copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move filechoosers into gtk module

This commit is contained in:
Philipp Hörist 2018-08-19 17:44:17 +02:00
parent def4f548c1
commit a457a9ac21
8 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gajim/filetransfers_window.py
View File

@ -48,7 +48,7 @@ from gajim.common import helpers
from gajim.common.file_props import FilesProp from gajim.common.file_props import FilesProp
from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused,
is_transfer_stopped) is_transfer_stopped)
from gajim.filechoosers import FileSaveDialog, FileChooserDialog from gajim.gtk.filechoosers import FileSaveDialog, FileChooserDialog
from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5
import logging import logging
log = logging.getLogger('gajim.filetransfer_window') log = logging.getLogger('gajim.filetransfer_window')

2
gajim/groupchat_control.py
View File

@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr
from gajim.chat_control import ChatControl from gajim.chat_control import ChatControl
from gajim.chat_control_base import ChatControlBase from gajim.chat_control_base import ChatControlBase
from gajim.filechoosers import AvatarChooserDialog from gajim.gtk.filechoosers import AvatarChooserDialog
from gajim.gtk import ErrorDialog from gajim.gtk import ErrorDialog
from gajim.gtk import InputTextDialog from gajim.gtk import InputTextDialog
from gajim.gtk import ConfirmationDialogCheck from gajim.gtk import ConfirmationDialogCheck

2
gajim/filechoosers.py → gajim/gtk/filechoosers.py
View File

@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com>
# #
# This file is part of Gajim. # This file is part of Gajim.

2
gajim/gtk/profile.py
View File

@ -29,7 +29,7 @@ from gajim import gtkgui_helpers
from gajim.gtk import ErrorDialog from gajim.gtk import ErrorDialog
from gajim.gtk import InformationDialog from gajim.gtk import InformationDialog
from gajim.gtk.util import get_builder from gajim.gtk.util import get_builder
from gajim.filechoosers import AvatarChooserDialog from gajim.gtk.filechoosers import AvatarChooserDialog
from gajim.common.const import AvatarSize from gajim.common.const import AvatarSize
from gajim.common import app from gajim.common import app
from gajim.common import ged from gajim.common import ged

2
gajim/gtkgui_helpers.py
View File

@ -52,7 +52,6 @@ from gajim.common import i18n
from gajim.common import app from gajim.common import app
from gajim.common import configpaths from gajim.common import configpaths
from gajim.common.const import PEPEventType, ACTIVITIES, MOODS from gajim.common.const import PEPEventType, ACTIVITIES, MOODS
from gajim.filechoosers import AvatarSaveDialog
gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme = Gtk.IconTheme.get_default()
gtk_icon_theme.append_search_path(configpaths.get('ICONS')) gtk_icon_theme.append_search_path(configpaths.get('ICONS'))
@ -464,6 +463,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''):
from gajim.gtk import ErrorDialog from gajim.gtk import ErrorDialog
from gajim.gtk import ConfirmationDialog from gajim.gtk import ConfirmationDialog
from gajim.gtk import FTOverwriteConfirmationDialog from gajim.gtk import FTOverwriteConfirmationDialog
from gajim.gtk.filechoosers import AvatarSaveDialog
def on_continue(response, file_path): def on_continue(response, file_path):
if response < 0: if response < 0:
return return

2
gajim/gui_interface.py
View File

@ -70,7 +70,7 @@ from gajim import message_control
from gajim.dialog_messages import get_dialog from gajim.dialog_messages import get_dialog
from gajim.dialogs import ProgressWindow from gajim.dialogs import ProgressWindow
from gajim.filechoosers import FileChooserDialog from gajim.gtk.filechoosers import FileChooserDialog
from gajim.chat_control_base import ChatControlBase from gajim.chat_control_base import ChatControlBase
from gajim.chat_control import ChatControl from gajim.chat_control import ChatControl

2
gajim/history_manager.py
View File

@ -88,7 +88,7 @@ from gajim.common import helpers
from gajim.gtk import YesNoDialog from gajim.gtk import YesNoDialog
from gajim.gtk import ErrorDialog from gajim.gtk import ErrorDialog
from gajim.gtk import ConfirmationDialog from gajim.gtk import ConfirmationDialog
from gajim.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileSaveDialog
from gajim import gtkgui_helpers from gajim import gtkgui_helpers

2
gajim/plugins/gui.py
View File

@ -36,7 +36,7 @@ from enum import IntEnum, unique
from gajim import gtkgui_helpers from gajim import gtkgui_helpers
from gajim.gtk import WarningDialog from gajim.gtk import WarningDialog
from gajim.gtk import YesNoDialog from gajim.gtk import YesNoDialog
from gajim.filechoosers import ArchiveChooserDialog from gajim.gtk.filechoosers import ArchiveChooserDialog
from gajim.common import app from gajim.common import app
from gajim.common import configpaths from gajim.common import configpaths
from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import log_calls