Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 5 commits: HistoryManager: Refactor code
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e958755a by Philipp Hörist at 2018-10-28T21:42:02Z HistoryManager: Refactor code - Use get_builder - Add get_app_icon_list() to gtk.util - - - - - a6d9b2c1 by Philipp Hörist at 2018-10-28T22:01:09Z Set the Window icon correctly Set the default list after the first window has been initialized. Only set icons on Windows that are different from the default. - - - - - 3ae03a24 by Philipp Hörist at 2018-10-28T23:12:44Z Remove unused method - - - - - 7a070a58 by Philipp Hörist at 2018-10-28T23:12:48Z Use get_image_button() from gtk.util - - - - - 985fced9 by Philipp Hörist at 2018-10-28T23:12:48Z Roster: Use icon names instead of pixbufs - Use icon names for Tune and Location notifications - Use None instead of an empty pixbuf when there is no data - - - - - 8 changed files: - gajim/groupchat_control.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/message_window.py - gajim/options_dialog.py - gajim/roster_window.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -34,7 +34,6 @@ from enum import IntEnum, unique import nbxmpp from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GLib from gi.repository import Gio @@ -90,9 +89,6 @@ class Column(IntEnum): TEXT = 3 # text shown in the cellrenderer AVATAR_IMG = 4 # avatar of the contact -empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) -empty_pixbuf.fill(0xffffff00) - def cell_data_func(column, renderer, model, iter_, user_data): # Background color has to be rendered for all cells ===================================== gajim/gtk/util.py ===================================== @@ -111,6 +111,15 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, log.error('Unable to load icon %s: %s', icon_name, str(error)) +def get_app_icon_list(scale_widget): + pixbufs = [] + for size in (16, 32, 48, 64, 128): + pixbuf = load_icon('org.gajim.Gajim', scale_widget, size, pixbuf=True) + if pixbuf is not None: + pixbufs.append(pixbuf) + return pixbufs + + def get_icon_name(name: str, iconset: Optional[str] = None, transport: Optional[str] = None) -> str: @@ -237,8 +246,7 @@ def get_image_button(icon_name, tooltip, toggle=False): image = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) button.set_image(image) else: - button = Gtk.Button.new_from_icon_name( - icon_name, Gtk.IconSize.MENU) + button = Gtk.Button.new_from_icon_name(icon_name, Gtk.IconSize.MENU) button.set_tooltip_text(tooltip) return button ===================================== gajim/gtkgui_helpers.py ===================================== @@ -60,19 +60,6 @@ class Color: GREY = Gdk.RGBA(red=195/255, green=195/255, blue=192/255, alpha=1) ORANGE = Gdk.RGBA(red=245/255, green=121/255, blue=0/255, alpha=1) -def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): - try: - iconinfo = gtk_icon_theme.lookup_icon(icon_name, size, 0) - if not iconinfo: - raise GLib.GError - if color: - pixbuf, _was_symbolic = iconinfo.load_symbolic(*color) - return pixbuf - return iconinfo.load_icon() - except GLib.GError as error: - if not quiet: - log.error('Unable to load icon %s: %s', icon_name, str(error)) - HAS_PYWIN32 = True if os.name == 'nt': @@ -86,19 +73,6 @@ if os.name == 'nt': from gajim.common import helpers -def get_image_button(icon_name, tooltip, toggle=False): - if toggle: - button = Gtk.ToggleButton() - icon = get_icon_pixmap(icon_name) - image = Gtk.Image() - image.set_from_pixbuf(icon) - button.set_image(image) - else: - button = Gtk.Button.new_from_icon_name( - icon_name, Gtk.IconSize.MENU) - button.set_tooltip_text(tooltip) - return button - def get_gtk_builder(file_name, widget=None): file_path = os.path.join(configpaths.get('GUI'), file_name) @@ -417,12 +391,7 @@ def get_pep_as_pixbuf(pep_class): return pixbuf if pep_class == PEPEventType.TUNE: - icon = get_icon_pixmap('audio-x-generic', quiet=True) - if not icon: - path = os.path.join( - configpaths.get('DATA'), 'emoticons', 'static', 'music.png') - return GdkPixbuf.Pixbuf.new_from_file(path) - return icon + return 'audio-x-generic' if pep_class == PEPEventType.ACTIVITY: pep_ = pep_class.data @@ -441,10 +410,7 @@ def get_pep_as_pixbuf(pep_class): return load_activity_icon('unknown').get_pixbuf() if pep_class == PEPEventType.LOCATION: - icon = get_icon_pixmap('applications-internet', quiet=True) - if not icon: - icon = get_icon_pixmap('gajim-earth') - return icon + return 'applications-internet' return None ===================================== gajim/gui_interface.py ===================================== @@ -95,7 +95,6 @@ from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp from gajim.common.const import AvatarSize, SSLError, PEPEventType -from gajim.common.const import ACTIVITIES, MOODS from gajim import roster_window from gajim.common import ged @@ -2419,40 +2418,6 @@ class Interface: return gc_ctrl and gc_ctrl.type_id == message_control.TYPE_GC - @staticmethod - def get_pep_icon(pep_obj): - if pep_obj == PEPEventType.MOOD: - received_mood = pep_obj.data['mood'] - mood = received_mood if received_mood in MOODS else 'unknown' - return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() - - if pep_obj == PEPEventType.TUNE: - path = os.path.join( - configpaths.get('DATA'), 'emoticons', 'static', 'music.png') - return GdkPixbuf.Pixbuf.new_from_file(path) - - if pep_obj == PEPEventType.ACTIVITY: - pep_ = pep_obj.data - activity = pep_['activity'] - - has_known_activity = activity in ACTIVITIES - has_known_subactivity = (has_known_activity and - 'subactivity' in pep_ and - pep_['subactivity'] in ACTIVITIES[activity]) - - if has_known_activity: - if has_known_subactivity: - subactivity = pep_['subactivity'] - return gtkgui_helpers.load_activity_icon( - activity, subactivity).get_pixbuf() - return gtkgui_helpers.load_activity_icon(activity).get_pixbuf() - return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() - - if pep_obj == PEPEventType.LOCATION: - icon = gtkgui_helpers.get_icon_pixmap( - 'applications-internet', quiet=True) - return icon - @staticmethod def create_ipython_window(): try: @@ -2739,15 +2704,6 @@ class Interface: from gajim.gtk import statusicon self.systray = statusicon.StatusIcon() - pixs = [] - for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) - if pix: - pixs.append(pix) - if pixs: - # set the icon to all windows - Gtk.Window.set_default_icon_list(pixs) - # Init emoji_chooser from gajim.gtk.emoji_chooser import emoji_chooser emoji_chooser.load() ===================================== gajim/history_manager.py ===================================== @@ -47,6 +47,8 @@ from gajim.common import i18n from gajim.common import configpaths from gajim.common.i18n import _ from gajim.common.const import StyleAttr +from gajim.common.const import JIDConstant +from gajim.common.const import KindConstant def is_standalone(): # Determine if we are in standalone mode @@ -81,14 +83,14 @@ if is_standalone(): configpaths.init() app.load_css_config() -from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.util import convert_rgb_to_hex -from gajim import gtkgui_helpers +from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_icon_list @unique @@ -101,23 +103,16 @@ class Column(IntEnum): class HistoryManager: def __init__(self): - pixs = [] - for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) - if pix: - pixs.append(pix) - if pixs: - # set the icon to all windows - Gtk.Window.set_default_icon_list(pixs) - log_db_path = configpaths.get('LOG_DB') if not os.path.exists(log_db_path): ErrorDialog(_('Cannot find history logs database'), '%s does not exist.' % log_db_path) sys.exit() - xml = gtkgui_helpers.get_gtk_builder('history_manager.ui') + xml = get_builder('history_manager.ui') self.window = xml.get_object('history_manager_window') + Gtk.Window.set_default_icon_list(get_app_icon_list(self.window)) + self.jids_listview = xml.get_object('jids_listview') self.logs_listview = xml.get_object('logs_listview') self.search_results_listview = xml.get_object('search_results_listview') @@ -452,8 +447,7 @@ class HistoryManager: def on_listview_button_press_event(self, widget, event): if event.button == 3: # right click - xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', - 'context_menu') + xml = get_builder('history_manager.ui', ['context_menu']) if Gtk.Buildable.get_name(widget) != 'jids_listview': xml.get_object('export_menuitem').hide() xml.get_object('delete_menuitem').connect('activate', ===================================== gajim/message_window.py ===================================== @@ -44,6 +44,7 @@ from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import move_window +from gajim.gtk.util import get_app_icon_list #################### @@ -469,13 +470,11 @@ class MessageWindow: def show_icon(self): window_mode = app.interface.msg_win_mgr.mode - icon = 'org.gajim.Gajim' if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, MessageWindowMgr.ONE_MSG_WINDOW_NEVER): if self.type_ == 'gc': icon = get_icon_name('muc-active') - - self.window.set_icon_name(icon) + self.window.set_icon_name(icon) def show_title(self, urgent=True, control=None): """ @@ -963,6 +962,8 @@ class MessageWindowMgr(GObject.GObject): self.parent_win = parent_window self.parent_paned = parent_paned + Gtk.Window.set_default_icon_list(get_app_icon_list(parent_window)) + def change_account_name(self, old_name, new_name): for win in self.windows(): win.change_account_name(old_name, new_name) ===================================== gajim/options_dialog.py ===================================== @@ -8,6 +8,7 @@ from gajim.common.exceptions import GajimGeneralException from gajim import dialogs from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ChangePasswordDialog +from gajim.gtk.util import get_image_button class OptionsDialog(Gtk.ApplicationWindow): @@ -398,7 +399,7 @@ class FileChooserOption(GenericOption): button.set_filename(self.option_value) button.connect('selection-changed', self.on_select) - clear_button = gtkgui_helpers.get_image_button( + clear_button = get_image_button( 'edit-clear-all-symbolic', _('Clear File')) clear_button.connect('clicked', lambda *args: button.unselect_all()) self.option_box.pack_start(button, True, True, 0) @@ -480,7 +481,7 @@ class ProxyComboOption(GenericOption): self.combo.connect('changed', self.on_value_change) self.combo.set_valign(Gtk.Align.CENTER) - button = gtkgui_helpers.get_image_button( + button = get_image_button( 'preferences-system-symbolic', _('Manage Proxies')) button.set_action_name('app.manage-proxies') button.set_valign(Gtk.Align.CENTER) ===================================== gajim/roster_window.py ===================================== @@ -98,15 +98,12 @@ class Column(IntEnum): ACCOUNT = 4 # cellrenderer text that holds account name MOOD_PIXBUF = 5 ACTIVITY_PIXBUF = 6 - TUNE_PIXBUF = 7 - LOCATION_PIXBUF = 8 + TUNE_ICON = 7 + LOCATION_ICON = 8 AVATAR_IMG = 9 # avatar_sha PADLOCK_PIXBUF = 10 # use for account row only VISIBLE = 11 -empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) -empty_pixbuf.fill(0xffffff00) - class RosterWindow: """ @@ -1093,27 +1090,27 @@ class RosterWindow: self.model[child_iter][Column.MOOD_PIXBUF] = \ gtkgui_helpers.get_pep_as_pixbuf(pep_dict['mood']) else: - self.model[child_iter][Column.MOOD_PIXBUF] = empty_pixbuf + self.model[child_iter][Column.MOOD_PIXBUF] = None if app.config.get('show_activity_in_roster') and 'activity' in \ pep_dict: self.model[child_iter][Column.ACTIVITY_PIXBUF] = \ gtkgui_helpers.get_pep_as_pixbuf(pep_dict['activity']) else: - self.model[child_iter][Column.ACTIVITY_PIXBUF] = empty_pixbuf + self.model[child_iter][Column.ACTIVITY_PIXBUF] = None if app.config.get('show_tunes_in_roster') and 'tune' in pep_dict: - self.model[child_iter][Column.TUNE_PIXBUF] = \ + self.model[child_iter][Column.TUNE_ICON] = \ gtkgui_helpers.get_pep_as_pixbuf(pep_dict['tune']) else: - self.model[child_iter][Column.TUNE_PIXBUF] = empty_pixbuf + self.model[child_iter][Column.TUNE_ICON] = None if app.config.get('show_location_in_roster') and 'geoloc' in \ pep_dict: - self.model[child_iter][Column.LOCATION_PIXBUF] = \ + self.model[child_iter][Column.LOCATION_ICON] = \ gtkgui_helpers.get_pep_as_pixbuf(pep_dict['geoloc']) else: - self.model[child_iter][Column.LOCATION_PIXBUF] = empty_pixbuf + self.model[child_iter][Column.LOCATION_ICON] = None def _really_draw_accounts(self): for acct in self.accounts_to_draw: @@ -1392,10 +1389,11 @@ class RosterWindow: return if not contact: contact = app.contacts.get_contact(account, jid) + + pixbuf = None if pep_type in contact.pep: pixbuf = gtkgui_helpers.get_pep_as_pixbuf(contact.pep[pep_type]) - else: - pixbuf = empty_pixbuf + for child_iter in iters: self.model[child_iter][model_column] = pixbuf @@ -4817,7 +4815,7 @@ class RosterWindow: return # allocate space for the icon only if needed - if not model[titer][data] or model[titer][data] == empty_pixbuf: + if model[titer][data] is None: renderer.set_property('visible', False) else: renderer.set_property('visible', True) @@ -5658,10 +5656,10 @@ class RosterWindow: self.save_done = False # [icon, name, type, jid, account, editable, mood_pixbuf, - # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_img, + # activity_pixbuf, TUNE_ICON, LOCATION_ICON, avatar_img, # padlock_pixbuf, visible] self.columns = [Gtk.Image, str, str, str, str, - GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, + GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, str, str, Gtk.Image, str, bool] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') @@ -5765,8 +5763,8 @@ class RosterWindow: self.renderers_list = [] self.renderers_propertys = {} self._pep_type_to_model_column = {'mood': Column.MOOD_PIXBUF, - 'activity': Column.ACTIVITY_PIXBUF, 'tune': Column.TUNE_PIXBUF, - 'geoloc': Column.LOCATION_PIXBUF} + 'activity': Column.ACTIVITY_PIXBUF, 'tune': Column.TUNE_ICON, + 'geoloc': Column.LOCATION_ICON} renderer_text = Gtk.CellRendererText() self.renderers_propertys[renderer_text] = ('ellipsize', @@ -5796,12 +5794,12 @@ class RosterWindow: self._fill_pep_pixbuf_renderer, Column.ACTIVITY_PIXBUF), ('tune', Gtk.CellRendererPixbuf(), False, - 'pixbuf', Column.TUNE_PIXBUF, - self._fill_pep_pixbuf_renderer, Column.TUNE_PIXBUF), + 'icon_name', Column.TUNE_ICON, + self._fill_pep_pixbuf_renderer, Column.TUNE_ICON), ('geoloc', Gtk.CellRendererPixbuf(), False, - 'pixbuf', Column.LOCATION_PIXBUF, - self._fill_pep_pixbuf_renderer, Column.LOCATION_PIXBUF)) + 'icon_name', Column.LOCATION_ICON, + self._fill_pep_pixbuf_renderer, Column.LOCATION_ICON)) if app.config.get('avatar_position_in_roster') == 'right': add_avatar_renderer() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0e3b74da1692ed74b14b00e50f6b94dc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0e3b74da1692ed74b14b00e50f6b94dc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint errors
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e3b74da by Philipp Hörist at 2018-10-28T21:04:29Z Fix pylint errors - - - - - 5 changed files: - gajim/gtk/account_wizard.py - gajim/gtk/discovery.py - gajim/gtk/filetransfer.py - gajim/gtk/join_groupchat.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -26,7 +26,6 @@ from gajim.common import connection from gajim.common.i18n import _ from gajim.common.modules import dataforms -from gajim import gtkgui_helpers from gajim import dataforms_widget from gajim import gui_menu_builder ===================================== gajim/gtk/discovery.py ===================================== @@ -48,7 +48,6 @@ import nbxmpp from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gajim.common import app from gajim.common.i18n import _ @@ -280,7 +279,6 @@ class ServicesCache: if identities is None: identities = [] # Grab the first identity with an icon - quiet = False for identity in identities: try: cat, type_ = identity['category'], identity['type'] @@ -293,7 +291,6 @@ class ServicesCache: else: # Loop fell through, default to unknown service_name = addr.split('.')[0] - quiet = True # Or load it icon_name = 'gajim-agent-%s' % service_name ===================================== gajim/gtk/filetransfer.py ===================================== @@ -27,7 +27,6 @@ from datetime import datetime from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Pango from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -22,6 +22,7 @@ from gajim.common.i18n import _ from gajim.common.caps_cache import muc_caps_cache from gajim.common.exceptions import GajimGeneralException +from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder @@ -300,7 +301,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): else: try: # Object will add itself to the window dict - from gajim.disco import ServiceDiscoveryWindow ServiceDiscoveryWindow( self.account, jid, initial_identities=[{'category': 'conference', ===================================== gajim/gtkgui_helpers.py ===================================== @@ -30,8 +30,6 @@ import math import logging from io import BytesIO import xml.etree.ElementTree as ET -import xml.sax.saxutils -from xml.sax import ContentHandler # type: ignore from gi.repository import Gtk from gi.repository import Gdk View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e3b74da1692ed74b14b00e50f6b94dc03… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e3b74da1692ed74b14b00e50f6b94dc03… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: Move SearchWindow to gtk folder
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 88f30f92 by Philipp Hörist at 2018-10-28T16:29:12Z Move SearchWindow to gtk folder - - - - - efbd2272 by Philipp Hörist at 2018-10-28T18:34:46Z DiscoveryWindow: Use icon name instead of pixbufs - - - - - cb58fc86 by Philipp Hörist at 2018-10-28T18:38:35Z Move GroupsPostWindow into disco module - - - - - 59ccac48 by Philipp Hörist at 2018-10-28T18:41:19Z Move ServiceDiscoveryWindow to gtk folder - - - - - f4a7e2a3 by Philipp Hörist at 2018-10-28T18:45:10Z Move AtomWindow to gtk folder - - - - - dcfaba09 by Philipp Hörist at 2018-10-28T19:17:59Z PluginsWindow: Refactor code - Use get_builder - Sort imports - Use load_icon instead of get_icon_pixmap - - - - - 9ae63b6f by Philipp Hörist at 2018-10-28T19:18:33Z FiletransferWindow: Use icon name instead of pixbufs - - - - - cdeb902f by Philipp Hörist at 2018-10-28T19:20:49Z FiletransferWindow: Move to gtk module - - - - - 95e67ab7 by Philipp Hörist at 2018-10-28T19:43:36Z AdHocCommands: move to gtk module - - - - - 69309d28 by Philipp Hörist at 2018-10-28T19:58:32Z AccountWizard: Use icon name instead of filename - - - - - 2a0d6dc1 by Philipp Hörist at 2018-10-28T20:26:25Z Use json format for the servers list - - - - - 5769ca1e by Philipp Hörist at 2018-10-28T20:45:04Z Remove dead servers from servers list All removed servers did not answer to a IBR request - - - - - ac3bc749 by Philipp Hörist at 2018-10-28T20:58:30Z Remove unused methods - - - - - 19 changed files: - gajim/app_actions.py - gajim/chat_control_base.py - gajim/common/helpers.py - + gajim/data/other/servers.json - − gajim/data/other/servers.xml - gajim/groupchat_control.py - − gajim/groups.py - gajim/gtk/account_wizard.py - gajim/adhoc_commands.py → gajim/gtk/adhoc_commands.py - gajim/atom_window.py → gajim/gtk/atom.py - gajim/disco.py → gajim/gtk/discovery.py - gajim/search_window.py → gajim/gtk/discovery_search.py - gajim/filetransfers_window.py → gajim/gtk/filetransfer.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/message_textview.py - gajim/plugins/gui.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -22,7 +22,6 @@ from gajim.common import helpers from gajim.common.app import interface from gajim.common.exceptions import GajimGeneralException from gajim import dialogs -from gajim import disco import gajim.plugins.gui @@ -44,6 +43,7 @@ from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.proxies import ManageProxies +from gajim.gtk.discovery import ServiceDiscoveryWindow # General Actions @@ -130,7 +130,7 @@ def on_service_disco(action, param): else: try: # Object will add itself to the window dict - disco.ServiceDiscoveryWindow(account, address_entry=True) + ServiceDiscoveryWindow(account, address_entry=True) except GajimGeneralException: pass ===================================== gajim/chat_control_base.py ===================================== @@ -52,7 +52,9 @@ from gajim.conversation_textview import ConversationTextview from gajim.message_textview import MessageTextView from gajim.gtk.dialogs import NonModalConfirmationDialog +from gajim.gtk import util from gajim.gtk.util import convert_rgb_to_hex +from gajim.gtk.util import at_the_end from gajim.gtk.emoji_chooser import emoji_chooser from gajim.command_system.implementation.middleware import ChatCommandProcessor @@ -708,7 +710,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): mark = message_buffer.get_insert() iter_ = message_buffer.get_iter_at_mark(mark) if message_buffer.get_end_iter().equal(iter_): - GLib.idle_add(gtkgui_helpers.scroll_to_end, self.msg_scrolledwindow) + GLib.idle_add(util.scroll_to_end, self.msg_scrolledwindow) return True elif event.keyval == Gdk.KEY_z: # CTRL+z @@ -1192,7 +1194,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if event.get_button()[1] != 1: # We want only to catch the left mouse button return - if not gtkgui_helpers.at_the_end(scrollbar.get_parent()): + if not at_the_end(scrollbar.get_parent()): app.log('autoscroll').info('Autoscroll disabled') self.conv_textview.autoscroll = False ===================================== gajim/common/helpers.py ===================================== @@ -39,6 +39,7 @@ import shlex import socket import time import logging +import json from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -1492,3 +1493,15 @@ def get_sync_threshold(jid, archive_info): app.logger.set_archive_infos(jid, sync_threshold=threshold) return threshold return archive_info.sync_threshold + +def load_json(path, key=None, default=None): + try: + with open(path, 'r') as file: + json_dict = json.loads(file.read()) + except Exception: + log.exception('Parsing error') + return default + + if key is None: + return json_dict + return json_dict.get(key, default) ===================================== gajim/data/other/servers.json ===================================== @@ -0,0 +1,42 @@ +{ + "servers":[ + "0nl1ne.at", + "404.city", + "brauchen.info", + "chatme.im", + "comm.unicate.me", + "creep.im", + "deshalbfrei.org", + "draugr.de", + "im.apinc.org", + "jabber-hosting.de", + "jabber.at", + "jabber.ccc.de", + "jabber.cz", + "jabber.hot-chilli.net", + "jabber.meta.net.nz", + "jabber.no", + "jabber.sk", + "jabber.rueckgr.at", + "jabberes.org", + "jabbim.com", + "jabbim.cz", + "jabbim.pl", + "jabbim.sk", + "jabster.pl", + "lightwitch.org", + "linuxlovers.at", + "njs.netlab.cz", + "pandion.im", + "richim.org", + "suchat.org", + "tigase.im", + "ubuntu-jabber.de", + "ubuntu-jabber.net", + "verdammung.org", + "xabber.de", + "xmpp-hosting.de", + "xmpp.jp", + "zsim.de" + ] +} ===================================== gajim/data/other/servers.xml deleted ===================================== @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<query xmlns:reg="urn:xmpp:vcard:registration:1"> - <item jid="0nl1ne.at" /> - <item jid="404.city" /> - <item jid="brauchen.info" /> - <item jid="chatme.im" /> - <item jid="climm.org" /> - <item jid="comm.unicate.me" /> - <item jid="creep.im" /> - <item jid="deshalbfrei.org" /> - <item jid="draugr.de" /> - <item jid="einfachjabber.de" /> - <item jid="forumanalogue.fr" /> - <item jid="im.apinc.org" /> - <item jid="im.flosoft.biz" /> - <item jid="jabber-hosting.de" /> - <item jid="jabber.at" /> - <item jid="jabber.ccc.de" /> - <item jid="jabber.chaotic.de" /> - <item jid="jabber.co.nz" /> - <item jid="jabber.cz" /> - <item jid="jabber.earth.li" /> - <item jid="jabber.fourecks.de" /> - <item jid="jabber.hot-chilli.net" /> - <item jid="jabber.i-pobox.net" /> - <item jid="jabber.me" /> - <item jid="jabber.meta.net.nz" /> - <item jid="jabber.no" /> - <item jid="jabber.sk" /> - <item jid="jabber.org" /> - <item jid="jabber.rueckgr.at" /> - <item jid="jabber.scha.de" /> - <item jid="jabber.second-home.de" /> - <item jid="jabber.smash-net.org" /> - <item jid="jabber.sow.as" /> - <item jid="jabber.theforest.us" /> - <item jid="jabberafrica.org" /> - <item jid="jabberes.org" /> - <item jid="jabberpl.org" /> - <item jid="jabbim.com" /> - <item jid="jabbim.cz" /> - <item jid="jabbim.hu" /> - <item jid="jabbim.pl" /> - <item jid="jabbim.sk" /> - <item jid="jabster.pl" /> - <item jid="jaim.at" /> - <item jid="lightwitch.org" /> - <item jid="linuxlovers.at" /> - <item jid="lsd-25.ru" /> - <item jid="njs.netlab.cz" /> - <item jid="palita.net" /> - <item jid="pandion.im" /> - <item jid="richim.org" /> - <item jid="sss.chaoslab.ru" /> - <item jid="sternenschweif.de" /> - <item jid="suchat.org" /> - <item jid="swissjabber.ch" /> - <item jid="swissjabber.de" /> - <item jid="swissjabber.eu" /> - <item jid="swissjabber.li" /> - <item jid="swissjabber.org" /> - <item jid="tcweb.org" /> - <item jid="tekst.me" /> - <item jid="tigase.im" /> - <item jid="ubuntu-jabber.de" /> - <item jid="ubuntu-jabber.net" /> - <item jid="univers-libre.net" /> - <item jid="uprod.biz" /> - <item jid="verdammung.org" /> - <item jid="wtfismyip.com" /> - <item jid="xabber.de" /> - <item jid="xmpp-hosting.de" /> - <item jid="xmpp.jp" /> - <item jid="xmppnet.de" /> - <item jid="zsim.de" /> -</query> ===================================== gajim/groupchat_control.py ===================================== @@ -44,7 +44,6 @@ from gajim import gui_menu_builder from gajim import message_control from gajim import vcard from gajim import dataforms_widget -from gajim import adhoc_commands from gajim.common.const import AvatarSize from gajim.common.caps_cache import muc_caps_cache @@ -76,6 +75,7 @@ from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig +from gajim.gtk.adhoc_commands import CommandWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_image_from_icon_name @@ -797,7 +797,7 @@ class GroupchatControl(ChatControlBase): """ Execute AdHoc commands on the current room """ - adhoc_commands.CommandWindow(self.account, self.room_jid) + CommandWindow(self.account, self.room_jid) def _on_upload_avatar(self, action, param): def _on_accept(filename): @@ -2783,7 +2783,7 @@ class GroupchatControl(ChatControlBase): def _on_execute_command_occupant(self, widget, nick): jid = self.room_jid + '/' + nick - adhoc_commands.CommandWindow(self.account, jid) + CommandWindow(self.account, jid) def on_row_activated(self, widget, path): """ ===================================== gajim/groups.py deleted ===================================== @@ -1,71 +0,0 @@ -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -'''Window to create new post for discussion groups service.''' - -from gajim.common import app -from nbxmpp import Node -from gajim import gtkgui_helpers - -class GroupsPostWindow: - def __init__(self, account, servicejid, groupid): - """ - Open new 'create post' window to create message for groupid on servicejid - service - """ - assert isinstance(servicejid, str) - assert isinstance(groupid, str) - - self.account = account - self.servicejid = servicejid - self.groupid = groupid - - self.xml = gtkgui_helpers.get_gtk_builder('groups_post_window.ui') - self.window = self.xml.get_object('groups_post_window') - for name in ('from_entry', 'subject_entry', 'contents_textview'): - self.__dict__[name] = self.xml.get_object(name) - - self.xml.connect_signals(self) - self.window.show_all() - - def on_cancel_button_clicked(self, w): - """ - Close window - """ - self.window.destroy() - - def on_send_button_clicked(self, w): - """ - Gather info from widgets and send it as a message - """ - # constructing item to publish... that's atom:entry element - item = Node('entry', {'xmlns':'http://www.w3.org/2005/Atom'}) - author = item.addChild('author') - author.addChild('name', {}, [self.from_entry.get_text()]) - item.addChild('generator', {}, ['Gajim']) - item.addChild('title', {}, [self.subject_entry.get_text()]) - - buf = self.contents_textview.get_buffer() - item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True)]) - - # publish it to node - con = app.connections[self.account] - con.get_module('PubSub').send_pb_publish( - self.servicejid, self.groupid, item, '0') - - # close the window - self.window.destroy() ===================================== gajim/gtk/account_wizard.py ===================================== @@ -54,10 +54,11 @@ class AccountCreationWizard: self.update_proxy_list() - # parse servers.xml - servers_xml = os.path.join( - configpaths.get('DATA'), 'other', 'servers.xml') - servers = gtkgui_helpers.parse_server_xml(servers_xml) + # parse servers.json + server_file_path = os.path.join( + configpaths.get('DATA'), 'other', 'servers.json') + servers = helpers.load_json(server_file_path, 'servers', []) + servers_model = self.xml.get_object('server_liststore') for server in servers: servers_model.append((server,)) @@ -179,10 +180,10 @@ class AccountCreationWizard: self.go_online_checkbutton.show() img = self.xml.get_object('finish_image') if self.modify: - img.set_from_icon_name(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) + img.set_from_icon_name('emblem-ok-symbolic', Gtk.IconSize.DIALOG) + img.get_style_context().add_class('success-color') else: - path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) - img.set_from_file(path_to_file) + img.set_from_icon_name('org.gajim.Gajim', Gtk.IconSize.DIALOG) self.show_vcard_checkbutton.set_active(not self.modify) self.notebook.set_current_page(6) # show finish page ===================================== gajim/adhoc_commands.py → gajim/gtk/adhoc_commands.py ===================================== @@ -29,10 +29,10 @@ from gajim.common.i18n import _ from gajim.common.modules import dataforms from gajim.common import ged -from gajim import gtkgui_helpers from gajim import dataforms_widget from gajim.gtk.dialogs import HigDialog +from gajim.gtk.util import get_builder class CommandWindow: @@ -68,7 +68,7 @@ class CommandWindow: self.stage_window_delete_cb = None # retrieving widgets from xml - self.xml = gtkgui_helpers.get_gtk_builder('adhoc_commands_window.ui') + self.xml = get_builder('adhoc_commands_window.ui') self.window = self.xml.get_object('adhoc_commands_window') self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) ===================================== gajim/atom_window.py → gajim/gtk/atom.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ -from gajim import gtkgui_helpers +from gajim.gtk.util import get_builder class AtomWindow: window = None @@ -57,7 +57,7 @@ class AtomWindow: self.entry = None # the entry actually displayed - self.xml = gtkgui_helpers.get_gtk_builder('atom_entry_window.ui') + self.xml = get_builder('atom_entry_window.ui') self.window = self.xml.get_object('atom_entry_window') for name in ('new_entry_label', 'feed_title_label', 'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label', ===================================== gajim/disco.py → gajim/gtk/discovery.py ===================================== @@ -3,6 +3,7 @@ # Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> # Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> # Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +# Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> # Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> # # This file is part of Gajim. @@ -49,11 +50,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -from gajim import gtkgui_helpers -from gajim import groups -from gajim import adhoc_commands -from gajim import search_window - from gajim.common import app from gajim.common.i18n import _ from gajim.common import helpers @@ -62,6 +58,10 @@ from gajim.common.const import StyleAttr from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.service_registration import ServiceRegistration +from gajim.gtk.discovery_search import SearchWindow +from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.util import icon_exists +from gajim.gtk.util import get_builder LABELS = { 1: _('This service has not yet responded with detailed information'), @@ -287,28 +287,19 @@ class ServicesCache: info = _agent_type_info[(cat, type_)] except KeyError: continue - filename = info[1] - if filename: + service_name = info[1] + if service_name: break else: # Loop fell through, default to unknown - filename = addr.split('.')[0] + service_name = addr.split('.')[0] quiet = True - # Use the cache if possible - if filename in _icon_cache: - return _icon_cache[filename] + # Or load it - pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32, - quiet=quiet) - if pix: - # Store in cache - _icon_cache[filename] = pix - return pix - if 'jabber' in _icon_cache: - return _icon_cache['jabber'] - pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-jabber', size=32) - _icon_cache['jabber'] = pix - return pix + icon_name = 'gajim-agent-%s' % service_name + if icon_exists(icon_name): + return icon_name + return 'gajim-agent-jabber' def get_browser(self, identities=None, features=None): """ @@ -513,7 +504,7 @@ _('Without a connection, you can not browse available services')) if initial_identities: self.cache._on_agent_info(jid, node, initial_identities, [], None) - self.xml = gtkgui_helpers.get_gtk_builder('service_discovery_window.ui') + self.xml = get_builder('service_discovery_window.ui') self.window = self.xml.get_object('service_discovery_window') self.services_treeview = self.xml.get_object('services_treeview') self.model = None @@ -869,8 +860,9 @@ class AgentBrowser: self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. - pix = self.cache.get_icon(identities, addr=self._get_agent_address()) - self.window.banner_icon.set_from_pixbuf(pix) + icon_name = self.cache.get_icon(identities, + addr=self._get_agent_address()) + self.window.banner_icon.set_from_icon_name(icon_name, Gtk.IconSize.DND) self.window.banner_icon.show() def _clean_title(self): @@ -1138,8 +1130,9 @@ class ToplevelAgentBrowser(AgentBrowser): identity = {'category': '_jid', 'type': type_} identities.append(identity) # Set the pixmap for the row - pix = self.cache.get_icon(identities, addr=addr) - self.model.append(None, (self.jid, self.node, pix, descr, LABELS[1])) + icon_name = self.cache.get_icon(identities, addr=addr) + self.model.append(None, + (self.jid, self.node, icon_name, descr, LABELS[1])) # Grab info on the service self.cache.get_info(self.jid, self.node, self._agent_info, force=False) @@ -1149,9 +1142,9 @@ class ToplevelAgentBrowser(AgentBrowser): """ jid = model.get_value(iter_, 0) if jid: - pix = model.get_value(iter_, 2) + icon_name = model.get_value(iter_, 2) cell.set_property('visible', True) - cell.set_property('pixbuf', pix) + cell.set_property('icon_name', icon_name) else: cell.set_property('visible', False) @@ -1202,7 +1195,7 @@ class ToplevelAgentBrowser(AgentBrowser): # state is None on success or has a string # from LABELS on error or while fetching view = self.window.services_treeview - self.model = Gtk.TreeStore(str, str, GdkPixbuf.Pixbuf, str, str) + self.model = Gtk.TreeStore(str, str, str, str, str) self.model.set_sort_func(4, self._treemodel_sort_func) self.model.set_sort_column_id(4, Gtk.SortType.ASCENDING) view.set_model(self.model) @@ -1211,6 +1204,7 @@ class ToplevelAgentBrowser(AgentBrowser): # Icon Renderer renderer = Gtk.CellRendererPixbuf() renderer.set_property('xpad', 6) + renderer.set_property('stock-size', Gtk.IconSize.DND) col.pack_start(renderer, False) col.set_cell_data_func(renderer, self._pixbuf_renderer_data_func) # Text Renderer @@ -1299,7 +1293,7 @@ class ToplevelAgentBrowser(AgentBrowser): present() else: app.interface.instances[self.account]['search'][service] = \ - search_window.SearchWindow(self.account, service) + SearchWindow(self.account, service) def cleanup(self): AgentBrowser.cleanup(self) @@ -1319,7 +1313,7 @@ class ToplevelAgentBrowser(AgentBrowser): return service = model[iter_][0] node = model[iter_][1] - adhoc_commands.CommandWindow(self.account, service, commandnode=node) + CommandWindow(self.account, service, commandnode=node) def on_register_button_clicked(self, widget=None): """ @@ -1547,13 +1541,13 @@ class ToplevelAgentBrowser(AgentBrowser): else: # Put it in the 'other' category for now cat_args = ('other',) - # Set the pixmap for the row - pix = self.cache.get_icon(identities, addr=addr) + + icon_name = self.cache.get_icon(identities, addr=addr) # Put it in the right category cat = self._find_category(*cat_args) if not cat: cat = self._create_category(*cat_args) - self.model.append(cat, (jid, node, pix, descr, LABELS[1])) + self.model.append(cat, (jid, node, icon_name, descr, LABELS[1])) GLib.idle_add(self._expand_all) # Grab info on the service self.cache.get_info(jid, node, self._agent_info, force=force) @@ -1583,7 +1577,7 @@ class ToplevelAgentBrowser(AgentBrowser): self._update_progressbar() # Search for an icon and category we can display - pix = self.cache.get_icon(identities, addr=addr) + icon_name = self.cache.get_icon(identities, addr=addr) cat, type_ = None, None for identity in identities: try: @@ -1596,7 +1590,7 @@ class ToplevelAgentBrowser(AgentBrowser): old_cat_iter = self.model.iter_parent(iter_) if not old_cat_iter or self.model.get_value(old_cat_iter, 3) == cat: # Already in the right category, just update - self.model[iter_][2] = pix + self.model[iter_][2] = icon_name self.model[iter_][3] = descr self.model[iter_][4] = None return @@ -1613,7 +1607,7 @@ class ToplevelAgentBrowser(AgentBrowser): cat_iter = self._find_category(cat, type_) if not cat_iter: cat_iter = self._create_category(cat, type_) - self.model.append(cat_iter, (jid, node, pix, descr, None)) + self.model.append(cat_iter, (jid, node, icon_name, descr, None)) self._expand_all() def _update_error(self, iter_, jid, node): @@ -2064,7 +2058,7 @@ class DiscussionGroupsBrowser(AgentBrowser): groupnode = model.get_value(iter_, 1) # 1 = groupnode - groups.GroupsPostWindow(self.account, self.jid, groupnode) + GroupsPostWindow(self.account, self.jid, groupnode) def on_subscribe_button_clicked(self, widget): """ @@ -2153,3 +2147,53 @@ class DiscussionGroupsBrowser(AgentBrowser): # Fill the global agent type info dictionary _agent_type_info = _gen_agent_type_info() + + +class GroupsPostWindow: + def __init__(self, account, servicejid, groupid): + """ + Open new 'create post' window to create message for groupid on servicejid + service + """ + assert isinstance(servicejid, str) + assert isinstance(groupid, str) + + self.account = account + self.servicejid = servicejid + self.groupid = groupid + + self.xml = get_builder('groups_post_window.ui') + self.window = self.xml.get_object('groups_post_window') + for name in ('from_entry', 'subject_entry', 'contents_textview'): + self.__dict__[name] = self.xml.get_object(name) + + self.xml.connect_signals(self) + self.window.show_all() + + def on_cancel_button_clicked(self, w): + """ + Close window + """ + self.window.destroy() + + def on_send_button_clicked(self, w): + """ + Gather info from widgets and send it as a message + """ + # constructing item to publish... that's atom:entry element + item = nbxmpp.Node('entry', {'xmlns':'http://www.w3.org/2005/Atom'}) + author = item.addChild('author') + author.addChild('name', {}, [self.from_entry.get_text()]) + item.addChild('generator', {}, ['Gajim']) + item.addChild('title', {}, [self.subject_entry.get_text()]) + + buf = self.contents_textview.get_buffer() + item.addChild('content', {}, [buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True)]) + + # publish it to node + con = app.connections[self.account] + con.get_module('PubSub').send_pb_publish( + self.servicejid, self.groupid, item, '0') + + # close the window + self.window.destroy() ===================================== gajim/search_window.py → gajim/gtk/discovery_search.py ===================================== @@ -24,33 +24,25 @@ from gajim.common import ged from gajim.common.modules import dataforms from gajim.common.i18n import _ -from gajim import gtkgui_helpers from gajim import vcard from gajim import config from gajim import dataforms_widget + +from gajim.gtk.util import get_builder from gajim.gtk.add_contact import AddNewContactWindow class SearchWindow: def __init__(self, account, jid): - """ - Create new window - """ - # an account object self.account = account self.jid = jid - # retrieving widgets from xml - self.xml = gtkgui_helpers.get_gtk_builder('search_window.ui') - self.window = self.xml.get_object('search_window') - for name in ('label', 'progressbar', 'search_vbox', 'search_button', - 'add_contact_button', 'information_button'): - self.__dict__[name] = self.xml.get_object(name) + self._ui = get_builder('search_window.ui') + self.window = self._ui.search_window - self.search_button.set_sensitive(False) + self._ui.search_button.set_sensitive(False) - # displaying the window - self.xml.connect_signals(self) + self._ui.connect_signals(self) self.window.show_all() self.request_form() self.pulse_id = GLib.timeout_add(80, self.pulse_callback) @@ -60,36 +52,40 @@ class SearchWindow: # Is there a jid column in results ? if -1: no, else column number self.jid_column = -1 - app.ged.register_event_handler('search-form-received', ged.GUI1, - self._nec_search_form_received) - app.ged.register_event_handler('search-result-received', ged.GUI1, - self._nec_search_result_received) + app.ged.register_event_handler('search-form-received', + ged.GUI1, + self._nec_search_form_received) + app.ged.register_event_handler('search-result-received', + ged.GUI1, + self._nec_search_result_received) def request_form(self): con = app.connections[self.account] con.get_module('Search').request_search_fields(self.jid) def pulse_callback(self): - self.progressbar.pulse() + self._ui.progressbar.pulse() return True - def on_search_window_key_press_event(self, widget, event): + def on_search_window_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_search_window_destroy(self, widget): + def on_search_window_destroy(self, _widget): if self.pulse_id: GLib.source_remove(self.pulse_id) del app.interface.instances[self.account]['search'][self.jid] - app.ged.remove_event_handler('search-form-received', ged.GUI1, - self._nec_search_form_received) - app.ged.remove_event_handler('search-result-received', ged.GUI1, - self._nec_search_result_received) - - def on_close_button_clicked(self, button): + app.ged.remove_event_handler('search-form-received', + ged.GUI1, + self._nec_search_form_received) + app.ged.remove_event_handler('search-result-received', + ged.GUI1, + self._nec_search_result_received) + + def on_close_button_clicked(self, _button): self.window.destroy() - def on_search_button_clicked(self, button): + def on_search_button_clicked(self, _button): con = app.connections[self.account] if self.is_form: self.data_form_widget.data_form.type_ = 'submit' @@ -101,22 +97,22 @@ class SearchWindow: del infos['instructions'] con.get_module('Search').send_search_form(self.jid, infos, False) - self.search_vbox.remove(self.data_form_widget) + self._ui.search_vbox.remove(self.data_form_widget) - self.progressbar.show() - self.label.set_text(_('Waiting for results')) - self.label.show() + self._ui.progressbar.show() + self._ui.label.set_text(_('Waiting for results')) + self._ui.label.show() self.pulse_id = GLib.timeout_add(80, self.pulse_callback) - self.search_button.hide() + self._ui.search_button.hide() - def on_add_contact_button_clicked(self, widget): + def on_add_contact_button_clicked(self, _widget): (model, iter_) = self.result_treeview.get_selection().get_selected() if not iter_: return jid = model[iter_][self.jid_column] AddNewContactWindow(self.account, jid) - def on_information_button_clicked(self, widget): + def on_information_button_clicked(self, _widget): (model, iter_) = self.result_treeview.get_selection().get_selected() if not iter_: return @@ -131,8 +127,8 @@ class SearchWindow: def _nec_search_form_received(self, obj): if self.pulse_id: GLib.source_remove(self.pulse_id) - self.progressbar.hide() - self.label.hide() + self._ui.progressbar.hide() + self._ui.label.hide() if obj.is_dataform: self.is_form = True @@ -142,19 +138,19 @@ class SearchWindow: try: self.data_form_widget.data_form = self.dataform except dataforms.Error: - self.label.set_text(_('Error in received dataform')) - self.label.show() + self._ui.label.set_text(_('Error in received dataform')) + self._ui.label.show() return if self.data_form_widget.title: - self.window.set_title('%s - Search - Gajim' % \ - self.data_form_widget.title) + self.window.set_title( + '%s - Search - Gajim' % self.data_form_widget.title) else: self.is_form = False self.data_form_widget = config.FakeDataForm(obj.data) self.data_form_widget.show_all() - self.search_vbox.pack_start(self.data_form_widget, True, True, 0) - self.search_button.set_sensitive(True) + self._ui.search_vbox.pack_start(self.data_form_widget, True, True, 0) + self._ui.search_button.set_sensitive(True) def on_result_treeview_cursor_changed(self, treeview): if self.jid_column == -1: @@ -163,29 +159,29 @@ class SearchWindow: if not iter_: return if model[iter_][self.jid_column]: - self.add_contact_button.set_sensitive(True) - self.information_button.set_sensitive(True) + self._ui.add_contact_button.set_sensitive(True) + self._ui.information_button.set_sensitive(True) else: - self.add_contact_button.set_sensitive(False) - self.information_button.set_sensitive(False) + self._ui.add_contact_button.set_sensitive(False) + self._ui.information_button.set_sensitive(False) def _nec_search_result_received(self, obj): if self.pulse_id: GLib.source_remove(self.pulse_id) - self.progressbar.hide() - self.label.hide() + self._ui.progressbar.hide() + self._ui.label.hide() if not obj.is_dataform: if not obj.data: - self.label.set_text(_('No result')) - self.label.show() + self._ui.label.set_text(_('No result')) + self._ui.label.show() return # We suppose all items have the same fields sw = Gtk.ScrolledWindow() sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) self.result_treeview = Gtk.TreeView() - self.result_treeview.connect('cursor-changed', - self.on_result_treeview_cursor_changed) + self.result_treeview.connect( + 'cursor-changed', self.on_result_treeview_cursor_changed) sw.add(self.result_treeview) # Create model fieldtypes = [str]*len(obj.data[0]) @@ -196,39 +192,41 @@ class SearchWindow: # Create columns counter = 0 for field in obj.data[0].keys(): - self.result_treeview.append_column(Gtk.TreeViewColumn(field, - Gtk.CellRendererText(), text=counter)) + self.result_treeview.append_column( + Gtk.TreeViewColumn(field, + Gtk.CellRendererText(), + text=counter)) if field == 'jid': self.jid_column = counter counter += 1 self.result_treeview.set_model(model) sw.show_all() - self.search_vbox.pack_start(sw, True, True, 0) + self._ui.search_vbox.pack_start(sw, True, True, 0) if self.jid_column > -1: - self.add_contact_button.show() - self.information_button.show() + self._ui.add_contact_button.show() + self._ui.information_button.show() return self.dataform = dataforms.extend_form(node=obj.data) if not self.dataform.items: # No result - self.label.set_text(_('No result')) - self.label.show() + self._ui.label.set_text(_('No result')) + self._ui.label.show() return self.data_form_widget.set_sensitive(True) try: self.data_form_widget.data_form = self.dataform except dataforms.Error: - self.label.set_text(_('Error in received dataform')) - self.label.show() + self._ui.label.set_text(_('Error in received dataform')) + self._ui.label.show() return self.result_treeview = self.data_form_widget.records_treeview selection = self.result_treeview.get_selection() selection.set_mode(Gtk.SelectionMode.SINGLE) - self.result_treeview.connect('cursor-changed', - self.on_result_treeview_cursor_changed) + self.result_treeview.connect( + 'cursor-changed', self.on_result_treeview_cursor_changed) counter = 0 for field in self.dataform.reported.iter_fields(): @@ -236,11 +234,11 @@ class SearchWindow: self.jid_column = counter break counter += 1 - self.search_vbox.pack_start(self.data_form_widget, True, True, 0) + self._ui.search_vbox.pack_start(self.data_form_widget, True, True, 0) self.data_form_widget.show() if self.jid_column > -1: - self.add_contact_button.show() - self.information_button.show() + self._ui.add_contact_button.show() + self._ui.information_button.show() if self.data_form_widget.title: - self.window.set_title('%s - Search - Gajim' % \ - self.data_form_widget.title) + self.window.set_title( + '%s - Search - Gajim' % self.data_form_widget.title) ===================================== gajim/filetransfers_window.py → gajim/gtk/filetransfer.py ===================================== @@ -50,6 +50,7 @@ from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.tooltips import FileTransfersTooltip +from gajim.gtk.util import get_builder log = logging.getLogger('gajim.filetransfer_window') @@ -69,7 +70,7 @@ class FileTransfersWindow: def __init__(self): self.files_props = {'r' : {}, 's': {}} self.height_diff = 0 - self.xml = gtkgui_helpers.get_gtk_builder('filetransfers.ui') + self.xml = get_builder('filetransfers.ui') self.window = self.xml.get_object('file_transfers_window') self.tree = self.xml.get_object('transfers_list') self.cancel_button = self.xml.get_object('cancel_button') @@ -80,8 +81,7 @@ class FileTransfersWindow: shall_notify = app.config.get('notify_on_file_complete') self.notify_ft_checkbox.set_active(shall_notify) - self.model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str, str, str, int, - int, str) + self.model = Gtk.ListStore(str, str, str, str, str, int, int, str) self.tree.set_model(self.model) col = Gtk.TreeViewColumn() @@ -91,7 +91,7 @@ class FileTransfersWindow: render_pixbuf.set_property('xpad', 3) render_pixbuf.set_property('ypad', 3) render_pixbuf.set_property('yalign', .0) - col.add_attribute(render_pixbuf, 'pixbuf', 0) + col.add_attribute(render_pixbuf, 'icon_name', 0) self.tree.append_column(col) col = Gtk.TreeViewColumn(_('File')) @@ -133,7 +133,6 @@ class FileTransfersWindow: col.set_expand(False) self.tree.append_column(col) - self.images = {} self.icons = { 'upload': 'go-up', 'download': 'go-down', @@ -459,10 +458,6 @@ class FileTransfersWindow: on_response_cancel(account, file_props)) dialog.popup() - def get_icon(self, ident): - return self.images.setdefault(ident, - gtkgui_helpers.get_icon_pixmap(self.icons[ident], 24)) - def set_status(self, file_props, status): """ Change the status of a transfer to state 'status' @@ -505,7 +500,7 @@ class FileTransfersWindow: helpers.convert_bytes(full_size) self.model.set(iter_, Column.PROGRESS, text) self.model.set(iter_, Column.PULSE, GLib.MAXINT32) - self.model.set(iter_, Column.IMAGE, self.get_icon(status)) + self.model.set(iter_, Column.IMAGE, self.icons[status]) path = self.model.get_path(iter_) self.select_func(path) @@ -644,7 +639,7 @@ class FileTransfersWindow: status = 'waiting' if file_props.connected is False: status = 'stop' - self.model.set(iter_, 0, self.get_icon(status)) + self.model.set(iter_, 0, self.icons[status]) if transfered_size == full_size: # If we are receiver and this is a jingle session if file_props.type_ == 'r' and \ ===================================== gajim/gtk/util.py ===================================== @@ -89,6 +89,10 @@ def get_builder(file_name: str, widgets: List[str] = None) -> Builder: return Builder(file_name, widgets) +def icon_exists(name: str) -> bool: + return _icon_theme.has_icon(name) + + def load_icon(icon_name, widget, size=16, pixbuf=False, flags=Gtk.IconLookupFlags.FORCE_SIZE): ===================================== gajim/gtkgui_helpers.py ===================================== @@ -75,16 +75,6 @@ def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): if not quiet: log.error('Unable to load icon %s: %s', icon_name, str(error)) -def get_icon_path(icon_name, size=16): - try: - icon_info = gtk_icon_theme.lookup_icon(icon_name, size, 0) - if icon_info is None: - log.error('Icon not found: %s', icon_name) - return '' - return icon_info.get_filename() - except GLib.GError as error: - log.error('Unable to find icon %s: %s', icon_name, str(error)) - HAS_PYWIN32 = True if os.name == 'nt': @@ -97,11 +87,6 @@ if os.name == 'nt': from gajim.common import helpers -def add_image_to_button(button, icon_name): - img = Gtk.Image() - path_img = get_icon_path(icon_name) - img.set_from_file(path_img) - button.set_image(img) def get_image_button(icon_name, tooltip, toggle=False): if toggle: @@ -146,66 +131,6 @@ def get_gtk_builder(file_name, widget=None): builder.add_from_file(file_path) return builder -def at_the_end(widget): - """Determines if a Scrollbar in a GtkScrolledWindow is at the end. - - Args: - widget (GtkScrolledWindow) - - Returns: - bool: The return value is True if at the end, False if not. - """ - adj_v = widget.get_vadjustment() - max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - return adj_v.get_value() == max_scroll_pos - -def scroll_to_end(widget): - """Scrolls to the end of a GtkScrolledWindow. - - Args: - widget (GtkScrolledWindow) - - Returns: - bool: The return value is False so it can be used with GLib.idle_add. - """ - adj_v = widget.get_vadjustment() - if adj_v is None: - # This can happen when the Widget is already destroyed when called - # from GLib.idle_add - return False - max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - adj_v.set_value(max_scroll_pos) - - adj_h = widget.get_hadjustment() - adj_h.set_value(0) - return False - - -class ServersXMLHandler(ContentHandler): - def __init__(self): - ContentHandler.__init__(self) - self.servers = [] - - def startElement(self, name, attributes): - if name == 'item': - if 'jid' in attributes.getNames(): - self.servers.append(attributes.getValue('jid')) - - def endElement(self, name): - pass - -def parse_server_xml(path_to_file): - try: - handler = ServersXMLHandler() - xml.sax.parse(path_to_file, handler) - return handler.servers - # handle exception if unable to open file - except IOError as message: - print(_('Error reading file:') + str(message), file=sys.stderr) - # handle exception parsing file - except xml.sax.SAXParseException as message: - print(_('Error parsing file:') + str(message), file=sys.stderr) - def set_unset_urgency_hint(window, unread_messages_no): """ Sets/unset urgency hint in window argument depending if we have unread @@ -247,22 +172,6 @@ def get_cursor(attr): cursor = getattr(Gdk.CursorType, attr) return Gdk.Cursor.new_for_display(display, cursor) -def get_current_desktop(window): - """ - Return the current virtual desktop for given window - - NOTE: Window is a GDK window. - """ - prop = window.property_get('_NET_CURRENT_DESKTOP') - if prop is None: # it means it's normal window (not root window) - # so we look for it's current virtual desktop in another property - prop = window.property_get('_NET_WM_DESKTOP') - - if prop is not None: - # f.e. prop is ('CARDINAL', 32, [0]) we want 0 or 1.. from [0] - current_virtual_desktop_no = prop[2][0] - return current_virtual_desktop_no - def file_is_locked(path_to_file): """ Return True if file is locked ===================================== gajim/gui_interface.py ===================================== @@ -74,9 +74,7 @@ from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl from gajim.groupchat_control import PrivateChatControl from gajim.message_window import MessageWindowMgr -from gajim.filetransfers_window import FileTransfersWindow -from gajim.atom_window import AtomWindow from gajim.session import ChatControlSession from gajim.common import idle @@ -121,6 +119,8 @@ from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig +from gajim.gtk.atom import AtomWindow +from gajim.gtk.filetransfer import FileTransfersWindow parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) ===================================== gajim/message_textview.py ===================================== @@ -24,9 +24,12 @@ from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango +from gajim import gtkgui_helpers + from gajim.common import app from gajim.common.i18n import _ -from gajim import gtkgui_helpers + +from gajim.gtk.util import scroll_to_end if app.is_installed('GSPELL'): from gi.repository import Gspell @@ -166,7 +169,7 @@ class MessageTextView(Gtk.TextView): mark = buffer_.get_insert() iter_ = buffer_.get_iter_at_mark(mark) if iter_.get_offset() == buffer_.get_end_iter().get_offset(): - GLib.idle_add(gtkgui_helpers.scroll_to_end, textview.get_parent()) + GLib.idle_add(scroll_to_end, textview.get_parent()) def make_clickable_urls(self, text): _buffer = self.get_buffer() ===================================== gajim/plugins/gui.py ===================================== @@ -21,25 +21,27 @@ GUI classes related to plug-in management. :license: GPL ''' -__all__ = ['PluginsWindow'] +import os +from enum import IntEnum +from enum import unique from gi.repository import Gtk from gi.repository import GdkPixbuf from gi.repository import Gdk -import os -from enum import IntEnum, unique - -from gajim import gtkgui_helpers -from gajim.gtk.dialogs import WarningDialog -from gajim.gtk.dialogs import YesNoDialog -from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.common import app from gajim.common import configpaths +from gajim.common.exceptions import PluginsystemError + from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.plugins_i18n import _ -from gajim.common.exceptions import PluginsystemError + +from gajim.gtk.dialogs import WarningDialog +from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.filechoosers import ArchiveChooserDialog +from gajim.gtk.util import get_builder +from gajim.gtk.util import load_icon @unique @@ -57,7 +59,7 @@ class PluginsWindow: @log_calls('PluginsWindow') def __init__(self): '''Initialize Plugins window''' - builder = gtkgui_helpers.get_gtk_builder('plugins_window.ui') + builder = get_builder('plugins_window.ui') self.window = builder.get_object('plugins_window') self.window.set_transient_for(app.interface.roster.window) @@ -91,7 +93,9 @@ class PluginsWindow: activatable=Column.ACTIVATABLE) self.installed_plugins_treeview.append_column(col) - self.def_icon = gtkgui_helpers.get_icon_pixmap('preferences-desktop') + self.def_icon = load_icon('preferences-desktop', + self.window, + pixbuf=True) # connect signal for selection change selection = self.installed_plugins_treeview.get_selection() ===================================== gajim/roster_window.py ===================================== @@ -46,12 +46,10 @@ from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE from gajim import dialogs from gajim import vcard -from gajim import disco from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import cell_renderer_image from gajim import message_control -from gajim import adhoc_commands from gajim.common import app from gajim.common import helpers @@ -79,9 +77,11 @@ from gajim.gtk.pep_config import ManagePEPServicesWindow from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration +from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.tooltips import RosterTooltip +from gajim.gtk.adhoc_commands import CommandWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import move_window @@ -3702,7 +3702,7 @@ class RosterWindow: jid = contact.jid if resource is not None: jid = jid + '/' + resource - adhoc_commands.CommandWindow(account, jid) + CommandWindow(account, jid) def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT @@ -4035,7 +4035,7 @@ class RosterWindow: else: try: # Object will add itself to the window dict - disco.ServiceDiscoveryWindow(account, address_entry=True) + ServiceDiscoveryWindow(account, address_entry=True) except GajimGeneralException: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/39dfe41af56df33f2e7e3d56de152f3bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/39dfe41af56df33f2e7e3d56de152f3bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Move ManageProxies into own module
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e2f00e5 by Philipp Hörist at 2018-10-28T14:36:11Z Move ManageProxies into own module - - - - - 9af4b4f0 by Philipp Hörist at 2018-10-28T14:36:43Z Move GroupchatConfig into own module - - - - - b5441b61 by Philipp Hörist at 2018-10-28T16:15:34Z Move ManageSounds into own module - - - - - 39dfe41a by Philipp Hörist at 2018-10-28T16:15:38Z Remove print statement - - - - - 10 changed files: - gajim/app_actions.py - gajim/config.py - gajim/groupchat_control.py - gajim/gtk/account_wizard.py - gajim/gtk/dialogs.py - + gajim/gtk/groupchat_config.py - gajim/gtk/preferences.py - + gajim/gtk/proxies.py - + gajim/gtk/sounds.py - gajim/gui_interface.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -21,7 +21,6 @@ from gajim.common import app from gajim.common import helpers from gajim.common.app import interface from gajim.common.exceptions import GajimGeneralException -from gajim import config from gajim import dialogs from gajim import disco @@ -44,6 +43,7 @@ from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow +from gajim.gtk.proxies import ManageProxies # General Actions @@ -252,7 +252,7 @@ def on_manage_proxies(action, param): app.interface.instances['manage_proxies'].window.present() else: app.interface.instances['manage_proxies'] = \ - config.ManageProxiesWindow(interface.roster.window) + ManageProxies(interface.roster.window) # Admin Actions ===================================== gajim/config.py ===================================== @@ -27,273 +27,20 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os - from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GObject -from gajim.common import helpers from gajim.common import app from gajim.common.i18n import _ from gajim import gtkgui_helpers from gajim import dialogs -from gajim import dataforms_widget + from gajim import gui_menu_builder from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import InputDialog - -#---------- ManageProxiesWindow class -------------# -class ManageProxiesWindow: - def __init__(self, transient_for=None): - self.xml = gtkgui_helpers.get_gtk_builder('manage_proxies_window.ui') - self.window = self.xml.get_object('manage_proxies_window') - self.window.set_transient_for(transient_for) - self.proxies_treeview = self.xml.get_object('proxies_treeview') - self.proxyname_entry = self.xml.get_object('proxyname_entry') - self.proxytype_combobox = self.xml.get_object('proxytype_combobox') - - self.init_list() - self.block_signal = False - self.xml.connect_signals(self) - self.window.show_all() - # hide the BOSH fields by default - self.show_bosh_fields() - - def show_bosh_fields(self, show=True): - if show: - self.xml.get_object('boshuri_entry').show() - self.xml.get_object('boshuri_label').show() - self.xml.get_object('boshuseproxy_checkbutton').show() - else: - cb = self.xml.get_object('boshuseproxy_checkbutton') - cb.hide() - cb.set_active(True) - self.on_boshuseproxy_checkbutton_toggled(cb) - self.xml.get_object('boshuri_entry').hide() - self.xml.get_object('boshuri_label').hide() - - - def fill_proxies_treeview(self): - model = self.proxies_treeview.get_model() - model.clear() - iter_ = model.append() - model.set(iter_, 0, _('None')) - for p in app.config.get_per('proxies'): - iter_ = model.append() - model.set(iter_, 0, p) - - def init_list(self): - self.xml.get_object('remove_proxy_button').set_sensitive(False) - self.proxytype_combobox.set_sensitive(False) - self.xml.get_object('proxy_table').set_sensitive(False) - model = Gtk.ListStore(str) - self.proxies_treeview.set_model(model) - col = Gtk.TreeViewColumn('Proxies') - self.proxies_treeview.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True) - col.add_attribute(renderer, 'text', 0) - self.fill_proxies_treeview() - self.xml.get_object('proxytype_combobox').set_active(0) - - def on_manage_proxies_window_destroy(self, widget): - window = app.get_app_window('AccountsWindow') - if window is not None: - window.update_proxy_list() - del app.interface.instances['manage_proxies'] - - def on_add_proxy_button_clicked(self, widget): - model = self.proxies_treeview.get_model() - proxies = app.config.get_per('proxies') - i = 1 - while 'proxy' + str(i) in proxies: - i += 1 - iter_ = model.append() - model.set(iter_, 0, 'proxy' + str(i)) - app.config.add_per('proxies', 'proxy' + str(i)) - self.proxies_treeview.set_cursor(model.get_path(iter_)) - - def on_remove_proxy_button_clicked(self, widget): - sel = self.proxies_treeview.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - proxy = model[iter_][0] - model.remove(iter_) - app.config.del_per('proxies', proxy) - self.xml.get_object('remove_proxy_button').set_sensitive(False) - self.block_signal = True - self.on_proxies_treeview_cursor_changed(self.proxies_treeview) - self.block_signal = False - - def on_close_button_clicked(self, widget): - self.window.destroy() - - def on_useauth_checkbutton_toggled(self, widget): - if self.block_signal: - return - act = widget.get_active() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'useauth', act) - self.xml.get_object('proxyuser_entry').set_sensitive(act) - self.xml.get_object('proxypass_entry').set_sensitive(act) - - def on_boshuseproxy_checkbutton_toggled(self, widget): - if self.block_signal: - return - act = widget.get_active() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'bosh_useproxy', act) - self.xml.get_object('proxyhost_entry').set_sensitive(act) - self.xml.get_object('proxyport_entry').set_sensitive(act) - - def on_proxies_treeview_cursor_changed(self, widget): - #FIXME: check if off proxy settings are correct (see - # http://trac.gajim.org/changeset/1921#file2 line 1221 - proxyhost_entry = self.xml.get_object('proxyhost_entry') - proxyport_entry = self.xml.get_object('proxyport_entry') - proxyuser_entry = self.xml.get_object('proxyuser_entry') - proxypass_entry = self.xml.get_object('proxypass_entry') - boshuri_entry = self.xml.get_object('boshuri_entry') - useauth_checkbutton = self.xml.get_object('useauth_checkbutton') - boshuseproxy_checkbutton = self.xml.get_object('boshuseproxy_checkbutton') - self.block_signal = True - proxyhost_entry.set_text('') - proxyport_entry.set_text('') - proxyuser_entry.set_text('') - proxypass_entry.set_text('') - boshuri_entry.set_text('') - - #boshuseproxy_checkbutton.set_active(False) - #self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) - - #useauth_checkbutton.set_active(False) - #self.on_useauth_checkbutton_toggled(useauth_checkbutton) - - sel = widget.get_selection() - if sel: - (model, iter_) = sel.get_selected() - else: - iter_ = None - if not iter_: - self.xml.get_object('proxyname_entry').set_text('') - self.xml.get_object('proxytype_combobox').set_sensitive(False) - self.xml.get_object('proxy_table').set_sensitive(False) - self.block_signal = False - return - - proxy = model[iter_][0] - self.xml.get_object('proxyname_entry').set_text(proxy) - - if proxy == _('None'): # special proxy None - self.show_bosh_fields(False) - self.proxyname_entry.set_editable(False) - self.xml.get_object('remove_proxy_button').set_sensitive(False) - self.xml.get_object('proxytype_combobox').set_sensitive(False) - self.xml.get_object('proxy_table').set_sensitive(False) - else: - proxytype = app.config.get_per('proxies', proxy, 'type') - - self.show_bosh_fields(proxytype == 'bosh') - - self.proxyname_entry.set_editable(True) - self.xml.get_object('remove_proxy_button').set_sensitive(True) - self.xml.get_object('proxytype_combobox').set_sensitive(True) - self.xml.get_object('proxy_table').set_sensitive(True) - proxyhost_entry.set_text(app.config.get_per('proxies', proxy, - 'host')) - proxyport_entry.set_text(str(app.config.get_per('proxies', - proxy, 'port'))) - proxyuser_entry.set_text(app.config.get_per('proxies', proxy, - 'user')) - proxypass_entry.set_text(app.config.get_per('proxies', proxy, - 'pass')) - boshuri_entry.set_text(app.config.get_per('proxies', proxy, - 'bosh_uri')) - types = ['http', 'socks5', 'bosh'] - self.proxytype_combobox.set_active(types.index(proxytype)) - boshuseproxy_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'bosh_useproxy')) - useauth_checkbutton.set_active( - app.config.get_per('proxies', proxy, 'useauth')) - self.block_signal = False - - def on_proxies_treeview_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Delete: - self.on_remove_proxy_button_clicked(widget) - - def on_proxyname_entry_changed(self, widget): - if self.block_signal: - return - sel = self.proxies_treeview.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - old_name = model.get_value(iter_, 0) - new_name = widget.get_text() - if new_name == '': - return - if new_name == old_name: - return - config = app.config.get_per('proxies', old_name) - app.config.del_per('proxies', old_name) - app.config.add_per('proxies', new_name) - for option in config: - app.config.set_per('proxies', new_name, option, config[option]) - model.set_value(iter_, 0, new_name) - - def on_proxytype_combobox_changed(self, widget): - if self.block_signal: - return - types = ['http', 'socks5', 'bosh'] - type_ = self.proxytype_combobox.get_active() - self.show_bosh_fields(types[type_] == 'bosh') - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'type', types[type_]) - - def on_proxyhost_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'host', value) - - def on_proxyport_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'port', value) - - def on_proxyuser_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'user', value) - - def on_boshuri_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'bosh_uri', value) - - def on_proxypass_entry_changed(self, widget): - if self.block_signal: - return - value = widget.get_text() - proxy = self.proxyname_entry.get_text() - app.config.set_per('proxies', proxy, 'pass', value) class FakeDataForm(Gtk.Table): @@ -347,227 +94,6 @@ class FakeDataForm(Gtk.Table): self.infos[name] = self.entries[name].get_text() return self.infos -class GroupchatConfigWindow: - - def __init__(self, account, room_jid, form=None): - self.account = account - self.room_jid = room_jid - self.form = form - self.remove_button = {} - self.affiliation_treeview = {} - self.start_users_dict = {} # list at the beginning - self.affiliation_labels = {'outcast': _('Ban List'), - 'member': _('Member List'), 'owner': _('Owner List'), - 'admin':_('Administrator List')} - - self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', - 'data_form_window') - self.window = self.xml.get_object('data_form_window') - self.window.set_transient_for(app.interface.roster.window) - - if self.form: - config_vbox = self.xml.get_object('config_vbox') - self.data_form_widget = dataforms_widget.DataFormWidget(self.form) - # hide scrollbar of this data_form_widget, we already have in this - # widget - sw = self.data_form_widget.xml.get_object( - 'single_form_scrolledwindow') - sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) - if self.form.title: - self.xml.get_object('title_label').set_text(self.form.title) - else: - self.xml.get_object('title_hseparator').set_no_show_all(True) - self.xml.get_object('title_hseparator').hide() - - self.data_form_widget.show() - config_vbox.pack_start(self.data_form_widget, True, True, 0) - else: - self.xml.get_object('title_label').set_no_show_all(True) - self.xml.get_object('title_label').hide() - self.xml.get_object('title_hseparator').set_no_show_all(True) - self.xml.get_object('title_hseparator').hide() - self.xml.get_object('config_hseparator').set_no_show_all(True) - self.xml.get_object('config_hseparator').hide() - - # Draw the edit affiliation list things - add_on_vbox = self.xml.get_object('add_on_vbox') - - for affiliation in self.affiliation_labels: - self.start_users_dict[affiliation] = {} - hbox = Gtk.HBox(spacing=5) - add_on_vbox.pack_start(hbox, False, True, 0) - - label = Gtk.Label(label=self.affiliation_labels[affiliation]) - hbox.pack_start(label, False, True, 0) - - bb = Gtk.HButtonBox() - bb.set_layout(Gtk.ButtonBoxStyle.END) - bb.set_spacing(5) - hbox.pack_start(bb, True, True, 0) - add_button = Gtk.Button(stock=Gtk.STOCK_ADD) - add_button.connect('clicked', self.on_add_button_clicked, - affiliation) - bb.pack_start(add_button, True, True, 0) - self.remove_button[affiliation] = Gtk.Button(stock=Gtk.STOCK_REMOVE) - self.remove_button[affiliation].set_sensitive(False) - self.remove_button[affiliation].connect('clicked', - self.on_remove_button_clicked, affiliation) - bb.pack_start(self.remove_button[affiliation], True, True, 0) - - # jid, reason, nick, role - liststore = Gtk.ListStore(str, str, str, str) - self.affiliation_treeview[affiliation] = Gtk.TreeView(liststore) - self.affiliation_treeview[affiliation].get_selection().set_mode( - Gtk.SelectionMode.MULTIPLE) - self.affiliation_treeview[affiliation].connect('cursor-changed', - self.on_affiliation_treeview_cursor_changed, affiliation) - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('JID'), renderer) - col.add_attribute(renderer, 'text', 0) - col.set_resizable(True) - col.set_sort_column_id(0) - self.affiliation_treeview[affiliation].append_column(col) - - if affiliation == 'outcast': - renderer = Gtk.CellRendererText() - renderer.set_property('editable', True) - renderer.connect('edited', self.on_cell_edited) - col = Gtk.TreeViewColumn(_('Reason'), renderer) - col.add_attribute(renderer, 'text', 1) - col.set_resizable(True) - col.set_sort_column_id(1) - self.affiliation_treeview[affiliation].append_column(col) - elif affiliation == 'member': - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Nick'), renderer) - col.add_attribute(renderer, 'text', 2) - col.set_resizable(True) - col.set_sort_column_id(2) - self.affiliation_treeview[affiliation].append_column(col) - renderer = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Role'), renderer) - col.add_attribute(renderer, 'text', 3) - col.set_resizable(True) - col.set_sort_column_id(3) - self.affiliation_treeview[affiliation].append_column(col) - - sw = Gtk.ScrolledWindow() - sw.add(self.affiliation_treeview[affiliation]) - add_on_vbox.pack_start(sw, True, True, 0) - con = app.connections[self.account] - con.get_module('MUC').get_affiliation(self.room_jid, affiliation) - - self.xml.connect_signals(self) - self.window.connect('delete-event', self.on_cancel_button_clicked) - self.window.show_all() - - def on_cancel_button_clicked(self, *args): - if self.form: - con = app.connections[self.account] - con.get_module('MUC').cancel_config(self.room_jid) - self.window.destroy() - - def on_cell_edited(self, cell, path, new_text): - model = self.affiliation_treeview['outcast'].get_model() - new_text = new_text - iter_ = model.get_iter(path) - model[iter_][1] = new_text - - def on_add_button_clicked(self, widget, affiliation): - if affiliation == 'outcast': - title = _('Banning…') - #You can move '\n' before user@domain if that line is TOO BIG - prompt = _('<b>Whom do you want to ban?</b>\n\n') - elif affiliation == 'member': - title = _('Adding Member…') - prompt = _('<b>Whom do you want to make a member?</b>\n\n') - elif affiliation == 'owner': - title = _('Adding Owner…') - prompt = _('<b>Whom do you want to make an owner?</b>\n\n') - else: - title = _('Adding Administrator…') - prompt = _('<b>Whom do you want to make an administrator?</b>\n\n') - prompt += _('Can be one of the following:\n' - '1. user@domain/resource (only that resource matches).\n' - '2. user@domain (any resource matches).\n' - '3. domain/resource (only that resource matches).\n' - '4. domain (the domain itself matches, as does any user@domain,\n' - 'domain/resource, or address containing a subdomain).') - - def on_ok(jid): - if not jid: - return - model = self.affiliation_treeview[affiliation].get_model() - model.append((jid, '', '', '')) - InputDialog(title, prompt, ok_handler=on_ok) - - def on_remove_button_clicked(self, widget, affiliation): - selection = self.affiliation_treeview[affiliation].get_selection() - model, paths = selection.get_selected_rows() - row_refs = [] - for path in paths: - row_refs.append(Gtk.TreeRowReference.new(model, path)) - for row_ref in row_refs: - path = row_ref.get_path() - iter_ = model.get_iter(path) - model.remove(iter_) - self.remove_button[affiliation].set_sensitive(False) - - def on_affiliation_treeview_cursor_changed(self, widget, affiliation): - self.remove_button[affiliation].set_sensitive(True) - - def affiliation_list_received(self, users_dict): - """ - Fill the affiliation treeview - """ - for jid in users_dict: - affiliation = users_dict[jid]['affiliation'] - if affiliation not in self.affiliation_labels.keys(): - # Unknown affiliation or 'none' affiliation, do not show it - continue - self.start_users_dict[affiliation][jid] = users_dict[jid] - tv = self.affiliation_treeview[affiliation] - model = tv.get_model() - reason = users_dict[jid].get('reason', '') - nick = users_dict[jid].get('nick', '') - role = users_dict[jid].get('role', '') - model.append((jid, reason, nick, role)) - - def on_data_form_window_destroy(self, widget): - del app.interface.instances[self.account]['gc_config'][self.room_jid] - - def on_ok_button_clicked(self, widget): - if self.form: - form = self.data_form_widget.data_form - con = app.connections[self.account] - con.get_module('MUC').set_config(self.room_jid, form) - for affiliation in self.affiliation_labels: - users_dict = {} - actual_jid_list = [] - model = self.affiliation_treeview[affiliation].get_model() - iter_ = model.get_iter_first() - # add new jid - while iter_: - jid = model[iter_][0] - actual_jid_list.append(jid) - if jid not in self.start_users_dict[affiliation] or \ - (affiliation == 'outcast' and 'reason' in self.start_users_dict[ - affiliation][jid] and self.start_users_dict[affiliation][jid]\ - ['reason'] != model[iter_][1]): - users_dict[jid] = {'affiliation': affiliation} - if affiliation == 'outcast': - users_dict[jid]['reason'] = model[iter_][1] - iter_ = model.iter_next(iter_) - # remove removed one - for jid in self.start_users_dict[affiliation]: - if jid not in actual_jid_list: - users_dict[jid] = {'affiliation': 'none'} - if users_dict: - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, users_dict) - self.window.destroy() - #---------- RemoveAccountWindow class -------------# class RemoveAccountWindow: """ @@ -692,106 +218,3 @@ class RemoveAccountWindow: if window is not None: window.remove_account(self.account) self.window.destroy() - - -class ManageSoundsWindow: - def __init__(self, transient): - self._builder = gtkgui_helpers.get_gtk_builder( - 'manage_sounds_window.ui') - self.window = self._builder.get_object('manage_sounds_window') - self.window.set_transient_for(transient) - - self.sound_button = self._builder.get_object('filechooser') - - filter_ = Gtk.FileFilter() - filter_.set_name(_('All files')) - filter_.add_pattern('*') - self.sound_button.add_filter(filter_) - - filter_ = Gtk.FileFilter() - filter_.set_name(_('Wav Sounds')) - filter_.add_pattern('*.wav') - self.sound_button.add_filter(filter_) - self.sound_button.set_filter(filter_) - - self.sound_tree = self._builder.get_object('sounds_treeview') - - self._fill_sound_treeview() - - self._builder.connect_signals(self) - - self.window.show_all() - - def _on_row_changed(self, model, path, iter_): - sound_event = model[iter_][3] - app.config.set_per('soundevents', sound_event, - 'enabled', bool(model[path][0])) - app.config.set_per('soundevents', sound_event, - 'path', model[iter_][2]) - - def _on_toggle(self, cell, path): - if self.sound_button.get_filename() is None: - return - model = self.sound_tree.get_model() - model[path][0] = not model[path][0] - - def _fill_sound_treeview(self): - model = self.sound_tree.get_model() - model.clear() - - # NOTE: sounds_ui_names MUST have all items of - # sounds = app.config.get_per('soundevents') as keys - sounds_dict = { - 'attention_received': _('Attention Message Received'), - 'first_message_received': _('First Message Received'), - 'next_message_received_focused': _('Next Message Received Focused'), - 'next_message_received_unfocused': _('Next Message Received Unfocused'), - 'contact_connected': _('Contact Connected'), - 'contact_disconnected': _('Contact Disconnected'), - 'message_sent': _('Message Sent'), - 'muc_message_highlight': _('Group Chat Message Highlight'), - 'muc_message_received': _('Group Chat Message Received'), - } - - for config_name, sound_name in sounds_dict.items(): - enabled = app.config.get_per('soundevents', config_name, 'enabled') - path = app.config.get_per('soundevents', config_name, 'path') - model.append((enabled, sound_name, path, config_name)) - - def _on_cursor_changed(self, treeview): - model, iter_ = treeview.get_selection().get_selected() - path_to_snd_file = helpers.check_soundfile_path(model[iter_][2]) - if path_to_snd_file is None: - self.sound_button.unselect_all() - else: - self.sound_button.set_filename(path_to_snd_file) - - def _on_file_set(self, button): - model, iter_ = self.sound_tree.get_selection().get_selected() - - filename = button.get_filename() - directory = os.path.dirname(filename) - app.config.set('last_sounds_dir', directory) - path_to_snd_file = helpers.strip_soundfile_path(filename) - - # set new path to sounds_model - model[iter_][2] = path_to_snd_file - # set the sound to enabled - model[iter_][0] = True - - def _on_clear(self, *args): - self.sound_button.unselect_all() - model, iter_ = self.sound_tree.get_selection().get_selected() - model[iter_][2] = '' - model[iter_][0] = False - - def _on_play(self, *args): - model, iter_ = self.sound_tree.get_selection().get_selected() - snd_event_config_name = model[iter_][3] - helpers.play_sound(snd_event_config_name) - - def _on_destroy(self, *args): - self.window.destroy() - window = app.get_app_window('Preferences') - if window is not None: - window.sounds_preferences = None ===================================== gajim/groupchat_control.py ===================================== @@ -42,7 +42,6 @@ from gi.repository import Gio from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import message_control -from gajim import config from gajim import vcard from gajim import dataforms_widget from gajim import adhoc_commands @@ -76,6 +75,7 @@ from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip +from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_image_from_icon_name @@ -742,7 +742,7 @@ class GroupchatControl(ChatControlBase): if self.room_jid not in app.interface.instances[self.account][ 'gc_config']: app.interface.instances[self.account]['gc_config'][ - self.room_jid] = config.GroupchatConfigWindow(self.account, + self.room_jid] = GroupchatConfig(self.account, self.room_jid) def _on_bookmark_room(self, action, param): ===================================== gajim/gtk/account_wizard.py ===================================== @@ -30,12 +30,11 @@ from gajim import gtkgui_helpers from gajim import dataforms_widget from gajim import gui_menu_builder -from gajim.config import ManageProxiesWindow from gajim.config import FakeDataForm from gajim.gtk.util import get_builder from gajim.gtk.dialogs import ErrorDialog - +from gajim.gtk.proxies import ManageProxies class AccountCreationWizard: @@ -352,8 +351,7 @@ class AccountCreationWizard: if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = \ - ManageProxiesWindow() + app.interface.instances['manage_proxies'] = ManageProxies() def on_custom_host_port_checkbutton_toggled(self, widget): self.xml.get_object('custom_host_hbox').set_sensitive( ===================================== gajim/gtk/dialogs.py ===================================== @@ -1022,7 +1022,6 @@ class NewConfirmationDialog(Gtk.MessageDialog): class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() - print(transient) builder = get_builder('shortcuts_window.ui') self.window = builder.get_object('shortcuts_window') self.window.connect('destroy', self._on_window_destroy) ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -0,0 +1,248 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim import dataforms_widget + +from gajim.gtk.util import get_builder +from gajim.gtk.dialogs import InputDialog + + +class GroupchatConfig: + def __init__(self, account, room_jid, form=None): + self.account = account + self.room_jid = room_jid + self.form = form + self.remove_button = {} + self.affiliation_treeview = {} + self.start_users_dict = {} # list at the beginning + self.affiliation_labels = { + 'outcast': _('Ban List'), + 'member': _('Member List'), + 'owner': _('Owner List'), + 'admin':_('Administrator List') + } + + self._ui = get_builder('data_form_window.ui', ['data_form_window']) + self.window = self._ui.data_form_window + self.window.set_transient_for(app.interface.roster.window) + + if self.form: + self.data_form_widget = dataforms_widget.DataFormWidget(self.form) + # hide scrollbar of this data_form_widget, we already have in this + # widget + sw = self.data_form_widget.xml.get_object( + 'single_form_scrolledwindow') + sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) + if self.form.title: + self._ui.title_label.set_text(self.form.title) + else: + self._ui.title_hseparator.set_no_show_all(True) + self._ui.title_hseparator.hide() + + self.data_form_widget.show() + self._ui.config_vbox.pack_start(self.data_form_widget, True, True, 0) + else: + self._ui.title_label.set_no_show_all(True) + self._ui.title_label.hide() + self._ui.title_hseparator.set_no_show_all(True) + self._ui.title_hseparator.hide() + self._ui.config_hseparator.set_no_show_all(True) + self._ui.config_hseparator.hide() + + # Draw the edit affiliation list things + add_on_vbox = self._ui.add_on_vbox + + for affiliation in self.affiliation_labels: + self.start_users_dict[affiliation] = {} + hbox = Gtk.HBox(spacing=5) + add_on_vbox.pack_start(hbox, False, True, 0) + + label = Gtk.Label(label=self.affiliation_labels[affiliation]) + hbox.pack_start(label, False, True, 0) + + bb = Gtk.HButtonBox() + bb.set_layout(Gtk.ButtonBoxStyle.END) + bb.set_spacing(5) + hbox.pack_start(bb, True, True, 0) + add_button = Gtk.Button(stock=Gtk.STOCK_ADD) + add_button.connect( + 'clicked', self.on_add_button_clicked, affiliation) + bb.pack_start(add_button, True, True, 0) + self.remove_button[affiliation] = Gtk.Button(stock=Gtk.STOCK_REMOVE) + self.remove_button[affiliation].set_sensitive(False) + self.remove_button[affiliation].connect( + 'clicked', self.on_remove_button_clicked, affiliation) + bb.pack_start(self.remove_button[affiliation], True, True, 0) + + # jid, reason, nick, role + liststore = Gtk.ListStore(str, str, str, str) + self.affiliation_treeview[affiliation] = Gtk.TreeView(liststore) + self.affiliation_treeview[affiliation].get_selection().set_mode( + Gtk.SelectionMode.MULTIPLE) + self.affiliation_treeview[affiliation].connect( + 'cursor-changed', + self.on_affiliation_treeview_cursor_changed, + affiliation) + renderer = Gtk.CellRendererText() + col = Gtk.TreeViewColumn(_('JID'), renderer) + col.add_attribute(renderer, 'text', 0) + col.set_resizable(True) + col.set_sort_column_id(0) + self.affiliation_treeview[affiliation].append_column(col) + + if affiliation == 'outcast': + renderer = Gtk.CellRendererText() + renderer.set_property('editable', True) + renderer.connect('edited', self.on_cell_edited) + col = Gtk.TreeViewColumn(_('Reason'), renderer) + col.add_attribute(renderer, 'text', 1) + col.set_resizable(True) + col.set_sort_column_id(1) + self.affiliation_treeview[affiliation].append_column(col) + elif affiliation == 'member': + renderer = Gtk.CellRendererText() + col = Gtk.TreeViewColumn(_('Nick'), renderer) + col.add_attribute(renderer, 'text', 2) + col.set_resizable(True) + col.set_sort_column_id(2) + self.affiliation_treeview[affiliation].append_column(col) + renderer = Gtk.CellRendererText() + col = Gtk.TreeViewColumn(_('Role'), renderer) + col.add_attribute(renderer, 'text', 3) + col.set_resizable(True) + col.set_sort_column_id(3) + self.affiliation_treeview[affiliation].append_column(col) + + sw = Gtk.ScrolledWindow() + sw.add(self.affiliation_treeview[affiliation]) + add_on_vbox.pack_start(sw, True, True, 0) + con = app.connections[self.account] + con.get_module('MUC').get_affiliation(self.room_jid, affiliation) + + self._ui.connect_signals(self) + self.window.connect('delete-event', self.on_cancel_button_clicked) + self.window.show_all() + + def on_cancel_button_clicked(self, *args): + if self.form: + con = app.connections[self.account] + con.get_module('MUC').cancel_config(self.room_jid) + self.window.destroy() + + def on_cell_edited(self, _cell, path, new_text): + model = self.affiliation_treeview['outcast'].get_model() + new_text = new_text + iter_ = model.get_iter(path) + model[iter_][1] = new_text + + def on_add_button_clicked(self, _widget, affiliation): + if affiliation == 'outcast': + title = _('Banning…') + #You can move '\n' before user@domain if that line is TOO BIG + prompt = _('<b>Whom do you want to ban?</b>\n\n') + elif affiliation == 'member': + title = _('Adding Member…') + prompt = _('<b>Whom do you want to make a member?</b>\n\n') + elif affiliation == 'owner': + title = _('Adding Owner…') + prompt = _('<b>Whom do you want to make an owner?</b>\n\n') + else: + title = _('Adding Administrator…') + prompt = _('<b>Whom do you want to make an administrator?</b>\n\n') + prompt += _( + 'Can be one of the following:\n' + '1. user@domain/resource (only that resource matches).\n' + '2. user@domain (any resource matches).\n' + '3. domain/resource (only that resource matches).\n' + '4. domain (the domain itself matches, as does any user@domain,\n' + 'domain/resource, or address containing a subdomain).') + + def on_ok(jid): + if not jid: + return + model = self.affiliation_treeview[affiliation].get_model() + model.append((jid, '', '', '')) + InputDialog(title, prompt, ok_handler=on_ok) + + def on_remove_button_clicked(self, _widget, affiliation): + selection = self.affiliation_treeview[affiliation].get_selection() + model, paths = selection.get_selected_rows() + row_refs = [] + for path in paths: + row_refs.append(Gtk.TreeRowReference.new(model, path)) + for row_ref in row_refs: + path = row_ref.get_path() + iter_ = model.get_iter(path) + model.remove(iter_) + self.remove_button[affiliation].set_sensitive(False) + + def on_affiliation_treeview_cursor_changed(self, _widget, affiliation): + self.remove_button[affiliation].set_sensitive(True) + + def affiliation_list_received(self, users_dict): + """ + Fill the affiliation treeview + """ + for jid in users_dict: + affiliation = users_dict[jid]['affiliation'] + if affiliation not in self.affiliation_labels.keys(): + # Unknown affiliation or 'none' affiliation, do not show it + continue + self.start_users_dict[affiliation][jid] = users_dict[jid] + tv = self.affiliation_treeview[affiliation] + model = tv.get_model() + reason = users_dict[jid].get('reason', '') + nick = users_dict[jid].get('nick', '') + role = users_dict[jid].get('role', '') + model.append((jid, reason, nick, role)) + + def on_data_form_window_destroy(self, _widget): + del app.interface.instances[self.account]['gc_config'][self.room_jid] + + def on_ok_button_clicked(self, _widget): + if self.form: + form = self.data_form_widget.data_form + con = app.connections[self.account] + con.get_module('MUC').set_config(self.room_jid, form) + for affiliation in self.affiliation_labels: + users_dict = {} + actual_jid_list = [] + model = self.affiliation_treeview[affiliation].get_model() + iter_ = model.get_iter_first() + # add new jid + while iter_: + jid = model[iter_][0] + actual_jid_list.append(jid) + if jid not in self.start_users_dict[affiliation] or \ + (affiliation == 'outcast' and 'reason' in self.start_users_dict[ + affiliation][jid] and self.start_users_dict[affiliation][jid]\ + ['reason'] != model[iter_][1]): + users_dict[jid] = {'affiliation': affiliation} + if affiliation == 'outcast': + users_dict[jid]['reason'] = model[iter_][1] + iter_ = model.iter_next(iter_) + # remove removed one + for jid in self.start_users_dict[affiliation]: + if jid not in actual_jid_list: + users_dict[jid] = {'affiliation': 'none'} + if users_dict: + con = app.connections[self.account] + con.get_module('MUC').set_affiliation( + self.room_jid, users_dict) + self.window.destroy() ===================================== gajim/gtk/preferences.py ===================================== @@ -31,14 +31,13 @@ from gajim import gtkgui_helpers from gajim.chat_control_base import ChatControlBase -from gajim.config import ManageProxiesWindow -from gajim.config import ManageSoundsWindow - from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.dialogs import AspellDictError from gajim.gtk.themes import Themes from gajim.gtk.advanced_config import AdvancedConfig +from gajim.gtk.proxies import ManageProxies +from gajim.gtk.sounds import ManageSounds try: from gajim.common.multimedia_helpers import AudioInputManager, AudioOutputManager @@ -683,7 +682,7 @@ class Preferences(Gtk.ApplicationWindow): def on_manage_sounds_button_clicked(self, widget): if self.sounds_preferences is None: - self.sounds_preferences = ManageSoundsWindow(self) + self.sounds_preferences = ManageSounds(self) else: self.sounds_preferences.window.present() @@ -1024,7 +1023,7 @@ class Preferences(Gtk.ApplicationWindow): if 'manage_proxies' in app.interface.instances: app.interface.instances['manage_proxies'].window.present() else: - app.interface.instances['manage_proxies'] = ManageProxiesWindow(self) + app.interface.instances['manage_proxies'] = ManageProxies(self) def update_proxy_list(self): our_proxy = app.config.get('global_proxy') ===================================== gajim/gtk/proxies.py ===================================== @@ -0,0 +1,253 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk +from gi.repository import Gdk + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder + + +class ManageProxies: + def __init__(self, transient_for=None): + self._ui = get_builder('manage_proxies_window.ui') + self.window = self._ui.manage_proxies_window + self.window.set_transient_for(transient_for) + + self.init_list() + self.block_signal = False + self._ui.connect_signals(self) + self.window.show_all() + # hide the BOSH fields by default + self.show_bosh_fields() + + def show_bosh_fields(self, show=True): + if show: + self._ui.boshuri_entry.show() + self._ui.boshuri_label.show() + self._ui.boshuseproxy_checkbutton.show() + else: + cb = self._ui.boshuseproxy_checkbutton + cb.hide() + cb.set_active(True) + self.on_boshuseproxy_checkbutton_toggled(cb) + self._ui.boshuri_entry.hide() + self._ui.boshuri_label.hide() + + def fill_proxies_treeview(self): + model = self._ui.proxies_treeview.get_model() + model.clear() + iter_ = model.append() + model.set(iter_, 0, _('None')) + for proxy in app.config.get_per('proxies'): + iter_ = model.append() + model.set(iter_, 0, proxy) + + def init_list(self): + self._ui.remove_proxy_button.set_sensitive(False) + self._ui.proxytype_combobox.set_sensitive(False) + self._ui.proxy_table.set_sensitive(False) + model = Gtk.ListStore(str) + self._ui.proxies_treeview.set_model(model) + col = Gtk.TreeViewColumn('Proxies') + self._ui.proxies_treeview.append_column(col) + renderer = Gtk.CellRendererText() + col.pack_start(renderer, True) + col.add_attribute(renderer, 'text', 0) + self.fill_proxies_treeview() + self._ui.proxytype_combobox.set_active(0) + + def on_manage_proxies_window_destroy(self, _widget): + window = app.get_app_window('AccountsWindow') + if window is not None: + window.update_proxy_list() + del app.interface.instances['manage_proxies'] + + def on_add_proxy_button_clicked(self, _widget): + model = self._ui.proxies_treeview.get_model() + proxies = app.config.get_per('proxies') + i = 1 + while 'proxy' + str(i) in proxies: + i += 1 + iter_ = model.append() + model.set(iter_, 0, 'proxy' + str(i)) + app.config.add_per('proxies', 'proxy' + str(i)) + self._ui.proxies_treeview.set_cursor(model.get_path(iter_)) + + def on_remove_proxy_button_clicked(self, _widget): + sel = self._ui.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() + if not iter_: + return + proxy = model[iter_][0] + model.remove(iter_) + app.config.del_per('proxies', proxy) + self._ui.remove_proxy_button.set_sensitive(False) + self.block_signal = True + self.on_proxies_treeview_cursor_changed(self._ui.proxies_treeview) + self.block_signal = False + + def on_close_button_clicked(self, _widget): + self.window.destroy() + + def on_useauth_checkbutton_toggled(self, widget): + if self.block_signal: + return + act = widget.get_active() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'useauth', act) + self._ui.proxyuser_entry.set_sensitive(act) + self._ui.proxypass_entry.set_sensitive(act) + + def on_boshuseproxy_checkbutton_toggled(self, widget): + if self.block_signal: + return + act = widget.get_active() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'bosh_useproxy', act) + self._ui.proxyhost_entry.set_sensitive(act) + self._ui.proxyport_entry.set_sensitive(act) + + def on_proxies_treeview_cursor_changed(self, widget): + #FIXME: check if off proxy settings are correct (see + # http://trac.gajim.org/changeset/1921#file2 line 1221 + + self.block_signal = True + self._ui.proxyhost_entry.set_text('') + self._ui.proxyport_entry.set_text('') + self._ui.proxyuser_entry.set_text('') + self._ui.proxypass_entry.set_text('') + self._ui.boshuri_entry.set_text('') + + sel = widget.get_selection() + if sel: + (model, iter_) = sel.get_selected() + else: + iter_ = None + if not iter_: + self._ui.proxyname_entry.set_text('') + self._ui.proxytype_combobox.set_sensitive(False) + self._ui.proxy_table.set_sensitive(False) + self.block_signal = False + return + + proxy = model[iter_][0] + self._ui.proxyname_entry.set_text(proxy) + + if proxy == _('None'): # special proxy None + self.show_bosh_fields(False) + self._ui.proxyname_entry.set_editable(False) + self._ui.remove_proxy_button.set_sensitive(False) + self._ui.proxytype_combobox.set_sensitive(False) + self._ui.proxy_table.set_sensitive(False) + else: + proxytype = app.config.get_per('proxies', proxy, 'type') + + self.show_bosh_fields(proxytype == 'bosh') + + self._ui.proxyname_entry.set_editable(True) + self._ui.remove_proxy_button.set_sensitive(True) + self._ui.proxytype_combobox.set_sensitive(True) + self._ui.proxy_table.set_sensitive(True) + self._ui.proxyhost_entry.set_text( + app.config.get_per('proxies', proxy, 'host')) + self._ui.proxyport_entry.set_text( + str(app.config.get_per('proxies', proxy, 'port'))) + self._ui.proxyuser_entry.set_text( + app.config.get_per('proxies', proxy, 'user')) + self._ui.proxypass_entry.set_text( + app.config.get_per('proxies', proxy, 'pass')) + self._ui.boshuri_entry.set_text( + app.config.get_per('proxies', proxy, 'bosh_uri')) + types = ['http', 'socks5', 'bosh'] + self._ui.proxytype_combobox.set_active(types.index(proxytype)) + self._ui.boshuseproxy_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'bosh_useproxy')) + self._ui.useauth_checkbutton.set_active( + app.config.get_per('proxies', proxy, 'useauth')) + self.block_signal = False + + def on_proxies_treeview_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Delete: + self.on_remove_proxy_button_clicked(widget) + + def on_proxyname_entry_changed(self, widget): + if self.block_signal: + return + sel = self._ui.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() + if not iter_: + return + old_name = model.get_value(iter_, 0) + new_name = widget.get_text() + if new_name == '': + return + if new_name == old_name: + return + config = app.config.get_per('proxies', old_name) + app.config.del_per('proxies', old_name) + app.config.add_per('proxies', new_name) + for option in config: + app.config.set_per('proxies', new_name, option, config[option]) + model.set_value(iter_, 0, new_name) + + def on_proxytype_combobox_changed(self, _widget): + if self.block_signal: + return + types = ['http', 'socks5', 'bosh'] + type_ = self._ui.proxytype_combobox.get_active() + self.show_bosh_fields(types[type_] == 'bosh') + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'type', types[type_]) + + def on_proxyhost_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'host', value) + + def on_proxyport_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'port', value) + + def on_proxyuser_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'user', value) + + def on_boshuri_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'bosh_uri', value) + + def on_proxypass_entry_changed(self, widget): + if self.block_signal: + return + value = widget.get_text() + proxy = self._ui.proxyname_entry.get_text() + app.config.set_per('proxies', proxy, 'pass', value) ===================================== gajim/gtk/sounds.py ===================================== @@ -0,0 +1,122 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import os + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import helpers +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder + + +class ManageSounds: + def __init__(self, transient): + self._ui = get_builder('manage_sounds_window.ui') + self.window = self._ui.manage_sounds_window + self.window.set_transient_for(transient) + + filter_ = Gtk.FileFilter() + filter_.set_name(_('All files')) + filter_.add_pattern('*') + self._ui.filechooser.add_filter(filter_) + + filter_ = Gtk.FileFilter() + filter_.set_name(_('Wav Sounds')) + filter_.add_pattern('*.wav') + self._ui.filechooser.add_filter(filter_) + self._ui.filechooser.set_filter(filter_) + + self._fill_sound_treeview() + + self._ui.connect_signals(self) + + self.window.show_all() + + @staticmethod + def _on_row_changed(model, path, iter_): + sound_event = model[iter_][3] + app.config.set_per('soundevents', sound_event, + 'enabled', bool(model[path][0])) + app.config.set_per('soundevents', sound_event, + 'path', model[iter_][2]) + + def _on_toggle(self, _cell, path): + if self._ui.filechooser.get_filename() is None: + return + model = self._ui.sounds_treeview.get_model() + model[path][0] = not model[path][0] + + def _fill_sound_treeview(self): + model = self._ui.sounds_treeview.get_model() + model.clear() + + # NOTE: sounds_ui_names MUST have all items of + # sounds = app.config.get_per('soundevents') as keys + sounds_dict = { + 'attention_received': _('Attention Message Received'), + 'first_message_received': _('First Message Received'), + 'next_message_received_focused': _('Next Message Received Focused'), + 'next_message_received_unfocused': _('Next Message Received Unfocused'), + 'contact_connected': _('Contact Connected'), + 'contact_disconnected': _('Contact Disconnected'), + 'message_sent': _('Message Sent'), + 'muc_message_highlight': _('Group Chat Message Highlight'), + 'muc_message_received': _('Group Chat Message Received'), + } + + for config_name, sound_name in sounds_dict.items(): + enabled = app.config.get_per('soundevents', config_name, 'enabled') + path = app.config.get_per('soundevents', config_name, 'path') + model.append((enabled, sound_name, path, config_name)) + + def _on_cursor_changed(self, treeview): + model, iter_ = treeview.get_selection().get_selected() + path_to_snd_file = helpers.check_soundfile_path(model[iter_][2]) + if path_to_snd_file is None: + self._ui.filechooser.unselect_all() + else: + self._ui.filechooser.set_filename(path_to_snd_file) + + def _on_file_set(self, button): + model, iter_ = self._ui.sounds_treeview.get_selection().get_selected() + + filename = button.get_filename() + directory = os.path.dirname(filename) + app.config.set('last_sounds_dir', directory) + path_to_snd_file = helpers.strip_soundfile_path(filename) + + # set new path to sounds_model + model[iter_][2] = path_to_snd_file + # set the sound to enabled + model[iter_][0] = True + + def _on_clear(self, *args): + self._ui.filechooser.unselect_all() + model, iter_ = self._ui.sounds_treeview.get_selection().get_selected() + model[iter_][2] = '' + model[iter_][0] = False + + def _on_play(self, *args): + model, iter_ = self._ui.sounds_treeview.get_selection().get_selected() + snd_event_config_name = model[iter_][3] + helpers.play_sound(snd_event_config_name) + + def _on_destroy(self, *args): + self.window.destroy() + window = app.get_app_window('Preferences') + if window is not None: + window.sounds_preferences = None ===================================== gajim/gui_interface.py ===================================== @@ -100,7 +100,6 @@ from gajim.common.const import AvatarSize, SSLError, PEPEventType from gajim.common.const import ACTIVITIES, MOODS from gajim import roster_window -from gajim import config from gajim.common import ged from gajim.common.caps_cache import muc_caps_cache from gajim.common import configpaths @@ -121,6 +120,7 @@ from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data +from gajim.gtk.groupchat_config import GroupchatConfig parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) @@ -604,7 +604,7 @@ class Interface: del app.automatic_rooms[account][obj.jid] elif obj.jid not in self.instances[account]['gc_config']: self.instances[account]['gc_config'][obj.jid] = \ - config.GroupchatConfigWindow(account, obj.jid, obj.dataform) + GroupchatConfig(account, obj.jid, obj.dataform) def handle_event_gc_affiliation(self, obj): #('GC_AFFILIATION', account, (room_jid, users_dict)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c109db6eebbbd2333e2845637b21dde67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c109db6eebbbd2333e2845637b21dde67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: Move tooltips module into gtk folder
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c97f0a9 by Philipp Hörist at 2018-10-28T08:33:40Z Move tooltips module into gtk folder - - - - - 7faebf2b by Philipp Hörist at 2018-10-28T09:20:59Z Tooltips: Refactor code - Use get_builder - Fix pylint errors - Move fill_table_with_accounts() to StatusTable class - - - - - a4077502 by Philipp Hörist at 2018-10-28T09:44:05Z Tooltips: Use icons from icontheme - - - - - e86c6193 by Philipp Hörist at 2018-10-28T13:17:04Z Rename and extend get_iconset_name_for() - - - - - 9734e7bd by Philipp Hörist at 2018-10-28T13:19:03Z Preferences: Use icons from icontheme - - - - - 960008a6 by Philipp Hörist at 2018-10-28T13:32:54Z Use get_icon_name() instead of get_iconset_name_for() - - - - - 6b5d559d by Philipp Hörist at 2018-10-28T13:37:19Z Fix error with some foreign keyboard layouts - - - - - c109db6e by Philipp Hörist at 2018-10-28T14:00:04Z Switch some calls to gtk.util helper methods - - - - - 17 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/dialogs.py - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/history.py - gajim/gtk/preferences.py - gajim/gtk/single_message.py - gajim/gtk/start_chat.py - gajim/gtk/statusicon.py - gajim/tooltips.py → gajim/gtk/tooltips.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/message_window.py - gajim/notify.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -54,6 +54,7 @@ from gajim import dialogs from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow +from gajim.gtk.util import get_icon_name from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import @@ -612,7 +613,7 @@ class ChatControl(ChatControlBase): show = contact.show # Set banner image - icon = gtkgui_helpers.get_iconset_name_for(show) + icon = get_icon_name(show) banner_status_img = self.xml.get_object('banner_status_image') banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) ===================================== gajim/chat_control_base.py ===================================== @@ -82,6 +82,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode except TypeError: keycode_c = 54 + except IndexError: + # FIXME + # On some keyboard layouts there is no keyval for KEY_c + keycode_c = None + try: keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[1][0].keycode except TypeError: ===================================== gajim/dialogs.py ===================================== @@ -55,6 +55,8 @@ from gajim.common.exceptions import GajimGeneralException # Compat with Gajim 1.0.3 for plugins from gajim.gtk.dialogs import * from gajim.gtk.add_contact import AddNewContactWindow +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import resize_window log = logging.getLogger('gajim.dialogs') @@ -1439,7 +1441,7 @@ class TransformChatToMUC: # Add contact if it can be invited if invitable(contact, contact_transport) and \ contact.show not in ('offline', 'error'): - icon_name = gtkgui_helpers.get_iconset_name_for(contact.show) + icon_name = get_icon_name(contact.show) name = contact.name if name == '': name = jid.split('@')[0] @@ -1558,7 +1560,7 @@ class DataFormWindow(Dialog): Gtk.ResponseType.CANCEL), (Gtk.STOCK_OK, Gtk.ResponseType.OK)], on_response_ok=self.on_ok) self.set_resizable(True) - gtkgui_helpers.resize_window(self, 600, 400) + resize_window(self, 600, 400) self.dataform_widget = dataforms_widget.DataFormWidget() self.dataform = dataforms.extend_form(node=form) self.dataform_widget.set_sensitive(True) ===================================== gajim/filetransfers_window.py ===================================== @@ -33,7 +33,6 @@ from gi.repository import Pango from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 from gajim import gtkgui_helpers -from gajim import tooltips from gajim.common import app from gajim.common import helpers @@ -50,6 +49,7 @@ from gajim.gtk.dialogs import FTOverwriteConfirmationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.filechoosers import FileChooserDialog +from gajim.gtk.tooltips import FileTransfersTooltip log = logging.getLogger('gajim.filetransfer_window') @@ -152,7 +152,7 @@ class FileTransfersWindow: # Tooltip self.tree.connect('query-tooltip', self._query_tooltip) self.tree.set_has_tooltip(True) - self.tooltip = tooltips.FileTransfersTooltip() + self.tooltip = FileTransfersTooltip() self.file_transfers_menu = self.xml.get_object('file_transfers_menu') self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem') ===================================== gajim/groupchat_control.py ===================================== @@ -39,11 +39,9 @@ from gi.repository import Pango from gi.repository import GLib from gi.repository import Gio - from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import message_control -from gajim import tooltips from gajim import config from gajim import vcard from gajim import dataforms_widget @@ -77,6 +75,9 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow +from gajim.gtk.tooltips import GCTooltip +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import get_image_from_icon_name log = logging.getLogger('gajim.groupchat_control') @@ -495,7 +496,7 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar.pack_start(self.subject_button) # GC Roster tooltip - self.gc_tooltip = tooltips.GCTooltip() + self.gc_tooltip = GCTooltip() self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id) settings_menu = self.xml.get_object('settings_menu') @@ -1092,9 +1093,9 @@ class GroupchatControl(ChatControlBase): def get_tab_image(self, count_unread=True): tab_image = None if self.is_connected: - tab_image = gtkgui_helpers.get_iconset_name_for('muc-active') + tab_image = get_icon_name('muc-active') else: - tab_image = gtkgui_helpers.get_iconset_name_for('muc-inactive') + tab_image = get_icon_name('muc-inactive') return tab_image def update_ui(self): @@ -1156,9 +1157,9 @@ class GroupchatControl(ChatControlBase): self.scale_factor) banner_status_img.set_from_surface(surface) return - icon = gtkgui_helpers.get_iconset_name_for('muc-active') + icon = get_icon_name('muc-active') else: - icon = gtkgui_helpers.get_iconset_name_for('muc-inactive') + icon = get_icon_name('muc-inactive') banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) def get_continued_conversation_name(self): @@ -1761,10 +1762,10 @@ class GroupchatControl(ChatControlBase): nick) theme = Gtk.IconTheme.get_default() if app.events.get_events(self.account, self.room_jid + '/' + nick): - icon_name = gtkgui_helpers.get_iconset_name_for('event') + icon_name = get_icon_name('event') surface = theme.load_surface(icon_name, 16, self.scale_factor, None, 0) else: - icon_name = gtkgui_helpers.get_iconset_name_for(gc_contact.show) + icon_name = get_icon_name(gc_contact.show) surface = theme.load_surface(icon_name, 16, self.scale_factor, None, 0) name = GLib.markup_escape_text(gc_contact.name) @@ -2123,8 +2124,7 @@ class GroupchatControl(ChatControlBase): # Create Role role_iter = self.get_role_iter(role) if not role_iter: - image = gtkgui_helpers.get_image_from_icon_name('closed', - self.scale_factor) + image = get_image_from_icon_name('closed', self.scale_factor) ext_columns = [None] * self.nb_ext_renderers row = [image, role, 'role', role_name, None] + ext_columns role_iter = self.model.append(None, row) @@ -2590,8 +2590,7 @@ class GroupchatControl(ChatControlBase): When a row is expanded: change the icon of the arrow """ model = widget.get_model() - image = gtkgui_helpers.get_image_from_icon_name( - 'opened', self.scale_factor) + image = get_image_from_icon_name('opened', self.scale_factor) model[iter_][Column.IMG] = image def on_list_treeview_row_collapsed(self, widget, iter_, path): @@ -2599,8 +2598,7 @@ class GroupchatControl(ChatControlBase): When a row is collapsed: change the icon of the arrow """ model = widget.get_model() - image = gtkgui_helpers.get_image_from_icon_name( - 'closed', self.scale_factor) + image = get_image_from_icon_name('closed', self.scale_factor) model[iter_][Column.IMG] = image def kick(self, widget, nick): ===================================== gajim/gtk/accounts.py ===================================== @@ -38,6 +38,7 @@ from gajim.options_dialog import OptionsBox from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.util import get_icon_name class AccountsWindow(Gtk.ApplicationWindow): @@ -425,7 +426,7 @@ class Account(Gtk.Box): def _update_image(self): show = helpers.get_current_show(self.account) - icon = gtkgui_helpers.get_iconset_name_for(show) + icon = get_icon_name(show) self.image.set_from_icon_name(icon, Gtk.IconSize.MENU) ===================================== gajim/gtk/history.py ===================================== @@ -23,7 +23,8 @@ import time import datetime -from enum import IntEnum, unique +from enum import IntEnum +from enum import unique from gi.repository import Gtk from gi.repository import Gdk @@ -33,12 +34,19 @@ from gajim.common import app from gajim.common import helpers from gajim.common import exceptions from gajim.common.i18n import _ -from gajim.common.const import ShowConstant, KindConstant +from gajim.common.const import ShowConstant +from gajim.common.const import KindConstant from gajim import conversation_textview -from gajim.gtk import util -from gajim.gtk.util import python_month, gtk_month +from gajim.gtk.util import python_month +from gajim.gtk.util import gtk_month +from gajim.gtk.util import resize_window +from gajim.gtk.util import move_window +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import get_completion_liststore +from gajim.gtk.util import get_builder + from gajim.gtk.dialogs import ErrorDialog @unique @@ -66,7 +74,7 @@ class HistoryWindow: """ def __init__(self, jid=None, account=None): - xml = util.get_builder('history_window.ui') + xml = get_builder('history_window.ui') self.window = xml.get_object('history_window') self.window.set_application(app.app) self.calendar = xml.get_object('calendar') @@ -137,12 +145,12 @@ class HistoryWindow: else: self._load_history(None) - util.resize_window(self.window, - app.config.get('history_window_width'), - app.config.get('history_window_height')) - util.move_window(self.window, - app.config.get('history_window_x-position'), - app.config.get('history_window_y-position')) + resize_window(self.window, + app.config.get('history_window_width'), + app.config.get('history_window_height')) + move_window(self.window, + app.config.get('history_window_x-position'), + app.config.get('history_window_y-position')) xml.connect_signals(self) self.window.show_all() @@ -163,7 +171,7 @@ class HistoryWindow: {key : (jid, account, nick_name, full_completion_name} This is a generator and does pseudo-threading via idle_add(). """ - liststore = util.get_completion_liststore( + liststore = get_completion_liststore( self.jid_entry.get_child()) liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) self.jid_entry.get_child().get_completion().connect( @@ -183,8 +191,8 @@ class HistoryWindow: completion_dict.update( helpers.get_contact_dict_for_account(account)) - muc_active_icon = util.get_iconset_name_for('muc-active') - online_icon = util.get_iconset_name_for('online') + muc_active_icon = get_icon_name('muc-active') + online_icon = get_icon_name('online') keys = list(completion_dict.keys()) # Move the actual jid at first so we load history faster ===================================== gajim/gtk/preferences.py ===================================== @@ -27,7 +27,6 @@ from gajim.common import idle from gajim.common.i18n import _ from gajim import message_control -from gajim import cell_renderer_image from gajim import gtkgui_helpers from gajim.chat_control_base import ChatControlBase @@ -36,6 +35,7 @@ from gajim.config import ManageProxiesWindow from gajim.config import ManageSoundsWindow from gajim.gtk.util import get_builder +from gajim.gtk.util import get_icon_name from gajim.gtk.dialogs import AspellDictError from gajim.gtk.themes import Themes from gajim.gtk.advanced_config import AdvancedConfig @@ -337,15 +337,15 @@ class Preferences(Gtk.ApplicationWindow): os.path.join(configpaths.get('DATA'), 'iconsets')) if os.path.isdir(configpaths.get('MY_ICONSETS')): iconsets_list += os.listdir(configpaths.get('MY_ICONSETS')) - # New model, image in 0, string in 1 - model = Gtk.ListStore(Gtk.Image, str) - renderer_image = cell_renderer_image.CellRendererImage(0, 0) + + model = Gtk.ListStore(str, str) + renderer_image = Gtk.CellRendererPixbuf() renderer_text = Gtk.CellRendererText() renderer_text.set_property('xpad', 5) self._ui.iconset_combobox.pack_start(renderer_image, False) self._ui.iconset_combobox.pack_start(renderer_text, True) self._ui.iconset_combobox.add_attribute(renderer_text, 'text', 1) - self._ui.iconset_combobox.add_attribute(renderer_image, 'image', 0) + self._ui.iconset_combobox.add_attribute(renderer_image, 'icon_name', 0) self._ui.iconset_combobox.set_model(model) dirlist = [] for dir_ in iconsets_list: @@ -357,16 +357,8 @@ class Preferences(Gtk.ApplicationWindow): if not dirlist: dirlist.append(' ') for index, dir_ in enumerate(dirlist): - preview = Gtk.Image() - files = [] - files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', - 'online.png')) - files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', - 'online.gif')) - for file_ in files: - if os.path.exists(file_): - preview.set_from_file(file_) - model.append([preview, dir_]) + icon_name = get_icon_name('online', iconset=dir_) + model.append([icon_name, dir_]) if app.config.get('iconset') == dir_: self._ui.iconset_combobox.set_active(index) ===================================== gajim/gtk/single_message.py ===================================== @@ -29,7 +29,7 @@ from gajim.conversation_textview import ConversationTextview from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_builder -from gajim.gtk.util import get_iconset_name_for +from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_completion_liststore from gajim.gtk.util import move_window from gajim.gtk.util import resize_window @@ -134,7 +134,7 @@ class SingleMessageWindow: keys = sorted(self.completion_dict.keys()) for jid in keys: contact = self.completion_dict[jid] - status_icon = get_iconset_name_for(contact.show) + status_icon = get_icon_name(contact.show) liststore.append((status_icon, jid)) else: self.completion_dict = {} ===================================== gajim/gtk/start_chat.py ===================================== @@ -24,7 +24,7 @@ from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.const import AvatarSize -from gajim.gtk.util import get_iconset_name_for +from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder @@ -276,7 +276,7 @@ class ContactRow(Gtk.Grid): self.new = jid == '' if self.groupchat: - muc_icon = get_iconset_name_for( + muc_icon = get_icon_name( 'muc-inactive' if self.new else 'muc-active') image = Gtk.Image.new_from_icon_name(muc_icon, Gtk.IconSize.DND) else: ===================================== gajim/gtk/statusicon.py ===================================== @@ -24,13 +24,16 @@ import os from gi.repository import Gtk from gajim import dialogs -from gajim import tooltips -from gajim import gtkgui_helpers + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ + from gajim.gtk.util import get_builder +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import move_window from gajim.gtk.single_message import SingleMessageWindow +from gajim.gtk.tooltips import NotificationAreaTooltip class StatusIcon: @@ -50,7 +53,7 @@ class StatusIcon: self._ui.connect_signals(self) self.popup_menus = [] self.status_icon = None - self.tooltip = tooltips.NotificationAreaTooltip() + self.tooltip = NotificationAreaTooltip() def subscribe_events(self): """ @@ -133,14 +136,14 @@ class StatusIcon: if app.events.get_nb_systray_events(): self.status_icon.set_visible(True) - icon_name = gtkgui_helpers.get_iconset_name_for('event') + icon_name = get_icon_name('event') self.status_icon.set_from_icon_name(icon_name) return if app.config.get('trayicon') == 'on_event': self.status_icon.set_visible(False) - icon_name = gtkgui_helpers.get_iconset_name_for(self.status) + icon_name = get_icon_name(self.status) self.status_icon.set_from_icon_name(icon_name) def change_status(self, global_status): @@ -381,9 +384,9 @@ class StatusIcon: if not win.get_property('visible'): win.show_all() if app.config.get('save-roster-position'): - gtkgui_helpers.move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + move_window(win, + app.config.get('roster_x-position'), + app.config.get('roster_y-position')) if not app.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(Gtk.get_current_event_time()) @@ -397,9 +400,9 @@ class StatusIcon: win = app.interface.roster.window if not win.get_property('visible') and app.config.get( 'save-roster-position'): - gtkgui_helpers.move_window(win, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + move_window(win, + app.config.get('roster_x-position'), + app.config.get('roster_y-position')) app.interface.handle_event(account, jid, event.type_) def on_middle_click(self): ===================================== gajim/tooltips.py → gajim/gtk/tooltips.py ===================================== @@ -34,14 +34,16 @@ from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango -from gajim import gtkgui_helpers -from gajim.common.const import AvatarSize from gajim.common import app from gajim.common import helpers +from gajim.common.const import AvatarSize from gajim.common.i18n import Q_ from gajim.common.i18n import _ -log = logging.getLogger('gajim.tooltips') +from gajim.gtk.util import get_builder +from gajim.gtk.util import get_icon_name + +log = logging.getLogger('gajim.gtk.tooltips') class StatusTable: @@ -71,11 +73,14 @@ class StatusTable: self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) self.text_label.set_markup(text) - self.table.attach(self.text_label, 1 + col_inc, self.current_row, - 3 - col_inc, 1) + self.table.attach(self.text_label, 1 + col_inc, + self.current_row, + 3 - col_inc, + 1) self.current_row += 1 - def get_status_info(self, resource, priority, show, status): + @staticmethod + def get_status_info(resource, priority, _show, status): str_status = resource + ' (' + str(priority) + ')' if status: status = status.strip() @@ -87,22 +92,15 @@ class StatusTable: str_status += ' - <i>' + status + '</i>' return str_status - def add_status_row(self, file_path, show, str_status, show_lock=False, - indent=True): + def add_status_row(self, show, str_status, show_lock=False, + indent=True, transport=None): """ Append a new row with status icon to the table """ self.table.insert_row(self.current_row) - state_file = show.replace(' ', '_') - files = [] - files.append(os.path.join(file_path, state_file + '.png')) - files.append(os.path.join(file_path, state_file + '.gif')) image = Gtk.Image() - image.set_from_pixbuf(None) - for f in files: - if os.path.exists(f): - image.set_from_file(f) - break + icon_name = get_icon_name(show, transport=transport) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) spacer = Gtk.Label(label=self.spacer_label) image.set_halign(Gtk.Align.START) image.set_valign(Gtk.Align.CENTER) @@ -117,25 +115,11 @@ class StatusTable: self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: lock_image = Gtk.Image() - lock_image.set_from_icon_name("dialog-password", - Gtk.IconSize.MENU) + lock_image.set_from_icon_name('dialog-password', Gtk.IconSize.MENU) self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 - -class NotificationAreaTooltip(StatusTable): - """ - Tooltip that is shown in the notification area - """ - - def __init__(self): - StatusTable.__init__(self) - def fill_table_with_accounts(self, accounts): - iconset = app.config.get('iconset') - if not iconset: - iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') for acct in accounts: message = acct['message'] message = helpers.reduce_chars_newlines(message, 100, 1) @@ -143,57 +127,64 @@ class NotificationAreaTooltip(StatusTable): con_type = app.con_types.get(acct['name']) show_lock = con_type in ('tls', 'ssl') + account_label = GLib.markup_escape_text(acct['account_label']) if message: - self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']) + ' - ' + \ - message, show_lock=show_lock, indent=False) + status = '%s - %s' % (account_label, message) else: - self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']), - show_lock=show_lock, indent=False) + status = account_label + + self.add_status_row(acct['show'], + status, + show_lock=show_lock, + indent=False) + for line in acct['event_lines']: self.add_text_row(' ' + line, 1) + +class NotificationAreaTooltip(StatusTable): + """ + Tooltip that is shown in the notification area + """ + + def __init__(self): + StatusTable.__init__(self) + def get_tooltip(self): self.create_table() accounts = helpers.get_notification_icon_tooltip_dict() self.fill_table_with_accounts(accounts) - self.hbox = Gtk.HBox() self.table.set_property('column-spacing', 1) - self.hbox.add(self.table) - self.hbox.show_all() - return self.hbox + hbox = Gtk.HBox() + hbox.add(self.table) + hbox.show_all() + return hbox class GCTooltip(): - # pylint: disable=E1101 def __init__(self): self.contact = None - self.xml = gtkgui_helpers.get_gtk_builder('tooltip_gc_contact.ui') - for name in ('nick', 'status', 'jid', 'user_show', 'fillelement', - 'resource', 'affiliation', 'avatar', 'resource_label', - 'jid_label', 'tooltip_grid'): - setattr(self, name, self.xml.get_object(name)) + self._ui = get_builder('tooltip_gc_contact.ui') def clear_tooltip(self): self.contact = None def get_tooltip(self, contact): if self.contact == contact: - return True, self.tooltip_grid + return True, self._ui.tooltip_grid self._populate_grid(contact) self.contact = contact - return False, self.tooltip_grid + return False, self._ui.tooltip_grid def _hide_grid_childs(self): """ Hide all Elements of the Tooltip Grid """ - for child in self.tooltip_grid.get_children(): + for child in self._ui.tooltip_grid.get_children(): child.hide() def _populate_grid(self, contact): @@ -202,31 +193,31 @@ class GCTooltip(): """ self._hide_grid_childs() - self.nick.set_text(contact.get_shown_name()) - self.nick.show() + self._ui.nick.set_text(contact.get_shown_name()) + self._ui.nick.show() # Status Message if contact.status: status = contact.status.strip() if status != '': - self.status.set_text(status) - self.status.show() + self._ui.status.set_text(status) + self._ui.status.show() # Status show = helpers.get_uf_show(contact.show) - self.user_show.set_markup(colorize_status(show)) - self.user_show.show() + self._ui.user_show.set_markup(colorize_status(show)) + self._ui.user_show.show() # JID if contact.jid.strip(): - self.jid.set_text(contact.jid) - self.jid.show() - self.jid_label.show() + self._ui.jid.set_text(contact.jid) + self._ui.jid.show() + self._ui.jid_label.show() # Resource if hasattr(contact, 'resource') and contact.resource.strip(): - self.resource.set_text(contact.resource) - self.resource.show() - self.resource_label.show() + self._ui.resource.set_text(contact.resource) + self._ui.resource.show() + self._ui.resource_label.show() # Affiliation if contact.affiliation != 'none': @@ -235,23 +226,23 @@ class GCTooltip(): _('%(owner_or_admin_or_member)s of this group chat') \ % {'owner_or_admin_or_member': uf_affiliation} uf_affiliation = self.colorize_affiliation(uf_affiliation) - self.affiliation.set_markup(uf_affiliation) - self.affiliation.show() + self._ui.affiliation.set_markup(uf_affiliation) + self._ui.affiliation.show() # Avatar if contact.avatar_sha is not None: app.log('avatar').debug( 'Load GCTooltip: %s %s', contact.name, contact.avatar_sha) - scale = self.tooltip_grid.get_scale_factor() + scale = self._ui.tooltip_grid.get_scale_factor() surface = app.interface.get_avatar( contact.avatar_sha, AvatarSize.TOOLTIP, scale) if surface is not None: - self.avatar.set_from_surface(surface) - self.avatar.show() - self.fillelement.show() + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() + self._ui.fillelement.show() app.plugin_manager.gui_extension_point( - 'gc_tooltip_populate', self, contact, self.tooltip_grid) + 'gc_tooltip_populate', self, contact, self._ui.tooltip_grid) @staticmethod def colorize_affiliation(affiliation): @@ -274,13 +265,14 @@ class GCTooltip(): return affiliation class RosterTooltip(Gtk.Window, StatusTable): - # pylint: disable=E1101 def __init__(self, parent): Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) StatusTable.__init__(self) self.create_table() + self.account = None self.row = None self.contact_jid = None + self.prim_contact = None self.last_widget = None self.num_resources = 0 self.set_title('tooltip') @@ -289,52 +281,22 @@ class RosterTooltip(Gtk.Window, StatusTable): self.set_name('gtk-tooltips') self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) - self.xml = gtkgui_helpers.get_gtk_builder('tooltip_roster_contact.ui') - for name in ('name', 'status', 'jid', 'user_show', 'fillelement', - 'resource', 'avatar', 'resource_label', 'pgp', 'pgp_label', - 'jid_label', 'tooltip_grid', 'idle_since', 'idle_since_label', - 'mood', 'tune', 'activity', 'location', 'tune_label', - 'location_label', 'activity_label', 'mood_label', 'sub_label', - 'sub', 'status_label'): - setattr(self, name, self.xml.get_object(name)) + self._ui = get_builder('tooltip_roster_contact.ui') - self.add(self.tooltip_grid) - self.tooltip_grid.show() + self.add(self._ui.tooltip_grid) + self._ui.tooltip_grid.show() def clear_tooltip(self): """ Hide all Elements of the Tooltip Grid """ - for child in self.tooltip_grid.get_children(): + for child in self._ui.tooltip_grid.get_children(): child.hide() - status_table = self.tooltip_grid.get_child_at(0, 3) + status_table = self._ui.tooltip_grid.get_child_at(0, 3) if status_table: status_table.destroy() self.create_table() - def fill_table_with_accounts(self, accounts): - iconset = app.config.get('iconset') - if not iconset: - iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for acct in accounts: - message = acct['message'] - message = helpers.reduce_chars_newlines(message, 100, 1) - message = GLib.markup_escape_text(message) - con_type = app.con_types.get(acct['name']) - show_lock = con_type in ('tls', 'ssl') - - if message: - self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']) + ' - ' + \ - message, show_lock=show_lock, indent=False) - else: - self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']), - show_lock=show_lock, indent=False) - for line in acct['event_lines']: - self.add_text_row(' ' + line, 1) - def populate(self, contacts, account, typ): """ Populate the Tooltip Grid with data of from the contact @@ -351,7 +313,7 @@ class RosterTooltip(Gtk.Window, StatusTable): accounts = helpers.get_notification_icon_tooltip_dict() self.spacer_label = '' self.fill_table_with_accounts(accounts) - self.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) self.table.show_all() return @@ -362,20 +324,21 @@ class RosterTooltip(Gtk.Window, StatusTable): # get our current contact info nbr_on, nbr_total = app.\ - contacts.get_nb_online_total_contacts( - accounts=[account]) + contacts.get_nb_online_total_contacts(accounts=[account]) account_name = app.get_account_label(account) if app.account_is_connected(account): - account_name += ' (%s/%s)' % (repr(nbr_on), - repr(nbr_total)) - contact = app.contacts.create_self_contact(jid=jid, - account=account, name=account_name, - show=connection.get_status(), status=connection.status, + account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) + contact = app.contacts.create_self_contact( + jid=jid, + account=account, + name=account_name, + show=connection.get_status(), + status=connection.status, resource=connection.server_resource, priority=connection.priority) if app.connections[account].gpg: - contact.keyID = app.config.get_per('accounts', - connection.name, 'keyid') + contact.keyID = app.config.get_per( + 'accounts', connection.name, 'keyid') contacts.append(contact) # Username/Account/Groupchat @@ -403,8 +366,8 @@ class RosterTooltip(Gtk.Window, StatusTable): except KeyError: pass - self.name.set_markup(name_markup) - self.name.show() + self._ui.name.set_markup(name_markup) + self._ui.name.show() self.num_resources = 0 # put contacts in dict, where key is priority @@ -418,23 +381,13 @@ class RosterTooltip(Gtk.Window, StatusTable): else: contacts_dict[priority] = [contact] if self.num_resources > 1: - self.status_label.show() + self._ui.status_label.show() transport = app.get_transport_name_from_jid(self.prim_contact.jid) - if transport: - file_path = os.path.join(helpers.get_transport_path(transport), - '16x16') - else: - iconset = app.config.get('iconset') - if not iconset: - iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), - '16x16') - contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() for priority in contact_keys: for acontact in contacts_dict[priority]: - icon_name = self._get_icon_name_for_tooltip(acontact) + show = self._get_icon_name_for_tooltip(acontact) if acontact.status and len(acontact.status) > 25: status = '' add_text = True @@ -442,58 +395,61 @@ class RosterTooltip(Gtk.Window, StatusTable): status = acontact.status add_text = False - status_line = self.get_status_info(acontact.resource, - acontact.priority, acontact.show, status) - self.add_status_row(file_path, icon_name, status_line) + status_line = self.get_status_info( + acontact.resource, + acontact.priority, + acontact.show, + status) + self.add_status_row(show, status_line, transport=transport) if add_text: self.add_text_row(acontact.status, 2) - self.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) self.table.show_all() else: # only one resource if contact.show and contact.status: status = contact.status.strip() if status: - self.status.set_text(status) - self.status.show() - self.status_label.show() + self._ui.status.set_text(status) + self._ui.status.show() + self._ui.status_label.show() # PEP Info self._append_pep_info(contact) # JID - self.jid.set_text(self.prim_contact.jid) - self.jid.show() - self.jid_label.show() + self._ui.jid.set_text(self.prim_contact.jid) + self._ui.jid.show() + self._ui.jid_label.show() # contact has only one resource if self.num_resources == 1 and contact.resource: res = GLib.markup_escape_text(contact.resource) prio = str(contact.priority) - self.resource.set_text("{} ({})".format(res, prio)) - self.resource.show() - self.resource_label.show() + self._ui.resource.set_text("{} ({})".format(res, prio)) + self._ui.resource.show() + self._ui.resource_label.show() if self.prim_contact.jid not in app.gc_connected[account]: if (account and - self.prim_contact.sub and + self.prim_contact.sub and self.prim_contact.sub != 'both'): # ('both' is the normal sub so we don't show it) - self.sub.set_text(helpers.get_uf_sub(self.prim_contact.sub)) - self.sub.show() - self.sub_label.show() + self._ui.sub.set_text(helpers.get_uf_sub(self.prim_contact.sub)) + self._ui.sub.show() + self._ui.sub_label.show() if self.prim_contact.keyID: - keyID = None + key_id = None if len(self.prim_contact.keyID) == 8: - keyID = self.prim_contact.keyID + key_id = self.prim_contact.keyID elif len(self.prim_contact.keyID) == 16: - keyID = self.prim_contact.keyID[8:] - if keyID: - self.pgp.set_text(keyID) - self.pgp.show() - self.pgp_label.show() + key_id = self.prim_contact.keyID[8:] + if key_id: + self._ui.pgp.set_text(key_id) + self._ui.pgp.show() + self._ui.pgp_label.show() self._set_idle_time(contact) @@ -503,19 +459,19 @@ class RosterTooltip(Gtk.Window, StatusTable): account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) if surface is None: return - self.avatar.set_from_surface(surface) - self.avatar.show() + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() app.plugin_manager.gui_extension_point( - 'roster_tooltip_populate', self, contacts, self.tooltip_grid) + 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) # Sets the Widget that is at the bottom to expand. # This is needed in case the Picture takes more Space then the Labels i = 1 while i < 15: - if self.tooltip_grid.get_child_at(0, i): - if self.tooltip_grid.get_child_at(0, i).get_visible(): - self.last_widget = self.tooltip_grid.get_child_at(0, i) + if self._ui.tooltip_grid.get_child_at(0, i): + if self._ui.tooltip_grid.get_child_at(0, i).get_visible(): + self.last_widget = self._ui.tooltip_grid.get_child_at(0, i) i += 1 self.last_widget.set_vexpand(True) @@ -526,27 +482,27 @@ class RosterTooltip(Gtk.Window, StatusTable): """ if 'mood' in contact.pep: mood = contact.pep['mood'].as_markup_text() - self.mood.set_markup(mood) - self.mood.show() - self.mood_label.show() + self._ui.mood.set_markup(mood) + self._ui.mood.show() + self._ui.mood_label.show() if 'activity' in contact.pep: activity = contact.pep['activity'].as_markup_text() - self.activity.set_markup(activity) - self.activity.show() - self.activity_label.show() + self._ui.activity.set_markup(activity) + self._ui.activity.show() + self._ui.activity_label.show() if 'tune' in contact.pep: tune = contact.pep['tune'].as_markup_text() - self.tune.set_markup(tune) - self.tune.show() - self.tune_label.show() + self._ui.tune.set_markup(tune) + self._ui.tune.show() + self._ui.tune_label.show() if 'geoloc' in contact.pep: location = contact.pep['geoloc'].as_markup_text() - self.location.set_markup(location) - self.location.show() - self.location_label.show() + self._ui.location.set_markup(location) + self._ui.location.show() + self._ui.location_label.show() def _set_idle_time(self, contact): if contact.idle_time: @@ -556,14 +512,14 @@ class RosterTooltip(Gtk.Window, StatusTable): idle_time = datetime(*(idle_time[:6])) current = datetime.now() if idle_time.date() == current.date(): - formatted = idle_time.strftime("%X") + formatted = idle_time.strftime('%X') else: - formatted = idle_time.strftime("%c") - idle_markup = "<span foreground='{}'>{}</span>".format(idle_color, - formatted) - self.idle_since.set_markup(idle_markup) - self.idle_since.show() - self.idle_since_label.show() + formatted = idle_time.strftime('%c') + idle_markup = '<span foreground="{}">{}</span>'.format( + idle_color, formatted) + self._ui.idle_since.set_markup(idle_markup) + self._ui.idle_since.show() + self._ui.idle_since_label.show() if contact.show and self.num_resources < 2: show = helpers.get_uf_show(contact.show) @@ -575,10 +531,11 @@ class RosterTooltip(Gtk.Window, StatusTable): else: show = _('Disconnected') - self.user_show.set_markup(colorize_status(show)) - self.user_show.show() + self._ui.user_show.set_markup(colorize_status(show)) + self._ui.user_show.show() - def _get_icon_name_for_tooltip(self, contact): + @staticmethod + def _get_icon_name_for_tooltip(contact): """ Helper function used for tooltip contacts/accounts @@ -610,7 +567,7 @@ class FileTransfersTooltip(): return False, self.widget @staticmethod - def _create_tooltip(file_props, sid): + def _create_tooltip(file_props, _sid): ft_table = Gtk.Table(2, 1) ft_table.set_property('column-spacing', 2) current_row = 1 @@ -626,7 +583,7 @@ class FileTransfersTooltip(): actor = _('Sender: ') sender = file_props.sender.split('/')[0] name = app.contacts.get_first_contact_from_jid( - file_props.tt_account, sender).get_shown_name() + file_props.tt_account, sender).get_shown_name() else: type_ = Q_('?Noun:Upload') actor = _('Recipient: ') @@ -673,15 +630,18 @@ class FileTransfersTooltip(): label.set_halign(Gtk.Align.START) label.set_valign(Gtk.Align.START) label.set_markup(property_[0]) - ft_table.attach(label, 1, 2, current_row, current_row + 1, - Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) + ft_table.attach( + label, 1, 2, current_row, current_row + 1, + Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) label = Gtk.Label() label.set_halign(Gtk.Align.START) label.set_valign(Gtk.Align.START) label.set_line_wrap(True) label.set_markup(property_[1]) - ft_table.attach(label, 2, 3, current_row, current_row + 1, - Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) + ft_table.attach( + label, 2, 3, current_row, current_row + 1, + Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, + Gtk.AttachOptions.FILL, 0, 0) ft_table.show_all() return ft_table ===================================== gajim/gtk/util.py ===================================== @@ -15,7 +15,7 @@ from typing import Any from typing import List from typing import Tuple - +from typing import Optional import os import sys @@ -107,9 +107,18 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, log.error('Unable to load icon %s: %s', icon_name, str(error)) -def get_iconset_name_for(name: str) -> str: +def get_icon_name(name: str, + iconset: Optional[str] = None, + transport: Optional[str] = None) -> str: if name == 'not in roster': name = 'notinroster' + + if iconset is not None: + return '%s-%s' % (iconset, name) + + if transport is not None: + return '%s-%s' % (transport, name) + iconset = app.config.get('iconset') if not iconset: iconset = app.config.DEFAULT_ICONSET @@ -230,6 +239,12 @@ def get_image_button(icon_name, tooltip, toggle=False): return button +def get_image_from_icon_name(icon_name: str, scale: int) -> Any: + icon = get_icon_name(icon_name) + surface = _icon_theme.load_surface(icon, 16, scale, None, 0) + return Gtk.Image.new_from_surface(surface) + + def python_month(month: int) -> int: return month + 1 @@ -247,3 +262,12 @@ def convert_rgb_to_hex(rgb_string: str) -> str: green = int(rgb.green * 255) blue = int(rgb.blue * 255) return '#%02x%02x%02x' % (red, green, blue) + + +def get_monitor_scale_factor() -> int: + display = Gdk.Display.get_default() + monitor = display.get_primary_monitor() + if monitor is None: + log.warning('Could not determine scale factor') + return 1 + return monitor.get_scale_factor() ===================================== gajim/gtkgui_helpers.py ===================================== @@ -97,13 +97,6 @@ if os.name == 'nt': from gajim.common import helpers -def get_total_screen_geometry(): - screen = Gdk.Screen.get_default() - window = Gdk.Screen.get_root_window(screen) - w, h = window.get_width(), window.get_height() - log.debug('Get screen geometry: %s %s', w, h) - return w, h - def add_image_to_button(button, icon_name): img = Gtk.Image() path_img = get_icon_path(icon_name) @@ -153,55 +146,6 @@ def get_gtk_builder(file_name, widget=None): builder.add_from_file(file_path) return builder -def get_completion_liststore(entry): - """ - Create a completion model for entry widget completion list consists of - (Pixbuf, Text) rows - """ - completion = Gtk.EntryCompletion() - liststore = Gtk.ListStore(str, str) - - render_pixbuf = Gtk.CellRendererPixbuf() - completion.pack_start(render_pixbuf, False) - completion.add_attribute(render_pixbuf, 'icon_name', 0) - - render_text = Gtk.CellRendererText() - completion.pack_start(render_text, True) - completion.add_attribute(render_text, 'text', 1) - completion.set_property('text_column', 1) - completion.set_model(liststore) - entry.set_completion(completion) - return liststore - -def move_window(window, x, y): - """ - Move the window, but also check if out of screen - """ - screen_w, screen_h = get_total_screen_geometry() - if x < 0: - x = 0 - if y < 0: - y = 0 - w, h = window.get_size() - if x + w > screen_w: - x = screen_w - w - if y + h > screen_h: - y = screen_h - h - window.move(x, y) - -def resize_window(window, w, h): - """ - Resize window, but also checks if huge window or negative values - """ - screen_w, screen_h = get_total_screen_geometry() - if not w or not h: - return - if w > screen_w: - w = screen_w - if h > screen_h: - h = screen_h - window.resize(abs(w), abs(h)) - def at_the_end(widget): """Determines if a Scrollbar in a GtkScrolledWindow is at the end. @@ -373,18 +317,6 @@ def get_fade_color(treeview, selected, focused): return Gdk.RGBA(bg.red*p + fg.red*q, bg.green*p + fg.green*q, bg.blue*p + fg.blue*q) -def make_gtk_month_python_month(month): - """ - GTK starts counting months from 0, so January is 0 but Python's time start - from 1, so align to Python - - NOTE: Month MUST be an integer. - """ - return month + 1 - -def make_python_month_gtk_month(month): - return month - 1 - def make_pixbuf_grayscale(pixbuf): pixbuf2 = pixbuf.copy() pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) @@ -609,14 +541,6 @@ def get_pep_as_pixbuf(pep_class): return None -def get_iconset_name_for(name): - if name == 'not in roster': - name = 'notinroster' - iconset = app.config.get('iconset') - if not iconset: - iconset = app.config.DEFAULT_ICONSET - return '%s-%s' % (iconset, name) - def load_icons_meta(): """ Load and return - AND + small icons to put on top left of an icon for meta @@ -804,11 +728,6 @@ def draw_affiliation(surface, affiliation): ctx.set_source_rgb(0, 255/255, 0) ctx.fill() -def get_image_from_icon_name(icon_name, scale): - icon = get_iconset_name_for(icon_name) - surface = gtk_icon_theme.load_surface(icon, 16, scale, None, 0) - return Gtk.Image.new_from_surface(surface) - def pango_to_css_weight(number): # Pango allows for weight values between 100 and 1000 # CSS allows only full hundred numbers like 100, 200 .. @@ -818,11 +737,3 @@ def pango_to_css_weight(number): if number > 900: return 900 return int(math.ceil(number / 100.0)) * 100 - -def get_monitor_scale_factor(): - display = Gdk.Display.get_default() - monitor = display.get_primary_monitor() - if monitor is None: - log.warning('Could not determine scale factor') - return 1 - return monitor.get_scale_factor() ===================================== gajim/message_window.py ===================================== @@ -41,6 +41,9 @@ from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl from gajim.gtk.dialogs import YesNoDialog +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import resize_window +from gajim.gtk.util import move_window #################### @@ -184,7 +187,7 @@ class MessageWindow: return sum(len(d) for d in self._controls.values()) def resize(self, width, height): - gtkgui_helpers.resize_window(self.window, width, height) + resize_window(self.window, width, height) def _on_window_focus(self, widget, event): # on destroy() the window that was last focused gets the focus @@ -470,7 +473,7 @@ class MessageWindow: if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, MessageWindowMgr.ONE_MSG_WINDOW_NEVER): if self.type_ == 'gc': - icon = gtkgui_helpers.get_iconset_name_for('muc-active') + icon = get_icon_name('muc-active') self.window.set_icon_name(icon) @@ -1046,7 +1049,7 @@ class MessageWindowMgr(GObject.GObject): else: return - gtkgui_helpers.move_window(win.window, pos[0], pos[1]) + move_window(win.window, pos[0], pos[1]) def _mode_to_key(self, contact, acct, type_, resource=None): if self.mode == self.ONE_MSG_WINDOW_NEVER: @@ -1283,9 +1286,9 @@ class MessageWindowMgr(GObject.GObject): child = w.parent_paned.get_child2() w.parent_paned.remove(child) self.parent_win.lookup_action('show-roster').set_enabled(False) - gtkgui_helpers.resize_window(w.window, - app.config.get('roster_width'), - app.config.get('roster_height')) + resize_window(w.window, + app.config.get('roster_width'), + app.config.get('roster_height')) self._windows = {} ===================================== gajim/notify.py ===================================== @@ -38,6 +38,10 @@ from gajim.common import helpers from gajim.common import ged from gajim.common.i18n import _ +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import get_monitor_scale_factor +from gajim.gtk.util import get_total_screen_geometry + log = logging.getLogger('gajim.notify') @@ -149,7 +153,7 @@ class Notification: elif obj.notif_type == 'pres': if obj.transport_name is not None: return '%s-%s' % (obj.transport_name, obj.show) - return gtkgui_helpers.get_iconset_name_for(obj.show) + return get_icon_name(obj.show) def popup(self, event_type, jid, account, type_='', icon_name=None, title=None, text=None, timeout=-1, room_jid=None): @@ -170,7 +174,7 @@ class Notification: app.interface.roster.popup_notification_windows.append(instance) return - scale = gtkgui_helpers.get_monitor_scale_factor() + scale = get_monitor_scale_factor() icon_pixbuf = gtkgui_helpers.gtk_icon_theme.load_icon_for_scale( icon_name, 48, scale, 0) @@ -298,7 +302,7 @@ class PopupNotificationWindow: window_width, self.window_height = self.window.get_size() app.interface.roster.popups_notification_height += self.window_height pos_x = app.config.get('notification_position_x') - screen_w, screen_h = gtkgui_helpers.get_total_screen_geometry() + screen_w, screen_h = get_total_screen_geometry() if pos_x < 0: pos_x = screen_w - window_width + pos_x + 1 pos_y = app.config.get('notification_position_y') @@ -335,7 +339,7 @@ class PopupNotificationWindow: current_index += 1 window_width, window_height = window_instance.window.get_size() app.interface.roster.popups_notification_height += window_height - screen_w, screen_h = gtkgui_helpers.get_total_screen_geometry() + screen_w, screen_h = get_total_screen_geometry() window_instance.window.move(screen_w - window_width, screen_h - \ app.interface.roster.popups_notification_height) ===================================== gajim/roster_window.py ===================================== @@ -50,7 +50,6 @@ from gajim import disco from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import cell_renderer_image -from gajim import tooltips from gajim import message_control from gajim import adhoc_commands @@ -82,6 +81,10 @@ from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow +from gajim.gtk.tooltips import RosterTooltip +from gajim.gtk.util import get_icon_name +from gajim.gtk.util import resize_window +from gajim.gtk.util import move_window log = logging.getLogger('gajim.roster') @@ -257,7 +260,7 @@ class RosterWindow: if tree_model[iter_][2] == 'status': cell.set_property('icon_name', icon_name) else: - iconset_name = gtkgui_helpers.get_iconset_name_for(icon_name) + iconset_name = get_icon_name(icon_name) cell.set_property('icon_name', iconset_name) else: show = tree_model[iter_][0] @@ -2372,9 +2375,9 @@ class RosterWindow: def on_message_window_delete(self, win_mgr, msg_win): if app.config.get('one_message_window') == 'always_with_roster': self.show_roster_vbox(True) - gtkgui_helpers.resize_window(self.window, - app.config.get('roster_width'), - app.config.get('roster_height')) + resize_window(self.window, + app.config.get('roster_width'), + app.config.get('roster_height')) def close_all_from_dict(self, dic): """ @@ -5703,13 +5706,13 @@ class RosterWindow: if len(app.connections) < 2: # Do not merge accounts if only one exists self.regroup = False - gtkgui_helpers.resize_window(self.window, - app.config.get('roster_width'), - app.config.get('roster_height')) + resize_window(self.window, + app.config.get('roster_width'), + app.config.get('roster_height')) if app.config.get('save-roster-position'): - gtkgui_helpers.move_window(self.window, - app.config.get('roster_x-position'), - app.config.get('roster_y-position')) + move_window(self.window, + app.config.get('roster_x-position'), + app.config.get('roster_y-position')) self.popups_notification_height = 0 self.popup_notification_windows = [] @@ -5841,7 +5844,7 @@ class RosterWindow: self.collapsed_rows = app.config.get('collapsed_rows').split('\t') self.tree.set_has_tooltip(True) - self.tree.set_tooltip_window(tooltips.RosterTooltip(self.window)) + self.tree.set_tooltip_window(RosterTooltip(self.window)) self.current_tooltip = None self.tree.connect('query-tooltip', self.query_tooltip) # Workaround: For strange reasons signal is behaving like row-changed View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1701301f7645d18719b6cf20fbf6ef73… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1701301f7645d18719b6cf20fbf6ef73… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Flatpak: remove modules provided by the runtime
by Philipp Hörist 28 Oct '18

