diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index a2756a525320d2f27a33af5029ce4b939fddb78b..9bea941f34e063c6b47567291bc61028ebb62015 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -60,7 +60,6 @@
from gajim import gtkgui_helpers
from gajim import gui_menu_builder
-from gajim import message_control
from gajim import dialogs
from gajim.gtk.dialogs import DialogButton
@@ -75,6 +74,7 @@
from gajim.gtk.util import format_location
from gajim.gtk.util import get_activity_icon_name
from gajim.gtk.util import make_href_markup
+from gajim.gtk.const import ControlType
from gajim.command_system.implementation.hosts import ChatCommands
from gajim.command_system.framework import CommandHost # pylint: disable=unused-import
@@ -93,7 +93,7 @@ class ChatControl(ChatControlBase):
JINGLE_STATE_ERROR
) = range(5)
- TYPE_ID = message_control.TYPE_CHAT
+ _type = ControlType.CHAT
old_msg_kind = None # last kind of the printed message
# Set a command host to bound to. Every command given through a chat will be
@@ -102,7 +102,6 @@ class ChatControl(ChatControlBase):
def __init__(self, parent_win, contact, acct, session, resource=None):
ChatControlBase.__init__(self,
- self.TYPE_ID,
parent_win,
'chat_control',
contact,
@@ -204,7 +203,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None):
self.xml.encryption_menu.set_menu_model(
gui_menu_builder.get_encryption_menu(
- self.control_id, self.type_id, self.account == 'Local'))
+ self.control_id, self._type, self.account == 'Local'))
self.set_encryption_menu_icon()
# restore previous conversation
self.restore_conversation()
@@ -228,7 +227,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None):
('zeroconf-error', ged.GUI1, self._on_zeroconf_error),
]
- if self.TYPE_ID == message_control.TYPE_CHAT:
+ if self._type.is_chat:
# Dont connect this when PrivateChatControl is used
self._event_handlers.append(('update-roster-avatar', ged.GUI1, self._nec_update_avatar))
# pylint: enable=line-too-long
@@ -666,7 +665,7 @@ def draw_banner_text(self):
name = contact.get_shown_name()
if self.resource:
name += '/' + self.resource
- if self.TYPE_ID == message_control.TYPE_PM:
+ if self._type.is_privatechat:
name = i18n.direction_mark + _(
'%(nickname)s from group chat %(room_name)s') % \
{'nickname': name, 'room_name': self.room_name}
@@ -699,7 +698,7 @@ def draw_banner_text(self):
status_reduced = ''
status_escaped = GLib.markup_escape_text(status_reduced)
- if self.TYPE_ID == 'pm':
+ if self._type.is_privatechat:
cs = self.gc_contact.chatstate
else:
cs = app.contacts.get_combined_chatstate(
@@ -973,7 +972,7 @@ def get_tab_label(self):
else:
jid = self.contact.jid
num_unread = len(app.events.get_events(
- self.account, jid, ['printed_' + self.type_id, self.type_id]))
+ self.account, jid, ['printed_%s' % self._type, str(self._type)]))
if num_unread == 1 and not app.config.get('show_unread_tab_icon'):
unread = '*'
elif num_unread > 1:
@@ -1002,7 +1001,9 @@ def get_tab_image(self, count_unread=True):
if count_unread:
num_unread = len(app.events.get_events(
- self.account, jid, ['printed_' + self.type_id, self.type_id]))
+ self.account,
+ jid,
+ ['printed_%s' % self._type, str(self._type)]))
else:
num_unread = 0
@@ -1068,7 +1069,7 @@ def shutdown(self):
app.events.remove_events(
self.account,
self.get_full_jid(),
- types=['printed_' + self.type_id, self.type_id])
+ types=['printed_%s' % self._type, str(self._type)])
# Remove contact instance if contact has been removed
key = (self.contact.jid, self.account)
roster = app.interface.roster
@@ -1122,7 +1123,7 @@ def _nec_chatstate_received(self, event):
if event.account != self.account:
return
- if self.TYPE_ID == 'pm':
+ if self._type.is_privatechat:
if event.contact != self.gc_contact:
return
else:
@@ -1142,9 +1143,9 @@ def _nec_chatstate_received(self, event):
def _nec_caps_received(self, obj):
if obj.conn.name != self.account:
return
- if self.TYPE_ID == 'chat' and obj.jid != self.contact.jid:
+ if self._type.is_chat and obj.jid != self.contact.jid:
return
- if self.TYPE_ID == 'pm' and obj.fjid != self.contact.jid:
+ if self._type.is_privatechat and obj.fjid != self.contact.jid:
return
self.update_ui()
@@ -1185,7 +1186,7 @@ def _on_drag_data_received(self, widget, context, x, y, selection,
return
# get contact info (check for PM = private chat)
- if self.TYPE_ID == message_control.TYPE_PM:
+ if self._type.is_privatechat:
contact = self.gc_contact.as_contact()
else:
contact = self.contact
@@ -1287,7 +1288,7 @@ def read_queue(self):
# list of message ids which should be marked as read
message_ids = []
for event in events:
- if event.type_ != self.type_id:
+ if event.type_ != str(self._type):
continue
kind = 'print_queue'
if event.sent_forwarded:
@@ -1309,7 +1310,7 @@ def read_queue(self):
app.logger.set_read_messages(message_ids)
app.events.remove_events(self.account,
jid_with_resource,
- types=[self.type_id])
+ types=[str(self._type)])
typ = 'chat' # Is it a normal chat or a pm ?
@@ -1318,7 +1319,7 @@ def read_queue(self):
room_jid, nick = app.get_room_and_nick_from_fjid(jid)
control = app.interface.msg_win_mgr.get_gc_control(room_jid,
self.account)
- if control and control.type_id == message_control.TYPE_GC:
+ if control and control.is_groupchat:
control.update_ui()
control.parent_win.show_title()
typ = 'pm'
diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py
index f63cb2de504236bbcef63a508860619f8d46de05..c75ddec8d6ab4a388b157311d83bbb56c6ef8195 100644
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -45,7 +45,6 @@
from gajim.common.const import Chatstate
from gajim import gtkgui_helpers
-from gajim import message_control
from gajim.message_control import MessageControl
from gajim.conversation_textview import ConversationTextview
@@ -60,6 +59,7 @@
from gajim.gtk.util import get_show_in_roster
from gajim.gtk.util import get_show_in_systray
from gajim.gtk.util import get_hardware_key_codes
+from gajim.gtk.const import ControlType # pylint: disable=unused-import
from gajim.gtk.emoji_chooser import emoji_chooser
from gajim.command_system.implementation.middleware import ChatCommandProcessor
@@ -90,8 +90,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
# So we match hardware keycodes instead of keyvals.
# Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c.
keycodes_c = get_hardware_key_codes(Gdk.KEY_c)
+ _type = None # type: ControlType
- def __init__(self, type_id, parent_win, widget_name, contact, acct,
+ def __init__(self, parent_win, widget_name, contact, acct,
resource=None):
# Undo needs this variable to know if space has been pressed.
# Initialize it to True so empty textview is saved in undo list
@@ -105,10 +106,15 @@ def __init__(self, type_id, parent_win, widget_name, contact, acct,
if _contact and not isinstance(_contact, GC_Contact):
contact = _contact
- MessageControl.__init__(self, type_id, parent_win, widget_name,
- contact, acct, resource=resource)
+ MessageControl.__init__(self,
+ self._type,
+ parent_win,
+ widget_name,
+ contact,
+ acct,
+ resource=resource)
- if self.TYPE_ID != message_control.TYPE_GC:
+ if not self._type.is_groupchat:
# Create banner and connect signals
id_ = self.xml.banner_eventbox.connect(
'button-press-event',
@@ -266,14 +272,30 @@ def __init__(self, type_id, parent_win, widget_name, contact, acct,
# to properly use the super, because of the old code.
CommandTools.__init__(self)
+ @property
+ def type(self):
+ return self._type
+
+ @property
+ def is_chat(self):
+ return self._type.is_chat
+
+ @property
+ def is_privatechat(self):
+ return self._type.is_privatechat
+
+ @property
+ def is_groupchat(self):
+ return self._type.is_groupchat
+
def get_nb_unread(self):
jid = self.contact.jid
if self.resource:
jid += '/' + self.resource
- type_ = self.type_id
- return len(app.events.get_events(self.account,
- jid,
- ['printed_' + type_, type_]))
+ return len(app.events.get_events(
+ self.account,
+ jid,
+ ['printed_%s' % self._type, str(self._type)]))
def draw_banner(self):
"""
@@ -330,7 +352,7 @@ def _nec_our_status(self, obj):
self.got_disconnected()
else:
# Other code rejoins all GCs, so we don't do it here
- if not self.type_id == message_control.TYPE_GC:
+ if not self._type.is_groupchat:
self.got_connected()
if self.parent_win:
self.parent_win.redraw_tab(self)
@@ -350,7 +372,7 @@ def setup_seclabel(self):
self.xml.label_selector.add_attribute(cell, 'text', 0)
con = app.connections[self.account]
jid = self.contact.jid
- if self.TYPE_ID == 'pm':
+ if self._type.is_privatechat:
jid = self.gc_contact.room_jid
if con.get_module('SecLabels').supported:
con.get_module('SecLabels').request_catalog(jid)
@@ -360,7 +382,7 @@ def _sec_labels_received(self, event):
return
jid = self.contact.jid
- if self.TYPE_ID == 'pm':
+ if self._type.is_privatechat:
jid = self.gc_contact.room_jid
if event.jid != jid:
@@ -531,7 +553,7 @@ def set_speller(self):
def get_speller_language(self):
per_type = 'contacts'
- if self.type_id == 'gc':
+ if self._type.is_groupchat:
per_type = 'rooms'
lang = app.config.get_per(
per_type, self.contact.jid, 'speller_language')
@@ -548,7 +570,7 @@ def get_speller_language(self):
def on_language_changed(self, checker, _param):
gspell_lang = checker.get_language()
per_type = 'contacts'
- if self.type_id == message_control.TYPE_GC:
+ if self._type.is_groupchat:
per_type = 'rooms'
if not app.config.get_per(per_type, self.contact.jid):
app.config.add_per(per_type, self.contact.jid)
@@ -676,7 +698,7 @@ def _paste_event_confirmed(self, is_checked, image):
'send-file-httpupload-%s' % self.control_id)
jingle = win.lookup_action('send-file-jingle-%s' % self.control_id)
- if self.type_id == message_control.TYPE_GC:
+ if self._type.is_groupchat:
# groupchat only supports httpupload on drag and drop
if httpupload.get_enabled():
# use httpupload
@@ -856,7 +878,7 @@ def drag_data_file_transfer(self, contact, selection, _widget):
path = helpers.get_file_path_from_dnd_dropped_uri(uri)
if not os.path.isfile(path): # is it a file?
continue
- if self.type_id == message_control.TYPE_GC:
+ if self._type.is_groupchat:
# groupchat only supports httpupload on drag and drop
if httpupload.get_enabled():
# use httpupload
@@ -885,7 +907,7 @@ def get_seclabel(self):
con = app.connections[self.account]
jid = self.contact.jid
- if self.TYPE_ID == 'pm':
+ if self._type.is_privatechat:
jid = self.gc_contact.room_jid
catalog = con.get_module('SecLabels').get_catalog(jid)
labels, label_list, _ = catalog
@@ -1066,9 +1088,9 @@ def add_message(self,
return
if kind == 'incoming':
- if not self.type_id == message_control.TYPE_GC or \
- app.config.notify_for_muc(jid) or \
- 'marked' in other_tags_for_text:
+ if (not self._type.is_groupchat or
+ app.config.notify_for_muc(jid) or
+ 'marked' in other_tags_for_text):
# it's a normal message, or a muc message with want to be
# notified about if quitting just after
# other_tags_for_text == ['marked'] --> highlighted gc message
@@ -1080,7 +1102,7 @@ def add_message(self,
if kind in ('incoming', 'incoming_queue', 'error'):
gc_message = False
- if self.type_id == message_control.TYPE_GC:
+ if self._type.is_groupchat:
gc_message = True
if ((self.parent_win and (not self.parent_win.get_active_control() or \
@@ -1098,7 +1120,7 @@ def add_message(self,
event_type = events.PrintedGcMsgEvent
event = 'gc_message_received'
else:
- if self.type_id == message_control.TYPE_CHAT:
+ if self._type.is_chat:
event_type = events.PrintedChatEvent
else:
event_type = events.PrintedPmEvent
@@ -1217,7 +1239,7 @@ def _on_ok(_contact):
app.interface.instances['file_transfers'].show_file_send_request(
self.account, _contact)
- if self.type_id == message_control.TYPE_PM:
+ if self._type.is_privatechat:
gc_contact = self.gc_contact
if not gc_contact:
@@ -1262,8 +1284,8 @@ def set_control_active(self, state):
jid = self.contact.jid
if self.conv_textview.autoscroll:
# we are at the end
- type_ = ['printed_' + self.type_id]
- if self.type_id == message_control.TYPE_GC:
+ type_ = ['printed_%s' % self._type]
+ if self._type.is_groupchat:
type_ = ['printed_gc_msg', 'printed_marked_gc_msg']
if not app.events.remove_events(self.account,
self.get_full_jid(),
@@ -1296,12 +1318,10 @@ def _on_edge_reached(self, _scrolledwindow, pos):
else:
jid = self.contact.jid
types_list = []
- type_ = self.type_id
- if type_ == message_control.TYPE_GC:
- type_ = 'gc_msg'
- types_list = ['printed_' + type_, type_, 'printed_marked_gc_msg']
+ if self._type.is_groupchat:
+ types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg']
else: # Not a GC
- types_list = ['printed_' + type_, type_]
+ types_list = ['printed_%s' % self._type, str(self._type)]
if not app.events.get_events(self.account, jid, types_list):
return
@@ -1381,7 +1401,7 @@ def redraw_after_event_removed(self, jid):
self.parent_win.redraw_tab(self)
self.parent_win.show_title()
# TODO : get the contact and check get_show_in_roster()
- if self.type_id == message_control.TYPE_PM:
+ if self._type.is_privatechat:
room_jid, nick = app.get_room_and_nick_from_fjid(jid)
groupchat_control = app.interface.msg_win_mgr.get_gc_control(
room_jid, self.account)
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 0521976feac9bc1617ddbb9cd10dd3d8b70c2b21..4379b91154f314b089f94acdb1cceadeee9f6d07 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -43,7 +43,6 @@
from gajim import gtkgui_helpers
from gajim import gui_menu_builder
-from gajim import message_control
from gajim import vcard
from gajim.common import events
@@ -76,21 +75,26 @@
from gajim.gtk.groupchat_roster import GroupchatRoster
from gajim.gtk.util import NickCompletionGenerator
from gajim.gtk.util import get_icon_name
+from gajim.gtk.const import ControlType
log = logging.getLogger('gajim.groupchat_control')
class GroupchatControl(ChatControlBase):
- TYPE_ID = message_control.TYPE_GC
+
+ _type = ControlType.GROUPCHAT
# Set a command host to bound to. Every command given through a group chat
# will be processed with this command host.
COMMAND_HOST = GroupChatCommands
def __init__(self, parent_win, contact, muc_data, acct):
- ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
- 'groupchat_control', contact, acct)
+ ChatControlBase.__init__(self,
+ parent_win,
+ 'groupchat_control',
+ contact,
+ acct)
self.force_non_minimizable = False
self.is_anonymous = True
@@ -151,7 +155,7 @@ def __init__(self, parent_win, contact, muc_data, acct):
self.set_lock_image()
self.xml.encryption_menu.set_menu_model(
- gui_menu_builder.get_encryption_menu(self.control_id, self.type_id))
+ gui_menu_builder.get_encryption_menu(self.control_id, self._type))
self.set_encryption_menu_icon()
# Banner
diff --git a/gajim/gtk/const.py b/gajim/gtk/const.py
index 2a01460c5ce4be6ea06207e6223baa0e92388f5e..de966be23e2cb673f479630202d30fe2e7666044 100644
--- a/gajim/gtk/const.py
+++ b/gajim/gtk/const.py
@@ -69,6 +69,27 @@ class SettingType(IntEnum):
DIALOG = 4
+class ControlType(Enum):
+ CHAT = 'chat'
+ GROUPCHAT = 'gc'
+ PRIVATECHAT = 'pm'
+
+ @property
+ def is_chat(self):
+ return self == ControlType.CHAT
+
+ @property
+ def is_groupchat(self):
+ return self == ControlType.GROUPCHAT
+
+ @property
+ def is_privatechat(self):
+ return self == ControlType.PRIVATECHAT
+
+ def __str__(self):
+ return self.value
+
+
SHOW_COLORS = {
'online': (102/255, 191/255, 16/255),
'offline': (154/255, 154/255, 154/255),
diff --git a/gajim/gtk/preferences.py b/gajim/gtk/preferences.py
index 070e5118ab2c49bb18a2c206bd5bcf8ebcc6dd01..bc23140d7b30952c7f79d0905f6521c949d31294 100644
--- a/gajim/gtk/preferences.py
+++ b/gajim/gtk/preferences.py
@@ -28,8 +28,6 @@
from gajim.common.i18n import ngettext
from gajim.common.helpers import open_file
-from gajim import message_control
-
from gajim.chat_control_base import ChatControlBase
from gajim.gtk.util import get_builder
@@ -40,6 +38,7 @@
from gajim.gtk.advanced_config import AdvancedConfig
from gajim.gtk.proxies import ManageProxies
from gajim.gtk.sounds import ManageSounds
+from gajim.gtk.const import ControlType
try:
from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager
@@ -563,7 +562,7 @@ def _get_all_controls(self):
def _get_all_muc_controls(self):
for ctrl in app.interface.msg_win_mgr.get_controls(
- message_control.TYPE_GC):
+ ControlType.GROUPCHAT):
yield ctrl
for account in app.connections:
for ctrl in app.interface.minimized_controls[account].values():
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 5b2f73d9b9e7c0a2454ad6c404b86aa4b1a30169..2e620b54940d3de18440a0ab44b5756a7199e26f 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -55,7 +55,6 @@
from gajim import gui_menu_builder
from gajim import dialogs
-from gajim import message_control
from gajim.dialog_messages import get_dialog
from gajim.chat_control_base import ChatControlBase
@@ -112,6 +111,7 @@
from gajim.gtk.ssl_error_dialog import SSLErrorDialog
from gajim.gtk.util import get_show_in_roster
from gajim.gtk.util import get_show_in_systray
+from gajim.gtk.const import ControlType
parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE'))
@@ -191,7 +191,7 @@ def _response(account, answer):
def handle_event_iq_error(self, event):
ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(),
event.account)
- if ctrl and ctrl.type_id == message_control.TYPE_GC:
+ if ctrl and ctrl.is_groupchat:
ctrl.add_info_message('Error: %s' % event.properties.error)
@staticmethod
@@ -860,14 +860,13 @@ def send_httpupload(self, chat_control):
@staticmethod
def on_file_dialog_ok(chat_control, paths):
con = app.connections[chat_control.account]
- groupchat = chat_control.type_id == message_control.TYPE_GC
for path in paths:
con.get_module('HTTPUpload').check_file_before_transfer(
path,
chat_control.encryption,
chat_control.contact,
chat_control.session,
- groupchat)
+ chat_control.is_groupchat)
def encrypt_file(self, file, account, callback):
app.nec.push_incoming_event(HTTPUploadProgressEvent(
@@ -1426,7 +1425,7 @@ def create_groupchat_control(self, account, room_jid, muc_data,
if not mw:
mw = self.msg_win_mgr.create_window(contact,
account,
- GroupchatControl.TYPE_ID)
+ ControlType.GROUPCHAT)
control = GroupchatControl(mw, contact, muc_data, account)
mw.new_tab(control)
mw.set_active_tab(control)
@@ -1498,8 +1497,8 @@ def new_private_chat(self, gc_contact, account, session=None):
message_window = self.msg_win_mgr.get_window(
gc_contact.get_full_jid(), account)
if not message_window:
- message_window = self.msg_win_mgr.create_window(contact,
- account, message_control.TYPE_PM)
+ message_window = self.msg_win_mgr.create_window(
+ contact, account, ControlType.PRIVATECHAT)
session.control = PrivateChatControl(message_window, gc_contact,
contact, account, session)
@@ -1513,16 +1512,14 @@ def new_private_chat(self, gc_contact, account, session=None):
def new_chat(self, contact, account, resource=None, session=None):
# Get target window, create a control, and associate it with the window
- type_ = message_control.TYPE_CHAT
-
fjid = contact.jid
if resource:
fjid += '/' + resource
mw = self.msg_win_mgr.get_window(fjid, account)
if not mw:
- mw = self.msg_win_mgr.create_window(contact, account, type_,
- resource)
+ mw = self.msg_win_mgr.create_window(
+ contact, account, ControlType.CHAT, resource)
chat_control = ChatControl(mw, contact, account, session, resource)
@@ -1898,7 +1895,7 @@ def is_pm_contact(self, fjid, account):
bare_jid in self.minimized_controls[account]:
gc_ctrl = self.minimized_controls[account][bare_jid]
- return gc_ctrl and gc_ctrl.type_id == message_control.TYPE_GC
+ return gc_ctrl and gc_ctrl.is_groupchat
@staticmethod
def create_ipython_window():
diff --git a/gajim/gui_menu_builder.py b/gajim/gui_menu_builder.py
index 04e2f01f55011cdf44ea840a222f35a3983b9f6f..57873dfdccc390061d02ec89e24319c85be3946f 100644
--- a/gajim/gui_menu_builder.py
+++ b/gajim/gui_menu_builder.py
@@ -19,7 +19,6 @@
from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE
from gajim import gtkgui_helpers
-from gajim import message_control
from gajim.common import app
from gajim.common import helpers
from gajim.common.helpers import is_affiliation_change_allowed
@@ -30,6 +29,7 @@
from gajim.common.const import URIAction
from gajim.gtk.util import get_builder
+from gajim.gtk.const import ControlType
def build_resources_submenu(contacts, account, action, room_jid=None,
@@ -97,7 +97,7 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=None,
minimized_controls += \
list(app.interface.minimized_controls[account].values())
for gc_control in app.interface.msg_win_mgr.get_controls(
- message_control.TYPE_GC) + minimized_controls:
+ ControlType.GROUPCHAT) + minimized_controls:
acct = gc_control.account
if acct not in connected_accounts:
continue
@@ -748,15 +748,15 @@ def build_accounts_menu():
menubar.insert_submenu(menu_position, _('Accounts'), acc_menu)
-def get_encryption_menu(control_id, type_id, zeroconf=False):
+def get_encryption_menu(control_id, control_type, zeroconf=False):
menu = Gio.Menu()
menu.append(
'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled'))
for name, plugin in app.plugin_manager.encryption_plugins.items():
- if type_id == 'gc':
+ if control_type.is_groupchat:
if not hasattr(plugin, 'allow_groupchat'):
continue
- if type_id == 'pm':
+ if control_type.is_privatechat:
if not hasattr(plugin, 'allow_privatechat'):
continue
if zeroconf:
diff --git a/gajim/message_control.py b/gajim/message_control.py
index 849cac53eb777fd0ea1c1162b17ae2e38a988f8f..90d27cd2bb8cf207acca7f17e1bc585374c13245 100644
--- a/gajim/message_control.py
+++ b/gajim/message_control.py
@@ -30,12 +30,6 @@
from gajim.gtk.util import get_builder
-# Derived types MUST register their type IDs here if custom behavor is required
-TYPE_CHAT = 'chat'
-TYPE_GC = 'gc'
-TYPE_PM = 'pm'
-
-####################
class MessageControl:
"""
@@ -43,12 +37,17 @@ class MessageControl:
MessageWindow
"""
- def __init__(self, type_id, parent_win, widget_name, contact, account,
- resource=None):
+ def __init__(self,
+ control_type,
+ parent_win,
+ widget_name,
+ contact,
+ account,
+ resource=None):
# dict { cb id : widget}
# keep all registered callbacks of widgets, created by self.xml
+ self.__control_type = control_type
self.handlers = {}
- self.type_id = type_id
self.parent_win = parent_win
self.widget_name = widget_name
self.contact = contact
@@ -220,7 +219,7 @@ def _nec_message_outgoing(self, obj):
obj.jid += '/' + self.resource
if not sess:
- if self.type_id == TYPE_PM:
+ if self.__control_type.is_privatechat:
sess = conn.make_new_session(obj.jid, type_='pm')
else:
sess = conn.make_new_session(obj.jid)
diff --git a/gajim/message_window.py b/gajim/message_window.py
index cb5f07c6a7b1511c6e8cec0f5bb33229fefe48cb..95d27f9324b85fee1c97ecc9ba01aeb8f60d82d2 100644
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -38,7 +38,6 @@
from gajim.common.i18n import _
from gajim import gtkgui_helpers
-from gajim import message_control
from gajim.chat_control_base import ChatControlBase
from gajim.chat_control import ChatControl
@@ -50,6 +49,7 @@
from gajim.gtk.util import get_app_icon_list
from gajim.gtk.util import get_builder
from gajim.gtk.util import set_urgency_hint
+from gajim.gtk.const import ControlType
log = logging.getLogger('gajim.message_window')
@@ -320,7 +320,7 @@ def _on_window_focus(self, widget, event):
if ctrl:
ctrl.set_control_active(True)
# Undo "unread" state display, etc.
- if ctrl.type_id == message_control.TYPE_GC:
+ if ctrl.is_groupchat:
self.redraw_tab(ctrl, 'active')
else:
# NOTE: we do not send any chatstate to preserve
@@ -488,9 +488,9 @@ def show_title(self, urgent=True, control=None):
return
unread = 0
for ctrl in self.controls():
- if (ctrl.type_id == message_control.TYPE_GC and not
- app.config.notify_for_muc(ctrl.room_jid) and not
- ctrl.attention_flag):
+ if (ctrl.is_groupchat and
+ not app.config.notify_for_muc(ctrl.room_jid) and
+ not ctrl.attention_flag):
# count only pm messages
unread += ctrl.get_nb_unread_pm()
continue
@@ -504,7 +504,7 @@ def show_title(self, urgent=True, control=None):
else:
urgent = False
- if control.type_id == message_control.TYPE_GC:
+ if control.is_groupchat:
name = control.contact.get_shown_name()
urgent = (control.attention_flag or
app.config.notify_for_muc(control.room_jid))
@@ -1012,6 +1012,7 @@ def _mode_to_key(self, contact, acct, type_, resource=None):
return type_
def create_window(self, contact, acct, type_, resource=None):
+ type_ = str(type_)
win_acct = None
win_type = None
win_role = None # X11 window role
@@ -1097,7 +1098,7 @@ def search_control(self, jid, account, resource=None):
win = self.get_window(jid, account)
if win:
ctrl = win.get_control(jid, account)
- if not ctrl.resource and ctrl.type_id != message_control.TYPE_GC:
+ if not ctrl.resource and not ctrl.is_groupchat:
return ctrl
return None
@@ -1107,7 +1108,7 @@ def get_gc_control(self, jid, acct):
some day in the future?
"""
ctrl = self.get_control(jid, acct)
- if ctrl and ctrl.type_id == message_control.TYPE_GC:
+ if ctrl and ctrl.is_groupchat:
return ctrl
return None
@@ -1116,7 +1117,7 @@ def get_controls(self, type_=None, acct=None):
for c in self.controls():
if acct and c.account != acct:
continue
- if not type_ or c.type_id == type_:
+ if not type_ or c.type == type_:
ctrls.append(c)
return ctrls
@@ -1238,8 +1239,7 @@ def reconfig(self):
for ctrl in controls:
mw = self.get_window(ctrl.contact.jid, ctrl.account)
if not mw:
- mw = self.create_window(ctrl.contact, ctrl.account,
- ctrl.type_id)
+ mw = self.create_window(ctrl.contact, ctrl.account, ctrl.type)
ctrl.parent_win = mw
ctrl.add_actions()
ctrl.update_actions()
@@ -1251,7 +1251,7 @@ def save_opened_controls(self):
chat_controls = {}
for acct in app.connections:
chat_controls[acct] = []
- for ctrl in self.get_controls(type_=message_control.TYPE_CHAT):
+ for ctrl in self.get_controls(type_=ControlType.CHAT):
acct = ctrl.account
if ctrl.contact.jid not in chat_controls[acct]:
chat_controls[acct].append(ctrl.contact.jid)
diff --git a/gajim/privatechat_control.py b/gajim/privatechat_control.py
index 32219e07792b3a3b11f761a804633b817e33e903..ad1b3d145c092536a03d9c3249038d70d4648bfa 100644
--- a/gajim/privatechat_control.py
+++ b/gajim/privatechat_control.py
@@ -24,8 +24,6 @@
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-from gajim import message_control
-
from gajim.common import app
from gajim.common import helpers
from gajim.common import ged
@@ -37,10 +35,12 @@
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.util import get_icon_name
+from gajim.gtk.const import ControlType
class PrivateChatControl(ChatControl):
- TYPE_ID = message_control.TYPE_PM
+
+ _type = ControlType.PRIVATECHAT
# Set a command host to bound to. Every command given through a private chat
# will be processed with this command host.
@@ -55,7 +55,6 @@ def __init__(self, parent_win, gc_contact, contact, account, session):
self.gc_contact = gc_contact
ChatControl.__init__(self, parent_win, contact, account, session)
- self.TYPE_ID = 'pm'
# pylint: disable=line-too-long
self.__event_handlers = [
@@ -250,7 +249,9 @@ def get_tab_image(self, count_unread=True):
if count_unread:
num_unread = len(app.events.get_events(
- self.account, jid, ['printed_' + self.type_id, self.type_id]))
+ self.account,
+ jid,
+ ['printed_%s' % self._type, str(self._type)]))
else:
num_unread = 0
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 22763e4600491b10bd18b6980c4c72156c51d034..dd5ee79eafcdd2a508a7cf2733ee3efbf21417b0 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -51,7 +51,6 @@
from gajim import vcard
from gajim import gtkgui_helpers
from gajim import gui_menu_builder
-from gajim import message_control
from gajim.common import app
from gajim.common import helpers
@@ -2151,7 +2150,7 @@ def chg_contact_status(self, contact, show, status, account):
# print status in chat window and update status/GPG image
ctrl = app.interface.msg_win_mgr.get_control(contact.jid, account)
- if ctrl and ctrl.type_id != message_control.TYPE_GC:
+ if ctrl and not ctrl.is_groupchat:
ctrl.contact = app.contacts.get_contact_with_highest_priority(
account, contact.jid)
ctrl.update_status_display(name, uf_show, status)
@@ -3031,8 +3030,8 @@ def on_groupchat_maximized(self, widget, jid, account):
ctrl = app.interface.minimized_controls[account][jid]
mw = app.interface.msg_win_mgr.get_window(jid, account)
if not mw:
- mw = app.interface.msg_win_mgr.create_window(ctrl.contact,
- ctrl.account, ctrl.type_id)
+ mw = app.interface.msg_win_mgr.create_window(
+ ctrl.contact, ctrl.account, ctrl.type)
id_ = mw.window.connect('motion-notify-event',
ctrl._on_window_motion_notify)
ctrl.handlers[id_] = mw.window