ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixes for release

Browse Source 
* updated keyboard shortcuts
* graph zooming also with Ctrl + Mouse Wheel
* display include and macro edges behind nodes
* allow more file search results
This commit is contained in:
Eberhard Graether
2017-05-05 12:40:51 +02:00
parent 9c6114336c
commit 8f44ad4a47
5 changed files with 33 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/QtKeyboardShortcuts.cpp
+19 -68
View File
@@ -114,7 +114,7 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
{
QtShortcutTable* table = createTableWidget("table_general");
table->setRowCount(15);
table->setRowCount(17);
table->setItem(0, 0, new QTableWidgetItem("Larger Font"));
table->setItem(1, 0, new QTableWidgetItem("Smaller Font"));
@@ -131,40 +131,10 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
table->setItem(12, 0, new QTableWidgetItem("Hide Window"));
table->setItem(13, 0, new QTableWidgetItem("To Overview"));
table->setItem(14, 0, new QTableWidgetItem("Preferences"));
table->setItem(15, 0, new QTableWidgetItem("Bookmark Active Symbols"));
table->setItem(16, 0, new QTableWidgetItem("Bookmark Manager"));
#if defined(Q_OS_WIN32)
table->setItem(0, 1, new QTableWidgetItem("Ctrl + +"));
table->setItem(1, 1, new QTableWidgetItem("Ctrl + -"));
table->setItem(2, 1, new QTableWidgetItem("Ctrl + 0"));
table->setItem(3, 1, new QTableWidgetItem("Ctrl + Z | Backspace"));
table->setItem(4, 1, new QTableWidgetItem("Ctrl + Shift + Z"));
table->setItem(5, 1, new QTableWidgetItem("F5"));
table->setItem(6, 1, new QTableWidgetItem("Shift + F5"));
table->setItem(7, 1, new QTableWidgetItem("Ctrl + F"));
table->setItem(8, 1, new QTableWidgetItem("Ctrl + Shift + F"));
table->setItem(9, 1, new QTableWidgetItem("Ctrl + N"));
table->setItem(10, 1, new QTableWidgetItem("Ctrl + O"));
table->setItem(11, 1, new QTableWidgetItem("Alt + F4"));
table->setItem(12, 1, new QTableWidgetItem(""));
table->setItem(13, 1, new QTableWidgetItem("Ctrl + Home"));
table->setItem(14, 1, new QTableWidgetItem("Ctrl + ,"));
#elif defined(Q_OS_LINUX)
table->setItem(0, 1, new QTableWidgetItem("Ctrl + +"));
table->setItem(1, 1, new QTableWidgetItem("Ctrl + -"));
table->setItem(2, 1, new QTableWidgetItem("Ctrl + 0"));
table->setItem(3, 1, new QTableWidgetItem("Ctrl + Z | Backspace"));
table->setItem(4, 1, new QTableWidgetItem("Ctrl + Shift + Z"));
table->setItem(5, 1, new QTableWidgetItem("F5"));
table->setItem(6, 1, new QTableWidgetItem("Shift + F5"));
table->setItem(7, 1, new QTableWidgetItem("Ctrl + F"));
table->setItem(8, 1, new QTableWidgetItem("Ctrl + Shift + F"));
table->setItem(9, 1, new QTableWidgetItem("Ctrl + N"));
table->setItem(10, 1, new QTableWidgetItem("Ctrl + O"));
table->setItem(11, 1, new QTableWidgetItem("Ctrl + W"));
table->setItem(12, 1, new QTableWidgetItem(""));
table->setItem(13, 1, new QTableWidgetItem("Ctrl + Home"));
table->setItem(14, 1, new QTableWidgetItem("Ctrl + ,"));
#elif defined(Q_OS_MAC)
#if defined(Q_OS_MAC)
table->setItem(0, 1, new QTableWidgetItem("Cmd + +"));
table->setItem(1, 1, new QTableWidgetItem("Cmd + -"));
table->setItem(2, 1, new QTableWidgetItem("Cmd + 0"));
@@ -180,6 +150,8 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
table->setItem(12, 1, new QTableWidgetItem("Cmd + H"));
table->setItem(13, 1, new QTableWidgetItem("Cmd + Home | Cmd + Up"));
table->setItem(14, 1, new QTableWidgetItem("Cmd + ,"));
table->setItem(15, 1, new QTableWidgetItem("Cmd + D"));
table->setItem(16, 1, new QTableWidgetItem("Cmd + B"));
#else
table->setItem(0, 1, new QTableWidgetItem("Ctrl + +"));
table->setItem(1, 1, new QTableWidgetItem("Ctrl + -"));
@@ -192,10 +164,16 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
table->setItem(8, 1, new QTableWidgetItem("Ctrl + Shift + F"));
table->setItem(9, 1, new QTableWidgetItem("Ctrl + N"));
table->setItem(10, 1, new QTableWidgetItem("Ctrl + O"));
#if defined(Q_OS_WIN32)
table->setItem(11, 1, new QTableWidgetItem("Alt + F4"));
#else
table->setItem(11, 1, new QTableWidgetItem("Ctrl + W"));
#endif
table->setItem(12, 1, new QTableWidgetItem(""));
table->setItem(13, 1, new QTableWidgetItem("Ctrl + Home"));
table->setItem(14, 1, new QTableWidgetItem("Ctrl + ,"));
table->setItem(15, 1, new QTableWidgetItem("Ctrl + D"));
table->setItem(16, 1, new QTableWidgetItem("Ctrl + B"));
#endif
table->updateSize();
@@ -211,13 +189,7 @@ QTableWidget* QtKeyboardShortcuts::createCodeViewShortcutsTable()
table->setItem(0, 0, new QTableWidgetItem("Code Reference Next"));
table->setItem(1, 0, new QTableWidgetItem("Code Reference Previous"));
#if defined(Q_OS_WIN32)
table->setItem(0, 1, new QTableWidgetItem("Ctrl + G"));
table->setItem(1, 1, new QTableWidgetItem("Ctrl + Shift + G"));
#elif defined(Q_OS_LINUX)
table->setItem(0, 1, new QTableWidgetItem("Ctrl + G"));
table->setItem(1, 1, new QTableWidgetItem("Ctrl + Shift + G"));
#elif defined(Q_OS_MAC)
#if defined(Q_OS_MAC)
table->setItem(0, 1, new QTableWidgetItem("Cmd + G"));
table->setItem(1, 1, new QTableWidgetItem("Cmd + Shift + G"));
#else
@@ -243,39 +215,18 @@ QTableWidget* QtKeyboardShortcuts::createGraphViewShortcutsTable()
table->setItem(5, 0, new QTableWidgetItem("Zoom out"));
table->setItem(6, 0, new QTableWidgetItem("Reset Zoom"));
#if defined(Q_OS_WIN32)
table->setItem(0, 1, new QTableWidgetItem("A"));
table->setItem(1, 1, new QTableWidgetItem("D"));
table->setItem(2, 1, new QTableWidgetItem("W"));
table->setItem(3, 1, new QTableWidgetItem("S"));
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Shift + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Shift + Mousewheel down"));
table->setItem(6, 1, new QTableWidgetItem("0"));
#elif defined(Q_OS_LINUX)
table->setItem(0, 1, new QTableWidgetItem("A"));
table->setItem(1, 1, new QTableWidgetItem("D"));
table->setItem(2, 1, new QTableWidgetItem("W"));
table->setItem(3, 1, new QTableWidgetItem("S"));
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Shift + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Shift + Mousewheel down"));
table->setItem(6, 1, new QTableWidgetItem("0"));
#elif defined(Q_OS_MAC)
table->setItem(0, 1, new QTableWidgetItem("A"));
table->setItem(1, 1, new QTableWidgetItem("D"));
table->setItem(2, 1, new QTableWidgetItem("W"));
table->setItem(3, 1, new QTableWidgetItem("S"));
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Shift + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Shift + Mousewheel down"));
table->setItem(6, 1, new QTableWidgetItem("0"));
#if defined(Q_OS_MAC)
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Cmd + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Cmd + Mousewheel down"));
#else
table->setItem(0, 1, new QTableWidgetItem("A"));
table->setItem(1, 1, new QTableWidgetItem("D"));
table->setItem(2, 1, new QTableWidgetItem("W"));
table->setItem(3, 1, new QTableWidgetItem("S"));
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Shift + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Shift + Mousewheel down"));
table->setItem(6, 1, new QTableWidgetItem("0"));
table->setItem(4, 1, new QTableWidgetItem("Shift + W | Ctrl + Mousewheel up"));
table->setItem(5, 1, new QTableWidgetItem("Shift + S | Ctrl + Mousewheel down"));
#endif
table->setItem(6, 1, new QTableWidgetItem("0"));
table->updateSize();