Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2/src
Modified Files:
callbacks.c callbacks.h e16menuedit2.c toolbar.c toolbar.h
Log Message:
toolbar...
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- callbacks.c 28 Jul 2004 22:12:28 -0000 1.6
+++ callbacks.c 29 Jul 2004 22:38:20 -0000 1.7
@@ -38,50 +38,6 @@
#include "e16menu.h"
#include "treeview.h"
-void on_menu_save_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- GtkWidget *treeview_menu;
-
- treeview_menu = (GtkWidget*) user_data;
- save_table_to_menu (treeview_menu);
-}
-
-void on_menu_quit_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- gtk_main_quit ();
-}
-
-void on_new_button (GtkButton *button, gpointer user_data)
-{
- GtkWidget *treeview_menu;
-
- treeview_menu = (GtkWidget*) user_data;
- new_table_row (treeview_menu);
-}
-
-void on_change_icon_button (GtkButton *button, gpointer user_data)
-{
- open_icon_chooser ((GtkWidget *) user_data);
-
-}
-void on_save_button (GtkButton *button, gpointer user_data)
-{
- GtkWidget *treeview_menu;
-
- treeview_menu = (GtkWidget*) user_data;
- save_table_to_menu (treeview_menu);
-}
-
-void on_delete_button (GtkButton *button, gpointer user_data)
-{
- GtkWidget *treeview_menu;
-
- treeview_menu = (GtkWidget*) user_data;
- delete_table_row (treeview_menu);
-}
-
void on_descrenderer_edited (GtkCellRendererText *celltext,
const gchar *string_path,
const gchar *new_text,
@@ -123,3 +79,65 @@
{
}
+
+
+void on_menu_save_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ save_table_to_menu (treeview_menu);
+}
+
+void on_menu_quit_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ gtk_main_quit ();
+}
+
+void on_menu_info_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+void
+on_toolbutton_save_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ save_table_to_menu (treeview_menu);
+}
+
+
+void
+on_toolbutton_new_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ new_table_row (treeview_menu);
+}
+
+
+void
+on_toolbutton_icon_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ open_icon_chooser ((GtkWidget *) user_data);
+}
+
+
+void
+on_toolbutton_del_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ delete_table_row (treeview_menu);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- callbacks.h 28 Jul 2004 22:12:28 -0000 1.3
+++ callbacks.h 29 Jul 2004 22:38:20 -0000 1.4
@@ -30,13 +30,9 @@
#include <gtk/gtk.h>
void on_menu_save_activate (GtkMenuItem *menuitem,
- gpointer user_data);
+ gpointer user_data);
void on_menu_quit_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-void on_new_button (GtkButton *button, gpointer user_data);
-void on_change_icon_button (GtkButton *button, gpointer user_data);
-void on_save_button (GtkButton *button, gpointer user_data);
-void on_delete_button (GtkButton *button, gpointer user_data);
+ gpointer user_data);
void on_descrenderer_edited (GtkCellRendererText *celltext,
const gchar *string_path,
const gchar *new_text,
@@ -47,6 +43,24 @@
gpointer data);
void on_iconcolumn_clicked (GtkTreeViewColumn *treeviewcolumn,
gpointer user_data);
+void on_menu_info_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+void
+on_toolbutton_save_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_toolbutton_new_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_toolbutton_icon_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_toolbutton_del_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
#define ICON_SIZE_AUTO_STRING "auto (64x64 limit)"
#define ICON_SIZE1_STRING "64x64"
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e16menuedit2.c 29 Jul 2004 21:28:29 -0000 1.5
+++ e16menuedit2.c 29 Jul 2004 22:38:20 -0000 1.6
@@ -41,7 +41,6 @@
GtkWidget *main_window;
GtkWidget *treeview_menu;
GladeXML *main_xml;
- GtkWidget *toolbar1;
char app_dir[PATH_MAX];
char package[] = "librsvg-2.0";
char good_version[] = "2.7.1";
@@ -77,8 +76,8 @@
treeview_menu = glade_xml_get_widget (main_xml, "treeview_menu");
create_tree_model (treeview_menu);
- toolbar1 = glade_xml_get_widget (main_xml, "toolbar1");
- create_toolbar (toolbar1, treeview_menu);
+ /* bind callbacks manual. Is Glade too stupid for it? */
+ bind_toolbar_callbacks (main_xml, treeview_menu);
/* create initial directories */
sprintf (app_dir, "%s/%s/%s", homedir (getuid ()), APP_HOME, ICON_DIR);
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/toolbar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toolbar.c 28 Jul 2004 22:12:28 -0000 1.1
+++ toolbar.c 29 Jul 2004 22:38:20 -0000 1.2
@@ -28,52 +28,45 @@
#include "callbacks.h"
#include "nls.h"
-void create_toolbar (GtkWidget *toolbar1, GtkWidget *treeview_menu)
+void bind_toolbar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu)
{
- GtkToolItem *toolitem1;
+ GtkWidget *toolbar1;
+ GtkWidget *toolitem1;
- /* new entry toolbar button */
- toolitem1 = gtk_tool_button_new_from_stock (GTK_STOCK_NEW);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), toolitem1, TB_NEW);
- gtk_widget_show (GTK_WIDGET (toolitem1));
- gtk_tool_item_set_tooltip (toolitem1, GTK_TOOLBAR (toolbar1)->tooltips,
- _("New Entry"), "");
- g_signal_connect (toolitem1, "clicked",
- G_CALLBACK (on_new_button), treeview_menu);
+ toolbar1 = glade_xml_get_widget (main_xml, "toolbar1");
- /* change icon toolbar button */
- toolitem1 = gtk_tool_button_new_from_stock (GTK_STOCK_SELECT_COLOR);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), toolitem1, TB_CHANGE_ICON);
- gtk_widget_show (GTK_WIDGET (toolitem1));
- gtk_tool_item_set_tooltip (toolitem1, GTK_TOOLBAR (toolbar1)->tooltips,
- _("Change Icon"), "");
+ /* bind callbacks */
+ toolitem1 = glade_xml_get_widget (main_xml, "toolbutton_save");
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolitem1),
+ GTK_TOOLBAR (toolbar1)->tooltips,
+ _("Save"), "");
g_signal_connect (toolitem1, "clicked",
- G_CALLBACK (on_change_icon_button), treeview_menu);
+ G_CALLBACK (on_toolbutton_save_clicked), treeview_menu);
- /* save toolbar button */
- toolitem1 = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), toolitem1, TB_SAVE);
- gtk_widget_show (GTK_WIDGET (toolitem1));
- gtk_tool_item_set_tooltip (toolitem1, GTK_TOOLBAR (toolbar1)->tooltips,
- _("Save Menu"), "");
+ toolitem1 = glade_xml_get_widget (main_xml, "toolbutton_new");
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolitem1),
+ GTK_TOOLBAR (toolbar1)->tooltips,
+ _("New Entry"), "");
g_signal_connect (toolitem1, "clicked",
- G_CALLBACK (on_save_button), treeview_menu);
+ G_CALLBACK (on_toolbutton_new_clicked), treeview_menu);
- /* delete toolbar button */
- toolitem1 = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), toolitem1, TB_DELETE);
- gtk_widget_show (GTK_WIDGET (toolitem1));
- gtk_tool_item_set_tooltip (toolitem1, GTK_TOOLBAR (toolbar1)->tooltips,
- _("Delete Entry or Submenu"), "");
+ toolitem1 = glade_xml_get_widget (main_xml, "toolbutton_icon");
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolitem1),
+ GTK_TOOLBAR (toolbar1)->tooltips,
+ _("Choose Icon"), "");
g_signal_connect (toolitem1, "clicked",
- G_CALLBACK (on_delete_button), treeview_menu);
+ G_CALLBACK (on_toolbutton_icon_clicked), treeview_menu);
- /* quit toolbar button */
- toolitem1 = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar1), toolitem1, TB_QUIT);
- gtk_widget_show (GTK_WIDGET (toolitem1));
- gtk_tool_item_set_tooltip (toolitem1, GTK_TOOLBAR (toolbar1)->tooltips,
- _("Quit Menu Editor"), "");
+ toolitem1 = glade_xml_get_widget (main_xml, "toolbutton_del");
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolitem1),
+ GTK_TOOLBAR (toolbar1)->tooltips,
+ _("Delete Entry"), "");
g_signal_connect (toolitem1, "clicked",
- G_CALLBACK (gtk_main_quit), NULL);
+ G_CALLBACK (on_toolbutton_del_clicked), treeview_menu);
+
+ toolitem1 = glade_xml_get_widget (main_xml, "toolbutton_quit");
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolitem1),
+ GTK_TOOLBAR (toolbar1)->tooltips,
+ _("Quit"), "");
+
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/toolbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toolbar.h 28 Jul 2004 22:12:28 -0000 1.1
+++ toolbar.h 29 Jul 2004 22:38:20 -0000 1.2
@@ -28,19 +28,11 @@
#define _TOOLBAR_H
#include <gtk/gtk.h>
+#include <glade/glade.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-void create_toolbar (GtkWidget *toolbar1, GtkWidget *treeview_menu);
-
-enum toolbar_buttons
-{
- TB_NEW,
- TB_CHANGE_ICON,
- TB_SAVE,
- TB_DELETE,
- TB_QUIT
-};
+void bind_toolbar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu);
#endif /* _TOOLBAR_H */
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
