From: Uwe Hermann <redacted>
Date: Sun, 11 Jun 2017 18:05:50 +0000 (+0200)
Subject: Rename sigrok-logo-notext.png to pulseview.png.
X-Git-Tag: pulseview-0.4.0~8
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=5ea53b3c20d5cd80c096fb2f8d1334ae17fbce7b;p=pulseview.git

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 a7cb281e..86f004ca 100644
--- 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 0800575c..339b6e80 100644
--- 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 8e5b6e75..7bdfbf30 100644
--- 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
index 00000000..5b35dfed
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
index 5b35dfed..00000000
Binary files a/icons/sigrok-logo-notext.png and /dev/null differ
diff --git a/pulseview.qrc b/pulseview.qrc
index 17f809c3..18d17f7a 100644
--- 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 a11d5286..8b11d082 100644
--- 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()));