Commit cdc608d3 authored by Anna Medonosova's avatar Anna Medonosova
Browse files

Arrange docker: UI polish

Summary:
  * New, more legible layout.
  * The arrange controls work only with the Select Shapes Tool. If another tool is active, the docker displays a message
    instead of the buttons. (Fixes bug 394084.)
  * Also fixes mismatched align icons (bug 399984).

BUG: 399984
BUG: 394084

Reviewers: #krita, rempt

Reviewed By: #krita, rempt

Subscribers: rempt

Tags: #krita

Differential Revision: https://phabricator.kde.org/D16902
parent ef077487
......@@ -15,8 +15,8 @@
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="dark_ox16-action-object-align-horizontal-left-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\ox16-action-object-align-horizontal-left-calligra.png"
sodipodi:docname="dark_ox16-action-object-align-horizontal-right-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\light_ox16-action-object-align-horizontal-right-calligra.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......@@ -94,7 +94,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="15.999999"
inkscape:cx="-0.13475366"
inkscape:cx="10.365247"
inkscape:cy="9.9492328"
inkscape:document-units="px"
inkscape:current-layer="layer3"
......@@ -164,24 +164,29 @@
id="layer3"
inkscape:label="Layer 3"
style="display:inline">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
id="rect4727"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 10,2 0,12 18,0 0,-12 z"
id="rect4727-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="opacity:1;fill:#323232;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
id="rect4763"
width="2"
height="32"
x="30"
y="-5.9999996e-007" />
<g
id="g4152"
transform="matrix(-1,0,0,1,32,0)"
style="fill:#323232">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="rect4727"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4727-0"
d="m 10,2 0,12 18,0 0,-12 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<rect
y="-5.9999996e-007"
x="30"
height="32"
width="2"
id="rect4763"
style="opacity:1;fill:#323232;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" />
</g>
</g>
</svg>
......@@ -15,8 +15,8 @@
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="dark_ox16-action-object-align-horizontal-right-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\light_ox16-action-object-align-horizontal-right-calligra.png"
sodipodi:docname="dark_ox16-action-object-align-horizontal-left-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\ox16-action-object-align-horizontal-left-calligra.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......@@ -94,7 +94,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="15.999999"
inkscape:cx="10.365247"
inkscape:cx="-0.13475366"
inkscape:cy="9.9492328"
inkscape:document-units="px"
inkscape:current-layer="layer3"
......@@ -164,29 +164,24 @@
id="layer3"
inkscape:label="Layer 3"
style="display:inline">
<g
id="g4152"
transform="matrix(-1,0,0,1,32,0)"
style="fill:#323232">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="rect4727"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4727-0"
d="m 10,2 0,12 18,0 0,-12 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<rect
y="-5.9999996e-007"
x="30"
height="32"
width="2"
id="rect4763"
style="opacity:1;fill:#323232;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" />
</g>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
id="rect4727"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#323232;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 10,2 0,12 18,0 0,-12 z"
id="rect4727-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="opacity:1;fill:#323232;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
id="rect4763"
width="2"
height="32"
x="30"
y="-5.9999996e-007" />
</g>
</svg>
......@@ -3,8 +3,6 @@
<file>dark_draw-eraser.svg</file>
<file>dark_geometry.svg</file>
<file alias="dark_object-align-horizontal-center-calligra.svg">dark_ox16-action-object-align-horizontal-center-calligra.svg</file>
<file alias="dark_object-align-horizontal-left-calligra.svg">dark_ox16-action-object-align-horizontal-left-calligra.svg</file>
<file alias="dark_object-align-horizontal-right-calligra.svg">dark_ox16-action-object-align-horizontal-right-calligra.svg</file>
<file alias="dark_object-align-vertical-bottom-calligra.svg">dark_ox16-action-object-align-vertical-bottom-calligra.svg</file>
<file alias="dark_object-align-vertical-center-calligra.svg">dark_ox16-action-object-align-vertical-center-calligra.svg</file>
<file alias="dark_object-align-vertical-top-calligra.svg">dark_ox16-action-object-align-vertical-top-calligra.svg</file>
......@@ -63,5 +61,7 @@
<file>dark_curve-preset-l.svg</file>
<file>dark_curve-preset-j.svg</file>
<file>dark_curve-preset-arch.svg</file>
<file alias="dark_object-align-horizontal-right-calligra.svg">dark_ox16-action-object-align-horizontal-right-calligra.svg</file>
<file alias="dark_object-align-horizontal-left-calligra.svg">dark_ox16-action-object-align-horizontal-left-calligra.svg</file>
</qresource>
</RCC>
......@@ -15,8 +15,8 @@
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="light_ox16-action-object-align-horizontal-left-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\ox16-action-object-align-horizontal-left-calligra.png"
sodipodi:docname="light_ox16-action-object-align-horizontal-right-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\light_ox16-action-object-align-horizontal-right-calligra.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......@@ -94,7 +94,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="15.999999"
inkscape:cx="11.333997"
inkscape:cx="21.833998"
inkscape:cy="9.9492328"
inkscape:document-units="px"
inkscape:current-layer="layer3"
......@@ -164,24 +164,28 @@
id="layer3"
inkscape:label="Layer 3"
style="display:inline">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
id="rect4727"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 10,2 0,12 18,0 0,-12 z"
id="rect4727-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="opacity:1;fill:#cacaca;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
id="rect4763"
width="2"
height="32"
x="30"
y="-5.9999996e-007" />
<g
id="g4152"
transform="matrix(-1,0,0,1,32,0)">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="rect4727"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4727-0"
d="m 10,2 0,12 18,0 0,-12 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<rect
y="-5.9999996e-007"
x="30"
height="32"
width="2"
id="rect4763"
style="opacity:1;fill:#cacaca;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" />
</g>
</g>
</svg>
......@@ -15,8 +15,8 @@
id="svg2"
version="1.1"
inkscape:version="0.92.1 r15371"
sodipodi:docname="light_ox16-action-object-align-horizontal-right-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\light_ox16-action-object-align-horizontal-right-calligra.png"
sodipodi:docname="light_ox16-action-object-align-horizontal-left-calligra.svg"
inkscape:export-filename="C:\dribbble\krita icons\Collaborate\1_flat\other\ox16-action-object-align-horizontal-left-calligra.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
......@@ -94,7 +94,7 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="15.999999"
inkscape:cx="21.833998"
inkscape:cx="11.333997"
inkscape:cy="9.9492328"
inkscape:document-units="px"
inkscape:current-layer="layer3"
......@@ -164,28 +164,24 @@
id="layer3"
inkscape:label="Layer 3"
style="display:inline">
<g
id="g4152"
transform="matrix(-1,0,0,1,32,0)">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="rect4727"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4727-0"
d="m 10,2 0,12 18,0 0,-12 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<rect
y="-5.9999996e-007"
x="30"
height="32"
width="2"
id="rect4763"
style="opacity:1;fill:#cacaca;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" />
</g>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 2,18 0,12 26,0 0,-12 z m 2,2 22,0 0,8 -22,0 z"
id="rect4727"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccc" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 10,2 0,12 18,0 0,-12 z"
id="rect4727-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="opacity:1;fill:#cacaca;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
id="rect4763"
width="2"
height="32"
x="30"
y="-5.9999996e-007" />
</g>
</svg>
......@@ -3,8 +3,6 @@
<file>light_draw-eraser.svg</file>
<file>light_geometry.svg</file>
<file alias="light_object-align-horizontal-center-calligra.svg">light_ox16-action-object-align-horizontal-center-calligra.svg</file>
<file alias="light_object-align-horizontal-left-calligra.svg">light_ox16-action-object-align-horizontal-left-calligra.svg</file>
<file alias="light_object-align-horizontal-right-calligra.svg">light_ox16-action-object-align-horizontal-right-calligra.svg</file>
<file alias="light_object-align-vertical-bottom-calligra.svg">light_ox16-action-object-align-vertical-bottom-calligra.svg</file>
<file alias="light_object-align-vertical-center-calligra.svg">light_ox16-action-object-align-vertical-center-calligra.svg</file>
<file alias="light_object-align-vertical-top-calligra.svg">light_ox16-action-object-align-vertical-top-calligra.svg</file>
......@@ -63,5 +61,7 @@
<file>light_curve-preset-l.svg</file>
<file>light_curve-preset-j.svg</file>
<file>light_curve-preset-arch.svg</file>
<file alias="light_object-align-horizontal-left-calligra.svg">light_ox16-action-object-align-horizontal-left-calligra.svg</file>
<file alias="light_object-align-horizontal-right-calligra.svg">light_ox16-action-object-align-horizontal-right-calligra.svg</file>
</qresource>
</RCC>
......@@ -88,4 +88,15 @@ void ArrangeDockerWidget::setActionCollection(KActionCollection *collection)
setEnabled(enabled);
}
void ArrangeDockerWidget::switchState(bool enabled)
{
if (enabled) {
ui->buttons->show();
ui->disabledLabel->hide();
} else {
ui->buttons->hide();
ui->disabledLabel->show();
}
}
......@@ -37,6 +37,7 @@ public:
~ArrangeDockerWidget() override;
void setActionCollection(KActionCollection *collection);
void switchState(bool enabled);
private:
Ui::ArrangeDockerWidget *ui;
......
......@@ -31,6 +31,7 @@ ArrangeDockerDock::ArrangeDockerDock( )
, m_canvas(0)
{
m_configWidget = new ArrangeDockerWidget(this);
m_configWidget->switchState(false);
setWidget(m_configWidget);
setEnabled(m_canvas);
}
......@@ -58,7 +59,7 @@ void ArrangeDockerDock::setCanvas(KoCanvasBase * canvas)
m_canvas->toolProxy(),
SIGNAL(toolChanged(QString)),
this,
SLOT(slotToolChanged()));
SLOT(slotToolChanged(QString)));
m_canvasConnections.addConnection(
m_canvas->shapeManager(),
......@@ -80,3 +81,10 @@ void ArrangeDockerDock::slotToolChanged()
KActionCollection *collection = m_canvas->viewManager()->actionCollection();
m_configWidget->setActionCollection(collection);
}
void ArrangeDockerDock::slotToolChanged(QString toolId)
{
bool enableWidget = (toolId == "InteractionTool") ? true : false;
m_configWidget->switchState(enableWidget);
slotToolChanged();
}
......@@ -37,6 +37,7 @@ public:
private Q_SLOTS:
void slotToolChanged();
void slotToolChanged(QString toolId);
private:
ArrangeDockerWidget *m_configWidget;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment