Skip to content

Commit bed6b4a

Browse files
author
timlinux
committedJan 1, 2006
Replace q3mainwindow with qmainwindow
setup icons using active theme refactor action names for consistancy and autoconnect convenience git-svn-id: http://svn.osgeo.org/qgis/trunk@4456 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 83021e7 commit bed6b4a

File tree

5 files changed

+148
-249
lines changed

5 files changed

+148
-249
lines changed
 

‎src/composer/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# $Id: Makefile.am 4416 2005-12-30 17:30:36Z timlinux $
1212

1313
if !HAVE_QTMAC
14+
PREFIX=-DPREFIX=\"$(prefix)\"
1415
PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
1516
endif
1617

@@ -53,7 +54,7 @@ libqgis_composer_la_LIBFLAGS = $(QT_LDADD)
5354

5455
libqgis_composer_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
5556
libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ \
56-
$(CXXFLAGS) $(EXTRA_CXXFLAGS) \
57+
$(PREFIX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) \
5758
$(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
5859

5960

‎src/composer/qgscomposer.cpp

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@
3636
#include <QToolBar>
3737
#include <iostream>
3838

39-
QgsComposer::QgsComposer( QgisApp *qgis): Q3MainWindow()
39+
40+
QgsComposer::QgsComposer( QgisApp *qgis): QMainWindow()
4041
{
4142
setupUi(this);
42-
setupTheme(qgis->themePath());
43-
connect(fileOpenAction, SIGNAL(activated()), this, SLOT(fileOpen()));
44-
connect(fileSaveAsAction, SIGNAL(activated()), this, SLOT(fileSaveAs()));
43+
setupTheme();
4544

4645
mQgis = qgis;
4746
mFirstTime = true;
@@ -82,23 +81,35 @@ QgsComposer::~QgsComposer()
8281
{
8382
}
8483

85-
void QgsComposer::setupTheme(QString thePath)
84+
void QgsComposer::setupTheme()
8685
{
87-
/**
88-
actionZoomFull->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
89-
actionZoomIn->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
90-
actionZoomOut->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
91-
actionRefresh->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
92-
actionPrint->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
93-
actionImage->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
94-
actionSvg->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
95-
actionSelectItem->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
96-
actionAddMap->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
97-
actionAddVectorLegend->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
98-
actionAddLabel->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
99-
actionAddScalebar->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
100-
actionAddPicture->setIconSet(QIcon(QPixmap(thePath + "/mActionFileNew.png")));
101-
*/
86+
//calculate the active theme path
87+
QSettings mySettings;
88+
#if defined(WIN32) || defined(Q_OS_MACX)
89+
QString myAppDir = qApp->applicationDirPath();
90+
#else
91+
QString myAppDir = PREFIX;
92+
#endif
93+
QString myThemeName = mySettings.readEntry("/Themes","default");
94+
QString myThemePath= myAppDir + "/share/qgis/themes/" + myThemeName;
95+
96+
97+
//now set all the icons
98+
mActionOpenTemplate->setIconSet(QIcon(QPixmap(myThemePath + "/mActionFileOpen.png")));
99+
mActionSaveTemplateAs->setIconSet(QIcon(QPixmap(myThemePath + "/mActionFileSaveAs.png")));
100+
mActionExportAsImage->setIconSet(QIcon(QPixmap(myThemePath + "/mActionExportMapServer.png")));
101+
mActionExportAsSVG->setIconSet(QIcon(QPixmap(myThemePath + "/mActionSaveAsSVG.png")));
102+
mActionPrint->setIconSet(QIcon(QPixmap(myThemePath + "/mActionFilePrint.png")));
103+
mActionZoomAll->setIconSet(QIcon(QPixmap(myThemePath + "/mActionZoomFullExtent.png")));
104+
mActionZoomIn->setIconSet(QIcon(QPixmap(myThemePath + "/mActionZoomIn.png")));
105+
mActionZoomOut->setIconSet(QIcon(QPixmap(myThemePath + "/mActionZoomOut.png")));
106+
mActionRefreshView->setIconSet(QIcon(QPixmap(myThemePath + "/mActionDraw.png")));
107+
mActionAddImage->setIconSet(QIcon(QPixmap(myThemePath + "/mActionSaveMapAsImage.png")));
108+
mActionAddNewMap->setIconSet(QIcon(QPixmap(myThemePath + "/mActionAddRasterLayer.png")));
109+
mActionAddNewLabel->setIconSet(QIcon(QPixmap(myThemePath + "/mActionLabel.png")));
110+
mActionAddNewVectLegend->setIconSet(QIcon(QPixmap(myThemePath + "/mActionAddLegend.png")));
111+
mActionAddNewScalebar->setIconSet(QIcon(QPixmap(myThemePath + "/mActionScaleBar.png")));
112+
mActionSelectMoveItem->setIconSet(QIcon(QPixmap(myThemePath + "/mActionPan.png")));
102113
}
103114

104115
void QgsComposer::open ( void )
@@ -211,34 +222,34 @@ void QgsComposer::zoomFull(void)
211222
mView->repaintContents();
212223
}
213224

214-
void QgsComposer::on_actionZoomFull_activated(void)
225+
void QgsComposer::on_mActionZoomAll_activated(void)
215226
{
216227
zoomFull();
217228
}
218229

219-
void QgsComposer::on_actionZoomIn_activated(void)
230+
void QgsComposer::on_mActionZoomIn_activated(void)
220231
{
221232
QMatrix m = mView->worldMatrix();
222233
m.scale( 2.0, 2.0 );
223234
mView->setWorldMatrix( m );
224235
mView->repaintContents();
225236
}
226237

227-
void QgsComposer::on_actionZoomOut_activated(void)
238+
void QgsComposer::on_mActionZoomOut_activated(void)
228239
{
229240
QMatrix m = mView->worldMatrix();
230241
m.scale( 0.5, 0.5 );
231242
mView->setWorldMatrix( m );
232243
mView->repaintContents();
233244
}
234245

235-
void QgsComposer::on_actionRefresh_activated(void)
246+
void QgsComposer::on_mActionRefreshView_activated(void)
236247
{
237248
mComposition->refresh();
238249
mView->repaintContents();
239250
}
240251

241-
void QgsComposer::on_actionPrint_activated(void)
252+
void QgsComposer::on_mActionPrint_activated(void)
242253
{
243254
/* Uff!!! It is impossible to set a custom page size for QPrinter.
244255
* Only the sizes hardcoded in Qt library can be used.
@@ -497,7 +508,7 @@ void QgsComposer::on_actionPrint_activated(void)
497508
}
498509
}
499510

500-
void QgsComposer::on_actionImage_activated(void)
511+
void QgsComposer::on_mActionExportAsImage_activated(void)
501512
{
502513
// Image size
503514
int width = (int) (mComposition->resolution() * mComposition->paperWidth() / 25.4);
@@ -616,7 +627,7 @@ void QgsComposer::on_actionImage_activated(void)
616627
pixmap.save ( myOutputFileNameQString, myFilterMap[myFilterString].toLocal8Bit().data() );
617628
}
618629

619-
void QgsComposer::on_actionSvg_activated(void)
630+
void QgsComposer::on_mActionExportAsSVG_activated(void)
620631
{
621632
QSettings myQSettings;
622633
QString myLastUsedFile = myQSettings.readEntry("/UI/lastSaveAsSvgFile","qgis.svg");
@@ -660,59 +671,67 @@ void QgsComposer::on_actionSvg_activated(void)
660671

661672
void QgsComposer::setToolActionsOff(void)
662673
{
663-
actionSelectItem->setOn ( false );
664-
actionAddMap->setOn ( false );
665-
actionAddVectorLegend->setOn ( false );
666-
actionAddLabel->setOn ( false );
667-
actionAddScalebar->setOn ( false );
668-
actionAddPicture->setOn ( false );
674+
mActionOpenTemplate->setOn ( false );
675+
mActionSaveTemplateAs->setOn ( false );
676+
mActionExportAsImage->setOn ( false );
677+
mActionExportAsSVG->setOn ( false );
678+
mActionPrint->setOn ( false );
679+
mActionZoomAll->setOn ( false );
680+
mActionZoomIn->setOn ( false );
681+
mActionZoomOut->setOn ( false );
682+
mActionRefreshView->setOn ( false );
683+
mActionAddNewMap->setOn ( false );
684+
mActionAddNewLabel->setOn ( false );
685+
mActionAddNewVectLegend->setOn ( false );
686+
mActionAddNewScalebar->setOn ( false );
687+
mActionSelectMoveItem->setOn ( false );
669688
}
670689

671690
void QgsComposer::selectItem(void)
672691
{
673692
mComposition->setTool ( QgsComposition::Select );
674693
setToolActionsOff();
675-
actionSelectItem->setOn ( true );
694+
mActionSelectMoveItem->setOn ( true );
676695
}
677696

678-
void QgsComposer::on_actionSelectItem_activated(void)
697+
void QgsComposer::on_mActionSelectMoveItem_activated(void)
679698
{
680699
selectItem();
681700
}
682701

683-
void QgsComposer::on_actionAddMap_activated(void)
702+
void QgsComposer::on_mActionAddNewMap_activated(void)
684703
{
685704
mComposition->setTool ( QgsComposition::AddMap );
686705
setToolActionsOff();
687-
actionAddMap->setOn ( true );
706+
mActionAddNewMap->setOn ( true );
688707
}
689708

690-
void QgsComposer::on_actionAddVectorLegend_activated(void)
709+
void QgsComposer::on_mActionAddNewVectLegend_activated(void)
691710
{
692711
mComposition->setTool ( QgsComposition::AddVectorLegend );
693712
setToolActionsOff();
694-
actionAddVectorLegend->setOn ( true );
713+
mActionAddNewVectLegend->setOn ( true );
695714
}
696715

697-
void QgsComposer::on_actionAddLabel_activated(void)
716+
void QgsComposer::on_mActionAddNewLabel_activated(void)
698717
{
699718
mComposition->setTool ( QgsComposition::AddLabel );
700719
setToolActionsOff();
701-
actionAddLabel->setOn ( true );
720+
mActionAddNewLabel->setOn ( true );
702721
}
703722

704-
void QgsComposer::on_actionAddScalebar_activated(void)
723+
void QgsComposer::on_mActionAddNewScalebar_activated(void)
705724
{
706725
mComposition->setTool ( QgsComposition::AddScalebar );
707726
setToolActionsOff();
708-
actionAddScalebar->setOn ( true );
727+
mActionAddNewScalebar->setOn ( true );
709728
}
710729

711-
void QgsComposer::on_actionAddPicture_activated(void)
730+
void QgsComposer::on_mActionAddImage_activated(void)
712731
{
713732
mComposition->setTool ( QgsComposition::AddPicture );
714733
setToolActionsOff();
715-
actionAddPicture->setOn ( true );
734+
mActionAddImage->setOn ( true );
716735
}
717736

718737
void QgsComposer::moveEvent ( QMoveEvent *e ) { saveWindowState(); }

‎src/composer/qgscomposer.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class QResizeEvent;
4444
* If open() is called and mFirstTime == true, a new default composition is created.
4545
*
4646
*/
47-
class QgsComposer: public Q3MainWindow, private Ui::QgsComposerBase
47+
class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
4848
{
4949
Q_OBJECT
5050

@@ -102,43 +102,43 @@ class QgsComposer: public Q3MainWindow, private Ui::QgsComposerBase
102102

103103
public slots:
104104
//! Zoom to full extent of the paper
105-
void on_actionZoomFull_activated(void);
105+
void on_mActionZoomAll_activated(void);
106106

107107
//! Zoom in
108-
void on_actionZoomIn_activated(void);
108+
void on_mActionZoomIn_activated(void);
109109

110110
//! Zoom out
111-
void on_actionZoomOut_activated(void);
111+
void on_mActionZoomOut_activated(void);
112112

113113
//! Refresh view
114-
void on_actionRefresh_activated(void);
114+
void on_mActionRefreshView_activated(void);
115115

116116
//! Print the composition
117-
void on_actionPrint_activated(void);
117+
void on_mActionPrint_activated(void);
118118

119119
//! Print as image
120-
void on_actionImage_activated(void);
120+
void on_mActionExportAsImage_activated(void);
121121

122122
//! Print as SVG
123-
void on_actionSvg_activated(void);
123+
void on_mActionExportAsSVG_activated(void);
124124

125125
//! Select item
126-
void on_actionSelectItem_activated(void);
126+
void on_mActionSelectMoveItem_activated(void);
127127

128128
//! Add new map
129-
void on_actionAddMap_activated(void);
129+
void on_mActionAddNewMap_activated(void);
130130

131131
//! Add new vector legend
132-
void on_actionAddVectorLegend_activated(void);
132+
void on_mActionAddNewVectLegend_activated(void);
133133

134134
//! Add new label
135-
void on_actionAddLabel_activated(void);
135+
void on_mActionAddNewLabel_activated(void);
136136

137137
//! Add new scalebar
138-
void on_actionAddScalebar_activated(void);
138+
void on_mActionAddNewScalebar_activated(void);
139139

140140
//! Add new picture
141-
void on_actionAddPicture_activated(void);
141+
void on_mActionAddImage_activated(void);
142142

143143
//! read project
144144
void projectRead();
@@ -148,7 +148,7 @@ public slots:
148148

149149
private:
150150
//! Set teh pixmap / icons on the toolbar buttons
151-
void setupTheme(QString thePath);
151+
void setupTheme();
152152
//! remove widget childrens
153153
void removeWidgetChildren ( QWidget *w );
154154

‎src/themes/default/mActionScaleBar.png

1.13 KB
Loading

‎src/ui/qgscomposerbase.ui

Lines changed: 67 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,22 @@
33
<comment></comment>
44
<exportmacro></exportmacro>
55
<class>QgsComposerBase</class>
6-
<widget class="Q3MainWindow" name="QgsComposerBase" >
6+
<widget class="QMainWindow" name="QgsComposerBase" >
77
<property name="geometry" >
88
<rect>
99
<x>0</x>
1010
<y>0</y>
11-
<width>725</width>
12-
<height>526</height>
11+
<width>800</width>
12+
<height>600</height>
1313
</rect>
1414
</property>
15-
<property name="mouseTracking" >
16-
<bool>false</bool>
17-
</property>
18-
<property name="focusPolicy" >
19-
<enum>Qt::ClickFocus</enum>
20-
</property>
2115
<property name="windowTitle" >
22-
<string>Map Composer</string>
16+
<string>MainWindow</string>
2317
</property>
24-
<widget class="QWidget" name="widget" >
25-
<property name="geometry" >
26-
<rect>
27-
<x>0</x>
28-
<y>38</y>
29-
<width>725</width>
30-
<height>488</height>
31-
</rect>
32-
</property>
18+
<widget class="QWidget" name="centralwidget" >
3319
<layout class="QGridLayout" >
3420
<property name="margin" >
35-
<number>8</number>
21+
<number>9</number>
3622
</property>
3723
<property name="spacing" >
3824
<number>6</number>
@@ -172,7 +158,7 @@
172158
</item>
173159
</layout>
174160
</widget>
175-
<widget class="QWidget" name="tab" >
161+
<widget class="QWidget" name="tab_2" >
176162
<attribute name="title" >
177163
<string>Item</string>
178164
</attribute>
@@ -211,255 +197,162 @@
211197
</item>
212198
</layout>
213199
</widget>
214-
<widget class="Q3ToolBar" name="Toolbar_2" >
200+
<widget class="QStatusBar" name="statusbar" >
215201
<property name="geometry" >
216202
<rect>
217203
<x>0</x>
218-
<y>0</y>
219-
<width>223</width>
220-
<height>38</height>
204+
<y>578</y>
205+
<width>800</width>
206+
<height>22</height>
221207
</rect>
222208
</property>
223-
<property name="label" >
224-
<string>Toolbar_2</string>
225-
</property>
226-
<addaction name="actionSelectItem" />
227-
<addaction name="actionAddMap" />
228-
<addaction name="actionAddVectorLegend" />
229-
<addaction name="actionAddScalebar" />
230-
<addaction name="actionAddLabel" />
231-
<addaction name="actionAddPicture" />
232-
</widget>
233-
<widget class="Q3ToolBar" name="Toolbar" >
234-
<property name="geometry" >
235-
<rect>
236-
<x>223</x>
237-
<y>0</y>
238-
<width>155</width>
239-
<height>38</height>
240-
</rect>
241-
</property>
242-
<property name="label" >
243-
<string>Toolbar</string>
244-
</property>
245-
<addaction name="actionZoomIn" />
246-
<addaction name="actionZoomOut" />
247-
<addaction name="actionZoomFullExtent" />
248-
<addaction name="actionRefresh" />
249209
</widget>
250-
<widget class="Q3ToolBar" name="toolBar" >
251-
<property name="geometry" >
252-
<rect>
253-
<x>378</x>
254-
<y>0</y>
255-
<width>121</width>
256-
<height>38</height>
257-
</rect>
258-
</property>
259-
<property name="label" >
260-
<string>Tools</string>
261-
</property>
262-
<addaction name="actionPrint" />
263-
<addaction name="actionImage" />
264-
<addaction name="actionSvg" />
210+
<widget class="QToolBar" name="toolBar" >
211+
<property name="orientation" >
212+
<enum>Qt::Horizontal</enum>
213+
</property>
214+
<attribute name="toolBarArea" >
215+
<number>4</number>
216+
</attribute>
217+
<addaction name="mActionOpenTemplate" />
218+
<addaction name="mActionSaveTemplateAs" />
219+
<addaction name="mActionExportAsImage" />
220+
<addaction name="mActionExportAsSVG" />
221+
<addaction name="mActionPrint" />
222+
<addaction name="separator" />
223+
<addaction name="mActionZoomAll" />
224+
<addaction name="mActionZoomIn" />
225+
<addaction name="mActionZoomOut" />
226+
<addaction name="mActionRefreshView" />
227+
<addaction name="separator" />
228+
<addaction name="mActionAddNewMap" />
229+
<addaction name="mActionAddNewLabel" />
230+
<addaction name="mActionAddImage" />
231+
<addaction name="mActionAddNewVectLegend" />
232+
<addaction name="mActionAddNewScalebar" />
233+
<addaction name="mActionSelectMoveItem" />
265234
</widget>
266-
<action name="fileOpenAction" >
267-
<property name="enabled" >
268-
<bool>false</bool>
269-
</property>
235+
<action name="mActionOpenTemplate" >
270236
<property name="icon" >
271-
<iconset>themes/default/mActionFileOpen.png</iconset>
237+
<iconset>../themes/default/mActionFileOpen.png</iconset>
272238
</property>
273239
<property name="text" >
274240
<string>&amp;Open Template ...</string>
275241
</property>
276-
<property name="iconText" >
277-
<string>Open Template</string>
278-
</property>
279-
<property name="shortcut" >
280-
<string>Ctrl+O</string>
281-
</property>
282242
</action>
283-
<action name="fileSaveAsAction" >
284-
<property name="enabled" >
285-
<bool>false</bool>
286-
</property>
243+
<action name="mActionSaveTemplateAs" >
287244
<property name="icon" >
288-
<iconset>themes/default/mActionFileSave.png</iconset>
245+
<iconset>../themes/default/mActionFileSaveAs.png</iconset>
289246
</property>
290247
<property name="text" >
291248
<string>Save Template &amp;As...</string>
292249
</property>
293-
<property name="iconText" >
294-
<string>Save Template As</string>
295-
</property>
296-
<property name="shortcut" >
297-
<string/>
298-
</property>
299250
</action>
300-
<action name="actionPrint" >
251+
<action name="mActionPrint" >
301252
<property name="icon" >
302-
<iconset>themes/default/mActionFilePrint.png</iconset>
253+
<iconset>../themes/default/mActionFilePrint.png</iconset>
303254
</property>
304255
<property name="text" >
305256
<string>&amp;Print...</string>
306257
</property>
307-
<property name="iconText" >
308-
<string>Print</string>
309-
</property>
310-
<property name="shortcut" >
311-
<string>Ctrl+P</string>
312-
</property>
313258
</action>
314-
<action name="actionZoomFullExtent" >
259+
<action name="mActionZoomAll" >
315260
<property name="icon" >
316-
<iconset>themes/default/mActionZoomFullExtent.png</iconset>
261+
<iconset>../themes/default/mActionZoomFullExtent.png</iconset>
317262
</property>
318263
<property name="text" >
319264
<string>Zoom All</string>
320265
</property>
321-
<property name="iconText" >
322-
<string>Zoom to full extent</string>
323-
</property>
324266
</action>
325-
<action name="actionZoomIn" >
267+
<action name="mActionZoomIn" >
326268
<property name="icon" >
327-
<iconset>themes/default/mActionZoomIn.png</iconset>
269+
<iconset>../themes/default/mActionZoomIn.png</iconset>
328270
</property>
329271
<property name="text" >
330272
<string>Zoom In</string>
331273
</property>
332-
<property name="iconText" >
333-
<string>Zoom in</string>
334-
</property>
335274
</action>
336-
<action name="actionZoomOut" >
275+
<action name="mActionZoomOut" >
337276
<property name="icon" >
338-
<iconset>themes/default/mActionZoomOut.png</iconset>
277+
<iconset>../themes/default/mActionZoomOut.png</iconset>
339278
</property>
340279
<property name="text" >
341280
<string>Zoom Out</string>
342281
</property>
343-
<property name="iconText" >
344-
<string>Zoom out</string>
345-
</property>
346282
</action>
347-
<action name="actionAddMap" >
348-
<property name="checkable" >
349-
<bool>true</bool>
350-
</property>
283+
<action name="mActionAddNewMap" >
351284
<property name="icon" >
352-
<iconset>themes/default/mActionAddNonDbLayer.png</iconset>
285+
<iconset>../themes/default/mActionAddRasterLayer.png</iconset>
353286
</property>
354287
<property name="text" >
355288
<string>Add new map</string>
356289
</property>
357-
<property name="iconText" >
358-
<string>Add new map</string>
359-
</property>
360290
</action>
361-
<action name="actionAddLabel" >
362-
<property name="checkable" >
363-
<bool>true</bool>
364-
</property>
291+
<action name="mActionAddNewLabel" >
365292
<property name="icon" >
366-
<iconset>themes/default/mActionLabel.png</iconset>
293+
<iconset>../themes/default/mActionLabel.png</iconset>
367294
</property>
368295
<property name="text" >
369296
<string>Add new label</string>
370297
</property>
371-
<property name="iconText" >
372-
<string>Add new label</string>
373-
</property>
374298
</action>
375-
<action name="actionAddVectorLegend" >
376-
<property name="checkable" >
377-
<bool>true</bool>
378-
</property>
299+
<action name="mActionAddNewVectLegend" >
379300
<property name="icon" >
380-
<iconset>themes/default/mActionAddLegend.png</iconset>
301+
<iconset>../themes/default/mActionAddLegend.png</iconset>
381302
</property>
382303
<property name="text" >
383304
<string>Add new vect legend</string>
384305
</property>
385-
<property name="iconText" >
386-
<string>Add new vect legend</string>
387-
</property>
388306
</action>
389-
<action name="actionSelectItem" >
390-
<property name="checkable" >
391-
<bool>true</bool>
392-
</property>
307+
<action name="mActionSelectMoveItem" >
393308
<property name="icon" >
394-
<iconset>themes/default/mActionSelect.png</iconset>
309+
<iconset>../themes/default/mActionPan.png</iconset>
395310
</property>
396311
<property name="text" >
397312
<string>Select/Move item</string>
398313
</property>
399-
<property name="iconText" >
400-
<string>Select/Move item</string>
401-
</property>
402314
</action>
403-
<action name="actionImage" >
315+
<action name="mActionExportAsImage" >
404316
<property name="icon" >
405-
<iconset>themes/default/mActionExportMapServer.png</iconset>
317+
<iconset>../themes/default/mActionExportMapServer.png</iconset>
406318
</property>
407319
<property name="text" >
408320
<string>Export as image</string>
409321
</property>
410-
<property name="iconText" >
411-
<string>Export as image</string>
412-
</property>
413322
</action>
414-
<action name="actionSvg" >
323+
<action name="mActionExportAsSVG" >
415324
<property name="icon" >
416-
<iconset>themes/default/mActionSaveAsSVG.png</iconset>
325+
<iconset>../themes/default/mActionSaveAsSVG.png</iconset>
417326
</property>
418327
<property name="text" >
419328
<string>Export as SVG</string>
420329
</property>
421-
<property name="iconText" >
422-
<string>Export as SVG</string>
423-
</property>
424330
</action>
425-
<action name="actionAddScalebar" >
426-
<property name="checkable" >
427-
<bool>true</bool>
428-
</property>
331+
<action name="mActionAddNewScalebar" >
429332
<property name="icon" >
430-
<iconset>themes/default/mActionMeasure.png</iconset>
333+
<iconset>../../plugins/scale_bar/icon.xpm</iconset>
431334
</property>
432335
<property name="text" >
433336
<string>Add new scalebar</string>
434337
</property>
435-
<property name="iconText" >
436-
<string>Add new scalebar</string>
437-
</property>
438338
</action>
439-
<action name="actionRefresh" >
339+
<action name="mActionRefreshView" >
440340
<property name="icon" >
441-
<iconset>themes/default/mActionDraw.png</iconset>
341+
<iconset>../themes/default/mActionDraw.png</iconset>
442342
</property>
443343
<property name="text" >
444344
<string>Refresh view</string>
445345
</property>
446-
<property name="iconText" >
447-
<string>Refresh view</string>
448-
</property>
449346
</action>
450-
<action name="actionAddPicture" >
451-
<property name="checkable" >
452-
<bool>true</bool>
453-
</property>
347+
<action name="mActionAddImage" >
454348
<property name="icon" >
455-
<iconset>themes/default/mActionAddRasterLayer.png</iconset>
349+
<iconset>../themes/default/mActionSaveMapAsImage.png</iconset>
456350
</property>
457-
<property name="iconText" >
458-
<string>Add new picture</string>
351+
<property name="text" >
352+
<string>Add Image</string>
459353
</property>
460354
</action>
461355
</widget>
462-
<layoutdefault spacing="6" margin="11" />
463356
<pixmapfunction></pixmapfunction>
464357
<customwidgets>
465358
<customwidget>
@@ -469,20 +362,6 @@
469362
<container>1</container>
470363
<pixmap></pixmap>
471364
</customwidget>
472-
<customwidget>
473-
<class>Q3ToolBar</class>
474-
<extends></extends>
475-
<header>q3listview.h</header>
476-
<container>0</container>
477-
<pixmap></pixmap>
478-
</customwidget>
479-
<customwidget>
480-
<class>Q3MainWindow</class>
481-
<extends></extends>
482-
<header>q3mainwindow.h</header>
483-
<container>1</container>
484-
<pixmap></pixmap>
485-
</customwidget>
486365
</customwidgets>
487366
<resources/>
488367
<connections/>

0 commit comments

Comments
 (0)
Please sign in to comment.