Author: aschnell Date: Tue May 6 20:12:29 2008 New Revision: 47335 URL: http://svn.opensuse.org/viewcvs/yast?rev=47335&view=rev Log: - moving icon names to a central place 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/include/icons.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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -27,11 +27,13 @@ list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); UI::ReplaceWidget(`tree_panel, - `VBox( - `Left(`Heading(sformat(_("Available Storage on %1"), short_hostname))), - `Table(`id(`table), `opt(`keepSorting, `notify), - table_header, table_contents) - )); + Greasemonkey::Transform( + `VBox( + `IconAndHeading(sformat(_("Available Storage on %1"), short_hostname), all_icon), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + )) + ); Wizard::RestoreHelp("Help about view with all devices"); } 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -26,7 +26,7 @@ Greasemonkey::Transform( `VBox( `HStretch(), - `IconAndHeading(_("Device Mapper (DM)"), ""), + `IconAndHeading(_("Device Mapper (DM)"), dm_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents) ) @@ -54,7 +54,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( - `IconAndHeading(sformat(_("DM: %1"), part_device), ""), + `IconAndHeading(sformat(_("DM: %1"), part_device), dm_icon), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -12,8 +12,6 @@ import "TreePanel"; - string part_icon = "yast-partitioning.png"; - string hd_icon = "yast-disk.png"; void CreateHdMainPanel(any user_data) { 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -27,7 +27,7 @@ Greasemonkey::Transform( `VBox( `HStretch(), - `IconAndHeading(_("Crypt Files"), ""), + `IconAndHeading(_("Crypt Files"), loop_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( @@ -63,7 +63,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( - `IconAndHeading(sformat(_("Crypt File: %1"), part_device), ""), + `IconAndHeading(sformat(_("Crypt File: %1"), part_device), loop_icon), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -12,7 +12,6 @@ import "TreePanel"; - string lvm_icon = "yast-lvm_config.png"; void CreateLvmMainPanel(any user_data) { 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -127,15 +127,14 @@ string short_hostname = Hostname::CurrentHostname(); - //FIXME: find some nicer icons here - tree = [ `item(`id(`all), short_hostname, open(`all), [ - `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)) + tree = [ `item(`id(`all), `icon(all_icon), short_hostname, open(`all), [ + `item(`id(`hd), `icon(hd_icon), _("Hard Disks"), open(`hd), subtree[`hd]:[]), + `item(`id(`lvm), `icon(lvm_icon), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), + `item(`id(`md), `icon(raid_icon), _("RAID"), open(`md), subtree[`md]:[]), + `item(`id(`loop), `icon(loop_icon), _("Crypt Files"), open(`loop), subtree[`loop]:[]), + `item(`id(`dm), `icon(dm_icon), _("Device Mapper"), open(`dm), subtree[`dm]:[]), + `item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs), subtree[`nfs]:[]), + `item(`id(`unused), `icon(unused_icon), _("Unused Devices"), open(`unused)) ]), `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)), `item(`id(`log), `icon(log_icon), _("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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -9,7 +9,6 @@ import "TreePanel"; - string nfs_icon = "yast-nfs.png"; void CreateNfsMainPanel(any user_data) { 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -26,7 +26,7 @@ Greasemonkey::Transform( `VBox( `HStretch(), - `IconAndHeading(_("RAID"), ""), + `IconAndHeading(_("RAID"), raid_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( @@ -127,7 +127,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( - `IconAndHeading(sformat(_("RAID: %1"), device), ""), + `IconAndHeading(sformat(_("RAID: %1"), device), raid_icon), TabPanel::DumbTab(`id(`tab), [ `item(`id(`overview), _("Overview")), `item(`id(`devices), _("Used Devices")) 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=47335&r1=47334&r2=47335&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 Tue May 6 20:12:29 2008 @@ -47,7 +47,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( - `IconAndHeading(_("Unused Devices"), ""), + `IconAndHeading(_("Unused Devices"), unused_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents) )) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp?rev=47335&r1=47334&r2=47335&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp Tue May 6 20:12:29 2008 @@ -5,6 +5,24 @@ * Authors: Arvin Schnell */ { + const string all_icon = "yast-disk.png"; + + const string hd_icon = "yast-disk.png"; + const string part_icon = "yast-partitioning.png"; + + const string lvm_icon = "yast-lvm_config.png"; + + const string raid_icon = "yast-general.png"; + + const string loop_icon = "yast-general.png"; + + const string dm_icon = "yast-general.png"; + + const string nfs_icon = "yast-nfs.png"; + + const string unused_icon = "yast-general.png"; + const string settings_icon = "yast.png"; + const string log_icon = "yast-messages.png"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org