Author: sh-sh-sh Date: Tue Oct 7 18:43:04 2008 New Revision: 51940 URL: http://svn.opensuse.org/viewcvs/yast?rev=51940&view=rev Log: Fixed bnc #429030: Configuration menu present in installation Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=51940&r1=51939&r2=51940&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Oct 7 18:43:04 2008 @@ -1,8 +1,13 @@ ------------------------------------------------------------------- +Tue Oct 7 18:41:47 CEST 2008 - sh@suse.de + +- Fixed bnc #429030: "Configuration" menu present in installation +- V 2.17.9 + +------------------------------------------------------------------- Tue Oct 7 15:04:28 CEST 2008 - sh@suse.de - Fixed bnc #421267: Missing newline in exported conflicts list -- V 2.17.9 ------------------------------------------------------------------- Thu Oct 2 13:20:46 CEST 2008 - sh@suse.de Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=51940&r1=51939&r2=51940&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Tue Oct 7 18:43:04 2008 @@ -716,16 +716,21 @@ // // Configuration menu // - _configMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _configMenu ); - action = _menuBar->addMenu( _configMenu ); - action->setText(_( "&Configuration" )); - _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); - _configMenu->addAction( _( "&Online Update..." ), this, SLOT( onlineUpdateConfiguration() ), Qt::CTRL + Qt::Key_O ); + + if ( repoMgrEnabled() ) + { + _configMenu = new QMenu( _menuBar ); + Q_CHECK_PTR( _configMenu ); + action = _menuBar->addMenu( _configMenu ); + action->setText(_( "&Configuration" )); + _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); + _configMenu->addAction( _( "&Online Update..." ), this, SLOT( onlineUpdateConfiguration() ), Qt::CTRL + Qt::Key_O ); + } // // Dependency menu // + _dependencyMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _dependencyMenu ); action = _menuBar->addMenu( _dependencyMenu ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org