Rename sigrok-logo-notext.png to pulseview.png.

This is more specific and prevents any potential issues e.g. when
multiple distro packages might ship with a generic file like
sigrok-logo-notext.png that's supposed to be installed in the same place.

diff --git a/Doxyfile b/Doxyfile
index a7cb281e202fd9079a33c5707dc443b9a03efd36..86f004cab1679991237f7ad24cacb3f6ea6383ca 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -8,7 +8,7 @@ DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "PulseView"
 PROJECT_NUMBER         = "unreleased development snapshot"
 PROJECT_BRIEF          = "A Qt-based sigrok GUI"
-PROJECT_LOGO           = icons/sigrok-logo-notext.png
+PROJECT_LOGO           = icons/pulseview.png
 OUTPUT_DIRECTORY       = doxy
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 0800575c00d66e3fd89ad516a08ba1ce351a3134..339b6e80eb9a82dbb80df176652a0a4c7f24afe6 100644 (file)
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -89,7 +89,7 @@
                                <filter token="bundled_libs" value="${bundled_libs}"/>
                        </filterset>
                </copy>
-               <copy file="${pulseview-source-path}/icons/sigrok-logo-notext.png"
+               <copy file="${pulseview-source-path}/icons/pulseview.png"
                        tofile="${resource.absolute.dir}/drawable/logo.png"/>
                <copy todir="${source.absolute.dir}">
                        <fileset dir="${prefix}/src/android/java/src">

diff --git a/contrib/org.sigrok.PulseView.desktop b/contrib/org.sigrok.PulseView.desktop
index 8e5b6e75dea9dfebda2a7c691d1b6ccdf6b5cb51..7bdfbf309c1e1600136cd8d4079911b033a6c3c0 100644 (file)
--- a/contrib/org.sigrok.PulseView.desktop
+++ b/contrib/org.sigrok.PulseView.desktop
@@ -5,6 +5,6 @@ GenericName=Logic analyzer, oscilloscope and MSO GUI
 Categories=Development;Electronics;
 Comment=Control your logic analyzer, oscilloscope, or MSO
 Exec=pulseview
-Icon=sigrok-logo-notext
+Icon=pulseview
 Type=Application
 MimeType=application/vnd.sigrok.session

diff --git a/icons/pulseview.png b/icons/pulseview.png
new file mode 100644 (file)
index 0000000..5b35dfe
Binary files /dev/null and b/icons/pulseview.png differ

diff --git a/icons/sigrok-logo-notext.png b/icons/sigrok-logo-notext.png
deleted file mode 100644 (file)
index 5b35dfe..0000000
Binary files a/icons/sigrok-logo-notext.png and /dev/null differ

diff --git a/pulseview.qrc b/pulseview.qrc
index 17f809c3a704eaafec7a6e1292a2a5fe8e3e6174..18d17f7ac954572998bb3d3e7dc8ae6cf3ba0edb 100644 (file)
--- a/pulseview.qrc
+++ b/pulseview.qrc
@@ -13,7 +13,7 @@
        <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/pulseview.png</file>
        <file>icons/sigrok-logo-notext.svg</file>
        <file>icons/status-green.svg</file>
        <file>icons/status-grey.svg</file>

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a11d5286dd049c67627359e6aaeb196b7d0f5009..8b11d0822d53c8960583e742117fcc76abdc52cd 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -403,7 +403,7 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+       icon.addFile(QString(":/icons/pulseview.png"));
        setWindowIcon(icon);
 
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));