enventor - no more support theme change.

now enventor works only on the dark theme based.

configure.ac

@@ -95,7 +95,6 @@ data/icon/Makefile
 data/images/Makefile
 data/themes/Makefile
 data/themes/default/Makefile
-data/themes/dark/Makefile
 data/.proto/Makefile
 ])
 

data/themes/Makefile.am

@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = default dark
+SUBDIRS = default

data/themes/dark/Makefile.am

@@ -1,17 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS = -id $(top_srcdir)/data/themes/dark/images
-
-filesdir = $(datadir)/$(PACKAGE)/themes
-files_DATA = enventor_dark.edj
-
-EXTRA_DIST = enventor_dark.edc
-
-enventor_dark.edj: Makefile $(EXTRA_DIST)
-	$(EDJE_CC) $(EDJE_FLAGS) \
-	$(top_srcdir)/data/themes/dark/enventor_dark.edc \
-	$(top_builddir)/data/themes/dark/enventor_dark.edj
-
-clean-local:
-	rm -f *.edj

data/themes/dark/content.edc

@@ -1,110 +0,0 @@
-images {
-   image: "part_highlight.png" COMP;
-   image: "swallow.png" COMP;
-}
-
-group { name: "swallow";
-   parts {
-      part { name: "base";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: 255 255 255 10;
-         }
-      }
-      part { name: "img";
-         type: IMAGE;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            image.normal: "swallow.png";
-            align: 0.5 0.5;
-            min: 0 0;
-            max: 120 120;
-            color: 255 255 255 127;
-            aspect: 1 1;
-            aspect_preference: BOTH;
-         }
-      }
-      part { name: "frame_l";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            align: 0 0.5;
-            rel1.relative: 0 0;
-            rel2.relative: 0 1;
-            color: 255 0 255 127;
-            min: 1 0;
-            fixed: 1 0;
-         }
-      }
-      part { name: "frame_r";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            align: 1 0.5;
-            rel1.relative: 1 0;
-            rel2.relative: 1 1;
-            color: 0 255 0 127;
-            min: 1 0;
-            fixed: 1 0;
-         }
-      }
-      part { name: "frame_t";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            align: 0.5 0;
-            rel1.relative: 0 0;
-            rel2.relative: 1 0;
-            color: 255 0 255 127;
-            min: 0 1;
-            fixed: 0 1;
-         }
-      }
-      part { name: "frame_b";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            align: 0.5 1;
-            rel1.relative: 0 1;
-            rel2.relative: 1 1;
-            color: 0 0 255 127;
-            min: 0 1;
-            fixed: 0 1;
-         }
-      }
-   }
-}
-
-group { name: "part_highlight";
-   parts {
-      part { name: "base";
-         type: IMAGE;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "part_highlight.png";
-            image.border: 3 3 3 3;
-            image.border_scale: 1;
-         }
-         description { state: "transparent" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-   }
-   programs {
-      program { name: "load";
-         signal: "load";
-         action: STATE_SET "transparent" 0.0;
-         target: "base";
-         transition: LINEAR 0.65;
-         after: "anim";
-      }
-      program { name: "anim";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         transition: LINEAR 0.65;
-         after: "load";
-      }
-   }
-}

data/themes/dark/enventor_dark.edc

@@ -1,9 +0,0 @@
-#define FN "Sans"
-
-collections {
-   #include "content.edc"
-   #include "images.edc"
-   #include "theme_ext.edc"
-   #include "layout.edc"
-   #include "menu.edc"
-}

data/themes/dark/images.edc

@@ -1,26 +0,0 @@
-images {
-   image: "plus.png" COMP;
-   image: "minus.png" COMP;
-}
-
-group { name: "plus_img";
-   parts {
-      part { name: "img";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            image.normal: "plus.png";
-         }
-      }
-   }
-}
-
-group { name: "minus_img";
-   parts {
-      part { name: "img";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            image.normal: "minus.png";
-         }
-      }
-   }
-}

data/themes/dark/layout.edc

