Commit d88e0a3f authored by Alf Gaida's avatar Alf Gaida

New snapshot: 0.14.2~24-g597e624-1

parent 0b69b747
......@@ -30,6 +30,7 @@ set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSIO
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
option(BUILD_BACKLIGHT_LINUX_BACKEND "Build the Linux backend for the backlight" ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
......@@ -41,7 +42,9 @@ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets DBus LinguistTools)
find_package(Qt5Xdg ${QTXDG_MINIMUM_VERSION} REQUIRED)
find_package(KF5WindowSystem ${KF5_MINIMUM_VERSION} REQUIRED)
find_package(PolkitQt5-1 REQUIRED)
if (BUILD_BACKLIGHT_LINUX_BACKEND)
find_package(PolkitQt5-1 REQUIRED)
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
if (NOT APPLE)
find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED X11Extras)
find_package(X11 REQUIRED)
......@@ -51,7 +54,10 @@ message(STATUS "Building ${PROJECT_NAME} with Qt ${Qt5Core_VERSION}")
include(CMakePackageConfigHelpers)
include(GNUInstallDirs) # Standard directories for installation
add_subdirectory(lxqtbacklight/linux_backend/driver)
if (BUILD_BACKLIGHT_LINUX_BACKEND)
add_subdirectory(lxqtbacklight/linux_backend/driver)
add_definitions(-DUSE_BACKLIGHT_LINUX_BACKEND)
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
set(LXQT_PKG_CONFIG_DESCRIPTION "Shared library for LXQt applications")
......@@ -136,7 +142,6 @@ set(SRCS
lxqtrotatedwidget.cpp
lxqtbacklight.cpp
lxqtbacklight/virtual_backend.cpp
lxqtbacklight/linux_backend/linuxbackend.cpp
)
if (NOT APPLE)
......@@ -145,6 +150,12 @@ if (NOT APPLE)
)
endif (NOT APPLE)
if (BUILD_BACKLIGHT_LINUX_BACKEND)
list (APPEND SRCS
lxqtbacklight/linux_backend/linuxbackend.cpp
)
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
set(MOCS
lxqthtmldelegate.h
lxqtpowermanager.h
......@@ -163,7 +174,6 @@ set(MOCS
lxqtgridlayout.h
lxqtrotatedwidget.h
lxqtbacklight/virtual_backend.h
lxqtbacklight/linux_backend/linuxbackend.h
)
if (NOT APPLE)
......@@ -172,6 +182,12 @@ if (NOT APPLE)
)
endif (NOT APPLE)
if (BUILD_BACKLIGHT_LINUX_BACKEND)
list (APPEND SRCS
lxqtbacklight/linux_backend/linuxbackend.h
)
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
set(FORMS
configdialog/lxqtconfigdialog.ui
)
......@@ -395,7 +411,9 @@ install(FILES ${LXQT_CONFIG_FILES}
COMPONENT Runtime
)
install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}")
if (BUILD_BACKLIGHT_LINUX_BACKEND)
install(FILES ${POLKIT_FILES} DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}")
endif (BUILD_BACKLIGHT_LINUX_BACKEND)
#************************************************
# Create and install pkgconfig file
......
liblxqt (0.14.2~24-g597e624-1) experimental-snapshots; urgency=medium
* New snapshot: 0.14.1-24-g597e624
-- Alf Gaida <agaida@siduction.org> Mon, 05 Aug 2019 20:56:29 +0200
liblxqt (0.14.2~20-g2b80534-1) experimental-snapshots; urgency=medium
* New snapshot: 0.14.1-20-g2b80534
......
......@@ -18,13 +18,19 @@
#include "lxqtbacklight.h"
#include "lxqtbacklight/virtual_backend.h"
#include "lxqtbacklight/linux_backend/linuxbackend.h"
#ifdef USE_BACKLIGHT_LINUX_BACKEND
#include "lxqtbacklight/linux_backend/linuxbackend.h"
#endif
namespace LXQt {
Backlight::Backlight(QObject *parent):QObject(parent)
{
#ifdef USE_BACKLIGHT_LINUX_BACKEND
m_backend = (VirtualBackEnd *) new LinuxBackend(this);
#else
m_backend = new VirtualBackEnd(this);
#endif
connect(m_backend, &VirtualBackEnd::backlightChanged, this, &Backlight::backlightChangedSlot);
}
......
......@@ -517,7 +517,7 @@ bool LXQtProvider::canAction(Power::Action action) const
}
// there can be case when lxqtsession-session does not run
return dbusCall(QL1S(LXQT_SERVICE), QL1S(LXQT_PATH), QL1S(LXQT_SERVICE),
return dbusCall(QL1S(LXQT_SERVICE), QL1S(LXQT_PATH), QL1S(LXQT_INTERFACE),
QDBusConnection::sessionBus(), command,
PowerProvider::DontCheckDBUS);
}
......
......@@ -161,14 +161,14 @@ void ScreenSaverPrivate::_l_xdgProcess_finished(int err, QProcess::ExitStatus st
{
box->setWindowTitle(tr("Screen Saver Activation Error"));
box->setText(tr("An error occurred starting screensaver. "
"Ensure you have xscreensaver installed and running."));
"Ensure you have a screensaver supported by xdg-screensaver installed and running."));
}
else if (err == 4)
{
box->setWindowTitle(tr("Screen Saver Activation Error"));
box->setText(tr("An error occurred starting screensaver. "
"Action 'activate' failed. "
"Ensure you have xscreensaver installed and running."));
"Ensure you have a screensaver supported by xdg-screensaver installed and running."));
}
else
{
......
......@@ -19,7 +19,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="74"/>
<source>Hibernate failed.</source>
<translation>ハイバーネーションを失敗しました。</translation>
<translation>ハイバネートを失敗しました。</translation>
</message>
</context>
<context>
......@@ -35,7 +35,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="117"/>
<source>Hibernate</source>
<translation>休止</translation>
<translation>ハイバネート</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="124"/>
......@@ -65,17 +65,17 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="158"/>
<source>Do you want to really suspend your computer?&lt;p&gt;Suspends the computer into a low power state. System state is not preserved if the power is lost.</source>
<translation>本当にコンピュータをサスペンドしますか?&lt;P&gt;コンピュータを低消費電力状態にサスペンドします。電源が失われた場合にはシステムの状態は保持されません。</translation>
<translation>本当にコンピューターをサスペンドしますか?&lt;P&gt;コンピューターを低消費電力状態にサスペンドします。電源が失われた場合にはシステムの状態は保持されません。</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="167"/>
<source>LXQt Session Hibernate</source>
<translation>LXQt セッションの休止</translation>
<translation>LXQt セッションのハイバネート</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="168"/>
<source>Do you want to really hibernate your computer?&lt;p&gt;Hibernates the computer into a low power state. System state is preserved if the power is lost.</source>
<translation>本当にコンピュータを休止状態にしますか?&lt;P&gt;コンピュータを低消費電力状態で休止します。電源が失われた場合でもシステムの状態は保持されます。</translation>
<translation>本当にコンピューターをハイバネートにしますか?&lt;P&gt;コンピューターを低消費電力状態で休止します。電源が失われた場合でもシステムの状態は保持されます。</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="177"/>
......@@ -85,7 +85,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="178"/>
<source>Do you want to really restart your computer? All unsaved work will be lost...</source>
<translation>本当にコンピュータを再起動しますか? 保存されていない作業はすべて失われます...</translation>
<translation>本当にコンピュータを再起動しますか? 保存されていない作業はすべて失われます...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="187"/>
......@@ -95,7 +95,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="188"/>
<source>Do you want to really switch off your computer? All unsaved work will be lost...</source>
<translation>本当にコンピュータをオフしますか? 保存されていないすべての作業は失われます...</translation>
<translation>本当にコンピュータをオフしますか? 保存されていないすべての作業は失われます...</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="197"/>
......@@ -116,7 +116,7 @@
<message>
<location filename="../lxqtpowermanager.cpp" line="206"/>
<source>Hibernate failed.</source>
<translation>ハイバーネーションを失敗しました。</translation>
<translation>ハイバネートを失敗しました。</translation>
</message>
<message>
<location filename="../lxqtpowermanager.cpp" line="211"/>
......@@ -129,7 +129,7 @@
<message>
<location filename="../lxqtscreensaver.cpp" line="236"/>
<source>Lock Screen</source>
<translation>スクリーンをロック</translation>
<translation>画面のロック</translation>
</message>
<message>
<location filename="../lxqtscreensaver.cpp" line="156"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment