More icon / OS X tweaks.

diff --git a/graphics/colour_conversions.png b/graphics/colour_conversions.png
index b2708178692c4e6a5c795550a44d07ed43c74176..161e8d6f1631ae4ece3acb5aeeb9a86081ae1faa 100644 (file)
Binary files a/graphics/colour_conversions.png and b/graphics/colour_conversions.png differ

diff --git a/graphics/colour_conversions.svg b/graphics/colour_conversions.svg
index 59b35c14f1bc2ec2fbbb4926e7d52947a5e39572..af34a347d3643dd8e6679b7e7e851dd39ff66d9b 100644 (file)
--- a/graphics/colour_conversions.svg
+++ b/graphics/colour_conversions.svg
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="343"
+   height="343"
    id="svg3882"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="colour_conversions.svg"
    inkscape:export-filename="/home/carl/src/dcpomatic/icons/colour_conversions.png"
    inkscape:export-xdpi="8.3965015"
@@ -28,16 +28,20 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="465.68138"
-     inkscape:cy="520"
+     inkscape:cx="116.68138"
+     inkscape:cy="164"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="714"
+     inkscape:window-height="719"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="1051"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <metadata
      id="metadata3887">
     <rdf:RDF>
@@ -53,30 +57,31 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-172,-315.36218)">
     <rect
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;enable-background:accumulate"
        id="rect3941"
        width="100"
        height="300"
        x="193.66678"
        y="335.36218" />
     <rect
-       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;enable-background:accumulate"
        id="rect3941-5"
        width="100"
        height="300"
        x="293.66678"
        y="335.36218" />
     <rect
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.62992096;marker:none;enable-background:accumulate"
        id="rect3941-5-1"
        width="100"
        height="300"
        x="393.66678"
        y="335.36218" />
     <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:10.62992095999999975;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:10.62992096;marker:none;enable-background:accumulate"
        id="rect4026"
        width="343"
        height="343"

diff --git a/graphics/dcpomatic.bmp b/graphics/dcpomatic.bmp
index 002b7ca4f0191eae08ea7ebb2fc56ac0a6e3f1d2..d86830f16529f41dc6f4c3f57ba30f53336b736e 100644 (file)
Binary files a/graphics/dcpomatic.bmp and b/graphics/dcpomatic.bmp differ

diff --git a/graphics/dcpomatic.png b/graphics/dcpomatic.png
index bfdc4969d20767e6d537096c006822f4b6a9b2f7..674ea2544ce1e44d348db1c64feb841938c35294 100644 (file)
Binary files a/graphics/dcpomatic.png and b/graphics/dcpomatic.png differ

diff --git a/graphics/defaults.png b/graphics/defaults.png
index 6097d81dc3a3819b6be2a99891b5d8f5012bfa1b..6ccce17b14d5878de30b26f150dd1fb24a658bc7 100644 (file)
Binary files a/graphics/defaults.png and b/graphics/defaults.png differ

diff --git a/graphics/defaults.svg b/graphics/defaults.svg
index ab254950d2dfb234c6e1ec71e0e6c2c5920c266f..06a593f8535dd4cec9ef49329e1995e9e2852812 100644 (file)
--- a/graphics/defaults.svg
+++ b/graphics/defaults.svg
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="327"
+   height="327"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="defaults.svg"
    inkscape:export-filename="/home/carl/src/dcpomatic/icons/defaults.png"
    inkscape:export-xdpi="9.7627115"
@@ -27,17 +27,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="204.5"
-     inkscape:cy="520"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="71.683736"
+     inkscape:cy="65.926989"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="714"
+     inkscape:window-height="719"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="1051"
+     inkscape:window-maximized="1"
+     fit-margin-top="16"
+     fit-margin-left="16"
+     fit-margin-bottom="16"
+     fit-margin-right="16" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -53,7 +57,8 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-58,-344.36218)">
     <g
        id="g3807"
        style="stroke-width:10.62992096;stroke-miterlimit:4;stroke-dasharray:none"
