summaryrefslogtreecommitdiffstats
path: root/kicker/applets/minipager/pagerapplet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/minipager/pagerapplet.cpp')
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp88
1 files changed, 45 insertions, 43 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..0af954fcb 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -36,9 +36,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <dcopclient.h>
#include <netwm.h>
@@ -73,7 +73,7 @@ static const int bgOffset = 300;
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
setFont( TDEGlobalSettings::taskbarFont() );
- m_twin = new KWinModule(TQT_TQOBJECT(this));
+ m_twin = new KWinModule(this);
m_activeWindow = m_twin->activeWindow();
m_curDesk = m_twin->currentDesktop();
@@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
m_curDesk = 1;
}
- desktopLayoutOrientation = Qt::Horizontal;
+ desktopLayoutOrientation = TQt::Horizontal;
desktopLayoutX = -1;
desktopLayoutY = -1;
@@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
drawButtons();
- connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) );
- connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
- connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
- connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
- connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
- connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
- connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) );
- connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
- connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
- connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
+ connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) );
+ connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
+ connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) );
+ connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) );
+ connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) );
+ connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) );
+ connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
+ connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+ connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
+ connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
- if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+ if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
{
m_contextMenu = new TQPopupMenu();
- connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
- connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+ connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+ connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
setCustomMenu(m_contextMenu);
}
@@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk )
int KMiniPager::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const
int KMiniPager::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( tqt_xdisplay());
m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
- screen, TQT_TQOBJECT(this) );
+ screen, this );
if( !m_desktopLayoutOwner->claim( false ))
{
delete m_desktopLayoutOwner;
@@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
return;
}
}
- NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
+ NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
NETRootInfo i( tqt_xdisplay(), 0 );
i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
}
void KMiniPager::resizeEvent(TQResizeEvent*)
{
- bool horiz = orientation() == Qt::Horizontal;
+ bool horiz = orientation() == TQt::Horizontal;
int deskNum = m_desktops.count();
int rowNum = m_settings->numberOfRows();
@@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
{
nDX = rowNum;
nDY = deskCols;
- updateDesktopLayout(Qt::Horizontal, -1, nDX);
+ updateDesktopLayout(TQt::Horizontal, -1, nDX);
}
else
{
nDX = deskCols;
nDY = rowNum;
- updateDesktopLayout(Qt::Horizontal, nDY, -1);
+ updateDesktopLayout(TQt::Horizontal, nDY, -1);
}
// 1 pixel spacing.
@@ -442,7 +442,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
{
int newDesk;
int desktops = KWin::numberOfDesktops();
-
+
if(cycleWindow()){
@@ -456,7 +456,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
{
newDesk = (desktops + m_curDesk - 2) % desktops + 1;
}
-
+
slotButtonSelected(newDesk);
}
}
@@ -484,10 +484,10 @@ void KMiniPager::drawButtons()
m_desktops.append( desk );
m_group->insert( desk, count );
- connect(desk, TQT_SIGNAL(buttonSelected(int)),
- TQT_SLOT(slotButtonSelected(int)) );
- connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )),
- TQT_SLOT(slotShowMenu(const TQPoint&, int )) );
+ connect(desk, TQ_SIGNAL(buttonSelected(int)),
+ TQ_SLOT(slotButtonSelected(int)) );
+ connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )),
+ TQ_SLOT(slotShowMenu(const TQPoint&, int )) );
desk->show();
++count;
@@ -727,14 +727,15 @@ void KMiniPager::aboutToShowContextMenu()
rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset);
rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
- connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
- showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
+ connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
+ showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
i18n("&Columns"),
rowMenu);
showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails);
showMenu->insertItem(i18n("&Window Icons"), WindowIcons);
showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle);
+ showMenu->insertItem(i18n("3&D Desk Borders"), Border3D);
showMenu->insertTitle(i18n("Text Label"));
showMenu->insertItem(i18n("Desktop N&umber"),
@@ -753,7 +754,7 @@ void KMiniPager::aboutToShowContextMenu()
showMenu->insertItem(i18n("&Desktop Wallpaper"),
PagerSettings::EnumBackgroundType::BgLive + bgOffset);
}
- connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+ connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
m_contextMenu->insertItem(i18n("&Pager Options"),showMenu);
m_contextMenu->insertItem(SmallIcon("configure"),
@@ -767,10 +768,8 @@ void KMiniPager::aboutToShowContextMenu()
m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview());
m_contextMenu->setItemChecked(WindowIcons, m_settings->icons());
m_contextMenu->setItemChecked(Cycle, m_settings->cycle());
+ m_contextMenu->setItemChecked(Border3D, m_settings->border3D());
m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview());
- m_contextMenu->setItemEnabled(RenameDesktop,
- m_settings->labelType() ==
- PagerSettings::EnumLabelType::LabelName);
}
void KMiniPager::slotShowMenu(const TQPoint& pos, int desktop)
@@ -799,7 +798,7 @@ void KMiniPager::contextMenuActivated(int result)
return;
case ConfigureDesktops:
- kapp->startServiceByDesktopName("desktop");
+ tdeApp->startServiceByDesktopName("desktop");
return;
case RenameDesktop:
@@ -822,6 +821,9 @@ void KMiniPager::contextMenuActivated(int result)
case Cycle:
m_settings->setCycle(!m_settings->cycle());
break;
+ case Border3D:
+ m_settings->setBorder3D(!m_settings->border3D());
+ break;
case WindowIcons:
m_settings->setIcons(!m_settings->icons());
break;
@@ -883,7 +885,7 @@ void KMiniPager::slotDesktopNamesChanged()
void KMiniPager::showPager()
{
- DCOPClient *dcop=kapp->dcopClient();
+ DCOPClient *dcop=tdeApp->dcopClient();
if (dcop->isApplicationRegistered("kpager"))
{
@@ -892,7 +894,7 @@ void KMiniPager::showPager()
else
{
// Let's run kpager if it isn't running
- connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+ connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) );
dcop->setNotifications(true);
TQString strAppPath(locate("exe", "kpager"));
if (!strAppPath.isEmpty())
@@ -922,7 +924,7 @@ void KMiniPager::showKPager(bool toggleShow)
pt=mapToGlobal( TQPoint(x(), y()) );
}
- DCOPClient *dcop=kapp->dcopClient();
+ DCOPClient *dcop=tdeApp->dcopClient();
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
@@ -941,8 +943,8 @@ void KMiniPager::applicationRegistered( const TQCString & appName )
{
if (appName == "kpager")
{
- disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ),
- this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+ disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+ this, TQ_SLOT(applicationRegistered(const TQCString &)) );
showKPager(false);
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 01:52:58 +0000