Implemented new shortcut for report user

huggle · Sep 29, 2015 · 34011ec · 34011ec
1 parent 831df52
commit 34011ec
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/huggle/Localization/en.xml b/huggle/Localization/en.xml
@@ -541,6 +541,8 @@
   <string name="user-history-fail">unable to retrieve history for user: $1</string>
   <string name="userinfo-generic">User info</string>
   <string name="userinfo-retrieve">Retrieve info</string>
+  <string name="shortcut-report-username">Report username</string>
+  <string name="shortcut-report-user">Report user</string>
   <string name="shortcut-my-talk">My talk page</string>
   <string name="shortcut-raw">Revert edit and warn a user</string>
   <string name="shortcut-exit">Terminate Huggle in a usual way</string>

diff --git a/huggle/configuration.cpp b/huggle/configuration.cpp
@@ -98,6 +98,8 @@ Configuration::Configuration()
     this->MakeShortcut("main-revert-warn-and-stay", "shortcut-rw-stay", "Shift+Q");
     this->MakeShortcut("main-tab", "shortcut-tab", "Ctrl+T");
     this->MakeShortcut("main-browser-close-tab", "shortcut-browser-close-tab", "Ctrl+W");
+    this->MakeShortcut("main-user-report-name", "shortcut-report-username", "Alt+R");
+    this->MakeShortcut("main-user-report-user", "shortcut-report-user", "Ctrl+R");
 }
 
 Configuration::~Configuration()
@@ -648,6 +650,10 @@ Shortcut::Shortcut(QString name, QString description)
         this->ID = HUGGLE_ACCEL_REVERT_STAY;
     else if (name == "main-talk")
         this->ID = HUGGLE_ACCEL_MAIN_TALK;
+    else if (name == "main-user-report-name")
+        this->ID = HUGGLE_ACCEL_USER_REPORT_USER_NAME;
+    else if (name == "main-user-report-user")
+        this->ID = HUGGLE_ACCEL_USER_REPORT;
     else if (name.startsWith("main-revert-and-warn-"))
     {
         if (name == "main-revert-and-warn-0")

diff --git a/huggle/configuration.hpp b/huggle/configuration.hpp
@@ -73,6 +73,8 @@ class QXmlStreamWriter;
 #define HUGGLE_ACCEL_MAIN_OPEN                  48
 #define HUGGLE_ACCEL_CLOSE_TAB                  200
 #define HUGGLE_ACCEL_CREATE_NEW_TAB             206
+#define HUGGLE_ACCEL_USER_REPORT_USER_NAME      300
+#define HUGGLE_ACCEL_USER_REPORT                310
 
 #define hcfg Huggle::Configuration::HuggleConfiguration
 

diff --git a/huggle/mainwindow.cpp b/huggle/mainwindow.cpp
@@ -793,6 +793,12 @@ void MainWindow::ReloadShort(QString id)
         case HUGGLE_ACCEL_MAIN_EXIT:
             q = this->ui->actionExit;
             break;
+        case HUGGLE_ACCEL_USER_REPORT_USER_NAME:
+            q = this->ui->actionReport_username;
+            break;
+        case HUGGLE_ACCEL_USER_REPORT:
+            q = this->ui->actionReport_user_2;
+            break;
     }
 
     if (q != nullptr)

diff --git a/huggle/mainwindow.ui b/huggle/mainwindow.ui
@@ -821,9 +821,6 @@
    <property name="text">
     <string notr="true">Report username</string>
    </property>
-   <property name="shortcut">
-    <string>Alt+R</string>
-   </property>
   </action>
   <action name="actionShow_list_of_score_words">
    <property name="text">