80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: All dialogs are now fixed

Browse Source
This commit is contained in:
Cacodemon345
2022-02-06 01:50:30 +06:00
parent a570f01d97
commit 6818c03799
9 changed files with 147 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/qt/qt_deviceconfig.cpp
View File

@@ -147,6 +147,7 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) {
++config;
}
dc.setFixedSize(dc.minimumSizeHint());
int res = dc.exec();
if (res == QDialog::Accepted) {
config = device->config;

24
src/qt/qt_harddiskdialog.ui
View File

@@ -10,6 +10,24 @@
<height>269</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>421</width>
<height>269</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>421</width>
<height>269</height>
</size>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
@@ -197,15 +215,15 @@
</item>
<item row="8" column="0" colspan="6">
<widget class="QProgressBar" name="progressBar">
<property name="visible">
<bool>false</bool>
</property>
<property name="value">
<number>0</number>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
<property name="visible">
<bool>false</bool>
</property>
</widget>
</item>
</layout>

3
src/qt/qt_joystickconfiguration.cpp
View File

@@ -27,6 +27,7 @@ JoystickConfiguration::JoystickConfiguration(int type, int joystick_nr, QWidget
}
ui->comboBoxDevice->setCurrentIndex(joystick_state[joystick_nr].plat_joystick_nr);
setFixedSize(minimumSizeHint());
}
JoystickConfiguration::~JoystickConfiguration()
@@ -180,4 +181,6 @@ void JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index) {
++row;
}
setFixedSize(minimumSizeHint());
}

1
src/qt/qt_mainwindow.cpp
View File

@@ -1414,6 +1414,7 @@ void MainWindow::on_actionAbout_86Box_triggered()
QDesktopServices::openUrl(QUrl("https://86box.net/"));
});
msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-yellow.ico").pixmap(32, 32));
msgBox.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
msgBox.exec();
}

14
src/qt/qt_newfloppydialog.ui
View File

@@ -6,10 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>287</width>
<width>327</width>
<height>140</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>327</width>
<height>140</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>327</width>
<height>140</height>
</size>
</property>
<property name="windowTitle">
<string>New Image</string>
</property>

12
src/qt/qt_progsettings.ui
View File

@@ -10,6 +10,18 @@
<height>228</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>370</width>
<height>228</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>228</height>
</size>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>

2
src/qt/qt_settings.cpp
View File

@@ -112,7 +112,7 @@ Settings::Settings(QWidget *parent) :
ui->stackedWidget->addWidget(otherRemovable);
ui->stackedWidget->addWidget(otherPeripherals);
ui->listView->setMaximumWidth(ui->listView->sizeHintForColumn(0) + 5);
ui->listView->setFixedWidth(ui->listView->sizeHintForColumn(0) + 5);
connect(machine, &SettingsMachine::currentMachineChanged, display, &SettingsDisplay::onCurrentMachineChanged);
connect(machine, &SettingsMachine::currentMachineChanged, input, &SettingsInput::onCurrentMachineChanged);

14
src/qt/qt_settings.ui
View File

@@ -6,10 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>900</width>
<width>831</width>
<height>595</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>831</width>
<height>595</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>831</width>
<height>595</height>
</size>
</property>
<property name="windowTitle">
<string>Settings</string>
</property>

144
src/qt/qt_soundgain.ui
View File

@@ -6,73 +6,93 @@
<rect>
<x>0</x>
<y>0</y>
<width>262</width>
<height>279</height>
<width>182</width>
<height>250</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>182</width>
<height>250</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>182</width>
<height>250</height>
</size>
</property>
<property name="windowTitle">
<string>Sound Gain</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>140</x>
<y>20</y>
<width>101</width>
<height>241</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QSlider" name="verticalSlider">
<property name="geometry">
<rect>
<x>30</x>
<y>30</y>
<width>31</width>
<height>231</height>
</rect>
</property>
<property name="maximum">
<number>18</number>
</property>
<property name="singleStep">
<number>2</number>
</property>
<property name="pageStep">
<number>4</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>-20</x>
<y>10</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Gain</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QSlider" name="verticalSlider">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>18</number>
</property>
<property name="singleStep">
<number>2</number>
</property>
<property name="pageStep">
<number>4</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Gain</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>