Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-28 12:42:39 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-28 12:42:39 (GMT) |
| commit | fa30c40e9a278db4daa5e4962f96c0a8bc91e03d (patch) | |
| tree | 4b25659cfaf7a9fd85b5019e4801a27b6b064ff5 /Swift | |
| parent | 109e50103d757d880e7ce390482951111dad1e22 (diff) | |
| download | swift-fa30c40e9a278db4daa5e4962f96c0a8bc91e03d.zip swift-fa30c40e9a278db4daa5e4962f96c0a8bc91e03d.tar.bz2 | |
Add copyright to about dialog
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtAboutWidget.cpp | 24 | ||||
| -rw-r--r-- | Swift/QtUI/QtAboutWidget.h | 3 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 10 | ||||
| -rw-r--r-- | Swift/QtUI/Swift.qrc | 1 |
4 files changed, 32 insertions, 6 deletions
diff --git a/Swift/QtUI/QtAboutWidget.cpp b/Swift/QtUI/QtAboutWidget.cpp index 8b072e4..b918c3b 100644 --- a/Swift/QtUI/QtAboutWidget.cpp +++ b/Swift/QtUI/QtAboutWidget.cpp @@ -11,7 +11,10 @@ #include <QLabel> #include <QVBoxLayout> #include <QtGlobal> - +#include <QPushButton> +#include <QTextEdit> +#include <QFile> +#include <QTextStream> #include "Swiften/Application/Application.h" @@ -39,7 +42,26 @@ QtAboutWidget::QtAboutWidget() : QDialog() { QLabel* buildLabel = new QLabel(buildString, this); mainLayout->addWidget(buildLabel); + QPushButton* licenseButton = new QPushButton("View License", this); + mainLayout->addWidget(licenseButton); + connect(licenseButton, SIGNAL(clicked()), this, SLOT(handleLicenseClicked())); + setFixedSize(minimumSizeHint()); } +void QtAboutWidget::handleLicenseClicked() { + QTextEdit* text = new QTextEdit(); + text->setAttribute(Qt::WA_DeleteOnClose); + text->setReadOnly(true); + QFile file(":/COPYING"); + file.open(QIODevice::ReadOnly); + QTextStream in(&file); + in.setAutoDetectUnicode(true); + text->setPlainText(in.readAll()); + file.close(); + text->resize(500, 600); + text->show(); + text->activateWindow(); +} + } diff --git a/Swift/QtUI/QtAboutWidget.h b/Swift/QtUI/QtAboutWidget.h index d154dd3..1800676 100644 --- a/Swift/QtUI/QtAboutWidget.h +++ b/Swift/QtUI/QtAboutWidget.h @@ -14,5 +14,8 @@ namespace Swift { public: QtAboutWidget(); + + private slots: + void handleLicenseClicked(); }; } diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 3b286b4..8ff8447 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -79,11 +79,11 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { } mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, eventWindowFactory_, settings_, application_, systemTray_, soundPlayer_, xmlConsoleWidgetFactory_, chatListWindowFactory_, mucSearchWindowFactory_, options.count("latency-debug") > 0); - PlatformAutoUpdaterFactory autoUpdaterFactory; - if (autoUpdaterFactory.isSupported()) { - autoUpdater_ = autoUpdaterFactory.createAutoUpdater(SWIFT_APPCAST_URL); - autoUpdater_->checkForUpdates(); - } + // PlatformAutoUpdaterFactory autoUpdaterFactory; + // if (autoUpdaterFactory.isSupported()) { + // autoUpdater_ = autoUpdaterFactory.createAutoUpdater(SWIFT_APPCAST_URL); + // autoUpdater_->checkForUpdates(); + // } } QtSwift::~QtSwift() { diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc index 1c07420..2d58eef 100644 --- a/Swift/QtUI/Swift.qrc +++ b/Swift/QtUI/Swift.qrc @@ -12,5 +12,6 @@ <file alias="icons/tray-standard.png">../resources/icons/tray-standard.png</file> <file alias="icons/new-chat.png">../resources/icons/new-chat.png</file> <file alias="sounds/message-received.wav">../resources/sounds/message-received.wav</file> + <file alias="COPYING">../../COPYING</file> </qresource> </RCC> |