@@ -62,13 +67,13 @@
          inkscape:connector-curvature="0"
          id="path2985"
          d="m 98,422.36218 19,19 31.68172,-54.87435"
-         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3755"
          d="m 167,421.36218 181,0"
-         style="color:#000000;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     </g>
     <g
        transform="translate(0,87.718611)"
@@ -78,13 +83,13 @@
          inkscape:connector-curvature="0"
          id="path2985-6"
          d="m 98,422.36218 19,19 31.68172,-54.87435"
-         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3755-0"
          d="m 167,421.36218 181,0"
-         style="color:#000000;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     </g>
     <g
        transform="translate(0,175.43718)"
@@ -94,16 +99,16 @@
          inkscape:connector-curvature="0"
          id="path2985-6-6"
          d="m 98,422.36218 19,19 31.68172,-54.87435"
-         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#800000;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3755-0-9"
          d="m 167,421.36218 181,0"
-         style="color:#000000;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#008080;stroke-width:10.62992096;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     </g>
     <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="rect3880"
        width="295"
        height="295"

diff --git a/graphics/keys.png b/graphics/keys.png
index 4f198375d24a29436fe063bd56869de1ad757687..b7b870314838f7f391e92975f73138b81751b1c3 100644 (file)
Binary files a/graphics/keys.png and b/graphics/keys.png differ

diff --git a/graphics/keys.svg b/graphics/keys.svg
index 371d02e9a3b5be3299d7c2f062bbffc667565703..870a0f51e91b80b91a9b86b5cd680c249da262ae 100644 (file)
--- a/graphics/keys.svg
+++ b/graphics/keys.svg
@@ -8,11 +8,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg4217"
-   viewBox="0 0 744.09449 1052.3622"
+   viewBox="-553676.6 0 0 1052.3622"
    version="1.0"
    inkscape:version="0.91 r13725"
-   width="100%"
-   height="100%"
+   width="450"
+   height="450"
    sodipodi:docname="keys.svg"
    inkscape:export-filename="/home/carl/src/dcpomatic/icons/kdm_email.png"
    inkscape:export-xdpi="6.5100002"
@@ -31,10 +31,10 @@
      id="namedview6320"
      showgrid="false"
      inkscape:zoom="0.60313323"
-     inkscape:cx="-141.74672"
-     inkscape:cy="195.645"
-     inkscape:window-x="170"
-     inkscape:window-y="1077"
+     inkscape:cx="275.35579"
+     inkscape:cy="268.52829"
+     inkscape:window-x="0"
+     inkscape:window-y="1051"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4217" />
   <defs
@@ -44,7 +44,7 @@
        y2="742.5"
        gradientUnits="userSpaceOnUse"
        x2="-886.76001"
-       gradientTransform="matrix(-0.84033,-0.84033,-0.84033,0.84033,136.32259,-691.39649)"
+       gradientTransform="matrix(-0.84033,-0.84033,-0.84033,0.84033,55.080175,-1194.2782)"
        y1="742.5"
        x1="-772.01001">
       <stop
@@ -62,7 +62,7 @@
        y2="613.94"
        gradientUnits="userSpaceOnUse"
        x2="385.04001"
-       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-203.97741,756.21351)"
+       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-285.21982,253.33182)"
        y1="63.870998"
        x1="386.39001">
       <stop
@@ -81,7 +81,7 @@
        x2="212.92999"
        y1="358.29999"
        x1="409.38"
-       gradientTransform="translate(-77.797413,384.00351)">
+       gradientTransform="translate(-159.03983,-118.87818)">
       <stop
          id="stop4034"
          stop-color="#dfb300"
@@ -100,7 +100,7 @@
        y2="448.35001"
        gradientUnits="userSpaceOnUse"
        x2="382.89999"
-       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-203.97741,756.21351)"
+       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-285.21982,253.33182)"
        y1="448.35001"
        x1="403.63">
       <stop
