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:
Eberhard Graether
2016-10-11 15:38:44 +02:00
parent 86f652d221
commit f6ae1afdb2
16 changed files with 93 additions and 44 deletions
+6 -6
View File
@@ -74,13 +74,13 @@ void QtIndexingDialog::setupProgress()
QBoxLayout* layout = createLayout();
addTopAndProgressBar(0.62);
addTopAndProgressBar(0.5);
addTitle("Clearing", layout);
addMessageLabel(layout);
layout->addStretch();
m_sizeHint = QSize(350, 350);
m_sizeHint = QSize(350, 280);
m_progressBar->showUnknownProgressAnimated();
@@ -268,12 +268,12 @@ void QtIndexingDialog::addTopAndProgressBar(float topRatio)
m_top = new QWidget(m_window);
m_top->setObjectName("topHalf");
m_top->setGeometry(0, 0, m_window->size().width(), m_window->size().height() * topRatio);
m_top->setGeometry(0, 0, 0, 0);
m_top->show();
m_top->lower();
m_progressBar = new QtProgressBar(m_window);
m_progressBar->setGeometry(0, m_window->size().height() * topRatio - 5, m_window->size().width(), 10);
m_progressBar->setGeometry(0, 0, 0, 0);
}
void QtIndexingDialog::addTitle(QString title, QBoxLayout* layout)
@@ -393,7 +393,7 @@ void QtIndexingDialog::setGeometries()
void QtIndexingDialog::finishSetup()
{
setGeometries();
setupDone();
setGeometries();
}
+6
View File
@@ -36,6 +36,7 @@
#include "utility/messaging/type/MessageResetZoom.h"
#include "utility/messaging/type/MessageSearch.h"
#include "utility/messaging/type/MessageUndo.h"
#include "utility/messaging/type/MessageWindowClosed.h"
#include "utility/messaging/type/MessageWindowFocus.h"
#include "utility/messaging/type/MessageZoom.h"
#include "utility/ResourcePaths.h"
@@ -314,6 +315,11 @@ void QtMainWindow::contextMenuEvent(QContextMenuEvent* event)
QtContextMenu::getInstance()->showDefault(event, this);
}
void QtMainWindow::closeEvent(QCloseEvent* event)
{
MessageWindowClosed().dispatch();
}
void QtMainWindow::about()
{
QtAbout* aboutWindow = createWindow<QtAbout>();
+1
View File
@@ -91,6 +91,7 @@ protected:
bool event(QEvent* event);
void keyPressEvent(QKeyEvent* event);
void contextMenuEvent(QContextMenuEvent* event);
void closeEvent(QCloseEvent* event);
public slots:
void about();
@@ -138,7 +138,6 @@ void QtProjectWizzardContentData::addNameAndLocation(QGridLayout* layout, int& r
layout->addWidget(locationLabel, row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignRight);
layout->addWidget(m_projectFileLocation, row, QtProjectWizzardWindow::BACK_COL);
layout->setRowMinimumHeight(row, 50);
row++;
}