Skip to content

Commit 4fcb381

Browse files
author
timlinux
committedNov 22, 2009
Store theme data in a resource file and pull icons from there as needed. Currently only default and newgis have been moved into the resource, others will follow
git-svn-id: http://svn.osgeo.org/qgis/trunk@12227 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 47ecdeb commit 4fcb381

File tree

5 files changed

+417
-157
lines changed

5 files changed

+417
-157
lines changed
 

‎images/images.qrc

Lines changed: 254 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,256 @@
11
<RCC>
2-
<qresource prefix="/images" >
3-
<file>icons/qgis-icon-16x16.png</file>
4-
<file>icons/qgis-icon-60x60.png</file>
5-
</qresource>
2+
<qresource prefix="/images" >
3+
<file>themes/newgis/mActionAddGPSLayer.png</file>
4+
<file>themes/newgis/mActionAddImage.png</file>
5+
<file>themes/newgis/mActionAddIsland.png</file>
6+
<file>themes/newgis/mActionAddLayer.png</file>
7+
<file>themes/newgis/mActionAddLegend.png</file>
8+
<file>themes/newgis/mActionAddMap.png</file>
9+
<file>themes/newgis/mActionAddOgrLayer.png</file>
10+
<file>themes/newgis/mActionAddRasterLayer.png</file>
11+
<file>themes/newgis/mActionAddRing.png</file>
12+
<file>themes/newgis/mActionAddSpatiaLiteLayer.png</file>
13+
<file>themes/newgis/mActionAddVertex.png</file>
14+
<file>themes/newgis/mActionAddWfsLayer.png</file>
15+
<file>themes/newgis/mActionAddWmsLayer.png</file>
16+
<file>themes/newgis/mActionCaptureLine.png</file>
17+
<file>themes/newgis/mActionCapturePoint.png</file>
18+
<file>themes/newgis/mActionCapturePolygon.png</file>
19+
<file>themes/newgis/mActionDeletePart.png</file>
20+
<file>themes/newgis/mActionDeleteRing.png</file>
21+
<file>themes/newgis/mActionDeleteSelected.png</file>
22+
<file>themes/newgis/mActionDeleteVertex.png</file>
23+
<file>themes/newgis/mActionDraw.png</file>
24+
<file>themes/newgis/mActionEditCopy.png</file>
25+
<file>themes/newgis/mActionEditCut.png</file>
26+
<file>themes/newgis/mActionEditPaste.png</file>
27+
<file>themes/newgis/mActionFileNew.png</file>
28+
<file>themes/newgis/mActionFileOpen.png</file>
29+
<file>themes/newgis/mActionFilePrint.png</file>
30+
<file>themes/newgis/mActionFileSave.png</file>
31+
<file>themes/newgis/mActionFileSaveAs.png</file>
32+
<file>themes/newgis/mActionGroupItems.png</file>
33+
<file>themes/newgis/mActionHelpContents.png</file>
34+
<file>themes/newgis/mActionHideAllLayers.png</file>
35+
<file>themes/newgis/mActionIdentify.png</file>
36+
<file>themes/newgis/mActionInOverview.png</file>
37+
<file>themes/newgis/mActionLabel.png</file>
38+
<file>themes/newgis/mActionMapTips.png</file>
39+
<file>themes/newgis/mActionMeasure.png</file>
40+
<file>themes/newgis/mActionMeasureArea.png</file>
41+
<file>themes/newgis/mActionMergeFeatures.png</file>
42+
<file>themes/newgis/mActionMoveFeature.png</file>
43+
<file>themes/newgis/mActionMoveItemContent.png</file>
44+
<file>themes/newgis/mActionMoveVertex.png</file>
45+
<file>themes/newgis/mActionNewBookmark.png</file>
46+
<file>themes/newgis/mActionNewVectorLayer.png</file>
47+
<file>themes/newgis/mActionNodeTool.png</file>
48+
<file>themes/newgis/mActionOpenTable.png</file>
49+
<file>themes/newgis/mActionPan.png</file>
50+
<file>themes/newgis/mActionRedo.png</file>
51+
<file>themes/newgis/mActionRemoveLayer.png</file>
52+
<file>themes/newgis/mActionReshape.png</file>
53+
<file>themes/newgis/mActionSaveAsPDF.png</file>
54+
<file>themes/newgis/mActionSaveAsSVG.png</file>
55+
<file>themes/newgis/mActionSaveMapAsImage.png</file>
56+
<file>themes/newgis/mActionScaleBar.png</file>
57+
<file>themes/newgis/mActionSelect.png</file>
58+
<file>themes/newgis/mActionSelectPan.png</file>
59+
<file>themes/newgis/mActionShowAllLayers.png</file>
60+
<file>themes/newgis/mActionShowBookmarks.png</file>
61+
<file>themes/newgis/mActionSimplify.png</file>
62+
<file>themes/newgis/mActionSplitFeatures.png</file>
63+
<file>themes/newgis/mActionToggleEditing.png</file>
64+
<file>themes/newgis/mActionUndo.png</file>
65+
<file>themes/newgis/mActionUngroupItems.png</file>
66+
<file>themes/newgis/mActionUnselectAttributes.png</file>
67+
<file>themes/newgis/mActionZoomFullExtent.png</file>
68+
<file>themes/newgis/mActionZoomIn.png</file>
69+
<file>themes/newgis/mActionZoomLast.png</file>
70+
<file>themes/newgis/mActionZoomNext.png</file>
71+
<file>themes/newgis/mActionZoomOut.png</file>
72+
<file>themes/newgis/mActionZoomToLayer.png</file>
73+
<file>themes/newgis/mActionZoomToSelected.png</file>
74+
<file>themes/default/cap_flat.png</file>
75+
<file>themes/default/cap_round.png</file>
76+
<file>themes/default/cap_square.png</file>
77+
<file>themes/default/clearInput.png</file>
78+
<file>themes/default/extents.png</file>
79+
<file>themes/default/favourites.png</file>
80+
<file>themes/default/geographic.png</file>
81+
<file>themes/default/transformed.png</file>
82+
<file>themes/default/user.png</file>
83+
<file>themes/default/join_bevel.png</file>
84+
<file>themes/default/join_miter.png</file>
85+
<file>themes/default/join_round.png</file>
86+
<file>themes/default/join_style.svg</file>
87+
<file>themes/default/mAction.png</file>
88+
<file>themes/default/mActionAddAllToOverview.png</file>
89+
<file>themes/default/mActionAddBasicShape.png</file>
90+
<file>themes/default/mActionAddImage.png</file>
91+
<file>themes/default/mActionAddIsland.png</file>
92+
<file>themes/default/mActionAddLayer.png</file>
93+
<file>themes/default/mActionAddLegend.png</file>
94+
<file>themes/default/mActionAddMap.png</file>
95+
<file>themes/default/mActionAddNonDbLayer.png</file>
96+
<file>themes/default/mActionAddOgrLayer.png</file>
97+
<file>themes/default/mActionAddRasterLayer.png</file>
98+
<file>themes/default/mActionAddRing.png</file>
99+
<file>themes/default/mActionAddSpatiaLiteLayer.png</file>
100+
<file>themes/default/mActionAddVertex.png</file>
101+
<file>themes/default/mActionAddWmsLayer.png</file>
102+
<file>themes/default/mActionAlignBottom.png</file>
103+
<file>themes/default/mActionAlignHCenter.png</file>
104+
<file>themes/default/mActionAlignLeft.png</file>
105+
<file>themes/default/mActionAlignRight.png</file>
106+
<file>themes/default/mActionAlignTop.png</file>
107+
<file>themes/default/mActionAlignVCenter.png</file>
108+
<file>themes/default/mActionArrowDown.png</file>
109+
<file>themes/default/mActionArrowUp.png</file>
110+
<file>themes/default/mActionCalculateField.png</file>
111+
<file>themes/default/mActionCaptureLine.png</file>
112+
<file>themes/default/mActionCapturePoint.png</file>
113+
<file>themes/default/mActionCapturePolygon.png</file>
114+
<file>themes/default/mActionCheckQgisVersion.png</file>
115+
<file>themes/default/mActionCollapseTree.png</file>
116+
<file>themes/default/mActionContextHelp.png</file>
117+
<file>themes/default/mActionCopySelected.png</file>
118+
<file>themes/default/mActionCustomProjection.png</file>
119+
<file>themes/default/mActionDeleteAttribute.png</file>
120+
<file>themes/default/mActionDeletePart.png</file>
121+
<file>themes/default/mActionDeleteRing.png</file>
122+
<file>themes/default/mActionDeleteSelected.png</file>
123+
<file>themes/default/mActionDeleteVertex.png</file>
124+
<file>themes/default/mActionDeselectAll.png</file>
125+
<file>themes/default/mActionDraw.png</file>
126+
<file>themes/default/mActionEditCopy.png</file>
127+
<file>themes/default/mActionEditCut.png</file>
128+
<file>themes/default/mActionEditPaste.png</file>
129+
<file>themes/default/mActionExpandTree.png</file>
130+
<file>themes/default/mActionExportMapServer.png</file>
131+
<file>themes/default/mActionFileExit.png</file>
132+
<file>themes/default/mActionFileNew.png</file>
133+
<file>themes/default/mActionFileOpen.png</file>
134+
<file>themes/default/mActionFilePrint.png</file>
135+
<file>themes/default/mActionFileSave.png</file>
136+
<file>themes/default/mActionFileSaveAs.png</file>
137+
<file>themes/default/mActionFileSmall.png</file>
138+
<file>themes/default/mActionFolder.png</file>
139+
<file>themes/default/mActionFromSelectedFeature.png</file>
140+
<file>themes/default/mActionGroupItems.png</file>
141+
<file>themes/default/mActionHelpAbout.png</file>
142+
<file>themes/default/mActionHelpContents.png</file>
143+
<file>themes/default/mActionHideAllLayers.png</file>
144+
<file>themes/default/mActionIdentify.png</file>
145+
<file>themes/default/mActionInOverview.png</file>
146+
<file>themes/default/mActionInvertSelection.png</file>
147+
<file>themes/default/mActionLabel.png</file>
148+
<file>themes/default/mActionLowerItems.png</file>
149+
<file>themes/default/mActionMapTips.png</file>
150+
<file>themes/default/mActionMeasure.png</file>
151+
<file>themes/default/mActionMeasureArea.png</file>
152+
<file>themes/default/mActionMergeFeatures.png</file>
153+
<file>themes/default/mActionMoveFeature.png</file>
154+
<file>themes/default/mActionMoveItemContent.png</file>
155+
<file>themes/default/mActionMoveItemsToBottom.png</file>
156+
<file>themes/default/mActionMoveItemsToTop.png</file>
157+
<file>themes/default/mActionMoveVertex.png</file>
158+
<file>themes/default/mActionNewAttribute.png</file>
159+
<file>themes/default/mActionNewBookmark.png</file>
160+
<file>themes/default/mActionNewComposer.png</file>
161+
<file>themes/default/mActionNewFolder.png</file>
162+
<file>themes/default/mActionNewVectorLayer.png</file>
163+
<file>themes/default/mActionNodeTool.png</file>
164+
<file>themes/default/mActionOpenTable.png</file>
165+
<file>themes/default/mActionOptions.png</file>
166+
<file>themes/default/mActionPan.png</file>
167+
<file>themes/default/mActionProjectProperties.png</file>
168+
<file>themes/default/mActionPropertyItem.png</file>
169+
<file>themes/default/mActionQgisHomePage.png</file>
170+
<file>themes/default/mActionRaiseItems.png</file>
171+
<file>themes/default/mActionRedo.png</file>
172+
<file>themes/default/mActionRemove.png</file>
173+
<file>themes/default/mActionRemoveAllFromOverview.png</file>
174+
<file>themes/default/mActionRemoveLayer.png</file>
175+
<file>themes/default/mActionRemoveSelectedFeature.png</file>
176+
<file>themes/default/mActionReshape.png</file>
177+
<file>themes/default/mActionRotatePointSymbols.png</file>
178+
<file>themes/default/mActionSaveAsPDF.png</file>
179+
<file>themes/default/mActionSaveAsSVG.png</file>
180+
<file>themes/default/mActionSaveMapAsImage.png</file>
181+
<file>themes/default/mActionScaleBar.png</file>
182+
<file>themes/default/mActionSelect.png</file>
183+
<file>themes/default/mActionSelectedToTop.png</file>
184+
<file>themes/default/mActionSelectPan.png</file>
185+
<file>themes/default/mActionShowAllLayers.png</file>
186+
<file>themes/default/mActionShowBookmarks.png</file>
187+
<file>themes/default/mActionShowPluginManager.png</file>
188+
<file>themes/default/mActionSimplify.png</file>
189+
<file>themes/default/mActionSplitFeatures.png</file>
190+
<file>themes/default/mActionToggleEditing.png</file>
191+
<file>themes/default/mActionUndo.png</file>
192+
<file>themes/default/mActionUngroupItems.png</file>
193+
<file>themes/default/mActionUnselectAttributes.png</file>
194+
<file>themes/default/mActionZoomFullExtent.png</file>
195+
<file>themes/default/mActionZoomIn.png</file>
196+
<file>themes/default/mActionZoomLast.png</file>
197+
<file>themes/default/mActionZoomNext.png</file>
198+
<file>themes/default/mActionZoomOut.png</file>
199+
<file>themes/default/mActionZoomToLayer.png</file>
200+
<file>themes/default/mActionZoomToSelected.png</file>
201+
<file>themes/default/mIconDelete.png</file>
202+
<file>themes/default/mIconEditable.png</file>
203+
<file>themes/default/mIconFirst.png</file>
204+
<file>themes/default/mIconGeometryLayer.png</file>
205+
<file>themes/default/mIconLast.png</file>
206+
<file>themes/default/mIconLayer.png</file>
207+
<file>themes/default/mIconLineLayer.png</file>
208+
<file>themes/default/mIconLock.png</file>
209+
<file>themes/default/mIconNew.png</file>
210+
<file>themes/default/mIconNext.png</file>
211+
<file>themes/default/mIconNoPyramid.png</file>
212+
<file>themes/default/mIconPointLayer.png</file>
213+
<file>themes/default/mIconPolygonLayer.png</file>
214+
<file>themes/default/mIconPrevious.png</file>
215+
<file>themes/default/mIconProjectionDisabled.png</file>
216+
<file>themes/default/mIconProjectionEnabled.png</file>
217+
<file>themes/default/mIconProjectionProblem.png</file>
218+
<file>themes/default/mIconProperties.png</file>
219+
<file>themes/default/mIconPyramid.png</file>
220+
<file>themes/default/mIconSymbology.png</file>
221+
<file>themes/default/mIconUnknownLayerType.png</file>
222+
<file>themes/default/mIconWaitingForLayerType.png</file>
223+
<file>themes/default/mMapserverExport.png</file>
224+
<file>themes/default/rendererCategorizedSymbol.png</file>
225+
<file>themes/default/rendererGraduatedSymbol.png</file>
226+
<file>themes/default/rendererSingleSymbol.png</file>
227+
<file>themes/default/symbologyAdd.png</file>
228+
<file>themes/default/symbologyDown.png</file>
229+
<file>themes/default/symbologyEdit.png</file>
230+
<file>themes/default/symbologyLock.png</file>
231+
<file>themes/default/symbologyRemove.png</file>
232+
<file>themes/default/symbologyUp.png</file>
233+
<file>themes/default/tracking.png</file>
234+
<file>themes/default/qgis.xpm</file>
235+
<file>themes/newgis/propertyicons/action.png</file>
236+
<file>themes/newgis/propertyicons/attributes.png</file>
237+
<file>themes/newgis/propertyicons/colormap.png</file>
238+
<file>themes/newgis/propertyicons/CRS.png</file>
239+
<file>themes/newgis/propertyicons/diagram.png</file>
240+
<file>themes/newgis/propertyicons/digitising.png</file>
241+
<file>themes/newgis/propertyicons/general.png</file>
242+
<file>themes/newgis/propertyicons/histogram.png</file>
243+
<file>themes/newgis/propertyicons/labels.png</file>
244+
<file>themes/newgis/propertyicons/locale.png</file>
245+
<file>themes/newgis/propertyicons/map_tools.png</file>
246+
<file>themes/newgis/propertyicons/metadata.png</file>
247+
<file>themes/newgis/propertyicons/network_and_proxy.png</file>
248+
<file>themes/newgis/propertyicons/overlay.png</file>
249+
<file>themes/newgis/propertyicons/pyramids.png</file>
250+
<file>themes/newgis/propertyicons/rendering.png</file>
251+
<file>themes/newgis/propertyicons/symbology.png</file>
252+
<file>themes/newgis/propertyicons/transparency.png</file>
253+
<file>icons/qgis-icon-16x16.png</file>
254+
<file>icons/qgis-icon-60x60.png</file>
255+
</qresource>
6256
</RCC>

