Compare commits

...

3 Commits

Author SHA1 Message Date
Alf Gaida
0547729af2 Adding upstream version 0.9.0+20151024. 2015-10-30 22:07:09 +01:00
Alf Gaida
5e3eb96167 Adding upstream version 0.9.0+20150830. 2015-09-03 00:22:41 +02:00
Yukiharu YABUKI
79a5b525d3
Adding upstream version 0.9.0+20150807.
Signed-off-by: Yukiharu YABUKI <yyabuki@debian.org>
2015-08-19 06:37:05 +09:00
16 changed files with 210 additions and 58 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
build

View File

@ -6,5 +6,5 @@ Copyright:
Copyright (c) 2010-2012 Razor team Copyright (c) 2010-2012 Razor team
Copyright (c) 2012-2014 LXQt team Copyright (c) 2012-2014 LXQt team
License: GPL-2 and LGPL-2.1+ License: LGPL-2.1+
The full text of the licenses can be found in the 'COPYING' file. The full text of the licenses can be found in the 'COPYING' file.

View File

@ -1,25 +1,27 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
project(lxqt-policykit-agent) project(lxqt-policykit-agent)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
include(GNUInstallDirs)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1) pkg_check_modules(POLKIT_AGENT REQUIRED polkit-agent-1)
message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}") message(STATUS "polkit agent: ${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_LIBRARIES}")
set(POLKIT_AGENT_BINARY_DIR "${CMAKE_INSTALL_BINDIR}" CACHE FILEPATH "Directory for install polkit agent")
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
find_package(PolkitQt5-1 REQUIRED) find_package(PolkitQt5-1 REQUIRED)
find_package(Qt5Widgets REQUIRED QUIET) find_package(Qt5Widgets REQUIRED QUIET)
find_package(Qt5LinguistTools REQUIRED QUIET) find_package(Qt5LinguistTools REQUIRED QUIET)
find_package(lxqt REQUIRED QUIET) find_package(lxqt REQUIRED QUIET)
find_package(qt5xdg REQUIRED QUIET)
include(${LXQT_USE_FILE})
include(${QTXDG_USE_FILE})
include(LXQtCompilerSettings NO_POLICY_SCOPE)
include(LXQtTranslate) include(LXQtTranslate)
# Deal with a bug in polkit-qt5 # Deal with a bug in polkit-qt5
@ -37,8 +39,6 @@ message(STATUS " include: ${POLKITQT-1_INCLUDE_DIR}")
# pkg-config --cflags glib-2.0 # pkg-config --cflags glib-2.0
# pkg-config --cflags polkit-agent-1 # pkg-config --cflags polkit-agent-1
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}/src"
"${CMAKE_CURRENT_BINARY_DIR}"
${POLKIT_AGENT_INCLUDE_DIRS} ${POLKIT_AGENT_INCLUDE_DIRS}
"${POLKITQT-1_INCLUDE_DIR}" "${POLKITQT-1_INCLUDE_DIR}"
) )
@ -72,27 +72,27 @@ lxqt_translate_ts(lxqt-policykit-agent_QM_FILES
lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME}) lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
qt5_wrap_ui(lxqt-policykit-agent_UI_CPP ${lxqt-policykit-agent_UI})
add_executable(lxqt-policykit-agent add_executable(lxqt-policykit-agent
${lxqt-policykit-agent_SRCS} ${lxqt-policykit-agent_SRCS}
${lxqt-policykit-agent_MOCS} ${lxqt-policykit-agent_MOCS}
${lxqt-policykit-agent_UI_CPP}
${lxqt-policykit-agent_QM_FILES} ${lxqt-policykit-agent_QM_FILES}
${QM_LOADER} ${QM_LOADER}
) )
target_link_libraries(lxqt-policykit-agent target_link_libraries(lxqt-policykit-agent
Qt5::Widgets Qt5::Widgets
${QTXDG_LIBRARY} lxqt
${LXQT_LIBRARIES}
${POLKITQT-1_CORE_LIBRARY} ${POLKITQT-1_CORE_LIBRARY}
${POLKITQT-1_AGENT_LIBRARY} ${POLKITQT-1_AGENT_LIBRARY}
${POLKIT_AGENT_LIBRARIES} ${POLKIT_AGENT_LIBRARIES}
) )
# install # install
install(TARGETS lxqt-policykit-agent DESTINATION bin) install(TARGETS
lxqt-policykit-agent
DESTINATION "${POLKIT_AGENT_BINARY_DIR}"
COMPONENT Runtime
)
# building tarball with CPack ------------------------------------------------- # building tarball with CPack -------------------------------------------------
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)

