New upstream version 1.6.0

fvcr · Feb 24, 2023 · 88ee17c · 88ee17c
1 parent 729517b
commit 88ee17c
Show file tree

Hide file tree

Showing 28 changed files with 603 additions and 338 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,12 +12,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Dependencies
         run: |
           sudo apt update
-          sudo apt -y install build-essential intltool libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev
+          sudo apt -y install build-essential intltool libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev libcanberra-dev
 
       - name: Configure
         run: |

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -12,12 +12,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Dependencies
         run: |
           sudo apt update
-          sudo apt -y install build-essential intltool libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev
+          sudo apt -y install build-essential intltool libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev libcanberra-dev
 
       - name: Configure
         run: mkdir build

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint clang-format
         uses: DoozyX/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt update
-          sudo apt -y install build-essential intltool cmake pkg-config libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev debhelper zsync squashfs-tools
+          sudo apt -y install build-essential intltool cmake pkg-config libgtkmm-3.0-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev libcanberra-dev debhelper zsync squashfs-tools
 
       - name: Build & Install
         run: |
@@ -33,7 +33,12 @@ jobs:
 
       - name: Build Debian Package
         id: dpkg-buildpackage
-        run: dpkg-buildpackage -uc -us -ui
+        uses: jtdor/build-deb-action@v1
+        env:
+          DEB_BUILD_OPTIONS: noautodbgsym
+        with:
+          artifacts-dir: "."
+          buildpackage-opts: -uc -us -ui
 
       - name: Build Snap Package
         id: snapcraft
@@ -47,14 +52,6 @@ jobs:
         env:
           UPDATE_INFO: gh-releases-zsync|eneshecan|whatsapp-for-linux|${{ env.RELEASE_VERSION }}|*x86_64.AppImage.zsync
 
-      - name: Publish Snap to Store
-        id: snapcraft-publish
-        uses: snapcore/action-publish@v1
-        with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
-          snap: ${{ steps.snapcraft.outputs.snap }}
-          release: stable
-
       - name: Push Tag
         id: push-tag
         uses: anothrNick/[email protected]
@@ -90,7 +87,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: "../whatsapp-for-linux_${{ env.RELEASE_VERSION }}_amd64.deb"
+          asset_path: "whatsapp-for-linux_${{ env.RELEASE_VERSION }}_amd64.deb"
           asset_name: "whatsapp-for-linux_${{ env.RELEASE_VERSION }}_amd64.deb"
           asset_content_type: application/deb
 
@@ -112,6 +109,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: "whatsapp-for-linux-${{ env.RELEASE_VERSION}}-x86_64.AppImage"
+          asset_path: "whatsapp-for-linux-${{ env.RELEASE_VERSION }}-x86_64.AppImage"
           asset_name: "whatsapp-for-linux-${{ env.RELEASE_VERSION }}-x86_64.AppImage"
           asset_content_type: application/appimage
+
+      - name: Publish Snap to Store
+        id: snapcraft-publish
+        uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
+          snap: ${{ steps.snapcraft.outputs.snap }}
+          release: stable
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 3.12)
 project(
         whatsapp-for-linux
-        VERSION 1.5.2
+        VERSION 1.6.0
         DESCRIPTION "An unofficial WhatsApp desktop application for Linux"
         HOMEPAGE_URL "https://github.com/eneshecan/whatsapp-for-linux"
         LANGUAGES C CXX
     )
 
 include(GNUInstallDirs)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(WFL_NAME ${CMAKE_PROJECT_NAME})
 set(WFL_FRIENDLY_NAME "WhatsApp for Linux")
@@ -53,21 +53,31 @@ include_directories(${WEBKIT_INCLUDE_DIRS})
 pkg_check_modules(APPINDICATOR ayatana-appindicator3-0.1 REQUIRED)
 include_directories(${APPINDICATOR_INCLUDE_DIRS})
 
+pkg_check_modules(CANBERRA libcanberra REQUIRED)
+include_directories(${CANBERRA_INCLUDE_DIRS})
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/generated/)
 
 add_executable(${CMAKE_PROJECT_NAME}
         src/main.cpp
         ${CMAKE_CURRENT_BINARY_DIR}/generated/Resources.c
         src/util/Helper.cpp
         src/util/Settings.cpp
+        src/util/Sound.cpp
         src/ui/Application.cpp
         src/ui/MainWindow.cpp
         src/ui/PreferencesWindow.cpp
         src/ui/PhoneNumberDialog.cpp
         src/ui/TrayIcon.cpp
         src/ui/WebView.cpp
     )
-target_link_libraries(${CMAKE_PROJECT_NAME} ${GTKMM_LIBRARIES} ${WEBKIT_LIBRARIES} ${APPINDICATOR_LIBRARIES} ${Intl_LIBRARIES})
+target_link_libraries(${CMAKE_PROJECT_NAME}
+        ${GTKMM_LIBRARIES}
+        ${WEBKIT_LIBRARIES}
+        ${APPINDICATOR_LIBRARIES}
+        ${CANBERRA_LIBRARIES}
+        ${Intl_LIBRARIES}
+    )
 
 install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/${WFL_APP_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)

diff --git a/README.md b/README.md
@@ -67,6 +67,7 @@ The application is available from a number of Linux distributions:
 * gtkmm-3.0
 * webkit2gtk-4.0
 * ayatana-appindicator3-0.1
+* libcanberra
 
 
 ## Build & Run
@@ -107,12 +108,11 @@ xargs rm < install_manifest.txt
 
 ## Packaging
 
-Set `RELEASE_VERSION` environment variable before packaging. The actual version can be read from `generated/VERSION` file in the build directory.
-
 ### Debian
 
 ```bash
-# Build the package
+# Don't forget to update the version number (0) in debian/changelog before this
+# Build the package.
 dpkg-buildpackage -uc -us -ui
 ```
 

diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml
@@ -22,6 +22,7 @@ AppDir:
       - libgtkmm-3.0-1v5:amd64
       - libwebkit2gtk-4.0-37:amd64
       - libayatana-appindicator3-1:amd64
+      - libcanberra-dev
       - glib-networking:amd64
       - gstreamer1.0-libav:amd64
       - gstreamer1.0-plugins-bad:amd64

diff --git a/debian/control b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: cmake,
                libayatana-appindicator3-dev,
                libgtkmm-3.0-dev,
                libwebkit2gtk-4.0-dev,
+               libcanberra-dev,
                pkg-config
 Standards-Version: 4.5.1
 Homepage: https://github.com/eneshecan/whatsapp-for-linux

diff --git a/po/en.po b/po/en.po
@@ -4,35 +4,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: whatsapp-for-linux\n"
+"Project-Id-Version: WhatsApp for Linux\n"
 "Language: en\n"
 
-#: ../src/ui/MainWindow.cpp:287 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
 #: ../resource/ui/MainWindow.ui.h:4
 msgid "About"
 msgstr "About"
 
-#: ../src/ui/MainWindow.cpp:289 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
 msgid "WhatsApp for Linux"
 msgstr "WhatsApp for Linux"
 
-#: ../src/ui/MainWindow.cpp:290
+#: ../src/ui/MainWindow.cpp:303
 msgid "An unofficial WhatsApp desktop application for Linux"
 msgstr "An unofficial WhatsApp desktop application for Linux"
 
-#: ../src/ui/MainWindow.cpp:292
-msgid "GitHub Repository"
-msgstr "GitHub Repository"
-
-#: ../src/ui/PreferencesWindow.cpp:35
+#: ../src/ui/PreferencesWindow.cpp:40
 msgid "On Demand"
 msgstr "On Demand"
 
-#: ../src/ui/PreferencesWindow.cpp:36
+#: ../src/ui/PreferencesWindow.cpp:41
 msgid "Always"
 msgstr "Always"
 
-#: ../src/ui/PreferencesWindow.cpp:37
+#: ../src/ui/PreferencesWindow.cpp:42
 msgid "Never"
 msgstr "Never"
 
