Skip to content

Commit

Permalink
[savestates] Added new Save State Manager dialog window
Browse files Browse the repository at this point in the history
  • Loading branch information
@garbear
garbear committed Mar 22, 2013
1 parent 3b01427 commit c03895d
Show file tree
Hide file tree
Showing 14 changed files with 777 additions and 7 deletions.
3 changes: 2 additions & 1 deletion addons/skin.confluence/720p/VideoOSD.xml
View file
Expand Up @@ -361,7 +361,8 @@
<onright>254</onright> <onright>254</onright>
<onup>1000</onup> <onup>1000</onup>
<ondown>1000</ondown> <ondown>1000</ondown>
<onclick>ActivateWindow(VideoBookmarks)</onclick> <onclick condition="!Player.HasGame">ActivateWindow(VideoBookmarks)</onclick>
<onclick condition="Player.HasGame">ActivateWindow(GameSaves)</onclick>
</control> </control>
<control type="button" id="254"> <control type="button" id="254">
<posx>220</posx> <posx>220</posx>
Expand Down
192 changes: 192 additions & 0 deletions addons/skin.confluence/720p/VideoOSDGameSaves.xml
View file
@@ -0,0 +1,192 @@
<window>
<defaultcontrol>2</defaultcontrol>
<coordinates>
<system>1</system>
<posx>270</posx>
<posy>45</posy>
</coordinates>
<include>dialogeffect</include>
<controls>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<width>740</width>
<height>630</height>
<texture border="40">DialogBack2.png</texture>
</control>
<control type="image">
<description>Dialog Header image</description>
<posx>40</posx>
<posy>16</posy>
<width>660</width>
<height>40</height>
<texture>dialogheader.png</texture>
</control>
<control type="label">
<description>header label</description>
<posx>40</posx>
<posy>20</posy>
<width>660</width>
<height>30</height>
<font>font13_title</font>
<label>$LOCALIZE[15030]</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>650</posx>
<posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
<onleft>3</onleft>
<onright>3</onright>
<onup>3</onup>
<ondown>3</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="label">
<description>number of files/pages in list text label</description>
<posx>700</posx>
<posy>524</posy>
<width>400</width>
<height>35</height>
<font>font12</font>
<align>right</align>
<aligny>center</aligny>
<scroll>true</scroll>
<textcolor>grey</textcolor>
<label>([COLOR=blue]$INFO[Container(11).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(11).CurrentPage]/$INFO[Container(11).NumPages][/COLOR])</label>
</control>
<control type="panel" id="11">
<posx>40</posx>
<posy>65</posy>
<width>660</width>
<height>460</height>
<onleft condition="Control.IsEnabled(2)">2</onleft>
<onleft condition="!Control.IsEnabled(2)">3</onleft>
<onright condition="Control.IsEnabled(3)">3</onright>
<onright condition="!Control.IsEnabled(3)">2</onright>
<ondown condition="Control.IsEnabled(2)">2</ondown>
<ondown condition="!Control.IsEnabled(2)">3</ondown>
<onup condition="Control.IsEnabled(2)">2</onup>
<onup condition="!Control.IsEnabled(2)">3</onup>
<scrolltime>200</scrolltime>
<viewtype label="536">icon</viewtype>
<pagecontrol>-</pagecontrol>
<orientation>vertical</orientation>
<itemlayout height="230" width="220">
<control type="image">
<posx>2</posx>
<posy>2</posy>
<width>216</width>
<height>226</height>
<texture border="3">button-nofocus.png</texture>
</control>
<control type="image">
<posx>10</posx>
<posy>20</posy>
<width>200</width>
<height>150</height>
<aspectratio>scale</aspectratio>
<info>ListItem.Icon</info>
</control>
<control type="label">
<posx>110</posx>
<posy>183</posy>
<width>205</width>
<height>15</height>
<font>font12</font>
<selectedcolor>selected</selectedcolor>
<align>center</align>
<aligny>center</aligny>
<info>ListItem.Label</info>
</control>
<control type="label">
<posx>110</posx>
<posy>204</posy>
<width>205</width>
<height>15</height>
<font>font10</font>
<selectedcolor>selected</selectedcolor>
<align>center</align>
<aligny>center</aligny>
<label>[COLOR=grey2]$INFO[ListItem.Duration][/COLOR]</label>
</control>
</itemlayout>
<focusedlayout height="230" width="220">
<control type="image">
<posx>2</posx>
<posy>2</posy>
<width>216</width>
<height>226</height>
<texture border="3">folder-focus.png</texture>
</control>
<control type="image">
<posx>10</posx>
<posy>20</posy>
<width>200</width>
<height>150</height>
<aspectratio>scale</aspectratio>
<info>ListItem.Icon</info>
</control>
<control type="label">
<posx>110</posx>
<posy>183</posy>
<width>205</width>
<height>15</height>
<font>font12</font>
<selectedcolor>selected</selectedcolor>
<align>center</align>
<aligny>center</aligny>
<info>ListItem.Label</info>
</control>
<control type="label">
<posx>110</posx>
<posy>204</posy>
<width>205</width>
<height>15</height>
<font>font10</font>
<selectedcolor>selected</selectedcolor>
<align>center</align>
<aligny>center</aligny>
<label>[COLOR=grey2]$INFO[ListItem.Duration][/COLOR]</label>
</control>
</focusedlayout>
</control>
<control type="grouplist" id="9000">
<posx>40</posx>
<posy>565</posy>
<width>660</width>
<height>40</height>
<itemgap>5</itemgap>
<align>center</align>
<orientation>horizontal</orientation>
<onleft>9000</onleft>
<onright>9000</onright>
<onup>11</onup>
<ondown>11</ondown>
<control type="button" id="2">
<description>Create save state button</description>
<label>15031</label>
<width>240</width>
<include>ButtonInfoDialogsCommonValues</include>
</control>
<control type="button" id="3">
<description>Clear save state button</description>
<label>15032</label>
<width>240</width>
<enable>!StringCompare(Container(11).NumItems,0)</enable>
<include>ButtonInfoDialogsCommonValues</include>
</control>
</control>
</controls>
</window>
28 changes: 27 additions & 1 deletion language/English/strings.po
View file
Expand Up @@ -2080,6 +2080,7 @@ msgctxt "#527"
msgid "Manually add to library" msgid "Manually add to library"
msgstr "" msgstr ""