View File

@ -1,18 +1,18 @@
.TH lxqt-policykit-agent "1" "September 2012" "LxQt\-qt\ 0.5.0" "LxQt\-Qt\ Module" .TH lxqt-policykit-agent "1" "September 2012" "LXQt\ 0.5.0" "LXQt\ Module"
.SH NAME .SH NAME
lxqt-policykit-agent \- Polkit agent for \fBLXDE-Qt\fR: the faster and lighter QT Desktop Environment lxqt-policykit-agent \- Polkit agent for \fBLXQt\fR: the faster and lighter QT Desktop Environment
.SH SYNOPSIS .SH SYNOPSIS
.B lxqt-policykit-agent .B lxqt-policykit-agent
[\fICurrently No command line arguments\fR] [\fICurrently No command line arguments\fR]
.br .br
.SH DESCRIPTION .SH DESCRIPTION
This module handles policykit for \fBLXDE-Qt\fR. The polkit module, will perform This module handles policykit for \fBLXQt\fR. The polkit module, will perform
security tast over scale action privilegies. security tast over scale action privilegies.
.P .P
The \fBLXDE-Qt modules\fR are desktop independent tools, The \fBLXQt modules\fR are desktop independent tools,
and operate as daemons for the local user for desktop specific operations. and operate as daemons for the local user for desktop specific operations.
.P .P
\fBLXDE-Qt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt \fBLXQt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt
technologies, ships several core desktop components, all of which are optional: technologies, ships several core desktop components, all of which are optional:
.P .P
* Panel * Panel
@ -25,28 +25,28 @@ technologies, ships several core desktop components, all of which are optional:
.P .P
These components perform similar actions to those available in other desktop These components perform similar actions to those available in other desktop
environments, and their name is self-descriptive. They are usually not launched environments, and their name is self-descriptive. They are usually not launched
by hand but automatically, when choosing a LxQt\-Qt session in the Display by hand but automatically, when choosing a LXQt\-Qt session in the Display
Manager. Manager.
.SH BEHAVIOR .SH BEHAVIOR
The module detected on shares privilege escalation, and maintain a security dialog The module detected on shares privilege escalation, and maintain a security dialog
that ask for the user's key need for action. that ask for the user's key need for action.
.SH AUTOSTART .SH AUTOSTART
The module only are showed on \fBLXDE-Qt\fR desktop, but u can create an autostart action The module only are showed on \fBLXQt\fR desktop, but u can create an autostart action
for u prefered desktop environment. for u prefered desktop environment.
.SH "REPORTING BUGS" .SH "REPORTING BUGS"
Report bugs to https://github.com/LXDE-Qt/LXDE-Qt/issues Report bugs to https://github.com/lxde/lxqt/issues
.SH "SEE ALSO" .SH "SEE ALSO"
\fBLXDE-Qt\fR it has been tailored for users who value simplicity, speed, and \fBLXQt\fR it has been tailored for users who value simplicity, speed, and
an intuitive interface, also intended for less powerful machines. See: an intuitive interface, also intended for less powerful machines. See:
.\" any module must refers to session app, for more info on start it .\" any module must refers to session app, for more info on start it
.P .P
\fBlxqt-session.1\fR LXDE-Qt for manage LXDE-Qt complete environment \fBlxqt-session.1\fR LXQt for manage LXQt complete environment
.P .P
\fBstart-lxqt.1\fR LXDE-Qt display management independient starup. \fBstart-lxqt.1\fR LXQt display management independient starup.
.P .P
\fBlxqt-config-session.1\fR LXDE-Qt application for performing session autostart applications \fBlxqt-config-session.1\fR LXQt application for performing session autostart applications
.P .P
.SH AUTHOR .SH AUTHOR
This manual page was created by \fBPICCORO Lenz McKAY\fR \fI<mckaygerhard@gmail.com>\fR This manual page was created by \fBPICCORO Lenz McKAY\fR \fI<mckaygerhard@gmail.com>\fR
for \fBLXDE-Qt\fR project and VENENUX GNU/Linux but can be used by others. for \fBLXQt\fR project and VENENUX GNU/Linux.

