diff options
Diffstat (limited to 'src')
22 files changed, 356 insertions, 4 deletions
diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked.png b/src/libs/qmleditorwidgets/images/checkbox_checked.png Binary files differindex 91d7cd07de..519914fc19 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_checked.png +++ b/src/libs/qmleditorwidgets/images/checkbox_checked.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png Binary files differnew file mode 100644 index 0000000000..0e91c4e3c8 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_checked_hover.png Binary files differdeleted file mode 100644 index 91d7cd07de..0000000000 --- a/src/libs/qmleditorwidgets/images/checkbox_checked_hover.png +++ /dev/null diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png Binary files differindex 183f80bbc1..ace0d06520 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png +++ b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png Binary files differnew file mode 100644 index 0000000000..ce4111e2bf --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png Binary files differindex 5b5b1f4d3a..c5b7cba837 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png Binary files differnew file mode 100644 index 0000000000..e4cef9dfa3 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_hover.png Binary files differdeleted file mode 100644 index 5b5b1f4d3a..0000000000 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_hover.png +++ /dev/null diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png Binary files differindex 5b5b1f4d3a..818a51da84 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png Binary files differnew file mode 100644 index 0000000000..aecb290520 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png Binary files differindex 6db7cb76a6..b62b894fc2 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png Binary files differnew file mode 100644 index 0000000000..e45da33a2a --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_hover.png Binary files differdeleted file mode 100644 index 6db7cb76a6..0000000000 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_hover.png +++ /dev/null diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png Binary files differindex 6db7cb76a6..1710037c9c 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png Binary files differnew file mode 100644 index 0000000000..6d5cc5bd41 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked.png Binary files differindex c9b6bcbe35..dd9cffac46 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_unchecked.png +++ b/src/libs/qmleditorwidgets/images/checkbox_unchecked.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png Binary files differnew file mode 100644 index 0000000000..f135be2287 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_hover.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_hover.png Binary files differdeleted file mode 100644 index c9b6bcbe35..0000000000 --- a/src/libs/qmleditorwidgets/images/checkbox_unchecked_hover.png +++ /dev/null diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png Binary files differindex a65132bb16..2358860d58 100644 --- a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png +++ b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png Binary files differnew file mode 100644 index 0000000000..a2c2661fe0 --- /dev/null +++ b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 2a03bc7cd5..61c2fe4565 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -1,17 +1,21 @@ <RCC> <qresource prefix="/qmldesigner"> <file>images/checkbox_checked.png</file> - <file>images/checkbox_checked_hover.png</file> + <file>images/checkbox_checked@2x.png</file> <file>images/checkbox_checked_pressed.png</file> + <file>images/checkbox_checked_pressed@2x.png</file> <file>images/checkbox_unchecked.png</file> - <file>images/checkbox_unchecked_hover.png</file> + <file>images/checkbox_unchecked@2x.png</file> <file>images/checkbox_unchecked_pressed.png</file> + <file>images/checkbox_unchecked_pressed@2x.png</file> <file>images/checkbox_tr_checked.png</file> - <file>images/checkbox_tr_checked_hover.png</file> + <file>images/checkbox_tr_checked@2x.png</file> <file>images/checkbox_tr_checked_pressed.png</file> + <file>images/checkbox_tr_checked_pressed@2x.png</file> <file>images/checkbox_tr_unchecked.png</file> - <file>images/checkbox_tr_unchecked_hover.png</file> + <file>images/checkbox_tr_unchecked@2x.png</file> <file>images/checkbox_tr_unchecked_pressed.png</file> + <file>images/checkbox_tr_unchecked_pressed@2x.png</file> <file>images/eye_open.png</file> <file>images/lock.png</file> <file>images/hole.png</file> diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 642e059102..09d3a2b4e3 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -20,6 +20,41 @@ id="defs4"> <linearGradient inkscape:collect="always" + id="linearGradient6897"> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0" + id="stop6899" /> + <stop + style="stop-color:#3f3f3f;stop-opacity:1" + offset="1" + id="stop6901" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient6874"> + <stop + style="stop-color:#5d5d5d;stop-opacity:1" + offset="0" + id="stop6876" /> + <stop + style="stop-color:#4a4a4a;stop-opacity:1" + offset="1" + id="stop6878" /> + </linearGradient> + <linearGradient + id="linearGradient4217-1"> + <stop + id="stop6870" + offset="0" + style="stop-color:#4a4a4a;stop-opacity:1" /> + <stop + id="stop6872" + offset="1" + style="stop-color:#383838;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" id="linearGradient4806"> <stop style="stop-color:#646464;stop-opacity:1" @@ -555,6 +590,33 @@ x="141" y="408" /> </clipPath> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4217-1" + id="linearGradient6858" + x1="547.5" + y1="585.5" + x2="547.5" + y2="595.5" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6874" + id="linearGradient6880" + x1="546.5" + y1="585.5" + x2="546.5" + y2="595.5" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6897" + id="linearGradient6903" + x1="558.5" + y1="584.5" + x2="558.5" + y2="596.5" + gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview id="base" @@ -1404,6 +1466,292 @@ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc" /> </g> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" + id="rect6617" + width="232" + height="16" + x="484" + y="584" /> + <g + id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow"> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path6627" + d="m 485,585 8,0 -4,4 -4,-4" + style="fill:#dbdbdb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <use + x="0" + y="0" + xlink:href="#share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow" + id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow" + transform="matrix(1,0,0,-1,8,1174)" + width="100%" + height="100%" /> + <g + id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder"> + <circle + r="2" + cy="591.5" + cx="507.5" + id="path6659" + style="opacity:1;fill:none;fill-opacity:1;stroke:#dbdbdb;stroke-opacity:1" /> + <rect + y="584" + x="501" + height="14" + width="14" + id="rect6661" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-opacity:1" /> + </g> + <g + id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu"> + <path + style="fill:#dbdbdb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 521.5,587 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,2.48528 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m -4,3 8,0 -4,4 z" + id="path6673" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssssscccc" /> + <rect + y="584" + x="515" + height="14" + width="14" + id="rect6685" + style="opacity:0.647;fill:none;fill-opacity:1;stroke:none;stroke-opacity:1" /> + </g> + <g + id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression"> + <g + transform="matrix(0.98173989,-0.19022827,0.19022827,0.98173989,-103.24469,112.42841)" + id="g6727"> + <circle + style="opacity:1;fill:none;fill-opacity:1;stroke:#dbdbdb;stroke-opacity:1" + id="path6713" + cx="534" + cy="594" + r="2.5" /> + <rect + style="opacity:1;fill:#dbdbdb;fill-opacity:1;stroke:none;stroke-opacity:1" + id="rect6715" + width="1" + height="1.5" + x="533.5" + y="590" + inkscape:transform-center-y="-3.25" /> + <use + x="0" + y="0" + xlink:href="#rect6715" + inkscape:transform-center-y="-1.6249936" + id="use6717" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" + width="100%" + height="100%" + inkscape:transform-center-x="2.814585" /> + <use + x="0" + y="0" + xlink:href="#use6717" + inkscape:transform-center-x="2.8145807" + inkscape:transform-center-y="1.6250117" + id="use6719" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use6719" + inkscape:transform-center-y="3.2500106" + id="use6721" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#use6721" + inkscape:transform-center-y="1.6250042" + id="use6723" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" + width="100%" + height="100%" + inkscape:transform-center-x="-2.8145849" /> + <use + x="0" + y="0" + xlink:href="#use6723" + inkscape:transform-center-x="-2.8145806" + inkscape:transform-center-y="-1.625001" + id="use6725" + transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" + width="100%" + height="100%" /> + </g> + <use + height="100%" + width="100%" + transform="matrix(0.99010264,-0.14034516,0.14034516,0.99010264,-74.079837,74.823351)" + id="use6736" + xlink:href="#g6727" + y="0" + x="0" /> + <rect + y="584" + x="529" + height="14" + width="14" + id="rect6738" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-opacity:1" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_unchecked"> + <image + width="13" + height="13" + preserveAspectRatio="none" + style="image-rendering:optimizeSpeed" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ bWFnZVJlYWR5ccllPAAAAFxJREFUeNpikZKSYiACsACxs7MzfkV79+4Fqfv///+7d+9wKRISEoKa B1T3798/XOqAslB1/8AAlzqIFEjdXzDApQ4iRYp5xLqP2vaSoA4SmATUXbhwgWD8AgQYACE8WYRh 3ceiAAAAAElFTkSuQmCC " + id="image6826" + x="543" + y="584" /> + <rect + y="584" + x="543" + height="13" + width="13" + id="rect6840" + style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-opacity:1" /> + <rect + y="585.5" + x="544.5" + height="10" + width="10" + id="rect6842" + style="opacity:1;fill:url(#linearGradient6858);fill-opacity:1;stroke:url(#linearGradient6880);stroke-opacity:1" /> + </g> + <rect + style="display:inline;opacity:1;fill:url(#linearGradient6903);fill-opacity:1;stroke:#1a1a1a;stroke-opacity:1" + id="src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed" + width="12" + height="12" + x="556.5" + y="584.5" /> + <g + id="src/libs/qmleditorwidgets/images/checkbox_checked"> + <use + height="100%" + width="100%" + transform="translate(26,0)" + id="use6912" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked" + y="0" + x="0" /> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="qmlpropertyeditor_checkbox_indicator" + d="m 571.87109,590.50735 1.5,-1.5 c 0.62624,0.82304 1.36869,1.69471 2.11049,3.5 0.88951,-2.5 2.40793,-5.00735 7.51842,-8.50735 -4,4.5 -5.5625,7.125 -6.0625,10.625 l -2.28125,1.84375 c -0.44837,-1.5873 -1.91768,-4.96759 -2.78516,-5.96142" + style="fill:#dbdbdb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_checked_pressed"> + <use + height="100%" + width="100%" + transform="translate(27,0)" + id="use6918" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="translate(14,0)" + id="use6916" + xlink:href="#qmlpropertyeditor_checkbox_indicator" + y="0" + x="0" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_tr_unchecked"> + <use + height="100%" + width="100%" + transform="translate(54,0)" + id="use4835" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked" + y="0" + x="0" /> + <use + style="opacity:0.25" + height="100%" + width="100%" + transform="translate(-26,0)" + id="use4839" + xlink:href="#qmlpropertyeditor_checkbox_tr_indicator" + y="0" + x="0" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed"> + <use + height="100%" + width="100%" + transform="translate(54,0)" + id="use4837" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed" + y="0" + x="0" /> + <use + style="opacity:0.25" + height="100%" + width="100%" + transform="translate(-13,0)" + id="use4841" + xlink:href="#qmlpropertyeditor_checkbox_tr_indicator" + y="0" + x="0" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_tr_checked"> + <use + height="100%" + width="100%" + transform="translate(80,0)" + id="use4826" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked" + y="0" + x="0" /> + <path + sodipodi:nodetypes="cccscsscccccccccsccccccccccccccsccccscccc" + inkscape:connector-curvature="0" + d="m 634.7863,588.98601 -0.3052,1.56048 -0.55626,0 c 0.01,-0.0689 0.0148,-0.13292 0.0148,-0.19199 0,-0.18378 -0.0394,-0.32653 -0.11814,-0.42827 -0.10502,-0.13784 -0.28223,-0.20675 -0.53165,-0.20675 -0.38068,0 -0.71378,0.16737 -0.9993,0.50211 -0.2855,0.33474 -0.44149,0.57814 -0.55636,1.17214 L 631.61506,594 l -1.74261,0 0.3926,-4.01028 -0.79747,0 0.17951,-0.98972 2.54009,0 -0.17722,0.97546 c 0.23957,-0.36428 0.51688,-0.63338 0.83193,-0.80731 0.31505,-0.17722 0.67604,-0.26583 1.08298,-0.26583 0.10174,0 0.22316,0.008 0.36428,0.0246 0.1444,0.0131 0.31012,0.0328 0.49718,0.0591 z m -10.16263,1.00371 0.17951,-0.98972 0.86858,0 0.27086,-2 1.74261,0 -0.27085,2 1.34169,0 -0.17952,0.98972 -1.34169,0 c -0.0466,1.08737 -0.26951,2.07452 -0.31112,3.151 0,0.0886 0.008,0.1526 0.0246,0.19198 0.0525,0.11158 0.17396,0.16737 0.36427,0.16737 0.21003,0 0.37905,-0.0706 0.50704,-0.21167 0.12799,-0.14112 0.2248,-0.35936 0.29043,-0.65472 l 0.73348,0 c -0.13127,0.52509 -0.34623,0.89429 -0.64487,1.1076 -0.29864,0.21003 -0.76301,0.31505 -1.39311,0.31505 -0.71871,0 -1.18472,-0.11322 -1.39803,-0.33966 -0.13783,-0.1444 -0.20675,-0.36756 -0.20675,-0.66948 l 0.3299,-3.03691 z" + style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:serif;-inkscape-font-specification:'serif Bold Italic';fill:#dbdbdb;fill-opacity:1" + id="qmlpropertyeditor_checkbox_tr_indicator" /> + </g> + <g + id="src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed"> + <use + height="100%" + width="100%" + transform="translate(80,0)" + id="use4828" + xlink:href="#src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed" + y="0" + x="0" /> + <use + height="100%" + width="100%" + transform="translate(13.00033,0)" + id="use4831" + xlink:href="#qmlpropertyeditor_checkbox_tr_indicator" + y="0" + x="0" /> + </g> </g> <g inkscape:groupmode="layer" |
