From: <enl...@li...> - 2004-02-14 07:55:25
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: main.c Log Message: fix saved placement, the prop_xy stuff wasn't working =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- main.c 7 Feb 2004 11:39:05 -0000 1.21 +++ main.c 14 Feb 2004 07:49:05 -0000 1.22 @@ -134,6 +134,7 @@ evas_object_show(iconbar); ecore_evas_show(ee); + ecore_evas_move_resize(ee, x, y, w, h); ecore_main_loop_begin(); |
From: <enl...@li...> - 2004-03-26 21:01:05
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: main.c prefs.c Log Message: allow for themes to specified whether they're shaped or transparent =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- main.c 20 Feb 2004 03:23:49 -0000 1.24 +++ main.c 26 Mar 2004 20:50:02 -0000 1.25 @@ -22,10 +22,12 @@ { int x, y, w, h; char buf[2048]; + Ecore_X_Window win; Evas_List *l = NULL; Evas_Object *o = NULL; + Evas_Object *trans = NULL; Ecore_Evas *ee = NULL; - Ecore_X_Window win; + const char *str = NULL; Evas_Coord edjew = 0, edjeh = 0; Evas_Object *iconbar = NULL; @@ -56,7 +58,6 @@ ecore_evas_name_class_set(ee, "Iconbar", "Rephorm"); ecore_evas_title_set(ee, "Iconbar"); 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()); ecore_evas_sticky_set(ee, iconbar_config_sticky_get()); ecore_evas_avoid_damage_set(ee, 1); @@ -64,22 +65,6 @@ //ecore_x_window_prop_layer_set(win, 1); iconbar_config_ecore_evas_set(ee); -#ifdef HAVE_TRANS_BG - { - if(!iconbar_config_shaped_get()) - { - ecore_evas_geometry_get(ee, &x, &y, &w, &h); - o = esmart_trans_x11_new(ecore_evas_get(ee)); - evas_object_layer_set(o, 0); - evas_object_move(o, 0, 0); - evas_object_resize(o, w, h); - evas_object_name_set(o, "trans"); - - esmart_trans_x11_freshen(o, x, y, w, h); - evas_object_show(o); - } - } -#endif for(l = iconbar_config_font_path_get(); l; l = l->next) { @@ -120,6 +105,37 @@ edje_object_signal_emit(o, "window,borderless,on", ""); else edje_object_signal_emit(o, "window,borderless,off", ""); + if((str = edje_object_data_get(o, "iconbar,window"))) + { + fprintf(stderr, "iconbar,window is %s\n", str); +#ifdef HAVE_TRANS_BG + if(!strcmp(str, "trans")) + { + ecore_evas_geometry_get(ee, &x, &y, &w, &h); + trans = esmart_trans_x11_new(ecore_evas_get(ee)); + evas_object_layer_set(trans, 0); + evas_object_move(trans, 0, 0); + evas_object_resize(trans, w, h); + evas_object_name_set(trans, "trans"); + + esmart_trans_x11_freshen(trans, x, y, w, h); + evas_object_show(trans); + } +#else + if(!strcmp(str, "trans")) + { + fprintf(stderr,"iconbar compiled without trans support\n"); + } +#endif + if(!strcmp(str, "shaped")) + { + ecore_evas_shaped_set(ee, 1); + } + } + else + { + ecore_evas_shaped_set(ee, 1); + } } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/prefs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- prefs.c 20 Jan 2004 06:20:40 -0000 1.7 +++ prefs.c 26 Mar 2004 20:50:02 -0000 1.8 @@ -16,7 +16,6 @@ Evas_List *fonts; Evas_List *icons; int x, y, w, h; - int shaped; int transparent; int raise; int borderless; @@ -71,8 +70,6 @@ ibprefs->withdrawn = 0; if(!e_db_int_get(db, "/iconbar/sticky", &ibprefs->sticky)) ibprefs->sticky = 1; - if(!e_db_int_get(db, "/iconbar/shaped", &ibprefs->shaped)) - ibprefs->shaped = 1; if(!e_db_int_get(db, "/iconbar/borderless", &ibprefs->borderless)) ibprefs->borderless = 1; if(!e_db_int_get(db, "/iconbar/x", &ibprefs->x)) @@ -126,8 +123,6 @@ e_db_int_set(db, "/iconbar/sticky", ecore_evas_sticky_get(ee)); e_db_int_set(db, "/iconbar/withdrawn", ecore_evas_withdrawn_get(ee)); - e_db_int_set(db, "/iconbar/shaped", - ecore_evas_shaped_get(ee)); e_db_int_set(db, "/iconbar/borderless", ecore_evas_borderless_get(ee)); e_db_int_set(db, "/iconbar/x", ibprefs->x); @@ -238,17 +233,6 @@ } } void -iconbar_config_shaped_set(int on) -{ - if(ibprefs && ibprefs->ee) - { - ibprefs->shaped = ecore_evas_shaped_get(ibprefs->ee); - if(ibprefs->shaped != on) - ecore_evas_shaped_set(ibprefs->ee, on); - ibprefs->shaped = on; - } -} -void iconbar_config_raise_lower_set(int raise) { if(ibprefs && ibprefs->ee) @@ -336,13 +320,6 @@ return(0); } int -iconbar_config_shaped_get(void) -{ - if(ibprefs) - return(ibprefs->shaped); - return(0); -} -int iconbar_config_borderless_get(void) { if(ibprefs) @@ -429,7 +406,6 @@ 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); e_db_int_set(db, "/iconbar/x", 0); |
From: <enl...@li...> - 2004-03-26 21:24:48
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: main.c Log Message: whoops =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- main.c 26 Mar 2004 20:50:02 -0000 1.25 +++ main.c 26 Mar 2004 21:13:49 -0000 1.26 @@ -107,7 +107,6 @@ edje_object_signal_emit(o, "window,borderless,off", ""); if((str = edje_object_data_get(o, "iconbar,window"))) { - fprintf(stderr, "iconbar,window is %s\n", str); #ifdef HAVE_TRANS_BG if(!strcmp(str, "trans")) { @@ -127,7 +126,7 @@ fprintf(stderr,"iconbar compiled without trans support\n"); } #endif - if(!strcmp(str, "shaped")) + else if(!strcmp(str, "shaped")) { ecore_evas_shaped_set(ee, 1); } |
From: <enl...@li...> - 2004-04-22 13:26:05
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: icon_editor.c Log Message: make this compile again =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/icon_editor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- icon_editor.c 20 Feb 2004 03:23:49 -0000 1.1 +++ icon_editor.c 22 Apr 2004 13:25:58 -0000 1.2 @@ -243,7 +243,7 @@ int w, h; printf("file: %s\n", file); - ewl_image_set_file(EWL_IMAGE(editor->icon_image), file); + ewl_image_set_file(EWL_IMAGE(editor->icon_image), file, NULL); icon_editor_image_data_get(&data, &w, &h); icon_editor_image_data_set(data, w, h); } @@ -327,7 +327,7 @@ ewl_widget_show(editor->bot_hbox); /* image */ - editor->icon_image = ewl_image_new("test.png"); + editor->icon_image = ewl_image_new("test.png", NULL); ewl_container_append_child(EWL_CONTAINER(editor->top_hbox), editor->icon_image); ewl_object_set_padding(EWL_OBJECT(editor->icon_image), 5, 5, 5, 5); ewl_widget_show(editor->icon_image); |
From: <enl...@li...> - 2004-04-22 16:45:38
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: iconbar.c iconbar.h iconbar_smart.c Log Message: update container =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- iconbar.c 20 Feb 2004 03:23:49 -0000 1.15 +++ iconbar.c 22 Apr 2004 16:45:31 -0000 1.16 @@ -69,9 +69,9 @@ evas_object_resize(ib->cont, 20, 200); evas_object_show(ib->cont); if((layout = edje_file_data_get(buf, "container_layout"))) - e_container_layout_plugin_set(ib->cont, layout); + esmart_container_layout_plugin_set(ib->cont, layout); edje_object_part_swallow(ib->gui, "icons", ib->cont); //was clip - e_container_callback_order_change_set(ib->cont, write_out_order, ib); + esmart_container_callback_order_change_set(ib->cont, write_out_order, ib); edje_object_signal_callback_add(ib->gui, "mouse,*", "*", cb_iconbar, ib); edje_object_signal_callback_add(ib->gui, "scroll,*", "*", cb_iconbar, ib); @@ -170,7 +170,7 @@ Icon *ic = evas_list_data(l); printf("append icon: %s\n", ic->file); - e_container_element_append(ib->cont, ic->image); + esmart_container_element_append(ib->cont, ic->image); } evas_list_free(icons); @@ -188,7 +188,7 @@ if((ib = (Iconbar*)data)) { - for (l = e_container_elements_get(ib->cont); l; l = l->next) + for (l = esmart_container_elements_get(ib->cont); l; l = l->next) { Evas_Object *obj = l->data; Icon *ic = evas_object_data_get(obj, "Icon"); @@ -215,19 +215,19 @@ ib = (Iconbar *)data; if (!strcmp(sig, "scroll,1,start")) { - e_container_scroll_start(ib->cont, -1); + esmart_container_scroll_start(ib->cont, -1); } else if (!strcmp(sig, "scroll,2,start")) { - e_container_scroll_start(ib->cont, 1); + esmart_container_scroll_start(ib->cont, 1); } else if (!strcmp(sig, "scroll,1,stop")) { - e_container_scroll_stop(ib->cont); + esmart_container_scroll_stop(ib->cont); } else if (!strcmp(sig, "scroll,2,stop")) { - e_container_scroll_stop(ib->cont); + esmart_container_scroll_stop(ib->cont); } if (!strcmp(sig, "mouse,clicked,1")) { =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- iconbar.h 20 Feb 2004 03:23:49 -0000 1.4 +++ iconbar.h 22 Apr 2004 16:45:31 -0000 1.5 @@ -4,7 +4,7 @@ #include <Evas.h> #include <Ecore.h> #include <Edje.h> -#include <Esmart/container.h> +#include <Esmart/Esmart_Container.h> #include <stdlib.h> #include <stdio.h> #include <dirent.h> =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/iconbar_smart.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- iconbar_smart.c 20 Feb 2004 03:23:49 -0000 1.1 +++ iconbar_smart.c 22 Apr 2004 16:45:31 -0000 1.2 @@ -63,13 +63,13 @@ evas = evas_object_evas_get(o); - ib->cont = e_container_new(evas); - e_container_direction_set(ib->cont, 1); - e_container_spacing_set(ib->cont, 5); - e_container_alignment_set(ib->cont, CONTAINER_ALIGN_CENTER); - e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X | + ib->cont = esmart_container_new(evas); + esmart_container_direction_set(ib->cont, 1); + esmart_container_spacing_set(ib->cont, 5); + esmart_container_alignment_set(ib->cont, CONTAINER_ALIGN_CENTER); + esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X | CONTAINER_FILL_POLICY_KEEP_ASPECT); - e_container_move_button_set(ib->cont, 2); + esmart_container_move_button_set(ib->cont, 2); } @@ -83,7 +83,7 @@ /* FIXME free everything up!! */ - for (l = e_container_elements_get(ib->cont); l; l = l->next) + for (l = esmart_container_elements_get(ib->cont); l; l = l->next) { Icon *ic = evas_object_data_get(l->data, "Icon"); iconbar_icon_free(ic); @@ -174,17 +174,17 @@ if (w > h) { - e_container_direction_set(ib->cont, 0); - e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_Y | + esmart_container_direction_set(ib->cont, 0); + esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_Y | CONTAINER_FILL_POLICY_KEEP_ASPECT); - e_container_padding_set(ib->cont, 5, 5, 11, 11); + esmart_container_padding_set(ib->cont, 5, 5, 11, 11); } else { - e_container_direction_set(ib->cont, 1); - e_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X | + esmart_container_direction_set(ib->cont, 1); + esmart_container_fill_policy_set(ib->cont, CONTAINER_FILL_POLICY_FILL_X | CONTAINER_FILL_POLICY_KEEP_ASPECT); - e_container_padding_set(ib->cont, 11, 11, 5, 5); + esmart_container_padding_set(ib->cont, 11, 11, 5, 5); } } |
From: <enl...@li...> - 2004-05-08 15:04:26
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: Makefile.am main.c Log Message: fix for catalyst =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 20 Feb 2004 03:23:49 -0000 1.3 +++ Makefile.am 8 May 2004 15:04:19 -0000 1.4 @@ -26,6 +26,8 @@ @ecore_libs@ \ @esmart_libs@ \ @ewl_libs@ \ +-lesmart_container \ +-lesmart_trans_x11 \ -ledje_edit =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- main.c 28 Apr 2004 14:09:11 -0000 1.27 +++ main.c 8 May 2004 15:04:19 -0000 1.28 @@ -2,7 +2,7 @@ #include <Ecore_X.h> #include <Ecore_Evas.h> #include <Evas.h> -#include <Esmart/Esmart_Trans.h> +#include <Esmart/Esmart_Trans_X11.h> #include <limits.h> #include "iconbar.h" |
From: <enl...@li...> - 2004-05-08 15:29:50
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar Modified Files: configure.in Log Message: thanks catalyst =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in 21 Feb 2004 04:34:19 -0000 1.6 +++ configure.in 8 May 2004 15:29:43 -0000 1.7 @@ -139,7 +139,7 @@ have_esmart_trans="no" dnl Make sure the esmart header/lib is available -AC_CHECK_HEADER( Esmart/Esmart_Trans.h, +AC_CHECK_HEADER( Esmart/Esmart_Trans_X11.h, [ AC_DEFINE(HAVE_TRANS_BG, [], [Esmart Pseudo-transparency support]) have_esmart_trans="yes" ]) |
From: <enl...@li...> - 2004-08-15 03:43:49
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar/src Modified Files: main.c Log Message: fixup from old esmart api, thanks catalyst =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- main.c 14 Aug 2004 16:50:42 -0000 1.29 +++ main.c 15 Aug 2004 03:43:33 -0000 1.30 @@ -203,7 +203,7 @@ last = ecore_time_get(); /* tell the icons too */ - for (l = e_container_elements_get(ib->cont); l; l = l->next) + for (l = esmart_container_elements_get(ib->cont); l; l = l->next) { Evas_Object *obj = l->data; edje_object_signal_emit(obj, "window,leave", ""); @@ -230,7 +230,7 @@ last = ecore_time_get(); /* tell the icons too */ - for (l = e_container_elements_get(ib->cont); l; l = l->next) + for (l = esmart_container_elements_get(ib->cont); l; l = l->next) { Evas_Object *obj = l->data; edje_object_signal_emit(obj, "window,enter", ""); |
From: <enl...@li...> - 2004-08-28 02:57:09
|
Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/iconbar Dir : e17/apps/iconbar Added Files: iconbar.spec Log Message: add spec file from jim perrin |