[ghex] Port from BonoboUI to GtkUIManager
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ghex] Port from BonoboUI to GtkUIManager
- Date: Mon, 1 Aug 2011 08:35:04 +0000 (UTC)
commit e65bd0563b5ea32cc6ba33ec1c5af36957fd1791
Author: Kalev Lember <kalevlember gmail com>
Date: Sun Jul 31 23:44:25 2011 +0300
Port from BonoboUI to GtkUIManager
configure.ac | 2 -
src/Makefile.am | 4 +-
src/accessiblegtkhex.c | 2 -
src/chartable.c | 1 +
src/converter.c | 1 +
src/findreplace.c | 1 +
src/ghex-ui.xml | 292 +++++-----------------
src/ghex-window.c | 662 +++++++++++++++++++++++++++++++-----------------
src/ghex-window.h | 29 ++-
src/hex-document-ui.c | 35 +--
src/main.c | 6 +-
src/preferences.c | 1 +
src/ui.c | 251 ++++++++++++-------
src/ui.h | 61 +++--
14 files changed, 735 insertions(+), 613 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4112381..9aee896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,6 @@ AC_DEFINE_UNQUOTED(LIBGTKHEX_RELEASE_STRING, "$LIBGTKHEX_RELEASE_STRING",
PKG_CHECK_MODULES(LIBGTKHEX,
gtk+-2.0 >= 2.24.0 \
- libbonobo-2.0 \
atk >= 1.0.0)
AC_SUBST(LIBGTKHEX_LIBS)
AC_SUBST(LIBGTKHEX_CFLAGS)
@@ -45,7 +44,6 @@ PKG_CHECK_MODULES(GHEX,
gio-2.0 \
gtk+-2.0 >= 2.24.0 \
gconf-2.0 \
- libbonoboui-2.0 \
libgnomeprintui-2.2)
AC_SUBST(GHEX_CFLAGS)
AC_SUBST(GHEX_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 753d14b..46ceb77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
-DGNOMELOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
-DLOCALEDIR=\"${prefix}/${DATADIRNAME}/locale\" \
- -DDATADIR=\""$(datadir)"\" \
+ -DGHEXDATADIR=\""$(pkgdatadir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(GHEX_CFLAGS) $(GAILUTIL_CFLAGS) \
$(WARN_CFLAGS) \
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libgtkhex.la
libgtkhexdir = $(includedir)/gtkhex/
-uidir = $(datadir)/gnome-2.0/ui/
+uidir = $(pkgdatadir)
libgtkhex_la_SOURCES = \
hex-document.c \
diff --git a/src/accessiblegtkhex.c b/src/accessiblegtkhex.c
index 42688bf..2f48129 100644
--- a/src/accessiblegtkhex.c
+++ b/src/accessiblegtkhex.c
@@ -29,8 +29,6 @@
#include <atk/atk.h>
#include <libgail-util/gailmisc.h>
-#include <bonobo.h>
-
#include "accessiblegtkhex.h"
#include "gtkhex.h"
#include "gtkhex-private.h"
diff --git a/src/chartable.c b/src/chartable.c
index ba9b6d0..27bdc91 100644
--- a/src/chartable.c
+++ b/src/chartable.c
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
#include "chartable.h"
#include "ghex-window.h"
diff --git a/src/converter.c b/src/converter.c
index aaf99bd..84cd9c8 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -32,6 +32,7 @@
#include <string.h> /* for strncpy */
#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
#include "gtkhex.h"
#include "converter.h"
diff --git a/src/findreplace.c b/src/findreplace.c
index 4f8ff0e..661a497 100644
--- a/src/findreplace.c
+++ b/src/findreplace.c
@@ -26,6 +26,7 @@
#endif
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include "findreplace.h"
#include "ui.h"
diff --git a/src/ghex-ui.xml b/src/ghex-ui.xml
index e89a1d0..67d8785 100644
--- a/src/ghex-ui.xml
+++ b/src/ghex-ui.xml
@@ -1,233 +1,59 @@
-<Root>
-
-<commands>
- <cmd name="FileOpen" _label="Open"
- _tip="Open a file" pixtype="stock" pixname="gtk-open"
- accel="*Control*O"/>
-
- <cmd name="FileSave" _label="Save"
- _tip="Save the current file" pixtype="stock" pixname="gtk-save"
- accel="*Control*S"/>
-
- <cmd name="FileSaveAs" _label="Save As"
- _tip="Save the current file with a different name"
- pixtype="stock" pixname="gtk-save-as" accel="*Shift**Control*S"/>
-
- <cmd name="ExportToHTML" _label="Export to HTML..."
- _tip="Export data to HTML source"/>
-
- <cmd name="FileRevert" _label="Revert"
- _tip="Revert to a saved version of the file"
- pixtype="stock" pixname="gtk-revert-to-saved"/>
-
- <cmd name="FilePrint" _label="Print"
- _tip="Print the current file" pixtype="stock" pixname="gtk-print"
- accel="*Control*P"/>
-
- <cmd name="FilePrintPreview" _label="Print Preview..."
- _tip="Preview printed data"
- pixtype="stock" pixname="gtk-print-preview"
- accel="*Shift**Control*P"/>
-
- <cmd name="FileClose" _label="Close"
- _tip="Close the current file" pixtype="stock" pixname="gtk-close"
- accel="*Control*W"/>
-
- <cmd name="FileExit" _label="Exit" _tip="Exit the program"
- pixtype="stock" pixname="gtk-quit" accel="*Control*Q"/>
-
- <cmd name="Converter" type="toggle" _label="Converter..."
- _tip="Open base conversion dialog"/>
-
- <cmd name="CharacterTable" type="toggle" _label="Character Table..."
- _tip="Show the character table"/>
-
- <cmd name="TypeDialog" type="toggle"
- _label="Type Conversion Dialog..."
- _tip="Show the type conversion dialog in the edit window"/>
-
- <cmd name="EditUndo" _label="Undo" _tip="Undo the last action"
- pixtype="stock" pixname="gtk-undo" accel="*Control*Z"/>
-
- <cmd name="EditRedo" _label="Redo" _tip="Redo the undone action"
- pixtype="stock" pixname="gtk-redo" accel="*Shift**Control*Z"/>
-
- <cmd name="EditPaste" _label="Paste" _tip="Paste data from clipboard"
- pixtype="stock" pixname="gtk-paste" accel="*Control*V"/>
-
- <cmd name="EditCopy" _label="Copy" _tip="Copy selection to clipboard"
- pixtype="stock" pixname="gtk-copy" accel="*Control*C"/>
-
- <cmd name="EditCut" _label="Cut" _tip="Cut selection"
- pixtype="stock" pixname="gtk-cut" accel="*Control*X"/>
-
- <cmd name="Find" _label="Find" _tip="Search for a string"
- pixtype="stock" pixname="gtk-find" accel="*Control*F"/>
-
- <cmd name="AdvancedFind" _label="Advanced Find" _tip="Advanced Find"
- pixtype="stock" pixname="gtk-find"/>
-
- <cmd name="Replace" _label="Replace" _tip="Replace a string"
- pixtype="stock" pixname="gtk-find-and-replace"
- accel="*Control*H"/>
-
- <cmd name="GoToByte" _label="Goto Byte"
- _tip="Jump to a certain position"
- accel="*Control*J"/>
-
- <cmd name="InsertMode" _label="Insert Mode"
- _tip="Insert/overwrite data"
- type="toggle" accel="Insert"/>
-
- <cmd name="Bytes" _label="Bytes" _tip="Group data by 8 bits"
- type="radio" group="Group"/>
-
- <cmd name="Words" _label="Words" _tip="Group data by 16 bits"
- type="radio" group="Group"/>
-
- <cmd name="Longwords" _label="Longwords" _tip="Group data by 32 bits"
- type="radio" group="Group"/>
-
- <cmd name="AddView" _label="Add View"
- _tip="Add a new view to the buffer"/>
-
- <cmd name="RemoveView" _label="Remove View"
- _tip="Remove the current view of the buffer"/>
-
- <cmd name="Preferences" _label="Preferences"
- _tip="Configure the application"
- pixtype="stock" pixname="gtk-preferences"/>
-
- <cmd name="HelpChat..." _label="Help Chat" _tip=""/>
-
- <cmd name="About" _label="_About" _tip="About this application"
- pixtype="stock" pixname="About"/>
-
- <cmd name="Help" _label="Contents" _tip="Help on this application"
- pixtype="stock" pixname="gtk-help" accel="F1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-
- <menuitem name="FileOpen" verb="" _label="_Open..."/>
-
- <separator/>
-
- <menuitem name="FileSave" verb="" _label="_Save"/>
-
- <menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-
- <menuitem name="ExportToHTML" verb="" _label="Save As _HTML..."/>
-
- <separator/>
-
- <menuitem name="FileRevert" verb="" _label="_Revert"/>
-
- <separator/>
-
- <menuitem name="FilePrint" verb="" _label="_Print"/>
-
- <menuitem name="FilePrintPreview" verb="" _label="Print Previe_w..."/>
-
- <separator/>
-
- <menuitem name="FileClose" verb="" _label="_Close"/>
-
- <menuitem name="FileExit" verb="" _label="E_xit"/>
-
-</submenu>
-
-<submenu name="Edit" _label="_Edit" hidden="0">
-
- <menuitem name="EditUndo" verb="" _label="_Undo"/>
-
- <menuitem name="EditRedo" verb="" _label="_Redo"/>
-
- <separator/>
-
- <menuitem name="EditCopy" verb="" _label="_Copy"/>
- <menuitem name="EditCut" verb="" _label="Cu_t"/>
- <menuitem name="EditPaste" verb="" _label="Pa_ste"/>
-
- <separator/>
-
- <menuitem name="Find" verb="" _label="_Find"/>
-
- <menuitem name="AdvancedFind" verb="" _label="_Advanced Find"/>
-
- <menuitem name="Replace" verb="" _label="R_eplace"/>
-
- <separator/>
-
- <menuitem name="GoToByte" verb="" _label="_Goto Byte..."/>
-
- <separator/>
-
- <menuitem name="InsertMode" verb="" _label="_Insert Mode"
- type="toggle"/>
-
- <separator/>
-
- <menuitem name="Preferences" verb="" _label="_Preferences"/>
-
-</submenu>
-
-<submenu name="View" _label="_View" hidden="1">
-
- <menuitem name="AddView" verb="" _label="_Add View"/>
-
- <menuitem name="RemoveView" verb="" _label="_Remove View"/>
-
- <separator/>
-
- <submenu name="GroupDataAs" _label="_Group Data As">
-
- <menuitem name="Bytes" verb="" _label="_Bytes"
- type="radio" group="Group"/>
-
- <menuitem name="Words" verb="" _label="_Words"
- type="radio" group="Group"/>
-
- <menuitem name="Longwords" verb="" _label="_Longwords"
- type="radio" group="Group"/>
-
- </submenu>
-
-</submenu>
-
-<submenu name="Windows" _label="_Windows">
- <placeholder delimit="bottom" name="OpenDocuments" />
-
- <separator/>
-
- <menuitem name="CharacterTable" type="toggle" verb=""
- _label="Character _Table"/>
-
- <menuitem name="Converter" type="toggle" verb=""
- _label="_Base Converter"/>
-
- <menuitem name="TypeDialog" type="toggle" verb=""
- _label="Type Conversion _Dialog"/>
-</submenu>
-
-<submenu name="Help" _label="_Help">
-
- <menuitem name="Help" verb="" _label="_Contents"/>
-
- <menuitem name="About" verb="" _label="_About"/>
-
-</submenu>
-
-</menu>
-
-<status>
-
- <item name="main"/>
-
-</status>
-
-</Root>
-
+<ui>
+ <menubar name="MainMenu">
+ <menu action="File">
+ <menuitem action="FileOpen"/>
+ <separator/>
+ <menuitem action="FileSave"/>
+ <menuitem action="FileSaveAs"/>
+ <menuitem action="FileExportToHTML"/>
+ <separator/>
+ <menuitem action="FileRevert"/>
+ <separator/>
+ <menuitem action="FilePrint"/>
+ <menuitem action="FilePrintPreview"/>
+ <separator/>
+ <menuitem action="FileClose"/>
+ <menuitem action="FileExit"/>
+ </menu>
+
+ <menu action="Edit">
+ <menuitem action="EditUndo"/>
+ <menuitem action="EditRedo"/>
+ <separator/>
+ <menuitem action="EditCopy"/>
+ <menuitem action="EditCut"/>
+ <menuitem action="EditPaste"/>
+ <separator/>
+ <menuitem action="EditFind"/>
+ <menuitem action="EditAdvancedFind"/>
+ <menuitem action="EditReplace"/>
+ <separator/>
+ <menuitem action="EditGotoByte"/>
+ <separator/>
+ <menuitem action="EditInsertMode"/>
+ <separator/>
+ <menuitem action="EditPreferences"/>
+ </menu>
+ <menu action="View">
+ <menuitem action="ViewAddView"/>
+ <menuitem action="ViewRemoveView"/>
+ <separator/>
+ <menu action="GroupDataAs">
+ <menuitem action="Bytes"/>
+ <menuitem action="Words"/>
+ <menuitem action="Longwords"/>
+ </menu>
+ </menu>
+ <menu action="Windows">
+ <placeholder name="OpenDocuments"/>
+ <separator/>
+ <menuitem action="CharacterTable"/>
+ <menuitem action="Converter"/>
+ <menuitem action="TypeDialog"/>
+ </menu>
+ <menu action="Help">
+ <menuitem action="HelpContents"/>
+ <menuitem action="HelpAbout"/>
+ </menu>
+ </menubar>
+</ui>
diff --git a/src/ghex-window.c b/src/ghex-window.c
index 04bdb0c..7397331 100644
--- a/src/ghex-window.c
+++ b/src/ghex-window.c
@@ -11,11 +11,8 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-ui-main.h>
-
#include <gio/gio.h>
+#include <glib/gi18n.h>
#include <math.h>
#include <ctype.h>
@@ -33,7 +30,7 @@
#define GHEX_WINDOW_DEFAULT_WIDTH 320
#define GHEX_WINDOW_DEFAULT_HEIGHT 256
-G_DEFINE_TYPE (GHexWindow, ghex_window, BONOBO_TYPE_WINDOW)
+G_DEFINE_TYPE (GHexWindow, ghex_window, GTK_TYPE_WINDOW)
static GList *window_list = NULL;
static GHexWindow *active_window = NULL;
@@ -164,52 +161,78 @@ ghex_window_focus_in_event(GtkWidget *win, GdkEventFocus *event)
}
void
+ghex_window_set_action_visible (GHexWindow *win,
+ const char *name,
+ gboolean visible)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (win->action_group, name);
+ gtk_action_set_visible (action, visible);
+}
+
+void
+ghex_window_set_action_sensitive (GHexWindow *win,
+ const char *name,
+ gboolean sensitive)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (win->action_group, name);
+ gtk_action_set_sensitive (action, sensitive);
+}
+
+static void
+ghex_window_set_toggle_action_active (GHexWindow *win,
+ const char *name,
+ gboolean active)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (win->action_group, name);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
+}
+
+static gboolean
+ghex_window_get_toggle_action_active (GHexWindow *win,
+ const char *name)
+{
+ GtkAction *action;
+
+ action = gtk_action_group_get_action (win->action_group, name);
+ return gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+}
+
+void
ghex_window_set_sensitivity (GHexWindow *win)
{
- BonoboUIComponent *uic = win->uic;
gboolean allmenus = (win->gh != NULL);
win->undo_sens = (allmenus && (win->gh->document->undo_top != NULL));
win->redo_sens = (allmenus && (win->gh->document->undo_stack != NULL && win->gh->document->undo_top != win->gh->document->undo_stack));
- bonobo_ui_component_freeze(uic, NULL);
- bonobo_ui_component_set_prop (uic, "/menu/View", "hidden",
- allmenus?"0":"1", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FileClose", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FileSave", "sensitive",
- (allmenus && win->gh->document->changed)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FileSaveAs", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/ExportToHTML", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FileRevert", "sensitive",
- (allmenus && win->gh->document->changed)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FilePrint", "sensitive",
- allmenus ?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/FilePrintPreview", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/Find", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/Replace", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/AdvancedFind", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/GoToByte", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/InsertMode", "sensitive",
- allmenus?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/EditUndo", "sensitive",
- (allmenus && win->undo_sens)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/EditRedo", "sensitive",
- (allmenus && win->redo_sens)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/EditCut", "sensitive",
- (allmenus)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/EditCopy", "sensitive",
- (allmenus)?"1":"0", NULL);
- bonobo_ui_component_set_prop (uic, "/commands/EditPaste", "sensitive",
- (allmenus)?"1":"0", NULL);
- bonobo_ui_component_thaw(uic, NULL);
+ ghex_window_set_action_visible (win, "View", allmenus);
+
+ /* File menu */
+ ghex_window_set_action_sensitive (win, "FileClose", allmenus);
+ ghex_window_set_action_sensitive (win, "FileSave", allmenus && win->gh->document->changed);
+ ghex_window_set_action_sensitive (win, "FileSaveAs", allmenus);
+ ghex_window_set_action_sensitive (win, "FileExportToHTML", allmenus);
+ ghex_window_set_action_sensitive (win, "FileRevert", allmenus && win->gh->document->changed);
+ ghex_window_set_action_sensitive (win, "FilePrint", allmenus);
+ ghex_window_set_action_sensitive (win, "FilePrintPreview", allmenus);
+
+ /* Edit menu */
+ ghex_window_set_action_sensitive (win, "EditFind", allmenus);
+ ghex_window_set_action_sensitive (win, "EditReplace", allmenus);
+ ghex_window_set_action_sensitive (win, "EditAdvancedFind", allmenus);
+ ghex_window_set_action_sensitive (win, "EditGotoByte", allmenus);
+ ghex_window_set_action_sensitive (win, "EditInsertMode", allmenus);
+ ghex_window_set_action_sensitive (win, "EditUndo", allmenus && win->undo_sens);
+ ghex_window_set_action_sensitive (win, "EditRedo", allmenus && win->redo_sens);
+ ghex_window_set_action_sensitive (win, "EditCut", allmenus);
+ ghex_window_set_action_sensitive (win, "EditCopy", allmenus);
+ ghex_window_set_action_sensitive (win, "EditPaste", allmenus);
}
static void
@@ -228,14 +251,12 @@ ghex_window_doc_changed(HexDocument *doc, HexChangeData *change_data,
else if(push_undo) {
if(win->undo_sens != ( win->gh->document->undo_top == NULL)) {
win->undo_sens = (win->gh->document->undo_top != NULL);
- bonobo_ui_component_set_prop (win->uic, "/commands/EditUndo", "sensitive",
- win->undo_sens?"1":"0", NULL);
+ ghex_window_set_action_sensitive (win, "EditUndo", win->undo_sens);
}
if(win->redo_sens != (win->gh->document->undo_stack != NULL && (win->gh->document->undo_stack != win->gh->document->undo_top))) {
win->redo_sens = (win->gh->document->undo_stack != NULL &&
(win->gh->document->undo_top != win->gh->document->undo_stack));
- bonobo_ui_component_set_prop (win->uic, "/commands/EditRedo", "sensitive",
- win->redo_sens?"1":"0", NULL);
+ ghex_window_set_action_sensitive (win, "EditRedo", win->redo_sens);
}
}
}
@@ -250,10 +271,6 @@ ghex_window_destroy(GtkObject *object)
win = GHEX_WINDOW(object);
- if(win->uic) {
- bonobo_object_unref(win->uic);
- win->uic = NULL;
- }
if(win->gh) {
hex_document_remove_view(win->gh->document, GTK_WIDGET(win->gh));
g_signal_handlers_disconnect_matched(win->gh->document,
@@ -263,6 +280,20 @@ ghex_window_destroy(GtkObject *object)
win);
win->gh = NULL;
}
+
+ if (win->action_group) {
+ g_object_unref (win->action_group);
+ win->action_group = NULL;
+ }
+ if (win->doc_list_action_group) {
+ g_object_unref (win->doc_list_action_group);
+ win->doc_list_action_group = NULL;
+ }
+ if (win->ui_manager) {
+ g_object_unref (win->ui_manager);
+ win->ui_manager = NULL;
+ }
+
if (win->dialog)
{
g_object_unref (G_OBJECT(win->dialog));
@@ -272,7 +303,7 @@ ghex_window_destroy(GtkObject *object)
window_list = g_list_remove(window_list, win);
if(window_list == NULL) {
- bonobo_main_quit();
+ gtk_main_quit ();
active_window = NULL;
}
else if(active_window == win)
@@ -289,6 +320,274 @@ ghex_window_delete_event(GtkWidget *widget, GdkEventAny *e)
return TRUE;
}
+/* Normal items */
+static const GtkActionEntry action_entries [] = {
+ { "File", NULL, "_File" },
+ { "Edit", NULL, "_Edit" },
+ { "View", NULL, "_View" },
+ { "GroupDataAs", NULL, "_Group Data As" }, // View submenu
+ { "Windows", NULL, "_Windows" },
+ { "Help", NULL, "_Help" },
+
+ /* File menu */
+ { "FileOpen", GTK_STOCK_OPEN, "_Open...", "<control>O",
+ "Open a file",
+ G_CALLBACK (open_cb) },
+ { "FileSave", GTK_STOCK_SAVE, "_Save", "<control>S",
+ "Save the current file",
+ G_CALLBACK (save_cb) },
+ { "FileSaveAs", GTK_STOCK_SAVE_AS, "Save _As...", "<shift><control>S",
+ "Save the current file with a different name",
+ G_CALLBACK (save_as_cb) },
+ { "FileExportToHTML", NULL, "Save As _HTML...", NULL,
+ "Export data to HTML source",
+ G_CALLBACK (export_html_cb) },
+ { "FileRevert", GTK_STOCK_REVERT_TO_SAVED, "_Revert", NULL,
+ "Revert to a saved version of the file",
+ G_CALLBACK (revert_cb) },
+ { "FilePrint", GTK_STOCK_PRINT, "_Print", "<control>P",
+ "Print the current file",
+ G_CALLBACK (print_cb) },
+ { "FilePrintPreview", GTK_STOCK_PRINT_PREVIEW, "Print Previe_w...", "<shift><control>P",
+ "Preview printed data",
+ G_CALLBACK (print_preview_cb) },
+ { "FileClose", GTK_STOCK_CLOSE, "_Close", "<control>W",
+ "Close the current file",
+ G_CALLBACK (close_cb) },
+ { "FileExit", GTK_STOCK_QUIT, "E_xit", "<control>Q",
+ "Exit the program",
+ G_CALLBACK (quit_app_cb) },
+
+ /* Edit menu */
+ { "EditUndo", GTK_STOCK_UNDO, "_Undo", "<control>Z",
+ "Undo the last action",
+ G_CALLBACK (undo_cb) },
+ { "EditRedo", GTK_STOCK_REDO, "_Redo", "<shift><control>Z",
+ "Redo the undone action",
+ G_CALLBACK (redo_cb) },
+ { "EditCopy", GTK_STOCK_COPY, "_Copy", "<control>C",
+ "Copy selection to clipboard",
+ G_CALLBACK (copy_cb) },
+ { "EditCut", GTK_STOCK_CUT, "Cu_t", "<control>X",
+ "Cut selection",
+ G_CALLBACK (cut_cb) },
+ { "EditPaste", GTK_STOCK_PASTE, "Pa_ste", "<control>V",
+ "Paste data from clipboard",
+ G_CALLBACK (paste_cb) },
+ { "EditFind", GTK_STOCK_FIND, "_Find", "<control>F",
+ "Search for a string",
+ G_CALLBACK (find_cb) },
+ { "EditAdvancedFind", GTK_STOCK_FIND, "_Advanced Find", NULL,
+ "Advanced Find",
+ G_CALLBACK (advanced_find_cb) },
+ { "EditReplace", GTK_STOCK_FIND_AND_REPLACE, "R_eplace", "<control>H",
+ "Replace a string",
+ G_CALLBACK (replace_cb) },
+ { "EditGotoByte", NULL, "_Goto Byte...", "<control>J",
+ "Jump to a certain position",
+ G_CALLBACK (jump_cb) },
+ { "EditPreferences", GTK_STOCK_PREFERENCES, "_Preferences", NULL,
+ "Configure the application",
+ G_CALLBACK (prefs_cb) },
+
+ /* View menu */
+ { "ViewAddView", NULL, "_Add View", NULL,
+ "Add a new view to the buffer",
+ G_CALLBACK (add_view_cb) },
+ { "ViewRemoveView", NULL, "_Remove View", NULL,
+ "Remove the current view of the buffer",
+ G_CALLBACK (remove_view_cb) },
+
+ /* Help menu */
+ { "HelpContents", GTK_STOCK_HELP, "_Contents", "F1",
+ "Help on this application",
+ G_CALLBACK (help_cb) },
+ { "HelpAbout", GTK_STOCK_ABOUT, "_About", NULL,
+ "About this application",
+ G_CALLBACK (about_cb) }
+};
+
+/* Toggle items */
+static const GtkToggleActionEntry toggle_entries[] = {
+ /* Edit menu */
+ { "EditInsertMode", NULL, "_Insert Mode", "Insert",
+ "Insert/overwrite data",
+ G_CALLBACK (insert_mode_cb), FALSE },
+
+ /* Windows menu */
+ { "CharacterTable", NULL, "Character _Table", NULL,
+ "Show the character table",
+ G_CALLBACK (character_table_cb), FALSE },
+ { "Converter", NULL, "_Base Converter", NULL,
+ "Open base conversion dialog",
+ G_CALLBACK (converter_cb), FALSE },
+ { "TypeDialog", NULL, "Type Conversion _Dialog", NULL,
+ "Show the type conversion dialog in the edit window",
+ G_CALLBACK (type_dialog_cb), TRUE }
+};
+
+/* Radio items in View -> Group Data As */
+static GtkRadioActionEntry group_data_entries[] = {
+ { "Bytes", NULL, "_Bytes", NULL,
+ "Group data by 8 bits", GROUP_BYTE },
+ { "Words", NULL, "_Words", NULL,
+ "Group data by 16 bits", GROUP_WORD },
+ { "Longwords", NULL, "_Longwords", NULL,
+ "Group data by 32 bits", GROUP_LONG }
+};
+
+static void
+menu_item_selected_cb (GtkWidget *item,
+ GHexWindow *window)
+{
+ GtkAction *action;
+ gchar *tooltip;
+
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
+ g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL);
+
+ if (tooltip != NULL)
+ gtk_statusbar_push (GTK_STATUSBAR (window->statusbar),
+ window->statusbar_tooltip_id,
+ tooltip);
+
+ g_free (tooltip);
+}
+
+static void
+menu_item_deselected_cb (GtkWidget *item,
+ GHexWindow *window)
+{
+ gtk_statusbar_pop (GTK_STATUSBAR (window->statusbar),
+ window->statusbar_tooltip_id);
+}
+
+static void
+connect_proxy_cb (GtkUIManager *ui,
+ GtkAction *action,
+ GtkWidget *proxy,
+ GHexWindow *window)
+{
+ if (!GTK_IS_MENU_ITEM (proxy))
+ return;
+
+ g_signal_connect (G_OBJECT (proxy), "select",
+ G_CALLBACK (menu_item_selected_cb), window);
+ g_signal_connect (G_OBJECT (proxy), "deselect",
+ G_CALLBACK (menu_item_deselected_cb), window);
+}
+
+static void
+disconnect_proxy_cb (GtkUIManager *manager,
+ GtkAction *action,
+ GtkWidget *proxy,
+ GHexWindow *window)
+{
+ if (!GTK_IS_MENU_ITEM (proxy))
+ return;
+
+ g_signal_handlers_disconnect_by_func
+ (proxy, G_CALLBACK (menu_item_selected_cb), window);
+ g_signal_handlers_disconnect_by_func
+ (proxy, G_CALLBACK (menu_item_deselected_cb), window);
+}
+
+void
+ghex_window_set_contents (GHexWindow *win,
+ GtkWidget *child)
+{
+ if (win->contents)
+ gtk_widget_destroy (win->contents);
+
+ win->contents = child;
+ gtk_box_pack_start (GTK_BOX (win->vbox), win->contents, TRUE, TRUE, 0);
+}
+
+void
+ghex_window_destroy_contents (GHexWindow *win)
+{
+ gtk_widget_destroy (win->contents);
+ win->contents = NULL;
+}
+
+static GObject *
+ghex_window_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params)
+{
+ GObject *object;
+ GHexWindow *window;
+ GtkWidget *menubar;
+ GError *error = NULL;
+ gchar *ui_path;
+
+ object = G_OBJECT_CLASS (ghex_window_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_params);
+ window = GHEX_WINDOW (object);
+
+ window->ui_merge_id = 0;
+ window->ui_manager = gtk_ui_manager_new ();
+ g_signal_connect (G_OBJECT (window->ui_manager), "connect-proxy",
+ G_CALLBACK (connect_proxy_cb), window);
+ g_signal_connect (G_OBJECT (window->ui_manager), "disconnect-proxy",
+ G_CALLBACK (disconnect_proxy_cb), window);
+
+ /* Action group for static menu items */
+ window->action_group = gtk_action_group_new ("GHexActions");
+ gtk_action_group_set_translation_domain (window->action_group,
+ GETTEXT_PACKAGE);
+ gtk_action_group_add_actions (window->action_group, action_entries,
+ G_N_ELEMENTS (action_entries),
+ window);
+ gtk_action_group_add_toggle_actions (window->action_group, toggle_entries,
+ G_N_ELEMENTS (toggle_entries),
+ window);
+ gtk_action_group_add_radio_actions (window->action_group, group_data_entries,
+ G_N_ELEMENTS (group_data_entries),
+ GROUP_BYTE,
+ G_CALLBACK (group_data_cb),
+ window);
+ gtk_ui_manager_insert_action_group (window->ui_manager,
+ window->action_group, 0);
+ gtk_window_add_accel_group (GTK_WINDOW (window),
+ gtk_ui_manager_get_accel_group (window->ui_manager));
+
+ /* Action group for open documents */
+ window->doc_list_action_group = gtk_action_group_new ("DocListActions");
+ gtk_ui_manager_insert_action_group (window->ui_manager,
+ window->doc_list_action_group, 0);
+
+ /* Load menu description from file */
+ ui_path = g_build_filename (GHEXDATADIR, "ghex-ui.xml", NULL);
+ if (!gtk_ui_manager_add_ui_from_file (window->ui_manager, ui_path, &error)) {
+ g_warning ("Failed to load ui: %s", error->message);
+ g_error_free (error);
+ }
+ g_free (ui_path);
+
+ window->vbox = gtk_vbox_new (FALSE, 0);
+
+ /* Attach menu */
+ menubar = gtk_ui_manager_get_widget (window->ui_manager, "/MainMenu");
+ gtk_box_pack_start (GTK_BOX (window->vbox), menubar, FALSE, TRUE, 0);
+ gtk_widget_show (menubar);
+
+ window->contents = NULL;
+
+ /* Create statusbar */
+ window->statusbar = gtk_statusbar_new ();
+ window->statusbar_tooltip_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->statusbar),
+ "tooltip");
+ gtk_box_pack_end (GTK_BOX (window->vbox), window->statusbar, FALSE, TRUE, 0);
+ gtk_widget_show (window->statusbar);
+
+ gtk_container_add (GTK_CONTAINER (window), window->vbox);
+ gtk_widget_show (window->vbox);
+
+ return object;
+}
+
static void
ghex_window_class_init(GHexWindowClass *class)
{
@@ -300,6 +599,8 @@ ghex_window_class_init(GHexWindowClass *class)
object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
+ gobject_class->constructor = ghex_window_constructor;
+
object_class->destroy = ghex_window_destroy;
widget_class->delete_event = ghex_window_delete_event;
@@ -321,9 +622,7 @@ ghex_window_sync_converter_item(GHexWindow *win, gboolean state)
wnode = ghex_window_get_list();
while(wnode) {
if(GHEX_WINDOW(wnode->data) != win)
- bonobo_ui_component_set_prop (GHEX_WINDOW(wnode->data)->uic,
- "/commands/Converter", "state",
- state?"1":"0", NULL);
+ ghex_window_set_toggle_action_active (GHEX_WINDOW (wnode->data), "Converter", state);
wnode = wnode->next;
}
}
@@ -336,112 +635,15 @@ ghex_window_sync_char_table_item(GHexWindow *win, gboolean state)
wnode = ghex_window_get_list();
while(wnode) {
if(GHEX_WINDOW(wnode->data) != win)
- bonobo_ui_component_set_prop (GHEX_WINDOW(wnode->data)->uic,
- "/commands/CharacterTable", "state",
- state?"1":"0", NULL);
+ ghex_window_set_toggle_action_active (GHEX_WINDOW (wnode->data), "CharacterTable", state);
wnode = wnode->next;
}
}
-static void
-ghex_window_listener (BonoboUIComponent *uic,
- const char *path,
- Bonobo_UIComponent_EventType type,
- const char *state,
- gpointer user_data)
-{
- GHexWindow *win;
-
- g_return_if_fail (user_data != NULL);
- g_return_if_fail (GHEX_IS_WINDOW (user_data));
-
- if (type != Bonobo_UIComponent_STATE_CHANGED)
- return;
-
- win = GHEX_WINDOW(user_data);
-
- if (!strcmp (path, "InsertMode")) {
- if (win->gh != NULL)
- gtk_hex_set_insert_mode(win->gh, *state == '1');
- return;
- }
- else if(!strcmp (path, "Converter")) {
- if(!converter)
- converter = create_converter();
-
- if(state && atoi(state)) {
- if(!gtk_widget_get_visible(converter->window)) {
- gtk_window_set_position(GTK_WINDOW(converter->window), GTK_WIN_POS_MOUSE);
- gtk_widget_show(converter->window);
- }
- raise_and_focus_widget(converter->window);
-
- if (!ghex_window_get_active() && converter_get)
- gtk_widget_set_sensitive(converter_get, FALSE);
- else
- gtk_widget_set_sensitive(converter_get, TRUE);
- }
- else {
- if(gtk_widget_get_visible(converter->window))
- gtk_widget_hide(converter->window);
- }
- ghex_window_sync_converter_item(win, atoi(state));
- return;
- }
- else if(!strcmp (path, "CharacterTable")) {
- if(!char_table)
- char_table = create_char_table();
-
- if(state && atoi(state)) {
- if(!gtk_widget_get_visible(char_table)) {
- gtk_window_set_position(GTK_WINDOW(char_table), GTK_WIN_POS_MOUSE);
- gtk_widget_show(char_table);
- }
- raise_and_focus_widget(char_table);
- }
- else {
- if(gtk_widget_get_visible(char_table))
- gtk_widget_hide(GTK_WIDGET(char_table));
- }
- ghex_window_sync_char_table_item(win, atoi(state));
- return;
- }
- else if (strcmp(path, "TypeDialog") == 0)
- {
- if (!win->dialog)
- return;
- if (state && atoi(state)) {
- if (!gtk_widget_get_visible(win->dialog_widget))
- {
- gtk_widget_show(win->dialog_widget);
- }
- }
- else if (gtk_widget_get_visible(win->dialog_widget))
- {
- gtk_widget_hide(GTK_WIDGET(win->dialog_widget));
- }
- return;
- }
- if (!state || !atoi (state) || (win->gh == NULL))
- return;
-
- if (!strcmp (path, "Bytes"))
- gtk_hex_set_group_type(win->gh, GROUP_BYTE);
- else if (!strcmp (path, "Words"))
- gtk_hex_set_group_type(win->gh, GROUP_WORD);
- else if (!strcmp (path, "Longwords"))
- gtk_hex_set_group_type(win->gh, GROUP_LONG);
- else {
- g_warning("Unknown event: '%s'.", path);
- }
-}
-
GtkWidget *
ghex_window_new(void)
{
GHexWindow *win;
- BonoboUIContainer *ui_container;
- BonoboUIComponent *uic;
const GList *doc_list;
static const GtkTargetEntry drag_types[] = {
@@ -449,7 +651,6 @@ ghex_window_new(void)
};
win = GHEX_WINDOW(g_object_new(GHEX_TYPE_WINDOW,
- "win_name", "ghex",
"title", _("GHex"),
NULL));
@@ -459,38 +660,10 @@ ghex_window_new(void)
sizeof (drag_types) / sizeof (drag_types[0]),
GDK_ACTION_COPY);
- /* add menu and toolbar */
- ui_container = bonobo_window_get_ui_container(BONOBO_WINDOW(win));
- uic = bonobo_ui_component_new("ghex");
- win->uic = uic;
- bonobo_ui_component_set_container(uic, BONOBO_OBJREF(ui_container),
- NULL);
- bonobo_ui_util_set_ui(uic, DATADIR, "ghex-ui.xml", "GHex", NULL);
- bonobo_ui_component_add_verb_list_with_data(uic, ghex_verbs, win);
-
- bonobo_ui_component_add_listener (uic, "Bytes",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "Words",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "Longwords",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "InsertMode",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "Converter",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "CharacterTable",
- ghex_window_listener, win);
- bonobo_ui_component_add_listener (uic, "TypeDialog",
- ghex_window_listener, win);
- bonobo_ui_component_set_prop (uic, "/commands/Converter", "state",
- (converter && gtk_widget_get_visible(converter->window))?"1":"0",
- NULL);
- bonobo_ui_component_set_prop (uic, "/commands/CharacterTable", "state",
- (char_table && gtk_widget_get_visible(char_table))?"1":"0",
- NULL);
- bonobo_ui_component_set_prop (uic, "/commands/TypeDialog", "state",
- "1", NULL);
- bonobo_ui_component_set_prop (uic, "/status", "hidden", "0", NULL);
+ ghex_window_set_toggle_action_active (win, "Converter",
+ converter && gtk_widget_get_visible (converter->window));
+ ghex_window_set_toggle_action_active (win, "CharacterTable",
+ char_table && gtk_widget_get_visible (char_table));
ghex_window_set_sensitivity(win);
@@ -529,7 +702,7 @@ ghex_window_new_from_doc(HexDocument *doc)
gtk_widget_show(gh);
GHEX_WINDOW(win)->gh = GTK_HEX(gh);
- bonobo_window_set_contents(BONOBO_WINDOW(win), gh);
+ ghex_window_set_contents (GHEX_WINDOW (win), gh);
g_signal_connect(G_OBJECT(doc), "document_changed",
G_CALLBACK(ghex_window_doc_changed), win);
ghex_window_set_doc_name(GHEX_WINDOW(win),
@@ -562,13 +735,13 @@ ghex_window_sync_group_type(GHexWindow *win)
switch(win->gh->group_type) {
case GROUP_BYTE:
- group_path = "/commands/Bytes";
+ group_path = "Bytes";
break;
case GROUP_WORD:
- group_path = "/commands/Words";
+ group_path = "Words";
break;
case GROUP_LONG:
- group_path = "/commands/Longwords";
+ group_path = "Longwords";
break;
default:
group_path = NULL;
@@ -578,7 +751,7 @@ ghex_window_sync_group_type(GHexWindow *win)
if(group_path == NULL)
return;
- bonobo_ui_component_set_prop(win->uic, group_path, "state", "1", NULL);
+ ghex_window_set_toggle_action_active (win, group_path, TRUE);
}
void
@@ -642,7 +815,7 @@ ghex_window_load(GHexWindow *win, const gchar *filename)
GtkWidget *gh;
GtkWidget *vbox;
const GList *window_list;
- gchar *state;
+ gboolean active;
g_return_val_if_fail(win != NULL, FALSE);
g_return_val_if_fail(GHEX_IS_WINDOW(win), FALSE);
@@ -685,8 +858,8 @@ ghex_window_load(GHexWindow *win, const gchar *filename)
win->dialog = hex_dialog_new();
win->dialog_widget = hex_dialog_getview(win->dialog);
gtk_box_pack_start(GTK_BOX(vbox), win->dialog_widget, FALSE, FALSE, 4);
- state = bonobo_ui_component_get_prop (win->uic, "/commands/TypeDialog", "state", NULL);
- if ((state && atoi(state)) || !state)
+ active = ghex_window_get_toggle_action_active (win, "TypeDialog");
+ if (active)
{
gtk_widget_show(win->dialog_widget);
}
@@ -709,7 +882,7 @@ ghex_window_load(GHexWindow *win, const gchar *filename)
ghex_window_doc_changed,
win);
}
- bonobo_window_set_contents(BONOBO_WINDOW(win), vbox);
+ ghex_window_set_contents (win, vbox);
win->gh = GTK_HEX(gh);
win->changed = FALSE;
@@ -827,27 +1000,59 @@ encode_xml (const gchar* text)
return g_string_free (str, FALSE);
}
+static void
+ghex_window_doc_menu_update (GHexWindow *win)
+{
+ GList *items, *l;
+
+ /* Remove existing entries from UI manager */
+ if (win->ui_merge_id > 0) {
+ gtk_ui_manager_remove_ui (win->ui_manager,
+ win->ui_merge_id);
+ gtk_ui_manager_ensure_update (win->ui_manager);
+ }
+ win->ui_merge_id = gtk_ui_manager_new_merge_id (win->ui_manager);
+
+ /* Populate the UI with entries from the action group */
+ items = gtk_action_group_list_actions (win->doc_list_action_group);
+ for (l = items; l && l->data; l = g_list_next (l)) {
+ GtkAction *action;
+ const gchar *action_name;
+
+ action = (GtkAction *) l->data;
+ action_name = gtk_action_get_name (action);
+
+ gtk_ui_manager_add_ui (win->ui_manager,
+ win->ui_merge_id,
+ "/MainMenu/Windows/OpenDocuments",
+ action_name,
+ action_name,
+ GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+ }
+}
+
void
ghex_window_remove_doc_from_list(GHexWindow *win, HexDocument *doc)
{
- gchar *verb_name = g_strdup_printf("FilesFile_%p", doc);
- gchar *menu_path = g_strdup_printf("/menu/Windows/OpenDocuments/%s", verb_name);
- gchar *cmd_path = g_strdup_printf("/commands/%s", verb_name);
-
- bonobo_ui_component_remove_verb(win->uic, verb_name);
- bonobo_ui_component_rm(win->uic, cmd_path, NULL);
- bonobo_ui_component_rm(win->uic, menu_path, NULL);
-
- g_free(cmd_path);
- g_free(menu_path);
- g_free(verb_name);
+ GtkAction *action;
+ gchar *action_name;
+
+ action_name = g_strdup_printf ("FilesFile_%p", doc);
+ action = gtk_action_group_get_action (win->doc_list_action_group,
+ action_name);
+ g_free (action_name);
+
+ gtk_action_group_remove_action (win->doc_list_action_group,
+ action);
+ ghex_window_doc_menu_update (win);
}
void
ghex_window_add_doc_to_list(GHexWindow *win, HexDocument *doc)
{
- gchar *menu = NULL, *verb_name;
- gchar *cmd = NULL;
+ GtkAction *action;
+ gchar *action_name;
gchar *escaped_name;
gchar *tip;
@@ -855,21 +1060,21 @@ ghex_window_add_doc_to_list(GHexWindow *win, HexDocument *doc)
tip = g_strdup_printf(_("Activate file %s"), escaped_name);
g_free(escaped_name);
escaped_name = encode_xml_and_escape_underscores(doc->path_end);
- verb_name = g_strdup_printf("FilesFile_%p", doc);
- menu = g_strdup_printf("<menuitem name=\"%s\" verb=\"%s\" label=\"%s\"/>",
- verb_name, verb_name, escaped_name);
- cmd = g_strdup_printf("<cmd name=\"%s\" label=\"%s\" _tip=\"%s\"/>",
- verb_name, escaped_name, tip);
- g_free(tip);
- g_free(escaped_name);
+ action_name = g_strdup_printf ("FilesFile_%p", doc);
+
+ action = gtk_action_new (action_name, escaped_name, tip, NULL);
+ g_signal_connect (action, "activate",
+ G_CALLBACK (file_list_activated_cb),
+ (gpointer) doc);
+ gtk_action_group_add_action (win->doc_list_action_group,
+ action);
+ g_object_unref (action);
- bonobo_ui_component_set_translate(win->uic, "/menu/Windows/OpenDocuments", menu, NULL);
- bonobo_ui_component_set_translate(win->uic, "/commands/", cmd, NULL);
- bonobo_ui_component_add_verb(win->uic, verb_name, file_list_activated_cb, doc);
+ ghex_window_doc_menu_update (win);
- g_free(menu);
- g_free(cmd);
- g_free(verb_name);
+ g_free (tip);
+ g_free (escaped_name);
+ g_free (action_name);
}
const GList *
@@ -884,12 +1089,6 @@ ghex_window_get_active()
return active_window;
}
-BonoboUIComponent *
-ghex_window_get_ui_component(GHexWindow *win)
-{
- return win->uic;
-}
-
void
ghex_window_set_doc_name(GHexWindow *win, const gchar *name)
{
@@ -939,7 +1138,7 @@ static const guint32 flash_length = 3000; /* 3 seconds, I hope */
/**
* ghex_window_set_status
- * @win: Pointer a Bonobo window object.
+ * @win: Pointer to GHexWindow object.
* @msg: Text of message to be shown on the status bar.
*
* Description:
@@ -953,14 +1152,13 @@ ghex_window_show_status (GHexWindow *win, const gchar *msg)
g_return_if_fail (GHEX_IS_WINDOW (win));
g_return_if_fail (msg != NULL);
- if (strcmp (msg, " "))
- bonobo_ui_component_set_status (win->uic, " ", NULL);
- bonobo_ui_component_set_status (win->uic, msg, NULL);
+ gtk_statusbar_pop (GTK_STATUSBAR (win->statusbar), 0);
+ gtk_statusbar_push (GTK_STATUSBAR (win->statusbar), 0, msg);
}
/**
* ghex_window_flash
- * @app: Pointer a Bonobo window object
+ * @win: Pointer to GHexWindow object
* @flash: Text of message to be flashed
*
* Description:
diff --git a/src/ghex-window.h b/src/ghex-window.h
index ae7f2a9..d76966e 100644
--- a/src/ghex-window.h
+++ b/src/ghex-window.h
@@ -10,10 +10,7 @@
#ifndef __GHEX_WINDOW_H__
#define __GHEX_WINDOW_H__
-#include <bonobo-activation/bonobo-activation.h>
#include <gconf/gconf-client.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-ui-main.h>
#include <math.h>
#include <ctype.h>
@@ -34,10 +31,19 @@ typedef struct _GHexWindowClass GHexWindowClass;
struct _GHexWindow
{
- BonoboWindow win;
+ GtkWindow win;
+
+ GtkHex *gh;
+ GtkWidget *vbox;
+ GtkWidget *contents;
+ GtkWidget *statusbar;
+ guint statusbar_tooltip_id;
+
+ GtkActionGroup *action_group;
+ GtkActionGroup *doc_list_action_group;
+ GtkUIManager *ui_manager;
+ guint ui_merge_id;
- GtkHex *gh;
- BonoboUIComponent *uic;
gboolean changed, undo_sens, redo_sens;
struct _HexDialog *dialog;
@@ -48,20 +54,27 @@ struct _GHexWindow
struct _GHexWindowClass
{
- BonoboWindowClass klass;
+ GtkWindowClass klass;
};
GType ghex_window_get_type (void) G_GNUC_CONST;
GtkWidget *ghex_window_new (void);
GtkWidget *ghex_window_new_from_doc (HexDocument *doc);
GtkWidget *ghex_window_new_from_file (const gchar *filename);
+void ghex_window_set_contents (GHexWindow *win, GtkWidget *child);
+void ghex_window_destroy_contents (GHexWindow *win);
gboolean ghex_window_load(GHexWindow *win, const gchar *filename);
gboolean ghex_window_close (GHexWindow *win);
-BonoboUIComponent *ghex_window_get_ui_component (GHexWindow *win);
const GList *ghex_window_get_list (void);
GHexWindow *ghex_window_get_active (void);
void ghex_window_set_doc_name (GHexWindow *win,
const gchar *name);
+void ghex_window_set_action_visible (GHexWindow *win,
+ const char *name,
+ gboolean visible);
+void ghex_window_set_action_sensitive (GHexWindow *win,
+ const char *name,
+ gboolean sensitive);
void ghex_window_set_sensitivity (GHexWindow *win);
void ghex_window_show_status (GHexWindow *win,
const gchar *msg);
diff --git a/src/hex-document-ui.c b/src/hex-document-ui.c
index b4e4f0a..ad156b6 100644
--- a/src/hex-document-ui.c
+++ b/src/hex-document-ui.c
@@ -38,7 +38,6 @@ set_doc_menu_sensitivity(HexDocument *doc)
GtkWidget *view;
gboolean sensitive;
GHexWindow *win;
- BonoboUIComponent *uic;
view_node = doc->views;
@@ -49,31 +48,20 @@ set_doc_menu_sensitivity(HexDocument *doc)
g_return_if_fail (win != NULL);
- uic = ghex_window_get_ui_component(win);
-
- g_return_if_fail (uic != NULL);
-
- bonobo_ui_component_freeze (uic, NULL);
-
sensitive = doc->undo_top != NULL;
- bonobo_ui_component_set_prop (uic, "/commands/EditUndo",
- "sensitive", sensitive ? "1" : "0",
- NULL);
+ ghex_window_set_action_sensitive (win, "EditUndo", sensitive);
sensitive = doc->undo_stack && doc->undo_top != doc->undo_stack;
+ ghex_window_set_action_sensitive (win, "EditRedo", sensitive);
- bonobo_ui_component_set_prop (uic, "/commands/EditRedo",
- "sensitive", sensitive ? "1" : "0",
- NULL);
-
- bonobo_ui_component_thaw (uic, NULL);
view_node = view_node->next;
}
}
void
-find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+find_cb (GtkAction *action,
+ gpointer user_data)
{
if(!find_dialog)
find_dialog = create_find_dialog();
@@ -87,7 +75,8 @@ find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-advanced_find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+advanced_find_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
if (!win->advanced_find_dialog)
@@ -104,7 +93,8 @@ advanced_find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbn
void
-replace_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+replace_cb (GtkAction *action,
+ gpointer user_data)
{
if(!replace_dialog)
replace_dialog = create_replace_dialog();
@@ -118,7 +108,8 @@ replace_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-jump_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+jump_cb (GtkAction *action,
+ gpointer user_data)
{
if(!jump_dialog)
jump_dialog = create_jump_dialog();
@@ -132,7 +123,8 @@ jump_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-undo_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+undo_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
HexDocument *doc;
@@ -154,7 +146,8 @@ undo_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-redo_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+redo_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
HexDocument *doc;
diff --git a/src/main.c b/src/main.c
index a4a9186..c4ae071 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <glib/gi18n.h>
#include "configuration.h"
#include "factory.h"
@@ -69,9 +70,6 @@ main(int argc, char **argv)
/* accessibility setup */
setup_factory();
- if (bonobo_ui_init ("Gnome Binary Editor", VERSION, &argc, argv) == FALSE)
- g_error (_("Could not initialize Bonobo!\n"));
-
if (args_remaining != NULL) {
gchar **filename;
for (filename = args_remaining; *filename != NULL; filename++) {
@@ -100,7 +98,7 @@ main(int argc, char **argv)
}
else win = GTK_WIDGET(ghex_window_get_list()->data);
- bonobo_main();
+ gtk_main ();
return 0;
}
diff --git a/src/preferences.c b/src/preferences.c
index 182ac3b..53dfcf3 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -26,6 +26,7 @@
#endif /* HAVE_CONFIG_H */
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include "preferences.h"
#include "configuration.h"
diff --git a/src/ui.c b/src/ui.c
index 3584243..97eee71 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -26,6 +26,7 @@
#include <unistd.h> /* for F_OK and W_OK */
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprintui/gnome-print-dialog.h>
@@ -43,36 +44,6 @@ static void ghex_print_run_dialog(GHexPrintJobInfo *pji);
static void ghex_print_preview_real(GHexPrintJobInfo *pji);
static void ghex_print_document_real (GHexPrintJobInfo *pji, gboolean preview);
-/* callbacks to nullify widget pointer after a delete event */
-static void open_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void close_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void save_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void save_as_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void print_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void print_preview_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void export_html_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void revert_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void prefs_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void about_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void cut_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void copy_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void paste_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-static void help_cb (BonoboUIComponent *uic, gpointer user_data,
- const gchar* verbname);
-
guint group_type[3] = {
GROUP_BYTE,
GROUP_WORD,
@@ -91,33 +62,6 @@ gchar *search_type_label[] = {
N_("ASCII data"),
};
-BonoboUIVerb ghex_verbs [] = {
- BONOBO_UI_VERB ("FileOpen", open_cb),
- BONOBO_UI_VERB ("FileSave", save_cb),
- BONOBO_UI_VERB ("FileSaveAs", save_as_cb),
- BONOBO_UI_VERB ("ExportToHTML", export_html_cb),
- BONOBO_UI_VERB ("FileRevert", revert_cb),
- BONOBO_UI_VERB ("FilePrint", print_cb),
- BONOBO_UI_VERB ("FilePrintPreview", print_preview_cb),
- BONOBO_UI_VERB ("FileClose", close_cb),
- BONOBO_UI_VERB ("FileExit", quit_app_cb),
- BONOBO_UI_VERB ("EditUndo", undo_cb),
- BONOBO_UI_VERB ("EditRedo", redo_cb),
- BONOBO_UI_VERB ("EditCut", cut_cb),
- BONOBO_UI_VERB ("EditCopy", copy_cb),
- BONOBO_UI_VERB ("EditPaste", paste_cb),
- BONOBO_UI_VERB ("Find", find_cb),
- BONOBO_UI_VERB ("AdvancedFind", advanced_find_cb),
- BONOBO_UI_VERB ("Replace", replace_cb),
- BONOBO_UI_VERB ("GoToByte", jump_cb),
- BONOBO_UI_VERB ("AddView", add_view_cb),
- BONOBO_UI_VERB ("RemoveView", remove_view_cb),
- BONOBO_UI_VERB ("Preferences", prefs_cb),
- BONOBO_UI_VERB ("About", about_cb),
- BONOBO_UI_VERB ("Help", help_cb),
- BONOBO_UI_VERB_END
-};
-
void
cancel_cb(GtkWidget *w, GtkWidget *me)
{
@@ -188,8 +132,9 @@ create_dialog_title(GtkWidget *window, gchar *title)
/*
* callbacks for global menus
*/
-static void
-about_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+about_cb (GtkAction *action,
+ gpointer user_data)
{
gchar *license_translated;
@@ -246,8 +191,9 @@ about_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
g_free (license_translated);
}
-static void
-help_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
+void
+help_cb (GtkAction *action,
+ gpointer user_data)
{
GError *error = NULL;
@@ -274,7 +220,8 @@ help_cb (BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
}
void
-paste_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+paste_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
@@ -283,7 +230,8 @@ paste_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-copy_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+copy_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
@@ -292,7 +240,8 @@ copy_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-cut_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+cut_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
@@ -301,7 +250,8 @@ cut_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-quit_app_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+quit_app_cb (GtkAction *action,
+ gpointer user_data)
{
const GList *doc_node;
GHexWindow *win;
@@ -315,11 +265,12 @@ quit_app_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
return;
doc_node = doc_node->next;
}
- bonobo_main_quit();
+ gtk_main_quit ();
}
-static void
-save_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+save_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
HexDocument *doc;
@@ -353,8 +304,9 @@ save_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
}
-static void
-open_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+open_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win;
GtkWidget *file_sel;
@@ -407,8 +359,9 @@ open_cb(BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
gtk_widget_destroy(file_sel);
}
-static void
-save_as_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+save_as_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
HexDocument *doc;
@@ -424,8 +377,9 @@ save_as_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
ghex_window_save_as(win);
}
-static void
-print_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+print_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
@@ -435,8 +389,9 @@ print_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
ghex_print(win->gh, FALSE);
}
-static void
-print_preview_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+print_preview_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
@@ -446,8 +401,9 @@ print_preview_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbn
ghex_print(win->gh, TRUE);
}
-static void
-export_html_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+export_html_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
HexDocument *doc;
@@ -547,8 +503,9 @@ export_html_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbnam
gtk_widget_destroy(GTK_WIDGET(file_sel));
}
-static void
-close_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+close_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data), *other_win;
HexDocument *doc;
@@ -582,13 +539,13 @@ close_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
gtk_widget_set_sensitive(converter_get, FALSE);
if(ghex_window_get_list()->next == NULL) {
- bonobo_window_set_contents(BONOBO_WINDOW(win), NULL);
+ ghex_window_destroy_contents (win);
win->gh = NULL;
ghex_window_set_sensitivity(win);
ghex_window_set_doc_name(win, NULL);
/* Clear the contents of status bar after closing the files */
- bonobo_ui_component_set_status(win->uic, " ", NULL);
+ ghex_window_show_status (win, " ");
}
else
gtk_widget_destroy(GTK_WIDGET(win));
@@ -607,7 +564,8 @@ raise_and_focus_widget (GtkWidget *widget)
}
void
-file_list_activated_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+file_list_activated_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win;
HexDocument *doc = HEX_DOCUMENT(user_data);
@@ -627,9 +585,119 @@ file_list_activated_cb (BonoboUIComponent *uic, gpointer user_data, const gchar*
}
}
-/* Changed the function parameters -- SnM */
-static
-void prefs_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+insert_mode_cb (GtkAction *action,
+ gpointer user_data)
+{
+ GHexWindow *win;
+ gboolean active;
+
+ win = GHEX_WINDOW (user_data);
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+
+ if (win->gh != NULL)
+ gtk_hex_set_insert_mode (win->gh, active);
+}
+
+void
+character_table_cb (GtkAction *action,
+ gpointer user_data)
+{
+ GHexWindow *win;
+ gboolean active;
+
+ win = GHEX_WINDOW (user_data);
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+
+ if (!char_table)
+ char_table = create_char_table ();
+
+ if (active) {
+ if (!gtk_widget_get_visible (char_table)) {
+ gtk_window_set_position (GTK_WINDOW (char_table), GTK_WIN_POS_MOUSE);
+ gtk_widget_show (char_table);
+ }
+ raise_and_focus_widget (char_table);
+ }
+ else {
+ if (gtk_widget_get_visible (char_table))
+ gtk_widget_hide (GTK_WIDGET (char_table));
+ }
+ ghex_window_sync_char_table_item (win, active ? 1 : 0);
+}
+
+void
+converter_cb (GtkAction *action,
+ gpointer user_data)
+{
+ GHexWindow *win;
+ gboolean active;
+
+ win = GHEX_WINDOW (user_data);
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+
+ if (!converter)
+ converter = create_converter ();
+
+ if (active) {
+ if (!gtk_widget_get_visible (converter->window)) {
+ gtk_window_set_position (GTK_WINDOW (converter->window), GTK_WIN_POS_MOUSE);
+ gtk_widget_show (converter->window);
+ }
+ raise_and_focus_widget (converter->window);
+
+ if (!ghex_window_get_active () && converter_get)
+ gtk_widget_set_sensitive (converter_get, FALSE);
+ else
+ gtk_widget_set_sensitive (converter_get, TRUE);
+ }
+ else {
+ if (gtk_widget_get_visible (converter->window))
+ gtk_widget_hide (converter->window);
+ }
+ ghex_window_sync_converter_item (win, active ? 1 : 0);
+}
+
+void
+type_dialog_cb (GtkAction *action,
+ gpointer user_data)
+{
+ GHexWindow *win;
+ gboolean active;
+
+ win = GHEX_WINDOW (user_data);
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+
+ if (!win->dialog)
+ return;
+ if (active) {
+ if (!gtk_widget_get_visible (win->dialog_widget)) {
+ gtk_widget_show (win->dialog_widget);
+ }
+ }
+ else if (gtk_widget_get_visible (win->dialog_widget)) {
+ gtk_widget_hide (GTK_WIDGET (win->dialog_widget));
+ }
+}
+
+void
+group_data_cb (GtkAction *action,
+ GtkRadioAction *current,
+ gpointer user_data)
+{
+ GHexWindow *win;
+ gint value;
+
+ win = GHEX_WINDOW (user_data);
+ value = gtk_radio_action_get_current_value (current);
+
+ if (win->gh != NULL)
+ gtk_hex_set_group_type (win->gh, value);
+}
+
+void
+prefs_cb (GtkAction *action,
+ gpointer user_data)
{
if(!prefs_ui)
prefs_ui = create_prefs_dialog();
@@ -647,8 +715,9 @@ void prefs_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname
}
-static void
-revert_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+void
+revert_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win;
HexDocument *doc;
@@ -933,7 +1002,8 @@ update_dialog_titles()
}
void
-add_view_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+add_view_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
GtkWidget *newwin;
@@ -946,7 +1016,8 @@ add_view_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
}
void
-remove_view_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname)
+remove_view_cb (GtkAction *action,
+ gpointer user_data)
{
GHexWindow *win = GHEX_WINDOW(user_data);
diff --git a/src/ui.h b/src/ui.h
index 7967927..560da36 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -26,16 +26,11 @@
#include <gtk/gtk.h>
-#include <libbonoboui.h>
-
#include "ghex-window.h"
#include "preferences.h"
G_BEGIN_DECLS
-/* command verbs */
-extern BonoboUIVerb ghex_verbs[];
-
/* various ui convenience functions */
void create_dialog_title (GtkWidget *, gchar *);
gint ask_user (GtkMessageDialog *);
@@ -50,20 +45,48 @@ GtkWidget *create_button (GtkWidget *, const gchar *, gchar *);
gint delete_event_cb(GtkWidget *, GdkEventAny *, GtkWindow *);
void cancel_cb (GtkWidget *, GtkWidget *);
-void find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void advanced_find_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void replace_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void jump_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void set_byte_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void set_word_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void set_long_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void undo_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void redo_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void add_view_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void remove_view_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void insert_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void quit_app_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
-void file_list_activated_cb (BonoboUIComponent *uic, gpointer user_data, const gchar* verbname);
+/* File menu */
+void open_cb (GtkAction *action, gpointer user_data);
+void save_cb (GtkAction *action, gpointer user_data);
+void save_as_cb (GtkAction *action, gpointer user_data);
+void export_html_cb (GtkAction *action, gpointer user_data);
+void revert_cb (GtkAction *action, gpointer user_data);
+void print_cb (GtkAction *action, gpointer user_data);
+void print_preview_cb (GtkAction *action, gpointer user_data);
+void close_cb (GtkAction *action, gpointer user_data);
+void quit_app_cb (GtkAction *action, gpointer user_data);
+
+/* Edit menu */
+void undo_cb (GtkAction *action, gpointer user_data);
+void redo_cb (GtkAction *action, gpointer user_data);
+void copy_cb (GtkAction *action, gpointer user_data);
+void cut_cb (GtkAction *action, gpointer user_data);
+void paste_cb (GtkAction *action, gpointer user_data);
+void find_cb (GtkAction *action, gpointer user_data);
+void advanced_find_cb (GtkAction *action, gpointer user_data);
+void replace_cb (GtkAction *action, gpointer user_data);
+void jump_cb (GtkAction *action, gpointer user_data);
+void insert_mode_cb (GtkAction *action, gpointer user_data);
+void prefs_cb (GtkAction *action, gpointer user_data);
+
+/* View menu */
+void add_view_cb (GtkAction *action, gpointer user_data);
+void remove_view_cb (GtkAction *action, gpointer user_data);
+void group_data_cb (GtkAction *action, GtkRadioAction *current, gpointer user_data);
+void set_byte_cb (GtkAction *action, gpointer user_data);
+void set_word_cb (GtkAction *action, gpointer user_data);
+void set_long_cb (GtkAction *action, gpointer user_data);
+
+/* Windows menu */
+void character_table_cb (GtkAction *action, gpointer user_data);
+void converter_cb (GtkAction *action, gpointer user_data);
+void type_dialog_cb (GtkAction *action, gpointer user_data);
+
+/* Help menu */
+void help_cb (GtkAction *action, gpointer user_data);
+void about_cb (GtkAction *action, gpointer user_data);
+
+void file_list_activated_cb (GtkAction *action, gpointer user_data);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
