From 280c6b96e95433e8e2e5827bdb890e70d1c94f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Tue, 30 Dec 2014 17:42:07 +0100
Subject: [PATCH] replaced shortcutsDialog by editShortcutsDialog in YACReader,
 the user is going to lose some information about how to use the magnifying
 glass but it results less confusing this way

---
 YACReader/main_window_viewer.cpp | 5 +++--
 YACReader/main_window_viewer.h   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index c0724ac8..b38aa87f 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -165,7 +165,7 @@ void MainWindowViewer::setupUI()
 	connect(optionsDialog,SIGNAL(changedFilters(int,int,int)),viewer,SLOT(updateFilters(int,int,int)));
 
 	optionsDialog->restoreOptions(settings);
-	shortcutsDialog = new ShortcutsDialog(this);
+    //shortcutsDialog = new ShortcutsDialog(this);
     editShortcutsDialog = new EditShortcutsDialog(this);
     connect(optionsDialog,SIGNAL(editShortcuts()),editShortcutsDialog,SLOT(show()));
 
@@ -369,7 +369,8 @@ void MainWindowViewer::createActions()
 	showShorcutsAction->setIcon(QIcon(":/images/viewer_toolbar/shortcuts.png"));
     showShorcutsAction->setData(SHOW_SHORCUTS_ACTION_Y);
     showShorcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_SHORCUTS_ACTION_Y));
-	connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
+    //connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
+    connect(showShorcutsAction, SIGNAL(triggered()), editShortcutsDialog, SLOT(show()));
 
     showInfoAction = new QAction(tr("Show Info"),this);
     showInfoAction->setIcon(QIcon(":/images/viewer_toolbar/info.png"));
diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h
index a2923c3b..9ef481b7 100644
--- a/YACReader/main_window_viewer.h
+++ b/YACReader/main_window_viewer.h
@@ -82,7 +82,7 @@ class EditShortcutsDialog;
 		//GoToDialog * goToDialog;
 		OptionsDialog * optionsDialog;
 		HelpAboutDialog * had;
-		ShortcutsDialog * shortcutsDialog;
+        //ShortcutsDialog * shortcutsDialog;
         EditShortcutsDialog * editShortcutsDialog;
 
 		//! ToolBars
@@ -130,7 +130,7 @@ class EditShortcutsDialog;
 		HttpVersionChecker * versionChecker;
 		QString previousComicPath;
 		QString nextComicPath;
-		//! Método que inicializa el interfaz.
+		//! Método que inicializa el interfaz.
 		void setupUI();
 		void createActions();
 		void createToolBars();