From 3432032fbc693b58a0c65427c025b9553c419237 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Wed, 5 Apr 2017 21:34:29 +0200
Subject: [PATCH] Rename icons to match freedesktop.org icon naming
 specification.

https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
---
 icons/{configure.png => preferences-system.png} | Bin
 icons/{zoom-fit.png => zoom-fit-best.png}       | Bin
 pulseview.qrc                                   |   4 ++--
 pv/mainwindow.cpp                               |   4 ++--
 pv/toolbars/mainbar.cpp                         |   4 ++--
 pv/views/trace/standardbar.cpp                  |   4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename icons/{configure.png => preferences-system.png} (100%)
 rename icons/{zoom-fit.png => zoom-fit-best.png} (100%)

diff --git a/icons/configure.png b/icons/preferences-system.png
similarity index 100%
rename from icons/configure.png
rename to icons/preferences-system.png
diff --git a/icons/zoom-fit.png b/icons/zoom-fit-best.png
similarity index 100%
rename from icons/zoom-fit.png
rename to icons/zoom-fit-best.png
diff --git a/pulseview.qrc b/pulseview.qrc
index 32e3d72a..17f809c3 100644
--- a/pulseview.qrc
+++ b/pulseview.qrc
@@ -3,7 +3,6 @@
 	<file>icons/add-decoder.svg</file>
 	<file>icons/application-exit.png</file>
 	<file>icons/channels.svg</file>
-	<file>icons/configure.png</file>
 	<file>icons/decoder-delete.svg</file>
 	<file>icons/decoder-hidden.svg</file>
 	<file>icons/decoder-shown.svg</file>
@@ -12,6 +11,7 @@
 	<file>icons/document-save-as.png</file>
 	<file>icons/information.svg</file>
 	<file>icons/menu.svg</file>
+	<file>icons/preferences-system.png</file>
 	<file>icons/settings-views.svg</file>
 	<file>icons/sigrok-logo-notext.png</file>
 	<file>icons/sigrok-logo-notext.svg</file>
@@ -31,7 +31,7 @@
 	<file>icons/trigger-none.svg</file>
 	<file>icons/trigger-rising.svg</file>
 	<file>icons/window-new.png</file>
-	<file>icons/zoom-fit.png</file>
+	<file>icons/zoom-fit-best.png</file>
 	<file>icons/zoom-in.png</file>
 	<file>icons/zoom-original.png</file>
 	<file>icons/zoom-out.png</file>
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index d13c8e19..205c95ca 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -374,8 +374,8 @@ void MainWindow::setup_ui()
 	run_stop_shortcut_->setAutoRepeat(false);
 
 	settings_button_ = new QToolButton();
-	settings_button_->setIcon(QIcon::fromTheme("configure",
-		QIcon(":/icons/configure.png")));
+	settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+		QIcon(":/icons/preferences-system.png")));
 	settings_button_->setToolTip(tr("Settings"));
 	settings_button_->setAutoRaise(true);
 
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 1a177fd6..e1a666b1 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -216,8 +216,8 @@ MainBar::MainBar(Session &session, QWidget *parent,
 	set_capture_state(pv::Session::Stopped);
 
 	configure_button_.setToolTip(tr("Configure Device"));
-	configure_button_.setIcon(QIcon::fromTheme("configure",
-		QIcon(":/icons/configure.png")));
+	configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+		QIcon(":/icons/preferences-system.png")));
 
 	channels_button_.setToolTip(tr("Configure Channels"));
 	channels_button_.setIcon(QIcon::fromTheme("channels",
diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index dc82ff1e..1a77edaa 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -64,8 +64,8 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 
 	action_view_zoom_fit_->setCheckable(true);
 	action_view_zoom_fit_->setText(tr("Zoom to &Fit"));
-	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit",
-		QIcon(":/icons/zoom-fit.png")));
+	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit-best",
+		QIcon(":/icons/zoom-fit-best.png")));
 	action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F));
 	connect(action_view_zoom_fit_, SIGNAL(triggered(bool)),
 		this, SLOT(on_actionViewZoomFit_triggered(bool)));
-- 
2.30.2