Enlightenment CVS committal
Author : urandom
Project : e17
Module : proto
Dir : e17/proto/edje_viewer/src/bin
Modified Files:
etk_gui.c etk_gui.h
Log Message:
minor gui changes
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_gui.c 20 Jan 2007 03:35:41 -0000 1.16
+++ etk_gui.c 20 Jan 2007 05:57:48 -0000 1.17
@@ -12,9 +12,8 @@
Etk_Menu_Shell *menu_shell);
static Etk_Bool _gui_tree_search(Gui *gui, Tree_Search direction);
+static void _open_edje_file(Gui *gui);
-static void _gui_menu_item_selected_cb(Etk_Object *obj, void *data);
-static void _gui_menu_item_deselected_cb(Etk_Object *obj, void *data);
static void _gui_menu_item_clicked_cb(Etk_Object *obj, void *data);
static void _gui_open_last_clicked_cb(Etk_Object *obj, void *data);
static void _gui_sort_parts_clicked_cb(Etk_Object *obj, void *data);
@@ -72,13 +71,16 @@
etk_box_append(ETK_BOX(vbox), menubar,
ETK_BOX_START, ETK_BOX_NONE, 0);
+ /* Main menu */
menuitem = _gui_menubar_item_new(gui, _("File"), ETK_MENU_SHELL(menubar));
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menuitem), ETK_MENU(menu));
_gui_menu_stock_item_new(gui, _("Open"), ETK_STOCK_DOCUMENT_OPEN,
- ETK_MENU_SHELL(menu));
+ ETK_MENU_SHELL(menu));
menuitem = _gui_menu_stock_item_new(gui, _("Open recent"),
ETK_STOCK_DOCUMENT_OPEN, ETK_MENU_SHELL(menu));
+ _gui_menu_stock_item_new(gui, _("Reload"), ETK_STOCK_VIEW_REFRESH,
+ ETK_MENU_SHELL(menu));
separator = etk_menu_item_separator_new();
etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(separator));
_gui_menu_stock_item_new(gui, _("Quit"), ETK_STOCK_DIALOG_CLOSE,
@@ -116,9 +118,11 @@
check = edje_viewer_config_sort_parts_get();
etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menuitem), check);
+ /* Main content */
paned = etk_hpaned_new();
vpaned = etk_vpaned_new();
etk_box_append(ETK_BOX(vbox), vpaned, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
+ etk_widget_padding_set(vpaned, 5, 5, 5, 0);
etk_paned_child1_set(ETK_PANED(vpaned), paned, ETK_TRUE);
gui->tree = etk_tree_new();
@@ -151,6 +155,7 @@
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_widget_padding_set(hbox, 5, 5, 0, 5);
signal_label = etk_label_new("Signal: ");
etk_box_append(ETK_BOX(hbox), signal_label, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -161,6 +166,7 @@
source_label = etk_label_new("Source: ");
etk_box_append(ETK_BOX(hbox), source_label, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_widget_padding_set(source_label, 5, 0, 0, 0);
source_entry = etk_entry_new();
etk_box_append(ETK_BOX(hbox), source_entry, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -172,21 +178,22 @@
etk_signal_connect("clicked", ETK_OBJECT(send_button),
ETK_CALLBACK(_gui_send_clicked_cb), gui);
- gui->status = etk_statusbar_new();
- etk_box_append(ETK_BOX(vbox), gui->status, ETK_BOX_END, ETK_BOX_NONE, 0);
-
bg_setup(ETK_CANVAS(gui->canvas));
etk_widget_show_all(gui->win);
check = edje_viewer_config_open_last_get();
- if (file) list_entries(file, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
+ if (file)
+ {
+ gui->path = file;
+ _open_edje_file(gui);
+ }
else if (check)
{
file = edje_viewer_config_last_get();
if (file)
{
- list_entries(file, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
- etk_window_title_set(ETK_WINDOW(gui->win), file);
+ gui->path = file;
+ _open_edje_file(gui);
}
}
etk_signal_connect("delete_event", ETK_OBJECT(gui->win),
@@ -206,11 +213,6 @@
menu_item = etk_menu_item_new_with_label(label);
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_selected_cb), gui);
- etk_signal_connect("deselected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_deselected_cb), gui);
-
return menu_item;
}
@@ -228,10 +230,6 @@
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_selected_cb), gui);
- etk_signal_connect("deselected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_deselected_cb), gui);
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_gui_menu_item_clicked_cb), gui);
@@ -250,10 +248,6 @@
menu_item = etk_menu_item_new_with_label(label);
etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
- etk_signal_connect("selected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_selected_cb), gui);
- etk_signal_connect("deselected", ETK_OBJECT(menu_item),
- ETK_CALLBACK(_gui_menu_item_deselected_cb), gui);
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_gui_menu_item_clicked_cb), gui);
@@ -311,26 +305,10 @@
return ETK_FALSE;
}
-static void _gui_menu_item_selected_cb(Etk_Object *obj, void *data)
+static void _open_edje_file(Gui *gui)
{
- Etk_Menu_Item *item;
- Gui *gui;
-
- if (!(item = ETK_MENU_ITEM(obj)))
- return;
- if (!(gui = data)) return;
-
- etk_statusbar_message_push(ETK_STATUSBAR(gui->status),
- etk_menu_item_label_get(item), 0);
-
-}
-
-static void _gui_menu_item_deselected_cb(Etk_Object *obj, void *data)
-{
- Gui *gui;
-
- if (!(gui = data)) return;
- etk_statusbar_message_pop(ETK_STATUSBAR(gui->status), 0);
+ list_entries(gui->path, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
+ etk_window_title_set(ETK_WINDOW(gui->win), gui->path);
}
static void _gui_menu_item_clicked_cb(Etk_Object *obj, void *data)
@@ -349,8 +327,13 @@
_gui_main_window_deleted_cb(NULL);
else if (!strcmp(label, "Open"))
_gui_open_edje_file_cb(gui);
+ else if (!strcmp(label, "Reload"))
+ _open_edje_file(gui);
else if (strstr(label, ".edj"))
- list_entries(label, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
+ {
+ gui->path = strdup(label);
+ _open_edje_file(gui);
+ }
}
static void _gui_open_last_clicked_cb(Etk_Object *obj, void *data)
@@ -528,9 +511,8 @@
gui->path = strdup(dir);
gui->path = strcat(gui->path, "/");
gui->path = strcat(gui->path, file);
- list_entries(gui->path, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
etk_window_hide_on_delete(ETK_OBJECT(gui->fm_dialog), NULL);
- etk_window_title_set(ETK_WINDOW(gui->win), gui->path);
+ _open_edje_file(gui);
}
static void _gui_fm_cancel_clicked_cb(Etk_Object *obj, void *data)
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_gui.h 17 Jan 2007 03:44:03 -0000 1.7
+++ etk_gui.h 20 Jan 2007 05:57:48 -0000 1.8
@@ -17,7 +17,6 @@
Etk_Widget *win;
Etk_Widget *tree;
Etk_Widget *canvas;
- Etk_Widget *status;
Etk_Widget *output;
Etk_Widget *signal_entry;
Etk_Widget *source_entry;
-------------------------------------------------------------------------
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
