Author: sh-sh-sh Date: Thu Feb 5 15:31:12 2009 New Revision: 55279 URL: http://svn.opensuse.org/viewcvs/yast?rev=55279&view=rev Log: reasonable preconfig Modified: trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgFilterTab.cc Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=55279&r1=55278&r2=55279&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Feb 5 15:31:12 2009 @@ -175,7 +175,24 @@ if ( ! pagesRestored ) { yuiDebug() << "No page configuration saved, using fallbacks" << endl; + + // + // Add a number of default tabs in the desired order + // + + if ( _searchFilterView ) _filters->showPage( _searchFilterView ); + + if ( ! searchMode() && ! summaryMode() + && _patternList ) _filters->showPage( _patternList ); + else if ( _rpmGroupTagsFilterView ) _filters->showPage( _rpmGroupTagsFilterView ); + + if ( _statusFilterView ) _filters->showPage( _statusFilterView ); + + // + // Move the desired tab to the foreground + // + if ( searchMode() && _searchFilterView ) { _filters->showPage( _searchFilterView ); @@ -194,7 +211,6 @@ } } - if ( _filters->diskUsageList() ) _filters->diskUsageList()->updateDiskUsage(); @@ -234,10 +250,10 @@ layout->setSpacing( SPACING_BELOW_MENU_BAR ); layoutMenuBar( this ); - QString settingsName = "pkg"; + QString settingsName = "YQPackageSelector"; - if ( onlineUpdateMode() ) settingsName = "online-update"; - if ( updateMode() ) settingsName = "system-update"; + if ( onlineUpdateMode() ) settingsName = "YQOnlineUpdate"; + if ( updateMode() ) settingsName = "YQSystemUpdate"; _filters = new YQPkgFilterTab( this, settingsName ); YUI_CHECK_NEW( _filters ); @@ -332,6 +348,7 @@ // // Languages view // + _langList = new YQPkgLangList( parent ); YUI_CHECK_NEW( _langList ); Modified: trunk/qt-pkg/src/YQPkgFilterTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFilterTab.cc?rev=55279&r1=55278&r2=55279&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgFilterTab.cc (original) +++ trunk/qt-pkg/src/YQPkgFilterTab.cc Thu Feb 5 15:31:12 2009 @@ -52,6 +52,8 @@ #define SHOW_ONLY_IMPORTANT_PAGES 1 #define VIEW_BUTTON_LEFT 1 +#define SETTINGS_DIR "YaST2" + #define MARGIN 5 // inner margin between 3D borders and content #define TOP_EXTRA_MARGIN 3 @@ -660,14 +662,14 @@ YQPkgFilterTab::loadSettings() { closeAllPages(); - QSettings settings( QSettings::UserScope, "openSUSE.org", priv->settingsName ); + QSettings settings( QSettings::UserScope, SETTINGS_DIR, priv->settingsName ); - int size = settings.beginReadArray( "tab-pages" ); + int size = settings.beginReadArray( "Tab_Pages" ); for ( int i=0; i < size; i++ ) { settings.setArrayIndex(i); - QString id = settings.value( "ID" ).toString(); + QString id = settings.value( "Page_ID" ).toString(); YQPkgFilterPage * page = findPage( id ); if ( page ) @@ -681,7 +683,7 @@ settings.endArray(); - QString id = settings.value( "current-page" ).toString(); + QString id = settings.value( "Current_Page" ).toString(); if ( ! id.isEmpty() ) showPage( id ); @@ -691,9 +693,9 @@ void YQPkgFilterTab::saveSettings() { - QSettings settings( QSettings::UserScope, "openSUSE.org", priv->settingsName ); + QSettings settings( QSettings::UserScope, SETTINGS_DIR, priv->settingsName ); - settings.beginWriteArray( "tab-pages" ); + settings.beginWriteArray( "Tab_Pages" ); for ( int i=0; i < tabBar()->count(); i++ ) { @@ -708,7 +710,7 @@ else { yuiDebug() << "Saving page #" << i << ": \"" << toUTF8( page->id ) << "\"" << endl; - settings.setValue( "ID", page->id ); + settings.setValue( "Page_ID", page->id ); } } } @@ -718,7 +720,7 @@ YQPkgFilterPage * currentPage = findPage( tabBar()->currentIndex() ); if ( currentPage ) - settings.setValue( "current-page", currentPage->id ); + settings.setValue( "Current_Page", currentPage->id ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org