kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Minor update dialog fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-01-30 00:29:54 +02:00 • committed by Alex Zolotarev
parent d9a3242426
commit b527df97c1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt/update_dialog.cpp
View file

@ -53,8 +53,8 @@ namespace qt
{
//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)));
QPushButton * m_updateButton = new QPushButton(QObject::tr(CHECK_FOR_UPDATE), this);
connect(m_updateButton, SIGNAL(clicked(bool)), this, SLOT(OnButtonClick(bool)));
m_tree = new QTreeWidget(this);
m_tree->setColumnCount(KNumberOfColumns);
@ -65,7 +65,7 @@ namespace qt
QHBoxLayout * horizontalLayout = new QHBoxLayout();
// horizontalLayout->addWidget(m_label);
horizontalLayout->addWidget(m_button);
horizontalLayout->addWidget(m_updateButton);
QVBoxLayout * verticalLayout = new QVBoxLayout();
verticalLayout->addLayout(horizontalLayout);
verticalLayout->addWidget(m_tree);
@ -173,8 +173,8 @@ namespace qt
void UpdateDialog::OnButtonClick(bool)
{
m_button->setText(QObject::tr("Checking for update..."));
m_button->setDisabled(true);
m_updateButton->setText(QObject::tr("Checking for update..."));
m_updateButton->setDisabled(true);
m_storage.CheckForUpdate();
}
@ -205,8 +205,8 @@ namespace qt
if (QMessageBox::Yes == QMessageBox::question(this, title, text, QMessageBox::Yes, QMessageBox::No))
m_storage.PerformUpdate();
}
m_button->setText(CHECK_FOR_UPDATE);
m_button->setDisabled(false);
m_updateButton->setText(CHECK_FOR_UPDATE);
m_updateButton->setDisabled(false);
}
void UpdateDialog::UpdateRowWithCountryInfo(TIndex const & index)

6
qt/update_dialog.hpp
View file

@ -16,7 +16,7 @@ namespace qt
Q_OBJECT
public:
UpdateDialog(QWidget * parent, storage::Storage & storage);
explicit UpdateDialog(QWidget * parent, storage::Storage & storage);
~UpdateDialog();
/// @name Called from downloader to notify GUI
@ -40,7 +40,7 @@ namespace qt
private:
QTreeWidget * m_tree;
//QLabel * m_label;
QPushButton * m_button;
QPushButton * m_updateButton;
storage::Storage & m_storage;
};
};
} // namespace qt