Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
66d9ad4d by wurstsalat at 2022-11-25T15:25:54+01:00
cfix: Preferences: Use correct preview actions
- - - - -
26f68c7f by wurstsalat at 2022-11-25T15:26:17+01:00
cfix: Menus: Fix linting error
- - - - -
b02f54d3 by wurstsalat at 2022-11-25T15:26:40+01:00
cq: File Choosers: Fix typo
- - - - -
027b2d47 by wurstsalat at 2022-11-25T15:27:57+01:00
cfix: FileTransferSelector: Improve file choosing
- - - - -
4 changed files:
- gajim/gtk/file_transfer_selector.py
- gajim/gtk/filechoosers.py
- gajim/gtk/menus.py
- gajim/gtk/preferences.py
Changes:
=====================================
gajim/gtk/file_transfer_selector.py
=====================================
@@ -232,7 +232,7 @@ def _on_choose_files_clicked(self, _button: Gtk.Button) ->
None:
FileChooserDialog(self.add_files,
select_multiple=True,
transient_for=app.window,
- path=app.settings.get('last_send_dir'))
+ path=app.settings.get('last_send_dir') or None)
class FileRow(Gtk.ListBoxRow):
=====================================
gajim/gtk/filechoosers.py
=====================================
@@ -87,7 +87,7 @@ def _update_preview(self, filechooser: Gtk.FileChooser) ->
None:
return
try:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
- path_to_file, *self._preivew_size)
+ path_to_file, *self._preview_size)
except GLib.Error:
preview.clear()
return
@@ -103,7 +103,7 @@ class BaseFileOpenDialog:
class BaseAvatarChooserDialog:
_title = _('Choose Avatar…')
- _preivew_size = (100, 100)
+ _preview_size = (100, 100)
if _require_native():
_filters = [Filter(_('PNG files'), '*.png', True),
@@ -179,7 +179,7 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog,
BaseFileChooser):
_title = ''
_filters: list[Filter] = []
_action = Gtk.FileChooserAction.OPEN
- _preivew_size = (200, 200)
+ _preview_size = (200, 200)
def __init__(self,
accept_cb: Callable[..., Any],
=====================================
gajim/gtk/menus.py
=====================================
@@ -677,19 +677,19 @@ def get_preview_menu(preview: Preview) -> GajimMenu:
variant = GLib.Variant('s', preview.id)
download = (_('_Download'), 'win.preview-download', variant)
- open = (_('_Open'), 'win.preview-open', variant)
+ open_file = (_('_Open'), 'win.preview-open', variant)
save_as = (_('_Save as'), 'win.preview-save-as', variant)
open_folder = (_('Open _Folder'), 'win.preview-open-folder', variant)
copy_link = (_('_Copy Link'), 'win.preview-copy-link', variant)
open_link = (_('Open Link in _Browser'), 'win.preview-open-link', variant)
if preview.is_geo_uri:
- menu_items.append(open)
+ menu_items.append(open_file)
menu_items.append(copy_link)
return GajimMenu.from_list(menu_items)
if preview.orig_exists:
- menu_items.append(open)
+ menu_items.append(open_file)
menu_items.append(save_as)
menu_items.append(open_folder)
else:
=====================================
gajim/gtk/preferences.py
=====================================
@@ -48,7 +48,7 @@
from .settings import SettingsDialog
from .sidebar_switcher import SideBarSwitcher
from .video_preview import VideoPreview
-from .preview import PREVIEW_CLICK_ACTIONS
+from .preview import PREVIEW_ACTIONS
from .util import open_window
from .util import get_app_window
from .builder import get_builder
@@ -416,6 +416,12 @@ def __init__(self, *args: Any) -> None:
10485760: '10 MiB',
}
+ preview_actions = {}
+ for action, data in PREVIEW_ACTIONS.items():
+ if action == 'download':
+ continue
+ preview_actions[action] = data[0]
+
settings = [
Setting(SettingKind.SWITCH,
_('File Preview'),
@@ -460,7 +466,7 @@ def __init__(self, *args: Any) -> None:
'preview_leftclick_action',
desc=_('Action for left-clicking a preview'),
bind='enable_file_preview',
- props={'entries': PREVIEW_CLICK_ACTIONS}),
+ props={'entries': preview_actions}),
Setting(SettingKind.SWITCH,
_('HTTPS Verification'),
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/45033e89ad327a0958c493c16868758455628ccc...027b2d47f61ff9329eed44597c8c061854c6218c
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/45033e89ad327a0958c493c16868758455628ccc...027b2d47f61ff9329eed44597c8c061854c6218c
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
