diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-05-07 03:43:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-05-07 03:43:19 +0000 |
| commit | c35d57256c61f97d2b4221e11e39b1fb9bac2a7e (patch) | |
| tree | 6dcd8fd6b9659dc95150630fd788aac61c575df9 /kicker | |
| parent | 4b06331086ba155155239d9e9a174a2dbc48c899 (diff) | |
| download | tdebase-c35d57256c61f97d2b4221e11e39b1fb9bac2a7e.tar.gz tdebase-c35d57256c61f97d2b4221e11e39b1fb9bac2a7e.zip | |
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
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/kicker/core/main.cpp | 5 | ||||
| -rw-r--r-- | kicker/libkicker/global.cpp | 10 |
2 files changed, 12 insertions, 3 deletions
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"), "[email protected]"); + aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Current maintainer"), "[email protected]"); + aboutData.addAuthor("Aaron J. Seigo",0, "[email protected]"); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); aboutData.addAuthor("Wilco Greven",0, "[email protected]"); 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 <kio/netaccess.h> #include <kstandarddirs.h> #include <kservice.h> +#include <ksimpleconfig.h> #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) |