Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Icons: Generate symbolic feather checkmarks
by Daniel Brötzmann 28 Jan '21

28 Jan '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8178de1a by Daniel Brötzmann at 2021-01-28T09:27:45+01:00 Icons: Generate symbolic feather checkmarks Fixed size symbolic icons have to be generated from SVGs using gtk-encode-symbolic-svg -o outpath feather-check-symbolic.svg 32x32 - - - - - 7ecda265 by Daniel Brötzmann at 2021-01-28T09:38:54+01:00 Icons: Convert feather camera and generate fixed size PNGs - - - - - 18 changed files: - − gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png - − gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png - gajim/data/icons/hicolor/scalable/devices/feather-camera-off-symbolic.svg - gajim/data/icons/hicolor/scalable/devices/feather-camera-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png and /dev/null differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-camera-off-symbolic.svg ===================================== @@ -1 +1,64 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-camera-off"><line x1="1" y1="1" x2="23" y2="23"></line><path d="M21 21H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h3m3-3h6l2 3h4a2 2 0 0 1 2 2v9.34m-7.72-2.06a4 4 0 1 1-5.56-5.56"></path></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + 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="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-camera-off" + version="1.1" + id="svg6" + sodipodi:docname="feather-camera-off-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview8" + showgrid="false" + inkscape:zoom="35.458333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 1.0292969 0 A 1 1 0 0 0 0.29296875 0.29296875 A 1 1 0 0 0 0.29296875 1.7070312 L 22.292969 23.707031 A 1 1 0 0 0 23.707031 23.707031 A 1 1 0 0 0 23.707031 22.292969 L 1.7070312 0.29296875 A 1 1 0 0 0 1.0292969 0 z " + id="path840" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 2 A 1 1 0 0 0 8 3 A 1 1 0 0 0 9 4 L 14.464844 4 L 16.167969 6.5546875 A 1.0001 1.0001 0 0 0 17 7 L 21 7 C 21.564129 7 22 7.4358706 22 8 L 22 17.339844 A 1 1 0 0 0 23 18.339844 A 1 1 0 0 0 24 17.339844 L 24 8 C 24 6.3549904 22.64501 5 21 5 L 17.535156 5 L 15.832031 2.4453125 A 1.0001 1.0001 0 0 0 15 2 L 9 2 z M 3 5 C 1.3549904 5 0 6.3549904 0 8 L 0 19 C 0 20.64501 1.3549904 22 3 22 L 21 22 A 1 1 0 0 0 22 21 A 1 1 0 0 0 21 20 L 3 20 C 2.4358706 20 2 19.564129 2 19 L 2 8 C 2 7.4358706 2.4358706 7 3 7 L 6 7 A 1 1 0 0 0 7 6 A 1 1 0 0 0 6 5 L 3 5 z M 9.6816406 8.7207031 A 1 1 0 0 0 9.15625 8.8945312 C 6.5894501 10.65089 6.2441315 14.357413 8.4433594 16.556641 C 10.642587 18.755869 14.34911 18.41055 16.105469 15.84375 A 1 1 0 0 0 15.84375 14.455078 A 1 1 0 0 0 14.455078 14.714844 C 13.382793 16.281916 11.200086 16.485242 9.8574219 15.142578 C 8.5147581 13.799914 8.7180837 11.617207 10.285156 10.544922 A 1 1 0 0 0 10.544922 9.15625 A 1 1 0 0 0 9.6816406 8.7207031 z " + id="path844" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-camera-symbolic.svg ===================================== @@ -1 +1,64 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-camera"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + 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="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-camera" + version="1.1" + id="svg6" + sodipodi:docname="feather-camera-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview8" + showgrid="false" + inkscape:zoom="35.458333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg6" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 2 A 1.0001 1.0001 0 0 0 8.1679688 2.4453125 L 6.4648438 5 L 3 5 C 1.3549904 5 0 6.3549904 0 8 L 0 19 C 0 20.64501 1.3549904 22 3 22 L 21 22 C 22.64501 22 24 20.64501 24 19 L 24 8 C 24 6.3549904 22.64501 5 21 5 L 17.535156 5 L 15.832031 2.4453125 A 1.0001 1.0001 0 0 0 15 2 L 9 2 z M 9.5351562 4 L 14.464844 4 L 16.167969 6.5546875 A 1.0001 1.0001 0 0 0 17 7 L 21 7 C 21.564129 7 22 7.4358706 22 8 L 22 19 C 22 19.564129 21.564129 20 21 20 L 3 20 C 2.4358706 20 2 19.564129 2 19 L 2 8 C 2 7.4358706 2.4358706 7 3 7 L 7 7 A 1.0001 1.0001 0 0 0 7.8320312 6.5546875 L 9.5351562 4 z " + id="path844" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 8 C 9.2504209 8 7 10.250421 7 13 C 7 15.749579 9.2504209 18 12 18 C 14.749579 18 17 15.749579 17 13 C 17 10.250421 14.749579 8 12 8 z M 12 10 C 13.668699 10 15 11.331301 15 13 C 15 14.668699 13.668699 16 12 16 C 10.331301 16 9 14.668699 9 13 C 9 11.331301 10.331301 10 12 10 z " + id="path840" /> +</svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0e36656ca71533b7b0bc87d63a5f30b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0e36656ca71533b7b0bc87d63a5f30b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Revert "Rename feather icons"
by Philipp Hörist 27 Jan '21

