Author: aschnell
Date: Tue Jun 24 17:06:31 2008
New Revision: 48511
URL: http://svn.opensuse.org/viewcvs/yast?rev=48511&view=rev
Log:
- cleanup
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.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-lib.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -496,7 +496,7 @@
else if (flavour == `lv)
{
// Heading for dialog
- heading = _("Resize Volume Group");
+ heading = _("Resize Logical Volume");
// Labels for bar graph. "%1" will be replace with a numeric value.
bargraph_label_lv_used = _("LV\nUsed\n%1") + unit;
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp?rev=48511&r1=48510&r2=48511&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp Tue Jun 24 17:06:31 2008
@@ -89,4 +89,21 @@
TreePanel::Create();
}
}
+
+
+ void EpResizePartition(string device)
+ {
+ DlgResize(`part);
+ }
+
+
+ void EpDeletePartition(string device)
+ {
+ if (EpDeleteDevice(device))
+ {
+ // TODO: update tree and tab (with focus)
+ UpdateNavigationTree(nil);
+ TreePanel::Create();
+ }
+ }
}
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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -285,16 +285,11 @@
break;
case `resize:
- DlgResize(`part);
+ EpResizePartition(part_device);
break;
case `delete:
- if (EpDeleteDevice(part_device))
- {
- // TODO: update tree and tab (with focus)
- UpdateNavigationTree(nil);
- CreateHdDiskPartitionsTab(user_data);
- }
+ EpDeletePartition(part_device);
break;
}
}
@@ -378,15 +373,11 @@
break;
case `resize:
- DlgResize(`part);
+ EpResizePartition(part_device);
break;
case `delete:
- if (EpDeleteDevice(part_device))
- {
- // TODO: update tree (with focus)
- UpdateNavigationTree(nil);
- }
+ EpDeletePartition(part_device);
break;
}
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp?rev=48511&r1=48510&r2=48511&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lib.ycp Tue Jun 24 17:06:31 2008
@@ -140,31 +140,4 @@
return true;
}
-
-
- boolean EpDeleteVg(string vgname)
- {
- boolean ret = false;
-
- map tg = Storage::GetTargetMap();
- integer count = size(get_lv_names(tg, vgname));
-
- if (count > 0)
- {
- // Message popup
- Popup::Message(sformat(_("The volume group \"%1\" contains at least one logical
-volume. It cannot be removed. Remove all logical volumes then
-remove the volume group.
-"), vgname));
- }
- else
- {
- // popup text
- if (Popup::ContinueCancel(sformat(_("Really remove the volume group \"%1\"?"), vgname)))
- {
- ret = Storage::DeleteLvmVg(vgname);
- }
- }
- return ret;
- }
}
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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -31,7 +31,7 @@
`Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents),
`HBox(
- `Left(`PushButton(`id(`add_loop), _("Add Crypt File..."))),
+ `Left(`PushButton(`id(`add), _("Add Crypt File..."))),
`HStretch()
)
)
@@ -46,7 +46,7 @@
{
switch (widget)
{
- case `create_loop:
+ case `add:
break;
}
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp?rev=48511&r1=48510&r2=48511&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp Tue Jun 24 17:06:31 2008
@@ -8,19 +8,56 @@
textdomain "storage";
- void EpCreateLogicalVolume(string device)
+ void EpCreateVolumeGroup()
{
- if (DlgCreateLogicalVolume(device))
+ DlgCreateVolumeGroupNew();
+ }
+
+
+ void EpResizeVolumeGroup(string device)
+ {
+ if (DlgResizeVolumeGroup(device))
{
UpdateNavigationTree(nil);
TreePanel::Create();
}
}
+
+ void EpDeleteVolumeGroup(string device)
+ {
+ string vgname = substring(device, 5);
+
+ map tg = Storage::GetTargetMap();
+ integer count = size(get_lv_names(tg, vgname));
- void EpResizeVolumeGroup(string device)
+ if (count > 0)
+ {
+ // Message popup
+ Popup::Message(sformat(_("The volume group \"%1\" contains at least one logical
+volume. It cannot be removed. Remove all logical volumes then
+remove the volume group.
+"), vgname));
+ }
+ else
+ {
+ // popup text
+ if (Popup::ContinueCancel(sformat(_("Really remove the volume group \"%1\"?"), vgname)))
+ {
+ if (Storage::DeleteLvmVg(vgname))
+ {
+ // TODO: update tree (with focus)
+ UpdateNavigationTree(nil);
+ TreePanel::Create();
+ }
+ }
+ }
+ }
+
+
+ void EpCreateLogicalVolume(string device)
{
- if (DlgResizeVolumeGroup(device))
+ if (DlgCreateLogicalVolume(device))
{
UpdateNavigationTree(nil);
TreePanel::Create();
@@ -36,4 +73,15 @@
TreePanel::Create();
}
}
+
+
+ void EpResizeLogicalVolume(string device)
+ {
+ DlgResizeLogicalVolumeNew(device);
+ }
+
+
+ void EpDeleteLogicalVolume(string device)
+ {
+ }
}
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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -35,7 +35,7 @@
`Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents),
`HBox(
- `PushButton(`id(`create_vg), _("Add Volume Group...")),
+ `PushButton(`id(`add), _("Add Volume Group...")),
`HStretch()
)
)
@@ -50,8 +50,8 @@
{
switch (widget)
{
- case `create_vg:
- DlgCreateVolumeGroupNew();
+ case `add:
+ EpCreateVolumeGroup();
break;
}
}
@@ -83,25 +83,16 @@
void HandleLvmVgOverviewTab(any user_data, symbol widget)
{
string device = (string) user_data;
- string vgname = substring(device, 5);
switch (widget)
{
case `resize:
- {
- DlgResizeVolumeGroup(device);
+ EpResizeVolumeGroup(device);
break;
- }
case `delete:
- {
- if (EpDeleteVg(vgname))
- {
- // TODO: update tree (with focus)
- UpdateNavigationTree(`lvm);
- }
+ EpDeleteVolumeGroup(device);
break;
- }
}
}
@@ -156,11 +147,11 @@
break;
case `resize:
- DlgResizeLogicalVolumeNew(lv_device);
+ EpResizeLogicalVolume(lv_device);
break;
case `delete:
- EpDeleteDevice(lv_device);
+ EpDeleteLogicalVolume(lv_device);
break;
}
}
@@ -263,11 +254,11 @@
break;
case `resize:
- DlgResizeLogicalVolumeNew(device);
+ EpResizeLogicalVolume(device);
break;
case `delete:
- EpDeleteDevice(device);
+ EpDeleteLogicalVolume(device);
break;
}
}
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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -30,7 +30,7 @@
`Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents),
`HBox(
- `Left(`PushButton(`id(`create_nfs), _("Add NFS Path..."))),
+ `Left(`PushButton(`id(`add), _("Add NFS Path..."))),
`HStretch()
)
)
@@ -45,7 +45,7 @@
{
switch (widget)
{
- case `create_nfs:
+ case `add:
break;
}
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp?rev=48511&r1=48510&r2=48511&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp Tue Jun 24 17:06:31 2008
@@ -8,6 +8,12 @@
textdomain "storage";
+ void EpCreateRaid()
+ {
+ DlgCreateRaidNew();
+ }
+
+
void EpEditRaid(string device)
{
if (DlgEditRaid(device))
@@ -16,4 +22,15 @@
TreePanel::Create();
}
}
+
+
+ void EpResizeRaid(string device)
+ {
+ DlgResizeRaid(device);
+ }
+
+
+ void EpDeleteRaid(string device)
+ {
+ }
}
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=48511&r1=48510&r2=48511&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 Tue Jun 24 17:06:31 2008
@@ -35,7 +35,7 @@
`Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents),
`HBox(
- `Left(`PushButton(`id(`add_raid), _("Add RAID..."))),
+ `Left(`PushButton(`id(`add), _("Add RAID..."))),
`HStretch()
)
)
@@ -50,12 +50,9 @@
{
switch (widget)
{
- case `add_raid:
- {
- DlgCreateRaidNew();
+ case `add:
+ EpCreateRaid();
break;
- }
- break;
}
}
@@ -89,19 +86,20 @@
void HandleRaidOverviewTab(any user_data, symbol widget)
{
- string part_device = (string) user_data;
+ string device = (string) user_data;
switch (widget)
{
case `edit:
- EpEditRaid(part_device);
+ EpEditRaid(device);
break;
case `resize:
- DlgResizeRaid(part_device);
+ EpResizeRaid(device);
break;
case `delete:
+ EpDeleteRaid(device);
break;
}
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org