Make imports GUI agnostic

2020-12-06 13:22:33 +01:00
parent b8548cbcd3
commit 5b763716a6
40 changed files with 87 additions and 84 deletions
--- a/anti_spam/config_dialog.py
+++ b/anti_spam/config_dialog.py
@@ -15,10 +15,10 @@

 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingKind
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingKind
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/anti_spam/manifest.ini
+++ b/anti_spam/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Anti Spam
 short_name: anti_spam
-version: 1.5.1
+version: 1.5.2
 description: Block some incoming messages.
 authors: Yann Leboulanger <asterix@lagaule.org>
 Denis Fomin <fominde@gmail.com>
--- a/clickable_nicknames/clickable_nicknames.py
+++ b/clickable_nicknames/clickable_nicknames.py
@@ -6,7 +6,7 @@ from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _

-from gajim.gtk.util import get_cursor
+from gajim.gui.util import get_cursor


 class ClickableNicknames(GajimPlugin):
--- a/clickable_nicknames/manifest.ini
+++ b/clickable_nicknames/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Clickable Nicknames
 short_name: clickable_nicknames
-version: 1.3.0
+version: 1.3.1
 description: Clickable nicknames in the conversation textview.
 authors: Andrey Musikhin <melomansegfault@gmail.com>
 Denis Fomin <fominde@gmail.com>
--- a/clients_icons/clients_icons.py
+++ b/clients_icons/clients_icons.py
@@ -20,7 +20,7 @@ from functools import partial
 from gi.repository import Gtk

 from gajim.common import app
-from gajim.gtk.util import load_icon
+from gajim.gui.util import load_icon

 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _
--- a/clients_icons/config_dialog.py
+++ b/clients_icons/config_dialog.py
@@ -15,10 +15,10 @@

 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingKind
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingKind
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/clients_icons/manifest.ini
+++ b/clients_icons/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Clients icons
 short_name: clients_icons
-version: 7.9.2
+version: 7.9.3
 description: Shows client icons in roster and in groupchats.
 authors: Denis Fomin <fominde@gmail.com>
 Artem Klyop <art.klyop@gmail.com>
--- a/form_handler/gtk/form.py
+++ b/form_handler/gtk/form.py
@@ -22,7 +22,7 @@ from gi.repository import Gtk
 from gajim.common import app
 from gajim.common.structs import OutgoingMessage

-from gajim.gtk.dataform import DataFormWidget
+from gajim.gui.dataform import DataFormWidget

 from gajim.plugins.plugins_i18n import _

--- a/form_handler/manifest.ini
+++ b/form_handler/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Form Handler
 short_name: form_handler
-version: 1.3.2
+version: 1.3.3
 description: Lets the user display and answer forms attached to messages.
 authors = Philipp Hoerist <philipp@hoerist.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/formhandler
--- a/latex/config_dialog.py
+++ b/latex/config_dialog.py
@@ -15,10 +15,10 @@
 from gi.repository import GObject
 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SpinSetting
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SpinSetting
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/latex/manifest.ini
+++ b/latex/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Latex
 short_name: latex
-version: 1.3.1
+version: 1.3.2
 description: Render LaTeX markup for $$foobar$$ sourrounded LaTeX equations.
 authors: Yves Fischer <yvesf@xapek.org>
 Yann Leboulanger <asterix@lagaule.org>
--- a/length_notifier/config_dialog.py
+++ b/length_notifier/config_dialog.py
@@ -18,11 +18,11 @@
 from gi.repository import GObject
 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SpinSetting
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingKind
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SpinSetting
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingKind
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/length_notifier/manifest.ini
+++ b/length_notifier/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Message Length Notifier
 short_name: length_notifier
-version: 1.3.1
+version: 1.3.2
 description: Highlights the chat window’s message input if a specified message length is exceeded
 authors: Mateusz Biliński <mateusz@bilinski.it>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/LengthNotifierPlugin
--- a/message_box_size/config_dialog.py
+++ b/message_box_size/config_dialog.py
@@ -1,10 +1,10 @@
 from gi.repository import GObject
 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SpinSetting
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SpinSetting
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/message_box_size/manifest.ini
+++ b/message_box_size/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Message Box Size
 short_name: message_box_size
-version: 1.3.0
+version: 1.3.1
 description: Allows you to adjust the height of the 'New message' input field.
 authors: Denis Fomin <fominde@gmail.com>
 Philipp Hörist <philipp@hoerist.com>
--- a/now_listen/gtk/config.py
+++ b/now_listen/gtk/config.py
@@ -15,10 +15,10 @@

 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SettingKind
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SettingKind
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/now_listen/manifest.ini
+++ b/now_listen/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Now Listen
 short_name: now_listen
-version: 1.3.1
+version: 1.3.2
 description: Allows you to paste info about the music you are playing (use by pressing Alt+N in the message input).
 authors = Denis Fomin <fominde@gmail.com>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/NowListenPlugin
--- a/omemo/CHANGELOG
+++ b/omemo/CHANGELOG
@@ -1,3 +1,6 @@
+2.7.12 / 2020-12-06
+- Adapt to Gajim changes
+
 2.7.11 / 2020-10-19
 - Adapt to nbxmpp changes

--- a/omemo/file_crypto.py
+++ b/omemo/file_crypto.py
@@ -31,8 +31,8 @@ from gajim.common.const import URIType
 from gajim.common.const import FTState
 from gajim.common.filetransfer import FileTransfer
 from gajim.plugins.plugins_i18n import _
-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import ConfirmationDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationDialog

 from omemo.backend.aes import aes_decrypt_file

--- a/omemo/gtk/key.py
+++ b/omemo/gtk/key.py
@@ -28,8 +28,8 @@ from gi.repository import GdkPixbuf
 from gajim.common import app
 from gajim.plugins.plugins_i18n import _
 from gajim.plugins.helpers import get_builder
-from gajim.gtk.dialogs import ConfirmationDialog
-from gajim.gtk.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationDialog
+from gajim.gui.dialogs import DialogButton

 from omemo.backend.util import Trust
 from omemo.backend.util import IdentityKeyExtended
--- a/omemo/manifest.ini
+++ b/omemo/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: OMEMO
 short_name: omemo
-version: 2.7.11
+version: 2.7.12
 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencies, detailed in the installation instructions for your system in the GitLab wiki.
 authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
 Daniel Gultsch <daniel@gultsch.de>
--- a/openpgp/gtk/key.py
+++ b/openpgp/gtk/key.py
@@ -21,8 +21,8 @@ from gi.repository import Gtk

 from gajim.common import app

-from gajim.gtk.dialogs import ConfirmationDialog
-from gajim.gtk.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationDialog
+from gajim.gui.dialogs import DialogButton
 from gajim.plugins.plugins_i18n import _

 from openpgp.modules.util import Trust
--- a/openpgp/manifest.ini
+++ b/openpgp/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: OpenPGP
 short_name: openpgp
-version: 1.3.8
+version: 1.3.9
 description: Experimental OpenPGP (XEP-0373) implementation.
 authors: Philipp Hörist <philipp@hoerist.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/pgp
--- a/openpgp/pgpplugin.py
+++ b/openpgp/pgpplugin.py
@@ -29,7 +29,7 @@ from gajim.common import configpaths
 from gajim.common import helpers
 from gajim.common.const import CSSPriority

-from gajim.gtk.dialogs import ErrorDialog
+from gajim.gui.dialogs import ErrorDialog

 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _
--- a/pgp/manifest.ini
+++ b/pgp/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: PGP
 short_name: pgp
-version: 1.3.4
+version: 1.3.5
 description: PGP encryption as per XEP-0027.
 authors: Philipp Hörist <philipp@hoerist.com>
 homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/pgpplugin
--- a/pgp/plugin.py
+++ b/pgp/plugin.py
@@ -26,9 +26,9 @@ from gajim.common import ged
 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _

-from gajim.gtk.dialogs import ErrorDialog
-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import ConfirmationCheckDialog
+from gajim.gui.dialogs import ErrorDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationCheckDialog

 from pgp.gtk.key import KeyDialog
 from pgp.gtk.config import PGPConfigDialog
--- a/plugin_installer/config_dialog.py
+++ b/plugin_installer/config_dialog.py
@@ -15,10 +15,10 @@

 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingKind
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingKind
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/plugin_installer/manifest.ini
+++ b/plugin_installer/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Plugin Installer
 short_name: plugin_installer
-version: 1.3.6
+version: 1.3.7
 description: Install and upgrade plugins for Gajim
 authors: Denis Fomin <fominde@gmail.com>
 Yann Leboulanger <asterix@lagaule.org>
--- a/plugin_installer/plugin_installer.py
+++ b/plugin_installer/plugin_installer.py
@@ -29,9 +29,9 @@ from gajim.common import app
 from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _

-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import InformationDialog
-from gajim.gtk.dialogs import ConfirmationCheckDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import InformationDialog
+from gajim.gui.dialogs import ConfirmationCheckDialog

 from plugin_installer.config_dialog import PluginInstallerConfigDialog
 from plugin_installer.widget import AvailablePage
--- a/set_location/manifest.ini
+++ b/set_location/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Set Location
 short_name: set_location
-version: 1.3.3
+version: 1.3.4
 description: Set information about your current geographical or physical location.
 To be able to set your location on the built-in map, you must install gir1.2-gtkchamplain and gir1.2-gtkclutter-1.0
 authors: Denis Fomin <fominde@gmail.com>
