April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r47093 - in /trunk/installation: package/yast2-installation.changes src/clients/desktop_finish.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 11:45:45 2008 New Revision: 47093 URL: http://svn.opensuse.org/viewcvs/yast?rev=47093&view=rev Log: - Handling KDE3 vs KDE4 in default logon and window managers (bnc #381821). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/desktop_finish.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 Mon Apr 28 11:45:45 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 28 11:42:21 CEST 2008 - locilka(a)suse.cz + +- Handling KDE3 vs KDE4 in default logon and window managers + (bnc #381821). + +------------------------------------------------------------------- Fri Apr 25 18:15:09 CEST 2008 - locilka(a)suse.cz - New desktop selection dialog (bnc #379157). Modified: trunk/installation/src/clients/desktop_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/desktop… ============================================================================== --- trunk/installation/src/clients/desktop_finish.ycp (original) +++ trunk/installation/src/clients/desktop_finish.ycp Mon Apr 28 11:45:45 2008 @@ -71,35 +71,32 @@ map <string,map <string, any> > desktop_data = $[ "gnome" : $[ "package" : ["gdm"], - "wm" : "gnome", - "dm" : "gdm", - "cursor" : "DMZ", ], "kde" : $[ "package" : ["kde4-kdm"], - "wm" : "kde", - "dm" : "kdm", - "cursor" : "DMZ", ], "kde3" : $[ "package" : ["kdebase3-kdm"], - "wm" : "kde", - "dm" : "kdm", - "cursor" : "DMZ", + + ], + "xfce" : $[ + "package" : ["xfce"], + ], "twm" : $[ "package" : ["xorg-x11"], - "wm" : "", - "dm" : "xdm", - "cursor" : "DMZ", ], ]; - string default_wm = "gnome"; - string default_dm = "gdm"; - string default_cursor = "DMZ"; + map dd_map = DefaultDesktop::GetAllDesktopsMap (); - string selected_desktop = DefaultDesktop::Desktop (); + string selected_desktop = DefaultDesktop::Desktop(); + if (selected_desktop == nil || selected_desktop == "") + selected_desktop = "gnome"; + + string default_dm = dd_map[selected_desktop, "logon"]:""; + string default_wm = dd_map[selected_desktop, "desktop"]:""; + string default_cursor = dd_map[selected_desktop, "cursor"]:""; list <string> selected_desktops = DefaultDesktop::SelectedDesktops(); @@ -133,11 +130,14 @@ if (Pkg::IsProvided (package) && (Pkg::PkgInstalled (package) || Pkg::IsSelected (package))) { y2milestone ("package %1 selected or installed", package); desktop_found = true; - default_dm = desktop_data[d, "dm"]:""; + + default_dm = dd_map[d, "logon"]:""; y2milestone ("Setting logon manager %1 - package selected", default_dm); - default_wm = desktop_data[d, "wm"]:""; + + default_wm = dd_map[d, "desktop"]:""; y2milestone ("Setting window manager %1 - package selected", default_wm); - default_cursor = desktop_data[d, "cursor"]:default_cursor; + + default_cursor = dd_map[d, "cursor"]:default_cursor; y2milestone ("Setting cursor theme %1 - package selected", default_cursor); } 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 Mon Apr 28 11:45:45 2008 @@ -25,7 +25,8 @@ Requires: yast2-country-data >= 2.16.11 # DefaultDesktop::SelectedDesktops -Requires: yast2-packager >= 2.16.37 +# ... + newly added data into desktops map +Requires: yast2-packager >= 2.16.41 # 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] r47092 - in /trunk/packager: package/yast2-packager.changes src/modules/DefaultDesktop.ycp
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 10:42:03 2008 New Revision: 47092 URL: http://svn.opensuse.org/viewcvs/yast?rev=47092&view=rev Log: - Selecting Xfce will set DEFAULT_WM to 'startxfce4' (bnc #298558). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp 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 Mon Apr 28 10:42:03 2008 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Apr 28 09:51:02 CEST 2008 - locilka(a)suse.cz -- Fixed KDE 3.5 description. +- Fixed KDE 3.5 description (bnc #379157). +- Selecting Xfce will set DEFAULT_WM to 'startxfce4' (bnc #298558). ------------------------------------------------------------------- Fri Apr 25 18:16:07 CEST 2008 - locilka(a)suse.cz 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 Mon Apr 28 10:42:03 2008 @@ -80,7 +80,7 @@ * "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) + * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], * ] */ @@ -131,7 +131,7 @@ /** * Desktop which was selected in the desktop selection dialog - * "kde", "gnome", "min_x11", "text" + * "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ string desktop = nil; @@ -141,14 +141,16 @@ map<string,string> desktop2wm = $[ "gnome" : "gnome", "kde" : "kde", - "xfce" : "twm", + "kde3" : "kde", + // bnc #298558 + "xfce" : "startxfce4", "min_x" : "twm", "textmode" : "twm", ]; /** * Get the currently set default desktop, nil if none set - * @return string "kde", "gnome", "xfce", "min_x", "textmode", nil + * @return string "kde", "kde3", "gnome", "xfce", "min_x", "textmode", nil */ global string Desktop () { return desktop; -- 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] r47091 - in /trunk/packager: package/yast2-packager.changes src/modules/DefaultDesktop.ycp
by locilka＠svn.opensuse.org 28 Apr '08

