qt-lightdm-greeter -> lightdm-qt5-greeter

rezso · Nov 20, 2019 · f2feddd · f2feddd
1 parent 2c45846
commit f2feddd
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-set(PROJECT qt-lightdm-greeter)
+set(PROJECT lightdm-qt5-greeter)
 project(${PROJECT})
 
 set(CMAKE_AUTOMOC ON)
@@ -11,7 +11,7 @@ message(STATUS "SRCS ${SRCS}")
 find_package(Qt5Widgets REQUIRED)
 #find_package(Qt5X11Extras REQUIRED QUIET)
 
-QT5_ADD_RESOURCES(RSCS qt-lightdm-greeter.qrc)
+QT5_ADD_RESOURCES(RSCS lightdm-qt5-greeter.qrc)
 
 
 include(FindPkgConfig)
@@ -22,15 +22,15 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}
                       ${LIGHTDM_QT_INCLUDE_DIRS}
 )
 
-add_executable ( qt-lightdm-greeter ${SRCS} ${RSCS})
+add_executable ( lightdm-qt5-greeter ${SRCS} ${RSCS})
 
-target_link_libraries ( qt-lightdm-greeter Qt5::Widgets ${LIGHTDM_QT_LIBRARIES} )
+target_link_libraries ( lightdm-qt5-greeter Qt5::Widgets ${LIGHTDM_QT_LIBRARIES} )
 
 
 install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
-install(FILES   qt-lightdm-greeter.desktop  DESTINATION /usr/share/xgreeters)
+install(FILES   lightdm-qt5-greeter.desktop  DESTINATION /usr/share/xgreeters)
 
 if (NOT KEEP_CONFIGS)
-    install(FILES qt-lightdm-greeter.conf DESTINATION /etc/lightdm)
+    install(FILES lightdm-qt5-greeter.conf DESTINATION /etc/lightdm)
 endif()
 
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# qt-lightdm-greeter
+# lightdm-qt5-greeter
 
-qt-lightdm-greeter is a simple frontend for the lightdm displaymanager, written in c++ and qt5.
+lightdm-qt5-greeter is a simple frontend for the lightdm displaymanager, written in c++ and qt5.
 
-It has it's roots in the razor project, where it was developed under the name razor-lightdm-greeter. When razor was merged into LXQt it was renamed to lxqt-lightdm-greeter.
+It has it's roots in the razor project, where it was developed under the name razor-lightdm-greeter. When razor was merged into LXQt it was renamed to lxlightdm-qt5-greeter.
 
 As of september 2015 I have renamed it to qt-lightdm-greeter and cut it's ties to LXQt. This was primarily because LXQt recommends SDDM as its displaymanager and because the application had very little integration with LXQt. 
 
@@ -15,24 +15,24 @@ Make sure you have cmake, gcc, qt5 and liblightdm-qt5 (and lightdm) installed on
 Do
 
 ```shell
-git clone https://github.com/surlykke/qt-lightdm-greeter.git
-cd qt-lightdm-greeter
+git clone https://github.com/surlykke/lightdm-qt5-greeter.git
+cd lightdm-qt5-greeter
 mkdir build
 cd build
 cmake ..
 make 
 sudo make install
 ```
 
-## How to enable qt-lightdm greeter
+## How to enable lightdm-qt5 greeter
 
 Update or insert in(to) your `/etc/lightdm/lightdm.conf`, in the `SeatDefaults` section, this line:
 
-    greeter-session=qt-lightdm-greeter
+    greeter-session=lightdm-qt5-greeter
 
-## Configure qt-lightdm-greeter
+## Configure lightdm-qt5-greeter
 
-The file `/etc/lightdm/qt-lightdm-greeter.conf` allows for a 
-few configurations of qt-lightdm-greeter (background-image, positioning of loginform). 
+The file `/etc/lightdm/lightdm-qt5-greeter.conf` allows for a 
+few configurations of lightdm-qt5-greeter (background-image, positioning of loginform). 
 The configuration options are documented in that file.
 
diff --git a/license-header.txt b/license-header.txt
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */
diff --git a/qt-lightdm-greeter.conf → lightdm-qt5-greeter.conf b/qt-lightdm-greeter.conf → lightdm-qt5-greeter.conf
@@ -1,4 +1,4 @@
-; qt-lightdm-greeter.conf
+; lightdm-qt5-greeter.conf
 ;
 ; General configuration
 ;

diff --git a/qt-lightdm-greeter.desktop → lightdm-qt5-greeter.desktop b/qt-lightdm-greeter.desktop → lightdm-qt5-greeter.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Qt LightDM Greeter
 Comment=This runs the Qt LightDM greeter, it should only be run from LightDM
-Exec=qt-lightdm-greeter
+Exec=lightdm-qt5-greeter
 Type=Application
-X-Ubuntu-Gettext-Domain=lightdm
diff --git a/qt-lightdm-greeter.qrc → lightdm-qt5-greeter.qrc b/qt-lightdm-greeter.qrc → lightdm-qt5-greeter.qrc
diff --git a/loginform.cpp b/loginform.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */

diff --git a/loginform.h b/loginform.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */

diff --git a/loginform.ui b/loginform.ui
@@ -121,7 +121,7 @@ QComboBox::down-arrow {
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="qt-lightdm-greeter.qrc">:/resources/rqt-2.png</pixmap>
+         <pixmap resource="lightdm-qt5-greeter.qrc">:/resources/rqt-2.png</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -249,7 +249,7 @@ QComboBox::down-arrow {
           <string/>
          </property>
          <property name="icon">
-          <iconset resource="qt-lightdm-greeter.qrc">
+          <iconset resource="lightdm-qt5-greeter.qrc">
            <normaloff>:/resources/leaveIcon.svg</normaloff>:/resources/leaveIcon.svg</iconset>
          </property>
         </item>
@@ -261,7 +261,7 @@ QComboBox::down-arrow {
   </layout>
  </widget>
  <resources>
-  <include location="qt-lightdm-greeter.qrc"/>
+  <include location="lightdm-qt5-greeter.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/main.cpp b/main.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke, Petr Vanek
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke, Petr Vanek
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */

diff --git a/mainwindow.h b/mainwindow.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2012-2015 Christian Surlykke, Petr Vanek
 *
-* This file is part of qt-lightdm-greeter 
+* This file is part of lightdm-qt5-greeter 
 * It is distributed under the LGPL 2.1 or later license.
 * Please refer to the LICENSE file for a copy of the license.
 */

diff --git a/settings.cpp b/settings.cpp
@@ -7,7 +7,7 @@
 #define LOGINFORM_OFFSETY_KEY "loginform-offset-y"
 #define LOGFILE_PATH_KEY "logfile-path"
 
-const QString Cache::GREETER_DATA_DIR_PATH = "/var/lib/lightdm/qt-lightdm-greeter";
+const QString Cache::GREETER_DATA_DIR_PATH = "/var/lib/lightdm/lightdm-qt5-greeter";
 
 void Cache::prepare()
 {

diff --git a/settings.h b/settings.h
@@ -19,7 +19,7 @@ class Cache : public QSettings
     void setLastSession(QString userId, QString session) { setValue(userId + "/last-session", session); }
 };
 
-#define CONFIG_FILE "/etc/lightdm/qt-lightdm-greeter.conf"
+#define CONFIG_FILE "/etc/lightdm/lightdm-qt5-greeter.conf"
 #define BACKGROUND_IMAGE_KEY "greeter-background-image"
 #define LOGINFORM_OFFSETX_KEY "loginform-offset-x"
 #define LOGINFORM_OFFSETY_KEY "loginform-offset-y"
@@ -28,7 +28,7 @@ class Cache : public QSettings
 class Settings : public QSettings
 {
 public:
-    Settings() : QSettings(QString("/etc/lightdm/qt-lightdm-greeter.conf"), QSettings::NativeFormat) {}
+    Settings() : QSettings(QString("/etc/lightdm/lightdm-qt5-greeter.conf"), QSettings::NativeFormat) {}
     QString iconThemeName() { return value("greeter-icon-theme").toString(); }
     QString backgrundImagePath() { return value("greeter-background-image").toString(); }
     QString offsetX() { return value("loginform-offset-x").toString(); }