Author: aschnell Date: Fri Mar 28 11:32:16 2008 New Revision: 45822 URL: http://svn.opensuse.org/viewcvs/yast?rev=45822&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Fri Mar 28 11:32:16 2008 @@ -163,4 +163,24 @@ return $[ `widget : widget, `size : 42 ]; } + + + void DisplayCommandOutput(string command) + { + // TODO: maybe use LogView.ycp, but here we want to wait until the command has finished + // TODO: better error handling + + UI::OpenDialog(`VBox( + `MinWidth(60, `LogView(`id(`log), "Out&put of " + command, 15, 0)), + `PushButton(`opt(`default), Label::CloseButton()) + )); + + map tmp = (map) SCR::Execute(.target.bash_output, command); + + string lines = tmp["stderr"]:"" != "" ? tmp["stderr"]:"" : tmp["stdout"]:""; + UI::ChangeWidget(`id(`log), `Value, lines); + + UI::UserInput(); + UI::CloseDialog(); + } } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp Fri Mar 28 11:32:16 2008 @@ -41,7 +41,6 @@ `Left(`Heading("DM: " + part_device)), `HStretch(), StorageFields::Overview(fields, target_map, part_device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `HStretch() Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Fri Mar 28 11:32:16 2008 @@ -52,12 +52,10 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - `BarGraph([ 450, 100 ]), StorageFields::Overview(fields, tg, device), - `VStretch(), `HBox( `PushButton(`id(`smart), "Smart..." ), - `PushButton( "HD Param..." ), + `PushButton(`id(`hdparm), "HD Parm..." ), `HStretch() ) ) @@ -67,9 +65,15 @@ void HandleHdDiskOverviewTab(any user_data, any widget) { + string disk_device = (string) user_data; + if (widget == `smart) { - Popup::YesNo (_("Smart whatever")); + DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); + } + else if (widget == `hdparm) + { + DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); } } @@ -197,7 +201,6 @@ `HStretch(), `Left(`Heading("Partition: " + device)), StorageFields::Overview(fields, tg, device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `PushButton(`id(`resize), "Resize..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp Fri Mar 28 11:32:16 2008 @@ -49,7 +49,6 @@ `Left(`Heading("Crypt File: " + part_device)), `HStretch(), StorageFields::Overview(fields, target_map, part_device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `PushButton(`id(`delete), "Delete..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Fri Mar 28 11:32:16 2008 @@ -59,9 +59,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - `BarGraph([ 500, 150 ]), StorageFields::Overview(fields, tg, device), - `VStretch(), `HBox( `PushButton(`id(`delete), "Delete..."), `HStretch() @@ -242,7 +240,6 @@ `HStretch(), `Left(`Heading("Logical Volume: " + device)), StorageFields::Overview(fields, tg, device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `PushButton(`id(`resize), "Resize..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp Fri Mar 28 11:32:16 2008 @@ -49,7 +49,6 @@ `Left(`Heading("NFS Path: " + part_device)), `HStretch(), StorageFields::Overview(fields, target_map, part_device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `PushButton(`id(`delete), "Delete..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Fri Mar 28 11:32:16 2008 @@ -46,7 +46,6 @@ `VBox( `HStretch(), StorageFields::Overview(fields, tg, part_device), - `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), `PushButton(`id(`delete), "Delete..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp Fri Mar 28 11:32:16 2008 @@ -765,6 +765,7 @@ *---------------------------------------------------------------------- * * TODO: also defined in partition_defines.ycp, remove one + * TODO: has different rounding than before; check if ok */ global string ByteToHumanStringWithZero(integer number) { Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=45822&r1=45821&r2=45822&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Fri Mar 28 11:32:16 2008 @@ -646,6 +646,6 @@ return MakeSubInfo(disk, part, field, `overview); }), ""); - return `RichText(`opt(`plainText), ret); + return `RichText(`opt(`plainText, `hstretch, `vstretch), ret); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org