diff --git a/src/m64py/ui/about_ui.py b/src/m64py/ui/about_ui.py index 06efd06..b6b0750 100644 --- a/src/m64py/ui/about_ui.py +++ b/src/m64py/ui/about_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'about.ui' # -# Created: Sat Jun 23 10:26:15 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_AboutDialog(object): def setupUi(self, AboutDialog): @@ -60,8 +69,8 @@ class Ui_AboutDialog(object): QtCore.QMetaObject.connectSlotsByName(AboutDialog) def retranslateUi(self, AboutDialog): - AboutDialog.setWindowTitle(QtGui.QApplication.translate("AboutDialog", "About M64Py", None, QtGui.QApplication.UnicodeUTF8)) - self.labelAbout.setText(QtGui.QApplication.translate("AboutDialog", "\n" + AboutDialog.setWindowTitle(_translate("AboutDialog", "About M64Py", None)) + self.labelAbout.setText(_translate("AboutDialog", "\n" "\n" @@ -73,8 +82,8 @@ class Ui_AboutDialog(object): "

This program is released under the terms of the

\n" "

GNU General Public License version 3.

\n" "


\n" -"

Mupen64Plus core version: CORE_VERSION

", None, QtGui.QApplication.UnicodeUTF8)) - self.textBrowser.setHtml(QtGui.QApplication.translate("AboutDialog", "\n" +"

Mupen64Plus core version: CORE_VERSION

", None)) + self.textBrowser.setHtml(_translate("AboutDialog", "\n" "\n" @@ -126,7 +135,7 @@ class Ui_AboutDialog(object): "


\n" "

The Bitstream license:

\n" "

* The TrueType font (data/font.ttf) is licensed by the Bitstream license.

\n" -"


", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButton.setText(QtGui.QApplication.translate("AboutDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8)) +"


