Commits March 2023

commits@gajim.org

1 participants
44 discussions

[Git][gajim/gajim][master] imprv: Declare that the installer is DPI-aware
by Philipp Hörist (＠lovetox) 05 Mar '23

05 Mar '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: bda77f26 by Michel Le Bihan at 2023-03-05T16:57:08+00:00 imprv: Declare that the installer is DPI-aware - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -1,6 +1,7 @@ ; File encoding 'UTF-8 with BOM' Unicode true +ManifestDPIAware true !include "MUI2.nsh" !include "LogicLib.nsh" ===================================== win/misc/gajim.nsi ===================================== @@ -1,6 +1,7 @@ ; File encoding 'UTF-8 with BOM' Unicode true +ManifestDPIAware true !include "MUI2.nsh" !include "LogicLib.nsh" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bda77f26346bcfcc4bfce8575dfe7260… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bda77f26346bcfcc4bfce8575dfe7260… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Windows installer: Save files using UTF-8 with BOM, convert intendation to spaces
by Daniel Brötzmann (＠wurstsalat) 03 Mar '23

03 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 79923364 by wurstsalat at 2023-03-03T09:30:13+01:00 cfix: Windows installer: Save files using UTF-8 with BOM, convert intendation to spaces - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -1,10 +1,9 @@ -; File encoding 'UTF-8 with BOM' +; File encoding 'UTF-8 with BOM' Unicode true !include "MUI2.nsh" !include "LogicLib.nsh" - Name "Gajim" OutFile "Gajim-Portable.exe" SetCompressor /final /solid lzma @@ -103,7 +102,6 @@ Section "Gajim" SecGajim "" "" "" SW_SHOWNORMAL "" "Gajim Portable Debug" FileOpen $0 "is_portable" w FileClose $0 - SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN ===================================== win/misc/gajim.nsi ===================================== @@ -1,4 +1,4 @@ -; File encoding 'UTF-8 with BOM' +; File encoding 'UTF-8 with BOM' Unicode true !include "MUI2.nsh" @@ -120,107 +120,107 @@ LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a Section "Gajim" SecGajim SectionIn RO - + Var /GLOBAL arch_name StrCpy $arch_name "(64-Bit)" StrCmp ${ARCH} "mingw64" continue StrCpy $arch_name "(32-Bit)" continue: - ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" - ${If} ${FileExists} $R3 - ; If Gajim was installed before, run uninstaller (in silent mode) - ExecWait '"$R3" /S _?=$INSTDIR' - ${EndIf} - - SetOutPath "$INSTDIR" - File /r "${ARCH}\*.*" - - WriteRegStr HKCU "Software\Gajim" "" $INSTDIR - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim ${VERSION} $arch_name" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "${VERSION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "https://www.gajim.org/" - WriteUninstaller "$INSTDIR\Uninstall.exe" - - SetOutPath "$INSTDIR\bin" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetShellVarContext current - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - SetShellVarContext all - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - !insertmacro MUI_STARTMENU_WRITE_END + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ${If} ${FileExists} $R3 + ; If Gajim was installed before, run uninstaller (in silent mode) + ExecWait '"$R3" /S _?=$INSTDIR' + ${EndIf} + + SetOutPath "$INSTDIR" + File /r "${ARCH}\*.*" + + WriteRegStr HKCU "Software\Gajim" "" $INSTDIR + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim ${VERSION} $arch_name" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "${VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "https://www.gajim.org/" + WriteUninstaller "$INSTDIR\Uninstall.exe" + + SetOutPath "$INSTDIR\bin" + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + SetShellVarContext current + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" + SetShellVarContext all + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" + !insertmacro MUI_STARTMENU_WRITE_END SectionEnd Section $(NAME_SecDesktopIcon) SecDesktopIcon - SetShellVarContext current - SetOutPath "$INSTDIR\bin" - CreateShortCut "$DESKTOP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" + SetShellVarContext current + SetOutPath "$INSTDIR\bin" + CreateShortCut "$DESKTOP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" SectionEnd Section $(NAME_SecAutostart) SecAutostart - SetShellVarContext current - SetOutPath "$INSTDIR\bin" - CreateShortCut "$SMSTARTUP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" + SetShellVarContext current + SetOutPath "$INSTDIR\bin" + CreateShortCut "$SMSTARTUP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" SectionEnd Section $(NAME_SecURI) SecURI - WriteRegStr HKCU "Software\Classes\xmpp" "" "URL:xmpp-uri" - WriteRegStr HKCU "Software\Classes\xmpp" "URL Protocol" "" - WriteRegStr HKCU "Software\Classes\xmpp\DefaultIcon" "" "$INSTDIR\bin\Gajim.exe,1" - WriteRegStr HKCU "Software\Classes\xmpp\shell" "" "open" - WriteRegStr HKCU "Software\Classes\xmpp\shell\open\" "FriendlyAppName" "${myAppName}" - WriteRegStr HKCU "Software\Classes\xmpp\shell\open\command" "" '"$INSTDIR\bin\Gajim.exe" "%1"' + WriteRegStr HKCU "Software\Classes\xmpp" "" "URL:xmpp-uri" + WriteRegStr HKCU "Software\Classes\xmpp" "URL Protocol" "" + WriteRegStr HKCU "Software\Classes\xmpp\DefaultIcon" "" "$INSTDIR\bin\Gajim.exe,1" + WriteRegStr HKCU "Software\Classes\xmpp\shell" "" "open" + WriteRegStr HKCU "Software\Classes\xmpp\shell\open\" "FriendlyAppName" "${myAppName}" + WriteRegStr HKCU "Software\Classes\xmpp\shell\open\command" "" '"$INSTDIR\bin\Gajim.exe" "%1"' SectionEnd Section "Uninstall" - ; Hint: Gajim setup should not be named gajim.exe, else it will be killed here - ExecWait "TaskKill /IM gdbus.exe /F" - ExecWait "TaskKill /IM gajim.exe /F" - ExecWait "TaskKill /IM gajim-debug.exe /F" - - RMDir /r "$INSTDIR" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - - SetShellVarContext current - Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - Delete "$DESKTOP\Gajim.lnk" - Delete "$SMSTARTUP\Gajim.lnk" - SetShellVarContext all - Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - DeleteRegKey /ifempty HKCU "Software\Gajim" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" + ; Hint: Gajim setup should not be named gajim.exe, else it will be killed here + ExecWait "TaskKill /IM gdbus.exe /F" + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" + + RMDir /r "$INSTDIR" + + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + + SetShellVarContext current + Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + Delete "$DESKTOP\Gajim.lnk" + Delete "$SMSTARTUP\Gajim.lnk" + SetShellVarContext all + Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + + DeleteRegKey /ifempty HKCU "Software\Gajim" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) - !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(DESC_SecDesktopIcon) - !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} $(DESC_SecAutostart) - !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) + !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) + !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(DESC_SecDesktopIcon) + !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} $(DESC_SecAutostart) + !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) !insertmacro MUI_FUNCTION_DESCRIPTION_END Function .onInit - BringToFront - ; Check if already running - ; If so don't open another but bring to front - System::Call "kernel32::CreateMutexA(i 0, i 0, t '$(^Name)') i .r0 ?e" - Pop $0 - StrCmp $0 0 StartInstall - StrLen $0 "$(^Name)" - IntOp $0 $0 + 1 - FindWindow $1 '#32770' '' 0 $1 - IntCmp $1 0 +3 - System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize - System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front - Abort + BringToFront + ; Check if already running + ; If so don't open another but bring to front + System::Call "kernel32::CreateMutexA(i 0, i 0, t '$(^Name)') i .r0 ?e" + Pop $0 + StrCmp $0 0 StartInstall + StrLen $0 "$(^Name)" + IntOp $0 $0 + 1 + FindWindow $1 '#32770' '' 0 $1 + IntCmp $1 0 +3 + System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize + System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front + Abort StartInstall: - !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window + !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window FunctionEnd View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/799233644e42e7864075a63f640bfc20… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/799233644e42e7864075a63f640bfc20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows installer: Add Polish language
by Daniel Brötzmann (＠wurstsalat) 02 Mar '23

