Author: locilka
Date: Mon Apr 28 11:48:40 2008
New Revision: 47094
URL: http://svn.opensuse.org/viewcvs/yast?rev=47094&view=rev
Log:
- Handling KDE3 vs KDE4 in default logon and window managers
(bnc #381821).
- Some more desktop-related configuration data moved to
DefaultDesktop module from desktop_finish client.
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.changes?rev=47094&r1=47093&r2=47094&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon Apr 28 11:48:40 2008
@@ -3,6 +3,10 @@
- Fixed KDE 3.5 description (bnc #379157).
- Selecting Xfce will set DEFAULT_WM to 'startxfce4' (bnc #298558).
+- Handling KDE3 vs KDE4 in default logon and window managers
+ (bnc #381821).
+- Some more desktop-related configuration data moved to
+ DefaultDesktop module from desktop_finish client.
-------------------------------------------------------------------
Fri Apr 25 18:16:07 CEST 2008 - locilka@suse.cz
Modified: trunk/packager/src/modules/DefaultDesktop.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=47094&r1=47093&r2=47094&view=diff
==============================================================================
--- trunk/packager/src/modules/DefaultDesktop.ycp (original)
+++ trunk/packager/src/modules/DefaultDesktop.ycp Mon Apr 28 11:48:40 2008
@@ -20,6 +20,9 @@
// @see GetAllDesktopsMap
map all_desktops = $[
"gnome" : $[
+ "desktop" : "gnome",
+ "logon" : "gdm",
+ "cursor" : "DMZ",
"order" : 1,
// TRANSLATORS: Dialog label
"label" : _("GNOME"),
@@ -29,6 +32,10 @@
It combines stability and maturity with incremental innovations."),
],
"kde" : $[
+ // bnc #381821
+ "desktop" : "startkde4",
+ "logon" : "kdm4",
+ "cursor" : "DMZ",
"order" : 1,
// TRANSLATORS: Dialog label
"label" : _("KDE 4.0"),
@@ -38,6 +45,10 @@
new KDE technologies, but it is less mature than the other desktops."),
],
"kde3" : $[
+ // bnc #381821
+ "desktop" : "startkde3",
+ "logon" : "kdm3",
+ "cursor" : "DMZ",
"order" : 1,
// TRANSLATORS: Dialog label
"label" : _("KDE 3.5"),
@@ -47,6 +58,10 @@
It is mature and stable."),
],
"xfce" : $[
+ // bnc #298558
+ "desktop" : "startxfce4",
+ "logon" : "xdm",
+ "cursor" : "DMZ",
"order" : 4,
// TRANSLATORS: Dialog label
"label" : _("XFCE Desktop"),
@@ -54,6 +69,9 @@
"icon" : "pattern-xfce",
],
"min_x" : $[
+ "desktop" : "twm",
+ "logon" : "xdm",
+ "cursor" : "DMZ",
"order" : 6,
// TRANSLATORS: Dialog label
"label" : _("Minimal X Window"),
@@ -61,6 +79,9 @@
"icon" : "yast-x11",
],
"textmode" : $[
+ "desktop" : "twm",
+ "logon" : "xdm",
+ "cursor" : "DMZ",
"order" : 8,
// TRANSLATORS: Dialog label
"label" : _("Minimal Server Selection (Text Mode)"),
@@ -76,6 +97,7 @@
*
* @struct $[
* "desktop ID" : $[
+ * "desktop" : "desktop to start", // DEFAULT_WM
* "order" : integer,
* "label" : _("Desktop Name Visible in Dialog"),
* "description" : _("Description text of the desktop"),
@@ -135,18 +157,7 @@
*/
string desktop = nil;
-/**
- * Window manager to be set according to selected desktop
- */
-map desktop2wm = $[
- "gnome" : "gnome",
- "kde" : "kde",
- "kde3" : "kde",
- // bnc #298558
- "xfce" : "startxfce4",
- "min_x" : "twm",
- "textmode" : "twm",
-];
+
/**
* Get the currently set default desktop, nil if none set
@@ -172,7 +183,7 @@
* @return string preffered window/desktop manager, empty if no one
*/
global string PrefferedWindowManager () {
- return desktop2wm[desktop]:"";
+ return all_desktops[desktop,"desktop"]:"";
}
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
