Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
-
66d9ad4d
by wurstsalat at 2022-11-25T15:25:54+01:00
-
26f68c7f
by wurstsalat at 2022-11-25T15:26:17+01:00
-
b02f54d3
by wurstsalat at 2022-11-25T15:26:40+01:00
-
027b2d47
by wurstsalat at 2022-11-25T15:27:57+01:00
4 changed files:
- gajim/gtk/file_transfer_selector.py
- gajim/gtk/filechoosers.py
- gajim/gtk/menus.py
- gajim/gtk/preferences.py
Changes:
| ... | ... | @@ -232,7 +232,7 @@ def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: |
| 232 | 232 | FileChooserDialog(self.add_files,
|
| 233 | 233 | select_multiple=True,
|
| 234 | 234 | transient_for=app.window,
|
| 235 | - path=app.settings.get('last_send_dir'))
|
|
| 235 | + path=app.settings.get('last_send_dir') or None)
|
|
| 236 | 236 | |
| 237 | 237 | |
| 238 | 238 | class FileRow(Gtk.ListBoxRow):
|
| ... | ... | @@ -87,7 +87,7 @@ def _update_preview(self, filechooser: Gtk.FileChooser) -> None: |
| 87 | 87 | return
|
| 88 | 88 | try:
|
| 89 | 89 | pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
|
| 90 | - path_to_file, *self._preivew_size)
|
|
| 90 | + path_to_file, *self._preview_size)
|
|
| 91 | 91 | except GLib.Error:
|
| 92 | 92 | preview.clear()
|
| 93 | 93 | return
|
| ... | ... | @@ -103,7 +103,7 @@ class BaseFileOpenDialog: |
| 103 | 103 | class BaseAvatarChooserDialog:
|
| 104 | 104 | |
| 105 | 105 | _title = _('Choose Avatar…')
|
| 106 | - _preivew_size = (100, 100)
|
|
| 106 | + _preview_size = (100, 100)
|
|
| 107 | 107 | |
| 108 | 108 | if _require_native():
|
| 109 | 109 | _filters = [Filter(_('PNG files'), '*.png', True),
|
| ... | ... | @@ -179,7 +179,7 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): |
| 179 | 179 | _title = ''
|
| 180 | 180 | _filters: list[Filter] = []
|
| 181 | 181 | _action = Gtk.FileChooserAction.OPEN
|
| 182 | - _preivew_size = (200, 200)
|
|
| 182 | + _preview_size = (200, 200)
|
|
| 183 | 183 | |
| 184 | 184 | def __init__(self,
|
| 185 | 185 | accept_cb: Callable[..., Any],
|
| ... | ... | @@ -677,19 +677,19 @@ def get_preview_menu(preview: Preview) -> GajimMenu: |
| 677 | 677 | variant = GLib.Variant('s', preview.id)
|
| 678 | 678 | |
| 679 | 679 | download = (_('_Download'), 'win.preview-download', variant)
|
| 680 | - open = (_('_Open'), 'win.preview-open', variant)
|
|
| 680 | + open_file = (_('_Open'), 'win.preview-open', variant)
|
|
| 681 | 681 | save_as = (_('_Save as'), 'win.preview-save-as', variant)
|
| 682 | 682 | open_folder = (_('Open _Folder'), 'win.preview-open-folder', variant)
|
| 683 | 683 | copy_link = (_('_Copy Link'), 'win.preview-copy-link', variant)
|
| 684 | 684 | open_link = (_('Open Link in _Browser'), 'win.preview-open-link', variant)
|
| 685 | 685 | |
| 686 | 686 | if preview.is_geo_uri:
|
| 687 | - menu_items.append(open)
|
|
| 687 | + menu_items.append(open_file)
|
|
| 688 | 688 | menu_items.append(copy_link)
|
| 689 | 689 | return GajimMenu.from_list(menu_items)
|
| 690 | 690 | |
| 691 | 691 | if preview.orig_exists:
|
| 692 | - menu_items.append(open)
|
|
| 692 | + menu_items.append(open_file)
|
|
| 693 | 693 | menu_items.append(save_as)
|
| 694 | 694 | menu_items.append(open_folder)
|
| 695 | 695 | else:
|
| ... | ... | @@ -48,7 +48,7 @@ |
| 48 | 48 | from .settings import SettingsDialog
|
| 49 | 49 | from .sidebar_switcher import SideBarSwitcher
|
| 50 | 50 | from .video_preview import VideoPreview
|
| 51 | -from .preview import PREVIEW_CLICK_ACTIONS
|
|
| 51 | +from .preview import PREVIEW_ACTIONS
|
|
| 52 | 52 | from .util import open_window
|
| 53 | 53 | from .util import get_app_window
|
| 54 | 54 | from .builder import get_builder
|
| ... | ... | @@ -416,6 +416,12 @@ def __init__(self, *args: Any) -> None: |
| 416 | 416 | 10485760: '10 MiB',
|
| 417 | 417 | }
|
| 418 | 418 | |
| 419 | + preview_actions = {}
|
|
| 420 | + for action, data in PREVIEW_ACTIONS.items():
|
|
| 421 | + if action == 'download':
|
|
| 422 | + continue
|
|
| 423 | + preview_actions[action] = data[0]
|
|
| 424 | + |
|
| 419 | 425 | settings = [
|
| 420 | 426 | Setting(SettingKind.SWITCH,
|
| 421 | 427 | _('File Preview'),
|
| ... | ... | @@ -460,7 +466,7 @@ def __init__(self, *args: Any) -> None: |
| 460 | 466 | 'preview_leftclick_action',
|
| 461 | 467 | desc=_('Action for left-clicking a preview'),
|
| 462 | 468 | bind='enable_file_preview',
|
| 463 | - props={'entries': PREVIEW_CLICK_ACTIONS}),
|
|
| 469 | + props={'entries': preview_actions}),
|
|
| 464 | 470 | |
| 465 | 471 | Setting(SettingKind.SWITCH,
|
| 466 | 472 | _('HTTPS Verification'),
|