Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h arrange.c desktops.c dialog.c ewin-ops.c ewins.c fx.c
menus.c mod-misc.c settings.c slideout.c startup.c
Log Message:
Fix dialog layout bug. Shuffle some dialog contents around.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -3 -r1.497 -r1.498
--- E.h 6 Oct 2005 21:57:17 -0000 1.497
+++ E.h 9 Oct 2005 18:01:25 -0000 1.498
@@ -535,6 +535,10 @@
char manual;
char manual_mouse_pointer;
char slidein;
+ char cleanupslide;
+ int slidemode;
+ int slidespeedmap;
+ int slidespeedcleanup;
char ignore_struts;
char raise_fullscreen;
} place;
@@ -592,10 +596,6 @@
int icon_mode;
} warplist;
int deskmode;
- int slidemode;
- char cleanupslide;
- int slidespeedmap;
- int slidespeedcleanup;
char animate_shading;
int shadespeed;
int button_move_resistance;
@@ -1452,7 +1452,6 @@
void SettingsArea(void);
void SettingsPlacement(void);
void SettingsAutoRaise(void);
-void SettingsSpecialFX(void);
void SettingsMiscellaneous(void);
void SettingsComposite(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/arrange.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- arrange.c 4 Sep 2005 07:27:17 -0000 1.81
+++ arrange.c 9 Oct 2005 18:01:27 -0000 1.82
@@ -971,8 +971,8 @@
type = params;
method = ARRANGE_BY_SIZE;
- speed = Conf.slidespeedcleanup;
- doslide = Conf.cleanupslide;
+ speed = Conf.place.slidespeedcleanup;
+ doslide = Conf.place.cleanupslide;
if (params)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- desktops.c 25 Sep 2005 00:50:52 -0000 1.183
+++ desktops.c 9 Oct 2005 18:01:27 -0000 1.184
@@ -1761,6 +1761,8 @@
static int tmp_desktops;
static DItem *tmp_desk_text;
static Dialog *tmp_desk_dialog;
+static char tmp_desktop_slide;
+static int tmp_desktop_slide_speed;
static char tmp_desktop_wraparound;
static char tmp_dragbar;
static int tmp_dragdir;
@@ -1771,6 +1773,8 @@
if (val < 2)
{
ChangeNumberOfDesktops(tmp_desktops);
+ Conf.desks.slidein = tmp_desktop_slide;
+ Conf.desks.slidespeed = tmp_desktop_slide_speed;
Conf.desks.desks_wraparound = tmp_desktop_wraparound;
if ((Conf.desks.dragdir != tmp_dragdir) ||
@@ -1892,6 +1896,8 @@
SoundPlay("SOUND_SETTINGS_DESKTOPS");
tmp_desktops = Conf.desks.num;
+ tmp_desktop_slide = Conf.desks.slidein;
+ tmp_desktop_slide_speed = Conf.desks.slidespeed;
tmp_desktop_wraparound = Conf.desks.desks_wraparound;
if (Conf.desks.dragbar_width < 1)
tmp_dragbar = 0;
@@ -1948,7 +1954,6 @@
DialogItemSliderSetUnits(di, 1);
DialogItemSliderSetJump(di, 1);
DialogItemSetColSpan(di, 2);
- DialogItemSliderSetVal(di, tmp_desktops);
DialogItemSliderSetValPtr(di, &tmp_desktops);
di = area = DialogAddItem(table, DITEM_AREA);
@@ -1968,14 +1973,42 @@
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Slide desktops around when changing"));
+ DialogItemCheckButtonSetPtr(di, &tmp_desktop_slide);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetAlign(di, 1024, 512);
+ DialogItemSetText(di, _("Desktop Slide speed:\n"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSliderSetBounds(di, 0, 20000);
+ DialogItemSliderSetUnits(di, 500);
+ DialogItemSliderSetJump(di, 1000);
+ DialogItemSliderSetValPtr(di, &tmp_desktop_slide_speed);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Wrap desktops around"));
- DialogItemCheckButtonSetState(di, tmp_desktop_wraparound);
DialogItemCheckButtonSetPtr(di, &tmp_desktop_wraparound);
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSeparatorSetOrientation(di, 0);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -1983,7 +2016,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Display desktop dragbar"));
- DialogItemCheckButtonSetState(di, tmp_dragbar);
DialogItemCheckButtonSetPtr(di, &tmp_dragbar);
di = DialogAddItem(table, DITEM_TEXT);
@@ -2209,7 +2241,6 @@
DialogItemSliderSetBounds(di, 1, 8);
DialogItemSliderSetUnits(di, 1);
DialogItemSliderSetJump(di, 1);
- DialogItemSliderSetVal(di, tmp_area_x);
DialogItemSliderSetValPtr(di, &tmp_area_x);
di = slider2 = DialogAddItem(table2, DITEM_SLIDER);
@@ -2220,7 +2251,6 @@
DialogItemSliderSetBounds(di, 1, 8);
DialogItemSliderSetUnits(di, 1);
DialogItemSliderSetJump(di, 1);
- DialogItemSliderSetVal(di, tmp_area_y);
DialogItemSliderSetValPtr(di, &tmp_area_y);
di = area = DialogAddItem(table2, DITEM_AREA);
@@ -2240,14 +2270,12 @@
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Wrap virtual desktops around"));
- DialogItemCheckButtonSetState(di, tmp_area_wraparound);
DialogItemCheckButtonSetPtr(di, &tmp_area_wraparound);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Enable edge flip"));
- DialogItemCheckButtonSetState(di, tmp_edge_flip);
DialogItemCheckButtonSetPtr(di, &tmp_edge_flip);
di = DialogAddItem(table, DITEM_TEXT);
@@ -2262,7 +2290,6 @@
DialogItemSliderSetBounds(di, 1, 100);
DialogItemSliderSetUnits(di, 1);
DialogItemSliderSetJump(di, 10);
- DialogItemSliderSetVal(di, tmp_edge_resist);
DialogItemSliderSetValPtr(di, &tmp_edge_resist);
di = DialogAddItem(table, DITEM_SEPARATOR);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- dialog.c 26 Sep 2005 17:32:09 -0000 1.129
+++ dialog.c 9 Oct 2005 18:01:29 -0000 1.130
@@ -1166,15 +1166,17 @@
rows = 1;
if ((cols > 0) && (rows > 0))
{
- int i, *col_size, *row_size = NULL, r = 0, c =
- 0, x = 0, y = 0;
+ int i, r, c, x, y;
+ int *col_size, *row_size;
col_size = Emalloc(sizeof(int) * cols);
- row_size = Erealloc(row_size, sizeof(int));
+ row_size = Emalloc(sizeof(int) * rows);
row_size[0] = 0;
for (i = 0; i < cols; i++)
col_size[i] = 0;
+
+ r = c = 0;
for (i = 0; i < di->item.table.num_items; i++)
{
DItem *dii;
@@ -1186,7 +1188,11 @@
for (j = 0; j < dii->col_span; j++)
csum += col_size[c + j];
if (w > csum)
- col_size[c + di->col_span - 1] += (w - csum);
+ {
+ for (j = 0; j < dii->col_span; j++)
+ col_size[c + j] =
+ (w + dii->col_span - 1) / dii->col_span;
+ }
if (h > row_size[r])
row_size[r] = h;
c += dii->col_span;
@@ -1224,16 +1230,17 @@
for (i = 0; i < rows; i++)
row_size[i] = max;
}
- iw = 0;
- ih = 0;
+
+ iw = ih = 0;
for (i = 0; i < cols; i++)
iw += col_size[i];
for (i = 0; i < rows; i++)
ih += row_size[i];
di->w = iw;
di->h = ih;
- r = 0;
- c = 0;
+
+ x = y = 0;
+ r = c = 0;
for (i = 0; i < di->item.table.num_items; i++)
{
DItem *dii;
@@ -1798,6 +1805,13 @@
}
void
+DialogItemSliderSetValPtr(DItem * di, int *val_ptr)
+{
+ di->item.slider.val_ptr = val_ptr;
+ DialogItemSliderSetVal(di, *val_ptr);
+}
+
+void
DialogItemSliderSetBounds(DItem * di, int lower, int upper)
{
if (lower < upper)
@@ -1833,12 +1847,6 @@
}
void
-DialogItemSliderSetValPtr(DItem * di, int *val_ptr)
-{
- di->item.slider.val_ptr = val_ptr;
-}
-
-void
DialogItemSliderSetOrientation(DItem * di, char horizontal)
{
di->item.slider.horizontal = horizontal;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ewin-ops.c 6 Oct 2005 16:53:01 -0000 1.67
+++ ewin-ops.c 9 Oct 2005 18:01:30 -0000 1.68
@@ -110,7 +110,7 @@
FocusEnable(0);
SoundPlay("SOUND_WINDOW_SLIDE");
- if (Conf.slidemode > 0)
+ if (Conf.place.slidemode > 0)
EGrabServer();
tmpx = abs(tx - fx) + abs(ty - fy);
@@ -124,10 +124,10 @@
y = ((fy * (1024 - k)) + (ty * k)) >> 10;
tmpx = x;
tmpy = y;
- if (Conf.slidemode == 0)
+ if (Conf.place.slidemode == 0)
EoMove(ewin, tmpx, tmpy);
else
- DrawEwinShape(ewin, Conf.slidemode, tmpx, tmpy,
+ DrawEwinShape(ewin, Conf.place.slidemode, tmpx, tmpy,
ewin->client.w, ewin->client.h, firstlast);
if (firstlast == 0)
firstlast = 1;
@@ -139,13 +139,13 @@
Mode.place.doing_slide = 0;
FocusEnable(1);
- if (Conf.slidemode == 0)
+ if (Conf.place.slidemode == 0)
EwinMove(ewin, tx, ty);
else
- DrawEwinShape(ewin, Conf.slidemode, tx, ty,
+ DrawEwinShape(ewin, Conf.place.slidemode, tx, ty,
ewin->client.w, ewin->client.h, 2);
- if (Conf.slidemode > 0)
+ if (Conf.place.slidemode > 0)
EUngrabServer();
SoundPlay("SOUND_WINDOW_SLIDE_END");
@@ -171,7 +171,7 @@
FocusEnable(0);
SoundPlay("SOUND_WINDOW_SLIDE");
- if (Conf.slidemode > 0)
+ if (Conf.place.slidemode > 0)
EGrabServer();
ETimedLoopInit(0, 1024, speed);
@@ -212,7 +212,7 @@
Mode.place.doing_slide = 0;
FocusEnable(1);
- if (Conf.slidemode > 0)
+ if (Conf.place.slidemode > 0)
EUngrabServer();
SoundPlay("SOUND_WINDOW_SLIDE_END");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- ewins.c 25 Sep 2005 13:08:09 -0000 1.109
+++ ewins.c 9 Oct 2005 18:01:30 -0000 1.110
@@ -1451,7 +1451,7 @@
goto done;
SlideEwinTo(ewin, EoGetX(ewin), EoGetY(ewin), ewin->req_x, ewin->req_y,
- Conf.slidespeedmap);
+ Conf.place.slidespeedmap);
done:
Mode.place.doing_slide = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- fx.c 4 Sep 2005 07:27:19 -0000 1.53
+++ fx.c 9 Oct 2005 18:01:30 -0000 1.54
@@ -966,8 +966,7 @@
Dialog *d;
DItem *table, *di;
- if ((d =
- FindItem("CONFIGURE_EFFECTS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
+ if ((d = FindItem("CONFIGURE_FX", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{
SoundPlay("SOUND_SETTINGS_ACTIVE");
ShowDialog(d);
@@ -979,8 +978,8 @@
tmp_effect_ripples = FX_IsOn("ripples");
tmp_effect_waves = FX_IsOn("waves");
- d = DialogCreate("CONFIGURE_EFFECTS");
- DialogSetTitle(d, _("Miscellaneous Effects Settings"));
+ d = DialogCreate("CONFIGURE_FX");
+ DialogSetTitle(d, _("Special FX Settings"));
table = DialogInitItem(d);
DialogItemTableSetOptions(table, 1, 0, 0, 0);
@@ -995,7 +994,7 @@
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di,
- _("Enlightenment Miscellaneous Effects\n"
+ _("Enlightenment Special Effects\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
@@ -1014,21 +1013,18 @@
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Enable Effect: Raindrops"));
- DialogItemCheckButtonSetState(di, tmp_effect_raindrops);
DialogItemCheckButtonSetPtr(di, &tmp_effect_raindrops);
#endif
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Ripples"));
- DialogItemCheckButtonSetState(di, tmp_effect_ripples);
DialogItemCheckButtonSetPtr(di, &tmp_effect_ripples);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Waves"));
- DialogItemCheckButtonSetState(di, tmp_effect_waves);
DialogItemCheckButtonSetPtr(di, &tmp_effect_waves);
di = DialogAddItem(table, DITEM_SEPARATOR);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -3 -r1.215 -r1.216
--- menus.c 26 Sep 2005 17:32:09 -0000 1.215
+++ menus.c 9 Oct 2005 18:01:30 -0000 1.216
@@ -1961,6 +1961,106 @@
}
}
+/*
+ * Configuration dialog
+ */
+
+static char tmp_warpmenus;
+static char tmp_animated_menus;
+static char tmp_menusonscreen;
+
+static void
+CB_ConfigureMenus(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
+{
+ if (val < 2)
+ {
+ Conf.menus.warp = tmp_warpmenus;
+ Conf.menus.animate = tmp_animated_menus;
+ Conf.menus.onscreen = tmp_menusonscreen;
+ }
+ autosave();
+}
+
+static void
+MenusSettings(void)
+{
+ Dialog *d;
+ DItem *table, *di;
+
+ if ((d = FindItem("CONFIGURE_MENUS", 0, LIST_FINDBY_NAME,
LIST_TYPE_DIALOG)))
+ {
+ SoundPlay("SOUND_SETTINGS_ACTIVE");
+ ShowDialog(d);
+ return;
+ }
+ SoundPlay("SOUND_SETTINGS_MENUS");
+
+ tmp_warpmenus = Conf.menus.warp;
+ tmp_animated_menus = Conf.menus.animate;
+ tmp_menusonscreen = Conf.menus.onscreen;
+
+ d = DialogCreate("CONFIGURE_MENUS");
+ DialogSetTitle(d, _("Menu Settings"));
+
+ table = DialogInitItem(d);
+ DialogItemTableSetOptions(table, 3, 0, 0, 0);
+
+ if (Conf.dialogs.headers)
+ {
+ di = DialogAddItem(table, DITEM_IMAGE);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemImageSetFile(di, "pix/place.png");
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Enlightenment Menu\n" "Settings Dialog\n"));
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 3);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSeparatorSetOrientation(di, 0);
+ }
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 3);
+ DialogItemSetText(di, _("Animated display of menus"));
+ DialogItemCheckButtonSetPtr(di, &tmp_animated_menus);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 3);
+ DialogItemSetText(di, _("Always pop up menus on screen"));
+ DialogItemCheckButtonSetPtr(di, &tmp_menusonscreen);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 3);
+ DialogItemSetText(di, _("Warp pointer after moving menus"));
+ DialogItemCheckButtonSetPtr(di, &tmp_warpmenus);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 3);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ DialogAddButton(d, _("OK"), CB_ConfigureMenus, 1, DIALOG_BUTTON_OK);
+ DialogAddButton(d, _("Apply"), CB_ConfigureMenus, 0, DIALOG_BUTTON_APPLY);
+ DialogAddButton(d, _("Close"), CB_ConfigureMenus, 1, DIALOG_BUTTON_CLOSE);
+ DialogSetExitFunction(d, CB_ConfigureMenus, 2);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", CB_ConfigureMenus, 0);
+
+ ShowDialog(d);
+}
+
static void
MenusIpc(const char *params, Client * c __UNUSED__)
{
@@ -1981,6 +2081,10 @@
{
IpcPrintf("Menus - active=%d\n", MenusActive());
}
+ else if (!strncmp(cmd, "cfg", 2))
+ {
+ MenusSettings();
+ }
else if (!strncmp(cmd, "list", 2))
{
Menu **lst;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-misc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- mod-misc.c 23 Sep 2005 16:12:13 -0000 1.21
+++ mod-misc.c 9 Oct 2005 18:01:30 -0000 1.22
@@ -124,6 +124,10 @@
CFG_ITEM_BOOL(Conf, place.manual, 0),
CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer, 0),
CFG_ITEM_BOOL(Conf, place.slidein, 0),
+ CFG_ITEM_BOOL(Conf, place.cleanupslide, 1),
+ CFG_ITEM_INT(Conf, place.slidemode, 0),
+ CFG_ITEM_INT(Conf, place.slidespeedmap, 6000),
+ CFG_ITEM_INT(Conf, place.slidespeedcleanup, 8000),
CFG_ITEM_BOOL(Conf, place.ignore_struts, 0),
CFG_ITEM_BOOL(Conf, place.raise_fullscreen, 0),
@@ -142,10 +146,6 @@
CFG_ITEM_BOOL(Conf, startup.animate, 1),
CFG_ITEM_INT(Conf, deskmode, MODE_NONE),
- CFG_ITEM_INT(Conf, slidemode, 0),
- CFG_ITEM_BOOL(Conf, cleanupslide, 1),
- CFG_ITEM_INT(Conf, slidespeedmap, 6000),
- CFG_ITEM_INT(Conf, slidespeedcleanup, 8000),
CFG_ITEM_BOOL(Conf, animate_shading, 1),
CFG_ITEM_INT(Conf, shadespeed, 8000),
CFG_ITEM_INT(Conf, button_move_resistance, 5),
@@ -190,8 +190,6 @@
{
if (!strncmp(prm, "autoraise", 2))
SettingsAutoRaise();
- else if (!strncmp(prm, "fx", 2))
- SettingsSpecialFX();
else if (!strncmp(prm, "misc", 2))
SettingsMiscellaneous();
else if (!strncmp(prm, "moveresize", 2))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- settings.c 6 Oct 2005 21:11:16 -0000 1.141
+++ settings.c 9 Oct 2005 18:01:30 -0000 1.142
@@ -237,7 +237,6 @@
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetText(di, _("Update window while moving"));
- DialogItemCheckButtonSetState(di, tmp_update_while_moving);
DialogItemCheckButtonSetPtr(di, &tmp_update_while_moving);
di = DialogAddItem(table, DITEM_SEPARATOR);
@@ -261,6 +260,13 @@
static char tmp_switch_popup;
static char tmp_manual_placement;
static char tmp_manual_placement_mouse_pointer;
+static char tmp_map_slide;
+static char tmp_cleanup_slide;
+static int tmp_slide_mode;
+static int tmp_map_slide_speed;
+static int tmp_cleanup_slide_speed;
+static char tmp_animate_shading;
+static int tmp_shade_speed;
static char tmp_place_ignore_struts;
static char tmp_raise_fullscreen;
@@ -275,8 +281,19 @@
{
Conf.focus.transientsfollowleader = tmp_with_leader;
Conf.focus.switchfortransientmap = tmp_switch_popup;
+
Conf.place.manual = tmp_manual_placement;
Conf.place.manual_mouse_pointer = tmp_manual_placement_mouse_pointer;
+
+ Conf.place.slidein = tmp_map_slide;
+ Conf.place.cleanupslide = tmp_cleanup_slide;
+ Conf.place.slidemode = tmp_slide_mode;
+ Conf.place.slidespeedmap = tmp_map_slide_speed;
+ Conf.place.slidespeedcleanup = tmp_cleanup_slide_speed;
+
+ Conf.animate_shading = tmp_animate_shading;
+ Conf.shadespeed = tmp_shade_speed;
+
Conf.place.ignore_struts = tmp_place_ignore_struts;
Conf.place.raise_fullscreen = tmp_raise_fullscreen;
#ifdef HAS_XINERAMA
@@ -291,7 +308,7 @@
SettingsPlacement(void)
{
Dialog *d;
- DItem *table, *di;
+ DItem *table, *di, *radio;
if ((d =
FindItem("CONFIGURE_PLACEMENT", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
@@ -304,10 +321,22 @@
tmp_with_leader = Conf.focus.transientsfollowleader;
tmp_switch_popup = Conf.focus.switchfortransientmap;
+
tmp_manual_placement = Conf.place.manual;
tmp_manual_placement_mouse_pointer = Conf.place.manual_mouse_pointer;
+
+ tmp_map_slide = Conf.place.slidein;
+ tmp_cleanup_slide = Conf.place.cleanupslide;
+ tmp_slide_mode = Conf.place.slidemode;
+ tmp_map_slide_speed = Conf.place.slidespeedmap;
+ tmp_cleanup_slide_speed = Conf.place.slidespeedcleanup;
+
+ tmp_animate_shading = Conf.animate_shading;
+ tmp_shade_speed = Conf.shadespeed;
+
tmp_place_ignore_struts = Conf.place.ignore_struts;
tmp_raise_fullscreen = Conf.place.raise_fullscreen;
+
#ifdef HAS_XINERAMA
tmp_extra_head = Conf.extra_head;
#endif
@@ -316,7 +345,7 @@
DialogSetTitle(d, _("Window Placement Settings"));
table = DialogInitItem(d);
- DialogItemTableSetOptions(table, 2, 0, 0, 0);
+ DialogItemTableSetOptions(table, 2, 0, 1, 0);
if (Conf.dialogs.headers)
{
@@ -332,9 +361,9 @@
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSeparatorSetOrientation(di, 0);
}
@@ -343,7 +372,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Dialog windows appear together with their owner"));
- DialogItemCheckButtonSetState(di, tmp_with_leader);
DialogItemCheckButtonSetPtr(di, &tmp_with_leader);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -351,15 +379,19 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Switch to desktop where dialog appears"));
- DialogItemCheckButtonSetState(di, tmp_switch_popup);
DialogItemCheckButtonSetPtr(di, &tmp_switch_popup);
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSeparatorSetOrientation(di, 0);
+
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Place windows manually"));
- DialogItemCheckButtonSetState(di, tmp_manual_placement);
DialogItemCheckButtonSetPtr(di, &tmp_manual_placement);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -367,15 +399,132 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Place windows under mouse"));
- DialogItemCheckButtonSetState(di, tmp_manual_placement_mouse_pointer);
DialogItemCheckButtonSetPtr(di, &tmp_manual_placement_mouse_pointer);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Slide windows in when they appear"));
+ DialogItemCheckButtonSetPtr(di, &tmp_map_slide);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Slide windows around when cleaning up"));
+ DialogItemCheckButtonSetPtr(di, &tmp_cleanup_slide);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Slide Method:"));
+
+ radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetText(di, _("Opaque"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 0);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetText(di, _("Technical"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 1);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetText(di, _("Box"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 2);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetText(di, _("Shaded"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 3);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetText(di, _("Semi-Solid"));
+ DialogItemRadioButtonSetFirst(di, radio);
+ DialogItemRadioButtonGroupSetVal(di, 4);
+ DialogItemRadioButtonGroupSetValPtr(radio, &tmp_slide_mode);
+
+ di = DialogAddItem(table, DITEM_NONE);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 1024, 512);
+ DialogItemSetText(di, _("Appear Slide speed:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSliderSetBounds(di, 0, 20000);
+ DialogItemSliderSetUnits(di, 500);
+ DialogItemSliderSetJump(di, 1000);
+ DialogItemSliderSetValPtr(di, &tmp_map_slide_speed);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 1024, 512);
+ DialogItemSetText(di, _("Cleanup Slide speed:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSliderSetBounds(di, 0, 20000);
+ DialogItemSliderSetUnits(di, 500);
+ DialogItemSliderSetJump(di, 1000);
+ DialogItemSliderSetValPtr(di, &tmp_cleanup_slide_speed);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Animate shading and unshading of windows"));
+ DialogItemCheckButtonSetPtr(di, &tmp_animate_shading);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 1024, 512);
+ DialogItemSetText(di, _("Window Shading speed:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSliderSetBounds(di, 0, 20000);
+ DialogItemSliderSetUnits(di, 500);
+ DialogItemSliderSetJump(di, 1000);
+ DialogItemSliderSetValPtr(di, &tmp_shade_speed);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSeparatorSetOrientation(di, 0);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Ignore struts"));
- DialogItemCheckButtonSetState(di, tmp_place_ignore_struts);
DialogItemCheckButtonSetPtr(di, &tmp_place_ignore_struts);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -383,7 +532,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Raise fullscreen windows"));
- DialogItemCheckButtonSetState(di, tmp_raise_fullscreen);
DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
#ifdef HAS_XINERAMA
@@ -394,15 +542,14 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Place windows on another head when full"));
- DialogItemCheckButtonSetState(di, tmp_extra_head);
DialogItemCheckButtonSetPtr(di, &tmp_extra_head);
}
#endif
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigurePlacement, 1, DIALOG_BUTTON_OK);
@@ -479,7 +626,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Raise Windows Automatically"));
- DialogItemCheckButtonSetState(di, tmp_autoraise);
DialogItemCheckButtonSetPtr(di, &tmp_autoraise);
di = DialogAddItem(table, DITEM_TEXT);
@@ -494,7 +640,6 @@
DialogItemSliderSetBounds(di, 0, 300);
DialogItemSliderSetUnits(di, 10);
DialogItemSliderSetJump(di, 25);
- DialogItemSliderSetVal(di, tmp_autoraisetime);
DialogItemSliderSetValPtr(di, &tmp_autoraisetime);
di = DialogAddItem(table, DITEM_SEPARATOR);
@@ -518,6 +663,8 @@
static char tmp_logout_dialog;
static char tmp_reboot_halt;
static char tmp_button_image;
+static char tmp_animate_startup;
+static char tmp_saveunders;
static void
CB_ConfigureMiscellaneous(Dialog * d __UNUSED__, int val, void *data
__UNUSED__)
@@ -528,6 +675,8 @@
Conf.session.enable_logout_dialog = tmp_logout_dialog;
Conf.session.enable_reboot_halt = tmp_reboot_halt;
Conf.dialogs.button_image = tmp_button_image;
+ Conf.startup.animate = tmp_animate_startup;
+ Conf.save_under = tmp_saveunders;
}
autosave();
}
@@ -551,6 +700,8 @@
tmp_logout_dialog = Conf.session.enable_logout_dialog;
tmp_reboot_halt = Conf.session.enable_reboot_halt;
tmp_button_image = Conf.dialogs.button_image;
+ tmp_animate_startup = Conf.startup.animate;
+ tmp_saveunders = Conf.save_under;
d = DialogCreate("CONFIGURE_MISCELLANEOUS");
DialogSetTitle(d, _("Miscellaneous Settings"));
@@ -583,7 +734,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Dialog Headers"));
- DialogItemCheckButtonSetState(di, tmp_dialog_headers);
DialogItemCheckButtonSetPtr(di, &tmp_dialog_headers);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -591,7 +741,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Button Images"));
- DialogItemCheckButtonSetState(di, tmp_button_image);
DialogItemCheckButtonSetPtr(di, &tmp_button_image);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -599,7 +748,6 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Logout Dialog"));
- DialogItemCheckButtonSetState(di, tmp_logout_dialog);
DialogItemCheckButtonSetPtr(di, &tmp_logout_dialog);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
@@ -607,338 +755,48 @@
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Reboot/Halt on Logout"));
- DialogItemCheckButtonSetState(di, tmp_reboot_halt);
DialogItemCheckButtonSetPtr(di, &tmp_reboot_halt);
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
DialogItemSeparatorSetOrientation(di, 0);
- DialogAddButton(d, _("OK"), CB_ConfigureMiscellaneous, 1, DIALOG_BUTTON_OK);
- DialogAddButton(d, _("Apply"), CB_ConfigureMiscellaneous, 0,
- DIALOG_BUTTON_APPLY);
- DialogAddButton(d, _("Close"), CB_ConfigureMiscellaneous, 1,
- DIALOG_BUTTON_CLOSE);
- DialogSetExitFunction(d, CB_ConfigureMiscellaneous, 2);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
- DialogBindKey(d, "Return", CB_ConfigureMiscellaneous, 0);
- ShowDialog(d);
-}
-
-static char tmp_saveunders;
-static char tmp_warpmenus;
-static char tmp_animated_menus;
-static char tmp_menusonscreen;
-static char tmp_map_slide;
-static char tmp_cleanup_slide;
-static char tmp_desktop_slide;
-static char tmp_animate_shading;
-static int tmp_slide_mode;
-static int tmp_map_slide_speed;
-static int tmp_cleanup_slide_speed;
-static int tmp_desktop_slide_speed;
-static int tmp_shade_speed;
-
-static void
-CB_ConfigureFX(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
-{
- if (val < 2)
- {
- Conf.save_under = tmp_saveunders;
- Conf.menus.warp = tmp_warpmenus;
- Conf.menus.animate = tmp_animated_menus;
- Conf.menus.onscreen = tmp_menusonscreen;
- Conf.place.slidein = tmp_map_slide;
- Conf.cleanupslide = tmp_cleanup_slide;
- Conf.desks.slidein = tmp_desktop_slide;
- Conf.animate_shading = tmp_animate_shading;
- Conf.shadespeed = tmp_shade_speed;
- Conf.slidemode = tmp_slide_mode;
- Conf.slidespeedmap = tmp_map_slide_speed;
- Conf.slidespeedcleanup = tmp_cleanup_slide_speed;
- Conf.desks.slidespeed = tmp_desktop_slide_speed;
- }
- autosave();
-}
-
-void
-SettingsSpecialFX(void)
-{
- Dialog *d;
- DItem *table, *di, *radio;
-
- if ((d = FindItem("CONFIGURE_FX", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
- {
- SoundPlay("SOUND_SETTINGS_ACTIVE");
- ShowDialog(d);
- return;
- }
- SoundPlay("SOUND_SETTINGS_FX");
-
- tmp_saveunders = Conf.save_under;
- tmp_warpmenus = Conf.menus.warp;
- tmp_animated_menus = Conf.menus.animate;
- tmp_menusonscreen = Conf.menus.onscreen;
- tmp_map_slide = Conf.place.slidein;
- tmp_cleanup_slide = Conf.cleanupslide;
- tmp_desktop_slide = Conf.desks.slidein;
- tmp_animate_shading = Conf.animate_shading;
- tmp_slide_mode = Conf.slidemode;
- tmp_map_slide_speed = Conf.slidespeedmap;
- tmp_shade_speed = Conf.shadespeed;
- tmp_cleanup_slide_speed = Conf.slidespeedcleanup;
- tmp_desktop_slide_speed = Conf.desks.slidespeed;
-
- d = DialogCreate("CONFIGURE_FX");
- DialogSetTitle(d, _("Special FX Settings"));
-
- table = DialogInitItem(d);
- DialogItemTableSetOptions(table, 4, 0, 0, 0);
-
- if (Conf.dialogs.headers)
- {
- di = DialogAddItem(table, DITEM_IMAGE);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemImageSetFile(di, "pix/fx.png");
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di,
- _("Enlightenment Special Effects\n"
- "Settings Dialog\n"));
-
- di = DialogAddItem(table, DITEM_NONE);
-
- di = DialogAddItem(table, DITEM_NONE);
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 4);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
- }
-
- di = DialogAddItem(table, DITEM_NONE);
-
- di = DialogAddItem(table, DITEM_NONE);
-
- di = DialogAddItem(table, DITEM_NONE);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Slide Method:"));
-
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 3);
- DialogItemSetText(di, _("Slide desktops around when changing"));
- DialogItemCheckButtonSetState(di, tmp_desktop_slide);
- DialogItemCheckButtonSetPtr(di, &tmp_desktop_slide);
-
- radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Opaque"));
- DialogItemRadioButtonSetFirst(di, radio);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 3);
- DialogItemSetText(di, _("Slide windows around when cleaning up"));
- DialogItemCheckButtonSetState(di, tmp_cleanup_slide);
- DialogItemCheckButtonSetPtr(di, &tmp_cleanup_slide);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Technical"));
- DialogItemRadioButtonSetFirst(di, radio);
- DialogItemRadioButtonGroupSetVal(di, 1);
-
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 3);
- DialogItemSetText(di, _("Slide windows in when they appear"));
- DialogItemCheckButtonSetState(di, tmp_map_slide);
- DialogItemCheckButtonSetPtr(di, &tmp_map_slide);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Box"));
- DialogItemRadioButtonSetFirst(di, radio);
- DialogItemRadioButtonGroupSetVal(di, 2);
-
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 3);
- DialogItemSetText(di, _("Animated display of menus"));
- DialogItemCheckButtonSetState(di, tmp_animated_menus);
- DialogItemCheckButtonSetPtr(di, &tmp_animated_menus);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Shaded"));
- DialogItemRadioButtonSetFirst(di, radio);
- DialogItemRadioButtonGroupSetVal(di, 3);
-
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 3);
- DialogItemSetText(di, _("Always pop up menus on screen"));
- DialogItemCheckButtonSetState(di, tmp_menusonscreen);
- DialogItemCheckButtonSetPtr(di, &tmp_menusonscreen);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetText(di, _("Semi-Solid"));
- DialogItemRadioButtonSetFirst(di, radio);
- DialogItemRadioButtonGroupSetVal(di, 4);
- DialogItemRadioButtonGroupSetValPtr(radio, &tmp_slide_mode);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Enable sliding startup windows"));
+ DialogItemCheckButtonSetPtr(di, &tmp_animate_startup);
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 4);
- DialogItemSetText(di, _("Warp pointer after moving menus"));
- DialogItemCheckButtonSetState(di, tmp_warpmenus);
- DialogItemCheckButtonSetPtr(di, &tmp_warpmenus);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSeparatorSetOrientation(di, 0);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 4);
+ DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Use saveunders to reduce window exposures"));
- DialogItemCheckButtonSetState(di, tmp_saveunders);
DialogItemCheckButtonSetPtr(di, &tmp_saveunders);
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 4);
- DialogItemSetText(di, _("Animate shading and unshading of windows"));
- DialogItemCheckButtonSetState(di, tmp_animate_shading);
- DialogItemCheckButtonSetPtr(di, &tmp_animate_shading);
-
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 4);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 1024, 512);
- DialogItemSetText(di, _("Desktop Slide speed: (slow)\n"));
-
- di = DialogAddItem(table, DITEM_SLIDER);
- DialogItemSetColSpan(di, 2);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSliderSetBounds(di, 0, 20000);
- DialogItemSliderSetUnits(di, 500);
- DialogItemSliderSetJump(di, 1000);
- DialogItemSliderSetVal(di, tmp_desktop_slide_speed);
- DialogItemSliderSetValPtr(di, &tmp_desktop_slide_speed);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemSetText(di, _("(fast)\n"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 1024, 512);
- DialogItemSetText(di, _("Cleanup Slide speed: (slow)\n"));
-
- di = DialogAddItem(table, DITEM_SLIDER);
- DialogItemSetColSpan(di, 2);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSliderSetBounds(di, 0, 20000);
- DialogItemSliderSetUnits(di, 500);
- DialogItemSliderSetJump(di, 1000);
- DialogItemSliderSetVal(di, tmp_cleanup_slide_speed);
- DialogItemSliderSetValPtr(di, &tmp_cleanup_slide_speed);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemSetText(di, _("(fast)\n"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 1024, 512);
- DialogItemSetText(di, _("Appear Slide speed: (slow)\n"));
-
- di = DialogAddItem(table, DITEM_SLIDER);
- DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSliderSetBounds(di, 0, 20000);
- DialogItemSliderSetUnits(di, 500);
- DialogItemSliderSetJump(di, 1000);
- DialogItemSliderSetVal(di, tmp_map_slide_speed);
- DialogItemSliderSetValPtr(di, &tmp_map_slide_speed);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemSetText(di, _("(fast)\n"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 1024, 512);
- DialogItemSetText(di, _("Window Shading speed: (slow)\n"));
-
- di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 2);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSliderSetBounds(di, 0, 20000);
- DialogItemSliderSetUnits(di, 500);
- DialogItemSliderSetJump(di, 1000);
- DialogItemSliderSetVal(di, tmp_shade_speed);
- DialogItemSliderSetValPtr(di, &tmp_shade_speed);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 0, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemSetText(di, _("(fast)\n"));
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 4);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
- DialogAddButton(d, _("OK"), CB_ConfigureFX, 1, DIALOG_BUTTON_OK);
- DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0, DIALOG_BUTTON_APPLY);
- DialogAddButton(d, _("Close"), CB_ConfigureFX, 1, DIALOG_BUTTON_CLOSE);
- DialogSetExitFunction(d, CB_ConfigureFX, 2);
+ DialogAddButton(d, _("OK"), CB_ConfigureMiscellaneous, 1, DIALOG_BUTTON_OK);
+ DialogAddButton(d, _("Apply"), CB_ConfigureMiscellaneous, 0,
+ DIALOG_BUTTON_APPLY);
+ DialogAddButton(d, _("Close"), CB_ConfigureMiscellaneous, 1,
+ DIALOG_BUTTON_CLOSE);
+ DialogSetExitFunction(d, CB_ConfigureMiscellaneous, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
- DialogBindKey(d, "Return", CB_ConfigureFX, 0);
-
+ DialogBindKey(d, "Return", CB_ConfigureMiscellaneous, 0);
ShowDialog(d);
}
@@ -1074,7 +932,6 @@
DialogItemSliderSetBounds(di, 0, 300);
DialogItemSliderSetUnits(di, 10);
DialogItemSliderSetJump(di, 25);
- DialogItemSliderSetVal(di, tmp_tooltiptime);
DialogItemSliderSetValPtr(di, &tmp_tooltiptime);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- slideout.c 1 Oct 2005 20:44:47 -0000 1.44
+++ slideout.c 9 Oct 2005 18:01:30 -0000 1.45
@@ -180,7 +180,7 @@
ESync();
EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx + sw, yy, xx, yy, 1, sh, sw, sh,
- Conf.slidespeedmap);
+ Conf.place.slidespeedmap);
break;
case 1:
att.win_gravity = NorthWestGravity;
@@ -192,7 +192,7 @@
ESync();
EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy, xx, yy, 1, sh, sw, sh,
- Conf.slidespeedmap);
+ Conf.place.slidespeedmap);
break;
case 2:
att.win_gravity = SouthEastGravity;
@@ -204,7 +204,7 @@
ESync();
EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy + sh, xx, yy, sw, 1, sw, sh,
- Conf.slidespeedmap);
+ Conf.place.slidespeedmap);
break;
case 3:
att.win_gravity = NorthWestGravity;
@@ -216,7 +216,7 @@
ESync();
EoMap(s, 2);
EobjSlideSizeTo(EoObj(s), xx, yy, xx, yy, sw, 1, sw, sh,
- Conf.slidespeedmap);
+ Conf.place.slidespeedmap);
break;
default:
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- startup.c 26 Sep 2005 17:32:10 -0000 1.60
+++ startup.c 9 Oct 2005 18:01:30 -0000 1.61
@@ -126,7 +126,7 @@
fy = 0;
- ETimedLoopInit(0, 1024, Conf.slidespeedcleanup / 2);
+ ETimedLoopInit(0, 1024, Conf.desks.slidespeed / 2);
for (k = 0; k <= 1024;)
{
if (bg_sideways)
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