28 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: d86f7806 by André Apitzsch at 2018-10-28T08:13:57Z Flatpak: remove modules provided by the runtime - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -69,54 +69,6 @@ modules: url: https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700… sha256: e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4 - - name: python3-six - buildsystem: simple - build-commands: - - pip3 install --prefix=/app six-1.11.0-py2.py3-none-any.whl - sources: - - type: file - url: https://pypi.python.org/packages/67/4b/141a581104b1f6397bfa78ac9d43d8ad29a7… - sha256: 832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb - - - name: python3-pyparsing - buildsystem: simple - build-commands: - - pip3 install --prefix=/app pyparsing-2.2.2-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/2b/4a/f06b45ab9690d4c37641ec776f7ad… - sha256: d29593d8ebe7b57d6967b62494f8c72b03ac0262b1eed63826c6f788b3606401 - - - name: python3-packaging - buildsystem: simple - build-commands: - - pip3 install --prefix=/app packaging-18.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/89/d1/92e6df2e503a69df9faab187c6845… - sha256: f95a1e147590f204328170981833854229bb2912ac3d5f89e2a8ccd2834800c9 - - - name: python3-appdirs - buildsystem: simple - build-commands: - - pip3 install --prefix=/app appdirs-1.4.3-py2.py3-none-any.whl - sources: - - type: file - url: https://pypi.python.org/packages/56/eb/810e700ed1349edde4cbdc1b2a21e28cdf11… - sha256: d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e - - - name: python3-setuptools - ensure-writable: - - easy-install.pth - - setuptools.pth - buildsystem: simple - build-commands: - - python3 setup.py install --prefix=/app - sources: - - type: archive - url: https://files.pythonhosted.org/packages/6e/9c/6a003320b00ef237f94aa74e4ad66… - sha256: acbc5740dd63f243f46c2b4b8e2c7fd92259c2ddb55a4115b16418a2ed371b15 - - name: python3-asn1crypto buildsystem: simple build-commands: @@ -229,14 +181,6 @@ modules: - type: archive url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz sha256: 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 - modules: - - name: enchant2 - cleanup: - - /bin - sources: - - type: archive - url: https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.t… - sha256: abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86f7806dc902f2568bca1194c9c71b177… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86f7806dc902f2568bca1194c9c71b177… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: remove modules provided by the runtime
by André 27 Oct '18

