Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c interface.h main.h
Log Message:
Small fixes.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- callbacks.c 13 Mar 2007 04:10:33 -0000 1.16
+++ callbacks.c 13 Mar 2007 04:43:18 -0000 1.17
@@ -45,8 +45,15 @@
//ShowAlert("Not yet implemented");
ShowFilechooser(FILECHOOSER_OPEN);
break;
- case TOOLBAR_SAVE_EDC:
+ case TOOLBAR_SAVE:
printf("Clicked signal on Toolbar Button 'Save' EMITTED\n");
+ if (Cur.open_file_name)
+ engrave_edj_output(Cur.ef,Cur.open_file_name);
+ else
+ ShowFilechooser(FILECHOOSER_SAVE_EDJ);
+ break;
+ case TOOLBAR_SAVE_EDC:
+ printf("Clicked signal on Toolbar Button 'Save edc' EMITTED\n");
ShowFilechooser(FILECHOOSER_SAVE_EDC);
break;
case TOOLBAR_SAVE_EDJ:
@@ -96,13 +103,6 @@
break;
case TOOLBAR_DEBUG:
DebugInfo(FALSE);
- //ZOOM TEST :(
- //int x,y,w,h;
- //evas_output_size_get (etk_widget_toplevel_evas_get (ETK_canvas),
&w, &h);
- //evas_output_size_set (etk_widget_toplevel_evas_get (ETK_canvas),
w+10, h+10);
- //evas_output_viewport_get (etk_widget_toplevel_evas_get
(ETK_canvas), &x, &y, &w, &h);
- //evas_output_viewport_set (etk_widget_toplevel_evas_get
(ETK_canvas), x+20, y+20, w+10, h+10);
- //printf("ZOOM: %d %d - %d %d\n",x,y,w,h);
break;
case TOOLBAR_IMAGE_FILE_ADD:
if (engrave_file_image_dir_get(Cur.ef))
ShowFilechooser(FILECHOOSER_IMAGE);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- interface.c 13 Mar 2007 04:10:34 -0000 1.19
+++ interface.c 13 Mar 2007 04:43:18 -0000 1.20
@@ -793,16 +793,6 @@
ETK_CALLBACK(on_Param2Entry_text_changed));
}
-void UpdateWindowTitle(void){
-/* GString *str;
- if (EDCFile){
- str = g_string_new("");
- g_string_printf(str,"Edje Editor - %s",EDCFile->str);
- etk_window_title_set(ETK_WINDOW(UI_MainWin), str->str);
- g_string_free(str,TRUE);
- } */
-}
-
void
ShowFilechooser(int FileChooserType)
{
@@ -814,18 +804,23 @@
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_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_IMAGE:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an
image to import");
+ etk_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_FONT:
etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose an
font to import");
+ etk_widget_hide(UI_FilechooserSaveButton);
break;
case FILECHOOSER_SAVE_EDJ:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edje name");
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edje name");
+ etk_widget_hide(UI_FilechooserLoadButton);
break;
case FILECHOOSER_SAVE_EDC:
- etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edc name");
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), "Choose the
new edc name");
+ etk_widget_hide(UI_FilechooserLoadButton);
break;
default:
break;
@@ -901,7 +896,7 @@
//etk_signal_connect("row_selected", ETK_OBJECT(fav_tree),
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
//label
- UI_FilechooserFileNameLabel = etk_label_new("<b>File</b>");
+ 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);
@@ -911,8 +906,10 @@
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),
+ UI_FilechooserLoadButton =
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DOCUMENT_OPEN ,ETK_RESPONSE_OK );
+ UI_FilechooserSaveButton =
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
+ ETK_STOCK_DOCUMENT_SAVE ,ETK_RESPONSE_OK );
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL );
@@ -977,18 +974,26 @@
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_OPEN);
- //SaveEDJButton
+ //SaveButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
- etk_object_properties_set(ETK_OBJECT(button),"label","Save edc",NULL);
+ etk_object_properties_set(ETK_OBJECT(button),"label","Save",NULL);
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
- etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDC);
-
+ etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE);
+
//SaveEDJButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE_AS);
- etk_object_properties_set(ETK_OBJECT(button),"label","Save edj",NULL);
+ etk_object_properties_set(ETK_OBJECT(button),"label","Save as",NULL);
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDJ);
+
+ //SaveEDCButton
+ button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
+ etk_object_properties_set(ETK_OBJECT(button),"label","Export edc",NULL);
+ etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
+ etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDC);
+
+
sep = etk_hseparator_new();
etk_toolbar_append(ETK_TOOLBAR(ToolBar), sep);
sep = etk_vseparator_new();
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- interface.h 13 Mar 2007 04:10:34 -0000 1.10
+++ interface.h 13 Mar 2007 04:43:18 -0000 1.11
@@ -54,6 +54,8 @@
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;
Etk_Widget *UI_AlertDialog;
Etk_Widget *UI_GroupMinWSpinner;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- main.h 13 Mar 2007 04:10:34 -0000 1.7
+++ main.h 13 Mar 2007 04:43:18 -0000 1.8
@@ -40,6 +40,7 @@
TOOLBAR_ADD,
TOOLBAR_REMOVE,
TOOLBAR_DEBUG,
+ TOOLBAR_SAVE,
TOOLBAR_SAVE_EDC,
TOOLBAR_SAVE_EDJ,
TOOLBAR_PLAY,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
