Author: aschnell
Date: Tue Jun 17 21:09:22 2008
New Revision: 48370
URL: http://svn.opensuse.org/viewcvs/yast?rev=48370&view=rev
Log:
- remember display name
Added:
branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.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-dialogs.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.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/include/ep-settings.ycp
branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp
branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am
branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Tue Jun 17 21:09:22 2008
@@ -12,14 +12,9 @@
{
string short_hostname = Hostname::CurrentHostname();
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size,
- `format, `type, `mount_point, `mount_by,
- `used_by ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size,
+ `format, `type, `mount_point, `mount_by,
+ `used_by ]);
map target_map = Storage::GetTargetMap();
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=48370&r1=48369&r2=48370&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 Tue Jun 17 21:09:22 2008
@@ -15,7 +15,7 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_DM]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `fs_type, `mount_point ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `fs_type, `mount_point ]);
map target_map = Storage::GetTargetMap();
@@ -48,9 +48,9 @@
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `used_by,
- `heading_filesystem, `fs_type, `mount_point,
- `mount_by, `uuid, `label ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by,
+ `heading_filesystem, `fs_type, `mount_point,
+ `mount_by, `uuid, `label ]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
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=48370&r1=48369&r2=48370&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 17 21:09:22 2008
@@ -19,14 +19,9 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_DMRAID, `CT_DISK]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format,
- `type, `mount_point, `mount_by,
- `start_cyl, `end_cyl, `used_by ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `format,
+ `type, `mount_point, `mount_by,
+ `start_cyl, `end_cyl, `used_by ]);
map target_map = Storage::GetTargetMap();
@@ -157,9 +152,9 @@
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `udev_path,
- `udev_id, `used_by, `heading_hd, `vendor,
- `model, `bus, `bios_id, `disk_label ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `udev_path,
+ `udev_id, `used_by, `heading_hd, `vendor,
+ `model, `bus, `bios_id, `disk_label ]);
UI::ReplaceWidget(`tab_panel,
`VBox(
@@ -201,14 +196,9 @@
return StorageFields::PredicateDiskDevice(disk, partition, [ device ]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format,
- `type, `mount_point, `mount_by,
- `start_cyl, `end_cyl, `used_by ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `format,
+ `type, `mount_point, `mount_by,
+ `start_cyl, `end_cyl, `used_by ]);
map target_map = Storage::GetTargetMap();
@@ -294,7 +284,7 @@
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
- `IconAndHeading(sformat(_("Hard Disk: %1"), DisplayName(disk)), hd_icon),
+ `IconAndHeading(sformat(_("Hard Disk: %1"), StorageSettings::DisplayName(disk)), hd_icon),
TabPanel::DumbTab(`id(`tab), [
`item(`id(`overview), _("Overview")),
`item(`id(`partitions), _("Partitions"))
@@ -321,16 +311,16 @@
map target_map = Storage::GetTargetMap();
map part = Storage::GetPartition(target_map, device);
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `udev_path,
- `udev_id, `used_by, `heading_filesystem,
- `fs_type, `mount_point, `mount_by, `uuid,
- `label, `encrypted ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `udev_path,
+ `udev_id, `used_by, `heading_filesystem,
+ `fs_type, `mount_point, `mount_by, `uuid,
+ `label, `encrypted ]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
`HStretch(),
- `IconAndHeading(sformat(_("Partition: %1"), DisplayName(part)), hd_part_icon),
+ `IconAndHeading(sformat(_("Partition: %1"), StorageSettings::DisplayName(part)), hd_part_icon),
StorageFields::Overview(fields, target_map, device),
`HBox(
`PushButton(`id(`edit), _("Edit...")),
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=48370&r1=48369&r2=48370&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 17 21:09:22 2008
@@ -16,7 +16,7 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_LOOP]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `mount_point ]);
map target_map = Storage::GetTargetMap();
@@ -58,8 +58,8 @@
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `file_path,
- `heading_filesystem, `fs_type, `mount_point ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `file_path,
+ `heading_filesystem, `fs_type, `mount_point ]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Tue Jun 17 21:09:22 2008
@@ -19,12 +19,7 @@
list<string> pvs = [];
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]);
map target_map = Storage::GetTargetMap();
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=48370&r1=48369&r2=48370&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 17 21:09:22 2008
@@ -18,9 +18,9 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_LVM]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type,
- `mount_point, `mount_by, `used_by,
- `lvm_metadata, `pe_size, `stripes ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `format, `type,
+ `mount_point, `mount_by, `used_by,
+ `lvm_metadata, `pe_size, `stripes ]);
map target_map = Storage::GetTargetMap();
@@ -62,8 +62,8 @@
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size,
- `heading_lvm, `lvm_metadata, `pe_size ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size,
+ `heading_lvm, `lvm_metadata, `pe_size ]);
UI::ReplaceWidget(`tab_panel,
`VBox(
@@ -114,9 +114,9 @@
return StorageFields::PredicateDiskDevice(disk, partition, [ device ]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type,
- `mount_point, `mount_by, `used_by,
- `lvm_metadata, `pe_size, `stripes ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `format, `type,
+ `mount_point, `mount_by, `used_by,
+ `lvm_metadata, `pe_size, `stripes ]);
map target_map = Storage::GetTargetMap();
@@ -172,13 +172,8 @@
return StorageFields::PredicateUsedByDevice(disk, partition, [ disk_device ]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size,
- `format, `type, `used_by ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size,
+ `format, `type, `used_by ]);
map target_map = Storage::GetTargetMap();
@@ -231,10 +226,10 @@
string device = (string) user_data;
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `used_by,
- `heading_lvm, `stripes, `heading_filesystem,
- `fs_type, `mount_point, `mount_by, `uuid,
- `label, `encrypted ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by,
+ `heading_lvm, `stripes, `heading_filesystem,
+ `fs_type, `mount_point, `mount_by, `uuid,
+ `label, `encrypted ]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Tue Jun 17 21:09:22 2008
@@ -13,6 +13,7 @@
import "TreePanel";
import "Popup";
import "StorageFields";
+ import "StorageSettings";
import "MiniWorkflow";
import "Greasemonkey";
import "Partitions";
@@ -97,14 +98,14 @@
list<term> tmp = [];
foreach(map partition, partitions, {
string part_device = partition["device"]:"";
- string part_displayname = DisplayName(partition);
+ string part_displayname = StorageSettings::DisplayName(partition);
tmp = add(tmp, `item(`id(part_device), part_displayname, open(part_device)));
data = add(data, part_device, union(a, $[ `user_data : part_device ]));
});
if (b != nil)
{
- string disk_displayname = DisplayName(disk);
+ string disk_displayname = StorageSettings::DisplayName(disk);
subtree[type] = add(subtree[type]:[], `item(`id(disk_device), disk_displayname, open(disk_device), tmp));
data = add(data, disk_device, union(b, $[ `user_data : disk_device ]));
}
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=48370&r1=48369&r2=48370&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 17 21:09:22 2008
@@ -15,7 +15,7 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_NFS]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `mount_point ]);
map target_map = Storage::GetTargetMap();
@@ -57,8 +57,8 @@
map target_map = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size,
- `heading_filesystem, `fs_type, `mount_point ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size,
+ `heading_filesystem, `fs_type, `mount_point ]);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
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=48370&r1=48369&r2=48370&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 17 21:09:22 2008
@@ -15,8 +15,8 @@
return StorageFields::PredicateDiskType(disk, partition, [`CT_MD]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `size, `raid_type, `mount_point,
- `mount_by, `used_by ]);
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `raid_type, `mount_point,
+ `mount_by, `used_by ]);
map target_map = Storage::GetTargetMap();
@@ -56,10 +56,10 @@
map tg = Storage::GetTargetMap();
- list<symbol> fields = StorageFields::Filter([ `heading_device, `device, `size, `used_by,
- `heading_md, `raid_type, `chunk_size,
- `heading_filesystem, `fs_type, `mount_point,
- `mount_by, `uuid, `label, `encrypted ]);
+ list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by,
+ `heading_md, `raid_type, `chunk_size,
+ `heading_filesystem, `fs_type, `mount_point,
+ `mount_by, `uuid, `label, `encrypted ]);
UI::ReplaceWidget(`tab_panel,
`VBox(
@@ -97,13 +97,8 @@
return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]);
}
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size,
- `format, `type, `used_by ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size,
+ `format, `type, `used_by ]);
map target_map = Storage::GetTargetMap();
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Tue Jun 17 21:09:22 2008
@@ -13,7 +13,6 @@
`reiserfs : "reiserfs" ];
- symbol preferred_displayname = `name;
symbol default_mountby = `uuid;
symbol default_fs = `ext2;
@@ -38,13 +37,13 @@
`VBox(
`IconAndHeading(_("Settings"), settings_icon),
`VBox(
- `Left(`ComboBoxSelected(`id(`preferred_displayname), `opt(`notify),
+ `Left(`ComboBoxSelected(`id(`display_name), `opt(`notify),
//FIXME: find some better wording
"Preferred Display Name",
[`item(`id(`name), "Device Name"),
`item(`id(`id), "Device ID"),
`item(`id(`path), "Device Path")],
- `id(preferred_displayname))),
+ `id(StorageSettings::GetDisplayName()))),
`Left(`ComboBoxSelected(`id(`default_mountby),
"Default Mount by",
[`item(`id(`name), "Device Name"),
@@ -70,8 +69,8 @@
void HandleSettingsPanel(any user_data, symbol widget)
{
- if (widget == `preferred_displayname) {
- preferred_displayname = (symbol) UI::QueryWidget(`id(`preferred_displayname), `Value);
+ if (widget == `display_name) {
+ StorageSettings::SetDisplayName((symbol) UI::QueryWidget(`id(`display_name), `Value));
UpdateNavigationTree(nil);
}
}
@@ -82,26 +81,4 @@
default_mountby = (symbol) UI::QueryWidget(`id(`default_mountby), `Value);
default_fs = (symbol) UI::QueryWidget(`id(`default_fs), `Value);
}
-
-
- string DisplayName(map data)
- {
- string displayname = "";
-
- switch(preferred_displayname)
- {
- case `path:
- displayname = data["udev_path"]:"";
- break;
-
- case `id:
- displayname = data["udev_id", 0]:"";
- break;
- }
-
- if (displayname == "")
- displayname = data["device"]:"";
-
- return displayname;
- }
}
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-unused.ycp Tue Jun 17 21:09:22 2008
@@ -37,12 +37,7 @@
}
}
- list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `type ]);
-
- if (preferred_displayname != `path)
- fields = filter(symbol field, fields, { return field != `udev_path; });
- if (preferred_displayname != `id)
- fields = filter(symbol field, fields, { return field != `udev_id; });
+ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `type ]);
map target_map = Storage::GetTargetMap();
Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am?rev=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am Tue Jun 17 21:09:22 2008
@@ -20,6 +20,7 @@
StorageControllers.ycp \
StorageDevices.ycp \
StorageFields.ycp \
+ StorageSettings.ycp \
TreePanel.ycp \
TabPanel.ycp \
MiniWorkflow.ycp \
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=48370&r1=48369&r2=48370&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Tue Jun 17 21:09:22 2008
@@ -20,19 +20,6 @@
import "Integer";
- global list<symbol> Filter(list<symbol> fields)
- {
- if (Arch::ppc())
- {
- fields = filter(symbol field, fields, {
- return field != `start_cyl && field != `end_cyl;
- });
- }
-
- return fields;
- }
-
-
/**
* Call callback for every disk of target_map in a well defined sorted order.
*/
Added: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp?rev=48370&view=auto
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp (added)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp Tue Jun 17 21:09:22 2008
@@ -0,0 +1,82 @@
+/**
+ * File: StorageSettings.ycp
+ * Package: yast2-storage
+ * Summary: Expert Partitioner
+ * Authors: Arvin Schnell
+ */
+{
+ module "StorageSettings";
+
+
+ textdomain "storage";
+
+
+ symbol display_name = nil;
+
+ list<symbol> hide_table = [];
+ list<symbol> hide_overview = [];
+
+
+ global void SetDisplayName(symbol new_display_name)
+ {
+ display_name = new_display_name;
+ // TODO: during installation?
+ SCR::Write(.sysconfig.storage.DISPLAY_NAME, substring(tostring(display_name), 1));
+ }
+
+ global symbol GetDisplayName()
+ {
+ if (display_name == nil)
+ {
+ string tmp = (string) SCR::Read(.sysconfig.storage.DISPLAY_NAME);
+ if (tmp == nil || !contains([ "name", "id", "path" ], tmp))
+ tmp = "name";
+
+ display_name = symbolof(toterm(tmp));
+ }
+
+ return display_name;
+ }
+
+ global string DisplayName(map data)
+ {
+ string ret = "";
+
+ switch(GetDisplayName())
+ {
+ case `path:
+ ret = data["udev_path"]:"";
+ break;
+
+ case `id:
+ ret = data["udev_id", 0]:"";
+ break;
+ }
+
+ if (ret == "")
+ ret = data["device"]:"";
+
+ return ret;
+ }
+
+
+ global list<symbol> FilterTable(list<symbol> fields)
+ {
+ fields = filter(symbol field, fields, { return !contains(hide_table, field); });
+
+ if (GetDisplayName() != `path)
+ fields = filter(symbol field, fields, { return field != `udev_path; });
+ if (GetDisplayName() != `id)
+ fields = filter(symbol field, fields, { return field != `udev_id; });
+
+ return fields;
+ }
+
+
+ global list<symbol> FilterOverview(list<symbol> fields)
+ {
+ fields = filter(symbol field, fields, { return !contains(hide_overview, field); });
+
+ return fields;
+ }
+}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org