@@ -65,19 +61,19 @@ msgstr "Ok"
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/ui/WebView.cpp:307
+#: ../src/ui/WebView.cpp:322
 msgid "Unresponsive"
 msgstr "Unresponsive"
 
-#: ../src/ui/WebView.cpp:308
+#: ../src/ui/WebView.cpp:323
 msgid "The application is not responding. Would you like to reload?"
 msgstr "The application is not responding. Would you like to reload?"
 
 #: ../resource/ui/MainWindow.ui.h:1
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../resource/ui/MainWindow.ui.h:2 ../resource/ui/PreferencesWindow.ui.h:18
+#: ../resource/ui/MainWindow.ui.h:2 ../resource/ui/PreferencesWindow.ui.h:22
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -129,40 +125,40 @@ msgstr "Start application as minimized"
 msgid "Start application after system boots"
 msgstr "Start application after system boots"
 
-#: ../resource/ui/PreferencesWindow.ui.h:9
+#: ../resource/ui/PreferencesWindow.ui.h:11
 #: ../resource/ui/ShortcutsWindow.ui.h:2
 msgid "General"
 msgstr "General"
 
-#: ../resource/ui/PreferencesWindow.ui.h:10
+#: ../resource/ui/PreferencesWindow.ui.h:12
 msgid "Prefer Dark Theme"
 msgstr "Prefer Dark Theme"
 
-#: ../resource/ui/PreferencesWindow.ui.h:11
+#: ../resource/ui/PreferencesWindow.ui.h:13
 msgid "Prefer dark theme for the application if system theme includes a dark variant"
 msgstr "Prefer dark theme for the application if system theme includes a dark variant"
 
-#: ../resource/ui/PreferencesWindow.ui.h:12
+#: ../resource/ui/PreferencesWindow.ui.h:14
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../resource/ui/PreferencesWindow.ui.h:13
+#: ../resource/ui/PreferencesWindow.ui.h:15
 msgid "Hardware Acceleration"
 msgstr "Hardware Acceleration"
 
-#: ../resource/ui/PreferencesWindow.ui.h:14
+#: ../resource/ui/PreferencesWindow.ui.h:16
 msgid "Allow Permissions"
 msgstr "Allow Permissions"
 
-#: ../resource/ui/PreferencesWindow.ui.h:15
+#: ../resource/ui/PreferencesWindow.ui.h:17
 msgid "Set hardware acceleration policy used by webkit"
 msgstr "Set hardware acceleration policy used by webkit"
 
-#: ../resource/ui/PreferencesWindow.ui.h:16
+#: ../resource/ui/PreferencesWindow.ui.h:18
 msgid "Allow permissions on application startup"
 msgstr "Allow permissions on application startup"
 
-#: ../resource/ui/PreferencesWindow.ui.h:17
+#: ../resource/ui/PreferencesWindow.ui.h:21
 msgid "Web"
 msgstr "Web"
 
@@ -185,3 +181,24 @@ msgstr "Show/Hide Header Bar"
 #: ../resource/ui/ShortcutsWindow.ui.h:6
 msgid "Open Preferences"
 msgstr "Open Preferences"
+
+#: ../src/ui/MainWindow.cpp:305
+msgid "GitHub Repository"
+msgstr "GitHub Repository"
+
+#: ../resource/ui/PreferencesWindow.ui.h:9
+msgid "Enable Notification Sounds"
+msgstr "Enable Notification Sounds"
+
+#: ../resource/ui/PreferencesWindow.ui.h:10
+msgid "Play sound on a notification raised by the application"
+msgstr "Play sound on a notification raised by the application"
+
+#: ../resource/ui/PreferencesWindow.ui.h:19
+msgid "Minimum Font Size"
+msgstr "Minimum Font Size"
+
+#: ../resource/ui/PreferencesWindow.ui.h:20
+msgid "Minimum font size used to display text, values other than 0 can potentially break page layouts"
+msgstr "Minimum font size used to display text, values other than 0 can potentially break page layouts"
+