Skip to content

P
PUAE
Commit 24636373 authored by GnoStiC's avatar GnoStiC
Browse files
Options

puae 2.3.1

parent ea310c1e
Show whitespace changes
Inline Side-by-side
Showing with 6116 additions and 5969 deletions
src/gui-qt/puae_mainwindow.cpp
View file @ 24636373
......@@ -505,24 +505,6 @@ void puae_MainWindow::on_IDC_COLLISION3_clicked()
workprefs.collision_level = 3;
}
/* Sound Disabled */
void puae_MainWindow::on_IDC_CS_SOUND0_clicked()
{
workprefs.produce_sound = 0;
}
/* Sound Emulated */
void puae_MainWindow::on_IDC_CS_SOUND1_clicked()
{
workprefs.produce_sound = 1;
}
/* Sound Emulated %100 */
void puae_MainWindow::on_IDC_CS_SOUND2_clicked()
{
workprefs.produce_sound = 2;
}
//*************************************************
// Advanced Chipset
//*************************************************
......@@ -1040,8 +1022,8 @@ void puae_MainWindow::values_to_memorydlg()
mem_size = 6;
else
mem_size = 7;
// ui->IDC_Z3CHIPMEM->setValue(mem_size);
// ui->IDC_Z3CHIPRAM->setText(memsize_names[msi_z3chip[mem_size]]);
ui->IDC_Z3CHIPMEM->setValue(mem_size);
ui->IDC_Z3CHIPRAM->setText(memsize_names[msi_z3chip[mem_size]]);
mem_size = 0;
switch (workprefs.gfxmem_size) {
......@@ -2164,7 +2146,18 @@ void puae_MainWindow::enable_for_inputdlg () {
void puae_MainWindow::values_from_inputdlg () {
}
static int input_selected_device, input_selected_widget, input_total_devices;
static int input_selected_event, input_selected_sub_num;
void puae_MainWindow::values_to_inputdlg () {
ui->IDC_INPUTTYPE->setCurrentIndex(workprefs.input_selected_setting);
ui->IDC_INPUTDEVICE->setCurrentIndex(input_selected_device);
// ui->IDC_INPUTDEADZONE->setText(workprefs.input_joystick_deadzone);
// ui->IDC_INPUTAUTOFIRERATE->setText(workprefs.input_autofire_linecnt);
// ui->IDC_INPUTSPEEDD->setText(workprefs.input_joymouse_speed);
// ui->IDC_INPUTSPEEDA->setText(workprefs.input_joymouse_multiplier);
// ui->IDC_INPUTDEVICEDISABLE->setEnabled(!input_total_devices || inputdevice_get_device_status (input_selected_device)) ? BST_CHECKED : BST_UNCHECKED);
}
void puae_MainWindow::init_portsdlg () {
......
src/gui-qt/puae_mainwindow.h
View file @ 24636373
......@@ -52,8 +52,6 @@ private slots:
void on_IDC_CS_CIAA_TOD2_clicked();
void on_IDC_CS_RTC3_clicked();
void on_IDC_CS_RTC2_clicked();
void on_IDC_CS_SOUND2_clicked();
void on_IDC_CS_SOUND1_clicked();
void on_IDC_COLLISION3_clicked();
void on_IDC_COLLISION2_clicked();
void on_IDC_COLLISION1_clicked();
......@@ -75,7 +73,6 @@ private slots:
void on_IDC_CS_CIAA_TOD1_clicked();
void on_IDC_CS_RTC1_clicked();
void on_IDC_CS_COMPATIBLE_toggled(bool checked);
void on_IDC_CS_SOUND0_clicked();
void on_IDC_COLLISION0_clicked();
void on_IDC_NTSC_toggled(bool checked);
void on_IDC_GENLOCK_toggled(bool checked);
......
src/gui-qt/puae_mainwindow.ui
View file @ 24636373
......@@ -6,169 +6,25 @@
<rect>
<x>0</x>
<y>0</y>
<width>703</width>
<height>501</height>
<width>710</width>
<height>566</height>
</rect>
</property>
<property name="windowTitle">
<string>PUAE 2.3.1</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>171</width>
<height>441</height>
</rect>
</property>
<layout class="QHBoxLayout" name="hl_tree">
<item>
<widget class="QTreeWidget" name="treeWidget">
<column>
<property name="text">
<string>PUAE</string>
</property>
</column>
<item>
<property name="text">
<string>About</string>
</property>
</item>
<item>
<property name="text">
<string>Paths</string>
</property>
</item>
<item>
<property name="text">
<string>Quickstart</string>
</property>
</item>
<item>
<property name="text">
<string>Configurations</string>
</property>
</item>
<item>
<property name="text">
<string>Hardware</string>
</property>
<item>
<property name="text">
<string>CPU and FPU</string>
</property>
</item>
<item>
<property name="text">
<string>Chipset</string>
</property>
</item>
<item>
<property name="text">
<string>Adv.Chipset</string>
</property>
</item>
<item>
<property name="text">
<string>ROM</string>
</property>
</item>
<item>
<property name="text">
<string>RAM</string>
</property>
</item>
<item>
<property name="text">
<string>Floppy Drives</string>
</property>
</item>
<item>
<property name="text">
<string>Hard Drives</string>
</property>
</item>
<item>
<property name="text">
<string>Expansions</string>
</property>
</item>
</item>
<item>
<property name="text">
<string>Host</string>
</property>
<item>
<property name="text">
<string>Display</string>
</property>
</item>
<item>
<property name="text">
<string>Sound</string>
</property>
</item>
<item>
<property name="text">
<string>Game Ports</string>
</property>
</item>
<item>
<property name="text">
<string>IO Ports</string>
</property>
</item>
<item>
<property name="text">
<string>Input</string>
</property>
</item>
<item>
<property name="text">
<string>Output</string>
</property>
</item>
<item>
<property name="text">
<string>Filter</string>
</property>
</item>
<item>
<property name="text">
<string>Disk Swapper</string>
</property>
</item>
<item>
<property name="text">
<string>Miscellaneous</string>
</property>
</item>
<item>
<property name="text">
<string>Pri. and Extensions</string>
</property>
</item>
</item>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<widget class="QTabWidget" name="tab_main">
<property name="geometry">
<rect>
<x>170</x>
<y>0</y>
<width>531</width>
<height>441</height>
<x>5</x>
<y>5</y>
<width>700</width>
<height>500</height>
</rect>
</property>
<layout class="QHBoxLayout" name="hl_tabs">
<item>
<widget class="QTabWidget" name="tab_main">
<property name="currentIndex">
<number>5</number>
<number>4</number>
</property>
<widget class="QWidget" name="tab_about">
<attribute name="title">
......@@ -924,18 +780,15 @@
<attribute name="title">
<string>Hardware</string>
</attribute>
<widget class="QWidget" name="verticalLayoutWidget">
<widget class="QTabWidget" name="tabWidget_2">
<property name="geometry">
<rect>
<x>0</x>
<x>5</x>
<y>0</y>
<width>521</width>
<height>416</height>
<width>686</width>
<height>466</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex">
<number>0</number>
</property>
......@@ -1801,61 +1654,6 @@
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_14">
<property name="geometry">
<rect>
<x>5</x>
<y>290</y>
<width>506</width>
<height>90</height>
</rect>
</property>
<property name="title">
<string>Sound Emulation</string>
</property>
<widget class="QRadioButton" name="IDC_CS_SOUND0">
<property name="geometry">
<rect>
<x>15</x>
<y>25</y>
<width>97</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Disabled</string>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_SOUND1">
<property name="geometry">
<rect>
<x>15</x>
<y>45</y>
<width>97</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Emulated</string>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_SOUND2">
<property name="geometry">
<rect>
<x>15</x>
<y>65</y>
<width>216</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Emulated, 100% Accurate</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab_hw_advchipset">
<attribute name="title">
......@@ -1886,7 +1684,7 @@
<string>None</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_RTC2">
......@@ -1901,6 +1699,9 @@
<property name="text">
<string>MSM6242B</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_RTC3">
<property name="geometry">
......@@ -1953,6 +1754,9 @@
<property name="text">
<string>Vertical Sync</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_CIAA_TOD2">
<property name="geometry">
......@@ -1967,7 +1771,7 @@
<string>Power Supply 50Hz</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
<widget class="QRadioButton" name="IDC_CS_CIAA_TOD3">
......@@ -2013,7 +1817,7 @@
<string>CIA ROM Overlay</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="IDC_CS_CD32CD">
......@@ -2067,6 +1871,9 @@
<property name="text">
<string>ROM Mirror (E0)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="IDC_CS_RESETWARNING">
<property name="geometry">
......@@ -2637,7 +2444,7 @@
<x>5</x>
<y>20</y>
<width>505</width>
<height>110</height>
<height>146</height>
</rect>
</property>
<property name="title">
......@@ -2814,12 +2621,54 @@
<string/>
</property>
</widget>
<widget class="QLabel" name="label_32bitchip">
<property name="geometry">
<rect>
<x>260</x>
<y>100</y>
<width>91</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>32-bit Chip:</string>
</property>
</widget>
<widget class="QSlider" name="IDC_Z3CHIPMEM">
<property name="geometry">
<rect>
<x>345</x>
<y>100</y>
<width>86</width>
<height>16</height>
</rect>
</property>
<property name="maximum">
<number>7</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QLineEdit" name="IDC_Z3CHIPRAM">
<property name="geometry">
<rect>
<x>440</x>
<y>95</y>
<width>51</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_34">
<property name="geometry">
<rect>
<x>5</x>
<y>155</y>
<y>175</y>
<width>505</width>
<height>110</height>
</rect>
......@@ -3023,14 +2872,46 @@
<string>Disk Label:</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_36">
<widget class="QCheckBox" name="IDC_FLOPPY_BOOTABLE">
<property name="geometry">
<rect>
<x>5</x>
<y>249</y>
<width>505</width>
<height>46</height>
<x>340</x>
<y>50</y>
<width>84</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Bootblock</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
<widget class="QCheckBox" name="IDC_FLOPPY_FFS">
<property name="geometry">
<rect>
<x>435</x>
<y>50</y>
<width>56</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>FFS</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_36">
<property name="geometry">
<rect>
<x>5</x>
<y>249</y>
<width>505</width>
<height>46</height>
</rect>
</property>
<property name="title">
......@@ -3518,7 +3399,7 @@
<property name="geometry">
<rect>
<x>5</x>
<y>274</y>
<y>209</y>
<width>196</width>
<height>26</height>
</rect>
......@@ -3531,7 +3412,7 @@
<property name="geometry">
<rect>
<x>215</x>
<y>274</y>
<y>209</y>
<width>141</width>
<height>26</height>
</rect>
......@@ -3544,7 +3425,7 @@
<property name="geometry">
<rect>
<x>375</x>
<y>274</y>
<y>209</y>
<width>136</width>
<height>26</height>
</rect>
......@@ -3557,7 +3438,7 @@
<property name="geometry">
<rect>
<x>5</x>
<y>365</y>
<y>300</y>
<width>171</width>
<height>21</height>
</rect>
......@@ -3570,7 +3451,7 @@
<property name="geometry">
<rect>
<x>5</x>
<y>345</y>
<y>280</y>
<width>186</width>
<height>21</height>
</rect>
......@@ -3583,7 +3464,7 @@
<property name="geometry">
<rect>
<x>5</x>
<y>305</y>
<y>240</y>
<width>186</width>
<height>21</height>
</rect>
......@@ -3596,7 +3477,7 @@
<property name="geometry">
<rect>
<x>5</x>
<y>325</y>
<y>260</y>
<width>186</width>
<height>21</height>
</rect>
......@@ -3609,7 +3490,7 @@
<property name="geometry">
<rect>
<x>201</x>
<y>305</y>
<y>240</y>
<width>221</width>
<height>21</height>
</rect>
......@@ -3622,7 +3503,7 @@
<property name="geometry">
<rect>
<x>201</x>
<y>345</y>
<y>280</y>
<width>221</width>
<height>21</height>
</rect>
......@@ -3635,7 +3516,7 @@
<property name="geometry">
<rect>
<x>201</x>
<y>325</y>
<y>260</y>
<width>196</width>
<height>21</height>
</rect>
......@@ -3648,7 +3529,7 @@
<property name="geometry">
<rect>
<x>424</x>
<y>310</y>
<y>245</y>
<width>86</width>
<height>26</height>
</rect>
......@@ -3661,7 +3542,7 @@
<property name="geometry">
<rect>
<x>424</x>
<y>335</y>
<y>270</y>
<width>86</width>
<height>26</height>
</rect>
......@@ -3670,6 +3551,65 @@
<string>Properties</string>
</property>
</widget>
<widget class="QPushButton" name="IDC_CD_SELECT">
<property name="geometry">
<rect>
<x>125</x>
<y>330</y>
<width>166</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Select Image File</string>
</property>
</widget>
<widget class="QPushButton" name="IDC_CD_EJECT">
<property name="geometry">
<rect>
<x>415</x>
<y>330</y>
<width>91</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Eject</string>
</property>
</widget>
<widget class="QComboBox" name="IDC_CD_TYPE">
<property name="geometry">
<rect>
<x>295</x>
<y>330</y>
<width>111</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_cddrvimg">
<property name="geometry">
<rect>
<x>10</x>
<y>340</y>
<width>106</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>CD Drive/Image</string>
</property>
</widget>
<widget class="QComboBox" name="IDC_CD_TEXT">
<property name="geometry">
<rect>
<x>5</x>
<y>355</y>
<width>496</width>
<height>26</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_14">
<attribute name="title">
......@@ -3991,26 +3931,20 @@
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QWidget" name="tab_host">
<attribute name="title">
<string>Host</string>
</attribute>
<widget class="QWidget" name="verticalLayoutWidget_2">
<widget class="QTabWidget" name="tab_host_main">
<property name="geometry">
<rect>
<x>0</x>
<x>5</x>
<y>0</y>
<width>648</width>
<height>416</height>
<width>686</width>
<height>466</height>
</rect>
</property>
<layout class="QVBoxLayout" name="vert_host">
<item>
<widget class="QTabWidget" name="tab_host_main">
<property name="currentIndex">
<number>1</number>
</property>
......@@ -4556,7 +4490,7 @@
<property name="title">
<string>Sound Emulation</string>
</property>
<widget class="QRadioButton" name="radioButton_4">
<widget class="QRadioButton" name="IDC_SOUND0">
<property name="geometry">
<rect>
<x>10</x>
......@@ -4569,7 +4503,7 @@
<string>Disabled</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButton_5">
<widget class="QRadioButton" name="IDC_SOUND1">
<property name="geometry">
<rect>
<x>10</x>
......@@ -4582,7 +4516,7 @@
<string>Disabled, but emulated</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButton_6">
<widget class="QRadioButton" name="IDC_SOUND2">
<property name="geometry">
<rect>
<x>10</x>
......@@ -4594,19 +4528,6 @@
<property name="text">
<string>Emulated</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButton_7">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>186</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Emulated, 100% accurate</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......@@ -5013,7 +4934,7 @@
<rect>
<x>375</x>
<y>80</y>
<width>91</width>
<width>111</width>
<height>25</height>
</rect>
</property>
......@@ -5074,7 +4995,7 @@
<rect>
<x>375</x>
<y>35</y>
<width>91</width>
<width>111</width>
<height>25</height>
</rect>
</property>
......@@ -5300,7 +5221,7 @@
</rect>
</property>
<property name="text">
<string>Swap</string>
<string>Swap ports</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_4">
......@@ -5703,6 +5624,248 @@
<attribute name="title">
<string>Input</string>
</attribute>
<widget class="QComboBox" name="IDC_INPUTTYPE">
<property name="geometry">
<rect>
<x>5</x>
<y>5</y>
<width>111</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="IDC_INPUTDEVICE">
<property name="geometry">
<rect>
<x>125</x>
<y>5</y>
<width>466</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QCheckBox" name="IDC_INPUTDEVICEDISABLE">
<property name="geometry">
<rect>
<x>595</x>
<y>10</y>
<width>26</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="QTableWidget" name="IDC_INPUTLIST">
<property name="geometry">
<rect>
<x>15</x>
<y>50</y>
<width>651</width>
<height>192</height>
</rect>
</property>
<column>
<property name="text">
<string>Input source</string>
</property>
</column>
<column>
<property name="text">
<string>Input target</string>
</property>
</column>
<column>
<property name="text">
<string>Autofire</string>
</property>
</column>
<column>
<property name="text">
<string>Toggle</string>
</property>
</column>
<column>
<property name="text">
<string>#</string>
</property>
</column>
</widget>
<widget class="QComboBox" name="IDC_INPUTAMIGACNT">
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>56</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="IDC_INPUTAMIGA">
<property name="geometry">
<rect>
<x>75</x>
<y>250</y>
<width>386</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="IDC_INPUTTEST">
<property name="geometry">
<rect>
<x>460</x>
<y>250</y>
<width>86</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Test</string>
</property>
</widget>
<widget class="QPushButton" name="IDC_INPUTREMAP">
<property name="geometry">
<rect>
<x>545</x>
<y>250</y>
<width>91</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Remap</string>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>25</x>
<y>305</y>
<width>151</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Joystick dead zone (%):</string>
</property>
</widget>
<widget class="QLabel" name="label_38">
<property name="geometry">
<rect>
<x>25</x>
<y>335</y>
<width>151</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Autofire rate (lines):</string>
</property>
</widget>
<widget class="QLineEdit" name="IDC_INPUTDEADZONE">
<property name="geometry">
<rect>
<x>185</x>
<y>305</y>
<width>61</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="IDC_INPUTAUTOFIRERATE">
<property name="geometry">
<rect>
<x>185</x>
<y>330</y>
<width>61</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_39">
<property name="geometry">
<rect>
<x>260</x>
<y>305</y>
<width>166</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Digital joy-mouse speed:</string>
</property>
</widget>
<widget class="QLineEdit" name="IDC_INPUTSPEEDD">
<property name="geometry">
<rect>
<x>430</x>
<y>305</y>
<width>61</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_40">
<property name="geometry">
<rect>
<x>260</x>
<y>335</y>
<width>166</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Analog joy-mouse speed:</string>
</property>
</widget>
<widget class="QLineEdit" name="IDC_INPUTSPEEDA">
<property name="geometry">
<rect>
<x>430</x>
<y>330</y>
<width>61</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="IDC_INPUTCOPYFROM">
<property name="geometry">
<rect>
<x>520</x>
<y>330</y>
<width>111</width>
<height>26</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="IDC_INPUTCOPY">
<property name="geometry">
<rect>
<x>520</x>
<y>300</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Copy from:</string>
</property>
</widget>
<widget class="QPushButton" name="IDC_INPUTSWAP">
<property name="geometry">
<rect>
<x>520</x>
<y>355</y>
<width>114</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Swap 1&lt;&gt;2</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_host_output">
<attribute name="title">
......@@ -6186,22 +6349,16 @@
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>703</width>
<height>25</height>
<width>710</width>
<height>22</height>
</rect>
</property>
</widget>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment