Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/iconbar
Dir : e17/apps/iconbar/src
Modified Files:
main.c prefs.c prefs.h
Log Message:
withdrawn support for *box
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c 17 Jan 2004 19:38:07 -0000 1.9
+++ main.c 17 Jan 2004 20:34:56 -0000 1.10
@@ -21,19 +21,11 @@
int x, y, w, h;
char buf[2048];
Evas_List *l = NULL;
- int i, withdrawn = 0;
Evas_Object *o = NULL;
Ecore_Evas *ee = NULL;
Evas_Coord edjew, edjeh;
Evas_Object *iconbar = NULL;
- for (i = 1; i < argc; i++)
- {
- if (!strcmp(argv[i], "--withdrawn") || !strcmp(argv[i], "-w"))
- withdrawn = 1;
- }
- printf("withdrawn: %d\n", withdrawn);
-
if(!ecore_init())
{
fprintf(stderr, "Unable to init Ecore, bailing out.\n");
@@ -58,9 +50,10 @@
ecore_evas_callback_destroy_set(ee, window_delete);
ecore_evas_name_class_set(ee, "Iconbar", "Rephorm");
ecore_evas_title_set(ee, "Iconbar");
- ecore_evas_borderless_set(ee, 1);
- ecore_evas_shaped_set(ee, 1);
-
+ ecore_evas_borderless_set(ee, iconbar_config_borderless_get());
+ ecore_evas_shaped_set(ee, iconbar_config_shaped_get());
+ ecore_evas_withdrawn_set(ee, iconbar_config_withdrawn_get());
+
#ifdef HAVE_TRANS_BG
{
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/prefs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- prefs.c 17 Jan 2004 19:38:07 -0000 1.2
+++ prefs.c 17 Jan 2004 20:34:56 -0000 1.3
@@ -19,6 +19,7 @@
int transparent;
int raise;
int borderless;
+ int withdrawn;
};
typedef struct _Iconbar_Prefs Iconbar_Prefs;
@@ -64,6 +65,8 @@
}
if(!e_db_int_get(db, "/iconbar/raise", &ibprefs->raise))
ibprefs->raise = 0;
+ if(!e_db_int_get(db, "/iconbar/withdrawn", &ibprefs->withdrawn))
+ ibprefs->withdrawn = 0;
if(!e_db_int_get(db, "/iconbar/shaped", &ibprefs->shaped))
ibprefs->shaped = 1;
if(!e_db_int_get(db, "/iconbar/borderless", &ibprefs->shaped))
@@ -114,6 +117,7 @@
e_db_str_set(db, "/iconbar/theme", ibprefs->theme);
e_db_str_set(db, "/iconbar/time_format", ibprefs->time_format);
e_db_int_set(db, "/iconbar/raise", ibprefs->raise);
+ e_db_int_set(db, "/iconbar/withdrawn", ibprefs->withdrawn);
e_db_int_set(db, "/iconbar/shaped", ibprefs->shaped);
e_db_int_set(db, "/iconbar/borderless", ibprefs->borderless);
e_db_int_set(db, "/iconbar/x", ibprefs->x);
@@ -224,6 +228,12 @@
if(ibprefs)
ibprefs->raise = on;
}
+void
+iconbar_config_withdrawn_set(int on)
+{
+ if(ibprefs)
+ ibprefs->withdrawn = on;
+}
/* query */
const char*
iconbar_config_theme_get(void)
@@ -295,6 +305,13 @@
return(ibprefs->borderless);
return(0);
}
+int
+iconbar_config_withdrawn_get(void)
+{
+ if(ibprefs)
+ return(ibprefs->withdrawn);
+ return(0);
+}
/*==========================================================================
* Private Functions
*========================================================================*/
@@ -360,6 +377,7 @@
e_db_str_set(db, "/iconbar/theme", buf);
e_db_int_set(db, "/iconbar/raise", 0);
+ e_db_int_set(db, "/iconbar/withdrawn", 0);
e_db_int_set(db, "/iconbar/shaped", 1);
e_db_int_set(db, "/iconbar/borderless", 1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/prefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- prefs.h 17 Jan 2004 19:38:07 -0000 1.2
+++ prefs.h 17 Jan 2004 20:34:56 -0000 1.3
@@ -17,6 +17,7 @@
void iconbar_config_raise_lower_set(int on);
void iconbar_config_shaped_set(int on);
void iconbar_config_borderless_set(int on);
+void iconbar_config_withdrawn_set(int on);
/* query */
const char *iconbar_config_theme_get(void);
@@ -28,5 +29,6 @@
int iconbar_config_raise_lower_get(void);
int iconbar_config_shaped_get(void);
int iconbar_config_borderless_get(void);
+int iconbar_config_withdrawn_get(void);
#endif
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
