[Glade-devel] [patch, glade3] remove some declarations
- From: pborelli katamail com (paolo borelli)
- Subject: [Glade-devel] [patch, glade3] remove some declarations
- Date: 24 Apr 2003 18:34:25 +0200
--=-rnrOc/EXzE0ZYEK0eStc
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Hi!
The attached trivial patch move some functions in glade-project-window.c
so that the declarations at the top of the file can be removed. It also
makes sense because after the patch all the callbacks for the menu items
are consecutive.
ciao
paolo
--=-rnrOc/EXzE0ZYEK0eStc
Content-Disposition: attachment; filename=kill_declarations.patch
Content-Type: text/x-patch; name=kill_declarations.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit
diff -upr gnome2/glade3/ChangeLog glade3/ChangeLog
--- gnome2/glade3/ChangeLog 2003-04-23 04:42:11.000000000 +0200
+++ glade3/ChangeLog 2003-04-24 18:26:57.000000000 +0200
@@ -1,3 +1,7 @@
+2003-04-24 Paolo Borelli <pborelli katamail com>
+
+ * src/glade-project-window.c: cleanups.
+
2003-04-22 Joaquin Cuenca Abela <e98cuenc yahoo com>
* src/main.c: remove the command line that you usually get on a
diff -upr gnome2/glade3/src/glade-project-window.c glade3/src/glade-project-window.c
--- gnome2/glade3/src/glade-project-window.c 2003-04-23 04:42:12.000000000 +0200
+++ glade3/src/glade-project-window.c 2003-04-24 16:32:31.000000000 +0200
@@ -42,21 +42,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkstock.h>
-static void gpw_new_cb (void);
-static void gpw_open_cb (void);
-static void gpw_save_cb (void);
-static void gpw_save_as_cb (void);
-static void gpw_quit_cb (void);
-
-static void gpw_toggle_palette_cb (void);
-static void gpw_toggle_editor_cb (void);
-static void gpw_toggle_widget_tree_cb (void);
-static void gpw_toggle_clipboard_cb (void);
-
-static void gpw_undo_cb (void);
-static void gpw_redo_cb (void);
-static void gpw_about_cb (void) {}
-
static void
gpw_new_cb (void)
@@ -335,189 +320,6 @@ gpw_redo_cb (void)
glade_command_redo ();
}
-static GtkItemFactoryEntry menu_items[] =
-{
- /* ============ FILE ============ */
- { "/_File", NULL, 0, 0, "<Branch>" },
- { "/File/_New", "<control>N", gpw_new_cb, 1, "<StockItem>", GTK_STOCK_NEW },
- { "/File/_Open", "<control>O", gpw_open_cb, 2, "<StockItem>", GTK_STOCK_OPEN },
- { "/File/sep1", NULL, NULL, 0, "<Separator>" },
- { "/File/_Save", "<control>S", gpw_save_cb, 3, "<StockItem>", GTK_STOCK_SAVE },
- { "/File/Save _As...", "<control><shift>S", gpw_save_as_cb, 4, "<StockItem>", GTK_STOCK_SAVE_AS },
- { "/File/sep2", NULL, NULL, 0, "<Separator>" },
- { "/File/_Quit", "<control>Q", gpw_quit_cb, 5, "<StockItem>", GTK_STOCK_QUIT },
-
- /* ============ EDIT ============ */
- { "/Edit", NULL, 0, 0, "<Branch>" },
- { "/Edit/_Undo", "<control>Z", gpw_undo_cb, 6, "<StockItem>", GTK_STOCK_UNDO },
- { "/Edit/_Redo", "<control>R", gpw_redo_cb, 7, "<StockItem>", GTK_STOCK_REDO },
- { "/Edit/sep1", NULL, NULL, 0, "<Separator>" },
- { "/Edit/C_ut", NULL, gpw_cut_cb, 8, "<StockItem>", GTK_STOCK_CUT },
- { "/Edit/_Copy", NULL, gpw_copy_cb, 9, "<StockItem>", GTK_STOCK_COPY },
- { "/Edit/_Paste", NULL, gpw_paste_cb, 10, "<StockItem>", GTK_STOCK_PASTE },
- { "/Edit/_Delete", "Delete", gpw_delete_cb, 11, "<StockItem>", GTK_STOCK_DELETE },
-
- /* ============ VIEW ============ */
- { "/View", NULL, 0, 0, "<Branch>" },
- { "/View/_Palette", NULL, gpw_toggle_palette_cb, 12, "<ToggleItem>" },
- { "/View/Property _Editor", NULL, gpw_toggle_editor_cb, 13, "<ToggleItem>" },
- { "/View/_Widget Tree", NULL, gpw_toggle_widget_tree_cb, 14, "<ToggleItem>" },
- { "/View/_Clipboard", NULL, gpw_toggle_clipboard_cb, 15, "<ToggleItem>" },
-
- /* =========== PROJECT ========== */
- { "/Project", NULL, 0, 0, "<Branch>" },
-
- /* ============ HELP ============ */
- { "/_Help", NULL, NULL, 0, "<Branch>" },
- { "/Help/_About", NULL, gpw_about_cb, 16 },
-};
-
-/*
- * Note! The action number in menu_items MUST match the position in this array
- */
-static const gchar *menu_tips[] =
-{
- NULL, /* action 0 (branches and separators) */
- N_("Create a new project file"), /* action 1 (New) */
- N_("Open a project file"), /* action 2 (Open) */
- N_("Save the current project file"), /* action 3 (Save) */
- N_("Save the current project file with a different name"), /* action 4 (Save as) */
- N_("Quit the program"), /* action 5 (Quit) */
-
- N_("Undo the last action"), /* action 6 (Undo) */
- N_("Redo the last action"), /* action 7 (Redo) */
- N_("Cut the selection"), /* action 8 (Cut) */
- N_("Copy the selection"), /* action 9 (Copy) */
- N_("Paste the clipboard"), /* action 10 (Paste) */
- N_("Delete the selection"), /* action 11 (Delete) */
-
- N_("Change the visibility of the palette of widgets"), /* action 12 (Palette) */
- N_("Change the visibility of the property editor"), /* action 13 (Editor) */
- N_("Change the visibility of the project widget tree"), /* action 14 (Tree) */
- N_("Change the visibility of the clipboard"), /* action 15 (Clipboard) */
-
- N_("About this application"), /* action 16 (About) */
-};
-
-
-static void
-gpw_push_statusbar_hint (GtkWidget* menuitem, const char *tip)
-{
- GladeProjectWindow *gpw;
-
- gpw = glade_project_window_get ();
- gtk_statusbar_push (GTK_STATUSBAR (gpw->statusbar), gpw->statusbar_menu_context_id, tip);
-}
-
-static void
-gpw_pop_statusbar_hint (GtkWidget* menuitem, gpointer not_used)
-{
- GladeProjectWindow *gpw;
-
- gpw = glade_project_window_get ();
- gtk_statusbar_pop (GTK_STATUSBAR (gpw->statusbar), gpw->statusbar_menu_context_id);
-}
-
-static void
-gpw_construct_menu (GladeProjectWindow *gpw)
-{
- GtkItemFactory *item_factory;
- GtkAccelGroup *accel_group;
- unsigned int i;
-
- /* Accelerators */
- accel_group = gtk_accel_group_new ();
- gtk_window_add_accel_group (GTK_WINDOW (gpw->window), accel_group);
-
- /* Item factory */
- item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
- gpw->item_factory = item_factory;
- g_object_ref (G_OBJECT (item_factory));
- gtk_object_sink (GTK_OBJECT (item_factory));
- g_object_set_data_full (G_OBJECT (gpw->window),
- "<main>",
- item_factory,
- (GDestroyNotify) g_object_unref);
-
- /* create menu items */
- gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
- menu_items, gpw->window);
- gtk_box_pack_start_defaults (GTK_BOX (gpw->main_vbox),
- gtk_item_factory_get_widget (item_factory, "<main>"));
-
- /* set the tooltips */
- for (i = 1; i < G_N_ELEMENTS (menu_tips); i++) {
- GtkWidget *item;
-
- item = gtk_item_factory_get_widget_by_action (item_factory, i);
- g_signal_connect (G_OBJECT (item), "select",
- G_CALLBACK (gpw_push_statusbar_hint),
- (void*) menu_tips[i]);
- g_signal_connect (G_OBJECT (item), "deselect",
- G_CALLBACK (gpw_pop_statusbar_hint),
- NULL);
- }
-}
-
-static void
-gpw_construct_toolbar (GladeProjectWindow *gpw)
-{
- GtkWidget *toolbar;
-
- toolbar = gtk_toolbar_new ();
-
- gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
- GTK_STOCK_OPEN,
- "Open project",
- NULL,
- G_CALLBACK (gpw_open_cb),
- gpw, -1);
- gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
- GTK_STOCK_SAVE,
- "Save the current project",
- NULL,
- G_CALLBACK (gpw_save_cb),
- gpw, -1);
- gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
- gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
- GTK_STOCK_UNDO,
- "Undo the last action",
- NULL,
- G_CALLBACK (gpw_undo_cb),
- gpw, -1);
- gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
- GTK_STOCK_REDO,
- "Redo the last action",
- NULL,
- G_CALLBACK (gpw_redo_cb),
- gpw, -1);
- gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
- gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
- GTK_STOCK_QUIT,
- "Quit glade",
- NULL,
- G_CALLBACK (gpw_quit_cb),
- gpw, -1);
-
- gtk_widget_show (toolbar);
-
- gtk_box_pack_start_defaults (GTK_BOX (gpw->main_vbox),
- toolbar);
-}
-
-static void
-gpw_construct_statusbar (GladeProjectWindow *gpw)
-{
- GtkWidget *statusbar;
-
- statusbar = gtk_statusbar_new ();
- gpw->statusbar = statusbar;
- gpw->statusbar_menu_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar), "menu");
- gpw->statusbar_actions_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
"actions");
-
- gtk_box_pack_end_defaults (GTK_BOX (gpw->main_vbox), statusbar);
-}
-
static gboolean
gpw_hide_palette_on_delete (GtkWidget *palette, gpointer not_used,
GtkItemFactory *item_factory)
@@ -884,6 +686,194 @@ gpw_toggle_clipboard_cb (void)
gpw_hide_clipboard_view (gpw);
}
+static void gpw_about_cb (void)
+{
+/* write me... */
+}
+
+
+static GtkItemFactoryEntry menu_items[] =
+{
+ /* ============ FILE ============ */
+ { "/_File", NULL, 0, 0, "<Branch>" },
+ { "/File/_New", "<control>N", gpw_new_cb, 1, "<StockItem>", GTK_STOCK_NEW },
+ { "/File/_Open", "<control>O", gpw_open_cb, 2, "<StockItem>", GTK_STOCK_OPEN },
+ { "/File/sep1", NULL, NULL, 0, "<Separator>" },
+ { "/File/_Save", "<control>S", gpw_save_cb, 3, "<StockItem>", GTK_STOCK_SAVE },
+ { "/File/Save _As...", "<control><shift>S", gpw_save_as_cb, 4, "<StockItem>", GTK_STOCK_SAVE_AS },
+ { "/File/sep2", NULL, NULL, 0, "<Separator>" },
+ { "/File/_Quit", "<control>Q", gpw_quit_cb, 5, "<StockItem>", GTK_STOCK_QUIT },
+
+ /* ============ EDIT ============ */
+ { "/Edit", NULL, 0, 0, "<Branch>" },
+ { "/Edit/_Undo", "<control>Z", gpw_undo_cb, 6, "<StockItem>", GTK_STOCK_UNDO },
+ { "/Edit/_Redo", "<control>R", gpw_redo_cb, 7, "<StockItem>", GTK_STOCK_REDO },
+ { "/Edit/sep1", NULL, NULL, 0, "<Separator>" },
+ { "/Edit/C_ut", NULL, gpw_cut_cb, 8, "<StockItem>", GTK_STOCK_CUT },
+ { "/Edit/_Copy", NULL, gpw_copy_cb, 9, "<StockItem>", GTK_STOCK_COPY },
+ { "/Edit/_Paste", NULL, gpw_paste_cb, 10, "<StockItem>", GTK_STOCK_PASTE },
+ { "/Edit/_Delete", "Delete", gpw_delete_cb, 11, "<StockItem>", GTK_STOCK_DELETE },
+
+ /* ============ VIEW ============ */
+ { "/View", NULL, 0, 0, "<Branch>" },
+ { "/View/_Palette", NULL, gpw_toggle_palette_cb, 12, "<ToggleItem>" },
+ { "/View/Property _Editor", NULL, gpw_toggle_editor_cb, 13, "<ToggleItem>" },
+ { "/View/_Widget Tree", NULL, gpw_toggle_widget_tree_cb, 14, "<ToggleItem>" },
+ { "/View/_Clipboard", NULL, gpw_toggle_clipboard_cb, 15, "<ToggleItem>" },
+
+ /* =========== PROJECT ========== */
+ { "/Project", NULL, 0, 0, "<Branch>" },
+
+ /* ============ HELP ============ */
+ { "/_Help", NULL, NULL, 0, "<Branch>" },
+ { "/Help/_About", NULL, gpw_about_cb, 16 },
+};
+
+/*
+ * Note! The action number in menu_items MUST match the position in this array
+ */
+static const gchar *menu_tips[] =
+{
+ NULL, /* action 0 (branches and separators) */
+ N_("Create a new project file"), /* action 1 (New) */
+ N_("Open a project file"), /* action 2 (Open) */
+ N_("Save the current project file"), /* action 3 (Save) */
+ N_("Save the current project file with a different name"), /* action 4 (Save as) */
+ N_("Quit the program"), /* action 5 (Quit) */
+
+ N_("Undo the last action"), /* action 6 (Undo) */
+ N_("Redo the last action"), /* action 7 (Redo) */
+ N_("Cut the selection"), /* action 8 (Cut) */
+ N_("Copy the selection"), /* action 9 (Copy) */
+ N_("Paste the clipboard"), /* action 10 (Paste) */
+ N_("Delete the selection"), /* action 11 (Delete) */
+
+ N_("Change the visibility of the palette of widgets"), /* action 12 (Palette) */
+ N_("Change the visibility of the property editor"), /* action 13 (Editor) */
+ N_("Change the visibility of the project widget tree"), /* action 14 (Tree) */
+ N_("Change the visibility of the clipboard"), /* action 15 (Clipboard) */
+
+ N_("About this application"), /* action 16 (About) */
+};
+
+static void
+gpw_push_statusbar_hint (GtkWidget* menuitem, const char *tip)
+{
+ GladeProjectWindow *gpw;
+
+ gpw = glade_project_window_get ();
+ gtk_statusbar_push (GTK_STATUSBAR (gpw->statusbar), gpw->statusbar_menu_context_id, tip);
+}
+
+static void
+gpw_pop_statusbar_hint (GtkWidget* menuitem, gpointer not_used)
+{
+ GladeProjectWindow *gpw;
+
+ gpw = glade_project_window_get ();
+ gtk_statusbar_pop (GTK_STATUSBAR (gpw->statusbar), gpw->statusbar_menu_context_id);
+}
+
+static void
+gpw_construct_menu (GladeProjectWindow *gpw)
+{
+ GtkItemFactory *item_factory;
+ GtkAccelGroup *accel_group;
+ unsigned int i;
+
+ /* Accelerators */
+ accel_group = gtk_accel_group_new ();
+ gtk_window_add_accel_group (GTK_WINDOW (gpw->window), accel_group);
+
+ /* Item factory */
+ item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group);
+ gpw->item_factory = item_factory;
+ g_object_ref (G_OBJECT (item_factory));
+ gtk_object_sink (GTK_OBJECT (item_factory));
+ g_object_set_data_full (G_OBJECT (gpw->window),
+ "<main>",
+ item_factory,
+ (GDestroyNotify) g_object_unref);
+
+ /* create menu items */
+ gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items),
+ menu_items, gpw->window);
+ gtk_box_pack_start_defaults (GTK_BOX (gpw->main_vbox),
+ gtk_item_factory_get_widget (item_factory, "<main>"));
+
+ /* set the tooltips */
+ for (i = 1; i < G_N_ELEMENTS (menu_tips); i++) {
+ GtkWidget *item;
+
+ item = gtk_item_factory_get_widget_by_action (item_factory, i);
+ g_signal_connect (G_OBJECT (item), "select",
+ G_CALLBACK (gpw_push_statusbar_hint),
+ (void*) menu_tips[i]);
+ g_signal_connect (G_OBJECT (item), "deselect",
+ G_CALLBACK (gpw_pop_statusbar_hint),
+ NULL);
+ }
+}
+
+static void
+gpw_construct_toolbar (GladeProjectWindow *gpw)
+{
+ GtkWidget *toolbar;
+
+ toolbar = gtk_toolbar_new ();
+
+ gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+ GTK_STOCK_OPEN,
+ "Open project",
+ NULL,
+ G_CALLBACK (gpw_open_cb),
+ gpw, -1);
+ gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+ GTK_STOCK_SAVE,
+ "Save the current project",
+ NULL,
+ G_CALLBACK (gpw_save_cb),
+ gpw, -1);
+ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+ gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+ GTK_STOCK_UNDO,
+ "Undo the last action",
+ NULL,
+ G_CALLBACK (gpw_undo_cb),
+ gpw, -1);
+ gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+ GTK_STOCK_REDO,
+ "Redo the last action",
+ NULL,
+ G_CALLBACK (gpw_redo_cb),
+ gpw, -1);
+ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
+ gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar),
+ GTK_STOCK_QUIT,
+ "Quit glade",
+ NULL,
+ G_CALLBACK (gpw_quit_cb),
+ gpw, -1);
+
+ gtk_widget_show (toolbar);
+
+ gtk_box_pack_start_defaults (GTK_BOX (gpw->main_vbox),
+ toolbar);
+}
+
+static void
+gpw_construct_statusbar (GladeProjectWindow *gpw)
+{
+ GtkWidget *statusbar;
+
+ statusbar = gtk_statusbar_new ();
+ gpw->statusbar = statusbar;
+ gpw->statusbar_menu_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar), "menu");
+ gpw->statusbar_actions_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
"actions");
+
+ gtk_box_pack_end_defaults (GTK_BOX (gpw->main_vbox), statusbar);
+}
+
static gboolean
gpw_delete_event (GtkWindow *w, gpointer not_used)
{
--=-rnrOc/EXzE0ZYEK0eStc--
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