27 Oct '18

André pushed to branch master at gajim / gajim Commits: a1701301 by André Apitzsch at 2018-10-27T23:34:11Z Flatpak: remove modules provided by the runtime - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -69,54 +69,6 @@ modules: url: https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700… sha256: e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4 - - name: python3-six - buildsystem: simple - build-commands: - - pip3 install --prefix=/app six-1.11.0-py2.py3-none-any.whl - sources: - - type: file - url: https://pypi.python.org/packages/67/4b/141a581104b1f6397bfa78ac9d43d8ad29a7… - sha256: 832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb - - - name: python3-pyparsing - buildsystem: simple - build-commands: - - pip3 install --prefix=/app pyparsing-2.2.2-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/2b/4a/f06b45ab9690d4c37641ec776f7ad… - sha256: d29593d8ebe7b57d6967b62494f8c72b03ac0262b1eed63826c6f788b3606401 - - - name: python3-packaging - buildsystem: simple - build-commands: - - pip3 install --prefix=/app packaging-18.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/89/d1/92e6df2e503a69df9faab187c6845… - sha256: f95a1e147590f204328170981833854229bb2912ac3d5f89e2a8ccd2834800c9 - - - name: python3-appdirs - buildsystem: simple - build-commands: - - pip3 install --prefix=/app appdirs-1.4.3-py2.py3-none-any.whl - sources: - - type: file - url: https://pypi.python.org/packages/56/eb/810e700ed1349edde4cbdc1b2a21e28cdf11… - sha256: d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e - - - name: python3-setuptools - ensure-writable: - - easy-install.pth - - setuptools.pth - buildsystem: simple - build-commands: - - python3 setup.py install --prefix=/app - sources: - - type: archive - url: https://files.pythonhosted.org/packages/6e/9c/6a003320b00ef237f94aa74e4ad66… - sha256: acbc5740dd63f243f46c2b4b8e2c7fd92259c2ddb55a4115b16418a2ed371b15 - - name: python3-asn1crypto buildsystem: simple build-commands: @@ -229,14 +181,6 @@ modules: - type: archive url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz sha256: 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 - modules: - - name: enchant2 - cleanup: - - /bin - sources: - - type: archive - url: https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.t… - sha256: abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a1701301f7645d18719b6cf20fbf6ef738… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a1701301f7645d18719b6cf20fbf6ef738… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove obsolete glade file for features window
by Philipp Hörist 27 Oct '18

