Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] GroupchatRoster: Correctly get real jid for menu
by Daniel Brötzmann (＠wurstsalat) 02 Dec '21

02 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a8720627 by Daniel Brötzmann at 2021-12-02T14:56:55+00:00 GroupchatRoster: Correctly get real jid for menu - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -564,7 +564,9 @@ def build_workspaces_submenu(current_workspace_id: str, account: str, def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu = Gtk.Menu() - real_jid = contact.real_jid.bare or '' + real_jid = '' + if contact.real_jid is not None: + real_jid = contact.real_jid.bare item = Gtk.MenuItem(label=_('Information')) action = f'win.contact-information-{control_id}::{contact.name}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8720627ce2c5a811c67ba7f8cf3630f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8720627ce2c5a811c67ba7f8cf3630f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Add contact for Chatlist and MUC roster
by Daniel Brötzmann (＠wurstsalat) 01 Dec '21

01 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 287f711a by wurstsalat at 2021-12-01T23:33:36+01:00 Fix Add contact for Chatlist and MUC roster - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -520,8 +520,12 @@ def get_chat_list_row_menu(workspace_id: str, account: str, is_self_contact = contact.jid.bare == client.get_own_jid().bare pm_with_jid = contact.is_pm_contact and contact.real_jid is not None if (not contact.is_groupchat and not contact.is_in_roster and - not is_self_contact and pm_with_jid): - menu_items.append(('add-to-roster', _('Add to Contact List…'))) + not is_self_contact): + if contact.is_pm_contact: + if contact.real_jid is not None: + menu_items.append(('add-to-roster', _('Add to Contact List…'))) + else: + menu_items.append(('add-to-roster', _('Add to Contact List…'))) menu = Gio.Menu() for item in menu_items: @@ -560,7 +564,7 @@ def build_workspaces_submenu(current_workspace_id: str, account: str, def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu = Gtk.Menu() - real_jid = contact.real_jid or '' + real_jid = contact.real_jid.bare or '' item = Gtk.MenuItem(label=_('Information')) action = f'win.contact-information-{control_id}::{contact.name}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/287f711a37460819d2b6bcb802e324c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/287f711a37460819d2b6bcb802e324c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix add_contact()
by Philipp Hörist (＠lovetox) 01 Dec '21

01 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a3a810d0 by lovetox at 2021-12-01T22:54:52+01:00 Fix add_contact() - - - - - 1 changed file: - gajim/app_actions.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -34,7 +34,9 @@ def on_add_contact_jid(_action, param): - jid = JID.from_string(param.get_string()) + jid = param.get_string() or None + if jid is not None: + jid = JID.from_string(jid) open_window('AddContact', account=None, jid=jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3a810d0751d22f48e9bb3e85adbcd8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3a810d0751d22f48e9bb3e85adbcd8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix get_active_accounts()
by Philipp Hörist (＠lovetox) 01 Dec '21

01 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 841d4bf6 by lovetox at 2021-12-01T18:13:48+01:00 Fix get_active_accounts() - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -574,7 +574,7 @@ def get_accounts(self) -> List[str]: def get_active_accounts(self) -> List[str]: active = [] for account, settings in self._account_settings.items(): - if settings['account']['active'] is True: + if self.get_account_setting(account, 'active'): active.append(account) return active View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/841d4bf6468d4b4647b9d43cc24ecd23… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/841d4bf6468d4b4647b9d43cc24ecd23… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Installer: Automatically detect and offer to 'upgrade' previous version
by Daniel Brötzmann (＠wurstsalat) 01 Dec '21

01 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e520f4e9 by wurstsalat at 2021-12-01T09:49:41+01:00 Installer: Automatically detect and offer to 'upgrade' previous version - - - - - d9e1b50d by wurstsalat at 2021-12-01T09:51:07+01:00 Portable Installer: Improve cleanup - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -16,7 +16,7 @@ InstallDir "$PROFILE\Gajim" RequestExecutionLevel user BrandingText "Gajim Setup" -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install-alt.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" @@ -115,6 +115,8 @@ Section "Gajim" SecGajim MessageBox MB_YESNO $(INST_NotEmpty) IDYES cleanup Abort cleanup: + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" RMDir /r "$InstDir\bin" RMDir /r "$InstDir\etc" RMDir /r "$InstDir\lib" ===================================== win/misc/gajim.nsi ===================================== @@ -3,6 +3,7 @@ Unicode true !include "MUI2.nsh" !include "LogicLib.nsh" +!include "nsDialogs.nsh" Name "Gajim" OutFile "Gajim.exe" @@ -18,13 +19,12 @@ BrandingText "Gajim Setup" Var StartMenuFolder -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install-alt.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" -;!define MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING @@ -36,6 +36,7 @@ Var StartMenuFolder !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Gajim" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder +Page custom CheckForUpgrade StartUpgrade /ENABLECANCEL !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_PAGE_FINISH @@ -69,8 +70,10 @@ LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on your desktop." 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)." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" -LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_ENGLISH} "Upgrade" +LangString STR_Installed_Text ${LANG_ENGLISH} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_ENGLISH} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; French LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" @@ -85,8 +88,10 @@ LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Ga LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString DESC_SecURI ${LANG_FRENCH} "Permet à Gajim d’ouvrir les liens xmpp (par exemple le lien vers un salon sur un site web)." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_FRENCH} "Upgrade" +LangString STR_Installed_Text ${LANG_FRENCH} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_FRENCH} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and try again." ; German LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" @@ -101,7 +106,9 @@ LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim. LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Erstellt ein Icon für Gajim auf dem Desktop." LangString DESC_SecAutostart ${LANG_GERMAN} "Startet Gajim automatisch zusammen mit Windows." LangString DESC_SecURI ${LANG_GERMAN} "Ermöglicht Gajim das Öffnen von xmpp-Links (z.B. verlinkter Gruppenchat auf einer Website)." -LangString STR_Installed ${LANG_GERMAN} "Gajim ist anscheinend bereits installiert. Wollen Sie Gajim deinstallieren?" +LangString STR_Installed_Title ${LANG_GERMAN} "Aktualisieren" +LangString STR_Installed_Text ${LANG_GERMAN} "Gajim aktualisieren" +LangString STR_Installed_Desc ${LANG_GERMAN} "Gajim ist bereits installiert. Wollen sie Gajim aktualisieren?" LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\nBitte beenden Sie Gajim und versuchen es erneut." ; Italian @@ -117,8 +124,10 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString DESC_SecURI ${LANG_ITALIAN} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" -LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_ITALIAN} "Upgrade" +LangString STR_Installed_Text ${LANG_ITALIAN} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_ITALIAN} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; Russian LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" @@ -133,8 +142,10 @@ LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных ф LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." LangString DESC_SecURI ${LANG_RUSSIAN} "Позволяет Gajim открывать xmpp-ссылки, например, адреса конференций на веб-странице." -LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" -LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_RUSSIAN} "Upgrade" +LangString STR_Installed_Text ${LANG_RUSSIAN} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_RUSSIAN} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and try again." ; Hebrew LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" @@ -149,8 +160,10 @@ LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריי LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" -LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_HEBREW} "Upgrade" +LangString STR_Installed_Text ${LANG_HEBREW} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_HEBREW} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and try again." Section "Gajim" SecGajim SectionIn RO @@ -181,7 +194,6 @@ Section "Gajim" SecGajim CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_STARTMENU_WRITE_END - SectionEnd Section $(NAME_SecDesktopIcon) SecDesktopIcon @@ -235,22 +247,35 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) !insertmacro MUI_FUNCTION_DESCRIPTION_END -Function un.onInit -; Check that Gajim is not running before uninstalling - FindWindow $0 "gdkWindowToplevel" "Gajim" - StrCmp $0 0 StartUninstall - IfSilent ForceQuitGajim - MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 +; Installer +Function StartUpgrade + ; Run uninstaller in silent mode + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ExecWait '"$R3" /S _?=$INSTDIR' +FunctionEnd -Cancel: - Abort +Function CheckForUpgrade + ; Check if Gajim is already installed + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ; Show upgrade page only if Gajim is already installed + ${IfNot} ${FileExists} $R3 + Abort + ${EndIf} -ForceQuitGajim: - ExecWait "TaskKill /IM gajim.exe /F" - !insertmacro MUI_UNGETLANGUAGE + !insertmacro MUI_HEADER_TEXT $(STR_Installed_Title) $(STR_Installed_Text) -StartUninstall: - !insertmacro MUI_UNGETLANGUAGE + nsDialogs::Create 1018 + Pop $0 + + ${NSD_CreateLabel} 0 10% 100% 12u "$(STR_Installed_Desc)" + Pop $0 + + ; Change Next Button text + GetDlgItem $0 $HWNDPARENT 1 + ${NSD_SetText} $0 "$(STR_Installed_Title)" + Pop $0 + + nsDialogs::Show FunctionEnd Function .onInit @@ -259,7 +284,7 @@ Function .onInit ; 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 launch + StrCmp $0 0 StartInstall StrLen $0 "$(^Name)" IntOp $0 $0 + 1 FindWindow $1 '#32770' '' 0 $1 @@ -268,30 +293,27 @@ Function .onInit System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front Abort -launch: -; Check to see if old install (inno setup) is already installed - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim_is1" "UninstallString" -; remove first and last " char - StrLen $0 $R0 - IntOp $0 $0 - 2 - strcpy $1 $R0 $0 1 - IfFileExists $1 +1 NotInstalled - MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit - StrCmp $R1 2 Quit +1 - ExecWait '$R0 _?=$INSTDIR' $R2 - StrCmp $R2 0 +1 Quit - -NotInstalled: -; Check to see if new installer (NSIS)already installed - ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" - IfFileExists $R3 +1 ReallyNotInstalled - MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit - StrCmp $R4 2 Quit +1 - ExecWait '$R3 _?=$INSTDIR' $R5 - StrCmp $R5 0 ReallyNotInstalled Quit -Quit: - Quit - -ReallyNotInstalled: +StartInstall: !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window FunctionEnd + +; Uninstaller +Function un.onInit +; Check that Gajim is not running before uninstalling + FindWindow $0 "gdkWindowToplevel" "Gajim" + StrCmp $0 0 StartUninstall + IfSilent ForceQuitGajim + MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 + +Cancel: + Abort + +ForceQuitGajim: + ; Hint: Gajim setup should not be named gajim.exe + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" + !insertmacro MUI_UNGETLANGUAGE + +StartUninstall: + !insertmacro MUI_UNGETLANGUAGE ; Open the language selection window +FunctionEnd \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71f4fdabf7ecaa157a6153d4f212d53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71f4fdabf7ecaa157a6153d4f212d53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Drag & Drop: Show info message if paths are skipped
by Philipp Hörist (＠lovetox) 29 Nov '21

