Move some settings to new non-standard page.

diff --git a/graphics/osx/preferences/non_standard@2x_black.png b/graphics/osx/preferences/non_standard@2x_black.png
new file mode 100644 (file)
index 0000000..8c4c8f3
Binary files /dev/null and b/graphics/osx/preferences/non_standard@2x_black.png differ

diff --git a/graphics/osx/preferences/non_standard@2x_white.png b/graphics/osx/preferences/non_standard@2x_white.png
new file mode 100644 (file)
index 0000000..1e758cf
Binary files /dev/null and b/graphics/osx/preferences/non_standard@2x_white.png differ

diff --git a/graphics/osx/preferences/non_standard_black.png b/graphics/osx/preferences/non_standard_black.png
new file mode 100644 (file)
index 0000000..885963e
Binary files /dev/null and b/graphics/osx/preferences/non_standard_black.png differ

diff --git a/graphics/osx/preferences/non_standard_white.png b/graphics/osx/preferences/non_standard_white.png
new file mode 100644 (file)
index 0000000..311ccb9
Binary files /dev/null and b/graphics/osx/preferences/non_standard_white.png differ

diff --git a/graphics/src/preferences_black.svg b/graphics/src/preferences_black.svg
index 22e61c78bc1effd31aa3951f9703aa1e727511e3..e9683951fac025d20033cc995e207fe06e80220c 100644 (file)
--- a/graphics/src/preferences_black.svg
+++ b/graphics/src/preferences_black.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   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"
-   sodipodi:docname="preferences.svg"
-   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="preferences_black.svg"
+   inkscape:version="1.2.2 (b0a8486, 2022-12-01)"
    id="svg8"
    version="1.1"
    viewBox="0 0 8.4666796 8.4666595"
    height="8.4666595mm"
-   width="8.4666796mm">
+   width="8.4666796mm"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs2">
     <linearGradient
@@ -48,17 +48,17 @@
      showguides="true"
      inkscape:window-maximized="1"
      inkscape:window-y="0"
-     inkscape:window-x="1920"
+     inkscape:window-x="0"
      inkscape:window-height="1043"
      inkscape:window-width="1920"
      showborder="true"
      showgrid="true"
      inkscape:document-rotation="0"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="svg8"
      inkscape:document-units="mm"
-     inkscape:cy="11.975201"
-     inkscape:cx="-227.35244"
-     inkscape:zoom="32.000002"
+     inkscape:cy="-9.8994943"
+     inkscape:cx="-125.15789"
+     inkscape:zoom="1.4142137"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      borderopacity="1.0"
@@ -70,7 +70,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true">
+     inkscape:snap-bbox="true"
+     inkscape:deskcolor="#e1e1e1">
     <sodipodi:guide
        id="guide3870"
        orientation="0,-1"
@@ -229,27 +230,33 @@
     <sodipodi:guide
        position="-126.99999,-46.96181"
        orientation="1,0"
-       id="guide1238" />
+       id="guide1238"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="-131.23332,-55.42847"
        orientation="1,0"
-       id="guide1240" />
+       id="guide1240"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="12.699999,-46.96181"
        orientation="1,0"
-       id="guide1257" />
+       id="guide1257"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="21.166658,-46.96181"
        orientation="1,0"
-       id="guide1289" />
+       id="guide1289"
+       inkscape:locked="false" />
     <sodipodi:guide
        id="guide1102"
        orientation="1,0"
-       position="33.866655,-55.42847" />
+       position="33.866655,-55.42847"
+       inkscape:locked="false" />
     <sodipodi:guide
        id="guide1119"
        orientation="1,0"
-       position="25.399995,-46.96181" />
+       position="25.399995,-46.96181"
+       inkscape:locked="false" />
     <inkscape:grid
        type="xygrid"
        id="grid1934"
@@ -258,6 +265,16 @@
        empspacing="2"
        empcolor="#3f3fff"
        empopacity="0.49803922" />
+    <sodipodi:guide
+       position="38.099992,-46.96181"
+       orientation="1,0"
+       id="guide6198"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="46.566666,-46.96181"
+       orientation="1,0"
+       id="guide6200"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata5">
@@ -278,7 +295,6 @@
      style="display:inline"
      transform="translate(-221.81526,-142.13316)">
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/no_tick.svg"
        xlink:href="no_tick.svg"
        id="image2055"
        height="68.000031"
@@ -288,7 +304,6 @@
        x="249.30568"
        y="98.565674" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/defaults.svg"
        xlink:href="defaults.svg"
        id="image1269"
        height="8.4666662"
@@ -298,7 +313,6 @@
        x="120.21528"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/email.svg"
        xlink:href="email.svg"
        id="image1397"
        height="8.4666662"
@@ -308,7 +322,6 @@
        x="171.01529"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/kdm_email.svg"
        xlink:href="kdm_email.svg"
        id="image1684"
        height="8.4666662"
@@ -318,7 +331,6 @@
        x="183.71527"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/keys.svg"
        xlink:href="keys.svg"
        id="image1948"
        height="8.4666662"
@@ -328,7 +340,6 @@
        x="145.61531"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/sound.svg"
        xlink:href="sound.svg"
        id="image2205"
        height="8.4666662"
@@ -338,7 +349,6 @@
        x="107.51526"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/cover_sheet.svg"
        xlink:href="cover_sheet.svg"
        id="image2404"
        height="8.4666662"
@@ -348,7 +358,6 @@
        x="209.11526"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/identifiers.svg"
        xlink:href="identifiers.svg"
        id="image2657"
        height="8.4666662"
@@ -358,7 +367,6 @@
        x="221.81526"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/tms.svg"
        xlink:href="tms.svg"
        id="image2918"
        height="8.4666662"
@@ -368,7 +376,6 @@
        x="158.31528"
        y="126.41271" />
     <image
-       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/notifications.svg"
        xlink:href="notifications.svg"
        id="image3199"
        height="8.4666662"
@@ -780,8 +787,7 @@
      id="layer3"
      inkscape:label="Bounding"
      style="display:none;opacity:0.999"
-     transform="translate(-221.81526,-142.13316)"
-     sodipodi:insensitive="true">
+     transform="translate(-221.81526,-142.13316)">
     <rect
        y="142.13316"
        x="145.61531"
@@ -876,9 +882,15 @@
        height="8.4666595"
        x="247.21526"
        y="142.13313" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       id="bounds-non_standard"
+       width="8.4666796"
+       height="8.4666595"
+       x="259.91525"
+       y="142.13313" />
   </g>
   <g
-     sodipodi:insensitive="true"
      inkscape:groupmode="layer"
      id="layer4"
      inkscape:label="Alignment"
@@ -1073,5 +1085,35 @@
        height="8.4666662"
        x="247.21526"
        y="197.56163" />
+    <rect
+       y="206.02829"
+       x="255.68192"
+       height="8.4666662"
+       width="12.7"
+       id="rect3872-7-6-9-9-8-2-7-3-1"
+       style="display:inline;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="display:inline;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3872-7-6-9-9-8-9-6-2"
+       width="8.4666662"
+       height="8.4666662"
+       x="259.91525"
+       y="197.56163" />
   </g>
+  <circle
+     r="3.4979"
+     cy="4.2333026"
+     cx="42.333332"
+     id="path4787-5"
+     style="font-variation-settings:normal;display:inline;opacity:0.999;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000" />
+  <path
+     style="font-variation-settings:normal;display:inline;opacity:1;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     d="m 40.471146,2.3711192 3.67137,3.67136"
+     id="path1916"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="font-variation-settings:normal;display:inline;opacity:1;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     d="m 40.497636,6.0689792 3.67137,-3.67136"
+     id="path1916-9"
+     sodipodi:nodetypes="cc" />
 </svg>

