diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/core/core.c | 2 | ||||
| -rw-r--r-- | src/gui/editor.c | 2 | ||||
| -rw-r--r-- | src/gui/menubar.c (renamed from src/gui/menus/menubar.c) | 224 | ||||
| -rw-r--r-- | src/gui/menubar.h (renamed from src/gui/menus/menubar.h) | 32 | ||||
| -rw-r--r-- | src/gui/menus/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/menus/binary.h | 2 | ||||
| -rw-r--r-- | src/gui/menus/edition.h | 2 | ||||
| -rw-r--r-- | src/gui/menus/options.h | 2 | ||||
| -rw-r--r-- | src/gui/menus/project.h | 2 | ||||
| -rw-r--r-- | src/gui/menus/view.h | 2 | 
11 files changed, 248 insertions, 24 deletions
| diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 18bda52..1bd4130 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -6,6 +6,7 @@ libgui_la_SOURCES =						\  	editor.h editor.c					\  	item-int.h							\  	item.h item.c						\ +	menubar.h menubar.c					\  	panel-int.h							\  	panel.h panel.c						\  	status.h status.c					\ diff --git a/src/gui/core/core.c b/src/gui/core/core.c index e6afc9a..5cfa1ed 100644 --- a/src/gui/core/core.c +++ b/src/gui/core/core.c @@ -27,7 +27,7 @@  #include "global.h"  #include "panels.h"  #include "theme.h" -#include "../menus/menubar.h" +#include "../menubar.h"  #include "../menus/view.h"  #include "../panels/welcome.h"  #include "../../core/params.h" diff --git a/src/gui/editor.c b/src/gui/editor.c index ea650d3..01d7264 100644 --- a/src/gui/editor.c +++ b/src/gui/editor.c @@ -35,10 +35,10 @@  #include "agroup.h" +#include "menubar.h"  #include "status.h"  #include "dialogs/loading.h"  #include "menus/file.h" -#include "menus/menubar.h"  #include "core/core.h"  #include "core/panels.h"  #include "core/global.h" diff --git a/src/gui/menus/menubar.c b/src/gui/menubar.c index 44761b9..55ff3fa 100644 --- a/src/gui/menus/menubar.c +++ b/src/gui/menubar.c @@ -28,17 +28,17 @@  #include <string.h> -#include "binary.h" -#include "debug.h" -#include "edition.h" -#include "file.h" -#include "help.h" -#include "options.h" -#include "plugins.h" -#include "project.h" -#include "view.h" -#include "../item-int.h" -#include "../core/global.h" +#include "item-int.h" +#include "core/global.h" +#include "menus/binary.h" +#include "menus/debug.h" +#include "menus/edition.h" +#include "menus/file.h" +#include "menus/help.h" +#include "menus/options.h" +#include "menus/plugins.h" +#include "menus/project.h" +#include "menus/view.h" @@ -283,7 +283,7 @@ static char *g_menu_bar_get_key(const GMenuBar *bar)  {      char *result;                           /* Description à renvoyer      */ -    result = strdup("menus"); +    result = strdup("menubar");      return result; @@ -417,3 +417,203 @@ static void update_menu_bar_for_project(GMenuBar *bar, GStudyProject *project)      update_menu_project_for_project(bar->project, project, bar);  } + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Fichier".          * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_file_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->file; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Edition".          * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_edition_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->edition; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Affichage".        * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_view_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->view; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Projet".           * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_project_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->project; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Binaire".          * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_binary_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->binary; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Débogage".         * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_debug_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->debug; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Options".          * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_options_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->options; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} + + +/****************************************************************************** +*                                                                             * +*  Paramètres  : bar = instance à consulter.                                  * +*                                                                             * +*  Description : Fournit le composant GTK associé au menu "Aide".             * +*                                                                             * +*  Retour      : Instance de composant graphique correspondant au menu visé.  * +*                                                                             * +*  Remarques   : -                                                            * +*                                                                             * +******************************************************************************/ + +GtkWidget *g_menu_bar_get_help_menu(const GMenuBar *bar) +{ +    GtkWidget *result;                      /* Menu à renvoyer             */ + +    result = bar->help; + +    g_object_ref(G_OBJECT(result)); + +    return result; + +} diff --git a/src/gui/menus/menubar.h b/src/gui/menubar.h index 5b77dc6..1a1b23c 100644 --- a/src/gui/menus/menubar.h +++ b/src/gui/menubar.h @@ -22,11 +22,11 @@   */ -#ifndef _GUI_MENUS_MENUBAR_H -#define _GUI_MENUS_MENUBAR_H +#ifndef _GUI_MENUBAR_H +#define _GUI_MENUBAR_H -#include "../item.h" +#include "item.h" @@ -51,6 +51,30 @@ GType g_menu_bar_get_type(void);  /* Compose la barre de menus principale. */  GEditorItem *g_menu_bar_new(GObject *); +/* Fournit le composant GTK associé au menu "Fichier". */ +GtkWidget *g_menu_bar_get_file_menu(const GMenuBar *); +/* Fournit le composant GTK associé au menu "Edition". */ +GtkWidget *g_menu_bar_get_edition_menu(const GMenuBar *); -#endif  /* _GUI_MENUS_MENUBAR_H */ +/* Fournit le composant GTK associé au menu "Affichage". */ +GtkWidget *g_menu_bar_get_view_menu(const GMenuBar *); + +/* Fournit le composant GTK associé au menu "Projet". */ +GtkWidget *g_menu_bar_get_project_menu(const GMenuBar *); + +/* Fournit le composant GTK associé au menu "Binaire". */ +GtkWidget *g_menu_bar_get_binary_menu(const GMenuBar *); + +/* Fournit le composant GTK associé au menu "Débogage". */ +GtkWidget *g_menu_bar_get_debug_menu(const GMenuBar *); + +/* Fournit le composant GTK associé au menu "Options". */ +GtkWidget *g_menu_bar_get_options_menu(const GMenuBar *); + +/* Fournit le composant GTK associé au menu "Aide". */ +GtkWidget *g_menu_bar_get_help_menu(const GMenuBar *); + + + +#endif  /* _GUI_MENUBAR_H */ diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am index 49214e1..4218374 100644 --- a/src/gui/menus/Makefile.am +++ b/src/gui/menus/Makefile.am @@ -7,7 +7,6 @@ libguimenus_la_SOURCES =				\  	edition.h edition.c					\  	file.h file.c						\  	help.h help.c						\ -	menubar.h menubar.c					\  	options.h options.c					\  	plugins.h plugins.c					\  	project.h project.c					\ diff --git a/src/gui/menus/binary.h b/src/gui/menus/binary.h index ed98b7c..056b918 100644 --- a/src/gui/menus/binary.h +++ b/src/gui/menus/binary.h @@ -29,7 +29,7 @@  #include <gtk/gtk.h> -#include "menubar.h" +#include "../menubar.h"  #include "../../analysis/loaded.h" diff --git a/src/gui/menus/edition.h b/src/gui/menus/edition.h index 9dd8c27..909d5ec 100644 --- a/src/gui/menus/edition.h +++ b/src/gui/menus/edition.h @@ -29,7 +29,7 @@  #include <gtk/gtk.h> -#include "menubar.h" +#include "../menubar.h"  #include "../../glibext/gloadedpanel.h" diff --git a/src/gui/menus/options.h b/src/gui/menus/options.h index f73d659..7176a09 100644 --- a/src/gui/menus/options.h +++ b/src/gui/menus/options.h @@ -29,7 +29,7 @@  #include <gtk/gtk.h> -#include "menubar.h" +#include "../menubar.h" diff --git a/src/gui/menus/project.h b/src/gui/menus/project.h index 5257694..6fddf74 100644 --- a/src/gui/menus/project.h +++ b/src/gui/menus/project.h @@ -29,7 +29,7 @@  #include <gtk/gtk.h> -#include "menubar.h" +#include "../menubar.h"  #include "../../analysis/project.h" diff --git a/src/gui/menus/view.h b/src/gui/menus/view.h index f230b85..3d4b69f 100644 --- a/src/gui/menus/view.h +++ b/src/gui/menus/view.h @@ -29,7 +29,7 @@  #include <gtk/gtk.h> -#include "menubar.h" +#include "../menubar.h"  #include "../../glibext/gloadedpanel.h" | 
