Skip to content

Commit fb95611

Browse files
laullonlaullon
committed
ToolBar, icons and selector.
1 parent a20e570 commit fb95611

File tree

6 files changed

+175
-10
lines changed

6 files changed

+175
-10
lines changed

‎English.lproj/RepositoryWindow.xib

Lines changed: 162 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
33
<data>
44
<int key="IBDocument.SystemTarget">1050</int>
5-
<string key="IBDocument.SystemVersion">10F569</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">804</string>
7-
<string key="IBDocument.AppKitVersion">1038.29</string>
8-
<string key="IBDocument.HIToolboxVersion">461.00</string>
5+
<string key="IBDocument.SystemVersion">10J567</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">788</string>
7+
<string key="IBDocument.AppKitVersion">1038.35</string>
8+
<string key="IBDocument.HIToolboxVersion">462.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
11-
<string key="NS.object.0">804</string>
11+
<string key="NS.object.0">788</string>
1212
</object>
1313
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
15-
<integer value="5"/>
15+
<integer value="367"/>
1616
</object>
1717
<object class="NSArray" key="IBDocument.PluginDependencies">
1818
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -58,6 +58,7 @@
5858
<string>41FA1145-D953-446F-B6DF-0230885AB433</string>
5959
<string>7A8FEE7B-B273-4AF3-8A22-53A9DAF786FA</string>
6060
<string>B15C57F2-985F-4446-9A29-34C76DBA9042</string>
61+
<string>D43D38AE-6110-463C-8514-FC8ACC0F327C</string>
6162
<string>FF15EAEC-D5AB-4C6F-9E13-4B62C6692BFC</string>
6263
<string>NSToolbarFlexibleSpaceItem</string>
6364
<string>NSToolbarSeparatorItem</string>
@@ -92,9 +93,10 @@
9293
<string key="NSToolbarItemPaletteLabel">Clone Repository To</string>
9394
<nil key="NSToolbarItemToolTip"/>
9495
<object class="NSButton" key="NSToolbarItemView" id="703553818">
95-
<nil key="NSNextResponder"/>
96+
<reference key="NSNextResponder"/>
9697
<int key="NSvFlags">268</int>
9798
<string key="NSFrame">{{38, 14}, {40, 25}}</string>
99+
<reference key="NSSuperview"/>
98100
<bool key="NSEnabled">YES</bool>
99101
<object class="NSButtonCell" key="NSCell" id="64590231">
100102
<int key="NSCellFlags">-2080244224</int>
@@ -137,9 +139,10 @@
137139
<string key="NSToolbarItemPaletteLabel">Refresh</string>
138140
<nil key="NSToolbarItemToolTip"/>
139141
<object class="NSButton" key="NSToolbarItemView" id="438380428">
140-
<nil key="NSNextResponder"/>
142+
<reference key="NSNextResponder"/>
141143
<int key="NSvFlags">268</int>
142144
<string key="NSFrame">{{8, 14}, {32, 25}}</string>
145+
<reference key="NSSuperview"/>
143146
<bool key="NSEnabled">YES</bool>
144147
<object class="NSButtonCell" key="NSCell" id="604536609">
145148
<int key="NSCellFlags">-2080244224</int>
@@ -170,6 +173,67 @@
170173
<bool key="NSToolbarIsUserRemovable">YES</bool>
171174
<int key="NSToolbarItemVisibilityPriority">0</int>
172175
</object>
176+
<object class="NSToolbarItem" id="121507526">
177+
<object class="NSMutableString" key="NSToolbarItemIdentifier">
178+
<characters key="NS.bytes">D43D38AE-6110-463C-8514-FC8ACC0F327C</characters>
179+
</object>
180+
<string key="NSToolbarItemLabel">View</string>
181+
<string key="NSToolbarItemPaletteLabel">View</string>
182+
<nil key="NSToolbarItemToolTip"/>
183+
<object class="NSSegmentedControl" key="NSToolbarItemView" id="371591001">
184+
<reference key="NSNextResponder"/>
185+
<int key="NSvFlags">268</int>
186+
<string key="NSFrame">{{0, 14}, {94, 25}}</string>
187+
<reference key="NSSuperview"/>
188+
<bool key="NSEnabled">YES</bool>
189+
<object class="NSSegmentedCell" key="NSCell" id="399933706">
190+
<int key="NSCellFlags">67239424</int>
191+
<int key="NSCellFlags2">0</int>
192+
<object class="NSFont" key="NSSupport">
193+
<string key="NSName">LucidaGrande</string>
194+
<double key="NSSize">13</double>
195+
<int key="NSfFlags">16</int>
196+
</object>
197+
<reference key="NSControlView" ref="371591001"/>
198+
<object class="NSMutableArray" key="NSSegmentImages">
199+
<bool key="EncodedWithXMLCoder">YES</bool>
200+
<object class="NSSegmentItem">
201+
<double key="NSSegmentItemWidth">44</double>
202+
<object class="NSCustomResource" key="NSSegmentItemImage">
203+
<string key="NSClassName">NSImage</string>
204+
<string key="NSResourceName">sidebar_Template</string>
205+
</object>
206+
<string key="NSSegmentItemLabel"/>
207+
<bool key="NSSegmentItemSelected">YES</bool>
208+
<int key="NSSegmentItemImageScaling">2</int>
209+
</object>
210+
<object class="NSSegmentItem">
211+
<double key="NSSegmentItemWidth">43</double>
212+
<object class="NSCustomResource" key="NSSegmentItemImage">
213+
<string key="NSClassName">NSImage</string>
214+
<string key="NSResourceName">list_Template</string>
215+
</object>
216+
<string key="NSSegmentItemLabel"/>
217+
<int key="NSSegmentItemTag">1</int>
218+
<bool key="NSSegmentItemSelected">YES</bool>
219+
<int key="NSSegmentItemImageScaling">0</int>
220+
</object>
221+
</object>
222+
<int key="NSTrackingMode">1</int>
223+
<int key="NSSegmentStyle">2</int>
224+
</object>
225+
</object>
226+
<nil key="NSToolbarItemImage"/>
227+
<nil key="NSToolbarItemTarget"/>
228+
<nil key="NSToolbarItemAction"/>
229+
<string key="NSToolbarItemMinSize">{94, 25}</string>
230+
<string key="NSToolbarItemMaxSize">{94, 25}</string>
231+
<bool key="NSToolbarItemEnabled">YES</bool>
232+
<bool key="NSToolbarItemAutovalidates">YES</bool>
233+
<int key="NSToolbarItemTag">0</int>
234+
<bool key="NSToolbarIsUserRemovable">YES</bool>
235+
<int key="NSToolbarItemVisibilityPriority">0</int>
236+
</object>
173237
<object class="NSToolbarItem" id="684497462">
174238
<object class="NSMutableString" key="NSToolbarItemIdentifier">
175239
<characters key="NS.bytes">FF15EAEC-D5AB-4C6F-9E13-4B62C6692BFC</characters>
@@ -287,11 +351,14 @@
287351
<reference ref="430741773"/>
288352
<reference ref="136647420"/>
289353
<reference ref="442829492"/>
354+
<reference ref="121507526"/>
290355
</object>
291356
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
292357
<bool key="EncodedWithXMLCoder">YES</bool>
293358
<reference ref="79199737"/>
294359
<reference ref="442829492"/>
360+
<reference ref="121507526"/>
361+
<reference ref="430741773"/>
295362
<reference ref="286515344"/>
296363
<reference ref="684497462"/>
297364
</object>
@@ -520,6 +587,14 @@
520587
</object>
521588
<int key="connectionID">419</int>
522589
</object>
590+
<object class="IBConnectionRecord">
591+
<object class="IBActionConnection" key="connection">
592+
<string key="label">changeLayout:</string>
593+
<reference key="source" ref="1001"/>
594+
<reference key="destination" ref="121507526"/>
595+
</object>
596+
<int key="connectionID">423</int>
597+
</object>
523598
</object>
524599
<object class="IBMutableOrderedSet" key="objectRecords">
525600
<object class="NSArray" key="orderedObjects">
@@ -603,6 +678,7 @@
603678
<reference ref="684497462"/>
604679
<reference ref="894083033"/>
605680
<reference ref="79199737"/>
681+
<reference ref="121507526"/>
606682
</object>
607683
<reference key="parent" ref="491121796"/>
608684
</object>
@@ -719,6 +795,29 @@
719795
<reference key="parent" ref="120427370"/>
720796
<string key="objectName">Content SplitView</string>
721797
</object>
798+
<object class="IBObjectRecord">
799+
<int key="objectID">422</int>
800+
<reference key="object" ref="121507526"/>
801+
<object class="NSMutableArray" key="children">
802+
<bool key="EncodedWithXMLCoder">YES</bool>
803+
<reference ref="371591001"/>
804+
</object>
805+
<reference key="parent" ref="1033396020"/>
806+
</object>
807+
<object class="IBObjectRecord">
808+
<int key="objectID">420</int>
809+
<reference key="object" ref="371591001"/>
810+
<object class="NSMutableArray" key="children">
811+
<bool key="EncodedWithXMLCoder">YES</bool>
812+
<reference ref="399933706"/>
813+
</object>
814+
<reference key="parent" ref="121507526"/>
815+
</object>
816+
<object class="IBObjectRecord">
817+
<int key="objectID">421</int>
818+
<reference key="object" ref="399933706"/>
819+
<reference key="parent" ref="371591001"/>
820+
</object>
722821
</object>
723822
</object>
724823
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -757,6 +856,12 @@
757856
<string>415.IBPluginDependency</string>
758857
<string>416.IBPluginDependency</string>
759858
<string>417.IBPluginDependency</string>
859+
<string>420.IBPluginDependency</string>
860+
<string>420.IBSegmentedControlTracker.RoundRobinState</string>
861+
<string>420.IBSegmentedControlTracker.WasGrowing</string>
862+
<string>421.IBPluginDependency</string>
863+
<string>421.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
864+
<string>422.toolbarItem.selectable</string>
760865
<string>5.IBPluginDependency</string>
761866
<string>5.ImportedFromIB2</string>
762867
</object>
@@ -779,7 +884,7 @@
779884
<bytes key="NSTransformStruct">AUM5AAAAAAAAA</bytes>
780885
</object>
781886
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
782-
<string>{{347, 1169}, {616, 0}}</string>
887+
<string>{{207, 573}, {616, 227}}</string>
783888
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
784889
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
785890
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -801,6 +906,12 @@
801906
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
802907
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
803908
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
909+
<integer value="0"/>
910+
<integer value="1"/>
911+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
912+
<integer value="0"/>
913+
<boolean value="NO"/>
914+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
804915
<integer value="1"/>
805916
</object>
806917
</object>
@@ -820,7 +931,7 @@
820931
</object>
821932
</object>
822933
<nil key="sourceID"/>
823-
<int key="maxID">419</int>
934+
<int key="maxID">423</int>
824935
</object>
825936
<object class="IBClassDescriber" key="IBDocument.Classes">
826937
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -832,13 +943,21 @@
832943
<string key="minorKey">NSApplication+GitXScripting.h</string>
833944
</object>
834945
</object>
946+
<object class="IBPartialClassDescription">
947+
<string key="className">NSCell</string>
948+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
949+
<string key="majorKey">IBProjectSource</string>
950+
<string key="minorKey">View/CellTrackingRect.h</string>
951+
</object>
952+
</object>
835953
<object class="IBPartialClassDescription">
836954
<string key="className">PBGitWindowController</string>
837955
<string key="superclassName">NSWindowController</string>
838956
<object class="NSMutableDictionary" key="actions">
839957
<bool key="EncodedWithXMLCoder">YES</bool>
840958
<object class="NSArray" key="dict.sortedKeys">
841959
<bool key="EncodedWithXMLCoder">YES</bool>
960+
<string>changeLayout:</string>
842961
<string>cloneTo:</string>
843962
<string>openInTerminal:</string>
844963
<string>refresh:</string>
@@ -854,12 +973,14 @@
854973
<string>id</string>
855974
<string>id</string>
856975
<string>id</string>
976+
<string>id</string>
857977
</object>
858978
</object>
859979
<object class="NSMutableDictionary" key="actionInfosByName">
860980
<bool key="EncodedWithXMLCoder">YES</bool>
861981
<object class="NSArray" key="dict.sortedKeys">
862982
<bool key="EncodedWithXMLCoder">YES</bool>
983+
<string>changeLayout:</string>
863984
<string>cloneTo:</string>
864985
<string>openInTerminal:</string>
865986
<string>refresh:</string>
@@ -869,6 +990,10 @@
869990
</object>
870991
<object class="NSMutableArray" key="dict.values">
871992
<bool key="EncodedWithXMLCoder">YES</bool>
993+
<object class="IBActionInfo">
994+
<string key="name">changeLayout:</string>
995+
<string key="candidateClassName">id</string>
996+
</object>
872997
<object class="IBActionInfo">
873998
<string key="name">cloneTo:</string>
874999
<string key="candidateClassName">id</string>
@@ -1349,6 +1474,13 @@
13491474
<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
13501475
</object>
13511476
</object>
1477+
<object class="IBPartialClassDescription">
1478+
<string key="className">NSObject</string>
1479+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1480+
<string key="majorKey">IBFrameworkSource</string>
1481+
<string key="minorKey">ScriptingBridge.framework/Headers/SBApplication.h</string>
1482+
</object>
1483+
</object>
13521484
<object class="IBPartialClassDescription">
13531485
<string key="className">NSObject</string>
13541486
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1456,6 +1588,22 @@
14561588
<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
14571589
</object>
14581590
</object>
1591+
<object class="IBPartialClassDescription">
1592+
<string key="className">NSSegmentedCell</string>
1593+
<string key="superclassName">NSActionCell</string>
1594+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1595+
<string key="majorKey">IBFrameworkSource</string>
1596+
<string key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string>
1597+
</object>
1598+
</object>
1599+
<object class="IBPartialClassDescription">
1600+
<string key="className">NSSegmentedControl</string>
1601+
<string key="superclassName">NSControl</string>
1602+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1603+
<string key="majorKey">IBFrameworkSource</string>
1604+
<string key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string>
1605+
</object>
1606+
</object>
14591607
<object class="IBPartialClassDescription">
14601608
<string key="className">NSSplitView</string>
14611609
<string key="superclassName">NSView</string>
@@ -1587,13 +1735,17 @@
15871735
<string>NSMenuCheckmark</string>
15881736
<string>NSMenuMixedState</string>
15891737
<string>NSRefreshTemplate</string>
1738+
<string>list_Template</string>
1739+
<string>sidebar_Template</string>
15901740
</object>
15911741
<object class="NSMutableArray" key="dict.values">
15921742
<bool key="EncodedWithXMLCoder">YES</bool>
15931743
<string>{26, 15}</string>
15941744
<string>{9, 8}</string>
15951745
<string>{7, 2}</string>
15961746
<string>{10, 12}</string>
1747+
<string>{16, 16}</string>
1748+
<string>{16, 16}</string>
15971749
</object>
15981750
</object>
15991751
</data>

