summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/core/main.cpp5
-rw-r--r--kicker/libkicker/global.cpp10
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"), "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 <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)