Skip to content

Commit 7cfe7f8

Browse files
nirvnNathanW2
nirvn
authored and
NathanW2
committed
[style dock] vectorize undo & redo button, create history symbol (#3187)
1 parent 1b31f08 commit 7cfe7f8

16 files changed

+306
-29
lines changed

‎images/images.qrc

+3
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

+107
Loading

‎images/themes/default/mActionRedo.svg

+81
Loading

‎images/themes/default/mActionUndo.svg

+81
Loading

‎src/app/composer/qgscomposer.cpp

+2-2
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

+2-2
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

+1-1
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

+1-1
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

+2-2
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

+2-2
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

+2-2
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

+1-1
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>

0 commit comments

Comments
 (0)