[yast-commit] r48157 - in /trunk/repair: ./ package/ src/ testsuite/tests/

9 Jun 2008

Author: jsuchome
Date: Mon Jun  9 13:07:05 2008
New Revision: 48157

URL: http://svn.opensuse.org/viewcvs/yast?rev=48157&view=rev
Log:
- use ReplaceWidget instead of changing button label (bnc#393832)
- TextEntry is InputField
- import Product before changing root, product info can be read
- 2.17.0


Modified:
    trunk/repair/VERSION
    trunk/repair/package/yast2-repair.changes
    trunk/repair/src/OSRBoot.ycp
    trunk/repair/src/OSRPopup.ycp
    trunk/repair/src/OSRRepairUI.ycp
    trunk/repair/testsuite/tests/Init.ycp
    trunk/repair/testsuite/tests/OSRCheckGroupRequires.ycp
    trunk/repair/testsuite/tests/OSRDetect.ycp
    trunk/repair/testsuite/tests/OSRDetectFstab.ycp

Modified: trunk/repair/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================

--- trunk/repair/VERSION (original)
+++ trunk/repair/VERSION Mon Jun  9 13:07:05 2008
@@ -1 +1 @@
-2.16.12
+2.17.0

Modified: trunk/repair/package/yast2-repair.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.changes?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/package/yast2-repair.changes (original)
+++ trunk/repair/package/yast2-repair.changes Mon Jun  9 13:07:05 2008
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Jun  9 11:49:03 CEST 2008 - jsuchome@suse.cz
+
+- use ReplaceWidget instead of changing button label (bnc#393832)
+- TextEntry is InputField
+- import Product before changing root, product info can be read
+- 2.17.0
+
+-------------------------------------------------------------------
 Thu May 29 11:00:17 CEST 2008 - jsuchome@suse.cz
 
 - mount /proc, /dev, /sys before writing new bootloader (bnc#395302)

Modified: trunk/repair/src/OSRBoot.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRBoot.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/src/OSRBoot.ycp (original)
+++ trunk/repair/src/OSRBoot.ycp Mon Jun  9 13:07:05 2008
@@ -19,6 +19,9 @@
     import "Installation";
     import "Mode";
     import "Popup";
+    // import Product.ycp now, to correctly read product info from /content
+    // before chrooting to target system
+    import "Product";
     import "Wizard";
 
     import "Bootloader";

Modified: trunk/repair/src/OSRPopup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPopup.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/src/OSRPopup.ycp (original)
+++ trunk/repair/src/OSRPopup.ycp Mon Jun  9 13:07:05 2008
@@ -196,16 +196,15 @@
    */
   global define string ChangeFieldDialog(string org_value, string description )``{
 
-    UI::OpenDialog(
-	`VBox(
-	    `TextEntry(`id(`text) , description,org_value),
+    UI::OpenDialog (`HBox (`HSpacing (0.2), `VBox(
+	    `InputField (`id(`text), `opt (`hstretch), description, org_value),
 	    `VSpacing(1),
 	    `HBox (
 		`PushButton(`id(`ok), Label::OKButton()),
 		`HSpacing(2),
 		`PushButton(`id(`cancel), Label::CancelButton())
 	    )
-    ));
+    ), `HSpacing (0.2)));
 
     string ret = "";
     if (UI::UserInput() == `ok)

Modified: trunk/repair/src/OSRRepairUI.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRRepairUI.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/src/OSRRepairUI.ycp (original)
+++ trunk/repair/src/OSRRepairUI.ycp Mon Jun  9 13:07:05 2008
@@ -47,6 +47,9 @@
 
   string exit_label		= Label::FinishButton();
 
+  // button label
+  string pause_label		= _("&Pause");
+
   /**
    * Captions ...
    */
@@ -598,8 +601,6 @@
     string system_check_label	= _("System Check");
     // button label
     string show_all_label	= _("&Show All Details");
-    // button label
-    string pause_label		= _("&Pause");
 
     if ( UI::WidgetExists (`id(`local_rich_text_info ))) return;
 
@@ -623,7 +624,9 @@
 	global_progress_bar,
 	`VSpacing(0.3),
 	`HBox (
-	    `Left (`PushButton(`id(`pause), pause_label)),
+	    `Left (`ReplacePoint (`id (`rpbutton),
+		`PushButton(`id(`pause), pause_label))
+	    ),
 	    `Right (`CheckBox(`id(`details), `opt(`notify), show_all_label,
 		OSRSummary::show_details))
 	),
@@ -755,7 +758,8 @@
 	    if ( input == `pause )
 	    {
 		set_buttons_enable( true, false, false );
-		UI::ChangeWidget(`id(`pause), `Label, _("&Pause"));
+		UI::ReplaceWidget (`id (`rpbutton),
+		    `PushButton(`id(`pause), pause_label));
 
 		input = OSR::Detect();
 
@@ -775,7 +779,8 @@
 		if ( input == `pause )
 		{
 		    set_buttons_enable( true,true, true );
-		    UI::ChangeWidget(`id(`pause), `Label,  go_on_label );
+		    UI::ReplaceWidget (`id (`rpbutton),
+			`PushButton(`id(`pause), go_on_label));
 
 		    // wait in pause mode and let the user change the protocol
 		    // mode or abort

Modified: trunk/repair/testsuite/tests/Init.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/testsuite/tests/Init.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/testsuite/tests/Init.ycp (original)
+++ trunk/repair/testsuite/tests/Init.ycp Mon Jun  9 13:07:05 2008
@@ -26,6 +26,7 @@
 	"target" : $[
 	    "size" : -1,
 	    "tmpdir" : "/tmp/",
+	    "string"	: ""
 	],
     ];
 

Modified: trunk/repair/testsuite/tests/OSRCheckGroupRequires.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/testsuite/tests/OSRCheckGroupRequires.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/testsuite/tests/OSRCheckGroupRequires.ycp (original)
+++ trunk/repair/testsuite/tests/OSRCheckGroupRequires.ycp Mon Jun  9 13:07:05 2008
@@ -29,6 +29,7 @@
 	"target" : $[
 	    "size"	: -1,
 	    "tmpdir"	: "/tmp/",
+	    "string"	: ""
 	],
 	"product"	: $[
 	    "features"	: $[

Modified: trunk/repair/testsuite/tests/OSRDetect.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/testsuite/tests/OSRDetect.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/testsuite/tests/OSRDetect.ycp (original)
+++ trunk/repair/testsuite/tests/OSRDetect.ycp Mon Jun  9 13:07:05 2008
@@ -29,6 +29,7 @@
 	"target" : $[
 	    "size"	: -1,
 	    "tmpdir"	: "/tmp/",
+	    "string"	: "",
 	],
 	"product"	: $[
 	    "features"	: $[

Modified: trunk/repair/testsuite/tests/OSRDetectFstab.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/testsuite/tests/OSRDetectFstab.ycp?rev=48157&r1=48156&r2=48157&view=diff
==============================================================================
--- trunk/repair/testsuite/tests/OSRDetectFstab.ycp (original)
+++ trunk/repair/testsuite/tests/OSRDetectFstab.ycp Mon Jun  9 13:07:05 2008
@@ -33,6 +33,7 @@
 	"target" : $[
 	    "size"	: -1,
 	    "tmpdir"	: "/tmp/",
+	    "string"	: "",
 	],
 	"product"	: $[
 	    "features"	: $[

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r48157 - in /trunk/repair: ./ package/ src/ testsuite/tests/

jsuchome＠svn.opensuse.org