@@ -118,22 +118,22 @@
   <path
      inkscape:connector-curvature="0"
      style="color:#000000;fill:url(#linearGradient3601);stroke:#000000;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 149.40259,561.73351 c -46.65,46.65 -46.67,122.4 -0.03,169.04 30.92,30.92 74.6,41.33 114.12,31.27 l 22.3,22.29 39.67,4.86 4.91,39.73 39.68,4.86 4.89,39.7 39.72,4.91 4.86,39.68 70.53,-5.91 5.66,-0.46 1.07,-12.21 5.62,-63.77 -22.07,-22.07 -22.03,-22.03 -22.05,-22.05 -22.03,-22.02 -22.05,-22.05 -22.05,-22.05 -22.05,-22.05 c 12.55,-40.94 2.66,-87.25 -29.71,-119.62 -46.64,-46.64 -122.32,-46.69 -168.96,-0.05 z m 24.21,24.32 c 21.41,-21.41 52.07,-25.54 68.44,-9.17 16.37,16.37 12.26,47.05 -9.14,68.46 -21.41,21.41 -52.07,25.49 -68.44,9.12 -16.37,-16.37 -12.27,-47.01 9.14,-68.41 z"
+     d="m 68.160175,58.85182 c -46.65,46.65 -46.67,122.4 -0.03,169.04 30.92,30.92 74.600005,41.33 114.120005,31.27 l 22.3,22.29 39.67,4.86 4.91,39.73 39.68,4.86 4.89,39.7 39.72,4.91 4.86,39.68 70.53,-5.91 5.66,-0.46 1.07,-12.21 5.62,-63.77 -22.07,-22.07 -22.03,-22.03 -22.05,-22.05 -22.03,-22.02 -22.05,-22.05 -22.05,-22.05 -22.05,-22.05 c 12.55,-40.94 2.66,-87.25 -29.71,-119.62 -46.64,-46.640002 -122.32,-46.690002 -168.960005,-0.05 z m 24.21,24.32 c 21.410005,-21.41 52.070005,-25.54 68.440005,-9.17 16.37,16.37 12.26,47.05 -9.14,68.46 -21.41,21.41 -52.070005,25.49 -68.440005,9.12 -16.37,-16.37 -12.27,-47.01 9.14,-68.41 z"
      id="path6625" />
   <path
      inkscape:connector-curvature="0"
      style="color:#000000;fill:url(#linearGradient3632);stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 310.63259,723.03351 c -1.68,1.68 -2.88,3.59 -3.69,5.59 -0.74,1.82 -1.28,3.93 -1.28,6.32 0,2.4 0.52,4.53 1.26,6.35 0.77,1.9 2.01,3.91 3.69,5.59 l 163.12,163.12 3.27,3.27 4.62,-0.38 5.68,-0.46 8.39,-0.71 0.75,-8.4 1.06,-12.19 0.4,-4.64 -3.29,-3.3 -160.16,-160.16 c -1.68,-1.68 -3.68,-2.91 -5.59,-3.69 -1.81,-0.73 -3.92,-1.28 -6.32,-1.28 -2.4,0 -4.51,0.55 -6.32,1.28 -1.91,0.78 -3.91,2.01 -5.59,3.69 z"