28 Apr '08

Author: locilka Date: Mon Apr 28 09:51:34 2008 New Revision: 47091 URL: http://svn.opensuse.org/viewcvs/yast?rev=47091&view=rev Log: - Fixed KDE 3.5 description. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp 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 Mon Apr 28 09:51:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 28 09:51:02 CEST 2008 - locilka(a)suse.cz + +- Fixed KDE 3.5 description. + +------------------------------------------------------------------- Fri Apr 25 18:16:07 CEST 2008 - locilka(a)suse.cz - New desktop selection dialog (bnc #379157). 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 Mon Apr 28 09:51:34 2008 @@ -43,7 +43,7 @@ "label" : _("KDE 3.5"), "patterns" : ["kde3", "x11", "base"], "icon" : "pattern-kde", - "description" : _("KDE 3.5 is the previous generation of K Desktop Environment. + "description" : _("KDE 3.5 is the previous generation of the K Desktop Environment. It is mature and stable."), ], "xfce" : $[ -- 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] r47090 - /trunk/theme/yast2-theme.spec.in
by coolo＠svn.opensuse.org 26 Apr '08

26 Apr '08

Author: coolo Date: Sat Apr 26 12:46:31 2008 New Revision: 47090 URL: http://svn.opensuse.org/viewcvs/yast?rev=47090&view=rev Log: fix build Modified: trunk/theme/yast2-theme.spec.in Modified: trunk/theme/yast2-theme.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/yast2-theme.spec.in?rev=47… ============================================================================== --- trunk/theme/yast2-theme.spec.in (original) +++ trunk/theme/yast2-theme.spec.in Sat Apr 26 12:46:31 2008 @@ -77,7 +77,7 @@ for subtheme in Crystal Oxygen; do cd $RPM_BUILD_ROOT/@themedir@/openSUSE-$subtheme for file in $files; do - mkdir $(dirname "$file") || true + mkdir -p $(dirname "$file") || true if ! test -f "$file"; then ln -s @themedir@/openSUSE/$file $file fi @@ -106,9 +106,7 @@ %defattr(-,root,root) %dir @themedir@ @themedir@/openSUSE -/usr/share/icons/hicolor/22x22/apps/* -/usr/share/icons/hicolor/32x32/apps/* -/usr/share/icons/hicolor/48x48/apps/* +/usr/share/icons/hicolor/*/apps/* %doc @docdir@-openSUSE # ghost file (not packed in RPM but listed) # remove the file when removing the RPM -- 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] r47089 - /trunk/theme/yast2-theme.spec.in
by coolo＠svn.opensuse.org 26 Apr '08

26 Apr '08

Author: coolo Date: Sat Apr 26 12:06:14 2008 New Revision: 47089 URL: http://svn.opensuse.org/viewcvs/yast?rev=47089&view=rev Log: one more dir Modified: trunk/theme/yast2-theme.spec.in Modified: trunk/theme/yast2-theme.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/yast2-theme.spec.in?rev=47… ============================================================================== --- trunk/theme/yast2-theme.spec.in (original) +++ trunk/theme/yast2-theme.spec.in Sat Apr 26 12:06:14 2008 @@ -61,8 +61,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps cd $RPM_BUILD_ROOT/@themedir@/current/icons -for dir in 22x22 32x32 48x48; do +for dir in 22x22 32x32 48x48 64x64; do cd $RPM_BUILD_ROOT/@themedir@/current/icons/$dir/apps icons=$(ls *.png) cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps -- 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] r47088 - /trunk/qt/package/yast2-qt.changes
by coolo＠svn.opensuse.org 26 Apr '08

