diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 19f5e9c..3f81fac 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -13,8 +13,6 @@ EXTRA_DIST = ephoto.edc \
images/sel_corner3.png \
images/sel_corner5.png \
images/sel_corner7.png \
- images/shadow_circle_horiz.png \
- images/shadow_circle_vert.png \
images/tile.png
ephoto.edj: Makefile $(EXTRA_DIST)
diff --git a/data/themes/ephoto.edc b/data/themes/ephoto.edc
index 49095f2..b945dc6 100644
--- a/data/themes/ephoto.edc
+++ b/data/themes/ephoto.edc
@@ -3,10 +3,7 @@
collections {
images {
- image: "images/shadow_circle_horiz.png" COMP;
- image: "images/shadow_circle_vert.png" COMP;
image: "images/tile.png" COMP;
- image: "images/shadow.png" COMP;
image: "images/sel_border.png" COMP;
image: "images/sel_corner1.png" COMP;
image: "images/sel_corner3.png" COMP;
@@ -15,98 +12,105 @@ collections {
}
group { name: "ephoto,main,layout";
script {
- public offseth = 0;
- public offsetv = 0;
- public custom = 0 ;
public custom_folders = 0;
- public folders_visible = 1;
- public controls_visible = 1;
+ public custom_editor = 0;
+ public folders_visible = 0;
+ public editor_visible = 0;
+ public statusbar_visible = 1;
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT_SET) && (id == 1)) {
- new hoffset = getarg(2);
- new voffset = getarg(3);
- new hoff, voff, roneoff;
-
- set_int(custom, 1);
- hoffset *= -1;
- voffset *= -1;
-
- get_state_val(PART:"ephoto.swallow.controls", STATE_REL1_OFFSET,
- 0, roneoff);
- get_state_val(PART:"ephoto.swallow.controls", STATE_REL2_OFFSET,
- hoff, voff);
-
- roneoff -= get_int(offsetv);
- roneoff += voffset;
- hoff -= get_int(offseth);
- voff -= get_int(offsetv);
- hoff += hoffset;
- voff += voffset;
- set_int(offseth, hoffset);
- set_int(offsetv, voffset);
-
- custom_state(PART:"ephoto.swallow.controls", "default", 0.0);
- set_state_val(PART:"ephoto.swallow.controls", STATE_REL1_OFFSET,
- 0, roneoff);
- set_state_val(PART:"ephoto.swallow.controls", STATE_REL2_OFFSET,
- hoff, voff);
- set_state(PART:"ephoto.swallow.controls", "custom", 0.0);
- }
- if ((type == MSG_INT_SET) && (id == 2)) {
new minw = getarg(2);
+ set_int(statusbar_visible, 1);
+
set_int(custom_folders, 1);
- custom_state(PART:"ephoto.swallow.folders", "visible", 0.0);
+ set_int(custom_editor, 1);
+ custom_state(PART:"ephoto,folders",
+ "visible", 0.0);
+ custom_state(PART:"ephoto.swallow.folders",
+ "visible", 0.0);
+ custom_state(PART:"ephoto,editor",
+ "visible", 0.0);
+ custom_state(PART:"ephoto.swallow.editor",
+ "visible", 0.0);
+ set_state_val(PART:"ephoto,folders",
+ STATE_MIN, minw, 0);
set_state_val(PART:"ephoto.swallow.folders",
STATE_MIN, minw, 0);
+ set_state_val(PART:"ephoto,editor",
+ STATE_MIN, minw, 0);
+ set_state_val(PART:"ephoto.swallow.editor",
+ STATE_MIN, minw, 0);
+ if (get_int(folders_visible)) {
+ set_state(PART:"ephoto,folders",
+ "custom", 0.0);
+ set_state(PART:"ephoto.swallow.folders",
+ "custom", 0.0);
+ }
+ if (get_int(editor_visible)) {
+ set_state(PART:"ephoto,editor",
+ "custom", 0.0);
+ set_state(PART:"ephoto.swallow.editor",
+ "custom", 0.0);
+ }
}
}
public hide_folders(val, Float:pos) {
set_int(folders_visible, 0);
set_state_anim(PART:"ephoto.swallow.folders",
- "hidden", 0.0, DECELERATE, pos);
- set_state_anim(PART:"folders_shadow",
- "hidden", 0.0, DECELERATE, pos);
+ "default", 0.0, DECELERATE, pos);
set_state_anim(PART:"ephoto,folders",
- "hidden", 0.0, DECELERATE, pos);
+ "default", 0.0, DECELERATE, pos);
}
public show_folders(val, Float:pos) {
set_int(folders_visible, 1);
- if (get_int(custom_folders)) {
+ if (custom_folders) {
set_state_anim(PART:"ephoto.swallow.folders",
- "custom", 0.0, ACCELERATE, pos);
+ "custom", 1.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto,folders",
+ "custom", 1.0, ACCELERATE, pos);
}
else {
set_state_anim(PART:"ephoto.swallow.folders",
- "default", 0.0, ACCELERATE, pos);
+ "visible", 1.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto,folders",
+ "visible", 1.0, ACCELERATE, pos);
}
- set_state_anim(PART:"folders_shadow",
- "default", 0.0, ACCELERATE, pos);
- set_state_anim(PART:"ephoto,folders",
- "default", 0.0, ACCELERATE, pos);
}
- public hide_controls(val, Float:pos) {
- set_int(controls_visible, 0);
- set_state_anim(PART:"ephoto.swallow.controls",
- "hidden", 0.0, DECELERATE, pos);
- set_state_anim(PART:"controls_shadow",
- "hidden", 0.0, DECELERATE, pos);
- set_state_anim(PART:"ephoto,controls",
- "hidden", 0.0, DECELERATE, pos);
+ public hide_editor(val, Float:pos) {
+ set_int(editor_visible, 0);
+ set_state_anim(PART:"ephoto.swallow.editor",
+ "default", 0.0, DECELERATE, pos);
+ set_state_anim(PART:"ephoto,editor",
+ "default", 0.0, DECELERATE, pos);
}
- public show_controls(val, Float:pos) {
- set_int(controls_visible, 1);
- if (get_int(custom)) {
- set_state_anim(PART:"ephoto.swallow.controls",
- "custom", 0.0, ACCELERATE, pos);
+ public show_editor(val, Float:pos) {
+ set_int(editor_visible, 1);
+ if (custom_editor) {
+ set_state_anim(PART:"ephoto.swallow.editor",
+ "custom", 1.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto,editor",
+ "custom", 1.0, ACCELERATE, pos);
}
else {
- set_state_anim(PART:"ephoto.swallow.controls",
- "default", 0.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto.swallow.editor",
+ "visible", 1.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto,editor",
+ "visible", 1.0, ACCELERATE, pos);
}
- set_state_anim(PART:"controls_shadow",
- "default", 0.0, ACCELERATE, pos);
- set_state_anim(PART:"ephoto,controls",
- "default", 0.0, ACCELERATE, pos);
+ }
+ public hide_statusbar(val, Float:pos) {
+ set_int(statusbar_visible, 0);
+ set_state_anim(PART:"ephoto.swallow.statusbar",
+ "hidden", 0.0, DECELERATE, pos);
+ set_state_anim(PART:"ephoto,statusbar",
+ "hidden", 0.0, DECELERATE, pos);
+ }
+ public show_statusbar(val, Float:pos) {
+ set_int(statusbar_visible, 1);
+ set_state_anim(PART:"ephoto.swallow.statusbar",
+ "default", 1.0, ACCELERATE, pos);
+ set_state_anim(PART:"ephoto,statusbar",
+ "default", 1.0, ACCELERATE, pos);
}
}
parts {
@@ -120,6 +124,8 @@ collections {
clip_to: "ephoto,main,clip";
description { state: "default" 0.0;
fixed: 1 1;
+ rel1.to: "ephoto.swallow.main";
+ rel2.to: "ephoto.swallow.main";
image.normal: "images/tile.png";
color: 210 210 210 255;
fill {
@@ -133,74 +139,11 @@ collections {
mouse_events: 1;
clip_to: "ephoto,main,clip";
description { state: "default" 0.0;
- rel2.to: "ephoto,editor";
- rel2.relative: 0.0 1.0;
- }
- }
- rect { name: "ephoto,editor";
- scale: 1;
- clip_to: "ephoto,main,clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "ephoto.swallow.editor";
- rel2.to: "ephoto.swallow.editor";
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: default 0.0;
- visible: 1;
- }
- }
- image { name: "editor_shadow";
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "images/shadow_circle_vert.png";
- min: 32 0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 1 1;
- rel1.to: "ephoto,editor";
+ rel1.to_x: "ephoto,folders";
rel1.relative: 1.0 0.0;
- rel2.to: "ephoto,editor";
- color: 255 255 255 128;
- visible: 1;
- }
- }
- rect { name: "editor_base";
- clip_to: "ephoto,editor";
- scale: 1;
- description { state: "default" 0.0;
- color: 30 30 30 150;
- rel1.to: "ephoto,editor";
- rel2.to: "ephoto,editor";
- }
- }
- swallow { name: "ephoto.swallow.editor";
- scale: 1;
- mouse_events: 1;
- clip_to: "ephoto,editor";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 220 0;
- rel1.to: "ephoto,main,clip";
- rel1.relative: 1.0 0.0;
- rel2.to: "ephoto,main,clip";
- rel2.relative: 2.0 1.0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "ephoto,main,clip";
- rel1.relative: 1.0 0.0;
- rel2.to: "ephoto,main,clip";
- rel2.relative: 1.0 1.0;
- align: 1.0 0.0;
- visible: 1;
+ rel2.to_x: "ephoto,editor";
+ rel2.to_y: "ephoto,statusbar";
+ rel2.relative: 0.0 0.0;
}
}
rect { name: "ephoto,folders";
@@ -208,45 +151,19 @@ collections {
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 220 0;
+ min: 0 0;
rel1.to: "ephoto.swallow.folders";
rel2.to: "ephoto.swallow.folders";
+ color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: default 0.0;
+ fixed: 1 1;
+ min: 220 0;
color: 255 255 255 255;
visible: 1;
}
- description { state: "hidden" 0.0;
- inherit: default 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- }
- image { name: "folders_shadow";
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "images/shadow_circle_vert.png";
- min: 32 0;
- rel1.to: "ephoto,folders";
- rel1.relative: 1.0 0.0;
- rel2.to: "ephoto,folders";
- color: 255 255 255 128;
- visible: 1;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- }
- rect { name: "folders_base";
- clip_to: "ephoto,folders";
- scale: 1;
- description { state: "default" 0.0;
- color: 30 30 30 150;
- rel1.to: "ephoto,folders";
- rel2.to: "ephoto,folders";
- }
}
swallow { name: "ephoto.swallow.folders";
scale: 1;
@@ -254,77 +171,77 @@ collections {
clip_to: "ephoto,folders";
description { state: "default" 0.0;
fixed: 1 1;
- min: 220 0;
- rel1.to: "ephoto.swallow.main";
+ min: 0 0;
+ align: 1.0 0.0;
rel1.relative: 0.0 0.0;
- rel2.to: "ephoto,controls";
+ rel2.to_y: "ephoto,statusbar";
rel2.relative: 0.0 0.0;
- align: 0.0 0.0;
- color: 255 255 255 255;
- visible: 1;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
color: 255 255 255 0;
visible: 0;
}
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ fixed: 1 1;
+ min: 220 0;
+ rel1.relative: 0.0 0.0;
+ rel2.to_y: "ephoto,statusbar";
+ rel2.relative: 0.2 0.0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
}
- rect { name: "ephoto,controls";
- scale: 1;
+ rect { name: "ephoto,editor";
clip_to: "ephoto,main,clip";
- description { state: "default" 0.0;
- fixed: 0 1;
- rel1.to: "ephoto.swallow.controls";
- rel2.to: "ephoto.swallow.controls";
- color: 255 255 255 255;
- visible: 1;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- }
- rect { name: "controls_base";
- clip_to: "ephoto,controls";
- scale: 1;
- description { state: "default" 0.0;
- color: 30 30 30 150;
- rel1.to: "ephoto,controls";
- rel2.to: "ephoto,controls";
- }
- }
- image { name: "controls_shadow";
- mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "controls_base";
- rel1.relative: 0.0 0.0;
- rel2.to: "controls_base";
- rel2.relative: 1.0 0.0;
- image.normal: "images/shadow_circle_horiz.png";
- min: 0 32;
- color: 255 255 255 128;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
+ min: 0 0;
+ rel1.to: "ephoto.swallow.editor";
+ rel2.to: "ephoto.swallow.editor";
color: 255 255 255 0;
visible: 0;
}
+ description { state: "visible" 0.0;
+ inherit: default 0.0;
+ fixed: 1 1;
+ min: 220 0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
}
- swallow { name: "ephoto.swallow.controls";
+ swallow { name: "ephoto.swallow.editor";
scale: 1;
mouse_events: 1;
- clip_to: "ephoto,controls";
+ clip_to: "ephoto,editor";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "ephoto.swallow.main";
- rel2.to: "ephoto.swallow.main";
- rel1.relative: 0.0 1.0;
- rel1.offset: 0 -1;
- rel2.offset: 0 -1;
- align: 0.5 1.0;
+ min: 0 0;
+ align: 0.0 0.0;
+ rel1.relative: 1.0 0.0;
+ rel2.to_y: "ephoto,statusbar";
+ rel2.relative: 1.0 0.0;
+ color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ fixed: 1 1;
+ min: 220 0;
+ rel1.relative: 0.8 0.0;
+ rel2.to_y: "ephoto,statusbar";
+ rel2.relative: 1.0 0.0;
+ align: 1.0 0.0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
+ }
+ rect { name: "ephoto,statusbar";
+ clip_to: "ephoto,main,clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "ephoto.swallow.statusbar";
+ rel2.to: "ephoto.swallow.statusbar";
color: 255 255 255 255;
visible: 1;
}
@@ -334,50 +251,32 @@ collections {
visible: 0;
}
}
+ swallow { name: "ephoto.swallow.statusbar";
+ scale: 1;
+ mouse_events: 1;
+ clip_to: "ephoto,statusbar";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
+ align: 0.0 1.0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.0;
+ color: 255 255 255 0;
+ visible: 0;
+ }
+ }
}
programs {
- program { signal: "ephoto,editor,hide";
- source: "ephoto";
- action: STATE_SET "default" 0.0;
- target: "ephoto.swallow.editor";
- target: "editor_shadow";
- target: "ephoto,editor";
- }
- program { signal: "ephoto,editor,show";
- source: "ephoto";
- action: STATE_SET "visible" 0.0;
- target: "ephoto.swallow.editor";
- target: "editor_shadow";
- target: "ephoto,editor";
- }
- program { signal: "mouse,in";
- source: "ephoto.swallow.controls";
- action: SIGNAL_EMIT "ephoto,block" "ephoto";
- }
- program { signal: "mouse,out";
- source: "ephoto.swallow.controls";
- action: SIGNAL_EMIT "ephoto,unblock" "ephoto";
- }
- program { signal: "mouse,in";
- source: "ephoto.swallow.folders";
- action: SIGNAL_EMIT "ephoto,block" "ephoto";
- }
- program { signal: "mouse,out";
- source: "ephoto.swallow.folders";
- action: SIGNAL_EMIT "ephoto,unblock" "ephoto";
- }
- program { signal: "ephoto,folders,hide,start";
- source: "ephoto";
- action: STATE_SET "hidden" 0.0;
- target: "ephoto.swallow.folders";
- target: "folders_shadow";
- target: "ephoto,folders";
- }
program { signal: "ephoto,folders,hide";
source: "ephoto";
script {
if (get_int(folders_visible)) {
- anim(1.0, "hide_folders", 1);
+ anim(0.3, "hide_folders", 1);
}
}
}
@@ -385,23 +284,49 @@ collections {
source: "ephoto";
script {
if (!get_int(folders_visible)) {
- anim(0.5, "show_folders", 1);
+ anim(0.3, "show_folders", 1);
}
}
}
- program { signal: "ephoto,controls,hide";
+ program { signal: "ephoto,folders,show,start";
source: "ephoto";
script {
- if (get_int(controls_visible)) {
- anim(1.0, "hide_controls", 1);
+ set_int(folders_visible, 1);
+ if (custom_folders) {
+ set_state(PART:"ephoto,folders", "custom", 0.0);
+ set_state(PART:"ephoto.swallow.folders", "custom", 0.0);
+ }
+ else {
+ set_state(PART:"ephoto,folders", "visible", 0.0);
+ set_state(PART:"ephoto.swallow.folders", "visible", 0.0);
}
}
}
- program { signal: "ephoto,controls,show";
+ program { signal: "ephoto,editor,hide";
source: "ephoto";
script {
- if (!get_int(controls_visible)) {
- anim(0.5, "show_controls", 1);
+ anim(0.3, "hide_editor", 1);
+ }
+ }
+ program { signal: "ephoto,editor,show";
+ source: "ephoto";
+ script {
+ anim(0.3, "show_editor", 1);
+ }
+ }
+ program { signal: "ephoto,statusbar,hide";
+ source: "ephoto";
+ script {
+ if (get_int(statusbar_visible)) {
+ anim(0.3, "hide_statusbar", 1);
+ }
+ }
+ }
+ program { signal: "ephoto,statusbar,show";
+ source: "ephoto";
+ script {
+ if (!get_int(statusbar_visible)) {
+ anim(0.3, "show_statusbar", 1);
}
}
}
diff --git a/data/themes/images/shadow.png b/data/themes/images/shadow.png
deleted file mode 100644
index 9d1e0a6..0000000
Binary files a/data/themes/images/shadow.png and /dev/null differ
diff --git a/data/themes/images/shadow_circle_horiz.png b/data/themes/images/shadow_circle_horiz.png
deleted file mode 100644
index f5fcc5c..0000000
Binary files a/data/themes/images/shadow_circle_horiz.png and /dev/null differ
diff --git a/data/themes/images/shadow_circle_vert.png b/data/themes/images/shadow_circle_vert.png
deleted file mode 100644
index f06b622..0000000
Binary files a/data/themes/images/shadow_circle_vert.png and /dev/null differ
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 70f19e5..85570b0 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -82,7 +82,6 @@ void ephoto_single_browser_image_data_done(Evas_Object *main,
unsigned int *image_data, Evas_Coord w, Evas_Coord h);
void ephoto_single_browser_cancel_editing(Evas_Object *main);
void ephoto_single_browser_slideshow(Evas_Object *obj);
-void ephoto_single_browser_adjust_offsets(Ephoto *ephoto);
/* smart callbacks called: "back" - the user wants to go back to the previous
* screen. */
@@ -91,7 +90,6 @@ Evas_Object *ephoto_slideshow_add(Ephoto *ephoto, Evas_Object *parent);
void ephoto_slideshow_entries_set(Evas_Object *obj, Eina_List *entries);
void ephoto_slideshow_entry_set(Evas_Object *obj, Ephoto_Entry *entry);
void ephoto_slideshow_show_controls(Ephoto *ephoto);
-void ephoto_slideshow_adjust_offsets(Ephoto *ephoto);
/* smart callbacks called: "back" - the user wants to go back to the previous
* screen. */
@@ -243,9 +241,12 @@ struct _Ephoto_Config
struct _Ephoto
{
Evas_Object *win;
+ Evas_Object *main;
Evas_Object *layout;
Evas_Object *pager;
Evas_Object *statusbar;
+ Evas_Object *folders_button;
+ Evas_Object *view_button;
Evas_Object *controls_left;
Evas_Object *controls_right;
Evas_Object *infolabel;
@@ -261,24 +262,17 @@ struct _Ephoto
Elm_Object_Item *sb;
Elm_Object_Item *sl;
+ Eina_Bool folders_toggle;
Eina_List *entries;
Eina_List *selentries;
Eina_List *searchentries;
Eina_List *thumbs;
- Eina_Bool blocking;
- Eina_Bool menu_blocking;
- Eina_Bool hover_blocking;
- Eina_Bool right_blocking;
- Eina_Bool folders_toggle;
- Eina_Bool editor_blocking;
-
Eio_Monitor *monitor;
Eina_List *monitor_handlers;
- Ecore_Thread *file_thread;
Eina_List *file_pos;
Eina_List *upload_handlers;
- Ecore_Timer *overlay_timer;
+ Ecore_Thread *file_thread;
Ecore_Con_Url *url_up;
char *url_ret;
char *upload_error;
@@ -417,5 +411,9 @@ extern int EPHOTO_EVENT_EDITOR_BACK;
#define WRN(...) EINA_LOG_WARN(__VA_ARGS__)
#define INF(...) EINA_LOG_INFO(__VA_ARGS__)
#define DBG(...) EINA_LOG_DBG(__VA_ARGS__)
+#define EPHOTO_WEIGHT evas_object_size_hint_weight_set
+#define EPHOTO_ALIGN evas_object_size_hint_align_set
+#define EPHOTO_EXPAND(X) EPHOTO_WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
+#define EPHOTO_FILL(X) EPHOTO_ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
#endif
diff --git a/src/bin/ephoto_bcg.c b/src/bin/ephoto_bcg.c
index 2b28bc9..7d8cee4 100644
--- a/src/bin/ephoto_bcg.c
+++ b/src/bin/ephoto_bcg.c
@@ -362,8 +362,9 @@ ephoto_bcg_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, .1);
elm_slider_value_set(slider, 1);
elm_slider_unit_format_set(slider, "%1.2f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.2f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_gamma_slider_changed, ebcg);
elm_box_pack_start(ebcg->editor, slider);
@@ -376,8 +377,9 @@ ephoto_bcg_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_contrast_slider_changed, ebcg);
elm_box_pack_start(ebcg->editor, slider);
@@ -390,8 +392,9 @@ ephoto_bcg_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_brightness_slider_changed, ebcg);
elm_box_pack_start(ebcg->editor, slider);
diff --git a/src/bin/ephoto_color.c b/src/bin/ephoto_color.c
index d7b4ff8..fa0c748 100644
--- a/src/bin/ephoto_color.c
+++ b/src/bin/ephoto_color.c
@@ -347,8 +347,9 @@ ephoto_color_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Ob
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_blue_slider_changed, eco);
elm_box_pack_start(eco->editor, slider);
@@ -361,8 +362,9 @@ ephoto_color_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Ob
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_green_slider_changed, eco);
elm_box_pack_start(eco->editor, slider);
@@ -375,8 +377,9 @@ ephoto_color_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Ob
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_red_slider_changed, eco);
elm_box_pack_start(eco->editor, slider);
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 47fdcd5..58ad9e1 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -73,14 +73,14 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
Evas_Object *table, *check, *hoversel, *entry, *label;
table = elm_table_add(parent);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(table);
+ EPHOTO_FILL(table);
elm_box_pack_end(parent, table);
evas_object_show(table);
check = elm_check_add(table);
elm_object_text_set(check, _("Show Folders On Start"));
- evas_object_size_hint_align_set(check, 0.0, 0.5);
+ EPHOTO_ALIGN(check, 0.0, 0.5);
elm_check_state_set(check, ephoto->config->folders);
elm_table_pack(table, check, 0, 0, 1, 1);
evas_object_show(check);
@@ -88,7 +88,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
check = elm_check_add(table);
elm_object_text_set(check, _("Prompt Before Changing The Filesystem"));
- evas_object_size_hint_align_set(check, 0.0, EVAS_HINT_FILL);
+ EPHOTO_FILL(check);
elm_check_state_set(check, ephoto->config->prompts);
elm_table_pack(table, check, 0, 1, 1, 1);
evas_object_show(check);
@@ -96,7 +96,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
check = elm_check_add(table);
elm_object_text_set(check, _("Move Files When Dropped"));
- evas_object_size_hint_align_set(check, 0.0, EVAS_HINT_FILL);
+ EPHOTO_FILL(check);
elm_check_state_set(check, ephoto->config->drop);
elm_table_pack(table, check, 0, 2, 1, 1);
evas_object_show(check);
@@ -104,7 +104,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
check = elm_check_add(table);
elm_object_text_set(check, _("Smooth Scale Images"));
- evas_object_size_hint_align_set(check, 0.0, EVAS_HINT_FILL);
+ EPHOTO_FILL(check);
elm_check_state_set(check, ephoto->config->smooth);
elm_table_pack(table, check, 0, 3, 1, 1);
evas_object_show(check);
@@ -112,7 +112,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
label = elm_label_add(table);
elm_object_text_set(label, _("Top Level Directory"));
- evas_object_size_hint_align_set(label, 0.5, 0.5);
+ EPHOTO_ALIGN(label, 0.5, 0.5);
elm_table_pack(table, label, 0, 4, 1, 1);
evas_object_show(label);
@@ -128,9 +128,8 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
_open_hv_select, ephoto);
elm_object_text_set(hoversel, ephoto->config->open);
evas_object_data_set(hoversel, "ephoto", ephoto);
- evas_object_size_hint_weight_set(hoversel, EVAS_HINT_EXPAND,
- EVAS_HINT_FILL);
- evas_object_size_hint_align_set(hoversel, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(hoversel, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(hoversel);
elm_table_pack(table, hoversel, 0, 5, 1, 1);
evas_object_show(hoversel);
ephoto->config->open_dir = hoversel;
@@ -142,8 +141,8 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
elm_object_disabled_set(entry, EINA_TRUE);
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(entry);
+ EPHOTO_FILL(entry);
elm_table_pack(table, entry, 0, 6, 1, 1);
evas_object_show(entry);
ephoto->config->open_dir_custom = entry;
@@ -202,14 +201,14 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
char buf[PATH_MAX];
table = elm_table_add(parent);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(table);
+ EPHOTO_FILL(table);
elm_box_pack_end(parent, table);
evas_object_show(table);
check = elm_check_add(table);
elm_object_text_set(check, _("Moving Slideshow"));
- evas_object_size_hint_align_set(check, 0.5, 0.5);
+ EPHOTO_ALIGN(check, 0.5, 0.5);
elm_check_state_set(check, ephoto->config->movess);
elm_table_pack(table, check, 0, 0, 2, 1);
evas_object_show(check);
@@ -219,7 +218,7 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
memset(buf, 0, PATH_MAX);
snprintf(buf, PATH_MAX, "%s:", _("Show Each Slide For"));
elm_object_text_set(label, buf);
- evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
+ EPHOTO_FILL(label);
elm_table_pack(table, label, 0, 1, 1, 1);
evas_object_show(label);
@@ -240,7 +239,7 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
memset(buf, 0, PATH_MAX);
snprintf(buf, PATH_MAX, "%s:", _("Slide Transition"));
elm_object_text_set(label, buf);
- evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
+ EPHOTO_FILL(label);
elm_table_pack(table, label, 0, 2, 1, 1);
evas_object_show(label);
@@ -254,9 +253,8 @@ _config_slideshow(Ephoto *ephoto, Evas_Object *parent)
_hv_select, transition);
elm_hoversel_item_add(hoversel, "none", NULL, 0, _hv_select, NULL);
elm_object_text_set(hoversel, ephoto->config->slideshow_transition);
- evas_object_size_hint_weight_set(hoversel, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(hoversel, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(hoversel);
+ EPHOTO_FILL(hoversel);
elm_table_pack(table, hoversel, 1, 2, 1, 1);
evas_object_show(hoversel);
ephoto->config->slide_trans = hoversel;
@@ -274,14 +272,14 @@ _config_settings(Ephoto *ephoto, Evas_Object *parent, Eina_Bool slideshow)
elm_object_text_set(frame, _("General"));
else
elm_object_text_set(frame, _("Slideshow"));
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(frame);
+ EPHOTO_FILL(frame);
evas_object_show(frame);
vbox = elm_box_add(frame);
elm_box_horizontal_set(vbox, EINA_FALSE);
- evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(vbox);
+ EPHOTO_FILL(vbox);
elm_object_content_set(frame, vbox);
evas_object_show(vbox);
@@ -352,28 +350,28 @@ _config_bindings(Evas_Object *parent)
frame = elm_frame_add(parent);
elm_object_text_set(frame, _("Bindings"));
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(frame);
+ EPHOTO_FILL(frame);
evas_object_show(frame);
box = elm_box_add(parent);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(box);
+ EPHOTO_FILL(box);
elm_object_content_set(frame, box);
evas_object_show(box);
scroller = elm_scroller_add(box);
- evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(scroller);
+ EPHOTO_FILL(scroller);
elm_box_pack_end(box, scroller);
evas_object_show(scroller);
entry = elm_entry_add(scroller);
elm_entry_editable_set(entry, EINA_FALSE);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
- evas_object_size_hint_weight_set(entry, 0.0, 0.0);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(entry, 0.0, 0.0);
+ EPHOTO_FILL(entry);
eina_strbuf_append_printf(sbuf,
_("General Bindings
"
"F1: Settings Panel
"
@@ -439,14 +437,14 @@ _config_about(Evas_Object *parent)
frame = elm_frame_add(parent);
elm_object_text_set(frame, _("About"));
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(frame);
+ EPHOTO_FILL(frame);
evas_object_show(frame);
box = elm_box_add(frame);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(box);
+ EPHOTO_FILL(box);
elm_object_content_set(frame, box);
evas_object_show(box);
@@ -463,8 +461,8 @@ _config_about(Evas_Object *parent)
lbl = elm_label_add(box);
elm_object_text_set(lbl, ver);
- evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(lbl);
+ EPHOTO_FILL(lbl);
elm_box_pack_end(box, lbl);
evas_object_show(lbl);
@@ -474,8 +472,8 @@ _config_about(Evas_Object *parent)
elm_entry_editable_set(entry, EINA_FALSE);
elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
- evas_object_size_hint_weight_set(entry, 0.0, 0.0);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(entry, 0.0, 0.0);
+ EPHOTO_FILL(entry);
eina_strbuf_append_printf(sbuf,
_("Ephoto is a comprehensive image viewer based on the EFL. For more
"
"information, please visit the Ephoto project page:
"
@@ -637,8 +635,8 @@ ephoto_config_main(Ephoto *ephoto)
table = elm_table_add(popup);
elm_table_homogeneous_set(table, EINA_FALSE);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(table);
+ EPHOTO_FILL(table);
settings = _config_settings(ephoto, table, EINA_FALSE);
elm_table_pack(table, settings, 1, 0, 1, 1);
@@ -652,8 +650,8 @@ ephoto_config_main(Ephoto *ephoto)
list = elm_list_add(table);
elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_scroller_content_min_limit(list, 1, 1);
- evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(list);
+ EPHOTO_FILL(list);
elm_table_pack(table, list, 0, 0, 1, 1);
evas_object_show(list);
diff --git a/src/bin/ephoto_cropper.c b/src/bin/ephoto_cropper.c
index 528d221..e1aad01 100644
--- a/src/bin/ephoto_cropper.c
+++ b/src/bin/ephoto_cropper.c
@@ -648,24 +648,21 @@ ephoto_cropper_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
ec->box = elm_box_add(image_parent);
elm_box_homogeneous_set(ec->box, EINA_TRUE);
elm_box_horizontal_set(ec->box, EINA_TRUE);
- evas_object_size_hint_weight_set(ec->box, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(ec->box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(ec->box);
+ EPHOTO_FILL(ec->box);
elm_table_pack(image_parent, ec->box, 0, 0, 1, 1);
evas_object_show(ec->box);
ec->layout = elm_layout_add(ec->box);
elm_layout_file_set(ec->layout, PACKAGE_DATA_DIR "/themes/ephoto.edj",
"ephoto,image,cropper,base");
- evas_object_size_hint_weight_set(ec->layout, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(ec->layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(ec->layout);
+ EPHOTO_FILL(ec->layout);
elm_box_pack_end(ec->box, ec->layout);
evas_object_show(ec->layout);
- evas_object_size_hint_weight_set(ec->image, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(ec->image, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(ec->image);
+ EPHOTO_FILL(ec->image);
elm_layout_content_set(ec->layout, "ephoto.swallow.image", ec->image);
evas_object_show(ec->image);
@@ -709,10 +706,10 @@ ephoto_cropper_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
elm_slider_min_max_set(ec->croph, 1, h);
elm_slider_step_set(ec->croph, 1);
elm_slider_unit_format_set(ec->croph, "%1.0f");
+ elm_slider_indicator_format_set(ec->croph, "%1.0f");
elm_object_text_set(ec->croph, _("Height"));
- evas_object_size_hint_weight_set(ec->croph, EVAS_HINT_EXPAND,
- EVAS_HINT_FILL);
- evas_object_size_hint_align_set(ec->croph, EVAS_HINT_FILL, 0.5);
+ EPHOTO_WEIGHT(ec->croph, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(ec->croph, EVAS_HINT_FILL, 0.5);
elm_box_pack_start(ec->editor, ec->croph);
evas_object_smart_callback_add(ec->croph, "slider,drag,stop",
_cropper_changed_height, ec);
@@ -722,10 +719,10 @@ ephoto_cropper_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
elm_slider_min_max_set(ec->cropw, 1, w);
elm_slider_step_set(ec->cropw, 1);
elm_slider_unit_format_set(ec->cropw, "%1.0f");
+ elm_slider_indicator_format_set(ec->cropw, "%1.0f");
elm_object_text_set(ec->cropw, _("Width"));
- evas_object_size_hint_weight_set(ec->cropw, EVAS_HINT_EXPAND,
- EVAS_HINT_FILL);
- evas_object_size_hint_align_set(ec->cropw, EVAS_HINT_FILL, 0.5);
+ EPHOTO_WEIGHT(ec->cropw, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(ec->cropw, EVAS_HINT_FILL, 0.5);
elm_box_pack_start(ec->editor, ec->cropw);
evas_object_smart_callback_add(ec->cropw, "slider,drag,stop",
_cropper_changed_width, ec);
diff --git a/src/bin/ephoto_directory_browser.c b/src/bin/ephoto_directory_browser.c
index 82ae600..498c769 100644
--- a/src/bin/ephoto_directory_browser.c
+++ b/src/bin/ephoto_directory_browser.c
@@ -56,7 +56,6 @@ _menu_dismissed_cb(void *data, Evas_Object *obj,
{
Ephoto_Directory_Browser *db = data;
- db->ephoto->menu_blocking = EINA_FALSE;
evas_object_del(obj);
elm_object_focus_set(db->main, EINA_TRUE);
}
@@ -447,8 +446,8 @@ _dir_go_trash(void *data, Evas_Object *obj EINA_UNUSED,
but = elm_button_add(db->leftbox);
elm_object_text_set(but, _("Back"));
elm_object_part_content_set(but, "icon", ic);
- evas_object_size_hint_weight_set(but, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_fill_set(but, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(but, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(but);
evas_object_smart_callback_add(but, "clicked", _trash_back, db);
elm_box_pack_end(db->leftbox, but);
evas_object_show(but);
@@ -456,9 +455,8 @@ _dir_go_trash(void *data, Evas_Object *obj EINA_UNUSED,
db->fsel = elm_genlist_add(db->leftbox);
elm_genlist_select_mode_set(db->fsel, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_genlist_highlight_mode_set(db->fsel, EINA_TRUE);
- evas_object_size_hint_weight_set(db->fsel, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(db->fsel, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(db->fsel);
+ EPHOTO_FILL(db->fsel);
evas_object_smart_callback_add(db->fsel, "expand,request",
_on_list_expand_req, db);
evas_object_smart_callback_add(db->fsel, "contract,request",
@@ -614,8 +612,6 @@ _fsel_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
if (item)
elm_genlist_item_selected_set(item, EINA_TRUE);
- db->ephoto->menu_blocking = EINA_TRUE;
-
menu = elm_menu_add(db->ephoto->win);
elm_menu_move(menu, x, y);
@@ -658,24 +654,22 @@ _ephoto_directory_view_add(Ephoto_Directory_Browser *db)
msg->count = 1;
msg->val[0] = (int)round(220 * elm_config_scale_get());
edje_object_message_send(elm_layout_edje_get(db->ephoto->layout),
- EDJE_MESSAGE_INT_SET, 2, msg);
+ EDJE_MESSAGE_INT_SET, 1, msg);
db->leftbox = elm_box_add(db->main);
elm_box_horizontal_set(db->leftbox, EINA_FALSE);
elm_box_homogeneous_set(db->leftbox, EINA_FALSE);
elm_box_padding_set(db->leftbox, 0, -5);
- evas_object_size_hint_weight_set(db->leftbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(db->leftbox,
- EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(db->leftbox);
+ EPHOTO_FILL(db->leftbox);
elm_box_pack_end(db->main, db->leftbox);
evas_object_show(db->leftbox);
db->fsel = elm_genlist_add(db->leftbox);
elm_genlist_select_mode_set(db->fsel, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_genlist_highlight_mode_set(db->fsel, EINA_TRUE);
- evas_object_size_hint_weight_set(db->fsel, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(db->fsel, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(db->fsel);
+ EPHOTO_FILL(db->fsel);
evas_object_smart_callback_add(db->fsel, "expand,request",
_on_list_expand_req, db);
evas_object_smart_callback_add(db->fsel, "contract,request",
@@ -1330,12 +1324,10 @@ ephoto_directory_browser_add(Ephoto *ephoto, Evas_Object *parent)
db->main = box;
elm_box_horizontal_set(db->main, EINA_FALSE);
- evas_object_size_hint_weight_set(db->main, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(db->main, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_event_callback_add(db->main, EVAS_CALLBACK_DEL,
_ephoto_main_del, db);
evas_object_size_hint_min_set(db->main, (int)round(195 * elm_config_scale_get()), 0);
+ evas_object_size_hint_max_set(db->main, (int)round(195 * elm_config_scale_get()), 99999);
evas_object_data_set(db->main, "directory_browser", db);
_ephoto_directory_view_add(db);
@@ -1361,7 +1353,7 @@ ephoto_directory_browser_add(Ephoto *ephoto, Evas_Object *parent)
_ephoto_dir_entry_create, db));
return db->main;
-
+
error:
evas_object_del(db->main);
return NULL;
diff --git a/src/bin/ephoto_editor.c b/src/bin/ephoto_editor.c
index 9d2a084..2cf562b 100644
--- a/src/bin/ephoto_editor.c
+++ b/src/bin/ephoto_editor.c
@@ -8,27 +8,17 @@ _editor_reset(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
static void
-_editor_apply(void *data, Evas_Object *obj EINA_UNUSED,
+_editor_apply(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Ephoto *ephoto = data;
-
ecore_event_add(EPHOTO_EVENT_EDITOR_APPLY, NULL, NULL, NULL);
- edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,editor,hide", "ephoto");
- ephoto->editor_blocking = EINA_FALSE;
}
static void
-_editor_cancel(void *data, Evas_Object *obj EINA_UNUSED,
+_editor_cancel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- Ephoto *ephoto = data;
-
ecore_event_add(EPHOTO_EVENT_EDITOR_CANCEL, NULL, NULL, NULL);
- edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,editor,hide", "ephoto");
- ephoto->editor_blocking = EINA_FALSE;
}
Evas_Object *
@@ -37,24 +27,22 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
{
Evas_Object *frame, *box, *ic, *button;
- ephoto->editor_blocking = EINA_TRUE;
- edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,controls,hide", "ephoto");
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,hide", "ephoto");
- frame = elm_frame_add(ephoto->layout);
+ frame = elm_frame_add(ephoto->main);
elm_object_text_set(frame, title);
- evas_object_size_hint_weight_set(frame, 0.3, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(frame, 0.3, EVAS_HINT_EXPAND);
+ EPHOTO_FILL(frame);
+ evas_object_size_hint_min_set(frame, (int)round(195 * elm_config_scale_get()), 0);
evas_object_data_set(frame, data_name, data);
elm_layout_content_set(ephoto->layout, "ephoto.swallow.editor", frame);
evas_object_show(frame);
box = elm_box_add(frame);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(box);
+ EPHOTO_FILL(box);
evas_object_data_set(box, data_name, data);
evas_object_data_set(box, "frame", frame);
elm_object_content_set(frame, box);
@@ -70,10 +58,8 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
elm_object_text_set(button, _("Reset"));
elm_object_part_content_set(button, "icon", ic);
evas_object_smart_callback_add(button, "clicked", _editor_reset, box);
- evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
- 30*elm_config_scale_get());
+ EPHOTO_WEIGHT(button, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(button);
elm_box_pack_end(box, button);
evas_object_show(button);
@@ -87,10 +73,8 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
elm_object_text_set(button, _("Apply"));
elm_object_part_content_set(button, "icon", ic);
evas_object_smart_callback_add(button, "clicked", _editor_apply, ephoto);
- evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
- 30*elm_config_scale_get());
+ EPHOTO_WEIGHT(button, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(button);
elm_box_pack_end(box, button);
evas_object_show(button);
@@ -104,15 +88,13 @@ ephoto_editor_add(Ephoto *ephoto, const char *title, const char *data_name,
elm_object_text_set(button, _("Cancel"));
elm_object_part_content_set(button, "icon", ic);
evas_object_smart_callback_add(button, "clicked", _editor_cancel, ephoto);
- evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_min_set(button, 220*elm_config_scale_get(),
- 30*elm_config_scale_get());
+ EPHOTO_WEIGHT(button, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(button);
elm_box_pack_end(box, button);
evas_object_show(button);
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,editor,show", "ephoto");
+ "ephoto,editor,show", "ephoto");
return box;
}
diff --git a/src/bin/ephoto_file.c b/src/bin/ephoto_file.c
index d981743..708ef46 100644
--- a/src/bin/ephoto_file.c
+++ b/src/bin/ephoto_file.c
@@ -23,14 +23,14 @@ _complete(Ephoto *ephoto, const char *title, const char *text)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(box);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
elm_object_text_set(label, text);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
@@ -72,14 +72,14 @@ _prompt(Ephoto *ephoto, const char *title, const char *text)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
elm_object_text_set(label, text);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
@@ -188,20 +188,20 @@ _upload_image_complete_cb(void *data, int ev_type EINA_UNUSED, void *event)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
hbox = elm_box_add(box);
elm_box_horizontal_set(hbox, EINA_TRUE);
- evas_object_size_hint_weight_set(hbox, EVAS_HINT_FILL, 0.0);
- evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(hbox, 0.0, 0.0);
+ EPHOTO_FILL(hbox);
elm_box_pack_end(box, hbox);
evas_object_show(hbox);
@@ -213,8 +213,8 @@ _upload_image_complete_cb(void *data, int ev_type EINA_UNUSED, void *event)
elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(entry);
+ EPHOTO_FILL(entry);
evas_object_smart_callback_add(entry, "anchor,hover,opened",
_upload_entry_anchor, entry);
elm_box_pack_end(hbox, entry);
@@ -370,8 +370,8 @@ _new_dir(Ephoto *ephoto, const char *file)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
entry = elm_entry_add(box);
@@ -382,8 +382,8 @@ _new_dir(Ephoto *ephoto, const char *file)
elm_entry_select_all(entry);
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(entry);
+ EPHOTO_FILL(entry);
elm_box_pack_end(box, entry);
evas_object_show(entry);
evas_object_data_set(popup, "entry", entry);
@@ -489,8 +489,8 @@ _rename_file(Ephoto *ephoto, const char *file)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
snprintf(buf, PATH_MAX, "%s", file);
@@ -505,8 +505,8 @@ _rename_file(Ephoto *ephoto, const char *file)
elm_entry_select_all(entry);
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(entry);
+ EPHOTO_FILL(entry);
elm_box_pack_end(box, entry);
evas_object_show(entry);
evas_object_data_set(popup, "entry", entry);
@@ -550,20 +550,20 @@ _processing(Ephoto *ephoto, const char *title, const char *text)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
elm_object_text_set(label, text);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
pb = elm_progressbar_add(box);
- evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
+ EPHOTO_WEIGHT(pb, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(pb, 0.0, 0.5);
elm_object_style_set(pb, "wheel");
elm_progressbar_pulse_set(pb, EINA_TRUE);
elm_box_pack_end(box, pb);
@@ -1217,13 +1217,13 @@ ephoto_file_save_image_as(Ephoto *ephoto, Ephoto_Entry *entry, Evas_Object *imag
elm_popup_orient_set(popup, ELM_POPUP_ORIENT_CENTER);
table = elm_table_add(popup);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(table);
+ EPHOTO_FILL(table);
rect = elm_box_add(popup);
evas_object_size_hint_min_set(rect, 0, h / 1.5);
- evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(rect);
+ EPHOTO_FILL(rect);
elm_table_pack(table, rect, 0, 0, 1, 1);
evas_object_show(rect);
@@ -1234,8 +1234,8 @@ ephoto_file_save_image_as(Ephoto *ephoto, Ephoto_Entry *entry, Evas_Object *imag
elm_fileselector_current_name_set(fsel, entry->basename);
elm_fileselector_mime_types_filter_append(fsel, "image/*",
_("Image Files"));
- evas_object_size_hint_weight_set(fsel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(fsel, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(fsel);
+ EPHOTO_FILL(fsel);
evas_object_smart_callback_add(fsel, "done", _prompt_save_image_as_apply, popup);
elm_table_pack(table, fsel, 0, 0, 1, 1);
evas_object_show(fsel);
diff --git a/src/bin/ephoto_filters.c b/src/bin/ephoto_filters.c
index 984f8fb..6ff5931 100644
--- a/src/bin/ephoto_filters.c
+++ b/src/bin/ephoto_filters.c
@@ -136,21 +136,21 @@ _processing(Evas_Object *main)
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
elm_object_text_set(label,
_("Please wait while this filter is applied to your image."));
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
pb = elm_progressbar_add(box);
- evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
+ EPHOTO_WEIGHT(pb, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(pb, 0.0, 0.5);
elm_object_style_set(pb, "wheel");
elm_progressbar_pulse_set(pb, EINA_TRUE);
elm_box_pack_end(box, pb);
diff --git a/src/bin/ephoto_hsv.c b/src/bin/ephoto_hsv.c
index d8ca837..fdf94ea 100644
--- a/src/bin/ephoto_hsv.c
+++ b/src/bin/ephoto_hsv.c
@@ -369,8 +369,9 @@ ephoto_hsv_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, 1.20);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.2f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.2f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed", _value_slider_changed,
ehsv);
elm_box_pack_start(ehsv->editor, slider);
@@ -383,8 +384,9 @@ ephoto_hsv_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, 1.20);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.2f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.2f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_saturation_slider_changed, ehsv);
elm_box_pack_start(ehsv->editor, slider);
@@ -397,8 +399,9 @@ ephoto_hsv_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 0);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_hue_slider_changed, ehsv);
elm_box_pack_start(ehsv->editor, slider);
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 25c362c..4e924f0 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -40,14 +40,9 @@ _ephoto_thumb_browser_show(Ephoto *ephoto, Ephoto_Entry *entry)
_ephoto_state_set(ephoto, EPHOTO_STATE_THUMB);
ephoto_title_set(ephoto, ephoto->config->directory);
ephoto_thumb_browser_update_info_label(ephoto);
+ evas_object_show(ephoto->statusbar);
elm_box_clear(ephoto->controls_left);
elm_box_clear(ephoto->controls_right);
- ephoto->blocking = EINA_FALSE;
- ephoto->menu_blocking = EINA_FALSE;
- ephoto->hover_blocking = EINA_FALSE;
- ephoto->editor_blocking = EINA_FALSE;
- ephoto->folders_toggle = EINA_TRUE;
- ephoto_show_folders(ephoto, EINA_TRUE);
ephoto_thumb_browser_show_controls(ephoto);
evas_object_freeze_events_set(ephoto->single_browser, EINA_TRUE);
evas_object_freeze_events_set(ephoto->slideshow, EINA_TRUE);
@@ -87,17 +82,10 @@ _ephoto_single_browser_show(Ephoto *ephoto, Ephoto_Entry *entry)
elm_naviframe_item_simple_promote(ephoto->pager, ephoto->single_browser);
elm_object_focus_set(ephoto->single_browser, EINA_TRUE);
_ephoto_state_set(ephoto, EPHOTO_STATE_SINGLE);
-
+ evas_object_show(ephoto->statusbar);
elm_box_clear(ephoto->controls_left);
elm_box_clear(ephoto->controls_right);
- ephoto->blocking = EINA_FALSE;
- ephoto->menu_blocking = EINA_FALSE;
- ephoto->hover_blocking = EINA_FALSE;
- ephoto->editor_blocking = EINA_FALSE;
- ephoto->folders_toggle = EINA_TRUE;
- ephoto_show_folders(ephoto, EINA_TRUE);
ephoto_single_browser_show_controls(ephoto);
- ephoto_single_browser_adjust_offsets(ephoto);
evas_object_freeze_events_set(ephoto->thumb_browser, EINA_TRUE);
evas_object_freeze_events_set(ephoto->slideshow, EINA_TRUE);
evas_object_freeze_events_set(ephoto->single_browser, EINA_FALSE);
@@ -118,15 +106,10 @@ _ephoto_slideshow_show(Ephoto *ephoto, Ephoto_Entry *entry)
elm_naviframe_item_simple_promote(ephoto->pager, ephoto->slideshow);
elm_object_focus_set(ephoto->slideshow, EINA_TRUE);
_ephoto_state_set(ephoto, EPHOTO_STATE_SLIDESHOW);
- edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,controls,hide", "ephoto");
- ephoto->blocking = EINA_FALSE;
- ephoto->menu_blocking = EINA_FALSE;
- ephoto->hover_blocking = EINA_FALSE;
- ephoto->editor_blocking = EINA_FALSE;
- ephoto->folders_toggle = EINA_TRUE;
- ephoto_show_folders(ephoto, EINA_TRUE);
- ephoto_slideshow_adjust_offsets(ephoto);
+ elm_layout_signal_emit(ephoto->layout, "ephoto,folders,hide", "ephoto");
+ elm_layout_signal_emit(ephoto->layout, "ephoto,statusbar,hide", "ephoto");
+ evas_object_hide(ephoto->dir_browser);
+ evas_object_hide(ephoto->statusbar);
evas_object_freeze_events_set(ephoto->single_browser, EINA_TRUE);
evas_object_freeze_events_set(ephoto->thumb_browser, EINA_TRUE);
evas_object_freeze_events_set(ephoto->slideshow, EINA_FALSE);
@@ -140,8 +123,6 @@ _ephoto_single_browser_back(void *data, Evas_Object *obj EINA_UNUSED,
Ephoto_Entry *entry = event_info;
ephoto->selentries = NULL;
- ephoto->folders_toggle = EINA_TRUE;
- ephoto_show_folders(ephoto, EINA_TRUE);
_ephoto_thumb_browser_show(ephoto, entry);
}
@@ -167,6 +148,13 @@ _ephoto_slideshow_back(void *data, Evas_Object *obj EINA_UNUSED,
ephoto->selentries = NULL;
_ephoto_thumb_browser_show(ephoto, entry);
}
+ if (ephoto->folders_toggle)
+ {
+ elm_layout_signal_emit(ephoto->layout, "ephoto,folders,show", "ephoto");
+ evas_object_show(ephoto->dir_browser);
+ }
+ elm_layout_signal_emit(ephoto->layout, "ephoto,statusbar,show", "ephoto");
+ evas_object_show(ephoto->statusbar);
}
static void
@@ -240,8 +228,6 @@ _win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
EINA_LIST_FREE(ephoto->monitor_handlers, handler)
ecore_event_handler_del(handler);
}
- if (ephoto->overlay_timer)
- ecore_timer_del(ephoto->overlay_timer);
ephoto_config_save(ephoto);
free(ephoto);
}
@@ -261,76 +247,6 @@ _resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
}
-static Eina_Bool
-_timer_cb(void *data)
-{
- Ephoto *ephoto = data;
- Edje_Object *edje = elm_layout_edje_get(ephoto->layout);
-
- if (ephoto->blocking || ephoto->menu_blocking ||
- ephoto->right_blocking || ephoto->hover_blocking ||
- ephoto->editor_blocking)
- return ECORE_CALLBACK_PASS_ON;
-
- edje_object_signal_emit(edje, "ephoto,controls,hide", "ephoto");
- if (ephoto->folders_toggle)
- {
- edje_object_signal_emit(edje, "ephoto,folders,hide", "ephoto");
- evas_object_hide(ephoto->dir_browser);
- }
- ecore_timer_del(ephoto->overlay_timer);
- ephoto->overlay_timer = NULL;
-
- return ECORE_CALLBACK_CANCEL;
-}
-
-static void
-_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ephoto *ephoto = data;
- Edje_Object *edje = elm_layout_edje_get(ephoto->layout);
-
- if (ephoto->blocking || ephoto->menu_blocking ||
- ephoto->right_blocking || ephoto->hover_blocking ||
- ephoto->editor_blocking)
- return;
-
- if (ephoto->overlay_timer)
- ecore_timer_del(ephoto->overlay_timer);
- ephoto->overlay_timer = NULL;
- edje_object_signal_emit(edje, "ephoto,controls,show", "ephoto");
- if (ephoto->folders_toggle)
- {
- edje_object_signal_emit(edje, "ephoto,folders,show", "ephoto");
- evas_object_show(ephoto->dir_browser);
- }
- ephoto->overlay_timer = ecore_timer_add(3.0, _timer_cb, ephoto);
-}
-
-static void
-_mouse_out_cb(void *data, Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
-{
- Ephoto *ephoto = data;
- ephoto->blocking = EINA_FALSE;
-
- if (ephoto->overlay_timer)
- ecore_timer_del(ephoto->overlay_timer);
- ephoto->overlay_timer = ecore_timer_add(3.0, _timer_cb, ephoto);
-}
-
-static void
-_mouse_in_cb(void *data, Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
-{
- Ephoto *ephoto = data;
- ephoto->blocking = EINA_TRUE;
-
- ecore_timer_del(ephoto->overlay_timer);
- ephoto->overlay_timer = NULL;
-}
-
static void
_folder_icon_clicked(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -341,7 +257,6 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
{
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,show", "ephoto");
- evas_object_show(ephoto->dir_browser);
ephoto->folders_toggle = EINA_TRUE;
if (elm_object_text_get(obj))
elm_object_text_set(obj, _("Hide Folders"));
@@ -351,7 +266,6 @@ _folder_icon_clicked(void *data, Evas_Object *obj,
{
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,hide", "ephoto");
- evas_object_hide(ephoto->dir_browser);
ephoto->folders_toggle = EINA_FALSE;
if (elm_object_text_get(obj))
elm_object_text_set(obj, _("Show Folders"));
@@ -395,23 +309,21 @@ _exit_icon_clicked(void *data, Evas_Object *obj EINA_UNUSED,
void
ephoto_show_folders(Ephoto *ephoto, Eina_Bool toggle)
{
- Evas_Object *but = evas_object_data_get(ephoto->layout, "folder_button");
if (!ephoto->folders_toggle || !toggle)
{
- _mouse_move_cb(ephoto, NULL, NULL, NULL);
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,show", "ephoto");
evas_object_show(ephoto->dir_browser);
ephoto->folders_toggle = EINA_TRUE;
- elm_object_tooltip_text_set(but, _("Hide Folders"));
+ elm_object_tooltip_text_set(ephoto->folders_button, _("Hide Folders"));
}
- else if (ephoto->folders_toggle && toggle)
+ else if (ephoto->folders_toggle)
{
edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
"ephoto,folders,hide", "ephoto");
evas_object_hide(ephoto->dir_browser);
ephoto->folders_toggle = EINA_FALSE;
- elm_object_tooltip_text_set(but, _("Show Folders"));
+ elm_object_tooltip_text_set(ephoto->folders_button, _("Show Folders"));
}
}
@@ -419,7 +331,7 @@ Evas_Object *
ephoto_window_add(const char *path)
{
Ephoto *ephoto = calloc(1, sizeof(Ephoto));
- Evas_Object *ic, *but, *fold;
+ Evas_Object *ic, *but;
char buf[PATH_MAX];
int ret;
@@ -435,11 +347,7 @@ ephoto_window_add(const char *path)
EPHOTO_EVENT_EDITOR_BACK = ecore_event_type_new();
ephoto->selentries = NULL;
- ephoto->blocking = EINA_FALSE;
- ephoto->menu_blocking = EINA_FALSE;
- ephoto->hover_blocking = EINA_FALSE;
- ephoto->folders_toggle = EINA_TRUE;
- ephoto->editor_blocking = EINA_FALSE;
+ ephoto->folders_toggle = EINA_FALSE;
ephoto->entries = NULL;
ephoto->sort = EPHOTO_SORT_ALPHABETICAL_ASCENDING;
ephoto->win = elm_win_util_standard_add("ephoto", "Ephoto");
@@ -466,28 +374,25 @@ ephoto_window_add(const char *path)
(ephoto->config->thumb_gen_size != 512))
ephoto_thumb_size_set(ephoto, ephoto->config->thumb_size);
- ephoto->layout = elm_layout_add(ephoto->win);
+ ephoto->main = elm_table_add(ephoto->win);
+ elm_table_homogeneous_set(ephoto->main, EINA_FALSE);
+ EPHOTO_EXPAND(ephoto->main);
+ EPHOTO_FILL(ephoto->main);
+ elm_win_resize_object_add(ephoto->win, ephoto->main);
+ evas_object_show(ephoto->main);
+
+ ephoto->layout = elm_layout_add(ephoto->main);
elm_layout_file_set(ephoto->layout, PACKAGE_DATA_DIR "/themes/ephoto.edj",
"ephoto,main,layout");
- evas_object_size_hint_weight_set(ephoto->layout, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(ephoto->layout, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
- evas_object_event_callback_add(ephoto->layout, EVAS_CALLBACK_MOUSE_MOVE,
- _mouse_move_cb, ephoto);
- edje_object_signal_callback_add(elm_layout_edje_get(ephoto->layout),
- "ephoto,block", "ephoto", _mouse_in_cb, ephoto);
- edje_object_signal_callback_add(elm_layout_edje_get(ephoto->layout),
- "ephoto,unblock", "ephoto", _mouse_out_cb, ephoto);
- elm_win_resize_object_add(ephoto->win, ephoto->layout);
+ EPHOTO_EXPAND(ephoto->layout);
+ EPHOTO_FILL(ephoto->layout);
+ elm_table_pack(ephoto->main, ephoto->layout, 0, 1, 1, 2);
evas_object_show(ephoto->layout);
- ephoto->pager = elm_naviframe_add(ephoto->win);
+ ephoto->pager = elm_naviframe_add(ephoto->layout);
elm_naviframe_prev_btn_auto_pushed_set(ephoto->pager, EINA_FALSE);
- evas_object_size_hint_weight_set(ephoto->pager, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(ephoto->pager, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_EXPAND(ephoto->pager);
+ EPHOTO_FILL(ephoto->pager);
elm_layout_content_set(ephoto->layout, "ephoto.swallow.main", ephoto->pager);
evas_object_show(ephoto->pager);
@@ -536,18 +441,18 @@ ephoto_window_add(const char *path)
_ephoto_slideshow_back, ephoto);
ephoto->dir_browser = ephoto_directory_browser_add(ephoto, ephoto->layout);
- elm_layout_content_set(ephoto->layout, "ephoto.swallow.folders",
- ephoto->dir_browser);
+ EPHOTO_WEIGHT(ephoto->dir_browser, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ EPHOTO_FILL(ephoto->dir_browser);
+ elm_layout_content_set(ephoto->layout, "ephoto.swallow.folders", ephoto->dir_browser);
evas_object_show(ephoto->dir_browser);
ephoto->statusbar = elm_box_add(ephoto->layout);
+ evas_object_size_hint_min_set(ephoto->statusbar, 20*elm_config_scale_get(),
+ 20*elm_config_scale_get());
elm_box_horizontal_set(ephoto->statusbar, EINA_TRUE);
- evas_object_size_hint_weight_set(ephoto->statusbar,
- EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(ephoto->statusbar, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
- elm_layout_content_set(ephoto->layout, "ephoto.swallow.controls",
- ephoto->statusbar);
+ EPHOTO_WEIGHT(ephoto->statusbar, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(ephoto->statusbar);
+ elm_layout_content_set(ephoto->layout, "ephoto.swallow.statusbar", ephoto->statusbar);
evas_object_show(ephoto->statusbar);
ic = elm_icon_add(ephoto->statusbar);
@@ -565,15 +470,12 @@ ephoto_window_add(const char *path)
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_RIGHT);
elm_box_pack_end(ephoto->statusbar, but);
evas_object_show(but);
- fold = but;
- evas_object_data_set(ephoto->layout, "folder_button", but);
+ ephoto->folders_button = but;
ephoto->controls_left = elm_box_add(ephoto->statusbar);
elm_box_horizontal_set(ephoto->controls_left, EINA_TRUE);
- evas_object_size_hint_weight_set(ephoto->controls_left,
- 0.0, 0.0);
- evas_object_size_hint_align_set(ephoto->controls_left, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(ephoto->controls_left, 0.0, 0.0);
+ EPHOTO_FILL(ephoto->controls_left);
elm_box_pack_end(ephoto->statusbar, ephoto->controls_left);
evas_object_show(ephoto->controls_left);
@@ -581,10 +483,8 @@ ephoto_window_add(const char *path)
elm_object_style_set(ephoto->infolabel, "info");
elm_label_line_wrap_set(ephoto->infolabel, ELM_WRAP_MIXED);
elm_object_text_set(ephoto->infolabel, _("Information"));
- evas_object_size_hint_weight_set(ephoto->infolabel,
- EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(ephoto->infolabel, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_EXPAND(ephoto->infolabel);
+ EPHOTO_FILL(ephoto->infolabel);
evas_object_size_hint_aspect_set(ephoto->infolabel, EVAS_ASPECT_CONTROL_HORIZONTAL,
1, 1);
elm_box_pack_end(ephoto->statusbar, ephoto->infolabel);
@@ -592,10 +492,8 @@ ephoto_window_add(const char *path)
ephoto->controls_right = elm_box_add(ephoto->statusbar);
elm_box_horizontal_set(ephoto->controls_right, EINA_TRUE);
- evas_object_size_hint_weight_set(ephoto->controls_right,
- 0.0, 0.0);
- evas_object_size_hint_align_set(ephoto->controls_right, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(ephoto->controls_right, 0.0, 0.0);
+ EPHOTO_FILL(ephoto->controls_right);
elm_box_pack_end(ephoto->statusbar, ephoto->controls_right);
evas_object_show(ephoto->controls_right);
@@ -679,7 +577,7 @@ ephoto_window_add(const char *path)
else
{
char *dir = ecore_file_dir_get(path);
- char *realpath = ecore_file_realpath(path);
+ char *realpath = ecore_file_realpath(dir);
eina_stringshare_replace(&ephoto->config->directory, realpath);
free(realpath);
@@ -698,17 +596,17 @@ ephoto_window_add(const char *path)
if (!ephoto->config->folders)
{
- edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
- "ephoto,folders,hide,start", "ephoto");
evas_object_hide(ephoto->dir_browser);
ephoto->folders_toggle = EINA_FALSE;
- elm_object_tooltip_text_set(fold, _("Show Folders"));
+ elm_object_tooltip_text_set(ephoto->folders_button, _("Show Folders"));
}
else
- elm_layout_signal_emit(ephoto->layout, "ephoto,folders,show", "ephoto");
- elm_layout_signal_emit(ephoto->layout, "ephoto,controls,show", "ephoto");
- ephoto->overlay_timer = ecore_timer_add(5.0, _timer_cb, ephoto);
-
+ {
+ ephoto->folders_toggle = EINA_TRUE;
+ edje_object_signal_emit(elm_layout_edje_get(ephoto->layout),
+ "ephoto,folders,show,start", "ephoto");
+ elm_object_tooltip_text_set(ephoto->folders_button, _("Hide Folders"));
+ }
if (ephoto->config->firstrun)
{
_settings_icon_clicked(ephoto, NULL, NULL);
@@ -861,8 +759,9 @@ _ephoto_populate_end(void *data, Eio_File *handler EINA_UNUSED)
ed->ephoto->ls = NULL;
- ephoto_single_browser_entries_set(ed->ephoto->single_browser,
- ed->ephoto->entries);
+ if (eina_list_count(ed->ephoto->entries))
+ ephoto_single_browser_entries_set(ed->ephoto->single_browser,
+ ed->ephoto->entries);
ecore_event_add(EPHOTO_EVENT_POPULATE_END, NULL, NULL, NULL);
free(ed);
}
@@ -873,7 +772,7 @@ _ephoto_populate_error(void *data, Eio_File *handler, int error EINA_UNUSED)
Ephoto_Dir_Data *ed = data;
ecore_event_add(EPHOTO_EVENT_POPULATE_ERROR, NULL, NULL, NULL);
- _ephoto_populate_end(ed->ephoto, handler);
+ _ephoto_populate_end(ed, handler);
}
static void
diff --git a/src/bin/ephoto_red_eye.c b/src/bin/ephoto_red_eye.c
index d3ec17f..ff25af3 100644
--- a/src/bin/ephoto_red_eye.c
+++ b/src/bin/ephoto_red_eye.c
@@ -239,8 +239,9 @@ ephoto_red_eye_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_
elm_slider_step_set(slider, 1);
elm_slider_value_set(slider, 15);
elm_slider_unit_format_set(slider, "%1.0f");
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+ elm_slider_indicator_format_set(slider, "%1.0f");
+ EPHOTO_WEIGHT(slider, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(slider, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(slider, "delay,changed",
_radius_slider_changed, er);
elm_box_pack_start(er->editor, slider);
@@ -249,8 +250,8 @@ ephoto_red_eye_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_
label = elm_label_add(er->editor);
elm_object_text_set(label, _("Click on an eye"));
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, 0.5);
+ EPHOTO_WEIGHT(label, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(label, 0.5, 0.5);
elm_box_pack_start(er->editor, label);
evas_object_show(label);
diff --git a/src/bin/ephoto_scale.c b/src/bin/ephoto_scale.c
index 15cf05c..295b14e 100644
--- a/src/bin/ephoto_scale.c
+++ b/src/bin/ephoto_scale.c
@@ -221,7 +221,7 @@ ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
es->aspect = elm_check_add(es->editor);
elm_object_text_set(es->aspect, _("Keep Aspect"));
- evas_object_size_hint_align_set(es->aspect, 0.5, EVAS_HINT_FILL);
+ EPHOTO_ALIGN(es->aspect, 0.5, 0.0);
elm_check_state_set(es->aspect, EINA_TRUE);
elm_box_pack_start(es->editor, es->aspect);
evas_object_show(es->aspect);
@@ -233,8 +233,8 @@ ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
elm_spinner_wrap_set(es->scaleh, EINA_FALSE);
elm_spinner_min_max_set(es->scaleh, 1, 99999);
elm_spinner_value_set(es->scaleh, es->h);
- evas_object_size_hint_align_set(es->scaleh, EVAS_HINT_FILL, 0.5);
- evas_object_size_hint_weight_set(es->scaleh, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(es->scaleh, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(es->scaleh, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(es->scaleh, "changed",
_scale_height_changed, es);
elm_box_pack_start(es->editor, es->scaleh);
@@ -247,8 +247,8 @@ ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
elm_spinner_wrap_set(es->scalew, EINA_FALSE);
elm_spinner_min_max_set(es->scalew, 1, 99999);
elm_spinner_value_set(es->scalew, es->w);
- evas_object_size_hint_align_set(es->scalew, EVAS_HINT_FILL, 0.5);
- evas_object_size_hint_weight_set(es->scalew, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(es->scalew, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_ALIGN(es->scalew, EVAS_HINT_FILL, 0.5);
evas_object_smart_callback_add(es->scalew, "changed",
_scale_width_changed, es);
elm_box_pack_start(es->editor, es->scalew);
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index f3b11b6..f7e0f5d 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -992,15 +992,15 @@ _reset_image(void *data, Evas_Object *obj EINA_UNUSED,
box = elm_box_add(popup);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(box, 0.0, 0.0);
+ EPHOTO_FILL(box);
evas_object_show(box);
label = elm_label_add(box);
elm_object_text_set(label,
_("Are you sure you want to reset your changes?"));
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(label);
+ EPHOTO_FILL(label);
elm_box_pack_end(box, label);
evas_object_show(label);
@@ -1039,9 +1039,13 @@ _close_editor(void *data, Evas_Object *obj EINA_UNUSED,
edje_object_signal_emit(elm_layout_edje_get(sb->ephoto->layout),
"ephoto,editor,hide", "ephoto");
+ if (sb->ephoto->folders_toggle)
+ {
+ elm_layout_signal_emit(sb->ephoto->layout, "ephoto,folders,show", "ephoto");
+ evas_object_show(sb->ephoto->dir_browser);
+ }
evas_object_del(sb->edit_main);
sb->edit_main = NULL;
- sb->ephoto->editor_blocking = EINA_FALSE;
}
static void
@@ -1159,6 +1163,8 @@ _crop_image(void *data, Evas_Object *obj EINA_UNUSED,
sb->cropping = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
elm_table_unpack(v->table, v->image);
ephoto_cropper_add(sb->ephoto, sb->main, sb->mhbox, v->table, v->image);
}
@@ -1173,7 +1179,9 @@ _scale_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
{
sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
-
+
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
ephoto_scale_add(sb->ephoto, sb->main, sb->mhbox, v->image, sb->entry->path);
}
}
@@ -1188,6 +1196,8 @@ _go_bcg(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
ephoto_bcg_add(sb->ephoto, sb->main, sb->mhbox, v->image);
}
}
@@ -1202,6 +1212,8 @@ _go_hsv(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
ephoto_hsv_add(sb->ephoto, sb->main, sb->mhbox, v->image);
}
}
@@ -1217,6 +1229,8 @@ _go_color(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
ephoto_color_add(sb->ephoto, sb->main, sb->mhbox, v->image);
}
}
@@ -1232,6 +1246,8 @@ _go_reye(void *data, Evas_Object *obj EINA_UNUSED,
sb->editing = EINA_TRUE;
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
+ evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
ephoto_red_eye_add(sb->ephoto, sb->main, sb->mhbox, v->image);
}
}
@@ -1416,31 +1432,6 @@ _go_emboss(void *data, Evas_Object *obj EINA_UNUSED,
}
}
-static void
-_image_changed(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ephoto_Single_Browser *sb = data;
- Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
- Evas_Coord w, h, sw, sh;
- Edje_Message_Int_Set *msg;
-
- if (sb->ephoto->state != EPHOTO_STATE_SINGLE)
- return;
-
- elm_scroller_region_get(v->scroller, 0, 0, &w, &h);
- evas_object_geometry_get(v->scroller, 0, 0, &sw, &sh);
-
- sw -= w;
- sh -= h;
- msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
- msg->count = 2;
- msg->val[0] = sw;
- msg->val[1] = sh;
- edje_object_message_send(elm_layout_edje_get(sb->ephoto->layout),
- EDJE_MESSAGE_INT_SET, 1, msg);
-}
-
/*Image Viewer Function*/
static Eina_Bool
_animate_cb(void *data)
@@ -1479,10 +1470,8 @@ _viewer_add(Evas_Object *parent, const char *path, Ephoto_Single_Browser *sb)
v->frame_count = 0;
v->scroller = elm_scroller_add(parent);
- evas_object_size_hint_weight_set(v->scroller, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(v->scroller,
- EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(v->scroller);
+ EPHOTO_FILL(v->scroller);
evas_object_data_set(v->scroller, "viewer", v);
evas_object_event_callback_add(v->scroller, EVAS_CALLBACK_MOUSE_UP,
_scroller_mouse_up_cb, sb);
@@ -1491,8 +1480,8 @@ _viewer_add(Evas_Object *parent, const char *path, Ephoto_Single_Browser *sb)
evas_object_show(v->scroller);
v->table = elm_table_add(v->scroller);
- evas_object_size_hint_weight_set(v->table, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
+ EPHOTO_EXPAND(v->table);
+ EPHOTO_FILL(v->table);
evas_object_size_hint_align_set(v->table, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(v->scroller, v->table);
evas_object_show(v->table);
@@ -1515,7 +1504,6 @@ _viewer_add(Evas_Object *parent, const char *path, Ephoto_Single_Browser *sb)
_image_mouse_down_cb, sb);
evas_object_event_callback_add(v->image, EVAS_CALLBACK_MOUSE_UP,
_image_mouse_up_cb, sb);
- evas_object_event_callback_add(v->image, EVAS_CALLBACK_RESIZE, _image_changed, sb);
elm_table_pack(v->table, v->image, 0, 0, 1, 1);
evas_object_show(v->image);
if (evas_object_image_animated_get(v->image))
@@ -1617,10 +1605,8 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
elm_label_line_wrap_set(sb->nolabel, ELM_WRAP_WORD);
elm_object_text_set(sb->nolabel,
_("This image does not exist or is corrupted!"));
- evas_object_size_hint_weight_set(sb->nolabel, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(sb->nolabel, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_EXPAND(sb->nolabel);
+ EPHOTO_FILL(sb->nolabel);
elm_box_pack_start(sb->mhbox, sb->nolabel);
evas_object_show(sb->nolabel);
ephoto_title_set(sb->ephoto, _("Bad Image"));
@@ -1648,8 +1634,8 @@ _edit_function_item_add(Evas_Object *parent, const char *icon, const char *label
evas_object_size_hint_min_set(button, 30*elm_config_scale_get(),
30*elm_config_scale_get());
evas_object_smart_callback_add(button, "clicked", callback, data);
- evas_object_size_hint_weight_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(button, 0.0, 0.0);
+ EPHOTO_FILL(button);
elm_box_pack_end(parent, button);
evas_object_show(button);
}
@@ -1721,9 +1707,6 @@ _editor_menu(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNU
Elm_Genlist_Item_Class *itc = elm_genlist_item_class_new();
Elm_Object_Item *par;
- if (sb->edit_main)
- return;
-
itc = elm_genlist_item_class_new();
itc->item_style = "group_index";
itc->func.text_get = _header_text_get;
@@ -1731,45 +1714,43 @@ _editor_menu(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNU
itc->func.state_get = NULL;
itc->func.del = NULL;
- sb->ephoto->editor_blocking = EINA_TRUE;
- edje_object_signal_emit(elm_layout_edje_get(sb->ephoto->layout),
- "ephoto,controls,hide", "ephoto");
edje_object_signal_emit(elm_layout_edje_get(sb->ephoto->layout),
"ephoto,folders,hide", "ephoto");
+ evas_object_hide(sb->ephoto->dir_browser);
frame = elm_frame_add(sb->ephoto->layout);
elm_object_text_set(frame, _("Edit"));
- evas_object_size_hint_weight_set(frame, 0.3, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(frame);
+ EPHOTO_FILL(frame);
elm_layout_content_set(sb->ephoto->layout, "ephoto.swallow.editor", frame);
evas_object_show(frame);
box = elm_box_add(frame);
elm_box_horizontal_set(box, EINA_TRUE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(box);
+ EPHOTO_FILL(box);
evas_object_data_set(box, "frame", frame);
elm_object_content_set(frame, box);
evas_object_show(box);
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
- evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(vbox);
+ EPHOTO_FILL(vbox);
elm_box_pack_end(box, vbox);
evas_object_show(vbox);
sep = elm_separator_add(box);
elm_separator_horizontal_set(sep, EINA_FALSE);
- evas_object_size_hint_weight_set(sep, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(sep, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(sep, 0.0, EVAS_HINT_EXPAND);
+ EPHOTO_FILL(sep);
elm_box_pack_end(box, sep);
evas_object_show(sep);
list = elm_genlist_add(vbox);
elm_genlist_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
- evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(list);
+ EPHOTO_FILL(list);
elm_box_pack_end(vbox, list);
evas_object_show(list);
@@ -1828,9 +1809,9 @@ _editor_menu(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNU
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
elm_box_homogeneous_set(vbox, EINA_TRUE);
- evas_object_size_hint_weight_set(vbox, 0.0, EVAS_HINT_EXPAND);
+ EPHOTO_WEIGHT(vbox, 0.0, EVAS_HINT_EXPAND);
+ EPHOTO_FILL(vbox);
evas_object_size_hint_min_set(vbox, 30, 30);
- evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, vbox);
evas_object_show(vbox);
@@ -1855,10 +1836,6 @@ _show_edit_main(void *data, int type EINA_UNUSED,
{
Ephoto_Single_Browser *sb = data;
- if (sb->edit_main)
- {
- sb->edit_main = NULL;
- }
_editor_menu(sb, NULL, NULL);
return ECORE_CALLBACK_PASS_ON;
@@ -2092,6 +2069,7 @@ _ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
eina_stringshare_del(sb->pending_path);
if (sb->edit_main)
evas_object_del(sb->edit_main);
+ sb->edit_main = NULL;
snprintf(tmp_path, PATH_MAX, "%s/.config/ephoto/", getenv("HOME"));
tmps = eina_file_stat_ls(tmp_path);
EINA_ITERATOR_FOREACH(tmps, info)
@@ -2115,24 +2093,6 @@ _ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
free(sb);
}
-/*Ephoto Single Browser Public Functions*/
-void
-ephoto_single_browser_adjust_offsets(Ephoto *ephoto)
-{
- Ephoto_Single_Browser *sb = evas_object_data_get(ephoto->single_browser,
- "single_browser");
- Edje_Message_Int_Set *msg;
-
- msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
- msg->count = 2;
- msg->val[0] = 0;
- msg->val[1] = 0;
- edje_object_message_send(elm_layout_edje_get(sb->ephoto->layout),
- EDJE_MESSAGE_INT_SET, 1, msg);
-
- _image_changed(sb, NULL, NULL, NULL);
-}
-
void
ephoto_single_browser_entries_set(Evas_Object *obj, Eina_List *entries)
{
@@ -2370,24 +2330,29 @@ ephoto_single_browser_show_controls(Ephoto *ephoto)
Evas_Object *but, *ic;
int ret;
- ic = elm_icon_add(ephoto->controls_left);
+ evas_object_del(ephoto->view_button);
+
+ ic = elm_icon_add(ephoto->statusbar);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
ret = elm_icon_standard_set(ic, "view-list-icons");
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
if (!ret)
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/grid.png", NULL);
+ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
- but = elm_button_add(ephoto->controls_left);
- if (!ret)
- elm_object_text_set(but, _("Thumbnails"));
+ but = elm_button_add(ephoto->statusbar);
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Thumbnails"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _ephoto_main_back, sb);
- elm_box_pack_end(ephoto->controls_left, but);
+ elm_box_pack_after(ephoto->statusbar, but, ephoto->folders_button);
evas_object_show(but);
+ ephoto->view_button = but;
+
+ elm_object_tooltip_text_set(ephoto->view_button, _("View Thumbnails"));
+ evas_object_smart_callback_add(ephoto->view_button, "clicked", _ephoto_main_back, sb);
+
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
@@ -2540,16 +2505,14 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent)
evas_object_event_callback_add(sb->main, EVAS_CALLBACK_DEL, _ephoto_main_del, sb);
evas_object_event_callback_add(sb->main, EVAS_CALLBACK_KEY_DOWN, _ephoto_main_key_down,
sb);
- evas_object_size_hint_weight_set(sb->main, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(sb->main, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(sb->main);
+ EPHOTO_FILL(sb->main);
evas_object_data_set(sb->main, "single_browser", sb);
sb->mhbox = elm_box_add(sb->main);
elm_box_horizontal_set(sb->mhbox, EINA_TRUE);
- evas_object_size_hint_weight_set(sb->mhbox, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(sb->mhbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(sb->mhbox);
+ EPHOTO_FILL(sb->mhbox);
elm_box_pack_end(sb->main, sb->mhbox);
evas_object_show(sb->mhbox);
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index 1b78f56..36cf8f1 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -39,6 +39,7 @@ struct _Ephoto_Slideshow
Evas_Object *slideshow;
Evas_Object *event;
Evas_Object *notify;
+ Evas_Object *notify_box;
Eina_List *entries;
Evas_Object *pause;
Evas_Object *pause_after;
@@ -344,8 +345,8 @@ _slideshow_item_get(Ephoto_Slideshow *ss, Ephoto_Entry *entry, Evas_Object *pare
layout = elm_layout_add(parent);
elm_layout_file_set(layout, PACKAGE_DATA_DIR "/themes/ephoto.edj",
"ephoto,slideshow,item");
- evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(layout);
+ EPHOTO_FILL(layout);
evas_object_data_set(layout, "entry", entry);
image = elm_image_add(parent);
@@ -353,8 +354,8 @@ _slideshow_item_get(Ephoto_Slideshow *ss, Ephoto_Entry *entry, Evas_Object *pare
elm_image_smooth_set(image, EINA_FALSE);
elm_image_file_set(image, entry->path, group);
elm_image_fill_outside_set(image, EINA_TRUE);
- evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(image);
+ EPHOTO_FILL(image);
evas_object_event_callback_add(image, EVAS_CALLBACK_SHOW, _image_shown,
entry);
evas_object_image_size_get(elm_image_object_get(image), &w, &h);
@@ -463,10 +464,6 @@ _mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
Ephoto_Slideshow *ss = data;
Ephoto_Entry *entry;
- elm_layout_content_unset(ss->ephoto->layout, "ephoto.swallow.controls");
- evas_object_del(ss->notify);
- elm_layout_content_set(ss->ephoto->layout, "ephoto.swallow.controls",
- ss->ephoto->statusbar);
if (elm_win_fullscreen_get(ss->ephoto->win))
{
elm_box_pack_end(ss->ephoto->statusbar, ss->ephoto->exit);
@@ -486,6 +483,10 @@ _mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
evas_object_del(ss->event);
ss->event = NULL;
}
+ evas_object_del(ss->notify_box);
+ evas_object_del(ss->notify);
+ ss->notify_box = NULL;
+ ss->notify = NULL;
evas_object_smart_callback_call(ss->slideshow, "back", entry);
if (ss->old_item)
{
@@ -531,10 +532,6 @@ _back(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
Ephoto_Slideshow *ss = data;
Ephoto_Entry *entry;
- elm_layout_content_unset(ss->ephoto->layout, "ephoto.swallow.controls");
- evas_object_del(ss->notify);
- elm_layout_content_set(ss->ephoto->layout, "ephoto.swallow.controls",
- ss->ephoto->statusbar);
if (elm_win_fullscreen_get(ss->ephoto->win))
{
elm_box_pack_end(ss->ephoto->statusbar, ss->ephoto->exit);
@@ -554,6 +551,10 @@ _back(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
evas_object_del(ss->event);
ss->event = NULL;
}
+ evas_object_del(ss->notify_box);
+ evas_object_del(ss->notify);
+ ss->notify_box = NULL;
+ ss->notify = NULL;
evas_object_smart_callback_call(ss->slideshow, "back", entry);
if (ss->old_item)
{
@@ -615,7 +616,7 @@ _pause(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
_slideshow_pause(ss);
ss->pause =
- _add_icon(ss->notify, "media-playback-start", _("Play"),
+ _add_icon(ss->notify_box, "media-playback-start", _("Play"),
ss->pause_after);
evas_object_smart_callback_add(ss->pause, "clicked", _pause, ss);
ss->playing = 0;
@@ -624,7 +625,7 @@ _pause(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
_slideshow_play(ss);
ss->pause =
- _add_icon(ss->notify, "media-playback-pause", _("Pause"),
+ _add_icon(ss->notify_box, "media-playback-pause", _("Pause"),
ss->pause_after);
evas_object_smart_callback_add(ss->pause, "clicked", _pause, ss);
ss->playing = 1;
@@ -673,23 +674,23 @@ _fullscreen(void *data, Evas_Object *obj EINA_UNUSED,
if (elm_win_fullscreen_get(ss->ephoto->win))
{
ss->fullscreen =
- _add_icon(ss->notify, "view-fullscreen", _("Fullscreen"),
+ _add_icon(ss->notify_box, "view-fullscreen", _("Fullscreen"),
ss->fullscreen_after);
evas_object_smart_callback_add(ss->fullscreen, "clicked",
_fullscreen, ss);
elm_win_fullscreen_set(ss->ephoto->win, EINA_FALSE);
- elm_box_unpack(ss->notify, ss->exit);
+ elm_box_unpack(ss->notify_box, ss->exit);
evas_object_hide(ss->exit);
}
else
{
ss->fullscreen =
- _add_icon(ss->notify, "view-restore", _("Normal"),
+ _add_icon(ss->notify_box, "view-restore", _("Normal"),
ss->fullscreen_after);
evas_object_smart_callback_add(ss->fullscreen, "clicked",
_fullscreen, ss);
elm_win_fullscreen_set(ss->ephoto->win, EINA_TRUE);
- elm_box_pack_end(ss->notify, ss->exit);
+ elm_box_pack_end(ss->notify_box, ss->exit);
evas_object_show(ss->exit);
}
}
@@ -773,17 +774,40 @@ _add_icon(Evas_Object *parent, const char *icon, const char *label, Evas_Object
return but;
}
-void
-ephoto_slideshow_adjust_offsets(Ephoto *ephoto)
+static void
+_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
- Edje_Message_Int_Set *msg;
+ Ephoto_Slideshow *ss = data;
- msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
- msg->count = 2;
- msg->val[0] = 0;
- msg->val[1] = 0;
- edje_object_message_send(elm_layout_edje_get(ephoto->layout),
- EDJE_MESSAGE_INT_SET, 1, msg);
+ if (ss->notify)
+ {
+ elm_notify_timeout_set(ss->notify, 0.0);
+ evas_object_show(ss->notify);
+ }
+}
+
+static void
+_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Ephoto_Slideshow *ss = data;
+
+ if (ss->notify)
+ elm_notify_timeout_set(ss->notify, 3.0);
+}
+
+static void
+_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Ephoto_Slideshow *ss = data;
+
+ if (ss->notify)
+ {
+ elm_notify_timeout_set(ss->notify, 3.0);
+ evas_object_show(ss->notify);
+ }
}
void
@@ -792,45 +816,53 @@ ephoto_slideshow_show_controls(Ephoto *ephoto)
Ephoto_Slideshow *ss = evas_object_data_get(ephoto->slideshow, "slideshow");
Evas_Object *but;
- elm_layout_content_unset(ephoto->layout, "ephoto.swallow.controls");
- evas_object_hide(ephoto->statusbar);
+ ss->notify = elm_notify_add(ephoto->win);
+ EPHOTO_EXPAND(ss->notify);
- ss->notify = elm_box_add(ephoto->win);
- elm_box_horizontal_set(ss->notify, EINA_TRUE);
- evas_object_size_hint_weight_set(ss->notify, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_fill_set(ss->notify, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ ss->notify_box = elm_box_add(ss->notify);
+ elm_box_horizontal_set(ss->notify_box, EINA_TRUE);
+ EPHOTO_WEIGHT(ss->notify, EVAS_HINT_EXPAND, 0.0);
+ evas_object_event_callback_add(ss->notify_box, EVAS_CALLBACK_MOUSE_IN, _mouse_in,
+ ss);
+ evas_object_event_callback_add(ss->notify_box, EVAS_CALLBACK_MOUSE_OUT, _mouse_out,
+ ss);
+ elm_object_content_set(ss->notify, ss->notify_box);
+ evas_object_show(ss->notify_box);
if (ephoto->prev_state == EPHOTO_STATE_SINGLE)
- but = _add_icon(ss->notify, "view-list-icons", _("Back"), NULL);
+ but = _add_icon(ss->notify_box, "view-list-icons", _("Back"), NULL);
else
- but = _add_icon(ss->notify, "view-list-details", _("Back"), NULL);
+ but = _add_icon(ss->notify_box, "view-list-details", _("Back"), NULL);
evas_object_smart_callback_add(but, "clicked", _back, ss);
- but = _add_icon(ss->notify, "go-first", _("First"), NULL);
+ but = _add_icon(ss->notify_box, "go-first", _("First"), NULL);
evas_object_smart_callback_add(but, "clicked", _first, ss);
- but = _add_icon(ss->notify, "go-previous", _("Previous"), NULL);
+ but = _add_icon(ss->notify_box, "go-previous", _("Previous"), NULL);
evas_object_smart_callback_add(but, "clicked", _previous, ss);
ss->pause =
- _add_icon(ss->notify, "media-playback-start", _("Play"), NULL);
+ _add_icon(ss->notify_box, "media-playback-start", _("Play"), NULL);
evas_object_smart_callback_add(ss->pause, "clicked", _pause, ss);
ss->pause_after =
- _add_icon(ss->notify, "go-next", _("Next"), NULL);
+ _add_icon(ss->notify_box, "go-next", _("Next"), NULL);
evas_object_smart_callback_add(ss->pause_after, "clicked", _next,
ss);
- but = _add_icon(ss->notify, "go-last", _("Last"), NULL);
+ but = _add_icon(ss->notify_box, "go-last", _("Last"), NULL);
evas_object_smart_callback_add(but, "clicked", _last, ss);
ss->fullscreen =
- _add_icon(ss->notify, "view-fullscreen", _("Fullscreen"), NULL);
+ _add_icon(ss->notify_box, "view-fullscreen", _("Fullscreen"), NULL);
evas_object_smart_callback_add(ss->fullscreen, "clicked", _fullscreen, ss);
ss->fullscreen_after =
- _add_icon(ss->notify, "preferences-other", _("Settings"), NULL);
+ _add_icon(ss->notify_box, "preferences-other", _("Settings"), NULL);
evas_object_smart_callback_add(ss->fullscreen_after, "clicked", _settings, ss);
ss->exit =
- _add_icon(ss->notify, "application-exit", _("Exit"), NULL);
+ _add_icon(ss->notify_box, "application-exit", _("Exit"), NULL);
evas_object_smart_callback_add(ss->exit, "clicked", _fullscreen, ss);
- elm_box_unpack(ss->notify, ss->exit);
+
+ elm_box_unpack(ss->notify_box, ss->exit);
evas_object_hide(ss->exit);
- elm_layout_content_set(ephoto->layout, "ephoto.swallow.controls", ss->notify);
+ elm_notify_align_set(ss->notify, 0.5, 1.0);
+ elm_notify_timeout_set(ss->notify, 3.0);
+ evas_object_show(ss->notify);
}
Evas_Object *
@@ -847,6 +879,8 @@ ephoto_slideshow_add(Ephoto *ephoto, Evas_Object *parent)
ss->slideshow = slideshow;
ss->playing = 0;
ss->current = 0;
+ ss->notify = NULL;
+ ss->notify_box = NULL;
ss->old_item = NULL;
ss->current_item = NULL;
ss->event = NULL;
@@ -859,10 +893,10 @@ ephoto_slideshow_add(Ephoto *ephoto, Evas_Object *parent)
evas_object_event_callback_add(slideshow, EVAS_CALLBACK_MOUSE_DOWN,
_mouse_down, ss);
evas_object_data_set(slideshow, "slideshow", ss);
- evas_object_size_hint_weight_set(slideshow, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(slideshow, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
+ EPHOTO_EXPAND(slideshow);
+ EPHOTO_FILL(slideshow);
+ evas_object_event_callback_add(ss->slideshow, EVAS_CALLBACK_MOUSE_MOVE,
+ _mouse_move, ss);
edje_object_signal_callback_add(elm_layout_edje_get(ss->slideshow),
"ephoto,transition,raise", "ephoto", _on_transition_raise, ss);
edje_object_signal_callback_add(elm_layout_edje_get(ss->slideshow),
@@ -907,7 +941,7 @@ ephoto_slideshow_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
{
evas_object_del(ss->pause);
ss->pause =
- _add_icon(ss->notify, "media-playback-pause", _("Pause"),
+ _add_icon(ss->notify_box, "media-playback-pause", _("Pause"),
ss->pause_after);
evas_object_smart_callback_add(ss->pause, "clicked", _pause, ss);
ss->playing = 1;
@@ -918,21 +952,21 @@ ephoto_slideshow_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
if (!elm_win_fullscreen_get(ss->ephoto->win))
{
ss->fullscreen =
- _add_icon(ss->notify, "view-fullscreen", _("Fullscreen"),
+ _add_icon(ss->notify_box, "view-fullscreen", _("Fullscreen"),
ss->fullscreen_after);
evas_object_smart_callback_add(ss->fullscreen, "clicked",
_fullscreen, ss);
- elm_box_unpack(ss->notify, ss->exit);
+ elm_box_unpack(ss->notify_box, ss->exit);
evas_object_hide(ss->exit);
}
else
{
ss->fullscreen =
- _add_icon(ss->notify, "view-restore", _("Normal"),
+ _add_icon(ss->notify_box, "view-restore", _("Normal"),
ss->fullscreen_after);
evas_object_smart_callback_add(ss->fullscreen, "clicked",
_fullscreen, ss);
- elm_box_pack_end(ss->notify, ss->exit);
+ elm_box_pack_end(ss->notify_box, ss->exit);
evas_object_show(ss->exit);
}
}
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 2763703..f42309d 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -341,9 +341,8 @@ _dnd_create_icon(void *data, Evas_Object *win, Evas_Coord *xoff,
*yoff = ym - (h / 2);
icon = elm_icon_add(win);
elm_image_file_set(icon, f, g);
- evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
+ EPHOTO_EXPAND(icon);
+ EPHOTO_FILL(icon);
if (xoff && yoff)
evas_object_move(icon, *xoff, *yoff);
evas_object_resize(icon, w, h);
@@ -1022,29 +1021,6 @@ _grid_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
}
-static void
-_grid_changed(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ephoto_Thumb_Browser *tb = data;
- Evas_Coord w, h, gw, gh;
- Edje_Message_Int_Set *msg;
-
- if (tb->ephoto->state != EPHOTO_STATE_THUMB)
- return;
-
- elm_scroller_region_get(tb->grid, 0, 0, &w, &h);
- evas_object_geometry_get(tb->grid, 0, 0, &gw, &gh);
- gw -= w;
- gh -= h;
- msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
- msg->count = 2;
- msg->val[0] = gw;
- msg->val[1] = gh;
- edje_object_message_send(elm_layout_edje_get(tb->ephoto->layout),
- EDJE_MESSAGE_INT_SET, 1, msg);
-}
-
static void
_ephoto_thumb_activated(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
@@ -1214,9 +1190,8 @@ _ephoto_thumb_search_go(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_hide(tb->original_grid);
tb->grid = elm_gengrid_add(tb->gridbox);
- evas_object_size_hint_weight_set(tb->grid, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->grid);
+ EPHOTO_FILL(tb->grid);
elm_gengrid_align_set(tb->grid, 0.5, 0.0);
elm_gengrid_multi_select_set(tb->grid, EINA_TRUE);
elm_gengrid_multi_select_mode_set(tb->grid,
@@ -1363,8 +1338,8 @@ _ephoto_thumb_search_start(void *data, Evas_Object *obj EINA_UNUSED,
}
hbox = elm_box_add(tb->gridbox);
elm_box_horizontal_set(hbox, EINA_TRUE);
- evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(hbox, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(hbox);
elm_box_pack_start(tb->gridbox, hbox);
evas_object_show(hbox);
@@ -1374,10 +1349,8 @@ _ephoto_thumb_search_start(void *data, Evas_Object *obj EINA_UNUSED,
elm_object_part_text_set(search, "guide", _("Search"));
elm_scroller_policy_set(search, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
- evas_object_size_hint_weight_set(search, EVAS_HINT_EXPAND,
- EVAS_HINT_FILL);
- evas_object_size_hint_align_set(search, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_WEIGHT(hbox, EVAS_HINT_EXPAND, 0.0);
+ EPHOTO_FILL(hbox);
evas_object_data_set(search, "thumb_browser", tb);
evas_object_data_set(search, "parent", hbox);
evas_object_smart_callback_add(search, "activated",
@@ -1396,9 +1369,8 @@ static void
_ephoto_thumb_view_add(Ephoto_Thumb_Browser *tb)
{
tb->table = elm_table_add(tb->main);
- evas_object_size_hint_weight_set(tb->table, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->table);
+ EPHOTO_FILL(tb->table);
elm_box_pack_end(tb->main, tb->table);
evas_object_show(tb->table);
@@ -1406,10 +1378,8 @@ _ephoto_thumb_view_add(Ephoto_Thumb_Browser *tb)
elm_label_line_wrap_set(tb->nolabel, ELM_WRAP_WORD);
elm_object_text_set(tb->nolabel,
_("There are no images in this directory"));
- evas_object_size_hint_weight_set(tb->nolabel, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->nolabel, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->nolabel);
+ EPHOTO_FILL(tb->nolabel);
evas_object_size_hint_aspect_set(tb->nolabel, EVAS_ASPECT_CONTROL_VERTICAL,
1, 1);
elm_table_pack(tb->table, tb->nolabel, 0, 0, 5, 1);
@@ -1417,16 +1387,13 @@ _ephoto_thumb_view_add(Ephoto_Thumb_Browser *tb)
tb->gridbox = elm_box_add(tb->table);
elm_box_horizontal_set(tb->gridbox, EINA_FALSE);
- evas_object_size_hint_weight_set(tb->gridbox, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->gridbox, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->gridbox);
+ EPHOTO_FILL(tb->gridbox);
evas_object_show(tb->gridbox);
tb->grid = elm_gengrid_add(tb->gridbox);
- evas_object_size_hint_weight_set(tb->grid, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->grid);
+ EPHOTO_FILL(tb->grid);
elm_gengrid_align_set(tb->grid, 0.5, 0.0);
elm_gengrid_multi_select_set(tb->grid, EINA_TRUE);
elm_gengrid_multi_select_mode_set(tb->grid,
@@ -1445,7 +1412,6 @@ _ephoto_thumb_view_add(Ephoto_Thumb_Browser *tb)
_drop_dropcb, NULL);
evas_object_data_set(tb->grid, "thumb_browser", tb);
elm_box_pack_end(tb->gridbox, tb->grid);
- evas_object_smart_callback_add(tb->grid, "changed", _grid_changed, tb);
evas_object_show(tb->grid);
elm_table_pack(tb->table, tb->gridbox, 0, 0, 5, 1);
@@ -1875,24 +1841,6 @@ _ephoto_main_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
eina_list_free(selected);
}
-static void
-_hover_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ephoto_Thumb_Browser *tb = data;
-
- tb->ephoto->hover_blocking = EINA_FALSE;
-}
-
-static void
-_hover_expand_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ephoto_Thumb_Browser *tb = data;
-
- tb->ephoto->hover_blocking = EINA_TRUE;
-}
-
static void
_ephoto_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@@ -2081,24 +2029,26 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
Evas_Object *but, *ic, *hover;
int ret;
- ic = elm_icon_add(ephoto->controls_left);
+ evas_object_del(ephoto->view_button);
+
+ ic = elm_icon_add(ephoto->statusbar);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
ret = elm_icon_standard_set(ic, "view-list-details");
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
if (!ret)
ret = elm_image_file_set(ic, PACKAGE_DATA_DIR "/images/single.png", NULL);
+ evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
- but = elm_button_add(ephoto->controls_left);
- if (!ret)
- elm_object_text_set(but, _("View Images"));
+ but = elm_button_add(ephoto->statusbar);
elm_object_part_content_set(but, "icon", ic);
elm_object_tooltip_text_set(but, _("View Images"));
elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
evas_object_smart_callback_add(but, "clicked", _view_single, tb);
- elm_box_pack_end(ephoto->controls_left, but);
+ elm_box_pack_after(ephoto->statusbar, but, ephoto->folders_button);
evas_object_show(but);
+ ephoto->view_button = but;
+
ic = elm_icon_add(ephoto->controls_left);
evas_object_size_hint_min_set(ic, 20*elm_config_scale_get(),
20*elm_config_scale_get());
@@ -2152,8 +2102,6 @@ ephoto_thumb_browser_show_controls(Ephoto *ephoto)
evas_object_show(ic);
elm_object_tooltip_text_set(hover, _("Sort"));
elm_object_tooltip_orient_set(hover, ELM_TOOLTIP_ORIENT_TOP);
- evas_object_smart_callback_add(hover, "expanded", _hover_expand_cb, tb);
- evas_object_smart_callback_add(hover, "dismissed", _hover_dismissed_cb, tb);
elm_box_pack_end(ephoto->controls_right, hover);
evas_object_show(hover);
tb->hover = hover;
@@ -2187,9 +2135,8 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
tb->main = box;
elm_box_horizontal_set(tb->main, EINA_FALSE);
- evas_object_size_hint_weight_set(tb->main, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(tb->main, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ EPHOTO_EXPAND(tb->main);
+ EPHOTO_FILL(tb->main);
evas_object_event_callback_add(tb->main, EVAS_CALLBACK_DEL,
_ephoto_main_del, tb);
evas_object_event_callback_add(tb->main, EVAS_CALLBACK_KEY_DOWN,