Author: juhliarik
Date: Thu May 15 17:51:04 2008
New Revision: 47593
URL: http://svn.opensuse.org/viewcvs/yast?rev=47593&view=rev
Log:
- added missing strings for (bnc# 386527)
- added disabled "Back" button during installation (bnc# 164884)
M bootloader/src/grub/helps.ycp
* added missing strings
M bootloader/src/routines/global_widgets.ycp
* disabled Back button in installation
M bootloader/src/routines/dialogs.ycp
* changed buttons Abort -> Cancel, Finish -> OK
M bootloader/src/routines/wizards.ycp
Modified:
trunk/bootloader/src/grub/helps.ycp
trunk/bootloader/src/routines/dialogs.ycp
trunk/bootloader/src/routines/global_widgets.ycp
trunk/bootloader/src/routines/wizards.ycp
Modified: trunk/bootloader/src/grub/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?rev=47593&r1=47592&r2=47593&view=diff
==============================================================================
--- trunk/bootloader/src/grub/helps.ycp (original)
+++ trunk/bootloader/src/grub/helps.ycp Thu May 15 17:51:04 2008
@@ -135,6 +135,8 @@
"boot_mbr" : _("Boot from Master Boot Record"),
"boot_root" : _("Boot from Root Partition"),
"boot_boot" : _("Boot from Boot Partition"),
+ "boot_extended" : _("Boot from Extended Partition"),
+ "former_default_image_flavor": _("Former default Image Flavor"),
"serial" : _("Serial Connection Parameters"),
"terminal" : _("Terminal Definition"),
"fallback" : _("Fallback Sections if default Fails"),
Modified: trunk/bootloader/src/routines/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.ycp?rev=47593&r1=47592&r2=47593&view=diff
==============================================================================
--- trunk/bootloader/src/routines/dialogs.ycp (original)
+++ trunk/bootloader/src/routines/dialogs.ycp Thu May 15 17:51:04 2008
@@ -76,6 +76,7 @@
string return_tab = "sections";
+
/**
* Run dialog for kernel section editation
* @return symbol for wizard sequencer
@@ -88,8 +89,8 @@
`Right ("adv_button")
);
-//F#300779 - Install diskless client (NFS-root)
-//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ //F#300779 - Install diskless client (NFS-root)
+ //kokso: additional warning that root partition is nfs type -> bootloader will not be installed
map dev = $[];
if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
@@ -103,7 +104,7 @@
return `next;
}
-//F#300779: end
+ //F#300779: end
list<string> widget_names = ["tab", "adv_button"];
map > widget_descr = (map >)
@@ -124,8 +125,8 @@
"contents" : contents,
"caption" : caption,
"back_button" : Label::BackButton (),
- "abort_button" : Label::AbortButton (),
- "next_button" : Label::FinishButton (),
+ "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (),
+ "next_button" : (!Mode::installation()) ? Label::FinishButton () : Label::OKButton (),
"fallback_functions" : global_handlers,
]);
if (ret != `back && ret != `abort && ret != `cancel)
@@ -197,7 +198,7 @@
"contents" : contents,
"caption" : caption,
"back_button" : Label::BackButton (),
- "abort_button" : Label::AbortButton (),
+ "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (),
"next_button" : Label::OKButton (),
"fallback_functions" : section_handlers,
]);
@@ -242,7 +243,7 @@
"contents" : contents,
"caption" : caption,
"back_button" : Label::BackButton (),
- "abort_button" : Label::AbortButton (),
+ "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (),
"next_button" : Label::OKButton (),
"fallback_functions" : section_handlers,
]);
@@ -272,8 +273,8 @@
"contents" : contents,
"caption" : caption,
"back_button" : Label::BackButton (),
- "abort_button" : Label::AbortButton (),
- "next_button" : Label::NextButton (),
+ "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (),
+ "next_button" : (!Mode::installation()) ? Label::NextButton () : Label::OKButton (),
]);
}
Modified: trunk/bootloader/src/routines/global_widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_widgets.ycp?rev=47593&r1=47592&r2=47593&view=diff
==============================================================================
--- trunk/bootloader/src/routines/global_widgets.ycp (original)
+++ trunk/bootloader/src/routines/global_widgets.ycp Thu May 15 17:51:04 2008
@@ -845,6 +845,38 @@
}
+
+/**
+ * Function for disable back button
+ * @param string key
+ */
+
+void BackButton (string key) {
+ if (Mode::installation())
+ UI::ChangeWidget(`id(`back), `Enabled, false);
+}
+
+
+/**
+ * Init function where are added UI hadle functions
+ * special hack widget where is handlig disable back button
+ *
+ * @return map map for start-stop widget
+ */
+
+map DisBackButton () {
+ map result = $[];
+
+ result["widget"] = `custom;
+ result["custom_widget"] =`Empty();
+ result["init"] = BackButton;
+ result["help"] = " ";
+
+ return result;
+}
+
+
+
/**
* Get the main dialog tabs description
* @return a map the description of the tabs
@@ -861,7 +893,8 @@
"sections",
`VSpacing (1)
), `HSpacing (3)),
- "widget_names": ["sections"]
+ "widget_names": ["DisBackButton", "sections"]
+
],
"installation": $[
// tab header
@@ -893,9 +926,9 @@
`VStretch ()
), `HStretch ()),
"widget_names": (lt == "none" || lt == "default")
- ? [ "loader_type", "loader_options" ]
+ ? [ "loader_type", "loader_options", "DisBackButton"]
: [ "loader_type", "loader_options", "loader_location",
- "inst_details" ]
+ "inst_details", "DisBackButton" ]
],
];
};
@@ -951,7 +984,12 @@
"handle" : InstDetailsButtonHandle,
"help" : InstDetailsHelp (),
],
+
+ "DisBackButton" : DisBackButton(),
];
+
+
+
return _common_global_widgets;
}
Modified: trunk/bootloader/src/routines/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/wizards.ycp?rev=47593&r1=47592&r2=47593&view=diff
==============================================================================
--- trunk/bootloader/src/routines/wizards.ycp (original)
+++ trunk/bootloader/src/routines/wizards.ycp Thu May 15 17:51:04 2008
@@ -22,6 +22,7 @@
import "Sequencer";
import "Wizard";
import "Report";
+import "Popup";
include "bootloader/routines/dialogs.ycp";
include "bootloader/generic/wizards.ycp";
@@ -132,6 +133,7 @@
Wizard::SetTitleIcon("bootloader"); // no .desktop file in inst-sys
else
Wizard::SetDesktopIcon("bootloader");
+
symbol ret = MainSequence ();
UI::CloseDialog();
return ret;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
