Merge branch 'develop' of https://github.com/DreamSourceLab/DSView into develop

Conflicts:
	INSTALL

DSView/CMakeLists.txt

@@ -396,6 +396,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "/usr/local/lib")
 install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
 install(DIRECTORY ../libsigrokdecode4DSL/decoders DESTINATION share/${PROJECT_NAME})
+install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
+install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
+install(FILES DSView.desktop DESTINATION /usr/share/applications/)
 
 #===============================================================================
 #= Packaging (handled by CPack)

DSView/DSView.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=0.96
+Exec=/usr/local/bin/DSView
+Name=DSView
+Comment=GUI Program for DreamSourceLab USB-based Instruments
+Icon=/usr/local/share/DSView/logo.png
+Type=Application
+Terminal=false
+Categories=Development

DSView/DreamSourceLab.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTRS{idVendor}=="2a0e", MODE="0666"

DSView/main.cpp

@@ -34,6 +34,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QDir>
+#include <QIcon>
 
 #include "dsapplication.h"
 #include "pv/devicemanager.h"

DSView/pv/mainframe.cpp

@@ -51,6 +51,12 @@ MainFrame::MainFrame(DeviceManager &device_manager,
     setMinimumWidth(800);
     //resize(1024, 768);
 
+    // Set the window icon
+    QIcon icon;
+    icon.addFile(QString::fromUtf8(":/icons/logo.png"),
+        QSize(), QIcon::Normal, QIcon::Off);
+    setWindowIcon(icon);
+
     _moving = false;
     _startPos = None;
     _freezing = false;

DSView/pv/mainwindow.cpp

@@ -117,12 +117,6 @@ void MainWindow::setup_ui()
     layout()->setMargin(0);
     layout()->setSpacing(0);
 
-	// Set the window icon
-	QIcon icon;
-    icon.addFile(QString::fromUtf8(":/icons/logo.png"),
-		QSize(), QIcon::Normal, QIcon::Off);
-	setWindowIcon(icon);
-
 	// Setup the central widget
 	_central_widget = new QWidget(this);
 	_vertical_layout = new QVBoxLayout(_central_widget);