Merge pull request #662 from mikusp/qt

Qt minor cleanup and add antialiasing, anisotropic filtering, show fps counter to options
This commit is contained in:
Henrik Rydgård
2013-02-11 23:56:43 -08:00
6 changed files with 504 additions and 254 deletions

View File

@@ -6,7 +6,7 @@
<message>
<location filename="../controls.ui" line="20"/>
<source>Controls</source>
<comment>Control window title</comment>
<comment>Controls window title</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -539,318 +539,358 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="172"/>
<location filename="../mainwindow.ui" line="149"/>
<source>Anisotropic filtering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="185"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="187"/>
<location filename="../mainwindow.ui" line="200"/>
<source>&amp;Open...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="192"/>
<location filename="../mainwindow.ui" line="205"/>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="197"/>
<location filename="../mainwindow.ui" line="210"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="202"/>
<location filename="../mainwindow.ui" line="215"/>
<source>Quickload state</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="205"/>
<location filename="../mainwindow.ui" line="218"/>
<source>F4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="210"/>
<location filename="../mainwindow.ui" line="223"/>
<source>Quicksave state</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="213"/>
<location filename="../mainwindow.ui" line="226"/>
<source>F2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="218"/>
<location filename="../mainwindow.ui" line="231"/>
<source>&amp;Load State File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="223"/>
<location filename="../mainwindow.ui" line="236"/>
<source>&amp;Save State File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="228"/>
<location filename="../mainwindow.ui" line="241"/>
<source>E&amp;xit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="233"/>
<location filename="../mainwindow.ui" line="246"/>
<source>&amp;Run</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="236"/>
<location filename="../mainwindow.ui" line="249"/>
<source>F7</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="241"/>
<location filename="../mainwindow.ui" line="254"/>
<source>&amp;Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="244"/>
<location filename="../mainwindow.ui" line="257"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="249"/>
<location filename="../mainwindow.ui" line="262"/>
<source>R&amp;eset</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="257"/>
<location filename="../mainwindow.ui" line="270"/>
<source>&amp;Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="265"/>
<location filename="../mainwindow.ui" line="278"/>
<source>&amp;Slightly Faster Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="273"/>
<location filename="../mainwindow.ui" line="286"/>
<source>&amp;Dynarec</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="281"/>
<location filename="../mainwindow.ui" line="294"/>
<source>Load &amp;Map File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="289"/>
<location filename="../mainwindow.ui" line="302"/>
<source>&amp;Save Map File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="297"/>
<location filename="../mainwindow.ui" line="310"/>
<source>&amp;Reset Symbol Table</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="302"/>
<location filename="../mainwindow.ui" line="315"/>
<source>&amp;Disassembly</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="305"/>
<location filename="../mainwindow.ui" line="318"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="313"/>
<location filename="../mainwindow.ui" line="326"/>
<source>&amp;Log Console</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="316"/>
<location filename="../mainwindow.ui" line="329"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="321"/>
<location filename="../mainwindow.ui" line="334"/>
<source>Memory &amp;View...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="324"/>
<location filename="../mainwindow.ui" line="337"/>
<source>Ctrl+M</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="329"/>
<location filename="../mainwindow.ui" line="342"/>
<source>Keyboard &amp;Controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="334"/>
<location filename="../mainwindow.ui" line="347"/>
<source>&amp;Toggle Full Screen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="337"/>
<location filename="../mainwindow.ui" line="350"/>
<source>F12</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="345"/>
<location filename="../mainwindow.ui" line="358"/>
<source>&amp;Buffered Rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="348"/>
<location filename="../mainwindow.ui" line="361"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="356"/>
<location filename="../mainwindow.ui" line="369"/>
<source>&amp;Hardware Transform</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="359"/>
<location filename="../mainwindow.ui" line="372"/>
<source>F6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="367"/>
<location filename="../mainwindow.ui" line="380"/>
<source>&amp;Linear Filtering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="375"/>
<location filename="../mainwindow.ui" line="388"/>
<source>&amp;Wireframe (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="383"/>
<location filename="../mainwindow.ui" line="396"/>
<source>&amp;Display Raw Framebuffer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="391"/>
<location filename="../mainwindow.ui" line="404"/>
<source>&amp;Show Debug Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="399"/>
<location filename="../mainwindow.ui" line="412"/>
<source>Screen &amp;1x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="402"/>
<location filename="../mainwindow.ui" line="415"/>
<source>Ctrl+1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="410"/>
<location filename="../mainwindow.ui" line="423"/>
<source>Screen &amp;2x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="413"/>
<location filename="../mainwindow.ui" line="426"/>
<source>Ctrl+2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="421"/>
<location filename="../mainwindow.ui" line="434"/>
<source>Screen &amp;3x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="424"/>
<location filename="../mainwindow.ui" line="437"/>
<source>Ctrl+3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="432"/>
<location filename="../mainwindow.ui" line="445"/>
<source>Screen &amp;4x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="435"/>
<location filename="../mainwindow.ui" line="448"/>
<source>Ctrl+4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="443"/>
<location filename="../mainwindow.ui" line="456"/>
<source>&amp;Fast Memory (dynarec, unstable)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="451"/>
<location filename="../mainwindow.ui" line="464"/>
<source>&amp;Ignore illegal reads/writes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="456"/>
<location filename="../mainwindow.ui" line="469"/>
<source>&amp;Go to http://www.ppsspp.org/</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="461"/>
<location filename="../mainwindow.ui" line="474"/>
<source>&amp;About PPSSPP...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="466"/>
<location filename="../mainwindow.ui" line="482"/>
<source>&amp;Use VBO</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="474"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<source>Debug</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="482"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="578"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="570"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="567"/>
<location filename="../mainwindow.ui" line="583"/>
<source>GamePad Controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="572"/>
<location filename="../mainwindow.ui" line="588"/>
<source>&amp;Run on load</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="577"/>
<location filename="../mainwindow.ui" line="593"/>
<source>D&amp;ump next frame to log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="582"/>
<location filename="../mainwindow.ui" line="601"/>
<source>&amp;Vertex Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="587"/>
<location filename="../mainwindow.ui" line="606"/>
<source>Memory View Texture...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="614"/>
<source>Simple 2xAA</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="622"/>
<source>Off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="630"/>
<source>2x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="638"/>
<source>4x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="646"/>
<source>8x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="654"/>
<source>16x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="662"/>
<source>Show FPS counter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="843"/>
<source>No translations</source>

View File

@@ -6,7 +6,7 @@
<message>
<location filename="../controls.ui" line="20"/>
<source>Controls</source>
<comment>Control window title</comment>
<comment>Controls window title</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -539,318 +539,358 @@
<translation>Langue</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="172"/>
<location filename="../mainwindow.ui" line="149"/>
<source>Anisotropic filtering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="185"/>
<source>&amp;Help</source>
<translation>&amp;Aide</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="187"/>
<location filename="../mainwindow.ui" line="200"/>
<source>&amp;Open...</source>
<translation>&amp;Ouvrir...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="192"/>
<location filename="../mainwindow.ui" line="205"/>
<source>&amp;Close</source>
<translation>&amp;Fermer</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="197"/>
<location filename="../mainwindow.ui" line="210"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="202"/>
<location filename="../mainwindow.ui" line="215"/>
<source>Quickload state</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="205"/>
<location filename="../mainwindow.ui" line="218"/>
<source>F4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="210"/>
<location filename="../mainwindow.ui" line="223"/>
<source>Quicksave state</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="213"/>
<location filename="../mainwindow.ui" line="226"/>
<source>F2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="218"/>
<location filename="../mainwindow.ui" line="231"/>
<source>&amp;Load State File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="223"/>
<location filename="../mainwindow.ui" line="236"/>
<source>&amp;Save State File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="228"/>
<location filename="../mainwindow.ui" line="241"/>
<source>E&amp;xit</source>
<translation>&amp;Quitter</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="233"/>
<location filename="../mainwindow.ui" line="246"/>
<source>&amp;Run</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="236"/>
<location filename="../mainwindow.ui" line="249"/>
<source>F7</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="241"/>
<location filename="../mainwindow.ui" line="254"/>
<source>&amp;Pause</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="244"/>
<location filename="../mainwindow.ui" line="257"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="249"/>
<location filename="../mainwindow.ui" line="262"/>
<source>R&amp;eset</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="257"/>
<location filename="../mainwindow.ui" line="270"/>
<source>&amp;Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="265"/>
<location filename="../mainwindow.ui" line="278"/>
<source>&amp;Slightly Faster Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="273"/>
<location filename="../mainwindow.ui" line="286"/>
<source>&amp;Dynarec</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="281"/>
<location filename="../mainwindow.ui" line="294"/>
<source>Load &amp;Map File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="289"/>
<location filename="../mainwindow.ui" line="302"/>
<source>&amp;Save Map File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="297"/>
<location filename="../mainwindow.ui" line="310"/>
<source>&amp;Reset Symbol Table</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="302"/>
<location filename="../mainwindow.ui" line="315"/>
<source>&amp;Disassembly</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="305"/>
<location filename="../mainwindow.ui" line="318"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="313"/>
<location filename="../mainwindow.ui" line="326"/>
<source>&amp;Log Console</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="316"/>
<location filename="../mainwindow.ui" line="329"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="321"/>
<location filename="../mainwindow.ui" line="334"/>
<source>Memory &amp;View...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="324"/>
<location filename="../mainwindow.ui" line="337"/>
<source>Ctrl+M</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="329"/>
<location filename="../mainwindow.ui" line="342"/>
<source>Keyboard &amp;Controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="334"/>
<location filename="../mainwindow.ui" line="347"/>
<source>&amp;Toggle Full Screen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="337"/>
<location filename="../mainwindow.ui" line="350"/>
<source>F12</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="345"/>
<location filename="../mainwindow.ui" line="358"/>
<source>&amp;Buffered Rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="348"/>
<location filename="../mainwindow.ui" line="361"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="356"/>
<location filename="../mainwindow.ui" line="369"/>
<source>&amp;Hardware Transform</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="359"/>
<location filename="../mainwindow.ui" line="372"/>
<source>F6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="367"/>
<location filename="../mainwindow.ui" line="380"/>
<source>&amp;Linear Filtering</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="375"/>
<location filename="../mainwindow.ui" line="388"/>
<source>&amp;Wireframe (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="383"/>
<location filename="../mainwindow.ui" line="396"/>
<source>&amp;Display Raw Framebuffer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="391"/>
<location filename="../mainwindow.ui" line="404"/>
<source>&amp;Show Debug Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="399"/>
<location filename="../mainwindow.ui" line="412"/>
<source>Screen &amp;1x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="402"/>
<location filename="../mainwindow.ui" line="415"/>
<source>Ctrl+1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="410"/>
<location filename="../mainwindow.ui" line="423"/>
<source>Screen &amp;2x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="413"/>
<location filename="../mainwindow.ui" line="426"/>
<source>Ctrl+2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="421"/>
<location filename="../mainwindow.ui" line="434"/>
<source>Screen &amp;3x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="424"/>
<location filename="../mainwindow.ui" line="437"/>
<source>Ctrl+3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="432"/>
<location filename="../mainwindow.ui" line="445"/>
<source>Screen &amp;4x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="435"/>
<location filename="../mainwindow.ui" line="448"/>
<source>Ctrl+4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="443"/>
<location filename="../mainwindow.ui" line="456"/>
<source>&amp;Fast Memory (dynarec, unstable)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="451"/>
<location filename="../mainwindow.ui" line="464"/>
<source>&amp;Ignore illegal reads/writes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="456"/>
<location filename="../mainwindow.ui" line="469"/>
<source>&amp;Go to http://www.ppsspp.org/</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="461"/>
<location filename="../mainwindow.ui" line="474"/>
<source>&amp;About PPSSPP...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="466"/>
<location filename="../mainwindow.ui" line="482"/>
<source>&amp;Use VBO</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="474"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<source>Debug</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="482"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="578"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="570"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="567"/>
<location filename="../mainwindow.ui" line="583"/>
<source>GamePad Controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="572"/>
<location filename="../mainwindow.ui" line="588"/>
<source>&amp;Run on load</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="577"/>
<location filename="../mainwindow.ui" line="593"/>
<source>D&amp;ump next frame to log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="582"/>
<location filename="../mainwindow.ui" line="601"/>
<source>&amp;Vertex Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="587"/>
<location filename="../mainwindow.ui" line="606"/>
<source>Memory View Texture...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="614"/>
<source>Simple 2xAA</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="622"/>
<source>Off</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="630"/>
<source>2x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="638"/>
<source>4x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="646"/>
<source>8x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="654"/>
<source>16x</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="662"/>
<source>Show FPS counter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="843"/>
<source>No translations</source>

View File

@@ -6,8 +6,8 @@
<message>
<location filename="../controls.ui" line="20"/>
<source>Controls</source>
<comment>Control window title</comment>
<translation>Układ klawiszy</translation>
<comment>Controls window title</comment>
<translation type="unfinished">Układ klawiszy</translation>
</message>
</context>
<context>
@@ -539,318 +539,358 @@
<translation>Język</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="172"/>
<location filename="../mainwindow.ui" line="149"/>
<source>Anisotropic filtering</source>
<translation>Filtrowanie anizotropowe</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="185"/>
<source>&amp;Help</source>
<translation>Pomo&amp;c</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="187"/>
<location filename="../mainwindow.ui" line="200"/>
<source>&amp;Open...</source>
<translation>&amp;Otwórz...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="192"/>
<location filename="../mainwindow.ui" line="205"/>
<source>&amp;Close</source>
<translation>&amp;Zamknij</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="197"/>
<location filename="../mainwindow.ui" line="210"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="202"/>
<location filename="../mainwindow.ui" line="215"/>
<source>Quickload state</source>
<translation>Wczytaj stan</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="205"/>
<location filename="../mainwindow.ui" line="218"/>
<source>F4</source>
<translation>F4</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="210"/>
<location filename="../mainwindow.ui" line="223"/>
<source>Quicksave state</source>
<translation>Zapisz stan</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="213"/>
<location filename="../mainwindow.ui" line="226"/>
<source>F2</source>
<translation>F2</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="218"/>
<location filename="../mainwindow.ui" line="231"/>
<source>&amp;Load State File...</source>
<translation>&amp;Wczytaj plik stanu...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="223"/>
<location filename="../mainwindow.ui" line="236"/>
<source>&amp;Save State File...</source>
<translation>&amp;Zapisz plik stanu...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="228"/>
<location filename="../mainwindow.ui" line="241"/>
<source>E&amp;xit</source>
<translation>Wyj&amp;</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="233"/>
<location filename="../mainwindow.ui" line="246"/>
<source>&amp;Run</source>
<translation>&amp;Uruchom</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="236"/>
<location filename="../mainwindow.ui" line="249"/>
<source>F7</source>
<translation>F7</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="241"/>
<location filename="../mainwindow.ui" line="254"/>
<source>&amp;Pause</source>
<translation>&amp;Pauza</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="244"/>
<location filename="../mainwindow.ui" line="257"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="249"/>
<location filename="../mainwindow.ui" line="262"/>
<source>R&amp;eset</source>
<translation>&amp;Reset</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="257"/>
<location filename="../mainwindow.ui" line="270"/>
<source>&amp;Interpreter</source>
<translation>&amp;Interpreter</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="265"/>
<location filename="../mainwindow.ui" line="278"/>
<source>&amp;Slightly Faster Interpreter</source>
<translation>&amp;Szybszy interpreter</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="273"/>
<location filename="../mainwindow.ui" line="286"/>
<source>&amp;Dynarec</source>
<translation>R&amp;ekompilacja (Dynarec)</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="281"/>
<location filename="../mainwindow.ui" line="294"/>
<source>Load &amp;Map File...</source>
<translation>&amp;Wczytaj plik mapy...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="289"/>
<location filename="../mainwindow.ui" line="302"/>
<source>&amp;Save Map File...</source>
<translation>&amp;Zapisz plik mapy...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="297"/>
<location filename="../mainwindow.ui" line="310"/>
<source>&amp;Reset Symbol Table</source>
<translation>Zresetuj &amp;tablicę symboli</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="302"/>
<location filename="../mainwindow.ui" line="315"/>
<source>&amp;Disassembly</source>
<translation>&amp;Deasembler</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="305"/>
<location filename="../mainwindow.ui" line="318"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="313"/>
<location filename="../mainwindow.ui" line="326"/>
<source>&amp;Log Console</source>
<translation>&amp;Konsola logowania</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="316"/>
<location filename="../mainwindow.ui" line="329"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="321"/>
<location filename="../mainwindow.ui" line="334"/>
<source>Memory &amp;View...</source>
<translation>Widok &amp;pamięci...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="324"/>
<location filename="../mainwindow.ui" line="337"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="329"/>
<location filename="../mainwindow.ui" line="342"/>
<source>Keyboard &amp;Controls</source>
<translation>Ustawienia &amp;klawiatury</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="334"/>
<location filename="../mainwindow.ui" line="347"/>
<source>&amp;Toggle Full Screen</source>
<translation>&amp;Pełny ekran</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="337"/>
<location filename="../mainwindow.ui" line="350"/>
<source>F12</source>
<translation>F12</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="345"/>
<location filename="../mainwindow.ui" line="358"/>
<source>&amp;Buffered Rendering</source>
<translation>&amp;Buforowane renderowanie</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="348"/>
<location filename="../mainwindow.ui" line="361"/>
<source>F5</source>
<translation>F5</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="356"/>
<location filename="../mainwindow.ui" line="369"/>
<source>&amp;Hardware Transform</source>
<translation>Sprzętowa &amp;transformacja</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="359"/>
<location filename="../mainwindow.ui" line="372"/>
<source>F6</source>
<translation>F6</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="367"/>
<location filename="../mainwindow.ui" line="380"/>
<source>&amp;Linear Filtering</source>
<translation>Filtrowanie &amp;liniowe</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="375"/>
<location filename="../mainwindow.ui" line="388"/>
<source>&amp;Wireframe (experimental)</source>
<translation>&amp;Widok siatki (eksperymentalny)</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="383"/>
<location filename="../mainwindow.ui" line="396"/>
<source>&amp;Display Raw Framebuffer</source>
<translation>Wyświetl &amp;surowy framebuffer</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="391"/>
<location filename="../mainwindow.ui" line="404"/>
<source>&amp;Show Debug Statistics</source>
<translation>Pokaż statystyki &amp;emulacji</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="399"/>
<location filename="../mainwindow.ui" line="412"/>
<source>Screen &amp;1x</source>
<translation>&amp;1x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="402"/>
<location filename="../mainwindow.ui" line="415"/>
<source>Ctrl+1</source>
<translation>Ctrl+1</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="410"/>
<location filename="../mainwindow.ui" line="423"/>
<source>Screen &amp;2x</source>
<translation>&amp;2x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="413"/>
<location filename="../mainwindow.ui" line="426"/>
<source>Ctrl+2</source>
<translation>Ctrl+2</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="421"/>
<location filename="../mainwindow.ui" line="434"/>
<source>Screen &amp;3x</source>
<translation>&amp;3x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="424"/>
<location filename="../mainwindow.ui" line="437"/>
<source>Ctrl+3</source>
<translation>Ctrl+3</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="432"/>
<location filename="../mainwindow.ui" line="445"/>
<source>Screen &amp;4x</source>
<translation>&amp;4x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="435"/>
<location filename="../mainwindow.ui" line="448"/>
<source>Ctrl+4</source>
<translation>Ctrl+4</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="443"/>
<location filename="../mainwindow.ui" line="456"/>
<source>&amp;Fast Memory (dynarec, unstable)</source>
<translation>S&amp;zybka pamięć (wymagany Dynarec, niestabilne)</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="451"/>
<location filename="../mainwindow.ui" line="464"/>
<source>&amp;Ignore illegal reads/writes</source>
<translation>&amp;Ignoruj nieprawidłowe odczyty/zapisy</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="456"/>
<location filename="../mainwindow.ui" line="469"/>
<source>&amp;Go to http://www.ppsspp.org/</source>
<translation>&amp;Idź do http://www.ppsspp.org</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="461"/>
<location filename="../mainwindow.ui" line="474"/>
<source>&amp;About PPSSPP...</source>
<translation>&amp;O PPSSPP...</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="466"/>
<location filename="../mainwindow.ui" line="482"/>
<source>&amp;Use VBO</source>
<translation>Użyj &amp;VBO</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="474"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="482"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<source>Warning</source>
<translation>Ostrzeżenia</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="490"/>
<location filename="../mainwindow.ui" line="530"/>
<location filename="../mainwindow.ui" line="562"/>
<location filename="../mainwindow.ui" line="506"/>
<location filename="../mainwindow.ui" line="546"/>
<location filename="../mainwindow.ui" line="578"/>
<source>Error</source>
<translation>Błędy</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="498"/>
<location filename="../mainwindow.ui" line="522"/>
<location filename="../mainwindow.ui" line="554"/>
<location filename="../mainwindow.ui" line="514"/>
<location filename="../mainwindow.ui" line="538"/>
<location filename="../mainwindow.ui" line="570"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="567"/>
<location filename="../mainwindow.ui" line="583"/>
<source>GamePad Controls</source>
<translation>Ustawienia pada</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="572"/>
<location filename="../mainwindow.ui" line="588"/>
<source>&amp;Run on load</source>
<translation>Uruchom po &amp;załadowaniu</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="577"/>
<location filename="../mainwindow.ui" line="593"/>
<source>D&amp;ump next frame to log</source>
<translation>Z&amp;rzuć następną ramkę do logu</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="582"/>
<location filename="../mainwindow.ui" line="601"/>
<source>&amp;Vertex Cache</source>
<translation>&amp;Cache wierzchołków</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="587"/>
<location filename="../mainwindow.ui" line="606"/>
<source>Memory View Texture...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="614"/>
<source>Simple 2xAA</source>
<translation>Prosty antyaliasing 2x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="622"/>
<source>Off</source>
<translation>Wyłączone</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="630"/>
<source>2x</source>
<translation>2x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="638"/>
<source>4x</source>
<translation>4x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="646"/>
<source>8x</source>
<translation>8x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="654"/>
<source>16x</source>
<translation>16x</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="662"/>
<source>Show FPS counter</source>
<translation>Pokaż licznik FPS</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="843"/>
<source>No translations</source>

View File

@@ -38,18 +38,15 @@ MainWindow::MainWindow(QWidget *parent) :
gamePadDlg = new GamePadDialog(&input_state, this);
#endif
SetPlaying(0);
host = new QtHost(this);
w = ui->widget;
w->init(&input_state);
w->resize(pixel_xres, pixel_yres);
w->setMinimumSize(pixel_xres, pixel_yres);
w->setMaximumSize(pixel_xres, pixel_yres);
QObject::connect( w, SIGNAL(doubleClick()), this, SLOT(on_action_OptionsFullScreen_triggered()) );
emugl = ui->widget;
emugl->init(&input_state);
emugl->resize(pixel_xres, pixel_yres);
emugl->setMinimumSize(pixel_xres, pixel_yres);
emugl->setMaximumSize(pixel_xres, pixel_yres);
QObject::connect( emugl, SIGNAL(doubleClick()), this, SLOT(on_action_OptionsFullScreen_triggered()) );
createLanguageMenu();
UpdateMenus();
int zoom = g_Config.iWindowZoom;
@@ -57,19 +54,20 @@ MainWindow::MainWindow(QWidget *parent) :
if (zoom > 4) zoom = 4;
SetZoom(zoom);
EmuThread_Start(w);
EmuThread_Start(emugl);
if (!fileToStart.isNull())
{
SetPlaying(fileToStart);
//Update();
SetGameTitle(fileToStart);
UpdateMenus();
EmuThread_StartGame(fileToStart);
}
if (!fileToStart.isNull() && stateToLoad != NULL)
SaveState::Load(stateToLoad);
if (stateToLoad != NULL)
SaveState::Load(stateToLoad);
}
else
SetGameTitle("");
}
MainWindow::~MainWindow()
@@ -164,26 +162,11 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/";
g_Config.flashDirectory = g_Config.memCardDirectory+"/flash/";
LogManager::Init();
if (fileToLog != NULL)
LogManager::GetInstance()->ChangeFileLog(fileToLog);
//LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console");
LogManager::GetInstance()->SetLogLevel(LogTypes::G3D, LogTypes::LERROR);
}
LogManager::GetInstance()->ChangeFileLog(fileToLog);
void MainWindow::SetPlaying(QString text)
{
if (text == 0)
{
QString title = "PPSSPP " + QString(PPSSPP_VERSION_STR);
setWindowTitle(title);
}
else
{
QString title = "PPSSPP " + QString(PPSSPP_VERSION_STR) + "-" + text;
setWindowTitle(title);
}
LogManager::GetInstance()->SetLogLevel(LogTypes::G3D, LogTypes::LERROR);
}
void MainWindow::SetNextState(CoreState state)
@@ -191,6 +174,15 @@ void MainWindow::SetNextState(CoreState state)
nextState = state;
}
void MainWindow::SetGameTitle(QString text)
{
QString title = "PPSSPP " + QString(PPSSPP_VERSION_STR);
if (text != "")
title += QString(" - %1").arg(text);
setWindowTitle(title);
}
void MainWindow::BrowseAndBoot(void)
{
QString filename = QFileDialog::getOpenFileName(NULL, "Load File", g_Config.currentDirectory.c_str(), "PSP ROMs (*.pbp *.elf *.iso *.cso *.prx)");
@@ -245,6 +237,12 @@ void MainWindow::UpdateMenus()
ui->action_EmulationRunLoad->setChecked(g_Config.bAutoRun);
ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO);
ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache);
ui->action_AFOff->setChecked(g_Config.iAnisotropyLevel == 0);
ui->action_AF2x->setChecked(g_Config.iAnisotropyLevel == 2);
ui->action_AF4x->setChecked(g_Config.iAnisotropyLevel == 4);
ui->action_AF8x->setChecked(g_Config.iAnisotropyLevel == 8);
ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
ui->action_Show_FPS_counter->setChecked(g_Config.bShowFPSCounter);
bool enable = !Core_IsStepping() ? false : true;
ui->action_EmulationRun->setEnabled(g_State.bEmuThreadStarted ? enable : false);
@@ -261,6 +259,9 @@ void MainWindow::UpdateMenus()
ui->action_CPUInterpreter->setEnabled(enable);
ui->action_CPUFastInterpreter->setEnabled(enable);
ui->action_EmulationStop->setEnabled(!enable);
ui->action_DebugDumpFrame->setEnabled(!enable);
ui->action_DebugDisassembly->setEnabled(!enable);
ui->action_DebugMemoryView->setEnabled(!enable);
ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iWindowZoom - 1));
ui->action_OptionsScreen2x->setChecked(1 == (g_Config.iWindowZoom - 1));
@@ -292,9 +293,9 @@ void MainWindow::SetZoom(float zoom) {
dp_xres = pixel_xres;
dp_yres = pixel_yres;
w->resize(pixel_xres, pixel_yres);
w->setMinimumSize(pixel_xres, pixel_yres);
w->setMaximumSize(pixel_xres, pixel_yres);
emugl->resize(pixel_xres, pixel_yres);
emugl->setMinimumSize(pixel_xres, pixel_yres);
emugl->setMaximumSize(pixel_xres, pixel_yres);
ui->centralwidget->setFixedSize(pixel_xres, pixel_yres);
ui->centralwidget->resize(pixel_xres, pixel_yres);
@@ -339,8 +340,7 @@ void MainWindow::on_action_EmulationStop_triggered()
memoryWindow->close();
EmuThread_StopGame();
SetPlaying(0);
Update();
SetGameTitle("");
UpdateMenus();
}
@@ -596,8 +596,8 @@ void MainWindow::on_action_OptionsFullScreen_triggered()
ui->statusbar->setVisible(false);
// Remove constraint
w->setMinimumSize(0, 0);
w->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
emugl->setMinimumSize(0, 0);
emugl->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
ui->centralwidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -853,7 +853,6 @@ void MainWindow::createLanguageMenu()
locale.truncate(locale.lastIndexOf('.'));
locale.remove(0, locale.indexOf('_') + 1);
//QString language = QLocale::languageToString(QLocale(locale).language());
QString language = QLocale(locale).nativeLanguageName();
QAction *action = new QAction(language, this);
action->setCheckable(true);
@@ -946,3 +945,45 @@ void MainWindow::on_action_OptionsUseVBO_triggered()
g_Config.bUseVBO = !g_Config.bUseVBO;
UpdateMenus();
}
void MainWindow::on_action_Simple_2xAA_triggered()
{
g_Config.SSAntiAliasing = !g_Config.SSAntiAliasing;
UpdateMenus();
}
void MainWindow::on_action_AFOff_triggered()
{
g_Config.iAnisotropyLevel = 0;
UpdateMenus();
}
void MainWindow::on_action_AF2x_triggered()
{
g_Config.iAnisotropyLevel = 2;
UpdateMenus();
}
void MainWindow::on_action_AF4x_triggered()
{
g_Config.iAnisotropyLevel = 4;
UpdateMenus();
}
void MainWindow::on_action_AF8x_triggered()
{
g_Config.iAnisotropyLevel = 8;
UpdateMenus();
}
void MainWindow::on_action_AF16x_triggered()
{
g_Config.iAnisotropyLevel = 16;
UpdateMenus();
}
void MainWindow::on_action_Show_FPS_counter_triggered()
{
g_Config.bShowFPSCounter = !g_Config.bShowFPSCounter;
UpdateMenus();
}