View File

@ -40,10 +40,10 @@ int main(int argc, char *argv[])
g_type_init(); g_type_init();
#endif #endif
LxQt::Application app(argc, argv); LXQt::Application app(argc, argv);
app.setQuitOnLastWindowClosed(false); app.setQuitOnLastWindowClosed(false);
LxQtPolicykit::PolicykitAgent agent; LXQtPolicykit::PolicykitAgent agent;
return app.exec(); return app.exec();
} }

View File

@ -36,7 +36,7 @@
#include "policykitagentgui.h" #include "policykitagentgui.h"
namespace LxQtPolicykit namespace LXQtPolicykit
{ {
PolicykitAgent::PolicykitAgent(QObject *parent) PolicykitAgent::PolicykitAgent(QObject *parent)
@ -68,7 +68,7 @@ void PolicykitAgent::initiateAuthentication(const QString &actionId,
{ {
if (m_inProgress) if (m_inProgress)
{ {
QMessageBox::information(0, tr("PolicyKit Information"), "Another authentization in progress. Please try it again later"); QMessageBox::information(0, tr("PolicyKit Information"), tr("Another authentization in progress. Please try it again later."));
return; return;
} }
m_inProgress = true; m_inProgress = true;

View File

@ -38,7 +38,7 @@
#include <QApplication> #include <QApplication>
#include <QHash> #include <QHash>
namespace LxQtPolicykit namespace LXQtPolicykit
{ {
class PolicykitAgentGUI; class PolicykitAgentGUI;

View File

@ -24,11 +24,11 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
* END_COMMON_COPYRIGHT_HEADER */ * END_COMMON_COPYRIGHT_HEADER */
#include <XdgIcon> #include <XdgIcon>
#include "policykitagentgui.h" #include "policykitagentgui.h"
namespace LxQtPolicykit namespace LXQtPolicykit
{ {
@ -45,7 +45,7 @@ PolicykitAgentGUI::PolicykitAgentGUI(const QString &actionId,
messageLabel->setText(message); messageLabel->setText(message);
iconLabel->setPixmap(XdgIcon::fromTheme(iconName).pixmap(64, 64)); iconLabel->setPixmap(XdgIcon::fromTheme(iconName).pixmap(64, 64));
foreach (PolkitQt1::Identity identity, identities) foreach (PolkitQt1::Identity identity, identities)
{ {
m_identityMap[identity.toString()] = identity; m_identityMap[identity.toString()] = identity;

View File

@ -33,7 +33,7 @@
#include "ui_policykitagentgui.h" #include "ui_policykitagentgui.h"
namespace LxQtPolicykit namespace LXQtPolicykit
{ {
class PolicykitAgentGUI : public QDialog, public Ui::PolicykitAgentGUI class PolicykitAgentGUI : public QDialog, public Ui::PolicykitAgentGUI

View File

@ -1,38 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0" language="en_US"> <TS version="2.1">
<context> <context>
<name>PolicykitAgentGUI</name> <name>LXQtPolicykit::PolicykitAgent</name>
<message>
<source>Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Identity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LxQtPolicykit::PolicykitAgent</name>
<message> <message>
<location filename="../src/policykitagent.cpp" line="71"/>
<location filename="../src/policykitagent.cpp" line="149"/>
<source>PolicyKit Information</source> <source>PolicyKit Information</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/policykitagent.cpp" line="71"/>
<source>Another authentization in progress. Please try it again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization Failed</source> <source>Authorization Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization failed for some reason</source> <source>Authorization failed for some reason</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/policykitagent.cpp" line="144"/>
<source>PolicyKit Error</source> <source>PolicyKit Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>PolicykitAgentGUI</name>
<message>
<location filename="../src/policykitagentgui.ui" line="14"/>
<source>Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="55"/>
<source>Identity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="65"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>

View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
<name>LXQtPolicykit::PolicykitAgent</name>
<message>
<location filename="../src/policykitagent.cpp" line="71"/>
<location filename="../src/policykitagent.cpp" line="149"/>
<source>PolicyKit Information</source>
<translation>PolicyKit Information</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="71"/>
<source>Another authentization in progress. Please try it again later.</source>
<translation>Eine andere Authentisierung wird gerade durchgeführt. Bitte später noch einmal versuchen.</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization Failed</source>
<translation>Autorisierung fehlgeschlagen</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization failed for some reason</source>
<translation>Autorisierung aus irgendeinem Grund fehlgeschlagen</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="144"/>
<source>PolicyKit Error</source>
<translation>PolicyKit Fehler</translation>
</message>
</context>
<context>
<name>PolicykitAgentGUI</name>
<message>
<location filename="../src/policykitagentgui.ui" line="14"/>
<source>Authentication Required</source>
<translation>Authentisierung benötigt</translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="55"/>
<source>Identity:</source>
<translation>Identität:</translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="65"/>
<source>Password:</source>
<translation>Kennwort:</translation>
</message>
</context>
</TS>

View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="el">
<context>
<name>LXQtPolicykit::PolicykitAgent</name>
<message>
<location filename="../src/policykitagent.cpp" line="71"/>
<location filename="../src/policykitagent.cpp" line="149"/>
<source>PolicyKit Information</source>
<translation>Πληροφορίες PolicyKit</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="71"/>
<source>Another authentization in progress. Please try it again later.</source>
<translation>Μια άλλη ταυτοποίηση είναι σε εξέλιξη. Παρακαλώ προσπαθήστε ξανά αργότερα.</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization Failed</source>
<translation>Η ταυτοποίηση απέτυχε</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="132"/>
<source>Authorization failed for some reason</source>
<translation>Η ταυτοποίηση για κάποια αιτία απέτυχε</translation>
</message>
<message>
<location filename="../src/policykitagent.cpp" line="144"/>
<source>PolicyKit Error</source>
<translation>Σφάλμα PolicyKit</translation>
</message>
</context>
<context>
<name>PolicykitAgentGUI</name>
<message>
<location filename="../src/policykitagentgui.ui" line="14"/>
<source>Authentication Required</source>
<translation>Απαιτείται ταυτοποίηση</translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="55"/>
<source>Identity:</source>
<translation>Ταυτότητα:</translation>
</message>
<message>
<location filename="../src/policykitagentgui.ui" line="65"/>
<source>Password:</source>
<translation>Κωδικός πρόσβασης:</translation>
</message>
</context>
</TS>

View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="en_US">
<context>
<name>PolicykitAgentGUI</name>
<message>
<source>Authentication Required</source>
<translation>Hitelesítés kell</translation>
</message>
<message>
<source>Identity:</source>
<translation>Név:</translation>
</message>
<message>
<source>Password:</source>
<translation>Jelszó:</translation>
</message>
</context>
<context>
<name>LXQtPolicykit::PolicykitAgent</name>
<message>
<source>PolicyKit Information</source>
<translation>Policykit információ</translation>
</message>
<message>
<source>Authorization Failed</source>
<translation>Hitelesítés sikertelen</translation>
</message>
<message>
<source>Authorization failed for some reason</source>
<translation>Hitelesítés valami miatt sikertelen</translation>
</message>
<message>
<source>PolicyKit Error</source>
<translation>Policykit hiba</translation>
</message>
</context>
</TS>

View File

@ -17,7 +17,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>LxQtPolicykit::PolicykitAgent</name> <name>LXQtPolicykit::PolicykitAgent</name>
<message> <message>
<source>PolicyKit Information</source> <source>PolicyKit Information</source>
<translation>Informaçoes PolicyKit</translation> <translation>Informaçoes PolicyKit</translation>

View File

@ -2,7 +2,7 @@
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="ru"> <TS version="2.1" language="ru">
<context> <context>
<name>LxQtPolicykit::PolicykitAgent</name> <name>LXQtPolicykit::PolicykitAgent</name>
<message> <message>
<source>PolicyKit Information</source> <source>PolicyKit Information</source>
<translation>Информация PolicyKit</translation> <translation>Информация PolicyKit</translation>

View File

@ -2,7 +2,7 @@
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1" language="ru_RU"> <TS version="2.1" language="ru_RU">
<context> <context>
<name>LxQtPolicykit::PolicykitAgent</name> <name>LXQtPolicykit::PolicykitAgent</name>
<message> <message>
<source>PolicyKit Information</source> <source>PolicyKit Information</source>
<translation>Информация PolicyKit</translation> <translation>Информация PolicyKit</translation>