Skip to content

Commit 7cfe7f8

Browse files
nirvnNathanW2
nirvn
authored and
NathanW2
committedJun 9, 2016
[style dock] vectorize undo & redo button, create history symbol (#3187)
·
ltr-3_40archive/master_2
1 parent 1b31f08 commit 7cfe7f8

16 files changed

+306
-29
lines changed
 

‎images/images.qrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
<file>themes/default/mActionHideAllLayers.png</file>
229229
<file>themes/default/mActionHideAllLayers.svg</file>
230230
<file>themes/default/mActionHideSelectedLayers.png</file>
231+
<file>themes/default/mActionHistory.svg</file>
231232
<file>themes/default/mActionIdentify.svg</file>
232233
<file>themes/default/mActionIncreaseBrightness.svg</file>
233234
<file>themes/default/mActionIncreaseContrast.svg</file>
@@ -277,6 +278,7 @@
277278
<file>themes/default/mActionPropertyItem.svg</file>
278279
<file>themes/default/mActionQgisHomePage.png</file>
279280
<file>themes/default/mActionRaiseItems.png</file>
281+
<file>themes/default/mActionRedo.svg</file>
280282
<file>themes/default/mActionRedo.png</file>
281283
<file>themes/default/mActionRefresh.png</file>
282284
<file>themes/default/mActionRemove.png</file>
@@ -330,6 +332,7 @@
330332
<file>themes/default/mActionToggleEditing.svg</file>
331333
<file>themes/default/mActionTouch.svg</file>
332334
<file>themes/default/mActionTouch2.png</file>
335+
<file>themes/default/mActionUndo.svg</file>
333336
<file>themes/default/mActionUndo.png</file>
334337
<file>themes/default/mActionUngroupItems.png</file>
335338
<file>themes/default/mActionUnselectAttributes.png</file>

‎images/themes/default/mActionHistory.svg

Lines changed: 107 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionRedo.svg

Lines changed: 81 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/mActionUndo.svg

Lines changed: 81 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎src/app/composer/qgscomposer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,8 @@ void QgsComposer::setupTheme()
719719
mActionZoomActual->setIcon( QgsApplication::getThemeIcon( "/mActionZoomActual.svg" ) );
720720
mActionMouseZoom->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToArea.svg" ) );
721721
mActionRefreshView->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.svg" ) );
722-
mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.png" ) );
723-
mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.png" ) );
722+
mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.svg" ) );
723+
mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.svg" ) );
724724
mActionAddImage->setIcon( QgsApplication::getThemeIcon( "/mActionAddImage.svg" ) );
725725
mActionAddNewMap->setIcon( QgsApplication::getThemeIcon( "/mActionAddMap.svg" ) );
726726
mActionAddNewLabel->setIcon( QgsApplication::getThemeIcon( "/mActionLabel.svg" ) );

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2514,8 +2514,8 @@ void QgisApp::setTheme( const QString& theThemeName )
25142514
mActionDeleteSelected->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteSelected.svg" ) );
25152515
mActionNodeTool->setIcon( QgsApplication::getThemeIcon( "/mActionNodeTool.png" ) );
25162516
mActionSimplifyFeature->setIcon( QgsApplication::getThemeIcon( "/mActionSimplify.png" ) );
2517-
mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.png" ) );
2518-
mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.png" ) );
2517+
mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.svg" ) );
2518+
mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.svg" ) );
25192519
mActionAddRing->setIcon( QgsApplication::getThemeIcon( "/mActionAddRing.png" ) );
25202520
mActionFillRing->setIcon( QgsApplication::getThemeIcon( "/mActionFillRing.svg" ) );
25212521
mActionAddPart->setIcon( QgsApplication::getThemeIcon( "/mActionAddPart.png" ) );

‎src/app/qgsmapstylingwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void QgsMapStylingWidget::setLayer( QgsMapLayer *layer )
134134
QgsDebugMsg( QString( "ROW IS %1" ).arg( row ) );
135135
}
136136
}
137-
mOptionsListWidget->addItem( new QListWidgetItem( QgsApplication::getThemeIcon( "mIconTreeView.png" ), "" ) );
137+
mOptionsListWidget->addItem( new QListWidgetItem( QgsApplication::getThemeIcon( "mActionHistory.svg" ), "" ) );
138138

139139
if ( sameLayerType )
140140
{

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
428428
mOptStackedWidget->indexOf( mOptsPage_Style ) );
429429
}
430430

431-
mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.png" ) );
431+
mResetColorRenderingBtn->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.svg" ) );
432432

433433
QString title = QString( tr( "Layer Properties - %1" ) ).arg( lyr->name() );
434434
restoreOptionsBaseUi( title );

‎src/app/qgsundowidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ void QgsUndoWidget::setupUi( QWidget *UndoWidget )
185185

186186
undoButton = new QPushButton( dockWidgetContents );
187187
undoButton->setObjectName( QString::fromUtf8( "undoButton" ) );
188-
undoButton->setIcon( QgsApplication::getThemeIcon( "mActionUndo.png" ) );
188+
undoButton->setIcon( QgsApplication::getThemeIcon( "mActionUndo.svg" ) );
189189

190190
gridLayout->addWidget( undoButton, 1, 0, 1, 1 );
191191

192192
redoButton = new QPushButton( dockWidgetContents );
193193
redoButton->setObjectName( QString::fromUtf8( "redoButton" ) );
194-
redoButton->setIcon( QgsApplication::getThemeIcon( "mActionRedo.png" ) );
194+
redoButton->setIcon( QgsApplication::getThemeIcon( "mActionRedo.svg" ) );
195195

