[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/base/polkit-kde-1/kcmodules
From: Dario Freddi <drf () kde ! org>
Date: 2009-12-30 14:29:44
Message-ID: 1262183384.165794.21151.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1067759 by dafre:
Move stuff around
Signed-off-by: Dario Freddi <drf@kde.org>
A PKLAEntry.cpp [License: GPL (v2+)]
A PKLAEntry.h [License: GPL (v2+)]
M +1 -0 helper/CMakeLists.txt
M +0 -17 helper/polkitkde1helper.cpp
M +1 -19 helper/polkitkde1helper.h
A polkitactions/ActionWidget.cpp [License: GPL (v2+)]
A polkitactions/ActionWidget.h [License: GPL (v2+)]
M +17 -18 polkitactions/PolkitActionsKCM.cpp
M +8 -15 polkitactions/PolkitActionsKCM.h
M +17 -44 polkitactions/actionwidget.ui
M +93 -11 polkitactions/explicitwidget.ui
M +1 -1 polkitconfig/identitywidget.cpp
M +1 -1 polkitconfig/identitywidget.h
M +1 -1 polkitconfig/kcmpolkitconfig.cpp
M +1 -1 polkitconfig/kcmpolkitconfig.h
--- trunk/extragear/base/polkit-kde-1/kcmodules/helper/CMakeLists.txt #1067758:1067759
@@ -29,6 +29,7 @@
set(polkitkde1helper_SRCS
main.cpp
polkitkde1helper.cpp
+ ../PKLAEntry.cpp
)
qt4_add_dbus_adaptor(polkitkde1helper_SRCS
--- trunk/extragear/base/polkit-kde-1/kcmodules/helper/polkitkde1helper.cpp #1067758:1067759
@@ -179,20 +179,3 @@
return retlist;
}
-QDBusArgument& operator<<(QDBusArgument& argument, const PKLAEntry& entry)
-{
- argument.beginStructure();
- argument << entry.title << entry.identity << entry.action << entry.resultAny << entry.resultInactive \
<< entry.resultActive
- << entry.filePriority << entry.fileOrder;
- argument.endStructure();
- return argument;
-}
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, PKLAEntry& entry)
-{
- argument.beginStructure();
- argument >> entry.title >> entry.identity >> entry.action >> entry.resultAny >> entry.resultInactive \
>> entry.resultActive
- >> entry.filePriority >> entry.fileOrder;
- argument.endStructure();
- return argument;
-}
--- trunk/extragear/base/polkit-kde-1/kcmodules/helper/polkitkde1helper.h #1067758:1067759
@@ -14,23 +14,8 @@
#include <QtCore/QObject>
#include <QtDBus/QDBusContext>
#include <QtDBus/qdbusargument.h>
+#include "../PKLAEntry.h"
-class PKLAEntry {
- public:
- QString title;
- QString identity;
- QString action;
- QString resultAny;
- QString resultInactive;
- QString resultActive;
-
- int filePriority;
- int fileOrder;
-};
-Q_DECLARE_METATYPE(PKLAEntry)
-
-typedef QList<PKLAEntry> PKLAEntryList;
-
class PolkitKde1Helper : public QObject, protected QDBusContext
{
Q_OBJECT
@@ -51,7 +36,4 @@
QList<PKLAEntry> entriesFromFile(int filePriority, const QString &fileContents);
};
-QDBusArgument& operator<<(QDBusArgument& argument, const PKLAEntry& entry);
-const QDBusArgument& operator>>(const QDBusArgument& argument, PKLAEntry& entry);
-
#endif // POLKITKDE1HELPER_H
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/PolkitActionsKCM.cpp #1067758:1067759
@@ -1,20 +1,11 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+/* This file is part of the KDE project
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
*/
#include "PolkitActionsKCM.h"
@@ -53,11 +44,14 @@
m_model = new PolkitKde::PoliciesModel(this);
m_proxyModel = new PolkitKde::AuthorizationsFilterModel(this);
m_proxyModel->setSourceModel(m_model);
+ m_ui->treeView->header()->hide();
m_ui->treeView->setModel(m_proxyModel);
m_ui->treeView->setItemDelegate(new PolkitKde::PkItemDelegate(this));
connect(m_ui->searchLine, SIGNAL(textChanged(QString)),
m_proxyModel, SLOT(setFilterRegExp(QString)));
+ connect(m_ui->treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotCurrentChanged(QModelIndex,QModelIndex)));
// Initialize
connect(PolkitQt1::Authority::instance(), \
SIGNAL(checkAuthorizationFinished(PolkitQt1::Authority::Result)), @@ -74,17 +68,17 @@
void PolkitActionsKCM::load()
{
-KCModule::load();
+ KCModule::load();
}
void PolkitActionsKCM::save()
{
-KCModule::save();
+ KCModule::save();
}
void PolkitActionsKCM::defaults()
{
-KCModule::defaults();
+ KCModule::defaults();
}
void PolkitActionsKCM::slotCheckAuthorizationFinished(PolkitQt1::Authority::Result result)
@@ -92,3 +86,8 @@
}
+void PolkitActionsKCM::slotCurrentChanged(const QModelIndex& current, const QModelIndex& )
+{
+
+}
+
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/PolkitActionsKCM.h #1067758:1067759
@@ -1,20 +1,11 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+/* This file is part of the KDE project
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
*/
#ifndef POLKITACTIONSKCM_H
@@ -23,6 +14,7 @@
#include <kcmodule.h>
#include <PolkitQt1/Authority>
+class QModelIndex;
namespace PolkitKde {
class PoliciesModel;
class AuthorizationsFilterModel;
@@ -45,6 +37,7 @@
public slots:
void slotCheckAuthorizationFinished(PolkitQt1::Authority::Result result);
+ void slotCurrentChanged(const QModelIndex ¤t, const QModelIndex&);
private:
Ui::PolkitActionsMainView *m_ui;
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/actionwidget.ui #1067758:1067759
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>ActionWidget</class>
+ <widget class="QWidget" name="ActionWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>394</width>
+ <width>412</width>
<height>508</height>
</rect>
</property>
<property name="windowTitle">
- <string>Form</string>
+ <string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@@ -38,12 +38,16 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="KUrlLabel" name="kurllabel"/>
+ <widget class="KUrlLabel" name="vendorLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
</item>
<item>
- <widget class="QLabel" name="label_5">
+ <widget class="QLabel" name="descriptionLabel">
<property name="text">
- <string>Description</string>
+ <string/>
</property>
</widget>
</item>
@@ -79,7 +83,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KComboBox" name="kcombobox">
+ <widget class="KComboBox" name="anyComboBox">
<item>
<property name="text">
<string>Yes</string>
@@ -120,7 +124,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="KComboBox" name="kcombobox_2">
+ <widget class="KComboBox" name="inactiveComboBox">
<item>
<property name="text">
<string>Yes</string>
@@ -161,7 +165,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="KComboBox" name="kcombobox_3">
+ <widget class="KComboBox" name="activeComboBox">
<item>
<property name="text">
<string>Yes</string>
@@ -196,37 +200,6 @@
</item>
</layout>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="KPushButton" name="kpushbutton">
- <property name="text">
- <string>Modify</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KPushButton" name="kpushbutton_2">
- <property name="text">
- <string>Revert to defaults</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
</item>
@@ -246,8 +219,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>362</width>
- <height>200</height>
+ <width>380</width>
+ <height>223</height>
</rect>
</property>
</widget>
@@ -269,7 +242,7 @@
</spacer>
</item>
<item>
- <widget class="KPushButton" name="kpushbutton_3">
+ <widget class="KPushButton" name="addLocalButton">
<property name="text">
<string>Add</string>
</property>
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/explicitwidget.ui #1067758:1067759
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>ExplicitAuthorizationWidget</class>
+ <widget class="QWidget" name="ExplicitAuthorizationWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>302</width>
- <height>78</height>
+ <width>434</width>
+ <height>153</height>
</rect>
</property>
<property name="windowTitle">
- <string>Form</string>
+ <string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
@@ -58,16 +58,16 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label">
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Result</string>
+ <string>Any</string>
</property>
</widget>
</item>
- <item>
- <widget class="KComboBox" name="kcombobox">
+ <item row="0" column="1">
+ <widget class="KComboBox" name="anyComboBox">
<item>
<property name="text">
<string>Yes</string>
@@ -100,6 +100,88 @@
</item>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Inactive console</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KComboBox" name="inactiveComboBox">
+ <item>
+ <property name="text">
+ <string>Yes</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>No</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Administrator Authentication (one shot)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Administrator Authentication (retain)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Authentication (one shot)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Authentication (retain)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Active console</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KComboBox" name="kcombobox_3">
+ <item>
+ <property name="text">
+ <string>Yes</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>No</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Administrator Authentication (one shot)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Administrator Authentication (retain)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Authentication (one shot)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Authentication (retain)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
</layout>
</item>
</layout>
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitconfig/identitywidget.cpp #1067758:1067759
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Dario Freddi <drf@kde.org>
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitconfig/identitywidget.h #1067758:1067759
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Dario Freddi <drf@kde.org>
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitconfig/kcmpolkitconfig.cpp #1067758:1067759
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Dario Freddi <drf@kde.org>
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitconfig/kcmpolkitconfig.h #1067758:1067759
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
- Copyright (C) 2008 Dario Freddi <drf@kde.org>
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic