Rename icons to match freedesktop.org icon naming specification.

https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html

diff --git a/icons/configure.png b/icons/configure.png
deleted file mode 100644 (file)
index cc91d65..0000000
Binary files a/icons/configure.png and /dev/null differ

diff --git a/icons/preferences-system.png b/icons/preferences-system.png
new file mode 100644 (file)
index 0000000..cc91d65
Binary files /dev/null and b/icons/preferences-system.png differ

diff --git a/icons/zoom-fit-best.png b/icons/zoom-fit-best.png
new file mode 100644 (file)
index 0000000..babe581
Binary files /dev/null and b/icons/zoom-fit-best.png differ

diff --git a/icons/zoom-fit.png b/icons/zoom-fit.png
deleted file mode 100644 (file)
index babe581..0000000
Binary files a/icons/zoom-fit.png and /dev/null differ

diff --git a/pulseview.qrc b/pulseview.qrc
index 32e3d72aa9a3b8b62b960bd440609ce4a96d1617..17f809c3a704eaafec7a6e1292a2a5fe8e3e6174 100644 (file)
--- 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 d13c8e197e3bfc917cd0ec697fbdfe72c54a2947..205c95ca95a765670d5386e16345ef176dcdf804 100644 (file)
--- 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 1a177fd65eea01c99d900ba68a54ac2c7e4fa875..e1a666b11ce9ea28c9e83dab427d25d485a10857 100644 (file)
--- 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 dc82ff1e1c065fdc918645cf31bffdcd98f1e1b4..1a77edaa7594f7546a6d582114e44b78435f84e0 100644 (file)
--- 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)));