OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BUILD] Set SOVERSION and GIT hash automatically.
[csp-qt/common_source_project-fm7.git]
/
source
/
src
/
qt
/
gui
/
mainwidget_base.h
diff --git
a/source/src/qt/gui/mainwidget_base.h
b/source/src/qt/gui/mainwidget_base.h
index
daca6d3
..
6278335
100644
(file)
--- a/
source/src/qt/gui/mainwidget_base.h
+++ b/
source/src/qt/gui/mainwidget_base.h
@@
-88,12
+88,12
@@
QT_BEGIN_NAMESPACE
__action[_i]->setEnabled(__enabled); \
__action[_i]->binds->setValue1(_i); \
__menu->addAction(__action[_i]); \
__action[_i]->setEnabled(__enabled); \
__action[_i]->binds->setValue1(_i); \
__menu->addAction(__action[_i]); \
- if(
using_flags->get_config_ptr()
->__cnf[_i][0]) __action[_i]->setChecked(true); \
+ if(
p_config
->__cnf[_i][0]) __action[_i]->setChecked(true); \
connect(__action[_i], __signal1, __action[_i], __slot1); \
connect(__action[_i], __signal2, this, __slot2); \
} \
connect(__action[_i], __signal1, __action[_i], __slot1); \
connect(__action[_i], __signal2, this, __slot2); \
} \
-
+class OSD;
class QVariant;
class QAction;
class QActionGroup;
class QVariant;
class QAction;
class QActionGroup;
@@
-162,6
+162,7
@@
private:
// Screen
QActionGroup *actionGroup_Stretch;
QActionGroup *actionGroup_SetRenderPlatform;
// Screen
QActionGroup *actionGroup_Stretch;
QActionGroup *actionGroup_SetRenderPlatform;
+ QActionGroup *actionGroup_RotateType;
class Action_Control *action_ScreenSeparateThread;
class Action_Control *action_ScreenUseOSD;
class Action_Control *actionZoom;
class Action_Control *action_ScreenSeparateThread;
class Action_Control *action_ScreenUseOSD;
class Action_Control *actionZoom;
@@
-169,7
+170,8
@@
private:
class Action_Control *actionScanLine;
class Action_Control *actionGLScanLineHoriz;
class Action_Control *actionGLScanLineVert;
class Action_Control *actionScanLine;
class Action_Control *actionGLScanLineHoriz;
class Action_Control *actionGLScanLineVert;
- class Action_Control *actionRotate;
+
+ class Action_Control *actionRotate[4];
class Action_Control *actionCRT_Filter;
class Action_Control *actionOpenGL_Filter;
class Action_Control *actionDot_by_Dot;
class Action_Control *actionCRT_Filter;
class Action_Control *actionOpenGL_Filter;
class Action_Control *actionDot_by_Dot;
@@
-414,6
+416,7
@@
protected:
QMenu *menuStretch_Mode;
QMenu *menuScreenSize;
QMenu *menuScreen_Render;
QMenu *menuStretch_Mode;
QMenu *menuScreenSize;
QMenu *menuScreen_Render;
+ QMenu *menuScreen_Rotate;
QMenu *menuCpuType;
QMenu *menuBootMode;
QMenu *menuCpuType;
QMenu *menuBootMode;
@@
-521,6
+524,11
@@
public:
bool get_direct_load_mzt(int drive);
virtual bool GetPowerState(void);
void set_logger(CSP_Logger *logger) { csp_logger = logger; }
bool get_direct_load_mzt(int drive);
virtual bool GetPowerState(void);
void set_logger(CSP_Logger *logger) { csp_logger = logger; }
+
+ virtual QString get_system_version();
+ virtual QString get_build_date();
+ QString get_gui_version();
+
// Basic slots
public slots:
void delete_emu_thread(void);
// Basic slots
public slots:
void delete_emu_thread(void);
@@
-535,6
+543,7
@@
public slots:
void do_update_volume(int level);
void set_screen_aspect(int num);
void set_screen_size(int w, int h);
void do_update_volume(int level);
void set_screen_aspect(int num);
void set_screen_size(int w, int h);
+ void do_set_screen_rotate(int type);
void OnReset(void);
void OnSpecialReset(void);
virtual void do_set_mouse_enable(bool flag);
void OnReset(void);
void OnSpecialReset(void);
virtual void do_set_mouse_enable(bool flag);
@@
-555,7
+564,6
@@
public slots:
virtual void OnOpenDebugger(int n);
virtual void OnCloseDebugger(void);
void doBeforeCloseMainWindow(void);
virtual void OnOpenDebugger(int n);
virtual void OnCloseDebugger(void);
void doBeforeCloseMainWindow(void);
- void set_screen_rotate(bool);
void set_gl_crt_filter(bool);
void set_cpu_power(int pw) {
OnCpuPower(pw);
void set_gl_crt_filter(bool);
void set_cpu_power(int pw) {
OnCpuPower(pw);