Skip to content

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

puae 2.3.1

parent 2dd5ee19
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 52 deletions
src/gui-qt/puae_bridge.cpp
View file @ 1b9788e8
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
*/ */
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QMessageBox>
#include <QThread> #include <QThread>
#include "puae_bridge.h" #include "puae_bridge.h"
#include "puae_mainwindow.h" #include "puae_mainwindow.h"
//#include "ui_puae_mainwindow.h" //#include "ui_puae_mainwindow.h"
static unsigned int gui_available;
extern "C" { extern "C" {
#include "gui.h" #include "gui.h"
#include "options.h" #include "options.h"
...@@ -79,6 +82,17 @@ void gui_display (int shortcut) ...@@ -79,6 +82,17 @@ void gui_display (int shortcut)
extern "C" void gui_message (const char *format,...) extern "C" void gui_message (const char *format,...)
{ {
char msg[2048];
va_list parms;
va_start (parms, format);
vsprintf (msg, format, parms);
va_end (parms);
if (gui_available)
QMessageBox::information(0, "PUAE", msg);
// write_log (msg);
} }
void gui_fps (int fps, int idle) void gui_fps (int fps, int idle)
......
src/gui-qt/puae_mainwindow.ui
View file @ 1b9788e8
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>PUAE 2.3.0</string> <string>PUAE 2.3.1</string>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<widget class="QWidget" name="horizontalLayoutWidget"> <widget class="QWidget" name="horizontalLayoutWidget">
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<item> <item>
<widget class="QTabWidget" name="tab_main"> <widget class="QTabWidget" name="tab_main">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="tab_about"> <widget class="QWidget" name="tab_about">
<attribute name="title"> <attribute name="title">
...@@ -201,6 +201,12 @@ ...@@ -201,6 +201,12 @@
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
<property name="font">
<font>
<family>Verdana</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
...@@ -214,6 +220,12 @@ ...@@ -214,6 +220,12 @@
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="font">
<font>
<family>Verdana</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>System ROMs:</string> <string>System ROMs:</string>
</property> </property>
...@@ -925,7 +937,7 @@ ...@@ -925,7 +937,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget_2"> <widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex"> <property name="currentIndex">
<number>7</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_hw_cpu"> <widget class="QWidget" name="tab_hw_cpu">
<attribute name="title"> <attribute name="title">
...@@ -1083,7 +1095,7 @@ ...@@ -1083,7 +1095,7 @@
<x>5</x> <x>5</x>
<y>250</y> <y>250</y>
<width>160</width> <width>160</width>
<height>135</height> <height>130</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
...@@ -1163,7 +1175,7 @@ ...@@ -1163,7 +1175,7 @@
<rect> <rect>
<x>170</x> <x>170</x>
<y>1</y> <y>1</y>
<width>346</width> <width>340</width>
<height>141</height> <height>141</height>
</rect> </rect>
</property> </property>
...@@ -1282,9 +1294,9 @@ ...@@ -1282,9 +1294,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>170</x> <x>170</x>
<y>255</y> <y>250</y>
<width>346</width> <width>340</width>
<height>131</height> <height>130</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
...@@ -1413,7 +1425,7 @@ ...@@ -1413,7 +1425,7 @@
<rect> <rect>
<x>170</x> <x>170</x>
<y>160</y> <y>160</y>
<width>346</width> <width>340</width>
<height>80</height> <height>80</height>
</rect> </rect>
</property> </property>
...@@ -1674,7 +1686,7 @@ ...@@ -1674,7 +1686,7 @@
<rect> <rect>
<x>260</x> <x>260</x>
<y>0</y> <y>0</y>
<width>255</width> <width>250</width>
<height>180</height> <height>180</height>
</rect> </rect>
</property> </property>
...@@ -1726,7 +1738,7 @@ ...@@ -1726,7 +1738,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>191</y> <y>191</y>
<width>506</width> <width>505</width>
<height>75</height> <height>75</height>
</rect> </rect>
</property> </property>
...@@ -1854,7 +1866,7 @@ ...@@ -1854,7 +1866,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>35</y> <y>35</y>
<width>511</width> <width>505</width>
<height>55</height> <height>55</height>
</rect> </rect>
</property> </property>
...@@ -1922,7 +1934,7 @@ ...@@ -1922,7 +1934,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>95</y> <y>95</y>
<width>511</width> <width>505</width>
<height>50</height> <height>50</height>
</rect> </rect>
</property> </property>
...@@ -2417,7 +2429,7 @@ ...@@ -2417,7 +2429,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>25</y> <y>25</y>
<width>511</width> <width>505</width>
<height>160</height> <height>160</height>
</rect> </rect>
</property> </property>
...@@ -2534,7 +2546,7 @@ ...@@ -2534,7 +2546,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>210</y> <y>210</y>
<width>511</width> <width>505</width>
<height>135</height> <height>135</height>
</rect> </rect>
</property> </property>
...@@ -2624,7 +2636,7 @@ ...@@ -2624,7 +2636,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>20</y> <y>20</y>
<width>511</width> <width>505</width>
<height>110</height> <height>110</height>
</rect> </rect>
</property> </property>
...@@ -2808,7 +2820,7 @@ ...@@ -2808,7 +2820,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>155</y> <y>155</y>
<width>511</width> <width>505</width>
<height>110</height> <height>110</height>
</rect> </rect>
</property> </property>
...@@ -2920,7 +2932,7 @@ ...@@ -2920,7 +2932,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>304</y> <y>304</y>
<width>511</width> <width>505</width>
<height>80</height> <height>80</height>
</rect> </rect>
</property> </property>
...@@ -3017,7 +3029,7 @@ ...@@ -3017,7 +3029,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>249</y> <y>249</y>
<width>511</width> <width>505</width>
<height>46</height> <height>46</height>
</rect> </rect>
</property> </property>
...@@ -3028,9 +3040,9 @@ ...@@ -3028,9 +3040,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>322</x> <x>322</x>
<y>15</y> <y>20</y>
<width>176</width> <width>176</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
...@@ -3063,7 +3075,7 @@ ...@@ -3063,7 +3075,7 @@
<widget class="QPushButton" name="IDC_DF0"> <widget class="QPushButton" name="IDC_DF0">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>489</x> <x>480</x>
<y>5</y> <y>5</y>
<width>25</width> <width>25</width>
<height>26</height> <height>26</height>
...@@ -3217,7 +3229,7 @@ ...@@ -3217,7 +3229,7 @@
<widget class="QPushButton" name="IDC_DF1"> <widget class="QPushButton" name="IDC_DF1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>489</x> <x>480</x>
<y>65</y> <y>65</y>
<width>25</width> <width>25</width>
<height>26</height> <height>26</height>
...@@ -3269,7 +3281,7 @@ ...@@ -3269,7 +3281,7 @@
<widget class="QPushButton" name="IDC_DF3"> <widget class="QPushButton" name="IDC_DF3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>491</x> <x>480</x>
<y>185</y> <y>185</y>
<width>25</width> <width>25</width>
<height>26</height> <height>26</height>
...@@ -3356,7 +3368,7 @@ ...@@ -3356,7 +3368,7 @@
<widget class="QComboBox" name="IDC_DF2TEXT"> <widget class="QComboBox" name="IDC_DF2TEXT">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>7</x> <x>5</x>
<y>155</y> <y>155</y>
<width>510</width> <width>510</width>
<height>25</height> <height>25</height>
...@@ -3401,7 +3413,7 @@ ...@@ -3401,7 +3413,7 @@
<widget class="QPushButton" name="IDC_DF2"> <widget class="QPushButton" name="IDC_DF2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>491</x> <x>480</x>
<y>125</y> <y>125</y>
<width>25</width> <width>25</width>
<height>26</height> <height>26</height>
...@@ -3427,7 +3439,7 @@ ...@@ -3427,7 +3439,7 @@
<widget class="QComboBox" name="IDC_DF3TEXT"> <widget class="QComboBox" name="IDC_DF3TEXT">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>7</x> <x>5</x>
<y>215</y> <y>215</y>
<width>510</width> <width>510</width>
<height>25</height> <height>25</height>
...@@ -3457,7 +3469,7 @@ ...@@ -3457,7 +3469,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>5</y> <y>5</y>
<width>511</width> <width>505</width>
<height>192</height> <height>192</height>
</rect> </rect>
</property> </property>
...@@ -3635,9 +3647,9 @@ ...@@ -3635,9 +3647,9 @@
<widget class="QPushButton" name="IDC_REMOVE"> <widget class="QPushButton" name="IDC_REMOVE">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>430</x> <x>424</x>
<y>310</y> <y>310</y>
<width>80</width> <width>86</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
...@@ -3648,9 +3660,9 @@ ...@@ -3648,9 +3660,9 @@
<widget class="QPushButton" name="IDC_EDIT"> <widget class="QPushButton" name="IDC_EDIT">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>430</x> <x>424</x>
<y>335</y> <y>335</y>
<width>80</width> <width>86</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
...@@ -3668,7 +3680,7 @@ ...@@ -3668,7 +3680,7 @@
<rect> <rect>
<x>5</x> <x>5</x>
<y>15</y> <y>15</y>
<width>510</width> <width>505</width>
<height>221</height> <height>221</height>
</rect> </rect>
</property> </property>
...@@ -3920,7 +3932,7 @@ ...@@ -3920,7 +3932,7 @@
<rect> <rect>
<x>220</x> <x>220</x>
<y>265</y> <y>265</y>
<width>296</width> <width>290</width>
<height>100</height> <height>100</height>
</rect> </rect>
</property> </property>
...@@ -3932,7 +3944,7 @@ ...@@ -3932,7 +3944,7 @@
<rect> <rect>
<x>15</x> <x>15</x>
<y>20</y> <y>20</y>
<width>171</width> <width>140</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
...@@ -3992,7 +4004,7 @@ ...@@ -3992,7 +4004,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>526</width> <width>648</width>
<height>416</height> <height>416</height>
</rect> </rect>
</property> </property>
...@@ -4000,7 +4012,7 @@ ...@@ -4000,7 +4012,7 @@
<item> <item>
<widget class="QTabWidget" name="tab_host_main"> <widget class="QTabWidget" name="tab_host_main">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_host_display"> <widget class="QWidget" name="tab_host_display">
<attribute name="title"> <attribute name="title">
...@@ -4022,7 +4034,7 @@ ...@@ -4022,7 +4034,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>100</x>
<y>15</y> <y>20</y>
<width>396</width> <width>396</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -4089,7 +4101,7 @@ ...@@ -4089,7 +4101,7 @@
<x>100</x> <x>100</x>
<y>80</y> <y>80</y>
<width>76</width> <width>76</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -4099,7 +4111,7 @@ ...@@ -4099,7 +4111,7 @@
<x>190</x> <x>190</x>
<y>80</y> <y>80</y>
<width>76</width> <width>76</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -4146,7 +4158,7 @@ ...@@ -4146,7 +4158,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>205</x> <x>205</x>
<y>15</y> <y>20</y>
<width>181</width> <width>181</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -4181,7 +4193,7 @@ ...@@ -4181,7 +4193,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>115</x> <x>115</x>
<y>20</y> <y>25</y>
<width>86</width> <width>86</width>
<height>15</height> <height>15</height>
</rect> </rect>
...@@ -4194,7 +4206,7 @@ ...@@ -4194,7 +4206,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>205</x> <x>205</x>
<y>40</y> <y>45</y>
<width>181</width> <width>181</width>
<height>25</height> <height>25</height>
</rect> </rect>
...@@ -4204,7 +4216,7 @@ ...@@ -4204,7 +4216,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>130</x> <x>130</x>
<y>45</y> <y>50</y>
<width>86</width> <width>86</width>
<height>15</height> <height>15</height>
</rect> </rect>
...@@ -4325,7 +4337,7 @@ ...@@ -4325,7 +4337,7 @@
<x>270</x> <x>270</x>
<y>155</y> <y>155</y>
<width>113</width> <width>113</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -4348,7 +4360,7 @@ ...@@ -4348,7 +4360,7 @@
<x>342</x> <x>342</x>
<y>185</y> <y>185</y>
<width>41</width> <width>41</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -4648,9 +4660,9 @@ ...@@ -4648,9 +4660,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>225</x> <x>225</x>
<y>15</y> <y>20</y>
<width>61</width> <width>61</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -4693,9 +4705,9 @@ ...@@ -4693,9 +4705,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>225</x> <x>225</x>
<y>15</y> <y>20</y>
<width>61</width> <width>61</width>
<height>25</height> <height>20</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -6189,7 +6201,7 @@ ...@@ -6189,7 +6201,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>703</width> <width>703</width>
<height>23</height> <height>22</height>
</rect> </rect>
</property> </property>
</widget> </widget>
......
src/picasso96.c
View file @ 1b9788e8
...@@ -59,7 +59,7 @@ int p96hack_vpos, p96hack_vpos2, p96refresh_active; ...@@ -59,7 +59,7 @@ int p96hack_vpos, p96hack_vpos2, p96refresh_active;
#define NOBLITTER 0 #define NOBLITTER 0
#define NOBLITTER_BLIT 0 #define NOBLITTER_BLIT 0
#define USE_HARDWARESPRITE 1 #define USE_HARDWARESPRITE 1
#define P96TRACING_ENABLED 1 #define P96TRACING_ENABLED 0
#define P96SPRTRACING_ENABLED 0 #define P96SPRTRACING_ENABLED 0
static int hwsprite = 0; static int hwsprite = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment