AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Qt Downloader] Added Last Update Check time label

Browse source
This commit is contained in:
Alex Zolotarev 2011-02-19 16:18:27 +01:00 • committed by Alex Zolotarev
parent 6d74c073e1
commit 79549dc836
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/settings.cpp
View file

@ -65,6 +65,17 @@ namespace Settings
StringStorage StringStorage::m_instance;
////////////////////////////////////////////////////////////////////////////////////////////
template <> string ToString<string>(string const & str)
{
return str;
}
template <> bool FromString<string>(string const & strIn, string & strOut)
{
strOut = strIn;
return true;
}
template <> string ToString<m2::RectD>(m2::RectD const & rect)
{
ostringstream stream;

17
qt/update_dialog.cpp
View file

@ -3,6 +3,8 @@
#include "../base/assert.hpp"
#include "../map/settings.hpp"
#include <boost/bind.hpp>
#include <QtGui/QVBoxLayout>
@ -13,8 +15,12 @@
#include <QtGui/QHeaderView>
#include <QtGui/QMessageBox>
#include <QtGui/QProgressBar>
#include <QtCore/QDateTime>
#define CHECK_FOR_UPDATE "Check for update"
#define LAST_UPDATE_CHECK "Last update check: "
/// used in settings
#define LAST_CHECK_TIME_KEY "LastUpdateCheckTime"
using namespace storage;
@ -52,7 +58,10 @@ namespace qt
UpdateDialog::UpdateDialog(QWidget * parent, Storage & storage)
: QDialog(parent), m_storage(storage)
{
//m_label = new QLabel(QObject::tr("Version: ") + VERSION_STRING, this);
string timeString;
if (!Settings::Get(LAST_CHECK_TIME_KEY, timeString))
timeString = "Never checked";
m_label = new QLabel(QString(QObject::tr(LAST_UPDATE_CHECK)) + timeString.c_str(), this);
m_updateButton = new QPushButton(QObject::tr(CHECK_FOR_UPDATE), this);
connect(m_updateButton, SIGNAL(clicked()), this, SLOT(OnUpdateClick()));
@ -65,7 +74,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_updateButton);
QVBoxLayout * verticalLayout = new QVBoxLayout();
verticalLayout->addLayout(horizontalLayout);
@ -220,6 +229,10 @@ namespace qt
// if (QMessageBox::Yes == QMessageBox::question(this, title, text, QMessageBox::Yes, QMessageBox::No))
// m_storage.PerformUpdate();
// }
QString labelText(LAST_UPDATE_CHECK);
QString const textDate = QDateTime::currentDateTime().toString();
Settings::Set(LAST_CHECK_TIME_KEY, string(textDate.toLocal8Bit().data()));
m_label->setText(labelText.append(textDate));
m_updateButton->setText(CHECK_FOR_UPDATE);
m_updateButton->setDisabled(false);
}

2
qt/update_dialog.hpp
View file

@ -38,7 +38,7 @@ namespace qt
private:
QTreeWidget * m_tree;
//QLabel * m_label;
QLabel * m_label;
QPushButton * m_updateButton;
storage::Storage & m_storage;
};