Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear Release Team,
qutebrowser upstream (Florian Bruhin, X-Debbugs-CC'ed) has released a
bugfix release for the 1.6.x series which we currently have in
Buster. It fixes at least one crash and some (syntax/conformance) issues
with the .desktop file and the icons it uses.
I consider at least the crash and the issues with the .desktop file as
severity important if not RC because both cause unexpected
misbehaving. The impact of the SVG conformance issue is currently
unclear to me, but some Freedesktop related validators argue about wrong
dimensions/scaling according to upstream.
There are also included tiny fixes for one UI issue and one rendering
issue as well as some commits reducing resource usage and test suite
dependencies. (Florian: please correct me if understood these wrong.)
The whole upstream source diff is at
https://github.com/qutebrowser/qutebrowser/compare/v1.6.0...v1.6.1
(15 commits, 15 changed files, 88 added lines and 30 deleted lines), but
also attached.
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 46b9a12abb..076fa00320 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,26 @@ breaking changes (such as renamed commands) can happen in minor releases.
// `Fixed` for any bug fixes.
// `Security` to invite users to upgrade in case of vulnerabilities.
+v1.6.1
+------
+
+Changed
+~~~~~~~
+
+- Windows/macOS releases now ship with Qt 5.12.2, which includes
+ security fixes up to Chromium 72.0.3626.121 (including CVE-2019-5786
+ which is known to be exploited in the wild).
+
+Fixed
+~~~~~
+
+- Crash when using `:config-{dict,list}-{add,remove}` with an invalid setting.
+- Functionality like hinting on pages with an element with ID `_qutebrowser` (such as qutebrowser.org) on Qt 5.12.
+- The .desktop file in v1.6.0 was missing the "Actions" key, which is now fixed.
+- The SVG icon now has a size of 256x256px set to comply with freedesktop standards.
+- Setting `colors.statusbar.*.bg` to a gradient now has the expected effect of
+ the gradient spanning the entire statusbar.
+
v1.6.0
------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 2d71a28c13..f0328f2c64 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -165,8 +165,7 @@ If no command is given, show the current binding for the given key. Using :bind
* +'command'+: The command to execute, with optional args.
==== optional arguments
-* +*-m*+, +*--mode*+: A comma-separated list of modes to bind the key in (default: `normal`). See `:help bindings.commands` for the
- available modes.
+* +*-m*+, +*--mode*+: The mode to bind the key in (default: `normal`). See `:help bindings.commands` for the available modes.
* +*-d*+, +*--default*+: If given, restore a default binding.
@@ -1425,7 +1424,7 @@ Unbind a keychain.
==== optional arguments
-* +*-m*+, +*--mode*+: A mode to unbind the key in (default: `normal`). See `:help bindings.commands` for the available modes.
+* +*-m*+, +*--mode*+: The mode to unbind the key in (default: `normal`). See `:help bindings.commands` for the available modes.
[[undo]]
diff --git a/icons/qutebrowser.svg b/icons/qutebrowser.svg
index 47ef97b75a..b26c80c2b1 100644
--- a/icons/qutebrowser.svg
+++ b/icons/qutebrowser.svg
@@ -9,13 +9,13 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="650.00012"
- height="650.00018"
- viewBox="0 0 650.0001 650.00015"
+ width="256"
+ height="256"
+ viewBox="0 0 255.99999 255.99999"
id="svg4546"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="qutebrowser-logo.svg">
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="qutebrowser.svg">
<defs
id="defs4548" />
<sodipodi:namedview
@@ -57,12 +57,12 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(522.14287,-798.7907)">
+ transform="translate(522.14287,-1192.7909)">
<g
style="display:inline"
id="qutebrowser-logo"
inkscape:label="qutebrowser-logo"
- transform="translate(4742.4729,-1387.0639)">
+ transform="matrix(0.39384608,0,0,0.39384608,1551.3054,331.90062)">
<title
id="title4674">qutebrowser-logo</title>
<g
@@ -85,7 +85,7 @@
<path
inkscape:label="qutebrowser-planet-continents"
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccscccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
- d="m -4950.1256,627.7519 c -41.0721,0 -80.1642,7.8197 -116.2898,21.5501 -2.6285,2.4104 -6.0419,4.2605 -8.7446,4.0308 -0.3622,-0.035 -0.7417,-0.2759 -1.1039,-0.4122 -17.8083,7.4364 -34.7008,16.5478 -50.7206,26.8822 2.0836,3.372 2.7009,7.1265 -1.5867,8.9502 -0.7245,0.3122 -9.2508,1.4737 -12.4142,1.396 -45.5513,33.0344 -81.4206,77.1046 -104.7757,128.9723 0.3794,-0.052 2.145,-0.2091 2.5243,-0.235 3.5446,-0.052 6.0115,1.0555 9.4162,1.7696 3.1408,0.6451 5.6744,2.7474 8.3945,2.9516 7.7149,0.5847 9.5725,-5.4041 15.8679,-8.7597 6.5042,0.9175 10.8196,-1.0988 16.6942,-0.4451 4.0032,0.4416 6.8956,4.7123 10.0157,4.9514 2.6252,0.2655 4.9329,-2.4512 7.4735,-2.0631 2.4681,0.3795 6.7215,5.7499 7.1233,8.7597 0.5002,3.7465 -2.7614,7.1204 -1.6903,11.2353 3.9308,3.997 11.0748,4.8067 16.6941,7.1093 3.6583,-3.009 0.483,-8.5931 0,-12.9491 0,-1.9169 0.2587,-3.6285 0,-5.3955 -0.3449,-2.9998 -1.6214,-5.748 -1.6558,-8.3153 0,-11.8579 9.5846,-17.4074 17.5532,-22.0899 3.4495,-2.0413 6.1661,-5.6155 9.1584,-7.1093 4.2275,-2.1158 7.3752,-2.6075 10.8748,-4.5703 6.3248,-3.5458 11.7493,-6.3922 16.6941,-10.41 2.2871,-5.3767 0.2243,-12.5866 0.414,-17.9005 2.2887,-1.3987 4.2516,0.602 6.6783,0.4123 3.817,-0.7917 4.1326,-6.1688 6.2955,-8.3153 1.259,-1.2298 4.7018,-2.1112 6.2645,-3.3326 3.8031,-2.9781 5.0415,-7.4763 8.3634,-8.7596 1.1902,-0.4812 3.9412,-0.3501 5.8195,-0.8572 2.4715,-0.6537 5.9901,-3.5737 10.0158,-4.9513 2.625,-0.9159 8.6342,-1.0918 9.6362,-2.0947 1.2247,-1.2574 0,-4.7832 0.414,-6.6648 2.0249,-9.407 16.2216,-11.4008 24.6126,-14.5679 5.8815,-2.2253 11.9182,-6.297 18.3792,-5.0465 -1.259,4.4706 -7.2837,2.8868 -6.2644,8.3155 1.4144,7.5338 11.518,-2.1589 14.1829,-3.269 5.095,-2.1433 13.8276,-3.4516 20.5111,-5.8718 5.859,-2.1431 16.3664,-5.402 10.8436,-12.0922 -4.6068,-0.2656 -6.8283,5.3958 -10.8436,7.1094 -2.7735,0.4415 -2.2457,-2.3165 -4.6104,-2.5391 -2.2509,-0.2655 -3.5099,2.0717 -5.8194,1.6817 -2.2974,-0.3777 -5.5244,-3.9842 -5.8831,-6.665 -0.9143,-6.9564 5.89,-9.8241 8.7756,-15.0122 -1.9076,-6.2923 -10.6281,-1.2816 -15.8991,-3.7451 0.5002,-3.7461 4.3931,-6.3297 8.7775,-7.046 3.5926,-0.6071 11.6594,-0.2967 13.7998,1.6179 1.242,1.0538 0,3.6801 2.0992,5.4273 2.1266,1.9171 4.743,1.7196 7.5044,1.2694 1.0004,-4.7481 -6.1867,-3.5571 -5.4054,-6.6967 5.6401,-3.6822 14.8141,-0.659 21.7184,-1.6817 3.974,-0.5847 8.1479,-3.3855 11.6698,-5.3638 3.3496,-1.9053 7.703,-5.2108 11.2578,-2.0948 0.9658,3.4033 -3.096,4.5293 -4.9934,6.2207 -6.3885,5.6721 -12.9685,12.1696 -17.9342,18.7573 3.0461,2.9656 8.5825,1.4798 13.7362,2.0947 2.0162,0.2656 4.5482,0.8624 6.6784,1.2384 2.4888,0.4415 5.1414,0.3173 7.0904,0.8245 3.5083,0.8572 4.4465,4.602 7.9185,4.602 5.7125,-0.011 5.7798,-6.177 2.5442,-10.0294 1.0175,-3.9329 2.6232,-5.9727 1.2418,-8.7279 -2.5734,-5.1363 -12.0114,-0.2656 -12.4979,-6.665 -0.3104,-4.1548 3.4841,-3.9692 4.9933,-7.0775 -0.6898,-8.0283 6.5973,-8.6099 5.8194,-15.8057 -0.345,-3.0099 -2.8804,-3.0515 -4.9932,-5.8716 -1.0521,-1.3868 -1.6041,-4.0437 -2.8287,-5.2368 -9.7432,-0.8676 -19.5969,-1.3971 -29.573,-1.3971 z m -168.0262,65.5708 0,0 c 1.9438,0.2812 4.2912,2.3608 6.6455,2.5392 2.2302,0.052 4.0653,-1.2263 5.4381,-0.8573 3.4911,0.9176 4.9623,6.1806 1.6904,8.7596 -2.7303,0.3415 -3.7945,-1.1815 -5.8504,-0.8244 -5.6711,0.9607 -7.8461,12.0465 -12.0838,11.6796 -3.9964,-0.3415 -6.1592,-10.0559 -2.0991,-12.9491 0.2588,-2.5259 -1.8473,-2.9313 -1.7247,-5.4273 1.2073,-1.5351 4.6291,-3.1868 7.9495,-2.9199 z m -18.7933,1.3006 c 1.1557,0.035 2.0352,0.319 2.4802,0.8261 -0.5518,4.4413 -4.0359,4.1503 -7.4734,6.2206 -5.935,3.5758 -9.3673,9.0244 -11.2559,16.6626 -0.5519,2.2252 -6.3972,8.1111 -9.2224,7.522 -6.6197,-1.3936 1.8265,-13.5736 3.3392,-15.4248 1.673,-2.052 3.9135,-3.8515 5.8832,-6.2207 1.9094,-2.2942 3.1529,-5.3917 4.9915,-6.6649 2.0163,-1.3937 7.7701,-3.0536 11.2576,-2.9201 z m 49.4149,14.9805 c 2.1216,0.035 4.0275,0.3811 4.8967,1.2383 -1.3624,5.5031 -13.2394,4.0501 -17.5842,2.0631 0.2761,-2.0751 3.5325,-2.6463 6.2644,-2.9199 1.9215,-0.052 4.3068,-0.445 6.4231,-0.3812 z m -27.0289,10.1561 c 1.4142,-0.035 2.8424,0.2725 4.3257,0.6658 -3.8429,3.2081 -7.9978,5.0254 -14.5968,7.1093 -3.1719,0.9969 -8.6515,2.2398 -9.1896,-1.3022 -0.6554,-4.3341 4.6396,-3.3255 7.5356,-3.7133 3.6479,-0.5053 7.6527,-2.6247 11.9251,-2.7611 z m 414.6595,24.6923 c -0.5003,1.1798 -0.8624,2.3483 -0.7934,3.4911 0.2586,2.011 2.4647,3.9451 2.9562,6.6651 0.2587,1.4402 -0.6726,4.5568 0,5.8716 2.0111,3.8912 7.2717,1.0918 11.0352,1.3005 -4.2758,-5.8758 -8.5447,-11.7617 -13.1963,-17.3292 z m 21.3372,28.6596 c -0.6037,2.871 -2.5545,6.6159 -4.1344,9.0136 -3.6392,5.5245 -8.5825,5.7821 -13.8017,8.728 -4.3515,2.4625 -6.2246,6.5714 -8.7756,10.8543 -2.7649,4.6264 -4.4776,7.4212 -3.3393,14.1237 -3.7306,7.3859 -9.3794,11.9111 -17.108,15.4246 -2.2854,1.0279 -5.4072,1.4075 -7.5045,2.9198 -1.6731,1.1971 -2.62,4.4166 -4.9916,7.0776 -2.9286,3.2523 -5.997,4.6247 -7.5372,7.1094 -1.1901,1.9172 -1.6041,5.7387 -2.9253,8.3155 -1.7817,3.4997 -5.5779,5.2139 -7.9184,8.7597 -1.0694,1.6402 -1.7765,4.962 -2.9563,7.1094 -2.6441,4.7974 -7.1629,8.2537 -6.6784,12.4729 0.483,4.0778 5.1209,4.7925 5.4382,8.3472 0,2.0094 -1.3279,3.2372 -1.2418,5.4273 0,3.1973 2.2267,5.4424 2.4804,7.9029 0.6208,6.1864 -2.1096,8.6552 -3.2755,12.8856 -0.5519,2.0199 -0.3105,4.2935 -0.8624,5.8716 -1.0176,3.097 -5.352,5.8917 -5.4364,9.5532 0,2.6018 2.6734,4.6945 2.8924,8.347 0,2.5181 -1.2419,5.2066 -0.7934,7.522 0.8969,4.5343 8.9981,9.8071 12.5288,13.3299 4.7241,4.7143 10.9075,8.3632 12.9428,13.3301 1.7074,4.218 1.7074,9.7066 4.9914,12.8857 2.4354,2.3474 6.4852,3.8108 9.6036,6.2523 2.9097,2.2793 6.0799,4.2466 9.1896,6.665 5.083,3.9677 12.7651,11.8768 20.8613,11.2672 4.2274,-0.3088 8.56,-3.7519 13.3549,-4.6021 4.9329,-0.8831 11.3353,-1.3367 16.3132,-0.8245 3.8117,0.3778 7.739,2.6575 11.7026,2.4756 4.1843,-0.2656 8.9826,-3.3542 13.7361,-5.4272 3.8256,-1.6627 8.5204,-3.5035 13.6741,-4.8559 2.3629,-15.8527 3.6254,-32.0934 3.6254,-48.6229 0,-66.5467 -19.9367,-128.2271 -54.0581,-179.6379 z m -538.5485,109.2108 c -6.9354,0.3794 -11.4802,0.6933 -15.4214,2.4756 -9.0343,4.1032 -7.2888,16.2872 -16.3129,19.17 -3.1218,0.9952 -7.4078,1.0435 -10.8436,1.6817 -2.9666,0.5416 -6.58,2.1592 -9.6364,2.0947 -0.8623,-0.012 -0.9086,-0.1949 -1.9727,-0.5329 -0.8094,5.1109 -1.7261,11.4288 -1.9674,17.1894 8.5859,1.6421 11.8706,12.6558 19.4597,16.4136 2.0783,1.0279 4.7949,1.0831 7.4717,1.6816 2.1612,0.4813 3.8015,1.3954 5.8833,2.0948 4.4154,1.4971 9.8243,1.316 13.3549,2.888 5.3226,2.3575 9.2242,12.3399 13.8017,15.0123 0.2587,2.6927 -0.5174,6.3076 0.414,8.3153 2.161,2.9264 5.2157,2.2813 8.7774,4.1895 4.2602,2.2942 5.564,8.2185 9.6036,10.0292 1.397,0.6173 4.8879,0.5381 7.0904,1.2055 5.5349,1.6714 7.3407,8.0618 12.0838,6.6651 3.1115,-0.9159 2.8665,-4.1093 3.3702,-7.0777 2.0559,-2.2251 4.2998,-5.7455 7.5045,-5.8079 5.1882,-0.2656 5.6486,5.3497 7.5373,10.3783 1.0693,2.8416 3.8514,5.3181 4.5793,8.3155 1.2936,5.1777 0.6554,20.6767 -0.4485,23.7718 -1.3108,3.7966 -6.4593,5.4072 -9.6346,9.6167 -1.5005,1.9737 -2.2112,4.8651 -3.3392,6.2524 -2.0438,2.4836 -5.0829,3.1344 -6.6128,5.4271 -0.8624,1.2919 -1.7075,4.0628 -2.544,5.8082 -2.5078,5.302 -5.8625,9.059 -3.753,15.4246 0.8795,2.6203 4.9828,4.3749 4.9931,7.4586 0.01,3.6279 -7.7321,6.8765 -8.3323,10.8543 -0.4484,2.9592 2.3991,8.2414 3.3392,12.0922 0.6899,2.9102 6.1987,4.7294 7.9183,6.6651 2.9304,3.284 5.2727,7.9361 7.9495,12.0606 5.2933,8.1125 9.4414,18.0066 14.5951,25.8666 2.7251,4.1168 6.549,7.8185 8.3634,12.0922 0.9315,2.1567 0.7934,4.7271 1.6558,6.665 2.9839,6.7213 16.1595,13.7388 22.9586,17.0751 3.1839,1.542 6.7145,2.0988 9.6345,3.7134 4.4242,2.4626 13.1895,9.0768 15.4231,12.949 1.9887,3.4807 3.2305,11.9529 4.198,17.4879 1.2938,7.3142 0.014,12.9303 0.4139,20.852 0.2589,4.2833 1.6388,8.5912 1.6905,12.8855 0.016,1.5023 -0.9177,1.4423 -0.9867,2.977 l 0.183,1.6086 c 40.8841,18.7713 86.3906,29.4377 134.4827,29.4377 8.6876,0 17.2623,-0.3073 25.7759,-0.9678 0.3794,-0.64 0.7374,-1.4468 1.1858,-2.0472 1.9594,-2.5675 3.6996,-4.8164 4.9933,-7.0776 1.2245,-7.6081 -3.0408,-12.9227 -1.242,-19.5825 1.9922,-7.4808 12.3565,-12.0496 19.6195,-15.4246 2.4991,-1.1591 5.0554,-3.0401 7.0906,-3.7453 5.0276,-1.7457 11.3041,-0.8019 15.8989,-2.4755 7.8237,-2.8571 8.6395,-11.2315 12.4979,-18.3446 1.8179,-3.3687 4.2223,-6.7415 4.5792,-9.1406 0.3105,-2.1569 -0.7934,-4.1855 -0.4485,-6.7285 0.3796,-2.5179 2.639,-4.6928 3.3393,-7.4585 0.9141,-3.6092 1.3108,-8.8969 1.3108,-12.9173 0,-3.3 -1.5523,-6.1955 -1.6903,-9.1723 -0.5347,-10.8083 3.9118,-12.0181 7.9185,-17.9004 2.0111,-2.9221 2.763,-6.253 4.1653,-8.3472 6.7267,-10.0161 18.3983,-14.8516 17.5531,-29.9926 -0.276,-5.0101 -3.4288,-16.3326 -7.1233,-17.9319 -2.1129,-0.9176 -6.9595,-0.052 -10.0159,-1.2383 -9.8674,-3.6742 -15.6592,-15.883 -25.8837,-16.6626 -2.1854,-0.2656 -4.1896,0.8952 -6.6473,0.8572 -4.0464,-0.2656 -10.1469,-2.8293 -14.6262,-3.3326 -2.8476,-0.3087 -6.6542,0.8469 -8.3634,0 -2.608,-1.2642 -2.8718,-6.0604 -4.9932,-7.4901 -1.6731,-1.1556 -4.9536,-1.5523 -7.5047,-2.539 -4.1118,-1.5765 -7.3716,-3.4153 -12.1147,-3.7452 -1.4661,-0.052 -3.2874,0.702 -4.9933,0.4449 -2.625,-0.4415 -4.7,-3.5433 -7.1216,-5.0146 -3.0338,-1.8429 -5.8383,-2.7346 -7.0923,-5.3636 2.7424,-8.9754 -4.8346,-11.477 -6.6782,-16.6626 -0.8798,-2.4301 -0.483,-5.3543 -1.242,-7.5219 -1.0866,-3.1051 -4.1636,-4.8998 -7.5355,-7.4903 -6.042,-4.6406 -11.3991,-8.9981 -20.0333,-10.0609 -3.7963,-0.4812 -7.5614,1.1349 -12.1477,0.8572 -4.8587,-0.3087 -10.9592,-4.5496 -14.595,-8.6963 -3.534,-4.0482 -5.2536,-7.6815 -8.3323,-9.6166 -2.915,-1.8712 -6.7836,-1.8175 -8.7758,-3.7134 -0.8795,-0.8244 -0.7416,-2.2428 -1.6903,-4.1895 -1.466,-3.031 -3.9273,-4.7156 -2.099,-8.347 -3.3271,-1.7058 -3.4185,3.1689 -7.0595,2.539 -3.2443,-4.5974 -5.9868,-6.7756 -13.355,-5.4274 -3.3754,0.6192 -5.2589,4.8772 -9.1896,4.9831 -3.2254,0.2656 -5.759,-3.5856 -10.0175,-4.1895 -3.215,-0.4415 -6.8699,0.871 -9.1586,0.445 -3.5634,-0.7123 -4.6622,-3.6717 -7.9167,-5.8081 -2.3873,-1.5662 -7.0252,-4.232 -8.3636,-4.1893 -4.1964,0.2656 -7.1872,8.9006 -12.9738,5.8397 -2.8131,-3.557 4.581,-5.4314 1.2419,-8.7598 -2.5304,-2.5256 -4.6552,1.1435 -6.6784,2.5391 -2.3181,1.5988 -4.4965,3.1795 -7.0595,4.1259 -5.7349,2.1431 -9.319,1.0211 -13.8,3.3326 -4.1498,2.1455 -4.3274,5.7349 -6.6783,9.9975 -1.9214,3.4922 -6.3006,8.5808 -9.1896,8.7916 -3.4996,0.2655 -6.8439,-4.8829 -10.0175,-6.2526 -9.5605,-4.1334 -14.1916,3.6709 -22.1323,3.777 -7.3666,0.2656 -17.8911,-11.8751 -17.5202,-18.7891 0,-4.2187 2.4301,-10.6185 2.9252,-15.8371 0.4484,-4.1509 3.2908,-6.653 3.3391,-10.442 0,-5.0612 -6.7266,-8.9528 -10.0174,-9.5532 -7.7995,-1.4315 -18.6294,3.1322 -27.569,-0.445 -1.7075,-2.8238 1.9991,-4.775 2.958,-7.5219 0.5347,-1.5627 0.2242,-3.6462 0.7935,-5.3637 0.983,-2.6538 3.779,-4.7101 5.0242,-7.522 0.9314,-2.1457 1.1728,-5.2407 2.0991,-7.9028 1.0866,-3.0313 3.1046,-4.9835 3.3392,-7.1094 0.3104,-2.8071 -0.759,-6.0516 -2.9581,-7.9027 z m 111.6154,88.2004 c 2.8287,0.2656 3.1839,6.1003 0.2933,6.5698 -3.1201,0.4829 -4.7069,-4.8866 -1.6903,-6.2843 0.5174,-0.2655 1.0004,-0.2828 1.397,-0.2535 l 0,-0.035 z"
+ d="m -4950.1256,627.7519 c -41.0721,0 -80.1642,7.8197 -116.2898,21.5501 -2.6285,2.4104 -6.0419,4.2605 -8.7446,4.0308 -0.3622,-0.035 -0.7417,-0.2759 -1.1039,-0.4122 -17.8083,7.4364 -34.7008,16.5478 -50.7206,26.8822 2.0836,3.372 2.7009,7.1265 -1.5867,8.9502 -0.7245,0.3122 -9.2508,1.4737 -12.4142,1.396 -45.5513,33.0344 -81.4206,77.1046 -104.7757,128.9723 0.3794,-0.052 2.145,-0.2091 2.5243,-0.235 3.5446,-0.052 6.0115,1.0555 9.4162,1.7696 3.1408,0.6451 5.6744,2.7474 8.3945,2.9516 7.7149,0.5847 9.5725,-5.4041 15.8679,-8.7597 6.5042,0.9175 10.8196,-1.0988 16.6942,-0.4451 4.0032,0.4416 6.8956,4.7123 10.0157,4.9514 2.6252,0.2655 4.9329,-2.4512 7.4735,-2.0631 2.4681,0.3795 6.7215,5.7499 7.1233,8.7597 0.5002,3.7465 -2.7614,7.1204 -1.6903,11.2353 3.9308,3.997 11.0748,4.8067 16.6941,7.1093 3.6583,-3.009 0.483,-8.5931 0,-12.9491 0,-1.9169 0.2587,-3.6285 0,-5.3955 -0.3449,-2.9998 -1.6214,-5.748 -1.6558,-8.3153 0,-11.8579 9.5846,-17.4074 17.5532,-22.0899 3.4495,-2.0413 6.1661,-5.6155 9.1584,-7.1093 4.2275,-2.1158 7.3752,-2.6075 10.8748,-4.5703 6.3248,-3.5458 11.7493,-6.3922 16.6941,-10.41 2.2871,-5.3767 0.2243,-12.5866 0.414,-17.9005 2.2887,-1.3987 4.2516,0.602 6.6783,0.4123 3.817,-0.7917 4.1326,-6.1688 6.2955,-8.3153 1.259,-1.2298 4.7018,-2.1112 6.2645,-3.3326 3.8031,-2.9781 5.0415,-7.4763 8.3634,-8.7596 1.1902,-0.4812 3.9412,-0.3501 5.8195,-0.8572 2.4715,-0.6537 5.9901,-3.5737 10.0158,-4.9513 2.625,-0.9159 8.6342,-1.0918 9.6362,-2.0947 1.2247,-1.2574 0,-4.7832 0.414,-6.6648 2.0249,-9.407 16.2216,-11.4008 24.6126,-14.5679 5.8815,-2.2253 11.9182,-6.297 18.3792,-5.0465 -1.259,4.4706 -7.2837,2.8868 -6.2644,8.3155 1.4144,7.5338 11.518,-2.1589 14.1829,-3.269 5.095,-2.1433 13.8276,-3.4516 20.5111,-5.8718 5.859,-2.1431 16.3664,-5.402 10.8436,-12.0922 -4.6068,-0.2656 -6.8283,5.3958 -10.8436,7.1094 -2.7735,0.4415 -2.2457,-2.3165 -4.6104,-2.5391 -2.2509,-0.2655 -3.5099,2.0717 -5.8194,1.6817 -2.2974,-0.3777 -5.5244,-3.9842 -5.8831,-6.665 -0.9143,-6.9564 5.89,-9.8241 8.7756,-15.0122 -1.9076,-6.2923 -10.6281,-1.2816 -15.8991,-3.7451 0.5002,-3.7461 4.3931,-6.3297 8.7775,-7.046 3.5926,-0.6071 11.6594,-0.2967 13.7998,1.6179 1.242,1.0538 0,3.6801 2.0992,5.4273 2.1266,1.9171 4.743,1.7196 7.5044,1.2694 1.0004,-4.7481 -6.1867,-3.5571 -5.4054,-6.6967 5.6401,-3.6822 14.8141,-0.659 21.7184,-1.6817 3.974,-0.5847 8.1479,-3.3855 11.6698,-5.3638 3.3496,-1.9053 7.703,-5.2108 11.2578,-2.0948 0.9658,3.4033 -3.096,4.5293 -4.9934,6.2207 -6.3885,5.6721 -12.9685,12.1696 -17.9342,18.7573 3.0461,2.9656 8.5825,1.4798 13.7362,2.0947 2.0162,0.2656 4.5482,0.8624 6.6784,1.2384 2.4888,0.4415 5.1414,0.3173 7.0904,0.8245 3.5083,0.8572 4.4465,4.602 7.9185,4.602 5.7125,-0.011 5.7798,-6.177 2.5442,-10.0294 1.0175,-3.9329 2.6232,-5.9727 1.2418,-8.7279 -2.5734,-5.1363 -12.0114,-0.2656 -12.4979,-6.665 -0.3104,-4.1548 3.4841,-3.9692 4.9933,-7.0775 -0.6898,-8.0283 6.5973,-8.6099 5.8194,-15.8057 -0.345,-3.0099 -2.8804,-3.0515 -4.9932,-5.8716 -1.0521,-1.3868 -1.6041,-4.0437 -2.8287,-5.2368 -9.7432,-0.8676 -19.5969,-1.3971 -29.573,-1.3971 z m -168.0262,65.5708 v 0 c 1.9438,0.2812 4.2912,2.3608 6.6455,2.5392 2.2302,0.052 4.0653,-1.2263 5.4381,-0.8573 3.4911,0.9176 4.9623,6.1806 1.6904,8.7596 -2.7303,0.3415 -3.7945,-1.1815 -5.8504,-0.8244 -5.6711,0.9607 -7.8461,12.0465 -12.0838,11.6796 -3.9964,-0.3415 -6.1592,-10.0559 -2.0991,-12.9491 0.2588,-2.5259 -1.8473,-2.9313 -1.7247,-5.4273 1.2073,-1.5351 4.6291,-3.1868 7.9495,-2.9199 z m -18.7933,1.3006 c 1.1557,0.035 2.0352,0.319 2.4802,0.8261 -0.5518,4.4413 -4.0359,4.1503 -7.4734,6.2206 -5.935,3.5758 -9.3673,9.0244 -11.2559,16.6626 -0.5519,2.2252 -6.3972,8.1111 -9.2224,7.522 -6.6197,-1.3936 1.8265,-13.5736 3.3392,-15.4248 1.673,-2.052 3.9135,-3.8515 5.8832,-6.2207 1.9094,-2.2942 3.1529,-5.3917 4.9915,-6.6649 2.0163,-1.3937 7.7701,-3.0536 11.2576,-2.9201 z m 49.4149,14.9805 c 2.1216,0.035 4.0275,0.3811 4.8967,1.2383 -1.3624,5.5031 -13.2394,4.0501 -17.5842,2.0631 0.2761,-2.0751 3.5325,-2.6463 6.2644,-2.9199 1.9215,-0.052 4.3068,-0.445 6.4231,-0.3812 z m -27.0289,10.1561 c 1.4142,-0.035 2.8424,0.2725 4.3257,0.6658 -3.8429,3.2081 -7.9978,5.0254 -14.5968,7.1093 -3.1719,0.9969 -8.6515,2.2398 -9.1896,-1.3022 -0.6554,-4.3341 4.6396,-3.3255 7.5356,-3.7133 3.6479,-0.5053 7.6527,-2.6247 11.9251,-2.7611 z m 414.6595,24.6923 c -0.5003,1.1798 -0.8624,2.3483 -0.7934,3.4911 0.2586,2.011 2.4647,3.9451 2.9562,6.6651 0.2587,1.4402 -0.6726,4.5568 0,5.8716 2.0111,3.8912 7.2717,1.0918 11.0352,1.3005 -4.2758,-5.8758 -8.5447,-11.7617 -13.1963,-17.3292 z m 21.3372,28.6596 c -0.6037,2.871 -2.5545,6.6159 -4.1344,9.0136 -3.6392,5.5245 -8.5825,5.7821 -13.8017,8.728 -4.3515,2.4625 -6.2246,6.5714 -8.7756,10.8543 -2.7649,4.6264 -4.4776,7.4212 -3.3393,14.1237 -3.7306,7.3859 -9.3794,11.9111 -17.108,15.4246 -2.2854,1.0279 -5.4072,1.4075 -7.5045,2.9198 -1.6731,1.1971 -2.62,4.4166 -4.9916,7.0776 -2.9286,3.2523 -5.997,4.6247 -7.5372,7.1094 -1.1901,1.9172 -1.6041,5.7387 -2.9253,8.3155 -1.7817,3.4997 -5.5779,5.2139 -7.9184,8.7597 -1.0694,1.6402 -1.7765,4.962 -2.9563,7.1094 -2.6441,4.7974 -7.1629,8.2537 -6.6784,12.4729 0.483,4.0778 5.1209,4.7925 5.4382,8.3472 0,2.0094 -1.3279,3.2372 -1.2418,5.4273 0,3.1973 2.2267,5.4424 2.4804,7.9029 0.6208,6.1864 -2.1096,8.6552 -3.2755,12.8856 -0.5519,2.0199 -0.3105,4.2935 -0.8624,5.8716 -1.0176,3.097 -5.352,5.8917 -5.4364,9.5532 0,2.6018 2.6734,4.6945 2.8924,8.347 0,2.5181 -1.2419,5.2066 -0.7934,7.522 0.8969,4.5343 8.9981,9.8071 12.5288,13.3299 4.7241,4.7143 10.9075,8.3632 12.9428,13.3301 1.7074,4.218 1.7074,9.7066 4.9914,12.8857 2.4354,2.3474 6.4852,3.8108 9.6036,6.2523 2.9097,2.2793 6.0799,4.2466 9.1896,6.665 5.083,3.9677 12.7651,11.8768 20.8613,11.2672 4.2274,-0.3088 8.56,-3.7519 13.3549,-4.6021 4.9329,-0.8831 11.3353,-1.3367 16.3132,-0.8245 3.8117,0.3778 7.739,2.6575 11.7026,2.4756 4.1843,-0.2656 8.9826,-3.3542 13.7361,-5.4272 3.8256,-1.6627 8.5204,-3.5035 13.6741,-4.8559 2.3629,-15.8527 3.6254,-32.0934 3.6254,-48.6229 0,-66.5467 -19.9367,-128.2271 -54.0581,-179.6379 z m -538.5485,109.2108 c -6.9354,0.3794 -11.4802,0.6933 -15.4214,2.4756 -9.0343,4.1032 -7.2888,16.2872 -16.3129,19.17 -3.1218,0.9952 -7.4078,1.0435 -10.8436,1.6817 -2.9666,0.5416 -6.58,2.1592 -9.6364,2.0947 -0.8623,-0.012 -0.9086,-0.1949 -1.9727,-0.5329 -0.8094,5.1109 -1.7261,11.4288 -1.9674,17.1894 8.5859,1.6421 11.8706,12.6558 19.4597,16.4136 2.0783,1.0279 4.7949,1.0831 7.4717,1.6816 2.1612,0.4813 3.8015,1.3954 5.8833,2.0948 4.4154,1.4971 9.8243,1.316 13.3549,2.888 5.3226,2.3575 9.2242,12.3399 13.8017,15.0123 0.2587,2.6927 -0.5174,6.3076 0.414,8.3153 2.161,2.9264 5.2157,2.2813 8.7774,4.1895 4.2602,2.2942 5.564,8.2185 9.6036,10.0292 1.397,0.6173 4.8879,0.5381 7.0904,1.2055 5.5349,1.6714 7.3407,8.0618 12.0838,6.6651 3.1115,-0.9159 2.8665,-4.1093 3.3702,-7.0777 2.0559,-2.2251 4.2998,-5.7455 7.5045,-5.8079 5.1882,-0.2656 5.6486,5.3497 7.5373,10.3783 1.0693,2.8416 3.8514,5.3181 4.5793,8.3155 1.2936,5.1777 0.6554,20.6767 -0.4485,23.7718 -1.3108,3.7966 -6.4593,5.4072 -9.6346,9.6167 -1.5005,1.9737 -2.2112,4.8651 -3.3392,6.2524 -2.0438,2.4836 -5.0829,3.1344 -6.6128,5.4271 -0.8624,1.2919 -1.7075,4.0628 -2.544,5.8082 -2.5078,5.302 -5.8625,9.059 -3.753,15.4246 0.8795,2.6203 4.9828,4.3749 4.9931,7.4586 0.01,3.6279 -7.7321,6.8765 -8.3323,10.8543 -0.4484,2.9592 2.3991,8.2414 3.3392,12.0922 0.6899,2.9102 6.1987,4.7294 7.9183,6.6651 2.9304,3.284 5.2727,7.9361 7.9495,12.0606 5.2933,8.1125 9.4414,18.0066 14.5951,25.8666 2.7251,4.1168 6.549,7.8185 8.3634,12.0922 0.9315,2.1567 0.7934,4.7271 1.6558,6.665 2.9839,6.7213 16.1595,13.7388 22.9586,17.0751 3.1839,1.542 6.7145,2.0988 9.6345,3.7134 4.4242,2.4626 13.1895,9.0768 15.4231,12.949 1.9887,3.4807 3.2305,11.9529 4.198,17.4879 1.2938,7.3142 0.014,12.9303 0.4139,20.852 0.2589,4.2833 1.6388,8.5912 1.6905,12.8855 0.016,1.5023 -0.9177,1.4423 -0.9867,2.977 l 0.183,1.6086 c 40.8841,18.7713 86.3906,29.4377 134.4827,29.4377 8.6876,0 17.2623,-0.3073 25.7759,-0.9678 0.3794,-0.64 0.7374,-1.4468 1.1858,-2.0472 1.9594,-2.5675 3.6996,-4.8164 4.9933,-7.0776 1.2245,-7.6081 -3.0408,-12.9227 -1.242,-19.5825 1.9922,-7.4808 12.3565,-12.0496 19.6195,-15.4246 2.4991,-1.1591 5.0554,-3.0401 7.0906,-3.7453 5.0276,-1.7457 11.3041,-0.8019 15.8989,-2.4755 7.8237,-2.8571 8.6395,-11.2315 12.4979,-18.3446 1.8179,-3.3687 4.2223,-6.7415 4.5792,-9.1406 0.3105,-2.1569 -0.7934,-4.1855 -0.4485,-6.7285 0.3796,-2.5179 2.639,-4.6928 3.3393,-7.4585 0.9141,-3.6092 1.3108,-8.8969 1.3108,-12.9173 0,-3.3 -1.5523,-6.1955 -1.6903,-9.1723 -0.5347,-10.8083 3.9118,-12.0181 7.9185,-17.9004 2.0111,-2.9221 2.763,-6.253 4.1653,-8.3472 6.7267,-10.0161 18.3983,-14.8516 17.5531,-29.9926 -0.276,-5.0101 -3.4288,-16.3326 -7.1233,-17.9319 -2.1129,-0.9176 -6.9595,-0.052 -10.0159,-1.2383 -9.8674,-3.6742 -15.6592,-15.883 -25.8837,-16.6626 -2.1854,-0.2656 -4.1896,0.8952 -6.6473,0.8572 -4.0464,-0.2656 -10.1469,-2.8293 -14.6262,-3.3326 -2.8476,-0.3087 -6.6542,0.8469 -8.3634,0 -2.608,-1.2642 -2.8718,-6.0604 -4.9932,-7.4901 -1.6731,-1.1556 -4.9536,-1.5523 -7.5047,-2.539 -4.1118,-1.5765 -7.3716,-3.4153 -12.1147,-3.7452 -1.4661,-0.052 -3.2874,0.702 -4.9933,0.4449 -2.625,-0.4415 -4.7,-3.5433 -7.1216,-5.0146 -3.0338,-1.8429 -5.8383,-2.7346 -7.0923,-5.3636 2.7424,-8.9754 -4.8346,-11.477 -6.6782,-16.6626 -0.8798,-2.4301 -0.483,-5.3543 -1.242,-7.5219 -1.0866,-3.1051 -4.1636,-4.8998 -7.5355,-7.4903 -6.042,-4.6406 -11.3991,-8.9981 -20.0333,-10.0609 -3.7963,-0.4812 -7.5614,1.1349 -12.1477,0.8572 -4.8587,-0.3087 -10.9592,-4.5496 -14.595,-8.6963 -3.534,-4.0482 -5.2536,-7.6815 -8.3323,-9.6166 -2.915,-1.8712 -6.7836,-1.8175 -8.7758,-3.7134 -0.8795,-0.8244 -0.7416,-2.2428 -1.6903,-4.1895 -1.466,-3.031 -3.9273,-4.7156 -2.099,-8.347 -3.3271,-1.7058 -3.4185,3.1689 -7.0595,2.539 -3.2443,-4.5974 -5.9868,-6.7756 -13.355,-5.4274 -3.3754,0.6192 -5.2589,4.8772 -9.1896,4.9831 -3.2254,0.2656 -5.759,-3.5856 -10.0175,-4.1895 -3.215,-0.4415 -6.8699,0.871 -9.1586,0.445 -3.5634,-0.7123 -4.6622,-3.6717 -7.9167,-5.8081 -2.3873,-1.5662 -7.0252,-4.232 -8.3636,-4.1893 -4.1964,0.2656 -7.1872,8.9006 -12.9738,5.8397 -2.8131,-3.557 4.581,-5.4314 1.2419,-8.7598 -2.5304,-2.5256 -4.6552,1.1435 -6.6784,2.5391 -2.3181,1.5988 -4.4965,3.1795 -7.0595,4.1259 -5.7349,2.1431 -9.319,1.0211 -13.8,3.3326 -4.1498,2.1455 -4.3274,5.7349 -6.6783,9.9975 -1.9214,3.4922 -6.3006,8.5808 -9.1896,8.7916 -3.4996,0.2655 -6.8439,-4.8829 -10.0175,-6.2526 -9.5605,-4.1334 -14.1916,3.6709 -22.1323,3.777 -7.3666,0.2656 -17.8911,-11.8751 -17.5202,-18.7891 0,-4.2187 2.4301,-10.6185 2.9252,-15.8371 0.4484,-4.1509 3.2908,-6.653 3.3391,-10.442 0,-5.0612 -6.7266,-8.9528 -10.0174,-9.5532 -7.7995,-1.4315 -18.6294,3.1322 -27.569,-0.445 -1.7075,-2.8238 1.9991,-4.775 2.958,-7.5219 0.5347,-1.5627 0.2242,-3.6462 0.7935,-5.3637 0.983,-2.6538 3.779,-4.7101 5.0242,-7.522 0.9314,-2.1457 1.1728,-5.2407 2.0991,-7.9028 1.0866,-3.0313 3.1046,-4.9835 3.3392,-7.1094 0.3104,-2.8071 -0.759,-6.0516 -2.9581,-7.9027 z m 111.6154,88.2004 c 2.8287,0.2656 3.1839,6.1003 0.2933,6.5698 -3.1201,0.4829 -4.7069,-4.8866 -1.6903,-6.2843 0.5174,-0.2655 1.0004,-0.2828 1.397,-0.2535 v -0.035 z"
id="use4632"
style="display:inline;fill:#7ebaff;fill-opacity:1;fill-rule:nonzero;stroke:none"
inkscape:connector-curvature="0">
@@ -98,7 +98,7 @@
sodipodi:nodetypes="cccccssccsccccssccsccccsccccc"
inkscape:connector-curvature="0"
id="qutebrowser-letterform-classical-clone"
- d="m -4845.3304,2264.927 -85.7148,51.123 0,130.7539 85.7148,-51.123 z m -149.0039,11.4375 c -78.5937,-0.4315 -227.4791,22.2666 -228.1386,190.8066 -0.8,204.4536 152.4167,157.7755 187.1425,137.1426 66.7691,-39.4285 135.559,-81.1427 198.5723,-118.0625 34.3158,-20.0731 98.5703,-33.1412 98.5703,61.1445 0,94.2857 -69.7669,123.5203 -107.1426,121.5 l 0,-159.2324 -85.7148,50.5879 0,181.7148 c 4.6167,0.947 22.0891,3.2468 46.1484,3.3789 78.5937,0.4315 227.4792,-22.2666 228.1387,-190.8066 0.8,-204.4536 -152.4167,-157.7755 -187.1426,-137.1426 -66.7691,39.4286 -135.5589,81.1428 -198.5722,118.0625 -34.3158,20.0731 -98.5703,33.1412 -98.5703,-61.1445 0,-94.2857 69.7669,-123.5203 107.1425,-121.5 l 0,159.2324 85.7149,-50.5879 0,-181.7148 c -4.6167,-0.947 -22.0892,-3.2468 -46.1485,-3.3789 z m 46.1485,298.541 -85.7149,51.123 0,130.7539 85.7149,-51.123 z"
+ d="m -4845.3304,2264.927 -85.7148,51.123 v 130.7539 l 85.7148,-51.123 z m -149.0039,11.4375 c -78.5937,-0.4315 -227.4791,22.2666 -228.1386,190.8066 -0.8,204.4536 152.4167,157.7755 187.1425,137.1426 66.7691,-39.4285 135.559,-81.1427 198.5723,-118.0625 34.3158,-20.0731 98.5703,-33.1412 98.5703,61.1445 0,94.2857 -69.7669,123.5203 -107.1426,121.5 v -159.2324 l -85.7148,50.5879 v 181.7148 c 4.6167,0.947 22.0891,3.2468 46.1484,3.3789 78.5937,0.4315 227.4792,-22.2666 228.1387,-190.8066 0.8,-204.4536 -152.4167,-157.7755 -187.1426,-137.1426 -66.7691,39.4286 -135.5589,81.1428 -198.5722,118.0625 -34.3158,20.0731 -98.5703,33.1412 -98.5703,-61.1445 0,-94.2857 69.7669,-123.5203 107.1425,-121.5 v 159.2324 l 85.7149,-50.5879 v -181.7148 c -4.6167,-0.947 -22.0892,-3.2468 -46.1485,-3.3789 z m 46.1485,298.541 -85.7149,51.123 v 130.7539 l 85.7149,-51.123 z"
style="fill:#0a396e;fill-opacity:1;fill-rule:evenodd">
<title
id="title4559">qutebrowser-letterform-classical</title>
diff --git a/misc/qutebrowser.desktop b/misc/qutebrowser.desktop
index 9768039159..5836a5e483 100644
--- a/misc/qutebrowser.desktop
+++ b/misc/qutebrowser.desktop
@@ -48,6 +48,7 @@ Terminal=false
StartupNotify=false
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/qute;
Keywords=Browser
+Actions=new-window;preferences;
[Desktop Action new-window]
Name=New Window
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 63722a679d..5e2880ce2e 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,5 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-PyQt5==5.12
-PyQt5-sip==4.19.14
-PyQtWebEngine==5.12
+PyQt5==5.12.1
+PyQt5-sip==4.19.15
+PyQtWebEngine==5.12.1
diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 7135756469..43e9d0a86b 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@
__license__ = "GPL"
__maintainer__ = __author__
__email__ = "m...@qutebrowser.org"
-__version_info__ = (1, 6, 0)
+__version_info__ = (1, 6, 1)
__version__ = '.'.join(str(e) for e in __version_info__)
__description__ = "A keyboard-driven, vim-like browser based on PyQt5."
diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py
index 132005878a..f622ee57b4 100644
--- a/qutebrowser/browser/webengine/webenginequtescheme.py
+++ b/qutebrowser/browser/webengine/webenginequtescheme.py
@@ -163,6 +163,7 @@ def init():
classes.
"""
if QWebEngineUrlScheme is not None:
+ assert not QWebEngineUrlScheme.schemeByName(b'qute').name()
scheme = QWebEngineUrlScheme(b'qute')
scheme.setFlags(QWebEngineUrlScheme.LocalScheme |
QWebEngineUrlScheme.LocalAccessAllowed)
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 410d415d5e..d674401e11 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -152,9 +152,8 @@ def bind(self, win_id: str, key: str = None, command: str = None, *,
key: The keychain to bind. Examples of valid keychains are `gC`,
`<Ctrl-X>` or `<Ctrl-C>a`.
command: The command to execute, with optional args.
- mode: A comma-separated list of modes to bind the key in
- (default: `normal`). See `:help bindings.commands` for the
- available modes.
+ mode: The mode to bind the key in (default: `normal`). See `:help
+ bindings.commands` for the available modes.
default: If given, restore a default binding.
"""
if key is None:
@@ -193,7 +192,7 @@ def unbind(self, key: str, *, mode: str = 'normal') -> None:
Args:
key: The keychain to unbind. See the help for `:bind` for the
correct syntax for keychains.
- mode: A mode to unbind the key in (default: `normal`).
+ mode: The mode to unbind the key in (default: `normal`).
See `:help bindings.commands` for the available modes.
"""
with self._handle_config_error():
@@ -275,7 +274,8 @@ def config_list_add(self, option: str, value: str,
value: The value to append to the end of the list.
temp: Add value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
valid_list_types = (configtypes.List, configtypes.ListOrValue)
if not isinstance(opt.typ, valid_list_types):
raise cmdutils.CommandError(":config-list-add can only be used "
@@ -300,7 +300,8 @@ def config_dict_add(self, option: str, key: str, value: str,
replace: Replace existing values. By default, existing values are
not overwritten.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
if not isinstance(opt.typ, configtypes.Dict):
raise cmdutils.CommandError(":config-dict-add can only be used "
"for dicts")
@@ -327,7 +328,8 @@ def config_list_remove(self, option: str, value: str,
value: The value to remove from the list.
temp: Remove value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
valid_list_types = (configtypes.List, configtypes.ListOrValue)
if not isinstance(opt.typ, valid_list_types):
raise cmdutils.CommandError(":config-list-remove can only be used "
@@ -355,7 +357,8 @@ def config_dict_remove(self, option: str, key: str,
key: The key to remove from the dict.
temp: Remove value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
if not isinstance(opt.typ, configtypes.Dict):
raise cmdutils.CommandError(":config-dict-remove can only be used "
"for dicts")
diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index cb1bb1fcbe..f4af6914b5 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -60,3 +60,4 @@ rules:
max-lines-per-function: "off"
require-unicode-regexp: "off"
max-params: "off"
+ prefer-named-capture-group: "off"
diff --git a/qutebrowser/javascript/global_wrapper.js b/qutebrowser/javascript/global_wrapper.js
index a302bd5d15..0762fd85d8 100644
--- a/qutebrowser/javascript/global_wrapper.js
+++ b/qutebrowser/javascript/global_wrapper.js
@@ -1,6 +1,6 @@
(function() {
"use strict";
- if (!("_qutebrowser" in window)) {
+ if (!window.hasOwnProperty("_qutebrowser")) {
window._qutebrowser = {"initialized": {}};
}
diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py
index 545d6d288f..5b1b178476 100644
--- a/qutebrowser/mainwindow/statusbar/bar.py
+++ b/qutebrowser/mainwindow/statusbar/bar.py
@@ -101,9 +101,12 @@ def _generate_stylesheet():
QWidget#StatusBar QLabel,
QWidget#StatusBar QLineEdit {
font: {{ conf.fonts.statusbar }};
- background-color: {{ conf.colors.statusbar.normal.bg }};
color: {{ conf.colors.statusbar.normal.fg }};
}
+
+ QWidget#StatusBar {
+ background-color: {{ conf.colors.statusbar.normal.bg }};
+ }
"""
for flag, option in flags:
stylesheet += """
@@ -111,10 +114,13 @@ def _generate_stylesheet():
QWidget#StatusBar[color_flags~="%s"] QLabel,
QWidget#StatusBar[color_flags~="%s"] QLineEdit {
color: {{ conf.colors.%s }};
+ }
+
+ QWidget#StatusBar[color_flags~="%s"] {
background-color: {{ conf.colors.%s }};
}
""" % (flag, flag, flag, # noqa: S001
- option + '.fg', option + '.bg')
+ option + '.fg', flag, option + '.bg')
return stylesheet
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index f51f221a3c..e50220c51b 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -415,7 +415,7 @@ def qnam(qapp):
@pytest.fixture
-def webengineview(qtbot, monkeypatch):
+def webengineview(qtbot, monkeypatch, web_tab_setup):
"""Get a QWebEngineView if QtWebEngine is available."""
QtWebEngineWidgets = pytest.importorskip('PyQt5.QtWebEngineWidgets')
monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebEngine)
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index 7eea8ffa72..5746586e78 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -30,7 +30,9 @@
@pytest.fixture(autouse=True)
-def init(qapp, config_stub, cache_tmpdir, data_tmpdir):
+def init(qapp, config_stub, cache_tmpdir, data_tmpdir, monkeypatch):
+ monkeypatch.setattr(webenginesettings.webenginequtescheme, 'init',
+ lambda: None)
init_args = types.SimpleNamespace(enable_webengine_inspector=False)
webenginesettings.init(init_args)
config_stub.changed.disconnect(webenginesettings._update_settings)
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index e7140bd116..1b91943c58 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -299,6 +299,12 @@ def test_list_add(self, commands, config_stub, yaml_value, temp, value):
else:
assert yaml_value(name)[-1] == value
+ def test_list_add_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_list_add('nonexistent', 'value')
+
def test_list_add_non_list(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -342,6 +348,12 @@ def test_dict_add_replace(self, commands, config_stub, replace):
"overwrite!"):
commands.config_dict_add(name, key, value, replace=False)
+ def test_dict_add_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_dict_add('nonexistent', 'key', 'value')
+
def test_dict_add_non_dict(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -371,6 +383,12 @@ def test_list_remove(self, commands, config_stub, yaml_value, value, temp):
else:
assert value not in yaml_value(name)
+ def test_list_remove_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_list_remove('nonexistent', 'value')
+
def test_list_remove_non_list(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -396,6 +414,12 @@ def test_dict_remove(self, commands, config_stub, yaml_value, key, temp):
else:
assert key not in yaml_value(name)
+ def test_dict_remove_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_dict_remove('nonexistent', 'key')
+
def test_dict_remove_non_dict(self, commands):
with pytest.raises(
cmdutils.CommandError,
diff --git a/tox.ini b/tox.ini
index 52665dcf98..a835eeec5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,8 @@ deps =
pyqt59: PyQt5==5.9.2
pyqt510: PyQt5==5.10.1
pyqt511: PyQt5==5.11.3
- pyqt512: PyQtWebEngine==5.12
+ pyqt512: PyQt5==5.12.1
+ pyqt512: PyQtWebEngine==5.12.1
commands =
{envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -bb -m pytest {posargs:tests}
We can also provide a proper Debian bug report for these issues if
necessary.
So if that IMHO rather small upstream diff would be ok for buster,
please tell us and we'd prepare an according upload of 1.6.1-1 and post
the exact source debdiff.
Otherwise, if you think that's out of scope for buster (which I'd
understand), I'd ask for pre-approval of an 1.6.0-2 upload with some
cherry-picked changes (crash + desktop/svg fixes + tiny fixes + doc
fixes).
I currently imagine the following changes for a potential 1.6.0-2 upload
(which are about 2/3 of the difference between 1.6.0 and 1.6.1) and we
will provide a full debdiff once we know which kind of upload we need to
prepare:
1) Documentation fixes:
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 2d71a28c13..f0328f2c64 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -165,8 +165,7 @@ If no command is given, show the current binding for the
given key. Using :bind
* +'command'+: The command to execute, with optional args.
==== optional arguments
-* +*-m*+, +*--mode*+: A comma-separated list of modes to bind the key in
(default: `normal`). See `:help bindings.commands` for the
- available modes.
+* +*-m*+, +*--mode*+: The mode to bind the key in (default: `normal`). See
`:help bindings.commands` for the available modes.
* +*-d*+, +*--default*+: If given, restore a default binding.
@@ -1425,7 +1424,7 @@ Unbind a keychain.
==== optional arguments
-* +*-m*+, +*--mode*+: A mode to unbind the key in (default: `normal`). See
`:help bindings.commands` for the available modes.
+* +*-m*+, +*--mode*+: The mode to unbind the key in (default: `normal`). See
`:help bindings.commands` for the available modes.
[[undo]]
2) SVG conformance fixes (basically a just changing the scaling):
diff --git a/icons/qutebrowser.svg b/icons/qutebrowser.svg
index 47ef97b75a..b26c80c2b1 100644
--- a/icons/qutebrowser.svg
+++ b/icons/qutebrowser.svg
@@ -9,13 +9,13 @@
xmlns="http://www.w3.org/2000/svg";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="650.00012"
- height="650.00018"
- viewBox="0 0 650.0001 650.00015"
+ width="256"
+ height="256"
+ viewBox="0 0 255.99999 255.99999"
id="svg4546"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="qutebrowser-logo.svg">
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="qutebrowser.svg">
<defs
id="defs4548" />
<sodipodi:namedview
@@ -57,12 +57,12 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(522.14287,-798.7907)">
+ transform="translate(522.14287,-1192.7909)">
<g
style="display:inline"
id="qutebrowser-logo"
inkscape:label="qutebrowser-logo"
- transform="translate(4742.4729,-1387.0639)">
+ transform="matrix(0.39384608,0,0,0.39384608,1551.3054,331.90062)">
<title
id="title4674">qutebrowser-logo</title>
<g
@@ -85,7 +85,7 @@
<path
inkscape:label="qutebrowser-planet-continents"
sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccscccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
- d="m -4950.1256,627.7519 c -41.0721,0 -80.1642,7.8197
-116.2898,21.5501 -2.6285,2.4104 -6.0419,4.2605 -8.7446,4.0308 -0.3622,-0.035
-0.7417,-0.2759 -1.1039,-0.4122 -17.8083,7.4364 -34.7008,16.5478
-50.7206,26.8822 2.0836,3.372 2.7009,7.1265 -1.5867,8.9502 -0.7245,0.3122
-9.2508,1.4737 -12.4142,1.396 -45.5513,33.0344 -81.4206,77.1046
-104.7757,128.9723 0.3794,-0.052 2.145,-0.2091 2.5243,-0.235 3.5446,-0.052
6.0115,1.0555 9.4162,1.7696 3.1408,0.6451 5.6744,2.7474 8.3945,2.9516
7.7149,0.5847 9.5725,-5.4041 15.8679,-8.7597 6.5042,0.9175 10.8196,-1.0988
16.6942,-0.4451 4.0032,0.4416 6.8956,4.7123 10.0157,4.9514 2.6252,0.2655
4.9329,-2.4512 7.4735,-2.0631 2.4681,0.3795 6.7215,5.7499 7.1233,8.7597
0.5002,3.7465 -2.7614,7.1204 -1.6903,11.2353 3.9308,3.997 11.0748,4.8067
16.6941,7.1093 3.6583,-3.009 0.483,-8.5931 0,-12.9491 0,-1.9169 0.2587,-3.6285
0,-5.3955 -0.3449,-2.9998 -1.6214,-5.748 -1.6558,-8.3153 0,-11.8579
9.5846,-17.4074 17.5532,-22.0899 3.4495,-2.0413 6.1661,-5.6155 9.1584,-7.1093
4.2275,-2.1158 7.3752,-2.6075 10.8748,-4.5703 6.3248,-3.5458 11.7493,-6.3922
16.6941,-10.41 2.2871,-5.3767 0.2243,-12.5866 0.414,-17.9005 2.2887,-1.3987
4.2516,0.602 6.6783,0.4123 3.817,-0.7917 4.1326,-6.1688 6.2955,-8.3153
1.259,-1.2298 4.7018,-2.1112 6.2645,-3.3326 3.8031,-2.9781 5.0415,-7.4763
8.3634,-8.7596 1.1902,-0.4812 3.9412,-0.3501 5.8195,-0.8572 2.4715,-0.6537
5.9901,-3.5737 10.0158,-4.9513 2.625,-0.9159 8.6342,-1.0918 9.6362,-2.0947
1.2247,-1.2574 0,-4.7832 0.414,-6.6648 2.0249,-9.407 16.2216,-11.4008
24.6126,-14.5679 5.8815,-2.2253 11.9182,-6.297 18.3792,-5.0465 -1.259,4.4706
-7.2837,2.8868 -6.2644,8.3155 1.4144,7.5338 11.518,-2.1589 14.1829,-3.269
5.095,-2.1433 13.8276,-3.4516 20.5111,-5.8718 5.859,-2.1431 16.3664,-5.402
10.8436,-12.0922 -4.6068,-0.2656 -6.8283,5.3958 -10.8436,7.1094 -2.7735,0.4415
-2.2457,-2.3165 -4.6104,-2.5391 -2.2509,-0.2655 -3.5099,2.0717 -5.8194,1.6817
-2.2974,-0.3777 -5.5244,-3.9842 -5.8831,-6.665 -0.9143,-6.9564 5.89,-9.8241
8.7756,-15.0122 -1.9076,-6.2923 -10.6281,-1.2816 -15.8991,-3.7451
0.5002,-3.7461 4.3931,-6.3297 8.7775,-7.046 3.5926,-0.6071 11.6594,-0.2967
13.7998,1.6179 1.242,1.0538 0,3.6801 2.0992,5.4273 2.1266,1.9171 4.743,1.7196
7.5044,1.2694 1.0004,-4.7481 -6.1867,-3.5571 -5.4054,-6.6967 5.6401,-3.6822
14.8141,-0.659 21.7184,-1.6817 3.974,-0.5847 8.1479,-3.3855 11.6698,-5.3638
3.3496,-1.9053 7.703,-5.2108 11.2578,-2.0948 0.9658,3.4033 -3.096,4.5293
-4.9934,6.2207 -6.3885,5.6721 -12.9685,12.1696 -17.9342,18.7573 3.0461,2.9656
8.5825,1.4798 13.7362,2.0947 2.0162,0.2656 4.5482,0.8624 6.6784,1.2384
2.4888,0.4415 5.1414,0.3173 7.0904,0.8245 3.5083,0.8572 4.4465,4.602
7.9185,4.602 5.7125,-0.011 5.7798,-6.177 2.5442,-10.0294 1.0175,-3.9329
2.6232,-5.9727 1.2418,-8.7279 -2.5734,-5.1363 -12.0114,-0.2656 -12.4979,-6.665
-0.3104,-4.1548 3.4841,-3.9692 4.9933,-7.0775 -0.6898,-8.0283 6.5973,-8.6099
5.8194,-15.8057 -0.345,-3.0099 -2.8804,-3.0515 -4.9932,-5.8716 -1.0521,-1.3868
-1.6041,-4.0437 -2.8287,-5.2368 -9.7432,-0.8676 -19.5969,-1.3971
-29.573,-1.3971 z m -168.0262,65.5708 0,0 c 1.9438,0.2812 4.2912,2.3608
6.6455,2.5392 2.2302,0.052 4.0653,-1.2263 5.4381,-0.8573 3.4911,0.9176
4.9623,6.1806 1.6904,8.7596 -2.7303,0.3415 -3.7945,-1.1815 -5.8504,-0.8244
-5.6711,0.9607 -7.8461,12.0465 -12.0838,11.6796 -3.9964,-0.3415
-6.1592,-10.0559 -2.0991,-12.9491 0.2588,-2.5259 -1.8473,-2.9313
-1.7247,-5.4273 1.2073,-1.5351 4.6291,-3.1868 7.9495,-2.9199 z m
-18.7933,1.3006 c 1.1557,0.035 2.0352,0.319 2.4802,0.8261 -0.5518,4.4413
-4.0359,4.1503 -7.4734,6.2206 -5.935,3.5758 -9.3673,9.0244 -11.2559,16.6626
-0.5519,2.2252 -6.3972,8.1111 -9.2224,7.522 -6.6197,-1.3936 1.8265,-13.5736
3.3392,-15.4248 1.673,-2.052 3.9135,-3.8515 5.8832,-6.2207 1.9094,-2.2942
3.1529,-5.3917 4.9915,-6.6649 2.0163,-1.3937 7.7701,-3.0536 11.2576,-2.9201 z m
49.4149,14.9805 c 2.1216,0.035 4.0275,0.3811 4.8967,1.2383 -1.3624,5.5031
-13.2394,4.0501 -17.5842,2.0631 0.2761,-2.0751 3.5325,-2.6463 6.2644,-2.9199
1.9215,-0.052 4.3068,-0.445 6.4231,-0.3812 z m -27.0289,10.1561 c 1.4142,-0.035
2.8424,0.2725 4.3257,0.6658 -3.8429,3.2081 -7.9978,5.0254 -14.5968,7.1093
-3.1719,0.9969 -8.6515,2.2398 -9.1896,-1.3022 -0.6554,-4.3341 4.6396,-3.3255
7.5356,-3.7133 3.6479,-0.5053 7.6527,-2.6247 11.9251,-2.7611 z m
414.6595,24.6923 c -0.5003,1.1798 -0.8624,2.3483 -0.7934,3.4911 0.2586,2.011
2.4647,3.9451 2.9562,6.6651 0.2587,1.4402 -0.6726,4.5568 0,5.8716 2.0111,3.8912
7.2717,1.0918 11.0352,1.3005 -4.2758,-5.8758 -8.5447,-11.7617 -13.1963,-17.3292
z m 21.3372,28.6596 c -0.6037,2.871 -2.5545,6.6159 -4.1344,9.0136
-3.6392,5.5245 -8.5825,5.7821 -13.8017,8.728 -4.3515,2.4625 -6.2246,6.5714
-8.7756,10.8543 -2.7649,4.6264 -4.4776,7.4212 -3.3393,14.1237 -3.7306,7.3859
-9.3794,11.9111 -17.108,15.4246 -2.2854,1.0279 -5.4072,1.4075 -7.5045,2.9198
-1.6731,1.1971 -2.62,4.4166 -4.9916,7.0776 -2.9286,3.2523 -5.997,4.6247
-7.5372,7.1094 -1.1901,1.9172 -1.6041,5.7387 -2.9253,8.3155 -1.7817,3.4997
-5.5779,5.2139 -7.9184,8.7597 -1.0694,1.6402 -1.7765,4.962 -2.9563,7.1094
-2.6441,4.7974 -7.1629,8.2537 -6.6784,12.4729 0.483,4.0778 5.1209,4.7925
5.4382,8.3472 0,2.0094 -1.3279,3.2372 -1.2418,5.4273 0,3.1973 2.2267,5.4424
2.4804,7.9029 0.6208,6.1864 -2.1096,8.6552 -3.2755,12.8856 -0.5519,2.0199
-0.3105,4.2935 -0.8624,5.8716 -1.0176,3.097 -5.352,5.8917 -5.4364,9.5532
0,2.6018 2.6734,4.6945 2.8924,8.347 0,2.5181 -1.2419,5.2066 -0.7934,7.522
0.8969,4.5343 8.9981,9.8071 12.5288,13.3299 4.7241,4.7143 10.9075,8.3632
12.9428,13.3301 1.7074,4.218 1.7074,9.7066 4.9914,12.8857 2.4354,2.3474
6.4852,3.8108 9.6036,6.2523 2.9097,2.2793 6.0799,4.2466 9.1896,6.665
5.083,3.9677 12.7651,11.8768 20.8613,11.2672 4.2274,-0.3088 8.56,-3.7519
13.3549,-4.6021 4.9329,-0.8831 11.3353,-1.3367 16.3132,-0.8245 3.8117,0.3778
7.739,2.6575 11.7026,2.4756 4.1843,-0.2656 8.9826,-3.3542 13.7361,-5.4272
3.8256,-1.6627 8.5204,-3.5035 13.6741,-4.8559 2.3629,-15.8527 3.6254,-32.0934
3.6254,-48.6229 0,-66.5467 -19.9367,-128.2271 -54.0581,-179.6379 z m
-538.5485,109.2108 c -6.9354,0.3794 -11.4802,0.6933 -15.4214,2.4756
-9.0343,4.1032 -7.2888,16.2872 -16.3129,19.17 -3.1218,0.9952 -7.4078,1.0435
-10.8436,1.6817 -2.9666,0.5416 -6.58,2.1592 -9.6364,2.0947 -0.8623,-0.012
-0.9086,-0.1949 -1.9727,-0.5329 -0.8094,5.1109 -1.7261,11.4288 -1.9674,17.1894
8.5859,1.6421 11.8706,12.6558 19.4597,16.4136 2.0783,1.0279 4.7949,1.0831
7.4717,1.6816 2.1612,0.4813 3.8015,1.3954 5.8833,2.0948 4.4154,1.4971
9.8243,1.316 13.3549,2.888 5.3226,2.3575 9.2242,12.3399 13.8017,15.0123
0.2587,2.6927 -0.5174,6.3076 0.414,8.3153 2.161,2.9264 5.2157,2.2813
8.7774,4.1895 4.2602,2.2942 5.564,8.2185 9.6036,10.0292 1.397,0.6173
4.8879,0.5381 7.0904,1.2055 5.5349,1.6714 7.3407,8.0618 12.0838,6.6651
3.1115,-0.9159 2.8665,-4.1093 3.3702,-7.0777 2.0559,-2.2251 4.2998,-5.7455
7.5045,-5.8079 5.1882,-0.2656 5.6486,5.3497 7.5373,10.3783 1.0693,2.8416
3.8514,5.3181 4.5793,8.3155 1.2936,5.1777 0.6554,20.6767 -0.4485,23.7718
-1.3108,3.7966 -6.4593,5.4072 -9.6346,9.6167 -1.5005,1.9737 -2.2112,4.8651
-3.3392,6.2524 -2.0438,2.4836 -5.0829,3.1344 -6.6128,5.4271 -0.8624,1.2919
-1.7075,4.0628 -2.544,5.8082 -2.5078,5.302 -5.8625,9.059 -3.753,15.4246
0.8795,2.6203 4.9828,4.3749 4.9931,7.4586 0.01,3.6279 -7.7321,6.8765
-8.3323,10.8543 -0.4484,2.9592 2.3991,8.2414 3.3392,12.0922 0.6899,2.9102
6.1987,4.7294 7.9183,6.6651 2.9304,3.284 5.2727,7.9361 7.9495,12.0606
5.2933,8.1125 9.4414,18.0066 14.5951,25.8666 2.7251,4.1168 6.549,7.8185
8.3634,12.0922 0.9315,2.1567 0.7934,4.7271 1.6558,6.665 2.9839,6.7213
16.1595,13.7388 22.9586,17.0751 3.1839,1.542 6.7145,2.0988 9.6345,3.7134
4.4242,2.4626 13.1895,9.0768 15.4231,12.949 1.9887,3.4807 3.2305,11.9529
4.198,17.4879 1.2938,7.3142 0.014,12.9303 0.4139,20.852 0.2589,4.2833
1.6388,8.5912 1.6905,12.8855 0.016,1.5023 -0.9177,1.4423 -0.9867,2.977 l
0.183,1.6086 c 40.8841,18.7713 86.3906,29.4377 134.4827,29.4377 8.6876,0
17.2623,-0.3073 25.7759,-0.9678 0.3794,-0.64 0.7374,-1.4468 1.1858,-2.0472
1.9594,-2.5675 3.6996,-4.8164 4.9933,-7.0776 1.2245,-7.6081 -3.0408,-12.9227
-1.242,-19.5825 1.9922,-7.4808 12.3565,-12.0496 19.6195,-15.4246 2.4991,-1.1591
5.0554,-3.0401 7.0906,-3.7453 5.0276,-1.7457 11.3041,-0.8019 15.8989,-2.4755
7.8237,-2.8571 8.6395,-11.2315 12.4979,-18.3446 1.8179,-3.3687 4.2223,-6.7415
4.5792,-9.1406 0.3105,-2.1569 -0.7934,-4.1855 -0.4485,-6.7285 0.3796,-2.5179
2.639,-4.6928 3.3393,-7.4585 0.9141,-3.6092 1.3108,-8.8969 1.3108,-12.9173
0,-3.3 -1.5523,-6.1955 -1.6903,-9.1723 -0.5347,-10.8083 3.9118,-12.0181
7.9185,-17.9004 2.0111,-2.9221 2.763,-6.253 4.1653,-8.3472 6.7267,-10.0161
18.3983,-14.8516 17.5531,-29.9926 -0.276,-5.0101 -3.4288,-16.3326
-7.1233,-17.9319 -2.1129,-0.9176 -6.9595,-0.052 -10.0159,-1.2383
-9.8674,-3.6742 -15.6592,-15.883 -25.8837,-16.6626 -2.1854,-0.2656
-4.1896,0.8952 -6.6473,0.8572 -4.0464,-0.2656 -10.1469,-2.8293 -14.6262,-3.3326
-2.8476,-0.3087 -6.6542,0.8469 -8.3634,0 -2.608,-1.2642 -2.8718,-6.0604
-4.9932,-7.4901 -1.6731,-1.1556 -4.9536,-1.5523 -7.5047,-2.539 -4.1118,-1.5765
-7.3716,-3.4153 -12.1147,-3.7452 -1.4661,-0.052 -3.2874,0.702 -4.9933,0.4449
-2.625,-0.4415 -4.7,-3.5433 -7.1216,-5.0146 -3.0338,-1.8429 -5.8383,-2.7346
-7.0923,-5.3636 2.7424,-8.9754 -4.8346,-11.477 -6.6782,-16.6626 -0.8798,-2.4301
-0.483,-5.3543 -1.242,-7.5219 -1.0866,-3.1051 -4.1636,-4.8998 -7.5355,-7.4903
-6.042,-4.6406 -11.3991,-8.9981 -20.0333,-10.0609 -3.7963,-0.4812
-7.5614,1.1349 -12.1477,0.8572 -4.8587,-0.3087 -10.9592,-4.5496 -14.595,-8.6963
-3.534,-4.0482 -5.2536,-7.6815 -8.3323,-9.6166 -2.915,-1.8712 -6.7836,-1.8175
-8.7758,-3.7134 -0.8795,-0.8244 -0.7416,-2.2428 -1.6903,-4.1895 -1.466,-3.031
-3.9273,-4.7156 -2.099,-8.347 -3.3271,-1.7058 -3.4185,3.1689 -7.0595,2.539
-3.2443,-4.5974 -5.9868,-6.7756 -13.355,-5.4274 -3.3754,0.6192 -5.2589,4.8772
-9.1896,4.9831 -3.2254,0.2656 -5.759,-3.5856 -10.0175,-4.1895 -3.215,-0.4415
-6.8699,0.871 -9.1586,0.445 -3.5634,-0.7123 -4.6622,-3.6717 -7.9167,-5.8081
-2.3873,-1.5662 -7.0252,-4.232 -8.3636,-4.1893 -4.1964,0.2656 -7.1872,8.9006
-12.9738,5.8397 -2.8131,-3.557 4.581,-5.4314 1.2419,-8.7598 -2.5304,-2.5256
-4.6552,1.1435 -6.6784,2.5391 -2.3181,1.5988 -4.4965,3.1795 -7.0595,4.1259
-5.7349,2.1431 -9.319,1.0211 -13.8,3.3326 -4.1498,2.1455 -4.3274,5.7349
-6.6783,9.9975 -1.9214,3.4922 -6.3006,8.5808 -9.1896,8.7916 -3.4996,0.2655
-6.8439,-4.8829 -10.0175,-6.2526 -9.5605,-4.1334 -14.1916,3.6709 -22.1323,3.777
-7.3666,0.2656 -17.8911,-11.8751 -17.5202,-18.7891 0,-4.2187 2.4301,-10.6185
2.9252,-15.8371 0.4484,-4.1509 3.2908,-6.653 3.3391,-10.442 0,-5.0612
-6.7266,-8.9528 -10.0174,-9.5532 -7.7995,-1.4315 -18.6294,3.1322 -27.569,-0.445
-1.7075,-2.8238 1.9991,-4.775 2.958,-7.5219 0.5347,-1.5627 0.2242,-3.6462
0.7935,-5.3637 0.983,-2.6538 3.779,-4.7101 5.0242,-7.522 0.9314,-2.1457
1.1728,-5.2407 2.0991,-7.9028 1.0866,-3.0313 3.1046,-4.9835 3.3392,-7.1094
0.3104,-2.8071 -0.759,-6.0516 -2.9581,-7.9027 z m 111.6154,88.2004 c
2.8287,0.2656 3.1839,6.1003 0.2933,6.5698 -3.1201,0.4829 -4.7069,-4.8866
-1.6903,-6.2843 0.5174,-0.2655 1.0004,-0.2828 1.397,-0.2535 l 0,-0.035 z"
+ d="m -4950.1256,627.7519 c -41.0721,0 -80.1642,7.8197
-116.2898,21.5501 -2.6285,2.4104 -6.0419,4.2605 -8.7446,4.0308 -0.3622,-0.035
-0.7417,-0.2759 -1.1039,-0.4122 -17.8083,7.4364 -34.7008,16.5478
-50.7206,26.8822 2.0836,3.372 2.7009,7.1265 -1.5867,8.9502 -0.7245,0.3122
-9.2508,1.4737 -12.4142,1.396 -45.5513,33.0344 -81.4206,77.1046
-104.7757,128.9723 0.3794,-0.052 2.145,-0.2091 2.5243,-0.235 3.5446,-0.052
6.0115,1.0555 9.4162,1.7696 3.1408,0.6451 5.6744,2.7474 8.3945,2.9516
7.7149,0.5847 9.5725,-5.4041 15.8679,-8.7597 6.5042,0.9175 10.8196,-1.0988
16.6942,-0.4451 4.0032,0.4416 6.8956,4.7123 10.0157,4.9514 2.6252,0.2655
4.9329,-2.4512 7.4735,-2.0631 2.4681,0.3795 6.7215,5.7499 7.1233,8.7597
0.5002,3.7465 -2.7614,7.1204 -1.6903,11.2353 3.9308,3.997 11.0748,4.8067
16.6941,7.1093 3.6583,-3.009 0.483,-8.5931 0,-12.9491 0,-1.9169 0.2587,-3.6285
0,-5.3955 -0.3449,-2.9998 -1.6214,-5.748 -1.6558,-8.3153 0,-11.8579
9.5846,-17.4074 17.5532,-22.0899 3.4495,-2.0413 6.1661,-5.6155 9.1584,-7.1093
4.2275,-2.1158 7.3752,-2.6075 10.8748,-4.5703 6.3248,-3.5458 11.7493,-6.3922
16.6941,-10.41 2.2871,-5.3767 0.2243,-12.5866 0.414,-17.9005 2.2887,-1.3987
4.2516,0.602 6.6783,0.4123 3.817,-0.7917 4.1326,-6.1688 6.2955,-8.3153
1.259,-1.2298 4.7018,-2.1112 6.2645,-3.3326 3.8031,-2.9781 5.0415,-7.4763
8.3634,-8.7596 1.1902,-0.4812 3.9412,-0.3501 5.8195,-0.8572 2.4715,-0.6537
5.9901,-3.5737 10.0158,-4.9513 2.625,-0.9159 8.6342,-1.0918 9.6362,-2.0947
1.2247,-1.2574 0,-4.7832 0.414,-6.6648 2.0249,-9.407 16.2216,-11.4008
24.6126,-14.5679 5.8815,-2.2253 11.9182,-6.297 18.3792,-5.0465 -1.259,4.4706
-7.2837,2.8868 -6.2644,8.3155 1.4144,7.5338 11.518,-2.1589 14.1829,-3.269
5.095,-2.1433 13.8276,-3.4516 20.5111,-5.8718 5.859,-2.1431 16.3664,-5.402
10.8436,-12.0922 -4.6068,-0.2656 -6.8283,5.3958 -10.8436,7.1094 -2.7735,0.4415
-2.2457,-2.3165 -4.6104,-2.5391 -2.2509,-0.2655 -3.5099,2.0717 -5.8194,1.6817
-2.2974,-0.3777 -5.5244,-3.9842 -5.8831,-6.665 -0.9143,-6.9564 5.89,-9.8241
8.7756,-15.0122 -1.9076,-6.2923 -10.6281,-1.2816 -15.8991,-3.7451
0.5002,-3.7461 4.3931,-6.3297 8.7775,-7.046 3.5926,-0.6071 11.6594,-0.2967
13.7998,1.6179 1.242,1.0538 0,3.6801 2.0992,5.4273 2.1266,1.9171 4.743,1.7196
7.5044,1.2694 1.0004,-4.7481 -6.1867,-3.5571 -5.4054,-6.6967 5.6401,-3.6822
14.8141,-0.659 21.7184,-1.6817 3.974,-0.5847 8.1479,-3.3855 11.6698,-5.3638
3.3496,-1.9053 7.703,-5.2108 11.2578,-2.0948 0.9658,3.4033 -3.096,4.5293
-4.9934,6.2207 -6.3885,5.6721 -12.9685,12.1696 -17.9342,18.7573 3.0461,2.9656
8.5825,1.4798 13.7362,2.0947 2.0162,0.2656 4.5482,0.8624 6.6784,1.2384
2.4888,0.4415 5.1414,0.3173 7.0904,0.8245 3.5083,0.8572 4.4465,4.602
7.9185,4.602 5.7125,-0.011 5.7798,-6.177 2.5442,-10.0294 1.0175,-3.9329
2.6232,-5.9727 1.2418,-8.7279 -2.5734,-5.1363 -12.0114,-0.2656 -12.4979,-6.665
-0.3104,-4.1548 3.4841,-3.9692 4.9933,-7.0775 -0.6898,-8.0283 6.5973,-8.6099
5.8194,-15.8057 -0.345,-3.0099 -2.8804,-3.0515 -4.9932,-5.8716 -1.0521,-1.3868
-1.6041,-4.0437 -2.8287,-5.2368 -9.7432,-0.8676 -19.5969,-1.3971
-29.573,-1.3971 z m -168.0262,65.5708 v 0 c 1.9438,0.2812 4.2912,2.3608
6.6455,2.5392 2.2302,0.052 4.0653,-1.2263 5.4381,-0.8573 3.4911,0.9176
4.9623,6.1806 1.6904,8.7596 -2.7303,0.3415 -3.7945,-1.1815 -5.8504,-0.8244
-5.6711,0.9607 -7.8461,12.0465 -12.0838,11.6796 -3.9964,-0.3415
-6.1592,-10.0559 -2.0991,-12.9491 0.2588,-2.5259 -1.8473,-2.9313
-1.7247,-5.4273 1.2073,-1.5351 4.6291,-3.1868 7.9495,-2.9199 z m
-18.7933,1.3006 c 1.1557,0.035 2.0352,0.319 2.4802,0.8261 -0.5518,4.4413
-4.0359,4.1503 -7.4734,6.2206 -5.935,3.5758 -9.3673,9.0244 -11.2559,16.6626
-0.5519,2.2252 -6.3972,8.1111 -9.2224,7.522 -6.6197,-1.3936 1.8265,-13.5736
3.3392,-15.4248 1.673,-2.052 3.9135,-3.8515 5.8832,-6.2207 1.9094,-2.2942
3.1529,-5.3917 4.9915,-6.6649 2.0163,-1.3937 7.7701,-3.0536 11.2576,-2.9201 z m
49.4149,14.9805 c 2.1216,0.035 4.0275,0.3811 4.8967,1.2383 -1.3624,5.5031
-13.2394,4.0501 -17.5842,2.0631 0.2761,-2.0751 3.5325,-2.6463 6.2644,-2.9199
1.9215,-0.052 4.3068,-0.445 6.4231,-0.3812 z m -27.0289,10.1561 c 1.4142,-0.035
2.8424,0.2725 4.3257,0.6658 -3.8429,3.2081 -7.9978,5.0254 -14.5968,7.1093
-3.1719,0.9969 -8.6515,2.2398 -9.1896,-1.3022 -0.6554,-4.3341 4.6396,-3.3255
7.5356,-3.7133 3.6479,-0.5053 7.6527,-2.6247 11.9251,-2.7611 z m
414.6595,24.6923 c -0.5003,1.1798 -0.8624,2.3483 -0.7934,3.4911 0.2586,2.011
2.4647,3.9451 2.9562,6.6651 0.2587,1.4402 -0.6726,4.5568 0,5.8716 2.0111,3.8912
7.2717,1.0918 11.0352,1.3005 -4.2758,-5.8758 -8.5447,-11.7617 -13.1963,-17.3292
z m 21.3372,28.6596 c -0.6037,2.871 -2.5545,6.6159 -4.1344,9.0136
-3.6392,5.5245 -8.5825,5.7821 -13.8017,8.728 -4.3515,2.4625 -6.2246,6.5714
-8.7756,10.8543 -2.7649,4.6264 -4.4776,7.4212 -3.3393,14.1237 -3.7306,7.3859
-9.3794,11.9111 -17.108,15.4246 -2.2854,1.0279 -5.4072,1.4075 -7.5045,2.9198
-1.6731,1.1971 -2.62,4.4166 -4.9916,7.0776 -2.9286,3.2523 -5.997,4.6247
-7.5372,7.1094 -1.1901,1.9172 -1.6041,5.7387 -2.9253,8.3155 -1.7817,3.4997
-5.5779,5.2139 -7.9184,8.7597 -1.0694,1.6402 -1.7765,4.962 -2.9563,7.1094
-2.6441,4.7974 -7.1629,8.2537 -6.6784,12.4729 0.483,4.0778 5.1209,4.7925
5.4382,8.3472 0,2.0094 -1.3279,3.2372 -1.2418,5.4273 0,3.1973 2.2267,5.4424
2.4804,7.9029 0.6208,6.1864 -2.1096,8.6552 -3.2755,12.8856 -0.5519,2.0199
-0.3105,4.2935 -0.8624,5.8716 -1.0176,3.097 -5.352,5.8917 -5.4364,9.5532
0,2.6018 2.6734,4.6945 2.8924,8.347 0,2.5181 -1.2419,5.2066 -0.7934,7.522
0.8969,4.5343 8.9981,9.8071 12.5288,13.3299 4.7241,4.7143 10.9075,8.3632
12.9428,13.3301 1.7074,4.218 1.7074,9.7066 4.9914,12.8857 2.4354,2.3474
6.4852,3.8108 9.6036,6.2523 2.9097,2.2793 6.0799,4.2466 9.1896,6.665
5.083,3.9677 12.7651,11.8768 20.8613,11.2672 4.2274,-0.3088 8.56,-3.7519
13.3549,-4.6021 4.9329,-0.8831 11.3353,-1.3367 16.3132,-0.8245 3.8117,0.3778
7.739,2.6575 11.7026,2.4756 4.1843,-0.2656 8.9826,-3.3542 13.7361,-5.4272
3.8256,-1.6627 8.5204,-3.5035 13.6741,-4.8559 2.3629,-15.8527 3.6254,-32.0934
3.6254,-48.6229 0,-66.5467 -19.9367,-128.2271 -54.0581,-179.6379 z m
-538.5485,109.2108 c -6.9354,0.3794 -11.4802,0.6933 -15.4214,2.4756
-9.0343,4.1032 -7.2888,16.2872 -16.3129,19.17 -3.1218,0.9952 -7.4078,1.0435
-10.8436,1.6817 -2.9666,0.5416 -6.58,2.1592 -9.6364,2.0947 -0.8623,-0.012
-0.9086,-0.1949 -1.9727,-0.5329 -0.8094,5.1109 -1.7261,11.4288 -1.9674,17.1894
8.5859,1.6421 11.8706,12.6558 19.4597,16.4136 2.0783,1.0279 4.7949,1.0831
7.4717,1.6816 2.1612,0.4813 3.8015,1.3954 5.8833,2.0948 4.4154,1.4971
9.8243,1.316 13.3549,2.888 5.3226,2.3575 9.2242,12.3399 13.8017,15.0123
0.2587,2.6927 -0.5174,6.3076 0.414,8.3153 2.161,2.9264 5.2157,2.2813
8.7774,4.1895 4.2602,2.2942 5.564,8.2185 9.6036,10.0292 1.397,0.6173
4.8879,0.5381 7.0904,1.2055 5.5349,1.6714 7.3407,8.0618 12.0838,6.6651
3.1115,-0.9159 2.8665,-4.1093 3.3702,-7.0777 2.0559,-2.2251 4.2998,-5.7455
7.5045,-5.8079 5.1882,-0.2656 5.6486,5.3497 7.5373,10.3783 1.0693,2.8416
3.8514,5.3181 4.5793,8.3155 1.2936,5.1777 0.6554,20.6767 -0.4485,23.7718
-1.3108,3.7966 -6.4593,5.4072 -9.6346,9.6167 -1.5005,1.9737 -2.2112,4.8651
-3.3392,6.2524 -2.0438,2.4836 -5.0829,3.1344 -6.6128,5.4271 -0.8624,1.2919
-1.7075,4.0628 -2.544,5.8082 -2.5078,5.302 -5.8625,9.059 -3.753,15.4246
0.8795,2.6203 4.9828,4.3749 4.9931,7.4586 0.01,3.6279 -7.7321,6.8765
-8.3323,10.8543 -0.4484,2.9592 2.3991,8.2414 3.3392,12.0922 0.6899,2.9102
6.1987,4.7294 7.9183,6.6651 2.9304,3.284 5.2727,7.9361 7.9495,12.0606
5.2933,8.1125 9.4414,18.0066 14.5951,25.8666 2.7251,4.1168 6.549,7.8185
8.3634,12.0922 0.9315,2.1567 0.7934,4.7271 1.6558,6.665 2.9839,6.7213
16.1595,13.7388 22.9586,17.0751 3.1839,1.542 6.7145,2.0988 9.6345,3.7134
4.4242,2.4626 13.1895,9.0768 15.4231,12.949 1.9887,3.4807 3.2305,11.9529
4.198,17.4879 1.2938,7.3142 0.014,12.9303 0.4139,20.852 0.2589,4.2833
1.6388,8.5912 1.6905,12.8855 0.016,1.5023 -0.9177,1.4423 -0.9867,2.977 l
0.183,1.6086 c 40.8841,18.7713 86.3906,29.4377 134.4827,29.4377 8.6876,0
17.2623,-0.3073 25.7759,-0.9678 0.3794,-0.64 0.7374,-1.4468 1.1858,-2.0472
1.9594,-2.5675 3.6996,-4.8164 4.9933,-7.0776 1.2245,-7.6081 -3.0408,-12.9227
-1.242,-19.5825 1.9922,-7.4808 12.3565,-12.0496 19.6195,-15.4246 2.4991,-1.1591
5.0554,-3.0401 7.0906,-3.7453 5.0276,-1.7457 11.3041,-0.8019 15.8989,-2.4755
7.8237,-2.8571 8.6395,-11.2315 12.4979,-18.3446 1.8179,-3.3687 4.2223,-6.7415
4.5792,-9.1406 0.3105,-2.1569 -0.7934,-4.1855 -0.4485,-6.7285 0.3796,-2.5179
2.639,-4.6928 3.3393,-7.4585 0.9141,-3.6092 1.3108,-8.8969 1.3108,-12.9173
0,-3.3 -1.5523,-6.1955 -1.6903,-9.1723 -0.5347,-10.8083 3.9118,-12.0181
7.9185,-17.9004 2.0111,-2.9221 2.763,-6.253 4.1653,-8.3472 6.7267,-10.0161
18.3983,-14.8516 17.5531,-29.9926 -0.276,-5.0101 -3.4288,-16.3326
-7.1233,-17.9319 -2.1129,-0.9176 -6.9595,-0.052 -10.0159,-1.2383
-9.8674,-3.6742 -15.6592,-15.883 -25.8837,-16.6626 -2.1854,-0.2656
-4.1896,0.8952 -6.6473,0.8572 -4.0464,-0.2656 -10.1469,-2.8293 -14.6262,-3.3326
-2.8476,-0.3087 -6.6542,0.8469 -8.3634,0 -2.608,-1.2642 -2.8718,-6.0604
-4.9932,-7.4901 -1.6731,-1.1556 -4.9536,-1.5523 -7.5047,-2.539 -4.1118,-1.5765
-7.3716,-3.4153 -12.1147,-3.7452 -1.4661,-0.052 -3.2874,0.702 -4.9933,0.4449
-2.625,-0.4415 -4.7,-3.5433 -7.1216,-5.0146 -3.0338,-1.8429 -5.8383,-2.7346
-7.0923,-5.3636 2.7424,-8.9754 -4.8346,-11.477 -6.6782,-16.6626 -0.8798,-2.4301
-0.483,-5.3543 -1.242,-7.5219 -1.0866,-3.1051 -4.1636,-4.8998 -7.5355,-7.4903
-6.042,-4.6406 -11.3991,-8.9981 -20.0333,-10.0609 -3.7963,-0.4812
-7.5614,1.1349 -12.1477,0.8572 -4.8587,-0.3087 -10.9592,-4.5496 -14.595,-8.6963
-3.534,-4.0482 -5.2536,-7.6815 -8.3323,-9.6166 -2.915,-1.8712 -6.7836,-1.8175
-8.7758,-3.7134 -0.8795,-0.8244 -0.7416,-2.2428 -1.6903,-4.1895 -1.466,-3.031
-3.9273,-4.7156 -2.099,-8.347 -3.3271,-1.7058 -3.4185,3.1689 -7.0595,2.539
-3.2443,-4.5974 -5.9868,-6.7756 -13.355,-5.4274 -3.3754,0.6192 -5.2589,4.8772
-9.1896,4.9831 -3.2254,0.2656 -5.759,-3.5856 -10.0175,-4.1895 -3.215,-0.4415
-6.8699,0.871 -9.1586,0.445 -3.5634,-0.7123 -4.6622,-3.6717 -7.9167,-5.8081
-2.3873,-1.5662 -7.0252,-4.232 -8.3636,-4.1893 -4.1964,0.2656 -7.1872,8.9006
-12.9738,5.8397 -2.8131,-3.557 4.581,-5.4314 1.2419,-8.7598 -2.5304,-2.5256
-4.6552,1.1435 -6.6784,2.5391 -2.3181,1.5988 -4.4965,3.1795 -7.0595,4.1259
-5.7349,2.1431 -9.319,1.0211 -13.8,3.3326 -4.1498,2.1455 -4.3274,5.7349
-6.6783,9.9975 -1.9214,3.4922 -6.3006,8.5808 -9.1896,8.7916 -3.4996,0.2655
-6.8439,-4.8829 -10.0175,-6.2526 -9.5605,-4.1334 -14.1916,3.6709 -22.1323,3.777
-7.3666,0.2656 -17.8911,-11.8751 -17.5202,-18.7891 0,-4.2187 2.4301,-10.6185
2.9252,-15.8371 0.4484,-4.1509 3.2908,-6.653 3.3391,-10.442 0,-5.0612
-6.7266,-8.9528 -10.0174,-9.5532 -7.7995,-1.4315 -18.6294,3.1322 -27.569,-0.445
-1.7075,-2.8238 1.9991,-4.775 2.958,-7.5219 0.5347,-1.5627 0.2242,-3.6462
0.7935,-5.3637 0.983,-2.6538 3.779,-4.7101 5.0242,-7.522 0.9314,-2.1457
1.1728,-5.2407 2.0991,-7.9028 1.0866,-3.0313 3.1046,-4.9835 3.3392,-7.1094
0.3104,-2.8071 -0.759,-6.0516 -2.9581,-7.9027 z m 111.6154,88.2004 c
2.8287,0.2656 3.1839,6.1003 0.2933,6.5698 -3.1201,0.4829 -4.7069,-4.8866
-1.6903,-6.2843 0.5174,-0.2655 1.0004,-0.2828 1.397,-0.2535 v -0.035 z"
id="use4632"
style="display:inline;fill:#7ebaff;fill-opacity:1;fill-rule:nonzero;stroke:none"
inkscape:connector-curvature="0">
@@ -98,7 +98,7 @@
sodipodi:nodetypes="cccccssccsccccssccsccccsccccc"
inkscape:connector-curvature="0"
id="qutebrowser-letterform-classical-clone"
- d="m -4845.3304,2264.927 -85.7148,51.123 0,130.7539 85.7148,-51.123 z
m -149.0039,11.4375 c -78.5937,-0.4315 -227.4791,22.2666 -228.1386,190.8066
-0.8,204.4536 152.4167,157.7755 187.1425,137.1426 66.7691,-39.4285
135.559,-81.1427 198.5723,-118.0625 34.3158,-20.0731 98.5703,-33.1412
98.5703,61.1445 0,94.2857 -69.7669,123.5203 -107.1426,121.5 l 0,-159.2324
-85.7148,50.5879 0,181.7148 c 4.6167,0.947 22.0891,3.2468 46.1484,3.3789
78.5937,0.4315 227.4792,-22.2666 228.1387,-190.8066 0.8,-204.4536
-152.4167,-157.7755 -187.1426,-137.1426 -66.7691,39.4286 -135.5589,81.1428
-198.5722,118.0625 -34.3158,20.0731 -98.5703,33.1412 -98.5703,-61.1445
0,-94.2857 69.7669,-123.5203 107.1425,-121.5 l 0,159.2324 85.7149,-50.5879
0,-181.7148 c -4.6167,-0.947 -22.0892,-3.2468 -46.1485,-3.3789 z m
46.1485,298.541 -85.7149,51.123 0,130.7539 85.7149,-51.123 z"
+ d="m -4845.3304,2264.927 -85.7148,51.123 v 130.7539 l 85.7148,-51.123
z m -149.0039,11.4375 c -78.5937,-0.4315 -227.4791,22.2666 -228.1386,190.8066
-0.8,204.4536 152.4167,157.7755 187.1425,137.1426 66.7691,-39.4285
135.559,-81.1427 198.5723,-118.0625 34.3158,-20.0731 98.5703,-33.1412
98.5703,61.1445 0,94.2857 -69.7669,123.5203 -107.1426,121.5 v -159.2324 l
-85.7148,50.5879 v 181.7148 c 4.6167,0.947 22.0891,3.2468 46.1484,3.3789
78.5937,0.4315 227.4792,-22.2666 228.1387,-190.8066 0.8,-204.4536
-152.4167,-157.7755 -187.1426,-137.1426 -66.7691,39.4286 -135.5589,81.1428
-198.5722,118.0625 -34.3158,20.0731 -98.5703,33.1412 -98.5703,-61.1445
0,-94.2857 69.7669,-123.5203 107.1425,-121.5 v 159.2324 l 85.7149,-50.5879 v
-181.7148 c -4.6167,-0.947 -22.0892,-3.2468 -46.1485,-3.3789 z m
46.1485,298.541 -85.7149,51.123 v 130.7539 l 85.7149,-51.123 z"
style="fill:#0a396e;fill-opacity:1;fill-rule:evenodd">
<title
id="title4559">qutebrowser-letterform-classical</title>
3) .desktop file syntax/misbehaving fixes
diff --git a/misc/qutebrowser.desktop b/misc/qutebrowser.desktop
index 9768039159..5836a5e483 100644
--- a/misc/qutebrowser.desktop
+++ b/misc/qutebrowser.desktop
@@ -48,6 +48,7 @@ Terminal=false
StartupNotify=false
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/qute;
Keywords=Browser
+Actions=new-window;preferences;
[Desktop Action new-window]
Name=New Window
4) Crash fixes + regression tests for the crash:
diff --git a/qutebrowser/config/configcommands.py
b/qutebrowser/config/configcommands.py
index 410d415d5e..d674401e11 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -152,9 +152,8 @@ def bind(self, win_id: str, key: str = None, command: str =
None, *,
key: The keychain to bind. Examples of valid keychains are `gC`,
`<Ctrl-X>` or `<Ctrl-C>a`.
command: The command to execute, with optional args.
- mode: A comma-separated list of modes to bind the key in
- (default: `normal`). See `:help bindings.commands` for the
- available modes.
+ mode: The mode to bind the key in (default: `normal`). See `:help
+ bindings.commands` for the available modes.
default: If given, restore a default binding.
"""
if key is None:
@@ -193,7 +192,7 @@ def unbind(self, key: str, *, mode: str = 'normal') -> None:
Args:
key: The keychain to unbind. See the help for `:bind` for the
correct syntax for keychains.
- mode: A mode to unbind the key in (default: `normal`).
+ mode: The mode to unbind the key in (default: `normal`).
See `:help bindings.commands` for the available modes.
"""
with self._handle_config_error():
@@ -275,7 +274,8 @@ def config_list_add(self, option: str, value: str,
value: The value to append to the end of the list.
temp: Add value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
valid_list_types = (configtypes.List, configtypes.ListOrValue)
if not isinstance(opt.typ, valid_list_types):
raise cmdutils.CommandError(":config-list-add can only be used "
@@ -300,7 +300,8 @@ def config_dict_add(self, option: str, key: str, value: str,
replace: Replace existing values. By default, existing values are
not overwritten.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
if not isinstance(opt.typ, configtypes.Dict):
raise cmdutils.CommandError(":config-dict-add can only be used "
"for dicts")
@@ -327,7 +328,8 @@ def config_list_remove(self, option: str, value: str,
value: The value to remove from the list.
temp: Remove value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
valid_list_types = (configtypes.List, configtypes.ListOrValue)
if not isinstance(opt.typ, valid_list_types):
raise cmdutils.CommandError(":config-list-remove can only be used "
@@ -355,7 +357,8 @@ def config_dict_remove(self, option: str, key: str,
key: The key to remove from the dict.
temp: Remove value temporarily until qutebrowser is closed.
"""
- opt = self._config.get_opt(option)
+ with self._handle_config_error():
+ opt = self._config.get_opt(option)
if not isinstance(opt.typ, configtypes.Dict):
raise cmdutils.CommandError(":config-dict-remove can only be used "
"for dicts")
diff --git a/tests/unit/config/test_configcommands.py
b/tests/unit/config/test_configcommands.py
index e7140bd116..1b91943c58 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -299,6 +299,12 @@ def test_list_add(self, commands, config_stub, yaml_value,
temp, value):
else:
assert yaml_value(name)[-1] == value
+ def test_list_add_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_list_add('nonexistent', 'value')
+
def test_list_add_non_list(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -342,6 +348,12 @@ def test_dict_add_replace(self, commands, config_stub,
replace):
"overwrite!"):
commands.config_dict_add(name, key, value, replace=False)
+ def test_dict_add_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_dict_add('nonexistent', 'key', 'value')
+
def test_dict_add_non_dict(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -371,6 +383,12 @@ def test_list_remove(self, commands, config_stub,
yaml_value, value, temp):
else:
assert value not in yaml_value(name)
+ def test_list_remove_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_list_remove('nonexistent', 'value')
+
def test_list_remove_non_list(self, commands):
with pytest.raises(
cmdutils.CommandError,
@@ -396,6 +414,12 @@ def test_dict_remove(self, commands, config_stub,
yaml_value, key, temp):
else:
assert key not in yaml_value(name)
+ def test_dict_remove_invalid_option(self, commands):
+ with pytest.raises(
+ cmdutils.CommandError,
+ match="No option 'nonexistent'"):
+ commands.config_dict_remove('nonexistent', 'key')
+
def test_dict_remove_non_dict(self, commands):
with pytest.raises(
cmdutils.CommandError,
5) Two tiny rendering/UI fixes
diff --git a/qutebrowser/javascript/global_wrapper.js
b/qutebrowser/javascript/global_wrapper.js
index a302bd5d15..0762fd85d8 100644
--- a/qutebrowser/javascript/global_wrapper.js
+++ b/qutebrowser/javascript/global_wrapper.js
@@ -1,6 +1,6 @@
(function() {
"use strict";
- if (!("_qutebrowser" in window)) {
+ if (!window.hasOwnProperty("_qutebrowser")) {
window._qutebrowser = {"initialized": {}};
}
diff --git a/qutebrowser/mainwindow/statusbar/bar.py
b/qutebrowser/mainwindow/statusbar/bar.py
index 545d6d288f..5b1b178476 100644
--- a/qutebrowser/mainwindow/statusbar/bar.py
+++ b/qutebrowser/mainwindow/statusbar/bar.py
@@ -101,9 +101,12 @@ def _generate_stylesheet():
QWidget#StatusBar QLabel,
QWidget#StatusBar QLineEdit {
font: {{ conf.fonts.statusbar }};
- background-color: {{ conf.colors.statusbar.normal.bg }};
color: {{ conf.colors.statusbar.normal.fg }};
}
+
+ QWidget#StatusBar {
+ background-color: {{ conf.colors.statusbar.normal.bg }};
+ }
"""
for flag, option in flags:
stylesheet += """
@@ -111,10 +114,13 @@ def _generate_stylesheet():
QWidget#StatusBar[color_flags~="%s"] QLabel,
QWidget#StatusBar[color_flags~="%s"] QLineEdit {
color: {{ conf.colors.%s }};
+ }
+
+ QWidget#StatusBar[color_flags~="%s"] {
background-color: {{ conf.colors.%s }};
}
""" % (flag, flag, flag, # noqa: S001
- option + '.fg', option + '.bg')
+ option + '.fg', flag, option + '.bg')
return stylesheet
-- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (990, 'unstable'), (600, 'testing'), (500, 'unstable-debug'),
(500, 'buildd-unstable'), (110, 'experimental'), (1, 'experimental-debug'), (1,
'buildd-experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=C.UTF-8
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
LSM: AppArmor: enabled
