Skip to content

Commit afbc719

Browse files
p2p2
committed
Fixes issues #2 and #8 
1 parent d4f4e04 commit afbc719

File tree

11 files changed

+149
-120
lines changed

11 files changed

+149
-120
lines changed

‎English.lproj/InfoPlist.strings

0 Bytes
Binary file not shown.

‎GeneratePreviewForURL.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
212212
}
213213
}
214214

215-
char formatString[9];
216-
static char result[10]; // max would be "1023.99 Byte" (12 byte), but that combination should not happen
215+
char formatString[10];
216+
static char result[11]; // max would be "1023.99 Byte" (12 byte), but that combination should not happen
217217
sprintf(formatString, "%s %s", format[i], unit[i]);
218218
sprintf(result, formatString, bytes);
219219

‎GenerateThumbnailForURL.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
5151

5252
// Parse the data if still interested in the thumbnail
5353
if (false == QLThumbnailRequestIsCancelled(thumbnail)) {
54-
CGFloat rowHeight = ceilf(THUMB_SIZE / NUM_ROWS);
55-
CGFloat fontSize = roundf(0.666f * rowHeight);
56-
5754
CSVDocument *csvDoc = [CSVDocument csvDoc];
5855
csvDoc.autoDetectSeparator = YES;
5956
NSUInteger gotRows = [csvDoc numRowsFromCSVString:fileString maxRows:NUM_ROWS error:NULL];
6057

58+
CGFloat rowHeight = ceilf(THUMB_SIZE / MIN(MAX(4, gotRows), NUM_ROWS));
59+
CGFloat fontSize = roundf(0.666 * rowHeight);
6160

6261
// Draw an icon if still interested in the thumbnail
6362
if ((gotRows > 0) && (false == QLThumbnailRequestIsCancelled(thumbnail))) {
@@ -147,8 +146,9 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
147146
}
148147

149148
// adjust the bounds to respect our fixed aspect ratio - portrait
150-
if ((usedBounds.size.width > maxBounds.size.width && usedBounds.size.height > maxBounds.size.height) ||
151-
(usedBounds.size.width <= usedBounds.size.height)) {
149+
//NSLog(@"%@ is: %.2fx%.2f -- max: %.2fx%.2f", myURL, usedBounds.size.width, usedBounds.size.height, maxBounds.size.width, maxBounds.size.height);
150+
if ((usedBounds.size.width > maxBounds.size.width && usedBounds.size.height > maxBounds.size.height)
151+
|| (usedBounds.size.width <= usedBounds.size.height)) {
152152
badgeMaxSize = usedBounds.size.height;
153153
usedBounds.size.width = usedBounds.size.height * ASPECT;
154154
}

‎Info.plist

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<string>public.comma-separated-values-text</string>
4141
<string>dyn.age80g650</string>
4242
<string>dyn.ah62d4rv4ge80g650</string>
43+
<string>dyn.ah62d4um4ge80g650</string>
4344
</array>
4445
<key>NSPersistentStoreTypeKey</key>
4546
<string>XML</string>
@@ -75,9 +76,9 @@
7576
<key>CFBundleName</key>
7677
<string>${PRODUCT_NAME}</string>
7778
<key>CFBundleShortVersionString</key>
78-
<string>1</string>
79+
<string>1.2</string>
7980
<key>CFBundleVersion</key>
80-
<string>1.1.1</string>
81+
<string>1.2</string>
8182
<key>CFPlugInDynamicRegisterFunction</key>
8283
<string></string>
8384
<key>CFPlugInDynamicRegistration</key>

‎QuickLookCSV.xcodeproj/pp.pbxuser

Lines changed: 84 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
7777
PBXFileTableDataSourceColumnWidthsKey = (
7878
20,
79-
817,
79+
10,
8080
60,
8181
20,
8282
48,
@@ -93,23 +93,24 @@
9393
PBXFileDataSource_Warnings_ColumnID,
9494
);
9595
};
96-
PBXPerProjectTemplateStateSaveDate = 292234139;
97-
PBXWorkspaceStateSaveDate = 292234139;
96+
PBXPerProjectTemplateStateSaveDate = 286568158;
97+
PBXWorkspaceStateSaveDate = 286568158;
9898
};
9999
perUserProjectItems = {
100-
EE009FB01133CE4E00312AD1 = EE009FB01133CE4E00312AD1 /* PlistBookmark */;
101-
EE2E1EFE105C37370016E6EB = EE2E1EFE105C37370016E6EB /* PBXTextBookmark */;
102-
EE2E1F01105C37370016E6EB = EE2E1F01105C37370016E6EB /* PBXTextBookmark */;
103-
EE2E1F05105C37370016E6EB = EE2E1F05105C37370016E6EB /* PBXTextBookmark */;
104-
EE5A62561147A10D00E79E92 = EE5A62561147A10D00E79E92 /* PBXTextBookmark */;
105-
EE5A62571147A10D00E79E92 = EE5A62571147A10D00E79E92 /* PBXTextBookmark */;
106-
EE5A62581147A10D00E79E92 = EE5A62581147A10D00E79E92 /* PBXTextBookmark */;
107-
EE5A62591147A10D00E79E92 = EE5A62591147A10D00E79E92 /* PBXTextBookmark */;
108-
EE5A62721147AB3600E79E92 = EE5A62721147AB3600E79E92 /* PBXTextBookmark */;
109-
EE5A62731147AB3600E79E92 = EE5A62731147AB3600E79E92 /* PBXTextBookmark */;
110-
EE8830A610013E43005590AE = EE8830A610013E43005590AE /* PBXTextBookmark */;
111-
EE8830A710013E43005590AE = EE8830A710013E43005590AE /* PBXTextBookmark */;
112-
EEA3A593104879AB00AA5FA8 = EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */;
100+
EE2E1EFE105C37370016E6EB /* PBXTextBookmark */ = EE2E1EFE105C37370016E6EB /* PBXTextBookmark */;
101+
EE2E1F02105C37370016E6EB /* PBXTextBookmark */ = EE2E1F02105C37370016E6EB /* PBXTextBookmark */;
102+
EE2E1F03105C37370016E6EB /* PBXTextBookmark */ = EE2E1F03105C37370016E6EB /* PBXTextBookmark */;
103+
EE2E1F05105C37370016E6EB /* PBXTextBookmark */ = EE2E1F05105C37370016E6EB /* PBXTextBookmark */;
104+
EE309FE610FE851300AADFE8 /* PBXTextBookmark */ = EE309FE610FE851300AADFE8 /* PBXTextBookmark */;
105+
EE8830A610013E43005590AE /* PBXTextBookmark */ = EE8830A610013E43005590AE /* PBXTextBookmark */;
106+
EE8830A710013E43005590AE /* PBXTextBookmark */ = EE8830A710013E43005590AE /* PBXTextBookmark */;
107+
EE8830A810013E43005590AE /* PBXTextBookmark */ = EE8830A810013E43005590AE /* PBXTextBookmark */;
108+
EE8E9E0711147D890092500D /* PBXTextBookmark */ = EE8E9E0711147D890092500D /* PBXTextBookmark */;
109+
EE8E9E0811147D890092500D /* PlistBookmark */ = EE8E9E0811147D890092500D /* PlistBookmark */;
110+
EE8E9E1211147DC10092500D /* PBXTextBookmark */ = EE8E9E1211147DC10092500D /* PBXTextBookmark */;
111+
EE8E9E4A1114AEF10092500D /* PBXTextBookmark */ = EE8E9E4A1114AEF10092500D /* PBXTextBookmark */;
112+
EE8E9E7B1114B36B0092500D /* PBXTextBookmark */ = EE8E9E7B1114B36B0092500D /* PBXTextBookmark */;
113+
EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */ = EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */;
113114
};
114115
sourceControlManager = EEB3ED180FFE215D00B7462F /* Source Control */;
115116
userBuildSettings = {
@@ -118,7 +119,7 @@
118119
089C167EFE841241C02AAC07 /* English */ = {
119120
uiCtxt = {
120121
sepNavIntBoundsRect = "{{0, 0}, {1027, 769}}";
121-
sepNavSelRange = "{94, 0}";
122+
sepNavSelRange = "{200, 0}";
122123
sepNavVisRange = "{0, 200}";
123124
};
124125
};
@@ -131,31 +132,25 @@
131132
};
132133
2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {
133134
uiCtxt = {
134-
sepNavIntBoundsRect = "{{0, 0}, {1047, 3232}}";
135-
sepNavSelRange = "{3567, 0}";
136-
sepNavVisRange = "{2118, 2512}";
135+
sepNavIntBoundsRect = "{{0, 0}, {1027, 3040}}";
136+
sepNavSelRange = "{3368, 0}";
137+
sepNavVisRange = "{1890, 2264}";
137138
};
138139
};
139140
61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */ = {
140141
uiCtxt = {
141-
sepNavIntBoundsRect = "{{0, 0}, {1047, 4768}}";
142-
sepNavSelRange = "{271, 50}";
143-
sepNavVisRange = "{0, 1820}";
142+
sepNavIntBoundsRect = "{{0, 0}, {1027, 4672}}";
143+
sepNavSelRange = "{2430, 0}";
144+
sepNavVisRange = "{5592, 1881}";
144145
};
145146
};
146147
8D57630D048677EA00EA77CD /* QuickLookCSV */ = {
147148
activeExec = 0;
148149
};
149-
EE009FB01133CE4E00312AD1 /* PlistBookmark */ = {
150-
isa = PlistBookmark;
151-
fRef = 8D576317048677EA00EA77CD /* Info.plist */;
152-
fallbackIsa = PBXBookmark;
153-
isK = 0;
154-
kPath = (
155-
);
156-
name = "/Users/pp/Cocoa/quicklook-csv/Info.plist";
157-
rLen = 0;
158-
rLoc = 9223372036854775808;
150+
8D576317048677EA00EA77CD /* Info.plist */ = {
151+
uiCtxt = {
152+
sepNavWindowFrame = "{{15, 39}, {1298, 834}}";
153+
};
159154
};
160155
EE2E1EFE105C37370016E6EB /* PBXTextBookmark */ = {
161156
isa = PBXTextBookmark;
@@ -167,36 +162,6 @@
167162
vrLen = 2106;
168163
vrLoc = 1754;
169164
};
170-
EE2E1F01105C37370016E6EB /* PBXTextBookmark */ = {
171-
isa = PBXTextBookmark;
172-
fRef = 089C167EFE841241C02AAC07 /* English */;
173-
name = "InfoPlist.strings: 3";
174-
rLen = 0;
175-
rLoc = 94;
176-
rType = 0;
177-
vrLen = 200;
178-
vrLoc = 0;
179-
};
180-
EE2E1F05105C37370016E6EB /* PBXTextBookmark */ = {
181-
isa = PBXTextBookmark;
182-
fRef = EEB3EE850FFE513200B7462F /* Style.css */;
183-
name = "Style.css: 11";
184-
rLen = 0;
185-
rLoc = 343;
186-
rType = 0;
187-
vrLen = 828;
188-
vrLoc = 0;
189-
};
190-
EE5A62561147A10D00E79E92 /* PBXTextBookmark */ = {
191-
isa = PBXTextBookmark;
192-
fRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */;
193-
name = "GenerateThumbnailForURL.m: 11";
194-
rLen = 50;
195-
rLoc = 271;
196-
rType = 0;
197-
vrLen = 1820;
198-
vrLoc = 0;
199-
};
200165
EE5A62571147A10D00E79E92 /* PBXTextBookmark */ = {
201166
isa = PBXTextBookmark;
202167
fRef = EE77BE4B0FFEB207008B09DE /* English */;
@@ -217,17 +182,18 @@
217182
vrLen = 443;
218183
vrLoc = 0;
219184
};
220-
EE5A62591147A10D00E79E92 /* PBXTextBookmark */ = {
185+
186+
EE5A62731147AB3600E79E92 /* PBXTextBookmark */ = {
221187
isa = PBXTextBookmark;
222188
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
223189
name = "GeneratePreviewForURL.m: 89";
224190
rLen = 0;
225191
rLoc = 3567;
226192
rType = 0;
227-
vrLen = 2013;
228-
vrLoc = 3097;
193+
vrLen = 2107;
194+
vrLoc = 2919;
229195
};
230-
EE5A62721147AB3600E79E92 /* PBXTextBookmark */ = {
196+
EE309FE610FE851300AADFE8 /* PBXTextBookmark */ = {
231197
isa = PBXTextBookmark;
232198
fRef = EE883106100141B9005590AE /* INSTALL.rtf */;
233199
name = "INSTALL.rtf: 8";
@@ -237,16 +203,6 @@
237203
vrLen = 332;
238204
vrLoc = 0;
239205
};
240-
EE5A62731147AB3600E79E92 /* PBXTextBookmark */ = {
241-
isa = PBXTextBookmark;
242-
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
243-
name = "GeneratePreviewForURL.m: 89";
244-
rLen = 0;
245-
rLoc = 3567;
246-
rType = 0;
247-
vrLen = 2107;
248-
vrLoc = 2919;
249-
};
250206
EE77BE4B0FFEB207008B09DE /* English */ = {
251207
uiCtxt = {
252208
sepNavIntBoundsRect = "{{0, 0}, {1047, 844}}";
@@ -288,6 +244,57 @@
288244
sepNavVisRect = "{{0, 0}, {1049, 844}}";
289245
};
290246
};
247+
EE8E9E0711147D890092500D /* PBXTextBookmark */ = {
248+
isa = PBXTextBookmark;
249+
fRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */;
250+
name = "GenerateThumbnailForURL.m: 66";
251+
rLen = 0;
252+
rLoc = 2430;
253+
rType = 0;
254+
vrLen = 1881;
255+
vrLoc = 5592;
256+
};
257+
EE8E9E0811147D890092500D /* PlistBookmark */ = {
258+
isa = PlistBookmark;
259+
fRef = 8D576317048677EA00EA77CD /* Info.plist */;
260+
fallbackIsa = PBXBookmark;
261+
isK = 0;
262+
kPath = (
263+
);
264+
name = "/Users/pp/Programming/Cocoa/quicklook-csv/Info.plist";
265+
rLen = 0;
266+
rLoc = 9223372036854775808;
267+
};
268+
EE8E9E1211147DC10092500D /* PBXTextBookmark */ = {
269+
isa = PBXTextBookmark;
270+
fRef = 089C167EFE841241C02AAC07 /* English */;
271+
name = "InfoPlist.strings: 5";
272+
rLen = 0;
273+
rLoc = 200;
274+
rType = 0;
275+
vrLen = 200;
276+
vrLoc = 0;
277+
};
278+
EE8E9E4A1114AEF10092500D /* PBXTextBookmark */ = {
279+
isa = PBXTextBookmark;
280+
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
281+
name = "GeneratePreviewForURL.m: 128";
282+
rLen = 0;
283+
rLoc = 4631;
284+
rType = 0;
285+
vrLen = 2025;
286+
vrLoc = 1347;
287+
};
288+
EE8E9E7B1114B36B0092500D /* PBXTextBookmark */ = {
289+
isa = PBXTextBookmark;
290+
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
291+
name = "GeneratePreviewForURL.m: 86";
292+
rLen = 0;
293+
rLoc = 3368;
294+
rType = 0;
295+
vrLen = 2264;
296+
vrLoc = 1890;
297+
};
291298
EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */ = {
292299
isa = PBXTextBookmark;
293300
fRef = 08FB77B6FE84183AC02AAC07 /* main.c */;

‎QuickLookCSV.xcodeproj/pp.perspectivev3

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@
233233
<key>Layout</key>
234234
<array>
235235
<dict>
236-
<key>BecomeActive</key>
237-
<true/>
238236
<key>ContentConfiguration</key>
239237
<dict>
240238
<key>PBXBottomSmartGroupGIDs</key>
@@ -273,7 +271,7 @@
273271
<string>089C166AFE841209C02AAC07</string>
274272
<string>08FB77AFFE84173DC02AAC07</string>
275273
<string>089C167CFE841241C02AAC07</string>
276-
<string>EE77BE9B0FFEB3EA008B09DE</string>
274+
<string>8D5B49A704867FD3000E48DA</string>
277275
<string>089C1671FE841209C02AAC07</string>
278276
<string>19C28FB6FE9D52B211CA2CBB</string>
279277
<string>1C37FBAC04509CD000000102</string>
@@ -282,8 +280,8 @@
282280
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
283281
<array>
284282
<array>
285-
<integer>3</integer>
286-
<integer>1</integer>
283+
<integer>23</integer>
284+
<integer>22</integer>
287285
<integer>0</integer>
288286
</array>
289287
</array>
@@ -316,6 +314,8 @@
316314
<key>Dock</key>
317315
<array>
318316
<dict>
317+
<key>BecomeActive</key>
318+
<true/>
319319
<key>ContentConfiguration</key>
320320
<dict>
321321
<key>PBXProjectModuleGUID</key>
@@ -333,21 +333,19 @@
333333
<key>_historyCapacity</key>
334334
<integer>0</integer>
335335
<key>bookmark</key>
336-
<string>EE5A62731147AB3600E79E92</string>
336+
<string>EE8E9E7B1114B36B0092500D</string>
337337
<key>history</key>
338338
<array>
339339
<string>EE8830A610013E43005590AE</string>
340340
<string>EE8830A710013E43005590AE</string>
341341
<string>EEA3A593104879AB00AA5FA8</string>
342342
<string>EE2E1EFE105C37370016E6EB</string>
343-
<string>EE2E1F01105C37370016E6EB</string>
344343
<string>EE2E1F05105C37370016E6EB</string>
345-
<string>EE009FB01133CE4E00312AD1</string>
346-
<string>EE5A62561147A10D00E79E92</string>
347-
<string>EE5A62571147A10D00E79E92</string>
348-
<string>EE5A62581147A10D00E79E92</string>
349-
<string>EE5A62721147AB3600E79E92</string>
350-
<string>EE5A62591147A10D00E79E92</string>
344+
<string>EE309FE610FE851300AADFE8</string>
345+
<string>EE8E9E0711147D890092500D</string>
346+
<string>EE8E9E0811147D890092500D</string>
347+
<string>EE8E9E1211147DC10092500D</string>
348+
<string>EE8E9E4A1114AEF10092500D</string>
351349
</array>
352350
</dict>
353351
<key>SplitCount</key>
@@ -470,11 +468,11 @@
470468
</array>
471469
<key>TableOfContents</key>
472470
<array>
473-
<string>EE5A625C1147A10D00E79E92</string>
471+
<string>EE8E9E4C1114AEF10092500D</string>
474472
<string>1CA23ED40692098700951B8B</string>
475-
<string>EE5A625D1147A10D00E79E92</string>
473+
<string>EE8E9E4D1114AEF10092500D</string>
476474
<string>EEB3ED3A0FFE2B1100B7462F</string>
477-
<string>EE5A625E1147A10D00E79E92</string>
475+
<string>EE8E9E4E1114AEF10092500D</string>
478476
<string>1CA23EDF0692099D00951B8B</string>
479477
<string>1CA23EE00692099D00951B8B</string>
480478
<string>1CA23EE10692099D00951B8B</string>

0 commit comments

Comments
 (0)