Author: aschnell Date: Mon Apr 21 10:35:53 2008 New Revision: 46885 URL: http://svn.opensuse.org/viewcvs/yast?rev=46885&view=rev Log: - show udev path or id if desired Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.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-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp 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/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Mon Apr 21 10:35:53 2008 @@ -46,10 +46,6 @@ } - list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, - `mount_point, `mount_by, `used_by ]); - - void CreateAllPanel(any user_data) { import "Hostname"; @@ -57,6 +53,15 @@ string short_hostname = Hostname::CurrentHostname(); map<string, map> target_map = Storage::GetTargetMap(); + 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; }); + UI::ReplaceWidget(`tree_panel, `VBox( `Left(`Heading( sformat(_("Available Storage on %1"), short_hostname))), @@ -84,6 +89,7 @@ void HandleAllPanel(any user_data, any widget) { + /* if (widget == `filter) { symbol old_filter = filter_; @@ -95,5 +101,6 @@ UI::ChangeWidget(`table, `Items, table_list); } } + */ } } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Mon Apr 21 10:35:53 2008 @@ -31,10 +31,15 @@ void CreateHdMainPanel(any user_data) { - list<symbol> fields = StorageFields::Filter([ `device, `size, `format, + 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; }); + term header = StorageFields::TableHeader(fields); map<string, map> target_map = Storage::GetTargetMap(); @@ -203,10 +208,15 @@ } } - list<symbol> fields = StorageFields::Filter([ `device, `size, `format, + 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; }); + term header = StorageFields::TableHeader(fields); map<string, map> tg = 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/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Mon Apr 21 10:35:53 2008 @@ -212,8 +212,13 @@ } } - list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, - `used_by ]); + 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; }); term header = StorageFields::TableHeader(fields); list table_list = StorageFields::TableContents(fields, tg, predicate); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Mon Apr 21 10:35:53 2008 @@ -26,6 +26,10 @@ include "partitioning/ep-lib.ycp"; include "partitioning/ep-dialogs.ycp"; + include "partitioning/ep-settings.ycp"; + include "partitioning/ep-log.ycp"; + + include "partitioning/ep-all.ycp"; include "partitioning/ep-hd.ycp"; include "partitioning/ep-lvm.ycp"; include "partitioning/ep-raid.ycp"; @@ -34,11 +38,6 @@ include "partitioning/ep-nfs.ycp"; include "partitioning/ep-unused.ycp"; - include "partitioning/ep-all.ycp"; - - include "partitioning/ep-settings.ycp"; - include "partitioning/ep-log.ycp"; - void MakeNavigationTree(map open_items, list<term>& tree, map<any, map>& data) { @@ -52,7 +51,7 @@ `dm : $[ `create : CreateDmMainPanel, `handle : HandleDmMainPanel ], `nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ], `unused : $[ `create : CreateUnusedPanel, `handle : HandleUnusedPanel ], - `settings : $[ `create : CreateSettingsPanel, `destroy : DestroySettingsPanel ], + `settings : $[ `create : CreateSettingsPanel, `handle : HandleSettingsPanel, `destroy : DestroySettingsPanel ], `log : $[ `create : CreateLogPanel, `handle : HandleLogPanel, `destroy : DestroyLogPanel ] ]; map<symbol, list> subtree = $[]; @@ -72,13 +71,15 @@ list<term> tmp = []; foreach(map partition, partitions, { string part_device = partition["device"]:""; - tmp = add(tmp, `item(`id(part_device), part_device, open(part_device))); + string part_displayname = 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) { - subtree[type] = add(subtree[type]:[], `item(`id(disk_device), disk_device, open(disk_device), tmp)); + string disk_displayname = 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 ])); } else @@ -191,7 +192,7 @@ term contents = `MarginBox(0.5, 0.5, `HBox( - `HWeight(30, + `HWeight(30, `VBox( `Tree(`id(`tree), `opt(`notify), _("System View"), tree) ) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Mon Apr 21 10:35:53 2008 @@ -94,7 +94,13 @@ } } - list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, `used_by ]); + 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; }); term header = StorageFields::TableHeader(fields); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Mon Apr 21 10:35:53 2008 @@ -39,14 +39,14 @@ `VBox( `Left(`Heading("Settings")), `VBox( - `Left(`ComboBoxSelected(`id(`preferred_displayname), + `Left(`ComboBoxSelected(`id(`preferred_displayname), `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))), - `Left(`ComboBoxSelected(`id(`default_mountby), + `Left(`ComboBoxSelected(`id(`default_mountby), "Default Mount by", [`item(`id(`name), "Device Name"), `item(`id(`label), "Volume Label"), @@ -69,10 +69,40 @@ } + void HandleSettingsPanel(any user_data, any widget) + { + if (widget == `preferred_displayname) { + preferred_displayname = (symbol) UI::QueryWidget(`id(`preferred_displayname), `Value); + UpdateNavigationTree(nil); + } + } + + void DestroySettingsPanel(any user_data) { - preferred_displayname = (symbol) UI::QueryWidget(`id(`preferred_displayname), `Value); 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/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Mon Apr 21 10:35:53 2008 @@ -364,7 +364,7 @@ case `udev_id: { if (style == `table) { - return mergestring(data["udev_id"]:[], " "); + return data["udev_id", 0]:""; } else { string ret = ""; integer i = 1; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org