diff options
author | Tobias Leupold <tl@l3u.de> | 2022-02-20 10:14:58 +0100 |
---|---|---|
committer | Tobias Leupold <tl@l3u.de> | 2022-02-20 10:14:58 +0100 |
commit | c384deefa1172d8e42b1049163e3abcd8de36a2d (patch) | |
tree | 6bff874ac5c50f8d5693e061243f40642aae290e | |
parent | aa5e4b057a242c9351c02547d2ea4bb5d3f180c4 (diff) |
Also make line wrapping optional
-rw-r--r-- | src/configdialog.cpp | 2 | ||||
-rw-r--r-- | src/configdialog.ui | 7 | ||||
-rw-r--r-- | src/mainwindow.cpp | 9 | ||||
-rw-r--r-- | src/qtpasssettings.cpp | 9 | ||||
-rw-r--r-- | src/qtpasssettings.h | 3 | ||||
-rw-r--r-- | src/settingsconstants.cpp | 1 | ||||
-rw-r--r-- | src/settingsconstants.h | 1 |
7 files changed, 32 insertions, 0 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp index b28f402c..4a711b03 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -39,6 +39,7 @@ ConfigDialog::ConfigDialog(MainWindow *parent) ui->checkBoxHideContent->setChecked(QtPassSettings::isHideContent()); ui->checkBoxUseMonospace->setChecked(QtPassSettings::isUseMonospace()); ui->checkBoxDisplayAsIs->setChecked(QtPassSettings::isDisplayAsIs()); + ui->checkBoxNoLineWrapping->setChecked(QtPassSettings::isNoLineWrapping()); ui->checkBoxAddGPGId->setChecked(QtPassSettings::isAddGPGId(true)); if (QSystemTrayIcon::isSystemTrayAvailable()) { @@ -207,6 +208,7 @@ void ConfigDialog::on_accepted() { QtPassSettings::setHideContent(ui->checkBoxHideContent->isChecked()); QtPassSettings::setUseMonospace(ui->checkBoxUseMonospace->isChecked()); QtPassSettings::setDisplayAsIs(ui->checkBoxDisplayAsIs->isChecked()); + QtPassSettings::setNoLineWrapping(ui->checkBoxNoLineWrapping->isChecked()); QtPassSettings::setAddGPGId(ui->checkBoxAddGPGId->isChecked()); QtPassSettings::setUseTrayIcon(ui->checkBoxUseTrayIcon->isEnabled() && ui->checkBoxUseTrayIcon->isChecked()); diff --git a/src/configdialog.ui b/src/configdialog.ui index d99261ff..874bbb3f 100644 --- a/src/configdialog.ui +++ b/src/configdialog.ui @@ -229,6 +229,13 @@ </widget> </item> <item> + <widget class="QCheckBox" name="checkBoxNoLineWrapping"> + <property name="text"> + <string>No line wrapping</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_9"> <property name="orientation"> <enum>Qt::Horizontal</enum> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5771c8d7..1229e466 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -90,6 +90,9 @@ MainWindow::MainWindow(const QString &searchText, QWidget *parent) if (QtPassSettings::isUseMonospace()) { ui->textBrowser->setFont(QFont(QStringLiteral("Monospace"))); } + if (QtPassSettings::isNoLineWrapping()) { + ui->textBrowser->setLineWrapMode(QTextBrowser::NoWrap); + } ui->textBrowser->setOpenExternalLinks(true); ui->textBrowser->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->textBrowser, &QWidget::customContextMenuRequested, this, @@ -248,6 +251,12 @@ void MainWindow::config() { } else { ui->textBrowser->setFont(QFont()); } + // Update the textBrowser line wrap mode + if (QtPassSettings::isNoLineWrapping()) { + ui->textBrowser->setLineWrapMode(QTextBrowser::NoWrap); + } else { + ui->textBrowser->setLineWrapMode(QTextBrowser::WidgetWidth); + } if (QtPassSettings::isAlwaysOnTop()) { Qt::WindowFlags flags = windowFlags(); diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp index 572c9792..b32a6525 100644 --- a/src/qtpasssettings.cpp +++ b/src/qtpasssettings.cpp @@ -260,6 +260,15 @@ void QtPassSettings::setDisplayAsIs(const bool &displayAsIs) { getInstance()->setValue(SettingsConstants::displayAsIs, displayAsIs); } +bool QtPassSettings::isNoLineWrapping(const bool &defaultValue) { + return getInstance() + ->value(SettingsConstants::noLineWrapping, defaultValue) + .toBool(); +} +void QtPassSettings::setNoLineWrapping(const bool &noLineWrapping) { + getInstance()->setValue(SettingsConstants::noLineWrapping, noLineWrapping); +} + bool QtPassSettings::isAddGPGId(const bool &defaultValue) { return getInstance() ->value(SettingsConstants::addGPGId, defaultValue) diff --git a/src/qtpasssettings.h b/src/qtpasssettings.h index 80ac58e6..e3d5b3f0 100644 --- a/src/qtpasssettings.h +++ b/src/qtpasssettings.h @@ -98,6 +98,9 @@ public: static bool isDisplayAsIs(const bool &defaultValue = QVariant().toBool()); static void setDisplayAsIs(const bool &displayAsIs); + static bool isNoLineWrapping(const bool &defaultValue = QVariant().toBool()); + static void setNoLineWrapping(const bool &noLineWrapping); + static bool isAddGPGId(const bool &defaultValue = QVariant().toBool()); static void setAddGPGId(const bool &addGPGId); diff --git a/src/settingsconstants.cpp b/src/settingsconstants.cpp index 68829648..863d110f 100644 --- a/src/settingsconstants.cpp +++ b/src/settingsconstants.cpp @@ -29,6 +29,7 @@ const QString SettingsConstants::hidePassword = "hidePassword"; const QString SettingsConstants::hideContent = "hideContent"; const QString SettingsConstants::useMonospace = "useMonospace"; const QString SettingsConstants::displayAsIs = "displayAsIs"; +const QString SettingsConstants::noLineWrapping = "noLineWrapping"; const QString SettingsConstants::addGPGId = "addGPGId"; const QString SettingsConstants::passStore = "passStore"; const QString SettingsConstants::passExecutable = "passExecutable"; diff --git a/src/settingsconstants.h b/src/settingsconstants.h index bd13ae4b..bb237ab3 100644 --- a/src/settingsconstants.h +++ b/src/settingsconstants.h @@ -28,6 +28,7 @@ public: const static QString hideContent; const static QString useMonospace; const static QString displayAsIs; + const static QString noLineWrapping; const static QString addGPGId; const static QString passStore; const static QString passExecutable; |