CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-15 02:12:29 +12:00
Code Issues Projects Releases Wiki Activity

Adds missing icons, and changes one in navigation dock (#159)

Browse source
This commit is contained in:
Olivier Keshavjee 2017-10-15 22:23:06 +02:00
parent c7e6a2d53e
commit aed93550f2
28 changed files with 945 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
icons/NumixMsk/128x128/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/128x128/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

16
icons/NumixMsk/16/actions/configure.svg
View file

@ -1,16 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<g>
<g>
<rect width="4" height="4" y="6" rx="1" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect rx="1" y="6" x="12" height="4" width="4" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect width="4" height="4" x="6" rx="1" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect rx="1" y="12" x="6" height="4" width="4" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect rx="1" y="-2" x="3.314" height="4" width="4" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect width="4" height="4" x="15.314" y="-2" rx="1" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect rx="1" y="-8" x="9.314" height="4" width="4" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<rect width="4" height="4" x="9.314" y="4" rx="1" transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
<path d="M 8 1.5 A 6.5 6.5 0 0 0 1.5 8 6.5 6.5 0 0 0 8 14.5 6.5 6.5 0 0 0 14.5 8 6.5 6.5 0 0 0 8 1.5 M 8 5 A 3 3 0 0 1 11 8 3 3 0 0 1 8 11 3 3 0 0 1 5 8 3 3 0 0 1 8 5" style="fill:#b4b4b4;opacity:1;fill-opacity:1;stroke:none"/>
</g>
<path d="M 8 3 A 5 5 0 0 0 3 8 5 5 0 0 0 8 13 5 5 0 0 0 13 8 5 5 0 0 0 8 3 M 8 6 A 2 2 0 0 1 10 8 2 2 0 0 1 8 10 2 2 0 0 1 6 8 2 2 0 0 1 8 6" style="fill:#2aa198;opacity:1;fill-opacity:1;stroke:none"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

11
icons/NumixMsk/16/actions/folder_color_picker.svg
View file

@ -1,11 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<g transform="matrix(0.5,0,0,0.5,-1.9999997,1.9999998)">
<path d="m 10.726 14.52 c -0.178 -0.63 -0.762 -1.066 -1.428 -1.066 l -3.817 0 c -0.445 0 -0.866 0.196 -1.148 0.534 -0.282 0.338 -0.393 0.783 -0.304 1.21 0.675 3.25 2.335 6.174 4.801 8.455 0.277 0.256 0.641 0.396 1.016 0.396 0.071 0 0.144 -0.005 0.215 -0.015 0.448 -0.065 0.841 -0.327 1.068 -0.712 l 1.926 -3.274 c 0.322 -0.547 0.247 -1.235 -0.185 -1.704 -1 -1.089 -1.746 -2.411 -2.145 -3.824" style="fill:#268bd2;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 23.632 21.932 c -0.269 -0.457 -0.762 -0.728 -1.283 -0.728 c -0.105 0 -0.211 0.011 -0.317 0.034 -0.671 0.144 -1.355 0.217 -2.033 0.217 -0.948 0 -1.885 -0.136 -2.785 -0.405 -0.143 -0.043 -0.288 -0.063 -0.432 -0.063 -0.519 0 -1.013 0.268 -1.283 0.727 l -1.891 3.216 c -0.218 0.372 -0.259 0.818 -0.11 1.222 0.148 0.403 0.471 0.722 0.88 0.87 c 1.792 0.65 3.683 0.979 5.621 0.979 c 1.603 0 3.185 -0.228 4.702 -0.677 0.433 -0.128 0.783 -0.444 0.95 -0.857 0.167 -0.413 0.132 -0.878 -0.094 -1.263 l -1.925 -3.272" style="fill:#859900;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 29.27 9.476 c 0.177 0.632 0.762 1.07 1.429 1.07 l 3.817 0 c 0.445 0 0.866 -0.196 1.147 -0.534 c 0.281 -0.338 0.394 -0.782 0.306 -1.209 -0.729 -3.542 -2.693 -6.77 -5.53 -9.09 -0.268 -0.219 -0.605 -0.337 -0.948 -0.337 c -0.087 0 -0.173 0.007 -0.26 0.022 -0.43 0.075 -0.805 0.333 -1.023 0.705 l -1.894 3.22 c -0.344 0.586 -0.232 1.327 0.271 1.789 1.291 1.185 2.22 2.693 2.686 4.362" style="fill:#ee7616;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 24.701 -3.323 c -1.517 -0.449 -3.098 -0.677 -4.702 -0.677 -1.938 0 -3.829 0.329 -5.621 0.979 -0.41 0.149 -0.732 0.467 -0.88 0.87 -0.148 0.403 -0.108 0.85 0.11 1.222 l 1.891 3.216 c 0.27 0.459 0.765 0.727 1.283 0.727 0.144 0 0.289 -0.02 0.432 -0.063 0.9 -0.269 1.837 -0.405 2.785 -0.405 0.678 0 1.362 0.073 2.033 0.217 0.105 0.023 0.212 0.034 0.317 0.034 0.521 0 1.014 -0.271 1.283 -0.728 l 1.925 -3.272 c 0.226 -0.385 0.261 -0.85 0.094 -1.263 -0.167 -0.413 -0.517 -0.729 -0.95 -0.857" style="fill:#dc322f;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 34.518 13.455 -3.817 0 c -0.667 0 -1.252 0.438 -1.429 1.07 -0.466 1.668 -1.395 3.176 -2.686 4.362 -0.503 0.462 -0.616 1.204 -0.271 1.789 l 1.894 3.22 c 0.218 0.372 0.593 0.63 1.023 0.705 0.086 0.015 0.173 0.022 0.26 0.022 0.344 0 0.68 -0.117 0.948 -0.337 2.837 -2.319 4.801 -5.547 5.53 -9.09 0.088 -0.428 -0.024 -0.872 -0.306 -1.209 -0.281 -0.338 -0.702 -0.534 -1.147 -0.534" style="fill:#ffcf38;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 11.131 0.678 c -0.227 -0.385 -0.62 -0.647 -1.068 -0.712 -0.072 -0.01 -0.144 -0.015 -0.215 -0.015 -0.375 0 -0.739 0.14 -1.016 0.396 -2.466 2.281 -4.127 5.204 -4.801 8.455 -0.089 0.428 0.023 0.872 0.304 1.21 0.281 0.338 0.703 0.534 1.148 0.534 l 3.817 0 c 0.666 0 1.25 -0.436 1.428 -1.066 0.399 -1.413 1.141 -2.735 2.145 -3.824 0.432 -0.468 0.507 -1.157 0.185 -1.704 l -1.926 -3.274" style="fill:#3a4f7a;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 32.528 5.55 -12.244 3.194 c -1.564 0.408 -3.097 1.028 -3.394 2.709 -0.313 1.776 0.827 3.463 2.544 3.766 1.232 0.217 2.195 -0.549 3.119 -1.322 z" style="fill:#4d4d4d;stroke:none"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

7
icons/NumixMsk/16/actions/history-view.svg
View file

@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<g transform="matrix(.8 0 0 .8 -1.6 -1.59999)">
<path d="m 21.375 12 a 9.375 9.375 0 0 1 -18.75 0 9.375 9.375 0 1 1 18.75 0 z" style="fill:#fff;fill-rule:evenodd"/>
<path d="m 11.984 5.484 c -0.551 0.008 -0.992 0.465 -0.984 1.016 l 0 5.5 c 0 0.234 0.082 0.461 0.234 0.641 l 2.5 3 c 0.223 0.301 0.59 0.449 0.957 0.395 0.367 -0.059 0.672 -0.313 0.793 -0.664 0.121 -0.352 0.035 -0.742 -0.219 -1.012 l -2.266 -2.719 0 -5.141 c 0.004 -0.27 -0.102 -0.531 -0.293 -0.723 -0.191 -0.191 -0.453 -0.297 -0.723 -0.293 z" style="fill:#268bd2"/>
<path d="m 12 2 c -5.512 0 -10 4.488 -10 10 0 5.512 4.488 10 10 10 5.512 0 10 -4.488 10 -10 0 -5.512 -4.488 -10 -10 -10 z m 0 2 c 4.43 0 8 3.57 8 8 0 4.43 -3.57 8 -8 8 c -4.43 0 -8 -3.57 -8 -8 0 -4.43 3.57 -8 8 -8 z" style="fill:#aaa"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 849 B

6
icons/NumixMsk/16/categories/applications-development.svg
View file

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<g transform="matrix(0.36396127,0,0,0.36391556,-0.54234024,-0.40222856)">
<path d="m 13.414 7.259 6.389 9.336 -2.828 2.828 -9.332 -6.385 a 10 10 0 0 0 2.261 10.627 10 10 0 0 0 14.14 0 10 10 0 0 0 0 -14.14 10 10 0 0 0 -10.631 -2.265 z" style="fill:#4793db;opacity:1;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<rect transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" y="32.737" x="-3.231" height="20" width="7" style="fill:#4793db;opacity:1;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 589 B

7
icons/NumixMsk/16/categories/preferences-desktop-theme.svg
View file

@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
<path d="m 1.678 1.518 12.643 0 c 0.087 0 0.16 0.073 0.16 0.16 l 0 12.643 c 0 0.087 -0.073 0.16 -0.16 0.16 l -12.643 0 c -0.087 0 -0.16 -0.073 -0.16 -0.16 l 0 -12.643 c 0 -0.087 0.073 -0.16 0.16 -0.16 z" style="stroke-dasharray:none;fill:none;stroke-miterlimit:4;stroke:#88b485;stroke-linecap:round;stroke-width:1.037"/>
<path d="m 3.5 9.5 2 0 0 2 -2 0 z" style="stroke-dasharray:none;fill:none;stroke-miterlimit:4;stroke:#88b485;stroke-linecap:round;stroke-linejoin:round;stroke-width:1"/>
<path d="m 3.992 3.5 8.02 0 c 0.272 0 0.49 0.22 0.49 0.496 l 0 1.01 c 0 0.276 -0.218 0.496 -0.49 0.496 l -8.02 0 c -0.272 0 -0.492 -0.22 -0.492 -0.496 l 0 -1.01 c 0 -0.276 0.22 -0.496 0.492 -0.496" style="stroke-dasharray:none;fill:none;stroke-miterlimit:4;stroke:#88b485;stroke-linecap:round;stroke-linejoin:round;stroke-width:1"/>
<path d="m 9.5 3.5 0 2 2.341 0 c 0.368 0 0.659 -0.274 0.659 -0.617 l 0 -0.76 c 0 -0.343 -0.291 -0.623 -0.659 -0.623 z" style="stroke-dasharray:none;fill:none;stroke-miterlimit:4;stroke:#88b485;stroke-linecap:round;stroke-linejoin:round;stroke-width:1"/>
<path d="m 10.5 9.5 2 0 0 2 -2 0 z" style="stroke-dasharray:none;fill:none;stroke-miterlimit:4;stroke:#88b485;stroke-linecap:round;stroke-linejoin:round;stroke-width:1"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

11
icons/NumixMsk/16/categories/preferences-system-time.svg
View file

@ -1,11 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 12.8 12.8">
<path d="m 6.338 2.8 0.124 0 c 0.112 0 0.204 0.068 0.204 0.154 l 0 0.492 c 0 0.084 -0.092 0.154 -0.204 0.154 l -0.124 0 c -0.112 0 -0.204 -0.07 -0.204 -0.154 l 0 -0.492 c 0 -0.086 0.092 -0.154 0.204 -0.154 z" style="fill:#fd4651;fill-opacity:1"/>
<path d="m 6.338 9.2 0.124 0 c 0.112 0 0.204 0.069 0.204 0.154 l 0 0.493 c 0 0.084 -0.092 0.154 -0.204 0.154 l -0.124 0 c -0.112 0 -0.204 -0.069 -0.204 -0.154 l 0 -0.493 c 0 -0.084 0.092 -0.154 0.204 -0.154 z" style="fill:#fd4651;fill-opacity:1"/>
<path d="m 2.8 6.462 0 -0.123 c 0 -0.112 0.069 -0.205 0.155 -0.205 l 0.491 0 c 0.084 0 0.154 0.093 0.154 0.205 l 0 0.123 c 0 0.114 -0.069 0.205 -0.154 0.205 l -0.491 0 c -0.085 0 -0.155 -0.091 -0.155 -0.205 z" style="fill:#fd4651;fill-opacity:1"/>
<path d="m 9.2 6.462 0 -0.123 c 0 -0.112 0.07 -0.205 0.154 -0.205 l 0.492 0 c 0.086 0 0.154 0.093 0.154 0.205 l 0 0.123 c 0 0.114 -0.068 0.205 -0.154 0.205 l -0.492 0 c -0.084 0 -0.154 -0.091 -0.154 -0.205 z" style="fill:#fd4651;fill-opacity:1"/>
<circle cx="6.4" cy="6.4" r="5" style="stroke-dasharray:none;stroke-opacity:1;fill:none;opacity:1;stroke-miterlimit:4;fill-opacity:1;stroke:#fd4651;fill-rule:nonzero;stroke-linecap:butt;stroke-linejoin:miter;stroke-width:1.2;stroke-dashoffset:0"/>
<path d="m 4.532 4.251 c -0.061 0 -0.121 0.023 -0.167 0.069 l -0.01 0.011 c -0.093 0.092 -0.093 0.242 0 0.333 l 1.39 1.39 c 0.001 0.001 0.001 0.001 0.002 0.002 a 0.733 0.733 0 0 1 0.35 -0.336 c -0.003 -0.003 -0.004 -0.007 -0.007 -0.01 l -1.39 -1.39 c -0.046 -0.046 -0.107 -0.069 -0.168 -0.069 z" style="fill:#fd4651;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 9.384 4.377 c -0.03 0.004 -0.061 0.014 -0.089 0.03 l -2.438 1.407 a 0.733 0.733 0 0 1 0.267 0.463 l 2.437 -1.407 c 0.114 -0.066 0.152 -0.211 0.087 -0.323 l -0.03 -0.053 c -0.049 -0.085 -0.143 -0.128 -0.234 -0.117 z" style="fill:#fd4651;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 5.926 6.947 -1.361 2.509 c -0.031 0.057 -0.011 0.131 0.045 0.166 l 0.016 0.01 c 0.056 0.033 0.126 0.015 0.157 -0.043 l 1.365 -2.515 a 0.733 0.733 0 0 1 -0.221 -0.128" style="fill:#fd4651;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
<path d="m 6.4 5.587 c -0.442 0 -0.8 0.358 -0.8 0.8 0 0.442 0.358 0.8 0.8 0.8 0.442 0 0.8 -0.358 0.8 -0.8 0 -0.442 -0.358 -0.8 -0.8 -0.8 z m 0 0.413 a 0.4 0.4 0 0 1 0.4 0.4 0.4 0.4 0 0 1 -0.4 0.4 0.4 0.4 0 0 1 -0.4 -0.4 0.4 0.4 0 0 1 0.4 -0.4 z" style="fill:#fd4651;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

125
icons/NumixMsk/16x16/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

6
icons/NumixMsk/16x16/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.3 KiB

103
icons/NumixMsk/22x22/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/22x22/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

104
icons/NumixMsk/24x24/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/24x24/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

99
icons/NumixMsk/256x256/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/256x256/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

99
icons/NumixMsk/32x32/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/32x32/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.6 KiB

99
icons/NumixMsk/48x48/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

5
icons/NumixMsk/48x48/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

99
icons/NumixMsk/64x64/actions/stock_timezone.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

14
icons/NumixMsk/64x64/actions/view-list-tree.svg Normal file
View file

@ -0,0 +1,14 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
<g transform="matrix(3.9998673,0,0,3.9998673,-247.99151,-3471.883)" style="fill:#bebebe;color:#000">
<rect width="3" x="64" y="870" height="3" style="fill:#268bd2;fill-opacity:1"/>
</g>
<g transform="matrix(3.9998673,0,0,3.9998673,-235.99031,-3451.8836)" style="fill:#bebebe;color:#000">
<rect height="3" y="870" x="65" width="3" style="fill:#268bd2;fill-opacity:1"/>
</g>
<g transform="matrix(3.9998673,0,0,3.9998673,-235.98871,-3435.8842)" style="fill:#bebebe;color:#000">
<rect width="3" x="65" y="870" height="3" style="fill:#268bd2;fill-opacity:1"/>
</g>
<path d="m 12 16 0 36 8 0 0 -4 -4 0 0 -12 4 0 0 -4 -4 0 0 -16 z" style="fill:#268bd2;opacity:1;fill-opacity:1;stroke:none"/>
<rect width="15.999" height="4" x="40" y="32" style="fill:#268bd2;opacity:1;fill-opacity:1;stroke:none"/>
<rect width="15.999" height="4" x="40" y="48" style="fill:#268bd2;opacity:1;fill-opacity:1;stroke:none"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 980 B

5
icons/NumixMsk/64x64/emblems/emblem-web.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

12
manuskript/mainWindow.py
View file

@ -904,7 +904,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
"application-text-template", #applications-publishing
"stock_people",
"stock_shuffle",
"applications-internet",
"emblem-web", #stock_timezone applications-internet
"gtk-index", #applications-versioncontrol
"gtk-edit",
"applications-debugging"
@ -1104,9 +1104,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
]
menus = [
(self.tr("Tree"), "Tree"),
(self.tr("Index cards"), "Cork"),
(self.tr("Outline"), "Outline")
(self.tr("Tree"), "Tree", "view-list-tree"),
(self.tr("Index cards"), "Cork", "view-cards"),
(self.tr("Outline"), "Outline", "view-outline")
]
submenus = {
@ -1135,8 +1135,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# print("Generating menus with", settings.viewSettings)
for mnu, mnud in menus:
for mnu, mnud, icon in menus:
m = QMenu(mnu, self.menuView)
if icon:
m.setIcon(QIcon.fromTheme(icon))
for s, sd in submenus[mnud]:
m2 = QMenu(s, m)
agp = QActionGroup(m2)

32
manuskript/ui/mainWindow.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
#
# Created: Sat Oct 14 21:07:22 2017
# Created: Sun Oct 15 22:19:14 2017
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -1138,8 +1138,12 @@ class Ui_MainWindow(object):
self.actSpellcheck.setIcon(icon)
self.actSpellcheck.setObjectName("actSpellcheck")
self.actLabels = QtWidgets.QAction(MainWindow)
icon = QtGui.QIcon.fromTheme("folder_color_picker")
self.actLabels.setIcon(icon)
self.actLabels.setObjectName("actLabels")
self.actStatus = QtWidgets.QAction(MainWindow)
icon = QtGui.QIcon.fromTheme("applications-development")
self.actStatus.setIcon(icon)
self.actStatus.setObjectName("actStatus")
self.actViewTree = QtWidgets.QAction(MainWindow)
self.actViewTree.setObjectName("actViewTree")
@ -1166,10 +1170,14 @@ class Ui_MainWindow(object):
self.actCloseProject.setIcon(icon)
self.actCloseProject.setObjectName("actCloseProject")
self.actCompile = QtWidgets.QAction(MainWindow)
icon = QtGui.QIcon.fromTheme("document-export")
self.actCompile.setIcon(icon)
self.actCompile.setObjectName("actCompile")
self.actToolFrequency = QtWidgets.QAction(MainWindow)
self.actToolFrequency.setObjectName("actToolFrequency")
self.actAbout = QtWidgets.QAction(MainWindow)
icon = QtGui.QIcon.fromTheme("stock_view-details")
self.actAbout.setIcon(icon)
self.actAbout.setObjectName("actAbout")
self.menuFile.addAction(self.actOpen)
self.menuFile.addAction(self.menuRecents.menuAction())
@ -1200,7 +1208,7 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
self.stack.setCurrentIndex(1)
self.tabMain.setCurrentIndex(3)
self.tabMain.setCurrentIndex(6)
self.tabSummary.setCurrentIndex(0)
self.tabPersos.setCurrentIndex(0)
self.tabPlot.setCurrentIndex(0)
@ -1339,18 +1347,18 @@ class Ui_MainWindow(object):
self.actAbout.setText(_translate("MainWindow", "&About"))
self.actAbout.setToolTip(_translate("MainWindow", "About Manuskript"))
from manuskript.ui.views.textEditCompleter import textEditCompleter
from manuskript.ui.views.metadataView import metadataView
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.cheatSheet import cheatSheet
from manuskript.ui.editors.mainEditor import mainEditor
from manuskript.ui.welcome import welcome
from manuskript.ui.search import search
from manuskript.ui.views.lineEditView import lineEditView
from manuskript.ui.views.characterTreeView import characterTreeView
from manuskript.ui.views.basicItemView import basicItemView
from manuskript.ui.views.outlineView import outlineView
from manuskript.ui.views.storylineView import storylineView
from manuskript.ui.views.treeView import treeView
from manuskript.ui.views.textEditView import textEditView
from manuskript.ui.editors.mainEditor import mainEditor
from manuskript.ui.views.sldImportance import sldImportance
from manuskript.ui.search import search
from manuskript.ui.views.plotTreeView import plotTreeView
from manuskript.ui.cheatSheet import cheatSheet
from manuskript.ui.views.characterTreeView import characterTreeView
from manuskript.ui.views.metadataView import metadataView
from manuskript.ui.views.outlineView import outlineView
from manuskript.ui.views.lineEditView import lineEditView
from manuskript.ui.views.sldImportance import sldImportance
from manuskript.ui.views.textEditCompleter import textEditCompleter

14
manuskript/ui/mainWindow.ui
View file

@ -124,7 +124,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>3</number>
<number>6</number>
</property>
<property name="documentMode">
<bool>true</bool>
@ -2349,11 +2349,17 @@ QListView::item:hover {
</property>
</action>
<action name="actLabels">
<property name="icon">
<iconset theme="folder_color_picker"/>
</property>
<property name="text">
<string>&amp;Labels...</string>
</property>
</action>
<action name="actStatus">
<property name="icon">
<iconset theme="applications-development"/>
</property>
<property name="text">
<string>&amp;Status...</string>
</property>
@ -2423,6 +2429,9 @@ QListView::item:hover {
</property>
</action>
<action name="actCompile">
<property name="icon">
<iconset theme="document-export"/>
</property>
<property name="text">
<string>Co&amp;mpile</string>
</property>
@ -2436,6 +2445,9 @@ QListView::item:hover {
</property>
</action>
<action name="actAbout">
<property name="icon">
<iconset theme="stock_view-details"/>
</property>
<property name="text">
<string>&amp;About</string>
</property>

16
manuskript/ui/settings_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui'
#
# Created: Sun Oct 15 14:43:30 2017
# Created: Sun Oct 15 22:18:32 2017
# by: PyQt5 UI code generator 5.2.1
#
# WARNING! All changes made in this file will be lost!
@ -584,7 +584,8 @@ class Ui_Settings(object):
self.verticalLayout_17.addLayout(self.horizontalLayout_9)
spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout_17.addItem(spacerItem5)
self.tabViews.addTab(self.tab, "")
icon = QtGui.QIcon.fromTheme("view-list-tree")
self.tabViews.addTab(self.tab, icon, "")
self.tab_2 = QtWidgets.QWidget()
self.tab_2.setObjectName("tab_2")
self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_2)
@ -746,7 +747,8 @@ class Ui_Settings(object):
self.verticalLayout_11.addWidget(self.groupBox_6)
spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.verticalLayout_11.addItem(spacerItem6)
self.tabViews.addTab(self.tab_2, "")
icon = QtGui.QIcon.fromTheme("view-outline")
self.tabViews.addTab(self.tab_2, icon, "")
self.tab_3 = QtWidgets.QWidget()
self.tab_3.setObjectName("tab_3")
self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_3)
@ -921,7 +923,8 @@ class Ui_Settings(object):
self.cmbCorkCorner.addItem("")
self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.cmbCorkCorner)
self.gridLayout_3.addWidget(self.groupBox_5, 0, 0, 2, 1)
self.tabViews.addTab(self.tab_3, "")
icon = QtGui.QIcon.fromTheme("view-cards")
self.tabViews.addTab(self.tab_3, icon, "")
self.tab_4 = QtWidgets.QWidget()
self.tab_4.setObjectName("tab_4")
self.horizontalLayout_11 = QtWidgets.QHBoxLayout(self.tab_4)
@ -1146,7 +1149,8 @@ class Ui_Settings(object):
self.spnEditorParaBelow.setObjectName("spnEditorParaBelow")
self.formLayout_9.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.spnEditorParaBelow)
self.horizontalLayout_11.addWidget(self.groupBox_13)
self.tabViews.addTab(self.tab_4, "")
icon = QtGui.QIcon.fromTheme("view-text")
self.tabViews.addTab(self.tab_4, icon, "")
self.verticalLayout_9.addWidget(self.tabViews)
self.stack.addWidget(self.stackedWidgetPage2)
self.stackedWidgetPage3 = QtWidgets.QWidget()
@ -1634,7 +1638,7 @@ class Ui_Settings(object):
self.retranslateUi(Settings)
self.stack.setCurrentIndex(2)
self.tabViews.setCurrentIndex(0)
self.tabViews.setCurrentIndex(3)
self.themeStack.setCurrentIndex(1)
self.themeEditStack.setCurrentIndex(0)
self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex)

14
manuskript/ui/settings_ui.ui
View file

@ -792,9 +792,12 @@ text-align:center;</string>
<item>
<widget class="QTabWidget" name="tabViews">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="icon">
<iconset theme="view-list-tree"/>
</attribute>
<attribute name="title">
<string>Tree</string>
</attribute>
@ -1168,6 +1171,9 @@ text-align:center;</string>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="icon">
<iconset theme="view-outline"/>
</attribute>
<attribute name="title">
<string>Outline</string>
</attribute>
@ -1511,6 +1517,9 @@ text-align:center;</string>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="icon">
<iconset theme="view-cards"/>
</attribute>
<attribute name="title">
<string>Index cards</string>
</attribute>
@ -1909,6 +1918,9 @@ text-align:center;</string>
</layout>
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="icon">
<iconset theme="view-text"/>
</attribute>
<attribute name="title">
<string>Text editor</string>
</attribute>