Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package whatsapp-for-linux for
openSUSE:Factory checked in at 2023-02-25 19:55:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/whatsapp-for-linux (Old)
and /work/SRC/openSUSE:Factory/.whatsapp-for-linux.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whatsapp-for-linux"
Sat Feb 25 19:55:37 2023 rev:7 rq:1067719 version:1.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/whatsapp-for-linux/whatsapp-for-linux.changes
2023-02-07 18:48:43.659016408 +0100
+++
/work/SRC/openSUSE:Factory/.whatsapp-for-linux.new.31432/whatsapp-for-linux.changes
2023-02-25 19:55:39.103466263 +0100
@@ -1,0 +2,8 @@
+Sat Feb 25 15:26:14 UTC 2023 - Michael Vetter <mvet...@suse.com>
+
+- Update to 1.6.1:
+ * Implemented enhancements:
+ + Implement Ctrl+/- and Ctrl+scroll Zoom In/Out shortcuts #276
+ + WhatsApp Web: Pass [ALT] key as [CMD] #280
+
+-------------------------------------------------------------------
Old:
----
whatsapp-for-linux-1.6.0.tar.xz
New:
----
whatsapp-for-linux-1.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ whatsapp-for-linux.spec ++++++
--- /var/tmp/diff_new_pack.eolTN4/_old 2023-02-25 19:55:39.591469270 +0100
+++ /var/tmp/diff_new_pack.eolTN4/_new 2023-02-25 19:55:39.595469294 +0100
@@ -17,7 +17,7 @@
Name: whatsapp-for-linux
-Version: 1.6.0
+Version: 1.6.1
Release: 0
Summary: WhatsApp for Linux
License: GPL-3.0-only
++++++ _service ++++++
--- /var/tmp/diff_new_pack.eolTN4/_old 2023-02-25 19:55:39.631469517 +0100
+++ /var/tmp/diff_new_pack.eolTN4/_new 2023-02-25 19:55:39.635469541 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://github.com/eneshecan/whatsapp-for-linux.git</param>
- <param name="revision">v1.6.0</param>
+ <param name="revision">v1.6.1</param>
<param name="match-tag">v*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ whatsapp-for-linux-1.6.0.tar.xz -> whatsapp-for-linux-1.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/CMakeLists.txt
new/whatsapp-for-linux-1.6.1/CMakeLists.txt
--- old/whatsapp-for-linux-1.6.0/CMakeLists.txt 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/CMakeLists.txt 2023-02-25 15:41:43.000000000
+0100
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12)
project(
whatsapp-for-linux
- VERSION 1.6.0
+ VERSION 1.6.1
DESCRIPTION "An unofficial WhatsApp desktop application for Linux"
HOMEPAGE_URL "https://github.com/eneshecan/whatsapp-for-linux";
LANGUAGES C CXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/README.md
new/whatsapp-for-linux-1.6.1/README.md
--- old/whatsapp-for-linux-1.6.0/README.md 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/README.md 2023-02-25 15:41:43.000000000
+0100
@@ -30,6 +30,7 @@
[](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/build.yml)
[](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/install.yml)
[](https://github.com/eneshecan/whatsapp-for-linux/actions/workflows/release.yml)
+[](https://poeditor.com/join/project/jMGkxVn3vN)
@@ -42,9 +43,11 @@
## Features
-* Features come with whatsapp web except audio and image capture
+* Features come with WhatsApp Web except audio/video capture and calls
+ * WhatsApp specific keyboard shortcuts work with *Alt* key instead of *Cmd*
* Zoom in/out
* System tray icon
+* Notification sounds
* Autostart with system
* Fullscreen mode
* Show/Hide headerbar by pressing *Alt+H*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/whatsapp-for-linux-1.6.0/appimage/AppImageBuilder.yml
new/whatsapp-for-linux-1.6.1/appimage/AppImageBuilder.yml
--- old/whatsapp-for-linux-1.6.0/appimage/AppImageBuilder.yml 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/appimage/AppImageBuilder.yml 2023-02-25
15:41:43.000000000 +0100
@@ -87,6 +87,7 @@
- /lib/x86_64-linux-gnu/libcairo-gobject.so.2
- /lib/x86_64-linux-gnu/libcairo.so.2
- /lib/x86_64-linux-gnu/libcairomm-1.0.so.1
+ - /lib/x86_64-linux-gnu/libcanberra.so.0
- /lib/x86_64-linux-gnu/libchromaprint.so.1
- /lib/x86_64-linux-gnu/libcodec2.so.0.9
- /lib/x86_64-linux-gnu/libcrypto.so.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/CMakeLists.txt
new/whatsapp-for-linux-1.6.1/po/CMakeLists.txt
--- old/whatsapp-for-linux-1.6.0/po/CMakeLists.txt 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/po/CMakeLists.txt 2023-02-25
15:41:43.000000000 +0100
@@ -2,12 +2,12 @@
add_custom_command(
OUTPUT ${CMAKE_PROJECT_NAME}.pot
- COMMAND intltool-update -g ${CMAKE_PROJECT_NAME} -p
+ COMMAND intltool-update -g ${CMAKE_PROJECT_NAME} -p && intltool-update
--dist --gettext-package=whatsapp-for-linux --output-file=en.po en
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "Updating default translation file"
+ COMMENT "Updating default translation files"
)
-add_custom_target(update-translation DEPENDS ${CMAKE_PROJECT_NAME}.pot)
+add_custom_target(update-translations DEPENDS ${CMAKE_PROJECT_NAME}.pot en.po)
foreach (LANG ${PO_FILES})
get_filename_component(LANG ${LANG} NAME)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/en.po
new/whatsapp-for-linux-1.6.1/po/en.po
--- old/whatsapp-for-linux-1.6.0/po/en.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/en.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,19 +7,23 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: en\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "About"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp for Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "An unofficial WhatsApp desktop application for Linux"
+#: ../src/ui/MainWindow.cpp:343
+msgid "GitHub Repository"
+msgstr "GitHub Repository"
+
#: ../src/ui/PreferencesWindow.cpp:40
msgid "On Demand"
msgstr "On Demand"
@@ -37,7 +41,7 @@
msgstr "Show"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "Quit"
@@ -77,7 +81,7 @@
msgid "Preferences"
msgstr "Preferences"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Keyboard Shortcuts"
@@ -125,6 +129,14 @@
msgid "Start application after system boots"
msgstr "Start application after system boots"
+#: ../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:11
#: ../resource/ui/ShortcutsWindow.ui.h:2
msgid "General"
@@ -158,6 +170,14 @@
msgid "Allow permissions on application startup"
msgstr "Allow permissions on application startup"
+#: ../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"
+
#: ../resource/ui/PreferencesWindow.ui.h:21
msgid "Web"
msgstr "Web"
@@ -171,34 +191,21 @@
msgstr "Refresh Page"
#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Enter/Exit Fullscreen"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "Show/Hide Header Bar"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
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"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/es.po
new/whatsapp-for-linux-1.6.1/po/es.po
--- old/whatsapp-for-linux-1.6.0/po/es.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/es.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: es\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "Acerca de"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp para Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "Aplicación no oficial de WhatsApp para Linux"
@@ -37,7 +37,7 @@
msgstr "Mostrar"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "Salir"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "Preferencias"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Atajos de teclado"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "Actualizar página"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Entrar/Salir de pantalla completa"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "Mostrar/Ocultar barra de encabezado"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "Abrir Preferencias"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "Repositorio GitHub"
@@ -202,3 +202,11 @@
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"
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/it.po
new/whatsapp-for-linux-1.6.1/po/it.po
--- old/whatsapp-for-linux-1.6.0/po/it.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/it.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: it\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "Informazioni"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp per Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "Un'applicazione WhatsApp non ufficiale per Linux"
@@ -37,7 +37,7 @@
msgstr "Mostra"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "Esci"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "Preferenze"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Scorciatoie da tastiera"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "Ricarica pagina"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Attiva/disattiva schermo intero"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "Mostra/nascondi barra del titolo"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "Apri preferenze"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "GitHub"
@@ -202,3 +202,11 @@
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"
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/ka.po
new/whatsapp-for-linux-1.6.1/po/ka.po
--- old/whatsapp-for-linux-1.6.0/po/ka.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/ka.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: ka\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "á¨áá¡áá®áá"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp-á áááá£á¥á¡áá¡áááá¡"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "WhatsApp-áá¡ áá ááá¤ááªáááá£á á
áááááááªáá áááá£á¥á¡áá¡áááá¡"
@@ -37,7 +37,7 @@
msgstr "á©áááááá"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "&ááá¡ááá"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "ááá áááá"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "á¡á®áá á¢á áááááá¨ááá"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "áááá ááá¡ ááááá®áááá"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "á¡á á£áá ááá áááá¡ á©áá á/ááááá á"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "áááá¡áá ááá¡ ááááá¡
á©áááááá/ááááááá"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "ááá ááááá¡ á¤ááá¯á áá¡ ááá®á¡áá"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "GitHub -áá¡ á áááááá¢áá áá"
@@ -202,3 +202,11 @@
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"
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/nl.po
new/whatsapp-for-linux-1.6.1/po/nl.po
--- old/whatsapp-for-linux-1.6.0/po/nl.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/nl.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: nl\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "Over"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp voor Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "Een onofficiële WhatsApp-desktoptoepassing voor Linux"
@@ -37,7 +37,7 @@
msgstr "Tonen"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "Afsluiten"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "Instellingen"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Sneltoetsen"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "Pagina vernieuwen"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Schermvullende weergave aan/uit"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "Kopbalk tonen/verbergen"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "Instellingen openen"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "GitHub"
@@ -202,3 +202,11 @@
msgid "Minimum font size used to display text, values other than 0 can
potentially break page layouts"
msgstr "De minimale tekstgrootte van berichten en het invoerveld. Let op:
waarden hoger dan 0 kunnen de indeling verstoren."
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Inzoomen"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Uitzoomen"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/pt-br.po
new/whatsapp-for-linux-1.6.1/po/pt-br.po
--- old/whatsapp-for-linux-1.6.0/po/pt-br.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/pt-br.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: pt-br\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "Sobre"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp para Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "Aplicação não oficial de WhatsApp para Linux"
@@ -37,7 +37,7 @@
msgstr "Mostrar"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "Sair"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "Preferências"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Atalhos de teclado"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "Atualizar página"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Entrar/Sair da tela cheia"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "Mostrar/Ocultar barra de cabeçalho"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "Abrir Preferências"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "Repositório GitHub"
@@ -202,3 +202,11 @@
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"
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/ru.po
new/whatsapp-for-linux-1.6.1/po/ru.po
--- old/whatsapp-for-linux-1.6.0/po/ru.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/ru.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: ru\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "РпÑогÑамме"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "WhatsApp Ð´Ð»Ñ Linux"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "ÐеоÑиÑиалÑное пÑиложение WhatsApp Ð´Ð»Ñ Linux"
@@ -37,7 +37,7 @@
msgstr "ÐоказÑваÑÑ"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "ÐÑÑ
од"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "ÐаÑамеÑÑÑ"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "ÐомбинаÑии клавиÑ"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "ÐбновиÑÑ ÑÑÑаниÑÑ"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "ÐклÑÑиÑÑ Ð¸Ð»Ð¸ оÑклÑÑиÑÑ Ð¿Ð¾Ð»Ð½Ð¾ÑкÑаннÑй
Ñежим"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "ÐоказаÑÑ Ð¸Ð»Ð¸ ÑкÑÑÑÑ ÑÑÑÐ¾ÐºÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "ÐÑкÑÑÑÑ Ð¿Ð°ÑамеÑÑÑ"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "РепозиÑоÑий на GitHub"
@@ -202,3 +202,11 @@
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"
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "Zoom In"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "Zoom Out"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/tr.po
new/whatsapp-for-linux-1.6.1/po/tr.po
--- old/whatsapp-for-linux-1.6.0/po/tr.po 2023-02-03 16:58:32.000000000
+0100
+++ new/whatsapp-for-linux-1.6.1/po/tr.po 2023-02-25 15:41:43.000000000
+0100
@@ -7,16 +7,16 @@
"Project-Id-Version: WhatsApp for Linux\n"
"Language: tr\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr "Hakkında"
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr "Linux için WhatsApp"
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr "Linux için resmi olmayan bir WhatsApp masaüstü uygulaması"
@@ -37,7 +37,7 @@
msgstr "Göster"
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr "ÃıkıÅ"
@@ -77,7 +77,7 @@
msgid "Preferences"
msgstr "Tercihler"
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr "Klavye kısayolları"
@@ -170,19 +170,19 @@
msgid "Refresh Page"
msgstr "Sayfayı Yenile"
-#: ../resource/ui/ShortcutsWindow.ui.h:4
+#: ../resource/ui/ShortcutsWindow.ui.h:6
msgid "Enter/Exit Fullscreen"
msgstr "Tam Ekrana Gir/Ãık"
-#: ../resource/ui/ShortcutsWindow.ui.h:5
+#: ../resource/ui/ShortcutsWindow.ui.h:7
msgid "Show/Hide Header Bar"
msgstr "BaÅlık ÃubuÄunu Göster/Gizle"
-#: ../resource/ui/ShortcutsWindow.ui.h:6
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr "Tercihleri Aç"
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr "GitHub"
@@ -196,9 +196,17 @@
#: ../resource/ui/PreferencesWindow.ui.h:19
msgid "Minimum Font Size"
-msgstr "Minimum Font Size"
+msgstr "Minimum Yazı Tipi Boyutu"
#: ../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"
+msgstr "Metni görüntülemek için kullanılan minimum yazı tipi boyutu, 0
dıÅındaki deÄerler potansiyel olarak sayfa düzenlerini bozabilir"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:4
+msgid "Zoom In"
+msgstr "YakınlaÅtır"
+
+#: ../resource/ui/ShortcutsWindow.ui.h:5
+msgid "Zoom Out"
+msgstr "UzaklaÅtır"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/po/whatsapp-for-linux.pot
new/whatsapp-for-linux-1.6.1/po/whatsapp-for-linux.pot
--- old/whatsapp-for-linux-1.6.0/po/whatsapp-for-linux.pot 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/po/whatsapp-for-linux.pot 2023-02-25
15:41:43.000000000 +0100
@@ -17,20 +17,20 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/ui/MainWindow.cpp:300 ../src/ui/TrayIcon.cpp:46
+#: ../src/ui/MainWindow.cpp:338 ../src/ui/TrayIcon.cpp:46
#: ../resource/ui/MainWindow.ui.h:4
msgid "About"
msgstr ""
-#: ../src/ui/MainWindow.cpp:302 ../resource/ui/MainWindow.ui.h:6
+#: ../src/ui/MainWindow.cpp:340 ../resource/ui/MainWindow.ui.h:6
msgid "WhatsApp for Linux"
msgstr ""
-#: ../src/ui/MainWindow.cpp:303
+#: ../src/ui/MainWindow.cpp:341
msgid "An unofficial WhatsApp desktop application for Linux"
msgstr ""
-#: ../src/ui/MainWindow.cpp:305
+#: ../src/ui/MainWindow.cpp:343
msgid "GitHub Repository"
msgstr ""
@@ -51,7 +51,7 @@
msgstr ""
#: ../src/ui/TrayIcon.cpp:47 ../resource/ui/MainWindow.ui.h:5
-#: ../resource/ui/ShortcutsWindow.ui.h:8
+#: ../resource/ui/ShortcutsWindow.ui.h:10
msgid "Quit"
msgstr ""
@@ -91,7 +91,7 @@
msgid "Preferences"
msgstr ""
-#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:7
+#: ../resource/ui/MainWindow.ui.h:3 ../resource/ui/ShortcutsWindow.ui.h:9
msgid "Keyboard Shortcuts"
msgstr ""
@@ -157,7 +157,8 @@
msgstr ""
#: ../resource/ui/PreferencesWindow.ui.h:13
-msgid "Prefer dark theme for the application if system theme includes a dark
variant"
+msgid ""
+"Prefer dark theme for the application if system theme includes a dark variant"
msgstr ""
#: ../resource/ui/PreferencesWindow.ui.h:14
@@ -201,13 +202,21 @@
msgstr ""
#: ../resource/ui/ShortcutsWindow.ui.h:4
-msgid "Enter/Exit Fullscreen"
+msgid "Zoom In"
msgstr ""
#: ../resource/ui/ShortcutsWindow.ui.h:5
-msgid "Show/Hide Header Bar"
+msgid "Zoom Out"
msgstr ""
#: ../resource/ui/ShortcutsWindow.ui.h:6
+msgid "Enter/Exit Fullscreen"
+msgstr ""
+
+#: ../resource/ui/ShortcutsWindow.ui.h:7
+msgid "Show/Hide Header Bar"
+msgstr ""
+
+#: ../resource/ui/ShortcutsWindow.ui.h:8
msgid "Open Preferences"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/whatsapp-for-linux-1.6.0/resource/ui/ShortcutsWindow.ui
new/whatsapp-for-linux-1.6.1/resource/ui/ShortcutsWindow.ui
--- old/whatsapp-for-linux-1.6.0/resource/ui/ShortcutsWindow.ui 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/resource/ui/ShortcutsWindow.ui 2023-02-25
15:41:43.000000000 +0100
@@ -23,6 +23,20 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">1</property>
+ <property name="accelerator"><ctrl>plus</property>
+ <property name="title" translatable="yes">Zoom In</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">1</property>
+ <property name="accelerator"><ctrl>minus</property>
+ <property name="title" translatable="yes">Zoom Out</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">1</property>
<property name="accelerator">F11</property>
<property name="title" translatable="yes">Enter/Exit
Fullscreen</property>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/src/ui/MainWindow.cpp
new/whatsapp-for-linux-1.6.1/src/ui/MainWindow.cpp
--- old/whatsapp-for-linux-1.6.0/src/ui/MainWindow.cpp 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/src/ui/MainWindow.cpp 2023-02-25
15:41:43.000000000 +0100
@@ -21,6 +21,7 @@
, m_phoneNumberDialog{nullptr}
, m_headerBar{nullptr}
, m_shortcutsWindow{nullptr}
+ , m_buttonZoomLevel{nullptr}
, m_fullscreen{false}
{
auto const appIcon16x16 =
Gdk::Pixbuf::create_from_resource("/main/image/icons/hicolor/16x16/apps/"
WFL_ICON ".png");
@@ -48,18 +49,17 @@
refBuilder->get_widget("button_fullscreen", buttonFullscreen);
buttonFullscreen->signal_clicked().connect(sigc::mem_fun(*this,
&MainWindow::onFullscreen));
- Gtk::Button* buttonZoomLevel = nullptr;
- refBuilder->get_widget("button_zoom_level", buttonZoomLevel);
- buttonZoomLevel->set_label(m_webView.getZoomLevelString());
-
buttonZoomLevel->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,
&MainWindow::onResetZoom), buttonZoomLevel));
+ refBuilder->get_widget("button_zoom_level", m_buttonZoomLevel);
+ m_buttonZoomLevel->set_label(m_webView.getZoomLevelString());
+ m_buttonZoomLevel->signal_clicked().connect(sigc::mem_fun(*this,
&MainWindow::onResetZoom));
Gtk::Button* buttonZoomIn = nullptr;
refBuilder->get_widget("button_zoom_in", buttonZoomIn);
- buttonZoomIn->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,
&MainWindow::onZoomIn), buttonZoomLevel));
+ buttonZoomIn->signal_clicked().connect(sigc::mem_fun(*this,
&MainWindow::onZoomIn));
Gtk::Button* buttonZoomOut = nullptr;
refBuilder->get_widget("button_zoom_out", buttonZoomOut);
-
buttonZoomOut->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,
&MainWindow::onZoomOut), buttonZoomLevel));
+ buttonZoomOut->signal_clicked().connect(sigc::mem_fun(*this,
&MainWindow::onZoomOut));
Gtk::ModelButton* buttonPreferences = nullptr;
refBuilder->get_widget("button_preferences", buttonPreferences);
@@ -104,54 +104,98 @@
bool MainWindow::on_key_press_event(GdkEventKey* keyEvent)
{
- switch (keyEvent->keyval)
+ if (keyEvent->state & GDK_CONTROL_MASK)
{
- case GDK_KEY_F11:
- onFullscreen();
- return true;
-
- case GDK_KEY_H:
- case GDK_KEY_h:
- if (keyEvent->state & GDK_MOD1_MASK)
+ switch (keyEvent->keyval)
+ {
+ case GDK_KEY_P:
+ case GDK_KEY_p:
+ onOpenPreferences();
+ return true;
+
+ case GDK_KEY_Q:
+ case GDK_KEY_q:
+ onQuit();
+ return true;
+
+ case GDK_KEY_question:
+ onShortcuts();
+ return true;
+
+ case GDK_KEY_plus:
+ onZoomIn();
+ return true;
+
+ case GDK_KEY_minus:
+ onZoomOut();
+ return true;
+
+ default:
+ break;
+ }
+ }
+ else if (keyEvent->state & GDK_MOD1_MASK)
+ {
+ switch (keyEvent->keyval)
+ {
+ case GDK_KEY_H:
+ case GDK_KEY_h:
{
auto const visible = !m_headerBar->is_visible();
m_headerBar->set_visible(visible);
util::Settings::getInstance().setValue("general",
"header-bar", visible);
return true;
}
- break;
- case GDK_KEY_P:
- case GDK_KEY_p:
- if (keyEvent->state & GDK_CONTROL_MASK)
- {
- onOpenPreferences();
+ default:
+ break;
+ }
+ }
+ else
+ {
+ switch (keyEvent->keyval)
+ {
+ case GDK_KEY_F11:
+ onFullscreen();
return true;
- }
- break;
- case GDK_KEY_Q:
- case GDK_KEY_q:
- if (keyEvent->state & GDK_CONTROL_MASK)
- {
- onQuit();
+ default:
+ break;
+ }
+ }
+
+ // This is required for keyboard shortcuts on WhatsApp Web to work.
Since it is running
+ // on WebKit, WhatsApp Web listens for Mac's [CMD] key instead of the
standard [ALT] key.
+ if (keyEvent->state & GDK_MOD1_MASK)
+ {
+ keyEvent->state |= GDK_META_MASK;
+ }
+
+ return Gtk::ApplicationWindow::on_key_press_event(keyEvent);
+ }
+
+ bool MainWindow::on_scroll_event(GdkEventScroll* scrollEvent)
+ {
+ if (scrollEvent->state & GDK_CONTROL_MASK)
+ {
+ switch (scrollEvent->direction)
+ {
+ case GDK_SCROLL_UP:
+ case GDK_SCROLL_RIGHT:
+ onZoomIn();
return true;
- }
- break;
- case GDK_KEY_question:
- if (keyEvent->state & GDK_CONTROL_MASK)
- {
- onShortcuts();
+ case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_LEFT:
+ onZoomOut();
return true;
- }
- break;
- default:
- break;
+ default:
+ break;
+ }
}
- return Gtk::ApplicationWindow::on_key_press_event(keyEvent);
+ return Gtk::ApplicationWindow::on_scroll_event(scrollEvent);
}
bool MainWindow::on_window_state_event(GdkEventWindowState*
windowStateEvent)
@@ -263,22 +307,22 @@
m_fullscreen ? unfullscreen() : fullscreen();
}
- void MainWindow::onZoomIn(Gtk::Button* buttonZoomLevel)
+ void MainWindow::onZoomIn()
{
m_webView.zoomIn();
- buttonZoomLevel->set_label(m_webView.getZoomLevelString());
+ m_buttonZoomLevel->set_label(m_webView.getZoomLevelString());
}
- void MainWindow::onZoomOut(Gtk::Button* buttonZoomLevel)
+ void MainWindow::onZoomOut()
{
m_webView.zoomOut();
- buttonZoomLevel->set_label(m_webView.getZoomLevelString());
+ m_buttonZoomLevel->set_label(m_webView.getZoomLevelString());
}
- void MainWindow::onResetZoom(Gtk::Button* buttonZoomLevel)
+ void MainWindow::onResetZoom()
{
m_webView.resetZoom();
- buttonZoomLevel->set_label(m_webView.getZoomLevelString());
+ m_buttonZoomLevel->set_label(m_webView.getZoomLevelString());
}
void MainWindow::onShortcuts()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/whatsapp-for-linux-1.6.0/src/ui/MainWindow.hpp
new/whatsapp-for-linux-1.6.1/src/ui/MainWindow.hpp
--- old/whatsapp-for-linux-1.6.0/src/ui/MainWindow.hpp 2023-02-03
16:58:32.000000000 +0100
+++ new/whatsapp-for-linux-1.6.1/src/ui/MainWindow.hpp 2023-02-25
15:41:43.000000000 +0100
@@ -23,6 +23,7 @@
protected:
bool on_key_press_event(GdkEventKey* keyEvent) override;
+ bool on_scroll_event(GdkEventScroll* scrollEvent) override;
bool on_window_state_event(GdkEventWindowState* windowStateEvent)
override;
bool on_delete_event(GdkEventAny*) override;
@@ -36,9 +37,9 @@
void onShow();
void onQuit();
void onFullscreen();
- void onZoomIn(Gtk::Button* buttonZoomLevel);
- void onZoomOut(Gtk::Button* buttonZoomLevel);
- void onResetZoom(Gtk::Button* buttonZoomLevel);
+ void onZoomIn();
+ void onZoomOut();
+ void onResetZoom();
void onShortcuts();
void onAbout();
@@ -51,6 +52,7 @@
PhoneNumberDialog* m_phoneNumberDialog;
Gtk::HeaderBar* m_headerBar;
Gtk::ShortcutsWindow* m_shortcutsWindow;
+ Gtk::Button* m_buttonZoomLevel;
bool m_fullscreen;
};
}
