Add option for word wrapping in Edit Database Cell

mgrojo · mgrojo · commit 29bfcc4922f9 · 2019-03-17T19:23:02.000+01:00
A new option, in the toolbar of the Edit Database Cell, is added for setting word wrapping for the text editor modes. It is now independent of the SQL preference. The configuration reading the editor/wrap_lines setting is moved to the particular SQL editor class. Added icon from the Silk icon set. See issue #1796
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
@@ -22,6 +22,8 @@
 #include <QClipboard>
 #include <QTextDocument>
 
+#include <Qsci/qsciscintilla.h>
+
 EditDialog::EditDialog(QWidget* parent)
     : QDialog(parent),
       ui(new Ui::EditDialog),
@@ -65,6 +67,8 @@ EditDialog::EditDialog(QWidget* parent)
     ui->actionIndent->setChecked(mustIndentAndCompact);
 
     ui->buttonAutoSwitchMode->setChecked(Settings::getValue("databrowser", "auto_switch_mode").toBool());
+    ui->actionWordWrap->setChecked(Settings::getValue("databrowser", "editor_word_wrap").toBool());
+    setWordWrapping(ui->actionWordWrap->isChecked());
 
     reloadSettings();
 }
@@ -73,6 +77,7 @@ EditDialog::~EditDialog()
 {
     Settings::setValue("databrowser", "indent_compact",  mustIndentAndCompact);
     Settings::setValue("databrowser", "auto_switch_mode", ui->buttonAutoSwitchMode->isChecked());
+    Settings::setValue("databrowser", "editor_word_wrap", ui->actionWordWrap->isChecked());
     delete ui;
 }
 
@@ -1012,3 +1017,9 @@ void EditDialog::copyHexAscii()
 {
     QApplication::clipboard()->setText(hexEdit->selectionToReadableString());
 }
+
+void EditDialog::setWordWrapping(bool value)
+{
+    // Set wrap lines
+    sciEdit->setWrapMode(value ? QsciScintilla::WrapWord : QsciScintilla::WrapNone);
+}
diff --git a/src/EditDialog.h b/src/EditDialog.h
@@ -46,6 +46,7 @@ private slots:
     void openPrintDialog();
     void openPrintImageDialog();
     void copyHexAscii();
+    void setWordWrapping(bool value);
 
 signals:
     void recordTextUpdated(const QPersistentModelIndex& idx, const QByteArray& data, bool isBlob);
diff --git a/src/EditDialog.ui b/src/EditDialog.ui
@@ -115,6 +115,7 @@
      </item>
      <item>
       <widget class="QToolBar" name="editCellToolbar">
+       <addaction name="actionWordWrap"/>
        <addaction name="actionIndent"/>
        <addaction name="actionImport"/>
        <addaction name="actionExport"/>
@@ -150,8 +151,8 @@ Errors are indicated with a red squiggle underline.</string>
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>598</width>
-         <height>265</height>
+         <width>85</width>
+         <height>35</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -359,6 +360,24 @@ Errors are indicated with a red squiggle underline.</string>
     <string>Erases the contents of the cell</string>
    </property>
   </action>
