ui & logic: fixes for release
* smaller indexing progress dialog with bar in the middle instead of golden ratio * set default code snippet expand range to 3 * no minimum height for project file location element in project setup wizard * move aggregation and inheritance edges to front when hovered or active * push parent nodes of active nodes to back to make edges to the active child visible * properly quit application when window is closed while confirm box is open * properly quit application when window is closed while indexing * only count top level nodes for count on bundle nodes * give noLetterScore to index 0 in search index scoring bug id = 121
This commit is contained in:
@@ -14,11 +14,13 @@
|
||||
QtDialogView::QtDialogView(QtMainWindow* mainWindow)
|
||||
: m_mainWindow(mainWindow)
|
||||
, m_windowStack(this)
|
||||
, m_resultReady(false)
|
||||
{
|
||||
}
|
||||
|
||||
QtDialogView::~QtDialogView()
|
||||
{
|
||||
m_resultReady = true;
|
||||
}
|
||||
|
||||
void QtDialogView::showProgressDialog(const std::string& title, const std::string& message)
|
||||
@@ -66,17 +68,17 @@ void QtDialogView::hideProgressDialog()
|
||||
bool QtDialogView::startIndexingDialog(size_t cleanFileCount, size_t indexFileCount)
|
||||
{
|
||||
bool result = false;
|
||||
bool done = false;
|
||||
m_resultReady = false;
|
||||
|
||||
m_onQtThread(
|
||||
[=, &result, &done]()
|
||||
[=, &result]()
|
||||
{
|
||||
QtIndexingDialog* window = createWindow<QtIndexingDialog>();
|
||||
window->setupStart(cleanFileCount, indexFileCount,
|
||||
[&](bool start)
|
||||
{
|
||||
result = start;
|
||||
done = true;
|
||||
m_resultReady = true;
|
||||
|
||||
setUIBlocked(false);
|
||||
}
|
||||
@@ -86,7 +88,7 @@ bool QtDialogView::startIndexingDialog(size_t cleanFileCount, size_t indexFileCo
|
||||
}
|
||||
);
|
||||
|
||||
while (!done)
|
||||
while (!m_resultReady)
|
||||
{
|
||||
const int SLEEP_TIME_MS = 25;
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_TIME_MS));
|
||||
@@ -155,10 +157,10 @@ void QtDialogView::finishedIndexingDialog(size_t fileCount, size_t totalFileCoun
|
||||
int QtDialogView::confirm(const std::string& message, const std::vector<std::string>& options)
|
||||
{
|
||||
int result = -1;
|
||||
bool done = false;
|
||||
m_resultReady = false;
|
||||
|
||||
m_onQtThread(
|
||||
[=, &result, &done]()
|
||||
[=, &result]()
|
||||
{
|
||||
QMessageBox msgBox;
|
||||
msgBox.setText(message.c_str());
|
||||
@@ -179,11 +181,11 @@ int QtDialogView::confirm(const std::string& message, const std::vector<std::str
|
||||
}
|
||||
}
|
||||
|
||||
done = true;
|
||||
m_resultReady = true;
|
||||
}
|
||||
);
|
||||
|
||||
while (!done)
|
||||
while (!m_resultReady)
|
||||
{
|
||||
const int SLEEP_TIME_MS = 25;
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_TIME_MS));
|
||||
@@ -218,6 +220,11 @@ void QtDialogView::handleMessage(MessageShowErrors* message)
|
||||
);
|
||||
}
|
||||
|
||||
void QtDialogView::handleMessage(MessageWindowClosed* message)
|
||||
{
|
||||
m_resultReady = true;
|
||||
}
|
||||
|
||||
void QtDialogView::updateErrorCount(size_t errorCount, size_t fatalCount)
|
||||
{
|
||||
QtIndexingDialog* window = dynamic_cast<QtIndexingDialog*>(m_windowStack.getTopWindow());
|
||||
|
||||
Reference in New Issue
Block a user