Commit 0932d44a authored by Scott Petrovic's avatar Scott Petrovic
Browse files

Merge remote-tracking branch 'origin/rempt/impex-refactoring' into petrovic/impex-brush-editor-ui

parents 9717d189 737e798c
......@@ -41,9 +41,11 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
if (appPlist != nil || appPlist.length) {
appIcon = [[NSImage alloc] initWithData:appPlist];
NSImageRep *rep = [[appIcon representations] objectAtIndex:0];
NSSize canvasSize = appIcon.size;
NSRect renderRect = NSMakeRect(0.0, 0.0, appIcon.size.width, appIcon.size.height);
NSSize canvasSize = NSMakeSize(rep.pixelsWide, rep.pixelsHigh);
NSRect renderRect = NSMakeRect(0.0, 0.0, rep.pixelsWide, rep.pixelsHigh);
CGContextRef _context = QLPreviewRequestCreateContext(preview, canvasSize, true, NULL);
......
......@@ -73,7 +73,9 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
appIcon = [[NSImage alloc] initWithData:appPlist];
NSRect renderRect = NSMakeRect(0.0, 0.0, appIcon.size.width, appIcon.size.height);
NSImageRep *rep = [[appIcon representations] objectAtIndex:0];
NSRect renderRect = NSMakeRect(0.0, 0.0, rep.pixelsWide, rep.pixelsHigh);
CGImageRef cgImage = [appIcon CGImageForProposedRect:&renderRect context:NULL hints:nil];
......
......@@ -91,7 +91,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4139"
width="5.0000019"
height="5.0000019"
......@@ -99,12 +99,12 @@
y="1033.3622"
ry="2.500001" />
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 5.5 14 C 4.1149999 14 3 15.115 3 16.5 C 3 17.885 4.1149999 19 5.5 19 C 6.8850001 19 8 17.885 8 16.5 C 8 15.115 6.8850001 14 5.5 14 z M 5.5 15 C 6.3310001 15 7 15.669 7 16.5 C 7 17.331 6.3310001 18 5.5 18 C 4.6689999 18 4 17.331 4 16.5 C 4 15.669 4.6689999 15 5.5 15 z "
id="rect4141"
transform="translate(0,1030.3622)" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4200"
width="16"
height="0.9999826"
......@@ -112,7 +112,7 @@
y="1035.3622"
ry="0" />
<rect
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
id="rect4206"
width="12"
height="0.9999826"
......
......@@ -255,7 +255,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 3.7070312 7 L 3 7.7070312 L 9.125 13.832031 L 11 15.707031 L 12.875 13.832031 L 19 7.7070312 L 18.292969 7 L 12.167969 13.125 L 11 14.292969 L 9.8320312 13.125 L 3.7070312 7 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17,1047.3622 0,-0.9964 -10.9999998,0 0,-11.0036 -1,0 0,12 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17,1035.3622 -0.9964,0 0,11 -11.0035997,0 0,1 11.9999997,0 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -239,7 +239,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 14.292969 3 L 8.1679688 9.125 L 6.2929688 11 L 8.1679688 12.875 L 14.292969 19 L 15 18.292969 L 8.875 12.167969 L 7.7070312 11 L 8.875 9.8320312 L 15 3.7070312 L 14.292969 3 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -275,7 +275,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 7.7070312 3 L 7 3.7070312 L 13.125 9.8320312 L 14.292969 11 L 13.125 12.167969 L 7 18.292969 L 7.7070312 19 L 13.832031 12.875 L 15.707031 11 L 13.832031 9.125 L 7.7070312 3 z "
transform="translate(-5e-7,1030.3622)"
id="rect4176" />
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 4.999999,1047.3622 0.9964361,0 0,-11 11.0035639,0 3e-6,-1 -11.9999985,0 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -207,7 +207,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#373737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 5.0000005,1035.3622 0,0.9964 10.9999995,0 0,11.0036 1,0 0,-12 z"
id="path4179"
inkscape:connector-curvature="0"
......
......@@ -231,7 +231,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 3.7070307,1044.3622 -0.7070312,-0.707 6.125,-6.125 1.8750005,-1.875 1.875,1.875 6.125,6.125 -0.707032,0.707 -6.125,-6.125 -1.167968,-1.168 -1.1679693,1.168 -6.125,6.125 z"
id="rect4176"
inkscape:connector-curvature="0" />
......
......@@ -110,7 +110,7 @@
id="layer1"
transform="translate(-238.85715,-522.93362)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="M 6 3 L 6 4 L 6 18 L 6 19 L 11 17 L 16 19 L 16 18 L 16 4 L 16 3 L 6 3 z M 7 4 L 15 4 L 15 17.599609 L 11 16 L 7 17.599609 L 7 4 z "
transform="translate(238.85715,522.93362)"
id="rect4136" />
......
......@@ -83,7 +83,7 @@
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 2,2 0,3 0,9 1,0 11,0 0,-1 L 14,2 3,2 Z m 1,3 10,0 0,8 -10,0 z m 1,1 0,6 2,0 0,-6 z m 3,1 0,1 5,0 0,-1 z m 0,3 0,1 5,0 0,-1 z"
transform="translate(421.71429,531.79074)"
id="rect4083"
......
......@@ -126,7 +126,7 @@
id="layer1"
transform="translate(-550.28572,-606.6479)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 12 4 C 9.9724023 4 8.1286798 4.7566937 6.71875 6 C 6.592511 6.1113202 6.4627201 6.2247799 6.34375 6.34375 L 6 6.71875 C 4.7566937 8.1286798 4 9.9724023 4 12 C 4 16.41828 7.58172 20 12 20 C 14.027598 20 15.87132 19.243306 17.28125 18 L 17.65625 17.65625 C 17.77522 17.53728 17.88868 17.407489 18 17.28125 C 19.243306 15.87132 20 14.027598 20 12 C 20 7.58172 16.41828 4 12 4 z M 12 5 C 15.86599 5 19 8.13401 19 12 C 19 13.75366 18.346785 15.334268 17.28125 16.5625 L 7.4375 6.71875 C 8.6657315 5.6532151 10.24634 5 12 5 z M 6.71875 7.4375 L 16.5625 17.28125 C 15.334268 18.346785 13.75366 19 12 19 C 8.13401 19 5 15.86599 5 12 C 5 10.24634 5.6532151 8.6657315 6.71875 7.4375 z "
transform="translate(550.28572,606.6479)"
id="rect4203" />
......
......@@ -103,7 +103,7 @@
id="layer1"
transform="translate(-364.57143,-525.79075)">
<path
style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
style="opacity:1;fill:#373737;fill-opacity:1;stroke:none"
d="m 382.8643,530.79077 -10.43876,10.56644 -4.14699,-4.19772 -0.70712,0.71578 4.14699,4.1977 -0.002,0.002 0.70713,0.71577 0.002,-0.002 0.002,0.002 0.70711,-0.71577 -0.002,-0.002 10.43877,-10.56645 -0.70712,-0.71576 z"
id="rect4113"
inkscape:connector-curvature="0" />
......
......@@ -84,7 +84,7 @@
id="layer1"
transform="translate(-421.71429,-531.79074)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="m 423.71429,542.18849 0,3.60225 3.60225,0 8.39775,-8.39774 -3.60225,-3.60226 -5.1107,5.11069 z m 1.08068,0.36022 1.19324,-1.19323 0,1.62101 1.03565,0 0.99062,0 0.0225,0.6529 -1.08068,1.08067 -1.44091,0 -0.72044,-0.72045 z m 2.20637,-2.20637 1.4409,-1.44091 1.62102,-1.62101 2.16135,2.16135 -3.17448,3.17449 0,-0.67542 -1.01313,0.0225 -1.03566,0 0,-1.03565 z"
id="rect4132"
inkscape:connector-curvature="0"
......
......@@ -131,7 +131,7 @@
inkscape:connector-curvature="0"
id="rect4292"
d="m 18,1033.3622 0,15 0,1 -1,0 -6,0 0,-1 6,0 0,-14 -12,0 0,11 4.292969,0 L 7,1043.0692 l 0.707031,-0.707 2.792969,2.793 0.707031,0.707 -0.707031,0.707 -2.792969,2.793 L 7,1048.6552 l 2.292969,-2.293 -5.292969,0 0,-1 0,-12 13,0 1,0 z"
style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
style="fill:#373737;fill-opacity:1;stroke:none" />
</g>
</g>
</svg>
......@@ -132,7 +132,7 @@
inkscape:connector-curvature="0"
id="rect4292"
d="m 18,1033.3622 0,15 0,1 -1,0 -6,0 0,-1 6,0 0,-14 -12,0 0,11 4.292969,0 L 7,1043.0692 l 0.707031,-0.707 2.792969,2.793 0.707031,0.707 -0.707031,0.707 -2.792969,2.793 L 7,1048.6552 l 2.292969,-2.293 -5.292969,0 0,-1 0,-12 13,0 1,0 z"
style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
style="fill:#373737;fill-opacity:1;stroke:none" />
</g>
</g>
</svg>
......@@ -125,7 +125,7 @@
id="layer1"
transform="translate(0,-1030.3622)">
<path
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
style="fill:#373737;fill-opacity:1;stroke:none"
d="M 4 3 L 4 19 L 5 19 L 13 19 L 14 19 L 14 18.990234 L 14.007812 19 L 18 15.007812 L 18 15 L 18 13.59375 L 18 3 L 17 3 L 5 3 L 4 3 z M 5 4 L 17 4 L 17 14 L 13 14 L 13 15 L 13 18 L 5 18 L 5 4 z "
transform="translate(0,1030.3622)"
id="rect4139" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment