Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
a457a9ac by Philipp Hörist at 2018-08-19T15:44:17Z
Move filechoosers into gtk module
- - - - -
8 changed files:
- gajim/filetransfers_window.py
- gajim/groupchat_control.py
- gajim/filechoosers.py → gajim/gtk/filechoosers.py
- gajim/gtk/profile.py
- gajim/gtkgui_helpers.py
- gajim/gui_interface.py
- gajim/history_manager.py
- gajim/plugins/gui.py
Changes:
=====================================
gajim/filetransfers_window.py
=====================================
--- a/gajim/filetransfers_window.py
+++ b/gajim/filetransfers_window.py
@@ -48,7 +48,7 @@ from gajim.common import helpers
from gajim.common.file_props import FilesProp
from gajim.common.protocol.bytestream import (is_transfer_active,
is_transfer_paused,
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
import logging
log = logging.getLogger('gajim.filetransfer_window')
=====================================
gajim/groupchat_control.py
=====================================
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr
from gajim.chat_control import ChatControl
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 InputTextDialog
from gajim.gtk import ConfirmationDialogCheck
=====================================
gajim/filechoosers.py → gajim/gtk/filechoosers.py
=====================================
--- a/gajim/filechoosers.py
+++ b/gajim/gtk/filechoosers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com>
#
# This file is part of Gajim.
=====================================
gajim/gtk/profile.py
=====================================
--- a/gajim/gtk/profile.py
+++ b/gajim/gtk/profile.py
@@ -29,7 +29,7 @@ from gajim import gtkgui_helpers
from gajim.gtk import ErrorDialog
from gajim.gtk import InformationDialog
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 import app
from gajim.common import ged
=====================================
gajim/gtkgui_helpers.py
=====================================
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -52,7 +52,6 @@ from gajim.common import i18n
from gajim.common import app
from gajim.common import configpaths
from gajim.common.const import PEPEventType, ACTIVITIES, MOODS
-from gajim.filechoosers import AvatarSaveDialog
gtk_icon_theme = Gtk.IconTheme.get_default()
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 ConfirmationDialog
from gajim.gtk import FTOverwriteConfirmationDialog
+ from gajim.gtk.filechoosers import AvatarSaveDialog
def on_continue(response, file_path):
if response < 0:
return
=====================================
gajim/gui_interface.py
=====================================
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -70,7 +70,7 @@ from gajim import message_control
from gajim.dialog_messages import get_dialog
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 import ChatControl
=====================================
gajim/history_manager.py
=====================================
--- a/gajim/history_manager.py
+++ b/gajim/history_manager.py
@@ -88,7 +88,7 @@ from gajim.common import helpers
from gajim.gtk import YesNoDialog
from gajim.gtk import ErrorDialog
from gajim.gtk import ConfirmationDialog
-from gajim.filechoosers import FileSaveDialog
+from gajim.gtk.filechoosers import FileSaveDialog
from gajim import gtkgui_helpers
=====================================
gajim/plugins/gui.py
=====================================
--- a/gajim/plugins/gui.py
+++ b/gajim/plugins/gui.py
@@ -36,7 +36,7 @@ from enum import IntEnum, unique
from gajim import gtkgui_helpers
from gajim.gtk import WarningDialog
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 configpaths
from gajim.plugins.helpers import log_calls
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/a457a9ac2153deb135274705e80179cf9f064d58
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/a457a9ac2153deb135274705e80179cf9f064d58
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
