Permalink
Browse files

Added new about box

  • Loading branch information...
1 parent 1ce79ca commit 69da107a64abb177da46298c084d2485a15f0708 Matt Wright committed Jul 22, 2008
@@ -119,6 +119,8 @@
<string>id</string>
<key>sendCommand</key>
<string>id</string>
+ <key>showAbout</key>
+ <string>id</string>
<key>showFontPanel</key>
<string>id</string>
<key>showPreferencePanel</key>
@@ -132,6 +134,10 @@
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
+ <key>aboutBox</key>
+ <string>NSWindow</string>
+ <key>aboutVersionLabel</key>
+ <string>NSTextField</string>
<key>box</key>
<string>id</string>
<key>channelBar</key>
@@ -140,6 +146,8 @@
<string>NSMenu</string>
<key>channelTableView</key>
<string>CustomTableView</string>
+ <key>copyrightTextView</key>
+ <string>NSTextView</string>
<key>editCurrentChannelMenuItem</key>
<string>NSMenuItem</string>
<key>errorTextField</key>
@@ -10,7 +10,8 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>621</integer>
+ <integer>644</integer>
+ <integer>57</integer>
</array>
<key>IBSystem Version</key>
<string>9E17</string>
Binary file not shown.
View
@@ -26,5 +26,7 @@
<string>Nils Hjelte</string>
<key>SmartCrashReports_EmailTicket</key>
<string>SCR-7AE0CF3CEA</string>
+ <key>NSGitRevision</key>
+ <string>N/A</string>
</dict>
</plist>
@@ -6,6 +6,21 @@
objectVersion = 42;
objects = {
+/* Begin PBXAggregateTarget section */
+ C9EC9F1E0E363AE000445345 /* Packages */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = C9EC9F290E363AED00445345 /* Build configuration list for PBXAggregateTarget "Packages" */;
+ buildPhases = (
+ C9EC9F250E363AEB00445345 /* ShellScript */,
+ );
+ dependencies = (
+ C9EC9F230E363AE500445345 /* PBXTargetDependency */,
+ );
+ name = Packages;
+ productName = Packages;
+ };
+/* End PBXAggregateTarget section */
+
/* Begin PBXBuildFile section */
8D1107280486CEB800E47090 /* MacIrssi_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32CA4F630368D1EE00C91783 /* MacIrssi_Prefix.pch */; };
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
@@ -414,6 +429,13 @@
remoteGlobalIDString = B32A9E9005F0F99C00DB2595;
remoteInfo = irssi;
};
+ C9EC9F220E363AE500445345 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8D1107260486CEB800E47090 /* MacIrssi */;
+ remoteInfo = MacIrssi;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -2868,6 +2890,7 @@
B32A9E9005F0F99C00DB2595 /* irssi */,
C224D2F008C6502200E66C62 /* ThemePreviewDaemon */,
C224D32708C651E000E66C62 /* Fake IRC Server */,
+ C9EC9F1E0E363AE000445345 /* Packages */,
);
};
/* End PBXProject section */
@@ -2932,7 +2955,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /usr/bin/perl;
- shellScript = "# Xcode auto-versioning script for Subversion by Axel Andersson\n# Updated for git by Marcus S. Zarra and Matt Long\n \nuse strict;\n \n# Get the current git commit hash and use it to set the CFBundleVersion value\nmy $REV = `git show --abbrev-commit | grep \"^commit\"`;\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n \nmy $version = $REV;\nif( $version =~ /^commit\\s+([^.]+)\\.\\.\\.$/ )\n{ \n\t$version = $1;\n}\nelse\n{\n\t$version = undef;\n}\ndie \"$0: No Git revision found\" unless $version;\n \nopen(FH, \"$INFO\") or die \"$0: $INFO: $!\";\nmy $info = join(\"\", <FH>);\nclose(FH);\n \n$info =~ s/([\\t ]+<key>CFBundleVersion<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/$1$version$2/;\n \nopen(FH, \">$INFO\") or die \"$0: $INFO: $!\";\nprint FH $info;\nclose(FH);";
+ shellScript = "# Xcode auto-versioning script for Subversion by Axel Andersson\n# Updated for git by Marcus S. Zarra and Matt Long\n \nuse strict;\n \n# Get the current git commit hash and use it to set the CFBundleVersion value\nmy $REV = `git show --abbrev-commit | grep \"^commit\"`;\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n \nmy $version = $REV;\nif( $version =~ /^commit\\s+([^.]+)\\.\\.\\.$/ )\n{ \n\t$version = $1;\n}\nelse\n{\n\t$version = undef;\n}\ndie \"$0: No Git revision found\" unless $version;\n \nopen(FH, \"$INFO\") or die \"$0: $INFO: $!\";\nmy $info = join(\"\", <FH>);\nclose(FH);\n \n$info =~ s/([\\t ]+<key>NSGitRevision<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/$1$version$2/;\n \nopen(FH, \">$INFO\") or die \"$0: $INFO: $!\";\nprint FH $info;\nclose(FH);";
+ };
+ C9EC9F250E363AEB00445345 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "VERSION=`pl < $PRODUCT_SETTINGS_PATH | perl -ne 'while (<STDIN>) { print $1 if ($_ =~ /CFBundleVersion\\s+=\\s+\"(.*?)\"/); }'`\nDMG_NAME=\"$PROJECT-$VERSION.dmg\"\nAPP_NAME=\"MacIrssi.app\"\n\nmkdir \"$TEMP_DIR/dmg\"\ncd \"$TEMP_DIR/dmg\"\necho \"Making DMG build dir ($DMG_NAME)...\"\nrm -rf \"$PROJECT\"\nmkdir \"$PROJECT\"\necho \"Copying Product...\"\ncp -rf \"$TARGET_BUILD_DIR/$APP_NAME\" \"$PROJECT/$APP_NAME\"\necho \"Creating DMG...\"\nhdiutil create -quiet -ov -srcfolder \"$PROJECT\" \"$DMG_NAME\"\necho \"Moving to products dir...\"\nmv -f \"$DMG_NAME\" \"$BUILT_PRODUCTS_DIR\"";
};
/* End PBXShellScriptBuildPhase section */
@@ -2998,6 +3034,11 @@
target = B32A9E9005F0F99C00DB2595 /* irssi */;
targetProxy = C224D34E08C6532B00E66C62 /* PBXContainerItemProxy */;
};
+ C9EC9F230E363AE500445345 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8D1107260486CEB800E47090 /* MacIrssi */;
+ targetProxy = C9EC9F220E363AE500445345 /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -3679,6 +3720,36 @@
};
name = Default;
};
+ C9EC9F1F0E363AE000445345 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = Packages;
+ };
+ name = Development;
+ };
+ C9EC9F200E363AE000445345 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GENERATE_PKGINFO_FILE = YES;
+ INFOPLIST_FILE = Info.plist;
+ PRODUCT_NAME = Packages;
+ ZERO_LINK = NO;
+ };
+ name = Deployment;
+ };
+ C9EC9F210E363AE000445345 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = Packages;
+ };
+ name = Default;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -3732,6 +3803,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
+ C9EC9F290E363AED00445345 /* Build configuration list for PBXAggregateTarget "Packages" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C9EC9F1F0E363AE000445345 /* Development */,
+ C9EC9F200E363AE000445345 /* Deployment */,
+ C9EC9F210E363AE000445345 /* Default */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Default;
+ };
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -62,6 +62,10 @@ extern char **argv;
IBOutlet ChannelBar *channelBar;
IBOutlet id box;
IBOutlet UKUpdateChecker *updateChecker;
+
+ IBOutlet NSWindow *aboutBox;
+ IBOutlet NSTextField *aboutVersionLabel;
+ IBOutlet NSTextView *copyrightTextView;
History *commandHistory;
ChannelController *currentChannelController;
@@ -114,6 +118,7 @@ extern char **argv;
- (IBAction)endErrorWindow:(id)sender;
- (IBAction)showFontPanel:(id)sender;
- (IBAction)showPreferencePanel:(id)sender;
+- (IBAction)showAbout:(id)sender;
//- (IBAction)paste:(id)sender;
- (IBAction)performShortcut:(id)sender;
- (IBAction)makeSearchFieldFirstResponder:(id)sender;
@@ -334,6 +334,19 @@ - (IBAction)showPreferencePanel:(id)sender
[preferenceController showWindow:self];
}
+- (IBAction)showAbout:(id)sender
+{
+ [aboutVersionLabel setStringValue:[NSString stringWithFormat:@"Version %@ (Build %@)",
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSGitRevision"]]];
+
+ [copyrightTextView setString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSHumanReadableCopyright"]];
+ [copyrightTextView setAlignment:NSCenterTextAlignment range:NSMakeRange(0, [[copyrightTextView textStorage] length])];
+
+ [aboutBox center];
+ [aboutBox makeKeyAndOrderFront:sender];
+}
+
- (IBAction)debugAction1:(id)sender
{
[self workspaceWillSleep:nil];
View
@@ -0,0 +1,7 @@
+export CFLAGS=-I/sw/include
+export LDFLAGS=-L/sw/lib
+export CXXFLAGS=$CFLAGS
+export CPPFLAGS=$CXXFLAGS
+export ACLOCAL_FLAGS="-I /sw/share/aclocal"
+export PKG_CONFIG_PATH="/sw/lib/pkgconfig"
+export MACOSX_DEPLOYMENT_TARGET=10.4

0 comments on commit 69da107

Please sign in to comment.