Merge pull request #96 from OpenBangla/commit-raw-text

Make the commit raw text key customizable.
OpenBangla · Mar 2, 2019 · 1e62bdd · 1e62bdd
2 parents 65dc837 + 82eeae2
commit 1e62bdd
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 51 deletions.
diff --git a/src/engine/ibus/ibus_engine.cpp b/src/engine/ibus/ibus_engine.cpp
@@ -185,8 +185,9 @@ gboolean ibus_process_key_event_cb(IBusEngine *engine,
     }
   }
 
-  // Commit the preedit buffer when the `Ctrl + B` key is pressed.
-  if(kctrl && key == VC_B && !suggestions.isEmpty()) {
+  // Commit the preedit buffer(raw text) when the user configured key is pressed.
+  int rawTextKey = gLayout->commitRawTextKey();
+  if(kctrl && rawTextKey != 0 && key == rawTextKey && !suggestions.isEmpty()) {
     commit_text(suggestions.auxiliaryText);
     return TRUE;
   }

diff --git a/src/engine/libengine/Layout.cpp b/src/engine/libengine/Layout.cpp
@@ -124,3 +124,7 @@ bool Layout::isCandidateWinHorizontal() {
 void Layout::updateEngine() {
   mth->updateEngine();
 }
+
+int Layout::commitRawTextKey() {
+  return gSettings->getCommitRaw();
+}
diff --git a/src/engine/libengine/Layout.h b/src/engine/libengine/Layout.h
@@ -140,11 +140,14 @@ class Layout {
    * @index index of the candidate string that was commited */
   void candidateCommited(int index);
 
-  /* Checks is the candidate window horizontal */
+  /* Checks if the candidate window is horizontal */
   bool isCandidateWinHorizontal();
 
   /* Update internal suggestion making mechanism */
   void updateEngine();
+
+  /* Returns the user configured key for commiting raw text. */
+  int commitRawTextKey();
 };
 
 /* Global */

diff --git a/src/frontend/SettingsDialog.cpp b/src/frontend/SettingsDialog.cpp
@@ -19,6 +19,7 @@
 #include "SettingsDialog.h"
 #include "ui_SettingsDialog.h"
 #include "Settings.h"
+#include "keycode.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),
@@ -27,6 +28,37 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 
   this->setFixedSize(QSize(this->width(), this->height()));
   ui->cmbOrientation->insertItems(0, {"Horizontal", "Vertical"});
+  ui->cmbRawTxt->addItem("None");
+  rawTextKeys = {
+    {"Ctrl + Q", VC_Q},
+    {"Ctrl + W", VC_W},
+    {"Ctrl + E", VC_E},
+    {"Ctrl + R", VC_R},
+    {"Ctrl + T", VC_T},
+    {"Ctrl + Y", VC_Y},
+    {"Ctrl + U", VC_U},
+    {"Ctrl + I", VC_I},
+    {"Ctrl + O", VC_O},
+    {"Ctrl + P", VC_P},
+    {"Ctrl + A", VC_A},
+    {"Ctrl + S", VC_S},
+    {"Ctrl + D", VC_D},
+    {"Ctrl + F", VC_F},
+    {"Ctrl + G", VC_G},
+    {"Ctrl + H", VC_H},
+    {"Ctrl + J", VC_J},
+    {"Ctrl + K", VC_K},
+    {"Ctrl + L", VC_L},
+    {"Ctrl + Z", VC_Z},
+    {"Ctrl + X", VC_X},
+    {"Ctrl + C", VC_C},
+    {"Ctrl + V", VC_V},
+    {"Ctrl + B", VC_B},
+    {"Ctrl + V", VC_V},
+    {"Ctrl + N", VC_N},
+    {"Ctrl + M", VC_M},
+  };
+  ui->cmbRawTxt->addItems(rawTextKeys.keys());
   updateSettings();
 }
 
@@ -39,13 +71,25 @@ void SettingsDialog::updateSettings() {
   ui->btnShowPrevWin->setChecked(gSettings->getShowCWPhonetic());
   ui->cmbOrientation->setCurrentIndex(gSettings->getCandidateWinHorizontal() ? 0 : 1);
   ui->btnCheckUpdate->setChecked(gSettings->getUpdateCheck());
+  int rawTextKey = gSettings->getCommitRaw();
+  if(rawTextKey == 0) {
+    ui->cmbRawTxt->setCurrentText("None");
+  } else {
+    ui->cmbRawTxt->setCurrentText(rawTextKeys.keys(rawTextKey).first());
+  }
 }
 
 void SettingsDialog::on_buttonBox_accepted() {
   gSettings->setEnterKeyClosesPrevWin(ui->btnClosePrevWin->isChecked());
   gSettings->setShowCWPhonetic(ui->btnShowPrevWin->isChecked());
   gSettings->setCandidateWinHorizontal((ui->cmbOrientation->currentIndex() == 0));
   gSettings->setUpdateCheck(ui->btnCheckUpdate->isChecked());
+  QString rawTextKey = ui->cmbRawTxt->currentText();
+  if(rawTextKey == "None") {
+    gSettings->setCommitRaw(0);
+  } else {
+    gSettings->setCommitRaw(rawTextKeys.value(rawTextKey));
+  }
 }
 
 void SettingsDialog::on_buttonBox_rejected() {

diff --git a/src/frontend/SettingsDialog.h b/src/frontend/SettingsDialog.h
@@ -20,6 +20,7 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
+#include <QMap>
 
 namespace Ui {
 class SettingsDialog;
@@ -49,6 +50,7 @@ private slots:
 
 private:
   Ui::SettingsDialog *ui;
+  QMap<QString, int> rawTextKeys;
 };
 
 #endif // SETTINGSDIALOG_H
diff --git a/src/frontend/SettingsDialog.ui b/src/frontend/SettingsDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>483</width>
-    <height>224</height>
+    <width>475</width>
+    <height>260</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,24 +20,23 @@
    <string>Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="horizontalSpacing">
-    <number>40</number>
-   </property>
-   <property name="verticalSpacing">
-    <number>10</number>
-   </property>
-   <item row="0" column="1">
-    <widget class="QPushButton" name="btnClosePrevWin">
-     <property name="text">
-      <string>Off</string>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="checkable">
-      <bool>true</bool>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter/Return key only closes preview
+                            window:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+                        </string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QPushButton" name="btnCheckUpdate">
+   <item row="0" column="1">
+    <widget class="QPushButton" name="btnClosePrevWin">
      <property name="text">
       <string>Off</string>
      </property>
@@ -46,19 +45,16 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QComboBox" name="cmbOrientation"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_4">
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Automatically check for updates:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show Preview Window in Phonetic mode:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
    </item>
@@ -72,54 +68,62 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter/Return key only closes preview
-                            window:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
-                        </string>
+      <string>Suggestion List Orientation:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
+   <item row="2" column="1">
+    <widget class="QComboBox" name="cmbOrientation"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Suggestion List Orientation:</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Automatically check for updates:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="3" column="1">
+    <widget class="QPushButton" name="btnCheckUpdate">
+     <property name="text">
+      <string>Off</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show Preview Window in Phonetic mode:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Commit Raw Text:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QComboBox" name="cmbRawTxt"/>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

diff --git a/src/shared/Settings.cpp b/src/shared/Settings.cpp
@@ -161,3 +161,13 @@ bool Settings::getUpdateCheck() {
   setting->sync();
   return setting->value("settings/UpdateCheck", true).toBool();
 }
+
+void Settings::setCommitRaw(int key) {
+  setting->setValue("settings/CommitRaw", key);
+  setting->sync();
+}
+
+int Settings::getCommitRaw() {
+  setting->sync();
+  return setting->value("settings/CommitRaw", 0xA0C7).toInt(); // Default: Ctrl + T
+}
diff --git a/src/shared/Settings.h b/src/shared/Settings.h
@@ -83,6 +83,10 @@ class Settings {
   void setUpdateCheck(bool b);
 
   bool getUpdateCheck();
+
+  void setCommitRaw(int key);
+
+  int getCommitRaw();
 };
 
 /* Global */