diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml index b1e4f34a..2a06b4cb 100644 --- a/bin/app/data/color_schemes/bright.xml +++ b/bin/app/data/color_schemes/bright.xml @@ -136,7 +136,7 @@ #6B9AB2 #C1315E #865F9E - #CC9533 + #B0812C diff --git a/src/lib/data/parser/TaskParseWrapper.cpp b/src/lib/data/parser/TaskParseWrapper.cpp index 6b407d30..4eb0ae0d 100644 --- a/src/lib/data/parser/TaskParseWrapper.cpp +++ b/src/lib/data/parser/TaskParseWrapper.cpp @@ -21,6 +21,7 @@ void TaskParseWrapper::doEnter(std::shared_ptr blackboard) blackboard->get("source_file_count", sourceFileCount); if (std::shared_ptr dialogView = Application::getInstance()->getDialogView()) { + dialogView->hideUnknownProgressDialog(); dialogView->updateIndexingDialog(0, 0, sourceFileCount, ""); } diff --git a/src/lib_gui/qt/view/QtDialogView.cpp b/src/lib_gui/qt/view/QtDialogView.cpp index a16caa38..1925bad7 100644 --- a/src/lib_gui/qt/view/QtDialogView.cpp +++ b/src/lib_gui/qt/view/QtDialogView.cpp @@ -131,7 +131,7 @@ void QtDialogView::startIndexingDialog( connect(timer.get(), &QTimer::timeout, [=]() { - showUnknownProgress("Preparing Index", "Processing Files", true); + showUnknownProgress("Preparing Indexing", "Processing Files", true); } ); timer->start(200); @@ -168,6 +168,7 @@ void QtDialogView::startIndexingDialog( )); m_windowStack.clearWindows(); + showUnknownProgress("Preparing Indexing", "Setting up Indexers", false); } ); diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index 1ab0dedc..0e8db02a 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -210,7 +210,7 @@ void QtIndexingDialog::setupReport( updateNextButton("OK"); setCloseVisible(false); - m_sizeHint = QSize(400, 280); + m_sizeHint = QSize(interrupted ? 400 : 430, 280); if (interrupted) { @@ -526,9 +526,9 @@ void QtIndexingDialog::setGeometries() m_top->setGeometry(0, 0, m_window->size().width(), m_window->size().height() * m_topRatio); m_title->setGeometry( - margins.left(), + 45, m_window->size().height() * m_topRatio - 50, - m_window->size().width() - margins.left() - margins.right(), + m_window->size().width() - 60, 40 ); }