@@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="320" - height="416" + height="460" id="svg3338" sodipodi:version="0.32" inkscape:version="0.46" @@ -265,7 +265,7 @@ offset="0" id="stop2540" /> <stop - style="stop-color:#e5e2ff;stop-opacity:1" + style="stop-color:#d4cfff;stop-opacity:1" offset="1" id="stop2542" /> </linearGradient> @@ -274,11 +274,11 @@ xlink:href="#linearGradient2538" id="linearGradient3357" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9233391,0,0,0.8133333,-18.494123,-27.66714)" + gradientTransform="matrix(0.9233391,0,0,0.835,-18.494123,-27.498437)" x1="5.6223307" y1="16.837086" x2="5.6223307" - y2="345.79681" /> + y2="537.41357" /> <linearGradient y2="128.09914" x2="439" @@ -468,6 +468,35 @@ x="-32" y="153" /> </mask> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3371" + id="linearGradient3551" + gradientUnits="userSpaceOnUse" + x1="253.99918" + y1="578.77551" + x2="253.94736" + y2="414.89465" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3217" + id="linearGradient3553" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3298447,0,0,1.3298447,124.46507,-469.5125)" + x1="339" + y1="579.36218" + x2="339" + y2="432.14465" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3231" + id="linearGradient3555" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3298447,0,0,1.5308677,124.46507,-580.0552)" + x1="339" + y1="579.36218" + x2="339" + y2="490.35657" /> </defs> <sodipodi:namedview id="base" @@ -503,10 +532,10 @@ inkscape:groupmode="layer" id="layer1"> <rect - style="opacity:1;fill:url(#linearGradient3357);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.24720442;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="opacity:1;fill:url(#linearGradient3357);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.24720442000000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3683" width="378" - height="488" + height="501" x="-20" y="-34" rx="0" @@ -669,6 +698,44 @@ dx="0 -6 -4 -5 -5">Mover</tspan></text> </g> </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/millenomi/Developer/Multiverse/Mover/LabsPrivate/Contingencies/Custom Page Art/Backdrop/Slides.png" + id="g3543" + transform="matrix(0.5701353,0.2371411,-0.2405915,0.5461356,-113.0532,226.76864)" + style="opacity:1"> + <rect + transform="matrix(1.3298446,4.205256e-4,-4.205256e-4,1.3298446,124.61353,-469.47312)" + ry="11" + rx="11" + y="440.36218" + x="254" + height="152" + width="152" + id="rect3545" + style="fill:url(#linearGradient3551);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter3357);enable-background:accumulate" /> + <rect + transform="matrix(1,3.1622159e-4,-3.1622159e-4,1,0,0)" + style="fill:url(#linearGradient3553);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3547" + width="202.13638" + height="202.13638" + x="462.24561" + y="116.1008" + rx="14.628291" + ry="14.628291" /> + <rect + transform="matrix(1,3.1622159e-4,-3.1622159e-4,1,0,0)" + style="fill:url(#linearGradient3555);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3549" + width="176.86934" + height="131.65462" + x="474.2142" + y="170.62444" + rx="14.628291" + ry="16.839546" /> + </g> </g> <g inkscape:groupmode="layer" AboutPaneBackdrop-LightBlue.svg @@ -63,7 +63,7 @@ id="layer1" transform="translate(-185.51562,-106.86218)"> <path - style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 188.83816,108.42768 L 186.72482,110.71018 L 190.10616,114.33365 L 186.72482,117.98565 L 188.83816,120.29668 L 188.91741,120.18256 L 194.04225,114.61896 L 194.30642,114.36218 L 194.04225,114.07687 L 188.91741,108.5418 L 188.83816,108.42768 z" id="path2504" sodipodi:nodetypes="ccccccccccc" /> AboutPaneDisclosureIndicator.svg @@ -18,18 +18,32 @@ SEL selector; IBOutlet UIToolbar* toolbar; + + // Paid version button + IBOutlet UILabel* paidVersionButtonLabel; + IBOutlet UILabel* paidVersionButtonDetailLabel; + IBOutlet UIImageView* paidVersionDisclosureIndicator; + IBOutlet UIButton* paidVersionButton; } @property(assign) IBOutlet UILabel* versionLabel; @property(assign) IBOutlet UIToolbar* toolbar; @property(retain) L0SlideAboutCopyrightWebPane* copyrightPane; +@property(assign) IBOutlet UILabel* paidVersionButtonLabel; +@property(assign) IBOutlet UILabel* paidVersionButtonDetailLabel; +@property(assign) IBOutlet UIImageView* paidVersionDisclosureIndicator; +@property(assign) IBOutlet UIButton* paidVersionButton; + - (IBAction) showAboutCopyrightWebPane; - (IBAction) openInfiniteLabsDotNet; - (IBAction) emailAFriend; - (IBAction) showBookmarksAccountPane; +- (IBAction) downloadPlus; +- (IBAction) addSafariBookmarklet; + - (IBAction) dismiss; - (void) setDismissButtonTarget:(id) target selector:(SEL) selector; Classes/L0MoverAboutPane.h @@ -10,6 +10,8 @@ #import "L0MoverBookmarksAccountPane.h" #import "L0MoverAppDelegate.h" +#import "L0MoverAdController.h" + @interface L0MoverAboutPane () - (void) clearOutlets; @@ -27,6 +29,18 @@ CGPoint center = self.toolbar.center; center.y += self.toolbar.bounds.size.height + 20; self.toolbar.center = center; + + if ([L0MoverAdController isPaidVersion]) { + self.paidVersionButton.enabled = NO; + + self.paidVersionButtonLabel.text = NSLocalizedString(@"Thanks for your support!", @"Paid version thank you banner"); + self.paidVersionButtonDetailLabel.text = NSLocalizedString(@"This is Mover+, the paid version without ads.", @"Paid version thank you subbanner"); + + self.paidVersionButtonLabel.textAlignment = UITextAlignmentCenter; + self.paidVersionButtonDetailLabel.textAlignment = UITextAlignmentCenter; + + self.paidVersionDisclosureIndicator.hidden = YES; + } } - (void) viewDidAppear:(BOOL) ani; @@ -68,9 +82,14 @@ self.versionLabel = nil; self.copyrightPane = nil; self.toolbar = nil; + self.paidVersionButton = nil; + self.paidVersionButtonLabel = nil; + self.paidVersionButtonDetailLabel = nil; + self.paidVersionDisclosureIndicator = nil; } @synthesize versionLabel, copyrightPane, toolbar; +@synthesize paidVersionButton, paidVersionButtonLabel, paidVersionButtonDetailLabel, paidVersionDisclosureIndicator; - (void) dealloc; { @@ -88,6 +107,16 @@ [UIApp openURL:[NSURL URLWithString:@"http://infinite-labs.net/"]]; } +- (IBAction) addSafariBookmarklet; +{ + [UIApp openURL:[NSURL URLWithString:@"http://infinite-labs.net/mover/safari-bookmarklet/"]]; +} + +- (IBAction) downloadPlus; +{ + [UIApp openURL:[NSURL URLWithString:@"http://infinite-labs.net/mover/download-plus/"]]; +} + - (IBAction) emailAFriend; { [(L0MoverAppDelegate*)UIApp.delegate tellAFriend]; Classes/L0MoverAboutPane.m @@ -28,6 +28,7 @@ } + sharedController; ++ (BOOL) isPaidVersion; @property(assign) UIView* superview; @property CGPoint origin; Classes/L0MoverAdController.h @@ -13,6 +13,11 @@ @synthesize superview, origin; ++ (BOOL) isPaidVersion; +{ + return [self sharedController] == nil; +} + #if kL0MoverInsertAdvertising L0ObjCSingletonMethod(sharedController) Classes/L0MoverAdController.m @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="108"/> + <integer value="92"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -570,6 +570,56 @@ </object> <int key="connectionID">112</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">downloadPlus</string> + <reference key="source" ref="704938462"/> + <reference key="destination" ref="372490531"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">113</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">addSafariBookmarklet</string> + <reference key="source" ref="678633979"/> + <reference key="destination" ref="372490531"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">114</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">paidVersionButton</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="704938462"/> + </object> + <int key="connectionID">115</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">paidVersionButtonLabel</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="835814867"/> + </object> + <int key="connectionID">116</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">paidVersionButtonDetailLabel</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="846926342"/> + </object> + <int key="connectionID">117</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">paidVersionDisclosureIndicator</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="414388026"/> + </object> + <int key="connectionID">118</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -911,7 +961,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">112</int> + <int key="maxID">118</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -923,7 +973,9 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>addSafariBookmarklet</string> <string>dismiss</string> + <string>downloadPlus</string> <string>emailAFriend</string> <string>openInfiniteLabsDotNet</string> <string>showAboutCopyrightWebPane</string> @@ -936,6 +988,8 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -943,6 +997,10 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>copyrightPane</string> + <string>paidVersionButton</string> + <string>paidVersionButtonDetailLabel</string> + <string>paidVersionButtonLabel</string> + <string>paidVersionDisclosureIndicator</string> <string>target</string> <string>toolbar</string> <string>versionLabel</string> @@ -950,6 +1008,10 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>L0SlideAboutCopyrightWebPane</string> + <string>UIButton</string> + <string>UILabel</string> + <string>UILabel</string> + <string>UIImageView</string> <string>id</string> <string>UIToolbar</string> <string>UILabel</string> English.lproj/L0MoverAboutPane.xib 630638c3ffcb855b9513eba85f73ca697e728899 Emanuele Vulcano (Infinite Labs) me@infinite-labs.net http://github.com/millenomi/slideapp/commit/42fe8e5147d69b75a193cda7cbf73114e32b8543 42fe8e5147d69b75a193cda7cbf73114e32b8543 2009-06-18T08:52:17-07:00 2009-06-18T08:52:17-07:00 Added "Thank you" banner on ads off, links to other About pane links. f27d3b6c0a72a73b31f5fb6d0dec7bfcd9218eb3 Emanuele Vulcano (Infinite Labs) me@infinite-labs.net