Author: locilka
Date: Wed Sep 10 15:54:30 2008
New Revision: 50958
URL: http://svn.opensuse.org/viewcvs/yast?rev=50958&view=rev
Log:
- Desktop selection dialog definitions have been moved to control
file (bnc #424678).
Modified:
trunk/installation/control/control.openSUSE.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_new_desktop.ycp
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=50958&r1=50957&r2=50958&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Wed Sep 10 15:54:30 2008
@@ -208,6 +208,88 @@
<priority config:type="integer">100</priority>
+
+ <!-- BNC #424678, Definition of supported desktops -->
+
+
+
+ <name>gnome</name>
+ <desktop>gnome</desktop>
+ desktop_gnome
+ <logon>gdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>gdm</packages>
+ <order config:type="integer">1</order>
+ <patterns>gnome x11 base</patterns>
+ <icon>pattern-gnome</icon>
+ description_gnome
+
+
+
+ <name>kde</name>
+ <!-- BNC #381821 -->
+ <desktop>startkde4</desktop>
+ desktop_kde
+ <logon>kdm4</logon>
+ <cursor>DMZ</cursor>
+ <packages>kde4-kdm</packages>
+ <order config:type="integer">1</order>
+ <patterns>kde x11 base</patterns>
+ <icon>pattern-kde4</icon>
+ description_kde
+
+
+
+ <name>kde3</name>
+ <!-- BNC #381821 -->
+ <desktop>startkde3</desktop>
+ desktop_kde3
+ <logon>kdm3</logon>
+ <cursor>DMZ</cursor>
+ <packages>kdebase3-kdm</packages>
+ <order config:type="integer">1</order>
+ <patterns>kde3 x11 base</patterns>
+ <icon>pattern-kde</icon>
+ description_kde3
+
+
+
+ <name>xfce</name>
+ <desktop>startxfce4</desktop>
+ desktop_xfce
+ <logon>xdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>xfce4-desktop</packages>
+ <order config:type="integer">4</order>
+ <patterns>xfce x11 base</patterns>
+ <icon>pattern-xfce</icon>
+
+
+
+ <name>min_x</name>
+ <desktop>twm</desktop>
+ desktop_min_x
+ <logon>xdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>xorg-x11</packages>
+ <order config:type="integer">6</order>
+ <patterns>x11 base</patterns>
+ <icon>yast-x11</icon>
+
+
+
+ <name>textmode</name>
+ <desktop>twm</desktop>
+ desktop_textmode
+ <logon>xdm</logon>
+ <cursor>DMZ</cursor>
+ <packages>xorg-x11</packages>
+ <order config:type="integer">8</order>
+ <patterns>enhanced_base</patterns>
+ <icon>yast-sshd</icon>
+
+
+
</software>
<partitioning>
@@ -267,6 +349,30 @@
<label>Configuring network...</label>
<label>Configuring hardware...</label>
<label>Finishing configuration...</label>
+
+ <!-- Desktop dialog label -->
+ <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.</label>
+
+ <!-- Desktop dialog: desktop names -->
+ <label>GNOME</label>
+ <label>KDE 4.1</label>
+ <label>KDE 3.5</label>
+ <label>XFCE Desktop</label>
+ <label>Minimal X Window</label>
+ <label>Minimal Server Selection (Text Mode)</label>
+
+ <!-- Desktop dialog: desktop descriptions -->
+ <label>GNOME 2.22 is the latest desktop from the GNOME Project.
+It combines stability and maturity with incremental innovations.</label>
+ <label>KDE 4.1 is the most recent evolution of KDE. It comes with many
+new KDE technologies, but it is less mature than the other desktops.</label>
+ <label>KDE 3.5 is the previous generation of the K Desktop Environment.
+It is mature and stable.</label>
+
</texts>
<proposals config:type="list">
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=50958&r1=50957&r2=50958&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Wed Sep 10 15:54:30 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Sep 10 15:53:44 CEST 2008 - locilka@suse.cz
+
+- Desktop selection dialog definitions have been moved to control
+ file (bnc #424678).
+
+-------------------------------------------------------------------
Tue Sep 9 16:02:03 CEST 2008 - locilka@suse.cz
- Replacing usage of barexml with anyxml SCR agent (bnc #424263).
Modified: trunk/installation/src/clients/inst_new_desktop.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_new_desktop.ycp?rev=50958&r1=50957&r2=50958&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_new_desktop.ycp (original)
+++ trunk/installation/src/clients/inst_new_desktop.ycp Wed Sep 10 15:54:30 2008
@@ -23,6 +23,7 @@
import "Stage";
import "Directory";
import "Icon";
+import "ProductControl";
// do not offer the dialog if base selection is fixed
if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed)
@@ -33,7 +34,7 @@
// TRANSLATORS: help text, part 1
string help = _("<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number
of different desktop environments. Below you see a list of the 2 major ones
-<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an easy to use desktop
+<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop
with a large number of desktop applications such as email, file browser, games and many others.</p>") +
// TRANSLATORS: help text, part 3
@@ -205,11 +206,7 @@
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.")),
+ `Label (ProductControl::GetTranslatedText ("desktop_dialog")),
`VWeight (3, `VStretch()),
`RadioButtonGroup (
`id ("selected_desktop"),
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
