mirrors/vanilla
1
0
Fork 0
mirror of https://github.com/vanilla-wiiu/vanilla.git synced 2025-01-22 16:21:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make config area scrollable and add region combobox

Browse source 
Region combobox currently does nothing, will eventually connect to #32
This commit is contained in:
itsmattkc 2024-06-17 19:50:03 -07:00
parent 175610f622
commit 3d3b148aaa
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/mainwindow.cpp
View file

@ -9,6 +9,7 @@
#include <QMediaDevices>
#include <QMessageBox>
#include <QPushButton>
#include <QScrollArea>
#include <QSlider>
#include <QSplitter>
#include <QThread>
@ -42,8 +43,15 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent)
m_splitter = new QSplitter(this);
layout->addWidget(m_splitter);
QWidget *configSection = new QWidget(this);
m_splitter->addWidget(configSection);
QScrollArea *configScrollArea = new QScrollArea(this);
configScrollArea->setWidgetResizable(true);
configScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
configScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
m_splitter->addWidget(configScrollArea);
QWidget *configSection = new QWidget(configScrollArea);
configScrollArea->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
configScrollArea->setWidget(configSection);
m_viewer = new Viewer(this);
m_viewer->setMinimumSize(854, 480);
@ -82,6 +90,32 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent)
configLayout->addWidget(m_connectBtn, row, 0, 1, 2);
}
{
QGroupBox *settingsGroupBox = new QGroupBox(tr("Settings"), configSection);
configOuterLayout->addWidget(settingsGroupBox);
QGridLayout *configLayout = new QGridLayout(settingsGroupBox);
int row = 0;
configLayout->addWidget(new QLabel(tr("Region: "), settingsGroupBox), row, 0);
m_regionComboBox = new QComboBox(settingsGroupBox);
m_regionComboBox->addItem(tr("Japan"));
m_regionComboBox->addItem(tr("North America"));
m_regionComboBox->addItem(tr("Europe"));
m_regionComboBox->addItem(tr("China (Unused)"));
m_regionComboBox->addItem(tr("South Korea (Unused)"));
m_regionComboBox->addItem(tr("Taiwan (Unused)"));
m_regionComboBox->addItem(tr("Australia (Unused)"));
// TODO: Should probably save this somewhere
m_regionComboBox->setCurrentIndex(1);
configLayout->addWidget(m_regionComboBox, row, 1);
}
{
QGroupBox *displayConfigGroupBox = new QGroupBox(tr("Display"), configSection);
configOuterLayout->addWidget(displayConfigGroupBox);
@ -127,7 +161,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent)
configLayout->addWidget(new QLabel(tr("Microphone: "), soundConfigGroupBox), row, 0);
m_microphoneComboBox = new QComboBox(soundConfigGroupBox);
m_microphoneComboBox->setMaximumWidth(m_microphoneComboBox->fontMetrics().horizontalAdvance(QStringLiteral("SOMEAMOUNTOFTEXT")));
m_microphoneComboBox->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
configLayout->addWidget(m_microphoneComboBox, row, 1);
}

1
app/mainwindow.h
View file

@ -37,6 +37,7 @@ private:
QComboBox *m_wirelessInterfaceComboBox;
QComboBox *m_microphoneComboBox;
QComboBox *m_controllerComboBox;
QComboBox *m_regionComboBox;
QProcess *m_process;
QPushButton *m_syncBtn;