02 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 535f7b44 by Daniel Brötzmann at 2023-03-02T09:21:55+00:00 imprv: Windows installer: Add Polish language - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -1,4 +1,4 @@ -; File encoding 'UTF-8 with BOM' +; File encoding 'UTF-8 with BOM' Unicode true !include "MUI2.nsh" @@ -40,6 +40,7 @@ BrandingText "Gajim Setup" !define MUI_LANGDLL_ALLLANGUAGES !insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Italian" @@ -51,6 +52,10 @@ BrandingText "Gajim Setup" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString INST_NotEmpty ${LANG_ENGLISH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" +; Polish +LangString DESC_SecGajim ${LANG_POLISH} "Rozpakuj główne pliki Gajim." +LangString INST_NotEmpty ${LANG_POLISH} "Wskazany katalog zawiera już pliki Gajim. Wymagane jest ich usunięcie. Dane osobiste nie zostaną skasowane. Czy Chcesz kontynuować ?" + ; French LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." LangString INST_NotEmpty ${LANG_FRENCH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ===================================== win/misc/gajim.nsi ===================================== @@ -1,4 +1,4 @@ -; File encoding 'UTF-8 with BOM' +; File encoding 'UTF-8 with BOM' Unicode true !include "MUI2.nsh" @@ -47,6 +47,7 @@ Var StartMenuFolder !define MUI_LANGDLL_ALLLANGUAGES !insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Italian" @@ -63,6 +64,15 @@ LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on LangString DESC_SecAutostart ${LANG_ENGLISH} "Starts Gajim automatically when starting Windows." LangString DESC_SecURI ${LANG_ENGLISH} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." +; Polish +LangString NAME_SecDesktopIcon ${LANG_POLISH} "Utwórz ikonę na Pulpicie" +LangString NAME_SecAutostart ${LANG_POLISH} "Uruchamiaj Gajim podczas uruchamiania systemu Windows" +LangString NAME_SecURI ${LANG_POLISH} "Otwieraj linki XMPP przy pomocy Gajim" +LangString DESC_SecGajim ${LANG_POLISH} "Zainstaluj główne pliki Gajim" +LangString DESC_SecDesktopIcon ${LANG_POLISH} "Tworzy skrót do programu Gajim na pulpicie." +LangString DESC_SecAutostart ${LANG_POLISH} "Pozwala na uruchamianie programu Gajim podczas wczytywania systemu Windows." +LangString DESC_SecURI ${LANG_POLISH} "Pozwala Gajim otwierać odnośniki XMPP (np. czaty grupowe na stronach www)." + ; French LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/535f7b44c5f694f34080a72fc065228e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/535f7b44c5f694f34080a72fc065228e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Notifications: Honor notification_preview_message setting
by Daniel Brötzmann (＠wurstsalat) 02 Mar '23

02 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0b0f9ba9 by wurstsalat at 2023-03-02T09:25:03+01:00 fix: Notifications: Honor notification_preview_message setting - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -454,6 +454,8 @@ def _issue_notification(self, event: events.MessageReceived) -> None: if isinstance(contact, GroupchatContact): name = event.properties.muc_nickname text = f'* {name} {text[3:]}' + else: + text = '' app.ged.raise_event( events.Notification(account=contact.account, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b0f9ba9ff1dcbacdc628744247a4440… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b0f9ba9ff1dcbacdc628744247a4440… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2023