Merge pull request #672 from ruimaciel/GH671_add_window_icon

Add window icon to all dialogs
IJHack · Nov 6, 2023 · 28d0099 · 28d0099
2 parents eb707b6 + 80195f9
commit 28d0099
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/src/configdialog.ui b/src/configdialog.ui
@@ -19,6 +19,10 @@
   <property name="windowTitle">
    <string>Configuration</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/artwork/icon.png</normaloff>:/artwork/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>6</number>
@@ -1094,7 +1098,9 @@ e-mail</string>
   <tabstop>storePath</tabstop>
   <tabstop>toolButtonStore</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/keygendialog.ui b/src/keygendialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Generate GnuPG keypair</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/artwork/icon.png</normaloff>:/artwork/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>6</number>
@@ -299,7 +303,9 @@ Expire-Date: 0
   <tabstop>checkBox</tabstop>
   <tabstop>plainTextEdit</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>QtPass</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/artwork/icon.png</normaloff>:/artwork/icon.png</iconset>
+  </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0" rowspan="2" colspan="2">
@@ -396,7 +400,9 @@
   <tabstop>treeView</tabstop>
   <tabstop>textBrowser</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections/>
  <slots>
   <slot>deselect()</slot>

diff --git a/src/passworddialog.ui b/src/passworddialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Password</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/artwork/icon.png</normaloff>:/artwork/icon.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
    <property name="leftMargin">
     <number>6</number>
@@ -191,7 +195,9 @@
   <tabstop>spinBox_pwdLength</tabstop>
   <tabstop>plainTextEdit</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/src/usersdialog.ui b/src/usersdialog.ui
@@ -19,6 +19,10 @@
   <property name="windowTitle">
    <string>Read access users</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources.qrc">
+    <normaloff>:/artwork/icon.png</normaloff>:/artwork/icon.png</iconset>
+  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
@@ -104,6 +108,8 @@ Red entries are not valid, you will not be able to encrypt to these.</string>
   <tabstop>lineEdit</tabstop>
   <tabstop>listWidget</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections/>
 </ui>