devhelp r1010 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Sun May 25 20:17:53 2008
New Revision: 1010
URL: http://svn.gnome.org/viewvc/devhelp?rev=1010&view=rev

Log:
2008-05-25  Richard Hult  <richard imendio com>

	* configure.in:
	* src/dh-window.c: (window_populate): Hook up mac menubar.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/dh-window.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun May 25 20:17:53 2008
@@ -32,12 +32,14 @@
 if test "x$IGE_PLATFORM" = xx11; then
    gconf_pkgconfig="gconf-2.0 >= 2.6.0"
    libwnck_pkgconfig="libwnck-1.0 >= 2.10.0"
+   igemacintegration_pkgconfig=
    REQUIRES_LIBWNCK=libwnck-1.0
    PLATFORM_CFLAGS=
    PLATFORM_LDFLAGS=
 else
    gconf_pkgconfig="gconf-2.0 >= 2.6.0"
    libwnck_pkgconfig=
+   igemacintegration_pkgconfig="ige-mac-integration >= 0.8.2"
    REQUIRES_LIBWNCK=
    PLATFORM_CFLAGS=
    PLATFORM_LDFLAGS=
@@ -58,6 +60,7 @@
 	libglade-2.0 >= 2.4.0
 	$gconf_pkgconfig
         $libwnck_pkgconfig
+        $igemacintegration_pkgconfig
 ])
 
 PKG_CHECK_MODULES([WEBKIT], [webkit-1.0])

Modified: trunk/src/dh-window.c
==============================================================================
--- trunk/src/dh-window.c	(original)
+++ trunk/src/dh-window.c	Sun May 25 20:17:53 2008
@@ -32,6 +32,10 @@
 #include "dh-window.h"
 #include "eggfindbar.h"
 
+#ifdef GDK_WINDOWING_QUARTZ
+#include <ige-mac-integration.h>
+#endif
+
 struct _DhWindowPriv {
 	DhBase         *base;
 
@@ -471,7 +475,36 @@
 					 NULL);
 	gtk_ui_manager_ensure_update (priv->manager);
 
-        priv->hpaned   = gtk_hpaned_new ();
+#ifdef GDK_WINDOWING_QUARTZ
+	{
+		GtkWidget       *widget;
+		IgeMacMenuGroup *group;
+
+		/* Hide toolbar labels. */
+		widget = gtk_ui_manager_get_widget (priv->manager, "/Toolbar");
+		gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
+
+		/* Setup menubar. */
+		widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar");
+		ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (widget));
+		gtk_widget_hide (widget);
+
+		widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/FileMenu/Quit");
+		ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget));
+
+		group =  ige_mac_menu_add_app_menu_group ();
+		widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/HelpMenu/About");
+		ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (widget),
+						_("About Devhelp"));
+
+		group =  ige_mac_menu_add_app_menu_group ();
+		widget = gtk_ui_manager_get_widget (priv->manager, "/MenuBar/EditMenu/Preferences");
+		ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (widget),
+						_("Preferences..."));
+	}
+#endif
+
+        priv->hpaned = gtk_hpaned_new ();
 
 	gtk_box_pack_start (GTK_BOX (priv->main_box), priv->hpaned, TRUE, TRUE, 0);