From c9e9fcd0a35622cb0227a4ce9d184c3d1451a40a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 5 Jul 2017 03:16:02 +0200 Subject: [PATCH] Dagimon champion level --- rpcs3/Json/tooltips.json | 2 +- rpcs3/rpcs3qt/about_dialog.ui | 355 +++++++++++++++++-------------- rpcs3/rpcs3qt/main_window.ui | 48 +++-- rpcs3/rpcs3qt/settings_dialog.ui | 28 ++- rpcs3/rpcs3qt/welcome_dialog.ui | 148 +++++++++---- 5 files changed, 349 insertions(+), 232 deletions(-) diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json index ea799c0252..07f4533d0c 100644 --- a/rpcs3/Json/tooltips.json +++ b/rpcs3/Json/tooltips.json @@ -69,7 +69,7 @@ } }, "input": { - "padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Config --> Input Settings.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with mmjoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.", + "padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with mmjoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.", "keyboardHandlerBox": "Some games support native keyboard input.\nBasic will work in these cases.", "mouseHandlerBox": "Some games support native mouse input.\nBasic will work in these cases.", "cameraBox": "Camera support is not implemented, leave this on null.", diff --git a/rpcs3/rpcs3qt/about_dialog.ui b/rpcs3/rpcs3qt/about_dialog.ui index 7363ccd630..01ca7dc34b 100644 --- a/rpcs3/rpcs3qt/about_dialog.ui +++ b/rpcs3/rpcs3qt/about_dialog.ui @@ -6,20 +6,26 @@ 0 0 - 537 - 572 + 591 + 532 + + + 0 + 0 + + - 537 - 572 + 591 + 532 - 537 - 572 + 591 + 532 @@ -29,130 +35,12 @@ :/rpcs3.ico:/rpcs3.ico - - - - 10 - -10 - 140 - 140 - - - - - - - :/Icons/insignia.png - - - true - - - Qt::AlignCenter - - - - - - 20 - 150 - 501 - 20 - - - - border-top:1px solid rgba(0,0,0,.2); - - - - - - - - - 160 - 43 - 371 - 71 - - - - - true - - - - <html><head/><body><p>RPCS3 is an open-source Sony PlayStation 3 emulator and debugger written in C++ for Windows and Linux funded with <a href="https://www.patreon.com/Nekotekina"><span style=" text-decoration: underline; color:#0000ff;">Patreon</span></a>. Our lead developers and contributors are always working hard to ensure this project can be the best that it can be. There are still plenty of implementations to be made and optimizations to be done.</p></body></html> - - - Qt::RichText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - 160 - 12 - 341 - 31 - - - - - 14 - 50 - false - - - - RPCS3 PlayStation 3 Emulator - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - 160 - 120 - 371 - 16 - - - - - true - - - - - - - Qt::RichText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - 20 - 530 - 501 + 490 + 551 25 @@ -194,39 +82,198 @@ - + - 20 - 170 - 501 - 341 + 280 + 160 + 117 + 286 - - - - - <p><b>Developers:</b><br><br>¬DH<br>¬AlexAltea<br>¬Hykem<br>Oil<br>Nekotekina<br>Bigpet<br>¬gopalsr83<br>¬tambry<br>vlj<br>kd-11<br>jarveson<br>raven02<br>AniLeo<br>cornytrace<br>ssshadow<br>Numan</p> - - - - - - - <p><b>Contributors:</b><br><br>BlackDaemon<br>elisha464<br>Aishou<br>krofna<br>xsacha<br>danilaml<br>unknownbrackets<br>Zangetsu38<br>lioncash<br>achurch<br>darkf<br>Syphurith<br>Blaypeg<br>Survanium90<br>georgemoralis<br>ikki84<br>hcorion<br>Megamouse<br>flash-fire<br>DAGINATSUKO</p> - - - - - - - <p><b>Supporters:</b><br><br>Howard Garrison<br>EXPotemkin<br>Marko V.<br>danhp<br>Jake (5315825)<br>Ian Reid<br>Tad Sherlock<br>Tyler Friesen<br>Folzar<br>Payton Williams<br>RedPill Australia<br>yanghong<br>Mohammed El-Serougi<br>Дима ~Ximer13~ Кулин<br>James Reed<br>BaroqueSonata<br>Bonzay0<br>Henrijs Kons<br>Davide Balbi<br>Lena Stöffler</p> - - - - + + <p><b>Supporters:</b><br><br>Howard Garrison<br>EXPotemkin<br>Marko V.<br>danhp<br>Jake (5315825)<br>Ian Reid<br>Tad Sherlock<br>Tyler Friesen<br>Folzar<br>Payton Williams<br>RedPill Australia<br>yanghong<br>Mohammed El-Serougi<br>Дима ~Ximer13~ Кулин<br>James Reed<br>BaroqueSonata<br>Bonzay0<br>Henrijs Kons<br>Davide Balbi<br>Lena Stöffler</p> + + + + + 170 + 160 + 84 + 286 + + + + <p><b>Contributors:</b><br><br>BlackDaemon<br>elisha464<br>Aishou<br>krofna<br>xsacha<br>danilaml<br>unknownbrackets<br>Zangetsu38<br>lioncash<br>achurch<br>darkf<br>Syphurith<br>Blaypeg<br>Survanium90<br>georgemoralis<br>ikki84<br>hcorion<br>Megamouse<br>flash-fire<br>DAGINATSUKO</p> + + + + + + 70 + 160 + 67 + 234 + + + + <p><b>Developers:</b><br><br>¬DH<br>¬AlexAltea<br>¬Hykem<br>Oil<br>Nekotekina<br>Bigpet<br>¬gopalsr83<br>¬tambry<br>vlj<br>kd-11<br>jarveson<br>raven02<br>AniLeo<br>cornytrace<br>ssshadow<br>Numan</p> + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 14 + 6 + 41 + 42 + + + + + 8 + + + + + + + :/Icons/insignia.png + + + true + + + Qt::AlignCenter + + + 0 + + + + + + 70 + 41 + 501 + 71 + + + + + Arial + true + + + + + + + <html><head/><body><p>RPCS3 is an open-source Sony PlayStation 3 emulator and debugger written in C++ for Windows and Linux funded with <a href="https://www.patreon.com/Nekotekina"><span style=" text-decoration: underline; color:#0000ff;">Patreon</span></a>. Our lead developers and contributors are always working hard to ensure this project can be the best that it can be. There are still plenty of implementations to be made and optimizations to be done.</p></body></html> + + + Qt::RichText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + true + + + + + + 70 + 10 + 341 + 31 + + + + + Arial + 14 + 50 + false + + + + + + + RPCS3 PlayStation 3 Emulator + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 0 + -1 + 591 + 141 + + + + background:#fff; + + + + + + + + + 70 + 110 + 501 + 21 + + + + + Arial + true + + + + + + + + + + Qt::RichText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + label_9 + layoutWidget + label_7 + label_8 + label_4 + label_2 + label_3 + label + version diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index c2726877e4..d8cc26a196 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -62,18 +62,22 @@ 10 - 75 - true + 50 + false Qt::ClickFocus + + color:#5e5e5e; +margin-left:14px; + false - Search apps ... + Search... false @@ -82,10 +86,10 @@ - 300 - 10 + 290 + 20 160 - 31 + 21 @@ -98,19 +102,13 @@ Qt::ClickFocus - QSlider::groove:horizontal { - border: 0px solid #999999; - height: 20px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #B1B1B1, stop:1 #c4c4c4); - margin: 2px 0; + QSlider::handle:horizontal { + background: #404040; } -QSlider::handle:horizontal { - background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f); - border: 0px solid #5c5c5c; - width: 15px; - margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */ - border-radius: 3px; +QSlider { + padding-left: 6px; + padding-right:6px } @@ -187,10 +185,10 @@ QSlider::handle:horizontal { - - + + @@ -400,7 +398,7 @@ selection-background-color: rgb(85, 170, 255); - Graphics + GPU Configure Graphics @@ -935,6 +933,16 @@ selection-background-color: rgb(85, 170, 255); Show Game Tool Bar + + + Network + + + + + Emulator + + diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 5506c36b42..72c025e539 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -10,6 +10,12 @@ 586 + + + 0 + 0 + + 516 @@ -70,7 +76,7 @@ - Interpreter (Fast) + Interpreter (fast) ppuBG @@ -102,7 +108,7 @@ - Interpreter (Precise) + Interpreter (precise) ppuBG @@ -131,7 +137,7 @@ - Interpreter (Fast) + Interpreter (fast) spuBG @@ -163,7 +169,7 @@ - Interpreter (Precise) + Interpreter (precise) spuBG @@ -380,7 +386,7 @@ - Configure CPU settings. + CPU settings allow you to change both the PPU (Power Processing Element) and SPU (Synergistic Processing Unit) decoder modes. You can also adjust firmware settings for the emulated console. These settings allow you to load firmware libraries automatically, manually or both at the same time as well as on-the-fly. Qt::PlainText @@ -668,7 +674,7 @@ - Configure GPU settings. + GPU settings allow you to change the rendering backend of the emulated console. You can also choose your preferred graphics device for GPU specific rendering APIs as well as adjust the output resolution, aspect ratio and framelimit of the emulated console. Additional enhancement settings will be added in the future. Qt::PlainText @@ -883,7 +889,7 @@ - Configure audio settings. + Audio settings allow you to change the way audio is encoded and handled by the emulator. More detailed settings will be added in the future. Qt::PlainText @@ -1041,7 +1047,7 @@ - Configure input and output settings. + I/O settings allow you to change controller, keyboard and mouse handlers as well as PlayStation camera inputs. More detailed settings will be added in the future. Qt::PlainText @@ -1130,7 +1136,7 @@ - Configure virtual PlayStation 3 system settings. + System settings allow you change basic system settings found within a real PlayStation 3 system. Depending on the application in use, the console language setting will change the language of the application accordingly. More detailed settings will be added in the future. Qt::PlainText @@ -1223,7 +1229,7 @@ - Configure virtual PlayStation 3 network settings. + Network settings allow you to change basic network settings found within a real PlayStation 3 system. More detailed settings may or may not be added in the future. Qt::PlainText @@ -1465,7 +1471,7 @@ - Configure RPCS3 Emulator settings. + Emulator settings allow you to set personal preferences within the emulator such as automatic exit when a process is finished, starting games after boot and allowing games to automatically boot into fullscreen mode. You can also create your own stylesheets which can be used as themes for a more personal experience. Qt::PlainText diff --git a/rpcs3/rpcs3qt/welcome_dialog.ui b/rpcs3/rpcs3qt/welcome_dialog.ui index 8cb3008675..d138236093 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.ui +++ b/rpcs3/rpcs3qt/welcome_dialog.ui @@ -6,20 +6,26 @@ 0 0 - 575 - 300 + 589 + 239 + + + 0 + 0 + + - 575 - 300 + 589 + 239 - 575 - 300 + 589 + 239 @@ -29,22 +35,32 @@ :/rpcs3.ico:/rpcs3.ico + + false + + + + - 180 - 22 + 70 + 10 341 31 + Arial 14 50 false + + + RPCS3 PlayStation 3 Emulator @@ -55,12 +71,17 @@ - 30 - 0 - 140 - 140 + 14 + 6 + 41 + 42 + + + 8 + + @@ -73,21 +94,28 @@ Qt::AlignCenter + + 0 + - 180 - 53 - 371 + 70 + 41 + 501 71 + Arial true + + + <html><head/><body><p>RPCS3 is an open-source Sony PlayStation 3 emulator and debugger written in C++ for Windows and Linux funded with <a href="https://www.patreon.com/Nekotekina"><span style=" text-decoration: underline; color:#0000ff;">Patreon</span></a>. Our lead developers and contributors are always working hard to ensure this project can be the best that it can be. There are still plenty of implementations to be made and optimizations to be done.</p></body></html> @@ -100,12 +128,15 @@ true + + true + - 30 - 247 + 20 + 199 75 23 @@ -113,14 +144,17 @@ Continue + + true + - 30 - 160 - 521 - 61 + 20 + 120 + 551 + 41 @@ -128,6 +162,9 @@ true + + + <html><head/><body><p>To get started, you must first install the <span style=" font-weight:600;">PlayStation 3 firmware</span>. Please refer to the <a href="https://rpcs3.net/quickstart"><span style=" text-decoration: underline; color:#0000ff;">Quickstart</span></a> guide found on the official website for further information. If you have any further questions, please refer to the <a href="https://rpcs3.net/faq"><span style=" text-decoration: underline; color:#0000ff;">FAQ</span></a>. Otherwise, further discussion and support can be found on the <a href="http://www.emunewz.net/forum/forumdisplay.php?fid=172"><span style=" text-decoration: underline; color:#0000ff;">Forums</span></a> or on our <a href="https://discord.me/RPCS3"><span style=" text-decoration: underline; color:#0000ff;">Discord</span></a> server.</p></body></html> @@ -144,38 +181,26 @@ true - - - - 40 - 140 - 501 - 20 - - - - border-top:1px solid rgba(0,0,0,.2); - - - - - - 30 - 220 - 521 - 31 + 20 + 170 + 551 + 16 8 - 75 - true + 50 + false + false + + + RPCS3 does not condone piracy. You must dump your own games. @@ -186,12 +211,15 @@ - 114 - 250 + 110 + 202 181 17 + + + I have read the Quickstart guide @@ -200,15 +228,43 @@ 300 - 250 + 202 121 17 + + + Do not show again + + + + 0 + 0 + 591 + 111 + + + + background:#fff; + + + + + + label_9 + label + label_2 + label_3 + okay + label_4 + label_6 + i_have_read + do_not_show