196196
gridLayout->addWidget( redoButton, 1, 1, 1, 1 );
197197

‎src/ui/composer/qgscomposerbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@
638638
<action name="mActionUndo">
639639
<property name="icon">
640640
<iconset>
641-
<normalon>:/images/themes/default/mActionUndo.png</normalon>
641+
<normalon>:/images/themes/default/mActionUndo.svg</normalon>
642642
</iconset>
643643
</property>
644644
<property name="text">
@@ -654,7 +654,7 @@
654654
<action name="mActionRedo">
655655
<property name="icon">
656656
<iconset resource="../../../images/images.qrc">
657-
<normaloff>:/images/themes/default/mActionRedo.png</normaloff>:/images/themes/default/mActionRedo.png</iconset>
657+
<normaloff>:/images/themes/default/mActionRedo.svg</normaloff>:/images/themes/default/mActionRedo.svg</iconset>
658658
</property>
659659
<property name="text">
660660
<string>&amp;Redo</string>

‎src/ui/qgisapp.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
<action name="mActionUndo">
664664
<property name="icon">
665665
<iconset resource="../../images/images.qrc">
666-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
666+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
667667
</property>
668668
<property name="text">
669669
<string>&amp;Undo</string>
@@ -675,7 +675,7 @@
675675
<action name="mActionRedo">
676676
<property name="icon">
677677
<iconset resource="../../images/images.qrc">
678-
<normaloff>:/images/themes/default/mActionRedo.png</normaloff>:/images/themes/default/mActionRedo.png</iconset>
678+
<normaloff>:/images/themes/default/mActionRedo.svg</normaloff>:/images/themes/default/mActionRedo.svg</iconset>
679679
</property>
680680
<property name="text">
681681
<string>&amp;Redo</string>

‎src/ui/qgslabelingguibase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
</property>
205205
<property name="icon">
206206
<iconset resource="../../images/images.qrc">
207-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
207+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
208208
</property>
209209
</widget>
210210
</item>

‎src/ui/qgsmapstylingwidgetbase.ui

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</property>
5454
<property name="icon">
5555
<iconset resource="../../images/images.qrc">
56-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
56+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
5757
</property>
5858
</widget>
5959
</item>
@@ -64,7 +64,7 @@
6464
</property>
6565
<property name="icon">
6666
<iconset resource="../../images/images.qrc">
67-
<normaloff>:/images/themes/default/mActionRedo.png</normaloff>:/images/themes/default/mActionRedo.png</iconset>
67+
<normaloff>:/images/themes/default/mActionRedo.svg</normaloff>:/images/themes/default/mActionRedo.svg</iconset>
6868
</property>
6969
</widget>
7070
</item>
@@ -75,19 +75,11 @@
7575
</property>
7676
<property name="sizeHint" stdset="0">
7777
<size>
78-
<width>40</width>
7978
<height>20</height>
8079
</size>
8180
</property>
8281
</spacer>
8382
</item>
84-
<item>
85-
<widget class="QDialogButtonBox" name="mButtonBox">
86-
<property name="standardButtons">
87-
<set>QDialogButtonBox::Apply</set>
88-
</property>
89-
</widget>
90-
</item>
9183
<item>
9284
<widget class="QCheckBox" name="mLiveApplyCheck">
9385
<property name="text">
@@ -101,6 +93,19 @@
10193
</property>
10294
</widget>
10395
</item>
96+
<item>
97+
<widget class="QDialogButtonBox" name="mButtonBox">
98+
<property name="sizePolicy">
99+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
100+
<horstretch>0</horstretch>
101+
<verstretch>0</verstretch>
102+
</sizepolicy>
103+
</property>
104+
<property name="standardButtons">
105+
<set>QDialogButtonBox::Apply</set>
106+
</property>
107+
</widget>
108+
</item>
104109
</layout>
105110
</item>
106111
<item row="1" column="0" rowspan="2">

‎src/ui/qgsoptionsbase.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@
904904
</property>
905905
<property name="icon">
906906
<iconset resource="../../images/images.qrc">
907-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
907+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
908908
</property>
909909
</widget>
910910
</item>
@@ -1202,7 +1202,7 @@
12021202
</property>
12031203
<property name="icon">
12041204
<iconset resource="../../images/images.qrc">
1205-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
1205+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
12061206
</property>
12071207
</widget>
12081208
</item>
@@ -3443,7 +3443,7 @@
34433443
</property>
34443444
<property name="icon">
34453445
<iconset resource="../../images/images.qrc">
3446-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
3446+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
34473447
</property>
34483448
</widget>
34493449
</item>
@@ -5011,7 +5011,7 @@
50115011
</property>
50125012
<property name="icon">
50135013
<iconset resource="../../images/images.qrc">
5014-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
5014+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
50155015
</property>
50165016
</widget>
50175017
</item>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@
827827
</property>
828828
<property name="icon">
829829
<iconset resource="../../images/images.qrc">
830-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
830+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
831831
</property>
832832
<property name="toolButtonStyle">
833833
<enum>Qt::ToolButtonTextBesideIcon</enum>

‎src/ui/qgsrendererrasterpropswidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
</property>
365365
<property name="icon">
366366
<iconset resource="../../images/images.qrc">
367-
<normaloff>:/images/themes/default/mActionUndo.png</normaloff>:/images/themes/default/mActionUndo.png</iconset>
367+
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
368368
</property>
369369
<property name="toolButtonStyle">
370370
<enum>Qt::ToolButtonTextBesideIcon</enum>

0 commit comments

Comments
 (0)
Please sign in to comment.