January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55145 - in /trunk/network: package/yast2-network.changes src/modules/Proxy.ycp src/services/proxy.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 12:09:27 2009 New Revision: 55145 URL: http://svn.opensuse.org/viewcvs/yast?rev=55145&view=rev Log: Notify user about the need to relogin on finishing proxy configuration Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp trunk/network/src/services/proxy.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jan 29 12:09:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 29 11:59:48 CET 2009 - kmachalkova(a)suse.cz + +- Proxy finish popup is back - notify user about the need to relogin + to apply new settings (bnc#458708) + +------------------------------------------------------------------- Mon Jan 26 13:30:16 CET 2009 - mzugec(a)suse.cz - lan : button labeling (bnc#440551) Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Thu Jan 29 12:09:27 2009 @@ -40,17 +40,13 @@ /** * Display popup at the end of the proxy configuration * @param modified true if proxy settings have been modified + */ define void ProxyFinishPopup(boolean modified) ``{ -string text = _("Applications that support it, such as YaST2 Online Update, -use them immediately. Other applications use them after a new login -(lynx, wget). Some applications do not support these settings at all -- -they use their own settings system. -"); +string text = _("It is recommended to relogin to make new proxy settings effective."); FinishPopup(modified, "proxy", text, "", []); } - */ /** * Read settings @@ -172,8 +168,8 @@ sleep(sl); Progress::NextStage(); - /*if (!Mode::config ()) - ProxyFinishPopup(true); */ + if (!Mode::config ()) + ProxyFinishPopup(true); /* Update /root/.wgetrc */ /* YOU uses curl(1) Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Thu Jan 29 12:09:27 2009 @@ -287,7 +287,9 @@ /* Proxy dialog help 1/8 */ string help = _("Configure your Internet proxy (caching) settings here. -Note: In some cases you may need to relogin for the settings to take effect") + +Note: It is generally recommended to relogin for the settings to take effect, +however in some cases the application may pick up new settings immediately. Please check +what your application (web browser, ftp client,...) supports. ") + /* Proxy dialog help 2/8 */ _("HTTP Proxy URL is the name of the proxy server for your access -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55144 - /trunk/autoinstallation/doc/autoyast.xml
by ug＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: ug Date: Thu Jan 29 12:08:43 2009 New Revision: 55144 URL: http://svn.opensuse.org/viewcvs/yast?rev=55144&view=rev Log: *LOL* Modified: trunk/autoinstallation/doc/autoyast.xml Modified: trunk/autoinstallation/doc/autoyast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/autoyast.xm… ============================================================================== --- trunk/autoinstallation/doc/autoyast.xml (original) +++ trunk/autoinstallation/doc/autoyast.xml Thu Jan 29 12:08:43 2009 @@ -59,7 +59,7 @@ <surname>Gansert</surname> <affiliation> <jobtitle>Server Technologies</jobtitle> - <orgname> &company-suse; Linux Products GmbH</orgname> + <orgname></orgname> </affiliation> </author> </authorgroup> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55143 - in /trunk/qt-pkg: ./ cmake/ package/ src/ src/icons/
by sh-sh-sh＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: sh-sh-sh Date: Thu Jan 29 12:05:23 2009 New Revision: 55143 URL: http://svn.opensuse.org/viewcvs/yast?rev=55143&view=rev Log: merged tabbed-pkg-browsing branch Added: trunk/qt-pkg/src/YQPkgFilterTab.cc - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc trunk/qt-pkg/src/YQPkgFilterTab.h - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.h trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h trunk/qt-pkg/src/icons/tab_remove.xpm - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm Modified: trunk/qt-pkg/ (props changed) trunk/qt-pkg/CMakeLists.txt (props changed) trunk/qt-pkg/MAINTAINER (props changed) trunk/qt-pkg/Makefile.cvs (props changed) trunk/qt-pkg/VERSION.cmake (contents, props changed) trunk/qt-pkg/cmake/ (props changed) trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/ (props changed) trunk/qt-pkg/src/CMakeLists.txt trunk/qt-pkg/src/YQIconPool.cc trunk/qt-pkg/src/YQIconPool.h trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelector.h trunk/qt-pkg/src/YQPackageSelectorPluginImpl.cc (props changed) trunk/qt-pkg/src/YQPackageSelectorPluginImpl.h (props changed) trunk/qt-pkg/src/YQPkgPatchList.cc trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=55143&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Jan 29 12:05:23 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jan 29 12:05:23 2009 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jan 29 11:59:13 CET 2009 - sh(a)suse.de + +- Use tabs instead of combo box for switching filter views + See also: + http://preview.tinyurl.com/tabbed-pkg-browsing + http://preview.tinyurl.com/tabbed-pkg-browsing-follow-up +- Moved PackageKit package groups filter view to separate class +- Restored RPM groups filter view +- V 2.18.2 + +------------------------------------------------------------------- Mon Jan 12 14:12:31 CET 2009 - tgoettlicher(a)suse.de - Fixed column widths in patch and language lists (bnc #461177) Modified: trunk/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/CMakeLists.txt?rev=55… ============================================================================== --- trunk/qt-pkg/src/CMakeLists.txt (original) +++ trunk/qt-pkg/src/CMakeLists.txt Thu Jan 29 12:05:23 2009 @@ -32,10 +32,12 @@ YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc + YQPkgFilterTab.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc + YQPkgPackageKitGroupsFilterView.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc Modified: trunk/qt-pkg/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.cc?rev=551… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.cc (original) +++ trunk/qt-pkg/src/YQIconPool.cc Thu Jan 29 12:05:23 2009 @@ -16,12 +16,13 @@ /-*/ +#include <qpixmap.h> + #define YUILogComponent "qt-ui" #include "YUILog.h" #include "YQIconPool.h" - #include "icons/autodel.xpm" #include "icons/autodel_disabled.xpm" #include "icons/autoinstall.xpm" @@ -58,8 +59,9 @@ #include "icons/step_current.xpm" #include "icons/step_todo.xpm" #include "icons/step_done.xpm" -//Added by qt3to4: -#include <qpixmap.h> + +#include "icons/tab_remove.xpm" + YQIconPool * YQIconPool::_iconPool = 0; @@ -106,6 +108,8 @@ QPixmap YQIconPool::stepToDo() { return iconPool()->cachedIcon( step_todo_xpm ); } QPixmap YQIconPool::stepDone() { return iconPool()->cachedIcon( step_done_xpm ); } +QPixmap YQIconPool::tabRemove() { return iconPool()->cachedIcon( tab_remove_xpm ); } + YQIconPool * YQIconPool::iconPool() { Modified: trunk/qt-pkg/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.h?rev=5514… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.h (original) +++ trunk/qt-pkg/src/YQIconPool.h Thu Jan 29 12:05:23 2009 @@ -69,6 +69,7 @@ static QPixmap stepToDo(); static QPixmap stepDone(); + static QPixmap tabRemove(); protected: Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Jan 29 12:05:23 2009 @@ -1,14 +1,14 @@ /*---------------------------------------------------------------------\ - | | - | __ __ ____ _____ ____ | - | \ \ / /_ _/ ___|_ _|___ \ | - | \ V / _` \___ \ | | __) | | - | | | (_| |___) || | / __/ | - | |_|\__,_|____/ |_| |_____| | - | | - | core system | - | (C) SuSE GmbH | - \----------------------------------------------------------------------/ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ File: YQPackageSelector.cc See also: YQPackageSelectorHelp.cc @@ -26,7 +26,9 @@ #define GLOBAL_UPDATE_CONFIRMATION_THRESHOLD 20 #define ENABLE_SOURCE_RPMS 0 #define BRAINDEAD_LIB_NAMING_SCHEME 1 -#define MARGIN 10 // around the widget +#define MARGIN 6 // around the widget +#define SPACING_BELOW_MENU_BAR 4 +#define SPLITTER_HALF_SPACING 4 #include <fstream> @@ -65,14 +67,16 @@ #include "YQPkgDiskUsageList.h" #include "YQPkgDiskUsageWarningDialog.h" #include "YQPkgFileListView.h" -#include "YQPkgRepoFilterView.h" -#include "YQPkgRepoList.h" +#include "YQPkgFilterTab.h" #include "YQPkgLangList.h" #include "YQPkgList.h" +#include "YQPkgPackageKitGroupsFilterView.h" #include "YQPkgPatchFilterView.h" #include "YQPkgPatchList.h" #include "YQPkgPatternList.h" #include "YQPkgProductDialog.h" +#include "YQPkgRepoFilterView.h" +#include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQPkgSearchFilterView.h" #include "YQPkgStatusFilterView.h" @@ -80,6 +84,7 @@ #include "YQPkgTextDialog.h" #include "YQPkgUpdateProblemFilterView.h" #include "YQPkgVersionsView.h" + #include "zypp/SysContent.h" #include "zypp/base/String.h" @@ -109,10 +114,11 @@ _showChangesDialog = true; _autoDependenciesAction = 0; _detailsViews = 0; - _diskUsageList = 0; _filters = 0; - _repoFilterView = 0; _langList = 0; + _packageKitGroupsFilterView = 0; + _patchFilterView = 0; + _patchList = 0; _patternList = 0; _pkgChangeLogView = 0; _pkgDependenciesView = 0; @@ -121,20 +127,17 @@ _pkgList = 0; _pkgTechnicalDetailsView = 0; _pkgVersionsView = 0; + _repoFilterView = 0; _rpmGroupTagsFilterView = 0; _searchFilterView = 0; _statusFilterView = 0; _updateProblemFilterView = 0; - _patchFilterView = 0; - _patchList = 0; _excludeDevelPkgs = 0; _excludeDebugInfoPkgs = 0; - if ( onlineUpdateMode() ) yuiMilestone() << "Online update mode" << endl; if ( updateMode() ) yuiMilestone() << "Update mode" << endl; - basicLayout(); addMenus(); // Only after all widgets are created! makeConnections(); @@ -190,8 +193,8 @@ } - if ( _diskUsageList ) - _diskUsageList->updateDiskUsage(); + if ( _filters->diskUsageList() ) + _filters->diskUsageList()->updateDiskUsage(); yuiMilestone() << "PackageSelector init done" << endl; @@ -208,73 +211,39 @@ #endif } + std::string YQPackageSelector::iconPath( const std::string &name, int size ) { - return zypp::str::form("%s/share/icons/hicolor/%dx%d/apps/%s.png", PREFIX, size, size, name.c_str()); + return zypp::str::form("%s/share/icons/hicolor/%dx%d/apps/%s.png", + PREFIX, size, size, name.c_str() ); } + void YQPackageSelector::basicLayout() { QVBoxLayout *layout = new QVBoxLayout(); - layout->setContentsMargins( MARGIN, 0, 0, MARGIN ); - setLayout(layout); - layoutMenuBar(this); - - QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); - Q_CHECK_PTR( outer_splitter ); - - outer_splitter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - - outer_splitter->setObjectName( "outer_splitter" ); - - layout->addWidget(outer_splitter); - - QWidget * left_pane = layoutLeftPane ( outer_splitter ); - - QWidget * right_pane = layoutRightPane( outer_splitter ); - - outer_splitter->setStretchFactor(outer_splitter->indexOf(left_pane), 0); - outer_splitter->setStretchFactor(outer_splitter->indexOf(right_pane), 1); -} + setLayout( layout ); + layout->setContentsMargins( MARGIN, // left + 0, // top + MARGIN, // right + MARGIN ); // bottom + layout->setSpacing( SPACING_BELOW_MENU_BAR ); + layoutMenuBar( this ); - -QWidget * -YQPackageSelector::layoutLeftPane( QWidget *parent ) -{ - QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); - Q_CHECK_PTR( splitter ); - splitter->setObjectName( "leftpanesplitter" ); - - QWidget * upper_vbox = new QWidget( splitter ); - QVBoxLayout *layout = new QVBoxLayout(upper_vbox); - layout->setContentsMargins( 0, MARGIN, 0, 0 ); - upper_vbox->setLayout(layout); - - Q_CHECK_PTR( upper_vbox ); - layoutFilters( upper_vbox ); - - _diskUsageList = new YQPkgDiskUsageList( splitter ); - - splitter->setStretchFactor(splitter->indexOf(upper_vbox), 1); - splitter->setStretchFactor(splitter->indexOf( _diskUsageList ), 2); - QList<int> sizes; - sizes << height(); - sizes << 0; - splitter->setSizes( sizes ); - - return splitter; + _filters = new YQPkgFilterTab( this ); + YUI_CHECK_NEW( _filters ); + + layout->addWidget( _filters ); + layoutFilters( this ); + layoutRightPane( _filters->rightPane() ); } void YQPackageSelector::layoutFilters( QWidget *parent ) { - _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), parent ); - Q_CHECK_PTR( _filters ); - parent->layout()->addWidget(_filters); - // // Update problem view // @@ -284,9 +253,11 @@ if ( YQPkgUpdateProblemFilterView::haveProblematicPackages() || testMode() ) { - _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent); - Q_CHECK_PTR( _updateProblemFilterView ); - _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); + _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); + YUI_CHECK_NEW( _updateProblemFilterView ); + _filters->addPage( _( "&Update Problems" ), _updateProblemFilterView, + "update_problems", // internal name + true ); // showAlways } } @@ -300,7 +271,9 @@ || ! zyppPool().empty<zypp::Patch>() #endif ) + { addPatchFilterView(); + } // @@ -310,8 +283,8 @@ if ( ! zyppPool().empty<zypp::Pattern>() || testMode() ) { _patternList = new YQPkgPatternList( parent, true ); - Q_CHECK_PTR( _patternList ); - _filters->addPage( _( "Patterns" ), _patternList ); + YUI_CHECK_NEW( _patternList ); + _filters->addPage( _( "&Patterns" ), _patternList, "patterns" ); connect( _patternList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -328,12 +301,24 @@ // + // PackageKit group view + // + + _packageKitGroupsFilterView = new YQPkgPackageKitGroupsFilterView( parent ); + YUI_CHECK_NEW( _packageKitGroupsFilterView ); + _filters->addPage( _( "Package &Groups" ), _packageKitGroupsFilterView, "package_groups" ); + + connect( this, SIGNAL( loadData() ), + _packageKitGroupsFilterView, SLOT ( filter() ) ); + + + // // RPM group tags view // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); - Q_CHECK_PTR( _rpmGroupTagsFilterView ); - _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); + YUI_CHECK_NEW( _rpmGroupTagsFilterView ); + _filters->addPage( _( "&RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); connect( this, SIGNAL( loadData() ), _rpmGroupTagsFilterView, SLOT ( filter() ) ); @@ -343,9 +328,9 @@ // Languages view // _langList = new YQPkgLangList( parent ); - Q_CHECK_PTR( _langList ); + YUI_CHECK_NEW( _langList ); - _filters->addPage( _( "Languages" ), _langList ); + _filters->addPage( _( "&Languages" ), _langList, "languages" ); _langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert connect( _langList, SIGNAL( statusChanged() ), @@ -360,8 +345,8 @@ // _repoFilterView = new YQPkgRepoFilterView( parent ); - Q_CHECK_PTR( _repoFilterView ); - _filters->addPage( _( "Repositories" ), _repoFilterView ); + YUI_CHECK_NEW( _repoFilterView ); + _filters->addPage( _( "&Repositories" ), _repoFilterView, "repos" ); // @@ -369,50 +354,48 @@ // _searchFilterView = new YQPkgSearchFilterView( parent ); - Q_CHECK_PTR( _searchFilterView ); - _filters->addPage( _( "Search" ), _searchFilterView ); + YUI_CHECK_NEW( _searchFilterView ); + _filters->addPage( _( "S&earch" ), _searchFilterView, "search", + true ); // showAlways - // - // Status change view - // - - _statusFilterView = new YQPkgStatusFilterView( parent ); - Q_CHECK_PTR( _statusFilterView ); - _filters->addPage( _( "Installation Summary" ), _statusFilterView ); - #if 0 // DEBUG - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", 0 ) ); - _filters->addPage( _( "MIME Types" ), new QLabel( "MIME Types\nfilter\n\nfor future use" , 0 ) ); + _filters->addPage( _( "&Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #endif + // + // Status change view + // + + _statusFilterView = new YQPkgStatusFilterView( parent ); + YUI_CHECK_NEW( _statusFilterView ); + _filters->addPage( _( "&Installation Summary" ), _statusFilterView, "inst_summary", + true ); // showAlways } QWidget * YQPackageSelector::layoutRightPane( QWidget *parent ) { - QWidget * right_pane_vbox = new QWidget( parent ); - - QVBoxLayout *layout = new QVBoxLayout( right_pane_vbox ); - - Q_CHECK_PTR( right_pane_vbox ); - - QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); - Q_CHECK_PTR( splitter ); + QVBoxLayout *layout = new QVBoxLayout( parent ); + YUI_CHECK_NEW( layout ); + layout->setContentsMargins( SPLITTER_HALF_SPACING, // left + 0, // top + 0, // right + 0 ); // bottom + + QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); + YUI_CHECK_NEW( splitter ); layout->addWidget(splitter); - Q_CHECK_PTR( splitter ); layoutPkgList( splitter ); - layoutDetailsViews( splitter ); + layoutButtons( parent ); - layoutButtons( right_pane_vbox ); - - return right_pane_vbox; + return parent; } @@ -420,7 +403,7 @@ YQPackageSelector::layoutPkgList( QWidget *parent ) { _pkgList= new YQPkgList( parent ); - Q_CHECK_PTR( _pkgList ); + YUI_CHECK_NEW( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -434,19 +417,19 @@ _detailsViews = new QTabWidget( parent ); - Q_CHECK_PTR( _detailsViews ); + YUI_CHECK_NEW( _detailsViews ); // // Description // _pkgDescriptionView = new YQPkgDescriptionView( _detailsViews ); - Q_CHECK_PTR( _pkgDescriptionView ); + YUI_CHECK_NEW( _pkgDescriptionView ); _detailsViews->addTab( _pkgDescriptionView, _( "D&escription" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgDescriptionView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); // @@ -454,11 +437,11 @@ // _pkgTechnicalDetailsView = new YQPkgTechnicalDetailsView( _detailsViews ); - Q_CHECK_PTR( _pkgTechnicalDetailsView ); + YUI_CHECK_NEW( _pkgTechnicalDetailsView ); _detailsViews->addTab( _pkgTechnicalDetailsView, _( "&Technical Data" ) ); - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgTechnicalDetailsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -467,12 +450,12 @@ // _pkgDependenciesView = new YQPkgDependenciesView( _detailsViews ); - Q_CHECK_PTR( _pkgDependenciesView ); + YUI_CHECK_NEW( _pkgDependenciesView ); _detailsViews->addTab( _pkgDependenciesView, _( "Dependencies" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgDependenciesView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -483,11 +466,11 @@ _pkgVersionsView = new YQPkgVersionsView( _detailsViews, true ); // userCanSwitchVersions - Q_CHECK_PTR( _pkgVersionsView ); + YUI_CHECK_NEW( _pkgVersionsView ); _detailsViews->addTab( _pkgVersionsView, _( "&Versions" ) ); - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgVersionsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -498,12 +481,12 @@ if ( haveInstalledPkgs ) // file list information is only available for installed pkgs { _pkgFileListView = new YQPkgFileListView( _detailsViews ); - Q_CHECK_PTR( _pkgFileListView ); + YUI_CHECK_NEW( _pkgFileListView ); _detailsViews->addTab( _pkgFileListView, _( "File List" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgFileListView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); } @@ -515,7 +498,7 @@ if ( haveInstalledPkgs ) // change log information is only available for installed pkgs { _pkgChangeLogView = new YQPkgChangeLogView( _detailsViews ); - Q_CHECK_PTR( _pkgChangeLogView ); + YUI_CHECK_NEW( _pkgChangeLogView ); _detailsViews->addTab( _pkgChangeLogView, _( "Change Log" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -530,16 +513,22 @@ YQPackageSelector::layoutButtons( QWidget *parent ) { QWidget * button_box = new QWidget( parent ); - Q_CHECK_PTR( button_box ); + YUI_CHECK_NEW( button_box ); parent->layout()->addWidget( button_box ); - QHBoxLayout *layout = new QHBoxLayout(button_box); - button_box->setLayout(layout); + QHBoxLayout * layout = new QHBoxLayout( button_box ); + YUI_CHECK_NEW( layout ); + + button_box->setLayout( layout ); + layout->setContentsMargins( 2, // left + 2, // top + 2, // right + 2 ); // bottom layout->addStretch(); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); - Q_CHECK_PTR( cancel_button ); + YUI_CHECK_NEW( cancel_button ); layout->addWidget(cancel_button); cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert @@ -549,7 +538,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); - Q_CHECK_PTR( accept_button ); + YUI_CHECK_NEW( accept_button ); layout->addWidget(accept_button); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert @@ -564,12 +553,11 @@ YQPackageSelector::layoutMenuBar( QWidget *parent ) { _menuBar = new QMenuBar( parent ); - Q_CHECK_PTR( _menuBar ); - + YUI_CHECK_NEW( _menuBar ); parent->layout()->addWidget(_menuBar); _fileMenu = 0; - _viewMenu = 0; + _optionsMenu = 0; _pkgMenu = 0; _patchMenu = 0; _extrasMenu = 0; @@ -588,8 +576,8 @@ // _fileMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _fileMenu ); - QAction *action = _menuBar->addMenu( _fileMenu ); + YUI_CHECK_NEW( _fileMenu ); + QAction * action = _menuBar->addMenu( _fileMenu ); action->setText( _( "&File" )); _fileMenu->addAction( _( "&Import..." ), this, SLOT( pkgImport() ) ); @@ -604,40 +592,11 @@ if ( _pkgList ) { // - // View menu - // - - _viewMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _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() ); - Q_CHECK_PTR( _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() ); - Q_CHECK_PTR( _excludeDebugInfoPkgs ); - _excludeDebugInfoPkgs->enable( false ); - - - // // Package menu // _pkgMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _pkgMenu ); + YUI_CHECK_NEW( _pkgMenu ); action = _menuBar->addMenu( _pkgMenu ); action->setText(_( "&Package" )); @@ -647,7 +606,7 @@ _pkgMenu->addAction(_pkgList->actionSetCurrentDelete); _pkgMenu->addAction(_pkgList->actionSetCurrentUpdate); _pkgMenu->addAction(_pkgList->actionSetCurrentTaboo); - _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); + _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); #if ENABLE_SOURCE_RPMS _pkgMenu->addSeparator(); @@ -658,7 +617,7 @@ _pkgMenu->addSeparator(); QMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); - Q_CHECK_PTR( submenu ); + YUI_CHECK_NEW( submenu ); #if ENABLE_SOURCE_RPMS submenu->addSeparator(); @@ -672,7 +631,7 @@ // submenu = new QMenu( _pkgMenu ); - Q_CHECK_PTR( submenu ); + YUI_CHECK_NEW( submenu ); // Translators: Unlike the "all in this list" submenu, this submenu // refers to all packages globally, not only to those that are @@ -695,7 +654,7 @@ // _patchMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _patchMenu ); + YUI_CHECK_NEW( _patchMenu ); action = _menuBar->addMenu( _patchMenu ); action->setText(_( "&Patch" )); @@ -721,7 +680,7 @@ if ( repoMgrEnabled() ) { _configMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _configMenu ); + YUI_CHECK_NEW( _configMenu ); action = _menuBar->addMenu( _configMenu ); action->setText(_( "&Configuration" )); _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); @@ -731,9 +690,9 @@ // // Dependency menu // - + _dependencyMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _dependencyMenu ); + YUI_CHECK_NEW( _dependencyMenu ); action = _menuBar->addMenu( _dependencyMenu ); action->setText(_( "&Dependencies" )); @@ -745,19 +704,48 @@ // + // 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 ); - Q_CHECK_PTR( _extrasMenu ); + YUI_CHECK_NEW( _extrasMenu ); action = _menuBar->addMenu( _extrasMenu ); action->setText(_( "&Extras" )); - _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); - _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); - _extrasMenu->addAction( _( "&Verify System" ), this, SLOT( verifySystem() ) ); + _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); + _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); + _extrasMenu->addAction( _( "&Verify System" ), this, SLOT( verifySystem() ) ); - - _extrasMenu->addSeparator(); #if BRAINDEAD_LIB_NAMING_SCHEME @@ -769,10 +757,9 @@ // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! _extrasMenu->addAction( _( "Install All Matching -de&buginfo Packages" ), this, SLOT( installDebugInfoPkgs() ) ); - + // Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"! _extrasMenu->addAction( _( "Install All Matching -debug&source Packages" ), this, SLOT( installDebugSourcePkgs() ) ); - _extrasMenu->addSeparator(); @@ -783,7 +770,6 @@ if ( _actionResetIgnoredDependencyProblems ) _extrasMenu->addAction(_actionResetIgnoredDependencyProblems); - #ifdef FIXME if ( _patchList ) _extrasMenu->addAction(_patchList->actionShowRawPatchInfo); @@ -795,7 +781,7 @@ // _helpMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _helpMenu ); + YUI_CHECK_NEW( _helpMenu ); _menuBar->addSeparator(); action = _menuBar->addMenu( _helpMenu ); action->setText(_( "&Help" )); @@ -810,7 +796,7 @@ _helpMenu->addAction( _( "&Symbols" ), this, SLOT( symbolHelp() ), Qt::SHIFT + Qt::Key_F1 ); // Menu entry for keyboard help - _helpMenu->addAction( _( "&Keys" ), this, SLOT( keyboardHelp() ) ); + _helpMenu->addAction( _( "&Keys" ), this, SLOT( keyboardHelp() ) ); } @@ -847,16 +833,15 @@ pkgList, SLOT ( setFocus() ) ); - - if ( hasUpdateSignal ) + if ( hasUpdateSignal && _filters->diskUsageList() ) { connect( filter, SIGNAL( updatePackages() ), pkgList, SLOT ( updateItemStates() ) ); - if ( _diskUsageList ) + if ( _filters->diskUsageList() ) { - connect( filter, SIGNAL( updatePackages() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + connect( filter, SIGNAL( updatePackages() ), + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } } } @@ -867,12 +852,15 @@ { connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); - connectFilter( _langList, _pkgList ); + connectFilter( _langList, _pkgList ); connectFilter( _repoFilterView, _pkgList, false ); + connectFilter( _packageKitGroupsFilterView, _pkgList, false ); connectFilter( _rpmGroupTagsFilterView, _pkgList, false ); - //FIXMEconnectFilter( _langList, _pkgList ); connectFilter( _statusFilterView, _pkgList, false ); connectFilter( _searchFilterView, _pkgList, false ); + + // FIXME + // connectFilter( _langList, _pkgList ); if ( _searchFilterView && _pkgList ) { @@ -886,11 +874,11 @@ _pkgList, SLOT ( addPkgItemDimmed ( ZyppSel, ZyppPkg ) ) ); } - if ( _pkgList && _diskUsageList ) + if ( _pkgList && _filters->diskUsageList() ) { - connect( _pkgList, SIGNAL( statusChanged() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + connect( _pkgList, SIGNAL( statusChanged() ), + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } connectPatchList(); @@ -916,10 +904,10 @@ } - if ( _diskUsageList ) + if ( _filters->diskUsageList() ) { connect( _pkgConflictDialog, SIGNAL( updatePackages() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } } @@ -940,7 +928,7 @@ // QShortcut * accel = new QShortcut( Qt::Key_F2, this, SLOT( hotkeyInsertPatchFilterView() ) ); - Q_CHECK_PTR( accel ); + YUI_CHECK_NEW( accel ); // // Update actions just before opening menus @@ -1003,11 +991,11 @@ if ( ! _patchFilterView ) { _patchFilterView = new YQPkgPatchFilterView( this ); - Q_CHECK_PTR( _patchFilterView ); - _filters->addPage( _( "Patches" ), _patchFilterView ); + YUI_CHECK_NEW( _patchFilterView ); + _filters->addPage( _( "P&atches" ), _patchFilterView, "patches" ); _patchList = _patchFilterView->patchList(); - Q_CHECK_PTR( _patchList ); + YUI_CHECK_PTR( _patchList ); connectPatchList(); } @@ -1028,6 +1016,10 @@ _pkgList->clear(); _patchList->filter(); } + else + { + _filters->showPage( _patchFilterView ); + } } @@ -1104,8 +1096,8 @@ _( "Error" ), // caption _( "Error exporting package list to %1" ).arg( filename ), QMessageBox::Ok | QMessageBox::Default, // button0 - Qt::NoButton, // button1 - Qt::NoButton ); // button2 + Qt::NoButton, // button1 + Qt::NoButton ); // button2 } } } @@ -1114,7 +1106,7 @@ void YQPackageSelector::pkgImport() { - QString filename = QFileDialog::getOpenFileName( this, _( "Load Package List" ), DEFAULT_EXPORT_FILE_NAME, // startsWi + QString filename = QFileDialog::getOpenFileName( this, _( "Load Package List" ), DEFAULT_EXPORT_FILE_NAME, "*.xml+;;*"// filter ); @@ -1327,6 +1319,7 @@ YQPkgProductDialog::showProductDialog(); } + void YQPackageSelector::installDevelPkgs() { @@ -1351,7 +1344,7 @@ void YQPackageSelector::pkgExcludeDebugChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDebugInfoPkgs ) _excludeDebugInfoPkgs->enable( ! on ); @@ -1360,10 +1353,11 @@ } } + void YQPackageSelector::pkgExcludeDevelChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDevelPkgs ) _excludeDevelPkgs->enable( ! on ); @@ -1372,6 +1366,7 @@ } } + void YQPackageSelector::installSubPkgs( const QString & suffix ) { @@ -1466,9 +1461,9 @@ _( "Added Subpackages:" ), QRegExp( ".*" + suffix + "$" ), _( "&OK" ), - QString::null, // rejectButtonLabel + QString::null, // rejectButtonLabel YQPkgChangesDialog::FilterAutomatic, - YQPkgChangesDialog::OptionNone ); // showIfEmpty + YQPkgChangesDialog::OptionNone ); // showIfEmpty } Modified: trunk/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.h (original) +++ trunk/qt-pkg/src/YQPackageSelector.h Thu Jan 29 12:05:23 2009 @@ -43,12 +43,15 @@ class YQPkgChangeLogView; class YQPkgDependenciesView; class YQPkgDescriptionView; -class YQPkgDiskUsageList; class YQPkgFileListView; -class YQPkgRepoFilterView; +class YQPkgFilterTab; class YQPkgLangList; class YQPkgList; +class YQPkgPackageKitGroupsFilterView; +class YQPkgPatchFilterView; +class YQPkgPatchList; class YQPkgPatternList; +class YQPkgRepoFilterView; class YQPkgRpmGroupTagsFilterView; class YQPkgSearchFilterView; class YQPkgSelList; @@ -56,8 +59,6 @@ class YQPkgTechnicalDetailsView; class YQPkgUpdateProblemFilterView; class YQPkgVersionsView; -class YQPkgPatchFilterView; -class YQPkgPatchList; class YQPackageSelector : public YQPackageSelectorBase { @@ -201,7 +202,6 @@ void basicLayout(); - QWidget * layoutLeftPane ( QWidget *parent ); QWidget * layoutRightPane ( QWidget *parent ); void layoutFilters ( QWidget *parent ); void layoutPkgList ( QWidget *parent ); @@ -294,7 +294,7 @@ QAction * _autoDependenciesAction; QPushButton * _checkDependenciesButton; QTabWidget * _detailsViews; - QY2ComboTabWidget * _filters; + YQPkgFilterTab * _filters; YQPkgChangeLogView * _pkgChangeLogView; YQPkgDependenciesView * _pkgDependenciesView; YQPkgDescriptionView * _pkgDescriptionView; @@ -303,6 +303,7 @@ YQPkgLangList * _langList; YQPkgList * _pkgList; YQPkgPatternList * _patternList; + YQPkgPackageKitGroupsFilterView * _packageKitGroupsFilterView; YQPkgRpmGroupTagsFilterView * _rpmGroupTagsFilterView; YQPkgSearchFilterView * _searchFilterView; YQPkgStatusFilterView * _statusFilterView; @@ -313,14 +314,14 @@ YQPkgPatchList * _patchList; QMenuBar * _menuBar; - QMenu * _fileMenu; - QMenu * _viewMenu; - QMenu * _pkgMenu; - QMenu * _patchMenu; - QMenu * _configMenu; - QMenu * _dependencyMenu; - QMenu * _extrasMenu; - QMenu * _helpMenu; + QMenu * _fileMenu; + QMenu * _pkgMenu; + QMenu * _patchMenu; + QMenu * _configMenu; + QMenu * _dependencyMenu; + QMenu * _optionsMenu; + QMenu * _extrasMenu; + QMenu * _helpMenu; QAction *_showDevelAction; QAction *_showDebugAction; Modified: trunk/qt-pkg/src/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchList.cc Thu Jan 29 12:05:23 2009 @@ -289,11 +289,11 @@ if ( patch ) { - zypp::Patch::Contents c(patch->contents()); - MIL << c << endl; + zypp::Patch::Contents contents(patch->contents()); + yuiMilestone() << contents << endl; - for ( zypp::Patch::Contents::Selectable_iterator it = c.selectableBegin(); - it != c.selectableEnd(); + for ( zypp::Patch::Contents::Selectable_iterator it = contents.selectableBegin(); + it != contents.selectableEnd(); ++it ) { ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); @@ -305,13 +305,12 @@ } else { - MIL << "patch is bogus" << endl; - + yuiMilestone() << "patch is bogus" << endl; } } else - WAR << "selection empty" << endl; + yuiWarning() << "selection empty" << endl; emit filterFinished(); } Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilt… ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Thu Jan 29 12:05:23 2009 @@ -22,200 +22,89 @@ #define YUILogComponent "qt-pkg" #include "YUILog.h" -#include <QApplication> - -#include "YQPackageSelector.h" -#include "zypp/sat/LookupAttr.h" - #include "YQPkgRpmGroupTagsFilterView.h" #include "YQi18n.h" #include "utf8.h" -QString -translatedText( YPkgGroupEnum group ) -{ - switch ( group ) - { - case PK_GROUP_ENUM_ACCESSIBILITY: return _( "Accessibility" ); - case PK_GROUP_ENUM_ACCESSORIES: return _( "Accessories" ); - case PK_GROUP_ENUM_EDUCATION: return _( "Education" ); - case PK_GROUP_ENUM_GAMES: return _( "Games" ); - case PK_GROUP_ENUM_GRAPHICS: return _( "Graphics" ); - case PK_GROUP_ENUM_INTERNET: return _( "Internet" ); - case PK_GROUP_ENUM_OFFICE: return _( "Office" ); - case PK_GROUP_ENUM_OTHER: return _( "Other" ); - case PK_GROUP_ENUM_PROGRAMMING: return _( "Programming" ); - case PK_GROUP_ENUM_MULTIMEDIA: return _( "Multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return _( "System" ); - case PK_GROUP_ENUM_DESKTOP_GNOME: return _( "GNOME Desktop" ); - case PK_GROUP_ENUM_DESKTOP_KDE: return _( "KDE Desktop" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return _( "XFCE Desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return _( "Other Desktops" ); - case PK_GROUP_ENUM_PUBLISHING: return _( "Publishing" ); - case PK_GROUP_ENUM_SERVERS: return _( "Servers" ); - case PK_GROUP_ENUM_FONTS: return _( "Fonts" ); - case PK_GROUP_ENUM_ADMIN_TOOLS: return _( "Admin Tools" ); - case PK_GROUP_ENUM_LEGACY: return _( "Legacy" ); - case PK_GROUP_ENUM_LOCALIZATION: return _( "Localization" ); - case PK_GROUP_ENUM_VIRTUALIZATION: return _( "Virtualization" ); - case PK_GROUP_ENUM_SECURITY: return _( "Security" ); - case PK_GROUP_ENUM_POWER_MANAGEMENT: return _( "Power Management" ); - case PK_GROUP_ENUM_COMMUNICATION: return _( "Communication" ); - case PK_GROUP_ENUM_NETWORK: return _( "Network" ); - case PK_GROUP_ENUM_MAPS: return _( "Maps" ); - case PK_GROUP_ENUM_REPOS: return _( "Software Sources" ); - case PK_GROUP_ENUM_UNKNOWN: return _( "Unknown Group" ); - - case YPKG_GROUP_ALL: return _( "All Packages" ); - case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); - case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); - // Intentionally omitting 'default' case so gcc can catch unhandled enums - } - - return _("Unknown Group"); -} +YRpmGroupsTree * YQPkgRpmGroupTagsFilterView::_rpmGroupsTree = 0; -string -groupIcon( YPkgGroupEnum group ) +YQPkgRpmGroupTagsFilterView::YQPkgRpmGroupTagsFilterView( QWidget * parent ) + : QTreeWidget( parent ) { - switch ( group ) - { - case PK_GROUP_ENUM_ACCESSIBILITY: return( "package_main" ); - case PK_GROUP_ENUM_ACCESSORIES: return( "package_applications" ); - case PK_GROUP_ENUM_EDUCATION: return( "package_edutainment" ); - case PK_GROUP_ENUM_GAMES: return( "package_games" ); - case PK_GROUP_ENUM_GRAPHICS: return( "package_graphics" ); - case PK_GROUP_ENUM_INTERNET: return( "package_network" ); - case PK_GROUP_ENUM_OFFICE: return( "package_office_addressbook" ); - case PK_GROUP_ENUM_OTHER: return( "package_main" ); - case PK_GROUP_ENUM_PROGRAMMING: return( "package_development" ); - case PK_GROUP_ENUM_MULTIMEDIA: return( "package_multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return( "yast-system" ); - case PK_GROUP_ENUM_DESKTOP_GNOME: return( "pattern-gnome" ); - case PK_GROUP_ENUM_DESKTOP_KDE: return( "pattern-kde" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_PUBLISHING: return( "package_main" ); - case PK_GROUP_ENUM_SERVERS: return( "package_editors" ); - case PK_GROUP_ENUM_FONTS: return( "package_main" ); - case PK_GROUP_ENUM_ADMIN_TOOLS: return( "yast-sysconfig" ); - case PK_GROUP_ENUM_LEGACY: return( "package_main" ); - case PK_GROUP_ENUM_LOCALIZATION: return( "yast-language" ); - case PK_GROUP_ENUM_VIRTUALIZATION: return( "yast-create-new-vm" ); - case PK_GROUP_ENUM_SECURITY: return( "yast-security" ); - case PK_GROUP_ENUM_POWER_MANAGEMENT: return( "package_settings_power" ); - case PK_GROUP_ENUM_COMMUNICATION: return( "yast-modem" ); - case PK_GROUP_ENUM_NETWORK: return( "package_network" ); - case PK_GROUP_ENUM_MAPS: return( "package_main" ); - case PK_GROUP_ENUM_REPOS: return( "package_main" ); - case PK_GROUP_ENUM_UNKNOWN: return( "package_main" ); - - case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); - case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); - case YPKG_GROUP_ALL: return( "package_main" ); + setHeaderLabels( QStringList(_( "Package Groups" )) ); + setRootIsDecorated( true ); + cloneTree( rpmGroupsTree()->root(), 0 ); - // Intentionally omitting 'default' case so gcc can catch unhandled enums - } + new YQPkgRpmGroupTag( this, _( "zzz All" ), 0 ); + + connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), + this, SLOT ( slotSelectionChanged ( QTreeWidgetItem * ) ) ); - return( "" ); + selectSomething(); } -YPkgGroupEnum -rpmGroupToPackageKitGroup( const string & rpmGroup ) +YQPkgRpmGroupTagsFilterView::~YQPkgRpmGroupTagsFilterView() { - string group = zypp::str::toLower( rpmGroup ); +} - if ( group.find( "amusements/teaching" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; - if ( group.find( "amusements" ) != string::npos ) return PK_GROUP_ENUM_GAMES; - if ( group.find( "development" ) != string::npos ) return PK_GROUP_ENUM_PROGRAMMING; - if ( group.find( "hardware" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; - if ( group.find( "archiving" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "clustering" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "system/monitoring" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "databases" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "system/management" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "graphics" ) != string::npos ) return PK_GROUP_ENUM_GRAPHICS; - if ( group.find( "multimedia" ) != string::npos ) return PK_GROUP_ENUM_MULTIMEDIA; - if ( group.find( "network" ) != string::npos ) return PK_GROUP_ENUM_NETWORK; - if ( group.find( "office" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "text" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "editors" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "publishing" ) != string::npos ) return PK_GROUP_ENUM_PUBLISHING; - if ( group.find( "security" ) != string::npos ) return PK_GROUP_ENUM_SECURITY; - if ( group.find( "telephony" ) != string::npos ) return PK_GROUP_ENUM_COMMUNICATION; - if ( group.find( "gnome" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_GNOME; - if ( group.find( "kde" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_KDE; - if ( group.find( "xfce" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_XFCE; - if ( group.find( "gui/other" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_OTHER; - if ( group.find( "localization" ) != string::npos ) return PK_GROUP_ENUM_LOCALIZATION; - if ( group.find( "system" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; - if ( group.find( "scientific" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; - return PK_GROUP_ENUM_UNKNOWN; -} +YRpmGroupsTree * +YQPkgRpmGroupTagsFilterView::rpmGroupsTree() +{ + if ( ! _rpmGroupsTree ) + { + _rpmGroupsTree = new YRpmGroupsTree(); + Q_CHECK_PTR( _rpmGroupsTree ); + fillRpmGroupsTree(); + } + return _rpmGroupsTree; +} -YQPkgRpmGroupTagsFilterView::YQPkgRpmGroupTagsFilterView( QWidget * parent ) - : QTreeWidget( parent ) - , _selectedGroup(YPKG_GROUP_ALL) +void +YQPkgRpmGroupTagsFilterView::fillRpmGroupsTree() { - setIconSize(QSize(32,32)); - setHeaderLabels( QStringList(_( "Package Groups" )) ); - setRootIsDecorated( false ); - setSortingEnabled( true ); - connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), - this, SLOT ( slotSelectionChanged ( QTreeWidgetItem * ) ) ); - fillGroups(); + yuiDebug() << "Filling RPM groups tree" << endl; - selectSomething(); -} + for ( ZyppPoolIterator it = zyppPkgBegin(); + it != zyppPkgEnd(); + ++it ) + { + ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); + if ( zyppPkg ) + rpmGroupsTree()->addRpmGroup( zyppPkg->group() ); + } -YQPkgRpmGroupTagsFilterView::~YQPkgRpmGroupTagsFilterView() -{ + yuiDebug() << "Filling RPM groups tree done" << endl; } void -YQPkgRpmGroupTagsFilterView::fillGroups() +YQPkgRpmGroupTagsFilterView::cloneTree( YStringTreeItem * parentRpmGroup, + YQPkgRpmGroupTag * parentClone ) { - if ( _groupsMap.empty() ) - { - zypp::sat::LookupAttr rpmgroups( zypp::sat::SolvAttr::group ); - for ( zypp::sat::LookupAttr::iterator it = rpmgroups.begin(); - it != rpmgroups.end(); - ++it ) - { - YPkgGroupEnum group; - std::map<std::string, YPkgGroupEnum>::const_iterator itg = _groupsCache.find(it.asString()); - if ( itg == _groupsCache.end() ) - { - group = rpmGroupToPackageKitGroup( it.asString() ); - _groupsCache[it.asString()] = group; - } - else - { - group = itg->second; - } - - //std::cout << it.asString() << std::endl; - - if ( _groupsMap.find(group) == _groupsMap.end() ) - { - _groupsMap[group] = new YQPkgRpmGroupTag( this, group ); - } - } - - _groupsMap[ YPKG_GROUP_ALL ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_ALL ); - _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_RECOMMENDED ); - _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_SUGGESTED ); + YStringTreeItem * child = parentRpmGroup->firstChild(); + YQPkgRpmGroupTag * clone; + while ( child ) + { + if ( parentClone ) + clone = new YQPkgRpmGroupTag( this, parentClone, child ); + else + clone = new YQPkgRpmGroupTag( this, child ); + + Q_CHECK_PTR( clone ); + //FIXME clone->setExpanded( clone->depth() < 1 ); + clone->setExpanded( true ); + cloneTree( child, clone ); + child = child->next(); } } @@ -225,9 +114,9 @@ { // FIXME // QTreeWidgetItem * item = children().first(); -// +// // if ( item ) -// setCurrentItem(item); +// setCurrentItem(item); } @@ -244,7 +133,7 @@ { emit filterStart(); // yuiDebug() << "Filtering packages for RPM group \"" << selectedRpmGroup() << "\"" << endl; - + if ( selection() ) { for ( ZyppPoolIterator it = zyppPkgBegin(); @@ -269,7 +158,7 @@ // any other instance. if ( ! match && - ! selectable->candidateObj() && + ! selectable->candidateObj() && ! selectable->installedObj() ) check( selectable, tryCastToZyppPkg( selectable->theObj() ) ); } @@ -286,22 +175,14 @@ if ( sel ) { - _selectedGroup = sel->group(); - // for the list of reccommended packages, we need - // to solve first - if ( _selectedGroup == YPKG_GROUP_SUGGESTED || - _selectedGroup == YPKG_GROUP_RECOMMENDED ) - { - // set the busy cursor for the solving - QApplication::setOverrideCursor(Qt::WaitCursor); - zypp::getZYpp()->resolver()->resolvePool(); - QApplication::restoreOverrideCursor(); - } - + if ( sel->rpmGroup() ) + _selectedRpmGroup = rpmGroupsTree()->rpmGroup( sel->rpmGroup() ); + else + _selectedRpmGroup = "*"; // "zzz_All" } else { - _selectedGroup = YPKG_GROUP_ALL; + _selectedRpmGroup = ""; } filter(); @@ -309,42 +190,28 @@ bool -YQPkgRpmGroupTagsFilterView::check( ZyppSel selectable, - ZyppPkg pkg ) +YQPkgRpmGroupTagsFilterView::check( ZyppSel selectable, + ZyppPkg pkg ) { if ( ! pkg || ! selection() ) return false; - if ( selection()->group() == YPKG_GROUP_ALL ) // Special case: All packages + if ( selection()->rpmGroup() == 0 ) // Special case: All packages { emit filterMatch( selectable, pkg ); return true; } - YPkgGroupEnum groupn = rpmGroupToPackageKitGroup( pkg->group() ); - - if ( groupn == selectedGroup() ) + if ( selectedRpmGroup().empty() ) + return false; + + if ( pkg->group() == selectedRpmGroup() || // full match? + pkg->group().find( selectedRpmGroup() + "/" ) == 0 ) // starts with selected? { emit filterMatch( selectable, pkg ); return true; } - if ( selectable->candidateObj() ) - { - if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && - zypp::PoolItem(pkg).status().isRecommended() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_SUGGESTED && - zypp::PoolItem(pkg).status().isSuggested() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - } - return false; } @@ -363,40 +230,45 @@ -YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, - YPkgGroupEnum group ) + + +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YStringTreeItem * rpmGroup ) : QTreeWidgetItem( parentFilterView ) , _filterView( parentFilterView ) - , _group( group ) + , _rpmGroup( rpmGroup ) { - QFont f = font(0); - QFontMetrics fm(f); - f.setPixelSize( (int) ( fm.height() * 1.1 ) ); - setFont(0,f); - - string iconName = groupIcon( group ); - setText( 0, translatedText( group ) ); - setIcon( 0, QIcon( QString( YQPackageSelector::iconPath( iconName, 32 ).c_str() ) ) ); + setText( 0, fromUTF8( _rpmGroup->value().translation() ) ); } -YQPkgRpmGroupTag::~YQPkgRpmGroupTag() +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YQPkgRpmGroupTag * parentGroupTag, + YStringTreeItem * rpmGroup ) + : QTreeWidgetItem( parentGroupTag ) + , _filterView( parentFilterView ) + , _rpmGroup( rpmGroup ) { - // NOP + setText( 0, fromUTF8( _rpmGroup->value().translation() ) ); } -bool -YQPkgRpmGroupTag::operator< ( const QTreeWidgetItem & otherListViewItem ) const +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + const QString & rpmGroupName, + YStringTreeItem * rpmGroup ) + : QTreeWidgetItem( parentFilterView ) + , _filterView( parentFilterView ) + , _rpmGroup( rpmGroup ) { - const YQPkgRpmGroupTag * otherCategoryItem = - dynamic_cast<const YQPkgRpmGroupTag *>(&otherListViewItem); + setText( 0, rpmGroupName ); +} - if ( otherCategoryItem ) - return group() > otherCategoryItem->group(); - else - return true; + +YQPkgRpmGroupTag::~YQPkgRpmGroupTag() +{ + // NOP } + #include "YQPkgRpmGroupTagsFilterView.moc" Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilt… ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h Thu Jan 29 12:05:23 2009 @@ -20,57 +20,12 @@ #ifndef YQPkgRpmGroupTagsFilterView_h #define YQPkgRpmGroupTagsFilterView_h -#include <map> #include "YQZypp.h" -#include "YRpmGroupsTree.h" #include <QTreeWidget> +#include <YRpmGroupsTree.h> -using std::string; - -typedef enum -{ - // - // PackageKit values - // - - PK_GROUP_ENUM_ACCESSIBILITY, - PK_GROUP_ENUM_ACCESSORIES, - PK_GROUP_ENUM_EDUCATION, - PK_GROUP_ENUM_GAMES, - PK_GROUP_ENUM_GRAPHICS, - PK_GROUP_ENUM_INTERNET, - PK_GROUP_ENUM_OFFICE, - PK_GROUP_ENUM_OTHER, - PK_GROUP_ENUM_PROGRAMMING, - PK_GROUP_ENUM_MULTIMEDIA, - PK_GROUP_ENUM_SYSTEM, - PK_GROUP_ENUM_DESKTOP_GNOME, - PK_GROUP_ENUM_DESKTOP_KDE, - PK_GROUP_ENUM_DESKTOP_XFCE, - PK_GROUP_ENUM_DESKTOP_OTHER, - PK_GROUP_ENUM_PUBLISHING, - PK_GROUP_ENUM_SERVERS, - PK_GROUP_ENUM_FONTS, - PK_GROUP_ENUM_ADMIN_TOOLS, - PK_GROUP_ENUM_LEGACY, - PK_GROUP_ENUM_LOCALIZATION, - PK_GROUP_ENUM_VIRTUALIZATION, - PK_GROUP_ENUM_SECURITY, - PK_GROUP_ENUM_POWER_MANAGEMENT, - PK_GROUP_ENUM_COMMUNICATION, - PK_GROUP_ENUM_NETWORK, - PK_GROUP_ENUM_MAPS, - PK_GROUP_ENUM_REPOS, - PK_GROUP_ENUM_UNKNOWN, - // - // Other values - // - - YPKG_GROUP_SUGGESTED, - YPKG_GROUP_RECOMMENDED, - YPKG_GROUP_ALL, -} YPkgGroupEnum; +using std::string; class YQPkgRpmGroupTag; @@ -109,9 +64,11 @@ ZyppPkg pkg ); /** - * Returns the (untranslated!) currently selected group enum + * Returns the (untranslated!) currently selected RPM group as string. + * Special case: "*" is returned if "zzz_All" is selected. **/ - YPkgGroupEnum selectedGroup() const { return _selectedGroup; } + const string & selectedRpmGroup() const { return _selectedRpmGroup; } + public slots: @@ -136,6 +93,13 @@ **/ void selectSomething(); + /** + * Returns the internal RPM groups tree and fills it + * if it doesn't exist yet. + **/ + static YRpmGroupsTree * rpmGroupsTree(); + + signals: /** @@ -163,25 +127,58 @@ **/ void slotSelectionChanged( QTreeWidgetItem * newSelection ); + protected: - void fillGroups(); + /** + * Fill the internal RPM groups tree with RPM groups of all packages + * currently in the pool + **/ + static void fillRpmGroupsTree(); + + /** + * Recursively clone the RPM group tag tree for the QListView widget: + * Make a deep copy of the tree starting at 'parentRpmGroup' and + * 'parentClone'. + **/ + void cloneTree( YStringTreeItem * parentRpmGroup, + YQPkgRpmGroupTag * parentClone = 0 ); + // // Data members // - YPkgGroupEnum _selectedGroup; - std::map<YPkgGroupEnum, YQPkgRpmGroupTag*> _groupsMap; - // map to cache converted groups - std::map<std::string, YPkgGroupEnum> _groupsCache; + string _selectedRpmGroup; + + static YRpmGroupsTree * _rpmGroupsTree; }; + + class YQPkgRpmGroupTag: public QTreeWidgetItem { public: + /** + * Constructor for toplevel RPM group tags + **/ + YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YStringTreeItem * rpmGroup ); + + /** + * Constructor for RPM group tags that have a parent + **/ + YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YQPkgRpmGroupTag * parentGroupTag, + YStringTreeItem * rpmGroup ); + + /** + * Constructor for toplevel RPM group tags via STL string + * ( for special cases like "zzz All" ) + **/ YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, - YPkgGroupEnum group ); + const QString & rpmGroupName, + YStringTreeItem * rpmGroup ); /** * Destructor @@ -194,15 +191,18 @@ **/ YQPkgRpmGroupTagsFilterView * filterView() const { return _filterView; } - YPkgGroupEnum group() const { return _group; } + /** + * Returns the original tree item + **/ + const YStringTreeItem * rpmGroup() const { return _rpmGroup; } + - virtual bool operator< ( const QTreeWidgetItem & otherListViewItem ) const; private: // Data members YQPkgRpmGroupTagsFilterView * _filterView; - YPkgGroupEnum _group; + YStringTreeItem * _rpmGroup; }; Modified: trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZyppSolverDialogPlu… ============================================================================== --- trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc (original) +++ trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Thu Jan 29 12:05:23 2009 @@ -18,6 +18,7 @@ /-*/ + #include <qmessagebox.h> #include "YQZyppSolverDialogPluginStub.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55142 - /tags/stable-2_18_0/sshd/
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 11:03:08 2009 New Revision: 55142 URL: http://svn.opensuse.org/viewcvs/yast?rev=55142&view=rev Log: Created tag stable-2_18_0 for sshd Added: tags/stable-2_18_0/sshd/ - copied from r55141, trunk/sshd/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55141 - /tags/branch-Code-11-2_17_2/sshd/
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:54:32 2009 New Revision: 55141 URL: http://svn.opensuse.org/viewcvs/yast?rev=55141&view=rev Log: Created tag branch-Code-11-2_17_2 for sshd Added: tags/branch-Code-11-2_17_2/sshd/ - copied from r55140, branches/SuSE-Code-11-Branch/sshd/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55140 - in /branches/SuSE-Code-11-Branch/sshd: VERSION package/yast2-sshd.changes src/Sshd.ycp src/complex.ycp src/dialogs.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:53:39 2009 New Revision: 55140 URL: http://svn.opensuse.org/viewcvs/yast?rev=55140&view=rev Log: - Dropping possibility to adjust PasswordAuthentication option as it has no or rather misleading effect (bnc #469207). - 2.17.2 Modified: branches/SuSE-Code-11-Branch/sshd/VERSION branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp branches/SuSE-Code-11-Branch/sshd/src/complex.ycp branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp Modified: branches/SuSE-Code-11-Branch/sshd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/VERS… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/VERSION (original) +++ branches/SuSE-Code-11-Branch/sshd/VERSION Thu Jan 29 10:53:39 2009 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/pack… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes (original) +++ branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes Thu Jan 29 10:53:39 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:50:10 CET 2009 - locilka(a)suse.cz + +- Dropping possibility to adjust PasswordAuthentication option + as it has no or rather misleading effect (bnc #469207). +- 2.17.2 + +------------------------------------------------------------------- Wed Dec 10 16:43:46 CET 2008 - locilka(a)suse.cz - Forgotten text marked for translation (bnc #450474). Modified: branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp Thu Jan 29 10:53:39 2009 @@ -60,7 +60,8 @@ "PermitRootLogin" : ["yes"], "IgnoreUserKnownHosts" : ["no"], "MaxAuthTries" : ["6"], - "PasswordAuthentication" : ["yes"], + // BNC #469207 + // "PasswordAuthentication" : ["yes"], "RSAAuthentication" : ["no"], "PubkeyAuthentication" : ["yes"], "Ciphers" : ["aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr"], Modified: branches/SuSE-Code-11-Branch/sshd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/complex.ycp Thu Jan 29 10:53:39 2009 @@ -151,7 +151,7 @@ UI::ChangeWidget(`id("MaxAuthTries"), `Value, MaxAuthTries[0]:"0"); foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { UI::ChangeWidget(`id(key), `Value, (Sshd::GetSSHDOption(key) == ["yes"])); }); } @@ -353,7 +353,7 @@ // Stores all boolean values and turns them to the "yes"/"no" notation foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { Sshd::SetSSHDOption( key, [ (((boolean) UI::QueryWidget(`id(key), `Value) == true) ? "yes":"no") ] Modified: branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp Thu Jan 29 10:53:39 2009 @@ -81,8 +81,11 @@ `VBox ( /* A text entry */ `Left(`InputField(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))), - /* A check box */ - `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + +// BNC #469207 +// /* A check box */ +// `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + /* A check box */ `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), /* A check box */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55139 - in /trunk/sshd: VERSION package/yast2-sshd.changes src/Sshd.ycp src/complex.ycp src/dialogs.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:53:28 2009 New Revision: 55139 URL: http://svn.opensuse.org/viewcvs/yast?rev=55139&view=rev Log: - Dropping possibility to adjust PasswordAuthentication option as it has no or rather misleading effect (bnc #469207). - 2.18.0 Modified: trunk/sshd/VERSION trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/Sshd.ycp trunk/sshd/src/complex.ycp trunk/sshd/src/dialogs.ycp Modified: trunk/sshd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/VERSION?rev=55139&r1=55138&… ============================================================================== --- trunk/sshd/VERSION (original) +++ trunk/sshd/VERSION Thu Jan 29 10:53:28 2009 @@ -1 +1 @@ -2.17.1 +2.18.0 Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Thu Jan 29 10:53:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:50:10 CET 2009 - locilka(a)suse.cz + +- Dropping possibility to adjust PasswordAuthentication option + as it has no or rather misleading effect (bnc #469207). +- 2.18.0 + +------------------------------------------------------------------- Tue Dec 16 16:31:25 CET 2008 - locilka(a)suse.cz - Dialog buttons adapted to the current style guide. Modified: trunk/sshd/src/Sshd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/Sshd.ycp?rev=55139&r1=5… ============================================================================== --- trunk/sshd/src/Sshd.ycp (original) +++ trunk/sshd/src/Sshd.ycp Thu Jan 29 10:53:28 2009 @@ -61,7 +61,8 @@ "PermitRootLogin" : ["yes"], "IgnoreUserKnownHosts" : ["no"], "MaxAuthTries" : ["6"], - "PasswordAuthentication" : ["yes"], + // BNC #469207 + // "PasswordAuthentication" : ["yes"], "RSAAuthentication" : ["no"], "PubkeyAuthentication" : ["yes"], "Ciphers" : ["aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr"], Modified: trunk/sshd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/complex.ycp?rev=55139&r… ============================================================================== --- trunk/sshd/src/complex.ycp (original) +++ trunk/sshd/src/complex.ycp Thu Jan 29 10:53:28 2009 @@ -151,7 +151,7 @@ UI::ChangeWidget(`id("MaxAuthTries"), `Value, MaxAuthTries[0]:"0"); foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { UI::ChangeWidget(`id(key), `Value, (Sshd::GetSSHDOption(key) == ["yes"])); }); } @@ -353,7 +353,7 @@ // Stores all boolean values and turns them to the "yes"/"no" notation foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { Sshd::SetSSHDOption( key, [ (((boolean) UI::QueryWidget(`id(key), `Value) == true) ? "yes":"no") ] Modified: trunk/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=55139&r… ============================================================================== --- trunk/sshd/src/dialogs.ycp (original) +++ trunk/sshd/src/dialogs.ycp Thu Jan 29 10:53:28 2009 @@ -83,8 +83,11 @@ `MarginBox (mbox_x, mbox_y, `VBox ( /* A text entry */ `Left(`InputField(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))), - /* A check box */ - `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + +// BNC #469207 +// /* A check box */ +// `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + /* A check box */ `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), /* A check box */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55138 - /trunk/packager/package/yast2-packager.changes
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:51:52 2009 New Revision: 55138 URL: http://svn.opensuse.org/viewcvs/yast?rev=55138&view=rev Log: something for changelog Modified: trunk/packager/package/yast2-packager.changes Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 29 10:51:52 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:46:38 CET 2009 - kmachalkova(a)suse.cz + +- Webpin search: remember all packages selected by user in all + queries in this session + show them in "All Packages" tab +- Show "Really exit?" pop-up only if there is something to do + +------------------------------------------------------------------- Wed Jan 28 17:06:48 CET 2009 - lslezak(a)suse.cz - do not remove kernel-xenpae package at update, it can be -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55137 - /trunk/packager/src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:42:52 2009 New Revision: 55137 URL: http://svn.opensuse.org/viewcvs/yast?rev=55137&view=rev Log: Show "Really exit?" pop-up only if there is something to do Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Thu Jan 29 10:42:52 2009 @@ -28,8 +28,15 @@ map <string, map > search_results = $[]; map <string, map > all_selected = $[]; + boolean SomethingSelected() { + return ( all_selected != $[]); + } + boolean AbortDialog() { - return Popup::YesNo( _("All changes will be lost. Really exit?")); + if (SomethingSelected()) + return Popup::YesNo( _("All changes will be lost. Really exit?")); + else + return true; } boolean Abort() { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55136 - /trunk/packager/src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:37:51 2009 New Revision: 55136 URL: http://svn.opensuse.org/viewcvs/yast?rev=55136&view=rev Log: - Remember packages selected by user in all queries in this session - Show them in "All Packages" tab Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Thu Jan 29 10:37:51 2009 @@ -22,10 +22,11 @@ import "WebpinPackageSearch"; import "Wizard"; import "Directory"; + import "Map"; import "Report"; - list <map> search_results = []; - map <string, integer> index = $[]; + map <string, map > search_results = $[]; + map <string, map > all_selected = $[]; boolean AbortDialog() { return Popup::YesNo( _("All changes will be lost. Really exit?")); @@ -39,7 +40,7 @@ else return false; } - + string SearchExpression() { string ret = (string) UI::QueryWidget(`id("search_text"), `Value); @@ -60,9 +61,17 @@ return ret; } + string CurrentTable() { + string ctable = UI::WidgetExists(`id("results")) ? "results" : "all"; + + return ctable; + } + void CreatePackageDescription( ) { - string checksum = (string) UI::QueryWidget(`id("results"), `CurrentItem ); - map citem = search_results [ index[checksum]: 0 ]: $[]; + string ctable = CurrentTable(); + string checksum = (string) UI::QueryWidget(`id( ctable ), `CurrentItem ); + + map citem = (ctable == "results") ? search_results[checksum]:$[] : all_selected[checksum]:$[]; string ret = ""; if ( citem != $[] ) { @@ -72,17 +81,14 @@ string archs = sformat(_("Architecture: %1 "), mergestring( citem["archs"]:[],",")); ret = "" + descr + version + archs + ""; } - else - ret = _("No packages matching entered criteria were found"); UI::ChangeWidget(`id("description"),`Value, ret); } - list CreatePackageList( list < map > results ) { + list CreatePackageListItems( map<string, map> results ) { list pkg_items = []; - integer i = 0; - foreach ( map it, results, { + foreach ( string iD, map pkg_line, results, { // Webpin seems to return "ppc" arch even for some i386 packages (e.g., "joe") // doesn't match the architecture // if (! WebpinPackageSearch::MatchesCurrentArchitecture (it["archs"]:["noarch"])) { @@ -90,25 +96,85 @@ // return; // } - pkg_items = add( pkg_items, `item(`id(it["checksum"]:""),it["name"]:"" + " - " + it["summary"]:"" )); - index = add( index, it["checksum"]:"", i); - i = i+1; + pkg_items = add( pkg_items, `item(`id(iD),pkg_line["name"]:"" + " - " + pkg_line["summary"]:"" )); }); return pkg_items; - } + } - list <map> FilterOutSelectedPackages() { - list <string> p = ( list <string> ) UI::QueryWidget(`id("results"), `SelectedItems); - list < map > result = []; + void PopulatePackageList( map <string, map> results ) { + list items = CreatePackageListItems( results ); + string ctable = CurrentTable(); + + list <string> IDs = (list <string> ) toset(Map::Keys(results)); + list <string> wantedIDs = (list <string>) toset(Map::Keys(all_selected)); + y2milestone("Package IDs: %1, previously selected: %2", IDs, wantedIDs); + + if (results != nil) { + UI::ChangeWidget(`id(ctable), `Items, items); + + if(ctable == "all") + UI::ChangeWidget(`id(ctable), `SelectedItems, wantedIDs); + else + UI::ChangeWidget(`id(ctable), `SelectedItems, multiset::intersection(IDs, wantedIDs)); - foreach ( string s, p, { - result = add(result, search_results[ index[s]:0 ]:$[]); + UI::SetFocus(`id(ctable)); + } + else + UI::SetFocus(`id("search_text")); + + } + + list <map> SelectedPackages() { + list < map > result = []; + + foreach ( string s, map m, all_selected, { + result = add(result, m); }); - y2internal("%1", result); + y2milestone("Passing these data to WebPin %1", result); return result; } + void AddItemIfNotExists( string checksum, map data ) { + if (!haskey (all_selected, checksum)) + all_selected[checksum] = data; + } + + void RemoveItemIfExists( string checksum ) { + if ( haskey (all_selected, checksum) ) + all_selected = remove(all_selected, checksum); + } + + void UpdateSelectedPkgs(){ + + string ctable = CurrentTable(); + list <string> selected_items = toset((list <string>) UI::QueryWidget(`id(ctable), `SelectedItems)); + list <string> other_items = []; + + list <term> tt = (list <term>) UI::QueryWidget(`id(ctable), `Items); + foreach(term t, tt, { + string tmp = argsof(argsof(t)[0]:`none())[0]:""; + if( !contains(selected_items, tmp) ) + other_items = add (other_items, tmp); + }); + + other_items = toset(other_items); + + if (ctable == "results") + { + foreach(string it, selected_items, { + AddItemIfNotExists( it, search_results[it]:$[] ); + }); + } + foreach(string it, other_items, { + RemoveItemIfExists( it ); + }); + + + y2milestone("Selecting these packages: %1", all_selected ); + + } + symbol ReadDialog() { list <string> steps = [ _("Check Network Configuration"), @@ -142,7 +208,13 @@ } symbol MainDialog() { - Wizard::SetContents ( + + term current_search_box = `MultiSelectionBox(`id ("results"), `opt (`notify, `hstretch), + "", [] ); + term all_pkgs_box = `MultiSelectionBox(`id ("all"), `opt (`notify, `hstretch), + "", [] ); + + Wizard::SetContents ( // TRANSLATORS: dialog caption _("Package Search"), `VBox ( @@ -180,11 +252,12 @@ //), `VWeight ( 2, - `MultiSelectionBox( - `id ("results"), `opt (`notify, `hstretch), - // TRANSLATORS: multi-selection box - _("&Found Packages"), [] - ) + `DumbTab(`id("tab_bar"), + [ `item(`id("search_tab"), _("&Found Packages"), true), + `item(`id("all_tab"), _("&All Selected Packages")) + ], + `ReplacePoint(`id(`rp), current_search_box) + ) ), //`HBox( `Left( `Label( _("Package Description")) ), @@ -215,13 +288,18 @@ UI::SetFocus(`id("search_text")); + any dialog_ret = nil; while (true) { dialog_ret = UI::UserInput(); + + if ( dialog_ret != "results" && dialog_ret != "all") + UpdateSelectedPkgs(); + if (dialog_ret == `next){ string temporary_xml = Directory::tmpdir + "/one_click_install_temporary_file.xml"; - list <map> selected_packages = FilterOutSelectedPackages(); + list <map> selected_packages = SelectedPackages(); if (selected_packages == nil || size (selected_packages) == 0) { Report::Message (_("Select some packages to install.")); @@ -236,33 +314,44 @@ break; } else if (dialog_ret == "search") { + + UI::ChangeWidget(`id("tab_bar"), `CurrentItem, "search_tab"); + UI::ReplaceWidget(`id(`rp), current_search_box ); string search_expr = SearchExpression(); if (search_expr != "") { map <string, boolean> search_params = SearchParameters(); Popup::ShowFeedback("", _("Searching for packages...")); - search_results = + list <map> tmp_results = WebpinPackageSearch::SearchForPackages( search_expr, nil, search_params ); + search_results = listmap( map m, tmp_results, { + return $[ m["checksum"]:"" : m ]; + }); Popup::ClearFeedback(); - list items = CreatePackageList( search_results ); + PopulatePackageList( search_results ); - if (search_results != nil) { - UI::ChangeWidget(`id("results"), `Items, items); - UI::SetFocus(`id("results")); - } + if ( search_results == $[] ) + UI::ChangeWidget(`id("description"), `Value, _("No packages matching entered criteria were found")); else - UI::SetFocus(`id("search_text")); - - CreatePackageDescription(); + CreatePackageDescription(); } - //else - continue; + continue; + } + else if (dialog_ret == "search_tab") { + UI::ReplaceWidget(`id(`rp), current_search_box ); + PopulatePackageList( search_results ); + CreatePackageDescription(); + } + else if (dialog_ret == "all_tab") { + UI::ReplaceWidget(`id(`rp), all_pkgs_box ); + PopulatePackageList( all_selected ); + CreatePackageDescription(); } - else if (dialog_ret == "results") { + else if ( dialog_ret == "results" || dialog_ret == "all") { CreatePackageDescription(); } else if (dialog_ret == `abort || dialog_ret == `cancel) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0