aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2013-10-16 00:49:02 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2013-10-16 00:49:02 +0000
commit1eec1d895e102f64e0db98cad38ab634abf5c053 (patch)
tree0087fc8fd0f3aeb6dc86125de080b8f395d02363
parentlayout (diff)
downloadgpg4usb-1eec1d895e102f64e0db98cad38ab634abf5c053.tar.gz
gpg4usb-1eec1d895e102f64e0db98cad38ab634abf5c053.zip
rename qmlpage to widgets/keydetailswidget and add licence
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@1070 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--gpg4usb.pro4
-rw-r--r--qmlpage.h28
-rw-r--r--textedit.cpp4
-rw-r--r--widgets/keydetailswidget.cpp (renamed from qmlpage.cpp)31
-rw-r--r--widgets/keydetailswidget.h49
5 files changed, 79 insertions, 37 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro
index bba4bad..65c3001 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -46,7 +46,7 @@ HEADERS += attachments.h \
helppage.h \
gpgconstants.h \
findwidget.h \
- qmlpage.h
+ widgets/keydetailswidget.h
SOURCES += attachments.cpp \
gpgcontext.cpp \
@@ -71,7 +71,7 @@ SOURCES += attachments.cpp \
helppage.cpp \
gpgconstants.cpp \
findwidget.cpp \
- qmlpage.cpp
+ widgets/keydetailswidget.cpp
RC_FILE = gpg4usb.rc
diff --git a/qmlpage.h b/qmlpage.h
deleted file mode 100644
index 1dc1c6d..0000000
--- a/qmlpage.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef QMLPAGE_H
-#define QMLPAGE_H
-
-#include <QWidget>
-#include <QDeclarativeContext>
-#include <QGraphicsObject>
-#include "kgpg/core/kgpgkey.h"
-#include "gpgcontext.h"
-
-class QMLPage : public QWidget
-{
-
- Q_OBJECT
-
-public:
- QMLPage(GpgME::GpgContext *ctx, KgpgCore::KgpgKey key, QWidget *parent = 0);
-
-public slots:
- void qmlClicked();
- void slotExportPublicKey();
- void slotExportPrivateKey();
-private:
- QDeclarativeContext *context;
- QGraphicsObject *obj;
- GpgME::GpgContext *mCtx;
-};
-
-#endif // QMLPAGE_H
diff --git a/textedit.cpp b/textedit.cpp
index 3f743a0..1a987bf 100644
--- a/textedit.cpp
+++ b/textedit.cpp
@@ -20,7 +20,7 @@
*/
#include "textedit.h"
-#include "qmlpage.h"
+#include "widgets/keydetailswidget.h"
TextEdit::TextEdit()
{
@@ -67,7 +67,7 @@ void TextEdit::slotNewHelpTab(QString title, QString path)
}
void TextEdit::slotNewQMLTab(QString title, GpgME::GpgContext *ctx, KgpgCore::KgpgKey key) {
- QMLPage *page = new QMLPage(ctx, key);
+ KeyDetailsWidget *page = new KeyDetailsWidget(ctx, key);
// todo: should parent also be given?
tabWidget->addTab(page, title);
tabWidget->setCurrentIndex(tabWidget->count() - 1);
diff --git a/qmlpage.cpp b/widgets/keydetailswidget.cpp
index d9ca178..2276570 100644
--- a/qmlpage.cpp
+++ b/widgets/keydetailswidget.cpp
@@ -1,4 +1,25 @@
-#include "qmlpage.h"
+/*
+ * keydetailswidget.cpp
+ *
+ * Copyright 2013 gpg4usb-team <[email protected]>
+ *
+ * This file is part of gpg4usb.
+ *
+ * Gpg4usb 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.
+ *
+ * Gpg4usb 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 gpg4usb. If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "keydetailswidget.h"
#include <QtDeclarative/QDeclarativeView>
#include <QHBoxLayout>
#include <QDebug>
@@ -7,7 +28,7 @@
#include <QDeclarativePropertyMap>
#include "kgpg/core/convert.h"
-QMLPage::QMLPage(GpgME::GpgContext *ctx, KgpgCore::KgpgKey key, QWidget *parent) :
+KeyDetailsWidget::KeyDetailsWidget(GpgME::GpgContext *ctx, KgpgCore::KgpgKey key, QWidget *parent) :
QWidget(parent), mCtx(ctx)
{
@@ -51,7 +72,7 @@ QMLPage::QMLPage(GpgME::GpgContext *ctx, KgpgCore::KgpgKey key, QWidget *parent)
}
-void QMLPage::qmlClicked() {
+void KeyDetailsWidget::qmlClicked() {
// http://stackoverflow.com/questions/9062189/how-to-modify-a-qml-text-from-c
qDebug() << "c++, click recieved from qml";
@@ -61,12 +82,12 @@ void QMLPage::qmlClicked() {
qDebug() << "text2 "<< obj->property("tf2Text");
}
-void QMLPage::slotExportPublicKey() {
+void KeyDetailsWidget::slotExportPublicKey() {
QString id=obj->property("keyid").toString();
mCtx->exportKeyToFile(QStringList(id));
}
-void QMLPage::slotExportPrivateKey() {
+void KeyDetailsWidget::slotExportPrivateKey() {
QString id=obj->property("keyid").toString();
mCtx->exportPrivateKey(id);
}
diff --git a/widgets/keydetailswidget.h b/widgets/keydetailswidget.h
new file mode 100644
index 0000000..0491336
--- /dev/null
+++ b/widgets/keydetailswidget.h
@@ -0,0 +1,49 @@
+/*
+ * keydetailswidget.h
+ *
+ * Copyright 2013 gpg4usb-team <[email protected]>
+ *
+ * This file is part of gpg4usb.
+ *
+ * Gpg4usb 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.
+ *
+ * Gpg4usb 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 gpg4usb. If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef KEYDETAILSWIDGET_H
+#define KEYDETAILSWIDGET_H
+
+#include <QWidget>
+#include <QDeclarativeContext>
+#include <QGraphicsObject>
+#include "kgpg/core/kgpgkey.h"
+#include "gpgcontext.h"
+
+class KeyDetailsWidget : public QWidget
+{
+
+ Q_OBJECT
+
+public:
+ KeyDetailsWidget(GpgME::GpgContext *ctx, KgpgCore::KgpgKey key, QWidget *parent = 0);
+
+public slots:
+ void qmlClicked();
+ void slotExportPublicKey();
+ void slotExportPrivateKey();
+private:
+ QDeclarativeContext *context;
+ QGraphicsObject *obj;
+ GpgME::GpgContext *mCtx;
+};
+
+#endif // KEYDETAILSWIDGET_H