From: Michael J. Rubinsky Date: Fri, 3 Sep 2010 21:44:26 +0000 (-0400) Subject: Add versioning and display it on plugin panel X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3e8b262c85fb6bc2790e13ad182835f747c7d441;p=horde.git Add versioning and display it on plugin panel --- diff --git a/iPhoto2Ansel/AnselExportController.h b/iPhoto2Ansel/AnselExportController.h index 2608947d2..1ec70b6fd 100644 --- a/iPhoto2Ansel/AnselExportController.h +++ b/iPhoto2Ansel/AnselExportController.h @@ -37,6 +37,7 @@ IBOutlet NSPopUpButton *mServersPopUp; IBOutlet NSTextField *mImageCountLabel; IBOutlet NSPopUpButton *mAnselVersion; + IBOutlet NSTextField *mVersionLabel; // Gallery View IBOutlet NSButton *viewGallery; diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m index 43ee19f1f..843975379 100644 --- a/iPhoto2Ansel/AnselExportController.m +++ b/iPhoto2Ansel/AnselExportController.m @@ -7,6 +7,7 @@ * @license http://opensource.org/licenses/bsd-license.php * @author Michael J. Rubinsky */ + #import "TURAnselKit.h" #import "AnselExportController.h"; #import "FBProgressController.h"; @@ -84,6 +85,10 @@ NSString * const TURAnselServerVersionKey = @"version"; selector: @selector(exportWindowDidBecomeKey:) name: NSWindowDidBecomeKeyNotification object :nil]; + // Version/build + NSDictionary *info = [[NSBundle bundleForClass: [self class]] infoDictionary]; + NSString *versionString = [NSString stringWithFormat:@"%@ %@", [info objectForKey:@"CFBundleName"], [info objectForKey:@"CFBundleVersion"]]; + [mVersionLabel setStringValue: versionString]; // Holds gallery's images info for the gallery preview browserData = [[NSMutableArray alloc] init]; diff --git a/iPhoto2Ansel/Info.plist b/iPhoto2Ansel/Info.plist index baf5afd7f..708b7f108 100644 --- a/iPhoto2Ansel/Info.plist +++ b/iPhoto2Ansel/Info.plist @@ -17,7 +17,11 @@ CFBundleSignature ???? CFBundleVersion - 1.0 + 1.0.0d1 + CFBundleDisplayName + + CFBundleShortVersionString + 1.0.0 NSMainNibFile Panel NSPrincipalClass diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml index dfec9a6e6..e1f34fd9c 100644 --- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml +++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml index 100fbc88d..a4547642a 100644 --- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml +++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml @@ -1 +1 @@ -org.horde.export.iPhoto2Ansel.iPhoto2Ansel-1.pkg1.0../build/Release/iPhoto2Ansel-1.0/installFrom.isRelativeTypeidentifierparentinstallTo01iphoto-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +org.horde.export.iPhoto2Ansel.iPhoto2Ansel-1.pkg1.0../build/Release/iPhoto2Ansel-1.0/installFrom.isRelativeTypeparentidentifierinstallTo01iphoto-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml index 8e23c5913..514fd1448 100644 --- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml +++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml @@ -1 +1 @@ -iPhoto2Ansel/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/build/Package/iPhoto2Ansel.pkgorg.horde01iphoto.xmlproperties.titleproperties.userDomainproperties.systemDomain \ No newline at end of file +iPhoto2Ansel/Users/mrubinsk/Desktop/iPhoto2Ansel.pkgorg.horde01iphoto.xmlproperties.titleproperties.userDomainproperties.systemDomain \ No newline at end of file diff --git a/iPhoto2Ansel/Resources/English.lproj/Panel.nib/designable.nib b/iPhoto2Ansel/Resources/English.lproj/Panel.nib/designable.nib index 2be70a7ab..9c79bd92b 100644 --- a/iPhoto2Ansel/Resources/English.lproj/Panel.nib/designable.nib +++ b/iPhoto2Ansel/Resources/English.lproj/Panel.nib/designable.nib @@ -21,9 +21,7 @@ YES - - - + YES @@ -69,6 +67,7 @@ 268 {{124, 158}, {311, 22}} + YES -1804468671 @@ -106,6 +105,7 @@ 268 {{17, 160}, {102, 17}} + YES 68288064 @@ -135,6 +135,7 @@ 268 {{124, 126}, {311, 22}} + YES -1804468671 @@ -152,6 +153,7 @@ 268 {{124, 94}, {311, 22}} + YES 343014976 @@ -173,6 +175,7 @@ 268 {{17, 128}, {67, 17}} + YES 68288064 @@ -189,6 +192,7 @@ 268 {{17, 96}, {67, 17}} + YES 68288064 @@ -205,6 +209,7 @@ 268 {{17, 192}, {102, 17}} + YES 68288064 @@ -221,6 +226,7 @@ 268 {{124, 190}, {311, 22}} + YES -1804468671 @@ -238,6 +244,7 @@ 268 {{345, 12}, {96, 32}} + YES 67239424 @@ -258,6 +265,7 @@ 268 {{244, 12}, {96, 32}} + YES 67239424 @@ -278,6 +286,7 @@ 268 {{17, 71}, {67, 17}} + YES 68288064 @@ -294,6 +303,7 @@ 268 {{121, 65}, {100, 26}} + YES -2076049856 @@ -354,6 +364,7 @@ {455, 229} + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -661,6 +672,7 @@ 268 {{370, 12}, {96, 32}} + YES 67239424 @@ -850,6 +862,7 @@ {423, 337} + NO YES YES @@ -866,6 +879,7 @@ {{1, 1}, {423, 337}} + @@ -876,6 +890,7 @@ 256 {{424, 1}, {15, 337}} + _doScroller: 1 @@ -886,6 +901,7 @@ 256 {{1, 338}, {423, 15}} + 1 _doScroller: @@ -894,6 +910,7 @@ {{20, 60}, {440, 354}} + 50 @@ -904,6 +921,7 @@ {480, 413} + {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -1445,6 +1463,22 @@ 2 NO + + + 268 + {{14, 13}, {475, 17}} + + YES + + 68288064 + 272761856 + iPhoto2Ansel Exporter + + + + + + {{2, 2}, {510, 373}} @@ -1741,6 +1775,14 @@ 641 + + + mVersionLabel + + + + 644 + @@ -2113,6 +2155,7 @@ YES + @@ -2470,6 +2513,20 @@ + + 642 + + + YES + + + + + + 643 + + + @@ -2615,6 +2672,8 @@ 636.IBPluginDependency 637.IBPluginDependency 638.IBPluginDependency + 642.IBPluginDependency + 643.IBPluginDependency 7.CustomClassName 7.IBPluginDependency 7.ImportedFromIB2 @@ -2762,6 +2821,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin AnselExportPluginBox com.apple.InterfaceBuilder.CocoaPlugin @@ -2785,7 +2846,7 @@ - 641 + 644 @@ -2812,6 +2873,7 @@ mServersPopUp mSettingsBox mSizePopUp + mVersionLabel mviewGallerySheet newServerSheet serverListPanel @@ -2837,6 +2899,7 @@ NSPopUpButton NSBox NSPopUpButton + NSTextField NSWindow NSWindow NSPanel diff --git a/iPhoto2Ansel/Resources/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/Resources/English.lproj/Panel.nib/keyedobjects.nib index c35409d51..872d9ddbf 100644 Binary files a/iPhoto2Ansel/Resources/English.lproj/Panel.nib/keyedobjects.nib and b/iPhoto2Ansel/Resources/English.lproj/Panel.nib/keyedobjects.nib differ diff --git a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj index 0815acfb7..8b345abbd 100644 --- a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj +++ b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj @@ -432,6 +432,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + CURRENT_PROJECT_VERSION = 1.0; DEPLOYMENT_LOCATION = NO; DSTROOT = /; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -442,6 +443,8 @@ PREBINDING = NO; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; VALID_ARCHS = "ppc64 ppc i386 x86_64"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_BUILDER = "mrubinsk@horde.org"; }; name = Release; };