29 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8dc8cfbf by Marcin Mielniczuk at 2021-11-29T20:13:38+01:00 Drag & Drop: Show info message if paths are skipped Related to #10544 - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/common/helpers.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -965,12 +965,13 @@ def _on_drag_motion(self, *args): self.xml.drop_area.set_no_show_all(False) self.xml.drop_area.show_all() - def drag_data_file_transfer(self, selection): + def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: # we may have more than one file dropped uri_splitted = selection.get_uris() for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) if not os.path.isfile(path): # is it a file? + self.add_info_message(_("The following file could not be accessed and was not uploaded: ") + path) continue self._start_filetransfer(path) ===================================== gajim/common/helpers.py ===================================== @@ -352,7 +352,7 @@ def build_command(executable, parameter): command = '%s "%s"' % (executable, parameter) return command -def get_file_path_from_dnd_dropped_uri(uri): +def get_file_path_from_dnd_dropped_uri(uri: str) -> str: path = urllib.parse.unquote(uri) # escape special chars path = path.strip('\r\n\x00') # remove \r\n and NULL # get the path to file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8dc8cfbfa8d4ddf111c68495febb91aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8dc8cfbfa8d4ddf111c68495febb91aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add annotations
by Philipp Hörist (＠lovetox) 29 Nov '21

29 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f891fdc2 by lovetox at 2021-11-29T20:01:01+01:00 Add annotations - - - - - 4 changed files: - gajim/common/app.py - gajim/common/types.py - gajim/gui/__init__.py - gajim/history_manager.py Changes: ===================================== gajim/common/app.py ===================================== @@ -24,6 +24,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any # pylint: disable=unused-import from typing import Dict # pylint: disable=unused-import from typing import List # pylint: disable=unused-import @@ -53,6 +55,8 @@ from gajim.common.types import ConnectionT # pylint: disable=unused-import from gajim.common.types import LegacyContactsAPIT # pylint: disable=unused-import from gajim.common.types import SettingsT # pylint: disable=unused-import +from gajim.common.types import CSSConfigT # pylint: disable=unused-import + interface = cast(InterfaceT, None) thread_interface = lambda *args: None # Interface to run a thread and then a callback @@ -76,7 +80,7 @@ def __init__(self): storage = Storage() -css_config = None +css_config = cast(CSSConfigT, None) transport_type = {} # type: Dict[str, str] ===================================== gajim/common/types.py ===================================== @@ -41,6 +41,7 @@ from gajim.gui_interface import Interface from gajim.common.settings import Settings + from gajim.gtk.css_config import CSSConfig NetworkEventsControllerT = Union['NetworkEventsController'] @@ -50,6 +51,7 @@ ContactsT = Union['Contact', 'GC_Contact'] ContactT = Union['Contact'] LegacyContactsAPIT = Union['LegacyContactsAPI'] +CSSConfigT = Union['CSSConfig'] # PEP PEPNotifyCallback = Callable[[nbxmpp.JID, nbxmpp.Node], None] ===================================== gajim/gui/__init__.py ===================================== @@ -1,24 +1,36 @@ +from __future__ import annotations + +from typing import Union +from typing import Sequence +from typing import Optional + +import types import sys from importlib.abc import MetaPathFinder from importlib.util import spec_from_file_location +from importlib.machinery import ModuleSpec from pathlib import Path class GUIFinder(MetaPathFinder): - def __init__(self, name, fallback=None): + def __init__(self, name: str, fallback: Optional[str] = None) -> None: self._path = Path(__file__).parent.parent / name self._fallback_path = None if fallback is not None: self._fallback_path = Path(__file__).parent.parent / fallback - def find_spec(self, fullname, _path, _target=None): + def find_spec(self, + fullname: str, + path: Optional[Sequence[Union[bytes, str]]], + target: Optional[types.ModuleType] = None) -> Optional[ModuleSpec]: + if not fullname.startswith('gajim.gui'): return None - _namespace, module_name = fullname.rsplit('.', 1) + _, module_name = fullname.rsplit('.', 1) module_path = self._find_module(module_name) if module_path is None: return None @@ -27,7 +39,7 @@ def find_spec(self, fullname, _path, _target=None): return spec - def _find_module(self, module_name): + def _find_module(self, module_name: str) -> Optional[Path]: module_path = self._path / f'{module_name}.py' if module_path.exists(): return module_path @@ -50,5 +62,5 @@ def _find_module(self, module_name): return None -def init(name, fallback=None): +def init(name: str, fallback: Optional[str] = None) -> None: sys.meta_path.append(GUIFinder(name, fallback=fallback)) ===================================== gajim/history_manager.py ===================================== @@ -70,7 +70,7 @@ def is_standalone() -> bool: def init_gtk() -> None: gajim.gui.init('gtk') - from gajim.gui import exception + from gajim.gtk import exception exception.init() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f891fdc2125c8c0b11c2656947ed621b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f891fdc2125c8c0b11c2656947ed621b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix issue with activating window
by Daniel Brötzmann (＠wurstsalat) 29 Nov '21

