Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47385 - in /trunk/x11: VERSION package/yast2-x11.changes src/XMessages.ycp src/autoyast/dialog/autoDialog.ycp src/autoyast/modules/AutoinstX11.ycp src/autoyast/schema/x11.rnc
  • From: jdsn@xxxxxxxxxxxxxxxx
  • Date: Thu, 08 May 2008 21:53:55 -0000
  • Message-id: <20080508215355.9FCF22DD7C@xxxxxxxxxxxxxxxx>
Author: jdsn
Date: Thu May 8 23:53:55 2008
New Revision: 47385

URL: http://svn.opensuse.org/viewcvs/yast?rev=47385&view=rev
Log:
2.15.12
option to enable Xgl via AutoYaST (fate#302572) (bnc#177709)
switching to strings with proper abbreviations

Modified:
trunk/x11/VERSION
trunk/x11/package/yast2-x11.changes
trunk/x11/src/XMessages.ycp
trunk/x11/src/autoyast/dialog/autoDialog.ycp
trunk/x11/src/autoyast/modules/AutoinstX11.ycp
trunk/x11/src/autoyast/schema/x11.rnc

Modified: trunk/x11/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/VERSION (original)
+++ trunk/x11/VERSION Thu May 8 23:53:55 2008
@@ -1 +1 @@
-2.15.11
+2.15.12

Modified: trunk/x11/package/yast2-x11.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/package/yast2-x11.changes (original)
+++ trunk/x11/package/yast2-x11.changes Thu May 8 23:53:55 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu May 8 23:35:30 CEST 2008 - jdsn@xxxxxxx
+
+- 2.15.12
+- option to enable Xgl via AutoYaST (fate#302572) (bnc#177709)
+- switching to strings with proper abbreviations
+
+-------------------------------------------------------------------
Tue Apr 29 16:14:35 CEST 2008 - ug@xxxxxxx

- rnc file fixed

Modified: trunk/x11/src/XMessages.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XMessages.ycp?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/src/XMessages.ycp (original)
+++ trunk/x11/src/XMessages.ycp Thu May 8 23:53:55 2008
@@ -67,10 +67,10 @@
// 16.7 Mio. colors - business language
string colors16m_uc_business = _("16.7 Mio. Colors");

-global string colors256 = colors256_lc;
-global string colors32k = colors32k_lc;
-global string colors65k = colors65k_lc;
-global string colors16m = colors16m_lc;
+global string colors256 = colors256_uc;
+global string colors32k = colors32k_uc;
+global string colors65k = colors65k_uc;
+global string colors16m = colors16m_uc_business;


//=============================================
@@ -89,7 +89,7 @@
string color24bit_uc = _("16.7 M [ 24 bit ]");
// string for a drop-down box - business language
string color24bit_uc_business = _("16.7 Mio. [ 24 bit ]");
-global string color24bit = color24bit_lc;
+global string color24bit = color24bit_uc_business;

//=============================================
// Xgl strings
@@ -101,11 +101,11 @@
// label for a text entry
global string xglOptions = _("Xgl options");
// label for a heading
-global string xglOptions = _("Xgl Options");
+global string xglOptions_uc = _("Xgl Options");
// label for a text entry
global string customXglOptions = _("Custom Xgl options");
// label for a heading
-global string customXglOptions = _("Custom Xgl Options");
+global string customXglOptions_uc = _("Custom Xgl Options");
// label for a drop-down box
global string XServer = _("X server");


Modified: trunk/x11/src/autoyast/dialog/autoDialog.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/dialog/autoDialog.ycp?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/src/autoyast/dialog/autoDialog.ycp (original)
+++ trunk/x11/src/autoyast/dialog/autoDialog.ycp Thu May 8 23:53:55 2008
@@ -99,6 +99,13 @@
`item(`id("fvwm"), _("FVWM"), (
x11["window_manager"]:"kde" == "fvwm"))
];
+ boolean xgl_opts_enabled = false;
+ if (x11["xgl_custom_options"]:"" != "" )
+ {
+ xgl_opts_enabled = true;
+ }
+ // translators: this string is used in the context of fetching a
configuration setting from the system
+ string fetch_xgl_opts = _("Fetch from system");
term contents =
`Top(
`VBox(
@@ -117,13 +124,11 @@
x11["enable_xgl"]:false)
),
`Left(
- `HBox( `CheckBox(
- `id(`xgl_options),
- _("&Custom Xgl options"),
- x11["xgl_options"]:false),
-
`TextEntry(`id(`xgl_options_string), ""),
- // translators: this string is used
in the context of fetching a configuration setting from the system
-
`PushButton(`id(`fetch_xgl_options), _("Fetch from system"))
+ `HBox( `CheckBox( `id(`xgl_options),
`opt(`notify), _("&Custom Xgl options"), xgl_opts_enabled),
+ `HBox(
`id(`xgl_opts_hbox),
+
`TextEntry(`id(`xgl_options_string), "", x11["xgl_custom_options"]:"") //,
+ //
`PushButton(`id(`fetch_xgl_options), fetch_xgl_opts)
+ )
)),
`VSpacing(1),
`HBox(
@@ -187,6 +192,7 @@
Wizard::SetContents(caption,
updateContents(), help, true, true);

+ UI::ChangeWidget(`id(`xgl_opts_hbox), `Enabled,
(boolean)UI::QueryWidget(`id(`xgl_options), `Value));

any ret = nil;
repeat {
@@ -208,8 +214,21 @@

boolean enable_3d = (boolean)UI::QueryWidget(`id(`enable_3d),
`Value);
AutoinstX11::x11["enable_3d"] = enable_3d;
+
+ boolean enable_xgl = (boolean)UI::QueryWidget(`id(`enable_xgl),
`Value);
+ AutoinstX11::x11["enable_xgl"] = enable_xgl;
+
+ if (enable_xgl && (boolean)UI::QueryWidget(`id(`xgl_options),
`Value) )
+ {
+ AutoinstX11::x11["xgl_custom_options"] =
(string)UI::QueryWidget(`id(`xgl_options_string), `Value);
+ }
+ else
+ {
+ AutoinstX11::x11["xgl_custom_options"] = "";
+ }
}

+ UI::ChangeWidget(`id(`xgl_opts_hbox), `Enabled,
(boolean)UI::QueryWidget(`id(`xgl_options), `Value));

} until ( ret ==`next || ret ==`back || ret == `abort || ret == `cancel
);