", None)) + self.pushButton.setText(_translate("AboutDialog", "&Close", None)) import images_rc diff --git a/src/m64py/ui/archive_ui.py b/src/m64py/ui/archive_ui.py index 240b5ca..14aa006 100644 --- a/src/m64py/ui/archive_ui.py +++ b/src/m64py/ui/archive_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'archive.ui' # -# Created: Sat Apr 6 10:51:54 2013 -# by: PyQt4 UI code generator 4.10 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! diff --git a/src/m64py/ui/cheat_ui.py b/src/m64py/ui/cheat_ui.py index cf07120..001f10c 100644 --- a/src/m64py/ui/cheat_ui.py +++ b/src/m64py/ui/cheat_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'cheat.ui' # -# Created: Sat Jun 23 10:26:17 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_CheatDialog(object): def setupUi(self, CheatDialog): @@ -137,9 +146,9 @@ class Ui_CheatDialog(object): QtCore.QMetaObject.connectSlotsByName(CheatDialog) def retranslateUi(self, CheatDialog): - CheatDialog.setWindowTitle(QtGui.QApplication.translate("CheatDialog", "Cheats", None, QtGui.QApplication.UnicodeUTF8)) - self.groupCheats.setTitle(QtGui.QApplication.translate("CheatDialog", "Cheats", None, QtGui.QApplication.UnicodeUTF8)) - self.pushUnmarkAll.setText(QtGui.QApplication.translate("CheatDialog", "Unmark All", None, QtGui.QApplication.UnicodeUTF8)) - self.groupNotes.setTitle(QtGui.QApplication.translate("CheatDialog", "Notes", None, QtGui.QApplication.UnicodeUTF8)) - self.pushClose.setText(QtGui.QApplication.translate("CheatDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8)) + CheatDialog.setWindowTitle(_translate("CheatDialog", "Cheats", None)) + self.groupCheats.setTitle(_translate("CheatDialog", "Cheats", None)) + self.pushUnmarkAll.setText(_translate("CheatDialog", "Unmark All", None)) + self.groupNotes.setTitle(_translate("CheatDialog", "Notes", None)) + self.pushClose.setText(_translate("CheatDialog", "&Close", None)) diff --git a/src/m64py/ui/choices_ui.py b/src/m64py/ui/choices_ui.py index c8b873c..4a403e9 100644 --- a/src/m64py/ui/choices_ui.py +++ b/src/m64py/ui/choices_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'choices.ui' # -# Created: Sat Jun 23 10:26:17 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_ChoicesDialog(object): def setupUi(self, ChoicesDialog): @@ -102,8 +111,8 @@ class Ui_ChoicesDialog(object): QtCore.QMetaObject.connectSlotsByName(ChoicesDialog) def retranslateUi(self, ChoicesDialog): - ChoicesDialog.setWindowTitle(QtGui.QApplication.translate("ChoicesDialog", "Choices", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("ChoicesDialog", "Choose a value to be used for:", None, QtGui.QApplication.UnicodeUTF8)) - self.pushOk.setText(QtGui.QApplication.translate("ChoicesDialog", "&Ok", None, QtGui.QApplication.UnicodeUTF8)) - self.pushCancel.setText(QtGui.QApplication.translate("ChoicesDialog", "&Cancel", None, QtGui.QApplication.UnicodeUTF8)) + ChoicesDialog.setWindowTitle(_translate("ChoicesDialog", "Choices", None)) + self.label.setText(_translate("ChoicesDialog", "Choose a value to be used for:", None)) + self.pushOk.setText(_translate("ChoicesDialog", "&Ok", None)) + self.pushCancel.setText(_translate("ChoicesDialog", "&Cancel", None)) diff --git a/src/m64py/ui/icons.qrc b/src/m64py/ui/icons.qrc index 705c3f1..a42a8e1 100644 --- a/src/m64py/ui/icons.qrc +++ b/src/m64py/ui/icons.qrc @@ -5,6 +5,7 @@ icons/action_clear.png icons/action_emulator.png icons/action_fullscreen.png + icons/action_graphics.png icons/action_license.png icons/action_open_from_list.png icons/action_open_manually.png diff --git a/src/m64py/ui/icons_rc.py b/src/m64py/ui/icons_rc.py index 3aa4ae1..9ce7419 100644 --- a/src/m64py/ui/icons_rc.py +++ b/src/m64py/ui/icons_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Fri Apr 5 22:09:20 2013 +# Created: Tue Sep 3 02:08:52 2013 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! @@ -1264,6 +1264,69 @@ qt_resource_data = "\ \x0b\x3c\xf7\x6d\x1b\x68\x03\x5b\xc0\xbf\x00\xff\x01\x78\x10\x33\ \x20\x49\xfc\xc7\x5f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\ \x82\ +\x00\x00\x03\xc6\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x16\x00\x00\x00\x16\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x03\x43\x49\x44\ +\x41\x54\x38\x8d\xb5\x95\xc1\x6b\x24\x45\x14\x87\xbf\xaa\xea\x74\ +\x4f\x27\x66\xb3\xba\x81\x8d\x08\x26\x9b\x0d\x11\xf5\xec\xc5\x9b\ +\x2b\xd8\xac\xce\x45\x10\xfc\x07\xbc\x08\x9e\x05\x6f\x82\x07\x4f\ +\xde\x05\xf1\xb6\xa0\xa2\x20\xb9\x65\x8e\xae\x92\xa3\x2c\xac\xac\ +\xeb\x66\x10\x93\x5d\x4d\x82\x66\x9c\x6c\x26\x55\xdd\x33\xfd\xaa\ +\x3c\x4c\xcf\x4c\xcf\x44\xbc\x04\x1f\x3c\xba\xab\xa8\xfa\xea\xf7\ +\x5e\x3d\x5e\xa9\x2c\xcb\xf8\x3f\x2c\x02\x68\x36\x9b\xef\x8b\xc8\ +\x47\x21\x84\xf8\x22\x30\xa5\x94\xc4\x71\xfc\xe9\xd6\xd6\xd6\x7b\ +\x2a\xcb\x32\x9a\xcd\x66\xf7\xe6\x1b\xaf\x2d\x2d\x2d\x2d\x5d\x48\ +\x65\xbf\xe8\xf3\xcd\xd7\xdf\x0e\x1a\x8d\xc6\xe5\x08\x20\x84\x90\ +\xa4\x69\xca\x9b\x6f\x7d\xc9\xfc\x52\x98\x5a\x1c\xa6\x87\x84\x00\ +\x8a\x30\xfe\xcf\x4f\x15\x5f\x7d\xf1\x36\x71\xac\x89\x93\x18\xa5\ +\x94\xb7\xd6\xc6\xd1\xd4\xae\xb9\x82\xab\xeb\x73\x28\xd4\x28\x38\ +\x94\x1a\x85\x39\x3b\x56\x10\x60\xff\x41\x1f\xe7\x06\xb4\x77\x7f\ +\x65\x75\x75\x6d\x8c\x1a\x83\x45\x3c\xa5\x80\x75\x25\x4a\x4d\x00\ +\xe7\xe0\x41\x4d\x1d\x52\xf4\x05\x80\x17\x5e\x7c\x7e\x4a\x63\x05\ +\x0e\xc3\xb8\x82\xa2\x90\x59\x95\xa1\x06\x03\xa5\x02\x83\xd2\xd3\ +\x7d\x7c\xc6\x71\xf7\x14\x39\x5e\x40\xc4\xf3\xd3\xdd\x7b\xac\xad\ +\xcd\x28\x0e\x80\x27\x10\xb4\xa6\x12\x30\x26\x4f\x94\x43\xd1\x2f\ +\x39\x3a\x3e\xc1\xba\x3e\x21\x04\x40\x11\xeb\x08\xef\x85\xcd\xe7\ +\x36\x30\xc6\x4c\x83\x9d\x75\x04\x1f\xf0\x41\x51\x08\xd3\x79\xac\ +\xec\x71\xcf\x71\xd2\xcb\x09\x41\x13\xc5\x8d\xf1\xbc\x71\x11\x22\ +\xc2\xcf\xf7\x7e\x61\x7d\x7d\x9d\x3c\xcf\xb1\xd6\x56\x60\xe7\x08\ +\xc1\x43\xd0\x0c\xbc\x22\xd4\xf2\x2a\xe2\x39\xb5\x05\x22\x0a\x33\ +\x97\x32\x6b\x5a\x6b\x44\x84\xeb\x1b\xd7\x48\x92\x04\xe7\x5c\x4d\ +\xb1\x73\x55\x2a\x0d\xfd\xa0\xc7\x69\x2f\xc5\x33\x28\x41\x45\x09\ +\x51\x74\x8e\x39\x5c\x66\x3c\x22\x25\xbb\x0f\xf6\xb9\xbe\xb1\x81\ +\xb5\x67\x14\x45\x7f\x08\xb6\xd6\x0e\x2b\x53\x1b\x06\x4c\xf2\x84\ +\x81\xc8\xfc\x3b\x70\x64\xa5\x29\x10\xf1\xac\x5e\x7b\x96\x46\x23\ +\xc1\xb9\x1c\xad\xf5\x10\x9c\xe7\xf9\x90\x63\x34\x21\x9e\xff\x6f\ +\xd2\xac\x62\x5d\xe2\xbd\x20\x52\x02\x0a\xeb\x2c\xe5\xa0\x9c\x28\ +\x06\xc5\xa5\x39\xc3\xdf\xfb\xbd\x73\x9b\x1b\x0d\x43\x23\x31\xe4\ +\xb9\x90\x17\x93\xb2\x51\x40\x2a\x81\x38\x01\x11\x41\x29\xc8\x5d\ +\x4e\xaf\xd7\x9b\x28\x56\x0a\x3e\xf9\xf8\x25\xbc\x97\x19\xac\x22\ +\x5d\x98\x47\x1b\x4d\xf0\x1e\x77\x66\x6b\xd8\xc9\xc7\xfb\x80\x42\ +\x55\x22\xab\xcb\x2b\xa5\x2c\x3a\xc7\x9d\x46\x9a\xa6\x18\x7d\xfe\ +\x96\xca\xbe\x00\xc3\x03\xa3\x28\x99\x52\x5c\xb7\x4e\xa7\x43\x51\ +\x14\x5a\x6b\xdd\x57\x59\x96\x91\xa6\xe9\x07\x65\x59\x7e\x28\x22\ +\x17\x6e\x9b\x49\x92\x7c\x66\xad\x7d\x57\x8d\x1a\x7d\xab\xd5\x52\ +\xc0\x1c\x90\xa6\x69\x7a\xe9\xf5\xe6\xcd\xf6\x8d\x1b\xaf\xc4\x9b\ +\x9b\x9b\x18\x63\x08\x04\x08\xc3\xba\xf5\xc1\xb3\xf7\xdb\x1e\xdb\ +\xdb\xdb\xf2\xe3\x9d\x3b\xaf\xb6\xef\xb7\xdb\x80\x03\x2c\x50\x64\ +\x59\x16\xea\x71\x37\x80\x05\x60\xc1\x39\xf7\xc4\xc1\xc1\xe1\xe7\ +\xdf\xdd\xbe\xfd\xce\xde\xc3\x3d\xb3\xb2\xf2\xb4\x5e\xb9\xba\x82\ +\xd1\x86\xc3\xa3\x43\xfe\x38\x38\x08\x8f\x1e\x3e\x92\xc3\x83\xa3\ +\x9d\xf6\xfd\xb6\x01\x96\x81\x5e\x25\xac\x07\x9c\xd5\xc1\x53\x9d\ +\x77\xe7\x87\x9d\x5b\xcb\xcb\xcb\xbb\x57\x96\xaf\xbc\xbc\xb8\xb8\ +\xb8\xf1\xe4\x53\x97\x9f\x31\xda\x44\x9d\x4e\xe7\xaf\x93\x6e\xf7\ +\xf7\x6e\xb7\x7b\xf7\xe8\xe8\xcf\xef\x81\xa2\xb6\x37\x00\x03\x00\ +\x55\x7f\xf3\x5a\xad\x56\x54\x57\x0e\x24\x33\xe3\x08\xc8\x47\x21\ +\x57\xee\x80\xd3\x6a\x2e\xcf\xb2\x4c\xce\x81\x6b\xb9\xae\xbb\x01\ +\x74\xe5\x0a\xf0\x8c\x1a\xe2\xb0\x54\x02\xe0\xb3\x2c\x9b\x8a\xf8\ +\x1f\xe6\xf9\x95\x73\xdb\x78\xbd\x1b\x00\x00\x00\x00\x49\x45\x4e\ +\x44\xae\x42\x60\x82\ \x00\x00\x03\x6d\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -1791,6 +1854,11 @@ qt_resource_name = "\ \x00\x70\ \x00\x6c\x00\x75\x00\x67\x00\x69\x00\x6e\x00\x73\x00\x5f\x00\x72\x00\x73\x00\x70\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x13\ +\x0a\xdb\x46\xa7\ +\x00\x61\ +\x00\x63\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x5f\x00\x67\x00\x72\x00\x61\x00\x70\x00\x68\x00\x69\x00\x63\x00\x73\x00\x2e\x00\x70\ +\x00\x6e\x00\x67\ +\x00\x13\ \x05\x22\x3c\x27\ \x00\x61\ \x00\x63\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x5f\x00\x73\x00\x70\x00\x65\x00\x65\x00\x64\x00\x5f\x00\x75\x00\x70\x00\x2e\x00\x70\ @@ -1825,12 +1893,12 @@ qt_resource_name = "\ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x18\x00\x00\x00\x02\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x19\x00\x00\x00\x02\ \x00\x00\x00\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x54\ \x00\x00\x01\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x0f\ -\x00\x00\x03\x66\x00\x00\x00\x00\x00\x01\x00\x00\x56\xe4\ -\x00\x00\x02\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x4b\xf6\ -\x00\x00\x03\x90\x00\x00\x00\x00\x00\x01\x00\x00\x58\xf3\ +\x00\x00\x03\x92\x00\x00\x00\x00\x00\x01\x00\x00\x5a\xae\ +\x00\x00\x03\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x4f\xc0\ +\x00\x00\x03\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x5c\xbd\ \x00\x00\x01\x76\x00\x00\x00\x00\x00\x01\x00\x00\x26\xc2\ \x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x14\x27\ \x00\x00\x01\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x2f\x1c\ @@ -1838,13 +1906,14 @@ qt_resource_struct = "\ \x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x2b\xae\ \x00\x00\x02\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x14\ \x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x04\xfc\ -\x00\x00\x03\x40\x00\x00\x00\x00\x00\x01\x00\x00\x54\xe6\ -\x00\x00\x03\xb6\x00\x00\x00\x00\x00\x01\x00\x00\x5d\xd9\ +\x00\x00\x03\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x58\xb0\ +\x00\x00\x02\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x4b\xf6\ +\x00\x00\x03\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x61\xa3\ \x00\x00\x02\x26\x00\x00\x00\x00\x00\x01\x00\x00\x36\x89\ \x00\x00\x01\xfe\x00\x00\x00\x00\x00\x01\x00\x00\x32\xbf\ \x00\x00\x00\xd8\x00\x00\x00\x00\x00\x01\x00\x00\x18\xaa\ -\x00\x00\x03\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x4f\x67\ -\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x62\xb2\ +\x00\x00\x03\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x53\x31\ +\x00\x00\x04\x08\x00\x00\x00\x00\x00\x01\x00\x00\x66\x7c\ \x00\x00\x00\x84\x00\x00\x00\x00\x00\x01\x00\x00\x0f\xb1\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ \x00\x00\x02\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x3e\x5a\ diff --git a/src/m64py/ui/images_rc.py b/src/m64py/ui/images_rc.py index 1ea1c01..6a35ea6 100644 --- a/src/m64py/ui/images_rc.py +++ b/src/m64py/ui/images_rc.py @@ -2,8 +2,8 @@ # Resource object code # -# Created: Sat Jun 23 10:26:19 2012 -# by: The Resource Compiler for PyQt (Qt v4.8.1) +# Created: Tue Sep 3 02:08:52 2013 +# by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! diff --git a/src/m64py/ui/input_ui.py b/src/m64py/ui/input_ui.py index 4ec1c17..3b38ea3 100644 --- a/src/m64py/ui/input_ui.py +++ b/src/m64py/ui/input_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'input.ui' # -# Created: Wed Jun 5 08:11:44 2013 -# by: PyQt4 UI code generator 4.10.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! diff --git a/src/m64py/ui/inputbutton.py b/src/m64py/ui/inputbutton.py index 8f6b009..cc24751 100644 --- a/src/m64py/ui/inputbutton.py +++ b/src/m64py/ui/inputbutton.py @@ -14,15 +14,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from PyQt4.QtGui import QPushButton, QKeySequence +from PyQt4.QtGui import QPushButton from PyQt4.QtCore import Qt, SIGNAL -try: - from SDL.constants import * -except ImportError, err: - sys.stderr.write("Error: Can't import SDL module%s%s%s" % ( - os.linesep, str(err), os.linesep)) - sys.exit(1) +from m64py.opts import SDL2 +from m64py.frontend.keymap import QT2SDL, QT2SDL2 +from m64py.SDL.constants import SDL_HAT_UP, SDL_HAT_RIGHT, SDL_HAT_DOWN, SDL_HAT_LEFT class InputButton(QPushButton): @@ -59,7 +56,7 @@ class InputButton(QPushButton): if modifier == Qt.NoModifier or modifier == Qt.KeypadModifier: key = event.key() else: - key = modifier + key = modifier.__int__() if key == Qt.Key_Escape: text = self.key @@ -68,12 +65,15 @@ class InputButton(QPushButton): text = "Select..." self.setCheckable(False) else: - text = QKeySequence(key).toString( - QKeySequence.PortableText) - if modifier != Qt.NoModifier: - text = text.replace("+", "") + if SDL2 or self.input.parent.worker.m64p.core_sdl2: + from m64py.SDL2.keyboard import SDL_GetScancodeName + text = SDL_GetScancodeName(QT2SDL2[key]) + else: + from m64py.SDL.keyboard import SDL_GetKeyName + text = SDL_GetKeyName(QT2SDL[key]).title() - self.setText(text) + text = text.replace("Left ", "") + self.setText(text.title()) self.clearFocus() def focusInEvent(self, event): diff --git a/src/m64py/ui/license_ui.py b/src/m64py/ui/license_ui.py index 63269a7..e04e12b 100644 --- a/src/m64py/ui/license_ui.py +++ b/src/m64py/ui/license_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'license.ui' # -# Created: Sat Jun 23 10:26:17 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_LicenseDialog(object): def setupUi(self, LicenseDialog): @@ -41,8 +50,8 @@ class Ui_LicenseDialog(object): QtCore.QMetaObject.connectSlotsByName(LicenseDialog) def retranslateUi(self, LicenseDialog): - LicenseDialog.setWindowTitle(QtGui.QApplication.translate("LicenseDialog", "License", None, QtGui.QApplication.UnicodeUTF8)) - self.textBrowser.setHtml(QtGui.QApplication.translate("LicenseDialog", "\n" + LicenseDialog.setWindowTitle(_translate("LicenseDialog", "License", None)) + self.textBrowser.setHtml(_translate("LicenseDialog", "\n" "\n" @@ -183,6 +192,6 @@ class Ui_LicenseDialog(object): "

