diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-12-29 00:42:07 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-12-29 00:42:07 +0000 |
| commit | af2096422176525fa2f4e1f4cf5942bcf51a9a20 (patch) | |
| tree | f6b7ebbc0a28ecd473f0b9eeeca64575ec103cbc | |
| parent | Fix snapping when constrained scaling: now snaps all corners of the selection (diff) | |
| download | inkscape-af2096422176525fa2f4e1f4cf5942bcf51a9a20.tar.gz inkscape-af2096422176525fa2f4e1f4cf5942bcf51a9a20.zip | |
Add icons to document properties grid table :-)
(bzr r4329)
| -rw-r--r-- | share/icons/icons.svg | 280 | ||||
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 36 | ||||
| -rw-r--r-- | src/ui/dialog/document-properties.h | 2 |
3 files changed, 231 insertions, 87 deletions
diff --git a/share/icons/icons.svg b/share/icons/icons.svg index a528a82a0..184d2a167 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -17,6 +17,48 @@ inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs3"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective4714" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective4704" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective4702" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective2343" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective4672" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + id="perspective2320" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" /> <inkscape:path-effect effect="skeletal" id="path-effect9860" @@ -4485,12 +4527,12 @@ inkscape:window-x="0" inkscape:window-height="1000" inkscape:window-width="1241" - inkscape:cy="1046.0601" - inkscape:cx="657.30672" - inkscape:zoom="0.42774315" + inkscape:cy="821.93472" + inkscape:cx="335.38325" + inkscape:zoom="19.357446" gridtolerance="6" snaptogrid="false" - showgrid="true" + showgrid="false" gridspacingx="0.5px" gridspacingy="0.5px" id="base" @@ -4498,20 +4540,48 @@ inkscape:grid-points="true" gridoriginy="0.0000000px" gridoriginx="0.0000000px" - guidetolerance="1" + guidetolerance="8" gridempspacing="2" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="true" - objecttolerance="11"> + objecttolerance="11" + inkscape:snap-bbox="true" + inkscape:snap-nodes="true" + inkscape:bbox-nodes="true" + inkscape:bbox-paths="true"> <inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" - spacingx="0px" - spacingy="0px" + spacingx="0.5px" + spacingy="0.5px" empspacing="2" /> + <sodipodi:guide + orientation="-0.5,0.8660254" + position="462.99911,893.99772" + id="guide4708" /> + <sodipodi:guide + orientation="-0.5,0.8660254" + position="50.999997,662" + id="guide4710" /> + <sodipodi:guide + orientation="-0.5,0.8660254" + position="70.4754,661.4991" + id="guide4712" /> + <sodipodi:guide + orientation="0.5,0.8660254" + position="68.5,982.5" + id="guide4714" /> + <sodipodi:guide + orientation="0.5,0.8660254" + position="56,984" + id="guide4716" /> + <sodipodi:guide + orientation="0.5,0.8660254" + position="60.5,975.5" + id="guide4718" /> </sodipodi:namedview> <metadata id="metadata1810"> @@ -13380,83 +13450,7 @@ http://www.inkscape.org/</dc:description> transform="scale(1.125) translate(4,-6.5)" id="g8862"> <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAYCAYAAAAVibZIAAANJWlDQ1BJQ0MgcHJvZmlsZQAAeNqt -12k4lO/bB/DznhnGMmYYO2Fk36LshOyJyr6lZN+GmWypVEgKkSUULQgJoUQiUf3IkpAs2YqKLKUQ -yTLPC6me33H8/8+b53x13uf94rqv+zg+3+u4AAhKLlQqGQUA/gHBgZbGeiR7B0cStg+YAQ9EkAGs -i1sQVdfc3Az+Yy32AgIA0C3nQqWSE0NOLve+X3rVaX5fAaGkesJ/L3ygvYMjACILABxeG/0uAOBw -3eitAYDjaDA1GADxBgAON28XdwAkHABkA60t9QGQQgDAe2301QCAd93omwEAH+rmFQyA9APQEwPc -fQIAsDMA9NruHkFuAHhZAHB3D3LzB8AnAYCZvz/FHQA/BACSbtTAYAACBgDk7B0cSRuffCAOQIkX -gMH0z+xoGkBlDoDk3j8zkQcAXC4AuQl/ZvOWgAAAwtUR5Km4AwAAEJweAN0IjTYvDoBNAVhLptFW -cmm0tZsA6CGABrJbSGDor/+FIO0A/9fzxp5/FRoBQAEgokgB6jg6HBNOd4o+AhvFcIbRgLGR6Rzz -eVwsywV8Fas3WzIxmT2F4xJnGlcadwZPIx+FP2tLlsA1wWZSiHDu1psiHWInxAskuqROSRfL9MpF -bbsjP7D93I57im+VL6hUqY6qJ2rUaI5rpWo/1pnSTdd7qv/FMNOoyXjO5MaeVtPFvbn7Xu7vNO+0 -6LJctS6y6bHtteuz73fEHLjrNHRw+NCI89vD71xxbg/dP3h89Bz3mvD+5DPpx0l+4v854Atllvr1 -yLfAuaCF4IWQ76GLR5fCfhxbPv7zxGr46sm101IRPVHIGVQ0+iwmhu4c/XlsLEMcYzzTBeYEXCLL -RXwSIZk1hS2VeIk9jSOdM4PrMvcVnkzeLL6r/Ne2XBe4IZgtlEPKFb65NU8kX7RA7JZEocRtySKp -Yuni6RLyHdlSuTL5coW72+9tr9hxX6lSuUqlavFBaLXqQ7UajVrNRzvrdj7Werxef7pB58mup7rP -9P7Rb8Q0RjcZPjdqNm4xaTVpY2qLf2HabvZyXwe+42KneZfFK8tuYnfKa6se616bPq6+jH67N/YD -joN8g1lDTsNOIwffCr698c559PCY8Fjue9cPbh/dx8XGCyY8P3lNek9JTRVN+874fSZ/kftSOhvw -lfKNOrd97t584ELQ9+BF5cWqpdAfYcvHfh5b0VipXT2xFr6utf6YRgNARFB41Fd0G6aYLpU+HOvF -YM2oz6TELIGTYOHBcxN4WHnYOIni7JIcapxmXIe4g3gSecv42vgnBdgFVYS8SJeFn4sgolpiR8Tv -SsxKSUqTZWrl0Nt05ZMVRndIKcYo9alIq1LVGjW4NcN2vtDm0qHseqonqn/CoMtI0Dhsd53Jsul2 -M4+9afu6zPEWxpZhVvnWr22Z7HbZH3G45th0YPag0KH9zscP57o0uk66c3roeNp7nfLO9mnwHfZb -9mcPkKEYUL2PhAcmBeUGV4Y0hw4enQpbPI4+wRZOOil7Svn0rgjTyP1RB84cjvY4S44JPhd4PiI2 -Iu5MfOyFlIT4xMyLV5IykpNTrqamXEpPu5xemHHrcumVwszirLKrj649ut5440V2V053bvfN7rzB -/A8FE7fGCj/eni36Vjxb8uXOXOls2XT5zN2Je6MVY/cHKruqWh40VD94WFZztTblUUSd/+MD9aYN -O59IPyU+XX727p/WxvtNqc8Dm61aVFr5W2ltAy/ut8e9dOwQ6RjvrOg6+cqwG989/Dq7x7dXsXet -r70/9c3BAamB+cGaoahh0xGOkZG3t98FjWqOYcZa31/6cOijxMeZ8ZqJyE97Jjknh6fypskzyjPr -n1u+pMwe+Cr6deZbxVz4vPECcaH/e/4iZUn9B/rH8+XknwdWRFY+r1atRayb0LhoNAA4g4ShjqM1 -0TWYk3Q6dPX0kdizDEYMjYwxTOeY43B7cG0sCfgEQiLrftYOtiRiCnsqRyqnNedrrnTudJ7LvJl8 -WfxZW64KOAkMC94QyiblCOdszRG5KZonli9eIHFLslDqtrSP9JRMkWyJ3J1tpfJlCuXb7+64p1ih -dF+5SqVKtUotTO2Heo1GjWbtzkdaddqntNd16nc16D7Re6r/zCDaEGPYaNRk/Hx3s0nLnlbTeDOc -2Yu97fte7u8wT7JgteiyfGXVbf3aptc23Y7Lrs++3+GN48CBLCd+p6GDw4feOr87/M4lx1XYdczt -vfsHj4+eBV7iGwniO+VXTJYlz/yvFJn/nSLVx9SOLR//eWIlfPXk2qn107RIiEL9ThLseWwsQ2xL -3J545gu4BFwiy0VCEmsy2+8s4crgvszzK0u2/J0luWM33fJE8kULxG+Jb6ZJiewdudJtf2WJYqVS -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 -+wOuBu1qqTfJ4wAAAABJRU5ErkJggg==" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAYCAYAAAAVibZIAAANJWlDQ1BJQ0MgcHJvZmlsZQAAeNqt 12k4lO/bB/DznhnGMmYYO2Fk36LshOyJyr6lZN+GmWypVEgKkSUULQgJoUQiUf3IkpAs2YqKLKUQ yTLPC6me33H8/8+b53x13uf94rqv+zg+3+u4AAhKLlQqGQUA/gHBgZbGeiR7B0cStg+YAQ9EkAGs i1sQVdfc3Az+Yy32AgIA0C3nQqWSE0NOLve+X3rVaX5fAaGkesJ/L3ygvYMjACILABxeG/0uAOBw 3eitAYDjaDA1GADxBgAON28XdwAkHABkA60t9QGQQgDAe2301QCAd93omwEAH+rmFQyA9APQEwPc fQIAsDMA9NruHkFuAHhZAHB3D3LzB8AnAYCZvz/FHQA/BACSbtTAYAACBgDk7B0cSRuffCAOQIkX gMH0z+xoGkBlDoDk3j8zkQcAXC4AuQl/ZvOWgAAAwtUR5Km4AwAAEJweAN0IjTYvDoBNAVhLptFW cmm0tZsA6CGABrJbSGDor/+FIO0A/9fzxp5/FRoBQAEgokgB6jg6HBNOd4o+AhvFcIbRgLGR6Rzz eVwsywV8Fas3WzIxmT2F4xJnGlcadwZPIx+FP2tLlsA1wWZSiHDu1psiHWInxAskuqROSRfL9MpF bbsjP7D93I57im+VL6hUqY6qJ2rUaI5rpWo/1pnSTdd7qv/FMNOoyXjO5MaeVtPFvbn7Xu7vNO+0 6LJctS6y6bHtteuz73fEHLjrNHRw+NCI89vD71xxbg/dP3h89Bz3mvD+5DPpx0l+4v854Atllvr1 yLfAuaCF4IWQ76GLR5fCfhxbPv7zxGr46sm101IRPVHIGVQ0+iwmhu4c/XlsLEMcYzzTBeYEXCLL RXwSIZk1hS2VeIk9jSOdM4PrMvcVnkzeLL6r/Ne2XBe4IZgtlEPKFb65NU8kX7RA7JZEocRtySKp Yuni6RLyHdlSuTL5coW72+9tr9hxX6lSuUqlavFBaLXqQ7UajVrNRzvrdj7Werxef7pB58mup7rP 9P7Rb8Q0RjcZPjdqNm4xaTVpY2qLf2HabvZyXwe+42KneZfFK8tuYnfKa6se616bPq6+jH67N/YD joN8g1lDTsNOIwffCr698c559PCY8Fjue9cPbh/dx8XGCyY8P3lNek9JTRVN+874fSZ/kftSOhvw lfKNOrd97t584ELQ9+BF5cWqpdAfYcvHfh5b0VipXT2xFr6utf6YRgNARFB41Fd0G6aYLpU+HOvF YM2oz6TELIGTYOHBcxN4WHnYOIni7JIcapxmXIe4g3gSecv42vgnBdgFVYS8SJeFn4sgolpiR8Tv SsxKSUqTZWrl0Nt05ZMVRndIKcYo9alIq1LVGjW4NcN2vtDm0qHseqonqn/CoMtI0Dhsd53Jsul2 M4+9afu6zPEWxpZhVvnWr22Z7HbZH3G45th0YPag0KH9zscP57o0uk66c3roeNp7nfLO9mnwHfZb 9mcPkKEYUL2PhAcmBeUGV4Y0hw4enQpbPI4+wRZOOil7Svn0rgjTyP1RB84cjvY4S44JPhd4PiI2 Iu5MfOyFlIT4xMyLV5IykpNTrqamXEpPu5xemHHrcumVwszirLKrj649ut5440V2V053bvfN7rzB /A8FE7fGCj/eni36Vjxb8uXOXOls2XT5zN2Je6MVY/cHKruqWh40VD94WFZztTblUUSd/+MD9aYN O59IPyU+XX727p/WxvtNqc8Dm61aVFr5W2ltAy/ut8e9dOwQ6RjvrOg6+cqwG989/Dq7x7dXsXet r70/9c3BAamB+cGaoahh0xGOkZG3t98FjWqOYcZa31/6cOijxMeZ8ZqJyE97Jjknh6fypskzyjPr n1u+pMwe+Cr6deZbxVz4vPECcaH/e/4iZUn9B/rH8+XknwdWRFY+r1atRayb0LhoNAA4g4ShjqM1 0TWYk3Q6dPX0kdizDEYMjYwxTOeY43B7cG0sCfgEQiLrftYOtiRiCnsqRyqnNedrrnTudJ7LvJl8 WfxZW64KOAkMC94QyiblCOdszRG5KZonli9eIHFLslDqtrSP9JRMkWyJ3J1tpfJlCuXb7+64p1ih dF+5SqVKtUotTO2Heo1GjWbtzkdaddqntNd16nc16D7Re6r/zCDaEGPYaNRk/Hx3s0nLnlbTeDOc 2Yu97fte7u8wT7JgteiyfGXVbf3aptc23Y7Lrs++3+GN48CBLCd+p6GDw4feOr87/M4lx1XYdczt vfsHj4+eBV7iGwniO+VXTJYlz/yvFJn/nSLVx9SOLR//eWIlfPXk2qn107RIiEL9ThLseWwsQ2xL 3J545gu4BFwiy0VCEmsy2+8s4crgvszzK0u2/J0luWM33fJE8kULxG+Jb6ZJiewdudJtf2WJYqVS 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 +wOuBu1qqTfJ4wAAAABJRU5ErkJggg==" clip-path="url(#cieClip)" style="filter:url(#cieblur)" width="36.60" @@ -15919,4 +15913,120 @@ HMfpXQMffuRJXok8jsipdCSfv+XLrWvB7u+oLhrHsQRBJO+82ZKP3/Xk1nLQm+++W61W78ft83+d width="1250" height="1250" /> </g> + <g + id="grid_xy"> + <path + sodipodi:nodetypes="cc" + id="path5235" + d="M 305.5,421.5 L 305.5,436.5" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <use + style="stroke-linecap:round" + height="1250" + width="1250" + transform="translate(4,0)" + id="use5238" + xlink:href="#path5235" + y="0" + x="0" /> + <use + style="stroke-linecap:round" + x="0" + y="0" + xlink:href="#path5235" + id="use5244" + transform="translate(8,0)" + width="1250" + height="1250" /> + <use + style="stroke-linecap:round" + height="1250" + width="1250" + transform="translate(12,0)" + id="use5246" + xlink:href="#path5235" + y="0" + x="0" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 319.5,423.5 L 304.5,423.5" + id="path5252" + sodipodi:nodetypes="cc" /> + <use + style="stroke-linecap:round" + height="1250" + width="1250" + transform="translate(0,4)" + id="use5254" + xlink:href="#path5252" + y="0" + x="0" /> + <use + style="stroke-linecap:round" + x="0" + y="0" + xlink:href="#path5252" + id="use5257" + transform="translate(0,8)" + width="1250" + height="1250" /> + <use + style="stroke-linecap:round" + height="1250" + width="1250" + transform="translate(0,12)" + id="use5259" + xlink:href="#path5252" + y="0" + x="0" /> + </g> + <g + id="grid_axonom" + inkscape:label="#grid_axonom"> + <path + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 332.5,421.5 L 332.5,436.5" + id="path4674" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path5266" + d="M 342.5,421.5 L 342.5,436.5" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 337.5,421.5 L 337.5,436.5" + id="path5268" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path4720" + d="M 330.48514,424.47407 L 345.50084,433.14339" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 330.43214,430.34539 L 341.06573,436.4847" + id="path5309" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path5311" + d="M 335.15282,421.45208 L 345.46054,427.40324" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + id="path5313" + d="M 330.43316,426.66919 L 339.44775,421.46461" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 330.46961,432.51822 L 345.47135,423.85696" + id="path5315" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path5317" + d="M 333.63656,436.56474 L 345.53668,429.6942" + style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> </svg> diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 5ffe3dcb8..7bbafcea0 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -35,7 +35,7 @@ #include "desktop-handles.h" #include "desktop.h" #include "sp-namedview.h" - +#include "widgets/icon.h" #include "document-properties.h" #include "display/canvas-grid.h" @@ -49,6 +49,10 @@ namespace Dialog { #define SPACE_SIZE_X 15 #define SPACE_SIZE_Y 10 +#define INKSCAPE_ICON_GRID_XY "grid_xy" +#define INKSCAPE_ICON_GRID_AXONOM "grid_axonom" + + //=================================================== //--------------------------------------------------- @@ -407,7 +411,19 @@ DocumentProperties::update_gridspage() for (GSList const * l = nv->grids; l != NULL; l = l->next) { Inkscape::CanvasGrid * grid = (Inkscape::CanvasGrid*) l->data; if (!grid->repr->attribute("id")) continue; // update_gridspage is called again when "id" is added - _grids_notebook.append_page(grid->getWidget(), grid->repr->attribute("id")); + Glib::ustring name(grid->repr->attribute("id")); + const char *icon = NULL; + switch (grid->getGridType()) { + case GRID_RECTANGULAR: + icon = INKSCAPE_ICON_GRID_XY; + break; + case GRID_AXONOMETRIC: + icon = INKSCAPE_ICON_GRID_AXONOM; + break; + default: + break; + } + _grids_notebook.append_page(grid->getWidget(), _createPageTabLabel(name, icon)); grids_present = true; } _grids_notebook.show_all(); @@ -519,6 +535,22 @@ DocumentProperties::update() _wr.setUpdating (false); } +// TODO: copied from fill-and-stroke.cpp factor out into new ui/widget file? +Gtk::HBox& +DocumentProperties::_createPageTabLabel(const Glib::ustring& label, const char *label_image) +{ + Gtk::HBox *_tab_label_box = manage(new Gtk::HBox(false, 0)); + _tab_label_box->set_spacing(4); + _tab_label_box->pack_start(*Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_DECORATION, + label_image))); + + Gtk::Label *_tab_label = manage(new Gtk::Label(label, true)); + _tab_label_box->pack_start(*_tab_label); + _tab_label_box->show_all(); + + return *_tab_label_box; +} + //-------------------------------------------------------------------- void diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h index b4076fbe7..cee1533c5 100644 --- a/src/ui/dialog/document-properties.h +++ b/src/ui/dialog/document-properties.h @@ -99,6 +99,8 @@ protected: gchar const *_prefs_path; Registry _wr; + Gtk::HBox& _createPageTabLabel(const Glib::ustring& label, const char *label_image); + private: DocumentProperties(); virtual ~DocumentProperties(); |