27 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e36656c by Philipp Hörist at 2021-01-27T23:34:12+01:00 Revert "Rename feather icons" This reverts commit ab451489ac1ce78d8b5d3e097fec440a7c3e7b3f - - - - - 26 changed files: - gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0e36656ca71533b7b0bc87d63a5f30b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0e36656ca71533b7b0bc87d63a5f30b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Icons: Add missing 16px Feather icons
by Daniel Brötzmann 27 Jan '21

27 Jan '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bb913f53 by wurstsalat at 2021-01-27T22:57:21+01:00 Icons: Add missing 16px Feather icons - - - - - 3 changed files: - + gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/LICENSE Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/LICENSE ===================================== @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2017 Cole Bemis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb913f53ee967025d10eee34f2866c05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb913f53ee967025d10eee34f2866c05… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 44 commits: DOAP: Add XEP-0222
by Philipp Hörist 27 Jan '21

27 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 97c157b1 by Daniel Brötzmann at 2021-01-11T08:54:39+01:00 DOAP: Add XEP-0222 - - - - - 3ac1fd52 by lovetox at 2021-01-12T23:32:10+01:00 Profile: Correctly handle not existing vcard - - - - - 0fc6c0b6 by zak333 at 2021-01-14T20:44:00+01:00 Update Muclumbus API endpoint - - - - - b894e2ba by André Apitzsch at 2021-01-14T23:15:49+01:00 Update year - - - - - 0abe497c by lovetox at 2021-01-15T23:28:28+01:00 PEPConfig: Raise default size - - - - - ea83fa7b by Daniel Brötzmann at 2021-01-16T17:36:59+01:00 AV: Fix closing chat window while in call - - - - - 3b702000 by lovetox at 2021-01-18T18:50:28+01:00 GroupchatCreation: Make it a dialog and raise size - - - - - ae18a849 by André Apitzsch at 2021-01-18T20:35:41+01:00 Search also in user data dir for translations Translation wasn't available if Gajim is installed in a user's home directory only." - - - - - 965b4a6f by lovetox at 2021-01-18T21:40:49+01:00 ChatControlBase: Don’t unselect text after key press This clears the SELECTION Clipboard for example when pressing ALT + TAB - - - - - 30d21d82 by lovetox at 2021-01-19T20:44:43+01:00 Windows: Fix build MSYS removed python2 support - - - - - b42a3ed4 by lovetox at 2021-01-20T21:14:13+01:00 RemoveAccounts: Fix race condition when removing an account disable_account() closes all account related dialogs. RemoveAccount is such a dialog but should not be closed mid processing the account removal. Fixes #10401 - - - - - c70dc103 by Daniel Brötzmann at 2021-01-22T17:17:14+01:00 DOAP: Add XEP-0245 - - - - - 304c9af1 by Daniel Brötzmann at 2021-01-22T17:18:19+01:00 DOAP: Use correct RFC strings - - - - - ab451489 by lovetox at 2021-01-26T23:21:17+01:00 Rename feather icons - - - - - 80581147 by lovetox at 2021-01-27T21:35:07+01:00 Start - - - - - ac1d3e6a by lovetox at 2021-01-27T21:35:07+01:00 Disable CI - - - - - 309d28d5 by lovetox at 2021-01-27T21:35:07+01:00 Really disable CI - - - - - b170bc88 by lovetox at 2021-01-27T21:36:25+01:00 Add Workspace settings API - - - - - af25b5fa by lovetox at 2021-01-27T21:36:25+01:00 Store and Open chats - - - - - 60f8cddc by lovetox at 2021-01-27T21:36:25+01:00 Add remove_chat() - - - - - 5c4032df by lovetox at 2021-01-27T21:36:25+01:00 Account Side Bar - - - - - 1ff8a7de by lovetox at 2021-01-27T21:36:26+01:00 Add Workspace Side Bar - - - - - 42fd46c3 by wurstsalat at 2021-01-27T21:36:26+01:00 ChatList: Add basic elements - - - - - abc1bd75 by wurstsalat at 2021-01-27T21:36:26+01:00 ChatListStack: Add Start Chat - - - - - f54adeee by wurstsalat at 2021-01-27T21:36:26+01:00 Add basic Sidebar styling - - - - - 1e7ea0f8 by wurstsalat at 2021-01-27T21:36:26+01:00 Improve styling for Sidebar and ChatList - - - - - ff7a64c6 by lovetox at 2021-01-27T21:36:26+01:00 Store chatlist on remove - - - - - fe05f61b by lovetox at 2021-01-27T21:36:26+01:00 Add/Remove Workspaces - - - - - 4e508cf2 by lovetox at 2021-01-27T21:36:26+01:00 Allow to add chats to different workspaces - - - - - 9c8524f9 by lovetox at 2021-01-27T21:36:26+01:00 Add transparent backgrounds - - - - - 3f6cf7f4 by wurstsalat at 2021-01-27T21:36:26+01:00 AccountSideBar: Improve styling - - - - - 42a50c6e by wurstsalat at 2021-01-27T21:36:26+01:00 WorkspaceSidebar: Improve styling - - - - - 0564b9a7 by lovetox at 2021-01-27T21:36:26+01:00 Improve left sidebar - - - - - a30c3070 by lovetox at 2021-01-27T21:36:26+01:00 css - - - - - 62cb48f2 by lovetox at 2021-01-27T21:36:26+01:00 Dont fail when account is disabled - - - - - 262e7ada by lovetox at 2021-01-27T21:36:26+01:00 CSS - - - - - cb9ace52 by wurstsalat at 2021-01-27T21:36:26+01:00 AvatarSelector: Add Load Image button - - - - - a0b49280 by Daniel Brötzmann at 2021-01-27T21:36:26+01:00 Workspace: Add Workspace edit dialog - - - - - ce1b1604 by wurstsalat at 2021-01-27T21:36:26+01:00 Workspace: Add title and editing functionality - - - - - 541a7983 by wurstsalat at 2021-01-27T21:36:26+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - d6e59460 by lovetox at 2021-01-27T21:36:26+01:00 Store type for open chats - - - - - 934e0e2d by lovetox at 2021-01-27T21:36:26+01:00 Store workspace dialog settings - - - - - ebf2f6f5 by lovetox at 2021-01-27T21:36:26+01:00 Fix adding new Workspace - - - - - 2032d76e by lovetox at 2021-01-27T21:36:26+01:00 Fix some selection bugs - - - - - 30 changed files: - − .gitlab-ci.yml - README.md - data/gajim-history-manager.1 - data/gajim-remote.1 - data/gajim.1 - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/const.py - gajim/common/i18n.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - + gajim/data/gui/main.ui - + gajim/data/gui/workspace_dialog.ui - gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e2cb36451cf3229d3461ca02f7a813… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e2cb36451cf3229d3461ca02f7a813… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix some selection bugs
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 8e2cb364 by lovetox at 2021-01-27T00:06:20+01:00 Fix some selection bugs - - - - - 3 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -16,6 +16,8 @@ def __init__(self, ui, chat_stack): self._chat_stack = chat_stack self._chat_lists = {} + self.add_named(Gtk.Box(), 'default') + self.show_all() self._ui.search_entry.connect( 'search-changed', self._on_search_changed) @@ -35,7 +37,7 @@ def add_chat_list(self, workspace_id): def remove_chat_list(self, workspace_id): chat_list = self._chat_lists[workspace_id] self.remove(chat_list) - for account, jid in chat_list.get_open_chats(): + for account, jid, _ in chat_list.get_open_chats(): self.remove_chat(workspace_id, account, jid) self._chat_lists.pop(workspace_id) @@ -48,9 +50,16 @@ def _on_row_selected(self, _chat_list, row): self._chat_stack.show_chat(row.account, row.jid) def show_chat_list(self, workspace_id): - self.set_visible_child_name(workspace_id) + current_workspace_id = self.get_visible_child_name() + if current_workspace_id == workspace_id: + return + + if current_workspace_id != 'default': + self._chat_lists[current_workspace_id].unselect_all() + self._ui.workspace_label.set_text( app.settings.get_workspace_setting(workspace_id, 'name')) + self.set_visible_child_name(workspace_id) def add_chat(self, workspace_id, account, jid, type_): chat_list = self._chat_lists.get(workspace_id) @@ -66,7 +75,6 @@ def select_chat(self, workspace_id, account, jid): def store_open_chats(self, workspace_id): chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() - print('store', open_chats) app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) ===================================== gajim/gtk/main.py ===================================== @@ -105,10 +105,22 @@ def add_workspace(self, _action, param): def remove_workspace(self, _action, param): workspace_id = param.get_string() - self._workspace_side_bar.remove_workspace(workspace_id) + + was_active = self.get_active_workspace() == workspace_id + + success = self._workspace_side_bar.remove_workspace(workspace_id) + if not success: + return + + if was_active: + new_active_id = self._workspace_side_bar.get_first_workspace() + self._workspace_side_bar.activate_workspace(new_active_id) + self._chat_list_stack.show_chat_list(new_active_id) + self._chat_list_stack.remove_chat_list(workspace_id) app.settings.remove_workspace(workspace_id) + def activate_workspace(self, _action, param): workspace_id = param.get_string() self._workspace_side_bar.activate_workspace(workspace_id) @@ -145,6 +157,11 @@ def _load_chats(self): continue self.add_chat_for_workspace(workspace_id, account, jid, type_) + for workspace_id in app.settings.get_workspaces(): + self._workspace_side_bar.activate_workspace(workspace_id) + self._chat_list_stack.show_chat_list(workspace_id) + break + self._startup_finished = True def _on_start_chat_clicked(self, _button): ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -51,8 +51,11 @@ def add_workspace(self, workspace_id): self.add(row) def remove_workspace(self, workspace_id): + if len(self._workspaces) == 1: + return False row = self._workspaces.pop(workspace_id) self.remove(row) + return True def activate_workspace(self, workspace_id): row = self.get_selected_row() @@ -68,6 +71,10 @@ def get_active_workspace(self): return None return row.workspace_id + def get_first_workspace(self): + for row in self.get_children(): + return row.workspace_id + def update_avatar(self, workspace_id): row = self._workspaces[workspace_id] row.update_avatar() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e2cb36451cf3229d3461ca02f7a8133… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e2cb36451cf3229d3461ca02f7a8133… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rename feather icons
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab451489 by lovetox at 2021-01-26T23:21:17+01:00 Rename feather icons - - - - - 26 changed files: - gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.png Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.png ===================================== ===================================== gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png → gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.png ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab451489ac1ce78d8b5d3e097fec440a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab451489ac1ce78d8b5d3e097fec440a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix adding new Workspace
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 0646b45c by lovetox at 2021-01-26T22:46:45+01:00 Fix adding new Workspace - - - - - 3 changed files: - gajim/data/gui/workspace_dialog.ui - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -190,7 +190,7 @@ </packing> </child> <child> - <object class="GtkButton"> + <object class="GtkButton" id="save_button"> <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> <property name="can_focus">True</property> ===================================== gajim/gtk/main.py ===================================== @@ -97,10 +97,11 @@ def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() def add_workspace(self, _action, param): - name = param.get_string() - workspace_id = app.settings.add_workspace(name) + workspace_id = param.get_string() self._workspace_side_bar.add_workspace(workspace_id) self._chat_list_stack.add_chat_list(workspace_id) + self._workspace_side_bar.activate_workspace(workspace_id) + self._chat_list_stack.show_chat_list(workspace_id) def remove_workspace(self, _action, param): workspace_id = param.get_string() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -79,11 +79,12 @@ def _on_cancel(self, _button): def _on_color_set(self, _button): self._update_avatar() - def _on_text_changed(self, _entry, _param): + def _on_text_changed(self, entry, _param): + self._ui.save_button.set_sensitive(bool(entry.get_text())) self._update_avatar() def _update_avatar(self): - name = self._ui.entry.get_text() or 'M' + name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() surface = make_workspace_avatar( @@ -121,6 +122,10 @@ def _on_save(self, _button): self.destroy() return + workspace_id = app.settings.add_workspace(name) + app.settings.set_workspace_setting( + workspace_id, 'color', rgba.to_string()) + app.window.activate_action( - 'add-workspace', GLib.Variant('s', name)) + 'add-workspace', GLib.Variant('s', workspace_id)) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0646b45c142fa919fcc8901a1f1e1aed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0646b45c142fa919fcc8901a1f1e1aed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Store type for open chats
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5e1c93c6 by lovetox at 2021-01-26T22:34:17+01:00 Store type for open chats - - - - - 0c15cef3 by lovetox at 2021-01-26T22:34:17+01:00 Store workspace dialog settings - - - - - 13 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/setting_values.py - gajim/data/gui/workspace_dialog.ui - gajim/gtk/avatar.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/util.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/common/client.py ===================================== @@ -450,7 +450,7 @@ def _finish_connect(self): # We did not resume the stream, so we are not joined any MUCs self.update_presence(include_muc=False) - self.get_module('Bookmarks').request_bookmarks() + # self.get_module('Bookmarks').request_bookmarks() self.get_module('SoftwareVersion').set_enabled(True) self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() ===================================== gajim/common/const.py ===================================== @@ -19,6 +19,7 @@ class AvatarSize(IntEnum): ROSTER = 32 ACCOUNT_SIDE_BAR = 40 WORKSPACE = 40 + WORKSPACE_EDIT = 100 CHAT = 48 NOTIFICATION = 48 GROUP_INFO = 100 ===================================== gajim/common/setting_values.py ===================================== @@ -287,6 +287,8 @@ class _ACCOUNT_DEFAULT: WORKSPACE_SETTINGS = { 'name': _('My Workspace'), + 'color': '', + 'avatar_sha': '', 'open_chats': [], } ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="preview"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -21,8 +21,9 @@ <child> <object class="GtkEntry" id="entry"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="halign">center</property> + <signal name="notify::text" handler="_on_text_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -33,10 +34,10 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Choose a color or select an image</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <style> <class name="dim-label"/> </style> @@ -50,7 +51,7 @@ <child> <object class="GtkStackSwitcher"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="stack">style_stack</property> </object> @@ -63,21 +64,21 @@ <child> <object class="GtkStack" id="style_stack"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="transition-duration">100</property> - <property name="transition-type">slide-left-right</property> + <property name="can_focus">False</property> + <property name="transition_duration">100</property> + <property name="transition_type">slide-left-right</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">start</property> - <property name="margin-top">6</property> + <property name="margin_top">6</property> <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="label" translatable="yes">Color</property> <style> @@ -93,9 +94,10 @@ <child> <object class="GtkColorButton" id="color_chooser"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="valign">center</property> + <signal name="color-set" handler="_on_color_set" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -112,19 +114,19 @@ <child> <object class="GtkBox" id="image_box"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkSwitch" id="use_image"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> </object> <packing> <property name="expand">False</property> @@ -135,7 +137,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Use Image instead of Color</property> </object> <packing> @@ -171,14 +173,14 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <child> <object class="GtkButton"> <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="_on_cancel" swapped="no"/> </object> <packing> @@ -191,9 +193,9 @@ <object class="GtkButton"> <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> <style> <class name="suggested-action"/> @@ -202,7 +204,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -210,7 +212,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> + <property name="pack_type">end</property> <property name="position">7</property> </packing> </child> ===================================== gajim/gtk/avatar.py ===================================== @@ -29,11 +29,14 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from .const import DEFAULT_WORKSPACE_COLOR from .util import load_pixbuf from .util import text_to_color from .util import scale_with_ratio from .util import get_css_show_class from .util import convert_rgb_string_to_float +from .util import rgba_to_float +from .util import make_rgba log = logging.getLogger('gajim.gui.avatar') @@ -79,7 +82,7 @@ def generate_avatar(letters, color, size, scale): return context.get_target() -@lru_cache(maxsize=2048) +@lru_cache(maxsize=None) def generate_default_avatar(letter, color_string, size, scale, style='circle'): color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) @@ -91,6 +94,17 @@ def generate_default_avatar(letter, color_string, size, scale, style='circle'): return surface +@lru_cache(maxsize=None) +def make_workspace_avatar(letter, color, size, scale, style='round-corners'): + surface = generate_avatar(letter, color, size, scale) + if style == 'circle': + surface = clip_circle(surface) + elif style == 'round-corners': + surface = round_corners(surface) + surface.set_device_scale(scale, scale) + return surface + + def add_status_to_avatar(surface, show): width = surface.get_width() height = surface.get_height() @@ -308,6 +322,23 @@ def get_muc_surface(self, account, jid, size, scale, default=False): self._cache[jid][(size, scale)] = surface return surface + def get_workspace_surface(self, workspace_id, size, scale): + surface = self._cache[workspace_id].get((size, scale)) + if surface is not None: + return surface + + name = app.settings.get_workspace_setting(workspace_id, 'name') + color = app.settings.get_workspace_setting(workspace_id, 'color') + avatar_sha = app.settings.get_workspace_setting( + workspace_id, 'avatar_sha') + if not avatar_sha: + rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) + letter = name[:1].upper() + surface = make_workspace_avatar( + letter, rgba_to_float(rgba), size, scale) + self._cache[workspace_id][(size, scale)] = surface + return surface + def prepare_for_publish(self, path): success, data = self._load_for_publish(path) if not success: ===================================== gajim/gtk/chat_list.py ===================================== @@ -38,12 +38,12 @@ def set_filter_text(self, text): self._current_filter_text = text self.invalidate_filter() - def add_chat(self, account, jid): + def add_chat(self, account, jid, type_): if self._chats.get((account, jid)) is not None: # Chat is already in the List return - row = ChatRow(self._workspace_id, account, jid) + row = ChatRow(self._workspace_id, account, jid, type_) self._chats[(account, jid)] = row self.add(row) @@ -60,16 +60,20 @@ def contains_chat(self, account, jid): return self._chats.get((account, jid)) is not None def get_open_chats(self): - return list(self._chats.keys()) + open_chats = [] + for key, value in self._chats.items(): + open_chats.append(key + (value.type,)) + return open_chats class ChatRow(Gtk.ListBoxRow): - def __init__(self, workspace_id, account, jid): + def __init__(self, workspace_id, account, jid, type_): Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid self.workspace_id = workspace_id + self.type = type_ self._unread_count = 0 self.get_style_context().add_class('chatlist-row') ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -52,20 +52,21 @@ def show_chat_list(self, workspace_id): self._ui.workspace_label.set_text( app.settings.get_workspace_setting(workspace_id, 'name')) - def add_chat(self, workspace_id, *args): + def add_chat(self, workspace_id, account, jid, type_): chat_list = self._chat_lists.get(workspace_id) if chat_list is None: chat_list = self.add_chat_list(workspace_id) - chat_list.add_chat(*args) + chat_list.add_chat(account, jid, type_) - def select_chat(self, workspace_id, *args): + def select_chat(self, workspace_id, account, jid): self.show_chat_list(workspace_id) chat_list = self._chat_lists.get(workspace_id) - chat_list.select_chat(*args) + chat_list.select_chat(account, jid) def store_open_chats(self, workspace_id): chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() + print('store', open_chats) app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) ===================================== gajim/gtk/const.py ===================================== @@ -25,6 +25,10 @@ 'bind inverted enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore + +DEFAULT_WORKSPACE_COLOR = 'rgb(191,15,167)' + + @unique class Theme(IntEnum): NOT_DARK = 0 ===================================== gajim/gtk/main.py ===================================== @@ -64,6 +64,7 @@ def _add_actions(self): ('add-workspace', 's', self.add_workspace), ('remove-workspace', 's', self.remove_workspace), ('activate-workspace', 's', self.activate_workspace), + ('add-chat', 'as', self.add_chat), ('remove-chat', 'as', self.remove_chat), ] @@ -89,6 +90,9 @@ def show_title(self, *args): def get_active_jid(self, *args): pass + def get_workspace_bar(self): + return self._workspace_side_bar + def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() @@ -109,13 +113,14 @@ def activate_workspace(self, _action, param): self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) - def add_chat(self, account, jid): + def add_chat(self, _action, param): + account, jid, type_ = param.unpack() workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, account, jid) + self.add_chat_for_workspace(workspace_id, account, jid, type_) - def add_chat_for_workspace(self, workspace_id, account, jid): + def add_chat_for_workspace(self, workspace_id, account, jid, type_): self._chat_stack.add_chat(account, jid) - self._chat_list_stack.add_chat(workspace_id, account, jid) + self._chat_list_stack.add_chat(workspace_id, account, jid, type_) if self._startup_finished: self._chat_list_stack.select_chat(workspace_id, account, jid) @@ -134,10 +139,10 @@ def _load_chats(self): self._chat_list_stack.add_chat_list(workspace_id) open_chats = app.settings.get_workspace_setting(workspace_id, 'open_chats') - for account, jid in open_chats: + for account, jid, type_ in open_chats: if account not in app.connections: continue - self.add_chat_for_workspace(workspace_id, account, jid) + self.add_chat_for_workspace(workspace_id, account, jid, type_) self._startup_finished = True ===================================== gajim/gtk/start_chat.py ===================================== @@ -296,7 +296,9 @@ def _start_new_chat(self, row): else: # app.interface.new_chat_from_jid(row.account, row.jid) - app.window.add_chat(row.account, row.jid) + app.window.activate_action( + 'add-chat', GLib.Variant('as', + [row.account, row.jid, 'contact'])) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/util.py ===================================== @@ -458,6 +458,16 @@ def convert_rgb_string_to_float(rgb_string: str) -> Tuple[float, float, float]: return (rgba.red, rgba.green, rgba.blue) +def rgba_to_float(rgba): + return (rgba.red, rgba.green, rgba.blue) + + +def make_rgba(color_string): + rgba = Gdk.RGBA() + rgba.parse(color_string) + return rgba + + def get_monitor_scale_factor() -> int: display = Gdk.Display.get_default() monitor = display.get_primary_monitor() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -20,10 +20,12 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from .avatar import generate_default_avatar +from .avatar import make_workspace_avatar from .avatar_selector import AvatarSelector from .util import get_builder -from .util import text_to_color +from .util import rgba_to_float +from .util import make_rgba +from .const import DEFAULT_WORKSPACE_COLOR class WorkspaceDialog(Gtk.ApplicationWindow): @@ -46,17 +48,21 @@ def __init__(self, workspace_id=None): self._avatar_selector.set_size_request(200, 200) self._ui.image_box.add(self._avatar_selector) + name = _('My Workspace') + color = None + avatar_sha = None + if workspace_id is not None: name = app.settings.get_workspace_setting( workspace_id, 'name') - rgba = Gdk.RGBA() # TODO: Load setting - else: - name = _('My Workspace') - rgba = Gdk.RGBA(*text_to_color(name)) + color = app.settings.get_workspace_setting( + workspace_id, 'color') + + rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) self._ui.entry.set_text(name) self._ui.color_chooser.set_rgba(rgba) - self._generate_avatar() + self._update_avatar() self._ui.connect_signals(self) @@ -70,14 +76,21 @@ def _on_key_press_event(self, _widget, event): def _on_cancel(self, _button): self.destroy() - def _generate_avatar(self): - name = self._ui.entry.get_text() - if not name: - return - letter = name[:1].upper() + def _on_color_set(self, _button): + self._update_avatar() + + def _on_text_changed(self, _entry, _param): + self._update_avatar() + + def _update_avatar(self): + name = self._ui.entry.get_text() or 'M' + rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() - surface = generate_default_avatar( - letter, name, AvatarSize.GROUP_INFO, scale, style='round-corners') + surface = make_workspace_avatar( + name[:1].upper(), + rgba_to_float(rgba), + AvatarSize.WORKSPACE_EDIT, + scale) self._ui.preview.set_from_surface(surface) def _get_avatar_data(self): @@ -92,14 +105,19 @@ def _get_avatar_data(self): def _on_save(self, _button): name = self._ui.entry.get_text() - # rgba = self._ui.color_chooser.get_rgba() - # color = rgba.to_string() + rgba = self._ui.color_chooser.get_rgba() # avatar = self._get_avatar_data() # use_image = self._ui.use_image.get_active() if self._workspace_id is not None: app.settings.set_workspace_setting( self._workspace_id, 'name', name) + app.settings.set_workspace_setting( + self._workspace_id, 'color', rgba.to_string()) + + app.interface.avatar_storage.invalidate_cache(self._workspace_id) + workspace_bar = app.window.get_workspace_bar() + workspace_bar.update_avatar(self._workspace_id) self.destroy() return ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -6,7 +6,6 @@ from gajim.common.i18n import _ -from .avatar import generate_default_avatar from .util import open_window @@ -69,6 +68,10 @@ def get_active_workspace(self): return None return row.workspace_id + def update_avatar(self, workspace_id): + row = self._workspaces[workspace_id] + row.update_avatar() + class CommonWorkspace(Gtk.ListBoxRow): def __init__(self, workspace_id): @@ -84,11 +87,14 @@ def __init__(self, workspace_id): self.sort_index = 0 - image = WorkspaceAvatar(workspace_id) - image.set_halign(Gtk.Align.CENTER) - self.add(image) + self._image = WorkspaceAvatar(workspace_id) + self._image.set_halign(Gtk.Align.CENTER) + self.add(self._image) self.show_all() + def update_avatar(self): + self._image.update() + class AddWorkspace(CommonWorkspace): def __init__(self, workspace_id): @@ -136,10 +142,11 @@ def _on_click(self, _button, action): class WorkspaceAvatar(Gtk.Image): def __init__(self, workspace_id): Gtk.Image.__init__(self) + self._workspace_id = workspace_id + self.update() - name = app.settings.get_workspace_setting(workspace_id, 'name') - letter = name[:1].upper() + def update(self): scale = self.get_scale_factor() - surface = generate_default_avatar( - letter, name, AvatarSize.WORKSPACE, scale, style='round-corners') + surface = app.interface.avatar_storage.get_workspace_surface( + self._workspace_id, AvatarSize.WORKSPACE, scale) self.set_from_surface(surface) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d47f9bc57e972e3324a47709911041… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d47f9bc57e972e3324a47709911041… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MainWindow: Add Paned for chat list and chat controls
by Daniel Brötzmann 26 Jan '21

