diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2011-01-03 01:22:36 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2011-01-03 01:22:36 (GMT) |
| commit | 9776f811af66eca56116fe81f77d859fb9b6e8fe (patch) | |
| tree | 63329a5b60e84528e10733ded7013c8eb81a9996 /src/editor.c | |
| parent | 651c94450df8619c26e26a133289dbaa197616f4 (diff) | |
Moved all menus related stuff into 'src/gui/menus'.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@205 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/editor.c')
| -rw-r--r-- | src/editor.c | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/src/editor.c b/src/editor.c index 7e5bb80..78d890e 100644 --- a/src/editor.c +++ b/src/editor.c @@ -52,11 +52,10 @@ #include "gtkext/gtkviewpanel.h" #include "debug/debugger.h" -#include "dialogs/about.h" #include "dialogs/binparts.h" #include "dialogs/export.h" #include "dialogs/plugins.h" -#include "gui/editem.h" +#include "gui/menus/menubar.h" #include "gui/tb/source.h" #include "panels/panel.h" @@ -146,9 +145,6 @@ void update_debug_menu_items(GObject *, gboolean); -/* Réagit avec le menu "Aide -> A propos de...". */ -static void mcb_help_about(GtkMenuItem *, GObject *); - @@ -201,6 +197,7 @@ GtkWidget *create_editor(void) { GtkWidget *result; /* Fenêtre à renvoyer */ GObject *ref; /* Version de référence */ + GEditorItem *editem; /* Menus réactifs principaux */ GtkWidget *menuboard; /* Barre de menus principale */ GtkWidget *menuitem; /* Elément de menu */ GtkWidget *menubar; /* Support pour éléments */ @@ -272,6 +269,13 @@ GtkWidget *create_editor(void) /* Intégration des menus */ + editem = g_menu_bar_new(ref); + menuboard = g_editor_item_get_widget(editem); + gtk_box_pack_start(GTK_BOX(vbox1), menuboard, FALSE, FALSE, 0); + + + + menuboard = gtk_menu_bar_new(); gtk_widget_show(menuboard); gtk_box_pack_start(GTK_BOX(vbox1), menuboard, FALSE, FALSE, 0); @@ -451,15 +455,7 @@ GtkWidget *create_editor(void) - menuitem = gtk_menu_item_new_with_mnemonic(_("_Help")); - gtk_widget_show(menuitem); - gtk_container_add(GTK_CONTAINER(menuboard), menuitem); - - menubar = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menubar); - submenuitem = qck_create_menu_item(NULL, NULL, _("About"), G_CALLBACK(mcb_help_about), result); - gtk_container_add(GTK_CONTAINER(menubar), submenuitem); /* Barre d'outils */ @@ -1428,28 +1424,6 @@ void update_debug_menu_items(GObject *ref, gboolean stopped) -/****************************************************************************** -* * -* Paramètres : menuitem = élément de menu sélectionné. * -* ref = adresse de l'espace de référencement global. * -* * -* Description : Réagit avec le menu "Aide -> A propos de...". * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -static void mcb_help_about(GtkMenuItem *menuitem, GObject *ref) -{ - GtkWidget *dialog; /* Boîte de dialogue à montrer */ - - dialog = create_about_dialog(GTK_WINDOW(ref)); - gtk_widget_show(dialog); - -} - |