diff --git a/graphics/src/preferences_white.svg b/graphics/src/preferences_white.svg
index d1f84e7d560443688b0e1db215d194f56b21713a..5aba547402770f8c63841b4cd9c7e4aa960acf9f 100644 (file)
--- a/graphics/src/preferences_white.svg
+++ b/graphics/src/preferences_white.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
    sodipodi:docname="preferences_white.svg"
-   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
+   inkscape:version="1.2.2 (b0a8486, 2022-12-01)"
    id="svg8"
    version="1.1"
    viewBox="0 0 8.4666796 8.4666595"
@@ -45,20 +45,20 @@
      inkscape:snap-midpoints="false"
      inkscape:snap-global="true"
      inkscape:guide-bbox="true"
-     showguides="true"
+     showguides="false"
      inkscape:window-maximized="1"
      inkscape:window-y="0"
      inkscape:window-x="0"
-     inkscape:window-height="1043"
+     inkscape:window-height="1016"
      inkscape:window-width="1920"
      showborder="true"
      showgrid="false"
      inkscape:document-rotation="0"
      inkscape:current-layer="layer2"
      inkscape:document-units="mm"
-     inkscape:cy="110.99999"
-     inkscape:cx="-213.99998"
-     inkscape:zoom="2.0000002"
+     inkscape:cy="31.437497"
+     inkscape:cx="99.31249"
+     inkscape:zoom="8.0000008"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      borderopacity="1.0"
@@ -70,7 +70,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true">
+     inkscape:snap-bbox="true"
+     inkscape:deskcolor="#212121">
     <sodipodi:guide
        id="guide3870"
        orientation="0,-1"
@@ -169,7 +170,7 @@
     <sodipodi:guide
        id="guide4449"
        orientation="0.00233919,-0.99999726"
-       position="-73.567837,5.6661875"
+       position="42.060869,5.6957494"
        inkscape:locked="false" />
     <sodipodi:guide
        id="guide4451"
@@ -229,27 +230,33 @@
     <sodipodi:guide
        position="-126.99999,-46.96181"
        orientation="1,0"
-       id="guide1238" />
+       id="guide1238"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="-131.23332,-55.42847"
        orientation="1,0"
-       id="guide1240" />
+       id="guide1240"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="12.699999,-46.96181"
        orientation="1,0"
-       id="guide1257" />
+       id="guide1257"
+       inkscape:locked="false" />
     <sodipodi:guide
        position="21.166658,-46.96181"
        orientation="1,0"
-       id="guide1289" />
+       id="guide1289"
+       inkscape:locked="false" />
     <sodipodi:guide
        id="guide1102"
        orientation="1,0"
-       position="33.866655,-55.42847" />
+       position="33.866655,-55.42847"
+       inkscape:locked="false" />
     <sodipodi:guide
        id="guide1119"
        orientation="1,0"
-       position="25.399995,-46.96181" />
+       position="25.399995,-46.96181"
+       inkscape:locked="false" />
     <inkscape:grid
        type="xygrid"
        id="grid1934"
@@ -258,6 +265,26 @@
        empspacing="2"
        empcolor="#3f3fff"
        empopacity="0.49803922" />
+    <sodipodi:guide
+       position="38.099992,-46.96181"
+       orientation="1,0"
+       id="guide1564"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="46.566666,-46.96181"
+       orientation="1,0"
+       id="guide1566"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="42.333299,4.3063014"
+       orientation="-0.70710678,-0.70710678"
+       id="guide1849"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="42.333299,4.3063014"
+       orientation="0.70710678,-0.70710678"
+       id="guide1851"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata5">
@@ -275,7 +302,8 @@
      inkscape:groupmode="layer"
      inkscape:label="Old"
      style="display:inline"
-     transform="translate(-221.81526,-142.13316)">
+     transform="translate(-221.81526,-142.13316)"
+     sodipodi:insensitive="true">
     <image
        xlink:href="no_tick.svg"
        id="image2055"
@@ -377,16 +405,16 @@
     <g
        transform="matrix(1.1551658,0,0,1.1392711,-38.903365,-20.430414)"
        id="g1161"