@@ -1,368 +0,0 @@
-styles {
-     style { name: "entry_statusbar_style";
-        base: "font="FN" font_size=11 text_class=entry color=#ffffff style=shadow,bottom shadow_color=#00000080 glow_color=#3399ff18 valign=0.5";
-     }
-}
-
-group { name: "viewer_layout";
-   parts {
-      part { name: "prev_clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-         }
-         description { state: "switched" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "cur_clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: -1 0;
-            rel2.relative: 0 1;
-            color: 255 255 255 0;
-         }
-         description { state: "switched" 0.0;
-            rel1.relative: 0 0;
-            rel2.relative: 1 1;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "elm.swallow.prev";
-         type: SWALLOW;
-         clip_to: "prev_clipper";
-         description { state: "default" 0.0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "cur_clipper";
-         description { state: "default" 0.0;
-            rel1.to: "cur_clipper";
-            rel2.to: "cur_clipper";
-         }
-      }
-   }
-   programs {
-      program { name: "switch_instant";
-         signal: "elm,view,switch,instant";
-         source: "";
-         action: STATE_SET "switched" 0.0;
-         target: "prev_clipper";
-         target: "cur_clipper";
-      }
-      program { name: "switch";
-         signal: "elm,view,switch";
-         source: "";
-         action: STATE_SET "default" 0.0;
-         target: "prev_clipper";
-         target: "cur_clipper";
-         after: "switched";
-      }
-      program { name: "switched";
-         action: STATE_SET "switched" 0.0;
-         target: "prev_clipper";
-         target: "cur_clipper";
-         transition: DECELERATE 0.25;
-      }
-   }
-}
-
-group { name: "preview_layout";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         description { state: "default" 0.0;
-            min: 100 100;
-            color: 225 225 225 255;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-         }
-      }
-      part { name: "elm.swallow.img";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-      }
-   }
-}
-
-group { name: "slider_layout";
-   parts {
-      part { name: "elm.swallow.plus";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            min: 20 20;
-            fixed: 1 1;
-            align: 0 0.5;
-            rel1.relative: 0.0 0.5;
-            rel1.offset: 5 0;
-            rel2.relative: 0.0 0.5;
-         }
-      }
-      part { name: "elm.swallow.minus";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            min: 20 20;
-            fixed: 1 1;
-            align: 0 0.5;
-            rel1.to: "elm.swallow.plus";
-            rel2.to: "elm.swallow.plus";
-            rel1.relative: 1.0 0.5;
-            rel2.relative: 1.0 0.5;
-            rel1.offset: 1 0;
-         }
-      }
-      part { name: "elm.swallow.slider";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            rel1.to_x: "elm.swallow.minus";
-            rel1.relative: 1 0;
-         }
-      }
-   }
-}
-
-group { name: "statusbar_layout";
-   parts {
-      part { name: "base_clip";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "hide" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "elm.text.view_size";
-         type: TEXTBLOCK;
-         scale: 1;
-         clip_to: "base_clip";
-         description {
-            rel2.relative: 0.0 1.0;
-            align: 0 0.5;
-            min: 120 18;
-            fixed: 1 1;
-            rel1.offset: 0 -2;
-            rel2.offset: -1 -3;
-            text.style: "entry_statusbar_style";
-         }
-      }
-      part { name: "elm.text.cur_pos";
-         type: TEXTBLOCK;
-         scale: 1;
-         clip_to: "base_clip";
-         description {
-            rel1.to: "elm.text.view_size";
-            rel1.relative: 1 0.0;
-            rel2.to: "elm.text.view_size";
-            rel2.relative: 1 1.0;
-            min: 180 18;
-            fixed: 1 1;
-            align: 0 0.5;
-            text.style: "entry_statusbar_style";
-         }
-      }
-      part { name: "elm.text.file_group_name";
-         type: TEXTBLOCK;
-         scale: 1;
-         clip_to: "base_clip";
-         description {
-            rel1.to: "elm.text.cur_pos";
-            rel1.relative: 1 0.0;
-            rel2.to: "elm.text.line";
-            rel2.relative: 0 1.0;
-            min: 180 18;
-            align: 1 0.5;
-            fixed: 1 1;
-            text.style: "entry_statusbar_style";
-         }
-      }
-      part { name: "elm.text.line";
-         type: TEXTBLOCK;
-         scale: 1;
-         clip_to: "base_clip";
-         description {
-            rel1.relative: 1 0;
-            rel1.offset: 0 -2;
-            rel2.offset: -1 -3;
-            align: 1 0.5;
-            min: 100 18;
-            fixed: 1 1;
-            text.style: "entry_statusbar_style";
-         }
-      }
-      part { name: "elm.text.info_msg";
-         type: TEXT;
-         scale: 1;
-         effect: GLOW;
-         description { state: "default" 0.0;
-            align: 0 0.5;
-            rel1.offset: 0 -1;
-            rel2.offset: -1 -2;
-            text {
-               font: FN;
-               size: 11;
-               align: 0 0.5;
-            }
-            color: 51 153 255 0;
-            color2: 51 153 255 0;
-            color3: 51 153 255 0;
-         }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
-            color2: 51 153 255 24;
-            color3: 51 153 255 18;
-         }
-      }
-      program { name: "info_msg_show";
-         signal: "elm,action,info_msg,show";
-         source: "";
-         action: STATE_SET "hide" 0.0;
-         target: "base_clip";
-         transition: DECELERATE 0.15;
-         after: "info_msg_show2";
-      }
-      program { name: "info_msg_show2";
-         action: STATE_SET "show" 0.0;
-         target: "elm.text.info_msg";
-         transition: DECELERATE 0.3;
-         after: "info_msg_idle";
-      }
-      program { name: "info_msg_idle";
-         action: STATE_SET "show" 0.0;
-         target: "elm.text.info_msg";
-         transition: LINEAR 2;
-         after: "info_msg_hide";
-      }
-      program { name: "info_msg_hide";
-         signal: "elm,action,info_msg,hide";
-         source: "";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text.info_msg";
-         transition: DECELERATE 0.3;
-         after: "info_msg_hide2";
-      }
-      program { name: "info_msg_hide2";
-         action: STATE_SET "default" 0.0;
-         target: "base_clip";
-         transition: DECELERATE 0.3;
-      }
-   }
-}
-
-group { name: "main_layout";
-   parts {
-      part { name: "base";
-         type: SPACER;
-         scale: 1;
-         description {
-            min: 640 440;
-         }
-      }
-      part { name: "elm.swallow.panes";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            rel1.relative: 0 0;
-            rel2.relative: 1 0;
-            rel2.to_y: "elm.swallow.statusbar";
-         }
-      }
-      part { name: "statusbar_clip";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 0 1;
-            rel2.relative: 1 1;
-            align: 0.5 1;
-            min: 0 15;
-            fixed: 0 1;
-         }
-         description { state: "hide" 0.0;
-            inherit: "default" 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "elm.swallow.statusbar";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "statusbar_clip";
-         description { state: "default" 0.0;
-            rel1.to: "statusbar_clip";
-            rel2.to: "statusbar_clip";
-         }
-      }
-   }
-   programs {
-      program { name: "statusbar_show";
-         signal: "elm,state,statusbar,show";
-         action: STATE_SET "default" 0.0;
-         target: "statusbar_clip";
-         transition: DECELERATE 0.35;
-      }
-      program { name: "statusbar_hide";
-         signal: "elm,state,statusbar,hide";
-         action: STATE_SET "hide" 0.0;
-         target: "statusbar_clip";
-         transition: DECELERATE 0.35;
-      }
-   }
-}
-
-group { name: "edit_layout";
-   parts {
-      part { name: "base_clip";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "elm.swallow.linenumber";
-            rel2.to: "elm.swallow.linenumber";
-            rel2.relative: 1 1;
-         }
-         description { state: "hide" 0.0;
-            rel1.to: "elm.swallow.linenumber";
-            rel2.to: "elm.swallow.linenumber";
-            rel2.relative: 0 1;
-         }
-      }
-      part { name: "elm.swallow.linenumber";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "base_clip";
-         mouse_events: 0;
-         description {
-            fixed: 1 0;
-            align: 0 0.5;
-            min: 15 0;
-            rel1.relative: 0 0;
-            rel1.offset: 3 0;
-            rel2.relative: 0 1;
-         }
-      }
-      part { name: "elm.swallow.edit";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            align: 0.5 0.5;
-            rel1.relative: 1 0;
-            rel1.to: "base_clip";
-         }
-      }
-   }
-   programs {
-      program { name: "linenumber_show";
-         signal: "elm,state,linenumber,show";
-         action: STATE_SET "default" 0.0;
-         target: "base_clip";
-         transition: DECELERATE 0.35;
-      }
-      program { name: "linenumber_hide";
-         signal: "elm,state,linenumber,hide";
-         action: STATE_SET "hide" 0.0;
-         target: "base_clip";
-         transition: DECELERATE 0.35;
-      }
-   }
-}

