Renamed app to Bitpost.

voisine · Jul 14, 2014 · 3050745 · 3050745
1 parent 5f842b1
commit 3050745
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 23 deletions.
diff --git a/Bitmessage.xcodeproj/project.pbxproj b/Bitmessage.xcodeproj/project.pbxproj
@@ -187,7 +187,7 @@
 		AA2AC86218B8175A008CEEB4 /* BMContactView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMContactView.m; sourceTree = "<group>"; };
 		AA2AC87218B88FF2008CEEB4 /* BMIdentityView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMIdentityView.h; sourceTree = "<group>"; };
 		AA2AC87318B88FF2008CEEB4 /* BMIdentityView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMIdentityView.m; sourceTree = "<group>"; };
-		AA31560718AAE02D0017E94F /* Bitmessage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bitmessage.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		AA31560718AAE02D0017E94F /* Bitpost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Bitpost.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		AA31560A18AAE02D0017E94F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		AA31560D18AAE02D0017E94F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		AA31560E18AAE02D0017E94F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -335,7 +335,7 @@
 		AA31560818AAE02D0017E94F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				AA31560718AAE02D0017E94F /* Bitmessage.app */,
+				AA31560718AAE02D0017E94F /* Bitpost.app */,
 				AA31562818AAE02D0017E94F /* BitmessageTests.xctest */,
 			);
 			name = Products;
@@ -636,7 +636,7 @@
 			);
 			name = Bitmessage;
 			productName = Bitmessage;
-			productReference = AA31560718AAE02D0017E94F /* Bitmessage.app */;
+			productReference = AA31560718AAE02D0017E94F /* Bitpost.app */;
 			productType = "com.apple.product-type.application";
 		};
 		AA31562718AAE02D0017E94F /* BitmessageTests */ = {
@@ -664,7 +664,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0510;
-				ORGANIZATIONNAME = Bitmarkets.org;
+				ORGANIZATIONNAME = voluntary.net;
 				TargetAttributes = {
 					AA31562718AAE02D0017E94F = {
 						TestTargetID = AA31560618AAE02D0017E94F;
@@ -973,7 +973,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Bitmessage/Bitmessage-Prefix.pch";
 				INFOPLIST_FILE = "Bitmessage/Bitmessage-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Bitpost;
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};
@@ -988,7 +988,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Bitmessage/Bitmessage-Prefix.pch";
 				INFOPLIST_FILE = "Bitmessage/Bitmessage-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Bitpost;
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Bitmessage.xcodeproj/xcuserdata/steve.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Bitmessage.xcodeproj/xcuserdata/steve.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bitmessage/Classes/Browser/Inspectors/Addressed/BMAddressedView.m"
-            timestampString = "426820570.200425"
+            timestampString = "426986177.773851"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "233"
-            endingLineNumber = "233"
+            startingLineNumber = "238"
+            endingLineNumber = "238"
             landmarkName = "-saveChanges"
             landmarkType = "5">
          </BreakpointContent>
@@ -83,5 +83,37 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Bitmessage/Classes/Browser/Inspectors/Addressed/BMAddressedView.m"
+            timestampString = "426986195.053705"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "195"
+            endingLineNumber = "195"
+            landmarkName = "-textDidChange:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Bitmessage/Classes/Browser/Inspectors/Addressed/BMAddressedView.m"
+            timestampString = "426986197.882652"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "197"
+            endingLineNumber = "197"
+            landmarkName = "-textDidChange:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/Bitmessage.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Bitmessage.xcscheme b/Bitmessage.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/Bitmessage.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "AA31560618AAE02D0017E94F"
-               BuildableName = "Bitmessage.app"
+               BuildableName = "Bitpost.app"
                BlueprintName = "Bitmessage"
                ReferencedContainer = "container:Bitmessage.xcodeproj">
             </BuildableReference>
@@ -43,7 +43,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AA31560618AAE02D0017E94F"
-            BuildableName = "Bitmessage.app"
+            BuildableName = "Bitpost.app"
             BlueprintName = "Bitmessage"
             ReferencedContainer = "container:Bitmessage.xcodeproj">
          </BuildableReference>
@@ -62,7 +62,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AA31560618AAE02D0017E94F"
-            BuildableName = "Bitmessage.app"
+            BuildableName = "Bitpost.app"
             BlueprintName = "Bitmessage"
             ReferencedContainer = "container:Bitmessage.xcodeproj">
          </BuildableReference>
@@ -80,7 +80,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "AA31560618AAE02D0017E94F"
-            BuildableName = "Bitmessage.app"
+            BuildableName = "Bitpost.app"
             BlueprintName = "Bitmessage"
             ReferencedContainer = "container:Bitmessage.xcodeproj">
          </BuildableReference>

diff --git a/Bitmessage/Classes/Browser/Controllers/BMAppController.m b/Bitmessage/Classes/Browser/Controllers/BMAppController.m
@@ -25,6 +25,7 @@ - (void)applicationDidFinishLaunching: (NSNotification *)aNote
 - (void)addAbout
 {
     NavInfoNode *about = [[NavInfoNode alloc] init];
+    about.shouldSortChildren = NO;
     [(BMNode *)self.rootNode addChild:about];
     about.nodeTitle = @"About";
     about.nodeSuggestedWidth = 150;
@@ -63,6 +64,55 @@ - (void)addAbout
        [contributors addChild:contributor];
     }
 
+
+    NavInfoNode *others = [[NavInfoNode alloc] init];
+    [contributors addChild:others];
+    others.nodeTitle = @"3rd Party";
+    others.nodeSuggestedWidth = 200;
+    others.shouldSortChildren = NO;
+
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"Bitmessage";
+        package.nodeSubtitle = @"bitmessage.org";
+        [others addChild:package];
+    }
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"Open Sans";
+        package.nodeSubtitle = @"Steve Matteson, Google fonts";
+        [others addChild:package];
+    }
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"Python";
+        package.nodeSubtitle = @"python.org";
+        [others addChild:package];
+    }
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"Tor";
+        package.nodeSubtitle = @"torproject.org";
+        [others addChild:package];
+    }
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"XmlPRC";
+        package.nodeSubtitle = @"Eric Czarny";
+        [others addChild:package];
+    }
+
+    {
+        NavInfoNode *package = [[NavInfoNode alloc] init];
+        package.nodeTitle = @"ZipKit";
+        package.nodeSubtitle = @"Karl Moskowski";
+        [others addChild:package];
+    }
 }
 
 - (void)checkForNewUser

