Merge branch 'release/0.4'

Author: jahnf

55-spotlight.rules

@@ -13,6 +13,5 @@
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c53e", MODE="660", GROUP="plugdev", ENV{USB_HUB_TYPE}="046d:c53e"
 
 # Rule when connected via Bluetooth
-SUBSYSTEMS=="input", ATTRS{name}=="SPOTLIGHT", MODE="660", GROUP="plugdev""
-
-
+# Updated rule, thanks to Torsten Maehne (https://github.com/maehne)
+SUBSYSTEMS=="input", ATTRS{name}=="SPOTLIGHT*", MODE="660", GROUP="plugdev"

CMakeLists.txt

@@ -9,6 +9,13 @@ elseif(QTDIR)
   list(APPEND CMAKE_PREFIX_PATH ${QTDIR})
 endif()
 
+# Set the default build type to release
+if( NOT CMAKE_BUILD_TYPE )
+  message(STATUS "Setting build type to 'Release' as none was specified.")
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+endif()
+
 project(Projecteur LANGUAGES CXX)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -42,3 +49,29 @@ add_version_info(projecteur "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # Add target with non-source files for convenience when using IDEs like QtCreator and others
 add_custom_target(non-sources SOURCES README.md LICENSE.md 55-spotlight.rules)
+
+# Install
+install(TARGETS projecteur DESTINATION bin)
+
+# Use udev.pc pkg-config file to set the dir path
+if (NOT CMAKE_INSTALL_UDEVRULESDIR)
+  set (UDEVDIR /lib/udev)
+  find_package(PkgConfig)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PKGCONFIG_UDEV udev)
+    if(PKGCONFIG_UDEV_FOUND)
+      execute_process(
+        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=udevdir udev
+        OUTPUT_VARIABLE PKGCONFIG_UDEVDIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+      if(PKGCONFIG_UDEVDIR)
+        file(TO_CMAKE_PATH "${PKGCONFIG_UDEVDIR}" UDEVDIR)
+      endif(PKGCONFIG_UDEVDIR)
+    endif(PKGCONFIG_UDEV_FOUND)
+  endif(PKG_CONFIG_FOUND)
+endif(NOT CMAKE_INSTALL_UDEVRULESDIR)
+set (CMAKE_INSTALL_UDEVRULESDIR ${UDEVDIR}/rules.d CACHE PATH "Where to install udev rules")
+mark_as_advanced(CMAKE_INSTALL_UDEVRULESDIR)
+
+install(FILES 55-spotlight.rules DESTINATION ${CMAKE_INSTALL_UDEVRULESDIR}/)

README.md

@@ -5,7 +5,7 @@ master: [![Build Status master](https://travis-ci.org/jahnf/Projecteur.svg?branc
 
 Linux/X11 application for the Logitech Spotlight device.
 
-Copyright 2018 [Jahn Fuchs](mailto:[email protected])
+Copyright 2018-2019 [Jahn Fuchs](mailto:[email protected])
 
 ## Motivation
 
@@ -26,7 +26,7 @@ So here it is: a Linux application for the Logitech Spotlight.
 
 ## Supported Environments
 
-The application was tested only on Ubuntu 18.04 (GNOME) and OpenSuse 42.3 (GNOME)
+The application was tested on Ubuntu 18.04 (GNOME) and OpenSuse 42.3 and 15 (GNOME)
 but should work on almost any Linux/X11 Desktop. Make sure you have the correct
 udev rules installed (see Installation Pre-requisites).
 
@@ -51,10 +51,12 @@ For more details: Have a look at the source code ;)
 
 * C++11 compiler
 * CMake 3.6 or later
-* Qt 5.6 (Might also work in earlier Qt5 versions - but not tested)
+* Qt 5.9 and later
 
 ### Build Example
 
+Note: You can ommit setting the `QTDIR` variable, CMake will then usually find the Qt versin that comes with the distribution's packacke management.
+
       > git clone https://github.com/jahnf/projecteur
       > cd projecteur
       > mkdir build && cd build

aboutdlg.cc

@@ -8,6 +8,7 @@
 #include <QIcon>
 #include <QLabel>
 #include <QPushButton>
+#include <QTabWidget>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 
@@ -22,10 +23,29 @@ AboutDialog::AboutDialog(QWidget* parent)
   iconLabel->setPixmap(QIcon(":/icons/projecteur-tray.svg").pixmap(QSize(128,128)));
   hbox->addWidget(iconLabel);
 
-  auto vbox = new QVBoxLayout();
-  vbox->addWidget(new QLabel(QString("<b>%1</b><br>Version %2")
+  auto tabWidget = new QTabWidget(this);
+  hbox->addWidget(tabWidget, 1);
+
+  tabWidget->addTab(createVersionInfoWidget(), tr("Version"));
+//  tabWidget->addTab(createContributorInfoWidget(), tr("Contributors"));
+
+  auto bbox = new QDialogButtonBox(QDialogButtonBox::Ok, this);
+  connect(bbox, &QDialogButtonBox::clicked, this, &QDialog::accept);
+
+  auto mainVbox = new QVBoxLayout(this);
+  mainVbox->addLayout(hbox);
+  mainVbox->addSpacing(10);
+  mainVbox->addWidget(bbox);
+}
+
+QWidget* AboutDialog::createVersionInfoWidget()
+{
+  auto versionInfoWidget = new QWidget(this);
+  auto vbox = new QVBoxLayout(versionInfoWidget);
+  vbox->addWidget(new QLabel(QString("<b>%1</b><br>%2")
                              .arg(QCoreApplication::applicationName())
-                             .arg(projecteur::version_string()), this));
+                             .arg(tr("Version %1", "%1=application version number")
+                                  .arg(projecteur::version_string()))));
 
   if (QString(projecteur::version_branch()) != "master")
   {
@@ -42,16 +62,19 @@ AboutDialog::AboutDialog(QWidget* parent)
   vbox->addWidget(weblinkLabel);
 
   vbox->addSpacing(20);
-  vbox->addWidget(new QLabel(QString("Qt Version: %1").arg(QT_VERSION_STR), this));
+  vbox->addWidget(new QLabel(tr("Qt Version: %1", "%1=qt version number").arg(QT_VERSION_STR), this));
 
   vbox->addStretch(1);
-  hbox->addLayout(vbox);
+  return versionInfoWidget;
+}
 
-  auto bbox = new QDialogButtonBox(QDialogButtonBox::Ok, this);
-  connect(bbox, &QDialogButtonBox::clicked, this, &QDialog::accept);
+QWidget* AboutDialog::createContributorInfoWidget()
+{
+  auto contributorWidget = new QWidget(this);
+  auto vbox = new QVBoxLayout(contributorWidget);
 
-  auto mainVbox = new QVBoxLayout(this);
-  mainVbox->addLayout(hbox);
-  mainVbox->addSpacing(10);
-  mainVbox->addWidget(bbox);
+  // TODO: list contributors (scroll box)
+
+  vbox->addStretch(1);
+  return contributorWidget;
 }

aboutdlg.h

@@ -10,4 +10,8 @@ class AboutDialog : public QDialog
 public:
   explicit AboutDialog(QWidget* parent = nullptr);
   virtual ~AboutDialog() override = default;
+
+private:
+  QWidget* createVersionInfoWidget();
+  QWidget* createContributorInfoWidget();
 };