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

ui: Fixed shortcuts dialog

Browse Source 
* fixed table sizes
* fixed scrolling for MacOS
* fixed couldn't resize dialog
This commit is contained in:
Eberhard Graether
2017-02-22 03:17:35 +01:00
parent c895179ace
commit 79fc78a518
4 changed files with 86 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/gui/keyboard_shortcuts/keyboard_shortcuts.css
+11 -55
View File
@@ -1,65 +1,21 @@
/* General settings */
* {
font-size: <setting:font_size>px;
font-family: "<setting:font_name>";
}
QScrollArea {
padding: 0px;
border: none;
background: transparent;
background-color: white;
margin: 12px;
}
#container {
background: transparent;
margin: 16px;
}
QPushButton {
border: 2px;
border-style: solid;
border-color: #dadada;
background: #f6f6f6;
background-position: 15px 5px;
height: 30px;
width: 30px;
border-radius: 12px;
margin: 2px;
}
QPushButton:hover {
background: #2D3C86;
color: white;
}
QTableWidget {
margin-top: 4px;
alternate-background-color: #dadada;
background-color: #f6f6f6;
selection-background-color: 227abf;
font-family: "<setting:font_name>";
color: black;
margin-top: 6px;
background-color: #dadada;
alternate-background-color: #f6f6f6;
selection-background-color: #227abf;
selection-color: white;
border-color: #666666;
gridline-color: #666666;
}
#title {
font-size: <setting:font_size+2>px;
font-weight: bold;
margin: 16px;
margin-top: 30px;
}
#close_button {
margin: 16px;
QHeaderView {
font-family: "<setting:font_name>";
}
#general_label, #code_label, #graph_label {
margin-top: 0px;
margin-bottom: 0px;
}
#code_label, #graph_label {
margin-top: 10px;
font-size: 14px;
font-weight: bold;
color: black;
}
src/lib_gui/qt/window/QtKeyboardShortcuts.cpp
+59 -59
View File
@@ -2,19 +2,36 @@
#include <QHeaderView>
#include <QLabel>
#include <QPushButton>
#include <QScrollBar>
#include <QTableView>
#include <QtGlobal>
#include "qt/utility/QtDeviceScaledPixmap.h"
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
QtKeyboardShortcuts::QtKeyboardShortcuts(QWidget* parent)
QtShortcutTable::QtShortcutTable(QWidget* parent)
: QTableWidget(parent)
{
}
void QtShortcutTable::updateSize()
{
int height = rowCount() * rowHeight(0) + horizontalHeader()->height() + 2 * frameWidth() + 8;
setMinimumHeight(height);
setMaximumHeight(height);
}
void QtShortcutTable::wheelEvent(QWheelEvent *event)
{
event->ignore();
}
QtKeyboardShortcuts::QtKeyboardShortcuts(QWidget* parent)
: QtWindow(parent)
{
setScrollAble(true);
raise();
}
QtKeyboardShortcuts::~QtKeyboardShortcuts()
{
}
@@ -24,95 +41,78 @@ QSize QtKeyboardShortcuts::sizeHint() const
return QSize(666, 666);
}
void QtKeyboardShortcuts::setupKeyboardShortcuts()
void QtKeyboardShortcuts::populateWindow(QWidget* widget)
{
QVBoxLayout* layout = new QVBoxLayout();
QLabel* title = new QLabel(this);
title->setObjectName("title");
title->setText("Keyboard Shortcuts");
layout->addWidget(title);
QWidget* container = new QWidget();
container->setObjectName("container");
QVBoxLayout* scrollLayout = new QVBoxLayout(container);
QScrollArea* scrollArea = new QScrollArea(this);
scrollArea->setObjectName("scroll_area");
scrollArea->setWidgetResizable(true);
scrollArea->setWidget(container);
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
layout->addWidget(scrollArea);
QVBoxLayout* layout = new QVBoxLayout(widget);
QLabel* generelLabel = new QLabel(this);
generelLabel->setObjectName("general_label");
generelLabel->setText("General Shortcuts");
scrollLayout->addWidget(generelLabel);
layout->addWidget(generelLabel);
scrollLayout->addWidget(createGenerelShortcutsTable());
layout->addWidget(createGenerelShortcutsTable());
layout->addSpacing(20);
QLabel* codeLabel = new QLabel(this);
codeLabel->setObjectName("code_label");
codeLabel->setText("Code View Shortcuts");
scrollLayout->addWidget(codeLabel);
layout->addWidget(codeLabel);
scrollLayout->addWidget(createCodeViewShortcutsTable());
layout->addWidget(createCodeViewShortcutsTable());
layout->addSpacing(20);
QLabel* graphLabel = new QLabel(this);
graphLabel->setObjectName("graph_label");
graphLabel->setText("Graph View Shortcuts");
scrollLayout->addWidget(graphLabel);
layout->addWidget(graphLabel);
scrollLayout->addWidget(createGraphViewShortcutsTable());
layout->addWidget(createGraphViewShortcutsTable());
QPushButton* closeButton = new QPushButton(this);
closeButton->setObjectName("close_button");
closeButton->setText("Close");
closeButton->show();
layout->addWidget(closeButton);
connect(closeButton, SIGNAL(clicked()), this, SLOT(handleCloseButtonClicked()));
widget->setLayout(layout);
setLayout(layout);
setFixedSize(QSize(682, 700));
// setFixedSize(table->horizontalHeader()->length(), table->verticalHeader()->length());
setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "keyboard_shortcuts/keyboard_shortcuts.css").c_str());
widget->setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "keyboard_shortcuts/keyboard_shortcuts.css").c_str());
}
void QtKeyboardShortcuts::handleCloseButtonClicked()
void QtKeyboardShortcuts::windowReady()
{
emit canceled();
updateTitle("Keyboard Shortcuts");
updateCloseButton("Close");
setNextVisible(false);
setPreviousVisible(false);
}
QTableWidget* QtKeyboardShortcuts::createTableWidget(const std::string& objectName)
QtShortcutTable* QtKeyboardShortcuts::createTableWidget(const std::string& objectName)
{
QTableWidget* table = new QTableWidget(this);
QtShortcutTable* table = new QtShortcutTable(this);
table->setObjectName(objectName.c_str());
table->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
table->setSelectionBehavior(QAbstractItemView::SelectionBehavior::SelectRows);
table->setEditTriggers(QAbstractItemView::EditTrigger::NoEditTriggers);
table->setShowGrid(true);
table->setAlternatingRowColors(true);
table->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeMode::Stretch);
table->verticalHeader()->hide();
table->setAlternatingRowColors(true);
table->horizontalScrollBar()->setDisabled(true);
table->horizontalScrollBar()->hide();
table->setAutoScroll(false);
table->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
table->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
table->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
table->setColumnCount(2);
table->setHorizontalHeaderItem(0, new QTableWidgetItem("Command"));
table->setHorizontalHeaderItem(1, new QTableWidgetItem("Shortcut"));
table->setFixedWidth(610);
return table;
}
QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
{
QTableWidget* table = createTableWidget("table_general");
QtShortcutTable* table = createTableWidget("table_general");
table->setRowCount(15);
@@ -198,14 +198,14 @@ QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable()
table->setItem(14, 1, new QTableWidgetItem("Ctrl + ,"));
#endif
table->setFixedHeight(480); // there doesn't seem to be an automatic method, so fuck you basically...
table->updateSize();
return table;
}
QTableWidget* QtKeyboardShortcuts::createCodeViewShortcutsTable()
{
QTableWidget* table = createTableWidget("table_code");
QtShortcutTable* table = createTableWidget("table_code");
table->setRowCount(2);
table->setItem(0, 0, new QTableWidgetItem("Code Reference Next"));
@@ -225,14 +225,14 @@ QTableWidget* QtKeyboardShortcuts::createCodeViewShortcutsTable()
table->setItem(1, 1, new QTableWidgetItem("Ctrl + Shift + G"));
#endif
table->setFixedHeight(90); // there doesn't seem to be an automatic method, so fuck you basically...
table->updateSize();
return table;
}
QTableWidget* QtKeyboardShortcuts::createGraphViewShortcutsTable()
{
QTableWidget* table = createTableWidget("table_graph");
QtShortcutTable* table = createTableWidget("table_graph");
table->setRowCount(7);
table->setItem(0, 0, new QTableWidgetItem("Pan left"));
@@ -277,7 +277,7 @@ QTableWidget* QtKeyboardShortcuts::createGraphViewShortcutsTable()
table->setItem(6, 1, new QTableWidgetItem("0"));
#endif
table->setFixedHeight(240); // there doesn't seem to be an automatic method, so fuck you basically...
table->updateSize();
return table;
}
src/lib_gui/qt/window/QtKeyboardShortcuts.h
+15 -6
View File
@@ -6,6 +6,17 @@
#include "qt/window/QtWindow.h"
class QtShortcutTable
: public QTableWidget
{
public:
QtShortcutTable(QWidget* parent = nullptr);
void updateSize();
protected:
virtual void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
};
class QtKeyboardShortcuts
: public QtWindow
{
@@ -16,17 +27,15 @@ public:
QSize sizeHint() const override;
void setupKeyboardShortcuts();
private slots:
void handleCloseButtonClicked();
virtual void populateWindow(QWidget* widget) override;
virtual void windowReady() override;
private:
QTableWidget* createTableWidget(const std::string& objectName);
QtShortcutTable* createTableWidget(const std::string& objectName);
QTableWidget* createGenerelShortcutsTable();
QTableWidget* createCodeViewShortcutsTable();
QTableWidget* createGraphViewShortcutsTable();
};
#endif // QT_KEYBOARD_SHORTCUTS_H
#endif // QT_KEYBOARD_SHORTCUTS_H
src/lib_gui/qt/window/QtMainWindow.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ void QtMainWindow::showDocumentation()
void QtMainWindow::showKeyboardShortcuts()
{
QtKeyboardShortcuts* keyboardShortcutWindow = createWindow<QtKeyboardShortcuts>();
keyboardShortcutWindow->setupKeyboardShortcuts();
keyboardShortcutWindow->setup();
}
void QtMainWindow::showBugtracker()