[yast-commit] r47017 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-hd.ycp include/ep-lvm.ycp include/ep-main.ycp include/ep-nfs.ycp modules/TreePanel.ycp

Author: kmachalkova Date: Thu Apr 24 10:53:26 2008 New Revision: 47017 URL: http://svn.opensuse.org/viewcvs/yast?rev=47017&view=rev Log: Icons, pictures & co. Modified: 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-nfs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp 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=47017&r1=47016&r2=47017&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 10:53:26 2008 @@ -7,10 +7,13 @@ { textdomain "storage"; - include "partitioning/ep-hd-dialogs.ycp"; include "partitioning/ep-hd-lib.ycp"; + import "TreePanel"; + + string part_icon = "yast-partitioning.png"; + string hd_icon = "yast-disk.png"; void CreateHdMainPanel(any user_data) { @@ -73,7 +76,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading(_("Hard Disks"))), + TreePanel::IconAndHeading(_("Hard Disks"), hd_icon ), `Table(`id(`table), `opt(`keepSorting,`notify ), table_header, table_contents), buttons @@ -296,7 +299,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading("Hard Disk: " + DisplayName(disk))), + TreePanel::IconAndHeading(_("Hard Disk: ") + DisplayName(disk), hd_icon ), TabPanel::DumbTab(`id(`tab), [ `item(`id(`overview), "&Overview"), `item(`id(`partitions), "&Partitions") @@ -329,7 +332,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( `HStretch(), - `Left(`Heading("Partition: " + DisplayName(part))), + TreePanel::IconAndHeading(_("Partition: ") + DisplayName(part), part_icon), StorageFields::Overview(fields, target_map, device), `HBox( `PushButton(`id(`edit), "Edit..."), 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=47017&r1=47016&r2=47017&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 10:53:26 2008 @@ -10,6 +10,9 @@ include "partitioning/ep-lvm-dialogs.ycp"; + import "TreePanel"; + + string lvm_icon = "yast-lvm_config.png"; void CreateLvmMainPanel(any user_data) { @@ -29,7 +32,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading(_("Volume Managment"))), + TreePanel::IconAndHeading( _("Volume Managment"), lvm_icon ), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( @@ -230,7 +233,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading("Volume Group: " + device)), + TreePanel::IconAndHeading( _("Volume Group: ") + device, lvm_icon), TabPanel::DumbTab(`id(`tab), [ `item(`id(`overview), "&Overview"), `item(`id(`lvs), "&Logical Volumes"), @@ -262,7 +265,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( `HStretch(), - `Left(`Heading("Logical Volume: " + device)), + TreePanel::IconAndHeading(_("Logical Volume: ") + device, lvm_icon), StorageFields::Overview(fields, tg, device), `HBox( `PushButton(`id(`edit), "Edit..."), 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=47017&r1=47016&r2=47017&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 10:53:26 2008 @@ -125,17 +125,18 @@ string short_hostname = Hostname::CurrentHostname(); + //FIXME: find some nicer icons here tree = [ `item(`id(`all), short_hostname, open(`all), [ - `item(`id(`hd), _("Hard Disks"), open(`hd), subtree[`hd]:[]), - `item(`id(`lvm), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), - `item(`id(`md), _("RAID"), open(`md), subtree[`md]:[]), - `item(`id(`loop), _("Crypt Files"), open(`loop), subtree[`loop]:[]), - `item(`id(`dm), _("Device Mapper"), open(`dm), subtree[`dm]:[]), - `item(`id(`nfs), _("NFS"), open(`nfs), subtree[`nfs]:[]), - `item(`id(`unused), _("Unused Devices"), open(`unused)) + `item(`id(`hd), `icon("yast-disk.png"), _("Hard Disks"), open(`hd), subtree[`hd]:[]), + `item(`id(`lvm),`icon("yast-lvm_config.png"), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), + `item(`id(`md),`icon("yast-general.png"), _("RAID"), open(`md), subtree[`md]:[]), + `item(`id(`loop), `icon("yast-general.png"), _("Crypt Files"), open(`loop), subtree[`loop]:[]), + `item(`id(`dm), `icon("yast-general.png"), _("Device Mapper"), open(`dm), subtree[`dm]:[]), + `item(`id(`nfs), `icon("yast-nfs.png"), _("NFS"), open(`nfs), subtree[`nfs]:[]), + `item(`id(`unused),`icon("yast-general.png"), _("Unused Devices"), open(`unused)) ]), - `item(`id(`settings), _("Settings"), open(`settings)), - `item(`id(`log), _("Log"), open(`log)) ]; + `item(`id(`settings), `icon("yast.png"), _("Settings"), open(`settings)), + `item(`id(`log), `icon("yast-messages.png"), _("Log"), open(`log)) ]; } 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=47017&r1=47016&r2=47017&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 10:53:26 2008 @@ -8,6 +8,9 @@ { textdomain "storage"; + import "TreePanel"; + + string nfs_icon = "yast-nfs.png"; void CreateNfsMainPanel(any user_data) { @@ -15,7 +18,7 @@ Greasemonkey::Transform( `VBox( `HStretch(), - `Left(`Heading("Network File System (NFS)")), + TreePanel::IconAndHeading( _("Network File System (NFS)"), nfs_icon), `VStackFrames( `Frame(_("New NFS Path"), `VBox( @@ -52,7 +55,7 @@ UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading("NFS Path: " + part_device)), + TreePanel::IconAndHeading(_("NFS Path: ") + part_device, nfs_icon), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( 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=47017&r1=47016&r2=47017&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 10:53:26 2008 @@ -10,6 +10,8 @@ { module "TreePanel"; + import "Directory"; + map data = nil; @@ -118,6 +120,9 @@ } } + /* + * Set new active item of the tree ( + replace main dlg content accordingly) + */ global void SwitchToNew( any new_current_item ) { if (current_item != new_current_item) @@ -136,4 +141,15 @@ { 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