-       style="stroke-width:0.23063583;stroke-miterlimit:4;stroke-dasharray:none;stroke:#ffffff;fill:#333333">
+       style="fill:#333333;stroke:#ffffff;stroke-width:0.230636;stroke-miterlimit:4;stroke-dasharray:none">
       <path
          id="path1140"
-         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.23063583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.230636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
          inkscape:transform-center-y="0.82979223"
          d="m 251.35104,149.66655 c -1.02681,-2.04753 -2.2451,-3.29197 -2.25653,-4.23965 -0.0447,-3.29377 4.44748,-3.29377 4.51308,0 0.006,1.11239 -1.27158,2.19212 -2.25655,4.23965 z"
          sodipodi:nodetypes="cccc"
          inkscape:transform-center-x="-2.8553886e-06" />
       <circle
-         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.23063583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.230636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
          id="path1157"
          cx="251.29668"
          cy="145.24889"
@@ -417,7 +445,7 @@
        sodipodi:cx="110.9753"
        sodipodi:type="arc"
        id="path4260"
-       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        d="m 114.16903,143.69144 a 4.0784903,4.2965121 0 0 1 0.11277,5.18751" />
     <path
        sodipodi:nodetypes="ccccc"
@@ -433,7 +461,7 @@
        sodipodi:nodetypes="ccc"
        id="path4309"
        d="m 123.0911,142.96076 -1.36064,1.74783 -0.66542,-0.57233"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
     <path
        style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        d="m 123.65485,149.14462 h 3.43959"
@@ -445,7 +473,7 @@
        d="m 123.65485,146.49878 h 3.43959"
        style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <g
-       style="display:inline;fill:#333333;fill-opacity:1;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke:#ffffff"
+       style="display:inline;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
        transform="translate(-25.44543,-0.13228854)"
        id="g5160">
       <path
@@ -495,19 +523,25 @@
        cy="146.3665"
        cx="200.67569"
        id="path4787"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        sodipodi:nodetypes="ccccc"
        id="path4877"
        d="m 200.31495,147.28816 -0.20355,-3.25948 1.10682,-8.8e-4 -0.21968,3.25753 z"
-       style="display:inline;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-dashoffset:0;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
     <rect
        y="148.26013"
        x="200.42728"
        height="0.47716767"
        width="0.47716767"
        id="rect4879"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;opacity:1;-inkscape-stroke:none;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
+    <circle
+       r="3.4979"
+       cy="146.29352"
+       cx="264.14856"
+       id="path4787-5"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <rect
        style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        id="rect4416-5"
@@ -603,7 +637,7 @@
        height="1.0583328"
        width="0.5291636"
        id="rect5009"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        id="path5026"
        d="m 226.57776,144.91128 h 2.38125"
@@ -633,7 +667,7 @@
        sodipodi:nodetypes="ccc" />
     <path
        sodipodi:nodetypes="cc"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        d="m 184.50901,150.33524 2.38125,-2.64583"
        id="path4720-02" />
     <path
@@ -648,7 +682,7 @@
       <path
          sodipodi:nodetypes="cc"
          id="path4562-1"
-         d="m 173.86125,146.3665 4.7625,0"
+         d="m 173.86125,146.3665 h 4.7625"
          style="font-variation-settings:normal;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
       <circle
          r="1.0585326"
@@ -721,7 +755,7 @@
        id="path5243-0"
        sodipodi:nodetypes="cc" />
     <path
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
        d="m 123.0911,145.49381 -1.36064,1.74783 -0.66542,-0.57233"
        id="path4309-3"
        sodipodi:nodetypes="ccc" />
