[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/systemsettings
From:       Ben Cooksley <sourtooth () gmail ! com>
Date:       2009-07-19 10:34:16
Message-ID: 1247999656.862130.32556.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 999144 by bcooksley:

Wordwrap module names to reduce space used
Reduce initial size of System Settings window

 M  +2 -2      app/SettingsBase.cpp  
 M  +2 -2      core/MenuItem.cpp  
 M  +11 -1     icons/IconMode.cpp  


--- trunk/KDE/kdebase/workspace/systemsettings/app/SettingsBase.cpp #999143:999144
@@ -71,7 +71,7 @@
 
 QSize SettingsBase::sizeHint() const
 {
-    return QSize(850, 650);
+    return QSize(780, 520);
 }
 
 void SettingsBase::initApplication()
@@ -131,7 +131,7 @@
     menuBar()->hide();
     // Toolbar & Configuration
     helpActionMenu->setMenu( dynamic_cast<KMenu*>( factory()->container("help", \
                this) ) );
-    setMinimumSize(800,480);
+    setMinimumSize(780,520);
     toolBar()->setMovable(false); // We don't allow any changes
     changeToolBar( BaseMode::Search | BaseMode::Configure );
 }
--- trunk/KDE/kdebase/workspace/systemsettings/core/MenuItem.cpp #999143:999144
@@ -128,8 +128,8 @@
     d->service = service;
     d->category = service->property("X-KDE-System-Settings-Category").toString();
     d->name = service->name();
-    d->item = KCModuleInfo( service->entryPath() );
-    const QVariant itemWeight = d->service->property( "X-KDE-Weight", QVariant::Int \
); +    d->item = KCModuleInfo( service );
+    const QVariant itemWeight = service->property( "X-KDE-Weight", QVariant::Int );
     if( itemWeight.isValid() ) {
         d->weight = itemWeight.toInt();
     } else {
--- trunk/KDE/kdebase/workspace/systemsettings/icons/IconMode.cpp #999143:999144
@@ -30,6 +30,7 @@
 #include <KDialog>
 #include <KTabWidget>
 #include <KAboutData>
+#include <KGlobalSettings>
 #include <KStandardAction>
 #include <KCategoryDrawer>
 #include <KCategorizedView>
@@ -164,6 +165,11 @@
 #if QT_VERSION >= 0x040500
     d->iconWidget->setDocumentMode( true );
 #endif
+    // Generate the grid size to be shared between views
+    int itemHeight = KIconLoader::SizeMedium + \
QFontMetrics(KGlobalSettings::generalFont()).height() * 2 + 10; +    int itemWidth = \
104; +    QSize maximumSize = QSize( itemWidth, itemHeight );
+    // Actually build the views
     foreach( MenuProxyModel *proxyModel, d->proxyList ) {
         KCategoryDrawer *drawer = new KCategoryDrawer();
         d->mCategoryDrawers << drawer;
@@ -175,8 +181,12 @@
         tv->setViewMode( QListView::IconMode );
         tv->setMouseTracking( true );
         tv->viewport()->setAttribute( Qt::WA_Hover );
-        tv->setItemDelegate( new KFileItemDelegate( tv ) );
+        KFileItemDelegate * delegate = new KFileItemDelegate( tv );
+        delegate->setMaximumSize( maximumSize );
+        tv->setItemDelegate( delegate );
         tv->setFrameShape( QFrame::NoFrame );
+        tv->setGridSize( maximumSize );
+        tv->setWordWrap( true );
         tv->setModel( proxyModel );
         d->iconWidget->addTab( tv, d->proxyMap.value( proxyModel ) );
         connect( tv, SIGNAL( activated( const QModelIndex& ) ),


[prev in list] [next in list] [prev in thread] [next in thread]