Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h mod-misc.c settings.c size.c
Log Message:
Enable setting default maximise policy.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -3 -r1.595 -r1.596
--- E.h 12 Sep 2007 21:33:49 -0000 1.595
+++ E.h 22 Sep 2007 08:55:15 -0000 1.596
@@ -325,6 +325,7 @@
int mode_move;
int mode_resize;
int mode_info;
+ int mode_maximize_default;
unsigned int color;
char avoid_server_grab;
char update_while_moving;
===================================================================
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- mod-misc.c 23 Aug 2007 18:48:20 -0000 1.59
+++ mod-misc.c 22 Sep 2007 08:55:16 -0000 1.60
@@ -153,6 +153,7 @@
CFG_ITEM_INT(Conf, movres.mode_move, 0),
CFG_ITEM_INT(Conf, movres.mode_resize, 2),
CFG_ITEM_INT(Conf, movres.mode_info, 1),
+ CFG_ITEM_INT(Conf, movres.mode_maximize_default, 1),
CFG_ITEM_HEX(Conf, movres.color, 0x00ff0000),
CFG_ITEM_INT(Conf, movres.avoid_server_grab, 1),
CFG_ITEM_BOOL(Conf, movres.update_while_moving, 0),
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- settings.c 23 Aug 2007 18:48:20 -0000 1.169
+++ settings.c 22 Sep 2007 08:55:16 -0000 1.170
@@ -28,6 +28,7 @@
static int tmp_move;
static int tmp_resize;
static int tmp_geominfo;
+static int tmp_maximize;
static char tmp_avoid_server_grab;
static char tmp_update_while_moving;
static char tmp_sync_request;
@@ -40,6 +41,7 @@
Conf.movres.mode_move = tmp_move;
Conf.movres.mode_resize = tmp_resize;
Conf.movres.mode_info = tmp_geominfo;
+ Conf.movres.mode_maximize_default = tmp_maximize;
Conf.movres.avoid_server_grab = tmp_avoid_server_grab;
Conf.movres.update_while_moving = tmp_update_while_moving;
Conf.movres.enable_sync_request = tmp_sync_request;
@@ -50,11 +52,12 @@
static void
_DlgFillMoveResize(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
- DItem *di, *radio1, *radio2, *radio3;
+ DItem *di, *radio1, *radio2, *radio3, *radio4;
tmp_move = Conf.movres.mode_move;
tmp_resize = Conf.movres.mode_resize;
tmp_geominfo = Conf.movres.mode_info;
+ tmp_maximize = Conf.movres.mode_maximize_default;
tmp_avoid_server_grab = Conf.movres.avoid_server_grab;
tmp_update_while_moving = Conf.movres.update_while_moving;
tmp_sync_request = Conf.movres.enable_sync_request;
@@ -162,6 +165,34 @@
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 0);
DialogItemRadioButtonGroupSetValPtr(radio3, &tmp_geominfo);
+
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 0, 512);
+ DialogItemSetText(di, _("Default Resize Policy:"));
+
+ radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Conservative"));
+ DialogItemRadioButtonSetFirst(di, radio4);
+ DialogItemRadioButtonGroupSetVal(di, 2);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Available"));
+ DialogItemRadioButtonSetFirst(di, radio4);
+ DialogItemRadioButtonGroupSetVal(di, 1);
+
+ di = DialogAddItem(table, DITEM_RADIOBUTTON);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Absolute"));
+ DialogItemRadioButtonSetFirst(di, radio4);
+ DialogItemRadioButtonGroupSetVal(di, 0);
+ DialogItemRadioButtonGroupSetValPtr(radio4, &tmp_maximize);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
===================================================================
RCS file: /cvs/e/e16/e/src/size.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- size.c 17 Mar 2007 15:49:41 -0000 1.55
+++ size.c 22 Sep 2007 08:55:16 -0000 1.56
@@ -63,8 +63,8 @@
}
type = MAX_ABSOLUTE; /* Select default */
- if (!resize_type)
- ;
+ if (!resize_type || !resize_type[0])
+ type = Conf.movres.mode_maximize_default;
else if (!strcmp(resize_type, "absolute"))
type = MAX_ABSOLUTE;
else if (!strcmp(resize_type, "available"))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
