Commit 220e3a3f authored by Scott Petrovic's avatar Scott Petrovic

move init values for sliders. update perspective icon. precision for flexibility option

parent a0a121b6
......@@ -33,17 +33,17 @@
id="namedview17"
showgrid="false"
inkscape:zoom="10.429825"
inkscape:cx="17.159841"
inkscape:cy="8.4308705"
inkscape:window-x="1877"
inkscape:window-y="73"
inkscape:cx="30.870522"
inkscape:cy="6.2256561"
inkscape:window-x="1797"
inkscape:window-y="129"
inkscape:window-maximized="0"
inkscape:current-layer="svg2"
showguides="true"
inkscape:guide-bbox="true">
<sodipodi:guide
orientation="1,0"
position="8.4373419,12.176618"
position="8.6290997,6.5197642"
id="guide3803" />
</sodipodi:namedview>
<defs
......@@ -83,6 +83,41 @@
id="linearGradient4330"
xlink:href="#linearGradient3780"
inkscape:collect="always" />
<linearGradient
gradientTransform="matrix(-1.3317383,0.00815264,-0.00910434,-1.1925288,17.767959,17.846735)"
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientUnits="userSpaceOnUse"
id="linearGradient3826-6"
xlink:href="#linearGradient3780-9"
inkscape:collect="always" />
<linearGradient
id="linearGradient3780-9">
<stop
style="stop-color:#424242;stop-opacity:1;"
offset="0"
id="stop3782-5" />
<stop
style="stop-color:#171717;stop-opacity:0;"
offset="1"
id="stop3784-2" />
</linearGradient>
<inkscape:path-effect
effect="spiro"
id="path-effect3923-8"
is_visible="true" />
<linearGradient
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientTransform="matrix(-0.9445321,0.00839088,-0.00645723,-1.2273772,12.7912,17.908191)"
gradientUnits="userSpaceOnUse"
id="linearGradient3149"
xlink:href="#linearGradient3780-9"
inkscape:collect="always" />
</defs>
<metadata
id="metadata7">
......@@ -92,7 +127,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -112,25 +147,21 @@
transform="translate(0,-1036.3622)"
id="layer2" />
<path
style="fill:none;stroke:url(#linearGradient4330);stroke-width:2.14807129;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 15.076904,7.9676956 8.4373419,13.076499 1.4118374,7.4749662 8.4373419,2.7687143 15.076904,7.9676956"
id="path3921"
inkscape:path-effect="#path-effect3923"
inkscape:original-d="M 15.076904,7.9676956 8.4373419,13.076499 1.4118374,7.4749662 8.4373419,2.7687143 C 14.183476,-2.5835218 11.138655,0.83400002 15.076904,7.9676956 z"
style="fill:none;stroke:url(#linearGradient3149);stroke-width:2.25788999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 8.6290997,5.4644902 0,5.2621708 L 1.252608,14.666056 1.0668532,1.1125947 8.6290997,5.4644902"
id="path3921-2"
inkscape:path-effect="#path-effect3923-8"
inkscape:original-d="m 8.6290997,5.4644902 0,5.2621708 L 1.252608,14.666056 1.0668532,1.1125947 C 0.98284571,2.516525 8.4905078,6.5858958 8.6290997,5.4644902 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#252525;fill-opacity:0;stroke:none"
id="rect3805-8-0"
width="11.313708"
height="1.5340619"
x="2.6366694"
y="0.036165446" />
<rect
style="fill:#000000;fill-opacity:0;stroke:none"
id="rect3805-8-0-2"
width="11.313708"
height="1.4381831"
x="2.9722462"
y="14.609756" />
<path
sodipodi:type="arc"
style="fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3170"
sodipodi:cx="-4.4583683"
sodipodi:cy="-6.0042043"
sodipodi:rx="1.6778805"
sodipodi:ry="1.8696383"
d="m -2.7804878,-6.0042043 a 1.6778805,1.8696383 0 1 1 -3.355761,0 1.6778805,1.8696383 0 1 1 3.355761,0 z"
transform="matrix(0.74285715,0,0,0.64102565,18.077279,12.130599)" />
</svg>
......@@ -16,7 +16,7 @@
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="light_transform_icons_perspective.svg"
inkscape:export-filename="/home/wolthera/Pictures/transform_icons_perspective_light.png"
inkscape:export-filename="/home/scott/kde4/src/calligra/krita/pics/tool_transform/light_transform_icons_perspective.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<sodipodi:namedview
......@@ -35,8 +35,8 @@
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="6.1550966"
inkscape:window-x="1758"
inkscape:window-y="81"
inkscape:window-x="1561"
inkscape:window-y="235"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
......@@ -146,6 +146,116 @@
id="linearGradient6645"
xlink:href="#linearGradient3780-0"
inkscape:collect="always" />
<linearGradient
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientTransform="matrix(-0.9445321,0.00839088,-0.00645723,-1.2273772,12.7912,17.908191)"
gradientUnits="userSpaceOnUse"
id="linearGradient3149"
xlink:href="#linearGradient3780-9"
inkscape:collect="always" />
<linearGradient
id="linearGradient3780-9">
<stop
style="stop-color:#424242;stop-opacity:1;"
offset="0"
id="stop3782-5" />
<stop
style="stop-color:#171717;stop-opacity:0;"
offset="1"
id="stop3784-2" />
</linearGradient>
<inkscape:path-effect
effect="spiro"
id="path-effect3923-8-2"
is_visible="true" />
<linearGradient
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientTransform="matrix(-0.9445321,0.00839088,-0.00645723,-1.2273772,12.951952,18.222255)"
gradientUnits="userSpaceOnUse"
id="linearGradient3957"
xlink:href="#linearGradient3780-9"
inkscape:collect="always" />
<linearGradient
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientTransform="matrix(-0.9445321,0.00839088,-0.00645723,-1.2273772,-10.098896,17.679882)"
gradientUnits="userSpaceOnUse"
id="linearGradient3957-6"
xlink:href="#linearGradient3780-9-7"
inkscape:collect="always" />
<linearGradient
id="linearGradient3780-9-7">
<stop
style="stop-color:#424242;stop-opacity:1;"
offset="0"
id="stop3782-5-9" />
<stop
style="stop-color:#171717;stop-opacity:0;"
offset="1"
id="stop3784-2-7" />
</linearGradient>
<inkscape:path-effect
effect="spiro"
id="path-effect3923-8-2-2"
is_visible="true" />
<linearGradient
y2="29.194195"
x2="6.315412"
y1="4.0600982"
x1="6.4204822"
gradientTransform="matrix(-0.9445321,0.00839088,-0.00645723,-1.2273772,12.756783,18.018866)"
gradientUnits="userSpaceOnUse"
id="linearGradient4597"
xlink:href="#linearGradient3780-0"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3780-0"
id="linearGradient4694"
x1="4.5169492"
y1="8.2372885"
x2="8.5677977"
y2="7.3559327"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.76290677,0,0,1.0161735,1.1297249,-0.13322601)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3780-0-7"
id="linearGradient4694-0"
x1="4.5169492"
y1="8.2372885"
x2="8.5677977"
y2="7.3559327"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient3780-0-7">
<stop
style="stop-color:#bfbfbf;stop-opacity:1;"
offset="0"
id="stop3782-1-8" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3784-1-5" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.01968709,-0.41878008,0.82610172,0.00998008,-1.9890195,9.9312893)"
y2="7.3559327"
x2="8.5677977"
y1="8.2372885"
x1="4.5169492"
gradientUnits="userSpaceOnUse"
id="linearGradient4711"
xlink:href="#linearGradient3780-0-7"
inkscape:collect="always" />
</defs>
<metadata
id="metadata7">
......@@ -155,7 +265,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -175,33 +285,39 @@
transform="translate(0,-1036.3622)"
id="layer2" />
<path
style="fill:none;stroke:url(#linearGradient6059);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 14.90033,7.99344 8.2607679,13.102243 1.2352634,7.50071 8.2607679,2.794458 14.90033,7.99344"
id="path3921"
inkscape:path-effect="#path-effect3923"
inkscape:original-d="M 14.90033,7.99344 8.2607679,13.102243 1.2352634,7.50071 8.2607679,2.794458 C 14.006902,-2.5577777 10.962081,0.859744 14.90033,7.99344 z"
style="fill:none;stroke:url(#linearGradient3957);stroke-width:2.2579999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 8.7898515,5.7785548 0,5.2621702 -7.376492,3.939395 -0.185755,-13.5534607 7.562247,4.3518955"
id="path3921-2"
inkscape:path-effect="#path-effect3923-8-2"
inkscape:original-d="m 8.7898515,5.7785548 0,5.2621702 -7.376492,3.939395 -0.185755,-13.5534607 c -0.08401,1.4039303 7.423655,5.4733011 7.562247,4.3518955 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#252525;fill-opacity:0;stroke:none"
id="rect3805-8-0"
width="11.313708"
height="1.5340619"
x="2.4600954"
y="0.061909676" />
<rect
style="fill:#000000;fill-opacity:0;stroke:none"
id="rect3805-8-0-2"
width="11.313708"
height="1.4381831"
x="2.7956724"
y="14.6355" />
<path
style="fill:none;stroke:url(#linearGradient6645);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 14.69694,7.7061062 8.057378,12.814909 1.0318731,7.2133762 8.057378,2.5071244 14.69694,7.7061062"
id="path3921-47"
inkscape:path-effect="#path-effect3923-8"
inkscape:original-d="M 14.69694,7.7061062 8.057378,12.814909 1.0318731,7.2133762 8.057378,2.5071244 c 5.746134,-5.3522357 2.701313,-1.93471398 6.639562,5.1989818 z"
sodipodi:type="arc"
style="fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3170"
sodipodi:cx="-4.4583683"
sodipodi:cy="-6.0042043"
sodipodi:rx="1.6778805"
sodipodi:ry="1.8696383"
d="m -2.7804878,-6.0042043 a 1.6778805,1.8696383 0 1 1 -3.355761,0 1.6778805,1.8696383 0 1 1 3.355761,0 z"
transform="matrix(0.74285715,0,0,0.64102565,18.238032,12.444663)" />
<path
style="fill:none;stroke:url(#linearGradient4597);stroke-width:2.2579999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 8.5946825,5.575165 0,5.262171 -7.376492,3.939395 -0.185755,-13.5534615 7.562247,4.3518955"
id="path3921-2-4"
inkscape:path-effect="#path-effect3923-8-2-2"
inkscape:original-d="m 8.5946825,5.575165 0,5.262171 -7.376492,3.939395 -0.185755,-13.5534615 c -0.08401,1.4039303 7.423655,5.4733011 7.562247,4.3518955 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
sodipodi:type="arc"
style="fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path3170-0"
sodipodi:cx="-4.4583683"
sodipodi:cy="-6.0042043"
sodipodi:rx="1.6778805"
sodipodi:ry="1.8696383"
d="m -2.7804878,-6.0042043 a 1.6778805,1.8696383 0 1 1 -3.355761,0 1.6778805,1.8696383 0 1 1 3.355761,0 z"
transform="matrix(0.74285715,0,0,0.64102565,18.091592,12.187832)" />
</svg>
......@@ -91,6 +91,46 @@ KisToolTransformConfigWidget::KisToolTransformConfigWidget(TransformTransactionP
nothingSelected->hide(); // a convenient button for when no button is checked in the group
m_rotationCenterButtons->addButton(nothingSelected, 9);
// initialize values for free transform sliders
shearXBox->setSuffix(" px");
shearYBox->setSuffix(" px");
shearXBox->setRange(-5.0, 5.0, 2);
shearYBox->setRange(-5.0, 5.0, 2);
shearXBox->setSingleStep(0.01);
shearYBox->setSingleStep(0.01);
shearXBox->setValue(0.0);
shearYBox->setValue(0.0);
translateXBox->setSuffix(" px");
translateYBox->setSuffix(" px");
translateXBox->setRange(-3000, 3000.0);
translateYBox->setRange(-3000, 3000.0);
scaleXBox->setSuffix("%");
scaleYBox->setSuffix("%");
scaleXBox->setRange(0.0, 2000.0);
scaleYBox->setRange(0.0, 2000.0);
scaleXBox->setExponentRatio(3.0);
scaleYBox->setExponentRatio(3.0);
scaleXBox->setValue(100.0);
scaleYBox->setValue(100.0);
aXBox->setSuffix(QChar(Qt::Key_degree));
aYBox->setSuffix(QChar(Qt::Key_degree));
aZBox->setSuffix(QChar(Qt::Key_degree));
aXBox->setRange(0.0, 360.0, 0);
aYBox->setRange(0.0, 360.0, 0);
aZBox->setRange(0.0, 360.0, 0);
aXBox->setValue(0.0);
aYBox->setValue(0.0);
aZBox->setValue(0.0);
connect(m_rotationCenterButtons, SIGNAL(buttonPressed(int)), this, SLOT(slotRotationCenterChanged(int)));
// Init Free Transform Values
......@@ -120,8 +160,8 @@ KisToolTransformConfigWidget::KisToolTransformConfigWidget(TransformTransactionP
// Init Warp Transform Values
alphaBox->setMaximum(5.0);
alphaBox->setSingleStep(0.1);
alphaBox->setRange(0, 10, 1);
connect(alphaBox, SIGNAL(valueChanged(qreal)), this, SLOT(slotSetWarpAlpha(qreal)));
connect(densityBox, SIGNAL(valueChanged(int)), this, SLOT(slotSetWarpDensity(int)));
......@@ -204,42 +244,6 @@ KisToolTransformConfigWidget::KisToolTransformConfigWidget(TransformTransactionP
connect(densityBox, SIGNAL(editingFinished()), this, SLOT(notifyEditingFinished()));
shearXBox->setSuffix(" px");
shearYBox->setSuffix(" px");
shearXBox->setRange(-5.0, 5.0, 2);
shearYBox->setRange(-5.0, 5.0, 2);
shearXBox->setSingleStep(0.01);
shearYBox->setSingleStep(0.01);
shearXBox->setValue(0.0);
shearYBox->setValue(0.0);
translateXBox->setSuffix(" px");
translateYBox->setSuffix(" px");
translateXBox->setRange(-3000, 3000.0);
translateYBox->setRange(-3000, 3000.0);
scaleXBox->setSuffix("%");
scaleYBox->setSuffix("%");
scaleXBox->setRange(0.0, 2000.0);
scaleYBox->setRange(0.0, 2000.0);
scaleXBox->setExponentRatio(3.0);
scaleYBox->setExponentRatio(3.0);
scaleXBox->setValue(100.0);
scaleYBox->setValue(100.0);
aXBox->setSuffix(QChar(Qt::Key_degree));
aYBox->setSuffix(QChar(Qt::Key_degree));
aZBox->setSuffix(QChar(Qt::Key_degree));
aXBox->setRange(0.0, 360.0, 0);
aYBox->setRange(0.0, 360.0, 0);
aZBox->setRange(0.0, 360.0, 0);
aXBox->setValue(0.0);
aYBox->setValue(0.0);
aZBox->setValue(0.0);
// Connect other widget (not having editingFinished signal) to
// the same slot. From Qt 4.6 onwards the sequence of the signal
......
......@@ -250,7 +250,7 @@
<enum>QFrame::Raised</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="freeTransformWidget">
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -533,7 +533,7 @@
<item>
<widget class="QRadioButton" name="freeRotationRadioButton">
<property name="text">
<string>Rotation</string>
<string>Rotate</string>
</property>
<attribute name="buttonGroup">
<string notr="true">freeTransformRadioGroup</string>
......@@ -616,7 +616,7 @@
<property name="minimumSize">
<size>
<width>240</width>
<height>135</height>
<height>100</height>
</size>
</property>
<property name="title">
......@@ -1093,7 +1093,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Horizontal Shear</string>
</property>
......@@ -1118,7 +1117,7 @@
</property>
<property name="toolTip">
<string>Vertical Shear</string>
</property>
</property>
</widget>
</item>
<item row="1" column="0">
......@@ -1194,7 +1193,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_4">
<property name="horizontalSpacing">
<number>12</number>
<number>10</number>
</property>
<property name="verticalSpacing">
<number>0</number>
......@@ -1202,7 +1201,7 @@
<item row="1" column="1">
<widget class="KisDoubleSliderSpinBox" name="alphaBox" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -1210,7 +1209,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="flexibilityLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -1237,7 +1236,7 @@
<item row="1" column="0">
<widget class="QComboBox" name="cmbWarpType">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -1988,8 +1987,8 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="cageTransformButtonGroup"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="freeTransformRadioGroup"/>
<buttongroup name="cageTransformButtonGroup"/>
</buttongroups>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment