navigationbar - black theme done.

Change-Id: I7e1b2e45e465243c72bd4583fb182c71cbaaf0e3

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index 66cc1ac..ba00434 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -2156,7 +2156,7 @@
                rel1 { relative: 1 0.2; }
                rel2 { relative: 1 0.8; }
                fixed: 1 0;
-               color: 238 223 194 255;
+               color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
             }
          }
          part {name: "padding_right";
@@ -2168,7 +2168,7 @@
                rel1 { relative: 0 0; to: "padding_after_right"; }
                rel2 { relative: 0 1; to: "padding_after_right"; }
                fixed: 1 0;
-               color: 164 151 130 255;
+               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
             }
          }
          part {
@@ -7751,7 +7751,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 1 0.2; }
                rel2 { relative: 1 0.8; }
                fixed: 1 0;
-               color: 238 223 194 255;
+               color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
             }
          }
          part {name: "padding_before_right";
@@ -7763,7 +7763,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                rel1 { relative: 0 0; to: "padding_right"; }
                rel2 { relative: 0 1; to: "padding_right"; }
                fixed: 1 0;
-               color: 164 151 130 255;
+               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
             }
          }
          part { name: "button_center_part";

diff --git a/themes/groups/navigationbar.edc b/themes/groups/navigationbar.edc
index 03fdfe6..2de23b6 100644 (file)
--- a/themes/groups/navigationbar.edc
+++ b/themes/groups/navigationbar.edc
@@ -31,7 +31,6 @@
 #define NAVIBAR_EXTENDED_H 115
 #define NAVIBAR_TITLE_SEPARATOR_H 5
 #define NAVIBAR_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EXTENDED_COLOR 219 201 174 255
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // NavigationBar
@@ -81,7 +80,7 @@ group {
             rel1 { relative: 0.0 0.0; to:"base"; }
             rel2 { relative: 1.0 0.0; to:"base"; }
             align: 0.5 0;
-            color: NAVIBAR_EXTENDED_COLOR;
+            color: NAVIBAR_TITLE_BG_COLOR_INC;
          }
       }
       part { name: "elm.rect.pada";
@@ -110,7 +109,7 @@ group {
             rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
             rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
             fixed: 1 0;
-            color: 238 223 194 255;
+            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
          }
       }
       part { name: "separator_2";
@@ -124,7 +123,7 @@ group {
             rel1 { relative: 0.0 0.0; to: "separator_1"; }
             rel2 { relative: 0.0 1.0; to: "separator_1"; }
             fixed: 1 0;
-            color: 164 151 130 255;
+            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
          }
       }
       part { name: "elm.rect.padb";
@@ -149,7 +148,7 @@ group {
                align: 0.5 0.5;
                max: 1 0;
             }
-            color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
+            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
             align: 0.5 0.5;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }

diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
index 8c63bb0..cf5f42e 100644 (file)
--- a/themes/groups/navigationbar_ex.edc
+++ b/themes/groups/navigationbar_ex.edc
@@ -27,7 +27,6 @@
 #define NAVIBAR_EX_EXTENDED_H2 186
 #define NAVIBAR_EX_TITLE_SEPARATOR_H 5
 #define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EX_EXTENDED_COLOR 219 201 174 255
 #define NAVIBAR_EX_TITLE_ITEM_H 67   //TODO: SHOULD BE 59
 #define NAVIBAR_EX_TITLE_ITEM_MAX_W 112
 #define NAVIBAR_EX_TITLE_SEPARATOR_H 5
@@ -218,7 +217,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
             rel1 { relative: 0.0 0.0; to: "base";}
             rel2 { relative: 1.0 0.0; to: "base";}
             align: 0.5 0.0;
-            color: NAVIBAR_EX_EXTENDED_COLOR;
+            color: NAVIBAR_TITLE_BG_COLOR_INC;
          }
       }
       part { name: "clip_title";
@@ -266,7 +265,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
             rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
             rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
             fixed: 1 0;
-            color: 238 223 194 255;
+            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
          }
       }
       part { name: "separator_2";
@@ -279,7 +278,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
             rel1 { relative: 0.0 0.0; to: "separator_1"; }
             rel2 { relative: 0.0 1.0; to: "separator_1"; }
             fixed: 1 0;
-            color: 164 151 130 255;
+            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
           }
       }
       part { name: "elm.rect.padb";
@@ -305,7 +304,7 @@ group { name: "elm/navigationbar_ex/item/title/default";
                  align: 0.5 0.5;
                  max: 1 0;
             }
-            color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
+            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
             align: 0.5 0.5;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
@@ -461,7 +460,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             rel1 { relative: 0.0 0.0; to: "base";}
             rel2 { relative: 1.0 0.0; to: "base";}
             align: 0.5 0.0;
-            color: NAVIBAR_EX_EXTENDED_COLOR;
+            color: NAVIBAR_TITLE_BG_COLOR_INC;
          }
       }
       part { name: "clip_title";
@@ -509,7 +508,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
             rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
             fixed: 1 0;
-            color: 238 223 194 255;
+            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
          }
       }
       part { name: "separator_2";
@@ -522,7 +521,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
             rel1 { relative: 0.0 0.0; to: "separator_1"; }
             rel2 { relative: 0.0 1.0; to: "separator_1"; }
             fixed: 1 0;
-            color: 164 151 130 255;
+            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
           }
       }
       part { name: "elm.rect.padb";
@@ -548,7 +547,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header/default";
                  align: 0.5 0.5;
                  max: 1 0;
             }
-            color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
+            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
             align: 0.5 0.5;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
@@ -779,7 +778,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
             rel1 { relative: 0.0 0.0; to: "base";}
             rel2 { relative: 1.0 0.0; to: "base";}
             align: 0.5 0.0;
-            color: NAVIBAR_EX_EXTENDED_COLOR;
+            color: NAVIBAR_TITLE_BG_COLOR_INC;
          }
       }
       part { name: "clip_title";
@@ -827,7 +826,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
             rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
             rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
             fixed: 1 0;
-            color: 238 223 194 255;
+            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
          }
       }
       part { name: "separator_2";
@@ -840,7 +839,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
             rel1 { relative: 0.0 0.0; to: "separator_1"; }
             rel2 { relative: 0.0 1.0; to: "separator_1"; }
             fixed: 1 0;
-            color: 164 151 130 255;
+            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
           }
       }
       part { name: "elm.rect.padb";
@@ -866,7 +865,7 @@ group { name: "elm/navigationbar_ex/item/title_option_header2/default";
                  align: 0.5 0.5;
                  max: 1 0;
             }
-            color: NAVIGATIONBAR_TITLE_TEXT_COLOR;
+            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
             align: 0.5 0.5;
             rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
             rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }

diff --git a/themes/images/nbeat-black/00_winset_btn_prev.png b/themes/images/nbeat-black/00_winset_btn_prev.png
index 272845c..1ffbb0b 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_prev.png and b/themes/images/nbeat-black/00_winset_btn_prev.png differ

diff --git a/themes/images/nbeat-black/00_winset_control_top_arrow.png b/themes/images/nbeat-black/00_winset_control_top_arrow.png
index 52cc727..45991ca 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_control_top_arrow.png and b/themes/images/nbeat-black/00_winset_control_top_arrow.png differ

diff --git a/themes/images/nbeat-black/00_winset_control_top_bg.png b/themes/images/nbeat-black/00_winset_control_top_bg.png
deleted file mode 100755 (executable)
index e3e4b2b..0000000
Binary files a/themes/images/nbeat-black/00_winset_control_top_bg.png and /dev/null differ

diff --git a/themes/images/nbeat-black/00_winset_control_top_noshadow_bg.png b/themes/images/nbeat-black/00_winset_control_top_noshadow_bg.png
deleted file mode 100644 (file)
index 0cae35b..0000000
Binary files a/themes/images/nbeat-black/00_winset_control_top_noshadow_bg.png and /dev/null differ

diff --git a/themes/images/nbeat-black/navibar_item_separator.png b/themes/images/nbeat-black/navibar_item_separator.png
index cf080bb..60e888c 100644 (file)
Binary files a/themes/images/nbeat-black/navibar_item_separator.png and b/themes/images/nbeat-black/navibar_item_separator.png differ

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index c25f325..e576e60 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -27,8 +27,10 @@
 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 15 15 15 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 15 15 15 255
 
-#define NAVIGATIONBAR_TITLE_TEXT_COLOR 73 44 7 255
-#define NAVIGATIONBAR_TITLE_TEXT_COLOR_HEX "#492C07"
+#define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
+#define NAVIBAR_TITLE_BG_COLOR_INC 50 65 74 255
+#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
+#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
 
 #define POPUP_TITLE_TEXT_COLOR "#f9f9f9"
 #define POPUP_DESCRIPTION_TEXT_COLOR "#f9f9f9"

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 7d09565..348d95c 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -21,13 +21,15 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
- 
+
 #define LAYOUT_BG_COLOR_INC 249 249 249 255
 #define LAYOUT_EDIT_MODE_BG_COLOR_INC 218 210 201 255
 #define LAYOUT_GROUP_LIST_BG_COLOR_INC 242 238 233 255
 
-#define NAVIGATIONBAR_TITLE_TEXT_COLOR 73 44 7 255
-#define NAVIGATIONBAR_TITLE_TEXT_COLOR_HEX "#492C07"
+#define NAVIBAR_TITLE_TEXT_COLOR_INC 73 44 7 255
+#define NAVIBAR_TITLE_BG_COLOR_INC 219 201 174 255
+#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
+#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
 
 #define POPUP_TITLE_TEXT_COLOR "#ffffff"
 #define POPUP_DESCRIPTION_TEXT_COLOR "#000000"