Author: tgoettlicher Date: Wed Feb 23 13:07:45 2011 New Revision: 63461 URL: http://svn.opensuse.org/viewcvs/yast?rev=63461&view=rev Log: - remember panel width (bnc #613352) - 2.20.2 Added: trunk/control-center/src/listview.h Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/CMakeLists.txt trunk/control-center/src/main_window.cpp trunk/control-center/src/main_window.h Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev=... ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Wed Feb 23 13:07:45 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-cont... ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Wed Feb 23 13:07:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 23 13:06:01 CET 2011 - tgoettlicher@suse.de + +- remember panel width (bnc #613352) +- 2.20.2 + +------------------------------------------------------------------- Tue Feb 22 17:36:58 CET 2011 - tgoettlicher@suse.de - fixed bnc #650907: yast2 shrinks module selector item on search Modified: trunk/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.txt... ============================================================================== --- trunk/control-center/src/CMakeLists.txt (original) +++ trunk/control-center/src/CMakeLists.txt Wed Feb 23 13:07:45 2011 @@ -17,22 +17,15 @@ main.cpp main_window.cpp kcategorizedview.cpp - # menuitem.cpp kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp - # kcmodulemodel.cpp moduleiconitem.cpp - # kcmoduleinfo.cpp - yccmoduleinfoprovider.cpp - yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp yqmodulesmodel.cpp yqmodulesproxymodel.cpp - yqsavelogs.cpp - i18n.cpp ) @@ -43,23 +36,17 @@ SET(yast2-control-center_HDRS main_window.h kcategorizedview.h - # menuitem.h - # kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h moduleiconitem.h - # kcmoduleinfo.h kcategorizedview_p.h - yccmoduleinfoprovider.h - yqdesktopfilesmodel.h yqmodulegroupsmodel.h yqmodulesmodel.h yqmodulesproxymodel.h - + listview.h yqsavelogs.h - i18n.h ) Added: trunk/control-center/src/listview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/listview.h?rev... ============================================================================== --- trunk/control-center/src/listview.h (added) +++ trunk/control-center/src/listview.h Wed Feb 23 13:07:45 2011 @@ -0,0 +1,13 @@ +#include <QtGui> + +class ListView : public QListView +{ +public: + ListView() : QListView() { mySize = QSize(42,42); } + + QSize sizeHint() const { return mySize; } + void setSizeHint( QSize s ) { mySize = s; } + +private: + QSize mySize; +}; Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.cp... ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Wed Feb 23 13:07:45 2011 @@ -38,12 +38,15 @@ #include "yqmodulesmodel.h" #include "yqmodulegroupsmodel.h" +#include "listview.h" //#include "moduleiconitem.h" #define ORG_NAME "YaST2" #define APP_NAME "y2controlcenter-qt" #define USED_QUEUE_SIZE 5 +#define GROUPSIZE QSize(200,350) + /* Textdomain "control-center" @@ -67,7 +70,7 @@ } YQModulesModel *modmodel; - QListView *groupview; + ListView *groupview; KCategorizedView * modview; // category proxy model KCategorizedSortFilterProxyModel * kcsfpm; @@ -144,9 +147,11 @@ d->gcsfpm->setFilterKeyColumn( 2 ); d->gcsfpm->setFilterRole( Qt::UserRole ); - d->groupview = new QListView( ); + d->groupview = new ListView( ); + d->groupview->setModel(d->gcsfpm); d->groupview->setIconSize( QSize(32,32) ); + d->groupview->setSizeHint( readGroupViewSize() ); //now pre-select something d->groupview->setSelectionMode( QAbstractItemView::SingleSelection ); @@ -192,6 +197,8 @@ connect( logSaver, SIGNAL( statusMsg( const QString &)), statusBar(), SLOT( showMessage( const QString &) )); + +// d->groupview->setSizeHint(500,500); } void MainWindow::setFullScreen( bool fs ) @@ -348,6 +355,19 @@ } +QSize MainWindow::readGroupViewSize() +{ + QSettings settings(ORG_NAME, APP_NAME); + QSize size; + + settings.beginGroup("GroupView"); + size = settings.value("Size", GROUPSIZE).toSize(); + settings.endGroup(); + + return size; +} + + void MainWindow::writeSettings() { QSettings settings(ORG_NAME, APP_NAME); @@ -361,6 +381,11 @@ QStringList used_list( d->recentlyUsed ); settings.setValue( "RecentlyUsed", used_list.join(",") ); settings.endGroup(); + + settings.beginGroup("GroupView"); + settings.setValue("Size", d->groupview->size()); + settings.endGroup(); + } void MainWindow::setWinTitle() Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h?... ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Wed Feb 23 13:07:45 2011 @@ -62,6 +62,9 @@ void writeSettings(); void readSettings(); void setWinTitle(); + QSize readGroupViewSize(); + + QDockWidget *groupdock; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org