@@ -729,10 +763,10 @@
        sodipodi:nodetypes="ccc"
        id="path4309-3-6"
        d="m 123.0911,148.08756 -1.36064,1.74783 -0.66542,-0.57233"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1;-inkscape-stroke:none" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff5555;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
     <path
        d="m 241.31866,145.98907 0.32801,-0.0482 0.19241,0.0187 0.54261,0.24564 v 0.32246 l -0.54261,0.24564 -0.19241,0.0187 -0.32801,-0.0482 -0.15562,0.58079 0.30815,0.1223 0.15727,0.11239 0.34711,0.48404 -0.16124,0.27926 -0.59274,-0.0586 -0.17597,-0.08 -0.25999,-0.20573 -0.42517,0.42517 0.20573,0.25999 0.08,0.17597 0.0586,0.59274 -0.27926,0.16124 -0.48404,-0.34711 -0.11239,-0.15727 -0.1223,-0.30815 -0.58079,0.15562 0.0482,0.32801 -0.0187,0.19241 -0.24564,0.54261 h -0.32246 l -0.24564,-0.54261 -0.0187,-0.19241 0.0482,-0.32801 -0.58079,-0.15562 -0.1223,0.30815 -0.11239,0.15727 -0.48404,0.34711 -0.27926,-0.16124 0.0586,-0.59274 0.08,-0.17597 0.20573,-0.25999 -0.42517,-0.42517 -0.25999,0.20573 -0.17597,0.08 -0.59274,0.0586 -0.16124,-0.27926 0.34711,-0.48404 0.15727,-0.11239 0.30815,-0.1223 -0.15562,-0.58079 -0.32801,0.0482 -0.19241,-0.0187 -0.54261,-0.24564 v -0.32246 l 0.54261,-0.24564 0.19241,-0.0187 0.32801,0.0482 0.15562,-0.58079 -0.30815,-0.1223 -0.15727,-0.11239 -0.34711,-0.48404 0.16124,-0.27926 0.59274,0.0586 0.17597,0.08 0.25999,0.20573 0.42517,-0.42517 -0.20573,-0.25999 -0.08,-0.17597 -0.0586,-0.59274 0.27926,-0.16124 0.48404,0.34711 0.11239,0.15727 0.1223,0.30815 0.58079,-0.15562 -0.0482,-0.32801 0.0187,-0.19241 0.24564,-0.54261 h 0.32246 l 0.24564,0.54261 0.0187,0.19241 -0.0482,0.32801 0.58079,0.15562 0.1223,-0.30815 0.11239,-0.15727 0.48404,-0.34711 0.27926,0.16124 -0.0586,0.59274 -0.08,0.17597 -0.20573,0.25999 0.42517,0.42517 0.25999,-0.20573 0.17597,-0.08 0.59274,-0.0586 0.16124,0.27926 -0.34711,0.48404 -0.15727,0.11239 -0.30815,0.1223 z"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        id="path4521"
        inkscape:connector-curvature="0" />
     <circle
@@ -763,6 +797,16 @@
        height="1.852089"
        x="97.990265"
        y="144.38211" />
+    <path
+       style="font-variation-settings:normal;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 262.28638,144.43134 3.67137,3.67136"
+       id="path1916"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="font-variation-settings:normal;display:inline;fill:#ff5555;fill-opacity:1;stroke:#ff5555;stroke-width:0.7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 262.31287,148.1292 3.67137,-3.67136"
+       id="path1916-9"
+       sodipodi:nodetypes="cc" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -777,14 +821,14 @@
        height="8.4666595"
        width="8.4666796"
        id="bounds-keys"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <rect
        y="142.13316"
        x="158.31526"
        height="8.4666595"
        width="8.4666796"
        id="bounds-tms"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <rect
        y="142.13316"
        x="171.0153"
@@ -865,9 +909,15 @@
        height="8.4666595"
        x="247.21526"
        y="142.13313" />
+    <rect
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       id="bounds-non_standard"
+       width="8.4666796"
+       height="8.4666595"
+       x="259.91522"
+       y="142.06018" />
   </g>
   <g
-     sodipodi:insensitive="true"
      inkscape:groupmode="layer"
      id="layer4"
      inkscape:label="Alignment"
@@ -1062,5 +1112,19 @@
        height="8.4666662"
        x="247.21526"
        y="197.56163" />
