Author: aschnell
Date: Mon Sep 1 16:12:38 2008
New Revision: 50528
URL: http://svn.opensuse.org/viewcvs/yast?rev=50528&view=rev
Log:
- work on messages
Modified:
trunk/storage/storage/src/include/ep-hd-lib.ycp
Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h…
==============================================================================
--- trunk/storage/storage/src/include/ep-hd-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-hd-lib.ycp Mon Sep 1 16:12:38 2008
@@ -12,6 +12,7 @@
{
if (disk_device == nil)
{
+ // error popup
Popup::Error(_("No hard disk selected."));
return;
}
@@ -21,6 +22,7 @@
if (disk["used_by_device"]:"" != "")
{
+ // error popup
Popup::Error(_("The disk is in use and cannot be modified."));
return;
}
@@ -41,6 +43,7 @@
UI::OpenDialog(`opt(`decorated),
Greasemonkey::Transform(
`VBox(
+ // dialog heading
`Label(sformat(_("Select new partition table type for %1."), disk_device)),
`RadioButtonGroup(`id(`labels), tmp),
`HBox(
@@ -61,6 +64,7 @@
return;
}
+ // popup text, %1 is be replaced by disk name e.g. /dev/sda
if (Popup::YesNo(sformat(_("Really create new partition table on %1? This will delete all data
on %1 and all RAIDs and Volume Groups using partitions on %1."), disk_device)))
{
@@ -75,6 +79,7 @@
{
if (device == nil)
{
+ // error popup
Popup::Error(_("No disk selected."));
return;
}
@@ -84,6 +89,7 @@
if (disk["type"]:`CT_UNKNOWN == `CT_DMRAID)
{
+ // popup text
if (Popup::YesNo(sformat(_("Really delete BIOS RAID %1?"), device)))
{
if (deleteAllDevPartitions(disk, Stage::initial(), false))
@@ -94,6 +100,7 @@
}
else
{
+ // error popup
Popup::Error(_("The disk cannot be deleted."));
}
}
@@ -127,7 +134,7 @@
if (size(ret) == 0)
{
- // TODO: give detailed reasons esp. for msdos partition table
+ // error popup
string text = sformat(_("It is not possible to create a partition on %1."), disk_device);
Popup::Warning(text);
}
@@ -144,6 +151,7 @@
{
if (disk_device == nil)
{
+ // error popup
Popup::Error(_("No hard disk selected."));
return;
}
@@ -153,6 +161,7 @@
if (disk["used_by_device"]:"" != "")
{
+ // error popup
Popup::Error(_("The disk is in use and cannot be modified."));
return;
}
@@ -175,8 +184,6 @@
if (DlgCreatePartition(data))
{
- Debug("create partition with data", data);
-
string device = data["device"]:"error";
symbol mby = data["mountby"]:Storage::GetMountBy(device);
@@ -198,6 +205,7 @@
{
if (device == nil)
{
+ // error popup
Popup::Error(_("No partition selected."));
return;
}
@@ -207,6 +215,7 @@
if (data["used_by"]:"" != "")
{
+ // error popup, %1 is replace by partition device name e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
edited. To edit %1, make sure it is not used."), device));
return;
@@ -214,8 +223,6 @@
if (DlgEditPartition(data))
{
- Debug("edit partition from data", data);
-
Storage::ChangeVolumeProperties(data);
UpdateNavigationTree(nil);
@@ -229,6 +236,7 @@
{
if (device == nil)
{
+ // error popup
Popup::Error(_("No partition selected."));
return;
}
@@ -245,6 +253,7 @@
if (data["used_by"]:"" != "")
{
+ // error popup, %1 is replace by partition device name, e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
resized. To resize %1, make sure it is not used."), device));
return;
@@ -259,6 +268,7 @@
{
if (device == nil)
{
+ // error popup
Popup::Error(_("No partition selected."));
return;
}
@@ -281,7 +291,7 @@
if (!disk["dasdfmt"]:false)
{
- // popup text %1 is replaced by a dasd name e.g. /dev/dasda
+ // popup text, %1 is replaced by a dasd name e.g. /dev/dasda
boolean doit = Popup::YesNo(sformat(
_("Running dasdfmt deletes all data on the disk.
Really execute dasdfmt on disk %1?
@@ -294,6 +304,7 @@
}
else
{
+ // popup text
Popup::Message(_("The disk is no longer marked for dasdfmt.
Partitions currently present on this disk are again
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
Author: aschnell
Date: Mon Sep 1 14:28:31 2008
New Revision: 50522
URL: http://svn.opensuse.org/viewcvs/yast?rev=50522&view=rev
Log:
- work on helptexts
Modified:
trunk/storage/storage/src/modules/StorageFields.ycp
Modified: trunk/storage/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor…
==============================================================================
--- trunk/storage/storage/src/modules/StorageFields.ycp (original)
+++ trunk/storage/storage/src/modules/StorageFields.ycp Mon Sep 1 14:28:31 2008
@@ -305,7 +305,7 @@
break;
case `model:
- // helptext for table column and overview entry
+ // helptext for table column and overview entry
ret = ret + _("<b>Model</b> shows the device model.");
break;
@@ -370,7 +370,8 @@
case `type:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>Type</b> gives a general overview about the
+device type.");
break;
case `udev_id:
@@ -380,7 +381,7 @@
break;
case `udev_path:
- // helptext for table column and overview entry
+ // helptext for table column and overview entry
ret = ret + _("<b>Device Path</b> shows the persistent device
path. This field can be empty.");
break;
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
Author: aschnell
Date: Mon Sep 1 14:08:16 2008
New Revision: 50520
URL: http://svn.opensuse.org/viewcvs/yast?rev=50520&view=rev
Log:
- work on helptexts
Modified:
trunk/storage/storage/src/modules/StorageFields.ycp
Modified: trunk/storage/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor…
==============================================================================
--- trunk/storage/storage/src/modules/StorageFields.ycp (original)
+++ trunk/storage/storage/src/modules/StorageFields.ycp Mon Sep 1 14:08:16 2008
@@ -241,7 +241,8 @@
case `encrypted:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>Encrypted</b> shows whether the file system
+is encrypted.");
break;
case `end_cyl:
@@ -270,7 +271,8 @@
case `file_path:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>File Path</b> shows the path of the file for
+an encrypted loop device.");
break;
case `format:
@@ -282,12 +284,12 @@
case `fs_id:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>FS Id</b> shows the file system id.");
break;
case `fs_type:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>FS Type</b> shows the file system type.");
break;
case `label:
@@ -298,7 +300,8 @@
case `lvm_metadata:
// helptext for table column and overview entry
- // TODO
+ ret = ret + _("<b>Metadata</b> shows the LVM metadata type for
+volume groups.");
break;
case `model:
@@ -648,7 +651,7 @@
if (style == `table)
return value;
else
- return sformat(_("Metadata Type: %1"), value);
+ return sformat(_("Metadata: %1"), value);
}
case `pe_size:
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org