‎GitX.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
31460CD4124185BA00B90AED /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 31460CAF124185BA00B90AED /* ReadMe.txt */; };
6161
31460CD5124185BA00B90AED /* Source Code License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB0124185BA00B90AED /* Source Code License.rtf */; };
6262
31460CD6124185BA00B90AED /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB1124185BA00B90AED /* TODO */; };
63+
316E7202131EE9C600AFBB36 /* list_Template.png in Resources */ = {isa = PBXBuildFile; fileRef = 316E7200131EE9C600AFBB36 /* list_Template.png */; };
64+
316E7203131EE9C600AFBB36 /* sidebar_Template.png in Resources */ = {isa = PBXBuildFile; fileRef = 316E7201131EE9C600AFBB36 /* sidebar_Template.png */; };
6365
31DAA7ED1317737100463846 /* gitx_l_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 31DAA7EC1317737100463846 /* gitx_l_pub.pem */; };
6466
3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */; };
6567
3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */; };
@@ -347,6 +349,8 @@
347349
31460CAF124185BA00B90AED /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
348350
31460CB0124185BA00B90AED /* Source Code License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "Source Code License.rtf"; sourceTree = "<group>"; };
349351
31460CB1124185BA00B90AED /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
352+
316E7200131EE9C600AFBB36 /* list_Template.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = list_Template.png; sourceTree = "<group>"; };
353+
316E7201131EE9C600AFBB36 /* sidebar_Template.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sidebar_Template.png; sourceTree = "<group>"; };
350354
31DAA7EC1317737100463846 /* gitx_l_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gitx_l_pub.pem; sourceTree = "<group>"; };
351355
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX_Prefix.pch; sourceTree = "<group>"; };
352356
3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HistoryViewTemplate.png; path = Images/HistoryViewTemplate.png; sourceTree = "<group>"; };
@@ -813,6 +817,8 @@
813817
29B97317FDCFA39411CA2CEA /* Resources */ = {
814818
isa = PBXGroup;
815819
children = (
820+
316E7200131EE9C600AFBB36 /* list_Template.png */,
821+
316E7201131EE9C600AFBB36 /* sidebar_Template.png */,
816822
21025C1012947AB200D87200 /* sourceListAction.png */,
817823
21025C1112947AB200D87200 /* sourceListActionOver.png */,
818824
02B41A5F123E307F00DFC531 /* PBCommitHookFailedSheet.xib */,
@@ -1428,6 +1434,8 @@
14281434
212A49AD12A31350009DAFAD /* ignored_file.png in Resources */,
14291435
212A49AF12A3135C009DAFAD /* modified_file.png in Resources */,
14301436
31DAA7ED1317737100463846 /* gitx_l_pub.pem in Resources */,
1437+
316E7202131EE9C600AFBB36 /* list_Template.png in Resources */,
1438+
316E7203131EE9C600AFBB36 /* sidebar_Template.png in Resources */,
14311439
);
14321440
runOnlyForDeploymentPostprocessing = 0;
14331441
};

‎PBGitWindowController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
- (IBAction) openInTerminal:(id)sender;
4747
- (IBAction) cloneTo:(id)sender;
4848
- (IBAction) refresh:(id)sender;
49+
- (IBAction) changeLayout:(id)sender;
4950

5051
- (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
5152

‎PBGitWindowController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode
215215
[sidebarController setHistorySearch:searchString mode:mode];
216216
}
217217

218+
- (IBAction) changeLayout:(id)sender{
219+
NSLog(@"selectedSegment=%ld (%d)",[sender selectedSegment],[sender isSelectedForSegment:[sender selectedSegment]]);
220+
}
221+
218222

219223

220224
#pragma mark -

‎list_Template.png

517 Bytes
Loading

‎sidebar_Template.png

503 Bytes
Loading

0 commit comments

Comments
 (0)