+    <rect
+       y="206.02829"
+       x="255.68192"
+       height="8.4666662"
+       width="12.7"
+       id="rect3872-7-6-9-9-8-2-7-3-3"
+       style="display:inline;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="display:inline;vector-effect:none;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3872-7-6-9-9-8-9-6-6"
+       width="8.4666662"
+       height="8.4666662"
+       x="259.91525"
+       y="197.56163" />
   </g>
 </svg>

diff --git a/graphics/update b/graphics/update
index ff3baca04e5245bae728e2ef217714c3b0f3a1f9..005bcf3fdb77cbe27e3e91fc502b9bcadfabf83b 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -81,7 +81,7 @@ else
     # OS X preferences icons
     mkdir -p osx/preferences
     for c in black white; do
-       for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do
+       for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced non_standard; do
            inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}_${c}.png --width 32 --height 32 src/preferences_$c.svg
            inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}@2x_${c}.png --width 64 --height 64 src/preferences_$c.svg
        done

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 087e8b936f778e48aeda42f106a4d4aca57d964f..7b2f330a235b3a31b74fad48aad40bbe73a26827 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -237,6 +237,7 @@ function copy_resources {
     cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/non_standard*.png "$dest"
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index b7f87fe7a27a579b23a2462ef96cfca8ffab3d08..4dff7b5bf780cb9916f78e55dcc614e65307335d 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1489,6 +1489,116 @@ private:
 };
 
 
