summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS3
-rw-r--r--src/modules/music-control/ui.c19
3 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8930b8b0d..32cb0c564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-02-02 Chidambar Zinnoury (ilLogict)
2
3 * Music-control settings: add check changed.
4
12013-02-01 Mike Blumenkrantz 52013-02-01 Mike Blumenkrantz
2 6
3 * split out binding configs into separate config domain 7 * split out binding configs into separate config domain
diff --git a/NEWS b/NEWS
index e9c93aa67..c18b14d66 100644
--- a/NEWS
+++ b/NEWS
@@ -53,7 +53,8 @@ Improvements:
53 - startup theme, 53 - startup theme,
54 - desktop environments, 54 - desktop environments,
55 - language, 55 - language,
56 - notification. 56 - notification,
57 - music-control.
57 * Improve UI of desk settings. 58 * Improve UI of desk settings.
58 * Add icons for gadcon settings. 59 * Add icons for gadcon settings.
59 * Improve strings of pager settings. 60 * Improve strings of pager settings.
diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c
index b32e96bcd..8b1f04402 100644
--- a/src/modules/music-control/ui.c
+++ b/src/modules/music-control/ui.c
@@ -29,7 +29,7 @@ music_control_state_update_all(E_Music_Control_Module_Context *ctxt)
29} 29}
30 30
31static void 31static void
32_btn_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) 32_btn_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source)
33{ 33{
34 E_Music_Control_Instance *inst = data; 34 E_Music_Control_Instance *inst = data;
35 if (!strcmp(source, "play")) 35 if (!strcmp(source, "play"))
@@ -41,7 +41,7 @@ _btn_clicked(void *data, Evas_Object *obj, const char *emission, const char *sou
41} 41}
42 42
43static void 43static void
44_label_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) 44_label_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
45{ 45{
46 E_Music_Control_Instance *inst = data; 46 E_Music_Control_Instance *inst = data;
47 music_control_popup_del(inst); 47 music_control_popup_del(inst);
@@ -182,12 +182,20 @@ _cfg_data_create(E_Config_Dialog *cfd)
182} 182}
183 183
184static void 184static void
185_cfg_data_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 185_cfg_data_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
186{ 186{
187 free(cfdata); 187 free(cfdata);
188} 188}
189 189
190static int 190static int
191_cfg_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
192{
193 E_Music_Control_Instance *inst = cfd->data;
194
195 return inst->ctxt->config->player_selected != cfdata->index;
196}
197
198static int
191_cfg_data_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 199_cfg_data_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
192{ 200{
193 E_Music_Control_Instance *inst = cfd->data; 201 E_Music_Control_Instance *inst = cfd->data;
@@ -204,7 +212,7 @@ _cfg_data_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
204} 212}
205 213
206static void 214static void
207_cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi) 215_cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
208{ 216{
209 E_Config_Dialog_View *v; 217 E_Config_Dialog_View *v;
210 218
@@ -213,6 +221,7 @@ _cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi)
213 v->free_cfdata = _cfg_data_free; 221 v->free_cfdata = _cfg_data_free;
214 v->basic.create_widgets = _cfg_widgets_create; 222 v->basic.create_widgets = _cfg_widgets_create;
215 v->basic.apply_cfdata = _cfg_data_apply; 223 v->basic.apply_cfdata = _cfg_data_apply;
224 v->basic.check_changed = _cfg_check_changed;
216 225
217 e_config_dialog_new(m->zone->container, "Music control Settings", "E", 226 e_config_dialog_new(m->zone->container, "Music control Settings", "E",
218 "_e_mod_music_config_dialog", 227 "_e_mod_music_config_dialog",
@@ -220,7 +229,7 @@ _cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi)
220} 229}
221 230
222void 231void
223music_control_mouse_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event) 232music_control_mouse_down_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
224{ 233{
225 E_Music_Control_Instance *inst = data; 234 E_Music_Control_Instance *inst = data;
226 Evas_Event_Mouse_Down *ev = event; 235 Evas_Event_Mouse_Down *ev = event;