Changeset 1487f05 in terepaima for terepaima-0.4.16/sources

Timestamp:

Aug 30, 2017, 4:19:41 PM (7 years ago)

Author:

pbuitrago@…>

Branches:

stretch

Children:

35bdadc

Parents:

da9aa6c

Message:

se cambio los botones de verificación de la firma para el menu segurity, se crearon dos nuevas ventanas, una para agregar el pin del dispositivo criptografico y la otra venta para mostrar los certificados que este en el dispositivo criptografico

Location:

terepaima-0.4.16/sources

Files:

• mainwindow.cpp (modified) (8 diffs)
• mainwindow.h (modified) (2 diffs)
• pluginhandler.cpp (modified) (1 diff)

terepaima-0.4.16/sources/mainwindow.cpp

@@ -101 +101 @@
 //********************************* POPPLER
 
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QDialog>
+//********************************* Signature
 namespace
 {
@@ -2877 +2884 @@
     m_printAction = createAction(tr("&Print..."), QLatin1String("print"), QLatin1String("document-print"), QKeySequence::Print, SLOT(on_print_triggered()));
     m_exitAction = createAction(tr("E&xit"), QLatin1String("exit"), QIcon::fromTheme("application-exit"), QKeySequence::Quit, SLOT(close()));
-    m_verify_signature = createAction(trUtf8("&Verificar firma electrónica..."), QLatin1String("Verify signature"), QLatin1String("icono_verificar"), QKeySequence(), SLOT(on_verify_signature()));
+    //m_verify_signature = createAction(trUtf8("&Verificar firma electrónica..."), QLatin1String("Verify signature"), QLatin1String("icono_verificar"), QKeySequence(), SLOT(on_verify_signature()));
 
     // edit
@@ -2975 +2982 @@
     s_settings->pageItem().setProgressIcon(loadIconWithFallback(QLatin1String("image-loading")));
     s_settings->pageItem().setErrorIcon(loadIconWithFallback(QLatin1String("image-missing")));
+
+    //security
+    m_signature = createAction(trUtf8("&Signature..."), QLatin1String("Signature"), QLatin1String("icono_firmar"), QKeySequence(), SLOT(on_signature()));
+    m_verify_signature = createAction(trUtf8("&Verificar firma electrónica..."), QLatin1String("Verify signature"), QLatin1String("icono_verificar"), QKeySequence(), SLOT(on_verify_signature()));
 }
 
@@ -2993 +3004 @@
 {
     m_fileToolBar = createToolBar(tr("&File"), QLatin1String("fileToolBar"), s_settings->mainWindow().fileToolBar(),
-                                  QList< QAction* >() << m_openAction << m_openInNewTabAction << m_openContainingFolderAction << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction << m_verify_signature);
-
+                                  //QList< QAction* >() << m_openAction << m_openInNewTabAction << m_openContainingFolderAction << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction << m_verify_signature);
+                                  QList< QAction* >() << m_openAction << m_openInNewTabAction << m_openContainingFolderAction << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction);
     m_editToolBar = createToolBar(tr("&Edit"), QLatin1String("editToolBar"), s_settings->mainWindow().editToolBar(),
                                   QList< QAction* >() << m_currentPageAction << m_previousPageAction << m_nextPageAction << m_firstPageAction << m_lastPageAction << m_jumpToPageAction << m_searchAction << m_jumpBackwardAction << m_jumpForwardAction << m_copyToClipboardModeAction << m_addAnnotationModeAction);
@@ -3241 +3252 @@
     }
 
-    m_fileMenu->addActions(QList< QAction* >() << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction << m_verify_signature);
+    //m_fileMenu->addActions(QList< QAction* >() << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction << m_verify_signature);
+    m_fileMenu->addActions(QList< QAction* >() << m_refreshAction << m_saveCopyAction << m_saveAsAction << m_printAction);
     m_fileMenu->addSeparator();
     m_fileMenu->addAction(m_exitAction);
@@ -3281 +3293 @@
 
     QMenu* docksMenu = m_viewMenu->addMenu(tr("&Docks"));
-    docksMenu->addActions(QList< QAction* >() << m_outlineDock->toggleViewAction() << m_propertiesDock->toggleViewAction() << m_thumbnailsDock->toggleViewAction() << m_bookmarksDock->toggleViewAction() << m_detailsSignatureDock->toggleViewAction());
+    //docksMenu->addActions(QList< QAction* >() << m_outlineDock->toggleViewAction() << m_propertiesDock->toggleViewAction() << m_thumbnailsDock->toggleViewAction() << m_bookmarksDock->toggleViewAction() << m_detailsSignatureDock->toggleViewAction());
+    docksMenu->addActions(QList< QAction* >() << m_outlineDock->toggleViewAction() << m_propertiesDock->toggleViewAction() << m_thumbnailsDock->toggleViewAction() << m_bookmarksDock->toggleViewAction());
 
     if(s_settings->mainWindow().extendedSearchDock())
