1 files changed, 66 insertions, 76 deletions

diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index e9f42e18a..3274f406b 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include <tqstylesheet.h>
+#include <tqinputdialog.h>
 
 #include <netwm.h>
 #include <dcopclient.h>
@@ -83,10 +84,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v
 
     m_desktopName = m_pager->twin()->desktopName(m_desktop);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
-    connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-    connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch()));
-    connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
+    connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
+    connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch()));
+    connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
 
     if (m_pager->desktopPreview())
     {
@@ -213,7 +214,7 @@ void KMiniPagerButton::loadBgPixmap()
     if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
         return; // not needed
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
     {
         client->attach();
@@ -247,8 +248,8 @@ void KMiniPagerButton::loadBgPixmap()
         }
         else if (s_commonSharedPixmap)
         { // other button is already fetching the pixmap
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
             return;
         }
     }
@@ -258,8 +259,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!s_commonSharedPixmap)
         {
             s_commonSharedPixmap = new TDESharedPixmap;
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
         if (retval == false) {
@@ -274,8 +275,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!m_sharedPixmap)
         {
             m_sharedPixmap = new TDESharedPixmap;
-            connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(m_sharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
         if (retval == false) {
@@ -397,47 +398,39 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         }
     }
 
-    if (!liveBkgnd)
+    // frame
+    if (liveBkgnd || transparent)
     {
-        if (transparent)
+        if (m_pager->border3D())
         {
-            // transparent windows get an 1 pixel frame...
-            if (on)
-            {
-                bp->setPen(colorGroup().midlight());
-            }
-            else if (down)
-            {
-                bp->setPen(KickerLib::blendColors(colorGroup().mid(),
-                                                 colorGroup().midlight()));
-            }
-            else
-            {
-                bp->setPen(colorGroup().dark());
-            }
-
-            bp->drawRect(0, 0, w, h);
+            qDrawShadeRect(bp, 0, 0, w, h, on ? palette().active() : palette().inactive());
         }
         else
         {
-            TQBrush background;
-
-            if (on)
-            {
-                background = colorGroup().brush(TQColorGroup::Midlight);
-            }
-            else if (down)
-            {
-                background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
-                                                    colorGroup().midlight()));
-            }
-            else
-            {
-                background = colorGroup().brush(TQColorGroup::Mid);
-            }
+            bp->setPen(on ? colorGroup().midlight()
+                          : KickerLib::blendColors(colorGroup().mid(), colorGroup().midlight()));
+            bp->drawRect(0, 0, w, h);
+        }
+    }
+    else
+    {
+        TQBrush background;
 
-            bp->fillRect(0, 0, w, h, background);
+        if (on)
+        {
+            background = colorGroup().brush(TQColorGroup::Midlight);
+        }
+        else if (down)
+        {
+            background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
+                                                colorGroup().midlight()));
         }
+        else
+        {
+            background = colorGroup().brush(TQColorGroup::Mid);
+        }
+
+        bp->fillRect(0, 0, w, h, background);
     }
 
     // window preview...
@@ -492,22 +485,6 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         }
     }
 
-    if (liveBkgnd)
-    {
-        // draw a little border around the individual buttons
-        // makes it look a bit more finished.
-        if (on)
-        {
-            bp->setPen(colorGroup().midlight());
-        }
-        else
-        {
-            bp->setPen(colorGroup().mid());
-        }
-
-        bp->drawRect(0, 0, w, h);
-    }
-
     if (m_pager->labelType() != PagerSettings::EnumLabelType::LabelNone)
     {
         TQString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ?
@@ -528,10 +505,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         // prevent LMB down -> RMB down -> LMB up sequence
-        if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton)
+        if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton)
         {
             emit showMenu(e->globalPos(), m_desktop);
             return;
@@ -724,17 +701,30 @@ void KMiniPagerButton::slotClicked()
 
 void KMiniPagerButton::rename()
 {
-  if ( !m_lineEdit ) {
-    m_lineEdit = new TQLineEdit( this );
-    connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
-    m_lineEdit->installEventFilter( this );
-  }
-  m_lineEdit->setGeometry( rect() );
-  m_lineEdit->setText(m_desktopName);
-  m_lineEdit->show();
-  m_lineEdit->setFocus();
-  m_lineEdit->selectAll();
-  m_pager->emitRequestFocus();
+    if (m_pager->labelType() == PagerSettings::EnumLabelType::LabelName)
+    {
+        if ( !m_lineEdit ) {
+            m_lineEdit = new TQLineEdit(this);
+            connect(m_lineEdit, TQ_SIGNAL(returnPressed()), m_lineEdit, TQ_SLOT(hide()));
+            m_lineEdit->installEventFilter(this);
+        }
+        m_lineEdit->setGeometry(rect());
+        m_lineEdit->setText(m_desktopName);
+        m_lineEdit->show();
+        m_lineEdit->setFocus();
+        m_lineEdit->selectAll();
+        m_pager->emitRequestFocus();
+    }
+    else
+    {
+        m_pager->twin()->setDesktopName(
+            m_desktop,
+            TQInputDialog::getText(
+                i18n("Renaming desktop %1").arg(m_desktopName),
+                i18n("Enter a new name for desktop %1 (%2):").arg(m_desktop).arg(m_desktopName)
+            )
+        );
+    }
 }
 
 void KMiniPagerButton::slotToggled( bool b )
@@ -747,12 +737,12 @@ void KMiniPagerButton::slotToggled( bool b )
 
 bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
 {
-    if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
+    if (o && o == m_lineEdit &&
         (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
     {
         m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );
         m_desktopName = m_lineEdit->text();
-        TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
+        TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) );
         m_lineEdit = 0;
         return true;
     }