sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt5 refactoring ...

Browse Source
This commit is contained in:
doitux
2013-08-28 10:49:03 +02:00
parent 1d0b9fc5f2
commit 20840a2af0
90 changed files with 1910 additions and 3067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/logfiledialog/logfiledialog.cpp
+9 -8
View File
@@ -70,13 +70,14 @@ LogFileDialog::~LogFileDialog()
delete ui;
}
void LogFileDialog::exec()
int LogFileDialog::exec()
{
uploader->Run();
refreshLogFileList();
QDialog::exec();
int ret = QDialog::exec();
uploader->SignalTermination();
uploader->Join(THREAD_WAIT_INFINITE);
return ret;
}
void LogFileDialog::UploadCompleted(const std::string &filename, const std::string &returnMessage)
@@ -99,7 +100,7 @@ void LogFileDialog::refreshLogFileList()
QFileInfo currentSqliteLogFile(QString::fromStdString(myGuiLog->getMySqliteLogFileName()));
ui->treeWidget_logFiles->blockSignals(TRUE);
ui->treeWidget_logFiles->blockSignals(true);
ui->treeWidget_logFiles->clear();
int i;
for (i=0; i < dbFilesList.size(); i++) {
@@ -119,7 +120,7 @@ void LogFileDialog::refreshLogFileList()
ui->treeWidget_logFiles->addTopLevelItem(item);
}
ui->treeWidget_logFiles->sortItems(0, Qt::DescendingOrder);
ui->treeWidget_logFiles->blockSignals(FALSE);
ui->treeWidget_logFiles->blockSignals(false);
ui->treeWidget_logFiles->setCurrentItem(ui->treeWidget_logFiles->topLevelItem(0));
}
@@ -200,14 +201,14 @@ void LogFileDialog::showLogFilePreview(ShowLogMode mode)
QTreeWidgetItem* selectedItem = ui->treeWidget_logFiles->currentItem();
if(mode == INIT_VIEW) {
ui->comboBox->blockSignals(TRUE);
ui->comboBox->blockSignals(true);
ui->comboBox->clear();
QList<int> gameIds = myGuiLog->getGameList(selectedItem->data(0, Qt::UserRole).toString());
QList<int>::const_iterator it;
for (it = gameIds.constBegin(); it != gameIds.constEnd(); ++it) {
ui->comboBox->addItem(QString::number(*it));
}
ui->comboBox->blockSignals(FALSE);
ui->comboBox->blockSignals(false);
}
if(selectedItem) {
@@ -249,7 +250,7 @@ void LogFileDialog::uploadFile()
void LogFileDialog::uploadInProgressAnimationStart()
{
//const QString buttonText(tr("Upload in progress"));
ui->pushButton_analyseLogfile->setDisabled(TRUE);
ui->pushButton_analyseLogfile->setDisabled(true);
QMovie *movie = new QMovie(":/gfx/loader.gif");
ui->label_animation->setMovie(movie);
@@ -261,7 +262,7 @@ void LogFileDialog::uploadInProgressAnimationStart()
void LogFileDialog::uploadInProgressAnimationStop()
{
ui->pushButton_analyseLogfile->setDisabled(FALSE);
ui->pushButton_analyseLogfile->setDisabled(false);
ui->label_animation->setMaximumWidth(0);
ui->horizontalLayout_animation->setSpacing(0);
src/gui/qt/logfiledialog/logfiledialog.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
void setGuiLog(guiLog *g) {
myGuiLog = g;
}
void exec();
int exec();
virtual void UploadCompleted(const std::string &filename, const std::string &returnMessage);
virtual void UploadError(const std::string &filename, const std::string &errorMessage);