--- a/set_location/set_location.py
+++ b/set_location/set_location.py
@@ -16,9 +16,9 @@ from gajim.common import ged
 from gajim.common import configpaths
 from gajim.common.helpers import sanitize_filename

-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import InputDialog
-from gajim.gtk.dialogs import WarningDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import InputDialog
+from gajim.gui.dialogs import WarningDialog

 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import get_builder
--- a/tictactoe/config_dialog.py
+++ b/tictactoe/config_dialog.py
@@ -17,10 +17,10 @@
 from gi.repository import GObject
 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SpinSetting
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SpinSetting
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/tictactoe/manifest.ini
+++ b/tictactoe/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Tic tac toe
 short_name: tictactoe
-version: 1.7.1
+version: 1.7.2
 description: Play Tic-tac-toe.
 authors = Yann Leboulanger <asterix@lagaule.org>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/TictactoePlugin
--- a/tictactoe/plugin.py
+++ b/tictactoe/plugin.py
@@ -44,8 +44,8 @@ from gajim.common import app
 from gajim.common import ged
 from gajim.common.connection_handlers_events import InformationEvent

-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import ConfirmationDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationDialog

 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import log
--- a/url_image_preview/config_dialog.py
+++ b/url_image_preview/config_dialog.py
@@ -20,11 +20,11 @@
 from gi.repository import GObject
 from gi.repository import Gtk

-from gajim.gtk.settings import SettingsDialog
-from gajim.gtk.settings import SpinSetting
-from gajim.gtk.const import Setting
-from gajim.gtk.const import SettingKind
-from gajim.gtk.const import SettingType
+from gajim.gui.settings import SettingsDialog
+from gajim.gui.settings import SpinSetting
+from gajim.gui.const import Setting
+from gajim.gui.const import SettingKind
+from gajim.gui.const import SettingType

 from gajim.plugins.plugins_i18n import _

--- a/url_image_preview/manifest.ini
+++ b/url_image_preview/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Url image preview
 short_name: url_image_preview
-version: 2.5.5
+version: 2.5.6
 description: Displays a preview of image links.
 authors = Denis Fomin <fominde@gmail.com>
 Yann Leboulanger <asterix@lagaule.org>
--- a/url_image_preview/url_image_preview.py
+++ b/url_image_preview/url_image_preview.py
@@ -47,11 +47,11 @@ from gajim.common.helpers import write_file_async
 from gajim.common.helpers import load_file_async
 from gajim.common.helpers import get_tls_error_phrase
 from gajim.common.helpers import get_user_proxy
-from gajim.gtk.dialogs import ErrorDialog
-from gajim.gtk.filechoosers import FileSaveDialog
-from gajim.gtk.util import get_cursor
-from gajim.gtk.util import get_monitor_scale_factor
-from gajim.gtk.util import load_icon
+from gajim.gui.dialogs import ErrorDialog
+from gajim.gui.filechoosers import FileSaveDialog
+from gajim.gui.util import get_cursor
+from gajim.gui.util import get_monitor_scale_factor
+from gajim.gui.util import load_icon

 from gajim.plugins import GajimPlugin
 from gajim.plugins.helpers import get_builder
--- a/whiteboard/manifest.ini
+++ b/whiteboard/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Whiteboard
 short_name: whiteboard
-version: 1.3.0
+version: 1.3.1
 description: Shows a whiteboard in chat. python-pygoocanvas is required.
 authors = Yann Leboulanger <asterix@lagaule.org>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/WhiteboardPlugin
--- a/whiteboard/plugin.py
+++ b/whiteboard/plugin.py
@@ -41,8 +41,8 @@ from gajim.common.jingle_content import JingleContent
 from gajim.common.jingle_transport import JingleTransport
 from gajim.common.jingle_transport import TransportType

-from gajim.gtk.dialogs import DialogButton
-from gajim.gtk.dialogs import ConfirmationDialog
+from gajim.gui.dialogs import DialogButton
+from gajim.gui.dialogs import ConfirmationDialog

 from gajim.plugins import GajimPlugin
 from gajim.plugins.gajimplugin import GajimPluginException
--- a/whiteboard/whiteboard_widget.py
+++ b/whiteboard/whiteboard_widget.py
@@ -21,8 +21,8 @@ from gi.repository import Gtk

 from gajim.common import app

-from gajim.gtk.filechoosers import NativeFileChooserDialog
-from gajim.gtk.filechoosers import Filter
+from gajim.gui.filechoosers import NativeFileChooserDialog
+from gajim.gui.filechoosers import Filter

 from gajim.plugins.helpers import get_builder
 from gajim.plugins.plugins_i18n import _