Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_location_add_dialog.c etk_mime_dialog_main.c
Log Message:
* Make the addition (and saving) of new mime types and descriptions possible
again
* Cleanups in ewl list viewer
* More generic config work
* Cleanup in etk location add dialog
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/dialogs/etk_location_add_dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_location_add_dialog.c 5 Mar 2006 23:57:56 -0000 1.8
+++ etk_location_add_dialog.c 19 Mar 2006 00:35:26 -0000 1.9
@@ -143,7 +143,6 @@
}
static void location_add_initialise() {
- evfs_filesystem* filesystem;
entropy_evfs_filesystems = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
@@ -162,15 +161,11 @@
Ecore_List* filesystems;
evfs_filesystem* system;
char* key;
- Etk_Widget* vbox;
Etk_Widget* dialog_button;
Etk_Widget* hbox;
Etk_Widget* outer_vbox;
- Etk_Widget* table;
- Evas_List* button_group = NULL;
Etk_Widget* first_button = NULL;
- Etk_Widget* entry;
Etk_Widget* label;
entropy_etk_location_add_dialog* dialog =
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_mime_dialog_main.c 18 Mar 2006 12:42:50 -0000 1.5
+++ etk_mime_dialog_main.c 19 Mar 2006 00:35:26 -0000 1.6
@@ -5,7 +5,7 @@
static Etk_Widget* mime_dialog_window;
static Etk_Widget* mime_dialog_add_edit_window;
static Etk_Widget* etk_mime_mime_entry;
-static Etk_Widget* etk_mime_program_entry;
+static Etk_Widget* etk_mime_desc_entry;
static Etk_Widget* _etk_mime_dialog_main_tree = NULL;
static Etk_Widget* _etk_mime_dialog_sub_tree = NULL;
@@ -23,6 +23,9 @@
_etk_mime_dialog_displayed = 0;
etk_object_destroy(ETK_OBJECT(mime_dialog_window));
+ /*Save the config*/
+ entropy_config_eet_config_save()
+
return ETK_TRUE;
}
@@ -80,9 +83,9 @@
void _entropy_etk_mime_dialog_add_edit_final_cb(Etk_Object* w, void* user_data)
{
const char *type_text =
etk_entry_text_get(ETK_ENTRY(etk_mime_mime_entry));
- const char *action_text =
etk_entry_text_get(ETK_ENTRY(etk_mime_program_entry));
+ const char *desc_text =
etk_entry_text_get(ETK_ENTRY(etk_mime_desc_entry));
- entropy_core_mime_action_add((char*)type_text, (char*)action_text);
+ entropy_core_mime_action_add((char*)type_text, (char*)desc_text);
etk_object_destroy(ETK_OBJECT(mime_dialog_add_edit_window));
mime_dialog_add_edit_window= NULL;
@@ -114,7 +117,7 @@
binding = l->data;
row = etk_tree_append(ETK_TREE(tree),
- col1, "Description",
+ col1, binding->desc,
col2, binding->mime_type,
NULL);
etk_tree_row_data_set(row, (int*)i);
@@ -153,14 +156,14 @@
0,0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL |
ETK_FILL_POLICY_HEXPAND);
- label = etk_label_new("Program");
+ label = etk_label_new("Description");
etk_table_attach(ETK_TABLE(table), label,0,0,1,1,
0,0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL |
ETK_FILL_POLICY_HEXPAND);
- etk_mime_program_entry = etk_entry_new();
- if (program) etk_entry_text_set(ETK_ENTRY(etk_mime_program_entry),
program);
- etk_table_attach(ETK_TABLE(table), etk_mime_program_entry,1,1,1,1,
+ etk_mime_desc_entry = etk_entry_new();
+ if (program) etk_entry_text_set(ETK_ENTRY(etk_mime_desc_entry),
program);
+ etk_table_attach(ETK_TABLE(table), etk_mime_desc_entry,1,1,1,1,
0,0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL |
ETK_FILL_POLICY_HEXPAND);
@@ -192,7 +195,7 @@
printf("Setting mime to '%s'...\n", mime);
etk_entry_text_set(ETK_ENTRY(etk_mime_mime_entry), mime);
}
- if (program) etk_entry_text_set(ETK_ENTRY(etk_mime_program_entry),
program);
+ if (program) etk_entry_text_set(ETK_ENTRY(etk_mime_desc_entry),
program);
}
@@ -275,14 +278,14 @@
button = etk_button_new_with_label("Add New Type");
etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
- //etk_signal_connect("pressed", ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_mime_dialog_edit_cb), NULL);
+ etk_signal_connect("pressed", ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_mime_dialog_add_cb), NULL);
button = etk_button_new_with_label("Remove Selected Type");
etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
/*button = etk_button_new_with_label("Add New..");
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);
- etk_signal_connect("pressed", ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_mime_dialog_add_cb), NULL);*/
+ etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0);*/
+
/*Build the sub-tree*/
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
