[Merge conflicts resolved]
authorShilpa Singh <shilpa.singh@samsung.com>
Thu, 11 Aug 2011 13:18:58 +0000 (22:18 +0900)
committerShilpa Singh <shilpa.singh@samsung.com>
Fri, 12 Aug 2011 06:44:26 +0000 (15:44 +0900)
[Review comments fixed] - please look at my reply for each comment,
permissions of images modified.
[HD modifications]: Progressbar

Change-Id: Iaf219b51dd4940e9abea07f0ee7cf01015c27e8d

68 files changed:
themes/groups/progressbar.edc
themes/images/nbeat-hd/00_winset_list_process_01.png
themes/images/nbeat-hd/00_winset_list_process_01_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_02.png
themes/images/nbeat-hd/00_winset_list_process_02_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_03.png
themes/images/nbeat-hd/00_winset_list_process_03_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_04.png
themes/images/nbeat-hd/00_winset_list_process_04_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_05.png
themes/images/nbeat-hd/00_winset_list_process_05_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_06.png
themes/images/nbeat-hd/00_winset_list_process_06_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_07.png
themes/images/nbeat-hd/00_winset_list_process_07_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_08.png
themes/images/nbeat-hd/00_winset_list_process_08_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_09.png
themes/images/nbeat-hd/00_winset_list_process_09_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_10.png
themes/images/nbeat-hd/00_winset_list_process_10_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_11.png
themes/images/nbeat-hd/00_winset_list_process_11_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_12.png
themes/images/nbeat-hd/00_winset_list_process_12_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_13.png
themes/images/nbeat-hd/00_winset_list_process_13_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_14.png
themes/images/nbeat-hd/00_winset_list_process_14_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_15.png
themes/images/nbeat-hd/00_winset_list_process_15_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_16.png
themes/images/nbeat-hd/00_winset_list_process_16_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_17.png
themes/images/nbeat-hd/00_winset_list_process_17_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_18.png
themes/images/nbeat-hd/00_winset_list_process_18_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_19.png
themes/images/nbeat-hd/00_winset_list_process_19_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_20.png
themes/images/nbeat-hd/00_winset_list_process_20_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_21.png
themes/images/nbeat-hd/00_winset_list_process_21_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_22.png
themes/images/nbeat-hd/00_winset_list_process_22_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_23.png
themes/images/nbeat-hd/00_winset_list_process_23_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_24.png
themes/images/nbeat-hd/00_winset_list_process_24_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_25.png
themes/images/nbeat-hd/00_winset_list_process_25_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_26.png
themes/images/nbeat-hd/00_winset_list_process_26_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_27.png
themes/images/nbeat-hd/00_winset_list_process_27_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_28.png
themes/images/nbeat-hd/00_winset_list_process_28_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_29.png
themes/images/nbeat-hd/00_winset_list_process_29_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_process_30.png
themes/images/nbeat-hd/00_winset_list_process_30_20x20.png [changed mode: 0755->0644]
themes/images/nbeat-hd/00_winset_list_progress_bar.png
themes/images/nbeat-hd/00_winset_list_progress_bg.png
themes/images/nbeat-hd/00_winset_progress_pending_01.png
themes/images/nbeat-hd/00_winset_progress_pending_02.png
themes/inc/nbeat-black-inc.edc
themes/inc/nbeat-hd-inc.edc
themes/inc/nbeat-inc.edc

