Author: aschnell Date: Thu Apr 24 12:19:56 2008 New Revision: 47022 URL: http://svn.opensuse.org/viewcvs/yast?rev=47022&view=rev Log: - consistency of dialogs - cleanup 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.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-unused.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -24,7 +24,7 @@ map target_map = Storage::GetTargetMap(); term table_header = StorageFields::TableHeader(fields); - list table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); + list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); UI::ReplaceWidget(`tree_panel, `VBox( 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -11,11 +10,26 @@ void CreateDmMainPanel(any user_data) { + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateType(disk, partition, [`CT_DM]); + } + + list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); + + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + UI::ReplaceWidget(`tree_panel, - `VBox( - `HStretch(), - `Left(`Heading("Device Mapper (DM)")), - `VStretch() + Greasemonkey::Transform( + `VBox( + `HStretch(), + `Left(`Heading(_("Device Mapper (DM)"))), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + ) ) ); @@ -23,7 +37,7 @@ } - void HandleDmMainPanel(any user_data, any widget) + void HandleDmMainPanel(any user_data, symbol widget) { } @@ -50,17 +64,14 @@ } - void HandleDmPanel(any user_data, any widget) + void HandleDmPanel(any user_data, symbol widget) { string part_device = (string) user_data; - switch ((symbol) widget) + switch (widget) { case `edit: break; - - case `delete: - break; } } } 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -34,7 +34,7 @@ map target_map = Storage::GetTargetMap(); term table_header = StorageFields::TableHeader(fields); - list table_contents = StorageFields::TableContents(fields, target_map, Predicate); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); term buttons = `HBox( // push button text @@ -75,11 +75,13 @@ } UI::ReplaceWidget(`tree_panel, - `VBox( - TreePanel::IconAndHeading(_("Hard Disks"), hd_icon ), - `Table(`id(`table), `opt(`keepSorting,`notify ), - table_header, table_contents), - buttons + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("Hard Disks"), hd_icon), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents), + buttons + ) ) ); } @@ -153,7 +155,7 @@ { string device = (string) user_data; - map tg = Storage::GetTargetMap(); + map target_map = Storage::GetTargetMap(); list<symbol> fields = StorageFields::Filter([ `device, `vendor, `model, `size, `newline, `bus, `bios_id, `udev_path, `udev_id, `newline, @@ -162,10 +164,10 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(fields, tg, device), + StorageFields::Overview(fields, target_map, device), `HBox( - `PushButton(`id(`smart), "Smart..." ), - `PushButton(`id(`hdparm), "HD Parm..." ), + `PushButton(`id(`smart), _("Smart...")), + `PushButton(`id(`hdparm), _("HD Parm...")), `HStretch() ) ) @@ -286,13 +288,15 @@ `user_data : user_data ] ]; UI::ReplaceWidget(`tree_panel, - `VBox( - TreePanel::IconAndHeading(_("Hard Disk: ") + DisplayName(disk), hd_icon ), - TabPanel::DumbTab(`id(`tab), [ - `item(`id(`overview), "&Overview"), - `item(`id(`partitions), "&Partitions") - ], - `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("Hard Disk:") + " " + DisplayName(disk), hd_icon), + TabPanel::DumbTab(`id(`tab), [ + `item(`id(`overview), "&Overview"), + `item(`id(`partitions), "&Partitions") + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) ) )); @@ -318,15 +322,17 @@ `udev_path, `udev_id, `newline, `used_by ]); UI::ReplaceWidget(`tree_panel, - `VBox( - `HStretch(), - TreePanel::IconAndHeading(_("Partition: ") + DisplayName(part), part_icon), - StorageFields::Overview(fields, target_map, device), - `HBox( - `PushButton(`id(`edit), "Edit..."), - `PushButton(`id(`resize), "Resize..."), - `PushButton(`id(`delete), "Delete..."), - `HStretch() + Greasemonkey::Transform( + `VBox( + `HStretch(), + `IconAndHeading(_("Partition:") + " " + DisplayName(part), part_icon), + StorageFields::Overview(fields, target_map, device), + `HBox( + `PushButton(`id(`edit), "Edit..."), + `PushButton(`id(`resize), "Resize..."), + `PushButton(`id(`delete), "Delete..."), + `HStretch() + ) ) ) ); 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -11,19 +11,29 @@ void CreateLoopMainPanel(any user_data) { + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateType(disk, partition, [`CT_LOOP]); + } + + list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); + + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( `HStretch(), - `Left(`Heading("Crypt Files")), - `VStackFrames( - `Frame(_("New Crypt File"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`create_loop), "Create Crypt File...")) - )) - ), - `VStretch() + `Left(`Heading(_("Crypt Files"))), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents), + `HBox( + `Left(`PushButton(`id(`add_loop), _("Add Crypt File..."))), + `HStretch() + ) ) ) ); @@ -32,9 +42,9 @@ } - void HandleLoopMainPanel(any user_data, any widget) + void HandleLoopMainPanel(any user_data, symbol widget) { - switch ((symbol) widget) + switch (widget) { case `create_loop: break; @@ -52,12 +62,12 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading("Crypt File: " + part_device)), + `Left(`Heading(_("Crypt File:") + " " + part_device)), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( - `PushButton(`id(`edit), "Edit..."), - `PushButton(`id(`delete), "Delete..."), + `PushButton(`id(`edit), _("Edit...")), + `PushButton(`id(`delete), _("Delete...")), `HStretch() ) ) @@ -65,11 +75,11 @@ } - void HandleLoopPanel(any user_data, any widget) + void HandleLoopPanel(any user_data, symbol widget) { string part_device = (string) user_data; - switch ((symbol) widget) + switch (widget) { case `edit: break; 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -28,17 +28,19 @@ map target_map = Storage::GetTargetMap(); term table_header = StorageFields::TableHeader(fields); - list table_contents = StorageFields::TableContents(fields, target_map, Predicate); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); UI::ReplaceWidget(`tree_panel, - `VBox( - TreePanel::IconAndHeading( _("Volume Managment"), lvm_icon ), - `Table(`id(`table), `opt(`keepSorting, `notify), - table_header, table_contents), - `HBox( - `PushButton(`id(`create_vg), _("Add Volume Group...")), - `PushButton(`id(`create_lv), _("Add Logical Volume...")), - `HStretch() + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("Volume Managment"), lvm_icon), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents), + `HBox( + `PushButton(`id(`create_vg), _("Add Volume Group...")), + `PushButton(`id(`create_lv), _("Add Logical Volume...")), + `HStretch() + ) ) ) ); @@ -69,17 +71,17 @@ { string device = (string) user_data; - map tg = Storage::GetTargetMap(); + map target_map = Storage::GetTargetMap(); list<symbol> fields = StorageFields::Filter([ `size, `pe_size, `lvm_metadata ]); UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(fields, tg, device), + StorageFields::Overview(fields, target_map, device), `HBox( - `PushButton(`id(`resize), "Resize..."), - `PushButton(`id(`delete), "Delete..."), + `PushButton(`id(`resize), _("Resize...")), + `PushButton(`id(`delete), _("Delete...")), `HStretch() ) ) @@ -126,16 +128,15 @@ `mount_point, `mount_by, `used_by, `lvm_metadata, `pe_size, `stripes ]); - 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, `notify), - header, table_list - ), + table_header, table_contents), `HBox( `PushButton(`id(`add), "Add..."), `PushButton(`id(`edit), "Edit..."), @@ -212,16 +213,17 @@ `pvs : $[ `create : CreateLvmVgPvsTab, `user_data : user_data ] ]; UI::ReplaceWidget(`tree_panel, - `VBox( - TreePanel::IconAndHeading( _("Volume Group: ") + device, lvm_icon), - TabPanel::DumbTab(`id(`tab), [ - `item(`id(`overview), "&Overview"), - `item(`id(`lvs), "&Logical Volumes"), - `item(`id(`pvs), "&Physical Volumes") - ], - `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) - ) - ) + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("Volume Group:") + " " + device, lvm_icon), + TabPanel::DumbTab(`id(`tab), [ + `item(`id(`overview), "&Overview"), + `item(`id(`lvs), "&Logical Volumes"), + `item(`id(`pvs), "&Physical Volumes") + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + )) ); TabPanel::Init(data); @@ -237,21 +239,23 @@ void CreateLvmLvPanel(any user_data) { string device = (string) user_data; - map tg = Storage::GetTargetMap(); + map target_map = Storage::GetTargetMap(); list<symbol> fields = StorageFields::Filter([ `mount_point, `mount_by, `size, `stripes, `fs_type, `uuid, `label ]); UI::ReplaceWidget(`tree_panel, - `VBox( - `HStretch(), - TreePanel::IconAndHeading(_("Logical Volume: ") + device, lvm_icon), - StorageFields::Overview(fields, tg, device), - `HBox( - `PushButton(`id(`edit), "Edit..."), - `PushButton(`id(`resize), "Resize..."), - `PushButton(`id(`delete), "Delete..."), - `HStretch() + Greasemonkey::Transform( + `VBox( + `HStretch(), + `IconAndHeading(_("Logical Volume:") + " " + device, lvm_icon), + StorageFields::Overview(fields, target_map, device), + `HBox( + `PushButton(`id(`edit), _("Edit...")), + `PushButton(`id(`resize), _("Resize...")), + `PushButton(`id(`delete), _("Delete...")), + `HStretch() + ) ) ) ); 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -120,8 +120,8 @@ } - map tg = Storage::GetTargetMap(); - StorageFields::IterateTargetMap(tg, callback); + map target_map = Storage::GetTargetMap(); + StorageFields::IterateTargetMap(target_map, callback); string short_hostname = Hostname::CurrentHostname(); 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -14,19 +13,29 @@ void CreateNfsMainPanel(any user_data) { + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateType(disk, partition, [`CT_NFS]); + } + + list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); + + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( `HStretch(), - TreePanel::IconAndHeading( _("Network File System (NFS)"), nfs_icon), - `VStackFrames( - `Frame(_("New NFS Path"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`create_nfs), "Create NFS Path...")) - )) - ), - `VStretch() + `IconAndHeading(_("Network File System (NFS)"), nfs_icon), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents), + `HBox( + `Left(`PushButton(`id(`create_nfs), _("Add NFS Path..."))), + `HStretch() + ) ) ) ); @@ -35,9 +44,9 @@ } - void HandleNfsMainPanel(any user_data, any widget) + void HandleNfsMainPanel(any user_data, symbol widget) { - switch ((symbol) widget) + switch (widget) { case `create_nfs: break; @@ -54,25 +63,27 @@ list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `fs_type ]); UI::ReplaceWidget(`tree_panel, - `VBox( - TreePanel::IconAndHeading(_("NFS Path: ") + part_device, nfs_icon), - `HStretch(), - StorageFields::Overview(fields, target_map, part_device), - `HBox( - `PushButton(`id(`edit), "Edit..."), - `PushButton(`id(`delete), "Delete..."), - `HStretch() + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("NFS Path:") + " " + part_device, nfs_icon), + `HStretch(), + StorageFields::Overview(fields, target_map, part_device), + `HBox( + `PushButton(`id(`edit), "Edit..."), + `PushButton(`id(`delete), "Delete..."), + `HStretch() + ) ) ) ); } - void HandleNfsPanel(any user_data, any widget) + void HandleNfsPanel(any user_data, symbol widget) { string part_device = (string) user_data; - switch ((symbol) widget) + switch (widget) { case `edit: break; 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -10,19 +10,29 @@ void CreateRaidMainPanel(any user_data) { + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateType(disk, partition, [`CT_MD]); + } + + list<symbol> fields = StorageFields::Filter([ `device, `size, `raid_type, `mount_point ]); + + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( `HStretch(), - `Left(`Heading("RAID")), - `VStackFrames( - `Frame(_("New RAID"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`create_raid), "Create RAID...")) - )) - ), - `VStretch() + `IconAndHeading(_("RAID"), ""), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents), + `HBox( + `Left(`PushButton(`id(`add_raid), _("Add RAID..."))), + `HStretch() + ) ) ) ); 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=47022&r1=47021&r2=47022&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 Thu Apr 24 12:19:56 2008 @@ -3,48 +3,46 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; - symbol PredicateUnused(map disk, map partition) + void CreateUnusedPanel(any user_data) { - symbol disk_type = disk["type"]:`CT_UNKNOWN; - - if (partition == nil) + symbol Predicate(map disk, map partition) { - if (size(disk["partitions"]:[]) == 0 && - disk["used_by_type"]:`UB_NONE == `UB_NONE) + symbol disk_type = disk["type"]:`CT_UNKNOWN; + + if (partition == nil) { - return `show; + if (size(disk["partitions"]:[]) == 0 && + disk["used_by_type"]:`UB_NONE == `UB_NONE) + { + return `show; + } + + return `follow; } - - return `follow; - } - else - { - if (partition["type"]:`primary != `extended && - partition["mount"]:"" == "" && - partition["used_by_type"]:`UB_NONE == `UB_NONE) + else { - return `show; + if (partition["type"]:`primary != `extended && + partition["mount"]:"" == "" && + partition["used_by_type"]:`UB_NONE == `UB_NONE) + { + return `show; + } + + return `ignore; } - - return `ignore; } - } - - - void CreateUnusedPanel(any user_data) - { + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type ]); map target_map = Storage::GetTargetMap(); term table_header = StorageFields::TableHeader(fields); - list<term> table_contents = StorageFields::TableContents(fields, target_map, PredicateUnused); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); UI::ReplaceWidget(`tree_panel, `VBox( @@ -57,7 +55,7 @@ } - void HandleUnusedPanel(any user_data, any widget) + void HandleUnusedPanel(any user_data, symbol widget) { } } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp?rev=47022&r1=47021&r2=47022&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp Thu Apr 24 12:19:56 2008 @@ -10,6 +10,9 @@ module "Greasemonkey"; + import "Directory"; + + term VStackFrames(term old) { list<term> frames = (list<term>) argsof(old); @@ -91,11 +94,24 @@ } + term IconAndHeading(term old) + { + list args = argsof(old); + + string title = args[0]:""; + string icon = Directory::icondir + "22x22/apps/" + args[1]:""; + + return `Left(`HBox(`Image(icon, ""), + `Heading(title))); + } + + map handlers = $[ `VStackFrames : VStackFrames, `ComboBoxSelected : ComboBoxSelected, `LeftRadioButton : LeftRadioButton, - `LeftRadioButtonWithAttachment : LeftRadioButtonWithAttachment + `LeftRadioButtonWithAttachment : LeftRadioButtonWithAttachment, + `IconAndHeading : IconAndHeading ]; Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp?rev=47022&r1=47021&r2=47022&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Thu Apr 24 12:19:56 2008 @@ -10,8 +10,6 @@ { module "TreePanel"; - import "Directory"; - map data = nil; @@ -141,15 +139,4 @@ { CallDestroy(); } - - global term IconAndHeading( string title, string icon ) - { - string icon_path = Directory::icondir + "22x22/apps/" + icon; - return `Left(`HBox( - `Image(icon_path, ""), - `Heading( title ) - ) - ); - } - } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org