+     d="m 229.39018,220.15182 c -1.68,1.68 -2.88,3.59 -3.69,5.59 -0.74,1.82 -1.28,3.93 -1.28,6.32 0,2.4 0.52,4.53 1.26,6.35 0.77,1.9 2.01,3.91 3.69,5.59 l 163.12,163.12 3.27,3.27 4.62,-0.38 5.68,-0.46 8.39,-0.71 0.75,-8.4 1.06,-12.19 0.4,-4.64 -3.29,-3.3 -160.16,-160.16 c -1.68,-1.68 -3.68,-2.91 -5.59,-3.69 -1.81,-0.73 -3.92,-1.28 -6.32,-1.28 -2.4,0 -4.51,0.55 -6.32,1.28 -1.91,0.78 -3.91,2.01 -5.59,3.69 z"
      id="path6871" />
   <path
      inkscape:connector-curvature="0"
      style="color:#000000;fill:url(#linearGradient3609);stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 161.64259,576.85351 c -2.29,2.41 -4.43,4.92 -6.43,7.49 2.5,-3.23 5.25,-6.31 8.22,-9.28 -0.6,0.6 -1.21,1.18 -1.79,1.79 z m 3.62,-3.58 c 4.29,-4.07 8.84,-7.67 13.61,-10.83 -4.76,3.15 -9.33,6.77 -13.61,10.83 z m -11.62,13.17 c -0.93,1.27 -1.81,2.53 -2.67,3.82 0.85,-1.29 1.74,-2.56 2.67,-3.82 z m -2.81,4.05 c -0.89,1.35 -1.76,2.74 -2.58,4.13 0.82,-1.4 1.68,-2.77 2.58,-4.13 z m -2.58,4.13 c -1.66,2.8 -3.16,5.65 -4.51,8.57 1.35,-2.91 2.86,-5.78 4.51,-8.57 z m -4.51,8.57 c -1.35,2.92 -2.55,5.9 -3.6,8.91 1.05,-3.01 2.25,-6 3.6,-8.91 z m -3.6,8.91 c -1.05,3 -1.97,6.05 -2.72,9.12 0.75,-3.08 1.67,-6.12 2.72,-9.12 z m -2.72,9.12 c -0.31,1.27 -0.58,2.53 -0.84,3.8 0.26,-1.27 0.53,-2.53 0.84,-3.8 z m 43.53,-60.1 c 1.38,-0.87 2.79,-1.69 4.2,-2.48 -1.41,0.79 -2.82,1.61 -4.2,2.48 z m 8.49,-4.73 c 1.44,-0.71 2.88,-1.37 4.35,-2.01 -1.46,0.63 -2.92,1.3 -4.35,2.01 z m 17.89,-6.76 c 1.53,-0.41 3.06,-0.77 4.6,-1.11 -1.54,0.34 -3.07,0.7 -4.6,1.11 z m 4.62,-1.13 c 1.54,-0.34 3.09,-0.62 4.64,-0.88 -1.55,0.26 -3.1,0.54 -4.64,0.88 z m -75.52,77.34 c -0.16,0.79 -0.29,1.58 -0.42,2.36 0.13,-0.77 0.27,-1.58 0.42,-2.36 z m -0.42,2.36 c -0.13,0.78 -0.27,1.55 -0.38,2.33 0.11,-0.79 0.24,-1.55 0.38,-2.33 z m -0.69,4.67 c -0.09,0.78 -0.17,1.57 -0.24,2.36 0.07,-0.78 0.15,-1.58 0.24,-2.36 z m -0.44,4.73 c -0.06,0.78 -0.1,1.56 -0.13,2.34 0.03,-0.79 0.07,-1.56 0.13,-2.34 z m 93.47,-91.26 c 1.18,-0.06 2.37,-0.1 3.56,-0.12 -1.2,0.02 -2.37,0.06 -3.56,0.12 z m 4.71,-0.12 c 0.78,0 1.57,0.01 2.36,0.03 -0.79,-0.02 -1.57,-0.03 -2.36,-0.03 z m -98.18,105.52 c 0.11,1.58 0.25,3.16 0.44,4.73 -0.19,-1.57 -0.33,-3.16 -0.44,-4.73 z m 109.98,-104.81 c 1.56,0.19 3.12,0.4 4.68,0.66 -1.56,-0.26 -3.12,-0.47 -4.68,-0.66 z m -108.85,114.2 c 0.13,0.78 0.26,1.58 0.42,2.36 -0.15,-0.77 -0.29,-1.58 -0.42,-2.36 z m 0.42,2.36 c 0.14,0.77 0.31,1.54 0.48,2.3 -0.17,-0.77 -0.33,-1.52 -0.48,-2.3 z m 1.61,6.92 c 0.21,0.77 0.41,1.55 0.64,2.32 -0.23,-0.76 -0.44,-1.55 -0.64,-2.32 z m 1.35,4.57 c 0.24,0.76 0.49,1.51 0.75,2.26 -0.27,-0.75 -0.51,-1.5 -0.75,-2.26 z m 0.75,2.26 c 0.25,0.71 0.5,1.43 0.77,2.14 -0.26,-0.7 -0.52,-1.43 -0.77,-2.14 z m 1.7,4.48 c 0.3,0.75 0.61,1.48 0.93,2.21 -0.32,-0.73 -0.63,-1.47 -0.93,-2.21 z m 0.93,2.21 c 0.32,0.74 0.63,1.48 0.97,2.21 -0.34,-0.72 -0.65,-1.47 -0.97,-2.21 z m 0.97,2.21 c 0.34,0.73 0.7,1.45 1.06,2.17 -0.36,-0.72 -0.72,-1.44 -1.06,-2.17 z m 2.14,4.31 c 0.38,0.72 0.78,1.43 1.17,2.15 -0.39,-0.71 -0.79,-1.43 -1.17,-2.15 z m 135.57,-131.54 c 1.12,0.63 2.23,1.28 3.34,1.97 -1.11,-0.69 -2.22,-1.34 -3.34,-1.97 z m -131.92,137.88 c 0.38,0.61 0.77,1.23 1.17,1.84 -0.4,-0.61 -0.79,-1.22 -1.17,-1.84 z m 1.57,2.46 c 0.42,0.62 0.85,1.24 1.28,1.85 -0.43,-0.62 -0.86,-1.23 -1.28,-1.85 z m 2.72,3.86 c 0.95,1.3 1.95,2.57 2.98,3.83 -1.02,-1.25 -2.03,-2.54 -2.98,-3.83 z m 139.45,-136.36 c 1.3,1.01 2.61,2.04 3.87,3.12 -1.27,-1.09 -2.56,-2.1 -3.87,-3.12 z m -126.15,151.04 c 38.64,34.9 98.35,33.74 135.59,-3.49 37.23,-37.24 38.39,-96.96 3.49,-135.59 31.41,35.32 -20.5,44.27 -57.68,81.45 -37.17,37.17 -46.08,89.04 -81.4,57.63 z"