index 14328b3..83b5624 100644 (file)
                }
                text {
                   font: "SLP:style=Roman";
-                  size: 25;
+                  size: PROGRESSBAR_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.5 0.0;
                }
             scale: 1;
             type: SWALLOW;
             description {
-               min: 48 10;
-               max: 99999 10;
+               min: 1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
+               max: 99999 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
                state: "default" 0.0;
                rel1 {
                   to: "elm.background.progressbar";
                color: PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 10;
+                  size: PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.5;
                }
                }
                text {
                   font: "SLP:style=Medium";
-                  size: 10;
+                  size: PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.5 0.0;
                }
                text {
                   text_source: "elm.text.status";
                   font: "SLP:style=Medium";
-                  size: 10;
+                  size: PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.0;
                }
             scale: 1;
             type: SWALLOW;
             description {
-               min: 48 10;
-               max: 99999 10;
+               min: 1 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
+               max: 99999 PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC;
                state: "default" 0.0;
                rel1 {
                   to: "elm.background.progressbar";
                color: PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: PROGRESSBAR_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.5;
                }
                }
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: PROGRESSBAR_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.5 0.0;
                }
                text {
                   text_source: "elm.text.status";
                   font: "SLP:style=Medium";
-                  size: 10;
+                  size: PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.0;
                }
                color: PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: PROGRESSBAR_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.5;
                }
                text {
                   text_source: "elm.text.status";
                   font: "SLP:style=Medium";
-                  size: 10;
+                  size: PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   align: 0.0 0.0;
                }
                }
                text {
                   font: "SLP:style=Medium";
-                  size: 20;
+                  size: PROGRESSBAR_TITLE_FONT_SIZE_INC;
                   min: 1 1;
                   align: 0.0 0.0;
                }
             scale: 1;
             type: SWALLOW;
             description {
-               min: 300 14;
-               max: 99999 14;
+               min: PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC PROGRESSBAR_LIST_PENDING_HEIGHT_INC;
+               max: 99999 PROGRESSBAR_LIST_PENDING_HEIGHT_INC;
                state: "default" 0.0;
                rel1 {
                   to: "elm.background.progressbar";
             clip_to: "elm.background.progressbar";
             description {
                state: "default" 0.0;
-               min: 42 42;
-               max: 42 42;
+               min: PROGRESSBAR_LIST_PROCESS_WIDTH_INC PROGRESSBAR_LIST_PROCESS_HEIGHT_INC;
+               max: PROGRESSBAR_LIST_PROCESS_WIDTH_INC PROGRESSBAR_LIST_PROCESS_HEIGHT_INC;
                visible: 1;
                aspect: 1.0 1.0;
                aspect_preference: BOTH;
index 306afaa..fb1eb96 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_01.png and b/themes/images/nbeat-hd/00_winset_list_process_01.png differ
index a72f702..c56f9a0 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_02.png and b/themes/images/nbeat-hd/00_winset_list_process_02.png differ
index b8ca496..b73c0b6 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_03.png and b/themes/images/nbeat-hd/00_winset_list_process_03.png differ
index 50f3756..320e249 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_04.png and b/themes/images/nbeat-hd/00_winset_list_process_04.png differ
index a871a2a..ed9c708 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_05.png and b/themes/images/nbeat-hd/00_winset_list_process_05.png differ
index a20afda..fa05d09 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_06.png and b/themes/images/nbeat-hd/00_winset_list_process_06.png differ
index 2d7a703..7f2eaaa 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_07.png and b/themes/images/nbeat-hd/00_winset_list_process_07.png differ
index 7700ecf..96a3ea5 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_08.png and b/themes/images/nbeat-hd/00_winset_list_process_08.png differ
index 159ec8b..a70b3b8 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_09.png and b/themes/images/nbeat-hd/00_winset_list_process_09.png differ
index 47f7858..a06c4a5 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_10.png and b/themes/images/nbeat-hd/00_winset_list_process_10.png differ
index ad4939a..ace2bf0 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_11.png and b/themes/images/nbeat-hd/00_winset_list_process_11.png differ
index c796601..20ac976 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_12.png and b/themes/images/nbeat-hd/00_winset_list_process_12.png differ
index f992f97..1bc4aa7 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_13.png and b/themes/images/nbeat-hd/00_winset_list_process_13.png differ
index 7d57d1c..ff03d0c 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_14.png and b/themes/images/nbeat-hd/00_winset_list_process_14.png differ
index 3ac9391..9c8abbd 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_15.png and b/themes/images/nbeat-hd/00_winset_list_process_15.png differ
index 8473c0f..967c18b 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_16.png and b/themes/images/nbeat-hd/00_winset_list_process_16.png differ
index fb35935..144a12a 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_17.png and b/themes/images/nbeat-hd/00_winset_list_process_17.png differ
index 9bb6e2a..6d6bcbe 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_18.png and b/themes/images/nbeat-hd/00_winset_list_process_18.png differ
index 22b76f4..ade3396 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_19.png and b/themes/images/nbeat-hd/00_winset_list_process_19.png differ
index e56697a..c95836d 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_20.png and b/themes/images/nbeat-hd/00_winset_list_process_20.png differ
index 23278ca..dfb7f56 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_21.png and b/themes/images/nbeat-hd/00_winset_list_process_21.png differ
index f6f7cc6..27ec6b0 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_22.png and b/themes/images/nbeat-hd/00_winset_list_process_22.png differ
index 96d2b48..b3b1b37 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_23.png and b/themes/images/nbeat-hd/00_winset_list_process_23.png differ
index 5147691..3df0d18 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_24.png and b/themes/images/nbeat-hd/00_winset_list_process_24.png differ
index aa37d02..b86a6ee 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_25.png and b/themes/images/nbeat-hd/00_winset_list_process_25.png differ
index 5dfad88..4ed9b4f 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_26.png and b/themes/images/nbeat-hd/00_winset_list_process_26.png differ
index 888de3e..fc0a1f0 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_27.png and b/themes/images/nbeat-hd/00_winset_list_process_27.png differ
index c00520d..352586c 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_28.png and b/themes/images/nbeat-hd/00_winset_list_process_28.png differ
index f32a7e9..e09204c 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_29.png and b/themes/images/nbeat-hd/00_winset_list_process_29.png differ
index 8dccb75..69bdc46 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_process_30.png and b/themes/images/nbeat-hd/00_winset_list_process_30.png differ
index 9682405..e40c792 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_progress_bar.png and b/themes/images/nbeat-hd/00_winset_list_progress_bar.png differ
index 5e83560..7ca5d98 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_list_progress_bg.png and b/themes/images/nbeat-hd/00_winset_list_progress_bg.png differ
index 0304853..9fd4a01 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_progress_pending_01.png and b/themes/images/nbeat-hd/00_winset_progress_pending_01.png differ
index 303ca43..ae23b1b 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_progress_pending_02.png and b/themes/images/nbeat-hd/00_winset_progress_pending_02.png differ
index 57fd981..845a3c1 100755 (executable)
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          249 249 249 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          224 224 224 255
 #define PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC      108 108 108 255
+#define PROGRESSBAR_LIST_PROCESS_WIDTH_INC 42
+#define PROGRESSBAR_LIST_PROCESS_HEIGHT_INC 42
+#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 10
+#define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 14
+#define PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC 300
+#define PROGRESSBAR_TITLE_FONT_SIZE_INC 20
+#define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 10
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 81 78 76 255
 
index 58110be..2190eff 100755 (executable)
@@ -45,6 +45,8 @@
 #define NAVIBAR_TITLE_FONT_SIZE_INC 36
 #define NAVIBAR_PADDING_EXPANDED_INC 141
 #define NAVIBAR_ICON_PADDING_INC 16
+#define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
+#define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
 
 #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 255 255 255 255
 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000"
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          0 0 0 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          224 224 224 255
 #define PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC      108 108 108 255
+#define PROGRESSBAR_LIST_PROCESS_WIDTH_INC 66
+#define PROGRESSBAR_LIST_PROCESS_HEIGHT_INC 66
+#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 16
+#define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 16
+#define PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC 500
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255
 
index 888a933..0c25a5d 100755 (executable)
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          0 0 0 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          224 224 224 255
 #define PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC      108 108 108 255
+#define PROGRESSBAR_LIST_PROCESS_WIDTH_INC 42
+#define PROGRESSBAR_LIST_PROCESS_HEIGHT_INC 42
+#define PROGRESSBAR_LIST_PROGRESS_HEIGHT_INC 10
+#define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 14
+#define PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC 300
+#define PROGRESSBAR_TITLE_FONT_SIZE_INC 20
+#define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 10
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255