November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r53737 - /trunk/pkg-bindings/src/Callbacks.cc
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 17:33:34 2008 New Revision: 53737 URL: http://svn.opensuse.org/viewcvs/yast?rev=53737&view=rev Log: - decrease callbacks logging Modified: trunk/pkg-bindings/src/Callbacks.cc Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Fri Nov 28 17:33:34 2008 @@ -457,8 +457,7 @@ virtual void start(const zypp::ProgressData &task) { CB callback( ycpcb( YCPCallbacks::CB_ProgressStart ) ); - // TODO: change it to y2debug later - y2milestone("ProgressStart: id:%d, %s", task.numericId(), task.name().c_str()); + y2debug("ProgressStart: id:%d, %s", task.numericId(), task.name().c_str()); if (callback._set) { @@ -477,8 +476,7 @@ virtual bool progress(const zypp::ProgressData &task) { CB callback( ycpcb( YCPCallbacks::CB_ProgressProgress ) ); - // TODO: change it to y2debug later - y2milestone("ProgressProgress: id:%d, %s: %lld%%", task.numericId(), task.name().c_str(), task.reportValue()); + y2debug("ProgressProgress: id:%d, %s: %lld%%", task.numericId(), task.name().c_str(), task.reportValue()); if (callback._set) { @@ -494,8 +492,7 @@ virtual void finish( const zypp::ProgressData &task ) { CB callback( ycpcb( YCPCallbacks::CB_ProgressDone ) ); - // TODO: change it to y2debug later - y2milestone("ProgressFinish: id:%d, %s", task.numericId(), task.name().c_str()); + y2debug("ProgressFinish: id:%d, %s", task.numericId(), task.name().c_str()); if (callback._set) { -- 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] r53736 - /tags/stable-2_17_3/inetd/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:23:48 2008 New Revision: 53736 URL: http://svn.opensuse.org/viewcvs/yast?rev=53736&view=rev Log: Created tag stable-2_17_3 for inetd Added: tags/stable-2_17_3/inetd/ - copied from r53735, trunk/inetd/ -- 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] r53735 - /trunk/inetd/VERSION
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:23:37 2008 New Revision: 53735 URL: http://svn.opensuse.org/viewcvs/yast?rev=53735&view=rev Log: version Modified: trunk/inetd/VERSION Modified: trunk/inetd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/VERSION?rev=53735&r1=53734… ============================================================================== --- trunk/inetd/VERSION (original) +++ trunk/inetd/VERSION Fri Nov 28 17:23:37 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 -- 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] r53734 - /tags/stable-2_17_53/yast2/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:21:57 2008 New Revision: 53734 URL: http://svn.opensuse.org/viewcvs/yast?rev=53734&view=rev Log: Created tag stable-2_17_53 for yast2 Added: tags/stable-2_17_53/yast2/ - copied from r53733, trunk/yast2/ -- 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] r53733 - /tags/stable-2_17_53/yast2/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:21:47 2008 New Revision: 53733 URL: http://svn.opensuse.org/viewcvs/yast?rev=53733&view=rev Log: Fixed Removed: tags/stable-2_17_53/yast2/ -- 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] r53732 - /trunk/yast2/package/yast2.changes
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:21:12 2008 New Revision: 53732 URL: http://svn.opensuse.org/viewcvs/yast?rev=53732&view=rev Log: correct bug number Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 28 17:21:12 2008 @@ -3,7 +3,7 @@ - Fixed the ag_netd agent to reset the STDOUT handler to :raw just for itself, otherwise UTF-8 chars read from disk are broken - (bnc #438481). + (bnc #447487). - 2.17.53 ------------------------------------------------------------------- -- 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] r53731 - /tags/stable-2_17_59/storage/
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 17:20:53 2008 New Revision: 53731 URL: http://svn.opensuse.org/viewcvs/yast?rev=53731&view=rev Log: Created tag stable-2_17_59 for storage Added: tags/stable-2_17_59/storage/ - copied from r53730, trunk/storage/ -- 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] r53730 - in /trunk/inetd: package/yast2-inetd.changes src/default_conf_xinetd.ycp src/dialogs.ycp
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:19:55 2008 New Revision: 53730 URL: http://svn.opensuse.org/viewcvs/yast?rev=53730&view=rev Log: - Updated to the latest state of packages (default services). - Disallowing invalid characters in service name to prevent from failures in writing the configuration (bnc #447487). - 2.17.3 Modified: trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/default_conf_xinetd.ycp trunk/inetd/src/dialogs.ycp Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Fri Nov 28 17:19:55 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 28 17:17:26 CET 2008 - locilka(a)suse.cz + +- Updated to the latest state of packages (default services). +- Disallowing invalid characters in service name to prevent from + failures in writing the configuration (bnc #447487). +- 2.17.3 + +------------------------------------------------------------------- Thu Oct 9 11:34:47 CEST 2008 - jsuchome(a)suse.cz - fixed failing testsuite (Service.ycp) Modified: trunk/inetd/src/default_conf_xinetd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/default_conf_xinetd.yc… ============================================================================== --- trunk/inetd/src/default_conf_xinetd.ycp (original) +++ trunk/inetd/src/default_conf_xinetd.ycp Fri Nov 28 17:19:55 2008 @@ -255,24 +255,6 @@ "wait" : true ], $[ - "comment" : " change \"disable = yes\" to \"disable = no\" and restart xinetd to\n use http-streaming from port 8080 with dvbd\n\n description: http streaming for dvbd\n", - "comment_inside" : "\tserver\t\t= /usr/bin/dvbcat-network\n", - "enabled" : false, - "group" : "", - "iid" : "1:./etc/xinetd.d/dvbcat", - "package" : "dvbd", - "protocol" : "tcp", - "rpc_version" : "", - "script" : "dvbcat", - "server" : "/usr/bin/dvbcat-network.pl", - "server_args" : "", - "service" : "dvbcat", - "socket_type" : "stream", - "unparsed" : "\tport\t\t= 8080\n\ttype\t\t= UNLISTED\n", - "user" : "dvbdaemon", - "wait" : false - ], - $[ "comment" : " default: off\n description: An echo server. This is the tcp version.\n", "comment_inside" : "", "enabled" : false, @@ -363,6 +345,24 @@ "wait" : false ], $[ + "comment" : " default: off\n description: The git server offers access to git repositories\n", + "comment_inside" : "", + "enabled" : true, + "group" : "nogroup", + "iid" : "1:./etc/xinetd.d/git", + "package" : "git-core", + "protocol" : "tcp", + "rpc_version" : "", + "script" : "git", + "server" : "/usr/bin/git", + "server_args" : "daemon --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path=\"/srv/git\"", + "service" : "git", + "socket_type" : "stream", + "unparsed" : " type = UNLISTED\n port = 9418\n log_on_failure += USERID\n", + "user" : "git-daemon", + "wait" : false + ], + $[ "comment" : " vbox (Voice Box)\n", "comment_inside" : "", "enabled" : false, @@ -543,24 +543,6 @@ "wait" : false ], $[ - "comment" : " default: off\n description: NRPE (Nagios Remote Plugin Executor)\n", - "comment_inside" : "\tonly_from = 127.0.0.1\n", - "enabled" : false, - "group" : "nogroup", - "iid" : "1:./etc/xinetd.d/nagios-nrpe", - "package" : "nagios-nrpe", - "protocol" : "", - "rpc_version" : "", - "script" : "nagios-nrpe", - "server" : "/usr/bin/nrpe", - "server_args" : "-c /etc/nagios/nrpe.cfg --inetd", - "service" : "nrpe", - "socket_type" : "stream", - "unparsed" : " \tflags = REUSE\n type = UNLISTED\n\tport\t\t= 5666 \n \tlog_on_failure += USERID\n", - "user" : "nobody", - "wait" : false - ], - $[ "comment" : " netstat (like the services finger and systat) give out user information which\n may be valuable to potential \"system crackers.\" Many sites choose to disable\n some or all of these services to improve security. Try \"telnet localhost\n systat\" and \"telnet localhost netstat\" to see that information yourself!\n\n", "comment_inside" : "", "enabled" : false, @@ -813,30 +795,12 @@ "wait" : false ], $[ - "comment" : " default: off\n This is the Obtuse smtpd/smtpfwdd SMTP store and forward proxy. It implements\n a minimal subset of the Simple Mail Transfer Protocol as specified in RFC 821. \n", - "comment_inside" : "", - "enabled" : false, - "group" : "root", - "iid" : "1:./etc/xinetd.d/smtpd", - "package" : "smtpd", - "protocol" : "tcp", - "rpc_version" : "", - "script" : "smtpd", - "server" : "/usr/sbin/smtpd", - "server_args" : "", - "service" : "smtpd", - "socket_type" : "stream", - "unparsed" : "", - "user" : "root", - "wait" : false - ], - $[ "comment" : "\n The Internet secure UUCP service.\n\n Find UUCP config examples at\n /usr/share/doc/packages/uucp/cfg_example/taylor_config/\n There are also the suucp-*.conf files required for a stunnel\n driven SUUCP client and server configuration.\n\n This xinetd configuration file covers the servers side with\n suucp-server.conf as argument for the stunnel exectuable.\n\n", "comment_inside" : "", "enabled" : false, "group" : "", "iid" : "1:./etc/xinetd.d/suucp", - "package" : "stunnel", + "package" : "", "protocol" : "tcp", "rpc_version" : "", "script" : "suucp", Modified: trunk/inetd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/dialogs.ycp?rev=53730&… ============================================================================== --- trunk/inetd/src/dialogs.ycp (original) +++ trunk/inetd/src/dialogs.ycp Fri Nov 28 17:19:55 2008 @@ -858,12 +858,14 @@ if (user_choice != `back) { + string service_name = (string) UI::QueryWidget(`id(`service), `Value); + // Are required values filled? // Inetd specific: // Service and Server must be filled // Xinetd specific: // Service must be filled. - if (UI::QueryWidget(`id(`service), `Value) == "") + if (service_name == "") { Popup::Message( /* Translators: Popup::Message */ @@ -871,6 +873,10 @@ Enter valid values. ")); input_failed = true; + } else if (service_name != nil && search (service_name, "/") != nil) { + /* Error message */ + Popup::Message (_("Service name contains disallowed character \"/\"")); + input_failed = true; } else if ((UI::QueryWidget(`id(`server), `Value) != "") && (UI::QueryWidget(`id(`user), `Value) == _("--default--"))) { -- 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] r53729 - in /trunk/storage: ./ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 17:17:17 2008 New Revision: 53729 URL: http://svn.opensuse.org/viewcvs/yast?rev=53729&view=rev Log: - show partitions/logical volumes tab in expert partitioner per default after start (bnc #450049) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dm.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-raid.ycp trunk/storage/storage/src/modules/TabPanel.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=53729&r1=537… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Nov 28 17:17:17 2008 @@ -1 +1 @@ -2.17.58 +2.17.59 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Nov 28 17:17:17 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 17:07:48 CET 2008 - aschnell(a)suse.de + +- show partitions/logical volumes tab in expert partitioner per + default after start (bnc #450049) +- 2.17.59 + +------------------------------------------------------------------- Fri Nov 28 14:59:36 CET 2008 - aschnell(a)suse.de - ignore volume label for hfs since there is no tool to set it Modified: trunk/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dm.ycp (original) +++ trunk/storage/storage/src/include/ep-dm.ycp Fri Nov 28 17:17:17 2008 @@ -148,7 +148,7 @@ ) ); - TabPanel::Init(data); + TabPanel::Init(data, `overview); } Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Fri Nov 28 17:17:17 2008 @@ -421,7 +421,7 @@ ) )); - TabPanel::Init(data); + TabPanel::Init(data, `partitions); } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Fri Nov 28 17:17:17 2008 @@ -239,7 +239,7 @@ )) ); - TabPanel::Init(data); + TabPanel::Init(data, `lvs); } Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Fri Nov 28 17:17:17 2008 @@ -176,7 +176,7 @@ ) ); - TabPanel::Init(data); + TabPanel::Init(data, `overview); } Modified: trunk/storage/storage/src/modules/TabPanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/TabP… ============================================================================== --- trunk/storage/storage/src/modules/TabPanel.ycp (original) +++ trunk/storage/storage/src/modules/TabPanel.ycp Fri Nov 28 17:17:17 2008 @@ -64,14 +64,20 @@ /** * When calling this function the DumbTab widget must already exist. + * + * The tab with symbol fallback will be selected if no other tab is found + * in the tab history. */ - global void Init(map<symbol, map> d) + global void Init(map<symbol, map> d, symbol fallback) { data = d; list<symbol> items = maplist(symbol s, map m, data, { return s; }); current_item = find(symbol s, history, { return contains(items, s); }); + if (current_item == nil && contains(items, fallback)) + current_item = fallback; + if (current_item != nil) UI::ChangeWidget(`tab, `CurrentItem, current_item); -- 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] r53728 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc src/YQPackageSelectorBase.cc src/YQPkgChangesDialog.cc src/YQPkgChangesDialog.h
by dmacvicar＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: dmacvicar Date: Fri Nov 28 17:16:24 2008 New Revision: 53728 URL: http://svn.opensuse.org/viewcvs/yast?rev=53728&view=rev Log: - refactor the mess of methods with 3 boolean parameters, by using QFlags. - fix the displaying of confirmations Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelectorBase.cc trunk/qt-pkg/src/YQPkgChangesDialog.cc trunk/qt-pkg/src/YQPkgChangesDialog.h Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=53728&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Nov 28 17:16:24 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "20") +SET(VERSION_PATCH "21") 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 Fri Nov 28 17:16:24 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Nov 28 17:10:23 CET 2008 - dmacvicar(a)suse.de + +- fix displaying of automatic changes confirmations and + unsupported packages confirmations. +- Needs fix in libzypp 5.24.2 so vendor unsupported packagages are + marked correctly. +- V 2.17.21 + +------------------------------------------------------------------- Tue Nov 25 19:03:35 CET 2008 - sh(a)suse.de - Fixed fix for bnc #447273 (versions missing) that broke fix for 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 Fri Nov 28 17:16:24 2008 @@ -1467,7 +1467,8 @@ QRegExp( ".*" + suffix + "$" ), _( "&OK" ), QString::null, // rejectButtonLabel - true ); // showIfEmpty + YQPkgChangesDialog::FilterAutomatic, + YQPkgChangesDialog::OptionNone ); // showIfEmpty } Modified: trunk/qt-pkg/src/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelectorBase… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelectorBase.cc (original) +++ trunk/qt-pkg/src/YQPackageSelectorBase.cc Fri Nov 28 17:16:24 2008 @@ -187,7 +187,8 @@ msg, _( "&OK" ), QString::null, // rejectButtonLabel - true ); // showIfEmpty + YQPkgChangesDialog::FilterAutomatic, + YQPkgChangesDialog::OptionNone ); // showIfEmpty } @@ -275,13 +276,14 @@ " have been changed to resolve dependencies:" ) + "<p>"; - if ( YQPkgChangesDialog::showChangesDialog( this, msg, _( "C&ontinue" ), _( "&Cancel" ) ) + if ( YQPkgChangesDialog::showChangesDialog( this, msg, _( "C&ontinue" ), _( "&Cancel" ), YQPkgChangesDialog::FilterAutomatic, YQPkgChangesDialog::OptionAutoAcceptIfEmpty ) == QDialog::Rejected ) return; } if ( confirmUnsupported() ) { + yuiMilestone() << "Confirm unsupported packages enabled." << endl; // Show which packages are unsupported QString msg = @@ -295,7 +297,7 @@ " requires an additional customer contract for support." ) + "<p>"; - if ( YQPkgUnsupportedPackagesDialog::showChangesDialog( this, msg, _( "C&ontinue" ), _( "&Cancel" ) ) + if ( YQPkgUnsupportedPackagesDialog::showChangesDialog( this, msg, _( "C&ontinue" ), _( "&Cancel" ), YQPkgChangesDialog::FilterUser, YQPkgChangesDialog::OptionAutoAcceptIfEmpty ) == QDialog::Rejected ) return; } Modified: trunk/qt-pkg/src/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.cc… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.cc (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.cc Fri Nov 28 17:16:24 2008 @@ -26,7 +26,6 @@ #include <QLabel> #include <QLayout> #include <QPushButton> -#include <QComboBox> #include <QStyle> #include <QBoxLayout> @@ -49,6 +48,7 @@ const QString & acceptButtonLabel, const QString & rejectButtonLabel ) : QDialog( parent ) + , _filter(0) { // Dialog title setWindowTitle( _( "Changed Packages" ) ); @@ -86,14 +86,18 @@ hbox->addWidget(label); label->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert + _filter = new QComboBox(this); - QComboBox *filter = new QComboBox(this); - filter->addItems( QStringList() << _("All") + // add the items. + _filter->addItems( QStringList() << _("All") << _("Selected by the user") << _("Automatic Changes") ); - layout->addWidget(filter); - connect( filter, SIGNAL(currentIndexChanged(int)), + _filter->setCurrentIndex(0); + + + layout->addWidget(_filter); + connect( _filter, SIGNAL(currentIndexChanged(int)), SLOT(slotFilterChanged(int))); // Pkg list @@ -113,9 +117,7 @@ hbox->addStretch(); - // Accept button - usually "OK" or "Continue" - QPushButton * button = new QPushButton( acceptButtonLabel, this ); Q_CHECK_PTR( button ); hbox->addWidget( button ); @@ -140,40 +142,94 @@ } } +YQPkgChangesDialog::Filters +YQPkgChangesDialog::indexToFilter( int i ) const +{ + switch (i) + { + case FilterIndexUser: + return FilterUser; + case FilterIndexAutomatic: + return FilterAutomatic; + case FilterIndexAll: + default: + return FilterAll; + } + return FilterAll; +} + +int +YQPkgChangesDialog::filterToIndex( Filters f ) const +{ + switch (f) + { + case FilterAll: + return FilterIndexAll; + case FilterUser: + return FilterIndexUser; + case FilterAutomatic: + return FilterIndexAutomatic; + default: + return FilterIndexAll; + } + + return FilterIndexAll; +} + + void -YQPkgChangesDialog::filter( bool byAuto, bool byApp, bool byUser ) +YQPkgChangesDialog::filter( Filters f ) { - filter( QRegExp( "" ), byAuto, byApp, byUser ); + filter( QRegExp( "" ), f ); } void YQPkgChangesDialog::slotFilterChanged( int index ) { - switch(index) - { - case All: - filter( true, true, true ); - break; - case User: - filter( false, true, true ); - break; - case Automatic: - filter( true, false, false ); - break; - default: - break; - }; + yuiMilestone() << "filter index changed to: " << index << endl; + Filters f = indexToFilter(index); + filter(f); +} + +void +YQPkgChangesDialog::setFilter( Filters f ) +{ + setFilter(QRegExp(""), f); +} + +void +YQPkgChangesDialog::setFilter( const QRegExp &regexp, Filters f ) +{ + int index = filterToIndex(f); + yuiMilestone() << "filter changed to: " << f << ", index: " << index << endl; + // so we dont get called again + _filter->blockSignals(true); + // try to set the widget + _filter->setCurrentIndex(f); + + _filter->blockSignals(false); + filter(regexp, f); } void -YQPkgChangesDialog::filter( const QRegExp & regexp, bool byAuto, bool byApp, bool byUser ) +YQPkgChangesDialog::filter( const QRegExp & regexp, Filters f ) { YQUI::ui()->busyCursor(); _pkgList->clear(); + bool byAuto = f.testFlag(FilterAutomatic); + bool byUser = f.testFlag(FilterUser); + bool byApp = f.testFlag(FilterUser); + + int discard_regex = 0; + int discard_ignored = 0; + int discard_extra = 0; + int discard_notmodified = 0; + int discard_whomodified = 0; + set<string> ignoredNames; if ( ! byUser || ! byApp ) @@ -187,7 +243,7 @@ if ( selectable->toModify() ) { - zypp::ResStatus::TransactByValue modifiedBy = selectable->modifiedBy(); + zypp::ResStatus::TransactByValue modifiedBy = selectable->modifiedBy(); if ( ( ( modifiedBy == zypp::ResStatus::SOLVER ) && byAuto ) || ( ( modifiedBy == zypp::ResStatus::APPL_LOW || @@ -202,13 +258,30 @@ ZyppPkg pkg = tryCastToZyppPkg( selectable->theObj() ); if ( extraFilter( selectable, pkg ) ) _pkgList->addPkgItem( selectable, pkg ); + else + discard_extra++; } - + else + { discard_ignored++; } } + else + { discard_regex++; } } + else + { discard_whomodified++; } + } + else + { discard_notmodified++; } + } + yuiMilestone() << "Filter result summary: " << endl; + yuiMilestone() << "Discarded by extra filter: " << discard_extra << endl; + yuiMilestone() << "Discarded by ignored: " << discard_ignored << endl; + yuiMilestone() << "Discarded by regex: " << discard_regex << endl; + yuiMilestone() << "Discarded because not modified: " << discard_notmodified << endl; + yuiMilestone() << "Discarded by who modified: " << discard_whomodified << endl; YQUI::ui()->normalCursor(); } @@ -237,16 +310,22 @@ const QString & message, const QString & acceptButtonLabel, const QString & rejectButtonLabel, - bool showIfListEmpty ) + Filters f, + Options o ) { YQPkgChangesDialog dialog( parent, message, acceptButtonLabel, rejectButtonLabel ); - dialog.filter(); - - if ( dialog.isEmpty() && ! showIfListEmpty ) + + dialog.setFilter(f); + + if ( dialog.isEmpty() && o.testFlag(OptionAutoAcceptIfEmpty) ) + { + yuiMilestone() << "No items to show in dialog, accepting it automatically" << endl; return true; + } + dialog.exec(); @@ -260,16 +339,20 @@ const QRegExp & regexp, const QString & acceptButtonLabel, const QString & rejectButtonLabel, - bool showIfListEmpty ) + Filters f, + Options o ) { YQPkgChangesDialog dialog( parent, message, acceptButtonLabel, rejectButtonLabel ); - dialog.filter( regexp, true, true, true ); - - if ( dialog.isEmpty() && ! showIfListEmpty ) + dialog.setFilter(regexp,f); + + if ( dialog.isEmpty() && o.testFlag(OptionAutoAcceptIfEmpty) ) + { + yuiMilestone() << "No items to show in dialog, accepting it automatically" << endl; return true; + } dialog.exec(); @@ -278,9 +361,11 @@ bool YQPkgUnsupportedPackagesDialog::extraFilter( ZyppSel sel, ZyppPkg pkg ) { + yuiMilestone() << "***: " << pkg << sel << endl; if (!pkg || !sel) return false; + yuiMilestone() << "PKG: " << pkg << endl; return pkg->maybeUnsupported(); } Modified: trunk/qt-pkg/src/YQPkgChangesDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.h?… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.h (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.h Fri Nov 28 17:16:24 2008 @@ -20,13 +20,13 @@ #ifndef YQPkgChangesDialog_h #define YQPkgChangesDialog_h -#include <qdialog.h> -#include <qregexp.h> - +#include <QDialog> +#include <QComboBox> +#include <QRegExp> +#include <QFlags> class YQPkgList; - /** * Changes dialog: Show a dialog with a list of packages that are changed. * By default, only packages with an "auto" status ( not set via selections ) @@ -37,16 +37,52 @@ Q_OBJECT public: + + /** + * filter combobox entries + */ + enum FilterIndex + { + FilterIndexAll = 0, + FilterIndexUser = 1, + FilterIndexAutomatic = 2 + }; + /** * Filters */ enum Filter { - All, - User, - Automatic + FilterNone = 0x0, + FilterUser = 0x1, + FilterAutomatic = 0x2, + FilterAll = 0x1 | 0x2 }; - + Q_DECLARE_FLAGS(Filters, Filter); + + /** + * Options + */ + enum Option + { + OptionNone = 0x0, + OptionAutoAcceptIfEmpty = 0x1 + }; + Q_DECLARE_FLAGS(Options, Option); + + /** + * Set the current filter + * This will change the combo box current selected + * filter and update the list + */ + void setFilter( Filters f ); + + /** + * Set the current filter + * This will change the combo box current selected + * filter and update the list + */ + void setFilter( const QRegExp &regexp, Filters f ); /** * Static convenience method: Post a changes dialog with text @@ -64,8 +100,8 @@ const QString & message, const QString & acceptButtonLabel, const QString & rejectButtonLabel = QString::null, - bool showIfListEmpty = false ); - + Filters f = FilterAutomatic, + Options o = OptionAutoAcceptIfEmpty ); /** * Static convenience method: Post a changes dialog with text 'message', a @@ -85,7 +121,8 @@ const QRegExp & regexp, const QString & acceptButtonLabel, const QString & rejectButtonLabel = QString::null, - bool showIfListEmpty = false ); + Filters f = FilterAutomatic, + Options o = OptionAutoAcceptIfEmpty ); /** * Returns the preferred size. @@ -103,6 +140,15 @@ protected: /** + * convert filter index into a filter combination + */ + Filters indexToFilter( int i ) const; + /** + * Filter to combobox index + */ + int filterToIndex( Filters f ) const; + + /** * Constructor: Creates a changes dialog with text 'message' on * top, a list packages with an "auto" status that is not set via selections * and one ( default ) or two buttons. @@ -124,9 +170,7 @@ * dependency solver ), by application ( i.e. via software selections ) or * manually by the user. **/ - void filter( bool byAuto = true, - bool byApp = false, - bool byUser = false ); + void filter( Filters f = FilterAutomatic ); /** * Apply the filter criteria: Fill the pkg list with pkgs that have a @@ -134,10 +178,7 @@ * dependency solver ), by application ( i.e. via software selections ) or * manually by the user and whose name matches 'regexp'. **/ - void filter( const QRegExp & regexp, - bool byAuto = true, - bool byApp = false, - bool byUser = false ); + void filter( const QRegExp & regexp, Filters f = FilterAutomatic ); /** * extra filter for child classes @@ -152,10 +193,14 @@ // Data members - + QComboBox *_filter; YQPkgList * _pkgList; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(YQPkgChangesDialog::Filters); +Q_DECLARE_METATYPE(YQPkgChangesDialog::Filters); + + class YQPkgUnsupportedPackagesDialog : public YQPkgChangesDialog { protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0