Merge branch 'master' into fullscreenstaticonqt
This commit is contained in:
Miran Grča
GitHub
@@ -15,7 +15,7 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
@@ -37,7 +37,14 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="RendererStack" name="stackedWidget"/>
|
||||
<widget class="RendererStack" name="stackedWidget">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@@ -47,23 +54,33 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>724</width>
|
||||
<height>22</height>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuAction">
|
||||
<property name="title">
|
||||
<string>&Action</string>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuTablet_tool">
|
||||
<property name="title">
|
||||
<string>Tablet tool</string>
|
||||
</property>
|
||||
<addaction name="actionPen"/>
|
||||
<addaction name="actionCursor_Puck"/>
|
||||
</widget>
|
||||
<addaction name="actionAuto_pause"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionKeyboard_requires_capture"/>
|
||||
<addaction name="actionRight_CTRL_is_left_ALT"/>
|
||||
<addaction name="menuTablet_tool"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionPause"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionHard_Reset"/>
|
||||
<addaction name="actionCtrl_Alt_Del"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionCtrl_Alt_Esc"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionPause"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionExit"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuTools">
|
||||
@@ -82,6 +99,10 @@
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionBegin_trace"/>
|
||||
<addaction name="actionEnd_trace"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionMCA_devices"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionOpen_screenshots_folder"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuView">
|
||||
<property name="title">
|
||||
@@ -95,6 +116,9 @@
|
||||
<addaction name="actionHardware_Renderer_OpenGL"/>
|
||||
<addaction name="actionHardware_Renderer_OpenGL_ES"/>
|
||||
<addaction name="actionOpenGL_3_0_Core"/>
|
||||
<addaction name="actionVulkan"/>
|
||||
<addaction name="actionDirect3D_9"/>
|
||||
<addaction name="actionVNC"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuWindow_scale_factor">
|
||||
<property name="title">
|
||||
@@ -104,6 +128,12 @@
|
||||
<addaction name="action1x"/>
|
||||
<addaction name="action1_5x"/>
|
||||
<addaction name="action2x"/>
|
||||
<addaction name="action3x"/>
|
||||
<addaction name="action4x"/>
|
||||
<addaction name="action5x"/>
|
||||
<addaction name="action6x"/>
|
||||
<addaction name="action7x"/>
|
||||
<addaction name="action8x"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuFilter_method">
|
||||
<property name="title">
|
||||
@@ -120,6 +150,7 @@
|
||||
<addaction name="actionFullScreen_43"/>
|
||||
<addaction name="actionFullScreen_keepRatio"/>
|
||||
<addaction name="actionFullScreen_int"/>
|
||||
<addaction name="actionFullScreen_int43"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuEGA_S_VGA_settings">
|
||||
<property name="title">
|
||||
@@ -151,10 +182,13 @@
|
||||
<addaction name="actionHide_status_bar"/>
|
||||
<addaction name="actionShow_status_icons_in_fullscreen"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionShow_non_primary_monitors"/>
|
||||
<addaction name="actionResizable_window"/>
|
||||
<addaction name="actionRemember_size_and_position"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="menuRenderer"/>
|
||||
<addaction name="actionRenderer_options"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionSpecify_dimensions"/>
|
||||
<addaction name="actionForce_4_3_display_ratio"/>
|
||||
<addaction name="menuWindow_scale_factor"/>
|
||||
@@ -163,6 +197,7 @@
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionFullscreen"/>
|
||||
<addaction name="menuFullscreen_stretch_mode"/>
|
||||
<addaction name="actionApply_fullscreen_stretch_mode_when_maximized"/>
|
||||
<addaction name="menuEGA_S_VGA_settings"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionCGA_PCjr_Tandy_EGA_S_VGA_overscan"/>
|
||||
@@ -195,6 +230,9 @@
|
||||
<property name="windowTitle">
|
||||
<string notr="true">toolBar</string>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="movable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
@@ -221,6 +259,7 @@
|
||||
</attribute>
|
||||
<addaction name="actionPause"/>
|
||||
<addaction name="actionHard_Reset"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionACPI_Shutdown"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionCtrl_Alt_Del"/>
|
||||
@@ -228,6 +267,14 @@
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionSettings"/>
|
||||
</widget>
|
||||
<action name="actionAuto_pause">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Auto-pause on focus loss</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionKeyboard_requires_capture">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
@@ -328,12 +375,6 @@
|
||||
<property name="text">
|
||||
<string>&Fullscreen</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+Alt+PgUp</string>
|
||||
</property>
|
||||
<property name="shortcutVisibleInContextMenu">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSoftware_Renderer">
|
||||
<property name="checkable">
|
||||
@@ -342,6 +383,9 @@
|
||||
<property name="text">
|
||||
<string>&Qt (Software)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL">
|
||||
<property name="checkable">
|
||||
@@ -350,6 +394,9 @@
|
||||
<property name="text">
|
||||
<string>Qt (&OpenGL)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>1</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL_ES">
|
||||
<property name="checkable">
|
||||
@@ -358,6 +405,9 @@
|
||||
<property name="text">
|
||||
<string>Qt (OpenGL &ES)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>2</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHide_status_bar">
|
||||
<property name="checkable">
|
||||
@@ -452,6 +502,54 @@
|
||||
<string>&2x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action3x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&3x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action4x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&4x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action5x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&5x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action6x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&6x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action7x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&7x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action8x">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&8x</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionNearest">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
@@ -500,6 +598,14 @@
|
||||
<string>&Integer scale</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionFullScreen_int43">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>4:&3 Integer scale</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionInverted_VGA_monitor">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
@@ -627,6 +733,9 @@
|
||||
<property name="text">
|
||||
<string>Open&GL (3.0 Core)</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionPreferences">
|
||||
<property name="text">
|
||||
@@ -657,7 +766,7 @@
|
||||
</action>
|
||||
<action name="actionACPI_Shutdown">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../qt_resources.qrc">
|
||||
@@ -670,7 +779,7 @@
|
||||
<string>ACPI Shutdown</string>
|
||||
</property>
|
||||
<property name="visible">
|
||||
<bool>false</bool>
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionBegin_trace">
|
||||
@@ -701,6 +810,78 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionRenderer_options">
|
||||
<property name="text">
|
||||
<string>Renderer options...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionVulkan">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Vulkan</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>4</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionMCA_devices">
|
||||
<property name="text">
|
||||
<string>MCA devices...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionDirect3D_9">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Direct3D 9</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>5</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionShow_non_primary_monitors">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show non-primary monitors</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionVNC">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>VNC</string>
|
||||
</property>
|
||||
<property name="vid_api" stdset="0">
|
||||
<number>6</number>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionOpen_screenshots_folder">
|
||||
<property name="text">
|
||||
<string>Open screenshots folder...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionApply_fullscreen_stretch_mode_when_maximized">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Apply fullscreen stretch mode when maximized</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCursor_Puck">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cursor/Puck</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionShow_status_icons_in_fullscreen">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
@@ -709,6 +890,14 @@
|
||||
<string>Show status icons in fullscreen</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionPen">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Pen</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
||||
Reference in New Issue
Block a user