26 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9d47f9bc by wurstsalat at 2021-01-26T21:09:54+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - 4 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -8,200 +8,6 @@ <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <child> -  - <object class="GtkGrid" id="right_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> -  - <object class="GtkGrid" id="middle_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton" id="start_chat_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Start Chat</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-symbolic</property> - </object> - </child> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="primary-icon-name">edit-find-symbolic</property> - <property name="primary-icon-activatable">False</property> - <property name="primary-icon-sensitive">False</property> - <property name="placeholder-text" translatable="yes">Search…</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="workspace_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label">Workspace Label</property> - <property name="ellipsize">end</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit_workspace_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Workspace</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> - </object> - </child> - <style> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <style> - <class name="chatlist-top-bar"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> <child>  <object class="GtkGrid" id="left_grid"> @@ -324,6 +130,215 @@ <property name="top-attach">0</property> </packing> </child> + <child> + <object class="GtkPaned" id="paned"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="position">250</property> + <property name="position-set">True</property> + <child> +  + <object class="GtkGrid" id="middle_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> +  + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">3</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton" id="start_chat_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Start Chat</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="workspace_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit_workspace_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Workspace</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <style> + <class name="chatlist-top-bar"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + <child> +  + <object class="GtkGrid" id="right_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -105,12 +105,8 @@ } .chatlist-top-bar { padding: 12px; - border-right: 1px solid @unfocused_borders; border-bottom: 1px solid @unfocused_borders; } -.chatlist-stack { - border-right: 1px solid @unfocused_borders; -} .revealer-close-button { padding: 0px; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -24,7 +24,6 @@ def __init__(self, workspace_id): self._chats = {} self._current_filter_text = '' self._workspace_id = workspace_id - self.set_size_request(250, -1) self.show_all() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -1,5 +1,4 @@ -from gi.repository import GLib from gi.repository import Gtk from gajim.common import app @@ -10,8 +9,7 @@ class ChatListStack(Gtk.Stack): def __init__(self, ui, chat_stack): Gtk.Stack.__init__(self) - self.get_style_context().add_class('chatlist-stack') - + self.set_hexpand(True) self.set_vexpand(True) self._ui = ui View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d47f9bc57e972e3324a47709911041d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d47f9bc57e972e3324a47709911041d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Workspace: Add title and editing functionality
by Daniel Brötzmann 26 Jan '21

26 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 20b9fded by wurstsalat at 2021-01-26T20:15:00+01:00 Workspace: Add title and editing functionality - - - - - 6 changed files: - gajim/data/gui/main.ui - gajim/data/gui/workspace_dialog.ui - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> +  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> +  <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -42,56 +44,123 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> +  <object class="GtkGrid" id="middle_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width_request">200</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> - <property name="placeholder_text" translatable="yes">Search…</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton" id="start_chat_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Start Chat</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkButton" id="start_chat_button"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Start Chat</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkImage"> + <object class="GtkLabel" id="workspace_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> + <property name="can-focus">False</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> + <style> + <class name="large-header"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit_workspace_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Workspace</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + <style> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="suggested-action"/> - </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <style> @@ -99,34 +168,59 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> +  <object class="GtkGrid" id="left_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkBox" id="account_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">end</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -142,18 +236,18 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="workspace_scrolled"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_height">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <property name="propagate-natural-height">True</property> <child> <placeholder/> </child> @@ -162,21 +256,20 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="app_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -187,7 +280,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -200,18 +293,54 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="chatlist-left-grid"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -94,7 +94,7 @@ <object class="GtkColorButton" id="color_chooser"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="valign">center</property> </object> <packing> @@ -192,7 +192,7 @@ <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="use-underline">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> <style> ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -19,14 +19,9 @@ def __init__(self, ui, chat_stack): self._chat_lists = {} self.show_all() - self._ui.start_chat_button.connect( - 'clicked', self._on_start_chat_clicked) self._ui.search_entry.connect( 'search-changed', self._on_search_changed) - def _on_start_chat_clicked(self, _button): - app.app.activate_action('start-chat', GLib.Variant('s', '')) - def _on_search_changed(self, search_entry): chat_list = self.get_visible_child() chat_list.set_filter_text(search_entry.get_text()) @@ -56,6 +51,8 @@ def _on_row_selected(self, _chat_list, row): def show_chat_list(self, workspace_id): self.set_visible_child_name(workspace_id) + self._ui.workspace_label.set_text( + app.settings.get_workspace_setting(workspace_id, 'name')) def add_chat(self, workspace_id, *args): chat_list = self._chat_lists.get(workspace_id) ===================================== gajim/gtk/main.py ===================================== @@ -11,6 +11,8 @@ from gajim.gui.account_side_bar import AccountSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar +from .util import open_window + class MainWindow(Gtk.ApplicationWindow): def __init__(self): @@ -45,6 +47,11 @@ def __init__(self): self._ui.middle_grid.add(self._chat_list_stack) self._ui.right_grid.add(self._chat_stack) + + self._ui.edit_workspace_button.connect( + 'clicked', self._on_edit_workspace_clicked) + self._ui.start_chat_button.connect( + 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) self.show_all() @@ -133,3 +140,10 @@ def _load_chats(self): self.add_chat_for_workspace(workspace_id, account, jid) self._startup_finished = True + + def _on_start_chat_clicked(self, _button): + app.app.activate_action('start-chat', GLib.Variant('s', '')) + + def _on_edit_workspace_clicked(self, _button): + open_window('WorkspaceDialog', + workspace_id=self.get_active_workspace()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -27,7 +27,7 @@ class WorkspaceDialog(Gtk.ApplicationWindow): - def __init__(self, edit_mode=True): + def __init__(self, workspace_id=None): Gtk.ApplicationWindow.__init__(self) self.set_name('WorkspaceDialog') self.set_application(app.app) @@ -37,7 +37,7 @@ def __init__(self, edit_mode=True): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_size_request(350, -1) - self._edit_mode = edit_mode + self._workspace_id = workspace_id self._ui = get_builder('workspace_dialog.ui') self.add(self._ui.box) @@ -46,8 +46,14 @@ def __init__(self, edit_mode=True): self._avatar_selector.set_size_request(200, 200) self._ui.image_box.add(self._avatar_selector) - name = _('My Workspace') - rgba = Gdk.RGBA(*text_to_color(name)) + if workspace_id is not None: + name = app.settings.get_workspace_setting( + workspace_id, 'name') + rgba = Gdk.RGBA() # TODO: Load setting + else: + name = _('My Workspace') + rgba = Gdk.RGBA(*text_to_color(name)) + self._ui.entry.set_text(name) self._ui.color_chooser.set_rgba(rgba) self._generate_avatar() @@ -91,9 +97,11 @@ def _on_save(self, _button): # avatar = self._get_avatar_data() # use_image = self._ui.use_image.get_active() - if self._edit_mode: - # TODO: Edit action + if self._workspace_id is not None: + app.settings.set_workspace_setting( + self._workspace_id, 'name', name) self.destroy() + return app.window.activate_action( 'add-workspace', GLib.Variant('s', name)) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -41,7 +41,7 @@ def _on_button_press(self, _listbox, button_event): def _on_row_activated(self, _listbox, row): main_window = self.get_toplevel() if row.workspace_id == 'add': - open_window('WorkspaceDialog', edit_mode=False) + open_window('WorkspaceDialog') else: main_window.activate_action( 'activate-workspace', GLib.Variant('s', row.workspace_id)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b9fded18b0001992262a6506251494… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b9fded18b0001992262a6506251494… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits