Menu
▾
▴
E SVN: jeffdameth IN trunk/e: data/themes src/modules/everything
|
From: Enlightenment S. <no-...@en...> - 2010-05-13 04:13:45
|
Log:
make multiple selection work in thumb mode.
trying thumb mode as default for aggregator
Author: jeffdameth
Date: 2010-05-12 21:13:38 -0700 (Wed, 12 May 2010)
New Revision: 48799
Modified:
trunk/e/data/themes/default.edc trunk/e/src/modules/everything/e_mod_main.c trunk/e/src/modules/everything/evry_plug_aggregator.c trunk/e/src/modules/everything/evry_plug_view_thumb.c
Modified: trunk/e/data/themes/default.edc
===================================================================
--- trunk/e/data/themes/default.edc 2010-05-13 03:49:23 UTC (rev 48798)
+++ trunk/e/data/themes/default.edc 2010-05-13 04:13:38 UTC (rev 48799)
@@ -33939,16 +33939,7 @@
name: "e/modules/everything/thumbview/main/window";
images {
image: "vgrad_dark.png" COMP;
- image: "dia_topshad.png" COMP;
image: "dia_botshad.png" COMP;
- image: "dia_botshad.png" COMP;
- image: "topsh.png" COMP;
- image: "wp-bot1.png" COMP;
- image: "wp-bot2.png" COMP;
- image: "wp-tb1.png" COMP;
- image: "wp-tb2.png" COMP;
- image: "wp-tb3.png" COMP;
- image: "wp-tbs.png" COMP;
image: "big_arrow_up.png" COMP;
image: "busy-1.png" COMP;
image: "busy-2.png" COMP;
@@ -34153,6 +34144,33 @@
}
}
part {
+ name: "bg_mark";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ rel1 {
+ to: "base";
+ offset: -1 -3;
+ }
+ rel2 {
+ to: "base";
+ offset: -2 2;
+ }
+ fill.smooth: 0;
+ image {
+ normal: "everything_item_bg.png";
+ border: 5 5 5 5;
+ }
+ }
+ description {
+ state: "marked" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 48;
+ }
+ }
+ part {
name: "base";
mouse_events: 0;
type: RECT;
@@ -34260,9 +34278,7 @@
signal: "e,state,selected";
source: "e";
action: STATE_SET "selected" 0.0;
- /* transition: DECELERATE 0.; */
target: "bg";
- /* target: "clip"; */
}
program {
name: "unsel";
@@ -34271,9 +34287,24 @@
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.1;
target: "bg";
- /* target: "clip"; */
}
program {
+ name: "mark";
+ signal: "e,state,marked";
+ source: "e";
+ action: STATE_SET "marked" 0.0;
+ target: "bg_mark";
+ transition: ACCELERATE 0.15;
+ }
+ program {
+ name: "unmark";
+ signal: "e,state,unmarked";
+ source: "e";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.2;
+ target: "bg_mark";
+ }
+ program {
name: "thumb_gen";
signal: "e,action,thumb,gen";
source: "e";
@@ -34373,7 +34404,7 @@
state: "marked" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 48;
+ color: 255 255 255 148;
}
}
part {
@@ -34480,9 +34511,6 @@
state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- /* min: 12 12;
- * max: 12 12; */
-
rel1 {
to: "base";
relative: 1.0 0.0;
@@ -34593,7 +34621,6 @@
action: STATE_SET "selected" 0.0;
target: "bg";
transition: ACCELERATE 0.15;
- /* target: "clip"; */
}
program {
name: "unsel";
@@ -34602,7 +34629,6 @@
action: STATE_SET "default" 0.0;
transition: LINEAR 0.2;
target: "bg";
- /* target: "clip"; */
}
program {
name: "mark";
@@ -34611,7 +34637,6 @@
action: STATE_SET "marked" 0.0;
target: "bg_mark";
transition: ACCELERATE 0.15;
- /* target: "clip"; */
}
program {
name: "unmark";
@@ -34620,14 +34645,12 @@
action: STATE_SET "default" 0.0;
transition: LINEAR 0.2;
target: "bg_mark";
- /* target: "clip"; */
}
program {
name: "arrow_show";
signal: "e,state,browseable";
source: "e";
action: STATE_SET "visible" 0.0;
- /* transition: SINUSOIDAL 0.1; */
target: "arrow";
}
program {
@@ -34644,7 +34667,6 @@
signal: "e,action,thumb,ungen";
source: "e";
action: STATE_SET "visible" 0.0;
- /* transition: SINUSOIDAL 0.15; */
target: "base";
}
program {
@@ -34658,7 +34680,6 @@
program {
name: "thumb_show_delayed2";
action: STATE_SET "visible" 0.0;
- /* transition: SINUSOIDAL 0.3; */
target: "base";
}
program {
@@ -34666,7 +34687,6 @@
signal: "e,action,thumb,show";
source: "e";
action: STATE_SET "visible" 0.0;
- /* transition: SINUSOIDAL 0.1; */
target: "base";
}
program {
Modified: trunk/e/src/modules/everything/e_mod_main.c
===================================================================
--- trunk/e/src/modules/everything/e_mod_main.c 2010-05-13 03:49:23 UTC (rev 48798)
+++ trunk/e/src/modules/everything/e_mod_main.c 2010-05-13 04:13:38 UTC (rev 48799)
@@ -368,7 +368,7 @@
evry_conf->quick_nav = 1;
evry_conf->view_mode = VIEW_MODE_DETAIL;
evry_conf->view_zoom = 0;
- evry_conf->cycle_mode = 0;
+ evry_conf->cycle_mode = 1;
evry_conf->history_sort_mode = 0;
evry_conf->first_run = EINA_TRUE;
IFMODCFGEND;
Modified: trunk/e/src/modules/everything/evry_plug_aggregator.c
===================================================================
--- trunk/e/src/modules/everything/evry_plug_aggregator.c 2010-05-13 03:49:23 UTC (rev 48798)
+++ trunk/e/src/modules/everything/evry_plug_aggregator.c 2010-05-13 04:13:38 UTC (rev 48799)
@@ -254,7 +254,10 @@
p = EVRY_PLUGIN_NEW(Plugin, N_("All"), NULL, 0, NULL, _finish, _fetch, _free);
p->history = EINA_FALSE;
- evry_plugin_register(p, type, -1);
+ if (evry_plugin_register(p, type, -1))
+ {
+ p->config->view_mode = VIEW_MODE_THUMB;
+ }
GET_PLUGIN(pa, p);
pa->selector = sel;
Modified: trunk/e/src/modules/everything/evry_plug_view_thumb.c
===================================================================
--- trunk/e/src/modules/everything/evry_plug_view_thumb.c 2010-05-13 03:49:23 UTC (rev 48798)
+++ trunk/e/src/modules/everything/evry_plug_view_thumb.c 2010-05-13 04:13:38 UTC (rev 48799)
@@ -690,9 +690,8 @@
{
prev = sd->cur_item->y / sd->cur_item->h;
sd->cur_item->selected = EINA_FALSE;
- if (!sd->cur_item->item->marked)
- edje_object_signal_emit(sd->cur_item->frame,
- "e,state,unselected", "e");
+ edje_object_signal_emit(sd->cur_item->frame,
+ "e,state,unselected", "e");
}
sd->cur_item = NULL;
|