From e571a8ea6e01a527fff1c2efec16a2107f5a446d Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 12 Jul 2012 11:14:14 +0200 Subject: [PATCH 1/6] don't cut broeders for tooltips --- dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dialog.cpp b/dialog.cpp index e192bd90d..d88fce831 100644 --- a/dialog.cpp +++ b/dialog.cpp @@ -171,7 +171,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) qreal bottomHeight(0); //decide about disabling the border attached to the panel - if (applet) { + if (applet && !(q->windowFlags() & Qt::ToolTip)) { background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight); switch (applet->location()) { @@ -223,7 +223,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) } //decide if to disable the other borders - if (q->isVisible()) { + if (q->isVisible() && !(q->windowFlags() & Qt::ToolTip)) { if (dialogGeom.left() <= avail.left()) { borders &= ~FrameSvg::LeftBorder; } From 8c8d4bfb09ebd47ab77127d19f7c1e60dd2e43b3 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 12 Jul 2012 11:58:58 +0200 Subject: [PATCH 2/6] fix the border disable logic --- dialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dialog.cpp b/dialog.cpp index d88fce831..9d10c6b70 100644 --- a/dialog.cpp +++ b/dialog.cpp @@ -171,7 +171,9 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) qreal bottomHeight(0); //decide about disabling the border attached to the panel - if (applet && !(q->windowFlags() & Qt::ToolTip)) { + //don't cut borders on tooltips + //Qt::ToolTip is 0xc & Qt::Window, so Qt::Window has to be considered + if (applet && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) { background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight); switch (applet->location()) { @@ -223,7 +225,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) } //decide if to disable the other borders - if (q->isVisible() && !(q->windowFlags() & Qt::ToolTip)) { + if (q->isVisible() && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) { if (dialogGeom.left() <= avail.left()) { borders &= ~FrameSvg::LeftBorder; } From 1614ea5cf93e8443bcee45dc5e86f774db115f8b Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 12 Jul 2012 13:32:43 +0200 Subject: [PATCH 3/6] use the window attribute fot the tooltip test --- dialog.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dialog.cpp b/dialog.cpp index 9d10c6b70..2eedd99ec 100644 --- a/dialog.cpp +++ b/dialog.cpp @@ -172,8 +172,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) //decide about disabling the border attached to the panel //don't cut borders on tooltips - //Qt::ToolTip is 0xc & Qt::Window, so Qt::Window has to be considered - if (applet && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) { + if (applet && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) { background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight); switch (applet->location()) { @@ -225,7 +224,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded) } //decide if to disable the other borders - if (q->isVisible() && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) { + if (q->isVisible() && !q->testAttribute(Qt::WA_X11NetWmWindowTypeToolTip)) { if (dialogGeom.left() <= avail.left()) { borders &= ~FrameSvg::LeftBorder; } From 3c46a565df2c9cca76fad25cd63189105b4bafdd Mon Sep 17 00:00:00 2001 From: Ignat Semenov Date: Sun, 15 Jul 2012 23:26:14 +0400 Subject: [PATCH 4/6] slots -> Q_SLOTS --- widgets/toolbutton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/toolbutton.h b/widgets/toolbutton.h index 3c891f9b2..89bbbb060 100644 --- a/widgets/toolbutton.h +++ b/widgets/toolbutton.h @@ -186,7 +186,7 @@ protected: QVariant itemChange(GraphicsItemChange change, const QVariant &value); QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const; -private slots: +private Q_SLOTS: void setAnimationUpdate(qreal progress); qreal animationUpdate() const; From d6b90f183efb2743ae0231b129fc13c3c980d897 Mon Sep 17 00:00:00 2001 From: Ignat Semenov Date: Sun, 15 Jul 2012 23:26:14 +0400 Subject: [PATCH 5/6] slots -> Q_SLOTS --- widgets/toolbutton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/toolbutton.h b/widgets/toolbutton.h index 3c891f9b2..89bbbb060 100644 --- a/widgets/toolbutton.h +++ b/widgets/toolbutton.h @@ -186,7 +186,7 @@ protected: QVariant itemChange(GraphicsItemChange change, const QVariant &value); QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const; -private slots: +private Q_SLOTS: void setAnimationUpdate(qreal progress); qreal animationUpdate() const; From 52fbecaf2c0c4737b3218ed9ed6ec1145649a510 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Thu, 19 Jul 2012 10:11:11 +0200 Subject: [PATCH 6/6] SVN_SILENT made messages (.desktop file) --- data/servicetypes/plasma-applet-popupapplet.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/servicetypes/plasma-applet-popupapplet.desktop b/data/servicetypes/plasma-applet-popupapplet.desktop index 09b2afb86..2e6a496c4 100644 --- a/data/servicetypes/plasma-applet-popupapplet.desktop +++ b/data/servicetypes/plasma-applet-popupapplet.desktop @@ -18,7 +18,7 @@ Comment[en_GB]=Plasma scripting popup applet Comment[es]=Miniaplicación emergente de script para Plasma Comment[et]=Plasma skriptimise hüpikaplett Comment[eu]=Plasma scripting popup appleta -Comment[fi]=Plasma ponnahdusikkunoiden skriptisovelma +Comment[fi]=Skriptikielellä tehty Plasma-ponnahdussovelma Comment[fr]=Applet de script Plasma Comment[fy]=Plasma scripting popup applet Comment[ga]=Feidhmchláirín aníos scriptithe Plasma