Author: aschnell Date: Wed Apr 23 16:48:37 2008 New Revision: 47003 URL: http://svn.opensuse.org/viewcvs/yast?rev=47003&view=rev Log: - cleanup Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp?rev=47003&r1=47002&r2=47003&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp Wed Apr 23 16:48:37 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -29,7 +28,7 @@ } - void HandleLogPanel(any user_data, any widget) + void HandleLogPanel(any user_data, symbol widget) { if (widget == `update || widget == `timeout) { 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=47003&r1=47002&r2=47003&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 Wed Apr 23 16:48:37 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -193,11 +192,9 @@ void CreateLvmVgPvsTab(any user_data) { - string device = (string) user_data; - - map tg = Storage::GetTargetMap(); + string part_device = (string) user_data; - symbol predicate(map disk, map partition) + symbol Predicate(map disk, map partition) { if (partition == nil) { @@ -205,7 +202,7 @@ } else { - if ("/dev/" + partition["used_by"]:"" == device) + if ("/dev/" + partition["used_by"]:"" == part_device) return `show; else return `ignore; @@ -220,19 +217,15 @@ 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); + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); UI::ReplaceWidget(`tab_panel, `VBox( - `Table(`opt(`keepSorting), - header, table_list - ), - `HBox( - // `PushButton(`id(`add), "Add..."), - // `PushButton(`id(`delete), "Delete..."), - `HStretch() - ) + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) ) ); } 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=47003&r1=47002&r2=47003&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 Wed Apr 23 16:48:37 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -81,7 +80,7 @@ { string part_device = (string) user_data; - symbol predicate(map disk, map partition) + symbol Predicate(map disk, map partition) { if (partition == nil) { @@ -104,16 +103,15 @@ if (preferred_displayname != `id) fields = filter(symbol field, fields, { return field != `udev_id; }); - term header = StorageFields::TableHeader(fields); + map target_map = Storage::GetTargetMap(); - map tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContents(fields, tg, predicate); + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); UI::ReplaceWidget(`tab_panel, `VBox( - `Table(`id(`table), `opt(`keepSorting), - header, table_list - ) + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) ) ); } 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=47003&r1=47002&r2=47003&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 Wed Apr 23 16:48:37 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -69,7 +68,7 @@ } - void HandleSettingsPanel(any user_data, any widget) + void HandleSettingsPanel(any user_data, symbol widget) { if (widget == `preferred_displayname) { preferred_displayname = (symbol) UI::QueryWidget(`id(`preferred_displayname), `Value); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org