‎src/app/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ IF (HAVE_SPATIALITE)
219219
ENDIF (HAVE_SPATIALITE)
220220

221221

222+
SET(IMAGE_RCCS ../../images/images.qrc)
223+
224+
QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
225+
222226
QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
223227

224228

‎src/app/qgsoptions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
150150

151151

152152
// add the themes to the combo box on the option dialog
153-
QDir myThemeDir( QgsApplication::pkgDataPath() + "/themes/" );
153+
QDir myThemeDir( ":/images/themes/" );
154154
myThemeDir.setFilter( QDir::Dirs );
155155
QStringList myDirList = myThemeDir.entryList( QStringList( "*" ) );
156156
cmbTheme->clear();

‎src/core/qgsapplication.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ const QString QgsApplication::pkgDataPath()
125125
}
126126
const QString QgsApplication::defaultThemePath()
127127
{
128-
return mPkgDataPath + "/themes/default/";
128+
return ":/images/themes/default/";
129129
}
130130
const QString QgsApplication::activeThemePath()
131131
{
132-
return mPkgDataPath + "/themes/" + mThemeName + "/";
132+
return ":/images/themes/" + mThemeName + "/";
133133
}
134134

135135
/*!

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 156 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,132 @@
1414
<string>Layer Properties</string>
1515
</property>
1616
<property name="windowIcon">
17-
<iconset>
18-
<normaloff>../../../../../.designer/backup</normaloff>../../../../../.designer/backup</iconset>
17+
<iconset resource="../../images/images.qrc">
18+
<normaloff>:/images/icons/qgis-icon-16x16.png</normaloff>:/images/icons/qgis-icon-16x16.png</iconset>
1919
</property>
2020
<property name="modal">
2121
<bool>true</bool>
2222
</property>
2323
<layout class="QGridLayout" name="gridLayout">
24-
<item row="0" column="2" colspan="3">
24+
<item row="0" column="0">
25+
<widget class="QListWidget" name="listWidget">
26+
<property name="minimumSize">
27+
<size>
28+
<width>110</width>
29+
<height>0</height>
30+
</size>
31+
</property>
32+
<property name="maximumSize">
33+
<size>
34+
<width>110</width>
35+
<height>16777215</height>
36+
</size>
37+
</property>
38+
<property name="frameShape">
39+
<enum>QFrame::NoFrame</enum>
40+
</property>
41+
<property name="frameShadow">
42+
<enum>QFrame::Plain</enum>
43+
</property>
44+
<property name="horizontalScrollBarPolicy">
45+
<enum>Qt::ScrollBarAlwaysOff</enum>
46+
</property>
47+
<property name="editTriggers">
48+
<set>QAbstractItemView::NoEditTriggers</set>
49+
</property>
50+
<property name="showDropIndicator" stdset="0">
51+
<bool>false</bool>
52+
</property>
53+
<property name="alternatingRowColors">
54+
<bool>false</bool>
55+
</property>
56+
<property name="iconSize">
57+
<size>
58+
<width>64</width>
59+
<height>64</height>
60+
</size>
61+
</property>
62+
<property name="textElideMode">
63+
<enum>Qt::ElideNone</enum>
64+
</property>
65+
<property name="flow">
66+
<enum>QListView::TopToBottom</enum>
67+
</property>
68+
<property name="isWrapping" stdset="0">
69+
<bool>false</bool>
70+
</property>
71+
<property name="resizeMode">
72+
<enum>QListView::Adjust</enum>
73+
</property>
74+
<property name="spacing">
75+
<number>9</number>
76+
</property>
77+
<property name="viewMode">
78+
<enum>QListView::IconMode</enum>
79+
</property>
80+
<property name="uniformItemSizes">
81+
<bool>false</bool>
82+
</property>
83+
<property name="wordWrap">
84+
<bool>true</bool>
85+
</property>
86+
<item>
87+
<property name="text">
88+
<string>Symbology</string>
89+
</property>
90+
<property name="icon">
91+
<iconset resource="../../images/images.qrc">
92+
<normaloff>:/images/themes/newgis/propertyicons/symbology.png</normaloff>:/images/themes/newgis/propertyicons/symbology.png</iconset>
93+
</property>
94+
</item>
95+
<item>
96+
<property name="text">
97+
<string>Labels</string>
98+
</property>
99+
<property name="icon">
100+
<iconset resource="../../images/images.qrc">
101+
<normaloff>:/images/themes/newgis/propertyicons/labels.png</normaloff>:/images/themes/newgis/propertyicons/labels.png</iconset>
102+
</property>
103+
</item>
104+
<item>
105+
<property name="text">
106+
<string>Attributes</string>
107+
</property>
108+
<property name="icon">
109+
<iconset resource="../../images/images.qrc">
110+
<normaloff>:/images/themes/newgis/propertyicons/attributes.png</normaloff>:/images/themes/newgis/propertyicons/attributes.png</iconset>
111+
</property>
112+
</item>
113+
<item>
114+
<property name="text">
115+
<string>General</string>
116+
</property>
117+
<property name="icon">
118+
<iconset resource="../../images/images.qrc">
119+
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
120+
</property>
121+
</item>
122+
<item>
123+
<property name="text">
124+
<string>Metadata</string>
125+
</property>
126+
<property name="icon">
127+
<iconset resource="../../images/images.qrc">
128+
<normaloff>:/images/themes/newgis/propertyicons/metadata.png</normaloff>:/images/themes/newgis/propertyicons/metadata.png</iconset>
129+
</property>
130+
</item>
131+
<item>
132+
<property name="text">
133+
<string>Actions</string>
134+
</property>
135+
<property name="icon">
136+
<iconset resource="../../images/images.qrc">
137+
<normaloff>:/images/themes/newgis/propertyicons/action.png</normaloff>:/images/themes/newgis/propertyicons/action.png</iconset>
138+
</property>
139+
</item>
140+
</widget>
141+
</item>
142+
<item row="0" column="1">
25143
<widget class="QStackedWidget" name="stackedWidget">
26144
<property name="currentIndex">
27145
<number>0</number>
@@ -305,7 +423,7 @@
305423
<rect>
306424
<x>0</x>
307425
<y>0</y>
308-
<width>605</width>
426+
<width>401</width>
309427
<height>425</height>
310428
</rect>
311429
</property>
@@ -565,159 +683,45 @@
565683
</widget>
566684
</item>
567685
<item row="1" column="0" colspan="2">
568-
<widget class="QPushButton" name="pbnLoadDefaultStyle">
569-
<property name="text">
570-
<string>Restore Default Style</string>
571-
</property>
572-
</widget>
573-
</item>
574-
<item row="1" column="2">
575-
<widget class="QPushButton" name="pbnSaveDefaultStyle">
576-
<property name="text">
577-
<string>Save As Default</string>
578-
</property>
579-
</widget>
580-
</item>
581-
<item row="1" column="3">
582-
<widget class="QPushButton" name="pbnLoadStyle">
583-
<property name="text">
584-
<string>Load Style ...</string>
585-
</property>
586-
</widget>
587-
</item>
588-
<item row="1" column="4">
589-
<widget class="QPushButton" name="pbnSaveStyleAs">
590-
<property name="text">
591-
<string>Save Style ...</string>
592-
</property>
593-
</widget>
594-
</item>
595-
<item row="2" column="0" colspan="5">
596-
<widget class="QDialogButtonBox" name="buttonBox">
597-
<property name="orientation">
598-
<enum>Qt::Horizontal</enum>
599-
</property>
600-
<property name="standardButtons">
601-
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
602-
</property>
603-
</widget>
604-
</item>
605-
<item row="0" column="0">
606-
<widget class="QListWidget" name="listWidget">
607-
<property name="minimumSize">
608-
<size>
609-
<width>110</width>
610-
<height>0</height>
611-
</size>
612-
</property>
613-
<property name="maximumSize">
614-
<size>
615-
<width>110</width>
616-
<height>16777215</height>
617-
</size>
618-
</property>
619-
<property name="frameShape">
620-
<enum>QFrame::NoFrame</enum>
621-
</property>
622-
<property name="frameShadow">
623-
<enum>QFrame::Plain</enum>
624-
</property>
625-
<property name="horizontalScrollBarPolicy">
626-
<enum>Qt::ScrollBarAlwaysOff</enum>
627-
</property>
628-
<property name="editTriggers">
629-
<set>QAbstractItemView::NoEditTriggers</set>
630-
</property>
631-
<property name="showDropIndicator" stdset="0">
632-
<bool>false</bool>
633-
</property>
634-
<property name="alternatingRowColors">
635-
<bool>false</bool>
636-
</property>
637-
<property name="iconSize">
638-
<size>
639-
<width>64</width>
640-
<height>64</height>
641-
</size>
642-
</property>
643-
<property name="textElideMode">
644-
<enum>Qt::ElideNone</enum>
645-
</property>
646-
<property name="flow">
647-
<enum>QListView::TopToBottom</enum>
648-
</property>
649-
<property name="isWrapping" stdset="0">
650-
<bool>false</bool>
651-
</property>
652-
<property name="resizeMode">
653-
<enum>QListView::Adjust</enum>
654-
</property>
655-
<property name="spacing">
656-
<number>9</number>
657-
</property>
658-
<property name="viewMode">
659-
<enum>QListView::IconMode</enum>
660-
</property>
661-
<property name="uniformItemSizes">
662-
<bool>false</bool>
663-
</property>
664-
<property name="wordWrap">
665-
<bool>true</bool>
666-
</property>
686+
<layout class="QHBoxLayout" name="horizontalLayout">
667687
<item>
668-
<property name="text">
669-
<string>Symbology</string>
670-
</property>
671-
<property name="icon">
672-
<iconset>
673-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
674-
</property>
675-
</item>
676-
<item>
677-
<property name="text">
678-
<string>Labels</string>
679-
</property>
680-
<property name="icon">
681-
<iconset>
682-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
683-
</property>
684-
</item>
685-
<item>
686-
<property name="text">
687-
<string>Attributes</string>
688-
</property>
689-
<property name="icon">
690-
<iconset>
691-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
692-
</property>
688+
<widget class="QPushButton" name="pbnLoadDefaultStyle">
689+
<property name="text">
690+
<string>Restore Default Style</string>
691+
</property>
692+
</widget>
693693
</item>
694694
<item>
695-
<property name="text">
696-
<string>General</string>
697-
</property>
698-
<property name="icon">
699-
<iconset>
700-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
701-
</property>
695+
<widget class="QPushButton" name="pbnSaveDefaultStyle">
696+
<property name="text">
697+
<string>Save As Default</string>
698+
</property>
699+
</widget>
702700
</item>
703701
<item>
704-
<property name="text">
705-
<string>Metadata</string>
706-
</property>
707-
<property name="icon">
708-
<iconset>
709-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
710-
</property>
702+
<widget class="QPushButton" name="pbnLoadStyle">
703+
<property name="text">
704+
<string>Load Style ...</string>
705+
</property>
706+
</widget>
711707
</item>
712708
<item>
713-
<property name="text">
714-
<string>Actions</string>
715-
</property>
716-
<property name="icon">
717-
<iconset>
718-
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
719-
</property>
709+
<widget class="QPushButton" name="pbnSaveStyleAs">
710+
<property name="text">
711+
<string>Save Style ...</string>
712+
</property>
713+
</widget>
720714
</item>
715+
</layout>
716+
</item>
717+
<item row="2" column="0" colspan="2">
718+
<widget class="QDialogButtonBox" name="buttonBox">
719+
<property name="orientation">
720+
<enum>Qt::Horizontal</enum>
721+
</property>
722+
<property name="standardButtons">
723+
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
724+
</property>
721725
</widget>
722726
</item>
723727
</layout>
@@ -734,7 +738,9 @@
734738
<tabstop>pbnQueryBuilder</tabstop>
735739
<tabstop>buttonBox</tabstop>
736740
</tabstops>
737-
<resources/>
741+
<resources>
742+
<include location="../../images/images.qrc"/>
743+
</resources>
738744
<connections>
739745
<connection>
740746
<sender>labelCheckBox</sender>

0 commit comments

Comments
 (0)
Please sign in to comment.