+  <action name="actionWordWrap">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/word_wrap</normaloff>:/icons/word_wrap</iconset>
+   </property>
+   <property name="text">
+    <string>Word Wrap</string>
+   </property>
+   <property name="toolTip">
+    <string>Wrap lines on word boundaries</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>comboMode</tabstop>
@@ -529,6 +548,22 @@ Errors are indicated with a red squiggle underline.</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionWordWrap</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>EditDialog</receiver>
+   <slot>setWordWrapping(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>308</x>
+     <y>190</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>importData()</slot>
diff --git a/src/ExtendedScintilla.cpp b/src/ExtendedScintilla.cpp
@@ -198,9 +198,6 @@ void ExtendedScintilla::reloadLexerSettings(QsciLexer *lexer)
     if(lexer)
         lexer->refreshProperties();
 
-    // Set wrap lines
-    setWrapMode(static_cast<QsciScintilla::WrapMode>(Settings::getValue("editor", "wrap_lines").toInt()));
-
     // Check if error indicators are enabled and clear them if they just got disabled
     showErrorIndicators = Settings::getValue("editor", "error_indicators").toBool();
     if(!showErrorIndicators)
diff --git a/src/Settings.cpp b/src/Settings.cpp
@@ -207,6 +207,8 @@ QVariant Settings::getDefaultValue(const QString& group, const QString& name)
             return false;
         if(name == "auto_switch_mode")
             return true;
+        if(name == "editor_word_wrap")
+            return true;
         if(name == "null_text")
             return "NULL";
         if(name == "blob_text")
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
@@ -79,5 +79,6 @@
         <file alias="project_save_as">package_rename.png</file>
         <file alias="field_fk">page_foreign_key.png</file>
         <file alias="save_all">save_all.png</file>
+        <file alias="word_wrap">page_white_text.png</file>
     </qresource>
 </RCC>
diff --git a/src/icons/page_white_text.png b/src/icons/page_white_text.png
diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp
@@ -61,6 +61,8 @@ void SqlTextEdit::reloadSettings()
     } else {
         setAutoCompletionThreshold(0);
     }
+    // Set wrap lines
+    setWrapMode(static_cast<QsciScintilla::WrapMode>(Settings::getValue("editor", "wrap_lines").toInt()));
 
     ExtendedScintilla::reloadSettings();
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`#include <QClipboard>`
`23`	`23`	`#include <QTextDocument>`
`24`	`24`
	`25`	`+#include <Qsci/qsciscintilla.h>`
	`26`	`+`
`25`	`27`	`EditDialog::EditDialog(QWidget* parent)`
`26`	`28`	`: QDialog(parent),`
`27`	`29`	`ui(new Ui::EditDialog),`
`@@ -65,6 +67,8 @@ EditDialog::EditDialog(QWidget* parent)`
`65`	`67`	`ui->actionIndent->setChecked(mustIndentAndCompact);`
`66`	`68`
`67`	`69`	`ui->buttonAutoSwitchMode->setChecked(Settings::getValue("databrowser", "auto_switch_mode").toBool());`
	`70`	`+ ui->actionWordWrap->setChecked(Settings::getValue("databrowser", "editor_word_wrap").toBool());`
	`71`	`+ setWordWrapping(ui->actionWordWrap->isChecked());`
`68`	`72`
`69`	`73`	`reloadSettings();`
`70`	`74`	`}`
`@@ -73,6 +77,7 @@ EditDialog::~EditDialog()`
`73`	`77`	`{`
`74`	`78`	`Settings::setValue("databrowser", "indent_compact", mustIndentAndCompact);`
`75`	`79`	`Settings::setValue("databrowser", "auto_switch_mode", ui->buttonAutoSwitchMode->isChecked());`
	`80`	`+ Settings::setValue("databrowser", "editor_word_wrap", ui->actionWordWrap->isChecked());`
`76`	`81`	`delete ui;`
`77`	`82`	`}`
`78`	`83`
`@@ -1012,3 +1017,9 @@ void EditDialog::copyHexAscii()`
`1012`	`1017`	`{`
`1013`	`1018`	`QApplication::clipboard()->setText(hexEdit->selectionToReadableString());`
`1014`	`1019`	`}`
	`1020`	`+`
	`1021`	`+void EditDialog::setWordWrapping(bool value)`
	`1022`	`+{`
	`1023`	`+ // Set wrap lines`
	`1024`	`+ sciEdit->setWrapMode(value ? QsciScintilla::WrapWord : QsciScintilla::WrapNone);`
	`1025`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ void SqlTextEdit::reloadSettings()`
`61`	`61`	`} else {`
`62`	`62`	`setAutoCompletionThreshold(0);`
`63`	`63`	`}`
	`64`	`+ // Set wrap lines`
	`65`	`+ setWrapMode(static_cast<QsciScintilla::WrapMode>(Settings::getValue("editor", "wrap_lines").toInt()));`
`64`	`66`
`65`	`67`	`ExtendedScintilla::reloadSettings();`
`66`	`68`