January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r43929 - in /trunk/network: ./ agents/ data/ doc/ doc/autodocs/ doc/diagrams/ doc/images/ package/ src/ src/clients/ src/config/ src/dsl/ src/installation/ src/isdn/ src/lan/ src/modem/ src/modules...
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 21:01:47 2008 New Revision: 43929 URL: http://svn.opensuse.org/viewcvs/yast?rev=43929&view=rev Log: fixing changelog Removed: trunk/network/.cvsignore trunk/network/agents/.cvsignore trunk/network/data/.cvsignore trunk/network/doc/.cvsignore trunk/network/doc/autodocs/.cvsignore trunk/network/doc/diagrams/.cvsignore trunk/network/doc/images/.cvsignore trunk/network/package/.cvsignore trunk/network/src/.cvsignore trunk/network/src/clients/.cvsignore trunk/network/src/config/.cvsignore trunk/network/src/dsl/.cvsignore trunk/network/src/installation/.cvsignore trunk/network/src/isdn/.cvsignore trunk/network/src/lan/.cvsignore trunk/network/src/modem/.cvsignore trunk/network/src/modules/.cvsignore trunk/network/src/provider/.cvsignore trunk/network/src/remote/.cvsignore trunk/network/src/routines/.cvsignore trunk/network/src/services/.cvsignore trunk/network/testsuite/.cvsignore trunk/network/testsuite/tests/.cvsignore Modified: trunk/network/package/yast2-network.changes 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 Sun Jan 27 21:01:47 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jan 27 21:01:33 CET 2008 - coolo(a)suse.de + +- fix changelog + +------------------------------------------------------------------- Thu Jan 17 15:19:55 CET 2008 - mzugec(a)suse.cz - remove NetworkInterfaces::device_name occurence @@ -17,7 +22,7 @@ - 2.16.20 ------------------------------------------------------------------- -Thu Jan 10 12:35:15 CET 2007 - mzugec(a)suse.cz +Thu Jan 10 12:35:15 CET 2008 - mzugec(a)suse.cz - use NetworkInterfaces instead of NetworkDevices - 2.16.19 -- 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] r43928 - /trunk/packager/package/yast2-packager.changes
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 20:58:34 2008 New Revision: 43928 URL: http://svn.opensuse.org/viewcvs/yast?rev=43928&view=rev Log: adding the change too 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 Sun Jan 27 20:58:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jan 27 20:58:18 CET 2008 - coolo(a)suse.de + +- fixing changelog order + +------------------------------------------------------------------- Fri Jan 25 13:48:18 CET 2008 - lslezak(a)suse.cz - added support for adding repositories on a hard disk or on -- 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] r43927 - in /trunk/packager: .cvsignore agents/.cvsignore doc/.cvsignore package/.cvsignore package/yast2-packager.changes src/modules/.cvsignore testsuite/.cvsignore testsuite/spkg/.cvsignore
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 20:57:57 2008 New Revision: 43927 URL: http://svn.opensuse.org/viewcvs/yast?rev=43927&view=rev Log: fixing changelog order Removed: trunk/packager/.cvsignore trunk/packager/agents/.cvsignore trunk/packager/doc/.cvsignore trunk/packager/package/.cvsignore trunk/packager/src/modules/.cvsignore trunk/packager/testsuite/.cvsignore trunk/packager/testsuite/spkg/.cvsignore 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 Sun Jan 27 20:57:57 2008 @@ -3068,6 +3068,11 @@ - added xen-dirinstall client ------------------------------------------------------------------- +Wed Mar 2 17:52:44 CET 2005 - sh(a)suse.de + +- Renamed some icons in .desktop files (name clashes) + +------------------------------------------------------------------- Wed Mar 2 10:46:11 CET 2005 - jsrain(a)suse.cz - merged texts from proofread @@ -3089,11 +3094,6 @@ disabled progress bar, use Close button instead of OK (#66642) ------------------------------------------------------------------- -Wed Mar 2 17:52:44 CET 2005 - sh(a)suse.de - -- Renamed some icons in .desktop files (name clashes) - -------------------------------------------------------------------- Sat Feb 26 16:40:38 CET 2005 - nashif(a)suse.de - Added missing import @@ -3947,6 +3947,12 @@ - run inst_rpmcopy during update after reboot ------------------------------------------------------------------- +Tue Aug 26 15:53:09 CEST 2003 - kkaempf(a)suse.de + +- don't release the sources in sw_single any more, the package- + manager handles this. + +------------------------------------------------------------------- Tue Aug 26 14:44:16 CEST 2003 - msvec(a)suse.cz - add a proper error reporting (#29325) @@ -3954,12 +3960,6 @@ - 2.8.11 ------------------------------------------------------------------- -Tue Aug 26 15:53:09 CEST 2003 - kkaempf(a)suse.de - -- don't release the sources in sw_single any more, the package- - manager handles this. - -------------------------------------------------------------------- Fri Aug 22 14:41:10 CEST 2003 - lnussel(a)suse.de - add code for installing into a directory @@ -4603,7 +4603,7 @@ - 2.6.34 ------------------------------------------------------------------- -Mon Sep 9 14:34:00 CEST 2002 - kkaempf(a)suse.de +Mon Sep 9 14:04:00 CEST 2002 - kkaempf(a)suse.de - call solver after activating selections - allow installing list of packages from ascii file @@ -4694,18 +4694,18 @@ - 2.6.20 ------------------------------------------------------------------- -Thu Aug 29 09:49:05 CEST 2002 - kkaempf(a)suse.de - -- activate selections before entering package manager (#18501) -- show all selected selections in proposal (#18523) - -------------------------------------------------------------------- Thu Aug 29 16:14:29 CEST 2002 - kkaempf(a)suse.de - symlink /dev/cdrom for DVD too - 2.6.19 ------------------------------------------------------------------- +Thu Aug 29 09:49:05 CEST 2002 - kkaempf(a)suse.de + +- activate selections before entering package manager (#18501) +- show all selected selections in proposal (#18523) + +------------------------------------------------------------------- Thu Aug 29 00:40:03 CEST 2002 - kkaempf(a)suse.de - Add directory to Url if not given by linuxrc -- 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] r43926 - /trunk/theme/openSUSE/wizard/style.qss
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 16:17:51 2008 New Revision: 43926 URL: http://svn.opensuse.org/viewcvs/yast?rev=43926&view=rev Log: theme Thomas' widget Modified: trunk/theme/openSUSE/wizard/style.qss Modified: trunk/theme/openSUSE/wizard/style.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/style.qss?… ============================================================================== --- trunk/theme/openSUSE/wizard/style.qss (original) +++ trunk/theme/openSUSE/wizard/style.qss Sun Jan 27 16:17:51 2008 @@ -167,6 +167,10 @@ stop: 0 #315910, stop: 1 #9aad72); } +QPushButton:disabled { + color: gray; +} + QPushButton:hover { background-color: #315910; color: white; @@ -179,3 +183,10 @@ QPushButton:default { border-color: darkgreen; /* make the default button prominent */ } + +BusyBar { + qproperty-frameShape: NoShape; + border-width: 3px; + border: 2px solid gray; + border-radius: 4px; +} -- 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] r43925 - /trunk/qt/src/YQWizard.cc
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 16:17:11 2008 New Revision: 43925 URL: http://svn.opensuse.org/viewcvs/yast?rev=43925&view=rev Log: make sure we always have a current step Modified: trunk/qt/src/YQWizard.cc Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=43925&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Sun Jan 27 16:17:11 2008 @@ -261,6 +261,10 @@ } _stepsIDs.insert( qId, _stepsList.last() ); + + // make sure we always have a current step if we have steps + if ( _currentStepID.isNull() ) + _currentStepID = qId; } @@ -426,6 +430,7 @@ qDeleteAll(_stepsList); _stepsList.clear(); _stepsIDs.clear(); + _currentStepID = QString::null; } -- 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] r43924 - /tags/stable-2_16_7/theme/
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 16:07:46 2008 New Revision: 43924 URL: http://svn.opensuse.org/viewcvs/yast?rev=43924&view=rev Log: Created tag stable-2_16_7 for theme Added: tags/stable-2_16_7/theme/ - copied from r43923, trunk/theme/ -- 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] r43923 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn.opensuse.org 27 Jan '08

27 Jan '08

Author: coolo Date: Sun Jan 27 16:07:42 2008 New Revision: 43923 URL: http://svn.opensuse.org/viewcvs/yast?rev=43923&view=rev Log: package Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=43923&r1=43922… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Sun Jan 27 16:07:42 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Sun Jan 27 16:07:42 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Jan 27 16:07:15 CET 2008 - coolo(a)suse.de + +- made more widgets green after Jiri complained +- V 2.16.7 + +------------------------------------------------------------------- Wed Jan 23 12:54:04 CET 2008 - coolo(a)suse.de - update worldmap with a one generated from marble (author tackat) -- 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] r43922 - /trunk/theme/openSUSE/wizard/style.qss
by coolo＠svn.opensuse.org 26 Jan '08

26 Jan '08

Author: coolo Date: Sat Jan 26 21:45:09 2008 New Revision: 43922 URL: http://svn.opensuse.org/viewcvs/yast?rev=43922&view=rev Log: it's unfortunate that no-one listened to me, but: I'm not a designer Modified: trunk/theme/openSUSE/wizard/style.qss Modified: trunk/theme/openSUSE/wizard/style.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/style.qss?… ============================================================================== --- trunk/theme/openSUSE/wizard/style.qss (original) +++ trunk/theme/openSUSE/wizard/style.qss Sat Jan 26 21:45:09 2008 @@ -30,14 +30,6 @@ background-color: rgba(255, 255, 255, 100); } -QPushButton { - color: black; -} - -QPushButton:disabled { - color: gray; -} - QTextBrowser { color: black; } @@ -98,9 +90,92 @@ border-radius: 5px; } +/* YQMultiProgressMeter::chunk { background-color: green; margin: 0.5px; width: 8px; height: 8px; } + +*/ + +QTabWidget::tab-bar { + left: 5px; /* move to the right by 5px */ +} + +/* Style the tab using the tab sub-control. Note that + it reads QTabBar _not_ QTabWidget */ +QTabBar::tab { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #315910, stop: 1.0 #6a8d52); + border: 0px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + min-width: 8ex; + padding: 2px; + color: white; +} + +QTabBar::tab:selected { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #719950, stop: 1.0 #9aad72); + color: black; +} + +QTabBar::tab:hover { + color: black; +} + +QTabBar::tab:!selected { + margin-top: 2px; /* make non-selected tabs look smaller */ +} + +/* make use of negative margins for overlapping tabs */ +QTabBar::tab:selected { + /* expand/overlap to the left and right by 4px */ + margin-left: -4px; + margin-right: -4px; +} + +QTabBar::tab:first:selected { + margin-left: 0; /* the first selected tab has nothing to overlap with on the left */ +} + +QTabBar::tab:last:selected { + margin-right: 0; /* the last selected tab has nothing to overlap with on the right */ +} + +QTabBar::tab:only-one { + margin: 0; /* if there is only one tab, we don't want overlapping margins */ +} + +QPushButton { + border: 2px solid #4f8f41; + border-radius: 6px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #318930, stop: 1 #315910); + padding-left: 14px; + padding-right: 14px; + padding-top: 5px; + padding-bottom: 5px; + color: white; +} + +QPushButton:pressed { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #315910, stop: 1 #9aad72); +} + +QPushButton:hover { + background-color: #315910; + color: white; +} + +QPushButton:flat { + border: none; /* no border for a flat push button */ +} + +QPushButton:default { + border-color: darkgreen; /* make the default button prominent */ +} -- 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] r43921 - in /trunk/core: libyui/src/Makefile.am libyui/src/YCPErrorDialog.cc libyui/src/YCPErrorDialog.h libyui/src/YUI.h libyui/src/YUI_builtins.cc libyui/src/YWidgetID.h package/yast2-core.changes
by sh-sh-sh＠svn.opensuse.org 25 Jan '08