#: xbmc/games/savegames/GUIDialogGameSaves.cpp
msgctxt "#528" msgctxt "#528"
msgid "Enter title" msgid "Enter title"
msgstr "" msgstr ""
Expand Down Expand Up @@ -6000,7 +6001,32 @@ msgctxt "#15027"
msgid "Slot %d" msgid "Slot %d"
msgstr "" msgstr ""


#empty strings from id 15028 to 15051 #: xbmc/games/savegames/GUIDialogGameSaves.cpp
msgctxt "#15028"
msgid "Load save state"
msgstr ""

#: xbmc/games/windows/GUIWindowGames.cpp
msgctxt "#15029"
msgid "Manage save states"
msgstr ""

#: addons/skin.confluence/720p/VideoOSDGameSaves.xml
msgctxt "#15030"
msgid "Save States"
msgstr ""

#: addons/skin.confluence/720p/VideoOSDGameSaves.xml
msgctxt "#15031"
msgid "Create Save State"
msgstr ""

#: addons/skin.confluence/720p/VideoOSDGameSaves.xml
msgctxt "#15032"
msgid "Clear Save States"
msgstr ""

#empty strings from id 15033 to 15051


msgctxt "#15052" msgctxt "#15052"
msgid "Password" msgid "Password"
Expand Down
2 changes: 2 additions & 0 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -600,6 +600,7 @@
<ClCompile Include="..\..\xbmc\games\GameFileLoader.cpp" /> <ClCompile Include="..\..\xbmc\games\GameFileLoader.cpp" />
<ClCompile Include="..\..\xbmc\games\GameManager.cpp" /> <ClCompile Include="..\..\xbmc\games\GameManager.cpp" />
<ClCompile Include="..\..\xbmc\games\libretro\LibretroEnvironment.cpp" /> <ClCompile Include="..\..\xbmc\games\libretro\LibretroEnvironment.cpp" />
<ClCompile Include="..\..\xbmc\games\savegames\GUIDialogGameSaves.cpp" />
<ClCompile Include="..\..\xbmc\games\savegames\SavestateDatabase.cpp" /> <ClCompile Include="..\..\xbmc\games\savegames\SavestateDatabase.cpp" />
<ClCompile Include="..\..\xbmc\games\savegames\Savestate.cpp" /> <ClCompile Include="..\..\xbmc\games\savegames\Savestate.cpp" />
<ClCompile Include="..\..\xbmc\games\SerialState.cpp" /> <ClCompile Include="..\..\xbmc\games\SerialState.cpp" />
Expand Down Expand Up @@ -1081,6 +1082,7 @@
<ClInclude Include="..\..\xbmc\games\GameManager.h" /> <ClInclude Include="..\..\xbmc\games\GameManager.h" />
<ClInclude Include="..\..\xbmc\games\libretro\libretro.h" /> <ClInclude Include="..\..\xbmc\games\libretro\libretro.h" />
<ClInclude Include="..\..\xbmc\games\libretro\LibretroEnvironment.h" /> <ClInclude Include="..\..\xbmc\games\libretro\LibretroEnvironment.h" />
<ClInclude Include="..\..\xbmc\games\savegames\GUIDialogGameSaves.h" />
<ClInclude Include="..\..\xbmc\games\savegames\SavestateDatabase.h" /> <ClInclude Include="..\..\xbmc\games\savegames\SavestateDatabase.h" />
<ClInclude Include="..\..\xbmc\games\savegames\Savestate.h" /> <ClInclude Include="..\..\xbmc\games\savegames\Savestate.h" />
<ClInclude Include="..\..\xbmc\games\SerialState.h" /> <ClInclude Include="..\..\xbmc\games\SerialState.h" />
Expand Down
6 changes: 6 additions & 0 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -3072,6 +3072,9 @@
<ClCompile Include="..\..\xbmc\games\savegames\Savestate.cpp"> <ClCompile Include="..\..\xbmc\games\savegames\Savestate.cpp">
<Filter>games\savegames</Filter> <Filter>games\savegames</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\xbmc\games\savegames\GUIDialogGameSaves.cpp">
<Filter>games\savegames</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h"> <ClInclude Include="..\..\xbmc\win32\pch.h">
Expand Down Expand Up @@ -5987,6 +5990,9 @@
<ClInclude Include="..\..\xbmc\games\savegames\Savestate.h"> <ClInclude Include="..\..\xbmc\games\savegames\Savestate.h">
<Filter>games\savegames</Filter> <Filter>games\savegames</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\xbmc\games\savegames\GUIDialogGameSaves.h">
<Filter>games\savegames</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc"> <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
Expand Down
25 changes: 25 additions & 0 deletions system/keymaps/keyboard.xml
View file
Expand Up @@ -281,8 +281,33 @@
<ampersand>Save7</ampersand> <ampersand>Save7</ampersand>
<asterisk>Save8</asterisk> <asterisk>Save8</asterisk>
<leftbracket>Save9</leftbracket> <leftbracket>Save9</leftbracket>
<f1>ActivateWindow(GameSaves)</f1>
</keyboard> </keyboard>
</FullscreenGame> </FullscreenGame>
<GameSaves>
<keyboard>
<delete>Delete</delete>
<one>Load1</one>
<two>Load2</two>
<three>Load3</three>
<four>Load4</four>
<five>Load5</five>
<six>Load6</six>
<seven>Load7</seven>
<eight>Load8</eight>
<nine>Load9</nine>
<exclaim>Save1</exclaim>
<at>Save2</at>
<hash>Save3</hash>
<dollar>Save4</dollar>
<percent>Save5</percent>
<caret>Save6</caret>
<ampersand>Save7</ampersand>
<asterisk>Save8</asterisk>
<leftbracket>Save9</leftbracket>
<f1>Close</f1>
</keyboard>
</GameSaves>
<VideoTimeSeek> <VideoTimeSeek>
<keyboard> <keyboard>
<return>Select</return> <return>Select</return>
Expand Down
3 changes: 3 additions & 0 deletions xbmc/Application.cpp
View file
Expand Up @@ -278,6 +278,7 @@
/* Game-related include files */ /* Game-related include files */
#include "cores/RetroPlayer/RetroPlayer.h" #include "cores/RetroPlayer/RetroPlayer.h"
#include "games/windows/GUIWindowGames.h" #include "games/windows/GUIWindowGames.h"
#include "games/savegames/GUIDialogGameSaves.h"


#ifdef HAS_PERFORMANCE_SAMPLE #ifdef HAS_PERFORMANCE_SAMPLE
#include "utils/PerformanceSample.h" #include "utils/PerformanceSample.h"
Expand Down Expand Up @@ -1355,6 +1356,7 @@ bool CApplication::Initialize()
g_windowManager.Add(new CGUIWindowStartup); g_windowManager.Add(new CGUIWindowStartup);


g_windowManager.Add(new CGUIWindowGames); g_windowManager.Add(new CGUIWindowGames);
g_windowManager.Add(new CGUIDialogGameSaves);


/* window id's 3000 - 3100 are reserved for python */ /* window id's 3000 - 3100 are reserved for python */


Expand Down Expand Up @@ -3397,6 +3399,7 @@ bool CApplication::Cleanup()
g_windowManager.Remove(WINDOW_DIALOG_VOLUME_BAR); g_windowManager.Remove(WINDOW_DIALOG_VOLUME_BAR);


g_windowManager.Delete(WINDOW_GAMES); g_windowManager.Delete(WINDOW_GAMES);
g_windowManager.Delete(WINDOW_DIALOG_GAME_SAVES);


CAddonMgr::Get().DeInit(); CAddonMgr::Get().DeInit();


Expand Down
1 change: 1 addition & 0 deletions xbmc/dialogs/GUIDialogContextMenu.h
View file
Expand Up @@ -126,6 +126,7 @@ enum CONTEXT_BUTTON { CONTEXT_BUTTON_CANCELLED = 0,
CONTEXT_BUTTON_RECORD_ITEM, CONTEXT_BUTTON_RECORD_ITEM,
CONTEXT_BUTTON_TAGS_ADD_ITEMS, CONTEXT_BUTTON_TAGS_ADD_ITEMS,
CONTEXT_BUTTON_TAGS_REMOVE_ITEMS, CONTEXT_BUTTON_TAGS_REMOVE_ITEMS,
CONTEXT_BUTTON_MANAGE_SAVE_STATES,
CONTEXT_BUTTON_USER1, CONTEXT_BUTTON_USER1,
CONTEXT_BUTTON_USER2, CONTEXT_BUTTON_USER2,
CONTEXT_BUTTON_USER3, CONTEXT_BUTTON_USER3,
Expand Down

0 comments on commit c03895d

Please sign in to comment.