[PATCH 1 of 3] Remove dead statusdialog

Wald Commits scm-commit at wald.intevation.org
Tue Apr 29 15:37:20 CEST 2014


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398778168 0
# Node ID 3edbe1af2c85d58ea80b25c54415aff4c6e6aecb
# Parent  a097dd86cb4d5c209cb66fadc255e248602d7563
Remove dead statusdialog

diff -r a097dd86cb4d -r 3edbe1af2c85 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Tue Apr 29 15:26:43 2014 +0200
+++ b/ui/CMakeLists.txt	Tue Apr 29 13:29:28 2014 +0000
@@ -34,7 +34,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/helpdialog.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/statusdialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificateitemdelegate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/separatoritemdelegate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/installwrapper.cpp
diff -r a097dd86cb4d -r 3edbe1af2c85 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Tue Apr 29 15:26:43 2014 +0200
+++ b/ui/mainwindow.cpp	Tue Apr 29 13:29:28 2014 +0000
@@ -46,7 +46,6 @@
 #include "downloader.h"
 #include "helpdialog.h"
 #include "aboutdialog.h"
-#include "statusdialog.h"
 #include "certificateitemdelegate.h"
 #include "separatoritemdelegate.h"
 #include "installwrapper.h"
@@ -318,16 +317,12 @@
     QMenu *mMenu = new QMenu(tr("Menu"), mMenuBar);
     mMenuBar->addMenu(mMenu);
     QAction *update = mMenu->addAction(tr("Force Update"));
-//    QAction *settings = mMenu->addAction(tr("Settings"));
-//    QAction *status = mMenu->addAction(tr("Statusdialog"));
     mMenu->addSeparator();
     QAction *help = mMenu->addAction(tr("Help"));
     QAction *about = mMenu->addAction(tr("About"));
     mMenu->addSeparator();
     QAction *quit = mMenu->addAction(tr("Quit"));
     connect(update, SIGNAL(triggered()), this, SLOT(checkUpdates()));
-//    connect(settings, SIGNAL(triggered()), this, SLOT(showSettings()));
-//    connect(status, SIGNAL(triggered()), this, SLOT(showStatus()));
     connect(help, SIGNAL(triggered()), this, SLOT(showHelp()));
     connect(about, SIGNAL(triggered()), this, SLOT(showAbout()));
     connect(quit, SIGNAL(triggered()), this, SLOT(closeApp()));
@@ -594,18 +589,6 @@
     return item;
 }
 
-void MainWindow::showSettings()
-{
-    qDebug() << "show settingsdialog";
-}
-
-void MainWindow::showStatus()
-{
-    qDebug() << "show settingsdialog";
-    StatusDialog *status = new StatusDialog(this);
-    status->show();
-}
-
 void MainWindow::showHelp()
 {
     qDebug() << "show helpdialog";
diff -r a097dd86cb4d -r 3edbe1af2c85 ui/mainwindow.h
--- a/ui/mainwindow.h	Tue Apr 29 15:26:43 2014 +0200
+++ b/ui/mainwindow.h	Tue Apr 29 13:29:28 2014 +0000
@@ -69,8 +69,6 @@
     void downloaderError(const QString &message, SSLConnection::ErrorCode error);
     /** @brief Trigger the appropiate action depending on the state */
     void messageClicked();
-    void showSettings();
-    void showStatus();
     void showHelp();
     void showAbout();
     void showDetails(QListWidgetItem*);
diff -r a097dd86cb4d -r 3edbe1af2c85 ui/statusdialog.cpp
--- a/ui/statusdialog.cpp	Tue Apr 29 15:26:43 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/* Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU GPL (v>=2)
- * and comes with ABSOLUTELY NO WARRANTY!
- * See LICENSE.txt for details.
- */
-#include "statusdialog.h"
-#include <QDebug>
-#include <QVBoxLayout>
-#include <QTextEdit>
-#include <QPushButton>
-
-StatusDialog::StatusDialog(QMainWindow *parent) :
-    QDialog(parent)
-{
-    setupGUI();
-}
-
-void StatusDialog::setupGUI()
-{
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    QTextEdit *helpText = new QTextEdit;
-    helpText->setReadOnly(true);
-    QString dummyText = tr("The following certificates are successfully installed:\r");
-    dummyText.append(tr("* Email CA 2013\r"));
-    dummyText.append(tr("* Server CA 2010\r"));
-    dummyText.append(tr("\rThe following certificates are successfully removed:\r"));
-    dummyText.append(tr("* Email CA 2010\r"));
-    dummyText.append(tr("\rErrors while processing certificates:\r"));
-    dummyText.append(tr("* PCA-1-Verwaltung-08\r"));
-    helpText->setPlainText(dummyText);
-
-    QHBoxLayout *buttonLayout = new QHBoxLayout;
-    QPushButton *closeButton = new QPushButton(tr("Close"));
-    connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
-    buttonLayout->insertStretch(0, 10);
-    buttonLayout->addWidget(closeButton);
-
-    mainLayout->addWidget(helpText);
-    mainLayout->addLayout(buttonLayout);
-}
diff -r a097dd86cb4d -r 3edbe1af2c85 ui/statusdialog.h
--- a/ui/statusdialog.h	Tue Apr 29 15:26:43 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/* Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU GPL (v>=2)
- * and comes with ABSOLUTELY NO WARRANTY!
- * See LICENSE.txt for details.
- */
-#ifndef STATUSDIALOG_H
-#define STATUSDIALOG_H
-
-#include <QDialog>
-#include <QMainWindow>
-/**
- * @file statusdialog.h
- * @brief The dialog for certificate status.
- */
-
-class StatusDialog : public QDialog
-{
-public:
-    /** @brief Create a status dialog */
-    StatusDialog(QMainWindow *parent);
-
-private:
-    void setupGUI();
-
-};
-#endif // STATUSDIALOG_H


More information about the Trustbridge-commits mailing list