ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dialog appearance improvements + link warning 

In SoundConfig.xrc and DisplayConfig.xrc use the 'option' property
to fully expand the contents.

In NetLink.xrc add a label at the top of the dialog explaining that Link
will likely not work over the internet or over LAN.

Signed-off-by: Zach Bacon <zachbacon@vba-m.com>
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Zach Bacon 2024-01-15 16:09:52 -08:00 committed by Rafael Kitover
parent 390482a719
commit 23ef8ef0f9
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
4 changed files with 174 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
po/wxvbam/wxvbam.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-29 14:47+0000\n" "POT-Creation-Date: 2024-01-15 14:15-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -120,7 +120,7 @@ msgstr ""
msgid "Start!" msgid "Start!"
msgstr "" msgstr ""
#: guiinit.cpp:123 xrc/NetLink.xrc:99 #: guiinit.cpp:123
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1538,10 +1538,10 @@ msgstr ""
msgid "Invalid value for Default magnification." msgid "Invalid value for Default magnification."
msgstr "" msgstr ""
#: dialogs/display-config.cpp:341 xrc/DisplayConfig.xrc:85 #: dialogs/display-config.cpp:341 xrc/DisplayConfig.xrc:86
#: xrc/DisplayConfig.xrc:135 xrc/DisplayConfig.xrc:221 #: xrc/DisplayConfig.xrc:136 xrc/DisplayConfig.xrc:222
#: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204
#: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309 #: xrc/SoundConfig.xrc:221 xrc/SoundConfig.xrc:311
msgid "None" msgid "None"
msgstr "" msgstr ""
@ -1551,7 +1551,7 @@ msgid "No usable rpi plugins found in %s"
msgstr "" msgstr ""
#: dialogs/display-config.cpp:410 dialogs/display-config.cpp:452 #: dialogs/display-config.cpp:410 dialogs/display-config.cpp:452
#: xrc/DisplayConfig.xrc:107 #: xrc/DisplayConfig.xrc:108
msgid "Plugin" msgid "Plugin"
msgstr "" msgstr ""
@ -2062,131 +2062,131 @@ msgstr ""
msgid "Display settings" msgid "Display settings"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:15 #: xrc/DisplayConfig.xrc:16
msgid "Output module" msgid "Output module"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:33 #: xrc/DisplayConfig.xrc:34
msgid "Simple" msgid "Simple"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:65 #: xrc/DisplayConfig.xrc:66
msgid "Filters" msgid "Filters"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:79 #: xrc/DisplayConfig.xrc:80
msgid "Display filter:" msgid "Display filter:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:87 #: xrc/DisplayConfig.xrc:88
msgid "Super 2xSaI" msgid "Super 2xSaI"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:88 #: xrc/DisplayConfig.xrc:89
msgid "Super Eagle" msgid "Super Eagle"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:89 #: xrc/DisplayConfig.xrc:90
msgid "Pixelate" msgid "Pixelate"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:90 #: xrc/DisplayConfig.xrc:91
msgid "Advance MAME Scale 2x" msgid "Advance MAME Scale 2x"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:91 #: xrc/DisplayConfig.xrc:92
msgid "Bilinear" msgid "Bilinear"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:92 #: xrc/DisplayConfig.xrc:93
msgid "Bilinear Plus" msgid "Bilinear Plus"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:93 #: xrc/DisplayConfig.xrc:94
msgid "Scanlines" msgid "Scanlines"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:94 #: xrc/DisplayConfig.xrc:95
msgid "TV Mode" msgid "TV Mode"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:97 #: xrc/DisplayConfig.xrc:98
msgid "Simple 2x" msgid "Simple 2x"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:98 #: xrc/DisplayConfig.xrc:99
msgid "Simple 3x" msgid "Simple 3x"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:100 #: xrc/DisplayConfig.xrc:101
msgid "Simple 4x" msgid "Simple 4x"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:115 #: xrc/DisplayConfig.xrc:116
msgid "Plugin:" msgid "Plugin:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:127 #: xrc/DisplayConfig.xrc:128
msgid "Interframe blending:" msgid "Interframe blending:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:136 #: xrc/DisplayConfig.xrc:137
msgid "Smart" msgid "Smart"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:137 #: xrc/DisplayConfig.xrc:138
msgid "Motion Blur" msgid "Motion Blur"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:151 xrc/SoundConfig.xrc:91 #: xrc/DisplayConfig.xrc:152 xrc/SoundConfig.xrc:93
msgid "Basic" msgid "Basic"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:159 #: xrc/DisplayConfig.xrc:160
msgid "Frame Skip" msgid "Frame Skip"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:177 #: xrc/DisplayConfig.xrc:178
msgid "&Number of frames to skip:" msgid "&Number of frames to skip:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:199 #: xrc/DisplayConfig.xrc:200
msgid "Speed" msgid "Speed"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:215 #: xrc/DisplayConfig.xrc:216
msgid "Speed indicator:" msgid "Speed indicator:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:222 #: xrc/DisplayConfig.xrc:223
msgid "Percentage" msgid "Percentage"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:223 #: xrc/DisplayConfig.xrc:224
msgid "Detailed" msgid "Detailed"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:237 #: xrc/DisplayConfig.xrc:238
msgid "On-Screen Display" msgid "On-Screen Display"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:247 #: xrc/DisplayConfig.xrc:248
msgid "Default magnification:" msgid "Default magnification:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:266 #: xrc/DisplayConfig.xrc:267
msgid "Maximum magnification factor:" msgid "Maximum magnification factor:"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:267 #: xrc/DisplayConfig.xrc:268
msgid "0 = no maximum" msgid "0 = no maximum"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:275 #: xrc/DisplayConfig.xrc:276
msgid "0 = no limit" msgid "0 = no limit"
msgstr "" msgstr ""
#: xrc/DisplayConfig.xrc:285 #: xrc/DisplayConfig.xrc:286
msgid "Zoom" msgid "Zoom"
msgstr "" msgstr ""
@ -3550,23 +3550,31 @@ msgstr ""
msgid "Start Network Link" msgid "Start Network Link"
msgstr "" msgstr ""
#: xrc/NetLink.xrc:11 #: xrc/NetLink.xrc:13
msgid "WARNING: Link will likely not work over the internet or LAN."
msgstr ""
#: xrc/NetLink.xrc:38
msgid "Server" msgid "Server"
msgstr "" msgstr ""
#: xrc/NetLink.xrc:19 #: xrc/NetLink.xrc:47
msgid "Client" msgid "Client"
msgstr "" msgstr ""
#: xrc/NetLink.xrc:32 #: xrc/NetLink.xrc:66
msgid "Players:" msgid "Players:"
msgstr "" msgstr ""
#: xrc/NetLink.xrc:67 #: xrc/NetLink.xrc:83
msgid "2"
msgstr ""
#: xrc/NetLink.xrc:107
msgid "Server:" msgid "Server:"
msgstr "" msgstr ""
#: xrc/NetLink.xrc:81 #: xrc/NetLink.xrc:124
msgid "Port:" msgid "Port:"
msgstr "" msgstr ""
@ -3590,83 +3598,83 @@ msgstr ""
msgid "Sound Settings" msgid "Sound Settings"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:16 #: xrc/SoundConfig.xrc:18
msgid "Volume:" msgid "Volume:"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:34 #: xrc/SoundConfig.xrc:36
msgid "Mute" msgid "Mute"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:54 xrc/SoundConfig.xrc:320 #: xrc/SoundConfig.xrc:56 xrc/SoundConfig.xrc:322
msgid "Maximum" msgid "Maximum"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:71 #: xrc/SoundConfig.xrc:73
msgid "Sample rate:" msgid "Sample rate:"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:77 #: xrc/SoundConfig.xrc:79
msgid "48 KHz" msgid "48 KHz"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:78 #: xrc/SoundConfig.xrc:80
msgid "44.1 KHz" msgid "44.1 KHz"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:79 #: xrc/SoundConfig.xrc:81
msgid "22 KHz" msgid "22 KHz"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:80 #: xrc/SoundConfig.xrc:82
msgid "11 KHz" msgid "11 KHz"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:118 #: xrc/SoundConfig.xrc:120
msgid "Direct Sound" msgid "Direct Sound"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:146 #: xrc/SoundConfig.xrc:148
msgid "Device" msgid "Device"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:154 #: xrc/SoundConfig.xrc:156
msgid "Enable stereo upmixing" msgid "Enable stereo upmixing"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:161 #: xrc/SoundConfig.xrc:163
msgid "Enable hardware acceleration" msgid "Enable hardware acceleration"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:190 #: xrc/SoundConfig.xrc:192
msgid "Number of sound buffers:" msgid "Number of sound buffers:"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:198 #: xrc/SoundConfig.xrc:200
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:230 #: xrc/SoundConfig.xrc:232
msgid "Lots" msgid "Lots"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:239 #: xrc/SoundConfig.xrc:241
msgid "Echo" msgid "Echo"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:247 #: xrc/SoundConfig.xrc:249
msgid "Stereo" msgid "Stereo"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:258 #: xrc/SoundConfig.xrc:260
msgid "Center" msgid "Center"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:269 #: xrc/SoundConfig.xrc:271
msgid "Left / Right" msgid "Left / Right"
msgstr "" msgstr ""
#: xrc/SoundConfig.xrc:298 #: xrc/SoundConfig.xrc:300
msgid "Sound filtering" msgid "Sound filtering"
msgstr "" msgstr ""

