January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r43969 - /trunk/devtools/yast2-devtools.spec.in
by locilka＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: locilka Date: Tue Jan 29 14:25:06 2008 New Revision: 43969 URL: http://svn.opensuse.org/viewcvs/yast?rev=43969&view=rev Log: - Recommends: doxygen (needed by ydoxygen). Modified: trunk/devtools/yast2-devtools.spec.in Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?… ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Tue Jan 29 14:25:06 2008 @@ -7,6 +7,8 @@ Requires: libxslt # we install our .pc under $prefix/share Requires: pkgconfig >= 0.16 +# /usr/lib/YaST2/bin/ydoxygen needs it +Recommends: doxygen Provides: ycpdoc ydoc Obsoletes: ycpdoc ydoc Provides: yast2-config-newmodule yast2-trans-newmodule -- 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] r43968 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_software_selection.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: locilka Date: Tue Jan 29 14:21:19 2008 New Revision: 43968 URL: http://svn.opensuse.org/viewcvs/yast?rev=43968&view=rev Log: - Unified DefaultDesktop module and software/desktop selection dialog in installation. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_software_selection.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jan 29 14:21:19 2008 @@ -4,6 +4,8 @@ - New desktop selection dialog without system task combo-boxes. System selection with icons (bnc #356926). - More UI checking in dialogs. +- Unified DefaultDesktop module and software/desktop selection + dialog in installation. ------------------------------------------------------------------- Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_so… ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Tue Jan 29 14:21:19 2008 @@ -4,7 +4,7 @@ * Summary: Replacement for Desktop Selection and Simple Pattern Selector * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: $ + * $Id:$ * */ @@ -29,70 +29,28 @@ boolean text_mode = UI::GetDisplayInfo()["TextMode"]:false; -DefaultDesktop::Init(); -string default_desktop = DefaultDesktop::Desktop(); +if (DefaultDesktop::Desktop() == nil || DefaultDesktop::Desktop() == "") { + DefaultDesktop::Init(); +} // TRANSLATORS: help text 1/2 string help = _("This is a base selection where you can decide which common parts of the system will by installed.") + // TRANSLATORS: help text 2/2 -_("Select a Type of System that allows you to choose +_("Select a System Type that allows you to choose the base task of the system."); -/** - * @struct $[ - * "desktop ID" : $[ - * "order" : integer, - * "label" : _("Desktop Name Visible in Dialog"), - * "description" : _("Description text of the desktop"), - * "patterns" : ["list", "of", "related", "patterns"], - * "icon" : "some-icon.png", // from the 22x22 directory of the current theme - * ], - * ] - */ -// Could be defined in control file -map <string, map> all_desktops = $[ - "gnome" : $[ - "order" : 1, - "label" : _("GNOME Desktop"), - "patterns" : ["gnome", "x11", "base"], - "icon" : "pattern-gnome", - ], - "kde" : $[ - "order" : 1, - "label" : _("KDE Desktop"), - "patterns" : ["kde", "x11", "base"], - "icon" : "pattern-kde", - ], - "xfce" : $[ - "order" : 4, - "label" : _("XFCE Desktop"), - "patterns" : ["xfce", "x11", "base"], - "icon" : "yast-tv", - ], - "min_x" : $[ - "order" : 6, - "label" : _("Minimal X-Windows"), - "patterns" : ["x11", "base"], - "icon" : "yast-x11", - ], - "textmode" : $[ - "order" : 8, - "label" : _("Minimal Server Selection (Text Mode)"), - "patterns" : ["base"], - "icon" : "yast-sshd", - ], -]; - +map <string, map> all_desktops = DefaultDesktop::GetAllDesktopsMap(); void SelectSoftwareNow () { - y2milestone ("Selected desktop: %1", InstData::selected_desktop); + y2milestone ("Selected desktop: %1", DefaultDesktop::Desktop()); + DefaultDesktop::SetDesktop (DefaultDesktop::Desktop()); Packages::ForceFullRepropose(); Packages::Reset ([`product]); - foreach (string one_pattern, (list <string>) all_desktops[InstData::selected_desktop, "patterns"]:[], { + foreach (string one_pattern, (list <string>) all_desktops[DefaultDesktop::Desktop(), "patterns"]:[], { y2milestone ("Marking desktop pattern to be installed: %1", one_pattern); Pkg::ResolvableInstall (one_pattern, `pattern); }); @@ -160,7 +118,7 @@ `MinWidth (38, `VBox ( `VWeight (5, `VStretch()), // TRANSLATORS: Label (of a Radio button group) - `Left (`Label (`opt(`boldFont), _("Type of System"))), + `Left (`Label (`opt(`boldFont), _("Select a System Type"))), `RadioButtonGroup ( `id ("selected_desktop"), `opt (`hstretch), @@ -194,15 +152,12 @@ // Adjust default values if (! UI::WidgetExists (`id ("selected_desktop"))) { y2error (-1, "Widget selected_desktop does not exist"); -} else if (InstData::selected_desktop != nil && InstData::selected_desktop != "") { - y2milestone ("Already selected desktop: %1", InstData::selected_desktop); - UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (InstData::selected_desktop)); -} else if (default_desktop != nil && default_desktop != "") { - y2milestone ("Pre-selected desktop: %1", default_desktop); - UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (default_desktop)); +} else if (DefaultDesktop::Desktop() != nil && DefaultDesktop::Desktop() != "") { + y2milestone ("Already selected desktop: %1", DefaultDesktop::Desktop()); + UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (DefaultDesktop::Desktop())); } -RedrawSelDesktopInfo (InstData::selected_desktop); +RedrawSelDesktopInfo (DefaultDesktop::Desktop()); // UI wait loop any ret = nil; @@ -216,9 +171,9 @@ RedrawSelDesktopInfo (currently_selected); } else if (ret == `next) { string currently_selected = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); - InstData::selected_desktop = regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1"); + DefaultDesktop::SetDesktop (regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1")); - if (InstData::selected_desktop != nil && haskey (all_desktops, InstData::selected_desktop)) { + if (DefaultDesktop::Desktop() != nil && haskey (all_desktops, DefaultDesktop::Desktop())) { SelectSoftwareNow (); break; } Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Jan 29 14:21:19 2008 @@ -15,8 +15,8 @@ Requires: yast2-bootloader # Newly created RPM Requires: yast2-country-data >= 2.16.3 -# AddOnProduct::skip_add_ons -Requires: yast2-packager >= 2.15.75 +# New System-selection data and API DefaultDesktop module +Requires: yast2-packager >= 2.16.17 # Only in inst-sys # Requires: yast2-runlevel -- 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] r43967 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/DefaultDesktop.ycp src/modules/Packages.ycp
by locilka＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: locilka Date: Tue Jan 29 14:17:41 2008 New Revision: 43967 URL: http://svn.opensuse.org/viewcvs/yast?rev=43967&view=rev Log: - Unified DefaultDesktop module and software/desktop selection dialog in installation. - 2.16.17 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=43967&r1=43… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Jan 29 14:17:41 2008 @@ -1 +1 @@ -2.16.16 +2.16.17 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 Tue Jan 29 14:17:41 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 29 20:14:27 CET 2008 - locilka(a)suse.cz + +- Unified DefaultDesktop module and software/desktop selection + dialog in installation. +- 2.16.17 + +------------------------------------------------------------------- Sun Jan 27 20:58:18 CET 2008 - coolo(a)suse.de - fixing changelog order Modified: trunk/packager/src/modules/DefaultDesktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesk… ============================================================================== --- trunk/packager/src/modules/DefaultDesktop.ycp (original) +++ trunk/packager/src/modules/DefaultDesktop.ycp Tue Jan 29 14:17:41 2008 @@ -14,6 +14,66 @@ import "ProductFeatures"; + +// Could be defined in control file +// @see GetAllDesktopsMap +map <string, map> all_desktops = $[ + "gnome" : $[ + "order" : 1, + // TRANSLATORS: Dialog label + "label" : _("GNOME Desktop"), + "patterns" : ["gnome", "x11", "base"], + "icon" : "pattern-gnome", + ], + "kde" : $[ + "order" : 1, + // TRANSLATORS: Dialog label + "label" : _("KDE Desktop"), + "patterns" : ["kde", "x11", "base"], + "icon" : "pattern-kde", + ], + "xfce" : $[ + "order" : 4, + // TRANSLATORS: Dialog label + "label" : _("XFCE Desktop"), + "patterns" : ["xfce", "x11", "base"], + "icon" : "yast-tv", + ], + "min_x" : $[ + "order" : 6, + // TRANSLATORS: Dialog label + "label" : _("Minimal X-Windows"), + "patterns" : ["x11", "base"], + "icon" : "yast-x11", + ], + "textmode" : $[ + "order" : 8, + // TRANSLATORS: Dialog label + "label" : _("Minimal Server Selection (Text Mode)"), + "patterns" : ["base"], + "icon" : "yast-sshd", + ], +]; + +/** + * Returns map of pre-defined default system tasks + * + * @return map <string, map> all_system_tasks + * + * @struct $[ + * "desktop ID" : $[ + * "order" : integer, + * "label" : _("Desktop Name Visible in Dialog"), + * "description" : _("Description text of the desktop"), + * "patterns" : ["list", "of", "related", "patterns"], + * "icon" : "some-icon", // filename from the 32x32 directory of the current theme (without .png suffix) + * ], + * ] + */ +global map <string, map> GetAllDesktopsMap () { + return all_desktops; +} + /** * Desktop which was selected in the desktop selection dialog * "kde", "gnome", "min_x11", "text" @@ -31,37 +91,6 @@ ]; /** - * Patterns to be preselected according to selected desktop - */ -map<string,list<string> > patterns_to_select = $[ - "gnome" : [ "gnome", "x11", "base" ], - "kde" : [ "kde", "x11", "base" ], - "min_x11" : [ "x11", "base" ], - "text" : [ "base" ], -]; - -/** - * Patterns NOT to be preselected according to selected desktop - */ -map<string,list<string> > patterns_to_deselect = $[ - "gnome" : [ "kde" ], - "kde" : [ "gnome" ], - "min_x11" : [ "kde, gnome" ], - "text" : [ "kde, gnome", "x11" ], -]; - -/** - * Map of desktop descriptions - */ -map<string,string> desktop_descr = $[ - "kde" : _("KDE"), - "gnome" : _("GNOME"), - "min_x11" : _("Minimal Graphical System"), - "text" : _("Text Mode"), -]; - - -/** * Get the currently set default desktop, nil if none set * @return string "kde", "gnome", "min_x11", "text", nil */ @@ -74,7 +103,7 @@ * @param desktop a string, one of "kde", "gnome", "min_x11", "text" or nil */ global void SetDesktop (string new_desktop) { - if (new_desktop != nil && ! haskey (desktop2wm, new_desktop)) + if (new_desktop != nil && ! haskey (all_desktops, new_desktop)) y2error ("Attempting to set desktop to unknown %1", new_desktop); else desktop = new_desktop; @@ -93,7 +122,7 @@ * @return a list of patterns */ global list<string> PatternsToSelect () { - return patterns_to_select[desktop]:[]; + return all_desktops[desktop, "patterns"]:[]; } /** @@ -101,7 +130,25 @@ * @return a list of patterns */ global list<string> PatternsToDeselect () { - return patterns_to_deselect[desktop]:[]; + // patterns which must be selected + list <string> patterns_to_select = PatternsToSelect(); + + list <string> patterns_to_deselect = []; + + // go through all known system task definitions + foreach (string one_desktop, map desktop_descr, all_desktops, { + // all patterns required by a system type + foreach (string one_pattern, desktop_descr["patterns"]:[], { + // if not required, add it to 'to deselect' + if (one_pattern != nil && ! contains (patterns_to_select, one_pattern)) { + patterns_to_deselect = add (patterns_to_deselect, one_pattern); + } + }); + }); + + y2milestone ("Patterns to deselect '%1' -> %2", desktop, patterns_to_deselect); + + return patterns_to_deselect; } /** @@ -109,7 +156,8 @@ * @return string the description of the desktop */ global string Description () { - return desktop_descr[desktop]:""; + // TRANSLATORS: dialog label + return all_desktops[desktop, "label"]:_("No system type selected"); } /** Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Tue Jan 29 14:17:41 2008 @@ -270,8 +270,8 @@ // (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) output = (list<string>)merge (output, ListSelected (`product, _("Product: %1"))); if (contains (flags, `desktop)) - // installation proposal - SW summary, %1 is name of the selected desktop (e.g. KDE) - output = (list<string>)add (output, sformat(_("Desktop: %1"), DefaultDesktop::Description ())); + // installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) + output = (list<string>)add (output, sformat(_("System Type: %1"), DefaultDesktop::Description ())); if (contains (flags, `pattern)) output = (list<string>) merge (output, ListSelected (`pattern, "+ %1")); -- 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] r43966 - in /trunk/core/libyui/src: FSize.h TreeItem.h YCPDialogParser.h YRpmGroupsTree.h YShortcut.h YSimpleEventHandler.h YStringTree.h YUIComponent.h YWidgetOpt.h
by sh-sh-sh＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: sh-sh-sh Date: Tue Jan 29 13:48:23 2008 New Revision: 43966 URL: http://svn.opensuse.org/viewcvs/yast?rev=43966&view=rev Log: removed cruft Modified: trunk/core/libyui/src/FSize.h trunk/core/libyui/src/TreeItem.h trunk/core/libyui/src/YCPDialogParser.h trunk/core/libyui/src/YRpmGroupsTree.h trunk/core/libyui/src/YShortcut.h trunk/core/libyui/src/YSimpleEventHandler.h trunk/core/libyui/src/YStringTree.h trunk/core/libyui/src/YUIComponent.h trunk/core/libyui/src/YWidgetOpt.h Modified: trunk/core/libyui/src/FSize.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/FSize.h?rev=4396… ============================================================================== --- trunk/core/libyui/src/FSize.h (original) +++ trunk/core/libyui/src/FSize.h Tue Jan 29 13:48:23 2008 @@ -29,7 +29,7 @@ // CLASS NAME : FSize // /** - * @short Store and operate on (file/package/partition) sizes (long long). + * Store and operate on (file/package/partition) sizes (long long). **/ class FSize { Modified: trunk/core/libyui/src/TreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/TreeItem.h?rev=4… ============================================================================== --- trunk/core/libyui/src/TreeItem.h (original) +++ trunk/core/libyui/src/TreeItem.h Tue Jan 29 13:48:23 2008 @@ -25,7 +25,7 @@ /** - * @short Template class for tree items that can handle tree children in a + * Template class for tree items that can handle tree children in a * generic way - firstChild(), next() and parent(). Each item stores one value * of type 'PAYLOAD'. * @@ -177,7 +177,7 @@ /** - * @short Template class for tree items that maintain sort order. + * Template class for tree items that maintain sort order. * * Class 'PAYLOAD' to provide operator<() in addition to what template *'TreeItem' requires. Modified: trunk/core/libyui/src/YCPDialogParser.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPDialogParser.… ============================================================================== --- trunk/core/libyui/src/YCPDialogParser.h (original) +++ trunk/core/libyui/src/YCPDialogParser.h Tue Jan 29 13:48:23 2008 @@ -44,9 +44,8 @@ /** * Parse a widget tree term. * - * @param parent the widget or dialog this widget is contained in - * @param term YCPTerm describing the widget - * @param rbg Pointer to the current radio button group + * 'parent': the widget or dialog this widget is contained in + * 'term': YCPTerm describing the widget * * Return value: pointer to the new widget or 0 if it was not successful. * And error has been logged in this case @@ -76,7 +75,7 @@ * Return value: 'true' if 'val' is a symbol or a valid `id(). **/ static bool isSymbolOrId( const YCPValue & val ); - + /** * Checks if the given value is a term with the symbol 'id and * size one. Logs an error if this is not so and 'complain' is set. @@ -115,7 +114,7 @@ static YWidget * parseFrame( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); - + static YWidget * parseCheckBoxFrame( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); @@ -218,7 +217,7 @@ const YCPTerm & term, const YCPList & optList, int argnr ); static YTableHeader * parseTableHeader( const YCPTerm & headerTerm ); - + static YWidget * parseProgressBar( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); @@ -252,7 +251,7 @@ static YWidget * parseMultiProgressMeter( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr, YUIDimension dim ); - + static YWidget * parseSlider( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); @@ -285,30 +284,31 @@ * Increases argnr by 1 if options are found. * For example PushButton( `id( 17 ), `opt( `kilroy, `color( `red ) ) * has the option list [ `kilroy, `color( `red ) ] - * @param term the Widgetterm - * @param argnr in/out: The number of the first non-id argument. + * 'term': the Widget term + * 'argnr' (in/out): The number of the first non-id argument. * Returns the number of the first non-id and non-opt argument. + * * Return value: The option list, which may be empty, but never YCPNull **/ static YCPList getWidgetOptions( const YCPTerm & term, int *argnr ); /** * Logs a warning for an unknown widget option - * @param term the widget term, e.g. PushButton( `opt( `unknown ), ... ) - * @param option the unknown option itself + * 'term: the widget term, e.g. PushButton( `opt( `unknown ), ... ) + * 'option': the unknown option itself **/ static void logUnknownOption( const YCPTerm & term, const YCPValue & option ); /** * Logs warning messages for all widget options other than the * standard ones - for widgets that don't handle any options. - * @param term the widget term, e.g. PushButton( `opt( `unknown ), ... ) - * @param optList the list of options not yet processed + * 'term': the widget term, e.g. PushButton( `opt( `unknown ), ... ) + * 'optList': the list of options not yet processed **/ static void rejectAllOptions( const YCPTerm & term, const YCPList & optList ); private: - + /** * Constructor. * Modified: trunk/core/libyui/src/YRpmGroupsTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YRpmGroupsTree.h… ============================================================================== --- trunk/core/libyui/src/YRpmGroupsTree.h (original) +++ trunk/core/libyui/src/YRpmGroupsTree.h Tue Jan 29 13:48:23 2008 @@ -24,7 +24,7 @@ /** - * @short Efficient storage for RPM group tags + * Efficient storage for RPM group tags **/ class YRpmGroupsTree: public YStringTree { Modified: trunk/core/libyui/src/YShortcut.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YShortcut.h?rev=… ============================================================================== --- trunk/core/libyui/src/YShortcut.h (original) +++ trunk/core/libyui/src/YShortcut.h Tue Jan 29 13:48:23 2008 @@ -25,7 +25,7 @@ /** - * @short Helper class for shortcut management: + * Helper class for shortcut management: * This class holds data about the shortcut for one single widget. **/ class YShortcut Modified: trunk/core/libyui/src/YSimpleEventHandler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSimpleEventHand… ============================================================================== --- trunk/core/libyui/src/YSimpleEventHandler.h (original) +++ trunk/core/libyui/src/YSimpleEventHandler.h Tue Jan 29 13:48:23 2008 @@ -25,7 +25,8 @@ /** - * @short Simple event handler suitable for most UIs. + * Simple event handler suitable for most UIs. + * * This event handler keeps track of one single event that gets overwritten * when a new one arrives. **/ Modified: trunk/core/libyui/src/YStringTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YStringTree.h?re… ============================================================================== --- trunk/core/libyui/src/YStringTree.h (original) +++ trunk/core/libyui/src/YStringTree.h Tue Jan 29 13:48:23 2008 @@ -30,7 +30,7 @@ /** - * @short Abstract base class for filter views with hierarchical filter + * Abstract base class for filter views with hierarchical filter * criteria - e.g., RPM group tags, MIME types. **/ class YStringTree Modified: trunk/core/libyui/src/YUIComponent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUIComponent.h?r… ============================================================================== --- trunk/core/libyui/src/YUIComponent.h (original) +++ trunk/core/libyui/src/YUIComponent.h Tue Jan 29 13:48:23 2008 @@ -28,7 +28,7 @@ class Y2Namespace; /** - * @short abstract base class for YaST2 user interface components. + * abstract base class for YaST2 user interface components. * Derive your own component class from this one and implement createUI(). **/ class YUIComponent : public Y2Component Modified: trunk/core/libyui/src/YWidgetOpt.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidgetOpt.h?rev… ============================================================================== --- trunk/core/libyui/src/YWidgetOpt.h (original) +++ trunk/core/libyui/src/YWidgetOpt.h Tue Jan 29 13:48:23 2008 @@ -21,7 +21,7 @@ /** - * @short Helper template class for options that may have some value or may be undefined + * Helper template class for options that may have some value or may be undefined **/ template<class T> class YAnyOpt { @@ -74,7 +74,7 @@ /** - * @short boolean option - tri state: true, false, undefined + * boolean option - tri state: true, false, undefined **/ class YBoolOpt: public YAnyOpt<bool> { @@ -83,7 +83,7 @@ /** - * @short long option - long value or undefined + * long option - long value or undefined **/ class YLongOpt: public YAnyOpt<long> { @@ -92,7 +92,7 @@ /** - * @short collection of various widget options to be passed + * collection of various widget options to be passed * transparently through the various library layers. * * This is a struct and not an object since there is neither a -- 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] r43965 - in /trunk/qt/src: YQDialog.cc YQDialog.h
by sh-sh-sh＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: sh-sh-sh Date: Tue Jan 29 13:31:36 2008 New Revision: 43965 URL: http://svn.opensuse.org/viewcvs/yast?rev=43965&view=rev Log: warnColor that doesn't bite with the new installation theme Modified: trunk/qt/src/YQDialog.cc trunk/qt/src/YQDialog.h Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=43965&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Tue Jan 29 13:31:36 2008 @@ -41,7 +41,6 @@ #include <X11/Xlib.h> #define YQMainDialogWFlags Qt::Widget - #define YQPopupDialogWFlags Qt::Dialog @@ -53,17 +52,17 @@ { setWidgetRep( this ); - _userResized = false; - _focusButton = 0; - _defaultButton = 0; + _userResized = false; + _focusButton = 0; + _defaultButton = 0; setWindowTitle( "YaST2" ); setFocusPolicy( Qt::StrongFocus ); if ( colorMode != YDialogNormalColor ) { - QColor normalBackground ( 0, 128, 0 ); - QColor inputFieldBackground ( 0xbb, 0xff, 0xbb ); + QColor normalBackground ( 240, 100, 36 ); + QColor inputFieldBackground ( 0xbb, 0xff, 0xbb ); QColor text = Qt::white; if ( colorMode == YDialogInfoColor ) Modified: trunk/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.h?rev=43965&r1=4… ============================================================================== --- trunk/qt/src/YQDialog.h (original) +++ trunk/qt/src/YQDialog.h Tue Jan 29 13:31:36 2008 @@ -56,7 +56,7 @@ public: /** - * Makes this dialog active or inactive + * Makes this dialog active or inactive. **/ void activate( bool active ); @@ -145,7 +145,7 @@ void ensureOnlyOneDefaultButton(); /** - * Activate ( i.e. click ) this dialog's default button, if there is any. + * Activate (i.e. click) this dialog's default button, if there is any. * Issue a warning to the log file if 'warn' is true. **/ bool activateDefaultButton( bool warn = true ); -- 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] r43964 - in /trunk: qt/src/YQRichText.cc theme/openSUSE/wizard/style.qss
by coolo＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: coolo Date: Tue Jan 29 12:56:23 2008 New Revision: 43964 URL: http://svn.opensuse.org/viewcvs/yast?rev=43964&view=rev Log: use _some_ background for the textbrowser Modified: trunk/qt/src/YQRichText.cc trunk/theme/openSUSE/wizard/style.qss Modified: trunk/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=43964&r… ============================================================================== --- trunk/qt/src/YQRichText.cc (original) +++ trunk/qt/src/YQRichText.cc Tue Jan 29 12:56:23 2008 @@ -63,17 +63,6 @@ setValue( text ); - // Set the text foreground color to black, regardless of its current - // settings - it might be changed if this widget resides in a - // warnColor dialog - which we cannot find right now out since our - // parent is not set yet :-( - - QPalette pal( _textBrowser->palette() ); - pal.setColor( QPalette::Text, Qt::black ); - pal.setColor( QPalette::Base, QColor(0,0,0,0)); - _textBrowser->setPalette( pal ); - - // Propagate clicks on hyperlinks connect( _textBrowser, SIGNAL( anchorClicked( const QUrl & ) ), 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 Tue Jan 29 12:56:23 2008 @@ -30,6 +30,10 @@ background-color: rgba(255, 255, 255, 100); } +YQRichText > YQTextBrowser { + background-color: rgba(55, 255, 255, 100); +} + QTextBrowser { color: black; } -- 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] r43963 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp src/clients/inst_mode.ycp src/clients/inst_proposal.ycp src/clients/inst_software_selection.ycp
by locilka＠svn.opensuse.org 29 Jan '08

