Author: mvidner
Date: Thu Jul 10 19:03:46 2008
New Revision: 48979
URL: http://svn.opensuse.org/viewcvs/yast?rev=48979&view=rev
Log:
Added a nesting stack (bnc#406138).
Added LastTab() so that some modules continue to work (bnc#134386).
Modified:
trunk/yast2/library/cwm/src/CWMTab.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/library/cwm/src/CWMTab.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMTab.ycp?rev=48979&r1=48978&r2=48979&view=diff
==============================================================================
--- trunk/yast2/library/cwm/src/CWMTab.ycp (original)
+++ trunk/yast2/library/cwm/src/CWMTab.ycp Thu Jul 10 19:03:46 2008
@@ -29,7 +29,7 @@
*/
const string default_tab_header = _("Tab");
-// local variables
+// local variables - remember to add them to Push+Pop
/**
* ID of the currently displayed tab
@@ -51,6 +51,36 @@
*/
map previous_tab_map = $[];
+/**
+ * this one is expressly excluded from Push+Pop
+ */
+string last_tab_id = nil;
+
+/**
+ * nesting stack, needed because of bnc#406138
+ */
+list > stack = [];
+
+void Push() {
+ map tos = $[
+ "cti": current_tab_id,
+ "pti": previous_tab_id,
+ "ctm": current_tab_map,
+ "ptm": previous_tab_map,
+ ];
+ stack = prepend (stack, tos);
+}
+
+void Pop() {
+ map tos = stack[0]:$[];
+ current_tab_id = tos["cti"]:"";
+ previous_tab_id = tos["pti"]:"";
+ current_tab_map = tos["ctm"]:$[];
+ previous_tab_map = tos["ptm"]:$[];
+ stack[0] = nil;
+ stack = filter (map m, stack, ``( m != nil));
+}
+
// local functions
/**
@@ -170,6 +200,7 @@
* @param key strnig the widget key
*/
global define void Init (map widget, string key) {
+ Push();
InitNewTab (widget["initial_tab"]:"", widget);
}
@@ -179,6 +210,8 @@
*/
global define void CleanUp (string key) {
TabCleanup (current_tab_map);
+ last_tab_id = current_tab_id;
+ Pop();
}
/**
@@ -237,6 +270,15 @@
}
/**
+ * Get the ID of the last displayed tab (after CWM::Run is done).
+ * It is needed because of bnc#134386.
+ * @return string the ID of the last displayed tab
+ */
+global string LastTab () {
+ return last_tab_id;
+}
+
+/**
* A hook to handle Alt-Ctrl-Shift-D
*/
void handleDebug () {
Modified: trunk/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=48979&r1=48978&r2=48979&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Thu Jul 10 19:03:46 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jul 10 19:02:22 CEST 2008 - mvidner@suse.cz
+
+- CWMTab: Added a nesting stack (bnc#406138); added LastTab() so
+ that some modules continue to work (bnc#134386).
+
+-------------------------------------------------------------------
Wed Jul 9 15:22:52 CEST 2008 - locilka@suse.cz
- Making ProductControl::InitAutomaticConfiguration public to make
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