26 Apr '08

Author: coolo Date: Sat Apr 26 07:11:38 2008 New Revision: 47088 URL: http://svn.opensuse.org/viewcvs/yast?rev=47088&view=rev Log: clean up after tux Modified: trunk/qt/package/yast2-qt.changes Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Sat Apr 26 07:11:38 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Apr 26 07:11:22 CEST 2008 - coolo(a)suse.de + +- resubmit clean tar + +------------------------------------------------------------------- Thu Apr 24 10:57:23 CEST 2008 - kmachalkova(a)suse.cz - Make YQWizard menus work again - Qt4 uses triggered() signal -- 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] r47087 - /tags/stable-2_16_39/packager/
by locilka＠svn.opensuse.org 25 Apr '08

25 Apr '08

Author: locilka Date: Fri Apr 25 18:21:41 2008 New Revision: 47087 URL: http://svn.opensuse.org/viewcvs/yast?rev=47087&view=rev Log: Created tag stable-2_16_39 for packager Added: tags/stable-2_16_39/packager/ - copied from r47086, trunk/packager/ -- 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] r47086 - /tags/stable-2_16_40/installation/
by locilka＠svn.opensuse.org 25 Apr '08

25 Apr '08

Author: locilka Date: Fri Apr 25 18:20:06 2008 New Revision: 47086 URL: http://svn.opensuse.org/viewcvs/yast?rev=47086&view=rev Log: Created tag stable-2_16_40 for installation Added: tags/stable-2_16_40/installation/ - copied from r47085, trunk/installation/ -- 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] r47085 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/DefaultDesktop.ycp
by locilka＠svn.opensuse.org 25 Apr '08

25 Apr '08

Author: locilka Date: Fri Apr 25 18:17:27 2008 New Revision: 47085 URL: http://svn.opensuse.org/viewcvs/yast?rev=47085&view=rev Log: - New desktop selection dialog (bnc #379157). - 2.16.39 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/DefaultDesktop.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47085&r1=47… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Apr 25 18:17:27 2008 @@ -1 +1 @@ -2.16.38 +2.16.39 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 Fri Apr 25 18:17:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 25 18:16:07 CEST 2008 - locilka(a)suse.cz + +- New desktop selection dialog (bnc #379157). +- 2.16.39 + +------------------------------------------------------------------- Fri Apr 25 08:03:38 CEST 2008 - lslezak(a)suse.cz - restored 'Software Repositories' icon in the control center 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 Fri Apr 25 18:17:27 2008 @@ -2,6 +2,7 @@ * File: DefaultDesktop.ycp * Package: Handling of default desktop selection * Authors: Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * * $Id: Packages.ycp 31512 2006-06-19 11:14:09Z jsrain $ */ @@ -21,23 +22,29 @@ "gnome" : $[ "order" : 1, // TRANSLATORS: Dialog label - "label" : _("GNOME Desktop"), + "label" : _("GNOME"), "patterns" : ["gnome", "x11", "base"], "icon" : "pattern-gnome", + "description" : _("GNOME 2.22 is the latest desktop from the GNOME Project. +It combines stability and maturity with incremental innovations."), ], "kde" : $[ "order" : 1, // TRANSLATORS: Dialog label - "label" : _("KDE4 Desktop"), + "label" : _("KDE 4.0"), "patterns" : ["kde", "x11", "base"], - "icon" : "pattern-kde-laptop", + "icon" : "pattern-kde4", + "description" : _("KDE 4.0 is the most recent evolution of KDE. It comes with many +new KDE technologies, but it is less mature than the other desktops."), ], "kde3" : $[ "order" : 1, // TRANSLATORS: Dialog label - "label" : _("KDE3 Desktop"), + "label" : _("KDE 3.5"), "patterns" : ["kde3", "x11", "base"], "icon" : "pattern-kde", + "description" : _("KDE 3.5 is the previous generation of K Desktop Environment. +It is mature and stable."), ], "xfce" : $[ "order" : 4, -- 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] r47084 - in /trunk/installation: VERSION control/control.openSUSE.xml package/yast2-installation.changes src/clients/inst_new_desktop.ycp
by locilka＠svn.opensuse.org 25 Apr '08

25 Apr '08

