forked from enlightenment/enlightenment
Tiling2: Remove things I don't need from config and config dialog.
This commit is contained in:
parent
4b2a53d1d4
commit
5e209ea583
|
@ -54,7 +54,6 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
|
||||||
/* Because we save a lot of lines here by using memcpy,
|
/* Because we save a lot of lines here by using memcpy,
|
||||||
* the structs have to be ordered the same */
|
* the structs have to be ordered the same */
|
||||||
memcpy(cfdata, tiling_g.config, sizeof(Config));
|
memcpy(cfdata, tiling_g.config, sizeof(Config));
|
||||||
cfdata->config.keyhints = strdup(tiling_g.config->keyhints);
|
|
||||||
|
|
||||||
/* Handle things which can't be easily memcpy'd */
|
/* Handle things which can't be easily memcpy'd */
|
||||||
cfdata->config.vdesks = NULL;
|
cfdata->config.vdesks = NULL;
|
||||||
|
@ -84,7 +83,6 @@ _free_data(E_Config_Dialog *cfd __UNUSED__,
|
||||||
E_Config_Dialog_Data *cfdata)
|
E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
eina_list_free(cfdata->config.vdesks);
|
eina_list_free(cfdata->config.vdesks);
|
||||||
free(cfdata->config.keyhints);
|
|
||||||
free(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,8 +103,7 @@ _fill_zone_config(E_Zone *zone,
|
||||||
for (i = 0; i < zone->desk_y_count * zone->desk_x_count; i++) {
|
for (i = 0; i < zone->desk_y_count * zone->desk_x_count; i++) {
|
||||||
E_Desk *desk = zone->desks[i];
|
E_Desk *desk = zone->desks[i];
|
||||||
struct _Config_vdesk *vd;
|
struct _Config_vdesk *vd;
|
||||||
Evas_Object *list, *slider, *radio;
|
Evas_Object *list, *slider;
|
||||||
E_Radio_Group *rg;
|
|
||||||
|
|
||||||
if (!desk)
|
if (!desk)
|
||||||
continue;
|
continue;
|
||||||
|
@ -118,7 +115,6 @@ _fill_zone_config(E_Zone *zone,
|
||||||
vd->y = desk->y;
|
vd->y = desk->y;
|
||||||
vd->zone_num = zone->num;
|
vd->zone_num = zone->num;
|
||||||
vd->nb_stacks = 0;
|
vd->nb_stacks = 0;
|
||||||
vd->use_rows = 0;
|
|
||||||
|
|
||||||
EINA_LIST_APPEND(cfdata->config.vdesks, vd);
|
EINA_LIST_APPEND(cfdata->config.vdesks, vd);
|
||||||
}
|
}
|
||||||
|
@ -126,17 +122,9 @@ _fill_zone_config(E_Zone *zone,
|
||||||
list = e_widget_list_add(evas, false, true);
|
list = e_widget_list_add(evas, false, true);
|
||||||
|
|
||||||
LIST_ADD(list, e_widget_label_add(evas, desk->name));
|
LIST_ADD(list, e_widget_label_add(evas, desk->name));
|
||||||
slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"),
|
slider = e_widget_check_add(evas, "", &vd->nb_stacks);
|
||||||
0.0, 8.0, 1.0, 0, NULL,
|
|
||||||
&vd->nb_stacks, 150);
|
|
||||||
LIST_ADD(list, slider);
|
LIST_ADD(list, slider);
|
||||||
|
|
||||||
rg = e_widget_radio_group_new(&vd->use_rows);
|
|
||||||
radio = e_widget_radio_add(evas, _("columns"), 0, rg);
|
|
||||||
LIST_ADD(list, radio);
|
|
||||||
radio = e_widget_radio_add(evas, _("rows"), 1, rg);
|
|
||||||
LIST_ADD(list, radio);
|
|
||||||
|
|
||||||
LIST_ADD(cfdata->o_desklist, list);
|
LIST_ADD(cfdata->o_desklist, list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -185,19 +173,13 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__,
|
||||||
e_widget_check_add(evas, _("Show window titles"),
|
e_widget_check_add(evas, _("Show window titles"),
|
||||||
&cfdata->config.show_titles));
|
&cfdata->config.show_titles));
|
||||||
oc = e_widget_list_add(evas, false, true);
|
oc = e_widget_list_add(evas, false, true);
|
||||||
e_widget_list_object_append(oc,
|
|
||||||
e_widget_label_add(evas, _("Key hints")), 1, 0, 0.5);
|
|
||||||
e_widget_list_object_append(oc,
|
|
||||||
e_widget_entry_add(evas, &cfdata->config.keyhints, NULL, NULL, NULL),
|
|
||||||
1, 1, 0.5);
|
|
||||||
e_widget_framelist_object_append(of, oc);
|
e_widget_framelist_object_append(of, oc);
|
||||||
|
|
||||||
LIST_ADD(o, of);
|
LIST_ADD(o, of);
|
||||||
|
|
||||||
/* Virtual desktop settings */
|
/* Virtual desktop settings */
|
||||||
of = e_widget_label_add(evas,
|
of = e_widget_label_add(evas,
|
||||||
_("Number of columns/rows used to tile per desk"
|
_("Enable/disable tiling per desktop."));
|
||||||
" (0 → tiling disabled):"));
|
|
||||||
LIST_ADD(o, of);
|
LIST_ADD(o, of);
|
||||||
of = e_widget_framelist_add(evas, _("Virtual Desktops"), 0);
|
of = e_widget_framelist_add(evas, _("Virtual Desktops"), 0);
|
||||||
cfdata->osf = e_widget_list_add(evas, 0, 1);
|
cfdata->osf = e_widget_list_add(evas, 0, 1);
|
||||||
|
@ -240,27 +222,6 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
|
||||||
|
|
||||||
tiling_g.config->tile_dialogs = cfdata->config.tile_dialogs;
|
tiling_g.config->tile_dialogs = cfdata->config.tile_dialogs;
|
||||||
tiling_g.config->show_titles = cfdata->config.show_titles;
|
tiling_g.config->show_titles = cfdata->config.show_titles;
|
||||||
if (strcmp(tiling_g.config->keyhints, cfdata->config.keyhints)) {
|
|
||||||
free(tiling_g.config->keyhints);
|
|
||||||
if (!cfdata->config.keyhints || !*cfdata->config.keyhints) {
|
|
||||||
tiling_g.config->keyhints = strdup(tiling_g.default_keyhints);
|
|
||||||
} else {
|
|
||||||
char *c = cfdata->config.keyhints;
|
|
||||||
int len = strlen(cfdata->config.keyhints);
|
|
||||||
|
|
||||||
/* Remove duplicates */
|
|
||||||
while (*c) {
|
|
||||||
char *f = c + 1;
|
|
||||||
|
|
||||||
while ((f = strchr(f, *c))) {
|
|
||||||
*f = cfdata->config.keyhints[--len];
|
|
||||||
cfdata->config.keyhints[len] = '\0';
|
|
||||||
}
|
|
||||||
c++;
|
|
||||||
}
|
|
||||||
tiling_g.config->keyhints = strdup(cfdata->config.keyhints);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check if the layout for one of the vdesks has changed */
|
/* Check if the layout for one of the vdesks has changed */
|
||||||
for (l = tiling_g.config->vdesks; l; l = l->next) {
|
for (l = tiling_g.config->vdesks; l; l = l->next) {
|
||||||
|
|
|
@ -56,7 +56,6 @@ struct tiling_g tiling_g = {
|
||||||
.module = NULL,
|
.module = NULL,
|
||||||
.config = NULL,
|
.config = NULL,
|
||||||
.log_domain = -1,
|
.log_domain = -1,
|
||||||
.default_keyhints = "asdfg;lkjh",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -989,7 +988,6 @@ e_modapi_init(E_Module *m)
|
||||||
struct _Config_vdesk);
|
struct _Config_vdesk);
|
||||||
E_CONFIG_VAL(_G.config_edd, Config, tile_dialogs, INT);
|
E_CONFIG_VAL(_G.config_edd, Config, tile_dialogs, INT);
|
||||||
E_CONFIG_VAL(_G.config_edd, Config, show_titles, INT);
|
E_CONFIG_VAL(_G.config_edd, Config, show_titles, INT);
|
||||||
E_CONFIG_VAL(_G.config_edd, Config, keyhints, STR);
|
|
||||||
|
|
||||||
E_CONFIG_LIST(_G.config_edd, Config, vdesks, _G.vdesk_edd);
|
E_CONFIG_LIST(_G.config_edd, Config, vdesks, _G.vdesk_edd);
|
||||||
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, x, INT);
|
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, x, INT);
|
||||||
|
@ -1004,10 +1002,6 @@ e_modapi_init(E_Module *m)
|
||||||
tiling_g.config->tile_dialogs = 1;
|
tiling_g.config->tile_dialogs = 1;
|
||||||
tiling_g.config->show_titles = 1;
|
tiling_g.config->show_titles = 1;
|
||||||
}
|
}
|
||||||
if (!tiling_g.config->keyhints)
|
|
||||||
tiling_g.config->keyhints = strdup(tiling_g.default_keyhints);
|
|
||||||
else
|
|
||||||
tiling_g.config->keyhints = strdup(tiling_g.config->keyhints);
|
|
||||||
|
|
||||||
E_CONFIG_LIMIT(tiling_g.config->tile_dialogs, 0, 1);
|
E_CONFIG_LIMIT(tiling_g.config->tile_dialogs, 0, 1);
|
||||||
E_CONFIG_LIMIT(tiling_g.config->show_titles, 0, 1);
|
E_CONFIG_LIMIT(tiling_g.config->show_titles, 0, 1);
|
||||||
|
@ -1117,7 +1111,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
e_configure_registry_item_del("windows/tiling");
|
e_configure_registry_item_del("windows/tiling");
|
||||||
e_configure_registry_category_del("windows");
|
e_configure_registry_category_del("windows");
|
||||||
|
|
||||||
free(tiling_g.config->keyhints);
|
|
||||||
E_FREE(tiling_g.config);
|
E_FREE(tiling_g.config);
|
||||||
E_CONFIG_DD_FREE(_G.config_edd);
|
E_CONFIG_DD_FREE(_G.config_edd);
|
||||||
E_CONFIG_DD_FREE(_G.vdesk_edd);
|
E_CONFIG_DD_FREE(_G.vdesk_edd);
|
||||||
|
|
|
@ -17,7 +17,6 @@ struct tiling_g
|
||||||
E_Module *module;
|
E_Module *module;
|
||||||
Config *config;
|
Config *config;
|
||||||
int log_domain;
|
int log_domain;
|
||||||
const char *default_keyhints;
|
|
||||||
};
|
};
|
||||||
extern struct tiling_g tiling_g;
|
extern struct tiling_g tiling_g;
|
||||||
|
|
||||||
|
@ -40,7 +39,6 @@ struct _Config
|
||||||
{
|
{
|
||||||
int tile_dialogs;
|
int tile_dialogs;
|
||||||
int show_titles;
|
int show_titles;
|
||||||
char *keyhints;
|
|
||||||
Eina_List *vdesks;
|
Eina_List *vdesks;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue