Ehhhh. So stuff in one go.

* Mouse Binding Dialog
  - dialog refactoring
  - no need to select modifiers, etc. Just click add button and do an action with a mouse.
  - new icons. Many thanks to Luchezar 'ManowarrioR' Petkov for great work on this icons.
  - extra mouse buttons and wheels are supported.
  - etc, just try and see.

* Shelf
  - No re-population when "plain/inset" mode set.
  - Changing the orientation of the shelf horiz->vert does not screws up it look.
  - something else

* Gadcon
  - No overlaping items in initial shelf.
  - Moving of items in gadcon is not problematic any more. Will not get any mess
    and overlaps in gadcon on moving.
  - Item sizing. If u size an item to the left it will be sized only to the left.
  - If gadcon clients take much more space than gadcon can display, they are resized
    starting from the biggest item(s).
  - Shrinked mode actions, moving/sizing, is not problematic. Everything works
    exactly in the same fasion as in non-shrinked mode.
  - etc.


SVN revision: 25235

data/themes/default_icons.edc

@@ -41,11 +41,12 @@ images {
    image: "e17_icon_up_arrow.png" COMP;
    image: "e17_icon_down_arrow.png" COMP;
 
-   image: "e17_icon_mouse_bindings_left.png" COMP;
-   image: "e17_icon_mouse_bindings_middle.png" COMP;
-   image: "e17_icon_mouse_bindings_right.png" COMP;
-   image: "e17_icon_mouse_bindings_scroll_up.png" COMP;
-   image: "e17_icon_mouse_bindings_scroll_down.png" COMP;
+   image: "e17_icon_mouse_left.png" COMP;
+   image: "e17_icon_mouse_middle.png" COMP;
+   image: "e17_icon_mouse_right.png" COMP;
+   image: "e17_icon_mouse_extra.png" COMP;
+   image: "e17_icon_mouse_wheel.png" COMP;
+   image: "e17_icon_mouse_clean.png" COMP;
    
    image: "e17_shelf_bottom_left.png" COMP;
    image: "e17_shelf_bottom.png" COMP;
@@ -605,7 +606,7 @@ group {
    }
 }
 group {
-   name: "e/icons/enlightenment/mouse_binding_left";
+   name: "e/icons/enlightenment/mouse_left";
    max:  64 64;
    parts {
       part {
@@ -617,14 +618,14 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_mouse_bindings_left.png";
+	       normal: "e17_icon_mouse_left.png";
 	    }
 	 }
       }
    }
 }
 group {
-   name: "e/icons/enlightenment/mouse_binding_middle";
+   name: "e/icons/enlightenment/mouse_middle";
    max:  64 64;
    parts {
       part {
@@ -636,14 +637,14 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_mouse_bindings_middle.png";
+	       normal: "e17_icon_mouse_middle.png";
 	    }
 	 }
       }
    }
 }
 group {
-   name: "e/icons/enlightenment/mouse_binding_right";
+   name: "e/icons/enlightenment/mouse_right";
    max:  64 64;
    parts {
       part {
@@ -655,14 +656,14 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_mouse_bindings_right.png";
+	       normal: "e17_icon_mouse_right.png";
 	    }
 	 }
       }
    }
 }
 group {
-   name: "e/icons/enlightenment/mouse_binding_scroll_up";
+   name: "e/icons/enlightenment/mouse_extra";
    max:  64 64;
    parts {
       part {
@@ -674,14 +675,14 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_mouse_bindings_scroll_up.png";
+	       normal: "e17_icon_mouse_extra.png";
 	    }
 	 }
       }
    }
 }
 group {
-   name: "e/icons/enlightenment/mouse_binding_scroll_down";
+   name: "e/icons/enlightenment/mouse_wheel";
    max:  64 64;
    parts {
       part {
@@ -693,7 +694,26 @@ group {
 	    aspect_preference: BOTH;
 	    max:      64 64;
 	    image {
-	       normal: "e17_icon_mouse_bindings_scroll_down.png";
+	       normal: "e17_icon_mouse_wheel.png";
+	    }
+	 }
+      }
+   }
+}
+group {
+   name: "e/icons/enlightenment/mouse_clean";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_mouse_clean.png";
 	    }
 	 }
       }

data/themes/images/Makefile.am

@@ -332,11 +332,12 @@ e17_icon_windows.png \
 e17_icon_window_focus.png \
 e17_icon_lost_windows.png \
 e17_icon_screen_resolution.png \
-e17_icon_mouse_bindings_left.png \
-e17_icon_mouse_bindings_middle.png \
-e17_icon_mouse_bindings_right.png \
-e17_icon_mouse_bindings_scroll_up.png \
-e17_icon_mouse_bindings_scroll_down.png \
+e17_icon_mouse_left.png \
+e17_icon_mouse_middle.png \
+e17_icon_mouse_right.png \
+e17_icon_mouse_extra.png \
+e17_icon_mouse_wheel.png \
+e17_icon_mouse_clean.png \
 e17_pointer.png \
 e17_pointer_mono.png \
 e17_dialog_watermark.png \

src/bin/e_config.c

@@ -90,6 +90,8 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, geom.pos, INT);
    E_CONFIG_VAL(D, T, geom.size, INT);
    E_CONFIG_VAL(D, T, geom.res, INT);
+   E_CONFIG_VAL(D, T, state_info.seq, INT);
+   E_CONFIG_VAL(D, T, state_info.flags, INT);
    E_CONFIG_VAL(D, T, style, STR);
    E_CONFIG_VAL(D, T, autoscroll, UCHAR);
    E_CONFIG_VAL(D, T, resizable, UCHAR);