View File

@@ -29,7 +29,7 @@ public:
void Create(int argc, const char *argv[], const char *savegame_directory, const char *external_directory, const char *installID);
void BrowseAndBoot();
void SetNextState(CoreState state);
void SetPlaying(QString text);
void SetGameTitle(QString text);
Debugger_Disasm* GetDialogDisasm() { return dialogDisasm; }
Debugger_Memory* GetDialogMemory() { return memoryWindow; }
@@ -153,6 +153,20 @@ private slots:
void on_action_OptionsUseVBO_triggered();
void on_action_Simple_2xAA_triggered();
void on_action_AFOff_triggered();
void on_action_AF2x_triggered();
void on_action_AF4x_triggered();
void on_action_AF8x_triggered();
void on_action_AF16x_triggered();
void on_action_Show_FPS_counter_triggered();
private:
void loadLanguage(const QString &language);
void createLanguageMenu();
@@ -163,9 +177,9 @@ private:
QString currentLanguage;
QString languagePath;
Ui::MainWindow *ui;
Ui::MainWindow *ui;
QtEmuGL* w;
QtEmuGL* emugl;
CoreState nextState;
InputState input_state;

View File

@@ -144,6 +144,16 @@
<string>Language</string>
</property>
</widget>
<widget class="QMenu" name="menuAnisotropic_filtering">
<property name="title">
<string>Anisotropic filtering</string>
</property>
<addaction name="action_AFOff"/>
<addaction name="action_AF2x"/>
<addaction name="action_AF4x"/>
<addaction name="action_AF8x"/>
<addaction name="action_AF16x"/>
</widget>
<addaction name="action_OptionsControls"/>
<addaction name="action_OptionsGamePadControls"/>
<addaction name="separator"/>
@@ -151,12 +161,15 @@
<addaction name="action_OptionsBufferedRendering"/>
<addaction name="action_OptionsHardwareTransform"/>
<addaction name="action_OptionsLinearFiltering"/>
<addaction name="action_Simple_2xAA"/>
<addaction name="menuAnisotropic_filtering"/>
<addaction name="action_OptionsUseVBO"/>
<addaction name="action_OptionsVertexCache"/>
<addaction name="separator"/>
<addaction name="action_OptionsWireframe"/>
<addaction name="action_OptionsDisplayRawFramebuffer"/>
<addaction name="action_OptionsShowDebugStatistics"/>
<addaction name="action_Show_FPS_counter"/>
<addaction name="separator"/>
<addaction name="menu_Log_Levels"/>
<addaction name="separator"/>
@@ -462,6 +475,9 @@
</property>
</action>
<action name="action_OptionsUseVBO">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Use VBO</string>
</property>
@@ -578,6 +594,9 @@
</property>
</action>
<action name="action_OptionsVertexCache">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Vertex Cache</string>
</property>
@@ -587,6 +606,62 @@
<string>Memory View Texture...</string>
</property>
</action>
<action name="action_Simple_2xAA">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Simple 2xAA</string>
</property>
</action>
<action name="action_AFOff">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Off</string>
</property>
</action>
<action name="action_AF2x">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>2x</string>
</property>
</action>
<action name="action_AF4x">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>4x</string>
</property>
</action>
<action name="action_AF8x">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>8x</string>
</property>
</action>
<action name="action_AF16x">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>16x</string>
</property>
</action>
<action name="action_Show_FPS_counter">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Show FPS counter</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>