gthumb r2454 - in branches/gthumb-2-10: . src
- From: mjc svn gnome org
- To: svn-commits-list gnome org
- Subject: gthumb r2454 - in branches/gthumb-2-10: . src
- Date: Tue, 16 Dec 2008 15:12:56 +0000 (UTC)
Author: mjc
Date: Tue Dec 16 15:12:56 2008
New Revision: 2454
URL: http://svn.gnome.org/viewvc/gthumb?rev=2454&view=rev
Log:
2008-12-16 Michael J. Chudobiak <mjc svn gnome org>
* NEWS:
* configure.in:
* src/Makefile.am:
* src/gs-fade.c:
* src/gth-application.c:
* src/gth-browser-ui.h:
* src/gth-browser.c: (gth_browser_construct):
* src/totem-scrsaver.c:
Provide support for the Mac OS X menubar. Bug #554240. Modified
version of the patch by W. Michael Petullo <mike flyn org>.
Also, define the HAVE_GDKX macro properly so it really works.
Modified:
branches/gthumb-2-10/ChangeLog
branches/gthumb-2-10/NEWS
branches/gthumb-2-10/configure.in
branches/gthumb-2-10/src/Makefile.am
branches/gthumb-2-10/src/gs-fade.c
branches/gthumb-2-10/src/gth-application.c
branches/gthumb-2-10/src/gth-browser-ui.h
branches/gthumb-2-10/src/gth-browser.c
branches/gthumb-2-10/src/totem-scrsaver.c
Modified: branches/gthumb-2-10/NEWS
==============================================================================
--- branches/gthumb-2-10/NEWS (original)
+++ branches/gthumb-2-10/NEWS Tue Dec 16 15:12:56 2008
@@ -8,6 +8,7 @@
libgphoto import routines are then run. Bug #560352.
* Modified the build files to better support gtk on MAC OS / Quartz.
Bug #551225.
+ * Provide support for the Mac OS X menubar. Bug #554240.
version 2.10.10
---------------
Modified: branches/gthumb-2-10/configure.in
==============================================================================
--- branches/gthumb-2-10/configure.in (original)
+++ branches/gthumb-2-10/configure.in Tue Dec 16 15:12:56 2008
@@ -227,10 +227,10 @@
#
HAVE_GDKX=no
PKG_CHECK_MODULES(GDKX, gdk-x11-2.0,
- [HAVE_GDKX=yes],
+ [AC_DEFINE(HAVE_GDKX, 1, [Define to 1 if X11 support is included])
+ HAVE_GDKX=yes],
[AC_MSG_WARN(Disabling GDK/X11-dependent features and Xrender.)])
-
#
# Checks for Xft/XRender
#
@@ -250,6 +250,24 @@
AC_SUBST(RENDER_LIBS)
fi
+#
+# Checks for Mac OS X menubar integration
+#
+AC_ARG_ENABLE([macos-menu],
+ [AC_HELP_STRING([--disable-macos-menu],[disable support for Mac OS X menubar integration])],,
+ [enable_macosmenu=yes])
+
+HAVE_MACOSMENU=no
+if test "x$enable_macosmenu" = "xyes"; then
+ PKG_CHECK_MODULES(IGE_MAC_INTEGRATION, ige-mac-integration,
+ [AC_DEFINE(USE_MACOSMENU, 1, [Build with Mac OS X menubar integration])
+ HAVE_MACOSMENU=yes],
+ [HAVE_MACOSMENU=no])
+fi
+
+AM_CONDITIONAL(USE_IGE_MAC_INTEGRATION, test "x$HAVE_IGE-MAC-INTEGRATION" = "xyes")
+AC_SUBST(IGE_MAC_INTEGRATION_CFLAGS)
+AC_SUBST(IGE_MAC_INTEGRATION_LIBS)
dnl ###############################################
@@ -364,5 +382,6 @@
Have libtiff: ${HAVE_TIFF}
Have libgphoto: ${HAVE_GPHOTO2}
Have libopenraw: ${HAVE_LIBOPENRAW}
+ Use Mac OS X menu: ${HAVE_MACOSMENU}
"
Modified: branches/gthumb-2-10/src/Makefile.am
==============================================================================
--- branches/gthumb-2-10/src/Makefile.am (original)
+++ branches/gthumb-2-10/src/Makefile.am Tue Dec 16 15:12:56 2008
@@ -17,6 +17,7 @@
$(IPTCDATA_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(GPHOTO_CFLAGS) \
+ $(IGE_MAC_INTEGRATION_CFLAGS) \
$(GTKUNIQUE_CFLAGS) \
-DGTHUMB_PREFIX=\"$(prefix)\" \
-DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -161,6 +162,7 @@
$(TIFF_LIBS) \
$(RENDER_LIBS) \
$(GPHOTO_LIBS) \
+ $(IGE_MAC_INTEGRATION_LIBS) \
$(XF86GAMMA_LIBS) \
$(XTEST_LIBS) \
$(GTKUNIQUE_LIBS)
Modified: branches/gthumb-2-10/src/gs-fade.c
==============================================================================
--- branches/gthumb-2-10/src/gs-fade.c (original)
+++ branches/gthumb-2-10/src/gs-fade.c Tue Dec 16 15:12:56 2008
@@ -42,10 +42,10 @@
*
*/
-#ifdef HAVE_GDKX
-
#include "config.h"
+#ifdef HAVE_GDKX
+
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
Modified: branches/gthumb-2-10/src/gth-application.c
==============================================================================
--- branches/gthumb-2-10/src/gth-application.c (original)
+++ branches/gthumb-2-10/src/gth-application.c Tue Dec 16 15:12:56 2008
@@ -34,6 +34,9 @@
#include "gth-browser-actions-callbacks.h"
#include "main.h"
+#ifdef HAVE_GDKX
+#include <gdk/gdkx.h>
+#endif
static BonoboObject *
gth_application_factory (BonoboGenericFactory *this_factory,
Modified: branches/gthumb-2-10/src/gth-browser-ui.h
==============================================================================
--- branches/gthumb-2-10/src/gth-browser-ui.h (original)
+++ branches/gthumb-2-10/src/gth-browser-ui.h Tue Dec 16 15:12:56 2008
@@ -50,7 +50,7 @@
" <menuitem action='File_CameraImport'/>"
" <menuitem action='File_WriteToCD'/>"
" <separator name='sep04'/>"
-" <menuitem action='File_CloseWindow'/>"
+" <menuitem name='Close' action='File_CloseWindow'/>"
" </menu>"
" <menu name='Edit' action='EditMenu'>"
" <menuitem action='Edit_Undo'/>"
@@ -74,7 +74,7 @@
" <menuitem action='Edit_AddToCatalog'/>"
" <menuitem action='Edit_RemoveFromCatalog'/>"
" <separator/>"
-" <menuitem action='Tools_Preferences'/>"
+" <menuitem name='Preferences' action='Tools_Preferences'/>"
" </menu>"
" <menu name='View' action='ViewMenu'>"
" <menu name='ShowHide' action='ViewShowHideMenu'>"
@@ -195,7 +195,7 @@
" <menuitem action='Help_Help'/>"
" <menuitem action='Help_Shortcuts'/>"
" <separator/>"
-" <menuitem action='Help_About'/>"
+" <menuitem name='About' action='Help_About'/>"
" </menu>"
" </menubar>"
" <toolbar name='ToolBar'>"
Modified: branches/gthumb-2-10/src/gth-browser.c
==============================================================================
--- branches/gthumb-2-10/src/gth-browser.c (original)
+++ branches/gthumb-2-10/src/gth-browser.c Tue Dec 16 15:12:56 2008
@@ -6461,6 +6461,7 @@
GtkWidget *image_pane_paned1;
GtkWidget *image_pane_paned2;
GtkWidget *scrolled_win;
+ GtkWidget *menubar;
GtkTreeSelection *selection;
int i;
GtkActionGroup *actions;
@@ -6535,7 +6536,33 @@
g_message ("building menus failed: %s", error->message);
g_error_free (error);
}
- gth_window_attach (GTH_WINDOW (browser), gtk_ui_manager_get_widget (ui, "/MenuBar"), GTH_WINDOW_MENUBAR);
+
+ menubar = gtk_ui_manager_get_widget (ui, "/MenuBar");
+#ifdef USE_MACOSMENU
+ {
+ GtkWidget *widget;
+ ige_mac_menu_install_key_handler ();
+ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
+ gtk_widget_hide (menubar);
+ widget = gtk_ui_manager_get_widget(ui, "/MenuBar/File/Close");
+ if (widget != NULL) {
+ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget));
+ }
+ widget = gtk_ui_manager_get_widget(ui, "/MenuBar/Help/About");
+ if (widget != NULL) {
+ ige_mac_menu_add_app_menu_item (ige_mac_menu_add_app_menu_group (),
+ GTK_MENU_ITEM (widget),
+ NULL);
+ }
+ widget = gtk_ui_manager_get_widget(ui, "/MenuBar/Edit/Preferences");
+ if (widget != NULL) {
+ ige_mac_menu_add_app_menu_item (ige_mac_menu_add_app_menu_group (),
+ GTK_MENU_ITEM (widget),
+ NULL);
+ }
+ }
+#endif
+ gth_window_attach (GTH_WINDOW (browser), menubar, GTH_WINDOW_MENUBAR);
priv->toolbar = toolbar = gtk_ui_manager_get_widget (ui, "/ToolBar");
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE);
Modified: branches/gthumb-2-10/src/totem-scrsaver.c
==============================================================================
--- branches/gthumb-2-10/src/totem-scrsaver.c (original)
+++ branches/gthumb-2-10/src/totem-scrsaver.c Tue Dec 16 15:12:56 2008
@@ -19,11 +19,11 @@
Author: Bastien Nocera <hadess hadess net>
*/
+#include "config.h"
+
#ifdef HAVE_GDKX
-#include "config.h"
#include "totem-scrsaver.h"
-
#include <gdk/gdkx.h>
#ifdef HAVE_XTEST
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]