@@ -3330 +3343 @@
     m_helpMenu = menuBar()->addMenu(tr("&Help"));
     m_helpMenu->addActions(QList< QAction* >() << m_contentsAction << m_aboutAction);
+
+    //security
+
+    m_security = menuBar()->addMenu(tr("&Security"));
+    m_security->addActions(QList< QAction* >() << m_signature << m_verify_signature << m_detailsSignatureDock->toggleViewAction());
+
 }
 
@@ -3919 +3938 @@
 }
 
+void MainWindow::on_signature() {
+
+    qDebug("on_signature");
+    QDialog ventana;
+    QHBoxLayout *layoutContrasenia = new QHBoxLayout;
+    QHBoxLayout *layoutBotones = new QHBoxLayout;
+    QVBoxLayout *layoutPrincipal = new QVBoxLayout(&ventana);
+
+    QLabel *etiquetaContrasenia = new QLabel("Para firmar introduzca el PIN");
+
+    QLineEdit *campoContrasenia = new QLineEdit;
+    campoContrasenia->setEchoMode(QLineEdit::Password);
+
+    QPushButton *botonAceptar = new QPushButton("Aceptar");
+    QPushButton *botonCancelar = new QPushButton("Cancelar");
+
+    layoutContrasenia->addWidget(etiquetaContrasenia);
+    layoutContrasenia->addWidget(campoContrasenia);
+
+    layoutBotones->addStretch();
+    layoutBotones->addWidget(botonAceptar);
+    layoutBotones->addWidget(botonCancelar);
+
+    layoutPrincipal->addLayout(layoutContrasenia);
+    layoutPrincipal->addLayout(layoutBotones);
+
+    ventana.setWindowTitle(QObject::trUtf8("PIN:"));
+    ventana.exec();
+    on_windowSelecctionCertificate();
+}
+
+void MainWindow::on_windowSelecctionCertificate() {
+
+    qDebug("on_windowSelecctionCertificate()");
+    QDialog ventana;
+    QHBoxLayout *layoutmensaje = new QHBoxLayout;
+    QHBoxLayout *layoutBotones = new QHBoxLayout;
+    QHBoxLayout *layoutTableView = new QHBoxLayout;
+    QVBoxLayout *layoutPrincipal = new QVBoxLayout(&ventana);
+
+    QLabel *mensaje = new QLabel("Al seleccionar el certificado acepto que mi nombre y certificado serán enviado al proveedor de servicio");
+
+    QTableView *listCertificate = new QTableView;
+    QStandardItemModel *model = new QStandardItemModel(10,3,this);
+    model->setHeaderData(0, Qt::Horizontal, QObject::tr("Certificado"));
+    model->setHeaderData(1, Qt::Horizontal, QObject::tr("Tipo"));
+    model->setHeaderData(2, Qt::Horizontal, QObject::tr("Valido hasta"));
+    listCertificate->setModel(model);
+    listCertificate->setShowGrid(false);
+    listCertificate->verticalHeader()->setVisible(false);
+    listCertificate->setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    QPushButton *botonAceptar = new QPushButton("Aceptar");
+    QPushButton *botonCancelar = new QPushButton("Cancelar");
+
+    layoutBotones->addStretch();
+    layoutmensaje->addWidget(mensaje);
+    layoutTableView->addWidget(listCertificate);
+    layoutBotones->addWidget(botonAceptar);
+    layoutBotones->addWidget(botonCancelar);
+
+    layoutPrincipal->addLayout(layoutmensaje);
+    layoutPrincipal->addLayout(layoutTableView);
+    layoutPrincipal->addLayout(layoutBotones);
+
+    ventana.setWindowTitle(QObject::trUtf8("Seleccionar el certificado del firmante:"));
+    ventana.exec();
+}
+
 bool MainWindowAdaptor::closeTab(const QString& absoluteFilePath)
 {

terepaima-0.4.16/sources/mainwindow.h

@@ -258 +258 @@
 
     void on_verify_signature();
+    void on_signature();
+    void on_windowSelecctionCertificate();
     //QString verify_signature();
     //QStringList verify_signature();
@@ -466 +468 @@
     SearchableMenu* m_bookmarksMenu;
     QMenu* m_helpMenu;
+    QMenu* m_security;
+    QAction* m_signature;
 
     bool m_bookmarksMenuIsDirty;

terepaima-0.4.16/sources/pluginhandler.cpp

@@ -74 +74 @@
     QPluginLoader pluginLoader("/usr/lib/terepaima/"+fileName);
 
-    //qDebug("****loadPlugin****");
-    //qDebug() << QDir(QApplication::applicationDirPath()).absoluteFilePath(fileName);
-    //qDebug("******************");
+    qDebug("****loadPlugin****");
+    qDebug() << QDir(QApplication::applicationDirPath()).absoluteFilePath(fileName);
+    qDebug("******************");
 
     if(!pluginLoader.load())