gthumb r2455 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Tue Dec 16 15:23:21 2008
New Revision: 2455
URL: http://svn.gnome.org/viewvc/gthumb?rev=2455&view=rev

Log:
Merged 2453:2454 from gthumb-2-10.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/gth-application.c
   trunk/src/gth-browser-ui.h
   trunk/src/gth-browser.c
   trunk/src/totem-scrsaver.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Dec 16 15:23:21 2008
@@ -75,6 +75,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: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec 16 15:23:21 2008
@@ -170,7 +170,8 @@
 #
 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.)])
 
 #
@@ -215,6 +216,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 ###############################################
 
@@ -340,5 +359,6 @@
 	Have libopenraw:          ${HAVE_LIBOPENRAW}
 	Have exiv2 xmp support:   ${HAVE_XMP}
 	Have gstreamer:           ${HAVE_GSTREAMER}
+	Use Mac OS X menu:        ${HAVE_MACOSMENU}
 
 "

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Dec 16 15:23:21 2008
@@ -15,6 +15,7 @@
 	$(GTHUMB_CFLAGS)			\
 	$(DISABLE_DEPRECATED)			\
 	$(GPHOTO_CFLAGS)			\
+	$(IGE_MAC_INTEGRATION_CFLAGS)		\
 	$(GTKUNIQUE_CFLAGS)			\
 	-DGTHUMB_PREFIX=\"$(prefix)\"		\
 	-DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\"	\
@@ -157,6 +158,7 @@
 	$(TIFF_LIBS)				\
 	$(RENDER_LIBS)				\
 	$(GPHOTO_LIBS)				\
+	$(IGE_MAC_INTEGRATION_LIBS)		\
 	$(XF86GAMMA_LIBS)			\
 	$(XTEST_LIBS)				\
 	$(GTKUNIQUE_LIBS)

Modified: trunk/src/gth-application.c
==============================================================================
--- trunk/src/gth-application.c	(original)
+++ trunk/src/gth-application.c	Tue Dec 16 15:23:21 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: trunk/src/gth-browser-ui.h
==============================================================================
--- trunk/src/gth-browser-ui.h	(original)
+++ trunk/src/gth-browser-ui.h	Tue Dec 16 15:23:21 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'/>"
@@ -73,7 +73,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'>"
@@ -199,7 +199,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: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Tue Dec 16 15:23:21 2008
@@ -6295,6 +6295,7 @@
 	GtkWidget             *image_pane_paned1;
 	GtkWidget             *image_pane_paned2;
 	GtkWidget             *scrolled_win;
+	GtkWidget             *menubar;
 	GtkTreeSelection      *selection;
 	int                    i;
 	GtkActionGroup        *actions;
@@ -6365,7 +6366,32 @@
 
 	generate_script_menu (ui, priv->actions, GTH_WINDOW (browser));
 
-	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: trunk/src/totem-scrsaver.c
==============================================================================
--- trunk/src/totem-scrsaver.c	(original)
+++ trunk/src/totem-scrsaver.c	Tue Dec 16 15:23:21 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