Fix for uncomment keyboard shortcut.

Author: Dman95

BSD/share/sasm/keys.ini

@@ -14,7 +14,7 @@ paste=default
 delete=default
 selectAll=default
 comment=Shift+Ctrl+A
-uncomment=Shift+Ctrl+S
+uncomment=Shift+Ctrl+Q
 deleteTab=Shift+Tab
 build=Ctrl+F9
 run=F9

Linux/share/sasm/keys.ini

@@ -14,7 +14,7 @@ paste=default
 delete=default
 selectAll=default
 comment=Shift+Ctrl+A
-uncomment=Shift+Ctrl+S
+uncomment=Shift+Ctrl+Q
 deleteTab=Shift+Tab
 build=Ctrl+F9
 run=F9

Windows/keys.ini

@@ -14,7 +14,7 @@ paste=default
 delete=default
 selectAll=default
 comment=Shift+Ctrl+A
-uncomment=Shift+Ctrl+S
+uncomment=Shift+Ctrl+Q
 deleteTab=Shift+Tab
 build=Ctrl+F9
 run=F9

mainwindow.cpp

@@ -364,7 +364,7 @@ void MainWindow::createActions()
 
     uncommentAction = new QAction(tr("Remove comment"), this);
     key = keySettings.value("uncomment", "default").toString();
-    stdKey = QKeySequence(QString("Shift+Ctrl+S"));
+    stdKey = QKeySequence(QString("Shift+Ctrl+Q"));
     if (key == "default")
         key = stdKey.toString();
     uncommentAction->setShortcut(key);
@@ -2226,7 +2226,7 @@ void MainWindow::openAbout()
                        tr("simple Open Source IDE for NASM, MASM, GAS and FASM assembler languages.") + '\n' +
                        tr("Licensed under the GNU GPL v3.0") + '\n' +
                        tr("Based on the Qt.") + '\n' +
-                       tr("Copyright © 2013 Dmitriy Manushin") + '\n' +
+                       tr("Copyright (c) 2013 Dmitriy Manushin") + '\n' +
                        tr("Development and idea - Dmitriy Manushin") + '\n' +
                        tr("Icon and advices - Alick Gaybullaev") + '\n' + '\n' +
                        tr("Wishes and error messages are sent to the e-mail: [email protected]") + '\n' +

ruqplaintextedit.cpp

@@ -56,12 +56,22 @@ RuQPlainTextEdit::RuQPlainTextEdit(QWidget *parent) :
 
     setDebugDisabled();
 
+    QSettings keySettings(Common::applicationDataPath() + "/keys.ini", QSettings::IniFormat);
+
     commentAction = new QAction(tr("Comment"), this);
-    commentAction->setShortcut(QString("Ctrl+Shift+Q"));
+    QString key = keySettings.value("comment", "default").toString();
+    QKeySequence stdKey = QKeySequence(QString("Shift+Ctrl+A"));
+    if (key == "default")
+        key = stdKey.toString();
+    commentAction->setShortcut(key);
     connect(commentAction, SIGNAL(triggered()), this, SLOT(commentSelectedCode()));
 
     uncommentAction = new QAction(tr("Remove comment"), this);
-    uncommentAction->setShortcut(QString("Ctrl+Shift+A"));
+    key = keySettings.value("uncomment", "default").toString();
+    stdKey = QKeySequence(QString("Shift+Ctrl+Q"));
+    if (key == "default")
+        key = stdKey.toString();
+    uncommentAction->setShortcut(key);
     connect(uncommentAction, SIGNAL(triggered()), this, SLOT(uncommentSelectedCode()));
 
     undoAction = new QAction(tr("Undo"), this);

ruqplaintextedit.h

@@ -49,6 +49,7 @@
 #include <QTextStream>
 #include <QPointer>
 #include <QSettings>
+#include "common.h"
 
 /**
  * @file ruqplaintextedit.h