diff --git a/Bitmessage/Classes/Browser/Inspectors/Addressed/BMAddressedView.m b/Bitmessage/Classes/Browser/Inspectors/Addressed/BMAddressedView.m
@@ -192,7 +192,12 @@ - (void)textDidChange:(NSNotification *)aNotification
                 [self.labelField gotoNext];
             }
 
-            [self.addressField endEditingOnReturn];
+            if([self.addressField endEditingOnReturn])
+            {
+                [self saveChanges];
+                [self.labelField gotoNext];
+            }
+
             [self updateAddressColor];
             [self updateCheckbox];
         }
@@ -209,7 +214,7 @@ - (void)textDidChange:(NSNotification *)aNotification
 
 - (void)updateCheckbox
 {
-    if (!self.isUpdating && self.isSynced && self.contact.isSynced && self.hasValidAddress)
+    if (/*!self.isUpdating &&*/ self.isSynced && self.contact.isSynced && self.hasValidAddress)
     {
         [self.checkbox setImage:[NSImage imageNamed:@"icon_tick"]];
     }

diff --git a/Bitmessage/resources/themes/themes.json b/Bitmessage/resources/themes/themes.json
@@ -209,7 +209,7 @@
         {
             "title" :
             {
-                "fontName" : "Open Sans Light",
+                "fontName" : "Open Sans",
                 "fontSize" : 24,
                 "color" : "#FFFFFF",
             },

diff --git a/Bitmessage/resources/xibs/MainMenu.xib b/Bitmessage/resources/xibs/MainMenu.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
@@ -17,10 +17,10 @@
         </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
-                <menuItem title="Bitmessage" id="56">
-                    <menu key="submenu" title="Bitmessage" systemMenu="apple" id="57">
+                <menuItem title="Bitpost" id="56">
+                    <menu key="submenu" title="Bitpost" systemMenu="apple" id="57">
                         <items>
-                            <menuItem title="About Bitmessage" id="58">
+                            <menuItem title="About" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="openInfoPanel:" target="494" id="mtQ-ec-Yb8"/>
@@ -39,7 +39,7 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide Bitmarket" keyEquivalent="h" id="134">
+                            <menuItem title="Hide" keyEquivalent="h" id="134">
                                 <connections>
                                     <action selector="hide:" target="-1" id="367"/>
                                 </connections>
@@ -58,7 +58,7 @@
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit Bitmarket" keyEquivalent="q" id="136">
+                            <menuItem title="Quit" keyEquivalent="q" id="136">
                                 <connections>
                                     <action selector="terminate:" target="-3" id="449"/>
                                 </connections>
@@ -612,7 +612,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="Bitmarket Help" keyEquivalent="?" id="492">
+                            <menuItem title="Help" keyEquivalent="?" id="492">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="493"/>
                                 </connections>