summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-10-03 13:57:18 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-10-03 13:57:18 +0200
commit43e70f308d677eb2d828d03d56503b0bdfaffc7e (patch)
tree2801299a04b5003bad1c248091d9a868ec43011b
parentbd8be611aae5aa04f95cc243fada55eb42262f2f (diff)
more work towords a usable app.
-rw-r--r--data/efl-netctl.desktop18
-rw-r--r--data/logo_small.pngbin0 -> 5655 bytes
-rw-r--r--data/meson.build9
-rw-r--r--meson.build1
-rw-r--r--src/bin/main.c10
-rw-r--r--src/bin/meson.build2
6 files changed, 34 insertions, 6 deletions
diff --git a/data/efl-netctl.desktop b/data/efl-netctl.desktop
new file mode 100644
index 0000000..02c49cb
--- /dev/null
+++ b/data/efl-netctl.desktop
@@ -0,0 +1,18 @@
1[Desktop Entry]
2#Encoding=UTF-8
3Type=Application
4Name=Efl-Netctl
5Name[ko]=터미놀로지
6Comment=EFL based netctl frontend
7Comment[da]=Terminalemulator
8Comment[eo]=Terminalimitilo
9Comment[es]=Emulador de terminal
10Comment[gl]=Emulador de terminal
11Comment[it]=Emulatore di terminale
12Comment[pt]=Emulador de terminal
13Comment[ru]=Эмулятор терминала
14Comment[ko]=터미널 에뮬레이터
15Keywords=network;efl;frontend;wifi;
16Exec=efl-netctl
17Icon=efl-netctl
18Categories=System;Settings;Network;
diff --git a/data/logo_small.png b/data/logo_small.png
new file mode 100644
index 0000000..c7dc665
--- /dev/null
+++ b/data/logo_small.png
Binary files differ
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..e30ff2b
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,9 @@
1install_data('efl-netctl.desktop',
2 install_dir: join_paths(get_option('datadir'), 'applications'),
3 install_mode: 'rw-r--r--'
4)
5
6install_data('logo_small.png',
7 install_dir: join_paths(get_option('datadir'), 'icons/hicolor/128x128/apps'),
8 install_mode : 'rw-r--r--'
9)
diff --git a/meson.build b/meson.build
index 81fc0c9..6281360 100644
--- a/meson.build
+++ b/meson.build
@@ -2,4 +2,5 @@ project('efl-netctl', 'c',
2 version : '0.1' 2 version : '0.1'
3) 3)
4 4
5subdir('data')
5subdir(join_paths('src', 'bin')) 6subdir(join_paths('src', 'bin'))
diff --git a/src/bin/main.c b/src/bin/main.c
index 9052475..1fee475 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -111,7 +111,7 @@ _back(void *data, const Efl_Event *ev)
111static void 111static void
112_connect(void *data, const Efl_Event *ev) 112_connect(void *data, const Efl_Event *ev)
113{ 113{
114 const char *active_profile = efl_key_data_get(efl_ui_single_selectable_last_selected_get(container), "__profile_key"); 114 const char *active_profile = efl_key_data_get(efl_ui_selectable_last_selected_get(container), "__profile_key");
115 connection_attempt_connect(active_profile); 115 connection_attempt_connect(active_profile);
116 _back(data, ev); 116 _back(data, ev);
117 _wait_mode(); 117 _wait_mode();
@@ -142,10 +142,10 @@ _selection_changed_cb(void *data, const Efl_Event *ev)
142 const char *active_profile; 142 const char *active_profile;
143 Connection_Config conf; 143 Connection_Config conf;
144 144
145 if (!efl_ui_single_selectable_last_selected_get(ev->object)) 145 if (!efl_ui_selectable_last_selected_get(ev->object))
146 return; 146 return;
147 147
148 active_profile = efl_key_data_get(efl_ui_single_selectable_last_selected_get(ev->object), "__profile_key"); 148 active_profile = efl_key_data_get(efl_ui_selectable_last_selected_get(ev->object), "__profile_key");
149 149
150 overall_box = efl_add(EFL_UI_BOX_CLASS, win); 150 overall_box = efl_add(EFL_UI_BOX_CLASS, win);
151 efl_ui_box_homogeneous_set(overall_box, EINA_FALSE); 151 efl_ui_box_homogeneous_set(overall_box, EINA_FALSE);
@@ -228,7 +228,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
228 interfaces = eina_hash_string_small_new(NULL); 228 interfaces = eina_hash_string_small_new(NULL);
229 229
230 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 230 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
231 efl_text_set(efl_added, "Netctl front end") 231 efl_text_set(efl_added, "EFL netctl frontend")
232 ); 232 );
233 efl_ui_win_autodel_set(win, EINA_TRUE); 233 efl_ui_win_autodel_set(win, EINA_TRUE);
234 efl_ui_win_exit_on_close_set(win, eina_value_int_new(0)); 234 efl_ui_win_exit_on_close_set(win, eina_value_int_new(0));
@@ -251,7 +251,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
251 251
252 container = efl_add(EFL_UI_LIST_CLASS, win, 252 container = efl_add(EFL_UI_LIST_CLASS, win,
253 efl_pack_end(box, efl_added)); 253 efl_pack_end(box, efl_added));
254 efl_event_callback_add(container, EFL_UI_SINGLE_SELECTABLE_EVENT_SELECTION_CHANGED, _selection_changed_cb, NULL); 254 efl_event_callback_add(container, EFL_UI_SELECTABLE_EVENT_SELECTION_CHANGED, _selection_changed_cb, NULL);
255 255
256 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320)); 256 efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 320));
257 257
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 4e7f27a..8592835 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -1,6 +1,6 @@
1efl_ui = dependency('efl-ui') 1efl_ui = dependency('efl-ui')
2 2
3exe = executable('efl_netctl', 3exe = executable('efl-netctl',
4 ['main.c', 'backend.c', 'ini.c'], 4 ['main.c', 'backend.c', 'ini.c'],
5 dependencies : [efl_ui], 5 dependencies : [efl_ui],
6 install : true 6 install : true