Author: aschnell Date: Tue Jun 17 22:29:55 2008 New Revision: 48371 URL: http://svn.opensuse.org/viewcvs/yast?rev=48371&view=rev Log: - added functions to handle hidden fields Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp 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=48371&r1=48370&r2=48371&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 22:29:55 2008 @@ -40,13 +40,13 @@ `Left(`ComboBoxSelected(`id(`display_name), `opt(`notify), //FIXME: find some better wording "Preferred Display Name", - [`item(`id(`name), "Device Name"), + [`item(`id(`device), "Device Name"), `item(`id(`id), "Device ID"), `item(`id(`path), "Device Path")], `id(StorageSettings::GetDisplayName()))), `Left(`ComboBoxSelected(`id(`default_mountby), "Default Mount by", - [`item(`id(`name), "Device Name"), + [`item(`id(`device), "Device Name"), `item(`id(`label), "Volume Label"), `item(`id(`uuid), "UUID"), `item(`id(`id), "Device ID"), Modified: 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=48371&r1=48370&r2=48371&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp Tue Jun 17 22:29:55 2008 @@ -13,15 +13,16 @@ symbol display_name = nil; - list<symbol> hide_table = []; - list<symbol> hide_overview = []; + list<symbol> hidden_fields = nil; 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)); + string tmp = substring(tostring(display_name), 1); + SCR::Write(.sysconfig.storage.DISPLAY_NAME, tmp); } global symbol GetDisplayName() @@ -29,10 +30,10 @@ if (display_name == nil) { string tmp = (string) SCR::Read(.sysconfig.storage.DISPLAY_NAME); - if (tmp == nil || !contains([ "name", "id", "path" ], tmp)) - tmp = "name"; + if (tmp == nil || !contains([ "device", "id", "path" ], tolower(tmp))) + tmp = "device"; - display_name = symbolof(toterm(tmp)); + display_name = symbolof(toterm(tolower(tmp))); } return display_name; @@ -42,7 +43,7 @@ { string ret = ""; - switch(GetDisplayName()) + switch (GetDisplayName()) { case `path: ret = data["udev_path"]:""; @@ -60,9 +61,36 @@ } + global void SetHiddenFields(list<symbol> new_hidden_fields) + { + hidden_fields = new_hidden_fields; + + // TODO: during installation? + string tmp = mergestring(maplist(symbol field, hidden_fields, { + return substring(tostring(field), 1); + }), " "); + SCR::Write(.sysconfig.storage.DISPLAY_NAME, tmp); + } + + global list<symbol> GetHiddenFields() + { + if (hidden_fields == nil) + { + string tmp = (string) SCR::Read(.sysconfig.storage.HIDDEN_FIELDS); + if (tmp == nil) + tmp = ""; + + hidden_fields = maplist(string field, splitstring(tmp, " \t"), { + return symbolof(toterm(tolower(field))); + }); + } + + return hidden_fields; + } + global list<symbol> FilterTable(list<symbol> fields) { - fields = filter(symbol field, fields, { return !contains(hide_table, field); }); + fields = filter(symbol field, fields, { return !contains(GetHiddenFields(), field); }); if (GetDisplayName() != `path) fields = filter(symbol field, fields, { return field != `udev_path; }); @@ -72,10 +100,9 @@ return fields; } - global list<symbol> FilterOverview(list<symbol> fields) { - fields = filter(symbol field, fields, { return !contains(hide_overview, field); }); + fields = filter(symbol field, fields, { return !contains(GetHiddenFields(), field); }); return fields; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org