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

Move AdvancedConfig to gtk module

This commit is contained in:
Philipp Hörist 2018-09-27 00:03:50 +02:00
parent 075069d37a
commit 6bf94f15d7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gajim/advanced_configuration_window.py → gajim/gtk/advanced_config.py
View File

@ -22,15 +22,17 @@
from enum import IntEnum, unique from enum import IntEnum, unique
from gi.repository import Gtk from gi.repository import Gtk
from gajim import gtkgui_helpers
from gi.repository import GLib from gi.repository import GLib
from gi.repository import Pango from gi.repository import Pango
from gajim.common import app from gajim.common import app
from gajim.gtk.util import get_builder
@unique @unique
class Column(IntEnum): class Column(IntEnum):
PREFERENCE_NAME = 0 NAME = 0
VALUE = 1 VALUE = 1
TYPE = 2 TYPE = 2
@ -64,9 +66,9 @@ def tree_model_pre_order(model, treeiter):
yield it yield it
class AdvancedConfigurationWindow: class AdvancedConfig:
def __init__(self, transient): def __init__(self, transient):
self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui') self.xml = get_builder('advanced_configuration_window.ui')
self.window = self.xml.get_object('advanced_configuration_window') self.window = self.xml.get_object('advanced_configuration_window')
self.window.set_transient_for(transient) self.window.set_transient_for(transient)
self.entry = self.xml.get_object('advanced_entry') self.entry = self.xml.get_object('advanced_entry')
@ -132,7 +134,7 @@ class AdvancedConfigurationWindow:
Check if it's boolean or holds password stuff and if yes make the Check if it's boolean or holds password stuff and if yes make the
cellrenderertext not editable, else - it's editable cellrenderertext not editable, else - it's editable
""" """
optname = model[iter_][Column.PREFERENCE_NAME] optname = model[iter_][Column.NAME]
opttype = model[iter_][Column.TYPE] opttype = model[iter_][Column.TYPE]
if opttype == self.types['boolean'] or optname == 'password': if opttype == self.types['boolean'] or optname == 'password':
cell.set_property('editable', False) cell.set_property('editable', False)
@ -319,7 +321,7 @@ class AdvancedConfigurationWindow:
desc = app.config.get_desc_per(opt_path[2], opt_path[0]) desc = app.config.get_desc_per(opt_path[2], opt_path[0])
elif len(opt_path) == 1: elif len(opt_path) == 1:
desc = app.config.get_desc(opt_path[0]) desc = app.config.get_desc(opt_path[0])
if search_string in model[it][Column.PREFERENCE_NAME] or (desc and \ if search_string in model[it][Column.NAME] or (desc and \
search_string in desc.lower()): search_string in desc.lower()):
return True return True
return False return False

5
gajim/gtk/preferences.py
View File

@ -25,7 +25,6 @@ from gajim.common import configpaths
from gajim.common import config as c_config from gajim.common import config as c_config
from gajim.common import idle from gajim.common import idle
from gajim.advanced_configuration_window import AdvancedConfigurationWindow
from gajim.chat_control_base import ChatControlBase from gajim.chat_control_base import ChatControlBase
from gajim.config import ManageProxiesWindow, ManageSoundsWindow from gajim.config import ManageProxiesWindow, ManageSoundsWindow
from gajim import message_control from gajim import message_control
@ -35,6 +34,7 @@ from gajim import gtkgui_helpers
from gajim.gtk.util import get_builder from gajim.gtk.util import get_builder
from gajim.gtk.dialogs import AspellDictError from gajim.gtk.dialogs import AspellDictError
from gajim.gtk.themes import Themes from gajim.gtk.themes import Themes
from gajim.gtk.advanced_config import AdvancedConfig
try: try:
from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager
@ -1011,8 +1011,7 @@ class Preferences(Gtk.ApplicationWindow):
if 'advanced_config' in app.interface.instances: if 'advanced_config' in app.interface.instances:
app.interface.instances['advanced_config'].window.present() app.interface.instances['advanced_config'].window.present()
else: else:
app.interface.instances['advanced_config'] = \ app.interface.instances['advanced_config'] = AdvancedConfig(self)
AdvancedConfigurationWindow(self)
def on_enable_logging_toggled(self, widget): def on_enable_logging_toggled(self, widget):
app.set_win_debug_mode(widget.get_active()) app.set_win_debug_mode(widget.get_active())