From d0b23a4786ea985550e3da11dd8d03f3e8d3edd7 Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Sat, 11 May 2013 07:40:10 -0500
Subject: [PATCH] Relocated "User Settings" to Edit->Preferences Removed
 <QDebug> reference from view.hpp

---
 apps/opencs/view/doc/view.cpp | 17 ++++-------------
 apps/opencs/view/doc/view.hpp |  2 --
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 4d1ab78bd5..d4df3b6330 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -16,8 +16,6 @@
 #include "operations.hpp"
 #include "subview.hpp"
 
-#include <QDebug>
-
 void CSVDoc::View::closeEvent (QCloseEvent *event)
 {
     if (!mViewManager.closeRequest (this))
@@ -52,6 +50,10 @@ void CSVDoc::View::setupEditMenu()
     mRedo= mDocument->getUndoStack().createRedoAction (this, tr("&Redo"));
     mRedo->setShortcuts (QKeySequence::Redo);
     edit->addAction (mRedo);
+
+    QAction *userSettings = new QAction (tr ("&Preferences"), this);
+    connect (userSettings, SIGNAL (triggered()), this, SLOT (showUserSettings()));
+    edit->addAction (userSettings);
 }
 
 void CSVDoc::View::setupViewMenu()
@@ -80,23 +82,12 @@ void CSVDoc::View::setupWorldMenu()
     world->addAction (mVerify);
 }
 
-void CSVDoc::View::setupSettingsMenu()
-{
-    QMenu *settings = menuBar()->addMenu( (tr ("&Settings")));
-
-    QAction *userSettings = new QAction (tr ("User Settings"), this);
-    connect (userSettings, SIGNAL (triggered()), this, SLOT (showUserSettings()));
-    settings->addAction (userSettings);
-
-}
-
 void CSVDoc::View::setupUi()
 {
     setupFileMenu();
     setupEditMenu();
     setupViewMenu();
     setupWorldMenu();
-    setupSettingsMenu();
 }
 
 void CSVDoc::View::updateTitle()
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index a46b72d42d..b659ce5013 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -59,8 +59,6 @@ namespace CSVDoc
 
             void setupWorldMenu();
 
-            void setupSettingsMenu();
-
             void setupUi();
 
             void updateTitle();