diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2023-11-06 18:44:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 18:44:48 +0100 |
| commit | 28d00994ab18ccb1030d0ddaca22f4b13aa86b2a (patch) | |
| tree | 72f37015d454cdd529e966cb9f7aff982a2a60d5 | |
| parent | eb707b6d3be95c8b6b6bc01650675542477e69d0 (diff) | |
| parent | 80195f98273eccb02d8c044b48492157999061a9 (diff) | |
Merge pull request #672 from ruimaciel/GH671_add_window_icon
Add window icon to all dialogs
| -rw-r--r-- | src/configdialog.ui | 8 | ||||
| -rw-r--r-- | src/keygendialog.ui | 8 | ||||
| -rw-r--r-- | src/mainwindow.ui | 8 | ||||
| -rw-r--r-- | src/passworddialog.ui | 8 | ||||
| -rw-r--r-- | src/usersdialog.ui | 8 |
5 files changed, 35 insertions, 5 deletions
diff --git a/src/configdialog.ui b/src/configdialog.ui index 68281ca7..af9c97e6 100644 --- 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 index 4f3647d5..81a6140c 100644 --- 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 index 9bdca371..894e99c9 100644 --- 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 index 0f64dea0..98e06b68 100644 --- 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 index 1727cb9b..ac19182b 100644 --- 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> |