Modified: trunk/x11/src/autoyast/modules/AutoinstX11.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/modules/AutoinstX11.ycp?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/src/autoyast/modules/AutoinstX11.ycp (original)
+++ trunk/x11/src/autoyast/modules/AutoinstX11.ycp Thu May 8 23:53:55 2008
@@ -87,6 +87,8 @@
summary = Summary::AddLine (summary,
(x11["enable_3d"]:false) ? _("Yes") : nc
);
+ summary = Summary::AddHeader (summary, _("Enable Xgl if possible"));
+ summary = Summary::AddLine (summary,
((boolean)x11["enable_xgl"]:false) ? _("Yes") : nc);
summary = Summary::AddHeader (summary, _("Color Depth"));
summary = Summary::AddLine (summary, depth );
summary = Summary::AddHeader (summary, _("Resolution"));
@@ -186,10 +188,24 @@
XLib::setDefaultColorDepth ( tostring(colors) );

boolean enable3D = x11["enable_3d"]:false;
+ boolean enableXGL = x11["enable_xgl"]:false;
y2milestone("X11-Auto: setup 3D <%1>",enable3D);
+ y2milestone("X11-Auto: setup XGL <%1>", enableXGL);
boolean has3D = XLib::hasOpenGLFeatures();
if ((enable3D) && (has3D)) {
XLib::activate3D();
+ if ( enableXGL )
+ {
+ // setup Xgl as X server
+ SCR::Write
(.sysconfig.displaymanager.DISPLAYMANAGER_XSERVER, "Xgl");
+ // empty custom options string will not overwrite the
default with empty options
+ // only one (or more) space character(s) will
+ if ( x11["xgl_custom_options"]:"" != "" )
+ {
+ SCR::Write
(.sysconfig.displaymanager.DISPLAYMANAGER_XGL_OPTS,
x11["xgl_custom_options"]:"" );
+ }
+ }
+
} else {
XLib::deactivate3D();
}

Modified: trunk/x11/src/autoyast/schema/x11.rnc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/schema/x11.rnc?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/x11/src/autoyast/schema/x11.rnc (original)
+++ trunk/x11/src/autoyast/schema/x11.rnc Thu May 8 23:53:55 2008
@@ -22,6 +22,9 @@
element frequency { INTEGER }
enable_3d =
element enable_3d { BOOLEAN }
+enable_xgl =
+ element enable_xgl { BOOLEAN }
+xgl_custom_options = element xgl_custom_options { text }
max_hsync =
element max_hsync { INTEGER }
max_vsync =
@@ -47,6 +50,8 @@
| configure_x11
| display_manager
| enable_3d
+ | enable_xgl
+ | xgl_custom_options
| window_manager
| monitor
| resolution

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages