From c35d57256c61f97d2b4221e11e39b1fb9bac2a7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 May 2010 03:43:19 +0000 Subject: Added backend for panel icon maximum size control Polished frontend for panel icon size configuration git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1123840 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/kicker/core/main.cpp | 5 +++-- kicker/libkicker/global.cpp | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'kicker') diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 8eb033e29..aa49f90aa 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -109,9 +109,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) KAboutData aboutData( appname.data(), I18N_NOOP("KDE Panel"), version, description, KAboutData::License_BSD, - I18N_NOOP("(c) 1999-2004, The KDE Team") ); + I18N_NOOP("(c) 1999-2010, The KDE Team") ); - aboutData.addAuthor("Aaron J. Seigo", I18N_NOOP("Current maintainer"), "aseigo@kde.org"); + aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Current maintainer"), "kb9vqf@pearsoncomputing.net"); + aboutData.addAuthor("Aaron J. Seigo",0, "aseigo@kde.org"); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Wilco Greven",0, "greven@kde.org"); diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 1f393616d..a0915bcd1 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -33,6 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include "global.h" #include "kickerSettings.h" @@ -157,7 +158,14 @@ int sizeValue(KPanelExtension::Size s) int maxButtonDim() { - return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; + int maxDim; + //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; + + KSimpleConfig *kickerconfig = new KSimpleConfig( QString::fromLatin1( "kickerrc" )); + kickerconfig->setGroup("General"); + maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; + delete kickerconfig; + return maxDim; } QString newDesktopFile(const KURL& url) -- cgit v1.2.1