Move version into filter bar

alcatraz · Dec 6, 2014 · 886c89a · 886c89a
1 parent 1f92209
commit 886c89a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 101 deletions.
diff --git a/Alcatraz.xcodeproj/project.pbxproj b/Alcatraz.xcodeproj/project.pbxproj
@@ -45,7 +45,6 @@
 		89D40AFC1721CBD600A67BB3 /* ATZPluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89D40AFB1721CBD600A67BB3 /* ATZPluginWindowController.m */; };
 		8A133EE319C235FD0068FCB9 /* ATZPackageListTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A133EE219C235FD0068FCB9 /* ATZPackageListTableCellView.m */; };
 		8A1732A81A2694BB002033D6 /* NSColor+Alcatraz.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A1732A71A2694BB002033D6 /* NSColor+Alcatraz.m */; };
-		8A44EF751745D13200411834 /* ATZVersionLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A44EF741745D13200411834 /* ATZVersionLabel.m */; };
 		8A4C621A19C2D6F1003580BD /* ATZFilterBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A4C621919C2D6F1003580BD /* ATZFilterBarView.m */; };
 		8A56ED9B19C20CCE00309B3C /* ATZPluginWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8A56ED9A19C20CCE00309B3C /* ATZPluginWindowController.xib */; };
 		8A6025AD19C2978900D47F3F /* 740-gear-selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 8A60259819C2978900D47F3F /* 740-gear-selected.png */; };
@@ -144,8 +143,6 @@
 		8A133EE219C235FD0068FCB9 /* ATZPackageListTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ATZPackageListTableCellView.m; path = Views/ATZPackageListTableCellView.m; sourceTree = "<group>"; };
 		8A1732A61A2694BB002033D6 /* NSColor+Alcatraz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSColor+Alcatraz.h"; sourceTree = "<group>"; };
 		8A1732A71A2694BB002033D6 /* NSColor+Alcatraz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSColor+Alcatraz.m"; sourceTree = "<group>"; };
-		8A44EF731745D13200411834 /* ATZVersionLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ATZVersionLabel.h; path = Views/ATZVersionLabel.h; sourceTree = "<group>"; };
-		8A44EF741745D13200411834 /* ATZVersionLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ATZVersionLabel.m; path = Views/ATZVersionLabel.m; sourceTree = "<group>"; };
 		8A4C621819C2D6F1003580BD /* ATZFilterBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ATZFilterBarView.h; path = Views/ATZFilterBarView.h; sourceTree = "<group>"; };
 		8A4C621919C2D6F1003580BD /* ATZFilterBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ATZFilterBarView.m; path = Views/ATZFilterBarView.m; sourceTree = "<group>"; };
 		8A56ED9A19C20CCE00309B3C /* ATZPluginWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ATZPluginWindowController.xib; sourceTree = "<group>"; };
@@ -386,8 +383,6 @@
 				8ADC22331A2AD5B800DB7BCA /* ATZPreviewImageButton.m */,
 				8AF670C719C2DE8A00E1C168 /* ATZSegmentedControl.h */,
 				8AF670C819C2DE8A00E1C168 /* ATZSegmentedControl.m */,
-				8A44EF731745D13200411834 /* ATZVersionLabel.h */,
-				8A44EF741745D13200411834 /* ATZVersionLabel.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -538,7 +533,6 @@
 				894714E817302F63003CDDA7 /* ATZInstaller.m in Sources */,
 				897F7899173FC54C006C43E5 /* ATZAlcatrazPackage.m in Sources */,
 				8A4C621A19C2D6F1003580BD /* ATZFilterBarView.m in Sources */,
-				8A44EF751745D13200411834 /* ATZVersionLabel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Alcatraz/ATZPluginWindowController.xib b/Alcatraz/ATZPluginWindowController.xib
@@ -13,6 +13,7 @@
                 <outlet property="previewPanel" destination="4vQ-3a-fNb" id="3Ez-xU-2v3"/>
                 <outlet property="searchField" destination="UNr-70-Qql" id="pQP-eA-7N3"/>
                 <outlet property="tableView" destination="Xmj-hd-CPE" id="AV4-2C-87K"/>
+                <outlet property="versionTextField" destination="hsV-nN-jHO" id="sOR-F4-Ibr"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="2B8-Td-gLY"/>
             </connections>
         </customObject>
@@ -63,11 +64,21 @@
                                     <action selector="segmentedControlPressed:" target="-2" id="dQL-wu-Ruf"/>
                                 </connections>
                             </segmentedControl>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hsV-nN-jHO">
+                                <rect key="frame" x="499" y="9" width="34" height="18"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="Or1-bZ-rS2">
+                                    <font key="font" size="12" name="HelveticaNeue"/>
+                                    <color key="textColor" white="0.75" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
                         </subviews>
                         <constraints>
                             <constraint firstAttribute="centerY" secondItem="reu-CB-C0i" secondAttribute="centerY" constant="2" id="2rj-TD-hfT"/>
+                            <constraint firstAttribute="centerY" secondItem="hsV-nN-jHO" secondAttribute="centerY" constant="2" id="4if-cW-Xnv"/>
                             <constraint firstItem="Wxk-Va-YMt" firstAttribute="centerY" secondItem="reu-CB-C0i" secondAttribute="centerY" id="D5D-79-kC3"/>
                             <constraint firstItem="reu-CB-C0i" firstAttribute="leading" secondItem="0Fa-9p-0gT" secondAttribute="leading" constant="16" id="ELF-J2-Y4x"/>
+                            <constraint firstAttribute="trailing" secondItem="hsV-nN-jHO" secondAttribute="trailing" constant="14" id="J89-aJ-Yya"/>
                             <constraint firstAttribute="height" constant="32" id="Yci-xm-ezL"/>
                             <constraint firstItem="Wxk-Va-YMt" firstAttribute="leading" secondItem="reu-CB-C0i" secondAttribute="trailing" constant="10" id="eMS-g8-tnJ"/>
                         </constraints>

diff --git a/Alcatraz/Controllers/ATZPluginWindowController.h b/Alcatraz/Controllers/ATZPluginWindowController.h
@@ -32,6 +32,7 @@
 @property (assign) IBOutlet NSTableView *tableView;
 @property (weak) IBOutlet NSSegmentedControl *packageTypeSegmentedControl;
 @property (weak) IBOutlet NSSegmentedControl *installationStateSegmentedControl;
+@property (weak) IBOutlet NSTextField *versionTextField;
 
 - (id)initWithBundle:(NSBundle *)bundle;
 

diff --git a/Alcatraz/Controllers/ATZPluginWindowController.m b/Alcatraz/Controllers/ATZPluginWindowController.m
@@ -25,8 +25,7 @@
 #import "ATZPluginWindowController.h"
 #import "ATZDownloader.h"
 #import "ATZPackageFactory.h"
-
-#import "ATZVersionLabel.h"
+#import "ATZVersion.h"
 
 #import "ATZPlugin.h"
 #import "ATZColorScheme.h"
@@ -61,9 +60,6 @@ - (id)init {
 
 - (id)initWithBundle:(NSBundle *)bundle {
     if (self = [super initWithWindowNibName:NSStringFromClass([ATZPluginWindowController class])]) {
-        [[self.window toolbar] setSelectedItemIdentifier:ALL_ITEMS_ID];
-        [self addVersionToWindow];
-
         @try {
             if ([NSUserNotificationCenter class])
                 [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
@@ -75,6 +71,7 @@ - (id)initWithBundle:(NSBundle *)bundle {
 
 - (void)windowDidLoad {
     [super windowDidLoad];
+    [self addVersionToWindow];
     if ([self.window respondsToSelector:@selector(setTitleVisibility:)])
         self.window.titleVisibility = NSWindowTitleHidden;
 }
@@ -272,14 +269,7 @@ - (void)retrieveImageViewForScreenshot:(NSString *)screenshotPath progress:(void
 }
 
 - (void)addVersionToWindow {
-    NSView *windowFrameView = [[self.window contentView] superview];
-    NSTextField *label = [[ATZVersionLabel alloc] initWithFrame:(NSRect){
-        .origin.x = self.window.frame.size.width - 46,
-        .origin.y = windowFrameView.bounds.size.height - 26,
-        .size.width = 40,
-        .size.height = 20
-    }];
-    [windowFrameView addSubview:label];
+    self.versionTextField.stringValue = @(ATZ_VERSION);
 }
 
 @end
diff --git a/Alcatraz/Views/ATZVersionLabel.h b/Alcatraz/Views/ATZVersionLabel.h
diff --git a/Alcatraz/Views/ATZVersionLabel.m b/Alcatraz/Views/ATZVersionLabel.m