[prev in list] [next in list] [prev in thread] [next in thread]
List: enlightenment-svn
Subject: E CVS: tools andreas99
From: enlightenment-cvs () lists ! sourceforge ! net
Date: 2004-07-31 22:31:22
Message-ID: E1Br2Nu-0000we-AX () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2/src
Modified Files:
Makefile.am callbacks.c callbacks.h e16menuedit2.c
Removed Files:
toolbar.c toolbar.h
Log Message:
lot of minor changes
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 28 Jul 2004 22:12:28 -0000 1.2
+++ Makefile.am 31 Jul 2004 22:31:22 -0000 1.3
@@ -26,9 +26,7 @@
e16menu.c\
e16menu.h\
treeview.c\
- treeview.h\
- toolbar.c\
- toolbar.h
+ treeview.h
e16menuedit2_LDFLAGS =
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.c 29 Jul 2004 22:38:20 -0000 1.7
+++ callbacks.c 31 Jul 2004 22:31:22 -0000 1.8
@@ -38,6 +38,70 @@
#include "e16menu.h"
#include "treeview.h"
+void bind_toolbar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu)
+{
+ GtkWidget *toolbar1;
+ GtkWidget *toolitem1;
+
+ toolbar1 = glade_xml_get_widget (main_xml, "toolbar1");
+
+ /* 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_toolbutton_save_clicked), treeview_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_toolbutton_new_clicked), treeview_menu);
+
+ 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_toolbutton_icon_clicked), treeview_menu);
+
+ 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 (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"), "");
+}
+
+void bind_menubar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu)
+{
+ GtkWidget *menuitem;
+
+ menuitem = glade_xml_get_widget (main_xml, "menu_save");
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (on_menu_save_activate), treeview_menu);
+
+ menuitem = glade_xml_get_widget (main_xml, "menu_new");
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (on_menu_new_activate), treeview_menu);
+
+ menuitem = glade_xml_get_widget (main_xml, "menu_icon");
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (on_menu_icon_activate), treeview_menu);
+
+ menuitem = glade_xml_get_widget (main_xml, "menu_delete");
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (on_menu_delete_activate), treeview_menu);
+
+}
+
void on_descrenderer_edited (GtkCellRendererText *celltext,
const gchar *string_path,
const gchar *new_text,
@@ -90,21 +154,31 @@
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)
{
+ GladeXML *info_xml;
+ GtkWidget *info_window;
+ GtkWidget *logo_image;
+
+ info_xml = glade_xml_new (PACKAGE_SOURCE_DIR"/e16menuedit2.glade",
+ "info_window", NULL);
+ glade_xml_signal_autoconnect (info_xml);
+
+ info_window = glade_xml_get_widget (info_xml, "info_window");
+
+ logo_image = glade_xml_get_widget (info_xml, "logo_image");
+
+ gtk_image_set_from_file (GTK_IMAGE (logo_image),
+ PACKAGE_PIXMAPS_DIR"/e16menuedit2-icon.png");
+
+
+ gtk_widget_show (info_window);
}
-void
-on_toolbutton_save_clicked (GtkToolButton *toolbutton,
- gpointer user_data)
+void on_toolbutton_save_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
{
GtkWidget *treeview_menu;
@@ -113,9 +187,8 @@
}
-void
-on_toolbutton_new_clicked (GtkToolButton *toolbutton,
- gpointer user_data)
+void on_toolbutton_new_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
{
GtkWidget *treeview_menu;
@@ -124,17 +197,39 @@
}
-void
-on_toolbutton_icon_clicked (GtkToolButton *toolbutton,
- gpointer user_data)
+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)
+void on_toolbutton_del_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ delete_table_row (treeview_menu);
+}
+
+void on_menu_new_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkWidget *treeview_menu;
+
+ treeview_menu = (GtkWidget*) user_data;
+ new_table_row (treeview_menu);
+}
+
+void on_menu_icon_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ open_icon_chooser ((GtkWidget *) user_data);
+}
+
+void on_menu_delete_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
{
GtkWidget *treeview_menu;
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- callbacks.h 29 Jul 2004 22:38:20 -0000 1.4
+++ callbacks.h 31 Jul 2004 22:31:22 -0000 1.5
@@ -28,39 +28,7 @@
#define _CALLBACKS_H
#include <gtk/gtk.h>
-
-void on_menu_save_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-void on_menu_quit_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-void on_descrenderer_edited (GtkCellRendererText *celltext,
- const gchar *string_path,
- const gchar *new_text,
- gpointer data);
-void on_paramsrenderer_edited (GtkCellRendererText *celltext,
- const gchar *string_path,
- const gchar *new_text,
- 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);
-
+#include <glade/glade.h>
#define ICON_SIZE_AUTO_STRING "auto (64x64 limit)"
#define ICON_SIZE1_STRING "64x64"
@@ -80,4 +48,38 @@
#define ICON_SIZE6 22
#define ICON_SIZE7 16
+void bind_toolbar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu);
+void bind_menubar_callbacks (GladeXML *main_xml, GtkWidget *treeview_menu);
+void on_menu_save_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+void on_descrenderer_edited (GtkCellRendererText *celltext,
+ const gchar *string_path,
+ const gchar *new_text,
+ gpointer data);
+void on_paramsrenderer_edited (GtkCellRendererText *celltext,
+ const gchar *string_path,
+ const gchar *new_text,
+ 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);
+void on_menu_new_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+void on_menu_icon_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+void on_menu_delete_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
#endif /* _CALLBACKS_H */
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e16menuedit2.c 29 Jul 2004 22:38:20 -0000 1.6
+++ e16menuedit2.c 31 Jul 2004 22:31:22 -0000 1.7
@@ -32,7 +32,6 @@
#include "callbacks.h"
#include "e16menu.h"
#include "treeview.h"
-#include "toolbar.h"
int librsvg_cmp;
@@ -78,6 +77,7 @@
/* bind callbacks manual. Is Glade too stupid for it? */
bind_toolbar_callbacks (main_xml, treeview_menu);
+ bind_menubar_callbacks (main_xml, treeview_menu);
/* create initial directories */
sprintf (app_dir, "%s/%s/%s", homedir (getuid ()), APP_HOME, ICON_DIR);
@@ -86,6 +86,7 @@
/* get librsvg version and check if good enough */
version = pkg_config_version (package);
librsvg_cmp = version_cmp (version, good_version);
+ g_free (version);
gtk_widget_show (main_window);
-------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic