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

Merge branch 'split-chat-control-base' into 'master' 

Split ChatControlBase into its own file

See merge request !21
This commit is contained in:
Philipp Hörist 2017-01-05 00:05:39 +01:00
parent 4afdba2874 80221afc2c
commit 09c82c319a
6 changed files with 1305 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1258
src/chat_control.py
View File

File diff suppressed because it is too large Load Diff

1298
src/chat_control_base.py Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/config.py
View File

@ -45,7 +45,7 @@ import gtkgui_helpers
import dialogs import dialogs
import cell_renderer_image import cell_renderer_image
import message_control import message_control
import chat_control from chat_control_base import ChatControlBase
import dataforms_widget import dataforms_widget
import profile_window import profile_window
@ -690,7 +690,7 @@ class PreferencesWindow:
def apply_speller(self): def apply_speller(self):
for ctrl in self._get_all_controls(): for ctrl in self._get_all_controls():
if isinstance(ctrl, chat_control.ChatControlBase): if isinstance(ctrl, ChatControlBase):
try: try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
except (TypeError, RuntimeError, OSError): except (TypeError, RuntimeError, OSError):
@ -701,7 +701,7 @@ class PreferencesWindow:
def remove_speller(self): def remove_speller(self):
for ctrl in self._get_all_controls(): for ctrl in self._get_all_controls():
if isinstance(ctrl, chat_control.ChatControlBase): if isinstance(ctrl, ChatControlBase):
try: try:
spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
except (TypeError, RuntimeError): except (TypeError, RuntimeError):

2
src/groupchat_control.py
View File

@ -54,7 +54,7 @@ from common import ged
from common import i18n from common import i18n
from chat_control import ChatControl from chat_control import ChatControl
from chat_control import ChatControlBase from chat_control_base import ChatControlBase
from common.exceptions import GajimGeneralException from common.exceptions import GajimGeneralException
from command_system.implementation.hosts import PrivateChatCommands from command_system.implementation.hosts import PrivateChatCommands

2
src/gui_interface.py
View File

@ -61,7 +61,7 @@ import dialogs
import notify import notify
import message_control import message_control
from chat_control import ChatControlBase from chat_control_base import ChatControlBase
from chat_control import ChatControl from chat_control import ChatControl
from groupchat_control import GroupchatControl from groupchat_control import GroupchatControl
from groupchat_control import PrivateChatControl from groupchat_control import PrivateChatControl

2
src/message_window.py
View File

@ -38,7 +38,7 @@ import common
import gtkgui_helpers import gtkgui_helpers
import message_control import message_control
import dialogs import dialogs
from chat_control import ChatControlBase from chat_control_base import ChatControlBase
from common import gajim from common import gajim