[yast-commit] r55268 - in /trunk/storage/storage/src/modules: Makefile.am StorageFields.ycp StorageIcons.ycp

Author: aschnell Date: Thu Feb 5 11:00:58 2009 New Revision: 55268 URL: http://svn.opensuse.org/viewcvs/yast?rev=55268&view=rev Log: - correct icon for device-mapper devices Modified: trunk/storage/storage/src/modules/Makefile.am trunk/storage/storage/src/modules/StorageFields.ycp trunk/storage/storage/src/modules/StorageIcons.ycp Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Makefile.am?rev=55268&r1=55267&r2=55268&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Thu Feb 5 11:00:58 2009 @@ -16,6 +16,7 @@ StorageDevices.ycp \ StorageFields.ycp \ StorageSettings.ycp \ + StorageIcons.ycp \ TreePanel.ycp \ TabPanel.ycp \ MiniWorkflow.ycp \ Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=55268&r1=55267&r2=55268&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Thu Feb 5 11:00:58 2009 @@ -12,6 +12,7 @@ import "Storage"; + import "StorageIcons"; import "FileSystems"; import "Partitions"; import "Directory"; @@ -21,8 +22,6 @@ import "String"; import "Region"; - include "partitioning/icons.ycp"; - /** * Call callback for every disk of target_map in a well defined sorted order. @@ -503,7 +502,7 @@ value = part["fstype"]:""; } if (style == `table) - return `cell(`icon(Directory::icondir + "22x22/apps/" + icon_map(type)), value); + return `cell(`icon(Directory::icondir + "22x22/apps/" + StorageIcons::IconMap(type)), value); else // row label return sformat(_("Type: %1"), String::EscapeTags(value)); Modified: trunk/storage/storage/src/modules/StorageIcons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageIcons.ycp?rev=55268&r1=55267&r2=55268&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageIcons.ycp (original) +++ trunk/storage/storage/src/modules/StorageIcons.ycp Thu Feb 5 11:00:58 2009 @@ -1,10 +1,12 @@ /** - * File: icons.ycp + * File: StorageIcons.ycp * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell */ { + module "StorageIcons"; + const string all_icon = "yast-disk.png"; @@ -32,8 +34,8 @@ const string log_icon = "yast-messages.png"; - //dunno if this list is correct and complete :( - string icon_map( symbol type ) + + global string IconMap(symbol type) { switch (type) { @@ -43,17 +45,18 @@ return raid_icon; case `CT_DMMULTIPATH: - case `CT_DM : + case `CT_DM: + case `dm: return dm_icon; - case `CT_DISK : + case `CT_DISK: return hd_icon; case `CT_LOOP: - case `loop : + case `loop: return loop_icon; - case `CT_LVM : + case `CT_LVM: case `lvm: return lvm_icon; @@ -63,13 +66,12 @@ case `primary: case `logical: - case `extended: + case `extended: return hd_part_icon; default: - //penguin on a disk as a fallback return "yast-hdd-controller-kernel-module.png"; } - } + } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org