Author: sh-sh-sh Date: Tue Jan 27 17:06:35 2009 New Revision: 55086 URL: http://svn.opensuse.org/viewcvs/yast?rev=55086&view=rev Log: - Shortcut for all filter views - Fixed duplicate "View" menu (main menu "View" now renamed to "Options" Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc?rev=55086&r1=55085&r2=55086&view=diff ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.cc Tue Jan 27 17:06:35 2009 @@ -255,7 +255,7 @@ { _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); YUI_CHECK_NEW( _updateProblemFilterView ); - _filters->addPage( _( "Update Problems" ), _updateProblemFilterView, + _filters->addPage( _( "&Update Problems" ), _updateProblemFilterView, "update_problems", // internal name true ); // showAlways } @@ -284,7 +284,7 @@ { _patternList = new YQPkgPatternList( parent, true ); YUI_CHECK_NEW( _patternList ); - _filters->addPage( _( "Patterns" ), _patternList, "patterns" ); + _filters->addPage( _( "&Patterns" ), _patternList, "patterns" ); connect( _patternList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -306,7 +306,7 @@ _packageKitGroupsFilterView = new YQPkgPackageKitGroupsFilterView( parent ); YUI_CHECK_NEW( _packageKitGroupsFilterView ); - _filters->addPage( _( "Package Groups" ), _packageKitGroupsFilterView, "package_groups" ); + _filters->addPage( _( "Package &Groups" ), _packageKitGroupsFilterView, "package_groups" ); connect( this, SIGNAL( loadData() ), _packageKitGroupsFilterView, SLOT ( filter() ) ); @@ -318,7 +318,7 @@ _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); YUI_CHECK_NEW( _rpmGroupTagsFilterView ); - _filters->addPage( _( "RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); + _filters->addPage( _( "&RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); connect( this, SIGNAL( loadData() ), _rpmGroupTagsFilterView, SLOT ( filter() ) ); @@ -330,7 +330,7 @@ _langList = new YQPkgLangList( parent ); YUI_CHECK_NEW( _langList ); - _filters->addPage( _( "Languages" ), _langList, "languages" ); + _filters->addPage( _( "&Languages" ), _langList, "languages" ); _langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert connect( _langList, SIGNAL( statusChanged() ), @@ -346,7 +346,7 @@ _repoFilterView = new YQPkgRepoFilterView( parent ); YUI_CHECK_NEW( _repoFilterView ); - _filters->addPage( _( "Repositories" ), _repoFilterView, "repos" ); + _filters->addPage( _( "&Repositories" ), _repoFilterView, "repos" ); // @@ -355,17 +355,15 @@ _searchFilterView = new YQPkgSearchFilterView( parent ); YUI_CHECK_NEW( _searchFilterView ); - _filters->addPage( _( "Search" ), _searchFilterView, "search", + _filters->addPage( _( "S&earch" ), _searchFilterView, "search", true ); // showAlways - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #if 0 // DEBUG - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ) ); - _filters->addPage( _( "MIME Types" ), new QLabel( "MIME Types\nfilter\n\nfor future use" , this ) ); + _filters->addPage( _( "&Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #endif // @@ -374,7 +372,7 @@ _statusFilterView = new YQPkgStatusFilterView( parent ); YUI_CHECK_NEW( _statusFilterView ); - _filters->addPage( _( "Installation Summary" ), _statusFilterView, "inst_summary", + _filters->addPage( _( "&Installation Summary" ), _statusFilterView, "inst_summary", true ); // showAlways } @@ -559,7 +557,7 @@ parent->layout()->addWidget(_menuBar); _fileMenu = 0; - _viewMenu = 0; + _optionsMenu = 0; _pkgMenu = 0; _patchMenu = 0; _extrasMenu = 0; @@ -579,7 +577,7 @@ _fileMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _fileMenu ); - QAction *action = _menuBar->addMenu( _fileMenu ); + QAction * action = _menuBar->addMenu( _fileMenu ); action->setText( _( "&File" )); _fileMenu->addAction( _( "&Import..." ), this, SLOT( pkgImport() ) ); @@ -594,35 +592,6 @@ if ( _pkgList ) { // - // View menu - // - - _viewMenu = new QMenu( _menuBar ); - YUI_CHECK_NEW( _viewMenu ); - QAction *action = _menuBar->addMenu( _viewMenu ); - action->setText(_( "&View" )); - - // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! - _showDevelAction = _viewMenu->addAction( _( "Show -de&vel Packages" ), - this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); - _showDevelAction->setCheckable(true); - _showDevelAction->setChecked(true); - - _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); - YUI_CHECK_NEW( _excludeDevelPkgs ); - _excludeDevelPkgs->enable( false ); - - // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! - _showDebugAction = _viewMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), - this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); - _showDebugAction->setCheckable(true); - _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); - YUI_CHECK_NEW( _excludeDebugInfoPkgs ); - _excludeDebugInfoPkgs->enable( false ); - - - // // Package menu // @@ -735,8 +704,39 @@ // + // View menu + // + + _optionsMenu = new QMenu( _menuBar ); + YUI_CHECK_NEW( _optionsMenu ); + action = _menuBar->addMenu( _optionsMenu ); + // Translators: Menu for view options (Use a noun, not a verb!) + action->setText(_( "&Options" )); + + // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! + _showDevelAction = _optionsMenu->addAction( _( "Show -de&vel Packages" ), + this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); + _showDevelAction->setCheckable(true); + _showDevelAction->setChecked(true); + + _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDevelPkgs ); + _excludeDevelPkgs->enable( false ); + + // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! + _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), + this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); + _showDebugAction->setCheckable(true); + _showDebugAction->setChecked(true); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDebugInfoPkgs ); + _excludeDebugInfoPkgs->enable( false ); + + + // // Extras menu // + _extrasMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _extrasMenu ); action = _menuBar->addMenu( _extrasMenu ); @@ -992,7 +992,7 @@ { _patchFilterView = new YQPkgPatchFilterView( this ); YUI_CHECK_NEW( _patchFilterView ); - _filters->addPage( _( "Patches" ), _patchFilterView, "patches" ); + _filters->addPage( _( "P&atches" ), _patchFilterView, "patches" ); _patchList = _patchFilterView->patchList(); YUI_CHECK_PTR( _patchList ); @@ -1344,7 +1344,7 @@ void YQPackageSelector::pkgExcludeDebugChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDebugInfoPkgs ) _excludeDebugInfoPkgs->enable( ! on ); @@ -1357,7 +1357,7 @@ void YQPackageSelector::pkgExcludeDevelChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDevelPkgs ) _excludeDevelPkgs->enable( ! on ); @@ -1461,9 +1461,9 @@ _( "Added Subpackages:" ), QRegExp( ".*" + suffix + "$" ), _( "&OK" ), - QString::null, // rejectButtonLabel + QString::null, // rejectButtonLabel YQPkgChangesDialog::FilterAutomatic, - YQPkgChangesDialog::OptionNone ); // showIfEmpty + YQPkgChangesDialog::OptionNone ); // showIfEmpty } Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h?rev=55086&r1=55085&r2=55086&view=diff ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPackageSelector.h Tue Jan 27 17:06:35 2009 @@ -315,11 +315,11 @@ QMenuBar * _menuBar; QMenu * _fileMenu; - QMenu * _viewMenu; QMenu * _pkgMenu; QMenu * _patchMenu; QMenu * _configMenu; QMenu * _dependencyMenu; + QMenu * _optionsMenu; QMenu * _extrasMenu; QMenu * _helpMenu; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org