Author: aschnell
Date: Tue Nov 4 16:01:59 2008
New Revision: 52890
URL: http://svn.opensuse.org/viewcvs/yast?rev=52890&view=rev
Log:
- fixed sign of resize size
Modified:
trunk/storage/storage/src/include/ep-dialogs.ycp
Modified: trunk/storage/storage/src/include/ep-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=52890&r1=52889&r2=52890&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-dialogs.ycp Tue Nov 4 16:01:59 2008
@@ -500,8 +500,6 @@
//data i.e. partition
boolean DlgResize(map &data, map disk)
{
- y2milestone("haha %1", data);
-
integer cyl_size = disk["cyl_size"]:1;
integer free_cyl_after = Storage::FreeCylAfter( disk, data);
integer av_space = cyl_size * free_cyl_after;
@@ -638,7 +636,7 @@
}
AdjustUnits( size_data );
- used = ToUI( size_data["used"]:0 );
+ used = ToUI( size_data["used"]:0 );
free = ToUI( size_data["df_free"]:0 );
av_space =ToUI( av_space );
total = used + free + av_space;
@@ -665,8 +663,7 @@
term content = `Empty();
- if (UI::HasSpecialWidget(`BarGraph) &&
- UI::HasSpecialWidget(`Slider))
+ if (UI::HasSpecialWidget(`BarGraph) && UI::HasSpecialWidget(`Slider))
{
content = `VBox(
`BarGraph(`id(`graph), `opt(`vstretch), [used, free, av_space], BarGraphLabels() ),
@@ -710,14 +707,15 @@
UI::ChangeWidget(`help, `HelpText, help_text);
- any widget = nil;
+ symbol widget = nil;
integer old_size = used + free;
integer new_size = old_size;
do {
- widget = UI::UserInput();
- switch ( (symbol) widget)
+ widget = (symbol) UI::UserInput();
+
+ switch (widget)
{
case `new_size:
{
@@ -727,6 +725,7 @@
UI::ChangeWidget(`id(`free), `Value, sformat("%1: %2 %3", FreeSpaceLabel(), new_free, unit));
break;
}
+
case `ok:
{
if ( new_size != old_size )
@@ -735,10 +734,12 @@
//calculate the difference
list old_reg = data["region"]:[];
- list new_reg = [ data["region",0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ];
- integer diff = old_reg[1]:0 - new_reg[1]:0;
+ list new_reg = [ data["region", 0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ];
+
+ integer diff = new_reg[1]:0 - old_reg[1]:0;
y2milestone("ResizePartition - new size %1 %2, in cylinders %3", new_size, unit, diff);
+
data["region"] = new_reg;
//1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint
@@ -759,15 +760,16 @@
}
break;
}
+
case `cancel:
break;
}
- } while ( widget != `cancel && widget != `ok);
+ } while (widget != `cancel && widget != `ok);
UI::CloseDialog();
- return ( widget == `ok);
+ return widget == `ok;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
aschnell＠svn.opensuse.org