Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c interface.h
Log Message:
Use the new Etk_Filechooser_Widget
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- callbacks.c 11 Aug 2007 19:33:15 -0000 1.27
+++ callbacks.c 13 Aug 2007 00:41:59 -0000 1.28
@@ -1325,21 +1325,26 @@
break;
case FILECHOOSER_SAVE_EDJ:
printf("SAVE EDJ\n");
-
SaveEDJ(etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)));
+ snprintf(cmd,4096,"%s/%s",
+ etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ etk_filechooser_widget_selected_file_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
+ SaveEDJ(cmd);
break;
- case FILECHOOSER_SAVE_EDC:
+/* case FILECHOOSER_SAVE_EDC:
printf("SAVE EDC\n");
engrave_edc_output(Cur.ef,
(char*)etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)));
- break;
+ break;*/
case FILECHOOSER_IMAGE:
- printf("new image:
%s\n",etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)));
if (Cur.eps){
//If the new image is not in the edc dir
- if (strcmp(etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_image_dir_get(Cur.ef))){
+ if
(strcmp(etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_image_dir_get(Cur.ef))){
//TODO check if image already exist and is a valid image
//Copy the image to the image_dir
- snprintf(cmd, 4096, "cp \"%s\" \"%s\"",
etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)),
engrave_file_image_dir_get(Cur.ef));
+ snprintf(cmd, 4096, "cp \"%s/%s\" \"%s\"",
+ etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ etk_filechooser_widget_selected_file_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ engrave_file_image_dir_get(Cur.ef));
ret = system(cmd);
if (ret < 0) {
ShowAlert("Error: unable to copy image!");
@@ -1361,13 +1366,15 @@
}
break;
case FILECHOOSER_FONT:
- printf("new font:
%s\n",etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)));
if (Cur.eps){
//If the new font is not in the edc dir
- if (strcmp(etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_font_dir_get(Cur.ef))){
+ if
(strcmp(etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),engrave_file_font_dir_get(Cur.ef))){
//TODO check if font already exist in the EDCFileDir
//Copy the font to the EDCDir
- snprintf(cmd, 4096, "cp %s %s",
etk_entry_text_get(ETK_ENTRY(UI_FilechooserFileNameEntry)),
engrave_file_font_dir_get(Cur.ef));
+ snprintf(cmd, 4096, "cp \"%s/%s\" \"%s\"",
+ etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ etk_filechooser_widget_selected_file_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
+ engrave_file_font_dir_get(Cur.ef));
ret = system(cmd);
if (ret < 0) {
ShowAlert("Error: unable to copy font!");
@@ -1379,7 +1386,7 @@
efont = engrave_font_new(
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)),
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
- engrave_file_font_add(Cur.ef,efont);
+ engrave_file_font_add(Cur.ef,efont);
engrave_part_state_text_font_set(Cur.eps,etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
PopulateFontsComboBox();
@@ -1393,23 +1400,6 @@
else{
etk_widget_hide(ETK_WIDGET(dialog));
}
-}
-
-void
-on_FileChooser_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data)
-{
- Etk_String *str=etk_string_new("");
-
- if (etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)))
-
etk_string_append_printf(str,"%s/",etk_filechooser_widget_current_folder_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
-
- if (etk_filechooser_widget_selected_file_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)))
- str =
etk_string_append_printf(str,etk_filechooser_widget_selected_file_get
(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
-
-
- etk_entry_text_set(ETK_ENTRY(UI_FilechooserFileNameEntry),str->string);
-
- etk_object_destroy(ETK_OBJECT(str));
}
void
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- interface.c 11 Aug 2007 19:33:15 -0000 1.34
+++ interface.c 13 Aug 2007 00:41:59 -0000 1.35
@@ -926,24 +926,27 @@
switch(FileChooserType){
case FILECHOOSER_OPEN:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an EDJ
or EDC file to open");
- etk_widget_hide(UI_FilechooserFileNameLabel);
- etk_widget_hide(UI_FilechooserFileNameEntry);
+ etk_filechooser_widget_is_save_set(UI_FileChooser,ETK_FALSE);
etk_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_IMAGE:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an
image to import");
+ etk_filechooser_widget_is_save_set(UI_FileChooser,ETK_FALSE);
etk_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_FONT:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an
font to import");
+ etk_filechooser_widget_is_save_set(UI_FileChooser,ETK_FALSE);
etk_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_SAVE_EDJ:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edje name");
+ etk_filechooser_widget_is_save_set(UI_FileChooser,ETK_TRUE);
etk_widget_hide(UI_FilechooserLoadButton);
break;
case FILECHOOSER_SAVE_EDC:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edc name");
+ etk_filechooser_widget_is_save_set(UI_FileChooser,ETK_TRUE);
etk_widget_hide(UI_FilechooserLoadButton);
break;
default:
@@ -970,27 +973,6 @@
UI_FileChooser = etk_filechooser_widget_new();
etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), UI_FileChooser,
ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
-
- file_tree = ETK_FILECHOOSER_WIDGET(UI_FileChooser)->files_tree;
- etk_signal_connect("row-clicked", ETK_OBJECT(file_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
- //etk_signal_connect("row-selected", ETK_OBJECT(file_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
- places_tree = ETK_FILECHOOSER_WIDGET(UI_FileChooser)->places_tree;
- etk_signal_connect("row-clicked", ETK_OBJECT(places_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
- //etk_signal_connect("row-selected", ETK_OBJECT(places_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
- fav_tree = ETK_FILECHOOSER_WIDGET(UI_FileChooser)->fav_tree;
- etk_signal_connect("row-clicked", ETK_OBJECT(fav_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
- //etk_signal_connect("row-selected", ETK_OBJECT(fav_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
-
- //label
- UI_FilechooserFileNameLabel = etk_label_new("<b>Full file name</b>");
- etk_object_properties_set (ETK_OBJECT(UI_FilechooserFileNameLabel),
"xalign",1.0,NULL);
-
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),UI_FilechooserFileNameLabel,
- ETK_BOX_START, ETK_BOX_NONE,0);
-
- //FileNameEntry
- UI_FilechooserFileNameEntry = etk_entry_new();
- etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
- UI_FilechooserFileNameEntry, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL );
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- interface.h 11 Aug 2007 19:33:15 -0000 1.17
+++ interface.h 13 Aug 2007 00:41:59 -0000 1.18
@@ -58,8 +58,6 @@
Etk_Widget *UI_FileChooser;
Etk_Widget *UI_FileChooserDialog;
Etk_Widget *UI_PlayTextView;
-Etk_Widget *UI_FilechooserFileNameEntry;
-Etk_Widget *UI_FilechooserFileNameLabel;
Etk_Widget *UI_FilechooserSaveButton;
Etk_Widget *UI_FilechooserLoadButton;
Etk_Widget *UI_tree_vbox;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
