syscon -> labels!

SVN revision: 38695

config/minimalist/e.src

@@ -816,7 +816,7 @@ group "E_Config" struct {
       value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "Delete";
-      value "action" string: "logout";
+      value "action" string: "syscon";
       value "any_mod" uchar: 0;
     }
   }

config/netbook/e.src

@@ -880,7 +880,7 @@ group "E_Config" struct {
       value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "Delete";
-      value "action" string: "logout";
+      value "action" string: "syscon";
       value "any_mod" uchar: 0;
     }
   }

config/scaleable/e.src

@@ -903,7 +903,7 @@ group "E_Config" struct {
       value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "Delete";
-      value "action" string: "logout";
+      value "action" string: "syscon";
       value "any_mod" uchar: 0;
     }
   }

config/standard/e.src

@@ -903,7 +903,7 @@ group "E_Config" struct {
       value "context" int: 9;
       value "modifiers" int: 6;
       value "key" string: "Delete";
-      value "action" string: "logout";
+      value "action" string: "syscon";
       value "any_mod" uchar: 0;
     }
   }

data/themes/default.edc

@@ -10644,6 +10644,42 @@ collections { /* begin the collection of edje groups that are in this file */
 	       }
 	    }
 	 }
+	 part { name: "e.text.label";
+	    type: TEXT;
+	    effect: SOFT_SHADOW;
+	    mouse_events:  0;
+	    scale: 1;
+	    description { state: "default" 0.0;
+               fixed: 0 1;
+               align: 0.5 1.0;
+	       rel1 {
+		  relative: 0.0  1.0;
+		  offset:   3    -4;
+		  to:     "button_image";
+	       }
+	       rel2 {
+		  relative: 1.0  1.0;
+		  offset:   -4   -4;
+		  to:     "button_image";
+	       }
+	       color: 224 224 224 255;
+	       color3: 0 0 0 64;
+	       color_class: "button_text";
+	       text {
+		  font:     "Sans";
+		  size:     10;
+		  min:      1 1;
+		  align:    0.5 1.0;
+		  text_class: "button";
+	       }
+	    }
+	    description { state: "disabled" 0.0;
+	       inherit: "default" 0.0;
+	       color: 0 0 0 128;
+	       color3: 0 0 0 0;
+	       color_class: "button_text_disabled";
+	    }
+	 }
 	 part {
 	    name: "e.swallow.icon";
 	    type: SWALLOW;
@@ -10658,9 +10694,10 @@ collections { /* begin the collection of edje groups that are in this file */
 		  to: "button_image";
 	       }
 	       rel2 {
-		  relative: 1.0 1.0;
+		  relative: 1.0 0.0;
-		  offset:   -4   -4;
+		  offset:   -4   -1;
-		  to: "button_image";
+		  to_x: "button_image";
+		  to_y: "e.text.label";
 	       }
 	    }
 	 }

src/bin/e_actions.c

@@ -2637,15 +2637,15 @@ e_actions_init(void)
 			    "exit_now", NULL, NULL, 0);
 
    ACT_GO(halt_now);
-   e_action_predef_name_set(_("Enlightenment"), _("Shut Down Immediately"), 
+   e_action_predef_name_set(_("Enlightenment"), _("Off Now"),
 			    "halt_now", NULL, NULL, 0);
 
    ACT_GO(halt);
-   e_action_predef_name_set(_("System"), _("Shut Down"), "halt", 
+   e_action_predef_name_set(_("System"), _("Off"), "halt", 
 			    NULL, NULL, 0);
 
    ACT_GO(reboot);
-   e_action_predef_name_set(_("System"), _("Reboot"), "reboot", 
+   e_action_predef_name_set(_("System"), _("Reset"), "reboot", 
 			    NULL, NULL, 0);
 
    ACT_GO(suspend);
@@ -2653,7 +2653,7 @@ e_actions_init(void)
 			    NULL, NULL, 0);
 
    ACT_GO(hibernate);
-   e_action_predef_name_set(_("System"), _("Suspend to Disk"), "hibernate", 
+   e_action_predef_name_set(_("System"), _("Hibernate"), "hibernate", 
 			    NULL, NULL, 0);
    
    ACT_GO(pointer_resize_push);
@@ -2661,7 +2661,7 @@ e_actions_init(void)
    
    /* desk_lock */
    ACT_GO(desk_lock);
-   e_action_predef_name_set(_("Desktop"), _("Desktop Lock"), "desk_lock", 
+   e_action_predef_name_set(_("Desktop"), _("Lock"), "desk_lock", 
 			    NULL, NULL, 0);
 
    /* cleanup_windows */
@@ -2751,11 +2751,12 @@ e_action_predef_label_get(const char *action, const char *params)
              actd = l2->data;
              if (!strcmp(actd->act_cmd, action))
                {
-                  if ((params) && (actd->act_params) &&
+                  if ((params) && (actd->act_params))
-                      (!strcmp(params, actd->act_params)))
                     {
-                       return actd->act_name;
+                       if (!strcmp(params, actd->act_params))
+                         return actd->act_name;
                     }
+                  else return actd->act_name;
                }
           }
      }

src/modules/syscon/e_syscon.c

@@ -187,6 +187,10 @@ e_syscon_show(E_Zone *zone, const char *defact)
              e_flowlayout_pack_end(o_flow_secondary, o);
              iw = ih = e_config->syscon.secondary.icon_size * e_scale;
           }
+        edje_object_message_signal_process(o);
+        edje_object_size_min_calc(o, &mw, &mh);
+        if (mw > iw) iw = mw;
+        if (mh > ih) ih = mh;
         e_flowlayout_pack_options_set(o, 1, 1, 0, 0, 0.5, 0.5, 
                                       iw, ih, iw, ih);
         evas_object_show(o);