From: Enlightenment S. <no-...@en...> - 2008-10-25 09:02:28
|
Log: placeholder icon. Author: raster Date: 2008-10-25 01:58:06 -0700 (Sat, 25 Oct 2008) New Revision: 37094 Modified: trunk/e/src/modules/wizard/page_020.c Modified: trunk/e/src/modules/wizard/page_020.c =================================================================== --- trunk/e/src/modules/wizard/page_020.c 2008-10-25 08:53:44 UTC (rev 37093) +++ trunk/e/src/modules/wizard/page_020.c 2008-10-25 08:58:06 UTC (rev 37094) @@ -87,8 +87,9 @@ snprintf(buf, sizeof(buf), "%s/icon.edj", dir); if ((desk) && (desk->icon)) snprintf(buf, sizeof(buf), "%s/%s", dir, desk->icon); + else + snprintf(buf, sizeof(buf), "%s/data/images/enlightenment.png", e_prefix_data_get()); ic = e_util_icon_add(buf, pg->evas); - e_widget_ilist_append(ob, ic, label, NULL, NULL, prof); if (e_config_profile_get()) { |
From: Enlightenment S. <no-...@en...> - 2008-10-25 15:33:31
|
Log: and note what has been done so far. Author: raster Date: 2008-10-25 08:33:28 -0700 (Sat, 25 Oct 2008) New Revision: 37100 Modified: trunk/e/src/modules/wizard/e_mod_main.c Modified: trunk/e/src/modules/wizard/e_mod_main.c =================================================================== --- trunk/e/src/modules/wizard/e_mod_main.c 2008-10-25 15:18:48 UTC (rev 37099) +++ trunk/e/src/modules/wizard/e_mod_main.c 2008-10-25 15:33:28 UTC (rev 37100) @@ -23,9 +23,9 @@ * . == automatic (no gui - none implemented currently) * * --- THE LIST - * o ask for language (default selection is current locale). - * o ask for initial profile - * o find XDG app menus/repositories and list them let user choose which + * o *ask for language (default selection is current locale). + * o *ask for initial profile + * o *find XDG app menus/repositories and list them let user choose which * one(s) are to be used. * o ask for ibar initial app set * o ask if user wants desktop icons or not (enable fwin module but seed it |
From: Enlightenment S. <no-...@en...> - 2008-10-26 02:42:11
|
Log: friendly error message. Author: raster Date: 2008-10-25 19:42:00 -0700 (Sat, 25 Oct 2008) New Revision: 37110 Modified: trunk/e/src/modules/wizard/page_030.c Modified: trunk/e/src/modules/wizard/page_030.c =================================================================== --- trunk/e/src/modules/wizard/page_030.c 2008-10-26 02:39:29 UTC (rev 37109) +++ trunk/e/src/modules/wizard/page_030.c 2008-10-26 02:42:00 UTC (rev 37110) @@ -61,92 +61,116 @@ o = e_widget_list_add(pg->evas, 1, 0); e_wizard_title_set(_("Menus")); - of = e_widget_framelist_add(pg->evas, _("Select application menu"), 0); - ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &xdg_sel); - e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); - - e_widget_ilist_freeze(ob); - for (i = 0, l = menus; l; l = l->next, i++) + if (!menus) { - char buf[PATH_MAX], *file, *p, *p2, *tlabel, *tdesc; - const char *label; + of = e_widget_framelist_add(pg->evas, _("Error"), 0); - file = l->data; - label = file; - tlabel = NULL; - tdesc = NULL; - if (!strcmp("/etc/xdg/menus/applications.menu", file)) + ob = e_widget_textblock_add(pg->evas); + e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + e_widget_textblock_markup_set + (ob, + _("No menu files were<br>" + "found on your system.<br>" + "Please see the<br>" + "documentation on<br>" + "www.enlightenment.org<br>" + "for more details on<br>" + "how to get your<br>" + "application menus<br>" + "working." + ) + ); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + evas_object_show(ob); + evas_object_show(of); + } + else + { + of = e_widget_framelist_add(pg->evas, _("Select application menu"), 0); + + ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &xdg_sel); + e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + + e_widget_ilist_freeze(ob); + for (i = 0, l = menus; l; l = l->next, i++) { - label = _("System Default"); - sel = i; - } - else - { - p = strrchr(file, '/'); - if (p) + char buf[PATH_MAX], *file, *p, *p2, *tlabel, *tdesc; + const char *label; + + file = l->data; + label = file; + tlabel = NULL; + tdesc = NULL; + if (!strcmp("/etc/xdg/menus/applications.menu", file)) { - p++; - p2 = strchr(p, '-'); - if (!p2) p2 = strrchr(p, '.'); - if (p2) + label = _("System Default"); + sel = i; + } + else + { + p = strrchr(file, '/'); + if (p) { - tlabel = malloc(p2 - p + 1); - if (tlabel) + p++; + p2 = strchr(p, '-'); + if (!p2) p2 = strrchr(p, '.'); + if (p2) { - strncpy(tlabel, p, p2 - p); - tlabel[p2 - p] = 0; - tlabel[0] = toupper(tlabel[0]); - if (*p2 == '-') + tlabel = malloc(p2 - p + 1); + if (tlabel) { - p2++; - p = strrchr(p2, '.'); - if (p) + strncpy(tlabel, p, p2 - p); + tlabel[p2 - p] = 0; + tlabel[0] = toupper(tlabel[0]); + if (*p2 == '-') { - tdesc = malloc(p - p2 + 1); - if (tdesc) + p2++; + p = strrchr(p2, '.'); + if (p) { - strncpy(tdesc, p2, p - p2); - tdesc[p - p2] = 0; - tdesc[0] = toupper(tdesc[0]); - snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc); + tdesc = malloc(p - p2 + 1); + if (tdesc) + { + strncpy(tdesc, p2, p - p2); + tdesc[p - p2] = 0; + tdesc[0] = toupper(tdesc[0]); + snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc); + } + else + snprintf(buf, sizeof(buf), "%s", tlabel); } else snprintf(buf, sizeof(buf), "%s", tlabel); } else snprintf(buf, sizeof(buf), "%s", tlabel); + label = buf; } - else - snprintf(buf, sizeof(buf), "%s", tlabel); - label = buf; } + else + label = p; } - else - label = p; } + e_widget_ilist_append(ob, NULL, label, NULL, NULL, file); + if (tlabel) free(tlabel); + if (tdesc) free(tdesc); + free(file); } - e_widget_ilist_append(ob, NULL, label, NULL, NULL, file); - if (tlabel) free(tlabel); - if (tdesc) free(tdesc); - free(file); - } - if (!menus) - { - e_widget_ilist_append(ob, NULL, _("No menus found"), NULL, NULL, NULL); - sel = 0; - } - if (menus) evas_list_free(menus); - e_widget_ilist_go(ob); - e_widget_ilist_thaw(ob); + evas_list_free(menus); + menus = NULL; + e_widget_ilist_go(ob); + e_widget_ilist_thaw(ob); - if (sel >= 0) e_widget_ilist_selected_set(ob, sel); + if (sel >= 0) e_widget_ilist_selected_set(ob, sel); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + evas_object_show(ob); + evas_object_show(of); + } - evas_object_show(ob); - evas_object_show(of); e_wizard_page_show(o); pg->data = of; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ |
From: Enlightenment S. <no-...@en...> - 2008-10-26 05:46:51
|
Log: add stubs for the rest of wiz to finish off. Author: raster Date: 2008-10-25 22:46:45 -0700 (Sat, 25 Oct 2008) New Revision: 37113 Added: trunk/e/src/modules/wizard/page_040.c trunk/e/src/modules/wizard/page_050.c trunk/e/src/modules/wizard/page_060.c trunk/e/src/modules/wizard/page_070.c Modified: trunk/e/src/modules/wizard/Makefile.am trunk/e/src/modules/wizard/e_mod_main.c Modified: trunk/e/src/modules/wizard/Makefile.am =================================================================== --- trunk/e/src/modules/wizard/Makefile.am 2008-10-26 05:37:38 UTC (rev 37112) +++ trunk/e/src/modules/wizard/Makefile.am 2008-10-26 05:46:45 UTC (rev 37113) @@ -21,7 +21,11 @@ page_000.la \ page_010.la \ page_020.la \ - page_030.la + page_030.la \ + page_040.la \ + page_050.la \ + page_060.la \ + page_070.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ @@ -52,5 +56,25 @@ page_030_la_LDFLAGS = -module -avoid-version page_030_la_DEPENDENCIES = $(top_builddir)/config.h +page_040_la_SOURCES = page_040.c +page_040_la_LIBADD = @e_libs@ @dlopen_libs@ +page_040_la_LDFLAGS = -module -avoid-version +page_040_la_DEPENDENCIES = $(top_builddir)/config.h + +page_050_la_SOURCES = page_050.c +page_050_la_LIBADD = @e_libs@ @dlopen_libs@ +page_050_la_LDFLAGS = -module -avoid-version +page_050_la_DEPENDENCIES = $(top_builddir)/config.h + +page_060_la_SOURCES = page_060.c +page_060_la_LIBADD = @e_libs@ @dlopen_libs@ +page_060_la_LDFLAGS = -module -avoid-version +page_060_la_DEPENDENCIES = $(top_builddir)/config.h + +page_070_la_SOURCES = page_070.c +page_070_la_LIBADD = @e_libs@ @dlopen_libs@ +page_070_la_LDFLAGS = -module -avoid-version +page_070_la_DEPENDENCIES = $(top_builddir)/config.h + uninstall: rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) Modified: trunk/e/src/modules/wizard/e_mod_main.c =================================================================== --- trunk/e/src/modules/wizard/e_mod_main.c 2008-10-26 05:37:38 UTC (rev 37112) +++ trunk/e/src/modules/wizard/e_mod_main.c 2008-10-26 05:46:45 UTC (rev 37113) @@ -29,8 +29,7 @@ * one(s) are to be used. * o ask for ibar initial app set * o ask if user wants desktop icons or not (enable fwin module but seed it - * with default config). - * o ask if you want links to home/system/tmp on desktop (if fileman above on) + * with default config icons on desktop and favorites). * o ask click to focus or sloppy * . take some of current config (language, fileman, profile) and load * load profile, apply language to it and save, restart e. Added: trunk/e/src/modules/wizard/page_040.c Added: trunk/e/src/modules/wizard/page_050.c Added: trunk/e/src/modules/wizard/page_060.c Added: trunk/e/src/modules/wizard/page_070.c |
From: Enlightenment S. <no-...@en...> - 2008-10-26 11:28:57
|
Log: symlinks for 3 favorites. Author: raster Date: 2008-10-26 04:24:35 -0700 (Sun, 26 Oct 2008) New Revision: 37134 Modified: trunk/e/src/modules/wizard/page_070.c Modified: trunk/e/src/modules/wizard/page_070.c =================================================================== --- trunk/e/src/modules/wizard/page_070.c 2008-10-26 11:18:37 UTC (rev 37133) +++ trunk/e/src/modules/wizard/page_070.c 2008-10-26 11:24:35 UTC (rev 37134) @@ -74,6 +74,12 @@ snprintf(buf, sizeof(buf), "%s/Desktop", homedir); ecore_file_mkpath(buf); // FIXME: ln -s the .desktop files in favorites + snprintf(buf, sizeof(buf), "%s/Desktop/home.desktop", homedir); + ecore_file_symlink("../.e/e/fileman/favorites/home.desktop", buf); + snprintf(buf, sizeof(buf), "%s/Desktop/root.desktop", homedir); + ecore_file_symlink("../.e/e/fileman/favorites/root.desktop", buf); + snprintf(buf, sizeof(buf), "%s/Desktop/tmp.desktop", homedir); + ecore_file_symlink("../.e/e/fileman/favorites/tmp.desktop", buf); // save the config now everyone has modified it e_config_save(); |
From: Enlightenment S. <no-...@en...> - 2008-10-28 02:54:38
|
Log: simplify lang list. Author: raster Date: 2008-10-27 19:54:34 -0700 (Mon, 27 Oct 2008) New Revision: 37260 Modified: trunk/e/src/modules/wizard/page_010.c Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2008-10-28 01:06:41 UTC (rev 37259) +++ trunk/e/src/modules/wizard/page_010.c 2008-10-28 02:54:34 UTC (rev 37260) @@ -70,11 +70,8 @@ EAPI int wizard_page_init(E_Wizard_Page *pg) { - Eina_List *e_lang_list; FILE *output; - e_lang_list = e_intl_language_list(); - output = popen("locale -a", "r"); if (output) { @@ -121,12 +118,6 @@ } /* Sort basic languages */ blang_list = eina_list_sort(blang_list, eina_list_count(blang_list), _basic_lang_list_sort); - - while (e_lang_list) - { - free(e_lang_list->data); - e_lang_list = eina_list_remove_list(e_lang_list, e_lang_list); - } pclose(output); } return 1; |
From: Enlightenment S. <no-...@en...> - 2008-11-02 02:54:15
|
Log: re-roder languages into slightly more "most popular" list - this is a rough mental guess. likely we should base this on real numbers at some point :) Author: raster Date: 2008-11-01 19:54:09 -0700 (Sat, 01 Nov 2008) New Revision: 37395 Modified: trunk/e/src/modules/wizard/page_010.c Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2008-11-02 02:43:43 UTC (rev 37394) +++ trunk/e/src/modules/wizard/page_010.c 2008-11-02 02:54:09 UTC (rev 37395) @@ -16,29 +16,29 @@ }; const E_Intl_Pair basic_language_predefined_pairs[ ] = { - {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"}, - {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"}, - {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"}, - {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"}, - {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"}, - {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"}, - {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"}, {"en_US.UTF-8", "lang-en_US.png", "English"}, - {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"}, + {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"}, {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"}, - {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"}, - {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"}, {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"}, + {"es_AR.UTF-8", "lang-es_AR.png", "Español"}, + {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"}, + {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"}, + {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"}, + {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"}, + {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"}, + {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"}, {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"}, {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"}, + {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"}, + {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"}, + {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"}, + {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"}, + {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"}, + {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"}, {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"}, - {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"}, - {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"}, - {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"}, + {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"}, {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"}, {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"}, - {"es_AR.UTF-8", "lang-es_AR.png", "Español"}, - {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"}, { NULL, NULL, NULL } }; |
From: Enlightenment S. <no-...@en...> - 2008-11-02 03:46:26
|
Log: oh silly me - this doesnt affect sorting! revert. Author: raster Date: 2008-11-01 20:46:16 -0700 (Sat, 01 Nov 2008) New Revision: 37398 Modified: trunk/e/src/modules/wizard/page_010.c Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2008-11-02 03:14:20 UTC (rev 37397) +++ trunk/e/src/modules/wizard/page_010.c 2008-11-02 03:46:16 UTC (rev 37398) @@ -16,29 +16,29 @@ }; const E_Intl_Pair basic_language_predefined_pairs[ ] = { + {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"}, + {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"}, + {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"}, + {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"}, + {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"}, + {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"}, + {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"}, {"en_US.UTF-8", "lang-en_US.png", "English"}, + {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"}, + {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"}, {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"}, - {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"}, + {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"}, {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"}, - {"es_AR.UTF-8", "lang-es_AR.png", "Español"}, - {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"}, - {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"}, - {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"}, - {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"}, - {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"}, - {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"}, {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"}, {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"}, + {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"}, {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"}, - {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"}, - {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"}, - {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"}, - {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"}, - {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"}, - {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"}, - {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"}, + {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"}, + {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"}, {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"}, {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"}, + {"es_AR.UTF-8", "lang-es_AR.png", "Español"}, + {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"}, { NULL, NULL, NULL } }; |
From: Enlightenment S. <no-...@en...> - 2009-01-06 02:10:47
|
Log: add 2 more pages to wizard - 1 to add .desktops for your user for apps that might not have them - if the app is installed, and to allow the user to select what goes in their ibar to start with. only .desktop files in ~/Desktop left to deal with. Author: raster Date: 2009-01-05 18:10:45 -0800 (Mon, 05 Jan 2009) New Revision: 38473 Added: trunk/e/src/modules/wizard/page_080.c trunk/e/src/modules/wizard/page_200.c Modified: trunk/e/src/modules/wizard/Makefile.am trunk/e/src/modules/wizard/e_mod_main.c trunk/e/src/modules/wizard/page_070.c Modified: trunk/e/src/modules/wizard/Makefile.am =================================================================== --- trunk/e/src/modules/wizard/Makefile.am 2009-01-06 00:16:12 UTC (rev 38472) +++ trunk/e/src/modules/wizard/Makefile.am 2009-01-06 02:10:45 UTC (rev 38473) @@ -22,7 +22,9 @@ page_010.la \ page_020.la \ page_030.la \ - page_070.la + page_070.la \ + page_080.la \ + page_200.la ### disabled because profile selector really does the job. code here just for ### informational purposes on how to make wizard pages @@ -79,5 +81,15 @@ page_070_la_LDFLAGS = -module -avoid-version page_070_la_DEPENDENCIES = $(top_builddir)/config.h +page_080_la_SOURCES = page_080.c +page_080_la_LIBADD = @e_libs@ @dlopen_libs@ +page_080_la_LDFLAGS = -module -avoid-version +page_080_la_DEPENDENCIES = $(top_builddir)/config.h + +page_200_la_SOURCES = page_200.c +page_200_la_LIBADD = @e_libs@ @dlopen_libs@ +page_200_la_LDFLAGS = -module -avoid-version +page_200_la_DEPENDENCIES = $(top_builddir)/config.h + uninstall: rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) Modified: trunk/e/src/modules/wizard/e_mod_main.c =================================================================== --- trunk/e/src/modules/wizard/e_mod_main.c 2009-01-06 00:16:12 UTC (rev 38472) +++ trunk/e/src/modules/wizard/e_mod_main.c 2009-01-06 02:10:45 UTC (rev 38473) @@ -95,6 +95,8 @@ dlsym(handle, "wizard_page_hide"), dlsym(handle, "wizard_page_apply")); } + else + printf("%s\n", dlerror()); } ecore_list_next(files); } Modified: trunk/e/src/modules/wizard/page_070.c =================================================================== --- trunk/e/src/modules/wizard/page_070.c 2009-01-06 00:16:12 UTC (rev 38472) +++ trunk/e/src/modules/wizard/page_070.c 2009-01-06 02:10:45 UTC (rev 38473) @@ -4,9 +4,180 @@ #include "e.h" #include "e_mod_main.h" +typedef struct _App App; +struct _App +{ + const char *file; // must be unique - should normally be app name + const char *name, *generic, *comment; // fields we should provide + const char *exec; // the exec line + const char *icon; // icon file + const char *extra; // extra fields (tranlations etc.) + int found; +}; + +static App apps[] = +{ + { "firefox", "Firefox", "Web Browser", "Browse the Internet", + "firefox %u", "web_browser.png", + "StartupNotify=true\n" + "StartupWMClass=Firefox-bin\n" + "Categories=Application;Network;", + 0 }, + { "xterm", "XTerm", "Terminal", "Run commands in a shell", + "xterm", "xterm.png", + "StartupWMClass=XTerm\n" + "Categories=Utility;TerminalEmulator;", + 0 }, + { "eterm", "ETerm", "Terminal", "Run commands in a shell", + "Eterm", "xterm.png", + "StartupWMClass=Eterm\n" + "Categories=Utility;TerminalEmulator;", + 0 }, + { "sylpheed", "Sylpheed", "E-Mail Client", "Read and write E-Mail", + "sylpheed", "mail_client.png", + "StartupNotify=true\n" + "StartupWMClass=Sylpheed\n" + "Categories=Application;Network;", + 0 }, + { "xine", "Xine", "Movie Player", "Watch movies and videos", + "xine %U", "video_player.png", + "StartupWMClass=xine\n" + "Categories=Application;AudioVideo;Player;", + 0 }, + { "mplayer", "MPlayer", "Movie Player", "Watch movies and videos", + "mplayer %U", "video_player.png", + "StartupWMClass=MPlayer\n" + "Categories=Application;AudioVideo;Player;", + 0 }, + { "xmms", "XMMS", "Audio Player", "Listen to music", + "xmms %U", "audio_player.png", + "StartupWMClass=XMMS\n" + "Categories=Application;AudioVideo;Player;", + 0 }, + { "beep-media-player", "BMP", "Audio Player", "Listen to music", + "beep-media-player %U", "audio_player.png", + "StartupWMClass=Beep-Media-Player\n" + "Categories=Application;AudioVideo;Player;", + 0 }, + { "audacious", "Audacious", "Audio Player", "Listen to music", + "audacious %U", "audio_player.png", + "StartupWMClass=Audacious\n" + "Categories=Application;AudioVideo;Player;", + 0 }, + { "gqview", "GQView", "Image Viewer", "Look at photos", + "gqview %U", "image_viewer.png", + "StartupWMClass=GQView\n" + "Categories=Application;Graphics;Viewer;", + 0 }, + { "xjed", "X-Jed", "Text Editor", "Edit text files", + "xjed %U", "text_editor.png", + "StartupWMClass=XJed\n" + "Categories=Application;Utility;TextEditor;\n" + "MimeType=text/plain;", + 0 } + // FIXME: add more apps to search for to add .desktops for OR add to ibar. + // feel free to have a pretty big list here. only list from the above ones + // that have a executable installed. + // FIXME: make sure these .desktop handle MimteType lists like xjed + // FIXME: this might be nice moved into a set of sample .desktops that get + // loaded and parsed to make it easier to add more in some dir somewhere +}; + +static int +_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2) +{ + if (!d1->name) return 1; + if (!d2->name) return -1; + return strcmp(d1->name, d2->name); +} + +static void +_app_write(App *a) +{ + FILE *f; + char buf[PATH_MAX]; + + snprintf(buf, sizeof(buf), "%s/applications", + efreet_data_home_get()); + ecore_file_mkpath(buf); + snprintf(buf, sizeof(buf), "%s/applications/%s.desktop", + efreet_data_home_get(), a->file); + f = fopen(buf, "w"); + if (!f) return; + fprintf(f, + "[Desktop Entry]\n" + "Encoding=UTF-8\n" + "Type=Application\n" + "Name=%s\n" + "GenericName=%s\n" + "Comment=%s\n" + "Exec=%s\n" + "Icon=%s\n", + a->name, a->generic, a->comment, a->exec, a->icon); + if (a->extra) fprintf(f, "%s\n", a->extra); + fclose(f); + efreet_desktop_get(buf); +} + EAPI int wizard_page_init(E_Wizard_Page *pg) { + Ecore_List *desks = NULL; + int i; + + efreet_util_init(); + + desks = efreet_util_desktop_name_glob_list("*"); + if (desks) + { + Efreet_Desktop *desk; + + ecore_list_first_goto(desks); + while ((desk = ecore_list_next(desks))) + { + char dbuf[4096]; + + if (!desk->exec) continue; + if (sscanf(desk->exec, "%4000s", dbuf) == 1) + { + for (i = 0; i < (sizeof(apps) / sizeof(App)); i++) + { + if (apps[i].found == 0) + { + char abuf[4096]; + + if (sscanf(apps[i].exec, "%4000s", abuf) == 1) + { + char *p1, *p2; + + if (!ecore_file_app_installed(abuf)) + { + /* can't find exe - mark as not available */ + apps[i].found = -1; + } + else + { + p1 = strrchr(dbuf, '/'); + if (p1) p1++; + else p1 = dbuf; + p2 = strrchr(abuf, '/'); + if (p2) p2++; + else p2 = abuf; + if (!strcmp(p1, p2)) + /* mark as found in .desktops */ + apps[i].found = 2; + } + } + } + } + } + } + ecore_list_destroy(desks); + } + efreet_util_shutdown(); + // FIXME: list all apps and of the apps either already installed, or to be + // created, offer them to be added to ibar by default. (actually should be + // page_080) return 1; } EAPI int @@ -17,73 +188,80 @@ EAPI int wizard_page_show(E_Wizard_Page *pg) { - char buf[PATH_MAX]; - const char *homedir; + Evas_Object *o, *of, *ob, *li, *ck; + Evas_Coord mw, mh; + int i; + int appnum = 0; - if ((e_config_profile_get()) && (strlen(e_config_profile_get()) > 0)) + for (i = 0; i < (sizeof(apps) / sizeof(App)); i++) { - // delete profile - homedir = e_user_homedir_get(); - snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, e_config_profile_get()); - printf("del %s\n", buf); - if (ecore_file_is_dir(buf)) ecore_file_recursive_rm(buf); + if (apps[i].found == 0) appnum++; } - // load profile as e_config - e_config_load(); - return 0; /* 1 == show ui, and wait for user, 0 == just continue */ + if (appnum == 0) return 0; + + o = e_widget_list_add(pg->evas, 1, 0); + e_wizard_title_set(_("Applications")); + + of = e_widget_framelist_add(pg->evas, _("Select Icons to Add"), 0); + + li = e_widget_list_add(pg->evas, 1, 0); + ob = e_widget_scrollframe_simple_add(pg->evas, li); + e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale); + + for (i = 0; i < (sizeof(apps) / sizeof(App)); i++) + { + if (apps[i].found == 0) + { + char *icon; + + apps[i].found = 1; + icon = efreet_icon_path_find(e_config->icon_theme, + apps[i].icon, 48); + ck = e_widget_check_icon_add(pg->evas, apps[i].name, + icon, 32 * e_scale, 32 * e_scale, + &(apps[i].found)); + if (icon) free(icon); + e_widget_list_object_append(li, ck, 1, 1, 0.0); + evas_object_show(ck); + } + } + + e_widget_min_size_get(li, &mw, &mh); + evas_object_resize(li, mw, mh); + + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + evas_object_show(ob); + evas_object_show(of); + evas_object_show(li); + + e_wizard_page_show(o); + + return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int wizard_page_hide(E_Wizard_Page *pg) { + int i; + + /* .desktops are actually written here. this is because page_080 needs them + * to exist in the efreet desktops list to select what is to go in ibar */ + for (i = 0; i < (sizeof(apps) / sizeof(App)); i++) + { + printf("%s %i\n", apps[i].name, apps[i].found); + if (apps[i].found == 1) + { + _app_write(&(apps[i])); + } + } evas_object_del(pg->data); return 1; } EAPI int wizard_page_apply(E_Wizard_Page *pg) { - char buf[PATH_MAX]; - const char *homedir; - - // setup ~/Desktop and ~/.e/e/fileman/favorites and - // ~/.e/e/applications/bar/default, maybe ~/.e/e/applications/startup/.order - - homedir = e_user_homedir_get(); - - // setup default .desktop files - snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get()); - ecore_file_mkpath(buf); - snprintf(buf, sizeof(buf), - "gzip -d -c < %s/data/other/desktop_files.tar.gz | " - "(cd %s/applications/ ; tar -xkf -)", - e_prefix_data_get(), efreet_data_home_get()); - system(buf); - // setup ibar - snprintf(buf, sizeof(buf), - "gzip -d -c < %s/data/other/desktop_order.tar.gz | " - "(cd %s/.e/e/ ; tar -xkf -)", - e_prefix_data_get(), homedir); - system(buf); - - // setup fileman favorites - snprintf(buf, sizeof(buf), - "gzip -d -c < %s/data/other/efm_favorites.tar.gz | " - "(cd %s/.e/e/ ; tar -xkf -)", - e_prefix_data_get(), homedir); - system(buf); - // ~/Desktop - snprintf(buf, sizeof(buf), "%s/Desktop", homedir); - ecore_file_mkpath(buf); - // FIXME: ln -s the .desktop files in favorites - snprintf(buf, sizeof(buf), "%s/Desktop/home.desktop", homedir); - ecore_file_symlink("../.e/e/fileman/favorites/home.desktop", buf); - snprintf(buf, sizeof(buf), "%s/Desktop/root.desktop", homedir); - ecore_file_symlink("../.e/e/fileman/favorites/root.desktop", buf); - snprintf(buf, sizeof(buf), "%s/Desktop/tmp.desktop", homedir); - ecore_file_symlink("../.e/e/fileman/favorites/tmp.desktop", buf); - - // save the config now everyone has modified it - e_config_save(); - // restart e - e_sys_action_do(E_SYS_RESTART, NULL); + // FIXME: write ~/.e/e/applications/bar/default/.order + // which should contain whatever apps the user wants in their bar by + // default (should be page_080) return 1; } Added: trunk/e/src/modules/wizard/page_080.c Added: trunk/e/src/modules/wizard/page_200.c |
From: Enlightenment S. <no-...@en...> - 2009-02-10 12:47:09
|
Log: look in PREFIX/etc for menu files too Author: raster Date: 2009-02-10 03:56:56 -0800 (Tue, 10 Feb 2009) New Revision: 38991 Modified: trunk/e/src/modules/wizard/page_030.c Modified: trunk/e/src/modules/wizard/page_030.c =================================================================== --- trunk/e/src/modules/wizard/page_030.c 2009-02-10 07:53:16 UTC (rev 38990) +++ trunk/e/src/modules/wizard/page_030.c 2009-02-10 11:56:56 UTC (rev 38991) @@ -7,9 +7,34 @@ static char *xdg_sel = NULL; static Eina_List *menus = NULL; +static void +check_menu_dir(const char *dir) +{ + char buf[PATH_MAX], *file; + Ecore_List *files; + + snprintf(buf, sizeof(buf), "%s/menus", dir); + files = ecore_file_ls(buf); + if (files) + { + ecore_list_first_goto(files); + while ((file = ecore_list_current(files))) + { + if (e_util_glob_match(file, "*.menu")) + { + snprintf(buf, sizeof(buf), "%s/menus/%s", dir, file); + menus = eina_list_append(menus, strdup(buf)); + } + ecore_list_next(files); + } + ecore_list_destroy(files); + } +} + EAPI int wizard_page_init(E_Wizard_Page *pg) { + char buf[PATH_MAX]; const char *dirs[] = { "/etc/xdg", @@ -17,33 +42,27 @@ "/usr/local/etc/xdg", "/usr/opt/etc/xdg", "/usr/opt/xdg", + "/usr/local/opt/etc/xdg", + "/usr/local/opt/xdg", + "/opt/etc/xdg", + "/opt/xdg", // FIXME: add more "known locations" NULL }; - int i; + int i, newdir; + for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i]); + newdir = 1; + snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get()); for (i = 0; dirs[i]; i++) { - Ecore_List *files; - char buf[PATH_MAX], *file; - - snprintf(buf, sizeof(buf), "%s/menus", dirs[i]); - files = ecore_file_ls(buf); - if (files) - { - ecore_list_first_goto(files); - while ((file = ecore_list_current(files))) - { - if (e_util_glob_match(file, "*.menu")) - { - snprintf(buf, sizeof(buf), "%s/menus/%s", dirs[i], file); - menus = eina_list_append(menus, strdup(buf)); - } - ecore_list_next(files); - } - ecore_list_destroy(files); - } + if (!strcmp(dirs[i], buf)) + { + newdir = 0; + break; + } } + if (newdir) check_menu_dir(buf); return 1; } EAPI int |
From: Enlightenment S. <no-...@en...> - 2009-03-13 07:54:14
|
Log: fix splash on xinerama! Author: raster Date: 2009-03-13 00:54:04 -0700 (Fri, 13 Mar 2009) New Revision: 39457 Modified: trunk/e/src/modules/wizard/e_wizard.c Modified: trunk/e/src/modules/wizard/e_wizard.c =================================================================== --- trunk/e/src/modules/wizard/e_wizard.c 2009-03-13 05:50:38 UTC (rev 39456) +++ trunk/e/src/modules/wizard/e_wizard.c 2009-03-13 07:54:04 UTC (rev 39457) @@ -166,7 +166,6 @@ } } -/* FIXME: decide how pages are defined - how about an array of page structs? */ EAPI E_Wizard_Page * e_wizard_page_add(void *handle, int (*init) (E_Wizard_Page *pg), @@ -244,7 +243,7 @@ Evas_Object *o, *o_ev; Evas_Modifier_Mask mask; - pop = e_popup_new(zone, zone->x, zone->y, zone->w, zone->h); + pop = e_popup_new(zone, 0, 0, zone->w, zone->h); e_popup_layer_set(pop, 255); o = edje_object_add(pop->evas); @@ -291,7 +290,7 @@ E_Popup *pop; Evas_Object *o; - pop = e_popup_new(zone, zone->x, zone->y, zone->w, zone->h); + pop = e_popup_new(zone, 0, 0, zone->w, zone->h); e_popup_layer_set(pop, 255); o = edje_object_add(pop->evas); e_theme_edje_object_set(o, "base/theme/wizard", "e/wizard/extra"); |
From: Enlightenment S. <no-...@en...> - 2009-04-11 08:42:35
|
Log: shoudl just use regular win. Author: raster Date: 2009-04-11 01:42:24 -0700 (Sat, 11 Apr 2009) New Revision: 39976 Modified: trunk/e/src/modules/wizard/e_wizard.c Modified: trunk/e/src/modules/wizard/e_wizard.c =================================================================== --- trunk/e/src/modules/wizard/e_wizard.c 2009-04-11 08:33:44 UTC (rev 39975) +++ trunk/e/src/modules/wizard/e_wizard.c 2009-04-11 08:42:24 UTC (rev 39976) @@ -275,8 +275,8 @@ e_popup_edje_bg_object_set(pop, o_bg); e_popup_show(pop); - if (!e_grabinput_get(ecore_evas_software_x11_subwindow_get(pop->ecore_evas), - 1, ecore_evas_software_x11_subwindow_get(pop->ecore_evas))) + if (!e_grabinput_get(ecore_evas_software_x11_window_get(pop->ecore_evas), + 1, ecore_evas_software_x11_window_get(pop->ecore_evas))) { e_object_del(E_OBJECT(pop)); pop = NULL; |
From: Enlightenment S. <no-...@en...> - 2010-02-27 10:06:29
|
Log: missing eapi's Author: raster Date: 2010-02-27 02:06:22 -0800 (Sat, 27 Feb 2010) New Revision: 46575 Modified: trunk/e/src/modules/wizard/e_wizard.c trunk/e/src/modules/wizard/e_wizard.h Modified: trunk/e/src/modules/wizard/e_wizard.c =================================================================== --- trunk/e/src/modules/wizard/e_wizard.c 2010-02-27 09:53:41 UTC (rev 46574) +++ trunk/e/src/modules/wizard/e_wizard.c 2010-02-27 10:06:22 UTC (rev 46575) @@ -20,7 +20,7 @@ static int next_can = 0; static int next_prev = 0; -int +EAPI int e_wizard_init(void) { Eina_List *l; @@ -52,7 +52,7 @@ return 1; } -int +EAPI int e_wizard_shutdown(void) { if (pop) @@ -72,7 +72,7 @@ return 1; } -void +EAPI void e_wizard_go(void) { if (!curpage) @@ -94,7 +94,7 @@ } } -void +EAPI void e_wizard_apply(void) { Eina_List *l; @@ -108,7 +108,7 @@ } } -void +EAPI void e_wizard_next(void) { Eina_List *l; @@ -148,7 +148,7 @@ } } -void +EAPI void e_wizard_page_show(Evas_Object *obj) { Evas_Coord minw, minh; @@ -166,7 +166,7 @@ } } -E_Wizard_Page * +EAPI E_Wizard_Page * e_wizard_page_add(void *handle, int (*init) (E_Wizard_Page *pg), int (*shutdown) (E_Wizard_Page *pg), @@ -194,7 +194,7 @@ return pg; } -void +EAPI void e_wizard_page_del(E_Wizard_Page *pg) { if (pg->handle) dlclose(pg->handle); @@ -202,20 +202,20 @@ free(pg); } -void +EAPI void e_wizard_button_next_enable_set(int enable) { next_ok = enable; _e_wizard_next_eval(); } -void +EAPI void e_wizard_title_set(const char *title) { edje_object_part_text_set(o_bg, "e.text.title", title); } -void +EAPI void e_wizard_labels_update(void) { edje_object_part_text_set(o_bg, "e.text.label", _("Next")); Modified: trunk/e/src/modules/wizard/e_wizard.h =================================================================== --- trunk/e/src/modules/wizard/e_wizard.h 2010-02-27 09:53:41 UTC (rev 46574) +++ trunk/e/src/modules/wizard/e_wizard.h 2010-02-27 10:06:22 UTC (rev 46575) @@ -21,13 +21,13 @@ void *data; }; -int e_wizard_init(void); -int e_wizard_shutdown(void); -void e_wizard_go(void); -void e_wizard_apply(void); -void e_wizard_next(void); -void e_wizard_page_show(Evas_Object *obj); -E_Wizard_Page * +EAPI int e_wizard_init(void); +EAPI int e_wizard_shutdown(void); +EAPI void e_wizard_go(void); +EAPI void e_wizard_apply(void); +EAPI void e_wizard_next(void); +EAPI void e_wizard_page_show(Evas_Object *obj); +EAPI E_Wizard_Page * e_wizard_page_add(void *handle, int (*init) (E_Wizard_Page *pg), int (*shutdown) (E_Wizard_Page *pg), @@ -35,10 +35,10 @@ int (*hide) (E_Wizard_Page *pg), int (*apply) (E_Wizard_Page *pg) ); -void e_wizard_page_del(E_Wizard_Page *pg); -void e_wizard_button_next_enable_set(int enable); -void e_wizard_title_set(const char *title); -void e_wizard_labels_update(void); +EAPI void e_wizard_page_del(E_Wizard_Page *pg); +EAPI void e_wizard_button_next_enable_set(int enable); +EAPI void e_wizard_title_set(const char *title); +EAPI void e_wizard_labels_update(void); #endif #endif |
From: Enlightenment S. <no-...@en...> - 2011-05-13 05:27:02
|
Log: give right label to e def menu. Author: raster Date: 2011-05-12 22:26:56 -0700 (Thu, 12 May 2011) New Revision: 59359 Trac: http://trac.enlightenment.org/e/changeset/59359 Modified: trunk/e/src/modules/wizard/page_030.c Modified: trunk/e/src/modules/wizard/page_030.c =================================================================== --- trunk/e/src/modules/wizard/page_030.c 2011-05-13 05:26:17 UTC (rev 59358) +++ trunk/e/src/modules/wizard/page_030.c 2011-05-13 05:26:56 UTC (rev 59359) @@ -121,7 +121,8 @@ tdesc = NULL; e_user_homedir_concat(buf, sizeof(buf), ".config/menus/applications.menu"); - snprintf(buf2, sizeof(buf2), "%s/etc/xdg/enlightenment.menu", + snprintf(buf2, sizeof(buf2), + "%s/etc/xdg/menus/enlightenment.menu", e_prefix_get()); if (!strcmp("/etc/xdg/menus/applications.menu", file)) { |
From: Enlightenment S. <no-...@en...> - 2011-08-15 09:26:22
|
Log: check for damage, composite and 24/32bpp too. Author: raster Date: 2011-08-15 02:26:15 -0700 (Mon, 15 Aug 2011) New Revision: 62479 Trac: http://trac.enlightenment.org/e/changeset/62479 Modified: trunk/e/src/modules/wizard/page_150.c Modified: trunk/e/src/modules/wizard/page_150.c =================================================================== --- trunk/e/src/modules/wizard/page_150.c 2011-08-15 09:21:12 UTC (rev 62478) +++ trunk/e/src/modules/wizard/page_150.c 2011-08-15 09:26:15 UTC (rev 62479) @@ -61,7 +61,15 @@ { Evas_Object *o, *of, *ob; Ecore_Evas *ee; + Ecore_X_Window_Attributes att; + if (!ecore_x_composite_query()) return 0; + if (!ecore_x_damage_query()) return 0; + + memset((&att), 0, sizeof(Ecore_X_Window_Attributes)); + ecore_x_window_attributes_get(ecore_x_window_root_first_get(), &att); + if ((att.depth != 24) && (att.depth != 32)) return 0; + ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 320, 240); if (ee) { @@ -192,7 +200,7 @@ E_CONFIG_DD_FREE(conf_edd); } e_config_save_queue(); - evas_object_del(pg->data); + if (pg->data) evas_object_del(pg->data); return 1; } |
From: Enlightenment S. <no-...@en...> - 2011-08-16 11:26:08
|
Log: and make focus inherit profile setting and dont change revert focus setting (leave per profile). Author: raster Date: 2011-08-16 04:26:02 -0700 (Tue, 16 Aug 2011) New Revision: 62499 Trac: http://trac.enlightenment.org/e/changeset/62499 Modified: trunk/e/src/modules/wizard/page_060.c Modified: trunk/e/src/modules/wizard/page_060.c =================================================================== --- trunk/e/src/modules/wizard/page_060.c 2011-08-16 11:22:58 UTC (rev 62498) +++ trunk/e/src/modules/wizard/page_060.c 2011-08-16 11:26:02 UTC (rev 62499) @@ -21,6 +21,8 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; + + if (e_config->focus_policy == E_FOCUS_CLICK) focus_mode = 0; o = e_widget_list_add(pg->evas, 1, 0); e_wizard_title_set(_("Window Focus")); @@ -55,7 +57,6 @@ e_config->always_click_to_raise = 0; e_config->always_click_to_focus = 0; e_config->focus_last_focused_per_desktop = 1; - e_config->focus_revert_on_hide_or_close = 1; e_config->pointer_slide = 0; } else @@ -66,7 +67,6 @@ e_config->always_click_to_raise = 0; e_config->always_click_to_focus = 0; e_config->focus_last_focused_per_desktop = 1; - e_config->focus_revert_on_hide_or_close = 1; e_config->pointer_slide = 1; } evas_object_del(pg->data); |
From: Enlightenment S. <no-...@en...> - 2011-08-20 03:49:23
|
Log: dont need buf anymore Author: raster Date: 2011-08-19 20:49:17 -0700 (Fri, 19 Aug 2011) New Revision: 62614 Trac: http://trac.enlightenment.org/e/changeset/62614 Modified: trunk/e/src/modules/wizard/page_020.c Modified: trunk/e/src/modules/wizard/page_020.c =================================================================== --- trunk/e/src/modules/wizard/page_020.c 2011-08-20 02:47:56 UTC (rev 62613) +++ trunk/e/src/modules/wizard/page_020.c 2011-08-20 03:49:17 UTC (rev 62614) @@ -136,8 +136,6 @@ EAPI int wizard_page_hide(E_Wizard_Page *pg) { - char buf[PATH_MAX]; - evas_object_del(pg->data); // actually apply profile if (!profile) profile = "standard"; |
From: Enlightenment S. <no-...@en...> - 2011-08-20 05:11:44
|
Log: slightly nicer code flow. Author: raster Date: 2011-08-19 22:11:38 -0700 (Fri, 19 Aug 2011) New Revision: 62621 Trac: http://trac.enlightenment.org/e/changeset/62621 Modified: trunk/e/src/modules/wizard/page_020.c Modified: trunk/e/src/modules/wizard/page_020.c =================================================================== --- trunk/e/src/modules/wizard/page_020.c 2011-08-20 05:11:12 UTC (rev 62620) +++ trunk/e/src/modules/wizard/page_020.c 2011-08-20 05:11:38 UTC (rev 62621) @@ -22,10 +22,12 @@ snprintf(buf, sizeof(buf), "%s/profile.desktop", dir); desk = efreet_desktop_new(buf); if (desk) - e_widget_textblock_markup_set(textblock, desk->comment); + { + e_widget_textblock_markup_set(textblock, desk->comment); + efreet_desktop_free(desk); + } else e_widget_textblock_markup_set(textblock, _("Unknown")); - if (desk) efreet_desktop_free(desk); // enable next once you choose a profile e_wizard_button_next_enable_set(1); |
From: Enlightenment S. <no-...@en...> - 2011-08-31 00:05:51
|
Log: dont stopr and del previous page data - wziard does it for us really :) Author: raster Date: 2011-08-30 17:05:44 -0700 (Tue, 30 Aug 2011) New Revision: 63014 Trac: http://trac.enlightenment.org/e/changeset/63014 Modified: trunk/e/src/modules/wizard/page_010.c trunk/e/src/modules/wizard/page_020.c trunk/e/src/modules/wizard/page_050.c trunk/e/src/modules/wizard/page_060.c trunk/e/src/modules/wizard/page_110.c trunk/e/src/modules/wizard/page_150.c Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_010.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -171,14 +171,14 @@ evas_object_show(ob); evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int wizard_page_hide(E_Wizard_Page *pg) { - evas_object_del(pg->data); +// evas_object_del(pg->data); /* special - language inits its stuff the moment it goes away */ eina_stringshare_del(e_config->language); e_config->language = eina_stringshare_ref(lang); Modified: trunk/e/src/modules/wizard/page_020.c =================================================================== --- trunk/e/src/modules/wizard/page_020.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_020.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -130,7 +130,7 @@ evas_object_show(ob); evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; e_wizard_button_next_enable_set(0); return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -138,7 +138,7 @@ EAPI int wizard_page_hide(E_Wizard_Page *pg) { - evas_object_del(pg->data); +// evas_object_del(pg->data); // actually apply profile if (!profile) profile = "standard"; e_config_profile_set(profile); Modified: trunk/e/src/modules/wizard/page_050.c =================================================================== --- trunk/e/src/modules/wizard/page_050.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_050.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -166,7 +166,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -174,7 +174,7 @@ wizard_page_hide(E_Wizard_Page *pg) { obs = eina_list_free(obs); - evas_object_del(pg->data); +// evas_object_del(pg->data); e_config->scale.use_dpi = 0; e_config->scale.use_custom = 1; Modified: trunk/e/src/modules/wizard/page_060.c =================================================================== --- trunk/e/src/modules/wizard/page_060.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_060.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -42,7 +42,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -69,7 +69,7 @@ e_config->focus_last_focused_per_desktop = 1; e_config->pointer_slide = 1; } - evas_object_del(pg->data); +// evas_object_del(pg->data); return 1; } Modified: trunk/e/src/modules/wizard/page_110.c =================================================================== --- trunk/e/src/modules/wizard/page_110.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_110.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -29,7 +29,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; e_wizard_button_next_enable_set(1); } @@ -152,7 +152,7 @@ ecore_timer_del(connman_timeout); connman_timeout = NULL; } - if (pg->data) evas_object_del(pg->data); +// if (pg->data) evas_object_del(pg->data); return 1; } Modified: trunk/e/src/modules/wizard/page_150.c =================================================================== --- trunk/e/src/modules/wizard/page_150.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_150.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -129,7 +129,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -200,7 +200,7 @@ E_CONFIG_DD_FREE(conf_edd); } e_config_save_queue(); - if (pg->data) evas_object_del(pg->data); +// if (pg->data) evas_object_del(pg->data); return 1; } |
From: Enlightenment S. <no-...@en...> - 2012-02-11 06:44:05
|
Log: actually full restart after wizard, not normal restart Author: raster Date: 2012-02-10 22:43:58 -0800 (Fri, 10 Feb 2012) New Revision: 67846 Trac: http://trac.enlightenment.org/e/changeset/67846 Modified: trunk/e/src/modules/wizard/page_200.c Modified: trunk/e/src/modules/wizard/page_200.c =================================================================== --- trunk/e/src/modules/wizard/page_200.c 2012-02-11 00:48:42 UTC (rev 67845) +++ trunk/e/src/modules/wizard/page_200.c 2012-02-11 06:43:58 UTC (rev 67846) @@ -31,6 +31,8 @@ { // save the config now everyone has modified it e_config_save(); + // diusable restart env so we actually start a whole new session properly + e_util_env_set("E_RESTART", NULL); // restart e e_sys_action_do(E_SYS_RESTART, NULL); return 1; |
From: Enlightenment S. <no-...@en...> - 2012-02-11 10:45:39
|
Log: add wiz page about update checks. Author: raster Date: 2012-02-11 02:45:32 -0800 (Sat, 11 Feb 2012) New Revision: 67848 Trac: http://trac.enlightenment.org/e/changeset/67848 Added: trunk/e/src/modules/wizard/page_170.c Modified: trunk/e/src/modules/wizard/Makefile.am Modified: trunk/e/src/modules/wizard/Makefile.am =================================================================== --- trunk/e/src/modules/wizard/Makefile.am 2012-02-11 10:44:51 UTC (rev 67847) +++ trunk/e/src/modules/wizard/Makefile.am 2012-02-11 10:45:32 UTC (rev 67848) @@ -62,6 +62,7 @@ page_140.la \ page_150.la \ page_160.la \ + page_170.la \ page_200.la module_la_SOURCES = e_mod_main.c \ @@ -163,7 +164,7 @@ page_140_la_LDFLAGS = -module -avoid-version page_140_la_DEPENDENCIES = $(top_builddir)/config.h -#Auto - do we need temperature? +#Request if compositing is wanted page_150_la_SOURCES = page_150.c $(top_srcdir)/src/modules/comp/e_mod_comp_cfdata.c page_150_la_LIBADD = @e_libs@ @dlopen_libs@ page_150_la_LDFLAGS = -module -avoid-version @@ -175,6 +176,12 @@ page_160_la_LDFLAGS = -module -avoid-version page_160_la_DEPENDENCIES = $(top_builddir)/config.h +#Request if user agrees to checking for updates +page_170_la_SOURCES = page_170.c +page_170_la_LIBADD = @e_libs@ @dlopen_libs@ +page_170_la_LDFLAGS = -module -avoid-version +page_170_la_DEPENDENCIES = $(top_builddir)/config.h + #Auto - finish up applying page_200_la_SOURCES = page_200.c page_200_la_LIBADD = @e_libs@ @dlopen_libs@ |
From: Enlightenment S. <no-...@en...> - 2012-05-01 09:15:24
|
Log: added simplified xkb layout selector into wizard. :) Author: raster Date: 2012-05-01 02:15:18 -0700 (Tue, 01 May 2012) New Revision: 70570 Trac: http://trac.enlightenment.org/e/changeset/70570 Added: trunk/e/src/modules/wizard/page_011.c Modified: trunk/e/src/modules/wizard/Makefile.am trunk/e/src/modules/wizard/page_010.c Modified: trunk/e/src/modules/wizard/Makefile.am =================================================================== --- trunk/e/src/modules/wizard/Makefile.am 2012-05-01 08:50:25 UTC (rev 70569) +++ trunk/e/src/modules/wizard/Makefile.am 2012-05-01 09:15:18 UTC (rev 70570) @@ -47,6 +47,7 @@ pkg_LTLIBRARIES = module.la \ page_000.la \ page_010.la \ + page_011.la \ page_020.la \ page_030.la \ page_040.la \ @@ -86,6 +87,12 @@ page_010_la_LDFLAGS = -module -avoid-version page_010_la_DEPENDENCIES = $(top_builddir)/config.h +#Choose kbd layout +page_011_la_SOURCES = page_011.c +page_011_la_LIBADD = @e_libs@ @dlopen_libs@ +page_011_la_LDFLAGS = -module -avoid-version +page_011_la_DEPENDENCIES = $(top_builddir)/config.h + #Choose Profile page_020_la_SOURCES = page_020.c page_020_la_LIBADD = @e_libs@ @dlopen_libs@ Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2012-05-01 08:50:25 UTC (rev 70569) +++ trunk/e/src/modules/wizard/page_010.c 2012-05-01 09:15:18 UTC (rev 70570) @@ -188,7 +188,11 @@ } e_widget_ilist_go(ob); e_widget_ilist_thaw(ob); - if (sel >= 0) e_widget_ilist_selected_set(ob, sel); + if (sel >= 0) + { + e_widget_ilist_selected_set(ob, sel); + e_widget_ilist_nth_show(ob, sel, 0); + } e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); |
From: Enlightenment S. <no-...@en...> - 2012-05-01 11:33:26
|
Log: make page 000 display firstpage theme element for wizard. Author: raster Date: 2012-05-01 04:33:19 -0700 (Tue, 01 May 2012) New Revision: 70575 Trac: http://trac.enlightenment.org/e/changeset/70575 Modified: trunk/e/src/modules/wizard/page_000.c Modified: trunk/e/src/modules/wizard/page_000.c =================================================================== --- trunk/e/src/modules/wizard/page_000.c 2012-05-01 11:33:01 UTC (rev 70574) +++ trunk/e/src/modules/wizard/page_000.c 2012-05-01 11:33:19 UTC (rev 70575) @@ -26,8 +26,14 @@ EAPI int wizard_page_show(E_Wizard_Page *pg __UNUSED__) { + Evas_Object *o; + e_wizard_title_set(_("Enlightenment")); e_wizard_button_next_enable_set(0); + o = edje_object_add(pg->evas); + e_theme_edje_object_set(o, "base/theme/wizard", "e/wizard/firstpage"); + e_wizard_page_show(o); + ecore_timer_add(2.0, _next_page, NULL); return 1; } |
From: Enlightenment S. <no-...@en...> - 2012-09-27 08:40:35
|
Log: 1. wait for initial efreet desktop update before going ot first page 2. wait again after new desktops instaleld and update comes in before advancing Author: raster Date: 2012-09-27 01:40:24 -0700 (Thu, 27 Sep 2012) New Revision: 77135 Trac: http://trac.enlightenment.org/e/changeset/77135 Modified: trunk/e/src/modules/wizard/page_000.c trunk/e/src/modules/wizard/page_040.c Modified: trunk/e/src/modules/wizard/page_000.c =================================================================== --- trunk/e/src/modules/wizard/page_000.c 2012-09-27 08:23:53 UTC (rev 77134) +++ trunk/e/src/modules/wizard/page_000.c 2012-09-27 08:40:24 UTC (rev 77135) @@ -3,6 +3,9 @@ #include "e.h" #include "e_mod_main.h" +static Ecore_Event_Handler *_update_handler = NULL; +static Ecore_Timer *_next_timer = NULL; + EAPI int wizard_page_init(E_Wizard_Page *pg __UNUSED__) { @@ -12,17 +15,30 @@ EAPI int wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) { + if (_update_handler) ecore_event_handler_del(_update_handler); + _update_handler = NULL; return 1; } static Eina_Bool _next_page(void *data __UNUSED__) { + _next_timer = NULL; + if (_update_handler) ecore_event_handler_del(_update_handler); + _update_handler = NULL; e_wizard_button_next_enable_set(1); e_wizard_next(); return ECORE_CALLBACK_CANCEL; } +static Eina_Bool +_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +{ + if (_next_timer) ecore_timer_del(_next_timer); + _next_timer = ecore_timer_add(2.0, _next_page, NULL); + return ECORE_CALLBACK_PASS_ON; +} + EAPI int wizard_page_show(E_Wizard_Page *pg __UNUSED__) { @@ -34,7 +50,12 @@ e_theme_edje_object_set(o, "base/theme/wizard", "e/wizard/firstpage"); e_wizard_page_show(o); - ecore_timer_add(2.0, _next_page, NULL); + _update_handler = + ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, + _cb_desktops_update, NULL); + + /* advance in 15 sec anyway if no efreet update comes */ + _next_timer = ecore_timer_add(15.0, _next_page, NULL); return 1; } Modified: trunk/e/src/modules/wizard/page_040.c =================================================================== --- trunk/e/src/modules/wizard/page_040.c 2012-09-27 08:23:53 UTC (rev 77134) +++ trunk/e/src/modules/wizard/page_040.c 2012-09-27 08:40:24 UTC (rev 77135) @@ -2,6 +2,9 @@ #include "e.h" #include "e_mod_main.h" +static Ecore_Event_Handler *_update_handler = NULL; +static Ecore_Timer *_next_timer = NULL; + EAPI int wizard_page_init(E_Wizard_Page *pg __UNUSED__) { @@ -11,9 +14,30 @@ EAPI int wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) { + if (_update_handler) ecore_event_handler_del(_update_handler); + _update_handler = NULL; return 1; } +static Eina_Bool +_next_page(void *data __UNUSED__) +{ + _next_timer = NULL; + if (_update_handler) ecore_event_handler_del(_update_handler); + _update_handler = NULL; + e_wizard_button_next_enable_set(1); + e_wizard_next(); + return ECORE_CALLBACK_CANCEL; +} + +static Eina_Bool +_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +{ + if (_next_timer) ecore_timer_del(_next_timer); + _next_timer = ecore_timer_add(1.0, _next_page, NULL); + return ECORE_CALLBACK_PASS_ON; +} + EAPI int wizard_page_show(E_Wizard_Page *pg __UNUSED__) { @@ -25,6 +49,14 @@ snprintf(buf, sizeof(buf), "%s/extra_desktops", e_wizard_dir_get()); extra_desks = ecore_file_ls(buf); if (!extra_desks) return 0; + + _update_handler = + ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, + _cb_desktops_update, NULL); + + /* advance in 15 sec anyway if no efreet update comes */ + _next_timer = ecore_timer_add(15.0, _next_page, NULL); + EINA_LIST_FREE(extra_desks, file) { snprintf(buf, sizeof(buf), "%s/extra_desktops/%s", @@ -80,7 +112,7 @@ } free(file); } - return 0; /* 1 == show ui, and wait for user, 0 == just continue */ + return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int |
From: Enlightenment S. <no-...@en...> - 2012-11-10 03:58:04
|
Log: fix a few minor wizrd things: 1. if adding desktop files takes to long to rescane... provide a blank pge+title at least with disabled next button 2. adjust sizes of title preview for scaling to be useful. 3. adjust other text box sizes to avoid scrollies. Author: raster Date: 2012-11-09 19:57:57 -0800 (Fri, 09 Nov 2012) New Revision: 79079 Trac: http://trac.enlightenment.org/e/changeset/79079 Modified: trunk/e/src/modules/wizard/page_040.c trunk/e/src/modules/wizard/page_050.c trunk/e/src/modules/wizard/page_150.c trunk/e/src/modules/wizard/page_170.c Modified: trunk/e/src/modules/wizard/page_040.c =================================================================== --- trunk/e/src/modules/wizard/page_040.c 2012-11-10 03:44:04 UTC (rev 79078) +++ trunk/e/src/modules/wizard/page_040.c 2012-11-10 03:57:57 UTC (rev 79079) @@ -46,6 +46,10 @@ char buf[PATH_MAX], *file; int found; + e_wizard_title_set(_("Adding missing App files")); + e_wizard_button_next_enable_set(0); + e_wizard_page_show(NULL); + snprintf(buf, sizeof(buf), "%s/extra_desktops", e_wizard_dir_get()); extra_desks = ecore_file_ls(buf); if (!extra_desks) return 0; Modified: trunk/e/src/modules/wizard/page_050.c =================================================================== --- trunk/e/src/modules/wizard/page_050.c 2012-11-10 03:44:04 UTC (rev 79078) +++ trunk/e/src/modules/wizard/page_050.c 2012-11-10 03:57:57 UTC (rev 79079) @@ -58,8 +58,8 @@ char buf[64]; int v; -#define SZW 110 -#define SZH 80 +#define SZW 200 +#define SZH 120 ob = e_widget_preview_add(e, SZW, SZH); e_widget_preview_vsize_set(ob, SZW, SZH); @@ -73,7 +73,7 @@ cm = edje_object_add(e_widget_preview_evas_get(ob)); e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/default"); evas_object_move(cm, 16, 16); - evas_object_resize(cm, 320, 400); + evas_object_resize(cm, 180 * sc, 80); evas_object_show(cm); bd = edje_object_add(e_widget_preview_evas_get(ob)); Modified: trunk/e/src/modules/wizard/page_150.c =================================================================== --- trunk/e/src/modules/wizard/page_150.c 2012-11-10 03:44:04 UTC (rev 79078) +++ trunk/e/src/modules/wizard/page_150.c 2012-11-10 03:57:57 UTC (rev 79079) @@ -95,7 +95,7 @@ of = e_widget_framelist_add(pg->evas, _("Transparent windows and effects"), 0); ob = e_widget_textblock_add(pg->evas); - e_widget_size_min_set(ob, 200 * e_scale, 180 * e_scale); + e_widget_size_min_set(ob, 260 * e_scale, 200 * e_scale); e_widget_textblock_markup_set (ob, _("Compositing provides translucency<br>" Modified: trunk/e/src/modules/wizard/page_170.c =================================================================== --- trunk/e/src/modules/wizard/page_170.c 2012-11-10 03:44:04 UTC (rev 79078) +++ trunk/e/src/modules/wizard/page_170.c 2012-11-10 03:57:57 UTC (rev 79079) @@ -27,7 +27,7 @@ of = e_widget_framelist_add(pg->evas, _("Check for available updates"), 0); ob = e_widget_textblock_add(pg->evas); - e_widget_size_min_set(ob, 200 * e_scale, 180 * e_scale); + e_widget_size_min_set(ob, 260 * e_scale, 280 * e_scale); e_widget_textblock_markup_set (ob, _("Enlightenment can check for new<br>" |