Author: tgoettlicher Date: Mon Aug 25 13:26:27 2008 New Revision: 50353 URL: http://svn.opensuse.org/viewcvs/yast?rev=50353&view=rev Log: fate #303458: Simplifiying Software Management Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelector.h trunk/qt-pkg/src/YQPackageSelectorBase.cc trunk/qt-pkg/src/YQPackageSelectorBase.h Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Mon Aug 25 13:26:27 2008 @@ -1,5 +1,5 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") -# RELEASED: 2.17.5 +# RELEASED: 2.17.6 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=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Mon Aug 25 13:26:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 25 13:11:21 CEST 2008 - tgoettlicher@suse.de + +- fate #303458: Simplifiying Software Management +- V 2.17.6 + +------------------------------------------------------------------- Thu Aug 21 14:13:46 CEST 2008 - tgoettlicher@suse.de - Fixed bnc #418606: widgets are not aligned Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Mon Aug 25 13:26:27 2008 @@ -106,7 +106,7 @@ : YQPackageSelectorBase( parent, modeFlags ) { _showChangesDialog = true; - _autoDependenciesCheckBox = 0; + _autoDependenciesAction = 0; _detailsViews = 0; _diskUsageList = 0; _filters = 0; @@ -535,27 +535,6 @@ QHBoxLayout *layout = new QHBoxLayout(button_box); button_box->setLayout(layout); - // Button: Dependency check - // Translators: Please keep this short! - _checkDependenciesButton = new QPushButton( _( "Chec&k" ), button_box ); - layout->addWidget(_checkDependenciesButton); - - Q_CHECK_PTR( _checkDependenciesButton ); - _checkDependenciesButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert - _normalButtonBackground = _checkDependenciesButton->palette().color(QPalette::Background);; - - connect( _checkDependenciesButton, SIGNAL( clicked() ), - this, SLOT ( manualResolvePackageDependencies() ) ); - - - // Checkbox: Automatically check dependencies for every package status change? - // Translators: Please keep this short! - _autoDependenciesCheckBox = new QCheckBox( _( "A&utocheck" ), button_box ); - Q_CHECK_PTR( _autoDependenciesCheckBox ); - layout->addWidget(_autoDependenciesCheckBox); - - _autoDependenciesCheckBox->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT ); - layout->addStretch(); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); @@ -593,7 +572,8 @@ _pkgMenu = 0; _patchMenu = 0; _extrasMenu = 0; - _repositoryMenu = 0; + _configMenu = 0; + _dependencyMenu = 0; _helpMenu = 0; } @@ -732,18 +712,31 @@ _patchList->addAllInListSubMenu( _patchMenu ); } - // add repository menu if requested - if (repoMgrEnabled()) - { - yuiDebug() << "Adding the repo manager menu" << std::endl; - // Repository menu - _repositoryMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _repositoryMenu ); - action = _menuBar->addMenu( _repositoryMenu ); - action->setText(_( "&Repositories" )); - _repositoryMenu->addAction( _( "Repository &Manager..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_M ); - } + // + // 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 ); + + // + // Dependency menu + // + _dependencyMenu = new QMenu( _menuBar ); + Q_CHECK_PTR( _dependencyMenu ); + action = _menuBar->addMenu( _dependencyMenu ); + action->setText(_( "&Dependencies" )); + + _dependencyMenu->addAction( _( "&Check" ), this, SLOT( manualResolvePackageDependencies() ) ); + _autoDependenciesAction = new QAction( _( "&Autocheck" ), this ); + _autoDependenciesAction->setCheckable( true ); + _autoDependenciesAction->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT ); + _dependencyMenu->addAction( _autoDependenciesAction ); + // // Extras menu @@ -855,12 +848,6 @@ void YQPackageSelector::makeConnections() { - connect( this, SIGNAL( resolvingStarted() ), - this, SLOT ( animateCheckButton() ) ); - - connect( this, SIGNAL( resolvingFinished() ), - this, SLOT ( restoreCheckButton() ) ); - connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); connectFilter( _langList, _pkgList ); @@ -957,34 +944,9 @@ void -YQPackageSelector::animateCheckButton() -{ - if ( _checkDependenciesButton ) - { - QPalette p = _checkDependenciesButton->palette(); - p.setColor(QPalette::Background, QColor( 0xE0, 0xE0, 0xF8 )); - _checkDependenciesButton->setPalette(p); - _checkDependenciesButton->repaint(); - } -} - - -void -YQPackageSelector::restoreCheckButton() -{ - if ( _checkDependenciesButton ) - { - QPalette p = _checkDependenciesButton->palette(); - p.setColor(QPalette::Background, _normalButtonBackground); - _checkDependenciesButton->setPalette(p); - } -} - - -void YQPackageSelector::autoResolveDependencies() { - if ( _autoDependenciesCheckBox && ! _autoDependenciesCheckBox->isChecked() ) + if ( _autoDependenciesAction && ! _autoDependenciesAction->isChecked() ) return; resolveDependencies(); Modified: trunk/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.h?rev=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.h (original) +++ trunk/qt-pkg/src/YQPackageSelector.h Mon Aug 25 13:26:27 2008 @@ -161,17 +161,6 @@ protected slots: /** - * Animate the "Check" button when dependency resolving is in progress, - * i.e. change its background color - **/ - void animateCheckButton(); - - /** - * Restore the normal background color of the "Check" button. - **/ - void restoreCheckButton(); - - /** * Add the "Patches" filter view, if it is not already there. **/ void addPatchFilterView(); @@ -302,7 +291,7 @@ // Data members - QCheckBox * _autoDependenciesCheckBox; + QAction * _autoDependenciesAction; QPushButton * _checkDependenciesButton; QTabWidget * _detailsViews; QY2ComboTabWidget * _filters; @@ -328,7 +317,8 @@ QMenu * _viewMenu; QMenu * _pkgMenu; QMenu * _patchMenu; - QMenu * _repositoryMenu; + QMenu * _configMenu; + QMenu * _dependencyMenu; QMenu * _extrasMenu; QMenu * _helpMenu; Modified: trunk/qt-pkg/src/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelectorBase.cc?rev=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelectorBase.cc (original) +++ trunk/qt-pkg/src/YQPackageSelectorBase.cc Mon Aug 25 13:26:27 2008 @@ -297,6 +297,13 @@ YQUI::ui()->sendEvent( new YMenuEvent( "repo_mgr" ) ); } +void +YQPackageSelectorBase::onlineUpdateConfiguration() +{ + yuiMilestone() << "Closing PackageSelector with \"OnlineUpdateConfiguration\"" << endl; + YQUI::ui()->sendEvent( new YMenuEvent( "online_update_configuration" ) ); +} + bool YQPackageSelectorBase::showPendingLicenseAgreements() { Modified: trunk/qt-pkg/src/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelectorBase.h?rev=50353&r1=50352&r2=50353&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelectorBase.h (original) +++ trunk/qt-pkg/src/YQPackageSelectorBase.h Mon Aug 25 13:26:27 2008 @@ -147,6 +147,11 @@ void repoManager(); /** + * Close processing and request start of the online update configuration + **/ + void onlineUpdateConfiguration(); + + /** * Inform user about a feature that is not implemented yet. * This should NEVER show up in the final version. **/ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org