summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Sergey Starosek <sergey.starosek@gmail.com>2013-11-30 20:41:38 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-30 12:01:32 -0800
commit988ddb84a6fc8c9e120cc61736524c1112d28b71 (patch)
tree390a094f2a546ee7eeeec3d275276a90a33076d9
parent5569577b177551503220abf8eb27991aa5db9f1e (diff)
downloadsubsurface-988ddb84a6fc8c9e120cc61736524c1112d28b71.tar.gz
Add application icon to dialogs
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/csvimportdialog.ui9
-rw-r--r--qt-ui/divecomputermanagementdialog.ui9
-rw-r--r--qt-ui/downloadfromdivecomputer.ui11
-rw-r--r--qt-ui/preferences.ui21
-rw-r--r--qt-ui/renumber.ui9
-rw-r--r--qt-ui/shifttimes.ui9
-rw-r--r--qt-ui/webservices.ui11
7 files changed, 63 insertions, 16 deletions
diff --git a/qt-ui/csvimportdialog.ui b/qt-ui/csvimportdialog.ui
index 7b5983ee2..6abbb4beb 100644
--- a/qt-ui/csvimportdialog.ui
+++ b/qt-ui/csvimportdialog.ui
@@ -13,6 +13,11 @@
<property name="windowTitle">
<string>Import CSV file</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
@@ -251,7 +256,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/qt-ui/divecomputermanagementdialog.ui b/qt-ui/divecomputermanagementdialog.ui
index 8b916f925..59be88122 100644
--- a/qt-ui/divecomputermanagementdialog.ui
+++ b/qt-ui/divecomputermanagementdialog.ui
@@ -13,6 +13,11 @@
<property name="windowTitle">
<string>Edit Dive Computer Nicknames</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTableView" name="tableView">
@@ -33,7 +38,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/qt-ui/downloadfromdivecomputer.ui b/qt-ui/downloadfromdivecomputer.ui
index 72e9c5ea1..05abd0e40 100644
--- a/qt-ui/downloadfromdivecomputer.ui
+++ b/qt-ui/downloadfromdivecomputer.ui
@@ -7,12 +7,17 @@
<x>0</x>
<y>0</y>
<width>331</width>
- <height>199</height>
+ <height>241</height>
</rect>
</property>
<property name="windowTitle">
<string>Download From Dive Computer</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
@@ -109,6 +114,8 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections/>
</ui>
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index f5926e7e5..b58acfed2 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -6,13 +6,18 @@
<rect>
<x>0</x>
<y>0</y>
- <width>698</width>
+ <width>780</width>
<height>521</height>
</rect>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -207,11 +212,11 @@
</widget>
</item>
<item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QComboBox" name="default_cylinder"/>
- </item>
- </layout>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QComboBox" name="default_cylinder"/>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -1076,12 +1081,12 @@
</connection>
</connections>
<buttongroups>
+ <buttongroup name="verticalSpeed"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup_3"/>
<buttongroup name="buttonGroup_4"/>
<buttongroup name="buttonGroup_5"/>
- <buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_6"/>
- <buttongroup name="verticalSpeed"/>
+ <buttongroup name="buttonGroup"/>
</buttongroups>
</ui>
diff --git a/qt-ui/renumber.ui b/qt-ui/renumber.ui
index ac82271c1..a7f6ba4c9 100644
--- a/qt-ui/renumber.ui
+++ b/qt-ui/renumber.ui
@@ -13,6 +13,11 @@
<property name="windowTitle">
<string>Renumber</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>0</number>
@@ -51,7 +56,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/qt-ui/shifttimes.ui b/qt-ui/shifttimes.ui
index 7fba6375c..33977dbc0 100644
--- a/qt-ui/shifttimes.ui
+++ b/qt-ui/shifttimes.ui
@@ -19,6 +19,11 @@
<property name="windowTitle">
<string>Shift selected times</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>6</number>
@@ -104,7 +109,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/qt-ui/webservices.ui b/qt-ui/webservices.ui
index b190a7980..123a95eae 100644
--- a/qt-ui/webservices.ui
+++ b/qt-ui/webservices.ui
@@ -7,12 +7,17 @@
<x>0</x>
<y>0</y>
<width>425</width>
- <height>141</height>
+ <height>169</height>
</rect>
</property>
<property name="windowTitle">
<string>Download Location Data</string>
</property>
+ <property name="windowIcon">
+ <iconset>
+ <normalon>:/subsurface-icon</normalon>
+ </iconset>
+ </property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0">
<widget class="QLabel" name="label_2">
@@ -89,7 +94,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../subsurface.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>