The branch, master has been updated via ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67 (commit) from a3655780a6bc15b0ecd4f8ef9fcbefab0f5e60e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ded3b9ec485f2dda81ef3685a99bf3a7bb91ab67 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 25 18:01:50 2011 +0200 Fix scaling of widget icon/applet when used with KDE > v4.4.x (appx.). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + plasma-applet-x2goplasmoid.desktop | 1 + plasmax2godialog.cpp | 1 + x2goplasmoid.cpp | 20 +++++++++++++------- 4 files changed, 16 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5330895..53a856f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goplasmabindings (3.0.1.2-0~x2go2) UNRELEASED; urgency=low - Tab'ified all project files. - Make X2go plasmoid aware of MIME box shared folders. - Add scalable X2go icon. + - Fix scaling of widget icon/applet when used with KDE > v4.4.x (appx.). * Renaming of source package and binary package. * Depend on x2goserver (>=3.0.99.7). diff --git a/plasma-applet-x2goplasmoid.desktop b/plasma-applet-x2goplasmoid.desktop index a4f465a..d49d8a0 100644 --- a/plasma-applet-x2goplasmoid.desktop +++ b/plasma-applet-x2goplasmoid.desktop @@ -83,6 +83,7 @@ Comment[zh_CN]=Plasma x2goplasmoid Comment[zh_TW]=Plasma x2goplasmoid Icon=x2go Type=Service +ServicesType=Plasma/Applet X-KDE-ServiceTypes=Plasma/Applet X-KDE-Library=plasma_applet_x2goplasmoid diff --git a/plasmax2godialog.cpp b/plasmax2godialog.cpp index ead61da..1e645d6 100644 --- a/plasmax2godialog.cpp +++ b/plasmax2godialog.cpp @@ -44,6 +44,7 @@ void PlasmaX2goDialog::initDialog() { m_widget=new QGraphicsWidget(m_applet); m_widget->installEventFilter(this); + m_widget->setMinimumSize(150,180); m_widget->setPreferredSize(250,300); QGraphicsLinearLayout* lay=new QGraphicsLinearLayout(Qt::Vertical, m_widget); diff --git a/x2goplasmoid.cpp b/x2goplasmoid.cpp index 7ba3c86..a4c785c 100644 --- a/x2goplasmoid.cpp +++ b/x2goplasmoid.cpp @@ -36,17 +36,24 @@ x2goplasmoid::x2goplasmoid ( QObject *parent, const QVariantList &args ) : Plasma::PopupApplet ( parent, args ), m_dialog(0) { - setBackgroundHints ( DefaultBackground ); - setHasConfigurationInterface ( true ); - //init widget - setMinimumSize(graphicsWidget()->minimumSize()); + setAspectRatioMode(Plasma::IgnoreAspectRatio); + resize(graphicsWidget()->minimumSize()); + setPopupIcon(DEFAULT_ICON_NAME); + sessionId=getenv("X2GO_SESSION"); if(sessionId.length()<=0) { - //setEnabled(false); - //m_dialog->dialog()->setEnabled(false); + // setEnabled(false); + // m_dialog->dialog()->setEnabled(false); return; } + + setBackgroundHints ( DefaultBackground ); + setHasConfigurationInterface ( true ); + + //init widget + setMinimumSize(22,22); + KUser user; stampFName="/tmp/"+user.loginName()+"_media/"+sessionId+".plasmoid"; slotUpdateStamp(); @@ -77,7 +84,6 @@ void x2goplasmoid::init() toolTip.setSubText(i18n("Manage X2Go shares\nSuspend session")); toolTip.setImage(KIcon(DEFAULT_ICON_NAME)); Plasma::ToolTipManager::self()->setContent(this,toolTip); - setPopupIcon(DEFAULT_ICON_NAME); } QGraphicsWidget* x2goplasmoid::graphicsWidget() hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2go).