[yast-commit] r44066 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: CMakeLists.txt main_window.cpp moduleiconitem.cpp

Author: tgoettlicher Date: Thu Jan 31 14:40:42 2008 New Revision: 44066 URL: http://svn.opensuse.org/viewcvs/yast?rev=44066&view=rev Log: + moduleiconitem Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt?rev=44066&r1=44065&r2=44066&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt Thu Jan 31 14:40:42 2008 @@ -11,6 +11,8 @@ kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp kcmodulemodel.cpp +moduleiconitem.cpp +kcmoduleinfo.cpp ) @@ -26,7 +28,8 @@ kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h - +moduleiconitem.h +kcmoduleinfo.h ) #SET(yast2-control-center_RCCS ../files.qrc) Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp?rev=44066&r1=44065&r2=44066&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Thu Jan 31 14:40:42 2008 @@ -9,6 +9,7 @@ #include "menuitem.h" #include "kcmodulemodel.h" #include "kcategorydrawer.h" +#include "moduleiconitem.h" MainWindow::MainWindow() : QMainWindow() { @@ -17,15 +18,6 @@ QWidget *centralWidget = new QWidget; setCentralWidget(centralWidget); - QHBoxLayout *layout = new QHBoxLayout; - centralWidget->setLayout(layout); - - -// KCategorizedView *view = new KCategorizedView(this); - -// layout->addWidget(view); - - MenuItem *rootItem = new MenuItem(true, 0); MenuItem *first = new MenuItem(false, rootItem); @@ -33,7 +25,6 @@ first->caption="hallo"; - // foreach ( MenuItem* item, rootItem->children ) { KCModuleModel *model = new KCModuleModel( first, this ); KCategoryDrawer * drawer = new KCategoryDrawer; @@ -42,7 +33,7 @@ // tv->setSpacing(KDialog::spacingHint()); tv->setCategoryDrawer( drawer ); tv->setViewMode( QListView::IconMode ); -// tv->setItemDelegate( new ModuleIconItemDelegate( this ) ); + tv->setItemDelegate( new ModuleIconItemDelegate( this ) ); tv->setMouseTracking( true ); tv->viewport()->setAttribute( Qt::WA_Hover ); KCategorizedSortFilterProxyModel * kcsfpm = new SystemSettingsProxyModel( this ); @@ -54,6 +45,10 @@ tv->setModel( kcsfpm ); + QHBoxLayout *layout = new QHBoxLayout; + centralWidget->setLayout(layout); + + layout->addWidget(tv); } Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp?rev=44066&r1=44065&r2=44066&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Thu Jan 31 14:40:42 2008 @@ -20,9 +20,9 @@ */ #include "moduleiconitem.h" -#include -#include -#include +//#include +//#include +#include "kcmoduleinfo.h" #include <climits> @@ -61,9 +61,9 @@ painter->fillPath(roundedRectangle(option.rect, 10), hover); } - if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { - painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); - } +// if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { +// painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); +// } const QSize &decorationSize = option.decorationSize; QIcon::Mode iconMode = QIcon::Normal; @@ -97,31 +97,31 @@ } ModuleIconItem::ModuleIconItem( QListWidget* parent, const KCModuleInfo& module) - : QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), + :// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), imageName(module.icon()) { - setData( Qt::UserRole, KIconLoader::DefaultState ); +// setData( Qt::UserRole, KIconLoader::DefaultState ); modules.append(module); setSize(); } ModuleIconItem::ModuleIconItem( QListWidget* parent, const QString &text, const QString &_imageName ) - : QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), + : //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), imageName(_imageName) { - setData( Qt::UserRole, KIconLoader::DefaultState ); +// setData( Qt::UserRole, KIconLoader::DefaultState ); setSize(); } void ModuleIconItem::loadIcon( bool enabled ) { - int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; - if( newState == data( Qt::UserRole ).toInt() ) +// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; +// if( newState == data( Qt::UserRole ).toInt() ) return; - setData( Qt::UserRole, newState ); - setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); +// setData( Qt::UserRole, newState ); +// setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); } void ModuleIconItem::setSize() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org