Text fixes

ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace/xcshareddata/ipbc-Client.xccheckout

@@ -10,29 +10,29 @@
 	<string>ipbc-Client</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>9E9A1E3F-FB76-4D7F-B5EB-64946445C72E</key>
+		<key>41A46EC74341898613642098E6535621FD117950</key>
 		<string>ssh://web1.adatewithmusic.com/git/ipbc-statusbarapp.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>ipbc-Client/ipbc-Client.xcodeproj/project.xcworkspace</string>
+	<string>ipbc-Client/ipbc-Client.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>9E9A1E3F-FB76-4D7F-B5EB-64946445C72E</key>
+		<key>41A46EC74341898613642098E6535621FD117950</key>
 		<string>../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>ssh://web1.adatewithmusic.com/git/ipbc-statusbarapp.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>9E9A1E3F-FB76-4D7F-B5EB-64946445C72E</string>
+	<string>41A46EC74341898613642098E6535621FD117950</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>9E9A1E3F-FB76-4D7F-B5EB-64946445C72E</string>
+			<string>41A46EC74341898613642098E6535621FD117950</string>
 			<key>IDESourceControlWCCName</key>
 			<string>ipbc-statusbarapp</string>
 		</dict>

ipbc-Client/ipbc-Client/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7531" systemVersion="14D131" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
+        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7531"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="ipbc-Client" id="56">
@@ -677,14 +677,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="90" y="125" width="480" height="309"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="R0G-2c-z7t">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="309"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Um2-TU-XD5">
                         <rect key="frame" x="17" y="272" width="104" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Name" id="Qib-zb-Irz">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -693,7 +692,6 @@
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tDT-Jc-803">
                         <rect key="frame" x="17" y="234" width="104" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Token" id="3TI-UC-yh2">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -702,7 +700,6 @@
                     </textField>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YxW-yA-Irj">
                         <rect key="frame" x="131" y="270" width="329" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="nCu-gY-fgW">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -711,7 +708,6 @@
                     </textField>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DuK-lM-9lP">
                         <rect key="frame" x="131" y="232" width="329" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="UzA-bg-t0Q">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -719,17 +715,16 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hXp-Wv-qfT">
-                        <rect key="frame" x="131" y="143" width="332" height="53"/>
+                        <rect key="frame" x="131" y="124" width="332" height="91"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" id="PYW-tK-cnY">
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="You need an ip-breadcrump.org account to use this software." id="PYW-tK-cnY">
                             <font key="font" metaFont="system"/>
+                            <string key="title">This is an application that updates your hostnames with the latest IP address of your computer assuring that you will always have an updated hostname allowing you to connect to your computer from everywhere.</string>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pkc-9j-DCv">
                         <rect key="frame" x="384" y="13" width="82" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1Np-5g-nIC">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -743,7 +738,6 @@ Gw
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c09-yz-NC8">
                         <rect key="frame" x="302" y="13" width="82" height="32"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rKq-NH-VrX">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -754,12 +748,10 @@ Gw
                     </button>
                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f3Z-SD-KAB">
                         <rect key="frame" x="20" y="20" width="60" height="60"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="feet" id="fxr-2I-BhX"/>
                     </imageView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WRx-Jh-YZc">
                         <rect key="frame" x="163" y="20" width="113" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="___.___.___.___" id="x8Y-LH-LbM">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -771,13 +763,22 @@ Gw
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="25a-TM-5vL">
                         <rect key="frame" x="134" y="20" width="27" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="IP:" id="pCL-ji-g5v">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6rt-xb-QaB">
+                        <rect key="frame" x="125" y="88" width="341" height="32"/>
+                        <buttonCell key="cell" type="push" title="Get your always free ip-breadcrump.org account!" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="czA-8v-Ae1">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="gotoHomepage:" target="494" id="OOq-FL-pEK"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
         </window>
@@ -785,6 +786,6 @@ Gw
         <userDefaultsController representsSharedInstance="YES" id="Smg-TM-f0h"/>
     </objects>
     <resources>
-        <image name="feet" width="245.76820373535156" height="245.76820373535156"/>
+        <image name="feet" width="245.75999450683594" height="245.75999450683594"/>
     </resources>
-</document>
+</document>

ipbc-Client/ipbc-Client/WebServiceConstants.h

@@ -10,6 +10,8 @@
 
 @interface WebServiceConstants : NSObject
 
+extern NSString * const HOMEPAGE_REGISTER;
+
 extern NSString * const WS_BASE;
 extern NSString * const WS_RESOURCE;
 extern NSString * const WS_GET_USERS_IP_SERVICE;

ipbc-Client/ipbc-Client/WebServiceConstants.m

@@ -10,6 +10,14 @@
 
 @implementation WebServiceConstants
 
+NSString * const HOMEPAGE_REGISTER = @"https://www.ip-bc.org/login.xhtml";
+
+/*
+NSString * const WS_BASE = @"localhost:8080/ip-bc.org";
+NSString * const WS_RESOURCE = @"http://localhost:8080/ip-bc.org/ws/update/ip";
+NSString * const WS_GET_USERS_IP_SERVICE = @"http://localhost:8080/ip-bc.org/ws/info/ip";
+*/
+
 NSString * const WS_BASE = @"www.ip-bc.org";
 NSString * const WS_RESOURCE = @"https://www.ip-bc.org/ws/update/ip";
 NSString * const WS_GET_USERS_IP_SERVICE = @"https://www.ip-bc.org/ws/info/ip";

ipbc-Client/ipbc-Client/WebserviceClient.m

@@ -83,7 +83,7 @@
 -(BOOL)checkUpdateNeeded {
     NSString *storedIPv4 = [[NSUserDefaults standardUserDefaults] stringForKey:@"value.ip.ipv4"];
     NSString *fetchedIPv4 = usersIPv4;
-    
+    //return YES;
     if(storedIPv4 == nil) {
         NSLog(@"stored IPv4 NULL");
         return YES;

ipbc-Client/ipbc-Client/ipbcAppDelegate.h

@@ -27,4 +27,6 @@
 -(IBAction)fromSettingsCancel:(id)sender;
 -(IBAction)fromSettingsSave:(id)sender;
 
+-(IBAction)gotoHomepage:(id)sender;
+
 @end

ipbc-Client/ipbc-Client/ipbcAppDelegate.m

@@ -8,6 +8,7 @@
 
 #import "ipbcAppDelegate.h"
 #import "ImageHelper.h"
+#import "WebServiceConstants.h"
 
 @implementation ipbcAppDelegate
 
@@ -56,4 +57,8 @@
     [settings orderOut:self];
 }
 
+-(IBAction)gotoHomepage:(id)sender {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:HOMEPAGE_REGISTER]];
+}
+
 @end