27 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a75c0cbd by Daniel Brötzmann at 2018-10-27T16:04:27Z Remove obsolete glade file for features window - - - - - 1 changed file: - − gajim/data/gui/features_window.ui Changes: ===================================== gajim/data/gui/features_window.ui deleted ===================================== @@ -1,153 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="features_box"> - <property name="width_request">400</property> - <property name="height_request">500</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Listing of available features</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="vexpand">True</property> - <property name="shadow_type">out</property> - <child> - <object class="GtkTreeView" id="features_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="enable_grid_lines">horizontal</property> - <signal name="cursor-changed" handler="on_features_treeview_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Description</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="dim-label"/> - <class name="margin-top6"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="feature_desc_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Requirements</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="dim-label"/> - <class name="margin-top6"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="feature_req_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> -</interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a75c0cbd488968835eae1b41ac67ae6ccb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a75c0cbd488968835eae1b41ac67ae6ccb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add clipboard button to copy server infos
by Philipp Hörist 27 Oct '18

27 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bed18c90 by Daniel Brötzmann at 2018-10-27T13:35:37Z Add clipboard button to copy server infos - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -18,6 +18,7 @@ from datetime import timedelta import nbxmpp from gi.repository import Gtk +from gi.repository import Gdk from gajim.common import app from gajim.common import ged @@ -50,8 +51,17 @@ class ServerInfoDialog(Gtk.Dialog): self.feature_listbox.set_header_func(self.header_func, 'Features') grid.attach(self.feature_listbox, 0, 1, 1, 1) + self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard_button = Gtk.Button(halign=Gtk.Align.END) + clp_image = Gtk.Image.new_from_icon_name('edit-copy-symbolic', + Gtk.IconSize.BUTTON) + clipboard_button.set_image(clp_image) + clipboard_button.set_tooltip_text(_('Copy info to clipboard')) + clipboard_button.connect('clicked', self.on_clipboard_button_clicked) + box = self.get_content_area() box.pack_start(grid, True, True, 0) + box.pack_start(clipboard_button, False, True, 0) box.set_property('margin', 12) box.set_spacing(18) @@ -193,6 +203,24 @@ class ServerInfoDialog(Gtk.Dialog): Info(_('Server Software'), self.version, None), Info(_('Server Uptime'), self.uptime, None)] + def on_clipboard_button_clicked(self, widget): + server_software = 'Server Software: %s\n' % self.get_infos()[1].value + server_features = '' + + for feature in self.get_features(): + if feature.available: + available = 'Yes' + else: + available = 'No' + if feature.tooltip != '': + tooltip = '(%s)' % feature.tooltip + else: + tooltip = '' + server_features += '%s: %s %s\n' % (feature.name, available, tooltip) + + clipboard_text = server_software + server_features + self.clipboard.set_text(clipboard_text, -1) + def on_response(self, dialog, response): if response == Gtk.ResponseType.OK: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bed18c9067ac7f168b31d70861b43dcb56… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bed18c9067ac7f168b31d70861b43dcb56… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Features Dialog Design
by Philipp Hörist 27 Oct '18

