Author: jreidinger
Date: Tue Mar 3 13:53:27 2009
New Revision: 55880
URL: http://svn.opensuse.org/viewcvs/yast?rev=55880&view=rev
Log:
align fix, console in checkbox frame, link trusted grub and gfxmenu
Modified:
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp?rev=55880&r1=55879&r2=55880&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Tue Mar 3 13:53:27 2009
@@ -69,8 +69,8 @@
void InitConsole( string widget){
boolean enable = BootCommon::globals["terminal"]:"" == "serial";
- UI::ChangeWidget(`id(`enable_console),`Value, enable);
- UI::ChangeWidget(`id(`console_args),`Enabled, enable);
+ UI::ChangeWidget(`id(`console_frame),`Value, enable);
+ //UI::ChangeWidget(`id(`console_args),`Enabled, enable);
string args = BootCommon::globals["console"]:"";
UI::ChangeWidget(`id(`console_args),`Value, args);
}
@@ -89,12 +89,15 @@
return $[
"widget" : `custom,
"custom_widget" : `HBox(
- `CheckBox(`id(`enable_console), `opt(`notify),_("Use &serial console")),
- `InputField(`id(`console_args),`opt(`hstretch), _("&Console arguments"))
+ `CheckBoxFrame(`id(`console_frame),_("Use &serial console"),true,
+ `HBox(
+ `HSpacing(2),
+ `InputField(`id(`console_args),`opt(`hstretch), _("&Console arguments")),
+ `HStretch()))
),
"init" : InitConsole,
- "handle" : HandleConsole,
- "handle_events" : [`enable_console],
+// "handle" : HandleConsole,
+// "handle_events" : [`enable_console],
"store" : StoreConsole
];
}
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp?rev=55880&r1=55879&r2=55880&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp Tue Mar 3 13:53:27 2009
@@ -39,6 +39,7 @@
*/
symbol i386InstallDetailsDialog () {
term contents = `HBox (`HStretch (), `VBox (
+ `VStretch(),
`Frame (_("Disk Order"),"disks_order"),
`VStretch()),
`HStretch());
@@ -61,24 +62,27 @@
symbol i386LoaderDetailsDialog () {
y2milestone ("Running i386 loader details dialog");
- term contents = `HBox (`HSpacing (2), `VBox (
+ term contents = `HBox (`HSpacing (2),`VBox (
`VStretch (),
- `Left("activate"),
- `VStretch (),
- `Left("debug"),
- `VStretch (),
- `Left("generic_mbr"),
- `VStretch (),
- `Left(`HBox("trusted_grub",`HStretch (),`Left("hiddenmenu"))),
- `VStretch (),
- `Left("gfxmenu"),
- `VStretch (),
- `Left("timeout"),
- `VStretch (),
- `Left("console"),
+ `Frame (_("Boot Menu"),
+ `HBox(
+ `HSpacing(2),
+ `VBox(
+ `Left("activate"),
+ `Left("debug"),
+ `Left("generic_mbr"),
+ `Left("trusted_grub"),
+ `Left("hiddenmenu"),
+ `Left("gfxmenu"),
+ `Left("timeout")
+ ),
+ `HStretch()
+ )
+ ),
+ `Left("console"),
`VStretch ()
-
- ), `HSpacing (2));
+ ),
+ `HSpacing (2));
list<string> widget_names = ["activate","debug","generic_mbr",
"trusted_grub","hiddenmenu","gfxmenu","timeout", "console"];
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp?rev=55880&r1=55879&r2=55880&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Tue Mar 3 13:53:27 2009
@@ -22,7 +22,20 @@
include "bootloader/routines/common_options.ycp";
+//TODO
+// check if works translated global variables
+// helps for widgets
+const string activateLabel =
+ _("&Set active Flag in Partition Table for Boot Partition");
+const string debugLabel = _("&Debugging Flag");
+const string genericLabel = _("&Write generic Boot Code to MBR");
+const string trustedLabel = _("&Use Trusted Grub");
+const string hiddenLabel = _("&Hide Menu on Boot");
+
+
void InitGfx(string widget){
+ boolean value = BootCommon::globals["trusted_grub"]:"false" != "true";
+ UI::ChangeWidget(`id(`gfxinput),`Enabled, value);
UI::ChangeWidget(`id(`gfxinput),`Value,BootCommon::globals[widget]:"");
}
@@ -49,7 +62,7 @@
map