+     d="m 80.400175,73.97182 c -2.29,2.41 -4.43,4.92 -6.43,7.49 2.5,-3.23 5.25,-6.31 8.22,-9.28 -0.6,0.6 -1.21,1.18 -1.79,1.79 z m 3.62,-3.58 c 4.29,-4.07 8.84,-7.67 13.61,-10.83 -4.76,3.15 -9.33,6.77 -13.61,10.83 z m -11.62,13.17 c -0.93,1.27 -1.81,2.53 -2.67,3.82 0.85,-1.29 1.74,-2.56 2.67,-3.82 z m -2.81,4.05 c -0.89,1.35 -1.76,2.74 -2.58,4.13 0.82,-1.4 1.68,-2.77 2.58,-4.13 z m -2.58,4.13 c -1.66,2.8 -3.16,5.65 -4.51,8.57 1.35,-2.91 2.86,-5.78 4.51,-8.57 z m -4.51,8.57 c -1.35,2.92 -2.55,5.9 -3.6,8.91 1.05,-3.01 2.25,-6 3.6,-8.91 z m -3.6,8.91 c -1.05,3 -1.97,6.05 -2.72,9.12 0.75,-3.08 1.67,-6.12 2.72,-9.12 z m -2.72,9.12 c -0.31,1.27 -0.58,2.53 -0.84,3.8 0.26,-1.27 0.53,-2.53 0.84,-3.8 z m 43.53,-60.1 c 1.380005,-0.87 2.790005,-1.69 4.200005,-2.48 -1.41,0.79 -2.82,1.61 -4.200005,2.48 z m 8.490005,-4.73 c 1.44,-0.71 2.88,-1.37 4.35,-2.01 -1.46,0.63 -2.92,1.3 -4.35,2.01 z m 17.89,-6.760002 c 1.53,-0.41 3.06,-0.77 4.6,-1.11 -1.54,0.34 -3.07,0.7 -4.6,1.11 z m 4.62,-1.13 c 1.54,-0.34 3.09,-0.62 4.64,-0.88 -1.55,0.26 -3.1,0.54 -4.64,0.88 z M 55.190175,122.96182 c -0.16,0.79 -0.29,1.58 -0.42,2.36 0.13,-0.77 0.27,-1.58 0.42,-2.36 z m -0.42,2.36 c -0.13,0.78 -0.27,1.55 -0.38,2.33 0.11,-0.79 0.24,-1.55 0.38,-2.33 z m -0.69,4.67 c -0.09,0.78 -0.17,1.57 -0.24,2.36 0.07,-0.78 0.15,-1.58 0.24,-2.36 z m -0.44,4.73 c -0.06,0.78 -0.1,1.56 -0.13,2.34 0.03,-0.79 0.07,-1.56 0.13,-2.34 z M 147.11018,43.461818 c 1.18,-0.06 2.37,-0.1 3.56,-0.12 -1.2,0.02 -2.37,0.06 -3.56,0.12 z m 4.71,-0.12 c 0.78,0 1.57,0.01 2.36,0.03 -0.79,-0.02 -1.57,-0.03 -2.36,-0.03 z M 53.640175,148.86182 c 0.11,1.58 0.25,3.16 0.44,4.73 -0.19,-1.57 -0.33,-3.16 -0.44,-4.73 z M 163.62018,44.051818 c 1.56,0.19 3.12,0.4 4.68,0.66 -1.56,-0.26 -3.12,-0.47 -4.68,-0.66 z M 54.770175,158.25182 c 0.13,0.78 0.26,1.58 0.42,2.36 -0.15,-0.77 -0.29,-1.58 -0.42,-2.36 z m 0.42,2.36 c 0.14,0.77 0.31,1.54 0.48,2.3 -0.17,-0.77 -0.33,-1.52 -0.48,-2.3 z m 1.61,6.92 c 0.21,0.77 0.41,1.55 0.64,2.32 -0.23,-0.76 -0.44,-1.55 -0.64,-2.32 z m 1.35,4.57 c 0.24,0.76 0.49,1.51 0.75,2.26 -0.27,-0.75 -0.51,-1.5 -0.75,-2.26 z m 0.75,2.26 c 0.25,0.71 0.5,1.43 0.77,2.14 -0.26,-0.7 -0.52,-1.43 -0.77,-2.14 z m 1.7,4.48 c 0.3,0.75 0.61,1.48 0.93,2.21 -0.32,-0.73 -0.63,-1.47 -0.93,-2.21 z m 0.93,2.21 c 0.32,0.74 0.63,1.48 0.97,2.21 -0.34,-0.72 -0.65,-1.47 -0.97,-2.21 z m 0.97,2.21 c 0.34,0.73 0.7,1.45 1.06,2.17 -0.36,-0.72 -0.72,-1.44 -1.06,-2.17 z m 2.14,4.31 c 0.38,0.72 0.78,1.43 1.17,2.15 -0.39,-0.71 -0.79,-1.43 -1.17,-2.15 z m 135.570005,-131.54 c 1.12,0.63 2.23,1.28 3.34,1.97 -1.11,-0.69 -2.22,-1.34 -3.34,-1.97 z m -131.920005,137.88 c 0.38,0.61 0.77,1.23 1.17,1.84 -0.4,-0.61 -0.79,-1.22 -1.17,-1.84 z m 1.57,2.46 c 0.42,0.62 0.85,1.24 1.28,1.85 -0.43,-0.62 -0.86,-1.23 -1.28,-1.85 z m 2.72,3.86 c 0.95,1.3 1.95,2.57 2.98,3.83 -1.02,-1.25 -2.03,-2.54 -2.98,-3.83 z m 139.450005,-136.36 c 1.3,1.01 2.61,2.04 3.87,3.12 -1.27,-1.09 -2.56,-2.1 -3.87,-3.12 z m -126.150005,151.04 c 38.640005,34.9 98.350005,33.74 135.590005,-3.49 37.23,-37.24 38.39,-96.96 3.49,-135.59 31.41,35.32 -20.5,44.27 -57.68,81.45 -37.17,37.17 -46.08,89.04 -81.400005,57.63 z"
      id="path2365" />
   <path
      inkscape:connector-curvature="0"
      style="color:#000000;fill:url(#linearGradient3594);stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 161.64259,576.87351 c -36.65,38.56 -36.03,99.58 1.8,137.42 38.44,38.43 46.67,-15.69 85.1,-54.13 38.43,-38.43 92.59,-46.69 54.15,-85.12 -38.43,-38.44 -100.81,-38.41 -139.25,0.03 -0.6,0.6 -1.22,1.19 -1.8,1.8 z m 11.99,9.17 c 21.4,-21.41 52.05,-25.51 68.42,-9.14 16.37,16.37 12.27,47.02 -9.14,68.43 -21.4,21.4 -52.05,25.5 -68.42,9.13 -16.37,-16.37 -12.27,-47.02 9.14,-68.42 z"
+     d="m 80.400175,73.99182 c -36.65,38.56 -36.03,99.58 1.8,137.42 38.440005,38.43 46.670005,-15.69 85.100005,-54.13 38.43,-38.43 92.59,-46.69 54.15,-85.12 -38.43,-38.440002 -100.81,-38.410002 -139.250005,0.03 -0.6,0.6 -1.22,1.19 -1.8,1.8 z m 11.99,9.17 c 21.400005,-21.41 52.050005,-25.51 68.420005,-9.14 16.37,16.37 12.27,47.02 -9.14,68.43 -21.4,21.4 -52.050005,25.5 -68.420005,9.13 -16.37,-16.37 -12.27,-47.02 9.14,-68.42 z"
      id="path6632" />
   <metadata
      id="metadata6318">
@@ -143,7 +143,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
         <dc:publisher>
           <cc:Agent
              rdf:about="http://openclipart.org/">
@@ -174,7 +174,7 @@
         </dc:subject>
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
@@ -185,10 +185,10 @@
     </rdf:RDF>
   </metadata>
   <rect
-     style="color:#000000;fill:#ff0000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
      id="rect6322"
      width="442.68826"
      height="442.68826"
-     x="84.558434"
-     y="505.21939" />
+     x="3.3160188"
+     y="2.3376961" />
 </svg>

