update UI DSL test (new gear icons)

This commit is contained in:
Vladimir Krivosheev
2018-08-15 20:08:38 +02:00
parent 30f805c4bc
commit 6fb6c6ffe4
5 changed files with 25 additions and 24 deletions
@@ -26,16 +26,16 @@
<path d="M0 0 L0 15 L108 15 L108 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="7">
<path d="M0 0 L0 16 L21 16 L21 0 Z"/>
<path d="M0 0 L0 16 L16 16 L16 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="8">
<path d="M0 0 L0 30 L324 30 L324 0 Z"/>
<path d="M0 0 L0 30 L329 30 L329 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="9">
<path d="M-1 -1 L-1 29 L323 29 L323 -1 Z"/>
<path d="M-1 -1 L-1 29 L328 29 L328 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="10">
<path d="M319 3 L319 25 L3 25 L3 3 ZM0 0 L0 28 L322 28 L322 0 Z"/>
<path d="M324 3 L324 25 L3 25 L3 3 ZM0 0 L0 28 L327 28 L327 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="11">
<path d="M0 0 L0 15 L61 15 L61 0 Z"/>
@@ -62,17 +62,17 @@
<g fill="rgb(187,187,187)" font-weight="bold" font-family="sans-serif" transform="translate(23,63)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="12" clip-path="url(#6)" stroke="none">Master Password:</text>
</g>
<g fill="rgb(187,187,187)" font-weight="bold" font-family="sans-serif" transform="translate(459,29)" stroke="rgb(187,187,187)">
<image x="0" y="0" clip-path="url(#7)" width="21" xlink:href="../../../../../../icons/src/general/gear.png" height="16" preserveAspectRatio="none"/>
<g fill="rgb(187,187,187)" font-weight="bold" font-family="sans-serif" transform="translate(464,29)" stroke="rgb(187,187,187)">
<image x="0" y="0" clip-path="url(#7)" width="16" xlink:href="../../../../../../icons/src/general/gearPlain.svg" height="16" preserveAspectRatio="none"/>
</g>
<g fill="rgb(60,63,65)" font-family="sans-serif" transform="translate(134,22)" stroke="rgb(60,63,65)">
<rect x="0" width="324" height="30" y="0" clip-path="url(#8)" stroke="none"/>
<rect x="0" width="329" height="30" y="0" clip-path="url(#8)" stroke="none"/>
</g>
<g fill="rgb(69,73,74)" text-rendering="optimizeLegibility" font-family="sans-serif" transform="translate(135,23)" stroke="rgb(69,73,74)">
<rect x="2" y="2" clip-path="url(#9)" width="318" rx="0" ry="0" height="24" stroke="none"/>
<rect x="2" y="2" clip-path="url(#9)" width="323" rx="0" ry="0" height="24" stroke="none"/>
</g>
<g fill="rgb(100,100,100)" text-rendering="optimizeLegibility" font-family="sans-serif" transform="translate(135,23)" stroke="rgb(100,100,100)">
<path d="M2 2 L320 2 L320 26 L2 26 L2 2 ZM3 3 L319 3 L319 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#10)" stroke="none"/>
<path d="M2 2 L325 2 L325 26 L2 26 L2 2 ZM3 3 L324 3 L324 25 L3 25 L3 3 Z" fill-rule="evenodd" clip-path="url(#10)" stroke="none"/>
</g>
<g fill="rgb(187,187,187)" font-weight="bold" font-family="sans-serif" transform="translate(23,29)" stroke="rgb(187,187,187)">
<text x="0" xml:space="preserve" y="12" clip-path="url(#11)" stroke="none">Database:</text>

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

@@ -73,8 +73,8 @@ cellBounds:
componentBounds:
In KeePass: [-2, -2, 90, 19]
'Database:': [23, 29, 61, 15]
'JTextField #2': [134, 22, 324, 30]
'JLabel #3': [459, 29, 21, 16]
'JTextField #2': [134, 22, 329, 30]
'JLabel #3': [464, 29, 16, 16]
'Master Password:': [23, 63, 108, 15]
'JBPasswordField #5': [134, 56, 256, 30]
Stored using weak encryption.: [138, 89, 158, 13]
@@ -23,16 +23,16 @@
<path d="M0 0 L0 15 L108 15 L108 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="6">
<path d="M0 0 L0 16 L21 16 L21 0 Z"/>
<path d="M0 0 L0 16 L16 16 L16 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="7">
<path d="M0 0 L0 27 L321 27 L321 0 Z"/>
<path d="M0 0 L0 27 L326 27 L326 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="8">
<path d="M-1 -1 L-1 26 L320 26 L320 -1 Z"/>
<path d="M-1 -1 L-1 26 L325 26 L325 -1 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="9">
<path d="M317 4 L317 23 L4 23 L4 4 ZM0 0 L0 27 L321 27 L321 0 Z"/>
<path d="M322 4 L322 23 L4 23 L4 4 ZM0 0 L0 27 L326 27 L326 0 Z"/>
</clipPath>
<clipPath clipPathUnits="userSpaceOnUse" id="10">
<path d="M0 0 L0 15 L61 15 L61 0 Z"/>
@@ -57,17 +57,17 @@
<g font-family="sans-serif" font-weight="bold" transform="translate(26,60)">
<text x="0" xml:space="preserve" y="12" clip-path="url(#5)" stroke="none">Master Password:</text>
</g>
<g font-family="sans-serif" font-weight="bold" transform="translate(459,29)">
<image x="0" y="0" clip-path="url(#6)" width="21" xlink:href="../../../../../../icons/src/general/gear.png" height="16" preserveAspectRatio="none"/>
<g font-family="sans-serif" font-weight="bold" transform="translate(464,29)">
<image x="0" y="0" clip-path="url(#6)" width="16" xlink:href="../../../../../../icons/src/general/gearPlain.svg" height="16" preserveAspectRatio="none"/>
</g>
<g fill="rgb(236,236,236)" font-family="sans-serif" transform="translate(137,23)" stroke="rgb(236,236,236)">
<rect x="0" width="321" height="27" y="0" clip-path="url(#7)" stroke="none"/>
<rect x="0" width="326" height="27" y="0" clip-path="url(#7)" stroke="none"/>
</g>
<g fill="white" text-rendering="optimizeLegibility" font-family="sans-serif" transform="translate(138,24)" stroke="white">
<rect x="3" y="3" clip-path="url(#8)" width="313" rx="0" ry="0" height="19" stroke="none"/>
<rect x="3" y="3" clip-path="url(#8)" width="318" rx="0" ry="0" height="19" stroke="none"/>
</g>
<g fill="rgb(188,188,188)" text-rendering="optimizeLegibility" font-family="sans-serif" transform="translate(137,23)" stroke="rgb(188,188,188)">
<path d="M3 3 L318 3 L318 24 L3 24 L3 3 ZM4 4 L317 4 L317 23 L4 23 L4 4 Z" fill-rule="evenodd" clip-path="url(#9)" stroke="none"/>
<path d="M3 3 L323 3 L323 24 L3 24 L3 3 ZM4 4 L322 4 L322 23 L4 23 L4 4 Z" fill-rule="evenodd" clip-path="url(#9)" stroke="none"/>
</g>
<g font-family="sans-serif" font-weight="bold" transform="translate(26,29)">
<text x="0" xml:space="preserve" y="12" clip-path="url(#10)" stroke="none">Database:</text>

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

@@ -73,8 +73,8 @@ cellBounds:
componentBounds:
In KeePass: [-3, -3, 92, 22]
'Database:': [26, 29, 61, 15]
'JTextField #2': [137, 23, 321, 27]
'JLabel #3': [459, 29, 21, 16]
'JTextField #2': [137, 23, 326, 27]
'JLabel #3': [464, 29, 16, 16]
'Master Password:': [26, 60, 108, 15]
'JBPasswordField #5': [137, 54, 256, 27]
Stored using weak encryption.: [141, 84, 158, 13]
@@ -55,9 +55,9 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration
return thatImage === image
}
for (name in arrayOf("checkBox", "radio", "gear", "spinnerRight")) {
for (name in arrayOf("checkBox", "radio", "gear.png", "gearPlain.png", "gearPlain.svg", "spinnerRight")) {
val iconWrapper = when (name) {
"gear" -> IconLoader.getIcon("/general/gear.png")
"gear.png", "gearPlain.png", "gearPlain.svg" -> IconLoader.getIcon("/general/$name")
else -> LafIconLookup.findIcon(name)
} ?: continue
@@ -117,6 +117,7 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration
writer.use {
val root = svgGenerator.root
root.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns", SVGSyntax.SVG_NAMESPACE_URI)
@Suppress("SpellCheckingInspection")
root.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink")
root.setAttributeNS(null, "viewBox", "0 0 ${component.width} ${component.height}")