29 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 71f4fdab by wurstsalat at 2021-11-29T09:27:40+01:00 Fix issue with activating window - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -534,7 +534,7 @@ def _on_window_active(self, window, _param): return if control.get_autoscroll(): - self.mark_as_read(control.account, control.jid) + self.mark_as_read(control.account, control.contact.jid) @staticmethod def contact_info(account, jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71f4fdabf7ecaa157a6153d4f212d53e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71f4fdabf7ecaa157a6153d4f212d53e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve unread counter behavior
by Daniel Brötzmann (＠wurstsalat) 28 Nov '21

28 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 54b5dea9 by wurstsalat at 2021-11-28T17:35:49+01:00 Improve unread counter behavior - - - - - 4 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/jump_to_end_button.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -73,7 +73,6 @@ def __init__(self, chat_filter, search_entry): self.connect('notify::visible-child-name', self._on_visible_child_name) search_entry.connect('search-changed', self._on_search_changed) chat_filter.connect('filter-changed', self._on_filter_changed) - app.window.connect('notify::is-active', self._on_window_active) self._add_actions() self.show_all() @@ -92,13 +91,6 @@ def _add_actions(self): act.connect('activate', func) app.window.add_action(act) - def _on_window_active(self, window, _param): - is_active = window.get_property('is-active') - if is_active: - chat = self.get_selected_chat() - if chat is not None: - chat.reset_unread() - def _on_visible_child_name(self, _stack, _param): if self._last_visible_child_name == self.get_visible_child_name(): return ===================================== gajim/gtk/controls/base.py ===================================== @@ -182,7 +182,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml.conv_view_overlay.add(self._scrolled_view) - self._jump_to_end_button = JumpToEndButton() + self._jump_to_end_button = JumpToEndButton(self.contact) self._jump_to_end_button.connect('clicked', self._on_jump_to_end) self.xml.conv_view_overlay.add_overlay(self._jump_to_end_button) ===================================== gajim/gtk/conversation/jump_to_end_button.py ===================================== @@ -25,14 +25,15 @@ class JumpToEndButton(Gtk.Overlay): ()), } - def __init__(self): + def __init__(self, contact): Gtk.Overlay.__init__(self) - self.set_halign(Gtk.Align.END) self.set_valign(Gtk.Align.END) self.set_margin_end(6) self.set_margin_bottom(12) + self._contact = contact + icon = Gtk.Image.new_from_icon_name( 'go-bottom-symbolic', Gtk.IconSize.BUTTON) icon.set_margin_start(4) @@ -49,6 +50,11 @@ def __init__(self): self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( 'unread-counter') + + if contact.is_groupchat and not contact.can_notify(): + self._unread_label.get_style_context().add_class( + 'unread-counter-silent') + self._unread_label.set_no_show_all(True) self._unread_label.set_halign(Gtk.Align.END) self._unread_label.set_valign(Gtk.Align.START) @@ -62,18 +68,18 @@ def __init__(self): def _on_jump_clicked(self, _button): self.emit('clicked') - def toggle(self, visible): + def toggle(self, visible: bool) -> None: if visible: self.show() else: self.hide() self.reset_unread_count() - def reset_unread_count(self): + def reset_unread_count(self) -> None: self._count = 0 self._unread_label.hide() - def add_unread_count(self): + def add_unread_count(self) -> None: self._count += 1 if self._count > 0: self._unread_label.set_text(str(self._count)) ===================================== gajim/gtk/main.py ===================================== @@ -86,6 +86,7 @@ def __init__(self): self._ui.account_box.add(self._account_side_bar) self.connect('motion-notify-event', self._on_window_motion_notify) + self.connect('notify::is-active', self._on_window_active) self.connect('delete-event', self._on_window_delete) self._ui.connect_signals(self) @@ -523,6 +524,18 @@ def mark_as_read(self, account: str, jid: JID, chat_list_stack = self._chat_page.get_chat_list_stack() chat_list_stack.mark_as_read(account, jid) + def _on_window_active(self, window, _param): + is_active = window.get_property('is-active') + if not is_active: + return + + control = self.get_active_control() + if control is None: + return + + if control.get_autoscroll(): + self.mark_as_read(control.account, control.jid) + @staticmethod def contact_info(account, jid): client = app.get_client(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/54b5dea9bf0da6bc4052215416e77e87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/54b5dea9bf0da6bc4052215416e77e87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add silent unread markers
by Daniel Brötzmann (＠wurstsalat) 28 Nov '21

28 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b8275942 by wurstsalat at 2021-11-28T13:58:33+01:00 Add silent unread markers - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -393,6 +393,9 @@ .unread-counter { padding-right: 6px; border-radius: 10px; } +.unread-counter-silent { + background-color: rgb(95, 95, 95); +} .header-box label { padding: 12px 18px 6px 18px; font-weight: bold; ===================================== gajim/gtk/chat_list.py ===================================== @@ -99,7 +99,6 @@ def mark_as_read(self, account: str, jid: JID) -> None: chat = self._chats.get((account, jid)) if chat is not None: chat.reset_unread() - self.emit_unread_changed() def emit_unread_changed(self) -> None: count = self.get_unread_count() @@ -508,6 +507,10 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self.update_name() self.update_account_identifier() + if self.contact.is_groupchat and not self.contact.can_notify(): + self._ui.unread_label.get_style_context().add_class( + 'unread-counter-silent') + # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) @@ -654,6 +657,8 @@ def _on_nickname_update(self, _contact, _signal_name): @property def unread_count(self) -> int: + if self.contact.is_groupchat and not self.contact.can_notify(): + return 0 return self._unread_count @unread_count.setter @@ -662,6 +667,31 @@ def unread_count(self, value: int) -> None: self._update_unread() self.get_parent().emit_unread_changed() + def _update_unread(self) -> None: + unread_count = self._get_unread_string(self._unread_count) + self._ui.unread_label.set_text(unread_count) + self._ui.unread_label.set_visible(bool(self._unread_count)) + + @staticmethod + def _get_unread_string(count: int) -> str: + if count < 1000: + return str(count) + return '999+' + + def add_unread(self) -> None: + control = app.window.get_control(self.account, self.jid) + if self.is_active and control.get_autoscroll(): + return + + self._unread_count += 1 + self._update_unread() + self.get_parent().emit_unread_changed() + + def reset_unread(self) -> None: + self._unread_count = 0 + self._update_unread() + self.get_parent().emit_unread_changed() + @property def is_active(self) -> bool: return (self.is_selected() and @@ -701,31 +731,6 @@ def update_time(self) -> None: self._ui.timestamp_label.set_text( get_uf_relative_time(self.timestamp)) - def _update_unread(self) -> None: - unread_count = self._get_unread_string(self._unread_count) - self._ui.unread_label.set_text(unread_count) - self._ui.unread_label.set_visible(bool(self._unread_count)) - - @staticmethod - def _get_unread_string(count: int) -> str: - if count < 1000: - return str(count) - return '999+' - - def add_unread(self) -> None: - control = app.window.get_control(self.account, self.jid) - if self.is_active and control.get_autoscroll(): - return - - self.unread_count += 1 - if self.unread_count == 1: - self.changed() - - def reset_unread(self) -> None: - if not self.unread_count: - return - self.unread_count = 0 - def set_nick(self, nickname: str) -> None: self._ui.nick_label.set_visible(bool(nickname)) self._ui.nick_label.set_text(nickname) ===================================== gajim/gtk/controls/base.py ===================================== @@ -565,7 +565,7 @@ def remove_actions(self) -> None: def mark_as_read(self, send_marker: bool = True) -> None: self._jump_to_end_button.reset_unread_count() - if send_marker: + if send_marker and self.last_msg_id is not None: # XEP-0333 Send <displayed> marker self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, @@ -976,10 +976,8 @@ def _on_autoscroll_changed(self, _widget, autoscroll): self._jump_to_end_button.toggle(True) return - if app.window.get_chat_unread_count(self.account, self.contact.jid) > 0: - app.window.mark_as_read(self.account, self.contact.jid) - self._jump_to_end_button.toggle(False) + app.window.mark_as_read(self.account, self.contact.jid) def _on_jump_to_end(self, _button): self.scroll_to_end(force=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8275942923f28a56b92587046dbfd27… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8275942923f28a56b92587046dbfd27… 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