Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/extrackt/src/bin/etk_fe
Modified Files:
gui.c
Log Message:
- bump up version
- saving / loading of rippers / encoders works properly now and selects default
one.
===================================================================
RCS file: /cvs/e/e17/proto/extrackt/src/bin/etk_fe/gui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- gui.c 3 Apr 2006 23:36:09 -0000 1.5
+++ gui.c 10 Jul 2006 05:59:50 -0000 1.6
@@ -244,6 +244,8 @@
void
_etk_fe_gui_encoder_combo_changed_cb(Etk_Object *object, void *data)
{
+ Evas_List *l;
+ Ex_Config_Encode *ece;
Ex_Config_Exe *ecx;
E_Gui_Etk *gui;
Etk_Combobox *combobox;
@@ -261,17 +263,26 @@
if(!ex_command_encode_set(gui->ex, label))
return;
+ ece = gui->ex->config.encode;
+ for(l = ece->encoders; l; l=l->next)
+ {
+ ecx = (Ex_Config_Exe *)l->data;
+ ecx->def = 0;
+ }
+
ecx = gui->ex->encode.encoder;
+ ecx->def = 1;
etk_entry_text_set(ETK_ENTRY(gui->encoder_executable_entry),ecx->exe);
etk_entry_text_set(ETK_ENTRY(gui->encoder_command_line_entry),ecx->command_line_opts);
-
etk_entry_text_set(ETK_ENTRY(gui->encoder_file_format_entry),ecx->file_format);
+
etk_entry_text_set(ETK_ENTRY(gui->encoder_file_format_entry),ecx->file_format);
}
void
_etk_fe_gui_ripper_combo_changed_cb(Etk_Object *object, void *data)
{
-
- Ex_Config_Exe *ecx;
+ Evas_List *l;
+ Ex_Config_Encode *ece;
+ Ex_Config_Exe *ecx;
E_Gui_Etk *gui;
Etk_Combobox *combobox;
Etk_Combobox_Item *active_item;
@@ -287,8 +298,16 @@
gui = data;
if(!ex_command_rip_set(gui->ex, label))
return;
-
+
+ ece = gui->ex->config.encode;
+ for(l = ece->encoders; l; l=l->next)
+ {
+ ecx = (Ex_Config_Exe *)l->data;
+ ecx->def = 0;
+ }
+
ecx = gui->ex->rip.ripper;
+ ecx->def = 1;
etk_entry_text_set(ETK_ENTRY(gui->ripper_executable_entry),ecx->exe);
etk_entry_text_set(ETK_ENTRY(gui->ripper_command_line_entry),ecx->command_line_opts);
etk_entry_text_set(ETK_ENTRY(gui->ripper_file_format_entry),ecx->file_format);
@@ -649,15 +668,14 @@
ecx = (Ex_Config_Exe *)l->data;
item = etk_combobox_item_append(ETK_COMBOBOX(gui->encoder_combo),
_(ecx->name));
etk_combobox_item_data_set_full(item, strdup(_(ecx->name)), free);
- if(!l->prev)
- etk_combobox_active_item_set(ETK_COMBOBOX(gui->encoder_combo),
item);
+ if(ecx->def)
+ {
+
etk_combobox_active_item_set(ETK_COMBOBOX(gui->encoder_combo), item);
+ etk_entry_text_set(ETK_ENTRY(gui->encoder_executable_entry),
ecx->exe);
+
etk_entry_text_set(ETK_ENTRY(gui->encoder_command_line_entry),
ecx->command_line_opts);
+ etk_entry_text_set(ETK_ENTRY(gui->encoder_file_format_entry),
ecx->file_format);
+ }
}
- /* FIXME we should save the last selected
- * fill the values for the first */
- ecx = gui->ex->config.encode->encoders->data;
- etk_entry_text_set(ETK_ENTRY(gui->encoder_executable_entry),ecx->exe);
-
etk_entry_text_set(ETK_ENTRY(gui->encoder_command_line_entry),ecx->command_line_opts);
-
etk_entry_text_set(ETK_ENTRY(gui->encoder_file_format_entry),ecx->file_format);
}
/* ripper tab */
@@ -673,15 +691,14 @@
ecx = (Ex_Config_Exe *)l->data;
item = etk_combobox_item_append(ETK_COMBOBOX(gui->ripper_combo),
_(ecx->name));
etk_combobox_item_data_set_full(item, strdup(_(ecx->name)), free);
- if(!l->prev)
- etk_combobox_active_item_set(ETK_COMBOBOX(gui->ripper_combo),
item);
+ if(ecx->def)
+ {
+ etk_combobox_active_item_set(ETK_COMBOBOX(gui->ripper_combo),
item);
+
etk_entry_text_set(ETK_ENTRY(gui->ripper_executable_entry),ecx->exe);
+
etk_entry_text_set(ETK_ENTRY(gui->ripper_command_line_entry),ecx->command_line_opts);
+
etk_entry_text_set(ETK_ENTRY(gui->ripper_file_format_entry),ecx->file_format);
+ }
}
- /* FIXME we should save the last selected
- * fill the values for the first */
- ecx = gui->ex->config.rippers->data;
- etk_entry_text_set(ETK_ENTRY(gui->ripper_executable_entry),ecx->exe);
-
etk_entry_text_set(ETK_ENTRY(gui->ripper_command_line_entry),ecx->command_line_opts);
-
etk_entry_text_set(ETK_ENTRY(gui->ripper_file_format_entry),ecx->file_format);
}
/* discdb tab */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
