From fe1b43c7b7c83e392b60ffc71ac29f7e63810f58 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@cs.ox.ac.uk>
Date: Mon, 4 Feb 2013 13:47:58 +0000
Subject: Put node and edge style editors into settings dialog

---
 tikzit/src/gtk/Menu.m | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tikzit/src/gtk/Menu.m')

diff --git a/tikzit/src/gtk/Menu.m b/tikzit/src/gtk/Menu.m
index a741520..7472f84 100644
--- a/tikzit/src/gtk/Menu.m
+++ b/tikzit/src/gtk/Menu.m
@@ -53,13 +53,13 @@ static void refresh_shapes_cb (GtkAction *action, Application *appl) {
     [pool drain];
 }
 
-#ifdef HAVE_POPPLER
 static void show_preferences_cb (GtkAction *action, Application *appl) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     [appl showSettingsDialog];
     [pool drain];
 }
 
+#ifdef HAVE_POPPLER
 static void show_preamble_cb (GtkAction *action, Application *appl) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     [appl showPreamblesEditor];
@@ -152,10 +152,10 @@ static GtkActionEntry app_action_entries[] = {
 
     { "Tool", NULL, N_("_Tool") },
 
-#ifdef HAVE_POPPLER
     { "ShowPreferences", GTK_STOCK_PREFERENCES, NULL, NULL,
       N_("Edit the TikZiT preferences"), G_CALLBACK (show_preferences_cb) },
 
+#ifdef HAVE_POPPLER
     { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL,
       N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) },
 #endif
@@ -503,10 +503,8 @@ static const gchar ui_info[] =
 "        <menuitem action='BringForward'/>"
 "        <menuitem action='BringToFront'/>"
 "      </menu>"
-#ifdef HAVE_POPPLER
 "      <separator/>"
 "      <menuitem action='ShowPreferences'/>"
-#endif
 "    </menu>"
 "    <menu action='ViewMenu'>"
 "      <menuitem action='ShowContextWindow'/>"
-- 
cgit v1.2.3