Skip to content

Commit

Permalink
Player modifications to make pull request for gideros/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@marceloadsj
marceloadsj committed Feb 3, 2015
1 parent 56f3591 commit 7900659
Show file tree
Hide file tree
Showing 23 changed files with 2,735 additions and 1,911 deletions.
231 changes: 155 additions & 76 deletions player/Forms/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,20 @@
<rect>
<x>0</x>
<y>0</y>
<width>312</width>
<height>387</height>
<width>320</width>
<height>480</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="windowTitle">
<string>Gideros Player</string>
</property>
<widget class="QWidget" name="centralWidget">
<property name="minimumSize">
<size>
<width>1</width>
<height>1</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
Expand Down Expand Up @@ -88,24 +57,64 @@
<rect>
<x>0</x>
<y>0</y>
<width>312</width>
<width>320</width>
<height>21</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>240</red>
<green>240</green>
<blue>240</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>&amp;File</string>
<string>File</string>
</property>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuHardware">
<property name="title">
<string>&amp;Hardware</string>
<string>Hardware</string>
</property>
<widget class="QMenu" name="menuOrientation">
<property name="title">
<string>Orientation</string>
</property>
<addaction name="actionRotate_Left"/>
<addaction name="actionRotate_Right"/>
<addaction name="separator"/>
<addaction name="actionPortrait"/>
<addaction name="actionLandscape_Left"/>
<addaction name="actionPortrait_Upside_Down"/>
Expand All @@ -116,23 +125,26 @@
<string>Resolution</string>
</property>
<addaction name="action320x480"/>
<addaction name="action768x1024"/>
<addaction name="action640x960"/>
<addaction name="action1536x2048"/>
<addaction name="action320x568"/>
<addaction name="action640x1136"/>
<addaction name="action750x1334"/>
<addaction name="action1242x2208"/>
<addaction name="action768x1024"/>
<addaction name="action1536x2048"/>
<addaction name="separator"/>
<addaction name="action480x800"/>
<addaction name="action240x320"/>
<addaction name="action540x960"/>
<addaction name="action480x854"/>
<addaction name="action240x400"/>
<addaction name="action360x640"/>
<addaction name="action800x1280"/>
<addaction name="action600x1024"/>
<addaction name="action480x800"/>
<addaction name="action480x854"/>
<addaction name="action540x960"/>
<addaction name="action600x800"/>
<addaction name="action768x1366"/>
<addaction name="action600x1024"/>
<addaction name="action720x1280"/>
<addaction name="action768x1366"/>
<addaction name="action800x1280"/>
<addaction name="action900x1200"/>
<addaction name="action1080x1920"/>
</widget>
<widget class="QMenu" name="menuFrame_Rate">
Expand All @@ -142,42 +154,56 @@
<addaction name="action15_fps"/>
<addaction name="action30_fps"/>
<addaction name="action60_fps"/>
<addaction name="separator"/>
<addaction name="actionUnlimited"/>
</widget>
<addaction name="actionAuto_Scale"/>
<addaction name="separator"/>
<addaction name="actionRotate_Left"/>
<addaction name="actionRotate_Right"/>
<addaction name="actionDraw_Infos"/>
<addaction name="separator"/>
<addaction name="menuOrientation"/>
<addaction name="menuResolution"/>
<addaction name="menuFrame_Rate"/>
</widget>
<widget class="QMenu" name="menu_View">
<property name="title">
<string>&amp;View</string>
<string>View</string>
</property>
<widget class="QMenu" name="menuZoom">
<property name="title">
<string>Zoom</string>
</property>
<addaction name="actionZoom_In"/>
<addaction name="actionZoom_Out"/>
<addaction name="separator"/>
<addaction name="actionQuarter"/>
<addaction name="actionHalf"/>
<addaction name="actionOriginal"/>
<addaction name="separator"/>
<addaction name="actionFit_To_Window"/>
</widget>
<addaction name="actionFull_Screen"/>
<addaction name="actionHide_Menu"/>
<addaction name="actionAlways_on_Top"/>
<addaction name="actionHide_Menu"/>
<addaction name="actionFull_Screen"/>
<addaction name="separator"/>
<addaction name="menuZoom"/>
</widget>
<widget class="QMenu" name="menuConfigurations">
<property name="title">
<string>Configurations</string>
</property>
<addaction name="actionSettings"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menu_View"/>
<addaction name="menuHardware"/>
<addaction name="menuConfigurations"/>
</widget>
<action name="actionExit">
<property name="text">
<string>E&amp;xit</string>
<string>Exit</string>
</property>
<property name="shortcut">
<string>Alt+E</string>
</property>
</action>
<action name="actionRotate_Left">
Expand Down Expand Up @@ -267,9 +293,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Unlimited</string>
</property>
Expand Down Expand Up @@ -302,33 +325,27 @@
<property name="text">
<string>Run</string>
</property>
<property name="shortcut">
<string>Ctrl+R</string>
</property>
</action>
<action name="actionStop">
<property name="text">
<string>Stop</string>
</property>
</action>
<action name="actionHalf">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>50%</string>
</property>
</action>
<action name="actionOriginal">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="text">
<string>100%</string>
</property>
<property name="shortcut">
<string>Alt+O</string>
</property>
</action>
<action name="action480x800">
<property name="checkable">
Expand Down Expand Up @@ -411,9 +428,6 @@
</property>
</action>
<action name="actionQuarter">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>25 %</string>
</property>
Expand Down Expand Up @@ -458,6 +472,30 @@
<string>1080x1920</string>
</property>
</action>
<action name="action750x1334">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>750x1334 (iPhone 6)</string>
</property>
</action>
<action name="action1242x2208">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>1242x2208 (iPhone 6 Plus)</string>
</property>
</action>
<action name="action900x1200">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>900x1200</string>
</property>
</action>
<action name="actionOpen">
<property name="text">
<string>Open</string>
Expand All @@ -475,9 +513,6 @@
</property>
</action>
<action name="actionHide_Menu">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Hide Menu</string>
</property>
Expand All @@ -496,9 +531,53 @@
<string>Alt+Return</string>
</property>
</action>
<action name="actionZoom_In">
<property name="text">
<string>Zoom In</string>
</property>
<property name="shortcut">
<string>Alt+Up</string>
</property>
</action>
<action name="actionZoom_Out">
<property name="text">
<string>Zoom Out</string>
</property>
<property name="shortcut">
<string>Alt+Down</string>
</property>
</action>
<action name="actionFit_To_Window">
<property name="text">
<string>Fit To Window</string>
</property>
<property name="shortcut">
<string>Alt+W</string>
</property>
</action>
<action name="actionSettings">
<property name="text">
<string>Settings</string>
</property>
</action>
<action name="actionDraw_Infos">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Draw Infos</string>
</property>
</action>
<addaction name="actionExit"/>
<addaction name="actionRotate_Left"/>
<addaction name="actionRotate_Right"/>
<addaction name="actionOriginal"/>
<addaction name="actionHide_Menu"/>
<addaction name="actionFull_Screen"/>
<addaction name="actionAuto_Scale"/>
<addaction name="actionZoom_In"/>
<addaction name="actionZoom_Out"/>
<addaction name="actionFit_To_Window"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
Expand Down
Loading

0 comments on commit 7900659

Please sign in to comment.