Author: juhliarik
Date: Thu Feb 19 08:58:28 2009
New Revision: 55604
URL: http://svn.opensuse.org/viewcvs/yast?rev=55604&view=rev
Log:
deleted using genrated UI from yast2-bootloader
Modified:
branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp?rev=55604&r1=55603&r2=55604&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootGRUB.ycp Thu Feb 19 08:58:28 2009
@@ -61,8 +61,10 @@
include "bootloader/grub/misc.ycp";
include "bootloader/routines/popups.ycp";
include "bootloader/grub/helps.ycp";
-include "bootloader/generic/device_map_edit_widget.ycp";
+//include "bootloader/generic/device_map_edit_widget.ycp";
include "bootloader/generic/dialogs.ycp";
+include "bootloader/routines/dialogs_i386.ycp";
+
// end of mandatory functions
//----------------------------------------------------------------------------
@@ -775,7 +777,7 @@
global map Dialogs () {
return $[
"installation" : i386InstallDetailsDialog,
- "loader" : genericBootLoaderOptionsDialog,
+ "loader" : i386LoaderDetailsDialog,
];
}
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp?rev=55604&r1=55603&r2=55604&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Thu Feb 19 08:58:28 2009
@@ -277,7 +277,7 @@
*/
symbol EditSectionSwitch () {
string type = BootCommon::current_section["type"]:"";
- if (type == "chainloader")
+ if (type == "chainloader" || type == "other")
return `chainloader;
else
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp?rev=55604&r1=55603&r2=55604&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/global_widgets.ycp Thu Feb 19 08:58:28 2009
@@ -108,7 +108,7 @@
void RedrawSectionsTable (list > sects) {
boolean elilo = Bootloader::getLoaderType () == "elilo";
list sec = maplist (map s, sects, {
- string image = s["kernel"]:"";
+ string image = s["image"]:"";
string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:"";
return `item (`id (s["name"]:""),
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp?rev=55604&r1=55603&r2=55604&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Thu Feb 19 08:58:28 2009
@@ -28,6 +28,7 @@
import "Storage";
import "StorageDevices";
import "TablePopup";
+import "Bootloader";
import "Popup";
include "bootloader/routines/helps.ycp";
Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp?rev=55604&r1=55603&r2=55604&view=diff
==============================================================================
--- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp (original)
+++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/wizards.ycp Thu Feb 19 08:58:28 2009
@@ -36,7 +36,7 @@
// error report
Report::Error (_("Because of the partitioning, the boot loader
cannot be installed properly."));
-
+ /*
// check loader-specific sequence
symbol spec_ret = Bootloader::blMainSequence ();
if (spec_ret == `generic_new)
@@ -44,7 +44,7 @@
if (spec_ret != `generic)
return spec_ret;
-
+ */
// run generic sequence
map aliases = $[
"edit_section_switch" : [``(EditSectionSwitch ()), true],
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