data/themes/default/layout.edc

@@ -1,6 +1,6 @@
 styles {
      style { name: "entry_statusbar_style";
-        base: "font="FN" font_size=11 text_class=entry color=#606060";
+        base: "font="FN" font_size=11 text_class=entry color=#ffffff style=shadow,bottom shadow_color=#00000080 glow_color=#3399ff18 valign=0.5";
      }
 }
 
@@ -90,15 +90,6 @@ group { name: "preview_layout";
 
 group { name: "slider_layout";
    parts {
-      part { name: "bg";
-         type: RECT;
-         description { state: "default" 0.0;
-            min: 100 25;
-            color: 225 225 225 255;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-         }
-      }
       part { name: "elm.swallow.plus";
          type: SWALLOW;
          description { state: "default" 0.0;
@@ -153,8 +144,8 @@ group { name: "statusbar_layout";
             align: 0 0.5;
             min: 120 18;
             fixed: 1 1;
-            rel1.offset: 0 -1;
-            rel2.offset: -1 -2;
+            rel1.offset: 0 -2;
+            rel2.offset: -1 -3;
             text.style: "entry_statusbar_style";
          }
       }
@@ -183,8 +174,8 @@ group { name: "statusbar_layout";
             rel2.to: "elm.text.line";
             rel2.relative: 0 1.0;
             min: 180 18;
-            fixed: 1 1;
             align: 1 0.5;
+            fixed: 1 1;
             text.style: "entry_statusbar_style";
          }
       }
@@ -194,8 +185,8 @@ group { name: "statusbar_layout";
          clip_to: "base_clip";
          description {
             rel1.relative: 1 0;
-            rel1.offset: 0 -1;
-            rel2.offset: -1 -2;
+            rel1.offset: 0 -2;
+            rel2.offset: -1 -3;
             align: 1 0.5;
             min: 100 18;
             fixed: 1 1;
@@ -205,9 +196,9 @@ group { name: "statusbar_layout";
       part { name: "elm.text.info_msg";
          type: TEXT;
          scale: 1;
+         effect: GLOW;
          description { state: "default" 0.0;
             align: 0 0.5;
-            color: 0 0 0 0;
             rel1.offset: 0 -1;
             rel2.offset: -1 -2;
             text {
@@ -215,10 +206,15 @@ group { name: "statusbar_layout";
                size: 11;
                align: 0 0.5;
             }
+            color: 51 153 255 0;
+            color2: 51 153 255 0;
+            color3: 51 153 255 0;
          }
          description { state: "show" 0.0;
             inherit: "default" 0.0;
-            color: 0 0 0 255;
+            color: 51 153 255 255;
+            color2: 51 153 255 24;
+            color3: 51 153 255 18;
          }
       }
       program { name: "info_msg_show";

data/themes/default/menu.edc

@@ -6,6 +6,8 @@ images {
    image: "setting_icon.png" COMP;
    image: "fileselect.png" COMP;
    image: "logo.png" COMP;
+   image: "shine.png" COMP;
+   image: "bub_over_bot.png" COMP;
 }
 
 group { name: "about_layout";
@@ -29,8 +31,10 @@ group { name: "about_layout";
       part { name: "logo";
          scale: 1;
          description { state: "default" 0.0;
-            min: 100 100;
-            max: 100 100;
+            min: 80 80;
+            max: 80 80;
+            rel1.offset: -25 -25;
+            rel2.offset: -26 -26;
             image.normal: "logo.png";
             align: 1 1;
             color: 255 255 255 205;
@@ -108,7 +112,6 @@ group { name: "about_layout";
    }
 }
 
-
 group { name: "fileselector_layout";
    parts {
       part { name: "clipper";
@@ -132,19 +135,32 @@ group { name: "fileselector_layout";
          scale: 1;
          clip_to: "clipper";
          description {
-            min: 600 400;
-            max: 600 400;
+            min: 600 380;
+            max: 600 380;
             fixed: 1 1;
             image.normal: "menu_layout.png";
-            image.border: 20 20 20 20;
+            image.border: 10 10 10 10;
             image.border_scale: 1;
          }
       }
+      part { name: "shine_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 0; }
+            align: 0.5 0;
+            min: 600 3;
+            fixed: 1 1;
+            image.normal: "shine.png";
+         }
+      }
       part { name: "base_frame";
          type: SPACER;
          description {
-            rel1 { to: "base_frame_img"; offset: 20 20; }
-            rel2 { to: "base_frame_img"; offset: -21 -21; }
+            rel1 { to: "base_frame_img"; offset: 10 10; }
+            rel2 { to: "base_frame_img"; offset: -11 -11; }
          }
       }
       part { name: "title_frame";
@@ -156,7 +172,7 @@ group { name: "fileselector_layout";
             align: 0.5 0;
             min: 0 23;
             fixed: 0 1;
-            color: 100 100 100 255;
+            color: 0 0 0 255;
          }
       }
       part { name: "title_icon";
@@ -181,7 +197,6 @@ group { name: "fileselector_layout";
          description {
             rel1.to: "title_frame";
             rel2.to: "title_frame";
-            color: 255 255 255 255;
             align: 0.5 0.5;
             fixed: 1 1;
             text {
@@ -190,8 +205,9 @@ group { name: "fileselector_layout";
                align: 0.5 0.5;
                min: 1 0;
             }
-            color2: 255 255 255 24;
-            color3: 255 255 255 18;
+            color: 51 153 255 255;
+            color2: 51 153 255 24;
+            color3: 51 153 255 18;
          }
       }
       part { name: "elm.swallow.fileselector";
@@ -235,6 +251,17 @@ group { name: "fileselector_layout";
             visible: 0;
          }
       }
+      part { name: "over_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         mouse_events: 0;
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 1; }
+            image.normal: "bub_over_bot.png";
+         }
+      }
    }
    programs {
       program { name: "load";
@@ -307,19 +334,32 @@ group { name: "warning_layout";
          scale: 1;
          clip_to: "clipper";
          description {
-            min: 300 155;
-            max: 300 155;
+            min: 300 135;
+            max: 300 135;
             fixed: 1 1;
             image.normal: "menu_layout.png";
-            image.border: 20 20 20 20;
+            image.border: 10 10 10 10;
             image.border_scale: 1;
          }
       }
+      part { name: "shine_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 0; }
+            align: 0.5 0;
+            min: 600 3;
+            fixed: 1 1;
+            image.normal: "shine.png";
+         }
+      }
       part { name: "base_frame";
          type: SPACER;
          description {
-            rel1 { to: "base_frame_img"; offset: 20 20; }
-            rel2 { to: "base_frame_img"; offset: -21 -21; }
+            rel1 { to: "base_frame_img"; offset: 10 10; }
+            rel2 { to: "base_frame_img"; offset: -11 -11; }
          }
       }
       part { name: "title_bg";
@@ -332,7 +372,7 @@ group { name: "warning_layout";
             align: 0.5 0;
             min: 0 23;
             fixed: 0 1;
-            color: 100 100 100 255;
+            color: 0 0 0 255;
          }
       }
       part { name: "warning_img";
@@ -366,8 +406,9 @@ group { name: "warning_layout";
             }
             fixed: 1 1;
             align: 0.5 0.5;
-            color2: 255 255 255 24;
-            color3: 255 255 255 18;
+            color: 51 153 255 255;
+            color2: 51 153 255 24;
+            color3: 51 153 255 18;
          }
       }
       part { name: "elm.text.desc";
@@ -386,7 +427,6 @@ group { name: "warning_layout";
             }
             align: 0.5 0;
             fixed: 1 1;
-            color: 30 30 30 255;
          }
       }
       part { name: "elm.text.question";
@@ -405,7 +445,6 @@ group { name: "warning_layout";
             }
             align: 0.5 0;
             fixed: 1 1;
-            color: 30 30 30 255;
          }
       }
       part { name: "elm.swallow.save";
@@ -464,6 +503,17 @@ group { name: "warning_layout";
             visible: 0;
          }
       }
+      part { name: "over_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         mouse_events: 0;
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 1; }
+            image.normal: "bub_over_bot.png";
+         }
+      }
    }
    programs {
       program { name: "load";
@@ -576,14 +626,15 @@ group { name: "menu_layout";
                align: 0.5 1;
                min: 1 0;
             }
-            color2: 255 255 255 24;
-            color3: 255 255 255 18;
+            color: 51 153 255 255;
+            color2: 51 153 255 24;
+            color3: 51 153 255 18;
          }
          description { state: "anim" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
-            color2: 255 255 255 58;
-            color3: 255 255 255 46;
+            color: 71 173 255 255;
+            color2: 71 173 255 58;
+            color3: 71 173 255 46;
          }
       }
       part { name: "padding1";
@@ -816,19 +867,32 @@ group { name: "setting_layout";
          scale: 1;
          clip_to: "clipper";
          description {
-            min: 600 400;
-            max: 600 400;
+            min: 600 380;
+            max: 600 380;
             fixed: 1 1;
             image.normal: "menu_layout.png";
-            image.border: 20 20 20 20;
+            image.border: 10 10 10 10;
             image.border_scale: 1;
          }
       }
+      part { name: "shine_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 0; }
+            align: 0.5 0;
+            min: 600 3;
+            fixed: 1 1;
+            image.normal: "shine.png";
+         }
+      }
       part { name: "base_frame";
          type: SPACER;
          description {
-            rel1 {to: "base_frame_img"; offset: 20 20;}
-            rel2 {to: "base_frame_img"; offset: -21 -21;}
+            rel1 {to: "base_frame_img"; offset: 10 10;}
+            rel2 {to: "base_frame_img"; offset: -11 -11;}
          }
       }
       part { name: "title_frame";
@@ -840,7 +904,7 @@ group { name: "setting_layout";
             align: 0.5 0;
             min: 0 23;
             fixed: 0 1;
-            color: 100 100 100 255;
+            color: 0 0 0 255;
          }
       }
       part { name: "title_icon";
@@ -865,7 +929,6 @@ group { name: "setting_layout";
          description {
             rel1.to: "title_frame";
             rel2.to: "title_frame";
-            color: 255 255 255 255;
             align: 0.5 0.5;
             fixed: 1 1;
             text {
@@ -875,8 +938,9 @@ group { name: "setting_layout";
                align: 0.5 0.5;
                min: 1 0;
             }
-            color2: 255 255 255 24;
-            color3: 255 255 255 18;
+            color: 51 153 255 255;
+            color2: 51 153 255 24;
+            color3: 51 153 255 18;
          }
       }
       part { name: "img_path_frame";
@@ -947,10 +1011,12 @@ group { name: "setting_layout";
          type: TEXT;
          scale: 1;
          clip_to: "clipper";
+         effect: SHADOW BOTTOM;
          description {
             rel1 {to: "img_path_icon"; relative: 1 0; offset: 5 1;}
             rel2 {to: "img_path_icon"; relative: 1 1;}
-            color: 30 30 30 255;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
             align: 0 0.5;
             fixed: 1 1;
             text {
@@ -992,12 +1058,14 @@ group { name: "setting_layout";
       }
       part { name: "snd_path_guide";
          type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description {
             rel1 {to: "snd_path_icon"; relative: 1 0; offset: 5 1;}
             rel2 {to: "snd_path_icon"; relative: 1 1;}
-            color: 30 30 30 255;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
             align: 0 0.5;
             fixed: 1 1;
             text {
@@ -1039,12 +1107,14 @@ group { name: "setting_layout";
       }
       part { name: "fnt_path_guide";
          type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description {
             rel1 {to: "fnt_path_icon"; relative: 1 0; offset: 5 1;}
             rel2 {to: "fnt_path_icon"; relative: 1 1;}
-            color: 30 30 30 255;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
             align: 0 0.5;
             fixed: 1 1;
             text {
@@ -1086,12 +1156,14 @@ group { name: "setting_layout";
       }
       part { name: "data_path_guide";
          type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description {
             rel1 {to: "data_path_icon"; relative: 1 0; offset: 5 1;}
             rel2 {to: "data_path_icon"; relative: 1 1;}
-            color: 30 30 30 255;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
             align: 0 0.5;
             fixed: 1 1;
             text {
@@ -1133,12 +1205,14 @@ group { name: "setting_layout";
       }
       part { name: "preference_guide";
          type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description {
             rel1 {to: "preference_icon"; relative: 1 0; offset: 5 1;}
             rel2 {to: "preference_icon"; relative: 1 1;}
-            color: 30 30 30 255;
+            color: 255 255 255 255;
+            color3: 0 0 0 128;
             align: 0 0;
             fixed: 1 1;
             text {
@@ -1215,6 +1289,17 @@ group { name: "setting_layout";
             visible: 0;
          }
       }
+      part { name: "over_img";
+         type: IMAGE;
+         scale: 1;
+         clip_to: "clipper";
+         mouse_events: 0;
+         description {
+            rel1 { to: "base_frame_img"; relative: 0 0; }
+            rel2 { to: "base_frame_img"; relative: 1 1; }
+            image.normal: "bub_over_bot.png";
+         }
+      }
    }
    programs {
       program { name: "load";

src/bin/config_data.c

@@ -27,7 +27,6 @@ struct config_s
    Eina_Bool part_highlight : 1;
    Eina_Bool dummy_swallow : 1;
    Eina_Bool auto_indent : 1;
-   Eina_Bool dark_theme : 1;
 };
 
 void
@@ -307,18 +306,6 @@ config_apply(config_data *cd)
    if (cd->update_cb) cd->update_cb(cd->update_cb_data, cd);
 }
 
-void
-config_dark_theme_set(config_data *cd, Eina_Bool dark_theme)
-{
-   cd->dark_theme = dark_theme;
-}
-
-Eina_Bool
-config_dark_theme_get(config_data *cd)
-{
-   return cd->dark_theme;
-}
-
 Eina_List *
 config_edc_img_path_list_get(config_data *cd)
 {

src/bin/edc_editor.c

@@ -104,14 +104,6 @@ syntax_color_timer_update(edit_data *ed)
                                               syntax_color_timer_cb, ed);
 }
 
-void
-edit_theme_change(edit_data *ed)
-{
-   color_theme_change(syntax_color_data_get(ed->sh),
-                      config_dark_theme_get(ed->cd));
-   syntax_color_timer_update(ed);
-}
-
 static void
 edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 {

src/bin/main.c

@@ -21,39 +21,8 @@ struct app_s
    Eina_Bool menu_opened : 1;
 };
 
-static Eina_Bool DARK_THEME = EINA_FALSE;
-
 int main(int argc, char **argv);
 
-static void
-theme_change(app_data *ad)
-{
-   if (DARK_THEME == config_dark_theme_get(ad->cd)) return;
-
-   elm_theme_extension_del(NULL, EDJE_PATH);
-
-   if (config_dark_theme_get(ad->cd))
-     {
-        snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor_dark.edj",
-                 elm_app_data_dir_get());
-        elm_theme_set(NULL, "dark");
-     }
-   else
-     {
-        snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj",
-                 elm_app_data_dir_get());
-        elm_theme_set(NULL, "default");
-     }
-
-   elm_theme_extension_add(NULL, EDJE_PATH);
-
-   menu_theme_change(ad->md);
-   stats_theme_change(ad->sd);
-   edit_theme_change(ad->ed);
-
-   DARK_THEME = config_dark_theme_get(ad->cd);
-}
-
 static Eina_Bool
 edc_changed_cb(void *data, int type EINA_UNUSED, void *event)
 {
@@ -445,7 +414,6 @@ static void
 config_update_cb(void *data, config_data *cd)
 {
    app_data *ad = data;
-   theme_change(ad);
    build_cmd_set(cd);
    edit_line_number_toggle(ad->ed);
    edit_font_size_update(ad->ed, EINA_FALSE);
@@ -560,6 +528,7 @@ elm_setup()
 
    /* Recover the scale & theme since it will be reset by
       elm_config_profile_set() */
+   elm_theme_set(NULL, "default");
    char *scale = getenv("ELM_SCALE");
    if (scale) elm_config_scale_set(atof(scale));
 

src/bin/menu.c

@@ -19,7 +19,6 @@ struct menu_s
    Evas_Object *toggle_highlight;
    Evas_Object *toggle_swallow;
    Evas_Object *toggle_indent;
-   Evas_Object *toggle_theme;
 
    Evas_Object *ctxpopup;
 
@@ -208,7 +207,6 @@ setting_apply_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
    config_part_highlight_set(cd, elm_check_state_get(md->toggle_highlight));
    config_dummy_swallow_set(cd, elm_check_state_get(md->toggle_swallow));
    config_auto_indent_set(cd, elm_check_state_get(md->toggle_indent));
-   config_dark_theme_set(cd, elm_check_state_get(md->toggle_theme));
 
    config_apply(cd);
 
@@ -302,7 +300,6 @@ setting_reset_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    elm_check_state_set(md->toggle_highlight, config_part_highlight_get(cd));
    elm_check_state_set(md->toggle_swallow, config_dummy_swallow_get(cd));
    elm_check_state_set(md->toggle_indent, config_auto_indent_get(cd));
-   elm_check_state_set(md->toggle_theme, config_dark_theme_get(cd));
 }
 
 static void
@@ -487,21 +484,6 @@ setting_open(menu_data *md)
 
    elm_box_pack_end(box, toggle_indent);
 
-   //Toggle (Theme)
-   Evas_Object *toggle_theme = elm_check_add(box);
-   elm_object_style_set(toggle_theme, "toggle");
-   elm_object_part_text_set(toggle_theme, "on", "Dark");
-   elm_object_part_text_set(toggle_theme, "off", "Light");
-   elm_check_state_set(toggle_theme, config_dark_theme_get(md->cd));
-   evas_object_size_hint_weight_set(toggle_theme, EVAS_HINT_EXPAND,
-                                    EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(toggle_theme, EVAS_HINT_FILL,
-                                   EVAS_HINT_FILL);
-   elm_object_text_set(toggle_theme, "Theme");
-   evas_object_show(toggle_theme);
-
-   elm_box_pack_end(box, toggle_theme);
-
    Evas_Object *btn;
 
    //Apply Button
@@ -545,7 +527,6 @@ setting_open(menu_data *md)
    md->toggle_highlight = toggle_highlight;
    md->toggle_swallow = toggle_swallow;
    md->toggle_indent = toggle_indent;
-   md->toggle_theme = toggle_theme;
 }
 
 static void
@@ -1012,12 +993,6 @@ load_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
    menu_edc_load(md);
 }
 
-void
-menu_theme_change(menu_data *md)
-{
-   elm_layout_file_set(md->menu_layout, EDJE_PATH, "menu_layout");
-}
-
 static void
 menu_open(menu_data *md)
 {

src/bin/statusbar.c

@@ -10,26 +10,12 @@ struct statusbar_s
    config_data *cd;
 };
 
-void
-stats_theme_change(stats_data *sd)
-{
-   elm_layout_file_set(sd->layout, EDJE_PATH, "statusbar_layout");
-   stats_edc_file_set(sd, sd->group_name);
-   stats_line_num_update(sd, sd->cur_line, sd->max_line);
-   stats_view_size_update(sd);
-   stats_cursor_pos_update(sd, 0, 0, 0, 0);
-}
-
 void
 stats_line_num_update(stats_data *sd, int cur_line, int max_line)
 {
    char buf[128];
-   if (config_dark_theme_get(sd->cd))
-     snprintf(buf, sizeof(buf),
-              "<align=right>Line [<style=glow><color=#3399ff>%d</color></style>:<style=glow><color=#3399ff>%d</color></style>]</align>", cur_line, max_line);
-   else
-     snprintf(buf, sizeof(buf),
-              "<align=right>Line [<color=#000000>%d</color>:<color=#000000>%d</color>]</align>", cur_line, max_line);
+   snprintf(buf, sizeof(buf),
+            "<align=right>Line [<style=glow><color=#3399ff>%d</color></style>:<style=glow><color=#3399ff>%d</color></style>]</align>", cur_line, max_line);
    elm_object_part_text_set(sd->layout, "elm.text.line", buf);
    sd->cur_line = cur_line;
    sd->max_line = max_line;
@@ -40,13 +26,8 @@ stats_edc_file_set(stats_data *sd, Eina_Stringshare *group_name)
 {
    char buf[PATH_MAX];
    const char *filename = ecore_file_file_get(config_edc_path_get(sd->cd));
-   if (config_dark_theme_get(sd->cd))
-     snprintf(buf, sizeof(buf), "<align=right>File [<style=glow><color=#3399ff>%s</color></style>]    Group [<style=glow><color=#3399ff>%s</color></style>]</align>", filename, group_name);
-   else
-     snprintf(buf, sizeof(buf), "<align=right>File [<color=#000000>%s</color>]    Group [<color=#000000>%s</color>]</align>", filename, group_name);
-
+   snprintf(buf, sizeof(buf), "<align=right>File [<style=glow><color=#3399ff>%s</color></style>]    Group [<style=glow><color=#3399ff>%s</color></style>]</align>", filename, group_name);
    elm_object_part_text_set(sd->layout, "elm.text.file_group_name", buf);
-
    sd->group_name = eina_stringshare_add(group_name);
 }
 
@@ -60,13 +41,8 @@ stats_init(Evas_Object *parent, config_data *cd)
    evas_object_show(layout);
 
    //FIXME: temporarily setup
-   if (config_dark_theme_get(cd))
-     elm_object_part_text_set(layout, "elm.text.cur_pos",
-                              "Cursor [<style=glow><color=#3399ff>0</color></style>,<style=glow><color=#3399ff>0</color></style>] [<style=glow><color=#3399ff>0.00</color></style>,<style=glow><color=#3399ff>0.00</color></style>]");
-   else
-     elm_object_part_text_set(layout, "elm.text.cur_pos",
-                              "Cursor [<color=#000000>0</color>,<color=#000000>0</color>] [<color=#000000>0.00</color>,<color=#000000>0.00</color>]");
-
+   elm_object_part_text_set(layout, "elm.text.cur_pos",
+                            "Cursor [<style=glow><color=#3399ff>0</color></style>,<style=glow><color=#3399ff>0</color></style>] [<style=glow><color=#3399ff>0.00</color></style>,<style=glow><color=#3399ff>0.00</color></style>]");
    sd->layout = layout;
    sd->cd = cd;
 
@@ -110,12 +86,8 @@ stats_view_size_update(stats_data *sd)
    config_view_size_get(sd->cd, &w, &h);
 
    char buf[128];
-   if (config_dark_theme_get(sd->cd))
-     snprintf(buf, sizeof(buf),
-              "Size [<style=glow><color=#3399ff>%d</color></style>x<style=glow><color=#3399ff>%d</color></style>]", w, h);
-   else
-     snprintf(buf, sizeof(buf),
-              "Size [<color=#000000>%d</color>x<color=#000000>%d</color>]", w, h);
+   snprintf(buf, sizeof(buf),
+            "Size [<style=glow><color=#3399ff>%d</color></style>x<style=glow><color=#3399ff>%d</color></style>]", w, h);
 
    elm_object_part_text_set(sd->layout, "elm.text.view_size", buf);
 }
@@ -124,12 +96,8 @@ void
 stats_cursor_pos_update(stats_data *sd, Evas_Coord x, Evas_Coord y, float rel_x, float rel_y)
 {
    char buf[250];
-   if (config_dark_theme_get(sd->cd))
-     snprintf(buf, sizeof(buf),
-              "Cursor [<style=glow><color=#3399ff>%d</color></style>,<style=glow><color=#3399ff>%d</color></style>] [<style=glow><color=#3399ff>%0.2f</color></style>,<style=glow><color=#3399ff>%0.2f</color></style>]", x, y, rel_x, rel_y);
-   else
-     snprintf(buf, sizeof(buf),
-              "Cursor [<color=#000000>%d</color>,<color=#000000>%d</color>] [<color=#000000>%0.2f</color>,<color=#000000>%0.2f</color>]", x, y, rel_x, rel_y);
+   snprintf(buf, sizeof(buf),
+            "Cursor [<style=glow><color=#3399ff>%d</color></style>,<style=glow><color=#3399ff>%d</color></style>] [<style=glow><color=#3399ff>%0.2f</color></style>,<style=glow><color=#3399ff>%0.2f</color></style>]", x, y, rel_x, rel_y);
 
    elm_object_part_text_set(sd->layout, "elm.text.cur_pos", buf);
 }

src/bin/syntax_color.c

@@ -17,33 +17,6 @@ struct syntax_color_s
    Eina_Stringshare *cols[COL_NUM];
 };
 
-void
-color_theme_change(color_data *cd, Eina_Bool dark)
-{
-   int i;
-   for(i = 0; i < COL_NUM; i++)
-     eina_stringshare_del(cd->cols[i]);
-
-   if (dark)
-     {
-        cd->cols[0] = eina_stringshare_add("A0A0A0");
-        cd->cols[1] = eina_stringshare_add("00FFFF");
-        cd->cols[2] = eina_stringshare_add("FFFF00");
-        cd->cols[3] = eina_stringshare_add("FF00FF");
-        cd->cols[4] = eina_stringshare_add("00FF00");
-        cd->cols[5] = eina_stringshare_add("FF0000");
-     }
-   else
-     {
-        cd->cols[0] = eina_stringshare_add("424242");
-        cd->cols[1] = eina_stringshare_add("A000A0");
-        cd->cols[2] = eina_stringshare_add("0000A0");
-        cd->cols[3] = eina_stringshare_add("969600");
-        cd->cols[4] = eina_stringshare_add("009600");
-        cd->cols[5] = eina_stringshare_add("00C0C0");
-     }
-}
-
 color_data *
 color_init(Eina_Strbuf *strbuf)
 {

src/include/config_data.h

@@ -34,6 +34,4 @@ void config_auto_indent_set(config_data *cd, Eina_Bool auto_indent);
 Eina_Bool config_auto_indent_get(config_data *cd);
 void config_font_size_set(config_data *cd, float font_size);
 float config_font_size_get(config_data *cd);
-void config_dark_theme_set(config_data *cd, Eina_Bool dark_theme);
-Eina_Bool config_dark_theme_get(config_data *cd);
 

src/include/edc_editor.h

@@ -14,4 +14,3 @@ void edit_view_sync(edit_data *ed);
 void edit_font_size_update(edit_data *ed, Eina_Bool msg);
 void edit_template_insert(edit_data *ed);
 void edit_template_part_insert(edit_data *ed, Edje_Part_Type type);
-void edit_theme_change(edit_data *ed);

src/include/menu.h

@@ -11,4 +11,3 @@ Eina_Bool menu_edc_load(menu_data *md);
 void menu_exit(menu_data *md);
 Eina_Bool menu_about(menu_data *md);
 Eina_Bool menu_setting(menu_data *md);
-void menu_theme_change(menu_data *md);

src/include/panes.h

@@ -1,6 +1,5 @@
 Evas_Object *panes_create(Evas_Object *parent);
 void panes_full_view_right(Evas_Object *panes);
 void panes_full_view_left(Evas_Object *panes);
-void panes_theme_change(Evas_Object *panes);
 
 

src/include/statusbar.h

@@ -7,4 +7,3 @@ void stats_line_num_update(stats_data *sd, int cur_line, int max_line);
 Evas_Object *stats_obj_get(stats_data *sd);
 void stats_edc_file_set(stats_data *sd, const char *group_name);
 Eina_Stringshare *stats_group_name_get(stats_data *sd);
-void stats_theme_change(stats_data *sd);

src/include/syntax_color.h

@@ -2,5 +2,4 @@ color_data *color_init(Eina_Strbuf *strbuf);
 void color_term(color_data *cd);
 const char *color_cancel(color_data *cd, const char *str, int length);
 const char *color_apply(color_data *cd, const char *str, int length);
-void color_theme_change(color_data *cd, Eina_Bool dark);