29 Jan '08

Author: locilka Date: Tue Jan 29 11:40:11 2008 New Revision: 43963 URL: http://svn.opensuse.org/viewcvs/yast?rev=43963&view=rev Log: - New desktop selection dialog without system task combo-boxes. System selection with icons (bnc #356926). - More UI checking in dialogs. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/clients/inst_proposal.ycp trunk/installation/src/clients/inst_software_selection.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jan 29 11:40:11 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 29 17:34:03 CET 2008 - locilka(a)suse.cz + +- New desktop selection dialog without system task combo-boxes. + System selection with icons (bnc #356926). +- More UI checking in dialogs. + +------------------------------------------------------------------- Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de - support Qt and Gtk frontend in startup scripts Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Tue Jan 29 11:40:11 2008 @@ -230,7 +230,7 @@ `Left (`Label (`opt(`boldFont), _("License Agreement"))), `Left (`Label (_("License agreement is missing here. It will be added soon."))), - `Left (`CheckBox (`id (`license_agreement), `opt (`notify), _("I Do Agree to the License Terms."), InstData::product_license_accepted)) + `Left (`CheckBox (`id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted)) ) ), `VWeight (3, `VStretch()) Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mo… ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Tue Jan 29 11:40:11 2008 @@ -276,8 +276,9 @@ } // Use Sources defined by product else if (ret == `productsources) { - if (UI::WidgetExists (`id (`productsources))) + if (UI::WidgetExists (`id (`productsources))) { Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value); + } ret = nil; continue; } @@ -372,7 +373,9 @@ ProductControl::DisabledModules = add (ProductControl::DisabledModules, "inst_add-on"); } - Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value); + if (UI::WidgetExists (`id (`productsources))) { + Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value); + } ProductControl::DisabledModules = filter (string m, ProductControl::DisabledModules, { return m != "productsources" && m != "inst_productsources"; }); Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Tue Jan 29 11:40:11 2008 @@ -76,7 +76,11 @@ **/ define void display_proposal( string proposal ) ``{ - UI::ChangeWidget(`id(`proposal), `Value, proposal ); + if (UI::WidgetExists (`id(`proposal))) { + UI::ChangeWidget(`id(`proposal), `Value, proposal ); + } else { + y2error (-1, "Widget `proposal does not exist"); + } }; Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_so… ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Tue Jan 29 11:40:11 2008 @@ -21,6 +21,7 @@ import "Popup"; import "Stage"; import "Directory"; +import "Icon"; // do not offer the dialog if base selection is fixed if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed) @@ -29,19 +30,15 @@ boolean text_mode = UI::GetDisplayInfo()["TextMode"]:false; DefaultDesktop::Init(); -string default_desktop = DefaultDesktop::Desktop (); +string default_desktop = DefaultDesktop::Desktop(); -// TRANSLATORS: help text 1/3 +// TRANSLATORS: help text 1/2 string help = _("This is a base selection where you can decide which common parts of the system will by installed.") + -// TRANSLATORS: help text 2/3 -_("First, select a Type of System that allows you to choose -the base task of the system.") + - -// TRANSLATORS: help text 3/3 -_("Then, choose secondary system tasks - what do you want to do with -this system."); +// TRANSLATORS: help text 2/2 +_("Select a Type of System that allows you to choose +the base task of the system."); /** * @struct $[ @@ -60,89 +57,34 @@ "order" : 1, "label" : _("GNOME Desktop"), "patterns" : ["gnome", "x11", "base"], - "icon" : "pattern-gnome.png", + "icon" : "pattern-gnome", ], "kde" : $[ "order" : 1, "label" : _("KDE Desktop"), "patterns" : ["kde", "x11", "base"], - "icon" : "pattern-kde.png", + "icon" : "pattern-kde", ], "xfce" : $[ "order" : 4, "label" : _("XFCE Desktop"), "patterns" : ["xfce", "x11", "base"], - "icon" : "yast-tv.png", + "icon" : "yast-tv", ], "min_x" : $[ "order" : 6, - "label" : _("Minimal X"), + "label" : _("Minimal X-Windows"), "patterns" : ["x11", "base"], - "icon" : "yast-x11.png", + "icon" : "yast-x11", ], "textmode" : $[ "order" : 8, - "label" : _("Text Mode"), + "label" : _("Minimal Server Selection (Text Mode)"), "patterns" : ["base"], - "icon" : "yast-sshd.png", + "icon" : "yast-sshd", ], - "base" : $[ - "order" : 9, - "label" : _("Base (Minimal) Selection"), - "patterns" : ["base"], - "icon" : "yast.png", - ] ]; -// Could be defined in control file -map <string, map> system_tasks = $[ - "office" : $[ - "order" : 5, - "label" : _("Open and modify documents from my mother"), - "patterns" : ["office"], - "icon" : "yast-messages.png", - "default" : true, - ], - "multimedia" : $[ - "order" : 6, - "label" : _("Use multimedia"), - "patterns" : ["multimedia"], - "icon" : "yast-sound.png", - "default" : true, - ], - "imaging" : $[ - "order" : 7, - "label" : _("Do some graphics"), - "patterns" : ["imaging"], - "icon" : "yast-autofs.png", - "default" : false, - ], - "games" : $[ - "order" : 8, - "label" : _("Play games"), - "patterns" : ["games"], - "icon" : "yast-joystick.png", - "default" : false, - ], - "network_admin" : $[ - "order" : 10, - "label" : _("Administer and debug network"), - "patterns" : ["network_admin"], - "icon" : "yast-network.png", - "default" : false, - ], -]; - -foreach (string task_name, map one_task, system_tasks, { - // if not yet defined, assign a boolean value for particular - if (! haskey (InstData::current_systasks_status, task_name)) { - InstData::current_systasks_status[task_name] = one_task["default"]:false; - } -}); - -string SystemTaskID (string task_name) { - return sformat ("systemtask:%1", task_name); -} void SelectSoftwareNow () { y2milestone ("Selected desktop: %1", InstData::selected_desktop); @@ -154,85 +96,56 @@ y2milestone ("Marking desktop pattern to be installed: %1", one_pattern); Pkg::ResolvableInstall (one_pattern, `pattern); }); +} - // go through all known system tasks - foreach (string one_task_name, map one_system_task, system_tasks, { - // when a task is selected - if ((boolean) UI::QueryWidget (`id (SystemTaskID (one_task_name)), `Value) == true) { - // pre-select all patterns listed in it - foreach (string one_pattern, (list <string>) system_tasks[one_task_name, "patterns"]:[], { - y2milestone ("Marking system-task pattern to be installed: %1", one_pattern); - Pkg::ResolvableInstall (one_pattern, `pattern); - }); - - // and store its state for the next run - InstData::current_systasks_status[one_task_name] = true; - } else { - InstData::current_systasks_status[one_task_name] = false; - } - }); +string GetDesktopRadioButtonId (string desktop_name) { + if (desktop_name == nil || desktop_name == "") { + y2warning ("Wrong desktop name: %1", desktop_name); + return ""; + } + + return sformat ("selected_desktop_%1", desktop_name); } -list <term> GetListOfDesktops () { +term GetDesktops () { list <string> sort_order = maplist (string desktop_name, map one_desktop, all_desktops, { return desktop_name; }); sort_order = sort (string x, string y, sort_order, ``(all_desktops[x,"order"]:99 < all_desktops[y,"order"]:99)); - list <term> ret = [ - `item ( - `id ("-none-"), - // TRANSLATORS: Combo box item - _("Choose one...") - ) - ]; + term ret = `VBox (); - integer counter = 0; + integer counter = -1; foreach (string desktop_name, sort_order, { counter = counter + 1; - ret[counter] = `item ( - `id (desktop_name), - `icon (all_desktops[desktop_name,"icon"]:"yast.png"), - all_desktops[desktop_name,"label"]:"" - ); - }); - - return ret; -} - -term GetListOfTasks () { - term ret = `VBox(); - - list <string> sort_order = maplist (string task_name, map one_task, system_tasks, { - return task_name; - }); - - sort_order = sort (string x, string y, sort_order, ``(system_tasks[x,"order"]:99 < system_tasks[y,"order"]:99)); + // boolean text_mode - integer counter = -1; - - foreach (string task_name, sort_order, { - counter = counter + 1; - - ret[counter] = `HBox ( - (text_mode ? `Empty():`Image (Directory::themedir + "/current/icons/22x22/apps/" + system_tasks[task_name,"icon"]:"yast.png", "")), - (text_mode ? `Empty():`HSpacing (1)), - `Left (`CheckBox ( - `id (SystemTaskID (task_name)), - system_tasks[task_name,"label"]:"", - // default values, need to be read on exit - InstData::current_systasks_status[task_name]:false - )) - ); + ret[counter] = + `Left (`HBox ( + `Image (Icon::IconPath(all_desktops[desktop_name,"icon"]:"yast"), ""), + `HSpacing (2), + `RadioButton ( + `id (GetDesktopRadioButtonId (desktop_name)), + `opt (`notify), + all_desktops[desktop_name,"label"]:"" + ) + )); }); return ret; } void RedrawSelDesktopInfo (string currently_selected) { + if (currently_selected == nil || currently_selected == "") { + y2milestone ("No desktop is currently selected"); + return; + } else { + y2milestone ("Selected desktop: %1", currently_selected); + } + list <string> desktop_patterns = all_desktops[currently_selected,"patterns"]:[]; list <map <string, any> > res_properties = Pkg::ResolvableProperties (currently_selected, `pattern, ""); @@ -244,15 +157,17 @@ term contents = `HBox ( `HStretch(), `HSquash ( - `MinWidth (33, `VBox ( + `MinWidth (38, `VBox ( `VWeight (5, `VStretch()), - `ComboBox ( + // TRANSLATORS: Label (of a Radio button group) + `Left (`Label (`opt(`boldFont), _("Type of System"))), + `RadioButtonGroup ( `id ("selected_desktop"), - `opt (`notify, `hstretch), + `opt (`hstretch), // TRANSLATORS: Combo box - _("&Type of System"), - GetListOfDesktops() + GetDesktops() ), + `VSpacing (1), `VSquash (`Frame ( _("Description"), `MinHeight (5, `RichText ( @@ -260,9 +175,6 @@ "" )) )), - `VWeight (2, `VStretch()), - `Left (`Label (_("I would like to use this system to..."))), - GetListOfTasks(), `VWeight (5, `VStretch()) )) ), @@ -270,7 +182,7 @@ ); // TRANSLATORS: dialog caption -string caption = _("System Type and Software Selection"); +string caption = _("System Type"); // Set UI Wizard::SetContents (caption, contents, help, @@ -280,12 +192,14 @@ Wizard::SetTitleIcon ("yast-desktop-select"); // Adjust default values -if (InstData::selected_desktop != nil && InstData::selected_desktop != "") { +if (! UI::WidgetExists (`id ("selected_desktop"))) { + y2error (-1, "Widget selected_desktop does not exist"); +} else if (InstData::selected_desktop != nil && InstData::selected_desktop != "") { y2milestone ("Already selected desktop: %1", InstData::selected_desktop); - UI::ChangeWidget (`id ("selected_desktop"), `Value, InstData::selected_desktop); + UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (InstData::selected_desktop)); } else if (default_desktop != nil && default_desktop != "") { y2milestone ("Pre-selected desktop: %1", default_desktop); - UI::ChangeWidget (`id ("selected_desktop"), `Value, default_desktop); + UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (default_desktop)); } RedrawSelDesktopInfo (InstData::selected_desktop); @@ -295,13 +209,14 @@ while (true) { ret = UI::UserInput(); - if (ret == "selected_desktop") { - string currently_selected = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); + if (is (ret, string) && regexpmatch (tostring (ret), "^selected_desktop_.*")) { + string currently_selected = regexpsub (tostring (ret), "^selected_desktop_(.*)", "\\1"); if (currently_selected != nil && currently_selected != "") RedrawSelDesktopInfo (currently_selected); } else if (ret == `next) { - InstData::selected_desktop = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); + string currently_selected = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); + InstData::selected_desktop = regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1"); if (InstData::selected_desktop != nil && haskey (all_desktops, InstData::selected_desktop)) { SelectSoftwareNow (); -- 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] r43962 - in /trunk/yast2/library: control/src/ProductControl.ycp wizard/src/Wizard.ycp
by locilka＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: locilka Date: Mon Jan 28 19:09:16 2008 New Revision: 43962 URL: http://svn.opensuse.org/viewcvs/yast?rev=43962&view=rev Log: - Removing useless Wizard() calls in ProductControl to minimize the Wizard redrawing. (Continuing on that ...) Modified: trunk/yast2/library/control/src/ProductControl.ycp trunk/yast2/library/wizard/src/Wizard.ycp Modified: trunk/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Produc… ============================================================================== --- trunk/yast2/library/control/src/ProductControl.ycp (original) +++ trunk/yast2/library/control/src/ProductControl.ycp Mon Jan 28 19:09:16 2008 @@ -535,25 +535,30 @@ }); }); - UI::WizardCommand(`SetCurrentStep( first_id ) ); + UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) ); } - - +/* Forces UpdateWizardSteps to redraw steps even if nothing seem to be changed */ +boolean force_UpdateWizardSteps = false; /** * Update Steps */ global define void UpdateWizardSteps(list<map> stagemode) { + if (force_UpdateWizardSteps == true) { + y2milestone ("UpdateWizardSteps forced"); + force_UpdateWizardSteps = false; + } else if (last_stage_mode == stagemode) { + y2milestone ("No changes in Wizard steps"); + return; + } + last_stage_mode = stagemode; UI::WizardCommand(`DeleteSteps()); + // Also redraws the wizard and sets the current step AddWizardSteps( stagemode ); - // AddWizardSteps sets the current step itself (which also updates the Wizard) - // UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) ); - // UI::WizardCommand(`UpdateSteps()); - return; } @@ -565,6 +570,7 @@ if ( size( last_stage_mode ) > 0 ) { y2debug( "Retranslating wizard steps" ); + force_UpdateWizardSteps = true; UpdateWizardSteps( last_stage_mode ); } } Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.… ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Mon Jan 28 19:09:16 2008 @@ -999,10 +999,13 @@ { if ( UI::WizardCommand(`EnableNextButton( false ) ) == false ) { - if ( UI::WidgetExists(`id(`next ) ) ) - UI::ChangeWidget(`id(`next), `Enabled, false ); - else - UI::ChangeWidget(`id(`accept), `Enabled, false ); + if (UI::WidgetExists (`id (`next))) { + UI::ChangeWidget(`id (`next), `Enabled, false); + } else if (UI::WidgetExists (`id (`accept))) { + UI::ChangeWidget(`id (`accept), `Enabled, false); + } else { + y2error (-1, "Neither `next nor `accept widgets exist"); + } } } -- 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] r43961 - /trunk/ncurses/src/NCPackageSelectorPlugin.cc
by kmachalkova＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: kmachalkova Date: Mon Jan 28 19:03:04 2008 New Revision: 43961 URL: http://svn.opensuse.org/viewcvs/yast?rev=43961&view=rev Log: Delete leftover dialogs (popups, menus) after leaving package selector (#354712 - maybe) Modified: trunk/ncurses/src/NCPackageSelectorPlugin.cc Modified: trunk/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ trunk/ncurses/src/NCPackageSelectorPlugin.cc Mon Jan 28 19:03:04 2008 @@ -153,13 +153,13 @@ // start event loop NCursesEvent event = NCursesEvent::cancel; + NCDialog * ncd = static_cast<NCDialog *>( dialog ); if ( ncSelector ) { try { ncSelector->showDefaultList(); - NCDialog * ncd = static_cast<NCDialog *>( dialog ); NCMIL << "NCDialog: " << ncd << endl; do { @@ -183,10 +183,12 @@ UIERR << "No NCPackageSelectorStart existing" << endl; } - YDialog::deleteTopmostDialog(); if ( event.result != "" ) { + while( YDialog::topmostDialog() != dialog ) { + YDialog::deleteTopmostDialog(); + } NCMIL << "Return value: " << event.result << endl; return YCPSymbol( event.result ); } -- 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] r43960 - /trunk/core/libyui/src/YUI_builtins.cc
by locilka＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: locilka Date: Mon Jan 28 18:02:04 2008 New Revision: 43960 URL: http://svn.opensuse.org/viewcvs/yast?rev=43960&view=rev Log: Fixed docu Modified: trunk/core/libyui/src/YUI_builtins.cc 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 Mon Jan 28 18:02:04 2008 @@ -1098,7 +1098,7 @@ * * This builtin is not for general use. Use the Wizard.ycp module instead. * - * For available wizard commands see file YWizard.cc . + * For available wizard commands see file YCPWizardCommandParser.cc . * If the current UI does not provide a wizard widget, 'false' is returned. * It is safe to call this even for UIs that don't provide a wizard widget. In * this case, all calls to this builtin simply return 'false'. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0