e module icons - final push to flatten...

2 years ago · 8e128abb28
parent 08ae4e5e5d
commit 8e128abb28
23 changed files with 6 additions and 15 deletions
--- a/src/modules/conf_applications/e-module-conf_applications.edj
+++ b/src/modules/conf_applications/e-module-conf_applications.edj
--- a/src/modules/conf_bindings/e-module-conf_bindings.edj
+++ b/src/modules/conf_bindings/e-module-conf_bindings.edj
--- a/src/modules/conf_bindings/meson.build
+++ b/src/modules/conf_bindings/meson.build
@ -10,4 +10,4 @@ src = files(
 if get_option('gesture-recognition') == true
   src += files('e_int_config_swipebindings.c')
 endif
-desktop_only = true
+
--- a/src/modules/conf_bindings/module.desktop
+++ b/src/modules/conf_bindings/module.desktop
@ -31,5 +31,5 @@ Comment[pt]=Definições do rato, teclas e botões.
 Comment[ru]=Настройки управления мышью, клавишами и кнопками.
 Comment[sr]=Поставке управљањем мишем, тастатуром и дугмадима.
 Comment[tr]=Klavye, fare ve düğme denetim ayarları.
-Icon=preferences-desktop-keyboard-shortcuts
+Icon=e-module-conf_bindings
 X-Enlightenment-ModuleType=settings
--- a/src/modules/conf_dialogs/e-module-conf_dialogs.edj
+++ b/src/modules/conf_dialogs/e-module-conf_dialogs.edj
--- a/src/modules/conf_display/e-module-conf_display.edj
+++ b/src/modules/conf_display/e-module-conf_display.edj
--- a/src/modules/conf_display/meson.build
+++ b/src/modules/conf_display/meson.build
@ -8,5 +8,3 @@ src = files(
  'e_int_config_screensaver.c',
  'e_mod_main.h'
 )
-
-desktop_only = true
--- a/src/modules/conf_display/module.desktop
+++ b/src/modules/conf_display/module.desktop
@ -32,5 +32,5 @@ Comment[pt]=Definições do ecrã
 Comment[ru]=Используется для настройки экрана.
 Comment[sr]=Користи се за подешавње приказа екрана.
 Comment[tr]=Ekran yapılandırmak için kullanılır.
-Icon=preferences-desktop-display
+Icon=e-module-conf_display
 X-Enlightenment-ModuleType=settings
--- a/src/modules/conf_interaction/e-module-conf_interaction.edj
+++ b/src/modules/conf_interaction/e-module-conf_interaction.edj
--- a/src/modules/conf_intl/e-module-conf_intl.edj
+++ b/src/modules/conf_intl/e-module-conf_intl.edj
--- a/src/modules/conf_intl/meson.build
+++ b/src/modules/conf_intl/meson.build
@ -5,5 +5,3 @@ src = files(
  'e_int_config_intl.c',
  'e_mod_main.h'
 )
-
-desktop_only = true
--- a/src/modules/conf_intl/module.desktop
+++ b/src/modules/conf_intl/module.desktop
@ -38,5 +38,5 @@ Comment[pt]=Permite-lhe escolher o idioma do sistema
 Comment[ru]=Используется для выбора языка системы по умолчанию.
 Comment[sr]=Користи се за избор подразумеваног језика.
 Comment[tr]=Öntanımlı dil seçmek için kullanılır.
-Icon=preferences-desktop-locale
+Icon=e-module-conf_intl
 X-Enlightenment-ModuleType=settings
--- a/src/modules/conf_menus/e-module-conf_menus.edj
+++ b/src/modules/conf_menus/e-module-conf_menus.edj
--- a/src/modules/conf_paths/e-module-conf_paths.edj
+++ b/src/modules/conf_paths/e-module-conf_paths.edj
--- a/src/modules/conf_performance/e-module-conf_performance.edj
+++ b/src/modules/conf_performance/e-module-conf_performance.edj
--- a/src/modules/conf_randr/e-module-conf_randr.edj
+++ b/src/modules/conf_randr/e-module-conf_randr.edj
--- a/src/modules/conf_shelves/e-module-conf_shelves.edj
+++ b/src/modules/conf_shelves/e-module-conf_shelves.edj
--- a/src/modules/conf_theme/e-module-conf_theme.edj
+++ b/src/modules/conf_theme/e-module-conf_theme.edj
--- a/src/modules/conf_theme/meson.build
+++ b/src/modules/conf_theme/meson.build
@ -11,5 +11,3 @@ src = files(
  'e_int_config_xsettings.c',
  'e_mod_main.h'
 )
-
-desktop_only = true
--- a/src/modules/conf_theme/module.desktop
+++ b/src/modules/conf_theme/module.desktop
@ -38,5 +38,5 @@ Comment[pt]=Permite-lhe configurar as preferências do tema
 Comment[ru]=Используется для настройки темы.
 Comment[sr]=Користи се за подешавање теме.
 Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır.
-Icon=preferences-desktop-theme
+Icon=e-module-conf_theme
 X-Enlightenment-ModuleType=settings
--- a/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
+++ b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
--- a/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj
+++ b/src/modules/conf_window_remembers/e-module-conf_window_remembers.edj
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@ -73,7 +73,6 @@ mods = [
 ]

 foreach m: mods
-  desktop_only = false
  disable      = false
  no_icon      = false
  cargs        = ''
@ -103,9 +102,7 @@ foreach m: mods
    _conf         = 'USE_MODULE_' + m.underscorify().to_upper()
    module_files += join_paths(_dir_bin, m + '.so')

-    if desktop_only == true
-      _data = [ join_paths(m, 'module.desktop') ]
-    elif no_icon == true
+    if no_icon == true
      _data = []
    else
      _data = [ join_paths(m, 'e-module-' + m + '.edj'),