From e9ed6456fd38abe6d9269bb4f3842c95dc11dfba Mon Sep 17 00:00:00 2001 From: Jimmy Date: Mon, 4 Apr 2022 17:35:04 +1200 Subject: Load icons via importlib.resources The PyQt resources system is gone in 6.2 and deprecated before that. This should be the last usage of it. Switches icons to be read with `utils.resources.read_file_binary()` in `notification.py` (fallback desktop notification icon) and `app.py` (icon for the desktop window). importlib only loads resources under a package, so the icons are moved under the `qutebrowser/` directory. Closes: #6062 --- MANIFEST.in | 2 +- README.asciidoc | 2 +- icons/qutebrowser-128x128.png | Bin 6426 -> 0 bytes icons/qutebrowser-16x16.png | Bin 856 -> 0 bytes icons/qutebrowser-24x24.png | Bin 1339 -> 0 bytes icons/qutebrowser-256x256.png | Bin 13690 -> 0 bytes icons/qutebrowser-32x32.png | Bin 1624 -> 0 bytes icons/qutebrowser-48x48.png | Bin 2399 -> 0 bytes icons/qutebrowser-512x512.png | Bin 30109 -> 0 bytes icons/qutebrowser-64x64.png | Bin 3179 -> 0 bytes icons/qutebrowser-96x96.png | Bin 4776 -> 0 bytes icons/qutebrowser-all.svg | 2183 ------------------------- icons/qutebrowser-favicon.svg | 107 -- icons/qutebrowser.icns | Bin 196205 -> 0 bytes icons/qutebrowser.ico | Bin 115490 -> 0 bytes icons/qutebrowser.svg | 108 -- icons/qutebrowser.xpm | 302 ---- misc/Makefile | 2 +- misc/qutebrowser.rcc | 13 - misc/qutebrowser.spec | 4 +- qutebrowser/app.py | 5 +- qutebrowser/browser/webengine/notification.py | 8 +- qutebrowser/icons/qutebrowser-128x128.png | Bin 0 -> 6426 bytes qutebrowser/icons/qutebrowser-16x16.png | Bin 0 -> 856 bytes qutebrowser/icons/qutebrowser-24x24.png | Bin 0 -> 1339 bytes qutebrowser/icons/qutebrowser-256x256.png | Bin 0 -> 13690 bytes qutebrowser/icons/qutebrowser-32x32.png | Bin 0 -> 1624 bytes qutebrowser/icons/qutebrowser-48x48.png | Bin 0 -> 2399 bytes qutebrowser/icons/qutebrowser-512x512.png | Bin 0 -> 30109 bytes qutebrowser/icons/qutebrowser-64x64.png | Bin 0 -> 3179 bytes qutebrowser/icons/qutebrowser-96x96.png | Bin 0 -> 4776 bytes qutebrowser/icons/qutebrowser-all.svg | 2183 +++++++++++++++++++++++++ qutebrowser/icons/qutebrowser-favicon.svg | 107 ++ qutebrowser/icons/qutebrowser.icns | Bin 0 -> 196205 bytes qutebrowser/icons/qutebrowser.ico | Bin 0 -> 115490 bytes qutebrowser/icons/qutebrowser.svg | 108 ++ qutebrowser/icons/qutebrowser.xpm | 302 ++++ scripts/asciidoc2html.py | 6 +- scripts/dev/gen_resources.py | 30 - tests/end2end/fixtures/webserver_sub.py | 2 +- 40 files changed, 2719 insertions(+), 2755 deletions(-) delete mode 100644 icons/qutebrowser-128x128.png delete mode 100644 icons/qutebrowser-16x16.png delete mode 100644 icons/qutebrowser-24x24.png delete mode 100644 icons/qutebrowser-256x256.png delete mode 100644 icons/qutebrowser-32x32.png delete mode 100644 icons/qutebrowser-48x48.png delete mode 100644 icons/qutebrowser-512x512.png delete mode 100644 icons/qutebrowser-64x64.png delete mode 100644 icons/qutebrowser-96x96.png delete mode 100644 icons/qutebrowser-all.svg delete mode 100644 icons/qutebrowser-favicon.svg delete mode 100644 icons/qutebrowser.icns delete mode 100644 icons/qutebrowser.ico delete mode 100644 icons/qutebrowser.svg delete mode 100644 icons/qutebrowser.xpm delete mode 100644 misc/qutebrowser.rcc create mode 100644 qutebrowser/icons/qutebrowser-128x128.png create mode 100644 qutebrowser/icons/qutebrowser-16x16.png create mode 100644 qutebrowser/icons/qutebrowser-24x24.png create mode 100644 qutebrowser/icons/qutebrowser-256x256.png create mode 100644 qutebrowser/icons/qutebrowser-32x32.png create mode 100644 qutebrowser/icons/qutebrowser-48x48.png create mode 100644 qutebrowser/icons/qutebrowser-512x512.png create mode 100644 qutebrowser/icons/qutebrowser-64x64.png create mode 100644 qutebrowser/icons/qutebrowser-96x96.png create mode 100644 qutebrowser/icons/qutebrowser-all.svg create mode 100644 qutebrowser/icons/qutebrowser-favicon.svg create mode 100644 qutebrowser/icons/qutebrowser.icns create mode 100644 qutebrowser/icons/qutebrowser.ico create mode 100644 qutebrowser/icons/qutebrowser.svg create mode 100644 qutebrowser/icons/qutebrowser.xpm delete mode 100644 scripts/dev/gen_resources.py diff --git a/MANIFEST.in b/MANIFEST.in index ed4b5e5b1..81bf824b7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,7 +4,7 @@ recursive-include qutebrowser/javascript *.js graft tests graft qutebrowser/html graft qutebrowser/3rdparty -graft icons +graft qutebrowser/icons graft doc/img graft misc/apparmor graft misc/userscripts diff --git a/README.asciidoc b/README.asciidoc index bb1f2562c..d1bb9ee98 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -7,7 +7,7 @@ qutebrowser =========== // QUTE_WEB_HIDE -image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.* +image:qutebrowser/icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.* image:https://github.com/qutebrowser/qutebrowser/workflows/CI/badge.svg["Build Status", link="https://github.com/qutebrowser/qutebrowser/actions?query=workflow%3ACI"] image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=master"] diff --git a/icons/qutebrowser-128x128.png b/icons/qutebrowser-128x128.png deleted file mode 100644 index ca88ccc42..000000000 Binary files a/icons/qutebrowser-128x128.png and /dev/null differ diff --git a/icons/qutebrowser-16x16.png b/icons/qutebrowser-16x16.png deleted file mode 100644 index 062fe402c..000000000 Binary files a/icons/qutebrowser-16x16.png and /dev/null differ diff --git a/icons/qutebrowser-24x24.png b/icons/qutebrowser-24x24.png deleted file mode 100644 index 6aa2b5cd3..000000000 Binary files a/icons/qutebrowser-24x24.png and /dev/null differ diff --git a/icons/qutebrowser-256x256.png b/icons/qutebrowser-256x256.png deleted file mode 100644 index 705d314fc..000000000 Binary files a/icons/qutebrowser-256x256.png and /dev/null differ diff --git a/icons/qutebrowser-32x32.png b/icons/qutebrowser-32x32.png deleted file mode 100644 index c03d91092..000000000 Binary files a/icons/qutebrowser-32x32.png and /dev/null differ diff --git a/icons/qutebrowser-48x48.png b/icons/qutebrowser-48x48.png deleted file mode 100644 index 1dd9e79a5..000000000 Binary files a/icons/qutebrowser-48x48.png and /dev/null differ diff --git a/icons/qutebrowser-512x512.png b/icons/qutebrowser-512x512.png deleted file mode 100644 index 08a273507..000000000 Binary files a/icons/qutebrowser-512x512.png and /dev/null differ diff --git a/icons/qutebrowser-64x64.png b/icons/qutebrowser-64x64.png deleted file mode 100644 index 72dc3febb..000000000 Binary files a/icons/qutebrowser-64x64.png and /dev/null differ diff --git a/icons/qutebrowser-96x96.png b/icons/qutebrowser-96x96.png deleted file mode 100644 index bc24982c5..000000000 Binary files a/icons/qutebrowser-96x96.png and /dev/null differ diff --git a/icons/qutebrowser-all.svg b/icons/qutebrowser-all.svg deleted file mode 100644 index da9ab4d6d..000000000 --- a/icons/qutebrowser-all.svg +++ /dev/null @@ -1,2183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 16x16 (favicon) - 24x24 (small icon) - 32x32 (large favicon) - 64x64 (medium icon, large favicon) - 110x110 (Instagram) - 128x128 - 180x180 (iphone retina icon, Facebook) - 165x165 (Pinterest) - 250x250 (Google+) - 400x400 (Twitter, LinkedIn) - 120x120 (iphone app icon) - 76x76 (ipad icon) - 152x152 (ipad retina icon) - 256x256 (windows large icon) - 48x48 (medium icon) - 512x512 (OSX Large icon) - 1024x1024 - Broken Logo - 96x96 - - - - qutebrowser-letterform-classical - - - - qutebrowser-planet-circle - - - qutebrowser-planet-continents - - - qutebrowser-letterform-favicon - - - favicon version - classical version - Planet - - qutebrowser-colors-classical - - qutebrowser-colors-main-classical - - - qutebrowser-colors-secondary-classical - - - qutebrowser-colors-tertiary-classical - - - - qutebrowser-colors-favicon - - qutebrowser-colors-main-favicon - - - qutebrowser-colors-secondary-favicon - - - qutebrowser-colors-tertiary-favicon - - - - qutebrowser-negative-classical - - - qutebrowser-negative-favicon - - Negative - Letterform - ColorScheme - - qutebrowser-planet-favicon - - qutebrowser-planet-circle-favicon - - - qutebrowser-planet-continents-favicon - - - - qutebrowser-planet-classical - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - - qutebrowser-logo-favicon - - qutebrowser-planet-favicon-clone - - qutebrowser-planet-circle - - - qutebrowser-planet-continents - - - - qutebrowser-letterform-favicon - - - Logos - - qute-icon-planet-16x16 - - - qutebrowser-logo-square-favicon - - qutebrowser-square-classical - - - qutebrowser-letterform-classical - - - - qutebrowser-logo-square-favicon - - qutebrowser-square-favicon - - - qutebrowser-letterform-favicon - - - Square - - qute-icon-square-16x16 - - qutebrowser-square-favicon - - - qutebrowser-letterform-favicon-clone-white - - - - qute-icon-planet-24x24 - - - qute-icon-square-24x24 - - qutebrowser-square-favicon - - - qutebrowser-letterform-favicon-clone-white - - - - qute-icon-planet-32x32 - - - qute-icon-square-32x32 - - qutebrowser-square-favicon - - - qutebrowser-letterform-favicon-clone-white - - - - qute-icon-planet-64x64 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-square-64x64 - - qutebrowser-square-classical - - - qutebrowser-letterform-classical-clone-white - - - - qute-icon-circle-16x16 - - - qute-circle-24x24 - - - qute-icon-circle-32x32 - - - qute-icon-circle-64x64 - - - qute-icon-planet-76x76 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-110x110 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-120x120 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-128x128 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-square-128x128 - - qutebrowser-square-classical - - - qutebrowser-letterform-classical-clone-white - - - - qute-icon-circle-128x128 - - - qute-icon-planet-152x152 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-165x165 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-180x180 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-square-180x180 - - qutebrowser-square-classical - - - qutebrowser-letterform-classical-clone-white - - - - qute-icon-planet-250x250 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-google-plus - - - qutebrowser-planet-180x180 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - - qute-icon-facebook - - - qutebrowser-planet-180x180 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - - qute-icon-planet-256x256 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-400x400 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-512x512 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-planet-1024x1024 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - - qute-icon-planet-48x48 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - qute-icon-square-48x48 - - qutebrowser-square-classical - - - qutebrowser-letterform-classical-clone-white - - - - qute-icon-circle-48x48 - - - qute-icon-planet-96x96 - - qutebrowser-planet-classical-clone - - qutebrowser-planet-circle-classical - - - qutebrowser-planet-continents-classical - - - - qutebrowser-letterform-classical-clone - - - - diff --git a/icons/qutebrowser-favicon.svg b/icons/qutebrowser-favicon.svg deleted file mode 100644 index 0cceab56c..000000000 --- a/icons/qutebrowser-favicon.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - qutebrowser-logo-favicon - - qutebrowser-planet-favicon-clone - - qutebrowser-planet-circle - - - qutebrowser-planet-continents - - - - qutebrowser-letterform-favicon - - - - diff --git a/icons/qutebrowser.icns b/icons/qutebrowser.icns deleted file mode 100644 index 928b6ca89..000000000 Binary files a/icons/qutebrowser.icns and /dev/null differ diff --git a/icons/qutebrowser.ico b/icons/qutebrowser.ico deleted file mode 100644 index 42419d944..000000000 Binary files a/icons/qutebrowser.ico and /dev/null differ diff --git a/icons/qutebrowser.svg b/icons/qutebrowser.svg deleted file mode 100644 index b26c80c2b..000000000 --- a/icons/qutebrowser.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/qutebrowser.xpm b/icons/qutebrowser.xpm deleted file mode 100644 index 04e183154..000000000 --- a/icons/qutebrowser.xpm +++ /dev/null @@ -1,302 +0,0 @@ -/* XPM */ -static char * qutebrowser_xpm[] = { -"32 32 267 2", -" c None", -". c #9FD4FD", -"+ c #99CBFE", -"@ c #90C3FE", -"# c #89BFFE", -"$ c #81BCFF", -"% c #80BBFF", -"& c #9BCAFD", -"* c #A9DBFB", -"= c #88D3FB", -"- c #98CBFE", -"; c #81BBFF", -"> c #7EBAFF", -", c #84BDFF", -"' c #8DC2FF", -") c #96C7FE", -"! c #A0CCFE", -"~ c #A9D1FE", -"{ c #CEE5FD", -"] c #C7E3FC", -"^ c #8AD3FB", -"/ c #9DCFFD", -"( c #C3DFFD", -"_ c #CDE4FD", -": c #A3CEFE", -"< c #94C6FE", -"[ c #CAE5FC", -"} c #7DD0FB", -"| c #9ECDFD", -"1 c #A1CDFE", -"2 c #8BC1FF", -"3 c #87BFFF", -"4 c #ADD4FE", -"5 c #C6E1FD", -"6 c #CCE3FC", -"7 c #A7DAFB", -"8 c #9DCBFE", -"9 c #78AFF1", -"0 c #6096D4", -"a c #4B82C0", -"b c #5A84B3", -"c c #6589B1", -"d c #6F92B9", -"e c #90AED0", -"f c #C4DBF5", -"g c #6286AE", -"h c #7D9EC2", -"i c #BADFFC", -"j c #85BDFE", -"k c #78B4F8", -"l c #4C83C0", -"m c #1E4F87", -"n c #0A396E", -"o c #345D8D", -"p c #CDE4FC", -"q c #88A7CA", -"r c #1D497C", -"s c #799BBF", -"t c #8AC1FD", -"u c #5E97D7", -"v c #14457B", -"w c #4F76A0", -"x c #A9D5FC", -"y c #95C9FD", -"z c #4C82C1", -"A c #0A3A6F", -"B c #C9E3FD", -"C c #95CCFC", -"D c #629BDB", -"E c #0B3A6F", -"F c #0C3B6F", -"G c #4E749F", -"H c #8CACCE", -"I c #6185AD", -"J c #CBE4FD", -"K c #89C0FF", -"L c #98CDFA", -"M c #27558A", -"N c #144175", -"O c #9BB8D8", -"P c #335D8C", -"Q c #AFC9E6", -"R c #AFD4FE", -"S c #91C7FD", -"T c #A0C0DE", -"U c #194779", -"V c #80A1C5", -"W c #C8E1F9", -"X c #9CB9D8", -"Y c #7799BE", -"Z c #6489B0", -"` c #7092B9", -" . c #6E9DCF", -".. c #79B5F9", -"+. c #83BDFE", -"@. c #7395BA", -"#. c #315C8B", -"$. c #7C9EC2", -"%. c #C0D9F3", -"&. c #7294BA", -"*. c #5C94D4", -"=. c #91CCFC", -"-. c #88CBFA", -";. c #5179A3", -">. c #6E91B7", -",. c #6084AC", -"'. c #96B3D4", -"). c #275283", -"!. c #0C3C71", -"~. c #629CDC", -"{. c #94C6FD", -"]. c #A7D2FC", -"^. c #36659A", -"/. c #2C5788", -"(. c #9DBAD9", -"_. c #B4CEEA", -":. c #476E9A", -"<. c #7EB9FE", -"[. c #8DC3FD", -"}. c #8CC2FE", -"|. c #2F619B", -"1. c #87A6C9", -"2. c #7A9BC0", -"3. c #CBE2FB", -"4. c #C7DFF8", -"5. c #6C8FB5", -"6. c #113F73", -"7. c #0F3D71", -"8. c #547AA4", -"9. c #9CBAD9", -"0. c #B9D3EE", -"a. c #A3C0DE", -"b. c #31629A", -"c. c #659EE0", -"d. c #87BFFE", -"e. c #C3E0FD", -"f. c #4371A4", -"g. c #7496BB", -"h. c #90AFD1", -"i. c #245081", -"j. c #416A96", -"k. c #B0CBE7", -"l. c #CCE4FD", -"m. c #7DB8FD", -"n. c #1E5088", -"o. c #497EBC", -"p. c #C9E3FC", -"q. c #7193B9", -"r. c #C6E0FB", -"s. c #A2CDFE", -"t. c #97C8FE", -"u. c #A7D0FE", -"v. c #BDDCFD", -"w. c #9EC2E8", -"x. c #416996", -"y. c #366AA6", -"z. c #C0DEFC", -"A. c #A2BFDD", -"B. c #326299", -"C. c #649DDF", -"D. c #71ABED", -"E. c #3569A4", -"F. c #0D3C71", -"G. c #6998CD", -"H. c #30639D", -"I. c #A8D3F8", -"J. c #2B5686", -"K. c #3A679B", -"L. c #ADCAEA", -"M. c #85A6C9", -"N. c #33639B", -"O. c #9CCBFD", -"P. c #86C2F7", -"Q. c #0E3C71", -"R. c #1B4C83", -"S. c #5D95D5", -"T. c #557BA5", -"U. c #85C0F6", -"V. c #55A8EF", -"W. c #94B3D3", -"X. c #1C497C", -"Y. c #13437A", -"Z. c #487DBB", -"`. c #7BB7FB", -" + c #76B1F5", -".+ c #4E85C3", -"++ c #ACD3FE", -"@+ c #2F5989", -"#+ c #7597BC", -"$+ c #53A7EF", -"%+ c #C6E1FC", -"&+ c #B6D5F7", -"*+ c #5890D0", -"=+ c #4076B2", -"-+ c #619ADB", -";+ c #7CB7FC", -">+ c #7DB9FE", -",+ c #5087C6", -"'+ c #134479", -")+ c #23548D", -"!+ c #24558D", -"~+ c #8AAACC", -"{+ c #A2C1E1", -"]+ c #86C1F5", -"^+ c #B4D7FE", -"/+ c #6CA5E8", -"(+ c #22548C", -"_+ c #6D94BF", -":+ c #98B6D6", -"<+ c #134174", -"[+ c #84BDF5", -"}+ c #CAE4FC", -"|+ c #CBE3FD", -"1+ c #8FC3FF", -"2+ c #3F72AD", -"3+ c #49719C", -"4+ c #0C3B70", -"5+ c #9CBBDB", -"6+ c #79B7F3", -"7+ c #BFDCFD", -"8+ c #7FBBFF", -"9+ c #7E9FC3", -"0+ c #77B6F3", -"a+ c #A5CEF7", -"b+ c #9FCBFE", -"c+ c #3267A1", -"d+ c #A4CDF7", -"e+ c #B9D9FA", -"f+ c #C7E1FD", -"g+ c #90C3FF", -"h+ c #15457C", -"i+ c #558CCB", -"j+ c #2E5889", -"k+ c #7B9CC1", -"l+ c #C4DDF6", -"m+ c #BBDAFA", -"n+ c #CDE5FD", -"o+ c #B3D6FE", -"p+ c #80BAFF", -"q+ c #4E84C3", -"r+ c #3E73AF", -"s+ c #78B3F7", -"t+ c #5991D1", -"u+ c #477DBA", -"v+ c #4075B2", -"w+ c #5783B6", -"x+ c #BDD6F0", -"y+ c #A1CBF6", -"z+ c #90C4FF", -"A+ c #BCDBFD", -"B+ c #73B0F1", -"C+ c #C5E0FB", -"D+ c #91C5FF", -"E+ c #AED3FE", -"F+ c #C9E2FC", -"G+ c #76B2F2", -"H+ c #8BBFF9", -"I+ c #81BBFE", -"J+ c #9ECBFE", -"K+ c #84B8F3", -"L+ c #79B4F4", -"M+ c #88BEFA", -"N+ c #83BCFE", -"O+ c #A4CFFC", -"P+ c #A6CDF6", -"Q+ c #82B8F2", -"R+ c #529BEC", -" . + @ # $ % & * = ", -" - ; > > , ' ) ! ~ { { { ] ^ ", -" / ; > > > > ; ( _ : < { { { { { [ } ", -" | 1 2 > > > 2 3 4 5 { { { { { 6 { { { 7 ", -" 8 $ < 9 0 a b c d e { { { { f g h { { { { i ", -" j k l m n n n n n n o { { p q r n s { { { { { i ", -" t u v n n n n n n n n o { { w n n n s { { { { { { x ", -" y z A n n n n n n n n n o { { o n n n s { { { { { { B C ", -" D E n n n F G H I n n n o { { o n n n s { { { { { J K % ", -" L M n n n N O { { s n n n o { { o n n P Q { { { { { R > > S ", -" T n n n n H { { { s n n n o { { o U V 6 W X Y Z ` ...> > +. ", -" @.n n n #.{ { { { s n n n o { { $.%.W &.U n n n n n v *.> > =.", -"-.;.n n n >.{ { { { s n n n ,.{ { { '.).n n n n n n n n !.~.> {.", -"].^.n n n q { { { { s n /.(.{ { _.:.n n n n n n n n n n n m <.[.", -"}.|.n n n H { { { { 1.2.3.{ 4.5.6.n n n 7.8.9.0.a.b.n n n n c.d.", -"e.f.n n n g.{ { { { { { { h.i.n n n n j.k.{ { { l.m.n.n n n o.$ ", -"p.q.n n n /.r.s.t.u.v.w.x.n n n n i.h.{ { { { { { u.o.n n n y.$ ", -"z.A.n n n n B.C.D.u E.F.n n n 6.5.4.{ 3.2.1.{ { { { G.n n n H.d.", -"I.p J.n n n n n n n n n n n K.L.{ { (./.n s { { { { M.n n n N.O.", -"P.{ (.Q.n n n n n n n n R.S.> K _ ,.n n n s { { { { 5.n n n T.U.", -"V.{ { W.X.n n n n n Y.Z.`. +.+> ++o n n n s { { { { @+n n n #+$+", -" %+{ { &+*+Z.=+a -+;+>+,+'+)+> > !+n n n s { { { ~+n n n n {+ ", -" ]+{ { ^+> > > > > /+(+n n )+> > )+n n n _+{ { :+<+n n n o [+ ", -" }+{ |+1+> > > > l n n n )+> > )+n n n 2+~+3+E n n n 4+5+ ", -" 6+{ { 7+8+> > > l n n n )+> > )+n n n n n n n n n F 9+0+ ", -" a+{ { b+> > > l n n n c+> > )+n n n n n n n n r O d+ ", -" e+{ f+g+> > l n h+i+<.> > )+n n n n n E j+k+l+m+ ", -" e+{ n+o+p+q+r+s+> > > > t+u+v+w+2.W.x+{ { e+ ", -" y+{ { z+>+> > > > > > > > > A+{ { { { d+ ", -" B+C+) > > > > > > > > D+E+{ { { F+G+ ", -" H+I+> > > > > > J+{ { { C+K+ ", -" L+M+# N+; 8+O+P+Q+R+ "}; diff --git a/misc/Makefile b/misc/Makefile index b916a20d5..0b021f305 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -24,7 +24,7 @@ install: man "$(DESTDIR)$(MANDIR)/man1/qutebrowser.1" install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ "$(DESTDIR)$(DATADIR)/applications/org.qutebrowser.qutebrowser.desktop" - $(foreach i,$(ICONSIZES),install -Dm644 "icons/qutebrowser-$(i)x$(i).png" \ + $(foreach i,$(ICONSIZES),install -Dm644 "qutebrowser/icons/qutebrowser-$(i)x$(i).png" \ "$(DESTDIR)$(DATADIR)/icons/hicolor/$(i)x$(i)/apps/qutebrowser.png";) install -Dm644 icons/qutebrowser.svg \ "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/qutebrowser.svg" diff --git a/misc/qutebrowser.rcc b/misc/qutebrowser.rcc deleted file mode 100644 index ffe9e47f6..000000000 --- a/misc/qutebrowser.rcc +++ /dev/null @@ -1,13 +0,0 @@ - - - ../icons/qutebrowser-16x16.png - ../icons/qutebrowser-24x24.png - ../icons/qutebrowser-32x32.png - ../icons/qutebrowser-48x48.png - ../icons/qutebrowser-64x64.png - ../icons/qutebrowser-96x96.png - ../icons/qutebrowser-128x128.png - ../icons/qutebrowser-256x256.png - ../icons/qutebrowser-512x512.png - - diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec index ffb17d371..11eb11c7d 100644 --- a/misc/qutebrowser.spec +++ b/misc/qutebrowser.spec @@ -40,9 +40,9 @@ setupcommon.write_git_file() if os.name == 'nt': - icon = '../icons/qutebrowser.ico' + icon = '../qutebrowser/icons/qutebrowser.ico' elif sys.platform == 'darwin': - icon = '../icons/qutebrowser.icns' + icon = '../qutebrowser/icons/qutebrowser.icns' else: icon = None diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 1ab28e8d0..663c33ffc 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -182,8 +182,9 @@ def _init_icon(): """Initialize the icon of qutebrowser.""" fallback_icon = QIcon() for size in [16, 24, 32, 48, 64, 96, 128, 256, 512]: - filename = ':/icons/qutebrowser-{size}x{size}.png'.format(size=size) - pixmap = QPixmap(filename) + filename = 'icons/qutebrowser-{size}x{size}.png'.format(size=size) + pixmap = QPixmap() + pixmap.loadFromData(resources.read_file_binary(filename)) if pixmap.isNull(): log.init.warning("Failed to load {}".format(filename)) else: diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py index 69c702aec..2b77a5ac4 100644 --- a/qutebrowser/browser/webengine/notification.py +++ b/qutebrowser/browser/webengine/notification.py @@ -65,7 +65,9 @@ if TYPE_CHECKING: from qutebrowser.config import config from qutebrowser.misc import objects -from qutebrowser.utils import qtutils, log, utils, debug, message, version, objreg +from qutebrowser.utils import ( + qtutils, log, utils, debug, message, version, objreg, resources, +) from qutebrowser.qt import sip @@ -965,8 +967,8 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): icon = qt_notification.icon() if icon.isNull(): - filename = ':/icons/qutebrowser-64x64.png' - icon = QImage(filename) + filename = 'icons/qutebrowser-64x64.png' + icon = QImage.fromData(resources.read_file_binary(filename)) key = self._quirks.icon_key or "image-data" data = self._convert_image(icon) diff --git a/qutebrowser/icons/qutebrowser-128x128.png b/qutebrowser/icons/qutebrowser-128x128.png new file mode 100644 index 000000000..ca88ccc42 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-128x128.png differ diff --git a/qutebrowser/icons/qutebrowser-16x16.png b/qutebrowser/icons/qutebrowser-16x16.png new file mode 100644 index 000000000..062fe402c Binary files /dev/null and b/qutebrowser/icons/qutebrowser-16x16.png differ diff --git a/qutebrowser/icons/qutebrowser-24x24.png b/qutebrowser/icons/qutebrowser-24x24.png new file mode 100644 index 000000000..6aa2b5cd3 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-24x24.png differ diff --git a/qutebrowser/icons/qutebrowser-256x256.png b/qutebrowser/icons/qutebrowser-256x256.png new file mode 100644 index 000000000..705d314fc Binary files /dev/null and b/qutebrowser/icons/qutebrowser-256x256.png differ diff --git a/qutebrowser/icons/qutebrowser-32x32.png b/qutebrowser/icons/qutebrowser-32x32.png new file mode 100644 index 000000000..c03d91092 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-32x32.png differ diff --git a/qutebrowser/icons/qutebrowser-48x48.png b/qutebrowser/icons/qutebrowser-48x48.png new file mode 100644 index 000000000..1dd9e79a5 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-48x48.png differ diff --git a/qutebrowser/icons/qutebrowser-512x512.png b/qutebrowser/icons/qutebrowser-512x512.png new file mode 100644 index 000000000..08a273507 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-512x512.png differ diff --git a/qutebrowser/icons/qutebrowser-64x64.png b/qutebrowser/icons/qutebrowser-64x64.png new file mode 100644 index 000000000..72dc3febb Binary files /dev/null and b/qutebrowser/icons/qutebrowser-64x64.png differ diff --git a/qutebrowser/icons/qutebrowser-96x96.png b/qutebrowser/icons/qutebrowser-96x96.png new file mode 100644 index 000000000..bc24982c5 Binary files /dev/null and b/qutebrowser/icons/qutebrowser-96x96.png differ diff --git a/qutebrowser/icons/qutebrowser-all.svg b/qutebrowser/icons/qutebrowser-all.svg new file mode 100644 index 000000000..da9ab4d6d --- /dev/null +++ b/qutebrowser/icons/qutebrowser-all.svg @@ -0,0 +1,2183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + 16x16 (favicon) + 24x24 (small icon) + 32x32 (large favicon) + 64x64 (medium icon, large favicon) + 110x110 (Instagram) + 128x128 + 180x180 (iphone retina icon, Facebook) + 165x165 (Pinterest) + 250x250 (Google+) + 400x400 (Twitter, LinkedIn) + 120x120 (iphone app icon) + 76x76 (ipad icon) + 152x152 (ipad retina icon) + 256x256 (windows large icon) + 48x48 (medium icon) + 512x512 (OSX Large icon) + 1024x1024 + Broken Logo + 96x96 + + + + qutebrowser-letterform-classical + + + + qutebrowser-planet-circle + + + qutebrowser-planet-continents + + + qutebrowser-letterform-favicon + + + favicon version + classical version + Planet + + qutebrowser-colors-classical + + qutebrowser-colors-main-classical + + + qutebrowser-colors-secondary-classical + + + qutebrowser-colors-tertiary-classical + + + + qutebrowser-colors-favicon + + qutebrowser-colors-main-favicon + + + qutebrowser-colors-secondary-favicon + + + qutebrowser-colors-tertiary-favicon + + + + qutebrowser-negative-classical + + + qutebrowser-negative-favicon + + Negative + Letterform + ColorScheme + + qutebrowser-planet-favicon + + qutebrowser-planet-circle-favicon + + + qutebrowser-planet-continents-favicon + + + + qutebrowser-planet-classical + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + + qutebrowser-logo-favicon + + qutebrowser-planet-favicon-clone + + qutebrowser-planet-circle + + + qutebrowser-planet-continents + + + + qutebrowser-letterform-favicon + + + Logos + + qute-icon-planet-16x16 + + + qutebrowser-logo-square-favicon + + qutebrowser-square-classical + + + qutebrowser-letterform-classical + + + + qutebrowser-logo-square-favicon + + qutebrowser-square-favicon + + + qutebrowser-letterform-favicon + + + Square + + qute-icon-square-16x16 + + qutebrowser-square-favicon + + + qutebrowser-letterform-favicon-clone-white + + + + qute-icon-planet-24x24 + + + qute-icon-square-24x24 + + qutebrowser-square-favicon + + + qutebrowser-letterform-favicon-clone-white + + + + qute-icon-planet-32x32 + + + qute-icon-square-32x32 + + qutebrowser-square-favicon + + + qutebrowser-letterform-favicon-clone-white + + + + qute-icon-planet-64x64 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-square-64x64 + + qutebrowser-square-classical + + + qutebrowser-letterform-classical-clone-white + + + + qute-icon-circle-16x16 + + + qute-circle-24x24 + + + qute-icon-circle-32x32 + + + qute-icon-circle-64x64 + + + qute-icon-planet-76x76 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-110x110 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-120x120 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-128x128 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-square-128x128 + + qutebrowser-square-classical + + + qutebrowser-letterform-classical-clone-white + + + + qute-icon-circle-128x128 + + + qute-icon-planet-152x152 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-165x165 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-180x180 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-square-180x180 + + qutebrowser-square-classical + + + qutebrowser-letterform-classical-clone-white + + + + qute-icon-planet-250x250 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-google-plus + + + qutebrowser-planet-180x180 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + + qute-icon-facebook + + + qutebrowser-planet-180x180 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + + qute-icon-planet-256x256 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-400x400 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-512x512 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-planet-1024x1024 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + + qute-icon-planet-48x48 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + qute-icon-square-48x48 + + qutebrowser-square-classical + + + qutebrowser-letterform-classical-clone-white + + + + qute-icon-circle-48x48 + + + qute-icon-planet-96x96 + + qutebrowser-planet-classical-clone + + qutebrowser-planet-circle-classical + + + qutebrowser-planet-continents-classical + + + + qutebrowser-letterform-classical-clone + + + + diff --git a/qutebrowser/icons/qutebrowser-favicon.svg b/qutebrowser/icons/qutebrowser-favicon.svg new file mode 100644 index 000000000..0cceab56c --- /dev/null +++ b/qutebrowser/icons/qutebrowser-favicon.svg @@ -0,0 +1,107 @@ + + + + + + + + + + image/svg+xml + + + + + + + + qutebrowser-logo-favicon + + qutebrowser-planet-favicon-clone + + qutebrowser-planet-circle + + + qutebrowser-planet-continents + + + + qutebrowser-letterform-favicon + + + + diff --git a/qutebrowser/icons/qutebrowser.icns b/qutebrowser/icons/qutebrowser.icns new file mode 100644 index 000000000..928b6ca89 Binary files /dev/null and b/qutebrowser/icons/qutebrowser.icns differ diff --git a/qutebrowser/icons/qutebrowser.ico b/qutebrowser/icons/qutebrowser.ico new file mode 100644 index 000000000..42419d944 Binary files /dev/null and b/qutebrowser/icons/qutebrowser.ico differ diff --git a/qutebrowser/icons/qutebrowser.svg b/qutebrowser/icons/qutebrowser.svg new file mode 100644 index 000000000..b26c80c2b --- /dev/null +++ b/qutebrowser/icons/qutebrowser.svg @@ -0,0 +1,108 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/qutebrowser/icons/qutebrowser.xpm b/qutebrowser/icons/qutebrowser.xpm new file mode 100644 index 000000000..04e183154 --- /dev/null +++ b/qutebrowser/icons/qutebrowser.xpm @@ -0,0 +1,302 @@ +/* XPM */ +static char * qutebrowser_xpm[] = { +"32 32 267 2", +" c None", +". c #9FD4FD", +"+ c #99CBFE", +"@ c #90C3FE", +"# c #89BFFE", +"$ c #81BCFF", +"% c #80BBFF", +"& c #9BCAFD", +"* c #A9DBFB", +"= c #88D3FB", +"- c #98CBFE", +"; c #81BBFF", +"> c #7EBAFF", +", c #84BDFF", +"' c #8DC2FF", +") c #96C7FE", +"! c #A0CCFE", +"~ c #A9D1FE", +"{ c #CEE5FD", +"] c #C7E3FC", +"^ c #8AD3FB", +"/ c #9DCFFD", +"( c #C3DFFD", +"_ c #CDE4FD", +": c #A3CEFE", +"< c #94C6FE", +"[ c #CAE5FC", +"} c #7DD0FB", +"| c #9ECDFD", +"1 c #A1CDFE", +"2 c #8BC1FF", +"3 c #87BFFF", +"4 c #ADD4FE", +"5 c #C6E1FD", +"6 c #CCE3FC", +"7 c #A7DAFB", +"8 c #9DCBFE", +"9 c #78AFF1", +"0 c #6096D4", +"a c #4B82C0", +"b c #5A84B3", +"c c #6589B1", +"d c #6F92B9", +"e c #90AED0", +"f c #C4DBF5", +"g c #6286AE", +"h c #7D9EC2", +"i c #BADFFC", +"j c #85BDFE", +"k c #78B4F8", +"l c #4C83C0", +"m c #1E4F87", +"n c #0A396E", +"o c #345D8D", +"p c #CDE4FC", +"q c #88A7CA", +"r c #1D497C", +"s c #799BBF", +"t c #8AC1FD", +"u c #5E97D7", +"v c #14457B", +"w c #4F76A0", +"x c #A9D5FC", +"y c #95C9FD", +"z c #4C82C1", +"A c #0A3A6F", +"B c #C9E3FD", +"C c #95CCFC", +"D c #629BDB", +"E c #0B3A6F", +"F c #0C3B6F", +"G c #4E749F", +"H c #8CACCE", +"I c #6185AD", +"J c #CBE4FD", +"K c #89C0FF", +"L c #98CDFA", +"M c #27558A", +"N c #144175", +"O c #9BB8D8", +"P c #335D8C", +"Q c #AFC9E6", +"R c #AFD4FE", +"S c #91C7FD", +"T c #A0C0DE", +"U c #194779", +"V c #80A1C5", +"W c #C8E1F9", +"X c #9CB9D8", +"Y c #7799BE", +"Z c #6489B0", +"` c #7092B9", +" . c #6E9DCF", +".. c #79B5F9", +"+. c #83BDFE", +"@. c #7395BA", +"#. c #315C8B", +"$. c #7C9EC2", +"%. c #C0D9F3", +"&. c #7294BA", +"*. c #5C94D4", +"=. c #91CCFC", +"-. c #88CBFA", +";. c #5179A3", +">. c #6E91B7", +",. c #6084AC", +"'. c #96B3D4", +"). c #275283", +"!. c #0C3C71", +"~. c #629CDC", +"{. c #94C6FD", +"]. c #A7D2FC", +"^. c #36659A", +"/. c #2C5788", +"(. c #9DBAD9", +"_. c #B4CEEA", +":. c #476E9A", +"<. c #7EB9FE", +"[. c #8DC3FD", +"}. c #8CC2FE", +"|. c #2F619B", +"1. c #87A6C9", +"2. c #7A9BC0", +"3. c #CBE2FB", +"4. c #C7DFF8", +"5. c #6C8FB5", +"6. c #113F73", +"7. c #0F3D71", +"8. c #547AA4", +"9. c #9CBAD9", +"0. c #B9D3EE", +"a. c #A3C0DE", +"b. c #31629A", +"c. c #659EE0", +"d. c #87BFFE", +"e. c #C3E0FD", +"f. c #4371A4", +"g. c #7496BB", +"h. c #90AFD1", +"i. c #245081", +"j. c #416A96", +"k. c #B0CBE7", +"l. c #CCE4FD", +"m. c #7DB8FD", +"n. c #1E5088", +"o. c #497EBC", +"p. c #C9E3FC", +"q. c #7193B9", +"r. c #C6E0FB", +"s. c #A2CDFE", +"t. c #97C8FE", +"u. c #A7D0FE", +"v. c #BDDCFD", +"w. c #9EC2E8", +"x. c #416996", +"y. c #366AA6", +"z. c #C0DEFC", +"A. c #A2BFDD", +"B. c #326299", +"C. c #649DDF", +"D. c #71ABED", +"E. c #3569A4", +"F. c #0D3C71", +"G. c #6998CD", +"H. c #30639D", +"I. c #A8D3F8", +"J. c #2B5686", +"K. c #3A679B", +"L. c #ADCAEA", +"M. c #85A6C9", +"N. c #33639B", +"O. c #9CCBFD", +"P. c #86C2F7", +"Q. c #0E3C71", +"R. c #1B4C83", +"S. c #5D95D5", +"T. c #557BA5", +"U. c #85C0F6", +"V. c #55A8EF", +"W. c #94B3D3", +"X. c #1C497C", +"Y. c #13437A", +"Z. c #487DBB", +"`. c #7BB7FB", +" + c #76B1F5", +".+ c #4E85C3", +"++ c #ACD3FE", +"@+ c #2F5989", +"#+ c #7597BC", +"$+ c #53A7EF", +"%+ c #C6E1FC", +"&+ c #B6D5F7", +"*+ c #5890D0", +"=+ c #4076B2", +"-+ c #619ADB", +";+ c #7CB7FC", +">+ c #7DB9FE", +",+ c #5087C6", +"'+ c #134479", +")+ c #23548D", +"!+ c #24558D", +"~+ c #8AAACC", +"{+ c #A2C1E1", +"]+ c #86C1F5", +"^+ c #B4D7FE", +"/+ c #6CA5E8", +"(+ c #22548C", +"_+ c #6D94BF", +":+ c #98B6D6", +"<+ c #134174", +"[+ c #84BDF5", +"}+ c #CAE4FC", +"|+ c #CBE3FD", +"1+ c #8FC3FF", +"2+ c #3F72AD", +"3+ c #49719C", +"4+ c #0C3B70", +"5+ c #9CBBDB", +"6+ c #79B7F3", +"7+ c #BFDCFD", +"8+ c #7FBBFF", +"9+ c #7E9FC3", +"0+ c #77B6F3", +"a+ c #A5CEF7", +"b+ c #9FCBFE", +"c+ c #3267A1", +"d+ c #A4CDF7", +"e+ c #B9D9FA", +"f+ c #C7E1FD", +"g+ c #90C3FF", +"h+ c #15457C", +"i+ c #558CCB", +"j+ c #2E5889", +"k+ c #7B9CC1", +"l+ c #C4DDF6", +"m+ c #BBDAFA", +"n+ c #CDE5FD", +"o+ c #B3D6FE", +"p+ c #80BAFF", +"q+ c #4E84C3", +"r+ c #3E73AF", +"s+ c #78B3F7", +"t+ c #5991D1", +"u+ c #477DBA", +"v+ c #4075B2", +"w+ c #5783B6", +"x+ c #BDD6F0", +"y+ c #A1CBF6", +"z+ c #90C4FF", +"A+ c #BCDBFD", +"B+ c #73B0F1", +"C+ c #C5E0FB", +"D+ c #91C5FF", +"E+ c #AED3FE", +"F+ c #C9E2FC", +"G+ c #76B2F2", +"H+ c #8BBFF9", +"I+ c #81BBFE", +"J+ c #9ECBFE", +"K+ c #84B8F3", +"L+ c #79B4F4", +"M+ c #88BEFA", +"N+ c #83BCFE", +"O+ c #A4CFFC", +"P+ c #A6CDF6", +"Q+ c #82B8F2", +"R+ c #529BEC", +" . + @ # $ % & * = ", +" - ; > > , ' ) ! ~ { { { ] ^ ", +" / ; > > > > ; ( _ : < { { { { { [ } ", +" | 1 2 > > > 2 3 4 5 { { { { { 6 { { { 7 ", +" 8 $ < 9 0 a b c d e { { { { f g h { { { { i ", +" j k l m n n n n n n o { { p q r n s { { { { { i ", +" t u v n n n n n n n n o { { w n n n s { { { { { { x ", +" y z A n n n n n n n n n o { { o n n n s { { { { { { B C ", +" D E n n n F G H I n n n o { { o n n n s { { { { { J K % ", +" L M n n n N O { { s n n n o { { o n n P Q { { { { { R > > S ", +" T n n n n H { { { s n n n o { { o U V 6 W X Y Z ` ...> > +. ", +" @.n n n #.{ { { { s n n n o { { $.%.W &.U n n n n n v *.> > =.", +"-.;.n n n >.{ { { { s n n n ,.{ { { '.).n n n n n n n n !.~.> {.", +"].^.n n n q { { { { s n /.(.{ { _.:.n n n n n n n n n n n m <.[.", +"}.|.n n n H { { { { 1.2.3.{ 4.5.6.n n n 7.8.9.0.a.b.n n n n c.d.", +"e.f.n n n g.{ { { { { { { h.i.n n n n j.k.{ { { l.m.n.n n n o.$ ", +"p.q.n n n /.r.s.t.u.v.w.x.n n n n i.h.{ { { { { { u.o.n n n y.$ ", +"z.A.n n n n B.C.D.u E.F.n n n 6.5.4.{ 3.2.1.{ { { { G.n n n H.d.", +"I.p J.n n n n n n n n n n n K.L.{ { (./.n s { { { { M.n n n N.O.", +"P.{ (.Q.n n n n n n n n R.S.> K _ ,.n n n s { { { { 5.n n n T.U.", +"V.{ { W.X.n n n n n Y.Z.`. +.+> ++o n n n s { { { { @+n n n #+$+", +" %+{ { &+*+Z.=+a -+;+>+,+'+)+> > !+n n n s { { { ~+n n n n {+ ", +" ]+{ { ^+> > > > > /+(+n n )+> > )+n n n _+{ { :+<+n n n o [+ ", +" }+{ |+1+> > > > l n n n )+> > )+n n n 2+~+3+E n n n 4+5+ ", +" 6+{ { 7+8+> > > l n n n )+> > )+n n n n n n n n n F 9+0+ ", +" a+{ { b+> > > l n n n c+> > )+n n n n n n n n r O d+ ", +" e+{ f+g+> > l n h+i+<.> > )+n n n n n E j+k+l+m+ ", +" e+{ n+o+p+q+r+s+> > > > t+u+v+w+2.W.x+{ { e+ ", +" y+{ { z+>+> > > > > > > > > A+{ { { { d+ ", +" B+C+) > > > > > > > > D+E+{ { { F+G+ ", +" H+I+> > > > > > J+{ { { C+K+ ", +" L+M+# N+; 8+O+P+Q+R+ "}; diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py index 0a6912b82..6b4e3fb0d 100755 --- a/scripts/asciidoc2html.py +++ b/scripts/asciidoc2html.py @@ -196,7 +196,11 @@ class AsciiDoc: continue self._build_website_file(item_path.parent, item_path.name) - copy = {'icons': 'icons', 'doc/img': 'doc/img', 'www/media': 'media/'} + copy = { + 'qutebrowser/icons': 'icons', + 'doc/img': 'doc/img', + 'www/media': 'media/', + } for src, dest in copy.items(): full_src = REPO_ROOT / src diff --git a/scripts/dev/gen_resources.py b/scripts/dev/gen_resources.py deleted file mode 100644 index efa6c6a3d..000000000 --- a/scripts/dev/gen_resources.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 -# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: - -# Copyright 2014-2021 Florian Bruhin (The-Compiler) - -# this file is part of qutebrowser. -# -# qutebrowser is free software: you can redistribute it and/or modify -# it under the terms of the gnu general public license as published by -# the free software foundation, either version 3 of the license, or -# (at your option) any later version. -# -# qutebrowser is distributed in the hope that it will be useful, -# but without any warranty; without even the implied warranty of -# merchantability or fitness for a particular purpose. see the -# gnu general public license for more details. -# -# you should have received a copy of the gnu general public license -# along with qutebrowser. If not, see . - -"""Generate Qt resources based on source files.""" - -import subprocess -import pathlib - -ROOT = pathlib.Path(__file__).parents[2] -OUTPUT = ROOT / 'qutebrowser' / 'resources.py' -INPUT = ROOT / 'misc' / 'qutebrowser.rcc' - -subprocess.run(['pyrcc5', '-o', str(OUTPUT), str(INPUT)], check=True) diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py index 6a4b249c2..392fbe43f 100644 --- a/tests/end2end/fixtures/webserver_sub.py +++ b/tests/end2end/fixtures/webserver_sub.py @@ -294,7 +294,7 @@ def view_user_agent(): def favicon(): # WORKAROUND for https://github.com/PyCQA/pylint/issues/5783 # pylint: disable-next=no-member,useless-suppression - icon_dir = END2END_DIR.parents[1] / 'icons' + icon_dir = END2END_DIR.parents[1] / 'qutebrowser' / 'icons' return flask.send_from_directory( icon_dir, 'qutebrowser.ico', mimetype='image/vnd.microsoft.icon') -- cgit v1.2.3-54-g00ecf