diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
index c2fea675e..c48ad17dd 100644
--- a/src/modules/conf_desk/module.desktop.in
+++ b/src/modules/conf_desk/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Desktop
Icon=e-module-conf_desk
Comment=E17 Configuration Applet
Used to configure the desktop name
and wallpaper for individual
virtual desktops.
Comment[it]=Applet configurazione di E17
Usato per configurare il nome e
lo sfondo per ogni singolo
desktop virtuale.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
index 2b3717fd0..19f6caf99 100644
--- a/src/modules/conf_desklock/module.desktop.in
+++ b/src/modules/conf_desklock/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Bloccaschermo
Icon=e-module-conf_desklock
Comment=E17 Configuration Applet
Configures the integrated desk lock.
Comment[it]=Applet configurazione di E17
Configura il bloccaschermo integrato.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
index 4ef9e2429..dc5fa5bed 100644
--- a/src/modules/conf_desks/module.desktop.in
+++ b/src/modules/conf_desks/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Desktop virtuali
Icon=e-module-conf_desks
Comment=E17 Configuration Applet
Configure the the virtual desktop
properties.
Comment[it]=Applet configurazione di E17
Configura le proprietà dei
desktop virtuali.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index 21e391a64..01c3369bd 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Finestre di dialogo
Icon=e-module-conf_dialogs
Comment=E17 Configuration Applet
Configure default dialog properties.
Comment[it]=Applet configurazione di E17
Configura le proprietà predefinite
per le finestre di dialogo.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index d630082e8..a4983b0fd 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Risoluzione schermo
Icon=e-module-conf_display
Comment=E17 Configuration Applet
Used to configure your screen's
resolution.
Comment[it]=Applet configurazione di E17
Usato per configurare la
risoluzione del vostro schermo.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
index 8e70ea052..fae776d8d 100644
--- a/src/modules/conf_dpms/module.desktop.in
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Gestione energetica
Icon=e-module-conf_dpms
Comment=E17 Configuration Applet
Configure the DPMS settings of
your system.
Comment[it]=Applet configurazione di E17
Configura le impostazioni DPMS
del vostro sistema.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
index 37d76abbf..da92b66b4 100644
--- a/src/modules/conf_engine/module.desktop.in
+++ b/src/modules/conf_engine/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Motore
Icon=e-module-conf_engine
Comment=E17 Configuration Applet
Used to select the rendering engine.
Comment[it]=Applet configurazione di E17
Usato per selezionere il
motore di rendering.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_exebuf/module.desktop.in b/src/modules/conf_exebuf/module.desktop.in
index 3b20297cd..0a9cd01d7 100644
--- a/src/modules/conf_exebuf/module.desktop.in
+++ b/src/modules/conf_exebuf/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Lanciacomandi
Icon=e-module-conf_exebuf
Comment=E17 Configuration Applet
Used to configure the settings of
the run command GUI.
Comment[it]=Applet configurazione di E17
Usato per configurare le
impostazioni della GUI per
l'esecuzione di comandi.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in
index b49953981..6274b253b 100644
--- a/src/modules/conf_fonts/module.desktop.in
+++ b/src/modules/conf_fonts/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Font
Icon=e-module-conf_fonts
Comment=E17 Configuration Applet
Font configuration dialog.
Comment[it]=Applet configurazione di E17
Interfaccia per la configurazione
dei font.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
index 9e30d7888..1a00a8ae8 100644
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Temi di icone
Icon=e-module-conf_icon_theme
Comment=E17 Configuration Applet
Configuration applet used to select
an icon theme for E17.
Comment[it]=Applet configurazione di E17
Applet di configurazione per
la selezione di un tema di
icone per E17.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in
index 7ca55d673..feb3db67c 100644
--- a/src/modules/conf_imc/module.desktop.in
+++ b/src/modules/conf_imc/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Metodo di input
Icon=e-module-conf_imc
Comment=E17 Configuration Applet
Used to select an input method.
Comment[it]=Applet configurazione di E17
Usato per selezionare un
metodo di input.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
index a778df9b6..737e5f3d8 100644
--- a/src/modules/conf_intl/module.desktop.in
+++ b/src/modules/conf_intl/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Lingua
Icon=e-module-conf_intl
Comment=E17 Configuration Applet
Used to select a default language.
Comment[it]=Applet configurazione di E17
Usato per selezionare una
lingua predefinita.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index 1b0169b53..f74d228b6 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Associazioni di tasti
Icon=e-module-conf_keybindings
Comment=E17 Configuration Applet
Configure your keybindings here.
Comment[it]=Applet configurazione di E17
Configura le vostre
associazioni di tasti.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
index d05ce6f8f..2c74f4671 100644
--- a/src/modules/conf_menus/module.desktop.in
+++ b/src/modules/conf_menus/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Impostazioni men
Icon=e-module-conf_menus
Comment=E17 Configuration Applet
Configures menu behavior.
Comment[it]=Applet configurazione di E17
Configura il comportamento
dei menù.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
index ac5cf0aaf..daac11527 100644
--- a/src/modules/conf_mime/module.desktop.in
+++ b/src/modules/conf_mime/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Icone dei file
Icon=e-module-conf_mime
Comment=E17 Configuration Applet
Configure E17 mime icons.
Comment[it]=Applet configurazione di E17
Configura le icone dei tipi
MIME in E17.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
index 8b58c3c97..618b33528 100644
--- a/src/modules/conf_mouse/module.desktop.in
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Accelerazione mouse
Icon=e-module-conf_mouse
Comment=E17 Configuration Applet
Configure mouse cursor
acceleration.
Comment[it]=Applet configurazione di E17
Configura l'accelerazione del
puntatore del mouse.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
index 1af08c19a..db2356357 100644
--- a/src/modules/conf_mouse_cursor/module.desktop.in
+++ b/src/modules/conf_mouse_cursor/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Cursore del mouse
Icon=e-module-conf_mouse_cursor
Comment=E17 Configuration Applet
Select the mouse cursor style.
Comment[it]=Applet configurazione di E17
Seleziona lo stile di puntatore
per il mouse.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
index 62bd34be1..843101a74 100644
--- a/src/modules/conf_mousebindings/module.desktop.in
+++ b/src/modules/conf_mousebindings/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Associazioni del mouse
Icon=e-module-conf_mousebindings
Comment=E17 Configuration Applet
Used to configure your mouse
bindings.
Comment[it]=Applet configurazione di E17
Usato per configurare le
associazioni per i tasti del mouse.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
index fa7a31e13..c2beb87f3 100644
--- a/src/modules/conf_paths/module.desktop.in
+++ b/src/modules/conf_paths/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Percorsi di ricerca
Icon=e-module-conf_paths
Comment=E17 Configuration Applet
Specifies the E17 search paths
and default directories.
Comment[it]=Applet configurazione di E17
Specifica i percorsi di ricerca e
le directory predefinite in E17.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
index 27e600066..0087fac0c 100644
--- a/src/modules/conf_performance/module.desktop.in
+++ b/src/modules/conf_performance/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Prestazioni
Icon=e-module-conf_performance
Comment=E17 Configuration Applet
Used to configure certain
performance related items as
frame rates and cache settings.
Comment[it]=Applet configurazione di E17
Usato per configurare alcune
proprieta' correlate alle prestazioni
come velocità frame e cache.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_profiles/module.desktop.in b/src/modules/conf_profiles/module.desktop.in
index f89531880..49bee23fb 100644
--- a/src/modules/conf_profiles/module.desktop.in
+++ b/src/modules/conf_profiles/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Profili
Icon=e-module-conf_profiles
Comment=E17 Configuration Applet
Allows management of configuration
profiles.
Comment[it]=Applet configurazione di E17
Consente la gestione dei
profili di configurazione.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
index 0f24e26c8..772d09e08 100644
--- a/src/modules/conf_screensaver/module.desktop.in
+++ b/src/modules/conf_screensaver/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Screensaver
Icon=e-module-conf_screensaver
Comment=E17 Configuration Applet
Configures the X screensaver.
Comment[it]=Applet configurazione di E17
Configura lo screensaver di X.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
index df87ef8df..d321fbb62 100644
--- a/src/modules/conf_shelves/module.desktop.in
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Mensole
Icon=e-module-conf_shelves
Comment=E17 Configuration Applet
Shelf configuration dialog.
Comment[it]=Applet configurazione di E17
Interfaccia per la configurazione
delle mensole portamoduli.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
index 6abe8f317..c8fdcfbb9 100644
--- a/src/modules/conf_startup/module.desktop.in
+++ b/src/modules/conf_startup/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Avvio
Icon=e-module-conf_startup
Comment=E17 Configuration Applet
Used to configure the E17 splash
screen.
Comment[it]=Applet configurazione di E17
Usato per configurare lo
splash screen di E17.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index 0479a1f84..ed448ee19 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Temi
Icon=e-module-conf_theme
Comment=E17 Configuration Applet
Used to configure your theme
preferences.
Comment[it]=Applet configurazione di E17
Usato per configurare le preferenze
per il vostro tema.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
index dd48156ce..0d18b9268 100644
--- a/src/modules/conf_transitions/module.desktop.in
+++ b/src/modules/conf_transitions/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Transizioni
Icon=e-module-conf_transitions
Comment=E17 Configuration Applet
Used to choose a default transition.
Transitions are used upon wallpaper
changes, among other things.
Comment[it]=Applet configurazione di E17
Usato per scegliere una transizione
predefinita. Le transizioni sono
usate al cambio di sfondo, e per
altre cose.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
index a06f805f0..f2641fe67 100644
--- a/src/modules/conf_wallpaper/module.desktop.in
+++ b/src/modules/conf_wallpaper/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Sfondo
Icon=e-module-conf_wallpaper
Comment=E17 Configuration Applet
Used to pick a wallpaper.
Comment[it]=Applet configurazione di E17
Usato per selezionare uno sfondo.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
index d38fb22b5..97b3d1d95 100644
--- a/src/modules/conf_window_display/module.desktop.in
+++ b/src/modules/conf_window_display/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Visualizzazione finestre
Icon=e-module-conf_window_display
Comment=E17 Configuration Applet
Configures default window
properties such as default
geometries, border icons,
placement styles, etc.
Comment[it]=Applet configurazione di E17
Configura le proprietà predefinite
delle finestre come geometrie, icona
del bordo, stile di posizionamento, ecc.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
index 8fde3a10f..f6ef008ab 100644
--- a/src/modules/conf_window_focus/module.desktop.in
+++ b/src/modules/conf_window_focus/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Fuoco delle finestre
Icon=e-module-conf_window_focus
Comment=E17 Configuration Applet
Configure window focus behavior.
Comment[it]=Applet configurazione di E17
Configura il comportamento del
fuoco delle finestre.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
index e2ededf1e..5c05a366c 100644
--- a/src/modules/conf_window_manipulation/module.desktop.in
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Manipolazione finestre
Icon=e-module-conf_winmanip
Comment=E17 Configuration Applet
Configures window raise, resistance,
and maximize policies.
Comment[it]=Applet configurazione di E17
Configura le regole per l'elevazione,
la resistenza e la massimizzazione
delle finestre.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
index 57e39ff93..2f21c226e 100644
--- a/src/modules/conf_winlist/module.desktop.in
+++ b/src/modules/conf_winlist/module.desktop.in
@@ -5,3 +5,4 @@ Name[it]=Configurazione - Lista finestre
Icon=e-module-conf_winlist
Comment=E17 Configuration Applet
Configure your window list
properties.
Comment[it]=Applet configurazione di E17
Configura le proprietà della
lista delle finestre.
+X-Enlightenment-ModuleType=config
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 344fc75e4..b5402de70 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -40,7 +40,8 @@ struct _E_Fwin
const char *overlay_file;
const char *scrollframe_file;
const char *theme_file;
-
+
+ E_Toolbar *tbar;
Ecore_Event_Handler *zone_handler;
};
@@ -372,7 +373,10 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
fwin->scrollframe_obj = o;
evas_object_move(o, 0, 0);
evas_object_show(o);
-
+
+ fwin->tbar = e_toolbar_new(e_win_evas_get(fwin->win), "toolbar");
+ e_toolbar_show(fwin->tbar);
+
o = edje_object_add(e_win_evas_get(fwin->win));
edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o);
evas_object_pass_events_set(o, 1);
@@ -421,6 +425,9 @@ _e_fwin_free(E_Fwin *fwin)
}
if (fwin->win) e_object_del(E_OBJECT(fwin->win));
if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
+
+ if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
+
if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
if (fwin->zone)
@@ -465,8 +472,13 @@ _e_fwin_cb_resize(E_Win *win)
else if (fwin->zone)
evas_object_resize(fwin->bg_obj, fwin->zone->w, fwin->zone->h);
}
- if (fwin->win)
- evas_object_resize(fwin->scrollframe_obj, fwin->win->w, fwin->win->h);
+ if (fwin->win)
+ {
+ e_toolbar_move_resize(fwin->tbar, 0, 0, fwin->win->w, fwin->tbar->h);
+ evas_object_move(fwin->scrollframe_obj, 0, fwin->tbar->h);
+ evas_object_resize(fwin->scrollframe_obj, fwin->win->w,
+ (fwin->win->h - fwin->tbar->h));
+ }
else if (fwin->zone)
evas_object_resize(fwin->scrollframe_obj, fwin->zone->w, fwin->zone->h);
}
diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in
index 875579095..cb81e21b2 100644
--- a/src/modules/temperature/module.desktop.in
+++ b/src/modules/temperature/module.desktop.in
@@ -4,3 +4,4 @@ Name=Temperature
Icon=e-module-temperature
Comment=Temperature Gadget
Temperature monitor.
Comment[it]=Modulo Temperature
Monitor per le temperature.
+X-Enlightenment-ModuleType=system