UI: Massive revamp, new features and improvements
This commit is contained in:
@@ -1,18 +1,16 @@
|
||||
#include "hotkeysettingswidget.h"
|
||||
#include "core/controller.h"
|
||||
#include "core/settings.h"
|
||||
#include "controllersettingsdialog.h"
|
||||
#include "frontend-common/input_manager.h"
|
||||
#include "inputbindingwidgets.h"
|
||||
#include "qthostinterface.h"
|
||||
#include "qtutils.h"
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include "settingwidgetbinder.h"
|
||||
#include <QtWidgets/QGridLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
|
||||
HotkeySettingsWidget::HotkeySettingsWidget(QtHostInterface* host_interface, QWidget* parent /* = nullptr */)
|
||||
: QWidget(parent), m_host_interface(host_interface)
|
||||
HotkeySettingsWidget::HotkeySettingsWidget(QWidget* parent, ControllerSettingsDialog* dialog)
|
||||
: QWidget(parent), m_dialog(dialog)
|
||||
{
|
||||
createUi();
|
||||
}
|
||||
@@ -24,49 +22,57 @@ void HotkeySettingsWidget::createUi()
|
||||
QGridLayout* layout = new QGridLayout(this);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
m_tab_widget = new QTabWidget(this);
|
||||
m_scroll_area = new QScrollArea(this);
|
||||
m_container = new QWidget(m_scroll_area);
|
||||
m_layout = new QVBoxLayout(m_container);
|
||||
m_scroll_area->setWidget(m_container);
|
||||
m_scroll_area->setWidgetResizable(true);
|
||||
m_scroll_area->setBackgroundRole(QPalette::Base);
|
||||
|
||||
createButtons();
|
||||
|
||||
layout->addWidget(m_tab_widget, 0, 0, 1, 1);
|
||||
m_layout->addStretch(1);
|
||||
layout->addWidget(m_scroll_area, 0, 0, 1, 1);
|
||||
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void HotkeySettingsWidget::createButtons()
|
||||
{
|
||||
const auto& hotkeys = m_host_interface->getHotkeyInfoList();
|
||||
for (const auto& hi : hotkeys)
|
||||
const std::vector<const HotkeyInfo*> hotkeys(InputManager::GetHotkeyList());
|
||||
for (const HotkeyInfo* hotkey : hotkeys)
|
||||
{
|
||||
const auto category = qApp->translate("Hotkeys", hi.category);
|
||||
const QString category(qApp->translate("Hotkeys", hotkey->category));
|
||||
|
||||
auto iter = m_categories.find(category);
|
||||
if (iter == m_categories.end())
|
||||
{
|
||||
QScrollArea* scroll = new QScrollArea(m_tab_widget);
|
||||
QWidget* container = new QWidget(scroll);
|
||||
QVBoxLayout* vlayout = new QVBoxLayout(container);
|
||||
QLabel* label = new QLabel(category, m_container);
|
||||
QFont label_font(label->font());
|
||||
label_font.setPointSizeF(14.0f);
|
||||
label->setFont(label_font);
|
||||
m_layout->addWidget(label);
|
||||
|
||||
QLabel* line = new QLabel(m_container);
|
||||
line->setFrameShape(QFrame::HLine);
|
||||
line->setFixedHeight(4);
|
||||
m_layout->addWidget(line);
|
||||
|
||||
QGridLayout* layout = new QGridLayout();
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
vlayout->addLayout(layout);
|
||||
vlayout->addStretch(1);
|
||||
iter = m_categories.insert(category, Category{container, layout});
|
||||
scroll->setWidget(container);
|
||||
scroll->setWidgetResizable(true);
|
||||
scroll->setBackgroundRole(QPalette::Base);
|
||||
scroll->setFrameShape(QFrame::NoFrame);
|
||||
m_tab_widget->addTab(scroll, category);
|
||||
m_layout->addLayout(layout);
|
||||
iter = m_categories.insert(category, layout);
|
||||
}
|
||||
|
||||
QWidget* container = iter->container;
|
||||
QGridLayout* layout = iter->layout;
|
||||
QGridLayout* layout = *iter;
|
||||
const int target_row = layout->count() / 2;
|
||||
|
||||
std::string section_name("Hotkeys");
|
||||
std::string key_name(hi.name.GetCharArray());
|
||||
layout->addWidget(new QLabel(qApp->translate("Hotkeys", hi.display_name), container), target_row, 0);
|
||||
layout->addWidget(
|
||||
new InputButtonBindingWidget(m_host_interface, std::move(section_name), std::move(key_name), container),
|
||||
target_row, 1);
|
||||
QLabel* label = new QLabel(qApp->translate("Hotkeys", hotkey->display_name), m_container);
|
||||
layout->addWidget(label, target_row, 0);
|
||||
|
||||
InputBindingWidget* bind =
|
||||
new InputBindingWidget(m_container, m_dialog->getProfileSettingsInterface(), "Hotkeys", hotkey->name);
|
||||
bind->setMinimumWidth(300);
|
||||
layout->addWidget(bind, target_row, 1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user