summaryrefslogtreecommitdiffstats
path: root/kicker/applets/minipager/pagerbutton.cpp
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2025-01-14 19:42:04 +0200
committerPhilippe Mavridis <philippe.mavridis@yandex.com>2025-07-06 11:19:04 +0300
commitfa284a459858f2255c485240121f7cd1cc7d17a0 (patch)
treeb6d3ef1260a830f2ad83cb74158c9e681935e358 /kicker/applets/minipager/pagerbutton.cpp
parent5570cf74bb8de62614eff1ded69af3a6143b8dda (diff)
downloadtdebase-fa284a459858f2255c485240121f7cd1cc7d17a0.tar.gz
tdebase-fa284a459858f2255c485240121f7cd1cc7d17a0.zip
Kicker: aesthetic improvements
* New icon margin option for the system tray applet * Panel blur effect strength is now configurable * 3D border option tin minipager * Ability to rename desktops when minipager label not displaying desktop name Signed-off-by: Philippe Mavridis <philippe.mavridis@yandex.com>
Diffstat (limited to 'kicker/applets/minipager/pagerbutton.cpp')
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp112
1 files changed, 51 insertions, 61 deletions
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 517f81cfe..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>
@@ -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) ?
@@ -724,17 +701,30 @@ void KMiniPagerButton::slotClicked()
void KMiniPagerButton::rename()
{
- 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();
+ 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 )