Skip to content

Commit 2de41fd

Browse files
laullonlaullon
committed
Merge remote branch 'refs/remotes/rastersize/master' into experimental
Conflicts: PBGitRepository.h PBGitSidebarController.m PBSourceViewCell.h PBSourceViewCell.m
2 parents e28ed65 + da2e81e commit 2de41fd

25 files changed

+546
-372
lines changed

‎English.lproj/Preferences.xib

Lines changed: 96 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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">10H574</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">804</string>
5+
<string key="IBDocument.SystemVersion">10J567</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">851</string>
77
<string key="IBDocument.AppKitVersion">1038.35</string>
8-
<string key="IBDocument.HIToolboxVersion">461.00</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">851</string>
1212
</object>
1313
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -43,6 +43,37 @@
4343
<int key="NSvFlags">268</int>
4444
<object class="NSMutableArray" key="NSSubviews">
4545
<bool key="EncodedWithXMLCoder">YES</bool>
46+
<object class="NSButton" id="604563603">
47+
<reference key="NSNextResponder" ref="1005"/>
48+
<int key="NSvFlags">268</int>
49+
<string key="NSFrame">{{18, 193}, {158, 18}}</string>
50+
<reference key="NSSuperview" ref="1005"/>
51+
<bool key="NSEnabled">YES</bool>
52+
<object class="NSButtonCell" key="NSCell" id="254305730">
53+
<int key="NSCellFlags">-2080244224</int>
54+
<int key="NSCellFlags2">0</int>
55+
<string key="NSContents">Refresh automatically</string>
56+
<object class="NSFont" key="NSSupport" id="734450335">
57+
<string key="NSName">LucidaGrande</string>
58+
<double key="NSSize">13</double>
59+
<int key="NSfFlags">1044</int>
60+
</object>
61+
<reference key="NSControlView" ref="604563603"/>
62+
<int key="NSButtonFlags">1211912703</int>
63+
<int key="NSButtonFlags2">2</int>
64+
<object class="NSCustomResource" key="NSNormalImage" id="136676346">
65+
<string key="NSClassName">NSImage</string>
66+
<string key="NSResourceName">NSSwitch</string>
67+
</object>
68+
<object class="NSButtonImageSource" key="NSAlternateImage" id="690089052">
69+
<string key="NSImageName">NSSwitch</string>
70+
</object>
71+
<string key="NSAlternateContents"/>
72+
<string key="NSKeyEquivalent"/>
73+
<int key="NSPeriodicDelay">200</int>
74+
<int key="NSPeriodicInterval">25</int>
75+
</object>
76+
</object>
4677
<object class="NSTextField" id="63761450">
4778
<reference key="NSNextResponder" ref="1005"/>
4879
<int key="NSvFlags">268</int>
@@ -53,11 +84,7 @@
5384
<int key="NSCellFlags">68288064</int>
5485
<int key="NSCellFlags2">272630784</int>
5586
<string key="NSContents">Reset all dialog warnings:</string>
56-
<object class="NSFont" key="NSSupport" id="734450335">
57-
<string key="NSName">LucidaGrande</string>
58-
<double key="NSSize">13</double>
59-
<int key="NSfFlags">1044</int>
60-
</object>
87+
<reference key="NSSupport" ref="734450335"/>
6188
<reference key="NSControlView" ref="63761450"/>
6289
<object class="NSColor" key="NSBackgroundColor" id="124675276">
6390
<int key="NSColorSpace">6</int>
@@ -160,13 +187,8 @@
160187
<reference key="NSControlView" ref="968361983"/>
161188
<int key="NSButtonFlags">1211912703</int>
162189
<int key="NSButtonFlags2">2</int>
163-
<object class="NSCustomResource" key="NSNormalImage" id="114317419">
164-
<string key="NSClassName">NSImage</string>
165-
<string key="NSResourceName">NSSwitch</string>
166-
</object>
167-
<object class="NSButtonImageSource" key="NSAlternateImage" id="690089052">
168-
<string key="NSImageName">NSSwitch</string>
169-
</object>
190+
<reference key="NSNormalImage" ref="136676346"/>
191+
<reference key="NSAlternateImage" ref="690089052"/>
170192
<string key="NSAlternateContents"/>
171193
<string key="NSKeyEquivalent"/>
172194
<int key="NSPeriodicDelay">200</int>
@@ -274,7 +296,7 @@
274296
<reference key="NSControlView" ref="910887184"/>
275297
<int key="NSButtonFlags">1211912703</int>
276298
<int key="NSButtonFlags2">2</int>
277-
<reference key="NSNormalImage" ref="114317419"/>
299+
<reference key="NSNormalImage" ref="136676346"/>
278300
<reference key="NSAlternateImage" ref="690089052"/>
279301
<string key="NSAlternateContents"/>
280302
<string key="NSKeyEquivalent"/>
@@ -285,7 +307,7 @@
285307
<object class="NSButton" id="160081910">
286308
<reference key="NSNextResponder" ref="1005"/>
287309
<int key="NSvFlags">268</int>
288-
<string key="NSFrame">{{18, 193}, {279, 18}}</string>
310+
<string key="NSFrame">{{18, 218}, {279, 18}}</string>
289311
<reference key="NSSuperview" ref="1005"/>
290312
<bool key="NSEnabled">YES</bool>
291313
<object class="NSButtonCell" key="NSCell" id="876763316">
@@ -296,7 +318,7 @@
296318
<reference key="NSControlView" ref="160081910"/>
297319
<int key="NSButtonFlags">1211912703</int>
298320
<int key="NSButtonFlags2">2</int>
299-
<reference key="NSNormalImage" ref="114317419"/>
321+
<reference key="NSNormalImage" ref="136676346"/>
300322
<reference key="NSAlternateImage" ref="690089052"/>
301323
<string key="NSAlternateContents"/>
302324
<string key="NSKeyEquivalent"/>
@@ -307,7 +329,7 @@
307329
<object class="NSButton" id="68472633">
308330
<reference key="NSNextResponder" ref="1005"/>
309331
<int key="NSvFlags">268</int>
310-
<string key="NSFrame">{{18, 218}, {207, 18}}</string>
332+
<string key="NSFrame">{{18, 243}, {207, 18}}</string>
311333
<reference key="NSSuperview" ref="1005"/>
312334
<bool key="NSEnabled">YES</bool>
313335
<object class="NSButtonCell" key="NSCell" id="456188813">
@@ -318,7 +340,7 @@
318340
<reference key="NSControlView" ref="68472633"/>
319341
<int key="NSButtonFlags">1211912703</int>
320342
<int key="NSButtonFlags2">2</int>
321-
<reference key="NSNormalImage" ref="114317419"/>
343+
<reference key="NSNormalImage" ref="136676346"/>
322344
<reference key="NSAlternateImage" ref="690089052"/>
323345
<string key="NSAlternateContents"/>
324346
<string key="NSKeyEquivalent"/>
@@ -327,7 +349,7 @@
327349
</object>
328350
</object>
329351
</object>
330-
<string key="NSFrameSize">{400, 254}</string>
352+
<string key="NSFrameSize">{401, 279}</string>
331353
<reference key="NSSuperview"/>
332354
<string key="NSClassName">NSView</string>
333355
</object>
@@ -366,7 +388,7 @@
366388
<reference key="NSControlView" ref="250497668"/>
367389
<int key="NSButtonFlags">1211912703</int>
368390
<int key="NSButtonFlags2">2</int>
369-
<reference key="NSNormalImage" ref="114317419"/>
391+
<reference key="NSNormalImage" ref="136676346"/>
370392
<reference key="NSAlternateImage" ref="690089052"/>
371393
<string key="NSAlternateContents"/>
372394
<string key="NSKeyEquivalent"/>
@@ -506,7 +528,7 @@
506528
<integer value="2"/>
507529
</object>
508530
</object>
509-
<string key="NS.format">EEEE, MMMM d, yyyy h:mm:ss a</string>
531+
<string key="NS.format">EEEE, dd MMMM, yyyy HH:mm:ss </string>
510532
<bool key="NS.natural">NO</bool>
511533
</object>
512534
<reference key="NSControlView" ref="1045127964"/>
@@ -557,7 +579,7 @@
557579
<reference key="NSControlView" ref="890810109"/>
558580
<int key="NSButtonFlags">1211912703</int>
559581
<int key="NSButtonFlags2">2</int>
560-
<reference key="NSNormalImage" ref="114317419"/>
582+
<reference key="NSNormalImage" ref="136676346"/>
561583
<reference key="NSAlternateImage" ref="690089052"/>
562584
<string key="NSAlternateContents"/>
563585
<string key="NSKeyEquivalent"/>
@@ -573,6 +595,10 @@
573595
<string key="NSClassName">SUUpdater</string>
574596
</object>
575597
<object class="NSUserDefaultsController" id="557723770">
598+
<object class="NSMutableArray" key="NSDeclaredKeys">
599+
<bool key="EncodedWithXMLCoder">YES</bool>
600+
<string>PBRefreshAutomatically</string>
601+
</object>
576602
<bool key="NSSharedInstance">YES</bool>
577603
</object>
578604
<object class="NSCustomView" id="263788152">
@@ -594,7 +620,7 @@
594620
<reference key="NSControlView" ref="237556568"/>
595621
<int key="NSButtonFlags">1211912703</int>
596622
<int key="NSButtonFlags2">2</int>
597-
<reference key="NSNormalImage" ref="114317419"/>
623+
<reference key="NSNormalImage" ref="136676346"/>
598624
<reference key="NSAlternateImage" ref="690089052"/>
599625
<string key="NSAlternateContents"/>
600626
<string key="NSKeyEquivalent"/>
@@ -616,7 +642,7 @@
616642
<reference key="NSControlView" ref="485413225"/>
617643
<int key="NSButtonFlags">1211912703</int>
618644
<int key="NSButtonFlags2">2</int>
619-
<reference key="NSNormalImage" ref="114317419"/>
645+
<reference key="NSNormalImage" ref="136676346"/>
620646
<reference key="NSAlternateImage" ref="690089052"/>
621647
<string key="NSAlternateContents"/>
622648
<string key="NSKeyEquivalent"/>
@@ -638,7 +664,7 @@
638664
<reference key="NSControlView" ref="933582906"/>
639665
<int key="NSButtonFlags">1211912703</int>
640666
<int key="NSButtonFlags2">2</int>
641-
<reference key="NSNormalImage" ref="114317419"/>
667+
<reference key="NSNormalImage" ref="136676346"/>
642668
<reference key="NSAlternateImage" ref="690089052"/>
643669
<string key="NSAlternateContents"/>
644670
<string key="NSKeyEquivalent"/>
@@ -660,7 +686,7 @@
660686
<reference key="NSControlView" ref="766070942"/>
661687
<int key="NSButtonFlags">1211912703</int>
662688
<int key="NSButtonFlags2">2</int>
663-
<reference key="NSNormalImage" ref="114317419"/>
689+
<reference key="NSNormalImage" ref="136676346"/>
664690
<reference key="NSAlternateImage" ref="690089052"/>
665691
<string key="NSAlternateContents"/>
666692
<string key="NSKeyEquivalent"/>
@@ -1079,6 +1105,22 @@
10791105
</object>
10801106
<int key="connectionID">140</int>
10811107
</object>
1108+
<object class="IBConnectionRecord">
1109+
<object class="IBBindingConnection" key="connection">
1110+
<string key="label">value: values.PBRefreshAutomatically</string>
1111+
<reference key="source" ref="604563603"/>
1112+
<reference key="destination" ref="557723770"/>
1113+
<object class="NSNibBindingConnector" key="connector">
1114+
<reference key="NSSource" ref="604563603"/>
1115+
<reference key="NSDestination" ref="557723770"/>
1116+
<string key="NSLabel">value: values.PBRefreshAutomatically</string>
1117+
<string key="NSBinding">value</string>
1118+
<string key="NSKeyPath">values.PBRefreshAutomatically</string>
1119+
<int key="NSNibBindingConnectorVersion">2</int>
1120+
</object>
1121+
</object>
1122+
<int key="connectionID">144</int>
1123+
</object>
10821124
</object>
10831125
<object class="IBMutableOrderedSet" key="objectRecords">
10841126
<object class="NSArray" key="orderedObjects">
@@ -1124,6 +1166,7 @@
11241166
<reference ref="25030403"/>
11251167
<reference ref="83909567"/>
11261168
<reference ref="63761450"/>
1169+
<reference ref="604563603"/>
11271170
</object>
11281171
<reference key="parent" ref="0"/>
11291172
<string key="objectName">General</string>
@@ -1543,6 +1586,20 @@
15431586
<reference key="object" ref="265220935"/>
15441587
<reference key="parent" ref="83909567"/>
15451588
</object>
1589+
<object class="IBObjectRecord">
1590+
<int key="objectID">141</int>
1591+
<reference key="object" ref="604563603"/>
1592+
<object class="NSMutableArray" key="children">
1593+
<bool key="EncodedWithXMLCoder">YES</bool>
1594+
<reference ref="254305730"/>
1595+
</object>
1596+
<reference key="parent" ref="1005"/>
1597+
</object>
1598+
<object class="IBObjectRecord">
1599+
<int key="objectID">142</int>
1600+
<reference key="object" ref="254305730"/>
1601+
<reference key="parent" ref="604563603"/>
1602+
</object>
15461603
</object>
15471604
</object>
15481605
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1581,6 +1638,9 @@
15811638
<string>138.IBPluginDependency</string>
15821639
<string>139.IBPluginDependency</string>
15831640
<string>14.IBPluginDependency</string>
1641+
<string>141.IBPluginDependency</string>
1642+
<string>141.IBViewBoundsToFrameTransform</string>
1643+
<string>142.IBPluginDependency</string>
15841644
<string>15.IBEditorWindowLastContentRect</string>
15851645
<string>15.IBPluginDependency</string>
15861646
<string>16.IBPluginDependency</string>
@@ -1623,7 +1683,7 @@
16231683
<object class="NSMutableArray" key="dict.values">
16241684
<bool key="EncodedWithXMLCoder">YES</bool>
16251685
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1626-
<string>{{845, 630}, {400, 254}}</string>
1686+
<string>{{511, 548}, {401, 279}}</string>
16271687
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
16281688
<object class="NSMutableArray">
16291689
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1672,6 +1732,11 @@
16721732
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
16731733
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
16741734
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1735+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1736+
<object class="NSAffineTransform">
1737+
<bytes key="NSTransformStruct">P4AAAL+AAADBcAAAw3QAAA</bytes>
1738+
</object>
1739+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
16751740
<string>{{443, 712}, {103, 71}}</string>
16761741
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
16771742
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1735,7 +1800,7 @@
17351800
</object>
17361801
</object>
17371802
<nil key="sourceID"/>
1738-
<int key="maxID">140</int>
1803+
<int key="maxID">144</int>
17391804
</object>
17401805
<object class="IBClassDescriber" key="IBDocument.Classes">
17411806
<object class="NSMutableArray" key="referencedPartialClassDescriptions">

‎GLFileView.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
+(BOOL)isStartDiff:(NSString *)line;
3737
+(BOOL)isStartBlock:(NSString *)line;
3838

39+
+(NSArray *)getFilesNames:(NSString *)line;
40+
+(BOOL)isBinaryFile:(NSString *)line;
41+
+(NSString*)mimeTypeForFileName:(NSString*)file;
42+
+(BOOL)isImage:(NSString*)file;
43+
3944
@property(retain) NSMutableArray *groups;
4045
@property(retain) NSString *logFormat;
4146

0 commit comments

Comments
 (0)