Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_border.c e_configure.c e_includes.h
e_int_border_menu.c
Added Files:
e_int_config_borders.c e_int_config_borders.h
Removed Files:
e_int_border_border.c e_int_border_border.h
Log Message:
Added border selection dialog (ie: winter square border) to allow selecting
default border from theme. Has fallback if border isn't present in new theme.
Removed old e_int_border_border files as this is all merged now into
e_int_config_borders.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- Makefile.am 12 Oct 2006 11:49:51 -0000 1.159
+++ Makefile.am 14 Oct 2006 09:43:12 -0000 1.160
@@ -109,7 +109,6 @@
e_ilist.h \
e_tlist.h \
e_livethumb.h \
-e_int_border_border.h \
e_widget_ilist.h \
e_widget_tlist.h \
e_widget_config_list.h \
@@ -174,7 +173,8 @@
e_int_config_transitions.h \
e_fwin.h \
e_widget_aspect.h \
-e_widget_desk_preview.h
+e_widget_desk_preview.h \
+e_int_config_borders.h
enlightenment_src = \
e_user.c \
@@ -258,7 +258,6 @@
e_ilist.c \
e_tlist.c \
e_livethumb.c \
-e_int_border_border.c \
e_widget_ilist.c \
e_widget_tlist.c \
e_widget_config_list.c \
@@ -325,6 +324,7 @@
e_fwin.c \
e_widget_aspect.c \
e_widget_desk_preview.c \
+e_int_config_borders.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -3 -r1.553 -r1.554
--- e_border.c 9 Oct 2006 15:18:53 -0000 1.553
+++ e_border.c 14 Oct 2006 09:43:12 -0000 1.554
@@ -5560,8 +5560,8 @@
else if ((bd->client.netwm.state.skip_taskbar) ||
(bd->client.netwm.state.skip_pager))
bordername = "skipped";
- else
- bordername = "default";
+ else
+ bordername = e_config->theme_default_border_style;
if ((!bd->client.border.name) || (strcmp(bd->client.border.name,
bordername)))
{
@@ -5584,8 +5584,19 @@
bd->client.border.name);
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
- ok = e_theme_edje_object_set(o, "base/theme/borders",
- "e/widgets/border/default/border");
+ {
+ ok = e_theme_edje_object_set(o, "base/theme/borders",
+
"e/widgets/border/default/border");
+ if (ok)
+ {
+ /* Reset default border style to default */
+ if (e_config->theme_default_border_style)
+
evas_stringshare_del(e_config->theme_default_border_style);
+ e_config->theme_default_border_style =
evas_stringshare_add("default");
+ e_config_save_queue();
+ }
+ }
+
if (ok)
{
const char *shape_option;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_configure.c 10 Oct 2006 17:48:15 -0000 1.65
+++ e_configure.c 14 Oct 2006 09:43:12 -0000 1.66
@@ -93,6 +93,7 @@
e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"),
e_int_config_theme);
e_configure_standard_item_add(eco, "enlightenment/colors", _("Colors"),
e_int_config_color_classes);
e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"),
e_int_config_fonts);
+ e_configure_standard_item_add(eco, "enlightenment/windows", _("Borders"),
e_int_config_borders);
e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon
Theme"), e_int_config_icon_themes);
e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse
Cursor"), e_int_config_cursor);
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Display"), e_int_config_window_display);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- e_includes.h 12 Oct 2006 11:49:51 -0000 1.136
+++ e_includes.h 14 Oct 2006 09:43:12 -0000 1.137
@@ -82,7 +82,6 @@
#include "e_int_border_menu.h"
#include "e_ilist.h"
#include "e_livethumb.h"
-#include "e_int_border_border.h"
#include "e_widget_ilist.h"
#include "e_widget_config_list.h"
#include "e_slider.h"
@@ -151,4 +150,5 @@
#include "e_fwin.h"
#include "e_widget_aspect.h"
#include "e_widget_desk_preview.h"
+#include "e_int_config_borders.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_int_border_menu.c 23 Sep 2006 23:37:15 -0000 1.46
+++ e_int_border_menu.c 14 Oct 2006 09:43:12 -0000 1.47
@@ -442,7 +442,7 @@
E_Border *bd;
bd = data;
if (bd->border_border_dialog) return;
- e_int_border_border(bd);
+ e_int_config_borders_border(bd);
}
static void
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