25 Jan '08

Author: sh-sh-sh Date: Fri Jan 25 19:59:01 2008 New Revision: 43921 URL: http://svn.opensuse.org/viewcvs/yast?rev=43921&view=rev Log: Improved UI syntax error handling: Open dialogs to inform the user Added: trunk/core/libyui/src/YCPErrorDialog.cc trunk/core/libyui/src/YCPErrorDialog.h Modified: trunk/core/libyui/src/Makefile.am trunk/core/libyui/src/YUI.h trunk/core/libyui/src/YUI_builtins.cc trunk/core/libyui/src/YWidgetID.h trunk/core/package/yast2-core.changes Modified: trunk/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/Makefile.am?rev=… ============================================================================== --- trunk/core/libyui/src/Makefile.am (original) +++ trunk/core/libyui/src/Makefile.am Fri Jan 25 19:59:01 2008 @@ -16,6 +16,7 @@ Y2CCUI.cc \ YApplication.cc \ YCPDialogParser.cc \ + YCPErrorDialog.cc \ YCPItemParser.cc \ YCPItemWriter.cc \ YCPMenuItemParser.cc \ @@ -108,6 +109,7 @@ YBothDim.h \ YColor.h \ YCPDialogParser.h \ + YCPErrorDialog.h \ YCPItem.h \ YCPItemParser.h \ YCPItemWriter.h \ Added: trunk/core/libyui/src/YCPErrorDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPErrorDialog.c… ============================================================================== --- trunk/core/libyui/src/YCPErrorDialog.cc (added) +++ trunk/core/libyui/src/YCPErrorDialog.cc Fri Jan 25 19:59:01 2008 @@ -0,0 +1,74 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPErrorDialog.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#include <ycp/YCPSymbol.h> + +#define YUILogComponent "ui" +#include "YUILog.h" + +#include "YCPErrorDialog.h" +#include "YUI.h" +#include "YUI_util.h" +#include "YApplication.h" + +#include "YWidgetFactory.h" +#include "YCPValueWidgetID.h" +#include "YDialog.h" +#include "YLabel.h" +#include "YPushButton.h" +#include "YLayoutBox.h" + +using std::string; + + +void YCPErrorDialog::exceptionDialog( const string & headingText, + const YUIException & exception ) throw() +{ + try + { + YWidgetFactory * fac = YUI::widgetFactory(); + YDialog * dialog = fac->createPopupDialog( YDialogWarnColor ); + YLayoutBox * vbox = fac->createVBox( dialog ); + fac->createHeading( vbox, headingText ); + fac->createLabel( vbox, exception.asString() ); + fac->createLabel( vbox, "Check the log file!" ); + YLayoutBox * buttonBox = fac->createHBox( vbox ); + fac->createHStretch( buttonBox ); + YPushButton * closeButton = fac->createPushButton( buttonBox, "&Close" ); + closeButton->setId( new YCPValueWidgetID( YCPSymbol( "cancel" ) ) ); + + dialog->setInitialSize(); + dialog->checkShortcuts(); + YUI::ui()->showDialog( dialog ); + + YCPValue input = YUI::ui()->waitForUserInput(); + yuiMilestone() << "Input: " << input << endl; + + YUI::ui()->closeDialog( YDialog::currentDialog() ); + YDialog::deleteTopmostDialog(); + } + catch ( YUIException & ex ) + { + YUI_CAUGHT( exception ); + } + catch ( ... ) + { + yuiWarning() << "Caught unknown exception" << endl; + } +} + Added: trunk/core/libyui/src/YCPErrorDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPErrorDialog.h… ============================================================================== --- trunk/core/libyui/src/YCPErrorDialog.h (added) +++ trunk/core/libyui/src/YCPErrorDialog.h Fri Jan 25 19:59:01 2008 @@ -0,0 +1,44 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPErrorDialog.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YCPErrorDialog_h +#define YCPErrorDialog_h + +#include <string> +#include "YUIException.h" + +using std::string; + + +class YCPErrorDialog +{ +public: + /** + * Post an error dialog with the specified heading text and the specified + * UI exception and wait for the user to confirm it. + **/ + static void exceptionDialog( const string & headingText, + const YUIException & exception ) throw(); + +private: + YCPErrorDialog() {} +}; + + +#endif // YCPErrorDialog_h + Modified: trunk/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI.h?rev=43921&… ============================================================================== --- trunk/core/libyui/src/YUI.h (original) +++ trunk/core/libyui/src/YUI.h Fri Jan 25 19:59:01 2008 @@ -21,21 +21,22 @@ #include <pthread.h> #include <deque> +#include <string> + +using std::deque; +using std::string; + #include <ycp/YCPString.h> #include <ycp/YCPVoid.h> #include <ycp/YCPTerm.h> #include <ycp/YCPInteger.h> #include <ycp/YCPMap.h> #include <ycp/YCPBoolean.h> -#include <ycp/YCPByteblock.h> #include "YTypes.h" #include "YWidgetOpt.h" -using std::deque; -using std::string; - class YApplication; class YWidget; class YWidgetFactory; @@ -102,7 +103,7 @@ * threads, this does nothing. **/ void shutdownThreads(); - + /** * Access the global UI. **/ @@ -174,6 +175,11 @@ public: /** + * The C++ counterpart to UI::UserInput(). + **/ + YCPValue waitForUserInput(); + + /** * Block (or unblock) events. If events are blocked, any event sent * should be ignored until events are unblocked again. * @@ -420,6 +426,8 @@ **/ virtual YEvent * pollInput() = 0; + +public: /** * Show and activate a previously created dialog. * This default implementation does nothing. @@ -434,7 +442,7 @@ **/ virtual void closeDialog( YDialog *dialog ); - + protected: @@ -626,7 +634,6 @@ bool wait, bool detailed ); - /** * Implements the WFM or SCR callback command. **/ @@ -655,7 +662,7 @@ /** * Enable or disable debug logging. * This will propagate the parameter to YUILog::enableDebugLogging(), - * but it might do more than just that. + * but it might do more than just that. **/ void enableDebugLogging( bool enable = true ); Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?… ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Fri Jan 25 19:59:01 2008 @@ -46,17 +46,18 @@ #include "YUI.h" #include "YUI_util.h" #include "YApplication.h" +#include "YWidget.h" #include "YEvent.h" #include "YUIException.h" #include "YUISymbols.h" #include "YDialog.h" -#include "YWidget.h" #include "YMacroRecorder.h" #include "YMacroPlayer.h" #include "YReplacePoint.h" #include "YShortcut.h" #include "YWizard.h" #include "YWidgetFactory.h" +#include "YCPErrorDialog.h" #include "YCPValueWidgetID.h" #include "YCPDialogParser.h" #include "YCPItemParser.h" @@ -430,6 +431,19 @@ } +YCPValue YUI::waitForUserInput() +{ +#if VERBOSE_EVENTS + yuiDebug() << "Waiting for user input..." << endl; +#endif + + return doUserInput( YUIBuiltin_UserInput, + 0, // timeout_millisec + true, // wait + false ); // detailed +} + + /** * @builtin PollInput * @short Poll Input @@ -532,98 +546,104 @@ yuiError() << builtin_name << "(): Invalid value " << timeout_millisec << " for timeout - assuming 0" << endl; - + timeout_millisec = 0; } + YEvent * event = 0; + YCPValue input = YCPVoid(); - YDialog * dialog = YDialog::currentDialog(); + try + { + YDialog * dialog = YDialog::currentDialog(); - // Check for leftover postponed shortcut check + // Check for leftover postponed shortcut check - if ( dialog->shortcutCheckPostponed() ) - { - yuiError() << "Missing CheckShortcuts() before " << builtin_name - << "() after PostponeShortcutCheck()!" - << endl; - - dialog->checkShortcuts( true ); - } + if ( dialog->shortcutCheckPostponed() ) + { + yuiError() << "Missing CheckShortcuts() before " << builtin_name + << "() after PostponeShortcutCheck()!" + << endl; + dialog->checkShortcuts( true ); + } - // Handle events - YEvent * event = 0; - YCPValue input = YCPVoid(); + // Handle events - if ( fakeUserInputQueue.empty() ) - { - if ( wait ) + if ( fakeUserInputQueue.empty() ) { - do + if ( wait ) { - // Get an event from the specific UI. Wait if there is none. + do + { + // Get an event from the specific UI. Wait if there is none. #if VERBOSE_EVENTS - yuiDebug() << "SpecificUI::userInput()" << endl; + yuiDebug() << "SpecificUI::userInput()" << endl; #endif - event = filterInvalidEvents( userInput( (unsigned long) timeout_millisec ) ); + event = filterInvalidEvents( userInput( (unsigned long) timeout_millisec ) ); - // If there was no event or if filterInvalidEvents() discarded - // an invalid event, go back and get the next one. - } while ( ! event ); - } - else - { - // Get an event from the specific UI. Don't wait if there is none. + // If there was no event or if filterInvalidEvents() discarded + // an invalid event, go back and get the next one. + } while ( ! event ); + } + else + { + // Get an event from the specific UI. Don't wait if there is none. #if VERBOSE_EVENTS - yuiDebug() << "SpecificUI::pollInput()" << endl; + yuiDebug() << "SpecificUI::pollInput()" << endl; #endif - event = filterInvalidEvents( pollInput() ); + event = filterInvalidEvents( pollInput() ); - // Nevermind if filterInvalidEvents() discarded an invalid event. - // PollInput() is called very often (in a loop) anyway, and most of - // the times it returns 'nil' anyway, so there is no need to care - // for just another 'nil' that is returned in this exotic case. - } + // Nevermind if filterInvalidEvents() discarded an invalid event. + // PollInput() is called very often (in a loop) anyway, and most of + // the times it returns 'nil' anyway, so there is no need to care + // for just another 'nil' that is returned in this exotic case. + } - if ( event ) - { + if ( event ) + { - if ( detailed ) - input = event->ycpEvent(); // The event map - else - input = event->userInput(); // Only one single ID (or 'nil') + if ( detailed ) + input = event->ycpEvent(); // The event map + else + input = event->userInput(); // Only one single ID (or 'nil') #if VERBOSE_EVENTS - yuiDebug() << "Got regular event from keyboard / mouse: " << input << endl; + yuiDebug() << "Got regular event from keyboard / mouse: " << input << endl; #endif + } } - } - else // fakeUserInputQueue contains elements -> use the first one - { - // Handle macro playing - - input = fakeUserInputQueue.front(); - yuiDebug() << "Using event from fakeUserInputQueue: "<< input << endl; - fakeUserInputQueue.pop_front(); - } + else // fakeUserInputQueue contains elements -> use the first one + { + // Handle macro playing + input = fakeUserInputQueue.front(); + yuiDebug() << "Using event from fakeUserInputQueue: "<< input << endl; + fakeUserInputQueue.pop_front(); + } - // Handle macro recording + // Handle macro recording - if ( macroRecorder ) - { - if ( ! input->isVoid() || wait ) // Don't record empty PollInput() calls + if ( macroRecorder ) { - macroRecorder->beginBlock(); - dialog->saveUserInput( macroRecorder ); - macroRecorder->recordUserInput( input ); - macroRecorder->endBlock(); + if ( ! input->isVoid() || wait ) // Don't record empty PollInput() calls + { + macroRecorder->beginBlock(); + dialog->saveUserInput( macroRecorder ); + macroRecorder->recordUserInput( input ); + macroRecorder->endBlock(); + } } } - + catch ( YUIException & exception ) + { + YUI_CAUGHT( exception ); + YCPErrorDialog::exceptionDialog( "Internal Error", exception ); + YUI_RETHROW( exception ); + } // Clean up. // @@ -784,6 +804,8 @@ ycperror( "UI::OpenDialog() failed" ); ok = false; + + YCPErrorDialog::exceptionDialog( "UI Syntax Error", exception ); } unblockEvents(); @@ -1058,6 +1080,7 @@ idValue->toString().c_str(), newContentTerm->toString().c_str() ); + YCPErrorDialog::exceptionDialog( "UI Syntax Error", exception ); } unblockEvents(); Modified: trunk/core/libyui/src/YWidgetID.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidgetID.h?rev=… ============================================================================== --- trunk/core/libyui/src/YWidgetID.h (original) +++ trunk/core/libyui/src/YWidgetID.h Fri Jan 25 19:59:01 2008 @@ -19,8 +19,8 @@ #ifndef YWidgetID_h #define YWidgetID_h -#include <string> #include <iosfwd> +#include <string> using std::string; Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Jan 25 19:59:01 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 25 19:56:35 CET 2008 - sh(a)suse.de + +- Improved UI syntax error handling: Open dialogs to inform the user + +------------------------------------------------------------------- Wed Jan 23 18:28:52 CET 2008 - sh(a)suse.de - V 2.16.23 -- 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] r43920 - /trunk/core/libyui/src/YCPDialogParser.cc
by sh-sh-sh＠svn.opensuse.org 25 Jan '08

25 Jan '08

Author: sh-sh-sh Date: Fri Jan 25 17:22:54 2008 New Revision: 43920 URL: http://svn.opensuse.org/viewcvs/yast?rev=43920&view=rev Log: Prevent segfaults because of YCP syntax errors: Throw exception instead that will be caught by UI::OpenDialog(). The corresponding UI::UserInput() will still barf, of course. Modified: trunk/core/libyui/src/YCPDialogParser.cc Modified: trunk/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPDialogParser.… ============================================================================== --- trunk/core/libyui/src/YCPDialogParser.cc (original) +++ trunk/core/libyui/src/YCPDialogParser.cc Fri Jan 25 17:22:54 2008 @@ -24,7 +24,10 @@ #include <ycp/YCPBoolean.h> #define y2log_component "ui" -#include <ycp/y2log.h> +#include <ycp/y2log.h> // ycperror() + +#define YUILogComponent "ui" +#include "YUILog.h" #include "YCPDialogParser.h" @@ -84,6 +87,24 @@ using std::string; +/** + * Complain in the log and throw syntax error exception. + * Written as a macro to preserve the original C++ code location. + **/ +#define THROW_BAD_ARGS(ARG_TERM) \ + do \ + { \ + string msg = "Invalid arguments for the "; \ + msg += (ARG_TERM)->name(); \ + msg += " widget"; \ + \ + ycperror( "%s: %s", msg.c_str(), \ + (ARG_TERM)->toString().c_str() ); \ + \ + _YUI_THROW( YUISyntaxErrorException( msg ), \ + YUI_EXCEPTION_CODE_LOCATION ); \ + } while ( 0 ) + YWidget * YCPDialogParser::parseWidgetTreeTerm( YWidget * p, @@ -199,8 +220,8 @@ } else if ( ! rawopt->value(o)->isTerm() ) { - y2warning( "Invalid widget option %s. Options must be symbols or terms", - rawopt->value(o)->toString().c_str() ); + ycperror( "Invalid widget option %s. Options must be symbols or terms.", + rawopt->value(o)->toString().c_str() ); } else ol->add( rawopt->value(o) ); } @@ -323,7 +344,7 @@ } else { - y2error( "Could not create %s", s.c_str() ); + yuiError() << "Could not create " << s << endl; ycperror( "Could not create %s from\n%s", s.c_str(), term->toString().c_str() ); } @@ -376,9 +397,7 @@ term->value( argnr ).isNull() || ! term->value( argnr )->isTerm() ) { - y2error( "Invalid arguments for the ReplacePoint widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -410,9 +429,7 @@ { if ( term->size() != argnr ) { - y2error( "Invalid arguments for the %s widget: %s", - term->name().c_str(),term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -484,9 +501,7 @@ if ( ! param_ok ) { - y2error( "Invalid arguments for the %s widget: %s", - term->name().c_str(),term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -562,11 +577,7 @@ } else { - y2error( "Bad arguments for alignment widget: %s", - term->toString().c_str() ); - y2error( "Expected `Alignment( child ) or " - "`Alignment(`BackgroundPixmap( \"dir/pixmap.png\" ), child )" ); - return 0; + THROW_BAD_ARGS( term ); } if ( YUI::ui()->reverseLayout() ) @@ -622,10 +633,7 @@ ! isNum ( term->value( argnr+1 ) ) || ! term->value( argnr+2 )->isTerm() ) { - - y2error( "Bad arguments for %s - expected `%s( minWidth, minHeight, child ), not %s", - YUIWidget_MinSize, YUIWidget_MinSize, term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } minWidth = toFloat( term->value( argnr ) ); @@ -638,10 +646,7 @@ ! isNum ( term->value( argnr ) ) || ! term->value( argnr+1 )->isTerm() ) { - - y2error( "Bad arguments for MinWidth|Height - expected ( minSize, child ), not %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } if ( hor ) minWidth = toFloat( term->value( argnr ) ); @@ -734,7 +739,7 @@ else paramOK = false; if ( ! paramOK ) - y2error( "Bad margin specification: %s", term->value(i)->toString().c_str() ); + ycperror( "Bad margin specification: %s", term->value(i)->toString().c_str() ); } if ( paramOK ) @@ -743,12 +748,7 @@ if ( ! paramOK ) { - y2error( "Bad MarginBox parameters: %s", - term->toString().c_str() ); - y2error( "Use either `MarginBox( horMargin, vertMargin, childTerm )" ); - y2error( "or `MarginBox( `leftMargin( 99 ), `rightMargin( 99 ), `topMargin( 99 ), `bottomMargin( 99 ), childTerm )" ); - - return 0; + THROW_BAD_ARGS( term ); } @@ -790,9 +790,7 @@ || ! term->value( argnr )->isString() || ! term->value( argnr+1 )->isTerm() ) { - y2error( "Invalid arguments for the Frame widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -839,9 +837,7 @@ term->value( argnr ).isNull() || ! term->value( argnr )->isTerm() ) { - y2error( "%s: The squash widgets take one widget as argument", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -894,9 +890,7 @@ || !term->value(argnr)->isInteger() || !term->value(argnr+1)->isTerm()) { - y2error( "Invalid arguments for the Weight widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -998,9 +992,7 @@ if ( term->size() - argnr != 1 || !term->value(argnr)->isString()) { - y2error( "Invalid arguments for the Label widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } @@ -1057,9 +1049,7 @@ if ( term->size() - argnr != 1 || !term->value(argnr)->isString()) { - y2error( "Invalid arguments for the Label RichText: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string text = term->value( argnr )->asString()->value(); @@ -1131,9 +1121,7 @@ || ! term->value( argnr+1 )->isInteger() || ! term->value( argnr+2 )->isInteger()) { - y2error( "Invalid arguments for the LogView widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -1194,9 +1182,7 @@ || ! term->value(argnr)->isString() || ! term->value(argnr+1)->isString() ) { - y2error( "Invalid arguments for the IconButton widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } iconName = term->value( argnr )->asString()->value(); @@ -1207,9 +1193,7 @@ if ( term->size() - argnr != 1 || !term->value(argnr)->isString() ) { - y2error( "Invalid arguments for the PushButton widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } label = term->value( argnr )->asString()->value(); @@ -1282,10 +1266,7 @@ || ! term->value( argnr )->isString() || ( numargs >= 2 && ! term->value( argnr+1 )->isList() ) ) { - y2error( "Invalid arguments for the MenuButton widget: " - "expected \"label\", [ `item(), `item(), ... ], not %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -1331,9 +1312,7 @@ || !term->value( argnr )->isString() || ( size == 2 && ! term->value(argnr+1)->isBoolean() ) ) { - y2error( "Invalid arguments for the CheckBox widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -1396,9 +1375,7 @@ || ! term->value( argnr+2 )->isTerm() ) { - y2error( "Invalid arguments for the CheckBoxFrame widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string label = term->value( argnr )->asString()->value(); @@ -1422,7 +1399,7 @@ if ( invertAutoEnable && ! autoEnable ) { - y2warning( "`opt(noAutoEnable) automatically disables `opt(`invertAutoEnable)" ); + yuiWarning() << ( "`opt(noAutoEnable) automatically disables `opt(`invertAutoEnable)" ); invertAutoEnable = false; } @@ -1467,9 +1444,7 @@ || ! term->value( argnr )->isString() || ( s == 2 && ! term->value( argnr+1 )->isBoolean() ) ) { - y2error( "Invalid arguments for the RadioButton widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -1518,9 +1493,7 @@ if ( term->size() != argnr+1 || !term->value(argnr)->isTerm()) { - y2error( "Invalid arguments for the RadioButtonGroup widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -1577,10 +1550,7 @@ || !term->value(argnr)->isString() || (term->size() == argnr+2 && !term->value(argnr+1)->isString())) { - y2error( "Invalid arguments for the %s widget: %s", - passwordMode ? "Password" : "InputField", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string label = term->value( argnr )->asString()->value(); @@ -1610,17 +1580,17 @@ if ( ! postedBugCompatibilityWarning ) { - y2warning( "\n" - "\nUsing `TextEntry() in bug compatibiltiy mode." - "\nThis is equivalent to `InputField(`opt(`hstretch), ...)." - "\nThis makes the field grab as much space horizontally as it can get," - "\ntypically making it stretch across the entire width of the dialog." - "\nWithout this hstretch, the field will take a reasonable default width." - "\n" - "\nIf this `hstretch is really desired, please use `InputField(`opt(`hstretch), ...)." - "\nIf it is not, please use `InputField() without `hstretch." - "\n\n" - ); + yuiWarning() << + "\n" + "\nUsing `TextEntry() in bug compatibiltiy mode." + "\nThis is equivalent to `InputField(`opt(`hstretch), ...)." + "\nThis makes the field grab as much space horizontally as it can get," + "\ntypically making it stretch across the entire width of the dialog." + "\nWithout this hstretch, the field will take a reasonable default width." + "\n" + "\nIf this `hstretch is really desired, please use `InputField(`opt(`hstretch), ...)." + "\nIf it is not, please use `InputField() without `hstretch." + "\n\n" << endl; postedBugCompatibilityWarning = true; } @@ -1661,9 +1631,7 @@ || !term->value(argnr)->isString() || (term->size() == argnr+2 && !term->value(argnr+1)->isString())) { - y2error( "Invalid arguments for the MultiLineEdit widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -1724,9 +1692,7 @@ || ! term->value( argnr )->isString() || ( numargs >= 2 && ! term->value( argnr+1 )->isList() ) ) { - y2error( "Invalid arguments for the SelectionBox widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string label = term->value( argnr )->asString()->value(); @@ -1796,10 +1762,7 @@ || ! term->value( argnr )->isString() || ( numargs >= 2 && ! term->value( argnr+1 )->isList() ) ) { - y2error( "Invalid arguments for the MultiSelectionBox widget: %s", - term->toString().c_str() ); - - return 0; + THROW_BAD_ARGS( term ); } string label = term->value( argnr )->asString()->value(); @@ -1871,9 +1834,7 @@ || !term->value(argnr)->isString() || ( numargs >= 2 && ! term->value( argnr+1 )->isList() ) ) { - y2error( "Invalid arguments for the ComboBox widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string label = term->value( argnr )->asString()->value(); @@ -1965,9 +1926,7 @@ || ! term->value( argnr )->isString() || ( numArgs >= 2 && ! term->value( argnr+1 )->isList() ) ) { - y2error( "Invalid arguments for the Tree widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2080,9 +2039,7 @@ || term->value(argnr)->asTerm()->name() != YUISymbol_header || (numArgs == 2 && !term->value(argnr+1)->isList())) { - y2error( "Invalid arguments for the Table widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } @@ -2147,7 +2104,7 @@ { string msg = string( "Unknown table header alignment: " ) + colHeaderTerm->name().c_str(); - y2error ( "%s", msg.c_str() ); + yuiError() << msg << endl; ycperror( "%s", msg.c_str() ); } @@ -2160,7 +2117,7 @@ string msg = string( "Expected string for table header, not " ) + colHeaderTerm->value(0)->toString(); - y2error ( "%s", msg.c_str() ); + yuiError() << msg << endl; ycperror( "%s", msg.c_str() ); } @@ -2169,7 +2126,7 @@ string msg = string( "Ignoring extra parameters of %s" ) + colHeaderTerm->toString(); - y2error ( "%s", msg.c_str() ); + yuiError() << msg << endl; ycperror( "%s", msg.c_str() ); } } @@ -2200,7 +2157,7 @@ * value will be 100. If you omit the optional parameter <tt>progress</tt>, the * progress bar will set to 0 initially. * - * If you don't know the number of total steps you might want to use the + * If you don't know the number of total steps you might want to use the * BusyIndicator widget instead of ProgressBar. * **/ @@ -2216,9 +2173,7 @@ || (s >= 2 && !term->value(argnr+1)->isInteger()) || (s >= 3 && !term->value(argnr+2)->isInteger())) { - y2error( "Invalid arguments for the ProgressBar widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2287,9 +2242,7 @@ if ( ! ok ) { - y2error( "Invalid arguments for the Image widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } string imageFileName = term->value( argnr )->asString()->value(); @@ -2362,9 +2315,7 @@ || ! term->value(argnr+3)->isInteger() ) { - y2error( "Invalid arguments for the IntField widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2420,9 +2371,7 @@ if ( numArgs > 1 || ( numArgs == 1 && ! term->value( argnr )->isString() ) ) { - y2error( "Invalid arguments for the PackageSelector widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } @@ -2473,9 +2422,7 @@ if ( numArgs != 1 || ! term->value( argnr )->isString() ) { - y2error( "Invalid arguments for the PkgSpecial widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2497,9 +2444,7 @@ { if ( term->size() - argnr > 0 ) { - y2error( "Invalid arguments for the DummySpecialWidget widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -2546,9 +2491,7 @@ || ( numArgs > 1 && ! term->value(argnr+1)->isList() ) ) { - y2error( "Invalid arguments for the BarGraph widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2640,9 +2583,7 @@ || ! term->value(argnr+2)->isInteger() ) { - y2error( "Invalid arguments for the DownloadProgress widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2731,9 +2672,7 @@ || ! term->value( argnr+1 )->isTerm() ) { - y2error( "Invalid arguments for the DumbTab widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } YCPList itemList = term->value( argnr )->asList(); @@ -2793,9 +2732,7 @@ if ( numArgs != 1 || ! term->value(argnr)->isList() ) { - y2error( "Invalid arguments for the MultiProgressMeter widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } vector<float> maxValues; @@ -2888,9 +2825,7 @@ || ! term->value(argnr+3)->isInteger() ) { - y2error( "Invalid arguments for the Slider widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -2964,9 +2899,7 @@ || ! term->value(argnr+9)->isString() // newPartFieldLabel ) { - y2error( "Invalid arguments for the PartitionSplitter widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -3020,9 +2953,7 @@ { if ( term->size() - argnr > 0 ) { - y2error( "Invalid arguments for the PatternSelector widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -3069,9 +3000,7 @@ { if ( term->size() - argnr > 0 ) { - y2error( "Invalid arguments for the SimplePatchSelector widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -3106,9 +3035,7 @@ || !term->value(argnr)->isString() || (term->size() == argnr+2 && !term->value(argnr+1)->isString())) { - y2error( "Invalid arguments for the DateField widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } @@ -3153,9 +3080,7 @@ || !term->value(argnr)->isString() || (term->size() == argnr+2 && !term->value(argnr+1)->isString())) { - y2error( "Invalid arguments for the TimeField widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -3217,9 +3142,7 @@ || ! isSymbolOrId( term->value( argnr+2 ) ) || ! term->value( argnr+3 )->isString() || ! isSymbolOrId( term->value( argnr+4 ) ) || ! term->value( argnr+5 )->isString() ) { - y2error( "Invalid arguments for the Wizard widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } @@ -3294,9 +3217,7 @@ || !term->value(argnr)->isString() || !term->value(argnr+1)->isMap() ) { - y2error( "Invalid arguments for the TimezoneSelector widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term, optList ); @@ -3327,13 +3248,13 @@ * a task is in progress and the user has to wait. It is similar to a progress bar. * The difference is that a busy indicator can be used when the total number of * steps is not known before the action starts. You have to send keep alive messages - * by setting alive to true every now and then, otherwise the busy indicator will + * by setting alive to true every now and then, otherwise the busy indicator will * change to stalled state. * * There are some limitations due to technical reasons in ncurses ui: * Only one BusyIndicator widget works at the same time. * The BusyIndicator widget cannot be used together with an UserInput widget. - * Please use the TimeoutUserInput widget in a loop instead. + * Please use the TimeoutUserInput widget in a loop instead. **/ YWidget * @@ -3346,9 +3267,7 @@ || (s >= 1 && !term->value(argnr)->isString()) || (s >= 2 && !term->value(argnr+1)->isInteger()) ) { - y2error( "Invalid arguments for the BusyIndicator widget: %s", - term->toString().c_str() ); - return 0; + THROW_BAD_ARGS( term ); } rejectAllOptions( term,optList ); @@ -3406,7 +3325,7 @@ { if ( complain ) { - y2error( "Expected `" YUISymbol_id "( any v ), you gave me %s", v->toString().c_str() ); + ycperror( "Expected `" YUISymbol_id "( any v ), not %s", v->toString().c_str() ); } return false; } @@ -3446,7 +3365,7 @@ YCPTerm idterm = term->value(0)->asTerm(); if ( idterm->size() != 1 ) { - y2error( "Widget id `" YUISymbol_id "() must have exactly one argument. You gave %s", + ycperror( "Widget id `" YUISymbol_id "() expects exactly one argument, not %s", idterm->toString().c_str() ); return YCPNull(); } @@ -3457,7 +3376,7 @@ false ) ) // Don't throw exception if not found { // Already have a widget with that ID? - y2error( "Widget id %s is not unique", id->toString().c_str() ); + ycperror( "Widget id %s is not unique", id->toString().c_str() ); return YCPNull(); } @@ -3490,8 +3409,8 @@ void YCPDialogParser::logUnknownOption( const YCPTerm & term, const YCPValue & option ) { - y2warning( "Unknown option %s in %s widget", - option->toString().c_str(), term->name().c_str() ); + ycperror( "Unknown option %s in %s widget", + option->toString().c_str(), term->name().c_str() ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0