27 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fb60324 by Daniel Brötzmann at 2018-10-27T12:54:57Z Update Features Dialog Design - - - - - 3 changed files: - gajim/data/gui/features_window.ui - gajim/data/style/gajim.css - gajim/gtk/features.py Changes: ===================================== gajim/data/gui/features_window.ui ===================================== @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="features_box"> - <property name="width_request">300</property> - <property name="height_request">530</property> + <property name="width_request">400</property> + <property name="height_request">500</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -19,9 +16,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> + <property name="label" translatable="yes">Listing of available features</property> <property name="use_markup">True</property> - <property name="xalign">0</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -41,9 +41,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="enable_grid_lines">horizontal</property> <signal name="cursor-changed" handler="on_features_treeview_cursor_changed" swapped="no"/> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <object class="GtkTreeSelection"/> </child> </object> </child> @@ -55,35 +56,97 @@ </packing> </child> <child> - <object class="GtkFrame"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">3</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Description</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + <class name="margin-top6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="feature_desc_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="halign">start</property> <property name="wrap">True</property> <property name="selectable">True</property> <property name="xalign">0</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <child type="label"> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Description</b></property> + <property name="halign">start</property> + <property name="label" translatable="yes">Requirements</property> <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + <class name="margin-top6"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="feature_req_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -88,6 +88,13 @@ popover#EmoticonPopover { padding: 5px; background-color: @theme_unfocused_base_ #ServerInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #ServerInfoGrid > list > row.activatable:active { box-shadow: none; } +/* Features Info */ +#FeaturesInfoGrid > list { border: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row:first-child { border-top: 1px solid; border-color: @borders; } +#FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } +#FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } +#FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } + /* OptionsBox */ #OptionsBox > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } #OptionsBox > row:last-child { border-bottom: 0px} ===================================== gajim/gtk/features.py ===================================== @@ -20,142 +20,148 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os +from collections import namedtuple import gi -from gi.repository import Gtk, Gdk +from gi.repository import Gtk from gajim.common import app -from gajim.common.i18n import Q_ from gajim.common.i18n import _ -from gajim.gtk.util import get_builder - class FeaturesDialog(Gtk.Dialog): def __init__(self): flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(_('Features'), None, flags) - self.connect('key-press-event', self.on_key_press_event) self.set_transient_for(app.interface.roster.window) + self.set_resizable(False) - self.builder = get_builder('features_window.ui') - content = self.get_content_area() - content.add(self.builder.get_object('features_box')) - - treeview = self.builder.get_object('features_treeview') - self.desc_label = self.builder.get_object('feature_desc_label') - - # {name: (available_function, unix_text, windows_text)} - self.features = { - _('Bonjour / Zeroconf'): ( - self.zeroconf_available, - _('Serverless chatting with autodetected clients in a local network.'), - _('Requires python-dbus.'), - _('Requires pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/).'}), - _('Command line'): ( - self.dbus_available, - _('A script to control Gajim via commandline.'), - _('Requires python-dbus.'), - _('Feature not available under Windows.')), - _('OpenPGP message encryption'): ( - self.gpg_available, - _('Ability to encrypting chat messages with OpenPGP.'), - _('Requires gpg and python-gnupg (%(url)s).') % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'}, - _('Requires gpg.exe in PATH.')), - _('Password encryption'): ( - self.some_keyring_available, - _('Passwords can be stored securely and not just in plaintext.'), - _('Requires libsecret and a provider (such as GNOME Keyring and KSecretService).'), - _('On Windows the Windows Credential Vault is used.')), - _('Spell Checker'): ( - self.speller_available, - _('Spellchecking of composed messages.'), - _('Requires Gspell'), - _('Requires Gspell')), - _('Automatic status'): ( - self.idle_available, - _('Ability to measure idle time, in order to set auto status.'), - _('Requires libxss library.'), - _('Requires python2.5.')), - _('RST Generator'): ( - self.docutils_available, - _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), - _('Requires python-docutils.'), - _('Requires python-docutils.')), - _('Audio / Video'): ( - self.farstream_available, - _('Ability to start audio and video chat.'), - _('Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and gstreamer1.0-plugins-ugly.'), - _('Feature not available under Windows.')), - _('UPnP-IGD'): ( - self.gupnp_igd_available, - _('Ability to request your router to forward port for file transfer.'), - _('Requires gir1.2-gupnpigd-1.0.'), - _('Feature not available under Windows.')), - } - - # name, supported - self.model = Gtk.ListStore(str, bool) - treeview.set_model(self.model) - - col = Gtk.TreeViewColumn(Q_('?features:Available')) - treeview.append_column(col) - cell = Gtk.CellRendererToggle() - cell.set_property('radio', True) - col.pack_start(cell, True) - col.add_attribute(cell, 'active', 1) - - col = Gtk.TreeViewColumn(_('Feature')) - treeview.append_column(col) - cell = Gtk.CellRendererText() - col.pack_start(cell, True) - col.add_attribute(cell, 'text', 0) - - # Fill model - for feature in self.features: - func = self.features[feature][0] - rep = func() - self.model.append([feature, rep]) - - self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) - - self.builder.connect_signals(self) - self.show_all() + grid = Gtk.Grid() + grid.set_name('FeaturesInfoGrid') + grid.set_row_spacing(10) + grid.set_hexpand(True) - def on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() + self.feature_listbox = Gtk.ListBox() + self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.feature_listbox.set_header_func(self.header_func, _('Features')) - def on_close_button_clicked(self, widget): - self.destroy() - - def on_features_treeview_cursor_changed(self, widget): - selection = widget.get_selection() - if not selection: - return - rows = selection.get_selected_rows()[1] - if not rows: - return - path = rows[0] - feature = self.model[path][0] - text = self.features[feature][1] + '\n' - if os.name == 'nt': - text = text + self.features[feature][3] + grid.attach(self.feature_listbox, 0, 0, 1, 1) + + box = self.get_content_area() + box.pack_start(grid, True, True, 0) + box.set_property('margin', 12) + box.set_spacing(18) + + self.connect('response', self.on_response) + + for feature in self.get_features(): + self.add_feature(feature) + + self.show_all() + + @staticmethod + def header_func(row, before, user_data): + if before: + row.set_header(None) else: - text = text + self.features[feature][2] - self.desc_label.set_text(text) + label = Gtk.Label(label=user_data) + label.set_halign(Gtk.Align.START) + row.set_header(label) + + def on_response(self, dialog, response): + if response == Gtk.ResponseType.OK: + self.destroy() - def zeroconf_available(self): - return app.is_installed('ZEROCONF') + def add_feature(self, feature): + item = FeatureItem(feature) + self.feature_listbox.add(item) + item.get_parent().set_tooltip_text(item.tooltip) + + def get_features(self): + Feature = namedtuple('Feature', + ['name', 'available', 'tooltip', + 'dependency_u', 'dependency_w', 'enabled']) + + spell_check_enabled = app.config.get('use_speller') + + auto_status = [app.config.get('autoaway'), app.config.get('autoxa')] + auto_status_enabled = bool(any(auto_status)) + + return [ + Feature(_('Audio / Video'), + app.is_installed('FARSTREAM'), + _('Enables Gajim to provide Audio and Video chats'), + _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' + 'gstreamer1.0-libav, gstreamer1.0-plugins-ugly'), + _('Feature not available under Windows'), + None), + Feature(_('Automatic Status'), + self.idle_available(), + _('Enables Gajim to measure your computer\'s idle time in ' + 'order to set your Status automatically'), + _('Requires: libxss'), + _('No additional requirements'), + auto_status_enabled), + Feature(_('Bonjour / Zeroconf (Serverless Chat)'), + app.is_installed('ZEROCONF'), + _('Enables Gajim to automatically detected clients in a ' + 'local network for serverless chats'), + _('Requires: python-dbus'), + _('Requires: pybonjour and bonjour SDK running (%(url)s)') + % {'url': 'https://developer.apple.com/opensource/)'}, + None), + Feature(_('Command line Control'), + self.dbus_available(), + _('Enables you to control Gajim with via commandline'), + _('Requires: python-dbus'), + _('Feature not available under Windows'), + None), + Feature(_('OpenPGP Message Encryption'), + app.is_installed('GPG'), + _('Enables Gajim to encrypt chat messages with OpenPGP'), + _('Requires: gpg and python-gnupg (%(url)s)') + % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'}, + _('Requires: gpg.exe in your PATH environment variable'), + None), + Feature(_('RST XHTML Generator'), + self.docutils_available(), + _('Enables Gajim to generate XHTML output from RST ' + 'code (%(url)s)') % {'url': + 'http://docutils.sourceforge.net/docs/ref/rst/' + 'restructuredtext.html'}, + _('Requires: python-docutils'), + _('Requires: python-docutils'), + None), + Feature(_('Secure Password Storage'), + self.some_keyring_available(), + _('Enables Gajim to store Passwords securely instead of ' + 'storing them in plaintext'), + _('Requires: libsecret and a provider (such as GNOME ' + 'Keyring and KSecretService)'), + _('Windows Credential Vault is used for secure password ' + 'storage'), + None), + Feature(_('Spell Checker'), + app.is_installed('GSPELL'), + _('Enables Gajim to spell check your messages while ' + 'composing'), + _('Requires: Gspell'), + _('Requires: Gspell'), + spell_check_enabled), + Feature(_('UPnP-IGD Port Forwarding'), + app.is_installed('UPNP'), + _('Enables Gajim to request your router to forward ports ' + 'for file transfers'), + _('Requires: gir1.2-gupnpigd-1.0'), + _('Feature not available under Windows'), + None) + ] def dbus_available(self): from gajim.common import dbus_support return dbus_support.supported - def gpg_available(self): - return app.is_installed('GPG') - def some_keyring_available(self): if os.name == 'nt': return True @@ -166,9 +172,6 @@ class FeaturesDialog(Gtk.Dialog): return False return True - def speller_available(self): - return app.is_installed('GSPELL') - def idle_available(self): from gajim.common import idle return idle.Monitor.is_available() @@ -180,8 +183,66 @@ class FeaturesDialog(Gtk.Dialog): return False return True - def farstream_available(self): - return app.is_installed('FARSTREAM') - def gupnp_igd_available(self): - return app.is_installed('UPNP') +class FeatureItem(Gtk.Grid): + def __init__(self, feature): + super().__init__() + self.set_column_spacing(12) + + self.tooltip = feature.tooltip + self.feature_dependency_u_text = feature.dependency_u + self.feature_dependency_w_text = feature.dependency_w + + self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + self.feature_label = Gtk.Label(label=feature.name) + self.feature_label.set_halign(Gtk.Align.START) + self.box.pack_start(self.feature_label, True, True, 0) + + self.feature_dependency_u = Gtk.Label(label=feature.dependency_u) + self.feature_dependency_u.get_style_context().add_class('dim-label') + self.feature_dependency_w = Gtk.Label(label=feature.dependency_w) + self.feature_dependency_w.get_style_context().add_class('dim-label') + + if not feature.available: + self.feature_dependency_u.set_halign(Gtk.Align.START) + self.feature_dependency_u.set_alignment(0.0, 0.0) + self.feature_dependency_u.set_line_wrap(True) + self.feature_dependency_u.set_max_width_chars(50) + self.feature_dependency_u.set_selectable(True) + self.feature_dependency_w.set_halign(Gtk.Align.START) + self.feature_dependency_w.set_alignment(0.0, 0.0) + self.feature_dependency_w.set_line_wrap(True) + self.feature_dependency_w.set_max_width_chars(50) + self.feature_dependency_w.set_selectable(True) + + if os.name == 'nt': + self.box.pack_start(self.feature_dependency_w, True, True, 0) + else: + self.box.pack_start(self.feature_dependency_u, True, True, 0) + + self.icon = Gtk.Image() + self.label_disabled = Gtk.Label(label='Disabled in Preferences') + self.label_disabled.get_style_context().add_class('dim-label') + self.set_feature(feature.available, feature.enabled) + + self.add(self.icon) + self.add(self.box) + + def set_feature(self, available, enabled): + self.icon.get_style_context().remove_class('error-color') + self.icon.get_style_context().remove_class('warning-color') + self.icon.get_style_context().remove_class('success-color') + + if not available: + self.icon.set_from_icon_name('window-close-symbolic', + Gtk.IconSize.MENU) + self.icon.get_style_context().add_class('error-color') + elif enabled is False: + self.icon.set_from_icon_name('dialog-warning-symbolic', + Gtk.IconSize.MENU) + self.box.pack_start(self.label_disabled, True, True, 0) + self.icon.get_style_context().add_class('warning-color') + else: + self.icon.set_from_icon_name('emblem-ok-symbolic', + Gtk.IconSize.MENU) + self.icon.get_style_context().add_class('success-color') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb6032420720c820d44e57198ea9cf05d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fb6032420720c820d44e57198ea9cf05d… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits