misc: bump daemon submodule

Change-Id: I800aad6362be0124a33904b834ff8e04b560d6a8
snap: add libpipewire to build dependencies
2025-10-30 07:53:33 +08:00 · 2024-04-08 15:11:47 -04:00 · 2024-04-07 12:32:32 -04:00 · 2024-04-04 11:39:44 -04:00 · 2024-04-01 16:42:26 -04:00 · 2024-03-25 08:57:23 -04:00
6 changed files with 66 additions and 45 deletions
--- a/2
+++ b/2
--- a/extras/packaging/gnu-linux/docker/Dockerfile_snap
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_snap
@ -1,5 +1,5 @@
 ARG RISK=edge
-ARG UBUNTU=focal
+ARG UBUNTU=jammy

 FROM ubuntu:$UBUNTU as builder
 ARG RISK
--- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
+++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
@ -168,7 +168,7 @@ package-repositories:
    components: [main]
    suites: [jami]
    key-id: A295D773307D25A33AE72F2F64CD5FA175348F84
-    url: https://dl.jami.net/nightly/ubuntu_20.04/
+    url: https://dl.jami.net/nightly/ubuntu_22.04/

 parts:
  desktop-launch:
@ -304,6 +304,7 @@ parts:
    - libswscale-dev
    - libva-dev
    - libvdpau-dev
+    - libpipewire-0.3-dev
    - libargon2-0-dev # opendht
    - libexpat1-dev
    - libjsoncpp-dev
@ -326,7 +327,7 @@ parts:
    - libegl1
    - libgbm1
    - libgudev-1.0-0
-    - libjsoncpp1
+    - libjsoncpp25
    - libllvm12
    - libminizip1
    - libnm0
--- a/src/app/mainview/components/InCallLocalVideo.qml
+++ b/src/app/mainview/components/InCallLocalVideo.qml
@ -43,8 +43,14 @@ LocalVideo {

    visibilityCondition: (CurrentCall.isSharing || !CurrentCall.isVideoMuted) &&
                         !CurrentCall.isConference
+
+    // Keep the area of the preview a proportion of the screen size plus a
+    // modifier to allow the user to scale it.
+    readonly property real containerArea: container.width * container.height
+    property real scalingFactor: 1
+    width: Math.sqrt(containerArea / 16) * scalingFactor
    height: width * invAspectRatio
-    width: Math.max(container.width / 5, JamiTheme.minimumPreviewWidth)
+
    flip: CurrentCall.flipSelf && !CurrentCall.isSharing
    blurRadius: hidden ? 25 : 0

@ -62,6 +68,20 @@ LocalVideo {
    // Animate the hiddenSize with a Behavior.
    Behavior on sideMargin { NumberAnimation { duration: 250; easing.type: Easing.OutExpo }}
    readonly property bool onLeft: state.indexOf("left") !== -1
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: !localPreview.hidden
+        onWheel: function(event) {
+            const delta = event.angleDelta.y / 120 * 0.1;
+            if (event.modifiers & Qt.ControlModifier) {
+                parent.opacity = JamiQmlUtils.clamp(parent.opacity + delta, 0.25, 1);
+            } else {
+                localPreview.scalingFactor = JamiQmlUtils.clamp(localPreview.scalingFactor + delta, 0.5, 4);
+            }
+        }
+    }
+
    PushButton {
        id: hidePreviewButton
        objectName: "hidePreviewButton"
--- a/translations/jami_client_qt_sr.ts
+++ b/translations/jami_client_qt_sr.ts
@ -307,37 +307,37 @@ Jami will now quit.</source>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="90"/>
        <source>Push-to-talk</source>
-        <translation type="unfinished"/>
+        <translation>Voki-toki</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="91"/>
        <source>Enable push-to-talk</source>
-        <translation type="unfinished"/>
+        <translation>Omogućite voki-toki</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="92"/>
        <source>Keyboard shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Prečica na tastaturi</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="93"/>
        <source>Change keyboard shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Promenite prečicu na tastaturi</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="96"/>
        <source>Change shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Promenite prečicu</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="97"/>
        <source>Press the key to be assigned to push-to-talk shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Pritisnite taster da budete dodeljeni voki-toki prečici</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="98"/>
        <source>Assign</source>
-        <translation type="unfinished"/>
+        <translation>Dodeli</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="101"/>
@ -597,7 +597,7 @@ Jami will now quit.</source>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="176"/>
        <source>Extensions</source>
-        <translation type="unfinished"/>
+        <translation>Proširenja</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="186"/>
@ -850,7 +850,7 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="480"/>
        <source>Use native window frame (requires restart)</source>
-        <translation type="unfinished"/>
+        <translation>Koristite izvorni okvir prozora (zahteva ponovno pokretanje)</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="484"/>
@ -885,12 +885,12 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="529"/>
        <source>Content access error</source>
-        <translation type="unfinished"/>
+        <translation>Greška u pristupu sadržaju</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="530"/>
        <source>Content not found</source>
-        <translation type="unfinished"/>
+        <translation>Sadržaj nije pronađen</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="593"/>
@ -900,22 +900,22 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="594"/>
        <source>This account is password encrypted, enter the password to generate a PIN code.</source>
-        <translation type="unfinished"/>
+        <translation>Ovaj nalog je šifrovan lozinkom, unesite lozinku da biste generisali PIN kod.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="596"/>
        <source>PIN expired</source>
-        <translation type="unfinished"/>
+        <translation>PIN je istekao</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="597"/>
        <source>On another device</source>
-        <translation type="unfinished"/>
+        <translation>Na drugom uređaju</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="598"/>
        <source>Install and launch Jami, select &quot;Import from another device&quot; and scan the QR code.</source>
-        <translation type="unfinished"/>
+        <translation>Instalirajte i pokrenite Jami, izaberite „Uvezi sa drugog uređaja“ i skenirajte QR kod.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="599"/>
@ -925,12 +925,12 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="600"/>
        <source>In Jami, scan QR code or manually enter the PIN.</source>
-        <translation type="unfinished"/>
+        <translation>U Jamiju, skenirajte QR kod ili ručno unesite PIN.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="601"/>
        <source>The PIN code is valid for: </source>
-        <translation type="unfinished"/>
+        <translation>PIN kod važi za:</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="604"/>
@ -4407,7 +4407,7 @@ connects to synchronize the conversation.</source>
    <message>
        <location filename="../src/app/utilsadapter.cpp" line="345"/>
        <source>%1 Mbps</source>
-        <translation>%1 Мбпс</translation>
+        <translation>%1 Mbps</translation>
    </message>
    <message>
        <location filename="../src/app/utilsadapter.cpp" line="345"/>
@ -4425,22 +4425,22 @@ connects to synchronize the conversation.</source>
    <message>
        <location filename="../src/libclient/contactmodel.cpp" line="498"/>
        <source>Searching…</source>
-        <translation>Трагајући...</translation>
+        <translation>Traženje…</translation>
    </message>
    <message>
        <location filename="../src/libclient/contactmodel.cpp" line="1030"/>
        <source>Invalid ID</source>
-        <translation>Неважни идентификациони документ</translation>
+        <translation>Nevažeći ID</translation>
    </message>
    <message>
        <location filename="../src/libclient/contactmodel.cpp" line="1033"/>
        <source>Username not found</source>
-        <translation>Име корисника није пронађено</translation>
+        <translation>Korisničko ime nije pronađeno</translation>
    </message>
    <message>
        <location filename="../src/libclient/contactmodel.cpp" line="1036"/>
        <source>Couldn&apos;t lookup…</source>
-        <translation>Не могу да тражим...</translation>
+        <translation>Nije moguće potražiti…</translation>
    </message>
 </context>
 <context>
@ -4448,7 +4448,7 @@ connects to synchronize the conversation.</source>
    <message>
        <location filename="../src/libclient/contactmodel.cpp" line="461"/>
        <source>Bad URI scheme</source>
-        <translation>Лоша схема УРИ-а</translation>
+        <translation>Loša URI šema</translation>
    </message>
 </context>
 </TS>
--- a/translations/jami_client_qt_sr@Cyrl.ts
+++ b/translations/jami_client_qt_sr@Cyrl.ts
@ -308,37 +308,37 @@ Jami will now quit.</source>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="90"/>
        <source>Push-to-talk</source>
-        <translation type="unfinished"/>
+        <translation>Voki-toki</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="91"/>
        <source>Enable push-to-talk</source>
-        <translation type="unfinished"/>
+        <translation>Omogućite voki-toki</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="92"/>
        <source>Keyboard shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Prečica na tastaturi</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="93"/>
        <source>Change keyboard shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Promenite prečicu na tastaturi</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="96"/>
        <source>Change shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Promenite prečicu</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="97"/>
        <source>Press the key to be assigned to push-to-talk shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Pritisnite taster da budete dodeljeni voki-toki prečici</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="98"/>
        <source>Assign</source>
-        <translation type="unfinished"/>
+        <translation>Dodeli</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="101"/>
@ -598,7 +598,7 @@ Jami will now quit.</source>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="176"/>
        <source>Extensions</source>
-        <translation type="unfinished"/>
+        <translation>Proširenja</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="186"/>
@ -850,7 +850,7 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="480"/>
        <source>Use native window frame (requires restart)</source>
-        <translation type="unfinished"/>
+        <translation>Koristite izvorni okvir prozora (zahteva ponovno pokretanje)</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="484"/>
@ -885,12 +885,12 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="529"/>
        <source>Content access error</source>
-        <translation type="unfinished"/>
+        <translation>Greška u pristupu sadržaju</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="530"/>
        <source>Content not found</source>
-        <translation type="unfinished"/>
+        <translation>Sadržaj nije pronađen</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="593"/>
@ -900,22 +900,22 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="594"/>
        <source>This account is password encrypted, enter the password to generate a PIN code.</source>
-        <translation type="unfinished"/>
+        <translation>Ovaj nalog je šifrovan lozinkom, unesite lozinku da biste generisali PIN kod.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="596"/>
        <source>PIN expired</source>
-        <translation type="unfinished"/>
+        <translation>PIN je istekao</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="597"/>
        <source>On another device</source>
-        <translation type="unfinished"/>
+        <translation>Na drugom uređaju</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="598"/>
        <source>Install and launch Jami, select &quot;Import from another device&quot; and scan the QR code.</source>
-        <translation type="unfinished"/>
+        <translation>Instalirajte i pokrenite Jami, izaberite „Uvezi sa drugog uređaja“ i skenirajte QR kod.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="599"/>
@ -925,12 +925,12 @@ The profile can be changed at all times from the account&apos;s settings.</sourc
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="600"/>
        <source>In Jami, scan QR code or manually enter the PIN.</source>
-        <translation type="unfinished"/>
+        <translation>U Jamiju, skenirajte QR kod ili ručno unesite PIN.</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="601"/>
        <source>The PIN code is valid for: </source>
-        <translation type="unfinished"/>
+        <translation>PIN kod važi za:</translation>
    </message>
    <message>
        <location filename="../src/app/net/jami/Constants/JamiStrings.qml" line="604"/>
Author	SHA1	Message	Date
Andreas Traczyk	73aeb02ebd	misc: bump daemon submodule Change-Id: I800aad6362be0124a33904b834ff8e04b560d6a8	2024-04-08 15:11:47 -04:00
François-Simon Fauteux-Chapleau	9d91317089	snap: add libpipewire to build dependencies Change-Id: Ie2d24de1aabe59c9506786cfb5fa18fcf4e8cad2	2024-04-07 12:32:32 -04:00
François-Simon Fauteux-Chapleau	474bc5f6a4	incalllocalvideo: allow resizing/changing opacity of local video This feature was accidentally removed in a recent refactoring of the local video preview: https://review.jami.net/c/jami-client-qt/+/27740 Change-Id: I8b621d4f692124311f0807d1bc0be0e96717a499	2024-04-04 11:39:44 -04:00
Jenkins	f5b64e955b	i18n: automatic bump Change-Id: I0589f432edc46aba5effaaca85f1a53df00760dd	2024-04-01 16:42:26 -04:00
Sébastien Blin	b88627d125	misc: bump daemon Change-Id: Ifcbfe71e3f9d3ab8966ddfa3af8fb70a4d3b0c7d	2024-03-25 08:57:23 -04:00