Commit c106803b authored by Felix Paul Kühne's avatar Felix Paul Kühne

Implement new reset button

parent 5dbd01b7
......@@ -837,7 +837,7 @@
<object class="IBUISlider" id="406103196">
<reference key="NSNextResponder" ref="11334779"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{6, 165}, {258, 23}}</string>
<string key="NSFrame">{{6, 165}, {252, 23}}</string>
<reference key="NSSuperview" ref="11334779"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="146856979"/>
......@@ -873,7 +873,7 @@
<object class="IBUIButton" id="437839795">
<reference key="NSNextResponder" ref="11334779"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{270, 167}, {18, 18}}</string>
<string key="NSFrame">{{264, 161}, {24, 30}}</string>
<reference key="NSSuperview" ref="11334779"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="831021170"/>
......@@ -890,7 +890,7 @@
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">reset.png</string>
<string key="NSResourceName">resetIcon.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="569046616"/>
......@@ -2165,7 +2165,7 @@
<string key="playIcon.png">{28, 27}</string>
<string key="playbackControllerBg.png">{352, 90}</string>
<string key="ratioButton.png">{50, 29}</string>
<string key="reset.png">{19, 19}</string>
<string key="resetIcon.png">{24, 30}</string>
<string key="speedIcon.png">{24, 25}</string>
<string key="subtitleIcon.png">{26, 27}</string>
<string key="videoEffectsIcon.png">{27, 20}</string>
......
......@@ -774,7 +774,7 @@
<object class="IBUISlider" id="23578597">
<reference key="NSNextResponder" ref="202327026"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 170}, {258, 23}}</string>
<string key="NSFrame">{{18, 170}, {252, 23}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="6762007"/>
......@@ -810,7 +810,7 @@
<object class="IBUIButton" id="916518907">
<reference key="NSNextResponder" ref="202327026"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{282, 172}, {18, 18}}</string>
<string key="NSFrame">{{276, 166}, {24, 30}}</string>
<reference key="NSSuperview" ref="202327026"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="331977945"/>
......@@ -827,7 +827,7 @@
<reference key="IBUINormalTitleShadowColor" ref="710600961"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">reset.png</string>
<string key="NSResourceName">resetIcon.png</string>
</object>
<reference key="IBUIFontDescription" ref="838206983"/>
<reference key="IBUIFont" ref="15074631"/>
......@@ -2183,7 +2183,7 @@
<string key="playIcon.png">{28, 27}</string>
<string key="playbackControllerBg.png">{352, 90}</string>
<string key="ratioButton.png">{50, 29}</string>
<string key="reset.png">{19, 19}</string>
<string key="resetIcon.png">{24, 30}</string>
<string key="speedIcon.png">{24, 25}</string>
<string key="subtitleIcon.png">{26, 27}</string>
<string key="videoEffectsIcon.png">{27, 20}</string>
......
......@@ -61,8 +61,8 @@
7D07F72F175691CC00CDE21C /* backButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F72B175691CC00CDE21C /* backButton@2x.png */; };
7D07F730175691CC00CDE21C /* backButtonHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F72C175691CC00CDE21C /* backButtonHighlight.png */; };
7D07F731175691CC00CDE21C /* backButtonHighlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F72D175691CC00CDE21C /* backButtonHighlight@2x.png */; };
7D10BCA61743FE7B00DA7059 /* reset.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9C1743FE7B00DA7059 /* reset.png */; };
7D10BCA71743FE7B00DA7059 /* reset@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9D1743FE7B00DA7059 /* reset@2x.png */; };
7D1AC3041762996100BD2EB5 /* resetIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC3021762996100BD2EB5 /* resetIcon.png */; };
7D1AC3051762996100BD2EB5 /* resetIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC3031762996100BD2EB5 /* resetIcon@2x.png */; };
7D2159E9174FD32F00EC00E8 /* page_white_text.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E5174FD32F00EC00E8 /* page_white_text.png */; };
7D2159EA174FD32F00EC00E8 /* folder.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E6174FD32F00EC00E8 /* folder.png */; };
7D2159EB174FD32F00EC00E8 /* page_white.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E7174FD32F00EC00E8 /* page_white.png */; };
......@@ -328,8 +328,8 @@
7D07F72B175691CC00CDE21C /* backButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backButton@2x.png"; sourceTree = "<group>"; };
7D07F72C175691CC00CDE21C /* backButtonHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backButtonHighlight.png; sourceTree = "<group>"; };
7D07F72D175691CC00CDE21C /* backButtonHighlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backButtonHighlight@2x.png"; sourceTree = "<group>"; };
7D10BC9C1743FE7B00DA7059 /* reset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = reset.png; path = Resources/reset.png; sourceTree = SOURCE_ROOT; };
7D10BC9D1743FE7B00DA7059 /* reset@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "reset@2x.png"; path = "Resources/reset@2x.png"; sourceTree = SOURCE_ROOT; };
7D1AC3021762996100BD2EB5 /* resetIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = resetIcon.png; sourceTree = "<group>"; };
7D1AC3031762996100BD2EB5 /* resetIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "resetIcon@2x.png"; sourceTree = "<group>"; };
7D2159E5174FD32F00EC00E8 /* page_white_text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_text.png; sourceTree = "<group>"; };
7D2159E6174FD32F00EC00E8 /* folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = folder.png; sourceTree = "<group>"; };
7D2159E7174FD32F00EC00E8 /* page_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white.png; sourceTree = "<group>"; };
......@@ -811,16 +811,6 @@
name = "Launch Screen";
sourceTree = "<group>";
};
7D10BC691743F9CB00DA7059 /* Filters and stuff */ = {
isa = PBXGroup;
children = (
7D10BC9C1743FE7B00DA7059 /* reset.png */,
7D10BC9D1743FE7B00DA7059 /* reset@2x.png */,
);
name = "Filters and stuff";
path = ../AspenProject;
sourceTree = "<group>";
};
7D2159E4174FD31900EC00E8 /* Dropbox */ = {
isa = PBXGroup;
children = (
......@@ -904,6 +894,8 @@
7D47D6F11760CD8700E86BAD /* backIcon@2x.png */,
7D47D6F21760CD8700E86BAD /* ballSlider.png */,
7D47D6F31760CD8700E86BAD /* ballSlider@2x.png */,
7D1AC3021762996100BD2EB5 /* resetIcon.png */,
7D1AC3031762996100BD2EB5 /* resetIcon@2x.png */,
);
name = "Movie VIew";
sourceTree = "<group>";
......@@ -1208,7 +1200,6 @@
7D6B08FB174D773C00A05173 /* Settings.bundle */,
29125E5317492219003F03E5 /* web */,
A7035BBD174519600057DFA7 /* iTunesArtwork */,
7D10BC691743F9CB00DA7059 /* Filters and stuff */,
7DA8B0F9173318E80029698C /* SourceCodePro-Regular.ttf */,
7DA8B0FA173318E80029698C /* SourceSansPro-Regular.ttf */,
7D5DD5C617590ABF001421E3 /* About Contents.html */,
......@@ -1348,8 +1339,6 @@
7DC87AF217413EE3009DC250 /* VLCPlaylistGridView.xib in Resources */,
A7FF9F3E17428C1900999819 /* DeleteButton.png in Resources */,
A7FF9F4017428C3800999819 /* DeleteButton@2x.png in Resources */,
7D10BCA61743FE7B00DA7059 /* reset.png in Resources */,
7D10BCA71743FE7B00DA7059 /* reset@2x.png in Resources */,
A7035BBE174519600057DFA7 /* iTunesArtwork in Resources */,
A7035BC217451D4A0057DFA7 /* Aspen.png in Resources */,
7D6BA1181748EFE100C0E203 /* VLCMenuViewController~ipad.xib in Resources */,
......@@ -1460,6 +1449,8 @@
7D6BD1851762026700AD311A /* thumbOverlay@2x.png in Resources */,
7D6BD1861762026700AD311A /* thumbOverlayPhone.png in Resources */,
7D6BD1871762026700AD311A /* thumbOverlay.png in Resources */,
7D1AC3041762996100BD2EB5 /* resetIcon.png in Resources */,
7D1AC3051762996100BD2EB5 /* resetIcon@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 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