[Multibuttonentry]Add nbeat-black theme (reupload:merge conflict)

diff --git a/themes/groups/multibuttonentry.edc b/themes/groups/multibuttonentry.edc
index 47f2b61..b7e84ea 100755 (executable)
--- a/themes/groups/multibuttonentry.edc
+++ b/themes/groups/multibuttonentry.edc
@@ -236,12 +236,12 @@
                state: "default" 0.0;
                rel1 { relative: 1.0 1.0; to_x:"left.padding";to_y:"top.padding";}
                rel2 { relative: 0.0 0.0; to_x:"right.padding";to_y:"bottom.padding";}
-               color: 195 160 107 255;
+               color: MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC;
             }
             description {
                state: "focused" 0.0;
                inherit: "default" 0.0;
-               color: 103 79 43 255;
+               color: MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC;
             }
          }
          part {

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 568c6d1..f867042 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -259,3 +259,6 @@
 
 #define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 23 34 38 255
 #define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 58 68 74 255
+
+#define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 42 109 140 255
+#define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
old mode 100644 (file)
new mode 100755 (executable)
index 2d3d2ab..b775971
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -282,3 +282,6 @@
 
 #define CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC 73 62 47 255
 #define CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC 136 121 100 255
+
+#define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 195 160 107 255
+#define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255