enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

add option to keep border settings as they are when remember is set 

SVN revision: 42430
This commit is contained in:
Hannes Janetzek 2009-09-12 03:43:51 +00:00
parent d798a5b840
commit 698aebad53
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_config.c
View File

@ -328,6 +328,7 @@ e_config_init(void)
#define D _e_config_remember_edd
E_CONFIG_VAL(D, T, match, INT);
E_CONFIG_VAL(D, T, apply_first_only, UCHAR);
E_CONFIG_VAL(D, T, keep_settings, UCHAR);
E_CONFIG_VAL(D, T, name, STR);
E_CONFIG_VAL(D, T, class, STR);
E_CONFIG_VAL(D, T, title, STR);
@ -381,7 +382,8 @@ e_config_init(void)
E_CONFIG_VAL(D, T, prop.head, INT);
E_CONFIG_VAL(D, T, prop.command, STR);
E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
E_CONFIG_VAL(D, T, prop.desktop_file, STR);
_e_config_color_class_edd = E_CONFIG_DD_NEW("E_Color_Class", E_Color_Class);
#undef T
#undef D

27
src/bin/e_int_border_remember.c
View File

@ -53,6 +53,7 @@ struct _E_Config_Dialog_Data
int apply_run;
int apply_icon_pref;
int set_focus_on_start;
int keep_settings;
} remember;
};
@ -168,6 +169,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (rem)
{
if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
if (rem->keep_settings) cfdata->remember.keep_settings = 1;
if (rem->match & E_REMEMBER_MATCH_NAME) cfdata->remember.match_name = 1;
if (rem->match & E_REMEMBER_MATCH_CLASS) cfdata->remember.match_class = 1;
if (rem->match & E_REMEMBER_MATCH_TITLE) cfdata->remember.match_title = 1;
@ -501,9 +503,10 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
if (rem)
{
{
rem->apply = 0;
rem->match = 0;
rem->apply_first_only = cfdata->remember.apply_first_only;
if (cfdata->remember.match_name) rem->match |= E_REMEMBER_MATCH_NAME;
if (cfdata->remember.match_class) rem->match |= E_REMEMBER_MATCH_CLASS;
if (cfdata->remember.match_title) rem->match |= E_REMEMBER_MATCH_TITLE;
@ -527,13 +530,12 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->remember.apply_icon_pref) rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
if (cfdata->remember.set_focus_on_start) rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
rem->apply_first_only = cfdata->remember.apply_first_only;
_remember_update(rem, cfdata);
cfdata->border->remember = rem;
rem->keep_settings = 0;
e_remember_update(rem, cfdata->border);
rem->keep_settings = cfdata->remember.keep_settings;
}
e_config_save_queue();
@ -667,14 +669,17 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
ob = e_widget_check_add(evas, _("Match only one window"), &(cfdata->remember.apply_first_only));
e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 1, 1, 1);
if (cfdata->command)
{
ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
}
ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
e_widget_table_object_append(o, ob, 1, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_check_add(evas, _("Keep current properties"), &(cfdata->remember.keep_settings));
e_widget_table_object_append(o, ob, 1, 2, 1, 1, 1, 1, 1, 1);
if (cfdata->command)
{
ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
e_widget_table_object_append(o, ob, 1, 3, 1, 1, 1, 1, 1, 1);
}
return o;
}

3
src/bin/e_remember.c
View File

@ -204,6 +204,9 @@ e_remember_update(E_Remember *rem, E_Border *bd)
if (!rem) return;
if (bd->new_client) return;
if (bd->remember && bd->remember->keep_settings)
return;
if (rem->prop.border) eina_stringshare_del(rem->prop.border);
rem->prop.border = NULL;

8
src/bin/e_remember.h
View File

@ -38,6 +38,7 @@ struct _E_Remember
unsigned char delete_me;
int match;
unsigned char apply_first_only;
unsigned char keep_settings;
int used_count;
const char *name;
const char *class;
@ -54,7 +55,7 @@ struct _E_Remember
int pos_w, pos_h;
int w, h;
int layer;
unsigned char lock_user_location;
unsigned char lock_client_location;
unsigned char lock_user_size;
@ -78,9 +79,9 @@ struct _E_Remember
unsigned char lock_focus_in;
unsigned char lock_focus_out;
unsigned char lock_life;
const char *border;
unsigned char sticky;
unsigned char shaded;
unsigned char fullscreen;
@ -93,6 +94,7 @@ struct _E_Remember
int zone;
int head;
const char *command;
const char *desktop_file;
} prop;
};