Author: locilka Date: Fri Apr 25 18:17:12 2008 New Revision: 47084 URL: http://svn.opensuse.org/viewcvs/yast?rev=47084&view=rev Log: - New desktop selection dialog (bnc #379157). - 2.16.40 Added: trunk/installation/src/clients/inst_new_desktop.ycp Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=47084&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Apr 25 18:17:12 2008 @@ -1 +1 @@ -2.16.39 +2.16.40 Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Fri Apr 25 18:17:12 2008 @@ -356,8 +356,8 @@ <enable_back>yes</enable_back> </module> <module> - <label>Software Selection</label> - <name>software_selection</name> + <label>Desktop Selection</label> + <name>new_desktop</name> </module> <module> <label>Disk</label> 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 Fri Apr 25 18:17:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 25 18:15:09 CEST 2008 - locilka(a)suse.cz + +- New desktop selection dialog (bnc #379157). +- 2.16.40 + +------------------------------------------------------------------- Thu Apr 24 14:54:53 CEST 2008 - locilka(a)suse.cz - New better shiny unified progress for image deployment. Added: trunk/installation/src/clients/inst_new_desktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_new_desktop.ycp (added) +++ trunk/installation/src/clients/inst_new_desktop.ycp Fri Apr 25 18:17:12 2008 @@ -0,0 +1,289 @@ +/** + * File: clients/inst_software_selection.ycp + * Package: Installation + * Summary: New Desktop Selection (bnc #379157) + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * Stephan Kulow <coolo(a)suse.de> + * + * $Id$ + * + */ + +{ + +textdomain "installation"; + +import "ProductFeatures"; +import "InstData"; +import "GetInstArgs"; +import "DefaultDesktop"; +import "Wizard"; +import "Packages"; +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) + return `auto; + +boolean text_mode = UI::GetDisplayInfo()["TextMode"]:false; + +// TRANSLATORS: help text, part 1 +string help = _("At Linux choice is a top priority. openSUSE offers a number +of different desktop environments. Below you see a list of the 2 major ones +GNOME and KDE (in two different versions). Both provide an easy to use desktop +with a large number of desktop applications such as email, file browser, games and many others.") + + +// TRANSLATORS: help text, part 3 +_("Additionally, not only desktop but you can also chose a minimalistic +installation that could fit your needs better."); + +if (DefaultDesktop::Desktop() == nil || DefaultDesktop::Desktop() == "") { + DefaultDesktop::Init(); +} + +map <string, map> all_desktops = DefaultDesktop::GetAllDesktopsMap(); + +void SelectSoftwareNow () { + y2milestone ("Selected desktop: %1", DefaultDesktop::Desktop()); + DefaultDesktop::SetDesktop (DefaultDesktop::Desktop()); + + Packages::ForceFullRepropose(); + Packages::Reset ([`product]); + + 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); + }); +} + +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); +} + +string GetDesktopDescriptionId (string desktop_name) { + if (desktop_name == nil || desktop_name == "") { + y2warning ("Wrong desktop name: %1", desktop_name); + return ""; + } + + return sformat ("desktop_description_%1", desktop_name); +} + +list <string> other_desktops = []; + +term GetDesktops (string desktops, boolean show_descr) { + 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)); + + if (desktops == "major") { + sort_order = filter (string desktop_name, sort_order, { + return (all_desktops[desktop_name,"order"]:99 == 1); + }); + } else if (desktops == "minor") { + sort_order = filter (string desktop_name, sort_order, { + return (all_desktops[desktop_name,"order"]:99 > 1); + }); + other_desktops = sort_order; + } + + term ret = `VBox (); + + integer counter = -1; + integer last_desktop_order = -1; + + foreach (string desktop_name, sort_order, { + counter = counter + 1; + + if (counter != 0 && desktops == "major") { + ret[counter] = `VSpacing (1); + counter = counter + 1; + } + + integer desktop_order = all_desktops[desktop_name,"order"]:99; + + term radio_opt = `opt (`notify, `boldFont); + if (desktops == "minor") + radio_opt = `opt (`notify); + + ret[counter] = + `Left (`HBox ( + `HSpacing ((desktops == "major" ? 2:8)), + `VBox ( + `Left (`RadioButton ( + `id (GetDesktopRadioButtonId (desktop_name)), + radio_opt, + all_desktops[desktop_name,"label"]:"" + )), + (desktops == "major" && show_descr ? + + `ReplacePoint (`id (GetDesktopDescriptionId (desktop_name)), `HBox ( + `HSpacing ((text_mode ? 4:2)), + `Left (`Label (all_desktops[desktop_name,"description"]:"")), + `HSpacing (1) + )) + : + `Empty() + ) + ), + (desktops == "major" ? + + `Image (Directory::themedir + "/current/icons/64x64/apps/" + all_desktops[desktop_name,"icon"]:"yast" + ".png") + : + `Empty() + ) + )); + + last_desktop_order = desktop_order; + }); + + if (desktops == "major") { + counter = counter + 1; + + if (counter != 0) { + ret[counter] = `VSpacing (1); + counter = counter + 1; + } + + ret[counter] = + `Left (`HBox ( + `HSpacing (2), + `VBox ( + `Left (`RadioButton ( + `id ("__other__"), + `opt (`notify, `boldFont), + _("Other") + )) + ) + )); + } + + return ret; +} + +term major_desktops = GetDesktops ("major", true); +term major_no_descr = GetDesktops ("major", false); +term minor_desktops = GetDesktops ("minor", true); + +boolean current_minor_d_status = false; + +void ShowHideOther (boolean show) { + string currently_selected = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); + + if (show == true && current_minor_d_status == false) { + if (text_mode) UI::ReplaceWidget (`id ("major_options"), major_no_descr); + UI::ReplaceWidget (`id ("other_options"), minor_desktops); + current_minor_d_status = true; + } else if (show == false && current_minor_d_status == true) { + if (text_mode) UI::ReplaceWidget (`id ("major_options"), major_desktops); + UI::ReplaceWidget (`id ("other_options"), `Empty()); + current_minor_d_status = false; + } + + UI::ChangeWidget (`id ("selected_desktop"), `Value, currently_selected); + UI::SetFocus (`id (currently_selected)); +} + +term default_ui_minor = `Empty(); + +string default_desktop = DefaultDesktop::Desktop(); +if (default_desktop != nil && default_desktop != "" && contains (other_desktops, default_desktop)) { + default_ui_minor = minor_desktops; + current_minor_d_status = true; +} + +term contents = `Left (`HBox ( + `HSquash ( + `VBox ( + `Label (_("openSUSE offers you a choice of user interfaces. The two major complete +desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full +suite of applications including email, a file manager, games and utilities. + +As desktop selection is a matter of taste, we do not give a recommendation.")), + `VWeight (3, `VStretch()), + `RadioButtonGroup ( + `id ("selected_desktop"), + `opt (`hstretch), + `VBox ( + `ReplacePoint (`id ("major_options"), major_desktops), + `ReplacePoint (`id ("other_options"), default_ui_minor) + ) + ), + `VWeight (5, `VStretch()) + ) + ) +)); + +// TRANSLATORS: dialog caption +string caption = _("Desktop Selection"); + +// Set UI +Wizard::SetContents (caption, contents, help, + Stage::initial() ? GetInstArgs::enable_back():true, + Stage::initial() ? GetInstArgs::enable_next():true +); +Wizard::SetTitleIcon ("yast-desktop-select"); + +// Adjust default values +if (! UI::WidgetExists (`id ("selected_desktop"))) { + y2error (-1, "Widget selected_desktop does not exist"); +} else if (default_desktop != nil && default_desktop != "") { + y2milestone ("Already selected desktop: %1", DefaultDesktop::Desktop()); + UI::ChangeWidget (`id ("selected_desktop"), `Value, GetDesktopRadioButtonId (DefaultDesktop::Desktop())); +} + +// UI wait loop +any ret = nil; +while (true) { + ret = UI::UserInput(); + + if (is (ret, string) && regexpmatch (tostring (ret), "^selected_desktop_.*")) { + string currently_selected = regexpsub (tostring (ret), "^selected_desktop_(.*)", "\\1"); + if (! contains (other_desktops, currently_selected)) { + ShowHideOther (false); + } + } else if (ret == `next) { + string currently_selected = (string) UI::QueryWidget (`id ("selected_desktop"), `Value); + if (currently_selected == "__other__") { + Popup::Message (_("No system type was selected. +Select the default type.")); + continue; + } + DefaultDesktop::SetDesktop (regexpsub (tostring (currently_selected), "^selected_desktop_(.*)", "\\1")); + + if (DefaultDesktop::Desktop() != nil && haskey (all_desktops, DefaultDesktop::Desktop())) { + SelectSoftwareNow (); + break; + } + Popup::Message (_("No system type was selected. +Select the default type.")); + continue; + } else if (ret == `abort || ret == `cancel) { + if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete)) { + ret = `abort; + break; + } + continue; + } else if (ret == `back) { + break; + } else if (ret == "__other__") { + ShowHideOther (true); + } else { + y2error ("Input %1 not handled", ret); + } +} + +return (symbol) ret; + +/* EOF */ +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0