diff --git a/graphics/tms.png b/graphics/tms.png
index 89ff6d5cf4cf951b0cffdc8d99cbdfbf9f085be0..4041ccd8e002854e3abafd5ef3d2d8fb6ce58b85 100644 (file)
Binary files a/graphics/tms.png and b/graphics/tms.png differ

diff --git a/graphics/tms.svg b/graphics/tms.svg
index c1815b9b367a76e68ed80a1e19ed806122b257d5..e0b18ce2ce739a021a042616287939151f8d5845 100644 (file)
--- a/graphics/tms.svg
+++ b/graphics/tms.svg
@@ -11,11 +11,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
+   width="255.26256"
+   height="255.26256"
    id="svg4047"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="tms.svg"
    inkscape:export-filename="/home/carl/src/dcpomatic/icons/tms.png"
    inkscape:export-xdpi="11.282503"
@@ -108,9 +108,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.7002102"
-     inkscape:cx="334.00378"
-     inkscape:cy="602.77323"
+     inkscape:zoom="0.60111508"
+     inkscape:cx="103.91195"
+     inkscape:cy="58.673368"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -118,13 +118,17 @@
      inkscape:guide-bbox="true"
      objecttolerance="10000"
      inkscape:window-width="1366"
-     inkscape:window-height="714"
+     inkscape:window-height="719"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
+     inkscape:window-y="1051"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <sodipodi:guide
        orientation="0,1"
-       position="-88,846"
+       position="-276.21201,395.46748"
        id="guide6105" />
   </sodipodi:namedview>
   <metadata
@@ -142,47 +146,48 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-188.21201,-346.56711)">
     <path