2
src/wx/xrc/DisplayConfig.xrc
View File

@ -5,6 +5,7 @@
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxEXPAND</flag>
<object class="wxNotebook"> <object class="wxNotebook">
<object class="notebookpage"> <object class="notebookpage">
<object class="wxPanel"> <object class="wxPanel">
@ -285,6 +286,7 @@
<label>Zoom</label> <label>Zoom</label>
</object> </object>
</object> </object>
<option>1</option>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>

143
src/wx/xrc/NetLink.xrc
View File

@ -2,109 +2,162 @@
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="NetLink"> <object class="wxDialog" name="NetLink">
<title>Start Network Link</title> <title>Start Network Link</title>
<centered>1</centered>
<style>wxDEFAULT_DIALOG_STYLE</style>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxGridSizer"> <flag>wxALL</flag>
<object class="sizeritem"> <border>5</border>
<object class="wxRadioButton" name="Server"> <object class="wxStaticText" name="m_staticText1">
<label>Server</label> <label>WARNING: Link will likely not work over the internet or LAN.</label>
<style>wxRB_GROUP</style> <style/>
</object> <fg>#DC143C</fg>
<flag>wxALL|wxALIGN_CENTRE</flag> <font>
<border>5</border> <sysfont>wxSYS_DEFAULT_GUI_FONT</sysfont>
</object> <style>normal</style>
<object class="sizeritem"> <weight>bold</weight>
<object class="wxRadioButton" name="Client"> <underlined>0</underlined>
<label>Client</label> </font>
</object> <wrap>200</wrap>
<flag>wxALL|wxALIGN_CENTRE</flag>
<border>5</border>
</object>
</object> </object>
</object>
<object class="sizeritem" name="gridSizer131">
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
</object> <object class="wxGridSizer">
<object class="sizeritem"> <cols>2</cols>
<object class="wxFlexGridSizer"> <rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStaticText" name="PlayersLab"> <flag>wxALL|wxALIGN_CENTER</flag>
<label>Players:</label>
</object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>
<object class="wxRadioButton" name="Server">
<style>wxRB_GROUP</style>
<label>Server</label>
<value>1</value>
</object>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER</flag>
<border>5</border>
<object class="wxRadioButton" name="Client">
<style/>
<label>Client</label>
<value>1</value>
</object>
</object>
</object>
</object>
<object class="sizeritem" name="flexGridSizer134">
<flag>wxEXPAND</flag>
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols/>
<growablerows/>
<object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
<border>5</border>
<object class="wxStaticText" name="PlayersLab">
<label>Players:</label>
<style/>
</object>
</object>
<object class="sizeritem" name="gridSizer136">
<flag>wxEXPAND</flag>
<object class="wxGridSizer"> <object class="wxGridSizer">
<cols>3</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER</flag>
<border>5</border>
<object class="wxRadioButton" name="Link2P"> <object class="wxRadioButton" name="Link2P">
<label translate="0">2</label> <label translate="0">2</label>
<style>wxRB_GROUP</style> <style>wxRB_GROUP</style>
<label>2</label>
<value>1</value>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE</flag>
<border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER</flag>
<border>5</border>
<object class="wxRadioButton" name="Link3P"> <object class="wxRadioButton" name="Link3P">
<label translate="0">3</label> <label translate="0">3</label>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE</flag>
<border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER</flag>
<border>5</border>
<object class="wxRadioButton" name="Link4P"> <object class="wxRadioButton" name="Link4P">
<label translate="0">4</label> <label translate="0">4</label>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE</flag>
<border>5</border>
</object> </object>
<cols>3</cols>
</object> </object>
<flag>wxEXPAND</flag>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
<border>5</border>
<object class="wxStaticText" name="ServerIPLab"> <object class="wxStaticText" name="ServerIPLab">
<label>Server:</label> <label>Server:</label>
<style/>
<wrap>200</wrap> <wrap>200</wrap>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxTextCtrl" name="ServerIP"/>
<option>1</option>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
<option>1</option>
<object class="wxTextCtrl" name="ServerIP">
<style/>
</object>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>
<border>5</border>
<object class="wxStaticText" name="ServerPortLab"> <object class="wxStaticText" name="ServerPortLab">
<label>Port:</label> <label>Port:</label>
<style/>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxTextCtrl" name="ServerPort"/>
<option>1</option>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
<option>1</option>
<object class="wxTextCtrl" name="ServerPort">
<style/>
</object>
</object> </object>
</object> </object>
<flag>wxEXPAND</flag>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStdDialogButtonSizer"> <flag>wxALL|wxEXPAND</flag>
<border>5</border>
<object class="wxStdDialogButtonSizer" name="m_stdBtnSizer143">
<object class="button"> <object class="button">
<object class="wxButton" name="wxID_OK"> <object class="wxButton" name="wxID_OK">
<label>Connect</label> <label/>
<style/>
<bg/>
<fg/>
<default>0</default>
</object> </object>
</object> </object>
<object class="button"> <object class="button">
<object class="wxButton" name="wxID_CANCEL"/> <object class="wxButton" name="wxID_CANCEL">
<label/>
<style/>
<bg/>
<fg/>
<default>0</default>
</object>
</object> </object>
</object> </object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object> </object>
</object> </object>
</object> </object>

3
src/wx/xrc/SoundConfig.xrc
View File

@ -5,7 +5,9 @@
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxEXPAND|wxALL</flag>
<object class="wxNotebook"> <object class="wxNotebook">
<flag>wxEXPAND|wxALL</flag>
<object class="notebookpage"> <object class="notebookpage">
<object class="wxPanel"> <object class="wxPanel">
<object class="wxFlexGridSizer"> <object class="wxFlexGridSizer">
@ -335,6 +337,7 @@
<label translate="0">Game Boy Advance</label> <label translate="0">Game Boy Advance</label>
</object> </object>
</object> </object>
<option>1</option>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>