From 952b40ba645f739cdabfebb80efb9938f155dd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrew=20Lee=20=28=E6=9D=8E=E5=81=A5=E7=A7=8B=29?= Date: Mon, 17 Aug 2015 18:08:31 +0800 Subject: [PATCH] Merging upstream version 0.9.0+20150807. --- .gitignore | 1 - CMakeLists.txt | 13 +- cmake/LxQtLibSuffix.cmake | 28 -- lxqt-config-session/CMakeLists.txt | 21 +- lxqt-config-session/basicsettings.cpp | 2 +- lxqt-config-session/basicsettings.ui | 2 +- lxqt-config-session/main.cpp | 4 +- lxqt-config-session/sessionconfigwindow.h | 2 +- .../translations/lxqt-config-session.ts | 12 +- .../lxqt-config-session_de.desktop | 7 +- .../translations/lxqt-config-session_de.ts | 116 ++++---- .../lxqt-config-session_de_DE.desktop | 4 - .../translations/lxqt-config-session_de_DE.ts | 264 ------------------ .../translations/lxqt-config-session_hu.ts | 22 +- .../translations/lxqt-config-session_hu_HU.ts | 90 +++--- .../lxqt-config-session_it.desktop | 5 +- ...ion_it_IT.ts => lxqt-config-session_it.ts} | 12 +- .../lxqt-config-session_it_IT.desktop | 4 - .../lxqt-config-session_zh_TW.desktop | 2 +- lxqt-leave/CMakeLists.txt | 69 +++++ lxqt-leave/leavedialog.cpp | 63 +++++ lxqt-leave/leavedialog.h | 56 ++++ lxqt-leave/leavedialog.ui | 152 ++++++++++ lxqt-leave/main.cpp | 110 ++++++++ .../resources/lxqt-hibernate.desktop.in | 0 lxqt-leave/resources/lxqt-leave.1 | 35 +++ lxqt-leave/resources/lxqt-leave.desktop.in | 11 + .../resources/lxqt-lockscreen.desktop.in | 0 .../resources/lxqt-logout.desktop.in | 0 .../resources/lxqt-reboot.desktop.in | 0 .../resources/lxqt-shutdown.desktop.in | 0 .../resources/lxqt-suspend.desktop.in | 0 .../translations/lxqt-hibernate_de.desktop | 2 + .../translations/lxqt-hibernate_hu.desktop | 2 + .../translations/lxqt-hibernate_it.desktop | 2 + .../translations/lxqt-hibernate_pt.desktop | 2 + .../translations/lxqt-hibernate_ru.desktop | 2 + lxqt-leave/translations/lxqt-leave.ts | 85 ++++++ lxqt-leave/translations/lxqt-leave_de.desktop | 2 + lxqt-leave/translations/lxqt-leave_de.ts | 85 ++++++ lxqt-leave/translations/lxqt-leave_hu.desktop | 2 + lxqt-leave/translations/lxqt-leave_hu.ts | 80 ++++++ lxqt-leave/translations/lxqt-leave_it.desktop | 2 + lxqt-leave/translations/lxqt-leave_it.ts | 80 ++++++ lxqt-leave/translations/lxqt-leave_ru.desktop | 2 + lxqt-leave/translations/lxqt-leave_ru.ts | 80 ++++++ lxqt-leave/translations/lxqt-leave_ru_RU.ts | 80 ++++++ .../translations/lxqt-lockscreen_de.desktop | 2 + .../translations/lxqt-lockscreen_hu.desktop | 2 + .../translations/lxqt-lockscreen_it.desktop | 2 + .../translations/lxqt-lockscreen_pt.desktop | 2 + .../translations/lxqt-lockscreen_ru.desktop | 2 + .../translations/lxqt-logout_de.desktop | 2 + .../translations/lxqt-logout_hu.desktop | 2 + .../translations/lxqt-logout_it.desktop | 2 + .../translations/lxqt-logout_pt.desktop | 2 + .../translations/lxqt-logout_ru.desktop | 2 + .../translations/lxqt-reboot_de.desktop | 2 + .../translations/lxqt-reboot_hu.desktop | 2 + .../translations/lxqt-reboot_it.desktop | 2 + .../translations/lxqt-reboot_pt.desktop | 2 + .../translations/lxqt-reboot_ru.desktop | 2 + .../translations/lxqt-shutdown_de.desktop | 2 + .../translations/lxqt-shutdown_hu.desktop | 2 + .../translations/lxqt-shutdown_it.desktop | 2 + .../translations/lxqt-shutdown_pt.desktop | 2 + .../translations/lxqt-shutdown_ru.desktop | 2 + .../translations/lxqt-suspend_de.desktop | 2 + .../translations/lxqt-suspend_hu.desktop | 2 + .../translations/lxqt-suspend_it.desktop | 2 + .../translations/lxqt-suspend_pt.desktop | 2 + .../translations/lxqt-suspend_ru.desktop | 2 + lxqt-session/CMakeLists.txt | 35 ++- lxqt-session/man/lxqt-session.1 | 4 +- lxqt-session/src/UdevNotifier.cpp | 99 +++++++ lxqt-session/src/UdevNotifier.h | 59 ++++ lxqt-session/src/lxqtmodman.cpp | 4 +- lxqt-session/src/sessionapplication.cpp | 42 ++- lxqt-session/src/windowmanager.cpp | 2 +- lxqt-session/src/windowmanager.h | 2 +- lxqt-session/translations/lxqt-session_ar.ts | 6 +- lxqt-session/translations/lxqt-session_cs.ts | 6 +- .../translations/lxqt-session_cs_CZ.ts | 10 +- .../translations/lxqt-session_da_DK.ts | 6 +- lxqt-session/translations/lxqt-session_de.ts | 30 +- .../translations/lxqt-session_de_DE.ts | 69 ----- .../translations/lxqt-session_el_GR.ts | 12 +- lxqt-session/translations/lxqt-session_eo.ts | 12 +- lxqt-session/translations/lxqt-session_es.ts | 12 +- .../translations/lxqt-session_es_UY.ts | 12 +- .../translations/lxqt-session_es_VE.ts | 12 +- lxqt-session/translations/lxqt-session_eu.ts | 12 +- lxqt-session/translations/lxqt-session_fi.ts | 12 +- .../translations/lxqt-session_fr_FR.ts | 12 +- lxqt-session/translations/lxqt-session_hu.ts | 16 +- .../translations/lxqt-session_hu_HU.ts | 30 +- ...qt-session_it_IT.ts => lxqt-session_it.ts} | 29 +- lxqt-session/translations/lxqt-session_ja.ts | 12 +- lxqt-session/translations/lxqt-session_lt.ts | 12 +- lxqt-session/translations/lxqt-session_nl.ts | 10 +- .../translations/lxqt-session_pl_PL.ts | 6 +- lxqt-session/translations/lxqt-session_pt.ts | 6 +- .../translations/lxqt-session_pt_BR.ts | 12 +- .../translations/lxqt-session_ro_RO.ts | 12 +- .../translations/lxqt-session_sk_SK.ts | 12 +- lxqt-session/translations/lxqt-session_sl.ts | 10 +- .../translations/lxqt-session_sr_BA.ts | 6 +- .../translations/lxqt-session_sr_RS.ts | 6 +- .../translations/lxqt-session_th_TH.ts | 12 +- lxqt-session/translations/lxqt-session_tr.ts | 12 +- lxqt-session/translations/lxqt-session_uk.ts | 12 +- .../translations/lxqt-session_zh_CN.ts | 12 +- .../translations/lxqt-session_zh_TW.ts | 12 +- lxqtleave/CMakeLists.txt | 35 --- lxqtleave/main.cpp | 77 ----- .../translations/lxqt-hibernate_de.desktop | 15 - .../translations/lxqt-hibernate_pt.desktop | 15 - .../translations/lxqt-lockscreen_de.desktop | 16 -- .../translations/lxqt-lockscreen_pt.desktop | 15 - lxqtleave/translations/lxqt-logout_de.desktop | 15 - lxqtleave/translations/lxqt-logout_pt.desktop | 15 - lxqtleave/translations/lxqt-reboot_de.desktop | 15 - lxqtleave/translations/lxqt-reboot_pt.desktop | 15 - .../translations/lxqt-shutdown_de.desktop | 15 - .../translations/lxqt-shutdown_pt.desktop | 15 - .../translations/lxqt-suspend_de.desktop | 15 - .../translations/lxqt-suspend_pt.desktop | 15 - 127 files changed, 1619 insertions(+), 1048 deletions(-) delete mode 100644 .gitignore delete mode 100644 cmake/LxQtLibSuffix.cmake delete mode 100644 lxqt-config-session/translations/lxqt-config-session_de_DE.desktop delete mode 100644 lxqt-config-session/translations/lxqt-config-session_de_DE.ts rename lxqt-config-session/translations/{lxqt-config-session_it_IT.ts => lxqt-config-session_it.ts} (96%) delete mode 100644 lxqt-config-session/translations/lxqt-config-session_it_IT.desktop create mode 100644 lxqt-leave/CMakeLists.txt create mode 100644 lxqt-leave/leavedialog.cpp create mode 100644 lxqt-leave/leavedialog.h create mode 100644 lxqt-leave/leavedialog.ui create mode 100644 lxqt-leave/main.cpp rename {lxqtleave => lxqt-leave}/resources/lxqt-hibernate.desktop.in (100%) create mode 100644 lxqt-leave/resources/lxqt-leave.1 create mode 100644 lxqt-leave/resources/lxqt-leave.desktop.in rename {lxqtleave => lxqt-leave}/resources/lxqt-lockscreen.desktop.in (100%) rename {lxqtleave => lxqt-leave}/resources/lxqt-logout.desktop.in (100%) rename {lxqtleave => lxqt-leave}/resources/lxqt-reboot.desktop.in (100%) rename {lxqtleave => lxqt-leave}/resources/lxqt-shutdown.desktop.in (100%) rename {lxqtleave => lxqt-leave}/resources/lxqt-suspend.desktop.in (100%) create mode 100644 lxqt-leave/translations/lxqt-hibernate_de.desktop create mode 100644 lxqt-leave/translations/lxqt-hibernate_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-hibernate_it.desktop create mode 100644 lxqt-leave/translations/lxqt-hibernate_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-hibernate_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-leave.ts create mode 100644 lxqt-leave/translations/lxqt-leave_de.desktop create mode 100644 lxqt-leave/translations/lxqt-leave_de.ts create mode 100644 lxqt-leave/translations/lxqt-leave_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-leave_hu.ts create mode 100644 lxqt-leave/translations/lxqt-leave_it.desktop create mode 100644 lxqt-leave/translations/lxqt-leave_it.ts create mode 100644 lxqt-leave/translations/lxqt-leave_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-leave_ru.ts create mode 100644 lxqt-leave/translations/lxqt-leave_ru_RU.ts create mode 100644 lxqt-leave/translations/lxqt-lockscreen_de.desktop create mode 100644 lxqt-leave/translations/lxqt-lockscreen_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-lockscreen_it.desktop create mode 100644 lxqt-leave/translations/lxqt-lockscreen_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-lockscreen_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-logout_de.desktop create mode 100644 lxqt-leave/translations/lxqt-logout_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-logout_it.desktop create mode 100644 lxqt-leave/translations/lxqt-logout_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-logout_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-reboot_de.desktop create mode 100644 lxqt-leave/translations/lxqt-reboot_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-reboot_it.desktop create mode 100644 lxqt-leave/translations/lxqt-reboot_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-reboot_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-shutdown_de.desktop create mode 100644 lxqt-leave/translations/lxqt-shutdown_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-shutdown_it.desktop create mode 100644 lxqt-leave/translations/lxqt-shutdown_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-shutdown_ru.desktop create mode 100644 lxqt-leave/translations/lxqt-suspend_de.desktop create mode 100644 lxqt-leave/translations/lxqt-suspend_hu.desktop create mode 100644 lxqt-leave/translations/lxqt-suspend_it.desktop create mode 100644 lxqt-leave/translations/lxqt-suspend_pt.desktop create mode 100644 lxqt-leave/translations/lxqt-suspend_ru.desktop create mode 100644 lxqt-session/src/UdevNotifier.cpp create mode 100644 lxqt-session/src/UdevNotifier.h delete mode 100644 lxqt-session/translations/lxqt-session_de_DE.ts rename lxqt-session/translations/{lxqt-session_it_IT.ts => lxqt-session_it.ts} (68%) delete mode 100644 lxqtleave/CMakeLists.txt delete mode 100644 lxqtleave/main.cpp delete mode 100644 lxqtleave/translations/lxqt-hibernate_de.desktop delete mode 100644 lxqtleave/translations/lxqt-hibernate_pt.desktop delete mode 100644 lxqtleave/translations/lxqt-lockscreen_de.desktop delete mode 100644 lxqtleave/translations/lxqt-lockscreen_pt.desktop delete mode 100644 lxqtleave/translations/lxqt-logout_de.desktop delete mode 100644 lxqtleave/translations/lxqt-logout_pt.desktop delete mode 100644 lxqtleave/translations/lxqt-reboot_de.desktop delete mode 100644 lxqtleave/translations/lxqt-reboot_pt.desktop delete mode 100644 lxqtleave/translations/lxqt-shutdown_de.desktop delete mode 100644 lxqtleave/translations/lxqt-shutdown_pt.desktop delete mode 100644 lxqtleave/translations/lxqt-suspend_de.desktop delete mode 100644 lxqtleave/translations/lxqt-suspend_pt.desktop diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/CMakeLists.txt b/CMakeLists.txt index 35d3ae2..e07debb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,25 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) project(lxqt-session) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) -# additional cmake files -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) + +include(GNUInstallDirs) find_package(KF5WindowSystem REQUIRED) find_package(Qt5Widgets REQUIRED QUIET) find_package(Qt5DBus REQUIRED QUIET) find_package(Qt5X11Extras REQUIRED QUIET) find_package(Qt5LinguistTools REQUIRED QUIET) -find_package(Qt5Xdg REQUIRED QUIET) find_package(lxqt REQUIRED QUIET) -include(${LXQT_USE_FILE}) +include(LXQtCompilerSettings NO_POLICY_SCOPE) include(LXQtTranslate) find_package(PkgConfig REQUIRED QUIET) @@ -29,7 +28,7 @@ find_package(X11 REQUIRED) add_subdirectory(lxqt-session) add_subdirectory(lxqt-config-session) -add_subdirectory(lxqtleave) +add_subdirectory(lxqt-leave) # building tarball with CPack ------------------------------------------------- include(InstallRequiredSystemLibraries) diff --git a/cmake/LxQtLibSuffix.cmake b/cmake/LxQtLibSuffix.cmake deleted file mode 100644 index def4427..0000000 --- a/cmake/LxQtLibSuffix.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# some system (rpm builds) setup LIB_SUFFIX for cmake. If there is no set, try to get it from system -if(NOT DEFINED LIB_SUFFIX AND NOT DEFINED LIB_SUFFIX_ALREADY_SET) - MESSAGE(STATUS "*********************************************************************") - MESSAGE(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now") - MESSAGE(STATUS "You can set it manually with -DLIB_SUFFIX= (64 for example)") - - # All 32bit system have empty lib suffix - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - # If there is lib64 dir, set suffix to 64 - if(IS_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib64) - set(LIB_SUFFIX 64) - elseif(IS_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib) - set(LIB_SUFFIX "") - else() - message(WARNING "LIB_SUFFIX cannot be autodetected. No ${CMAKE_INSTALL_PREFIX}/lib neither ${CMAKE_INSTALL_PREFIX}/lib64 found.") - set(LIB_SUFFIX "") - endif() - else() - set(LIB_SUFFIX "") - endif() - - set(LIB_SUFFIX_ALREADY_SET 1) - - message(STATUS "LIB_SUFFIX autodetected as '${LIB_SUFFIX}', libraries will be installed into ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") - MESSAGE(STATUS "*********************************************************************") -else() - message(STATUS "LIB_SUFFIX already set: ${LIB_SUFFIX}") -endif() diff --git a/lxqt-config-session/CMakeLists.txt b/lxqt-config-session/CMakeLists.txt index d128c31..e07db2c 100644 --- a/lxqt-config-session/CMakeLists.txt +++ b/lxqt-config-session/CMakeLists.txt @@ -1,10 +1,5 @@ project(lxqt-config-session) -include_directories( - "${CMAKE_SOURCE_DIR}" - "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}" -) set(lxqt-sessioncfg_HDRS sessionconfigwindow.h @@ -40,8 +35,6 @@ set(lxqt-sessioncfg_UI_FILES environmentpage.ui ) -qt5_wrap_ui(lxqt-sessioncfg_UIS ${lxqt-sessioncfg_UI_FILES}) - # Translations lxqt_translate_ts(lxqt-sessioncfg_QM_FILES UPDATE_TRANSLATIONS @@ -59,7 +52,6 @@ lxqt_translate_desktop(lxqt-sessioncfg_DESKTOP_FILES SOURCES lxqt-config-session add_executable(lxqt-config-session ${lxqt-sessioncfg_SRCS} - ${lxqt-sessioncfg_UIS} ${lxqt-sessioncfg_DESKTOP_FILES} ${lxqt-sessioncfg_QM_FILES} ${lxqt-sessioncfg_QM_LOADER}) @@ -69,13 +61,18 @@ target_link_libraries(lxqt-config-session Qt5::Widgets Qt5::DBus Qt5::X11Extras - ${LXQT_LIBRARIES} - ${QTXDG_LIBRARIES} + lxqt +) + +INSTALL(TARGETS + lxqt-config-session + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) -INSTALL(TARGETS lxqt-config-session RUNTIME DESTINATION bin) install(FILES ${lxqt-sessioncfg_DESKTOP_FILES} DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/applications + "${CMAKE_INSTALL_DATAROOTDIR}/applications" + COMPONENT Runtime ) diff --git a/lxqt-config-session/basicsettings.cpp b/lxqt-config-session/basicsettings.cpp index 2c4e25a..5936406 100644 --- a/lxqt-config-session/basicsettings.cpp +++ b/lxqt-config-session/basicsettings.cpp @@ -68,7 +68,7 @@ void BasicSettings::restoreSettings() SessionConfigWindow::handleCfgComboBox(ui->wmComboBox, knownWMs, wm); m_moduleModel->reset(); - ui->leaveConfirmationCheckBox->setChecked(m_settings->value("leave_confirmation", true).toBool()); + ui->leaveConfirmationCheckBox->setChecked(m_settings->value("leave_confirmation", false).toBool()); } void BasicSettings::save() diff --git a/lxqt-config-session/basicsettings.ui b/lxqt-config-session/basicsettings.ui index fb9d451..8fce482 100644 --- a/lxqt-config-session/basicsettings.ui +++ b/lxqt-config-session/basicsettings.ui @@ -114,7 +114,7 @@ - Ask confirmation to leave session + Ask for confirmation to leave session diff --git a/lxqt-config-session/main.cpp b/lxqt-config-session/main.cpp index 148b573..392f662 100644 --- a/lxqt-config-session/main.cpp +++ b/lxqt-config-session/main.cpp @@ -24,7 +24,7 @@ * Boston, MA 02110-1301 USA * * END_COMMON_COPYRIGHT_HEADER */ - + #include #include @@ -35,7 +35,7 @@ int main(int argc, char** argv) { LxQt::SingleApplication a(argc, argv); - + SessionConfigWindow w; a.setActivationWindow(&w); w.show(); diff --git a/lxqt-config-session/sessionconfigwindow.h b/lxqt-config-session/sessionconfigwindow.h index f881b1b..a79021e 100644 --- a/lxqt-config-session/sessionconfigwindow.h +++ b/lxqt-config-session/sessionconfigwindow.h @@ -35,7 +35,7 @@ class SessionConfigWindow : public LxQt::ConfigDialog { Q_OBJECT - + public: SessionConfigWindow(); ~SessionConfigWindow(); diff --git a/lxqt-config-session/translations/lxqt-config-session.ts b/lxqt-config-session/translations/lxqt-config-session.ts index 38096d8..3d88672 100644 --- a/lxqt-config-session/translations/lxqt-config-session.ts +++ b/lxqt-config-session/translations/lxqt-config-session.ts @@ -129,7 +129,7 @@ - Ask confirmation to leave session + Ask for confirmation to leave session @@ -178,27 +178,27 @@ EnvironmentPage - + Add - + Delete - + Environment Variables (Advanced) - + Variable Name - + Value diff --git a/lxqt-config-session/translations/lxqt-config-session_de.desktop b/lxqt-config-session/translations/lxqt-config-session_de.desktop index 556e32d..1e8749f 100644 --- a/lxqt-config-session/translations/lxqt-config-session_de.desktop +++ b/lxqt-config-session/translations/lxqt-config-session_de.desktop @@ -1,4 +1,3 @@ -# Translations -Comment[de]=Konfiguriere die LxQt-Qt Sitzungsmodule -GenericName[de]=LxQt Sitzungskonfiguration -Name[de]=LxQt Sitzungskonfiguration +Name[de]=Sitzungskonfiguration +GenericName[de]=LXQt Sitzungskonfiguration +Comment[de]=Die LXQt Sitzung konfigurieren diff --git a/lxqt-config-session/translations/lxqt-config-session_de.ts b/lxqt-config-session/translations/lxqt-config-session_de.ts index 3e348df..d73ae1d 100644 --- a/lxqt-config-session/translations/lxqt-config-session_de.ts +++ b/lxqt-config-session/translations/lxqt-config-session_de.ts @@ -6,32 +6,32 @@ Edit - + Bearbeiten Name: - + Name: Search... - + Suche... Command: - + Befehl: Wait for system tray - + Warte auf System Tray Select Application - + Anwendung auswählen @@ -39,22 +39,22 @@ Global Autostart - + Globaler Autostart LXQt Autostart - + LXQt Autostart Location: %1 - + Ort: %1 Overrides: %1 - + Überschreibt: %1 @@ -62,80 +62,80 @@ Delete - + Löschen Add - + Hinzufügen Edit - + Bearbeiten Application Autostart - + Anwendung-Autostart Error - + Fehler File '%1' already exists! - + Datei '%1' existiert bereits! BasicSettings + + + Basic Settings + Grundeinstellungen + Window Manager - + Fenstermanager Search... - + Suchen... LXQt Modules - + LXQt Module Start - + Start Stop - + Stopp + + + + Select a window manager + Fenstermanager auswählen Leave Session - + Sitzung beenden - Ask confirmation to leave session - - - - - Basic Settings - - - - - Select a window manager - + Ask for confirmation to leave session + Beenden der Sitzung bestätigen @@ -143,12 +143,12 @@ Select a terminal emulator - + Terminal-Emulator auswählen Select a web browser - + Web-Browser auswählen @@ -156,51 +156,51 @@ Default Applications - + Standardanwendungen Terminal Emulation: - + Terminal-Emulator: Search... - + Suche... Web Browser: - + Web-Browser: EnvironmentPage - + Add - + Hinzufügen - + Delete - + Löschen - + Environment Variables (Advanced) - + Umgebungsvariablen (Erweitert) - + Variable Name - + Variablenname - + Value - + Wert @@ -208,7 +208,7 @@ Running - + Läuft @@ -216,37 +216,37 @@ LXQt Session Settings - + LXQt Sitzungseinstellungen Basic Settings - + Grundeinstellungen Default Applications - + Standardanwendungen Autostart - + Autostart Environment (Advanced) - + Umgebung (Erweitert) Session Restart Required - + Erneute Anmeldung erforderlich You need to restart desktop session (lxqt-session) to reload settings. Use logout from the main menu. - + Sie müssen sich erneut anmelden (lxqt-session), damit Ihre Änderungen aktiv werden. Klicken Sie dafür auf "Abmelden" im Hauptmenü. diff --git a/lxqt-config-session/translations/lxqt-config-session_de_DE.desktop b/lxqt-config-session/translations/lxqt-config-session_de_DE.desktop deleted file mode 100644 index b9fb0bf..0000000 --- a/lxqt-config-session/translations/lxqt-config-session_de_DE.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Comment[de_DE]=LxQt-Qt Sitzungsmodul konfigurieren -GenericName[de_DE]=LxQt Sitzungskonfigurator -Name[de_DE]=LxQt Sitzungskonfigurator diff --git a/lxqt-config-session/translations/lxqt-config-session_de_DE.ts b/lxqt-config-session/translations/lxqt-config-session_de_DE.ts deleted file mode 100644 index d43165e..0000000 --- a/lxqt-config-session/translations/lxqt-config-session_de_DE.ts +++ /dev/null @@ -1,264 +0,0 @@ - - - - - AutoStartEdit - - - Edit - Bearbeiten - - - - Name: - Name: - - - - Search... - Suche... - - - - Command: - Befehl: - - - - Wait for system tray - Warte auf System Tray - - - - Select Application - Anwendung auswählen - - - - AutoStartItemModel - - - Global Autostart - Globaler Autostart - - - LxQt Autostart - LxQt Autostart - - - - LXQt Autostart - - - - - Location: %1 - Ort: %1 - - - - Overrides: %1 - Überschreibung: %1 - - - - AutoStartPage - - - Delete - Löschen - - - - Add - Hinzufügen - - - - Edit - Bearbeiten - - - - Application Autostart - Anwendung-Autostart - - - - Error - Fehler - - - - File '%1' already exists! - Datei '%1' existiert bereits! - - - - BasicSettings - - - Window Manager - Fenstermanager - - - - Search... - Suchen... - - - - LXQt Modules - - - - - Leave Session - - - - - Ask confirmation to leave session - - - - - Basic Settings - Grundeinstellungen - - - LxQt Modules - LxQt-Module - - - - Start - Start - - - - Stop - Stopp - - - - Select a window manager - Fenstermanager auswählen - - - - DefaultApps - - - Select a terminal emulator - Terminal-Emulator auswählen - - - - Select a web browser - Web Browser auswählen - - - - DefaultAppsPage - - - Default Applications - Standardanwendungen - - - - Terminal Emulation: - Terminal-Emulator: - - - - - Search... - Suche... - - - - Web Browser: - Web Browser: - - - - EnvironmentPage - - - Add - Hinzufügen - - - - Delete - Löschen - - - - Environment Variables (Advanced) - Umgebungsvariablen (Erweitert) - - - - Variable Name - Variablenname - - - - Value - Wert - - - - ModuleModel - - - Running - Läuft - - - - SessionConfigWindow - - LxQt Session Configuration - LxQt Sitzungs-Konfiguration - - - - LXQt Session Settings - - - - - Basic Settings - Grundeinstellungen - - - - Default Applications - Standardanwendungen - - - - Autostart - Autostart - - - - Environment (Advanced) - Umgebung (Erweitert) - - - - Session Restart Required - Erneute Anmeldung erforderlich - - - - You need to restart desktop session (lxqt-session) to reload settings. Use logout from the main menu. - Sie müssen sich erneut anmelden (lxqt-session), damit Ihre Änderungen aktiv werden. Klicken Sie dafür auf "Abmelden" im Hauptmenü. - - - diff --git a/lxqt-config-session/translations/lxqt-config-session_hu.ts b/lxqt-config-session/translations/lxqt-config-session_hu.ts index 470cca1..31db7d5 100644 --- a/lxqt-config-session/translations/lxqt-config-session_hu.ts +++ b/lxqt-config-session/translations/lxqt-config-session_hu.ts @@ -1,6 +1,6 @@ - + AutoStartEdit @@ -43,12 +43,12 @@ LxQt Autostart - LxQt automatikus indítás + LxQt automatikus indítás LXQt Autostart - + LXQt automatikus indítás @@ -91,7 +91,7 @@ File '%1' already exists! - A(z) „%1” fájl már létezik. + Van már '%1' fájl! @@ -109,17 +109,17 @@ LXQt Modules - + LXQt modulok Leave Session - + Munkamenet elhagyása Ask confirmation to leave session - + Jóváhagyás az elhagyás előtt @@ -128,7 +128,7 @@ LxQt Modules - LxQt modulok + LxQt modulok @@ -223,12 +223,12 @@ SessionConfigWindow LxQt Session Configuration - LxQt munkamenet-beállítás + LxQt munkamenet konfiguráció LXQt Session Settings - + LxQt munkamenet-beállítás @@ -253,7 +253,7 @@ Session Restart Required - A munkamenet újraindítása szükséges + A munkamenet újraindítandó diff --git a/lxqt-config-session/translations/lxqt-config-session_hu_HU.ts b/lxqt-config-session/translations/lxqt-config-session_hu_HU.ts index 6b18a29..cac09fb 100644 --- a/lxqt-config-session/translations/lxqt-config-session_hu_HU.ts +++ b/lxqt-config-session/translations/lxqt-config-session_hu_HU.ts @@ -1,37 +1,37 @@ - + AutoStartEdit Edit - + Szerkesztés Name: - + Név: Search... - + Keresés... Command: - + Parancs: Wait for system tray - + Várakozás a paneltálcára Select Application - + Alkalmazás kiválasztása @@ -39,22 +39,22 @@ Global Autostart - + Automatikus indítás LXQt Autostart - + LXQt automatikus indítás Location: %1 - + Hely: %1 Overrides: %1 - + Felülbírálások: %1 @@ -62,32 +62,32 @@ Delete - + Törlés Add - + Hozzáadás Edit - + Szerkesztés Application Autostart - + Alkalmazás automatikus indítása Error - + Hiba File '%1' already exists! - + Van már '%1' fájl! @@ -95,47 +95,47 @@ Window Manager - + Ablakkezelő Search... - + Keresés... LXQt Modules - + LXQt modulok Start - + Indítás Stop - + Leállítás Leave Session - + Munkamenet elhagyása Ask confirmation to leave session - + Jóváhagyás az elhagyás előtt Basic Settings - + Alapbeállítások Select a window manager - + Ablakkezelő választása @@ -143,12 +143,12 @@ Select a terminal emulator - + Terminálemulátor választása Select a web browser - + Webböngésző választása @@ -156,23 +156,23 @@ Default Applications - + Alapértelmezett alkalmazások Terminal Emulation: - + Terminálemuláció: Search... - + Keresés… Web Browser: - + Webböngésző: @@ -180,27 +180,27 @@ Add - + Hozzáadás Delete - + Törlés Environment Variables (Advanced) - + Környezeti változók (speciális) Variable Name - + Változónév Value - + Érték @@ -208,7 +208,7 @@ Running - + Futó @@ -216,37 +216,37 @@ LXQt Session Settings - + LxQt munkamenet-beállítás Basic Settings - + Alapbeállítások Default Applications - + Alapértelmezett alkalmazások Autostart - + Automatikus indítás Environment (Advanced) - + Környezet (speciális) Session Restart Required - + A munkamenet újraindítandó You need to restart desktop session (lxqt-session) to reload settings. Use logout from the main menu. - + Újra kell indítania a munkamenetet (lxqt-session) a beállítások újratöltéséhez. Használja a főmenü kijelentkezés pontját. diff --git a/lxqt-config-session/translations/lxqt-config-session_it.desktop b/lxqt-config-session/translations/lxqt-config-session_it.desktop index be453cb..f1e3ecc 100644 --- a/lxqt-config-session/translations/lxqt-config-session_it.desktop +++ b/lxqt-config-session/translations/lxqt-config-session_it.desktop @@ -1,4 +1,3 @@ # Translations -Comment[it]=Configura la sessione LxQt -GenericName[it]=Impostazioni della sessione LxQt -Name[it]=Impostazioni della sessione LxQt +Name[it]=Impostazioni della sessione +Comment[it]=Configura i moduli della sessione di LXQt diff --git a/lxqt-config-session/translations/lxqt-config-session_it_IT.ts b/lxqt-config-session/translations/lxqt-config-session_it.ts similarity index 96% rename from lxqt-config-session/translations/lxqt-config-session_it_IT.ts rename to lxqt-config-session/translations/lxqt-config-session_it.ts index 26e402d..c55e54d 100644 --- a/lxqt-config-session/translations/lxqt-config-session_it_IT.ts +++ b/lxqt-config-session/translations/lxqt-config-session_it.ts @@ -1,6 +1,6 @@ - + AutoStartEdit @@ -48,7 +48,7 @@ LXQt Autostart - + @@ -109,17 +109,17 @@ LXQt Modules - + Moduli di LXQt Leave Session - + Chiusura sessione Ask confirmation to leave session - + Chiedi una conferma per terminare la sessione @@ -228,7 +228,7 @@ LXQt Session Settings - + Impostazioni della sessione LXQt diff --git a/lxqt-config-session/translations/lxqt-config-session_it_IT.desktop b/lxqt-config-session/translations/lxqt-config-session_it_IT.desktop deleted file mode 100644 index f15f6fc..0000000 --- a/lxqt-config-session/translations/lxqt-config-session_it_IT.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Comment[it_IT]=Configura il modulo sessione di LxQt-Qt -GenericName[it_IT]=Strumento di configurazione della sessione di LxQt -Name[it_IT]=Strumento di configurazione della sessione di LxQt diff --git a/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop b/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop index bf78cbd..4dd6fbc 100644 --- a/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop +++ b/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop @@ -1,4 +1,4 @@ # Translations -Comment[zh_TW]=LXDE-Qt會話模組設定 +Comment[zh_TW]=LXQt會話模組設定 GenericName[zh_TW]=LxQt會話設定 Name[zh_TW]=LxQt會話設定 diff --git a/lxqt-leave/CMakeLists.txt b/lxqt-leave/CMakeLists.txt new file mode 100644 index 0000000..d54cdcd --- /dev/null +++ b/lxqt-leave/CMakeLists.txt @@ -0,0 +1,69 @@ +project(lxqt-leave) + +set(CPP_FILES + main.cpp + leavedialog.cpp +) + +set(H_FILES + leavedialog.h +) + +set(UI_FILES + leavedialog.ui +) + + +# Translations ********************************** +lxqt_translate_desktop(DESKTOP_FILES + SOURCES + resources/lxqt-leave.desktop.in + resources/lxqt-hibernate.desktop.in + resources/lxqt-lockscreen.desktop.in + resources/lxqt-logout.desktop.in + resources/lxqt-reboot.desktop.in + resources/lxqt-shutdown.desktop.in + resources/lxqt-suspend.desktop.in +) + +lxqt_translate_ts(lxqt-leave_QM_FILES + UPDATE_TRANSLATIONS + ${UPDATE_TRANSLATIONS} + SOURCES + ${CPP_FILES} + ${UI_FILES} + ${H_FILES} + INSTALL_DIR + "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" +) + +lxqt_app_translation_loader(lxqt-leave_QM_LOADER ${PROJECT_NAME}) +#************************************************ + + +add_executable(lxqt-leave + ${CPP_FILES} + ${DESKTOP_FILES} + ${lxqt-leave_QM_LOADER} + ${lxqt-leave_QM_FILES} +) + +target_link_libraries(lxqt-leave + lxqt +) + +install(TARGETS + lxqt-leave + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime +) +install(FILES + ${DESKTOP_FILES} DESTINATION + "${CMAKE_INSTALL_DATAROOTDIR}/applications" + COMPONENT Runtime +) +install(FILES + resources/lxqt-leave.1 + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT Runtime +) diff --git a/lxqt-leave/leavedialog.cpp b/lxqt-leave/leavedialog.cpp new file mode 100644 index 0000000..4bcb8b7 --- /dev/null +++ b/lxqt-leave/leavedialog.cpp @@ -0,0 +1,63 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LxQt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org, http://lxde.org/ + * + * Copyright: 2010-2015 LXQt team + * Authors: + * Paulo Lieuthier + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "leavedialog.h" + +LeaveDialog::LeaveDialog(QWidget* parent) + : QDialog(parent), + ui(new Ui::LeaveDialog), + mPower(new LxQt::Power(this)), + mScreensaver(new LxQt::ScreenSaver(this)) +{ + ui->setupUi(this); + + ui->logoutButton->setEnabled(mPower->canAction(LxQt::Power::PowerLogout)); + ui->rebootButton->setEnabled(mPower->canAction(LxQt::Power::PowerReboot)); + ui->shutdownButton->setEnabled(mPower->canAction(LxQt::Power::PowerShutdown)); + ui->suspendButton->setEnabled(mPower->canAction(LxQt::Power::PowerSuspend)); + ui->hibernateButton->setEnabled(mPower->canAction(LxQt::Power::PowerHibernate)); + + connect(ui->logoutButton, &QPushButton::clicked, [&] { close(); mPower->logout(); }); + connect(ui->rebootButton, &QPushButton::clicked, [&] { close(); mPower->reboot(); }); + connect(ui->shutdownButton, &QPushButton::clicked, [&] { close(); mPower->shutdown(); }); + connect(ui->suspendButton, &QPushButton::clicked, [&] { close(); mPower->suspend(); }); + connect(ui->hibernateButton, &QPushButton::clicked, [&] { close(); mPower->hibernate(); }); + connect(ui->lockscreenButton, &QPushButton::clicked, [&] { + close(); + QEventLoop loop; + connect(mScreensaver, &LxQt::ScreenSaver::done, &loop, &QEventLoop::quit); + mScreensaver->lockScreen(); + loop.exec(); + }); + + connect(ui->cancelButton, &QPushButton::clicked, [&] { close(); }); +} + +LeaveDialog::~LeaveDialog() +{ + delete ui; +} diff --git a/lxqt-leave/leavedialog.h b/lxqt-leave/leavedialog.h new file mode 100644 index 0000000..45466f1 --- /dev/null +++ b/lxqt-leave/leavedialog.h @@ -0,0 +1,56 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LxQt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org, http://lxde.org/ + * + * Copyright: 2010-2015 LXQt team + * Authors: + * Paulo Lieuthier + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef LEAVEDIALOG_H +#define LEAVEDIALOG_H + +#include "ui_leavedialog.h" + +#include +#include +#include + +namespace Ui { + class LeaveDialog; +} + +class LeaveDialog : public QDialog +{ + Q_OBJECT + +public: + explicit LeaveDialog(QWidget *parent = 0); + ~LeaveDialog(); + +private: + Ui::LeaveDialog *ui; + LxQt::Power *mPower; + LxQt::ScreenSaver *mScreensaver; +}; + + +#endif diff --git a/lxqt-leave/leavedialog.ui b/lxqt-leave/leavedialog.ui new file mode 100644 index 0000000..ea6f62c --- /dev/null +++ b/lxqt-leave/leavedialog.ui @@ -0,0 +1,152 @@ + + + LeaveDialog + + + + 0 + 0 + 617 + 135 + + + + + 0 + 0 + + + + Leave + + + + + + QFrame::NoFrame + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + + + Qt::AutoText + + + Qt::AlignCenter + + + + + + + + + + Logout + + + + + + + + + + + + Reboot + + + + + + + + + + + + Shutdown + + + + + + + + + + + + Suspend + + + + + + + + + + + + Lock screen + + + + + + + + + + + + Hibernate + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 170 + 20 + + + + + + + + Cancel + + + + + + + + + + + + + + + + diff --git a/lxqt-leave/main.cpp b/lxqt-leave/main.cpp new file mode 100644 index 0000000..925b21e --- /dev/null +++ b/lxqt-leave/main.cpp @@ -0,0 +1,110 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXDE-Qt - a lightweight, Qt based, desktop toolset + * http://razor-qt.org + * + * Copyright: 2010-2011 Razor team + * Authors: + * Petr Vanek + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include +#include +#include +#include +#include +#include +#include + +#include "leavedialog.h" + +int main(int argc, char *argv[]) +{ + LxQt::Application a(argc, argv); + LxQt::Translator::translateApplication(); + + LxQt::PowerManager powermanager(&a); + LxQt::ScreenSaver screensaver(&a); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("lxqt-leave")); + parser.addHelpOption(); + parser.addVersionOption(); + + QCommandLineOption logoutOption(QStringLiteral("logout"), QCoreApplication::translate("main", "Logout.")); + parser.addOption(logoutOption); + + QCommandLineOption lockscreenOption(QStringLiteral("lockscreen"), QCoreApplication::translate("main", "Lockscreen.")); + parser.addOption(lockscreenOption); + + QCommandLineOption suspendOption(QStringLiteral("suspend"), QCoreApplication::translate("main", "Suspend.")); + parser.addOption(suspendOption); + + QCommandLineOption hibernateOption(QStringLiteral("hibernate"), QCoreApplication::translate("main", "Hibernate.")); + parser.addOption(hibernateOption); + + QCommandLineOption shutdownOption(QStringLiteral("shutdown"), QCoreApplication::translate("main", "Shutdown.")); + parser.addOption(shutdownOption); + + QCommandLineOption rebootOption(QStringLiteral("reboot"), QCoreApplication::translate("main", "Reboot.")); + parser.addOption(rebootOption); + + parser.process(a); + + if (parser.isSet(logoutOption)) { + powermanager.logout(); + return 0; + } + + if (parser.isSet(lockscreenOption)) { + a.connect(&screensaver, &LxQt::ScreenSaver::done, &a, &LxQt::Application::quit); + screensaver.lockScreen(); + a.exec(); + return 0; + } + + if (parser.isSet(suspendOption)) { + powermanager.suspend(); + return 0; + } + + if (parser.isSet(hibernateOption)) { + powermanager.hibernate(); + return 0; + } + + if (parser.isSet(shutdownOption)) { + powermanager.shutdown(); + return 0; + } + + if (parser.isSet(rebootOption)) { + powermanager.reboot(); + return 0; + } + + LeaveDialog dialog; + dialog.setGeometry(QStyle::alignedRect(Qt::LeftToRight, + Qt::AlignCenter, + dialog.size(), + qApp->desktop()->screenGeometry(QCursor::pos()))); + dialog.setMaximumSize(dialog.minimumSize()); + return dialog.exec(); +} diff --git a/lxqtleave/resources/lxqt-hibernate.desktop.in b/lxqt-leave/resources/lxqt-hibernate.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-hibernate.desktop.in rename to lxqt-leave/resources/lxqt-hibernate.desktop.in diff --git a/lxqt-leave/resources/lxqt-leave.1 b/lxqt-leave/resources/lxqt-leave.1 new file mode 100644 index 0000000..827ebbc --- /dev/null +++ b/lxqt-leave/resources/lxqt-leave.1 @@ -0,0 +1,35 @@ +.TH lxqt-leave 1 "" "" "LXQt\ Helper" +.SH NAME +\fBlxqt-leave\fR \- easily logout, reboot, shutdown, suspend, hibernate and lock screen from a dialog +.SH SYNOPSIS +\fBlxqt-leave\fR [\fIargument\fR] +.SH DESCRIPTION +\fBlxqt-leave\fR is a graphical Qt tool for easily triggering leave session actions: logout, reboot, shutdown, hibernate and lock screen. If run with an argument, the dialog is not shown and the action is executed directly. +.SH OPTIONS +.PP +The options which apply to the \fBlxqt-leave\fR command are: +.PP +\fB\-\-logout\fR +.RE +.PP +\fB\-\-lockscreen\fR +.RE +.PP +\fB\-\-suspend\fR +.RE +.PP +\fB\-\-hibernate\fR +.RE +.PP +\fB\-\-shutdown\fR +.RE +.PP +\fB\-\-reboot\fR +.RE +.PP +\fB\-\-help\fR +.RE +.SH "REPORTING BUGS" +Report bugs to https://github.com/lxde/lxqt/issues +.SH AUTHOR +This manual page was created by \fBPaulo Lieuthier\fR \fI\fR for the \fBLXQt\fR project. diff --git a/lxqt-leave/resources/lxqt-leave.desktop.in b/lxqt-leave/resources/lxqt-leave.desktop.in new file mode 100644 index 0000000..97ff2ed --- /dev/null +++ b/lxqt-leave/resources/lxqt-leave.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Name=Leave +GenericName=Leave +Comment=Leave dialog +Exec=lxqt-leave +Icon=system-shutdown +Categories=LXQt;X-Leave +OnlyShowIn=LXQt; + +#TRANSLATIONS_DIR=../translations diff --git a/lxqtleave/resources/lxqt-lockscreen.desktop.in b/lxqt-leave/resources/lxqt-lockscreen.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-lockscreen.desktop.in rename to lxqt-leave/resources/lxqt-lockscreen.desktop.in diff --git a/lxqtleave/resources/lxqt-logout.desktop.in b/lxqt-leave/resources/lxqt-logout.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-logout.desktop.in rename to lxqt-leave/resources/lxqt-logout.desktop.in diff --git a/lxqtleave/resources/lxqt-reboot.desktop.in b/lxqt-leave/resources/lxqt-reboot.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-reboot.desktop.in rename to lxqt-leave/resources/lxqt-reboot.desktop.in diff --git a/lxqtleave/resources/lxqt-shutdown.desktop.in b/lxqt-leave/resources/lxqt-shutdown.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-shutdown.desktop.in rename to lxqt-leave/resources/lxqt-shutdown.desktop.in diff --git a/lxqtleave/resources/lxqt-suspend.desktop.in b/lxqt-leave/resources/lxqt-suspend.desktop.in similarity index 100% rename from lxqtleave/resources/lxqt-suspend.desktop.in rename to lxqt-leave/resources/lxqt-suspend.desktop.in diff --git a/lxqt-leave/translations/lxqt-hibernate_de.desktop b/lxqt-leave/translations/lxqt-hibernate_de.desktop new file mode 100644 index 0000000..ac367be --- /dev/null +++ b/lxqt-leave/translations/lxqt-hibernate_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=Rechner in Tiefschlaf versetzen +Name[de]=Tiefschlaf diff --git a/lxqt-leave/translations/lxqt-hibernate_hu.desktop b/lxqt-leave/translations/lxqt-hibernate_hu.desktop new file mode 100644 index 0000000..b5b20c5 --- /dev/null +++ b/lxqt-leave/translations/lxqt-hibernate_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=Mélykészenléti állapot +Name[hu]=Mélykészenlét diff --git a/lxqt-leave/translations/lxqt-hibernate_it.desktop b/lxqt-leave/translations/lxqt-hibernate_it.desktop new file mode 100644 index 0000000..1e715b2 --- /dev/null +++ b/lxqt-leave/translations/lxqt-hibernate_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Iberna +Comment[it]=Ibernare il computer diff --git a/lxqt-leave/translations/lxqt-hibernate_pt.desktop b/lxqt-leave/translations/lxqt-hibernate_pt.desktop new file mode 100644 index 0000000..99f17a4 --- /dev/null +++ b/lxqt-leave/translations/lxqt-hibernate_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Hibernar +Comment[pt]=Hibernar o computador diff --git a/lxqt-leave/translations/lxqt-hibernate_ru.desktop b/lxqt-leave/translations/lxqt-hibernate_ru.desktop new file mode 100644 index 0000000..16a7338 --- /dev/null +++ b/lxqt-leave/translations/lxqt-hibernate_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Спящий режим +Comment[ru]=Перевести компьютер в спящий режим diff --git a/lxqt-leave/translations/lxqt-leave.ts b/lxqt-leave/translations/lxqt-leave.ts new file mode 100644 index 0000000..7c2ba24 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave.ts @@ -0,0 +1,85 @@ + + + + + LeaveDialog + + + Leave + + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + + + + + Logout + + + + + Reboot + + + + + Shutdown + + + + + Suspend + + + + + Lock screen + + + + + Hibernate + + + + + Cancel + + + + + main + + + Logout. + + + + + Lockscreen. + + + + + Suspend. + + + + + Hibernate. + + + + + Shutdown. + + + + + Reboot. + + + + diff --git a/lxqt-leave/translations/lxqt-leave_de.desktop b/lxqt-leave/translations/lxqt-leave_de.desktop new file mode 100644 index 0000000..285fb05 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_de.desktop @@ -0,0 +1,2 @@ +Name[de]=Verlassen +Comment[de]=Beenden-Dialog diff --git a/lxqt-leave/translations/lxqt-leave_de.ts b/lxqt-leave/translations/lxqt-leave_de.ts new file mode 100644 index 0000000..2a33baa --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_de.ts @@ -0,0 +1,85 @@ + + + + + LeaveDialog + + + Leave + Verlassen + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + <html><head/><body><p><span style=" font-size:12pt;">Was soll der Computer tun?</span></p></body></html> + + + + Logout + Abmelden + + + + Reboot + Neustart + + + + Shutdown + Herunterfahren + + + + Suspend + Bereitschaft + + + + Lock screen + Bildschirm sperren + + + + Hibernate + Tiefschlaf + + + + Cancel + Abbrechen + + + + main + + + Logout. + Abmelden. + + + + Lockscreen. + Sperren. + + + + Suspend. + Bereitschaft. + + + + Hibernate. + Tiefschlaf. + + + + Shutdown. + Herunterfahren. + + + + Reboot. + Neustart. + + + diff --git a/lxqt-leave/translations/lxqt-leave_hu.desktop b/lxqt-leave/translations/lxqt-leave_hu.desktop new file mode 100644 index 0000000..c517e17 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_hu.desktop @@ -0,0 +1,2 @@ +Name[hu]=Kiléptetés +Comment[hu]=Kiléptető párbeszédablak \ No newline at end of file diff --git a/lxqt-leave/translations/lxqt-leave_hu.ts b/lxqt-leave/translations/lxqt-leave_hu.ts new file mode 100644 index 0000000..87a84fa --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_hu.ts @@ -0,0 +1,80 @@ + + + + + LeaveDialog + + + Form + Űrlap + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + <html><head/><body><p><span style=" font-size:12pt;">Mi legyen a számítógéppel?</span></p></body></html> + + + + Logout + Kilépés + + + + Reboot + Újraindítás + + + + Shutdown + Kikapcsolás + + + + Suspend + Készenlét + + + + Hibernate + Mélykészenlét + + + + Cancel + Mégse + + + + main + + + Logout. + Kilépés. + + + + Lockscreen. + Képernyőzár. + + + + Suspend. + Készenlét. + + + + Hibernate. + Mélykészenlét. + + + + Shutdown. + Kikapcsolás. + + + + Reboot. + Újraindítás. + + + diff --git a/lxqt-leave/translations/lxqt-leave_it.desktop b/lxqt-leave/translations/lxqt-leave_it.desktop new file mode 100644 index 0000000..0527e47 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Esci +Comment[it]=Opzioni di uscita diff --git a/lxqt-leave/translations/lxqt-leave_it.ts b/lxqt-leave/translations/lxqt-leave_it.ts new file mode 100644 index 0000000..8c53cf8 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_it.ts @@ -0,0 +1,80 @@ + + + + + LeaveDialog + + + Form + Esci + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + <html><head/><body><p><span style=" font-size:12pt;">Terminare la sessione di LXQt?</span></p></body></html> + + + + Logout + Chiudi sessione + + + + Reboot + Riavvia + + + + Shutdown + Spegni + + + + Suspend + Sospendi + + + + Hibernate + Iberna + + + + Cancel + Cancella + + + + main + + + Logout. + + + + + Lockscreen. + + + + + Suspend. + + + + + Hibernate. + + + + + Shutdown. + + + + + Reboot. + + + + diff --git a/lxqt-leave/translations/lxqt-leave_ru.desktop b/lxqt-leave/translations/lxqt-leave_ru.desktop new file mode 100644 index 0000000..b4acf0b --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Выйти +Comment[ru]=Меню выхода \ No newline at end of file diff --git a/lxqt-leave/translations/lxqt-leave_ru.ts b/lxqt-leave/translations/lxqt-leave_ru.ts new file mode 100644 index 0000000..a923c84 --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_ru.ts @@ -0,0 +1,80 @@ + + + + + LeaveDialog + + + Form + Меню выхода + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + <html><head/><body><p><span style=" font-size:12pt;">Что вы хотите сделать с компьютером?</span></p></body></html> + + + + Logout + Выйти + + + + Reboot + Перезагрузить + + + + Shutdown + Выключить + + + + Suspend + Перевести в ждущий режим + + + + Hibernate + Перевести в спящий режим + + + + Cancel + Отмена + + + + main + + + Logout. + Выйти. + + + + Lockscreen. + Блокировать экран. + + + + Suspend. + Перевести в ждущий режим. + + + + Hibernate. + Перевести в спящий режим. + + + + Shutdown. + Выключить. + + + + Reboot. + Перезагрузить. + + + diff --git a/lxqt-leave/translations/lxqt-leave_ru_RU.ts b/lxqt-leave/translations/lxqt-leave_ru_RU.ts new file mode 100644 index 0000000..929b98f --- /dev/null +++ b/lxqt-leave/translations/lxqt-leave_ru_RU.ts @@ -0,0 +1,80 @@ + + + + + LeaveDialog + + + Form + Меню выхода + + + + <html><head/><body><p><span style=" font-size:12pt;">What do you want the computer to do?</span></p></body></html> + <html><head/><body><p><span style=" font-size:12pt;">Что вы хотите сделать с компьютером?</span></p></body></html> + + + + Logout + Выйти + + + + Reboot + Перезагрузить + + + + Shutdown + Выключить + + + + Suspend + Перевести в ждущий режим + + + + Hibernate + Перевести в спящий режим + + + + Cancel + Отмена + + + + main + + + Logout. + Выйти. + + + + Lockscreen. + Блокировать экран. + + + + Suspend. + Перевести в ждущий режим. + + + + Hibernate. + Перевести в спящий режим. + + + + Shutdown. + Выключить. + + + + Reboot. + Перезагрузить. + + + diff --git a/lxqt-leave/translations/lxqt-lockscreen_de.desktop b/lxqt-leave/translations/lxqt-lockscreen_de.desktop new file mode 100644 index 0000000..f4d041d --- /dev/null +++ b/lxqt-leave/translations/lxqt-lockscreen_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=aktuelle Sitzung sperren +Name[de]=Bildschirm sperren diff --git a/lxqt-leave/translations/lxqt-lockscreen_hu.desktop b/lxqt-leave/translations/lxqt-lockscreen_hu.desktop new file mode 100644 index 0000000..2d75b7e --- /dev/null +++ b/lxqt-leave/translations/lxqt-lockscreen_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=A gép zárolása +Name[hu]=Képernyőzár diff --git a/lxqt-leave/translations/lxqt-lockscreen_it.desktop b/lxqt-leave/translations/lxqt-lockscreen_it.desktop new file mode 100644 index 0000000..d1a5f58 --- /dev/null +++ b/lxqt-leave/translations/lxqt-lockscreen_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Blocca schermo +Comment[it]=Blocca la sessione attuale diff --git a/lxqt-leave/translations/lxqt-lockscreen_pt.desktop b/lxqt-leave/translations/lxqt-lockscreen_pt.desktop new file mode 100644 index 0000000..c75dd18 --- /dev/null +++ b/lxqt-leave/translations/lxqt-lockscreen_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Bloquear +Comment[pt]=Bloquear a sessão atual diff --git a/lxqt-leave/translations/lxqt-lockscreen_ru.desktop b/lxqt-leave/translations/lxqt-lockscreen_ru.desktop new file mode 100644 index 0000000..2267019 --- /dev/null +++ b/lxqt-leave/translations/lxqt-lockscreen_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Блокировать экран +Comment[ru]=Блокировать текущий сеанс diff --git a/lxqt-leave/translations/lxqt-logout_de.desktop b/lxqt-leave/translations/lxqt-logout_de.desktop new file mode 100644 index 0000000..eea2cd6 --- /dev/null +++ b/lxqt-leave/translations/lxqt-logout_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=Sitzung beenden +Name[de]=Abmelden diff --git a/lxqt-leave/translations/lxqt-logout_hu.desktop b/lxqt-leave/translations/lxqt-logout_hu.desktop new file mode 100644 index 0000000..999555c --- /dev/null +++ b/lxqt-leave/translations/lxqt-logout_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=LXQt munkamenet vége +Name[hu]=Kilépés diff --git a/lxqt-leave/translations/lxqt-logout_it.desktop b/lxqt-leave/translations/lxqt-logout_it.desktop new file mode 100644 index 0000000..4eb083d --- /dev/null +++ b/lxqt-leave/translations/lxqt-logout_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Chiudi sessione +Comment[it]=Chiudere la sessione attuale diff --git a/lxqt-leave/translations/lxqt-logout_pt.desktop b/lxqt-leave/translations/lxqt-logout_pt.desktop new file mode 100644 index 0000000..45b8637 --- /dev/null +++ b/lxqt-leave/translations/lxqt-logout_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Sair +Comment[pt]=Sair da sessão diff --git a/lxqt-leave/translations/lxqt-logout_ru.desktop b/lxqt-leave/translations/lxqt-logout_ru.desktop new file mode 100644 index 0000000..105e3b7 --- /dev/null +++ b/lxqt-leave/translations/lxqt-logout_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Выйти из системы +Comment[ru]=Выйти из текущего сеанса diff --git a/lxqt-leave/translations/lxqt-reboot_de.desktop b/lxqt-leave/translations/lxqt-reboot_de.desktop new file mode 100644 index 0000000..964102a --- /dev/null +++ b/lxqt-leave/translations/lxqt-reboot_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=Rechner neustarten +Name[de]=Neustart diff --git a/lxqt-leave/translations/lxqt-reboot_hu.desktop b/lxqt-leave/translations/lxqt-reboot_hu.desktop new file mode 100644 index 0000000..b31f773 --- /dev/null +++ b/lxqt-leave/translations/lxqt-reboot_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=A gép újraindítása +Name[hu]=Újraindítás diff --git a/lxqt-leave/translations/lxqt-reboot_it.desktop b/lxqt-leave/translations/lxqt-reboot_it.desktop new file mode 100644 index 0000000..5012aa8 --- /dev/null +++ b/lxqt-leave/translations/lxqt-reboot_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Riavvia +Comment[it]=Riavviare il computer diff --git a/lxqt-leave/translations/lxqt-reboot_pt.desktop b/lxqt-leave/translations/lxqt-reboot_pt.desktop new file mode 100644 index 0000000..57ea2da --- /dev/null +++ b/lxqt-leave/translations/lxqt-reboot_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Reiniciar +Comment[pt]=Reiniciar o computador diff --git a/lxqt-leave/translations/lxqt-reboot_ru.desktop b/lxqt-leave/translations/lxqt-reboot_ru.desktop new file mode 100644 index 0000000..187a4b7 --- /dev/null +++ b/lxqt-leave/translations/lxqt-reboot_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Перезагрузка +Comment[ru]=Перезагрузить компьютер diff --git a/lxqt-leave/translations/lxqt-shutdown_de.desktop b/lxqt-leave/translations/lxqt-shutdown_de.desktop new file mode 100644 index 0000000..3654fec --- /dev/null +++ b/lxqt-leave/translations/lxqt-shutdown_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=Rechner herunterfahren +Name[de]=Herunterfahren diff --git a/lxqt-leave/translations/lxqt-shutdown_hu.desktop b/lxqt-leave/translations/lxqt-shutdown_hu.desktop new file mode 100644 index 0000000..2e4dc99 --- /dev/null +++ b/lxqt-leave/translations/lxqt-shutdown_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=A számítógép kikapcsolása +Name[hu]=Kikapcsolás diff --git a/lxqt-leave/translations/lxqt-shutdown_it.desktop b/lxqt-leave/translations/lxqt-shutdown_it.desktop new file mode 100644 index 0000000..c6f548b --- /dev/null +++ b/lxqt-leave/translations/lxqt-shutdown_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Arresta +Comment[it]=Spegnere il computer diff --git a/lxqt-leave/translations/lxqt-shutdown_pt.desktop b/lxqt-leave/translations/lxqt-shutdown_pt.desktop new file mode 100644 index 0000000..20f06af --- /dev/null +++ b/lxqt-leave/translations/lxqt-shutdown_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Desligar +Comment[pt]=Desligar o computador diff --git a/lxqt-leave/translations/lxqt-shutdown_ru.desktop b/lxqt-leave/translations/lxqt-shutdown_ru.desktop new file mode 100644 index 0000000..d982e9a --- /dev/null +++ b/lxqt-leave/translations/lxqt-shutdown_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Выключение +Comment[ru]=Выключить компьютер diff --git a/lxqt-leave/translations/lxqt-suspend_de.desktop b/lxqt-leave/translations/lxqt-suspend_de.desktop new file mode 100644 index 0000000..3ac6a6d --- /dev/null +++ b/lxqt-leave/translations/lxqt-suspend_de.desktop @@ -0,0 +1,2 @@ +Comment[de]=Rechner in Bereitschaftsmodus versetzen +Name[de]=Bereitschaft diff --git a/lxqt-leave/translations/lxqt-suspend_hu.desktop b/lxqt-leave/translations/lxqt-suspend_hu.desktop new file mode 100644 index 0000000..edd82d8 --- /dev/null +++ b/lxqt-leave/translations/lxqt-suspend_hu.desktop @@ -0,0 +1,2 @@ +Comment[hu]=A számítógép készenléti állapotba helyezése +Name[hu]=Készenlét diff --git a/lxqt-leave/translations/lxqt-suspend_it.desktop b/lxqt-leave/translations/lxqt-suspend_it.desktop new file mode 100644 index 0000000..9d49081 --- /dev/null +++ b/lxqt-leave/translations/lxqt-suspend_it.desktop @@ -0,0 +1,2 @@ +Name[it]=Sospensione +Comment[it]=Sospendere il computer diff --git a/lxqt-leave/translations/lxqt-suspend_pt.desktop b/lxqt-leave/translations/lxqt-suspend_pt.desktop new file mode 100644 index 0000000..9823ce5 --- /dev/null +++ b/lxqt-leave/translations/lxqt-suspend_pt.desktop @@ -0,0 +1,2 @@ +Name[pt]=Suspender +Comment[pt]=Suspender o computador diff --git a/lxqt-leave/translations/lxqt-suspend_ru.desktop b/lxqt-leave/translations/lxqt-suspend_ru.desktop new file mode 100644 index 0000000..f3fe543 --- /dev/null +++ b/lxqt-leave/translations/lxqt-suspend_ru.desktop @@ -0,0 +1,2 @@ +Name[ru]=Ждущий режим +Comment[ru]=Перевести компьютер в ждущий режим diff --git a/lxqt-session/CMakeLists.txt b/lxqt-session/CMakeLists.txt index dd6c2e0..b50ed2b 100644 --- a/lxqt-session/CMakeLists.txt +++ b/lxqt-session/CMakeLists.txt @@ -4,16 +4,22 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() -include(LxQtLibSuffix) +if(NOT DEFINED LIBUDEV_MONITOR OR LIBUDEV_MONITOR) + set(LIBUDEV_MONITOR Yes) + + find_package(PkgConfig) + pkg_check_modules(LIBUDEV REQUIRED libudev) + + add_definitions(-DWITH_LIBUDEV_MONITOR) +endif() include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} ${XCB_INCLUDE_DIRS} ${X11_INCLUDE_DIR} - src ) +if(LIBUDEV_MONITOR) + include_directories(${LIBUDEV_INCLUDE_DIRS}) +endif() set(lxqt-session_HDRS "") @@ -25,6 +31,9 @@ set(lxqt-session_SRCS src/sessionapplication.cpp src/sessiondbusadaptor.h ) +if(LIBUDEV_MONITOR) + list(APPEND lxqt-session_SRCS src/UdevNotifier.cpp) +endif() set(lxqt-session_UI src/wmselectdialog.ui @@ -43,11 +52,8 @@ lxqt_translate_ts(lxqt-session_QM_FILES ) lxqt_app_translation_loader(lxqt-session_QM_LOADER ${PROJECT_NAME}) -qt5_wrap_ui(UIS ${lxqt-session_UI}) - add_executable(lxqt-session ${lxqt-session_SRCS} - ${UIS} ${RSCS} ${lxqt-session_QM_FILES} ${lxqt-session_QM_LOADER} @@ -59,8 +65,15 @@ target_link_libraries(lxqt-session Qt5::X11Extras ${XCB_LIBRARIES} ${X11_LIBRARIES} - ${LXQT_LIBRARIES} - ${QTXDG_LIBRARIES} + lxqt KF5::WindowSystem ) -INSTALL(TARGETS lxqt-session RUNTIME DESTINATION bin) +if(LIBUDEV_MONITOR) + target_link_libraries(lxqt-session ${LIBUDEV_LIBRARIES}) +endif() + +INSTALL(TARGETS + lxqt-session + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime +) diff --git a/lxqt-session/man/lxqt-session.1 b/lxqt-session/man/lxqt-session.1 index 9983064..1cfea84 100644 --- a/lxqt-session/man/lxqt-session.1 +++ b/lxqt-session/man/lxqt-session.1 @@ -23,7 +23,7 @@ and operate as daemons for the local user for desktop specific operations. .P These components perform similar actions to those available in other desktop environments, and their names are self-descriptive. They are usually not launched -by hand but automatically, when choosing a \fBLxQt\-qt\fR session in the Display +by hand but automatically, when choosing a \fBLXQt\-qt\fR session in the Display Manager. .SH BEHAVIOR Through this application \fBLXQt\fR desktop environment manage the session desktop behavior, @@ -34,7 +34,7 @@ important module for a working lxqt sesion. Each of any desktop environment has any way to configure applications need or want to start at logon, so user can manage manualy in the \fBlxqt-config-session\fR application. .SH "REPORTING BUGS" -Report bugs to https://github.com/lxde/lxde-qt/issues +Report bugs to https://github.com/lxde/lxqt/issues .SH "SEE ALSO" \fBLXQt\fR it has been tailored for users who value simplicity, speed, and an intuitive interface, also intended for less powerful machines. See also: diff --git a/lxqt-session/src/UdevNotifier.cpp b/lxqt-session/src/UdevNotifier.cpp new file mode 100644 index 0000000..8d680f0 --- /dev/null +++ b/lxqt-session/src/UdevNotifier.cpp @@ -0,0 +1,99 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Palo Kisa + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "UdevNotifier.h" +#include +#include +#include + + +class UdevNotifier::Impl +{ +public: + struct udev * udev; + struct udev_monitor * monitor; + QScopedPointer notifier; +}; + + +UdevNotifier::UdevNotifier(QString const & subsystem, QObject * parent/* = nullptr*/) + : QObject(parent) + , d(new Impl) +{ + d->udev = udev_new(); + d->monitor = udev_monitor_new_from_netlink(d->udev, "udev"); + if (nullptr == d->monitor) + { + qWarning() << QStringLiteral("UdevNotifier: unable to initialize udev_monitor, monitoring will be disabled"); + return; + } + + int ret = udev_monitor_filter_add_match_subsystem_devtype(d->monitor, subsystem.toUtf8().constData(), nullptr); + if (0 != ret) + qWarning() << QStringLiteral("UdevNotifier: unable to add match subsystem, monitor will receive all devices"); + + ret = udev_monitor_enable_receiving(d->monitor); + if (0 != ret) + { + qWarning() << QStringLiteral("UdevNotifier: unable to enable receiving(%1), monitoring will be disabled").arg(ret); + return; + } + + d->notifier.reset(new QSocketNotifier(udev_monitor_get_fd(d->monitor), QSocketNotifier::Read)); + connect(d->notifier.data(), &QSocketNotifier::activated, this, &UdevNotifier::eventReady); + d->notifier->setEnabled(true); +} + +UdevNotifier::~UdevNotifier() +{ + if (d->monitor) + udev_monitor_unref(d->monitor); + udev_unref(d->udev); +} + +void UdevNotifier::eventReady(int socket) +{ + struct udev_device * dev; + while (nullptr != (dev = udev_monitor_receive_device(d->monitor))) + { + QString const action = udev_device_get_action(dev); + QString const device = udev_device_get_devpath(dev); + + if (QStringLiteral("add") == action) + emit deviceAdded(std::move(device)); + else if (QStringLiteral("remove") == action) + emit deviceRemoved(std::move(device)); + else if (QStringLiteral("change") == action) + emit deviceChanged(std::move(device)); + else if (QStringLiteral("online") == action) + emit deviceOnline(std::move(device)); + else if (QStringLiteral("offline") == action) + emit deviceOffline(std::move(device)); + + udev_device_unref(dev); + } +} diff --git a/lxqt-session/src/UdevNotifier.h b/lxqt-session/src/UdevNotifier.h new file mode 100644 index 0000000..645aef1 --- /dev/null +++ b/lxqt-session/src/UdevNotifier.h @@ -0,0 +1,59 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * (c)LGPL2+ + * + * LXQt - a lightweight, Qt based, desktop toolset + * http://lxqt.org + * + * Copyright: 2015 LXQt team + * Authors: + * Palo Kisa + * + * This program or library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * END_COMMON_COPYRIGHT_HEADER */ + +#if !defined(UdevNotifier_h) +#define UdevNotifier_h +#if defined(WITH_LIBUDEV_MONITOR) + +#include +#include + +class UdevNotifier : public QObject +{ + Q_OBJECT +public: + UdevNotifier(QString const & subsystem, QObject * parent = nullptr); + ~UdevNotifier(); + +signals: + void deviceAdded(QString path); + void deviceRemoved(QString path); + void deviceChanged(QString path); + void deviceOnline(QString path); + void deviceOffline(QString path); + +private slots: + void eventReady(int socket); + +private: + class Impl; + + QScopedPointer d; +}; + +#endif //WITH_LIBUDEV_MONITOR +#endif //UdevNotifier_h diff --git a/lxqt-session/src/lxqtmodman.cpp b/lxqt-session/src/lxqtmodman.cpp index 465bdf6..2e1d7c5 100644 --- a/lxqt-session/src/lxqtmodman.cpp +++ b/lxqt-session/src/lxqtmodman.cpp @@ -43,8 +43,8 @@ #include "windowmanager.h" #include -#include -#include +#include +#include #include diff --git a/lxqt-session/src/sessionapplication.cpp b/lxqt-session/src/sessionapplication.cpp index f152435..e705548 100644 --- a/lxqt-session/src/sessionapplication.cpp +++ b/lxqt-session/src/sessionapplication.cpp @@ -20,6 +20,7 @@ #include "sessionapplication.h" #include "sessiondbusadaptor.h" #include "lxqtmodman.h" +#include "UdevNotifier.h" #include #include #include @@ -78,6 +79,25 @@ bool SessionApplication::startup() loadKeyboardSettings(settings); loadMouseSettings(settings); +#if defined(WITH_LIBUDEV_MONITOR) + UdevNotifier * dev_notifier = new UdevNotifier{QStringLiteral("input"), this}; //will be released upon our destruction + QTimer * dev_timer = new QTimer{this}; //will be released upon our destruction + dev_timer->setSingleShot(true); + dev_timer->setInterval(500); //give some time to xorg... we need to reset keyboard afterwards + connect(dev_timer, &QTimer::timeout, [this] + { + //XXX: is this a race? (because settings can be currently changed by lxqt-config-input) + // but with such a little probablity we can live... + LxQt::Settings settings(configName); + loadKeyboardSettings(settings); + }); + connect(dev_notifier, &UdevNotifier::deviceAdded, [this, dev_timer] (QString device) + { + qWarning() << QStringLiteral("Session '%1', new input device '%2', keyboard setting will be (optionaly) reloaded...").arg(configName).arg(device); + dev_timer->start(); + }); +#endif + // launch module manager and autostart apps modman->startup(settings); @@ -109,29 +129,29 @@ void SessionApplication::loadEnvironmentSettings(LxQt::Settings& settings) // FIXME: how to set keyboard layout in Wayland? void SessionApplication::setxkbmap(QString layout, QString variant, QString model, QStringList options) { - QString command = "setxkbmap"; + QStringList args; if(!model.isEmpty()) { - command += " -model "; - command += model; + args << QStringLiteral("-model"); + args << model; } if(!layout.isEmpty()) { - command += " -layout "; - command += layout; + args << QStringLiteral("-layout"); + args << layout; if(!variant.isEmpty()) { - command += " -variant "; - command += variant; + args << QStringLiteral("-variant"); + args << variant; } } if(!options.isEmpty()) { Q_FOREACH(const QString& option, options) { - command += " -option "; - command += option; + args << QStringLiteral("-option"); + args << option; } } // execute the command line - QProcess setxkbmap; - setxkbmap.startDetached(command); + if (!args.isEmpty()) + QProcess::startDetached(QStringLiteral("setxkbmap"), args); } void SessionApplication::loadKeyboardSettings(LxQt::Settings& settings) diff --git a/lxqt-session/src/windowmanager.cpp b/lxqt-session/src/windowmanager.cpp index fda7eec..cc47c21 100644 --- a/lxqt-session/src/windowmanager.cpp +++ b/lxqt-session/src/windowmanager.cpp @@ -24,7 +24,7 @@ * Boston, MA 02110-1301 USA * * END_COMMON_COPYRIGHT_HEADER */ - + #include "windowmanager.h" #include diff --git a/lxqt-session/src/windowmanager.h b/lxqt-session/src/windowmanager.h index 0f6ade2..67a10b7 100644 --- a/lxqt-session/src/windowmanager.h +++ b/lxqt-session/src/windowmanager.h @@ -24,7 +24,7 @@ * Boston, MA 02110-1301 USA * * END_COMMON_COPYRIGHT_HEADER */ - + #ifndef WINDOWMANAGER_H #define WINDOWMANAGER_H diff --git a/lxqt-session/translations/lxqt-session_ar.ts b/lxqt-session/translations/lxqt-session_ar.ts index b1d4a32..1359b8a 100644 --- a/lxqt-session/translations/lxqt-session_ar.ts +++ b/lxqt-session/translations/lxqt-session_ar.ts @@ -25,13 +25,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt أهلاً بكم في ريزركيوت - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>أهلاً بكم في ريزركيوت</b> <p> قد تودُّ اختيار مدير النَّوافذ قبل الشُّروع باستخدام ريزركيوت: diff --git a/lxqt-session/translations/lxqt-session_cs.ts b/lxqt-session/translations/lxqt-session_cs.ts index 9378649..2d1085b 100644 --- a/lxqt-session/translations/lxqt-session_cs.ts +++ b/lxqt-session/translations/lxqt-session_cs.ts @@ -25,13 +25,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Vítejte v LxQt-Qt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Vítejte v LxQt-Qt</b> <p> Před započetím s prací byste mohl chtít vybrat si správce oken: diff --git a/lxqt-session/translations/lxqt-session_cs_CZ.ts b/lxqt-session/translations/lxqt-session_cs_CZ.ts index 7a3dc4a..afe500a 100644 --- a/lxqt-session/translations/lxqt-session_cs_CZ.ts +++ b/lxqt-session/translations/lxqt-session_cs_CZ.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Vítejte v LxQtu - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Vítejte v prostředí LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Vítejte v prostředí LXQt</b> <p> -Než LXDE-Qt začnete používat, vyberte si správce oken: +Než LXQt začnete používat, vyberte si správce oken: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_da_DK.ts b/lxqt-session/translations/lxqt-session_da_DK.ts index d3645c1..d3790ac 100644 --- a/lxqt-session/translations/lxqt-session_da_DK.ts +++ b/lxqt-session/translations/lxqt-session_da_DK.ts @@ -25,13 +25,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Velkommen til LxQt-Qt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Velkommen til LxQt-Qt</b> <p> Før du starter LxQt-Qt, skal du vælge window manager: diff --git a/lxqt-session/translations/lxqt-session_de.ts b/lxqt-session/translations/lxqt-session_de.ts index 3c10961..6525b24 100644 --- a/lxqt-session/translations/lxqt-session_de.ts +++ b/lxqt-session/translations/lxqt-session_de.ts @@ -6,40 +6,40 @@ Crash Report - + Absturzbericht <b>%1</b> crashed too many times. Its autorestart has been disabled until next login. - + <b>%1</b> stürzte zu oft ab. Ihr automatischer Neustart wurde bis zum nächsten Einloggen deaktiviert. WmSelectDialog - - - Other ... - - - - - Choose your favorite one. - - Welcome to LXQt - + Willkommen zu LXQt <html><head/><body><p><span style=" font-weight:600;">Welcome to LXQt</span></p><p>Please select your default Window Manager.</p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Willkommen zu LXQt</span></p><p>Bitte den Default-Fenstermanager auswählen.</p></body></html> + + + + Other ... + Andere... + + + + Choose your favorite one. + Den Favoriten auswählen. You will be able to change this at any time through Preferences -> Session Settings -> Basic Settings. - + Der Fenstermanager kann jederzeit über Einstellungen -> Sitzungs-Konfigurator -> Grundeinstellungen wieder geändert werden. diff --git a/lxqt-session/translations/lxqt-session_de_DE.ts b/lxqt-session/translations/lxqt-session_de_DE.ts deleted file mode 100644 index aa346bc..0000000 --- a/lxqt-session/translations/lxqt-session_de_DE.ts +++ /dev/null @@ -1,69 +0,0 @@ - - - - - LxQtModuleManager - - LxQt Session Crash Report - LxQt Sitzungs-Absturzbericht - - - Application '%1' crashed too many times. Its autorestart has been disabled for current session. - Anwendung '%1' stürzte zu oft ab. Ihr automatischer Neustart wurde für die aktuelle Sitzung deaktiviert. - - - - Crash Report - - - - - <b>%1</b> crashed too many times. Its autorestart has been disabled until next login. - - - - - WmSelectDialog - - Welcome to LXDE-Qt - Willkommen zu LXDE-Qt - - - <b>Welcome to LXDE-Qt</b> -<p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Willkommen zu LXDE-Qt</b>⏎ -<p>⏎ -Bevor Sie LXDE-Qt starten, möchten Sie vielleicht einen Fenstermanager auswählen: - - - You can change the Window Manager later at any time via LxQt Session Configurator. - Sie können den Fenstermanager später durch die LxQt Sitzungs-Konfiguration jederzeit wieder ändern. - - - - Other ... - Andere... - - - - Choose your favorite one. - Wähle was dir am Besten gefällt. - - - - Welcome to LXQt - - - - - <html><head/><body><p><span style=" font-weight:600;">Welcome to LXQt</span></p><p>Please select your default Window Manager.</p></body></html> - - - - - You will be able to change this at any time through Preferences -> Session Settings -> Basic Settings. - - - - diff --git a/lxqt-session/translations/lxqt-session_el_GR.ts b/lxqt-session/translations/lxqt-session_el_GR.ts index f2b765a..f8ec475 100644 --- a/lxqt-session/translations/lxqt-session_el_GR.ts +++ b/lxqt-session/translations/lxqt-session_el_GR.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Καλως ήλθατε στο LXDE-Qt + Welcome to LXQt + Καλως ήλθατε στο LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Καλως ήλθατε στο LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Καλως ήλθατε στο LXQt</b> <p> -Πριν ξεκινήσετε να χρησιμοποιείτε το LXDE-Qt, ίσως θέλετε να επιλέξετε ένα διαχειριστή παραθύρων: +Πριν ξεκινήσετε να χρησιμοποιείτε το LXQt, ίσως θέλετε να επιλέξετε ένα διαχειριστή παραθύρων: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_eo.ts b/lxqt-session/translations/lxqt-session_eo.ts index a322c34..5578910 100644 --- a/lxqt-session/translations/lxqt-session_eo.ts +++ b/lxqt-session/translations/lxqt-session_eo.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bonvenon en LXDE-Qt + Welcome to LXQt + Bonvenon en LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bonvenon en LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bonvenon en LXQt</b> <p> -Antaŭ startigi uzadon de LXDE-Qt, vi eble volas elekti la fenestran mastrumilon: +Antaŭ startigi uzadon de LXQt, vi eble volas elekti la fenestran mastrumilon: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_es.ts b/lxqt-session/translations/lxqt-session_es.ts index 8ec64db..3aeaef4 100644 --- a/lxqt-session/translations/lxqt-session_es.ts +++ b/lxqt-session/translations/lxqt-session_es.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bienvenido a LXDE-Qt + Welcome to LXQt + Bienvenido a LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bienvenido a LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bienvenido a LXQt</b> <p> -Antes de comenzar a usar LXDE-Qt, podría desear seleccionar el gestor de ventanas: +Antes de comenzar a usar LXQt, podría desear seleccionar el gestor de ventanas: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_es_UY.ts b/lxqt-session/translations/lxqt-session_es_UY.ts index d62cbfe..9813f04 100644 --- a/lxqt-session/translations/lxqt-session_es_UY.ts +++ b/lxqt-session/translations/lxqt-session_es_UY.ts @@ -17,16 +17,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bienvenido a LXDE-Qt + Welcome to LXQt + Bienvenido a LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bienvenido a LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bienvenido a LXQt</b> <p> -Antes de empezar a usar LXDE-Qt puede querer seleccionar el administrador de ventanas: +Antes de empezar a usar LXQt puede querer seleccionar el administrador de ventanas: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_es_VE.ts b/lxqt-session/translations/lxqt-session_es_VE.ts index 1657358..bcd90f1 100644 --- a/lxqt-session/translations/lxqt-session_es_VE.ts +++ b/lxqt-session/translations/lxqt-session_es_VE.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bienvenido a LXDE-Qt + Welcome to LXQt + Bienvenido a LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bienvenido a LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bienvenido a LXQt</b> <p> -Antes de empezar a usar LXDE-Qt puede querer seleccionar el administrador de ventanas: +Antes de empezar a usar LXQt puede querer seleccionar el administrador de ventanas: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_eu.ts b/lxqt-session/translations/lxqt-session_eu.ts index 0fbda22..d42e2f3 100644 --- a/lxqt-session/translations/lxqt-session_eu.ts +++ b/lxqt-session/translations/lxqt-session_eu.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Ongi etorri LXDE-Qt-ra + Welcome to LXQt + Ongi etorri LXQt-ra - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Ongi etorri LXDE-Qt-ra</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Ongi etorri LXQt-ra</b> <p> -LXDE-Qt erabiltzen hasi aurretik, leiho-kudeatzailea aukera dezakezu: +LXQt erabiltzen hasi aurretik, leiho-kudeatzailea aukera dezakezu: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_fi.ts b/lxqt-session/translations/lxqt-session_fi.ts index d7a545f..27309ca 100644 --- a/lxqt-session/translations/lxqt-session_fi.ts +++ b/lxqt-session/translations/lxqt-session_fi.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Tervetuloa LXDE-Qt-työpöytäympäristöön + Welcome to LXQt + Tervetuloa LXQt-työpöytäympäristöön - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Tervetuloa LXDE-Qt-työpöytäympäristöön</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Tervetuloa LXQt-työpöytäympäristöön</b> <p> -Ennen kuin alat käyttää LXDE-Qt-työpöytäympäristöä, halunnet määrittää ikkunahallinnan: +Ennen kuin alat käyttää LXQt-työpöytäympäristöä, halunnet määrittää ikkunahallinnan: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_fr_FR.ts b/lxqt-session/translations/lxqt-session_fr_FR.ts index 8c46adf..0f0bc88 100644 --- a/lxqt-session/translations/lxqt-session_fr_FR.ts +++ b/lxqt-session/translations/lxqt-session_fr_FR.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bienvenue sur LXDE-Qt + Welcome to LXQt + Bienvenue sur LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bienvenue sur LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bienvenue sur LXQt</b> <p> -Avant de commencer à utiliser LXDE-Qt, vous voulez peut-être choisir un gestionnaire de fenêtres : +Avant de commencer à utiliser LXQt, vous voulez peut-être choisir un gestionnaire de fenêtres : You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_hu.ts b/lxqt-session/translations/lxqt-session_hu.ts index b4c888e..33cfed9 100644 --- a/lxqt-session/translations/lxqt-session_hu.ts +++ b/lxqt-session/translations/lxqt-session_hu.ts @@ -1,17 +1,17 @@ - + LxQtModuleManager Crash Report - + Összeomlás <b>%1</b> crashed too many times. Its autorestart has been disabled until next login. - + A <b>%1</b> gyorsan többször összeomlott. Az autorestart a következő bejeltkezésig letiltva. @@ -19,27 +19,27 @@ Other ... - + Más... Choose your favorite one. - + Válassz egy kedvencet. Welcome to LXQt - + Üdvözli az LXQt <html><head/><body><p><span style=" font-weight:600;">Welcome to LXQt</span></p><p>Please select your default Window Manager.</p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Íme az LXQt!</span></p><p>Ablakkezelőt kell választani.</p></body></html> You will be able to change this at any time through Preferences -> Session Settings -> Basic Settings. - + Ez a választás később módosítható a Beállítások -> Munkamenet beállítás -> Alapbeállítás helyen. diff --git a/lxqt-session/translations/lxqt-session_hu_HU.ts b/lxqt-session/translations/lxqt-session_hu_HU.ts index 214e51b..40e7576 100644 --- a/lxqt-session/translations/lxqt-session_hu_HU.ts +++ b/lxqt-session/translations/lxqt-session_hu_HU.ts @@ -1,61 +1,61 @@ - + LxQtModuleManager Crash Report - + Összeomlás <b>%1</b> crashed too many times. Its autorestart has been disabled until next login. - + A <b>%1</b> gyorsan többször összeomlott. Az autorestart a következő bejeltkezésig letiltva. WmSelectDialog - Welcome to LXDE-Qt - Üdvözli a LXDE-Qt! + Welcome to LXQt + Üdvözli a LXQt! - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Üdvözli a LXDE-Qt!</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Üdvözli a LXQt!</b> <p> -Mielőtt elkezdené a LXDE-Qt használatát, válasszon ablakkezelőt: +Mielőtt elkezdené a LXQt használatát, válasszon ablakkezelőt: You can change the Window Manager later at any time via LxQt Session Configurator. - Az ablakkezelőt később bármikor megváltoztathatja a LxQt munkamenetbeállítóban. + Az ablakkezelőt később bármikor megváltoztathatja a LxQt munkamenetbeállítóban. Other ... - + Más... Choose your favorite one. - + Válassz egy kedvencet. Welcome to LXQt - + Üdvözli az LXQt <html><head/><body><p><span style=" font-weight:600;">Welcome to LXQt</span></p><p>Please select your default Window Manager.</p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Íme az LXQt!</span></p><p>Ablakkezelőt kell választani.</p></body></html> You will be able to change this at any time through Preferences -> Session Settings -> Basic Settings. - + Ez a választás később módosítható a Beállítások -> Munkamenet beállítás -> Alapbeállítás helyen. diff --git a/lxqt-session/translations/lxqt-session_it_IT.ts b/lxqt-session/translations/lxqt-session_it.ts similarity index 68% rename from lxqt-session/translations/lxqt-session_it_IT.ts rename to lxqt-session/translations/lxqt-session_it.ts index 2e22ee6..fb7bb03 100644 --- a/lxqt-session/translations/lxqt-session_it_IT.ts +++ b/lxqt-session/translations/lxqt-session_it.ts @@ -1,6 +1,6 @@ - + LxQtModuleManager @@ -14,27 +14,27 @@ Crash Report - + Rapporto di crash <b>%1</b> crashed too many times. Its autorestart has been disabled until next login. - + <b>%1</b> è andato in crash troppe volte. Il suo avvio automatico è stato disabilitato fino al prossimo login. WmSelectDialog - Welcome to LXDE-Qt - Benvenuto in LXDE-Qt + Welcome to LXQt + Benvenuto in LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Benvenuto in LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Benvenuto in LXQt</b> <p> -Prima di iniziare a usare LXDE-Qt dovresti selezionare il gestore delle finestre: +Prima di iniziare a usare LXQt dovresti selezionare il gestore delle finestre: You can change the Window Manager later at any time via LxQt Session Configurator. @@ -48,22 +48,17 @@ Prima di iniziare a usare LXDE-Qt dovresti selezionare il gestore delle finestre Choose your favorite one. - Scegli il tuo preferito - - - - Welcome to LXQt - + Scegli il tuo preferito. <html><head/><body><p><span style=" font-weight:600;">Welcome to LXQt</span></p><p>Please select your default Window Manager.</p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Benvenuto in LXQt</span></p><p>Scegli il gestore delle finestre.</p></body></html> You will be able to change this at any time through Preferences -> Session Settings -> Basic Settings. - + E' possibile cambiarlo in ogni momento da: Preferenze ->Impostazioni della sessione -> Impostazioni di base. diff --git a/lxqt-session/translations/lxqt-session_ja.ts b/lxqt-session/translations/lxqt-session_ja.ts index bfe9a8f..c03c564 100644 --- a/lxqt-session/translations/lxqt-session_ja.ts +++ b/lxqt-session/translations/lxqt-session_ja.ts @@ -25,15 +25,15 @@ WmSelectDialog - Welcome to LXDE-Qt - LXDE-Qtにようこそ + Welcome to LXQt + LXQtにようこそ - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>LXDE-Qtへようこそ</b> -<p>LXDE-Qtを使い始める前に、ウィンドウマネージャを選択することもできます: +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>LXQtへようこそ</b> +<p>LXQtを使い始める前に、ウィンドウマネージャを選択することもできます: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_lt.ts b/lxqt-session/translations/lxqt-session_lt.ts index 44cd40e..4e630b4 100644 --- a/lxqt-session/translations/lxqt-session_lt.ts +++ b/lxqt-session/translations/lxqt-session_lt.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Jus sveikina LXDE-Qt + Welcome to LXQt + Jus sveikina LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Jus sveikina LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Jus sveikina LXQt</b> <p> -Prieš pradėdami dirbti LXDE-Qt aplinkoje, pasirinkite norimą langų tvarkyklę. +Prieš pradėdami dirbti LXQt aplinkoje, pasirinkite norimą langų tvarkyklę. You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_nl.ts b/lxqt-session/translations/lxqt-session_nl.ts index 1310dca..79d9f30 100644 --- a/lxqt-session/translations/lxqt-session_nl.ts +++ b/lxqt-session/translations/lxqt-session_nl.ts @@ -25,14 +25,14 @@ WmSelectDialog - Welcome to LXDE-Qt - Welkom bij LXDE-Qt + Welcome to LXQt + Welkom bij LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Welkom bij LXDE-Qt</b>⏎ +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Welkom bij LXQt</b>⏎ <p>⏎ Voordat u gebruik maakt van LxQt-Qt, wilt u wellicht een Window Manager selecteren: diff --git a/lxqt-session/translations/lxqt-session_pl_PL.ts b/lxqt-session/translations/lxqt-session_pl_PL.ts index 1587c06..273ecb2 100644 --- a/lxqt-session/translations/lxqt-session_pl_PL.ts +++ b/lxqt-session/translations/lxqt-session_pl_PL.ts @@ -25,13 +25,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Witamy w LxQt-Qt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Witamy w LxQt-Qt</b> <p> Przed rozpoczęciem korzystania z komputera, proszę wybrać menedżer okien: diff --git a/lxqt-session/translations/lxqt-session_pt.ts b/lxqt-session/translations/lxqt-session_pt.ts index 2ca20f1..7bd4a7d 100644 --- a/lxqt-session/translations/lxqt-session_pt.ts +++ b/lxqt-session/translations/lxqt-session_pt.ts @@ -25,13 +25,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Bem-vindo ao LxQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Bem-vindo ao LxQt</b> <p> Antes de começar a utilizar o LxQt, deve escolher o seu gestor de janelas: diff --git a/lxqt-session/translations/lxqt-session_pt_BR.ts b/lxqt-session/translations/lxqt-session_pt_BR.ts index 04a1ec2..2d654a5 100644 --- a/lxqt-session/translations/lxqt-session_pt_BR.ts +++ b/lxqt-session/translations/lxqt-session_pt_BR.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bem-vindo ao LXDE-Qt + Welcome to LXQt + Bem-vindo ao LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bem-vindo ao LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bem-vindo ao LXQt</b> <p> -Antes de iniciar o uso do LXDE-Qt, você pode querer selecionar o gerenciador de janelas: +Antes de iniciar o uso do LXQt, você pode querer selecionar o gerenciador de janelas: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_ro_RO.ts b/lxqt-session/translations/lxqt-session_ro_RO.ts index f67248e..bbc2e20 100644 --- a/lxqt-session/translations/lxqt-session_ro_RO.ts +++ b/lxqt-session/translations/lxqt-session_ro_RO.ts @@ -21,16 +21,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Bine ați venit în LXDE-Qt + Welcome to LXQt + Bine ați venit în LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Bine ați venit în LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Bine ați venit în LXQt</b> <p> -Înainte de a utiliza LXDE-Qt, selectați un administrator de ferestre: +Înainte de a utiliza LXQt, selectați un administrator de ferestre: diff --git a/lxqt-session/translations/lxqt-session_sk_SK.ts b/lxqt-session/translations/lxqt-session_sk_SK.ts index 24ab8bb..7002117 100644 --- a/lxqt-session/translations/lxqt-session_sk_SK.ts +++ b/lxqt-session/translations/lxqt-session_sk_SK.ts @@ -17,16 +17,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Víta vás LXDE-Qt + Welcome to LXQt + Víta vás LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Víta vás LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Víta vás LXQt</b> <p> -Predtým, než začnete používať LXDE-Qt si možno budete chcieť zvoliť správcu okien: +Predtým, než začnete používať LXQt si možno budete chcieť zvoliť správcu okien: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_sl.ts b/lxqt-session/translations/lxqt-session_sl.ts index 6a12aae..e00b10f 100644 --- a/lxqt-session/translations/lxqt-session_sl.ts +++ b/lxqt-session/translations/lxqt-session_sl.ts @@ -25,14 +25,14 @@ WmSelectDialog - Welcome to LXDE-Qt - Dobrodošli v LXDE-Qt + Welcome to LXQt + Dobrodošli v LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Dobrodošli v LXDE-Qt</b>
<p>
Preden začnete uporabljati LXDE-Qt si verjetno želite izbrati upravljalnika oken: +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Dobrodošli v LXQt</b>
<p>
Preden začnete uporabljati LXQt si verjetno želite izbrati upravljalnika oken: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_sr_BA.ts b/lxqt-session/translations/lxqt-session_sr_BA.ts index 4558372..f8dce6e 100644 --- a/lxqt-session/translations/lxqt-session_sr_BA.ts +++ b/lxqt-session/translations/lxqt-session_sr_BA.ts @@ -86,13 +86,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Добро дошли у Рејзор-кјут - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Добро дошли у Рејзор-кјут</b> <p> Прије него почнете да користите Рејзор-кјут морате да изаберете менаџер прозора: diff --git a/lxqt-session/translations/lxqt-session_sr_RS.ts b/lxqt-session/translations/lxqt-session_sr_RS.ts index bb4a44f..e6518a1 100644 --- a/lxqt-session/translations/lxqt-session_sr_RS.ts +++ b/lxqt-session/translations/lxqt-session_sr_RS.ts @@ -17,13 +17,13 @@ WmSelectDialog - Welcome to LXDE-Qt + Welcome to LXQt Добро дошли у Рејзор-кјут - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: +Before starting to use the LXQt, you might want to select the Windows Manager: <b>Добро дошли у Рејзор-кјут</b> <p> Пре него почнете да користите Рејзор-кјут морате да изаберете менаџер прозора: diff --git a/lxqt-session/translations/lxqt-session_th_TH.ts b/lxqt-session/translations/lxqt-session_th_TH.ts index b2bb3aa..3e06489 100644 --- a/lxqt-session/translations/lxqt-session_th_TH.ts +++ b/lxqt-session/translations/lxqt-session_th_TH.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - ยินดีต้อนรับเข้าสู่ LXDE-Qt + Welcome to LXQt + ยินดีต้อนรับเข้าสู่ LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>ยินดีต้อนรับสู่ LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>ยินดีต้อนรับสู่ LXQt</b> <p> -ก่อนเริ่มการใช้งาน LXDE-Qt คุณจะต้องเลือกโปรแกรมจัดการหน้าต่าง: +ก่อนเริ่มการใช้งาน LXQt คุณจะต้องเลือกโปรแกรมจัดการหน้าต่าง: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_tr.ts b/lxqt-session/translations/lxqt-session_tr.ts index 0bac1b3..1696209 100644 --- a/lxqt-session/translations/lxqt-session_tr.ts +++ b/lxqt-session/translations/lxqt-session_tr.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - LXDE-Qt' ye hoş geldiniz + Welcome to LXQt + LXQt' ye hoş geldiniz - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>LXDE-Qt' ye hoş geldiniz</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>LXQt' ye hoş geldiniz</b> <p> -LXDE-Qt' yi kullanmaya başlamadan önce, Pencere Yöneticisini seçiniz: +LXQt' yi kullanmaya başlamadan önce, Pencere Yöneticisini seçiniz: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_uk.ts b/lxqt-session/translations/lxqt-session_uk.ts index 0a6a963..b2e5318 100644 --- a/lxqt-session/translations/lxqt-session_uk.ts +++ b/lxqt-session/translations/lxqt-session_uk.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - Вітаємо в LXDE-Qt + Welcome to LXQt + Вітаємо в LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>Вітаємо в LXDE-Qt!</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>Вітаємо в LXQt!</b> <p> -Перед тим, як почати користуватись LXDE-Qt, будь ласка, оберіть менеджер вікон: +Перед тим, як почати користуватись LXQt, будь ласка, оберіть менеджер вікон: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_zh_CN.ts b/lxqt-session/translations/lxqt-session_zh_CN.ts index edb11d3..1a3da51 100644 --- a/lxqt-session/translations/lxqt-session_zh_CN.ts +++ b/lxqt-session/translations/lxqt-session_zh_CN.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - 欢迎来到 LXDE-Qt + Welcome to LXQt + 欢迎来到 LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>欢迎来到 LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>欢迎来到 LXQt</b> <p> -在开始使用LXDE-Qt之前，也许你想选择窗口管理器： +在开始使用LXQt之前，也许你想选择窗口管理器： You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqt-session/translations/lxqt-session_zh_TW.ts b/lxqt-session/translations/lxqt-session_zh_TW.ts index 9fe79f5..e912c7d 100644 --- a/lxqt-session/translations/lxqt-session_zh_TW.ts +++ b/lxqt-session/translations/lxqt-session_zh_TW.ts @@ -25,16 +25,16 @@ WmSelectDialog - Welcome to LXDE-Qt - 歡迎使用 LXDE-Qt + Welcome to LXQt + 歡迎使用 LXQt - <b>Welcome to LXDE-Qt</b> + <b>Welcome to LXQt</b> <p> -Before starting to use the LXDE-Qt, you might want to select the Windows Manager: - <b>歡迎使用 LXDE-Qt</b> +Before starting to use the LXQt, you might want to select the Windows Manager: + <b>歡迎使用 LXQt</b> <p> -在開始探索LXDE-Qt之前，您也許會想先選擇視窗管理器: +在開始探索LXQt之前，您也許會想先選擇視窗管理器: You can change the Window Manager later at any time via LxQt Session Configurator. diff --git a/lxqtleave/CMakeLists.txt b/lxqtleave/CMakeLists.txt deleted file mode 100644 index 6932b57..0000000 --- a/lxqtleave/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -cmake_minimum_required(VERSION 2.8.11) -project(lxqt-leave) - -set(CPP_FILES - main.cpp -) - - -# Translations ********************************** -include(LXQtTranslate) -lxqt_translate_desktop(DESKTOP_FILES - SOURCES - resources/lxqt-hibernate.desktop.in - resources/lxqt-lockscreen.desktop.in - resources/lxqt-logout.desktop.in - resources/lxqt-reboot.desktop.in - resources/lxqt-shutdown.desktop.in - resources/lxqt-suspend.desktop.in -) -#************************************************ - - -add_executable(lxqt-leave - ${CPP_FILES} - ${DESKTOP_FILES} -) - -target_link_libraries(lxqt-leave - ${LXQT_LIBRARIES} - ${LXQT_LIBRARY_NAME} -) - -install(TARGETS lxqt-leave RUNTIME DESTINATION bin) -install(FILES ${DESKTOP_FILES} DESTINATION share/applications) - diff --git a/lxqtleave/main.cpp b/lxqtleave/main.cpp deleted file mode 100644 index 2732017..0000000 --- a/lxqtleave/main.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - LxQt::Application a(argc,argv); - LxQt::Translator::translateApplication(); - - LxQt::PowerManager powermanager(&a); - LxQt::ScreenSaver screensaver(&a); - for (int i=1; i < argc; ++i) - { - QString arg = QString::fromLocal8Bit(argv[i]); - - if (arg == "--logout") - { - powermanager.logout(); - return 0; - } - if (arg == "--suspend") - { - powermanager.suspend(); - return 0; - } - if (arg == "--hibernate") - { - powermanager.hibernate(); - return 0; - } - if (arg == "--shutdown") - { - powermanager.shutdown(); - return 0; - } - if (arg == "--reboot") - { - powermanager.reboot(); - return 0; - } - if (arg == "--lockscreen") - { - a.connect(&screensaver,SIGNAL(done()),&a,SLOT(quit())); - screensaver.lockScreen(); - a.exec(); - return 0; - } - } -} diff --git a/lxqtleave/translations/lxqt-hibernate_de.desktop b/lxqtleave/translations/lxqt-hibernate_de.desktop deleted file mode 100644 index 74e3dbf..0000000 --- a/lxqtleave/translations/lxqt-hibernate_de.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hibernate -GenericName=Hibernate -Comment=hibernate the machine -Exec=lxqt-leave --hibernate -Icon=system-suspend-hibernate -Categories=LXQt;X-Leave -OnlyShowIn=LXQt - -#TRANSLATIONS_DIR=../translations - -# Translations -Comment[de]=Rechner in Tiefschlaf versetzen -Name[de]=Tiefschlaf diff --git a/lxqtleave/translations/lxqt-hibernate_pt.desktop b/lxqtleave/translations/lxqt-hibernate_pt.desktop deleted file mode 100644 index 38370d9..0000000 --- a/lxqtleave/translations/lxqt-hibernate_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hibernate -GenericName=Hibernate -Comment=hibernate the machine -Exec=lxqt-leave --hibernate -Icon=system-suspend-hibernate -Categories=LXQt;X-Leave -OnlyShowIn=LXQt - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Hibernar -Comment[pt]=Hibernar o computador diff --git a/lxqtleave/translations/lxqt-lockscreen_de.desktop b/lxqtleave/translations/lxqt-lockscreen_de.desktop deleted file mode 100644 index 448d934..0000000 --- a/lxqtleave/translations/lxqt-lockscreen_de.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Lock Screen -GenericName=Lock Screen -Comment=Lock the current session -Exec=lxqt-leave --lockscreen -Icon=system-lock-screen -Categories=LXQt;Screensaver -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - - -# Translations -Comment[de]=aktuelle Sitzung sperren -Name[de]=Bildschirm sperren diff --git a/lxqtleave/translations/lxqt-lockscreen_pt.desktop b/lxqtleave/translations/lxqt-lockscreen_pt.desktop deleted file mode 100644 index d3d1626..0000000 --- a/lxqtleave/translations/lxqt-lockscreen_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Lock Screen -GenericName=Lock Screen -Comment=Lock the current session -Exec=lxqt-leave --lockscreen -Icon=system-lock-screen -Categories=LXQt;Screensaver -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Bloquear -Comment[pt]=Bloquear a sessão atual diff --git a/lxqtleave/translations/lxqt-logout_de.desktop b/lxqtleave/translations/lxqt-logout_de.desktop deleted file mode 100644 index 65e57f6..0000000 --- a/lxqtleave/translations/lxqt-logout_de.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Logout -GenericName=Logout -Comment=Logout from the current session -Exec=lxqt-leave --logout -Icon=system-log-out -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Comment[de]=Sitzung beenden -Name[de]=Abmelden diff --git a/lxqtleave/translations/lxqt-logout_pt.desktop b/lxqtleave/translations/lxqt-logout_pt.desktop deleted file mode 100644 index b36769a..0000000 --- a/lxqtleave/translations/lxqt-logout_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Logout -GenericName=Logout -Comment=Logout from the current session -Exec=lxqt-leave --logout -Icon=system-log-out -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Sair -Comment[pt]=Sair da sessão \ No newline at end of file diff --git a/lxqtleave/translations/lxqt-reboot_de.desktop b/lxqtleave/translations/lxqt-reboot_de.desktop deleted file mode 100644 index 4c0d386..0000000 --- a/lxqtleave/translations/lxqt-reboot_de.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Reboot -GenericName=Reboot -Comment=reboot the machine -Exec=lxqt-leave --reboot -Icon=system-reboot -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Comment[de]=Rechner neustarten -Name[de]=Neustart diff --git a/lxqtleave/translations/lxqt-reboot_pt.desktop b/lxqtleave/translations/lxqt-reboot_pt.desktop deleted file mode 100644 index b75ec62..0000000 --- a/lxqtleave/translations/lxqt-reboot_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Reboot -GenericName=Reboot -Comment=reboot the machine -Exec=lxqt-leave --reboot -Icon=system-reboot -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Reiniciar -Comment[pt]=Reiniciar o computador diff --git a/lxqtleave/translations/lxqt-shutdown_de.desktop b/lxqtleave/translations/lxqt-shutdown_de.desktop deleted file mode 100644 index d656d3d..0000000 --- a/lxqtleave/translations/lxqt-shutdown_de.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Shutdown -GenericName=Shutdown -Comment=shutdown the machine -Exec=lxqt-leave --shutdown -Icon=system-shutdown -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Comment[de]=Rechner herunterfahren -Name[de]=Herunterfahren diff --git a/lxqtleave/translations/lxqt-shutdown_pt.desktop b/lxqtleave/translations/lxqt-shutdown_pt.desktop deleted file mode 100644 index 3d6c229..0000000 --- a/lxqtleave/translations/lxqt-shutdown_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Shutdown -GenericName=Shutdown -Comment=shutdown the machine -Exec=lxqt-leave --shutdown -Icon=system-shutdown -Categories=LXQt;X-Leave -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Desligar -Comment[pt]=Desligar o computador diff --git a/lxqtleave/translations/lxqt-suspend_de.desktop b/lxqtleave/translations/lxqt-suspend_de.desktop deleted file mode 100644 index 21906e2..0000000 --- a/lxqtleave/translations/lxqt-suspend_de.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Suspend -GenericName=Suspend -Comment=suspend the machine -Exec=lxqt-leave --suspend -Icon=system-suspend -Categories=LXQt;X-Leave -OnlyShowIn=LXQt - -#TRANSLATIONS_DIR=../translations - -# Translations -Comment[de]=Rechner in Bereitschaftsmodus versetzen -Name[de]=Bereitschaft diff --git a/lxqtleave/translations/lxqt-suspend_pt.desktop b/lxqtleave/translations/lxqt-suspend_pt.desktop deleted file mode 100644 index 713b2cc..0000000 --- a/lxqtleave/translations/lxqt-suspend_pt.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Suspend -GenericName=Suspend -Comment=suspend the machine -Exec=lxqt-leave --suspend -Icon=system-suspend -Categories=LXQt;X-Leave -OnlyShowIn=LXQt - -#TRANSLATIONS_DIR=../translations - -# Translations -Name[pt]=Suspender -Comment[pt]=Suspender o computador