+class NonStandardPage : public Page
+{
+public:
+       NonStandardPage(wxSize panel_size, int border)
+               : Page(panel_size, border)
+       {}
+
+       wxString GetName() const override
+       {
+               return _("Non-standard");
+       }
+
+#ifdef DCPOMATIC_OSX
+       wxBitmap GetLargeIcon() const override
+       {
+               return wxBitmap(icon_path("non_standard"), wxBITMAP_TYPE_PNG);
+       }
+#endif
+
+private:
+       void setup() override
+       {
+               auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol(1, 1);
+               _panel->GetSizer()->Add(table, 1, wxALL | wxEXPAND, _border);
+
+               {
+                       add_label_to_sizer(table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+                       wxBoxSizer* s = new wxBoxSizer(wxHORIZONTAL);
+                       _maximum_j2k_bandwidth = new wxSpinCtrl(_panel);
+                       s->Add(_maximum_j2k_bandwidth, 1);
+                       add_label_to_sizer(s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxALIGN_CENTRE_VERTICAL);
+                       table->Add(s, 1);
+               }
+
+               _allow_any_dcp_frame_rate = new CheckBox(_panel, _("Allow any DCP frame rate"));
+               table->Add(_allow_any_dcp_frame_rate, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+               table->AddSpacer(0);
+
+               _allow_any_container = new CheckBox(_panel, _("Allow full-frame and non-standard container ratios"));
+               table->Add(_allow_any_container, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+               auto restart = new StaticText(_panel, _("(restart DCP-o-matic to see all ratios)"));
+               auto font = restart->GetFont();
+               font.SetStyle(wxFONTSTYLE_ITALIC);
+               font.SetPointSize(font.GetPointSize() - 1);
+               restart->SetFont(font);
+               table->Add(restart, 1, wxALIGN_CENTRE_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
+               restart->SetFont(font);
+
+               _allow_96khz_audio = new CheckBox(_panel, _("Allow creation of DCPs with 96kHz audio"));
+               table->Add(_allow_96khz_audio, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+               table->AddSpacer (0);
+
+               _use_all_audio_channels = new CheckBox(_panel, _("Allow mapping to all audio channels"));
+               table->Add(_use_all_audio_channels, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+               table->AddSpacer(0);
+
+               _maximum_j2k_bandwidth->SetRange(1, 1000);
+               _maximum_j2k_bandwidth->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_j2k_bandwidth_changed, this));
+               _allow_any_dcp_frame_rate->bind(&NonStandardPage::allow_any_dcp_frame_rate_changed, this);
+               _allow_any_container->bind(&NonStandardPage::allow_any_container_changed, this);
+               _allow_96khz_audio->bind(&NonStandardPage::allow_96khz_audio_changed, this);
+               _use_all_audio_channels->bind(&NonStandardPage::use_all_channels_changed, this);
+       }
+
+       void config_changed() override
+       {
+               auto config = Config::instance();
+
+               checked_set(_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
+               checked_set(_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate());
+               checked_set(_allow_any_container, config->allow_any_container());
+               checked_set(_allow_96khz_audio, config->allow_96khz_audio());
+               checked_set(_use_all_audio_channels, config->use_all_audio_channels());
+       }
+
+       void maximum_j2k_bandwidth_changed()
+       {
+               Config::instance()->set_maximum_j2k_bandwidth(_maximum_j2k_bandwidth->GetValue() * 1000000);
+       }
+
+       void allow_any_dcp_frame_rate_changed()
+       {
+               Config::instance()->set_allow_any_dcp_frame_rate(_allow_any_dcp_frame_rate->GetValue());
+       }
+
+       void allow_any_container_changed()
+       {
+               Config::instance()->set_allow_any_container(_allow_any_container->GetValue());
+       }
+
+       void allow_96khz_audio_changed()
+       {
+               Config::instance()->set_allow_96hhz_audio(_allow_96khz_audio->GetValue());
+       }
+
+       void use_all_channels_changed()
+       {
+               Config::instance()->set_use_all_audio_channels(_use_all_audio_channels->GetValue());
+       }
+
+       wxSpinCtrl* _maximum_j2k_bandwidth = nullptr;
+       CheckBox* _allow_any_dcp_frame_rate = nullptr;
+       CheckBox* _allow_any_container = nullptr;
+       CheckBox* _allow_96khz_audio = nullptr;
+       CheckBox* _use_all_audio_channels = nullptr;
+};
+
+
+
 /** @class AdvancedPage
  *  @brief Advanced page of the preferences dialog.
  */
@@ -1529,15 +1639,6 @@ private:
                table->AddGrowableCol (1, 1);
                _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
-               {
-                       add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-                       _maximum_j2k_bandwidth = new wxSpinCtrl (_panel);
-                       s->Add (_maximum_j2k_bandwidth, 1);
-                       add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxALIGN_CENTRE_VERTICAL);
-                       table->Add (s, 1);
-               }
-
                add_label_to_sizer (table, _panel, _("Video display mode"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
                _video_display_mode = new wxChoice (_panel, wxID_ANY);
                table->Add (_video_display_mode);
@@ -1549,24 +1650,6 @@ private:
                restart->SetFont (font);
                table->AddSpacer (0);
 
-               _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate"));
-               table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-               table->AddSpacer (0);
-
-               _allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios"));
-               table->Add (_allow_any_container, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-               restart = new StaticText (_panel, _("(restart DCP-o-matic to see all ratios)"));
-               table->Add(restart, 1, wxALIGN_CENTRE_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
-               restart->SetFont (font);
-
-               _allow_96khz_audio = new CheckBox (_panel, _("Allow creation of DCPs with 96kHz audio"));
-               table->Add (_allow_96khz_audio, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-               table->AddSpacer (0);
-
-               _use_all_audio_channels = new CheckBox(_panel, _("Allow mapping to all audio channels"));
-               table->Add(_use_all_audio_channels, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-               table->AddSpacer(0);
-
                _show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors"));
                table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
                table->AddSpacer (0);
@@ -1660,17 +1743,11 @@ private:
                table->AddSpacer (0);
 #endif
 
-               _maximum_j2k_bandwidth->SetRange (1, 1000);
-               _maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
                _video_display_mode->Append (_("Simple (safer)"));
 #if wxCHECK_VERSION(3, 1, 0)
                _video_display_mode->Append (_("OpenGL (faster)"));
 #endif
                _video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
-               _allow_any_dcp_frame_rate->bind(&AdvancedPage::allow_any_dcp_frame_rate_changed, this);
-               _allow_any_container->bind(&AdvancedPage::allow_any_container_changed, this);
-               _allow_96khz_audio->bind(&AdvancedPage::allow_96khz_audio_changed, this);
-               _use_all_audio_channels->bind(&AdvancedPage::use_all_channels_changed, this);
                _show_experimental_audio_processors->bind(&AdvancedPage::show_experimental_audio_processors_changed, this);
                _only_servers_encode->bind(&AdvancedPage::only_servers_encode_changed, this);
                _frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this));
@@ -1695,7 +1772,6 @@ private:
        {
                auto config = Config::instance ();
 
-               checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
                switch (config->video_view_type()) {
                case Config::VIDEO_VIEW_SIMPLE:
                        checked_set (_video_display_mode, 0);
@@ -1704,10 +1780,6 @@ private:
                        checked_set (_video_display_mode, 1);
                        break;
                }
-               checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
-               checked_set (_allow_any_container, config->allow_any_container ());
-               checked_set (_allow_96khz_audio, config->allow_96khz_audio());
-               checked_set (_use_all_audio_channels, config->use_all_audio_channels());
                checked_set (_show_experimental_audio_processors, config->show_experimental_audio_processors ());
                checked_set (_only_servers_encode, config->only_servers_encode ());
                checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
@@ -1726,11 +1798,6 @@ private:
 #endif
        }
 
-       void maximum_j2k_bandwidth_changed ()
-       {
-               Config::instance()->set_maximum_j2k_bandwidth(_maximum_j2k_bandwidth->GetValue() * 1000000);
-       }
-
        void video_display_mode_changed ()
        {
                if (_video_display_mode->GetSelection() == 0) {
@@ -1745,26 +1812,6 @@ private:
                Config::instance()->set_frames_in_memory_multiplier(_frames_in_memory_multiplier->GetValue());
        }
 
-       void allow_any_dcp_frame_rate_changed ()
-       {
-               Config::instance()->set_allow_any_dcp_frame_rate(_allow_any_dcp_frame_rate->GetValue());
-       }
-
-       void allow_any_container_changed ()
-       {
-               Config::instance()->set_allow_any_container(_allow_any_container->GetValue());
-       }
-
-       void allow_96khz_audio_changed ()
-       {
-               Config::instance()->set_allow_96hhz_audio(_allow_96khz_audio->GetValue());
-       }
-
-       void use_all_channels_changed ()
-       {
-               Config::instance()->set_use_all_audio_channels(_use_all_audio_channels->GetValue());
-       }
-
        void show_experimental_audio_processors_changed ()
        {
                Config::instance()->set_show_experimental_audio_processors(_show_experimental_audio_processors->GetValue());
@@ -1828,13 +1875,8 @@ private:
        }
 #endif
 
-       wxSpinCtrl* _maximum_j2k_bandwidth = nullptr;
        wxChoice* _video_display_mode = nullptr;
        wxSpinCtrl* _frames_in_memory_multiplier = nullptr;
-       CheckBox* _allow_any_dcp_frame_rate = nullptr;
-       CheckBox* _allow_any_container = nullptr;
-       CheckBox* _allow_96khz_audio = nullptr;
-       CheckBox* _use_all_audio_channels = nullptr;
        CheckBox* _show_experimental_audio_processors = nullptr;
        CheckBox* _only_servers_encode = nullptr;
        NameFormatEditor* _dcp_metadata_filename_format = nullptr;
@@ -1883,6 +1925,7 @@ create_full_config_dialog ()
        e->AddPage (new NotificationsPage  (ps, border));
        e->AddPage (new CoverSheetPage     (ps, border));
        e->AddPage (new IdentifiersPage    (ps, border));
+       e->AddPage (new NonStandardPage    (ps, border));
        e->AddPage (new AdvancedPage       (ps, border));
        return e;
 }