Fixed margins around profile groupBox. Added a new function to avoid manual static_cast to int for Enums::ClipboardType

6 files changed, 28 insertions, 17 deletions

diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index f31f8662..8293f7fd 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -44,13 +44,13 @@ ConfigDialog::ConfigDialog(MainWindow *parent)
   ui->checkBoxAutoPull->setChecked(QtPassSettings::isAutoPull());
   ui->checkBoxAutoPush->setChecked(QtPassSettings::isAutoPush());
   ui->checkBoxAlwaysOnTop->setChecked(QtPassSettings::isAlwaysOnTop());
+  ui->comboBoxClipboard->setCurrentIndex(QtPassSettings::getClipBoardTypeRaw());
 
   setProfiles(QtPassSettings::getProfiles(), QtPassSettings::getProfile());
   setPwgenPath(QtPassSettings::getPwgenExecutable());
   setPasswordConfiguration(QtPassSettings::getPasswordConfiguration());
 
   usePass(QtPassSettings::isUsePass());
-  useClipboard(QtPassSettings::getClipBoardType());
   useSelection(QtPassSettings::isUseSelection());
   useAutoclear(QtPassSettings::isUseAutoclear());
   useAutoclearPanel(QtPassSettings::isUseAutoclearPanel());
@@ -59,6 +59,8 @@ ConfigDialog::ConfigDialog(MainWindow *parent)
   usePwgen(QtPassSettings::isUsePwgen());
   useTemplate(QtPassSettings::isUseTemplate());
 
+  on_comboBoxClipboard_activated(QtPassSettings::getClipBoardTypeRaw());
+
   ui->profileTable->verticalHeader()->hide();
   ui->profileTable->horizontalHeader()->setStretchLastSection(true);
   ui->label->setText(ui->label->text() + VERSION);
@@ -278,14 +280,6 @@ void ConfigDialog::on_checkBoxAutoclearPanel_clicked() {
 }
 
 /**
- * @brief ConfigDialog::useClipboard set the clipboard use from MainWindow.
- */
-void ConfigDialog::useClipboard(Enums::clipBoardType useClipboard) {
-  ui->comboBoxClipboard->setCurrentIndex(static_cast<int>(useClipboard));
-  on_comboBoxClipboard_activated(static_cast<int>(useClipboard));
-}
-
-/**
  * @brief ConfigDialog::useSelection set the clipboard type use from
  * MainWindow.
  * @param useSelection
diff --git a/src/configdialog.h b/src/configdialog.h
index 855ef8e8..af1767df 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -27,7 +27,6 @@ public:
   explicit ConfigDialog(MainWindow *parent);
   ~ConfigDialog();
 
-  void useClipboard(Enums::clipBoardType);
   void useSelection(bool useSelection);
   void useAutoclear(bool useAutoclear);
   void useAutoclearPanel(bool useAutoclearPanel);
diff --git a/src/keygendialog.cpp b/src/keygendialog.cpp
index 27ea819d..b4cda01a 100644
--- a/src/keygendialog.cpp
+++ b/src/keygendialog.cpp
@@ -29,7 +29,7 @@ void KeygenDialog::on_passphrase1_textChanged(const QString &arg1) {
   bool state = ui->passphrase1->text() == ui->passphrase2->text();
   if (state) {
     replace("Passphrase", arg1);
-    no_protection(arg.isEmpty());
+    no_protection(arg1.isEmpty());
   }
 
   ui->buttonBox->setEnabled(state);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 74609721..51b4bb3b 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -46,6 +46,18 @@
         <item>
          <widget class="QWidget" name="profileWidget" native="true">
           <layout class="QHBoxLayout" name="horizontalLayout">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
            <item>
             <widget class="QLabel" name="label">
              <property name="text">
@@ -343,7 +355,8 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionEdit">
    <property name="icon">
-    <iconset theme="document-properties"/>
+    <iconset theme="document-properties">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Edit</string>
diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
index e71f3d82..eabb1b23 100644
--- a/src/qtpasssettings.cpp
+++ b/src/qtpasssettings.cpp
@@ -156,13 +156,16 @@ void QtPassSettings::setUsePass(const bool &usePass) {
   getInstance()->setValue(SettingsConstants::usePass, usePass);
 }
 
+int QtPassSettings::getClipBoardTypeRaw(
+    const Enums::clipBoardType &defaultvalue) {
+  return getInstance()
+      ->value(SettingsConstants::clipBoardType, static_cast<int>(defaultvalue))
+      .toInt();
+}
+
 Enums::clipBoardType
 QtPassSettings::getClipBoardType(const Enums::clipBoardType &defaultvalue) {
-  return static_cast<Enums::clipBoardType>(
-      getInstance()
-          ->value(SettingsConstants::clipBoardType,
-                  static_cast<int>(defaultvalue))
-          .toInt());
+  return static_cast<Enums::clipBoardType>(getClipBoardTypeRaw(defaultvalue));
 }
 void QtPassSettings::setClipBoardType(
     const Enums::clipBoardType &clipBoardType) {
diff --git a/src/qtpasssettings.h b/src/qtpasssettings.h
index a54fde5b..9de46c88 100644
--- a/src/qtpasssettings.h
+++ b/src/qtpasssettings.h
@@ -63,6 +63,8 @@ public:
   static bool isUsePass(const bool &defaultValue = QVariant().toBool());
   static void setUsePass(const bool &usePass);
 
+  static int getClipBoardTypeRaw(
+      const Enums::clipBoardType &defaultvalue = Enums::CLIPBOARD_NEVER);
   static Enums::clipBoardType getClipBoardType(
       const Enums::clipBoardType &defaultvalue = Enums::CLIPBOARD_NEVER);
   static void setClipBoardType(const Enums::clipBoardType &clipBoardType);