[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:01:42 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=633d5b2
The following commit has been merged in the master branch:
commit 633d5b27c91b4d83db1c3bd71ec5c002d4378cd0
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Mon Feb 27 11:43:06 2012 +0100
Fix SimpleProfileSelectWidget button size with some themes
Setting a new created size policy breaks the vertical layout, so
instead we change the policies of the existing one.
Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
---
.../simple-profile-select-widget.cpp | 27 ++++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index 361643f..58cfbf2 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -69,34 +69,41 @@ SimpleProfileSelectWidget::SimpleProfileSelectWidget(ProfileListModel *profileLi
QCommandLinkButton *buttonJabber = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("jabber")), QString());
buttonJabber->setIcon(KIcon(QLatin1String("im-jabber")));
buttonJabber->setIconSize(QSize(32,32));
- buttonJabber->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+ // NOTE: Setting a new created size policy breaks the vertical layout, so
+ // instead we change the policies of the existing one
+ buttonJabber->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonJabber->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
QCommandLinkButton *buttonGTalk = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("google-talk")));
buttonGTalk->setIcon(KIcon(QLatin1String("im-google-talk")));
buttonGTalk->setIconSize(QSize(32,32));
- buttonGTalk->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
-
+ buttonGTalk->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonGTalk->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
QCommandLinkButton *buttonFacebook = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("facebook")));
buttonFacebook->setIcon(KIcon(QLatin1String("im-facebook")));
buttonFacebook->setIconSize(QSize(32,32));
- buttonFacebook->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
-
+ buttonFacebook->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonFacebook->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
+
QCommandLinkButton *buttonIcq = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("icq")));
buttonIcq->setIcon(KIcon(QLatin1String("im-icq")));
buttonIcq->setIconSize(QSize(32,32));
- buttonIcq->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+ buttonIcq->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonIcq->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
QCommandLinkButton *buttonMsn = new QCommandLinkButton(Dictionary::instance()->string(QLatin1String("msn")));
buttonMsn->setIcon(KIcon(QLatin1String("im-msn")));
buttonMsn->setIconSize(QSize(32,32));
- buttonMsn->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
-
+ buttonMsn->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonMsn->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
+
QCommandLinkButton *buttonOthers = new QCommandLinkButton(i18n("Others"), i18n("AOL, Gadu-Gadu, IRC, Yahoo and more..."));
buttonOthers->setIcon(KIcon(QLatin1String("go-next")));
buttonOthers->setIconSize(QSize(32,32));
- buttonOthers->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
-
+ buttonOthers->sizePolicy().setHorizontalPolicy(QSizePolicy::Expanding);
+ buttonOthers->sizePolicy().setVerticalPolicy(QSizePolicy::Fixed);
+
// Add them to the SignalMapper
d->signalMapper->setMapping(buttonJabber, QLatin1String("jabber"));
d->signalMapper->setMapping(buttonGTalk, QLatin1String("google-talk"));
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list