Skip to content

Commit a7faf4f

Browse files
laullonlaullon
committed
Remove the Quick Look button from the upper history toolbar and put it in the file list's bar
1 parent 3a25496 commit a7faf4f

File tree

3 files changed

+97
-49
lines changed

3 files changed

+97
-49
lines changed

‎GLFileView.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
IBOutlet MGScopeBar *typeBar;
2121
NSMutableArray *groups;
2222
NSString *logFormat;
23+
IBOutlet NSView *accessoryView;
2324
}
2425

2526
- (void)showFile;

‎GLFileView.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,15 @@ - (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected f
131131
startFile=identifier;
132132
NSString *path = [NSString stringWithFormat:@"html/views/%@", identifier];
133133
NSString *html = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path];
134-
NSLog(@"[FileViewerController scopeBar:selectedStateChanged] -> file: '%@' (%@)",html,identifier);
135134
NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:html]];
136135
[[view mainFrame] loadRequest:request];
137136
}
138137

138+
- (NSView *)accessoryViewForScopeBar:(MGScopeBar *)scopeBar
139+
{
140+
return accessoryView;
141+
}
142+
139143
- (void) didLoad
140144
{
141145
[self showFile];

‎PBGitHistoryView.xib

Lines changed: 91 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</object>
2222
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
2323
<bool key="EncodedWithXMLCoder">YES</bool>
24-
<integer value="475"/>
24+
<integer value="486"/>
2525
</object>
2626
<object class="NSArray" key="IBDocument.PluginDependencies">
2727
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -113,34 +113,6 @@
113113
<int key="NSvFlags">266</int>
114114
<object class="NSMutableArray" key="NSSubviews">
115115
<bool key="EncodedWithXMLCoder">YES</bool>
116-
<object class="NSButton" id="16222431">
117-
<reference key="NSNextResponder" ref="172148644"/>
118-
<int key="NSvFlags">289</int>
119-
<string key="NSFrame">{{908, 3}, {37, 25}}</string>
120-
<reference key="NSSuperview" ref="172148644"/>
121-
<bool key="NSEnabled">YES</bool>
122-
<object class="NSButtonCell" key="NSCell" id="102056827">
123-
<int key="NSCellFlags">-2080244224</int>
124-
<int key="NSCellFlags2">134217728</int>
125-
<string key="NSContents">QuickLook</string>
126-
<object class="NSFont" key="NSSupport" id="924107556">
127-
<string key="NSName">LucidaGrande</string>
128-
<double key="NSSize">13</double>
129-
<int key="NSfFlags">1044</int>
130-
</object>
131-
<reference key="NSControlView" ref="16222431"/>
132-
<int key="NSButtonFlags">-2033958657</int>
133-
<int key="NSButtonFlags2">163</int>
134-
<object class="NSCustomResource" key="NSNormalImage">
135-
<string key="NSClassName">NSImage</string>
136-
<string key="NSResourceName">NSQuickLookTemplate</string>
137-
</object>
138-
<string key="NSAlternateContents"/>
139-
<string type="base64-UTF8" key="NSKeyEquivalent">IA</string>
140-
<int key="NSPeriodicDelay">400</int>
141-
<int key="NSPeriodicInterval">75</int>
142-
</object>
143-
</object>
144116
<object class="NSSegmentedControl" id="802449565">
145117
<reference key="NSNextResponder" ref="172148644"/>
146118
<int key="NSvFlags">292</int>
@@ -150,7 +122,11 @@
150122
<object class="NSSegmentedCell" key="NSCell" id="534046869">
151123
<int key="NSCellFlags">-2080244224</int>
152124
<int key="NSCellFlags2">0</int>
153-
<reference key="NSSupport" ref="924107556"/>
125+
<object class="NSFont" key="NSSupport" id="924107556">
126+
<string key="NSName">LucidaGrande</string>
127+
<double key="NSSize">13</double>
128+
<int key="NSfFlags">1044</int>
129+
</object>
154130
<reference key="NSControlView" ref="802449565"/>
155131
<object class="NSMutableArray" key="NSSegmentImages">
156132
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1109,6 +1085,47 @@
11091085
<object class="NSCustomView" id="375746871">
11101086
<reference key="NSNextResponder" ref="891500945"/>
11111087
<int key="NSvFlags">266</int>
1088+
<object class="NSMutableArray" key="NSSubviews">
1089+
<bool key="EncodedWithXMLCoder">YES</bool>
1090+
<object class="NSCustomView" id="951933530">
1091+
<reference key="NSNextResponder" ref="375746871"/>
1092+
<int key="NSvFlags">268</int>
1093+
<object class="NSMutableArray" key="NSSubviews">
1094+
<bool key="EncodedWithXMLCoder">YES</bool>
1095+
<object class="NSButton" id="16222431">
1096+
<reference key="NSNextResponder" ref="951933530"/>
1097+
<int key="NSvFlags">289</int>
1098+
<string key="NSFrame">{{41, 1.5}, {29, 19}}</string>
1099+
<reference key="NSSuperview" ref="951933530"/>
1100+
<bool key="NSEnabled">YES</bool>
1101+
<object class="NSButtonCell" key="NSCell" id="102056827">
1102+
<int key="NSCellFlags">-2080244224</int>
1103+
<int key="NSCellFlags2">134217728</int>
1104+
<string key="NSContents">QuickLook</string>
1105+
<object class="NSFont" key="NSSupport">
1106+
<string key="NSName">LucidaGrande-Bold</string>
1107+
<double key="NSSize">12</double>
1108+
<int key="NSfFlags">16</int>
1109+
</object>
1110+
<reference key="NSControlView" ref="16222431"/>
1111+
<int key="NSButtonFlags">147079423</int>
1112+
<int key="NSButtonFlags2">173</int>
1113+
<object class="NSCustomResource" key="NSNormalImage">
1114+
<string key="NSClassName">NSImage</string>
1115+
<string key="NSResourceName">NSQuickLookTemplate</string>
1116+
</object>
1117+
<string key="NSAlternateContents"/>
1118+
<string type="base64-UTF8" key="NSKeyEquivalent">IA</string>
1119+
<int key="NSPeriodicDelay">400</int>
1120+
<int key="NSPeriodicInterval">75</int>
1121+
</object>
1122+
</object>
1123+
</object>
1124+
<string key="NSFrame">{{639, 0}, {84, 24}}</string>
1125+
<reference key="NSSuperview" ref="375746871"/>
1126+
<string key="NSClassName">NSView</string>
1127+
</object>
1128+
</object>
11121129
<string key="NSFrame">{{0, 211}, {723, 24}}</string>
11131130
<reference key="NSSuperview" ref="891500945"/>
11141131
<string key="NSClassName">MGScopeBar</string>
@@ -1957,6 +1974,14 @@
19571974
</object>
19581975
<int key="connectionID">485</int>
19591976
</object>
1977+
<object class="IBConnectionRecord">
1978+
<object class="IBOutletConnection" key="connection">
1979+
<string key="label">accessoryView</string>
1980+
<reference key="source" ref="932676109"/>
1981+
<reference key="destination" ref="951933530"/>
1982+
</object>
1983+
<int key="connectionID">487</int>
1984+
</object>
19601985
</object>
19611986
<object class="IBMutableOrderedSet" key="objectRecords">
19621987
<object class="NSArray" key="orderedObjects">
@@ -2303,7 +2328,6 @@
23032328
<reference ref="258088911"/>
23042329
<reference ref="1006113529"/>
23052330
<reference ref="502319102"/>
2306-
<reference ref="16222431"/>
23072331
<reference ref="802449565"/>
23082332
</object>
23092333
<reference key="parent" ref="319362431"/>
@@ -2445,20 +2469,6 @@
24452469
<reference key="object" ref="534046869"/>
24462470
<reference key="parent" ref="802449565"/>
24472471
</object>
2448-
<object class="IBObjectRecord">
2449-
<int key="objectID">49</int>
2450-
<reference key="object" ref="16222431"/>
2451-
<object class="NSMutableArray" key="children">
2452-
<bool key="EncodedWithXMLCoder">YES</bool>
2453-
<reference ref="102056827"/>
2454-
</object>
2455-
<reference key="parent" ref="172148644"/>
2456-
</object>
2457-
<object class="IBObjectRecord">
2458-
<int key="objectID">50</int>
2459-
<reference key="object" ref="102056827"/>
2460-
<reference key="parent" ref="16222431"/>
2461-
</object>
24622472
<object class="IBObjectRecord">
24632473
<int key="objectID">407</int>
24642474
<reference key="object" ref="246205303"/>
@@ -2562,10 +2572,34 @@
25622572
<reference key="object" ref="375746871"/>
25632573
<object class="NSMutableArray" key="children">
25642574
<bool key="EncodedWithXMLCoder">YES</bool>
2575+
<reference ref="951933530"/>
25652576
</object>
25662577
<reference key="parent" ref="891500945"/>
25672578
<string key="objectName">TypeBar</string>
25682579
</object>
2580+
<object class="IBObjectRecord">
2581+
<int key="objectID">486</int>
2582+
<reference key="object" ref="951933530"/>
2583+
<object class="NSMutableArray" key="children">
2584+
<bool key="EncodedWithXMLCoder">YES</bool>
2585+
<reference ref="16222431"/>
2586+
</object>
2587+
<reference key="parent" ref="375746871"/>
2588+
</object>
2589+
<object class="IBObjectRecord">
2590+
<int key="objectID">49</int>
2591+
<reference key="object" ref="16222431"/>
2592+
<object class="NSMutableArray" key="children">
2593+
<bool key="EncodedWithXMLCoder">YES</bool>
2594+
<reference ref="102056827"/>
2595+
</object>
2596+
<reference key="parent" ref="951933530"/>
2597+
</object>
2598+
<object class="IBObjectRecord">
2599+
<int key="objectID">50</int>
2600+
<reference key="object" ref="102056827"/>
2601+
<reference key="parent" ref="16222431"/>
2602+
</object>
25692603
</object>
25702604
</object>
25712605
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2676,6 +2710,7 @@
26762710
<string>46.IBPluginDependency</string>
26772711
<string>475.IBPluginDependency</string>
26782712
<string>48.IBPluginDependency</string>
2713+
<string>486.IBPluginDependency</string>
26792714
<string>49.IBAttributePlaceholdersKey</string>
26802715
<string>49.IBPluginDependency</string>
26812716
<string>50.IBPluginDependency</string>
@@ -2859,6 +2894,7 @@
28592894
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
28602895
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
28612896
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2897+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
28622898
<object class="NSMutableDictionary">
28632899
<string key="NS.key.0">ToolTip</string>
28642900
<object class="IBToolTipAttribute" key="NS.object.0">
@@ -2892,7 +2928,7 @@
28922928
</object>
28932929
</object>
28942930
<nil key="sourceID"/>
2895-
<int key="maxID">485</int>
2931+
<int key="maxID">487</int>
28962932
</object>
28972933
<object class="IBClassDescriber" key="IBDocument.Classes">
28982934
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2904,31 +2940,38 @@
29042940
<bool key="EncodedWithXMLCoder">YES</bool>
29052941
<object class="NSArray" key="dict.sortedKeys">
29062942
<bool key="EncodedWithXMLCoder">YES</bool>
2943+
<string>accessoryView</string>
29072944
<string>historyController</string>
29082945
<string>typeBar</string>
29092946
</object>
29102947
<object class="NSMutableArray" key="dict.values">
29112948
<bool key="EncodedWithXMLCoder">YES</bool>
2949+
<string>NSView</string>
29122950
<string>PBGitHistoryController</string>
2913-
<string>PBGitGradientBarView</string>
2951+
<string>MGScopeBar</string>
29142952
</object>
29152953
</object>
29162954
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
29172955
<bool key="EncodedWithXMLCoder">YES</bool>
29182956
<object class="NSArray" key="dict.sortedKeys">
29192957
<bool key="EncodedWithXMLCoder">YES</bool>
2958+
<string>accessoryView</string>
29202959
<string>historyController</string>
29212960
<string>typeBar</string>
29222961
</object>
29232962
<object class="NSMutableArray" key="dict.values">
29242963
<bool key="EncodedWithXMLCoder">YES</bool>
2964+
<object class="IBToOneOutletInfo">
2965+
<string key="name">accessoryView</string>
2966+
<string key="candidateClassName">NSView</string>
2967+
</object>
29252968
<object class="IBToOneOutletInfo">
29262969
<string key="name">historyController</string>
29272970
<string key="candidateClassName">PBGitHistoryController</string>
29282971
</object>
29292972
<object class="IBToOneOutletInfo">
29302973
<string key="name">typeBar</string>
2931-
<string key="candidateClassName">PBGitGradientBarView</string>
2974+
<string key="candidateClassName">MGScopeBar</string>
29322975
</object>
29332976
</object>
29342977
</object>

0 commit comments

Comments
 (0)