From 0674bab340e3d2d6a94f07466499ec4e85aa4d00 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 12 Jan 2011 14:34:22 +0200 Subject: [PATCH] [qt] About dialog --- qt/about.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++ qt/about.hpp | 10 +++++++++ qt/mainwindow.cpp | 14 ++++--------- qt/qt.pro | 2 ++ qt/res/logo.png | Bin 0 -> 20575 bytes qt/res/resources.qrc | 3 +++ qt/update_dialog.cpp | 8 +++---- qt/update_dialog.hpp | 2 +- 8 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 qt/about.cpp create mode 100644 qt/about.hpp create mode 100644 qt/res/logo.png diff --git a/qt/about.cpp b/qt/about.cpp new file mode 100644 index 0000000000..11857965f0 --- /dev/null +++ b/qt/about.cpp @@ -0,0 +1,49 @@ +#include "about.hpp" + +#include "../version/version.hpp" + +#include "../platform/platform.hpp" + +#include +#include +#include +#include +#include +#include + +AboutDialog::AboutDialog(QWidget * parent) + : QDialog(parent) +{ + QIcon icon(":logo.png"); + setWindowIcon(icon); + setWindowTitle(QMenuBar::tr("About")); + + QLabel * labelIcon = new QLabel(); + labelIcon->setPixmap(icon.pixmap(128)); + + QString const versionString = tr("

%1 %2

" + "
" + "Built on %3" + ).arg(QString("MapsWithMe"), QLatin1String(VERSION_STRING), + QLatin1String(VERSION_DATE_STRING)); + QLabel * labelVersion = new QLabel(versionString); + + QHBoxLayout * hBox = new QHBoxLayout(); + hBox->addWidget(labelIcon); + hBox->addWidget(labelVersion); + + QFile file(GetPlatform().ReadPathForFile("about.txt").c_str()); + if (file.open(QIODevice::ReadOnly)) + { + QByteArray aboutData = file.readAll(); + file.close(); + + QLabel * labelAbout = new QLabel(aboutData); + QVBoxLayout * vBox = new QVBoxLayout(); + vBox->addLayout(hBox); + vBox->addWidget(labelAbout); + setLayout(vBox); + } + else + setLayout(hBox); +} diff --git a/qt/about.hpp b/qt/about.hpp new file mode 100644 index 0000000000..6f2cbe4cf7 --- /dev/null +++ b/qt/about.hpp @@ -0,0 +1,10 @@ +#pragma once + +#include + +class AboutDialog : public QDialog +{ + Q_OBJECT +public: + explicit AboutDialog(QWidget * parent); +}; diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index eff2859f66..a325c87f75 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -6,17 +6,15 @@ #include "searchwindow.hpp" #include "classificator_tree.hpp" #include "slider_ctrl.hpp" +#include "about.hpp" #include "../indexer/classificator.hpp" -#include "../platform/platform.hpp" - #include #include #include #include #include -#include #include #include "../base/start_mem_debug.hpp" @@ -35,6 +33,7 @@ MainWindow::MainWindow() setCentralWidget(m_pDrawWidget); setWindowTitle(tr("MapsWithMe")); + setWindowIcon(QIcon(":logo.png")); QMenu * helpMenu = new QMenu(tr("Help"), this); menuBar()->addMenu(helpMenu); @@ -226,13 +225,8 @@ void MainWindow::ShowClassifPanel() void MainWindow::OnAbout() { - QFile file(GetPlatform().ReadPathForFile("about.txt").c_str()); - if (file.open(QIODevice::ReadOnly)) - { - QByteArray data = file.readAll(); - QMessageBox::about(this, QMenuBar::tr("About"), data); - file.close(); - } + AboutDialog dlg(this); + dlg.exec(); } } diff --git a/qt/qt.pro b/qt/qt.pro index 83b3ea4c44..f250acd105 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -46,6 +46,7 @@ SOURCES += \ classificator_tree.cpp \ proxystyle.cpp \ slider_ctrl.cpp \ + about.cpp HEADERS += \ mainwindow.hpp \ @@ -57,5 +58,6 @@ HEADERS += \ classificator_tree.hpp \ proxystyle.hpp \ slider_ctrl.hpp \ + about.hpp \ RESOURCES += res/resources.qrc \ diff --git a/qt/res/logo.png b/qt/res/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8dab760201a19bd8041057783016a2400cdb457d GIT binary patch literal 20575 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 y7|QuhD4M-EJv@~rplus.png minus.png + + logo.png + diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 1c67ec3527..984c783085 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -2,8 +2,6 @@ #include "../base/assert.hpp" -#include "../version/version.hpp" - #include #include @@ -53,7 +51,7 @@ namespace qt UpdateDialog::UpdateDialog(QWidget * parent, Storage & storage) : QDialog(parent), m_storage(storage) { - m_label = new QLabel(QObject::tr("Version: ") + VERSION_STRING, this); + //m_label = new QLabel(QObject::tr("Version: ") + VERSION_STRING, this); m_button = new QPushButton(QObject::tr(CHECK_FOR_UPDATE), this); connect(m_button, SIGNAL(clicked(bool)), this, SLOT(OnButtonClick(bool))); @@ -66,7 +64,7 @@ namespace qt connect(m_tree, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(OnItemClick(QTreeWidgetItem *, int))); QHBoxLayout * horizontalLayout = new QHBoxLayout(); - horizontalLayout->addWidget(m_label); +// horizontalLayout->addWidget(m_label); horizontalLayout->addWidget(m_button); QVBoxLayout * verticalLayout = new QVBoxLayout(); verticalLayout->addLayout(horizontalLayout); @@ -173,7 +171,7 @@ namespace qt void UpdateDialog::OnUpdateCheck(int64_t updateSize, char const * readme) { if (updateSize < 0) - m_label->setText(QObject::tr("No update is available")); + ;//m_label->setText(QObject::tr("No update is available")); else { QString title(QObject::tr("Update is available")); diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp index 851a59bfce..03be8a12ce 100644 --- a/qt/update_dialog.hpp +++ b/qt/update_dialog.hpp @@ -39,7 +39,7 @@ namespace qt private: QTreeWidget * m_tree; - QLabel * m_label; + //QLabel * m_label; QPushButton * m_button; storage::Storage & m_storage; };