-       style="fill:url(#linearGradient6226);fill-opacity:1;stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient6226);fill-opacity:1;stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 323.35383,442.15071 -0.58817,142.87283 73.44365,-49.82452 -2.19901,-140.69539 z"
        id="path6121"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:url(#linearGradient6210);stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       style="fill:url(#linearGradient6210);fill-opacity:1;stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 323.35382,439.86652 -87.07405,-40.13194 0,126.71456 86.48589,58.35081 z"
        id="path6123"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:url(#linearGradient6218);fill-opacity:1;stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient6218);fill-opacity:1;stroke:#4d4d4d;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 236.28706,399.69135 64.7791,-37.11367 93.23766,31.49886 -69.74842,46.49277 z"
        id="path6125"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#ff0000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ff0000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 339.3698,456.5535 12.93958,-9.4106"
        id="path6127"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#ff0000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ff0000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 339.95796,471.84573 12.93958,-9.4106"
        id="path6127-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#00ff00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#00ff00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 340.54612,487.13795 12.93958,-9.4106"
        id="path6127-4-9"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#00ff00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#00ff00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 367.6016,534.77913 12.93958,-9.4106"
        id="path6127-4-9-1"
        inkscape:connector-curvature="0" />
     <rect
-       style="color:#000000;fill:#ff0000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="rect6202"
        width="255.26256"
        height="255.26256"

diff --git a/graphics/update b/graphics/update
index b16becc96741ac4faa02456f145a8c02b2482e0a..4f228f0ebd60ed33376349cabc6f5831f4a0a899 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -42,7 +42,7 @@ else
        icotool -c -o $p.ico 48/$p.png
     done
     icotool -c -o dcpomatic2_server_small.ico dcpomatic2_server_small.png
-    $INKSCAPE dcpomatic.png dcpomatic2.svg -w 400 -h 286
+    $INKSCAPE dcpomatic.png dcpomatic2.svg -w 400 -h 400
     convert dcpomatic.png dcpomatic.bmp
 
     # Preferences icons (all platforms)

diff --git a/platform/osx/dcpomatic2_batch.Info.plist.in b/platform/osx/dcpomatic2_batch.Info.plist.in
index 8c07661ace828cec2aeb564e10e9552952389b17..935fecffbadde708f7f3e3fee1182e4c27569484 100644 (file)
--- a/platform/osx/dcpomatic2_batch.Info.plist.in
+++ b/platform/osx/dcpomatic2_batch.Info.plist.in
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>dcpomatic2_batch</string>
        <key>CFBundleGetInfoString</key>
-       <string>DCP-o-matic Batch Converter</string>
+       <string>DCP-o-matic 2 Batch Converter</string>
        <key>CFBundleIconFile</key>
        <string>dcpomatic2_batch.icns</string>
        <key>CFBundleIdentifier</key>

diff --git a/platform/osx/dcpomatic2_kdm.Info.plist.in b/platform/osx/dcpomatic2_kdm.Info.plist.in
index 1d7741bbfda5033363d78582c813a2545fcb9b33..3f16f428a7238383634742363caf2c6265e41416 100644 (file)
--- a/platform/osx/dcpomatic2_kdm.Info.plist.in
+++ b/platform/osx/dcpomatic2_kdm.Info.plist.in
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>dcpomatic2_kdm</string>
        <key>CFBundleGetInfoString</key>
-       <string>DCP-o-matic KDM creator</string>
+       <string>DCP-o-matic 2 KDM creator</string>
        <key>CFBundleIconFile</key>
        <string>dcpomatic2_kdm.icns</string>
        <key>CFBundleIdentifier</key>

diff --git a/platform/osx/dcpomatic2_server.Info.plist.in b/platform/osx/dcpomatic2_server.Info.plist.in
index 4c893be40a7b00eae9992c0c34db0fd481382af5..276106e690ce163b41ee49f3aa7dcc521a3dfbcf 100644 (file)
--- a/platform/osx/dcpomatic2_server.Info.plist.in
+++ b/platform/osx/dcpomatic2_server.Info.plist.in
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>dcpomatic2_server</string>
        <key>CFBundleGetInfoString</key>
-       <string>DCP-o-matic Server</string>
+       <string>DCP-o-matic 2 Server</string>
        <key>CFBundleIconFile</key>
        <string>dcpomatic2.icns</string>
        <key>CFBundleIdentifier</key>