Author: jsuchome
Date: Wed Mar 19 08:21:07 2008
New Revision: 45581
URL: http://svn.opensuse.org/viewcvs/yast?rev=45581&view=rev
Log:
- yast2-storage required for build (bnc#359719)
- fixed expert summary layout (bnc#366358)
- fixed selection of minimal package set (bnc#366865)
- do not show package progress in wizard window
- 2.16.5
Modified:
trunk/repair/VERSION
trunk/repair/package/yast2-repair.changes
trunk/repair/src/OSRCommon.ycp
trunk/repair/src/OSRDirect.ycp
trunk/repair/src/OSRPkg.ycp
trunk/repair/src/OSRRepairUI.ycp
trunk/repair/src/osr_module_packages.ycp
trunk/repair/yast2-repair.spec.in
Modified: trunk/repair/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/VERSION (original)
+++ trunk/repair/VERSION Wed Mar 19 08:21:07 2008
@@ -1 +1 @@
-2.16.4
+2.16.5
Modified: trunk/repair/package/yast2-repair.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.changes?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/package/yast2-repair.changes (original)
+++ trunk/repair/package/yast2-repair.changes Wed Mar 19 08:21:07 2008
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Mar 19 08:03:14 CET 2008 - jsuchome@suse.cz
+
+- yast2-storage required for build (bnc#359719)
+- fixed expert summary layout (bnc#366358)
+- fixed selection of minimal package set (bnc#366865)
+- do not show package progress in wizard window
+- 2.16.5
+
+-------------------------------------------------------------------
Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
- added 'StartupNotify=true' to the desktop file (bnc #304964)
Modified: trunk/repair/src/OSRCommon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRCommon.ycp?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/src/OSRCommon.ycp (original)
+++ trunk/repair/src/OSRCommon.ycp Wed Mar 19 08:21:07 2008
@@ -26,6 +26,10 @@
textdomain "repair";
+
+// original value of progress status (before manipulation with our progress)
+global boolean progress_orig = true;
+
/**
* Functions that could be used as a default in lookups for functin pointers
* @return false
Modified: trunk/repair/src/OSRDirect.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRDirect.ycp?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/src/OSRDirect.ycp (original)
+++ trunk/repair/src/OSRDirect.ycp Wed Mar 19 08:21:07 2008
@@ -101,17 +101,7 @@
string text = "";
foreach (string key, map data, (map >)direct_methods , ``{
- string item = "";
- if (UI::HasSpecialWidget(`DownloadProgress))
- {
- item = "<tr><th width=30 colspan=2> %1 </th><th></th></tr>"
- + "<tr> <td width=30> </th> <td width=370>%2</th></tr>"
- + "<tr><td> </th><td></th></tr>";
- }
- else
- {
- item = "<li>%1 </li> <li>%2 </li> <li> </li><br>";
- }
+ string item = "<li>%1 </li> <li>%2 </li> <li> </li><br>";
data["description"] = mergestring (
splitstring (data["description"]:"", "\n"), " ");
@@ -124,15 +114,7 @@
menu_button_items = add (menu_button_items,
`item (`id(key), data["button_text"]:""));
});
- if (UI::HasSpecialWidget(`DownloadProgress))
- {
- direct_items = add (direct_items,
- `RichText(`id(`options),sformat("<table>%1</table>",text)));
- }
- else
- {
- direct_items = add (direct_items,`RichText(`id(`options),text));
- }
+ direct_items = add (direct_items,`RichText(`id(`options),text));
direct_items = add (direct_items,
// menubutton label
Modified: trunk/repair/src/OSRPkg.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkg.ycp?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/src/OSRPkg.ycp (original)
+++ trunk/repair/src/OSRPkg.ycp Wed Mar 19 08:21:07 2008
@@ -200,7 +200,7 @@
}
if (minimal_selection == [] || minimal_selection == nil)
{
- DefaultDesktop::SetDesktop ("text");
+ DefaultDesktop::SetDesktop ("textmode");
list<string> pats = DefaultDesktop::PatternsToSelect ();
foreach (string p, pats, {
Modified: trunk/repair/src/OSRRepairUI.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRRepairUI.ycp?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/src/OSRRepairUI.ycp (original)
+++ trunk/repair/src/OSRRepairUI.ycp Wed Mar 19 08:21:07 2008
@@ -126,6 +126,8 @@
integer no_of_steps = 6;
+ OSRCommon::progress_orig = Progress::status ();
+
// We do not set help text here, because it was set outside
if(!OSRMode::script)
Progress::New ( init_dialog_caption, " ", no_of_steps,
Modified: trunk/repair/src/osr_module_packages.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_packages.ycp?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/src/osr_module_packages.ycp (original)
+++ trunk/repair/src/osr_module_packages.ycp Wed Mar 19 08:21:07 2008
@@ -18,6 +18,7 @@
textdomain "repair";
import "Popup";
+ import "Progress";
import "Report";
import "Stage";
@@ -80,14 +81,13 @@
}
/**
- *
+ * Search for package database
*/
define boolean OSRPackagesDBFind() ``{
- /////////////////////////////////////////////////////////////////////////
- //
- //
- //
- /////////////////////////////////////////////////////////////////////////
+
+ // no package callbacks in wizard window
+ Progress::set (false);
+
if ( OSRPkg::CheckDB (OSRSystem::TargetRoot()))
{
// summary text
@@ -215,7 +215,14 @@
return OSRPackagesVerifyPackages ("all");
}
+ /**
+ * Direct method "Verify Installed Software" (from Expert tools)
+ */
define symbol OSRDirectPackageCheck()``{
+
+ // no package callbacks in wizard window
+ Progress::set (false);
+
symbol ret = `next;
// radio button label
string sret = _("Base Packages Only");
@@ -266,17 +273,21 @@
OSRFstab::Reset();
OSRPkg::Reset();
+ // progress was off due to package callbacks
+ Progress::set (OSRCommon::progress_orig);
y2milestone("Direct package check");
return ret;
}
/**
- * Reset boot loader temporary settings.
+ * Reset packager temporary settings.
*/
define boolean OSRPackagesReset() ``{
OSRSystem::SetOrgRoot();
OSRPkg::Reset();
+ // progress was off due to package callbacks
+ Progress::set (OSRCommon::progress_orig);
return true;
}
@@ -355,7 +366,7 @@
"packages_verify_base" :
$[
// module action label
- "text" : _("Verify Base Packages (time consuming)"),
+ "text" : _("Verify Base Packages"),
// helptext
"help" : sformat("
<P>%1</P>
@@ -491,26 +502,4 @@
- /*
- integer arg_n = 0;
- //////////////////////////////////////////////////////////////////////
- //
- // MAIN
- //
- //////////////////////////////////////////////////////////////////////
- while ( arg_n < size(WFM::Args()) )
- {
- if ( WFM::Args(arg_n) == .init )
- {
- y2milestone("Argument: %1", WFM::Args(arg_n));
- return OSRPackagesInit();
- }
- else
- {
- y2error("ERROR: unknown option %1", WFM::Args(arg_n) );
- return $[];
- }
- arg_n = arg_n + 1;
- }
- */
}//EOF
Modified: trunk/repair/yast2-repair.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/yast2-repair.spec.in?rev=45581&r1=45580&r2=45581&view=diff
==============================================================================
--- trunk/repair/yast2-repair.spec.in (original)
+++ trunk/repair/yast2-repair.spec.in Wed Mar 19 08:21:07 2008
@@ -1,7 +1,7 @@
@HEADER-COMMENT@
@HEADER@
-BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2 yast2-bootloader yast2-testsuite yast2-packager
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2 yast2-bootloader yast2-testsuite yast2-packager yast2-storage
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
BuildArchitectures: noarch
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