under certain conditions; type `show c\' for details.

\n" "

The hypothetical commands `show w\' and `show c\' should show the appropriate parts of the General Public License. Of course, your program\'s commands might be different; for a GUI interface, you would use an “about box”.

\n" "

You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.

\n" -"

The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButton.setText(QtGui.QApplication.translate("LicenseDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8)) +"

The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

", None)) + self.pushButton.setText(_translate("LicenseDialog", "&Close", None)) diff --git a/src/m64py/ui/mainwindow.ui b/src/m64py/ui/mainwindow.ui index 0c3781f..f3eaa4f 100644 --- a/src/m64py/ui/mainwindow.ui +++ b/src/m64py/ui/mainwindow.ui @@ -48,7 +48,7 @@ 0 0 320 - 22 + 24 @@ -94,6 +94,7 @@ + @@ -608,6 +609,15 @@ QStatusBar { margin:0px; } F8 + + + + :/icons/action_graphics.png:/icons/action_graphics.png + + + Graphics + + diff --git a/src/m64py/ui/mainwindow_ui.py b/src/m64py/ui/mainwindow_ui.py index 15c7c92..4bcb246 100644 --- a/src/m64py/ui/mainwindow_ui.py +++ b/src/m64py/ui/mainwindow_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'mainwindow.ui' # -# Created: Fri Jun 7 18:55:40 2013 -# by: PyQt4 UI code generator 4.10.1 +# Created: Tue Sep 3 02:08:51 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -42,7 +42,7 @@ class Ui_MainWindow(object): self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) MainWindow.setCentralWidget(self.centralWidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 320, 22)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 320, 24)) self.menubar.setObjectName(_fromUtf8("menubar")) self.menuFile = QtGui.QMenu(self.menubar) self.menuFile.setObjectName(_fromUtf8("menuFile")) @@ -257,6 +257,11 @@ class Ui_MainWindow(object): self.actionSoftReset.setEnabled(False) self.actionSoftReset.setIcon(icon15) self.actionSoftReset.setObjectName(_fromUtf8("actionSoftReset")) + self.actionGraphics = QtGui.QAction(MainWindow) + icon19 = QtGui.QIcon() + icon19.addPixmap(QtGui.QPixmap(_fromUtf8(":/icons/action_graphics.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionGraphics.setIcon(icon19) + self.actionGraphics.setObjectName(_fromUtf8("actionGraphics")) self.menuLoad.addAction(self.actionManually) self.menuLoad.addAction(self.actionFromList) self.menuFile.addAction(self.menuLoad.menuAction()) @@ -276,6 +281,7 @@ class Ui_MainWindow(object): self.menuFile.addAction(self.actionQuit) self.menuSettings.addAction(self.actionPaths) self.menuSettings.addAction(self.actionEmulator) + self.menuSettings.addAction(self.actionGraphics) self.menuSettings.addAction(self.actionPlugins) self.menuHelp.addAction(self.actionAbout) self.menuHelp.addAction(self.actionLicense) @@ -371,6 +377,7 @@ class Ui_MainWindow(object): self.actionLimitFPS.setText(_translate("MainWindow", "Limit FPS", None)) self.actionSoftReset.setText(_translate("MainWindow", "Sof&t Reset", None)) self.actionSoftReset.setShortcut(_translate("MainWindow", "F8", None)) + self.actionGraphics.setText(_translate("MainWindow", "Graphics", None)) import images_rc import icons_rc diff --git a/src/m64py/ui/plugin_ui.py b/src/m64py/ui/plugin_ui.py index ddc06ed..fcf3c9f 100644 --- a/src/m64py/ui/plugin_ui.py +++ b/src/m64py/ui/plugin_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'plugin.ui' # -# Created: Sat Jun 23 10:26:18 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:52 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_PluginDialog(object): def setupUi(self, PluginDialog): @@ -84,5 +93,5 @@ class Ui_PluginDialog(object): QtCore.QMetaObject.connectSlotsByName(PluginDialog) def retranslateUi(self, PluginDialog): - self.pushButton.setText(QtGui.QApplication.translate("PluginDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8)) + self.pushButton.setText(_translate("PluginDialog", "&Close", None)) diff --git a/src/m64py/ui/pyuicrcc.sh b/src/m64py/ui/pyuicrcc.sh index 716c6cf..242d318 100755 --- a/src/m64py/ui/pyuicrcc.sh +++ b/src/m64py/ui/pyuicrcc.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash for x in *.ui; do pyuic4 ${x} > ${x/.ui/}_ui.py; done for x in *.qrc; do pyrcc4 ${x} > ${x/.qrc/}_rc.py; done diff --git a/src/m64py/ui/romlist_ui.py b/src/m64py/ui/romlist_ui.py index d20eb35..471d688 100644 --- a/src/m64py/ui/romlist_ui.py +++ b/src/m64py/ui/romlist_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'romlist.ui' # -# Created: Sat Jun 23 10:26:18 2012 -# by: PyQt4 UI code generator 4.9.1 +# Created: Tue Sep 3 02:08:52 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_ROMList(object): def setupUi(self, ROMList): @@ -181,15 +190,15 @@ class Ui_ROMList(object): QtCore.QMetaObject.connectSlotsByName(ROMList) def retranslateUi(self, ROMList): - ROMList.setWindowTitle(QtGui.QApplication.translate("ROMList", "Load ROM Image", None, QtGui.QApplication.UnicodeUTF8)) - self.groupROMList.setTitle(QtGui.QApplication.translate("ROMList", "ROMs List", None, QtGui.QApplication.UnicodeUTF8)) + ROMList.setWindowTitle(_translate("ROMList", "Load ROM Image", None)) + self.groupROMList.setTitle(_translate("ROMList", "ROMs List", None)) self.listWidget.setSortingEnabled(True) - self.groupTitle.setTitle(QtGui.QApplication.translate("ROMList", "Title Screen", None, QtGui.QApplication.UnicodeUTF8)) - self.groupSnapshot.setTitle(QtGui.QApplication.translate("ROMList", "In Game Snapshot", None, QtGui.QApplication.UnicodeUTF8)) - self.checkAvailable.setText(QtGui.QApplication.translate("ROMList", "Show available ROMs", None, QtGui.QApplication.UnicodeUTF8)) - self.pushRefresh.setText(QtGui.QApplication.translate("ROMList", "Refresh", None, QtGui.QApplication.UnicodeUTF8)) - self.labelAvailable.setText(QtGui.QApplication.translate("ROMList", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) - self.pushCancel.setText(QtGui.QApplication.translate("ROMList", "&Cancel", None, QtGui.QApplication.UnicodeUTF8)) - self.pushOpen.setText(QtGui.QApplication.translate("ROMList", "&Open", None, QtGui.QApplication.UnicodeUTF8)) + self.groupTitle.setTitle(_translate("ROMList", "Title Screen", None)) + self.groupSnapshot.setTitle(_translate("ROMList", "In Game Snapshot", None)) + self.checkAvailable.setText(_translate("ROMList", "Show available ROMs", None)) + self.pushRefresh.setText(_translate("ROMList", "Refresh", None)) + self.labelAvailable.setText(_translate("ROMList", "TextLabel", None)) + self.pushCancel.setText(_translate("ROMList", "&Cancel", None)) + self.pushOpen.setText(_translate("ROMList", "&Open", None)) from imageview import ImageView diff --git a/src/m64py/ui/settings.ui b/src/m64py/ui/settings.ui index ae6d21b..976bcf9 100644 --- a/src/m64py/ui/settings.ui +++ b/src/m64py/ui/settings.ui @@ -6,21 +6,21 @@ 0 0 - 509 - 397 + 507 + 392 Settings - + QTabWidget::Rounded - 1 + 2 @@ -31,7 +31,7 @@ 10 10 - 461 + 451 271 @@ -223,154 +223,32 @@ QGroupBox::title { Emulator - - - - - - - false - - - QGroupBox { - border: 1px solid #7F7F7F; - border-radius: 3px; - margin-top: 1ex; - padding: 4px 0 -; - } - -QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top left; - padding: 0 2px; - } - - - Graphics - - - false - - - false - - - - - - - - Used only when video extension is disabled - - - Fullscreen - - - - - - - On Screen Display - - - true - - - - - - - <html><head/><body><p>Enable embedding of OpenGL window. This option needs restart.</p></body></html> - - - Enable Video Extension - - - false - - - - - - - false - - - QGroupBox { - border: 1px solid #7F7F7F; - border-radius: 3px; - margin-top: 1ex; - } - -QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top left; - padding: 0 2px; - } - - - Resolution - - - false - - - false - - - - - - - - false - - - - 0 - 0 - - - - Used only when video extension is disabled - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - false - - - QGroupBox { + + + + 10 + 10 + 461 + 211 + + + + + + + + 0 + 0 + + + + false + + + QGroupBox { border: 1px solid #7F7F7F; border-radius: 3px; margin-top: 1ex; - padding: 4px 0; } QGroupBox::title { @@ -378,29 +256,34 @@ QGroupBox::title { subcontrol-position: top left; padding: 0 2px; } - - - CPU Core - - - false - - - false - - - - - - - false - - - QGroupBox { + + + CPU Core + + + false + + + false + + + + + + + + 0 + 0 + + + + false + + + QGroupBox { border: 1px solid #7F7F7F; border-radius: 3px; margin-top: 1ex; - padding: 4px 0; } QGroupBox::title { @@ -408,41 +291,230 @@ QGroupBox::title { subcontrol-position: top left; padding: 0 2px; } + + + Compatibility + + + false + + + false + + + + + + + + No Compiled Jump + + + + + + + Disable Extra Memory + + + + + + + + + + + + + + Graphics + + + + + 11 + 10 + 461 + 233 + + + + + + + + 0 + 0 + + + + false + + + QGroupBox { + border: 1px solid #7F7F7F; + border-radius: 3px; + margin-top: 1ex; + } + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; + padding: 0 2px; + } + + + Graphics + + + false + + + false + + + + 6 - - Compatibility - - - false - - - false - - - - - - - - No Compiled Jump - - - - - - - Disable Extra Memory - - - - - - - - - - - + + + + 6 + + + + + On Screen Display + + + true + + + + + + + Disables ScreenSaver when emulator is running + + + Disable ScreenSaver + + + + + + + Enable embedding of OpenGL window. This option needs restart. + + + Enable Video Extension + + + false + + + + + + + Maintain aspect-ratio on resizing + + + Keep Aspect Ratio + + + + + + + + + + + + + 0 + 0 + + + + false + + + QGroupBox { + border: 1px solid #7F7F7F; + border-radius: 3px; + margin-top: 1ex; + } + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; + padding: 0 2px; + } + + + Resolution + + + false + + + false + + + + + + Fullscreen, used only when video extension is disabled + + + Fullscreen + + + false + + + + + + + + + false + + + + 0 + 0 + + + + Used only when video extension is disabled + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + diff --git a/src/m64py/ui/settings_ui.py b/src/m64py/ui/settings_ui.py index f76ad3d..7283554 100644 --- a/src/m64py/ui/settings_ui.py +++ b/src/m64py/ui/settings_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'settings.ui' # -# Created: Wed Jun 5 09:01:17 2013 -# by: PyQt4 UI code generator 4.10.1 +# Created: Tue Sep 3 02:08:52 2013 +# by: PyQt4 UI code generator 4.10.2 # # WARNING! All changes made in this file will be lost! @@ -26,16 +26,16 @@ except AttributeError: class Ui_Settings(object): def setupUi(self, Settings): Settings.setObjectName(_fromUtf8("Settings")) - Settings.resize(509, 397) - self.verticalLayout_2 = QtGui.QVBoxLayout(Settings) - self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) + Settings.resize(507, 392) + self.verticalLayout_14 = QtGui.QVBoxLayout(Settings) + self.verticalLayout_14.setObjectName(_fromUtf8("verticalLayout_14")) self.tabWidget = QtGui.QTabWidget(Settings) self.tabWidget.setTabShape(QtGui.QTabWidget.Rounded) self.tabWidget.setObjectName(_fromUtf8("tabWidget")) self.tab_1 = QtGui.QWidget() self.tab_1.setObjectName(_fromUtf8("tab_1")) self.layoutWidget = QtGui.QWidget(self.tab_1) - self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 461, 271)) + self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 451, 271)) self.layoutWidget.setObjectName(_fromUtf8("layoutWidget")) self.verticalLayout_13 = QtGui.QVBoxLayout(self.layoutWidget) self.verticalLayout_13.setMargin(0) @@ -155,85 +155,23 @@ class Ui_Settings(object): self.tabWidget.addTab(self.tab_1, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) - self.verticalLayout_14 = QtGui.QVBoxLayout(self.tab_2) - self.verticalLayout_14.setObjectName(_fromUtf8("verticalLayout_14")) - self.verticalLayout_10 = QtGui.QVBoxLayout() + self.widget = QtGui.QWidget(self.tab_2) + self.widget.setGeometry(QtCore.QRect(10, 10, 461, 211)) + self.widget.setObjectName(_fromUtf8("widget")) + self.verticalLayout_10 = QtGui.QVBoxLayout(self.widget) + self.verticalLayout_10.setMargin(0) self.verticalLayout_10.setObjectName(_fromUtf8("verticalLayout_10")) - self.groupGraphics = QtGui.QGroupBox(self.tab_2) - self.groupGraphics.setAutoFillBackground(False) - self.groupGraphics.setStyleSheet(_fromUtf8("QGroupBox {\n" -" border: 1px solid #7F7F7F;\n" -" border-radius: 3px;\n" -" margin-top: 1ex; \n" -" padding: 4px 0\n" -";\n" -" }\n" -"\n" -"QGroupBox::title {\n" -" subcontrol-origin: margin;\n" -" subcontrol-position: top left; \n" -" padding: 0 2px;\n" -" }")) - self.groupGraphics.setFlat(False) - self.groupGraphics.setCheckable(False) - self.groupGraphics.setObjectName(_fromUtf8("groupGraphics")) - self.verticalLayout_18 = QtGui.QVBoxLayout(self.groupGraphics) - self.verticalLayout_18.setObjectName(_fromUtf8("verticalLayout_18")) - self.verticalLayout_15 = QtGui.QVBoxLayout() - self.verticalLayout_15.setObjectName(_fromUtf8("verticalLayout_15")) - self.checkFullscreen = QtGui.QCheckBox(self.groupGraphics) - self.checkFullscreen.setObjectName(_fromUtf8("checkFullscreen")) - self.verticalLayout_15.addWidget(self.checkFullscreen) - self.checkOSD = QtGui.QCheckBox(self.groupGraphics) - self.checkOSD.setChecked(True) - self.checkOSD.setObjectName(_fromUtf8("checkOSD")) - self.verticalLayout_15.addWidget(self.checkOSD) - self.checkEnableVidExt = QtGui.QCheckBox(self.groupGraphics) - self.checkEnableVidExt.setChecked(False) - self.checkEnableVidExt.setObjectName(_fromUtf8("checkEnableVidExt")) - self.verticalLayout_15.addWidget(self.checkEnableVidExt) - self.groupResolution = QtGui.QGroupBox(self.groupGraphics) - self.groupResolution.setAutoFillBackground(False) - self.groupResolution.setStyleSheet(_fromUtf8("QGroupBox {\n" -" border: 1px solid #7F7F7F;\n" -" border-radius: 3px;\n" -" margin-top: 1ex; \n" -" }\n" -"\n" -"QGroupBox::title {\n" -" subcontrol-origin: margin;\n" -" subcontrol-position: top left; \n" -" padding: 0 2px;\n" -" }")) - self.groupResolution.setFlat(False) - self.groupResolution.setCheckable(False) - self.groupResolution.setObjectName(_fromUtf8("groupResolution")) - self.verticalLayout_11 = QtGui.QVBoxLayout(self.groupResolution) - self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11")) - self.horizontalLayout_10 = QtGui.QHBoxLayout() - self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10")) - self.comboResolution = QtGui.QComboBox(self.groupResolution) - self.comboResolution.setEnabled(False) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + self.groupEmuMode = QtGui.QGroupBox(self.widget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.comboResolution.sizePolicy().hasHeightForWidth()) - self.comboResolution.setSizePolicy(sizePolicy) - self.comboResolution.setObjectName(_fromUtf8("comboResolution")) - self.horizontalLayout_10.addWidget(self.comboResolution) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_10.addItem(spacerItem) - self.verticalLayout_11.addLayout(self.horizontalLayout_10) - self.verticalLayout_15.addWidget(self.groupResolution) - self.verticalLayout_18.addLayout(self.verticalLayout_15) - self.verticalLayout_10.addWidget(self.groupGraphics) - self.groupEmuMode = QtGui.QGroupBox(self.tab_2) + sizePolicy.setHeightForWidth(self.groupEmuMode.sizePolicy().hasHeightForWidth()) + self.groupEmuMode.setSizePolicy(sizePolicy) self.groupEmuMode.setAutoFillBackground(False) self.groupEmuMode.setStyleSheet(_fromUtf8("QGroupBox {\n" " border: 1px solid #7F7F7F;\n" " border-radius: 3px;\n" " margin-top: 1ex;\n" -" padding: 4px 0;\n" " }\n" "\n" "QGroupBox::title {\n" @@ -245,13 +183,17 @@ class Ui_Settings(object): self.groupEmuMode.setCheckable(False) self.groupEmuMode.setObjectName(_fromUtf8("groupEmuMode")) self.verticalLayout_10.addWidget(self.groupEmuMode) - self.groupEmuMode_2 = QtGui.QGroupBox(self.tab_2) + self.groupEmuMode_2 = QtGui.QGroupBox(self.widget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.groupEmuMode_2.sizePolicy().hasHeightForWidth()) + self.groupEmuMode_2.setSizePolicy(sizePolicy) self.groupEmuMode_2.setAutoFillBackground(False) self.groupEmuMode_2.setStyleSheet(_fromUtf8("QGroupBox {\n" " border: 1px solid #7F7F7F;\n" " border-radius: 3px;\n" " margin-top: 1ex;\n" -" padding: 4px 0;\n" " }\n" "\n" "QGroupBox::title {\n" @@ -274,8 +216,101 @@ class Ui_Settings(object): self.verticalLayout_16.addWidget(self.checkDisableExtraMem) self.verticalLayout_17.addLayout(self.verticalLayout_16) self.verticalLayout_10.addWidget(self.groupEmuMode_2) - self.verticalLayout_14.addLayout(self.verticalLayout_10) self.tabWidget.addTab(self.tab_2, _fromUtf8("")) + self.tab_4 = QtGui.QWidget() + self.tab_4.setObjectName(_fromUtf8("tab_4")) + self.widget1 = QtGui.QWidget(self.tab_4) + self.widget1.setGeometry(QtCore.QRect(11, 10, 461, 233)) + self.widget1.setObjectName(_fromUtf8("widget1")) + self.verticalLayout_18 = QtGui.QVBoxLayout(self.widget1) + self.verticalLayout_18.setMargin(0) + self.verticalLayout_18.setObjectName(_fromUtf8("verticalLayout_18")) + self.groupGraphics = QtGui.QGroupBox(self.widget1) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.groupGraphics.sizePolicy().hasHeightForWidth()) + self.groupGraphics.setSizePolicy(sizePolicy) + self.groupGraphics.setAutoFillBackground(False) + self.groupGraphics.setStyleSheet(_fromUtf8("QGroupBox {\n" +" border: 1px solid #7F7F7F;\n" +" border-radius: 3px;\n" +" margin-top: 1ex;\n" +" }\n" +"\n" +"QGroupBox::title {\n" +" subcontrol-origin: margin;\n" +" subcontrol-position: top left; \n" +" padding: 0 2px;\n" +" }")) + self.groupGraphics.setFlat(False) + self.groupGraphics.setCheckable(False) + self.groupGraphics.setObjectName(_fromUtf8("groupGraphics")) + self.verticalLayout_15 = QtGui.QVBoxLayout(self.groupGraphics) + self.verticalLayout_15.setSpacing(6) + self.verticalLayout_15.setObjectName(_fromUtf8("verticalLayout_15")) + self.verticalLayout_2 = QtGui.QVBoxLayout() + self.verticalLayout_2.setSpacing(6) + self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) + self.checkOSD = QtGui.QCheckBox(self.groupGraphics) + self.checkOSD.setChecked(True) + self.checkOSD.setObjectName(_fromUtf8("checkOSD")) + self.verticalLayout_2.addWidget(self.checkOSD) + self.checkDisableScreenSaver = QtGui.QCheckBox(self.groupGraphics) + self.checkDisableScreenSaver.setObjectName(_fromUtf8("checkDisableScreenSaver")) + self.verticalLayout_2.addWidget(self.checkDisableScreenSaver) + self.checkEnableVidExt = QtGui.QCheckBox(self.groupGraphics) + self.checkEnableVidExt.setChecked(False) + self.checkEnableVidExt.setObjectName(_fromUtf8("checkEnableVidExt")) + self.verticalLayout_2.addWidget(self.checkEnableVidExt) + self.checkKeepAspect = QtGui.QCheckBox(self.groupGraphics) + self.checkKeepAspect.setObjectName(_fromUtf8("checkKeepAspect")) + self.verticalLayout_2.addWidget(self.checkKeepAspect) + self.verticalLayout_15.addLayout(self.verticalLayout_2) + self.verticalLayout_18.addWidget(self.groupGraphics) + self.groupResolution = QtGui.QGroupBox(self.widget1) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.groupResolution.sizePolicy().hasHeightForWidth()) + self.groupResolution.setSizePolicy(sizePolicy) + self.groupResolution.setAutoFillBackground(False) + self.groupResolution.setStyleSheet(_fromUtf8("QGroupBox {\n" +" border: 1px solid #7F7F7F;\n" +" border-radius: 3px;\n" +" margin-top: 1ex;\n" +" }\n" +"\n" +"QGroupBox::title {\n" +" subcontrol-origin: margin;\n" +" subcontrol-position: top left; \n" +" padding: 0 2px;\n" +" }")) + self.groupResolution.setFlat(False) + self.groupResolution.setCheckable(False) + self.groupResolution.setObjectName(_fromUtf8("groupResolution")) + self.verticalLayout_11 = QtGui.QVBoxLayout(self.groupResolution) + self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11")) + self.checkFullscreen = QtGui.QCheckBox(self.groupResolution) + self.checkFullscreen.setChecked(False) + self.checkFullscreen.setObjectName(_fromUtf8("checkFullscreen")) + self.verticalLayout_11.addWidget(self.checkFullscreen) + self.horizontalLayout_10 = QtGui.QHBoxLayout() + self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10")) + self.comboResolution = QtGui.QComboBox(self.groupResolution) + self.comboResolution.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboResolution.sizePolicy().hasHeightForWidth()) + self.comboResolution.setSizePolicy(sizePolicy) + self.comboResolution.setObjectName(_fromUtf8("comboResolution")) + self.horizontalLayout_10.addWidget(self.comboResolution) + spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_10.addItem(spacerItem) + self.verticalLayout_11.addLayout(self.horizontalLayout_10) + self.verticalLayout_18.addWidget(self.groupResolution) + self.tabWidget.addTab(self.tab_4, _fromUtf8("")) self.tab_3 = QtGui.QWidget() self.tab_3.setObjectName(_fromUtf8("tab_3")) self.layoutWidget1 = QtGui.QWidget(self.tab_3) @@ -441,7 +476,7 @@ class Ui_Settings(object): self.verticalLayout_5.addLayout(self.horizontalLayout_9) self.verticalLayout_12.addWidget(self.groupRSP) self.tabWidget.addTab(self.tab_3, _fromUtf8("")) - self.verticalLayout_2.addWidget(self.tabWidget) + self.verticalLayout_14.addWidget(self.tabWidget) self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) spacerItem1 = QtGui.QSpacerItem(368, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) @@ -449,10 +484,10 @@ class Ui_Settings(object): self.closeButton = QtGui.QPushButton(Settings) self.closeButton.setObjectName(_fromUtf8("closeButton")) self.horizontalLayout_2.addWidget(self.closeButton) - self.verticalLayout_2.addLayout(self.horizontalLayout_2) + self.verticalLayout_14.addLayout(self.horizontalLayout_2) self.retranslateUi(Settings) - self.tabWidget.setCurrentIndex(1) + self.tabWidget.setCurrentIndex(2) QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL(_fromUtf8("clicked()")), Settings.close) QtCore.QMetaObject.connectSlotsByName(Settings) @@ -467,19 +502,24 @@ class Ui_Settings(object): self.groupROM.setTitle(_translate("Settings", "ROMs directory", None)) self.browseROM.setText(_translate("Settings", "Browse", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_1), _translate("Settings", "Paths", None)) - self.groupGraphics.setTitle(_translate("Settings", "Graphics", None)) - self.checkFullscreen.setToolTip(_translate("Settings", "Used only when video extension is disabled", None)) - self.checkFullscreen.setText(_translate("Settings", "Fullscreen", None)) - self.checkOSD.setText(_translate("Settings", "On Screen Display", None)) - self.checkEnableVidExt.setToolTip(_translate("Settings", "

Enable embedding of OpenGL window. This option needs restart.

", None)) - self.checkEnableVidExt.setText(_translate("Settings", "Enable Video Extension", None)) - self.groupResolution.setTitle(_translate("Settings", "Resolution", None)) - self.comboResolution.setToolTip(_translate("Settings", "Used only when video extension is disabled", None)) self.groupEmuMode.setTitle(_translate("Settings", "CPU Core", None)) self.groupEmuMode_2.setTitle(_translate("Settings", "Compatibility", None)) self.checkNoCompiledJump.setText(_translate("Settings", "No Compiled Jump", None)) self.checkDisableExtraMem.setText(_translate("Settings", "Disable Extra Memory", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("Settings", "Emulator", None)) + self.groupGraphics.setTitle(_translate("Settings", "Graphics", None)) + self.checkOSD.setText(_translate("Settings", "On Screen Display", None)) + self.checkDisableScreenSaver.setToolTip(_translate("Settings", "Disables ScreenSaver when emulator is running", None)) + self.checkDisableScreenSaver.setText(_translate("Settings", "Disable ScreenSaver", None)) + self.checkEnableVidExt.setToolTip(_translate("Settings", "Enable embedding of OpenGL window. This option needs restart.", None)) + self.checkEnableVidExt.setText(_translate("Settings", "Enable Video Extension", None)) + self.checkKeepAspect.setToolTip(_translate("Settings", "Maintain aspect-ratio on resizing", None)) + self.checkKeepAspect.setText(_translate("Settings", "Keep Aspect Ratio", None)) + self.groupResolution.setTitle(_translate("Settings", "Resolution", None)) + self.checkFullscreen.setToolTip(_translate("Settings", "Fullscreen, used only when video extension is disabled", None)) + self.checkFullscreen.setText(_translate("Settings", "Fullscreen", None)) + self.comboResolution.setToolTip(_translate("Settings", "Used only when video extension is disabled", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("Settings", "Graphics", None)) self.groupVideo.setTitle(_translate("Settings", "Video", None)) self.pushButtonVideo.setText(_translate("Settings", "Configure", None)) self.groupAudio.setTitle(_translate("Settings", "Audio", None))