@@ -1145,6 +1147,8 @@ e_config_init(void)
    cf_gcc->geom.res = _res; \
    cf_gcc->geom.size = _size; \
    cf_gcc->geom.pos = _pos; \
+   cf_gcc->state_info.seq = 0; \
+   cf_gcc->state_info.flags = 0; \
    if (_style) cf_gcc->style = evas_stringshare_add(_style); \
    else cf_gcc->style = NULL; \
    cf_gcc->autoscroll = _autoscr; \

src/bin/e_config.h

@@ -50,7 +50,7 @@ typedef Eet_Data_Descriptor                 E_Config_DD;
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need top be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0100
+#define E_CONFIG_FILE_GENERATION 0x0101
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT      0
@@ -113,10 +113,10 @@ struct _E_Config
    Evas_List  *font_fallbacks; // GUI
    Evas_List  *font_defaults; // GUI
    Evas_List  *themes; // GUI
-   Evas_List  *mouse_bindings;
+   Evas_List  *mouse_bindings; // GUI
    Evas_List  *key_bindings; // GUI
    Evas_List  *signal_bindings;
-   Evas_List  *wheel_bindings;
+   Evas_List  *wheel_bindings; // GUI
    Evas_List  *path_append_data; // GUI
    Evas_List  *path_append_images; // GUI
    Evas_List  *path_append_fonts; // GUI
@@ -333,6 +333,9 @@ struct _E_Config_Gadcon_Client
    struct {
       int pos, size, res;
    } geom;
+   struct {
+      int seq, flags;
+   } state_info;
    const char    *style;
    unsigned char  autoscroll;
    unsigned char  resizable;

src/bin/e_configure.c

@@ -80,7 +80,7 @@ e_configure_show(E_Container *con)
    e_configure_header_item_add(eco, "enlightenment/behavior", _("Behavior"));
    e_configure_standard_item_add(eco, "enlightenment/focus", _("Window Focus"), e_int_config_focus);
    e_configure_standard_item_add(eco, "enlightenment/keys", _("Key Bindings"), e_int_config_keybindings);
-   e_configure_standard_item_add(eco, "enlightenment/mouse_binding_left", _("Mouse Bindings"), e_int_config_mousebindings);
+   e_configure_standard_item_add(eco, "enlightenment/mouse_clean", _("Mouse Bindings"), e_int_config_mousebindings);
    e_configure_standard_item_add(eco, "enlightenment/menus", _("Menus"), e_int_config_menus);
    
    e_configure_header_item_add(eco, "enlightenment/misc", _("Miscellaneous"));

src/bin/e_gadcon.h

@@ -114,7 +114,15 @@ struct _E_Gadcon_Client
    void                  *data;
    struct {
       int                 pos, size, res;
-   } config;
+   } config; 
+
+   struct { 
+     int seq, flags; // goes to save
+     int state, resist;
+     int prev_pos, prev_size;
+     int want_save : 1;
+   } state_info;
+
    struct {
       Evas_Coord          w, h;
    } pad, min, aspect;
@@ -129,7 +137,7 @@ struct _E_Gadcon_Client
    
    unsigned char          moving : 1;
    unsigned char          resizing : 1;
-   Evas_Coord             dx, dy, sx, sy, sw, sh;
+   Evas_Coord             dx, dy;
 };
 
 EAPI int              e_gadcon_init(void);

src/bin/e_int_config_keybindings.c

@@ -11,7 +11,7 @@
 #define TEXT_ACTION _("Action")
 #define TEXT_NONE_ACTION_KEY _("<None>")
 #define TEXT_PRESS_KEY_SEQUENCE _("Please press key sequence,<br>" \
-				  "or <hilight>Escape</hilight> to abort")
+				  "or <hilight>Escape</hilight> to abort.")
 
 #define ILIST_ICON_WITH_KEYBIND	    "enlightenment/keys"
 #define ILIST_ICON_WITHOUT_KEYBIND  ""
@@ -1292,6 +1292,7 @@ _e_keybinding_keybind_cb_new_shortcut(void *data, void *data2)
   e_dialog_icon_set(cfdata->locals.dia, "enlightenment/e", 64);
   e_dialog_text_set(cfdata->locals.dia, TEXT_PRESS_KEY_SEQUENCE);
   e_win_centered_set(cfdata->locals.dia->win, 1);
+  e_win_borderless_set(cfdata->locals.dia->win, 1);
 
   cfdata->locals.keybind_win = ecore_x_window_input_new(e_manager_current_get()->root,
 							0, 0, 1, 1);

src/bin/e_int_shelf_config.c

@@ -251,6 +251,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	cfdata->escfg->orient = cfdata->orient;
 	e_shelf_orient(cfdata->es, cfdata->orient);
 	e_shelf_position_calc(cfdata->es);
+	restart = 1;
      }
 
    /* Only Change fit along if we need to */

src/bin/e_shelf.c

@@ -261,8 +261,8 @@ e_shelf_move_resize(E_Shelf *es, int x, int y, int w, int h)
    es->y = y;
    es->w = w;
    es->h = h;
-   if (es->popup)
-     e_popup_move_resize(es->popup, es->x, es->y, es->w, es->h);
+   if (es->popup) 
+     e_popup_move_resize(es->popup, es->x, es->y, es->w, es->h); 
    else
      {
 	evas_object_move(es->o_event, es->zone->x + es->x, es->zone->y + es->y);
@@ -475,7 +475,6 @@ e_shelf_style_set(E_Shelf *es, const char *style)
    if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf))
      e_theme_edje_object_set(es->o_base, "base/theme/shelf", 
 			     "e/shelf/default/base");
-   
    e_gadcon_unpopulate(es->gadcon);
    e_gadcon_populate(es->gadcon);
 }