mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-08 09:28:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[GTK3] Large rename/modify code for GTK3

Browse source
This commit is contained in:
Calum Lind 2016-11-11 16:58:55 +00:00 • committed by Calum Lind
commit ea72164798
32 changed files with 845 additions and 830 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deluge/ui/gtkui/aboutdialog.py
View file

@ -9,7 +9,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import gtk from gi.repository import Gtk
import deluge.component as component import deluge.component as component
from deluge.common import get_version, open_url_in_browser, windows_check from deluge.common import get_version, open_url_in_browser, windows_check
@ -19,9 +19,10 @@ from deluge.ui.gtkui.common import get_deluge_icon, get_pixbuf
class AboutDialog(object): class AboutDialog(object):
def __init__(self): def __init__(self):
self.about = gtk.AboutDialog() self.about = Gtk.AboutDialog()
self.about.set_transient_for(component.get('MainWindow').window) self.about.set_transient_for(component.get('MainWindow').get_window())
self.about.set_position(gtk.WIN_POS_CENTER) self.about.set_position(Gtk.WindowPosition.CENTER)
self.about.set_name(_('Deluge'))
self.about.set_program_name(_('Deluge')) self.about.set_program_name(_('Deluge'))
if windows_check(): if windows_check():

76
deluge/ui/gtkui/addtorrentdialog.py
View file

@ -15,8 +15,8 @@ from base64 import b64decode, b64encode
from xml.sax.saxutils import escape as xml_escape from xml.sax.saxutils import escape as xml_escape
from xml.sax.saxutils import unescape as xml_unescape from xml.sax.saxutils import unescape as xml_unescape
import gtk from gi.repository import Gtk
from gobject import TYPE_INT64, TYPE_UINT64 from gi.repository.GObject import TYPE_INT64, TYPE_UINT64
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
@ -40,7 +40,7 @@ log = logging.getLogger(__name__)
class AddTorrentDialog(component.Component): class AddTorrentDialog(component.Component):
def __init__(self): def __init__(self):
component.Component.__init__(self, 'AddTorrentDialog') component.Component.__init__(self, 'AddTorrentDialog')
self.builder = gtk.Builder() self.builder = Gtk.Builder()
# The base dialog # The base dialog
self.builder.add_from_file( self.builder.add_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
@ -68,10 +68,10 @@ class AddTorrentDialog(component.Component):
self.builder.connect_signals(self) self.builder.connect_signals(self)
# download?, path, filesize, sequence number, inconsistent? # download?, path, filesize, sequence number, inconsistent?
self.files_treestore = gtk.TreeStore( self.files_treestore = Gtk.TreeStore(
bool, str, TYPE_UINT64, TYPE_INT64, bool, str bool, str, TYPE_UINT64, TYPE_INT64, bool, str
) )
self.files_treestore.set_sort_column_id(1, gtk.SORT_ASCENDING) self.files_treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING)
# Holds the files info # Holds the files info
self.files = {} self.files = {}
@ -86,22 +86,22 @@ class AddTorrentDialog(component.Component):
self.prefetching_magnets = [] self.prefetching_magnets = []
render = gtk.CellRendererText() render = Gtk.CellRendererText()
render.connect('edited', self._on_torrent_name_edit) render.connect('edited', self._on_torrent_name_edit)
render.set_property('editable', True) render.set_property('editable', True)
column = gtk.TreeViewColumn(_('Torrent'), render, text=1) column = Gtk.TreeViewColumn(_('Torrent'), render, text=1)
self.listview_torrents.append_column(column) self.listview_torrents.append_column(column)
render = gtk.CellRendererToggle() render = Gtk.CellRendererToggle()
render.connect('toggled', self._on_file_toggled) render.connect('toggled', self._on_file_toggled)
column = gtk.TreeViewColumn(None, render, active=0, inconsistent=4) column = Gtk.TreeViewColumn(None, render, active=0, inconsistent=4)
self.listview_files.append_column(column) self.listview_files.append_column(column)
column = gtk.TreeViewColumn(_('Filename')) column = Gtk.TreeViewColumn(_('Filename'))
render = gtk.CellRendererPixbuf() render = Gtk.CellRendererPixbuf()
column.pack_start(render, False) column.pack_start(render, False)
column.add_attribute(render, 'stock-id', 5) column.add_attribute(render, 'stock-id', 5)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
render.set_property('editable', True) render.set_property('editable', True)
render.connect('edited', self._on_filename_edited) render.connect('edited', self._on_filename_edited)
column.pack_start(render, True) column.pack_start(render, True)
@ -109,18 +109,18 @@ class AddTorrentDialog(component.Component):
column.set_expand(True) column.set_expand(True)
self.listview_files.append_column(column) self.listview_files.append_column(column)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column = gtk.TreeViewColumn(_('Size')) column = Gtk.TreeViewColumn(_('Size'))
column.pack_start(render, True) column.pack_start(render, True)
column.set_cell_data_func(render, cell_data_size, 2) column.set_cell_data_func(render, cell_data_size, 2)
self.listview_files.append_column(column) self.listview_files.append_column(column)
self.torrent_liststore = gtk.ListStore(str, str, str) self.torrent_liststore = Gtk.ListStore(str, str, str)
self.listview_torrents.set_model(self.torrent_liststore) self.listview_torrents.set_model(self.torrent_liststore)
self.listview_torrents.set_tooltip_column(2) self.listview_torrents.set_tooltip_column(2)
self.listview_files.set_model(self.files_treestore) self.listview_files.set_model(self.files_treestore)
self.listview_files.get_selection().set_mode(gtk.SELECTION_MULTIPLE) self.listview_files.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE)
self.listview_torrents.get_selection().connect( self.listview_torrents.get_selection().connect(
'changed', self._on_torrent_changed 'changed', self._on_torrent_changed
) )
@ -377,7 +377,7 @@ class AddTorrentDialog(component.Component):
for key, value in split_files.items(): for key, value in split_files.items():
if key.endswith(os.path.sep): if key.endswith(os.path.sep):
chunk_iter = self.files_treestore.append( chunk_iter = self.files_treestore.append(
parent_iter, [True, key, 0, -1, False, gtk.STOCK_DIRECTORY] parent_iter, [True, key, 0, -1, False, Gtk.STOCK_DIRECTORY]
) )
chunk_size = self.add_files(chunk_iter, value) chunk_size = self.add_files(chunk_iter, value)
self.files_treestore.set(chunk_iter, 2, chunk_size) self.files_treestore.set(chunk_iter, 2, chunk_size)
@ -385,7 +385,7 @@ class AddTorrentDialog(component.Component):
else: else:
self.files_treestore.append( self.files_treestore.append(
parent_iter, parent_iter,
[value[2], key, value[1]['size'], value[0], False, gtk.STOCK_FILE], [value[2], key, value[1]['size'], value[0], False, Gtk.STOCK_FILE],
) )
ret += value[1]['size'] ret += value[1]['size']
if parent_iter and self.files_treestore.iter_has_child(parent_iter): if parent_iter and self.files_treestore.iter_has_child(parent_iter):
@ -651,15 +651,15 @@ class AddTorrentDialog(component.Component):
def on_button_file_clicked(self, widget): def on_button_file_clicked(self, widget):
log.debug('on_button_file_clicked') log.debug('on_button_file_clicked')
# Setup the filechooserdialog # Setup the filechooserdialog
chooser = gtk.FileChooserDialog( chooser = Gtk.FileChooserDialog(
_('Choose a .torrent file'), _('Choose a .torrent file'),
None, None,
gtk.FILE_CHOOSER_ACTION_OPEN, Gtk.FileChooserAction.OPEN,
buttons=( buttons=(
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_OPEN, Gtk.STOCK_OPEN,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
) )
@ -669,11 +669,11 @@ class AddTorrentDialog(component.Component):
chooser.set_local_only(False) chooser.set_local_only(False)
# Add .torrent and * file filters # Add .torrent and * file filters
file_filter = gtk.FileFilter() file_filter = Gtk.FileFilter()
file_filter.set_name(_('Torrent files')) file_filter.set_name(_('Torrent files'))
file_filter.add_pattern('*.' + 'torrent') file_filter.add_pattern('*.' + 'torrent')
chooser.add_filter(file_filter) chooser.add_filter(file_filter)
file_filter = gtk.FileFilter() file_filter = Gtk.FileFilter()
file_filter.set_name(_('All files')) file_filter.set_name(_('All files'))
file_filter.add_pattern('*') file_filter.add_pattern('*')
chooser.add_filter(file_filter) chooser.add_filter(file_filter)
@ -686,7 +686,7 @@ class AddTorrentDialog(component.Component):
# Run the dialog # Run the dialog
response = chooser.run() response = chooser.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = chooser.get_filenames() result = chooser.get_filenames()
self.config['default_load_path'] = chooser.get_current_folder() self.config['default_load_path'] = chooser.get_current_folder()
else: else:
@ -701,7 +701,7 @@ class AddTorrentDialog(component.Component):
dialog = self.builder.get_object('url_dialog') dialog = self.builder.get_object('url_dialog')
entry = self.builder.get_object('entry_url') entry = self.builder.get_object('entry_url')
dialog.set_default_response(gtk.RESPONSE_OK) dialog.set_default_response(Gtk.ResponseType.OK)
dialog.set_transient_for(self.dialog) dialog.set_transient_for(self.dialog)
entry.grab_focus() entry.grab_focus()
@ -712,7 +712,7 @@ class AddTorrentDialog(component.Component):
dialog.show_all() dialog.show_all()
response = dialog.run() response = dialog.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
url = entry.get_text().decode('utf-8') url = entry.get_text().decode('utf-8')
else: else:
url = None url = None
@ -736,16 +736,14 @@ class AddTorrentDialog(component.Component):
).run() ).run()
def add_from_url(self, url): def add_from_url(self, url):
dialog = gtk.Dialog( dialog = Gtk.Dialog(
_('Downloading...'), _('Downloading...'),
flags=gtk.DIALOG_MODAL flags=Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
| gtk.DIALOG_DESTROY_WITH_PARENT
| gtk.DIALOG_NO_SEPARATOR,
parent=self.dialog, parent=self.dialog,
) )
dialog.set_transient_for(self.dialog) dialog.set_transient_for(self.dialog)
pb = gtk.ProgressBar() pb = Gtk.ProgressBar()
dialog.vbox.pack_start(pb, True, True, 0) dialog.vbox.pack_start(pb, True, True, 0)
dialog.show_all() dialog.show_all()
@ -795,7 +793,7 @@ class AddTorrentDialog(component.Component):
entry = self.builder.get_object('entry_hash') entry = self.builder.get_object('entry_hash')
textview = self.builder.get_object('text_trackers') textview = self.builder.get_object('text_trackers')
dialog.set_default_response(gtk.RESPONSE_OK) dialog.set_default_response(Gtk.ResponseType.OK)
dialog.set_transient_for(self.dialog) dialog.set_transient_for(self.dialog)
entry.grab_focus() entry.grab_focus()
@ -806,7 +804,7 @@ class AddTorrentDialog(component.Component):
dialog.show_all() dialog.show_all()
response = dialog.run() response = dialog.run()
infohash = entry.get_text().strip() infohash = entry.get_text().strip()
if response == gtk.RESPONSE_OK and deluge.common.is_infohash(infohash): if response == Gtk.RESPONSE_OK and deluge.common.is_infohash(infohash):
# Create a list of trackers from the textview buffer # Create a list of trackers from the textview buffer
tview_buf = textview.get_buffer() tview_buf = textview.get_buffer()
trackers_text = tview_buf.get_text(*tview_buf.get_bounds()) trackers_text = tview_buf.get_text(*tview_buf.get_bounds())
@ -974,7 +972,7 @@ class AddTorrentDialog(component.Component):
split_text = new_text.split(os.path.sep) split_text = new_text.split(os.path.sep)
for s in split_text[:-1]: for s in split_text[:-1]:
parent = self.files_treestore.append( parent = self.files_treestore.append(
parent, [True, s, 0, -1, False, gtk.STOCK_DIRECTORY] parent, [True, s, 0, -1, False, Gtk.STOCK_DIRECTORY]
) )
self.files_treestore[itr][1] = split_text[-1] self.files_treestore[itr][1] = split_text[-1]
@ -1034,7 +1032,7 @@ class AddTorrentDialog(component.Component):
# the existing itr and change the text # the existing itr and change the text
parent = self.files_treestore.append( parent = self.files_treestore.append(
parent, parent,
[True, s + os.path.sep, 0, -1, False, gtk.STOCK_DIRECTORY], [True, s + os.path.sep, 0, -1, False, Gtk.STOCK_DIRECTORY],
) )
self.files_treestore[itr][1] = split_text[-1] + os.path.sep self.files_treestore[itr][1] = split_text[-1] + os.path.sep
@ -1046,7 +1044,7 @@ class AddTorrentDialog(component.Component):
# We need to re-expand the view because it might contracted # We need to re-expand the view because it might contracted
# if we change the root iter # if we change the root iter
# FIXME add back expand_row # FIXME add back expand_row
# self.listview_files.expand_row('0', False) # self.listview_files.expand_row(b'0', False)
self.listview_files.expand_all() self.listview_files.expand_all()
else: else:
# This was a simple folder rename without any splits, so just # This was a simple folder rename without any splits, so just

43
deluge/ui/gtkui/common.py
View file

@ -16,22 +16,17 @@ import shutil
import sys import sys
import six.moves.cPickle as pickle import six.moves.cPickle as pickle
from gobject import GError from gi.repository.Gdk import SELECTION_CLIPBOARD
from gtk import ( from gi.repository.GdkPixbuf import Colorspace, Pixbuf
SORT_ASCENDING, from gi.repository.GObject import GError
from gi.repository.Gtk import (
Clipboard,
IconTheme,
Menu, Menu,
MenuItem, MenuItem,
RadioMenuItem, RadioMenuItem,
SeparatorMenuItem, SeparatorMenuItem,
clipboard_get, SortType,
icon_theme_get_default,
)
from gtk.gdk import (
COLORSPACE_RGB,
SELECTION_PRIMARY,
Pixbuf,
pixbuf_new_from_file,
pixbuf_new_from_file_at_size,
) )
from deluge.common import get_pixmap, osx_check, windows_check from deluge.common import get_pixmap, osx_check, windows_check
@ -40,14 +35,14 @@ log = logging.getLogger(__name__)
def create_blank_pixbuf(size=16): def create_blank_pixbuf(size=16):
pix = Pixbuf(COLORSPACE_RGB, True, 8, size, size) pix = Pixbuf(Colorspace.RGB, True, 8, size, size)
pix.fill(0x0) pix.fill(0x0)
return pix return pix
def get_pixbuf(filename): def get_pixbuf(filename):
try: try:
return pixbuf_new_from_file(get_pixmap(filename)) return Pixbuf.new_from_file(get_pixmap(filename))
except GError as ex: except GError as ex:
log.warning(ex) log.warning(ex)
return create_blank_pixbuf() return create_blank_pixbuf()
@ -64,7 +59,7 @@ icon_checking = get_pixbuf('checking16.png')
def get_pixbuf_at_size(filename, size): def get_pixbuf_at_size(filename, size):
try: try:
return pixbuf_new_from_file_at_size(get_pixmap(filename), size, size) return Pixbuf.new_from_file_at_size(get_pixmap(filename), size, size)
except GError as ex: except GError as ex:
# Failed to load the pixbuf (Bad image file), so return a blank pixbuf. # Failed to load the pixbuf (Bad image file), so return a blank pixbuf.
log.warning(ex) log.warning(ex)
@ -78,7 +73,7 @@ def get_logo(size):
size (int): Size of logo in pixels size (int): Size of logo in pixels
Returns: Returns:
gtk.gdk.Pixbuf: deluge logo Pixbuf: deluge logo
""" """
filename = 'deluge.svg' filename = 'deluge.svg'
if windows_check(): if windows_check():
@ -111,7 +106,7 @@ def build_menu_radio_list(
The pref_value is what you would like to test for the default active radio item. The pref_value is what you would like to test for the default active radio item.
Returns: Returns:
gtk.Menu: The menu radio Menu: The menu radio
""" """
menu = Menu() menu = Menu()
group = None group = None
@ -188,13 +183,13 @@ def get_deluge_icon():
that is distributed with the package. that is distributed with the package.
Returns: Returns:
gtk.gdk.Pixbuf: the deluge icon Pixbuf: the deluge icon
""" """
if windows_check(): if windows_check():
return get_logo(32) return get_logo(32)
else: else:
try: try:
icon_theme = icon_theme_get_default() icon_theme = IconTheme.get_default()
return icon_theme.load_icon('deluge', 64, 0) return icon_theme.load_icon('deluge', 64, 0)
except GError: except GError:
return get_logo(64) return get_logo(64)
@ -252,7 +247,7 @@ def associate_magnet_links(overwrite=False):
elif not osx_check(): elif not osx_check():
# gconf method is only available in a GNOME environment # gconf method is only available in a GNOME environment
try: try:
import gconf from gi.repository import GConf
except ImportError: except ImportError:
log.debug( log.debug(
'gconf not available, so will not attempt to register magnet uri handler' 'gconf not available, so will not attempt to register magnet uri handler'
@ -260,7 +255,7 @@ def associate_magnet_links(overwrite=False):
return False return False
else: else:
key = '/desktop/gnome/url-handlers/magnet/command' key = '/desktop/gnome/url-handlers/magnet/command'
gconf_client = gconf.client_get_default() gconf_client = GConf.Client.get_default()
if (gconf_client.get(key) and overwrite) or not gconf_client.get(key): if (gconf_client.get(key) and overwrite) or not gconf_client.get(key):
# We are either going to overwrite the key, or do it if it hasn't been set yet # We are either going to overwrite the key, or do it if it hasn't been set yet
if gconf_client.set_string(key, 'deluge "%s"'): if gconf_client.set_string(key, 'deluge "%s"'):
@ -357,7 +352,7 @@ def listview_replace_treestore(listview):
treestore.clear() treestore.clear()
treestore.set_default_sort_func(lambda *args: 0) treestore.set_default_sort_func(lambda *args: 0)
original_sort = treestore.get_sort_column_id() original_sort = treestore.get_sort_column_id()
treestore.set_sort_column_id(-1, SORT_ASCENDING) treestore.set_sort_column_id(-1, SortType.ASCENDING)
yield yield
@ -370,8 +365,8 @@ def listview_replace_treestore(listview):
def get_clipboard_text(): def get_clipboard_text():
text = ( text = (
clipboard_get(selection=SELECTION_PRIMARY).wait_for_text() Clipboard.get(selection=SELECTION_CLIPBOARD).wait_for_text()
or clipboard_get().wait_for_text() or Clipboard.get().wait_for_text()
) )
if text: if text:
return text.strip() return text.strip()

32
deluge/ui/gtkui/connectionmanager.py
View file

@ -13,7 +13,7 @@ import logging
import os import os
from socket import gaierror, gethostbyname from socket import gaierror, gethostbyname
import gtk from gi.repository import Gtk
from twisted.internet import defer, reactor from twisted.internet import defer, reactor
import deluge.component as component import deluge.component as component
@ -79,7 +79,7 @@ class ConnectionManager(component.Component):
def stop(self): def stop(self):
# Close this dialog when we are shutting down # Close this dialog when we are shutting down
if self.running: if self.running:
self.connection_manager.response(gtk.RESPONSE_CLOSE) self.connection_manager.response(Gtk.ResponseType.CLOSE)
def shutdown(self): def shutdown(self):
pass pass
@ -87,7 +87,7 @@ class ConnectionManager(component.Component):
# Public methods # Public methods
def show(self): def show(self):
"""Show the ConnectionManager dialog.""" """Show the ConnectionManager dialog."""
self.builder = gtk.Builder() self.builder = Gtk.Builder()
self.builder.add_from_file( self.builder.add_from_file(
resource_filename( resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'connection_manager.ui') 'deluge.ui.gtkui', os.path.join('glade', 'connection_manager.ui')
@ -98,29 +98,29 @@ class ConnectionManager(component.Component):
# Create status pixbufs # Create status pixbufs
if not HOSTLIST_PIXBUFS: if not HOSTLIST_PIXBUFS:
for stock_id in (gtk.STOCK_NO, gtk.STOCK_YES, gtk.STOCK_CONNECT): for stock_id in (Gtk.STOCK_NO, Gtk.STOCK_YES, Gtk.STOCK_CONNECT):
HOSTLIST_PIXBUFS.append( HOSTLIST_PIXBUFS.append(
self.connection_manager.render_icon(stock_id, gtk.ICON_SIZE_MENU) self.connection_manager.render_icon(stock_id, Gtk.IconSize.MENU)
) )
# Setup the hostlist liststore and treeview # Setup the hostlist liststore and treeview
self.treeview = self.builder.get_object('treeview_hostlist') self.treeview = self.builder.get_object('treeview_hostlist')
self.liststore = self.builder.get_object('liststore_hostlist') self.liststore = self.builder.get_object('liststore_hostlist')
render = gtk.CellRendererPixbuf() render = Gtk.CellRendererPixbuf()
column = gtk.TreeViewColumn(_('Status'), render) column = Gtk.TreeViewColumn(_('Status'), render)
column.set_cell_data_func(render, cell_render_status, HOSTLIST_COL_STATUS) column.set_cell_data_func(render, cell_render_status, HOSTLIST_COL_STATUS)
self.treeview.append_column(column) self.treeview.append_column(column)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column = gtk.TreeViewColumn(_('Host'), render, text=HOSTLIST_COL_HOST) column = Gtk.TreeViewColumn(_('Host'), render, text=HOSTLIST_COL_HOST)
host_data = (HOSTLIST_COL_HOST, HOSTLIST_COL_PORT, HOSTLIST_COL_USER) host_data = (HOSTLIST_COL_HOST, HOSTLIST_COL_PORT, HOSTLIST_COL_USER)
column.set_cell_data_func(render, cell_render_host, host_data) column.set_cell_data_func(render, cell_render_host, host_data)
column.set_expand(True) column.set_expand(True)
self.treeview.append_column(column) self.treeview.append_column(column)
column = gtk.TreeViewColumn( column = Gtk.TreeViewColumn(
_('Version'), gtk.CellRendererText(), text=HOSTLIST_COL_VERSION _('Version'), Gtk.CellRendererText(), text=HOSTLIST_COL_VERSION
) )
self.treeview.append_column(column) self.treeview.append_column(column)
@ -212,7 +212,7 @@ class ConnectionManager(component.Component):
self.builder.get_object('button_removehost').set_sensitive(False) self.builder.get_object('button_removehost').set_sensitive(False)
self.builder.get_object('button_startdaemon').set_sensitive(False) self.builder.get_object('button_startdaemon').set_sensitive(False)
self.builder.get_object('image_startdaemon').set_from_stock( self.builder.get_object('image_startdaemon').set_from_stock(
gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU
) )
self.builder.get_object('label_startdaemon').set_text_with_mnemonic( self.builder.get_object('label_startdaemon').set_text_with_mnemonic(
'_Start Daemon' '_Start Daemon'
@ -242,7 +242,7 @@ class ConnectionManager(component.Component):
if status == 'Connected' or status == 'Online': if status == 'Connected' or status == 'Online':
self.builder.get_object('button_connect').set_sensitive(True) self.builder.get_object('button_connect').set_sensitive(True)
self.builder.get_object('image_startdaemon').set_from_stock( self.builder.get_object('image_startdaemon').set_from_stock(
gtk.STOCK_STOP, gtk.ICON_SIZE_MENU Gtk.STOCK_STOP, Gtk.IconSize.MENU
) )
self.builder.get_object('label_startdaemon').set_text_with_mnemonic( self.builder.get_object('label_startdaemon').set_text_with_mnemonic(
_('_Stop Daemon') _('_Stop Daemon')
@ -310,7 +310,7 @@ class ConnectionManager(component.Component):
# this component will be stopped(while the connect deferred is # this component will be stopped(while the connect deferred is
# running), so, self.connection_manager will be deleted. # running), so, self.connection_manager will be deleted.
# If that's not the case, close the dialog. # If that's not the case, close the dialog.
self.connection_manager.response(gtk.RESPONSE_OK) self.connection_manager.response(Gtk.ResponseType.OK)
component.start() component.start()
def _on_connect_fail(self, reason, host_id, try_counter): def _on_connect_fail(self, reason, host_id, try_counter):
@ -321,7 +321,7 @@ class ConnectionManager(component.Component):
dialog = AuthenticationDialog(reason.value.message, reason.value.username) dialog = AuthenticationDialog(reason.value.message, reason.value.username)
def dialog_finished(response_id): def dialog_finished(response_id):
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.RESPONSE_OK:
self._connect(host_id, dialog.get_username(), dialog.get_password()) self._connect(host_id, dialog.get_username(), dialog.get_password())
return dialog.run().addCallback(dialog_finished) return dialog.run().addCallback(dialog_finished)
@ -371,7 +371,7 @@ class ConnectionManager(component.Component):
self._connect(host_id, try_counter=try_counter) self._connect(host_id, try_counter=try_counter)
def on_button_close_clicked(self, widget): def on_button_close_clicked(self, widget):
self.connection_manager.response(gtk.RESPONSE_CLOSE) self.connection_manager.response(Gtk.ResponseType.CLOSE)
def _run_addhost_dialog(self, edit_host_info=None): def _run_addhost_dialog(self, edit_host_info=None):
"""Create and runs the add host dialog. """Create and runs the add host dialog.

92
deluge/ui/gtkui/createtorrentdialog.py
View file

@ -13,8 +13,8 @@ import logging
import os.path import os.path
from base64 import b64encode from base64 import b64encode
import gtk from gi.repository import Gtk
from gobject import TYPE_UINT64, idle_add from gi.repository.GObject import TYPE_UINT64, idle_add
from twisted.internet.threads import deferToThread from twisted.internet.threads import deferToThread
import deluge.component as component import deluge.component as component
@ -35,7 +35,7 @@ class CreateTorrentDialog(object):
pass pass
def show(self): def show(self):
self.builder = gtk.Builder() self.builder = Gtk.Builder()
# The main dialog # The main dialog
self.builder.add_from_file( self.builder.add_from_file(
@ -73,20 +73,20 @@ class CreateTorrentDialog(object):
self.builder.connect_signals(self) self.builder.connect_signals(self)
# path, icon, size # path, icon, size
self.files_treestore = gtk.TreeStore(str, str, TYPE_UINT64) self.files_treestore = Gtk.TreeStore(str, str, TYPE_UINT64)
column = gtk.TreeViewColumn(_('Filename')) column = Gtk.TreeViewColumn(_('Filename'))
render = gtk.CellRendererPixbuf() render = Gtk.CellRendererPixbuf()
column.pack_start(render, False) column.pack_start(render, False)
column.add_attribute(render, 'stock-id', 1) column.add_attribute(render, 'stock-id', 1)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column.pack_start(render, True) column.pack_start(render, True)
column.add_attribute(render, 'text', 0) column.add_attribute(render, 'text', 0)
column.set_expand(True) column.set_expand(True)
self.builder.get_object('treeview_files').append_column(column) self.builder.get_object('treeview_files').append_column(column)
column = gtk.TreeViewColumn(_('Size')) column = Gtk.TreeViewColumn(_('Size'))
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column.pack_start(render, True) column.pack_start(render, True)
column.set_cell_data_func(render, cell_data_size, 2) column.set_cell_data_func(render, cell_data_size, 2)
self.builder.get_object('treeview_files').append_column(column) self.builder.get_object('treeview_files').append_column(column)
@ -95,17 +95,17 @@ class CreateTorrentDialog(object):
self.builder.get_object('treeview_files').set_show_expanders(False) self.builder.get_object('treeview_files').set_show_expanders(False)
# tier, url # tier, url
self.trackers_liststore = gtk.ListStore(int, str) self.trackers_liststore = Gtk.ListStore(int, str)
self.builder.get_object('tracker_treeview').append_column( self.builder.get_object('tracker_treeview').append_column(
gtk.TreeViewColumn(_('Tier'), gtk.CellRendererText(), text=0) Gtk.TreeViewColumn(_('Tier'), Gtk.CellRendererText(), text=0)
) )
self.builder.get_object('tracker_treeview').append_column( self.builder.get_object('tracker_treeview').append_column(
gtk.TreeViewColumn(_('Tracker'), gtk.CellRendererText(), text=1) Gtk.TreeViewColumn(_('Tracker'), Gtk.CellRendererText(), text=1)
) )
self.builder.get_object('tracker_treeview').set_model(self.trackers_liststore) self.builder.get_object('tracker_treeview').set_model(self.trackers_liststore)
self.trackers_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.trackers_liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
if not client.is_localhost() and client.connected(): if not client.is_localhost() and client.connected():
self.builder.get_object('button_remote_path').show() self.builder.get_object('button_remote_path').show()
@ -140,15 +140,15 @@ class CreateTorrentDialog(object):
def on_button_file_clicked(self, widget): def on_button_file_clicked(self, widget):
log.debug('on_button_file_clicked') log.debug('on_button_file_clicked')
# Setup the filechooserdialog # Setup the filechooserdialog
chooser = gtk.FileChooserDialog( chooser = Gtk.FileChooserDialog(
_('Choose a file'), _('Choose a file'),
self.dialog, self.dialog,
gtk.FILE_CHOOSER_ACTION_OPEN, Gtk.FileChooserAction.OPEN,
buttons=( buttons=(
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_OPEN, Gtk.STOCK_OPEN,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
) )
@ -159,7 +159,7 @@ class CreateTorrentDialog(object):
# Run the dialog # Run the dialog
response = chooser.run() response = chooser.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = chooser.get_filename() result = chooser.get_filename()
else: else:
chooser.destroy() chooser.destroy()
@ -168,22 +168,22 @@ class CreateTorrentDialog(object):
path = result.decode('utf-8') path = result.decode('utf-8')
self.files_treestore.clear() self.files_treestore.clear()
self.files_treestore.append(None, [result, gtk.STOCK_FILE, get_path_size(path)]) self.files_treestore.append(None, [result, Gtk.STOCK_FILE, get_path_size(path)])
self.adjust_piece_size() self.adjust_piece_size()
chooser.destroy() chooser.destroy()
def on_button_folder_clicked(self, widget): def on_button_folder_clicked(self, widget):
log.debug('on_button_folder_clicked') log.debug('on_button_folder_clicked')
# Setup the filechooserdialog # Setup the filechooserdialog
chooser = gtk.FileChooserDialog( chooser = Gtk.FileChooserDialog(
_('Choose a folder'), _('Choose a folder'),
self.dialog, self.dialog,
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, Gtk.FileChooserAction.SELECT_FOLDER,
buttons=( buttons=(
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_OPEN, Gtk.STOCK_OPEN,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
) )
@ -193,7 +193,7 @@ class CreateTorrentDialog(object):
# Run the dialog # Run the dialog
response = chooser.run() response = chooser.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = chooser.get_filename() result = chooser.get_filename()
else: else:
chooser.destroy() chooser.destroy()
@ -202,7 +202,7 @@ class CreateTorrentDialog(object):
path = result.decode('utf-8') path = result.decode('utf-8')
self.files_treestore.clear() self.files_treestore.clear()
self.files_treestore.append(None, [result, gtk.STOCK_OPEN, get_path_size(path)]) self.files_treestore.append(None, [result, Gtk.STOCK_OPEN, get_path_size(path)])
self.adjust_piece_size() self.adjust_piece_size()
chooser.destroy() chooser.destroy()
@ -215,14 +215,14 @@ class CreateTorrentDialog(object):
entry.grab_focus() entry.grab_focus()
response = dialog.run() response = dialog.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = entry.get_text() result = entry.get_text()
def _on_get_path_size(size): def _on_get_path_size(size):
log.debug('size: %s', size) log.debug('size: %s', size)
if size > 0: if size > 0:
self.files_treestore.clear() self.files_treestore.clear()
self.files_treestore.append(None, [result, gtk.STOCK_NETWORK, size]) self.files_treestore.append(None, [result, Gtk.STOCK_NETWORK, size])
self.adjust_piece_size() self.adjust_piece_size()
client.core.get_path_size(result).addCallback(_on_get_path_size) client.core.get_path_size(result).addCallback(_on_get_path_size)
@ -243,7 +243,7 @@ class CreateTorrentDialog(object):
path = self.files_treestore[0][0].rstrip('\\/') path = self.files_treestore[0][0].rstrip('\\/')
torrent_filename = '%s.torrent' % os.path.split(path)[-1] torrent_filename = '%s.torrent' % os.path.split(path)[-1]
is_remote = self.files_treestore[0][1] == gtk.STOCK_NETWORK is_remote = self.files_treestore[0][1] == Gtk.STOCK_NETWORK
if is_remote: if is_remote:
# This is a remote path # This is a remote path
@ -252,7 +252,7 @@ class CreateTorrentDialog(object):
dialog_save_path = self.builder.get_object('entry_save_path') dialog_save_path = self.builder.get_object('entry_save_path')
dialog_save_path.set_text(path + '.torrent') dialog_save_path.set_text(path + '.torrent')
response = dialog.run() response = dialog.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = dialog_save_path.get_text() result = dialog_save_path.get_text()
else: else:
dialog.hide() dialog.hide()
@ -260,15 +260,15 @@ class CreateTorrentDialog(object):
dialog.hide() dialog.hide()
else: else:
# Setup the filechooserdialog # Setup the filechooserdialog
chooser = gtk.FileChooserDialog( chooser = Gtk.FileChooserDialog(
_('Save .torrent file'), _('Save .torrent file'),
self.dialog, self.dialog,
gtk.FILE_CHOOSER_ACTION_SAVE, Gtk.FileChooserAction.SAVE,
buttons=( buttons=(
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_SAVE, Gtk.STOCK_SAVE,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
) )
@ -277,11 +277,11 @@ class CreateTorrentDialog(object):
chooser.set_property('skip-taskbar-hint', True) chooser.set_property('skip-taskbar-hint', True)
# Add .torrent and * file filters # Add .torrent and * file filters
file_filter = gtk.FileFilter() file_filter = Gtk.FileFilter()
file_filter.set_name(_('Torrent files')) file_filter.set_name(_('Torrent files'))
file_filter.add_pattern('*.' + 'torrent') file_filter.add_pattern('*.' + 'torrent')
chooser.add_filter(file_filter) chooser.add_filter(file_filter)
file_filter = gtk.FileFilter() file_filter = Gtk.FileFilter()
file_filter.set_name(_('All files')) file_filter.set_name(_('All files'))
file_filter.add_pattern('*') file_filter.add_pattern('*')
chooser.add_filter(file_filter) chooser.add_filter(file_filter)
@ -290,7 +290,7 @@ class CreateTorrentDialog(object):
# Run the dialog # Run the dialog
response = chooser.run() response = chooser.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
result = chooser.get_filename() result = chooser.get_filename()
else: else:
chooser.destroy() chooser.destroy()
@ -339,7 +339,7 @@ class CreateTorrentDialog(object):
if is_remote: if is_remote:
def torrent_created(): def torrent_created():
self.builder.get_object('progress_dialog').hide_all() self.builder.get_object('progress_dialog').hide()
client.deregister_event_handler( client.deregister_event_handler(
'CreateTorrentProgressEvent', on_create_torrent_progress_event 'CreateTorrentProgressEvent', on_create_torrent_progress_event
) )
@ -371,7 +371,7 @@ class CreateTorrentDialog(object):
else: else:
def hide_progress(result): def hide_progress(result):
self.builder.get_object('progress_dialog').hide_all() self.builder.get_object('progress_dialog').hide()
deferToThread( deferToThread(
self.create_torrent, self.create_torrent,
@ -475,7 +475,7 @@ class CreateTorrentDialog(object):
def on_button_add_clicked(self, widget): def on_button_add_clicked(self, widget):
log.debug('on_button_add_clicked') log.debug('on_button_add_clicked')
builder = gtk.Builder() builder = Gtk.Builder()
builder.add_from_file( builder.add_from_file(
resource_filename( resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'edit_trackers.add.ui') 'deluge.ui.gtkui', os.path.join('glade', 'edit_trackers.add.ui')
@ -493,7 +493,7 @@ class CreateTorrentDialog(object):
textview.grab_focus() textview.grab_focus()
response = dialog.run() response = dialog.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
# Create a list of trackers from the textview buffer # Create a list of trackers from the textview buffer
textview_buf = textview.get_buffer() textview_buf = textview.get_buffer()
trackers_text = textview_buf.get_text(*textview_buf.get_bounds()) trackers_text = textview_buf.get_text(*textview_buf.get_bounds())

154
deluge/ui/gtkui/dialogs.py
View file

@ -11,7 +11,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import gtk from gi.repository import Gtk
from twisted.internet import defer from twisted.internet import defer
import deluge.component as component import deluge.component as component
@ -19,7 +19,7 @@ from deluge.common import windows_check
from deluge.ui.gtkui.common import get_deluge_icon, get_pixbuf_at_size from deluge.ui.gtkui.common import get_deluge_icon, get_pixbuf_at_size
class BaseDialog(gtk.Dialog): class BaseDialog(Gtk.Dialog):
""" """
Base dialog class that should be used with all dialogs. Base dialog class that should be used with all dialogs.
""" """
@ -36,9 +36,7 @@ class BaseDialog(gtk.Dialog):
super(BaseDialog, self).__init__( super(BaseDialog, self).__init__(
title=header, title=header,
parent=parent if parent else component.get('MainWindow').window, parent=parent if parent else component.get('MainWindow').window,
flags=gtk.DIALOG_MODAL flags=Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
| gtk.DIALOG_DESTROY_WITH_PARENT
| gtk.DIALOG_NO_SEPARATOR,
buttons=buttons, buttons=buttons,
) )
@ -50,9 +48,9 @@ class BaseDialog(gtk.Dialog):
# Setup all the formatting and such to make our dialog look pretty # Setup all the formatting and such to make our dialog look pretty
self.set_border_width(5) self.set_border_width(5)
self.set_default_size(200, 100) self.set_default_size(200, 100)
hbox = gtk.HBox(spacing=5) hbox = Gtk.HBox(spacing=5)
image = gtk.Image() image = Gtk.Image()
if not gtk.stock_lookup(icon) and ( if not Gtk.stock_lookup(icon) and (
icon.endswith('.svg') or icon.endswith('.png') icon.endswith('.svg') or icon.endswith('.png')
): ):
# Hack for Windows since it doesn't support svg # Hack for Windows since it doesn't support svg
@ -60,11 +58,11 @@ class BaseDialog(gtk.Dialog):
icon = icon.rpartition('.svg')[0] + '16.png' icon = icon.rpartition('.svg')[0] + '16.png'
image.set_from_pixbuf(get_pixbuf_at_size(icon, 32)) image.set_from_pixbuf(get_pixbuf_at_size(icon, 32))
else: else:
image.set_from_stock(icon, gtk.ICON_SIZE_DIALOG) image.set_from_stock(icon, Gtk.IconSize.DIALOG)
image.set_alignment(0.5, 0.0) image.set_alignment(0.5, 0.0)
hbox.pack_start(image, False, False, 0) hbox.pack_start(image, False, False, 0)
vbox = gtk.VBox(spacing=5) vbox = Gtk.VBox(spacing=5)
tlabel = gtk.Label(text) tlabel = Gtk.Label(label=text)
tlabel.set_use_markup(True) tlabel.set_use_markup(True)
tlabel.set_line_wrap(True) tlabel.set_line_wrap(True)
tlabel.set_alignment(0.0, 0.5) tlabel.set_alignment(0.0, 0.5)
@ -75,7 +73,7 @@ class BaseDialog(gtk.Dialog):
self.vbox.show_all() self.vbox.show_all()
def _on_delete_event(self, widget, event): def _on_delete_event(self, widget, event):
self.deferred.callback(gtk.RESPONSE_DELETE_EVENT) self.deferred.callback(Gtk.ResponseType.DELETE_EVENT)
self.destroy() self.destroy()
def _on_response(self, widget, response): def _on_response(self, widget, response):
@ -96,7 +94,7 @@ class YesNoDialog(BaseDialog):
""" """
Displays a dialog asking the user to select Yes or No to a question. Displays a dialog asking the user to select Yes or No to a question.
When run(), it will return either a gtk.RESPONSE_YES or a gtk.RESPONSE_NO. When run(), it will return either a Gtk.ResponseType.YES or a Gtk.ResponseType.NO.
""" """
@ -109,8 +107,8 @@ class YesNoDialog(BaseDialog):
super(YesNoDialog, self).__init__( super(YesNoDialog, self).__init__(
header, header,
text, text,
gtk.STOCK_DIALOG_QUESTION, Gtk.STOCK_DIALOG_QUESTION,
(gtk.STOCK_NO, gtk.RESPONSE_NO, gtk.STOCK_YES, gtk.RESPONSE_YES), (Gtk.STOCK_NO, Gtk.ResponseType.NO, Gtk.STOCK_YES, Gtk.ResponseType.YES),
parent, parent,
) )
@ -119,7 +117,7 @@ class InformationDialog(BaseDialog):
""" """
Displays an information dialog. Displays an information dialog.
When run(), it will return a gtk.RESPONSE_CLOSE. When run(), it will return a Gtk.ResponseType.CLOSE.
""" """
def __init__(self, header, text, parent=None): def __init__(self, header, text, parent=None):
@ -131,8 +129,8 @@ class InformationDialog(BaseDialog):
super(InformationDialog, self).__init__( super(InformationDialog, self).__init__(
header, header,
text, text,
gtk.STOCK_DIALOG_INFO, Gtk.STOCK_DIALOG_INFO,
(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE), (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE),
parent, parent,
) )
@ -141,7 +139,7 @@ class ErrorDialog(BaseDialog):
""" """
Displays an error dialog with optional details text for more information. Displays an error dialog with optional details text for more information.
When run(), it will return a gtk.RESPONSE_CLOSE. When run(), it will return a Gtk.ResponseType.CLOSE.
""" """
def __init__(self, header, text, parent=None, details=None, traceback=False): def __init__(self, header, text, parent=None, details=None, traceback=False):
@ -158,8 +156,8 @@ class ErrorDialog(BaseDialog):
super(ErrorDialog, self).__init__( super(ErrorDialog, self).__init__(
header, header,
text, text,
gtk.STOCK_DIALOG_ERROR, Gtk.STOCK_DIALOG_ERROR,
(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE), (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE),
parent, parent,
) )
@ -176,14 +174,14 @@ class ErrorDialog(BaseDialog):
if details: if details:
self.set_default_size(600, 400) self.set_default_size(600, 400)
textview = gtk.TextView() textview = Gtk.TextView()
textview.set_editable(False) textview.set_editable(False)
textview.get_buffer().set_text(details) textview.get_buffer().set_text(details)
sw = gtk.ScrolledWindow() sw = Gtk.ScrolledWindow()
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
sw.set_shadow_type(gtk.SHADOW_IN) sw.set_shadow_type(Gtk.ShadowType.IN)
sw.add(textview) sw.add(textview)
label = gtk.Label(_('Details:')) label = Gtk.Label(label=_('Details:'))
label.set_alignment(0.0, 0.5) label.set_alignment(0.0, 0.5)
self.vbox.pack_start(label, False, False, 0) self.vbox.pack_start(label, False, False, 0)
self.vbox.pack_start(sw, True, True, 0) self.vbox.pack_start(sw, True, True, 0)
@ -194,8 +192,8 @@ class AuthenticationDialog(BaseDialog):
""" """
Displays a dialog with entry fields asking for username and password. Displays a dialog with entry fields asking for username and password.
When run(), it will return either a gtk.RESPONSE_CANCEL or a When run(), it will return either a Gtk.ResponseType.CANCEL or a
gtk.RESPONSE_OK. Gtk.ResponseType.OK.
""" """
def __init__(self, err_msg='', username=None, parent=None): def __init__(self, err_msg='', username=None, parent=None):
@ -206,25 +204,30 @@ class AuthenticationDialog(BaseDialog):
super(AuthenticationDialog, self).__init__( super(AuthenticationDialog, self).__init__(
_('Authenticate'), _('Authenticate'),
err_msg, err_msg,
gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.STOCK_DIALOG_AUTHENTICATION,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_CONNECT, gtk.RESPONSE_OK), (
Gtk.STOCK_CANCEL,
Gtk.ResponseType.CANCEL,
Gtk.STOCK_CONNECT,
Gtk.ResponseType.OK,
),
parent, parent,
) )
table = gtk.Table(2, 2, False) table = Gtk.Table(2, 2, False)
self.username_label = gtk.Label() self.username_label = Gtk.Label()
self.username_label.set_markup('<b>' + _('Username:') + '</b>') self.username_label.set_markup('<b>' + _('Username:') + '</b>')
self.username_label.set_alignment(1.0, 0.5) self.username_label.set_alignment(1.0, 0.5)
self.username_label.set_padding(5, 5) self.username_label.set_padding(5, 5)
self.username_entry = gtk.Entry() self.username_entry = Gtk.Entry()
table.attach(self.username_label, 0, 1, 0, 1) table.attach(self.username_label, 0, 1, 0, 1)
table.attach(self.username_entry, 1, 2, 0, 1) table.attach(self.username_entry, 1, 2, 0, 1)
self.password_label = gtk.Label() self.password_label = Gtk.Label()
self.password_label.set_markup('<b>' + _('Password:') + '</b>') self.password_label.set_markup('<b>' + _('Password:') + '</b>')
self.password_label.set_alignment(1.0, 0.5) self.password_label.set_alignment(1.0, 0.5)
self.password_label.set_padding(5, 5) self.password_label.set_padding(5, 5)
self.password_entry = gtk.Entry() self.password_entry = Gtk.Entry()
self.password_entry.set_visibility(False) self.password_entry.set_visibility(False)
self.password_entry.connect('activate', self.on_password_activate) self.password_entry.connect('activate', self.on_password_activate)
table.attach(self.password_label, 0, 1, 1, 2) table.attach(self.password_label, 0, 1, 1, 2)
@ -247,7 +250,7 @@ class AuthenticationDialog(BaseDialog):
return self.password_entry.get_text() return self.password_entry.get_text()
def on_password_activate(self, widget): def on_password_activate(self, widget):
self.response(gtk.RESPONSE_OK) self.response(Gtk.ResponseType.OK)
class AccountDialog(BaseDialog): class AccountDialog(BaseDialog):
@ -263,12 +266,12 @@ class AccountDialog(BaseDialog):
super(AccountDialog, self).__init__( super(AccountDialog, self).__init__(
_('Edit Account'), _('Edit Account'),
_('Edit existing account'), _('Edit existing account'),
gtk.STOCK_DIALOG_INFO, Gtk.STOCK_DIALOG_INFO,
( (
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_APPLY, Gtk.STOCK_APPLY,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
parent, parent,
) )
@ -276,29 +279,34 @@ class AccountDialog(BaseDialog):
super(AccountDialog, self).__init__( super(AccountDialog, self).__init__(
_('New Account'), _('New Account'),
_('Create a new account'), _('Create a new account'),
gtk.STOCK_DIALOG_INFO, Gtk.STOCK_DIALOG_INFO,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_ADD, gtk.RESPONSE_OK), (
Gtk.STOCK_CANCEL,
Gtk.ResponseType.CANCEL,
Gtk.STOCK_ADD,
Gtk.ResponseType.OK,
),
parent, parent,
) )
self.levels_mapping = levels_mapping self.levels_mapping = levels_mapping
table = gtk.Table(2, 3, False) table = Gtk.Table(2, 3, False)
self.username_label = gtk.Label() self.username_label = Gtk.Label()
self.username_label.set_markup('<b>' + _('Username:') + '</b>') self.username_label.set_markup('<b>' + _('Username:') + '</b>')
self.username_label.set_alignment(1.0, 0.5) self.username_label.set_alignment(1.0, 0.5)
self.username_label.set_padding(5, 5) self.username_label.set_padding(5, 5)
self.username_entry = gtk.Entry() self.username_entry = Gtk.Entry()
table.attach(self.username_label, 0, 1, 0, 1) table.attach(self.username_label, 0, 1, 0, 1)
table.attach(self.username_entry, 1, 2, 0, 1) table.attach(self.username_entry, 1, 2, 0, 1)
self.authlevel_label = gtk.Label() self.authlevel_label = Gtk.Label()
self.authlevel_label.set_markup('<b>' + _('Authentication Level:') + '</b>') self.authlevel_label.set_markup('<b>' + _('Authentication Level:') + '</b>')
self.authlevel_label.set_alignment(1.0, 0.5) self.authlevel_label.set_alignment(1.0, 0.5)
self.authlevel_label.set_padding(5, 5) self.authlevel_label.set_padding(5, 5)
# combo_box_new_text is deprecated but no other pygtk alternative. # combo_box_new_text is deprecated but no other pygtk alternative.
self.authlevel_combo = gtk.combo_box_new_text() self.authlevel_combo = Gtk.ComboBoxText()
active_idx = None active_idx = None
for idx, level in enumerate(levels_mapping): for idx, level in enumerate(levels_mapping):
self.authlevel_combo.append_text(level) self.authlevel_combo.append_text(level)
@ -313,11 +321,11 @@ class AccountDialog(BaseDialog):
table.attach(self.authlevel_label, 0, 1, 1, 2) table.attach(self.authlevel_label, 0, 1, 1, 2)
table.attach(self.authlevel_combo, 1, 2, 1, 2) table.attach(self.authlevel_combo, 1, 2, 1, 2)
self.password_label = gtk.Label() self.password_label = Gtk.Label()
self.password_label.set_markup('<b>' + _('Password:') + '</b>') self.password_label.set_markup('<b>' + _('Password:') + '</b>')
self.password_label.set_alignment(1.0, 0.5) self.password_label.set_alignment(1.0, 0.5)
self.password_label.set_padding(5, 5) self.password_label.set_padding(5, 5)
self.password_entry = gtk.Entry() self.password_entry = Gtk.Entry()
self.password_entry.set_visibility(False) self.password_entry.set_visibility(False)
table.attach(self.password_label, 0, 1, 2, 3) table.attach(self.password_label, 0, 1, 2, 3)
table.attach(self.password_entry, 1, 2, 2, 3) table.attach(self.password_entry, 1, 2, 2, 3)
@ -362,24 +370,31 @@ class OtherDialog(BaseDialog):
raise TypeError('default value needs to be an int or float') raise TypeError('default value needs to be an int or float')
if not icon: if not icon:
icon = gtk.STOCK_DIALOG_INFO icon = Gtk.STOCK_DIALOG_INFO
super(OtherDialog, self).__init__( super(OtherDialog, self).__init__(
header, header,
text, text,
icon, icon,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_APPLY, gtk.RESPONSE_OK), (
Gtk.STOCK_CANCEL,
Gtk.ResponseType.CANCEL,
Gtk.STOCK_APPLY,
Gtk.ResponseType.OK,
),
parent, parent,
) )
hbox = gtk.HBox(spacing=5) hbox = Gtk.HBox(spacing=5)
alignment_spacer = gtk.Alignment() alignment_spacer = Gtk.Alignment()
hbox.pack_start(alignment_spacer, True, True, 0) hbox.pack_start(alignment_spacer, True, True, 0)
alignment_spin = gtk.Alignment(1, 0.5, 1, 1) alignment_spin = Gtk.Alignment(xalign=1, yalign=0.5, xscale=1, yscale=1)
adjustment_spin = gtk.Adjustment( adjustment_spin = Gtk.Adjustment(
value=-1, lower=-1, upper=2097151, step_incr=1, page_incr=10 value=-1, lower=-1, upper=2097151, step_increment=1, page_increment=10
)
self.spinbutton = Gtk.SpinButton(
adjustment=adjustment_spin, climb_rate=0, digits=0
) )
self.spinbutton = gtk.SpinButton(adjustment_spin)
self.spinbutton.set_value(default) self.spinbutton.set_value(default)
self.spinbutton.select_region(0, -1) self.spinbutton.select_region(0, -1)
self.spinbutton.set_width_chars(6) self.spinbutton.set_width_chars(6)
@ -389,7 +404,7 @@ class OtherDialog(BaseDialog):
self.spinbutton.set_digits(1) self.spinbutton.set_digits(1)
alignment_spin.add(self.spinbutton) alignment_spin.add(self.spinbutton)
hbox.pack_start(alignment_spin, False, True, 0) hbox.pack_start(alignment_spin, False, True, 0)
label_type = gtk.Label() label_type = Gtk.Label()
label_type.set_text(unit_text) label_type.set_text(unit_text)
label_type.set_alignment(0.0, 0.5) label_type.set_alignment(0.0, 0.5)
hbox.pack_start(label_type, True, True, 0) hbox.pack_start(label_type, True, True, 0)
@ -403,7 +418,7 @@ class OtherDialog(BaseDialog):
def _on_response(self, widget, response): def _on_response(self, widget, response):
value = None value = None
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
if self.value_type is int: if self.value_type is int:
value = self.spinbutton.get_value_as_int() value = self.spinbutton.get_value_as_int()
else: else:
@ -416,7 +431,7 @@ class PasswordDialog(BaseDialog):
""" """
Displays a dialog with an entry field asking for a password. Displays a dialog with an entry field asking for a password.
When run(), it will return either a gtk.RESPONSE_CANCEL or a gtk.RESPONSE_OK. When run(), it will return either a Gtk.ResponseType.CANCEL or a Gtk.ResponseType.OK.
""" """
def __init__(self, password_msg='', parent=None): def __init__(self, password_msg='', parent=None):
@ -427,17 +442,22 @@ class PasswordDialog(BaseDialog):
super(PasswordDialog, self).__init__( super(PasswordDialog, self).__init__(
_('Password Protected'), _('Password Protected'),
password_msg, password_msg,
gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.STOCK_DIALOG_AUTHENTICATION,
(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_CONNECT, gtk.RESPONSE_OK), (
Gtk.STOCK_CANCEL,
Gtk.ResponseType.CANCEL,
Gtk.STOCK_CONNECT,
Gtk.ResponseType.OK,
),
parent, parent,
) )
table = gtk.Table(1, 2, False) table = Gtk.Table(1, 2, False)
self.password_label = gtk.Label() self.password_label = Gtk.Label()
self.password_label.set_markup('<b>' + _('Password:') + '</b>') self.password_label.set_markup('<b>' + _('Password:') + '</b>')
self.password_label.set_alignment(1.0, 0.5) self.password_label.set_alignment(1.0, 0.5)
self.password_label.set_padding(5, 5) self.password_label.set_padding(5, 5)
self.password_entry = gtk.Entry() self.password_entry = Gtk.Entry()
self.password_entry.set_visibility(False) self.password_entry.set_visibility(False)
self.password_entry.connect('activate', self.on_password_activate) self.password_entry.connect('activate', self.on_password_activate)
table.attach(self.password_label, 0, 1, 1, 2) table.attach(self.password_label, 0, 1, 1, 2)
@ -452,4 +472,4 @@ class PasswordDialog(BaseDialog):
return self.password_entry.get_text() return self.password_entry.get_text()
def on_password_activate(self, widget): def on_password_activate(self, widget):
self.response(gtk.RESPONSE_OK) self.response(Gtk.ResponseType.OK)

24
deluge/ui/gtkui/edittrackersdialog.py
View file

@ -12,7 +12,7 @@ from __future__ import unicode_literals
import logging import logging
import os.path import os.path
import gtk from gi.repository import Gtk
from twisted.internet import defer from twisted.internet import defer
import deluge.component as component import deluge.component as component
@ -28,7 +28,7 @@ def last_tier_trackers_from_liststore(trackers_liststore):
"""Create a list of tracker from existing liststore and find last tier number. """Create a list of tracker from existing liststore and find last tier number.
Args: Args:
tracker_liststore (gtk.ListStore): A gtk.ListStore with [tier (int), tracker (str)] rows. tracker_liststore (Gtk.ListStore): A gtk.ListStore with [tier (int), tracker (str)] rows.
Returns: Returns:
tuple(int, list): A tuple containing last tier number and list of trackers. tuple(int, list): A tuple containing last tier number and list of trackers.
@ -79,7 +79,7 @@ def trackers_tiers_from_text(text_str=''):
class EditTrackersDialog(object): class EditTrackersDialog(object):
def __init__(self, torrent_id, parent=None): def __init__(self, torrent_id, parent=None):
self.torrent_id = torrent_id self.torrent_id = torrent_id
self.builder = gtk.Builder() self.builder = Gtk.Builder()
self.gtkui_config = ConfigManager('gtkui.conf') self.gtkui_config = ConfigManager('gtkui.conf')
# Main dialog # Main dialog
@ -118,18 +118,18 @@ class EditTrackersDialog(object):
self.builder.connect_signals(self) self.builder.connect_signals(self)
# Create a liststore for tier, url # Create a liststore for tier, url
self.liststore = gtk.ListStore(int, str) self.liststore = Gtk.ListStore(int, str)
# Create the columns # Create the columns
self.treeview.append_column( self.treeview.append_column(
gtk.TreeViewColumn(_('Tier'), gtk.CellRendererText(), text=0) Gtk.TreeViewColumn(_('Tier'), Gtk.CellRendererText(), text=0)
) )
self.treeview.append_column( self.treeview.append_column(
gtk.TreeViewColumn(_('Tracker'), gtk.CellRendererText(), text=1) Gtk.TreeViewColumn(_('Tracker'), Gtk.CellRendererText(), text=1)
) )
self.treeview.set_model(self.liststore) self.treeview.set_model(self.liststore)
self.liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
self.dialog.connect('delete-event', self._on_delete_event) self.dialog.connect('delete-event', self._on_delete_event)
self.dialog.connect('response', self._on_response) self.dialog.connect('response', self._on_response)
@ -163,7 +163,7 @@ class EditTrackersDialog(object):
self.gtkui_config['edit_trackers_dialog_height'] = event.height self.gtkui_config['edit_trackers_dialog_height'] = event.height
def _on_delete_event(self, widget, event): def _on_delete_event(self, widget, event):
self.deferred.callback(gtk.RESPONSE_DELETE_EVENT) self.deferred.callback(Gtk.ResponseType.DELETE_EVENT)
self.dialog.destroy() self.dialog.destroy()
def _on_response(self, widget, response): def _on_response(self, widget, response):
@ -180,11 +180,11 @@ class EditTrackersDialog(object):
if self.old_trackers != self.trackers: if self.old_trackers != self.trackers:
# Set the torrens trackers # Set the torrens trackers
client.core.set_torrent_trackers(self.torrent_id, self.trackers) client.core.set_torrent_trackers(self.torrent_id, self.trackers)
self.deferred.callback(gtk.RESPONSE_OK) self.deferred.callback(Gtk.ResponseType.OK)
else: else:
self.deferred.callback(gtk.RESPONSE_CANCEL) self.deferred.callback(Gtk.ResponseType.CANCEL)
else: else:
self.deferred.callback(gtk.RESPONSE_CANCEL) self.deferred.callback(Gtk.ResponseType.CANCEL)
self.dialog.destroy() self.dialog.destroy()
def _on_get_torrent_status(self, status): def _on_get_torrent_status(self, status):
@ -294,6 +294,6 @@ class EditTrackersDialog(object):
def on_button_add_cancel_clicked(self, widget): def on_button_add_cancel_clicked(self, widget):
log.debug('on_button_add_cancel_clicked') log.debug('on_button_add_cancel_clicked')
# Clear the entry widget and hide the dialog # Clear the entry widget and hide the dialog
b = gtk.TextBuffer() b = Gtk.TextBuffer()
self.builder.get_object('textview_trackers').set_buffer(b) self.builder.get_object('textview_trackers').set_buffer(b)
self.add_tracker_dialog.hide() self.add_tracker_dialog.hide()

69
deluge/ui/gtkui/files_tab.py
View file

@ -12,15 +12,10 @@ from __future__ import division, unicode_literals
import logging import logging
import os.path import os.path
import gtk
import six.moves.cPickle as pickle import six.moves.cPickle as pickle
from gobject import TYPE_UINT64 from gi.repository import Gtk
from gtk.gdk import ( # pylint: disable=ungrouped-imports from gi.repository.Gdk import DragAction, ModifierType, keyval_name
ACTION_DEFAULT, from gi.repository.GObject import TYPE_UINT64
ACTION_MOVE,
BUTTON1_MASK,
keyval_name,
)
import deluge.component as component import deluge.component as component
from deluge.common import open_file, show_file from deluge.common import open_file, show_file
@ -38,10 +33,10 @@ from deluge.ui.gtkui.torrentview_data_funcs import cell_data_size
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
CELL_PRIORITY_ICONS = { CELL_PRIORITY_ICONS = {
'Ignore': gtk.STOCK_NO, 'Ignore': Gtk.STOCK_NO,
'Low': gtk.STOCK_GO_DOWN, 'Low': Gtk.STOCK_GO_DOWN,
'Normal': gtk.STOCK_OK, 'Normal': Gtk.STOCK_OK,
'High': gtk.STOCK_GO_UP, 'High': Gtk.STOCK_GO_UP,
} }
@ -83,8 +78,8 @@ class FilesTab(Tab):
self.listview = self.main_builder.get_object('files_listview') self.listview = self.main_builder.get_object('files_listview')
# filename, size, progress string, progress value, priority, file index, icon id # filename, size, progress string, progress value, priority, file index, icon id
self.treestore = gtk.TreeStore(str, TYPE_UINT64, str, float, int, int, str) self.treestore = Gtk.TreeStore(str, TYPE_UINT64, str, float, int, int, str)
self.treestore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
# We need to store the row that's being edited to prevent updating it until # We need to store the row that's being edited to prevent updating it until
# it's been done editing # it's been done editing
@ -92,11 +87,11 @@ class FilesTab(Tab):
# Filename column # Filename column
self.filename_column_name = _('Filename') self.filename_column_name = _('Filename')
column = gtk.TreeViewColumn(self.filename_column_name) column = Gtk.TreeViewColumn(self.filename_column_name)
render = gtk.CellRendererPixbuf() render = Gtk.CellRendererPixbuf()
column.pack_start(render, False) column.pack_start(render, False)
column.add_attribute(render, 'stock-id', 6) column.add_attribute(render, 'stock-id', 6)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
render.set_property('editable', True) render.set_property('editable', True)
render.connect('edited', self._on_filename_edited) render.connect('edited', self._on_filename_edited)
render.connect('editing-started', self._on_filename_editing_start) render.connect('editing-started', self._on_filename_editing_start)
@ -112,8 +107,8 @@ class FilesTab(Tab):
self.listview.append_column(column) self.listview.append_column(column)
# Size column # Size column
column = gtk.TreeViewColumn(_('Size')) column = Gtk.TreeViewColumn(_('Size'))
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column.pack_start(render, False) column.pack_start(render, False)
column.set_cell_data_func(render, cell_data_size, 1) column.set_cell_data_func(render, cell_data_size, 1)
column.set_sort_column_id(1) column.set_sort_column_id(1)
@ -125,8 +120,8 @@ class FilesTab(Tab):
self.listview.append_column(column) self.listview.append_column(column)
# Progress column # Progress column
column = gtk.TreeViewColumn(_('Progress')) column = Gtk.TreeViewColumn(_('Progress'))
render = gtk.CellRendererProgress() render = Gtk.CellRendererProgress()
column.pack_start(render, True) column.pack_start(render, True)
column.set_cell_data_func(render, cell_progress, (2, 3)) column.set_cell_data_func(render, cell_progress, (2, 3))
column.set_sort_column_id(3) column.set_sort_column_id(3)
@ -138,11 +133,11 @@ class FilesTab(Tab):
self.listview.append_column(column) self.listview.append_column(column)
# Priority column # Priority column
column = gtk.TreeViewColumn(_('Priority')) column = Gtk.TreeViewColumn(_('Priority'))
render = gtk.CellRendererPixbuf() render = Gtk.CellRendererPixbuf()
column.pack_start(render, False) column.pack_start(render, False)
column.set_cell_data_func(render, cell_priority_icon, 4) column.set_cell_data_func(render, cell_priority_icon, 4)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column.pack_start(render, False) column.pack_start(render, False)
column.set_cell_data_func(render, cell_priority, 4) column.set_cell_data_func(render, cell_priority, 4)
column.set_sort_column_id(4) column.set_sort_column_id(4)
@ -157,7 +152,7 @@ class FilesTab(Tab):
self.listview.set_model(self.treestore) self.listview.set_model(self.treestore)
self.listview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) self.listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE)
self.file_menu = self.main_builder.get_object('menu_file_tab') self.file_menu = self.main_builder.get_object('menu_file_tab')
self.file_menu_priority_items = [ self.file_menu_priority_items = [
@ -179,9 +174,11 @@ class FilesTab(Tab):
self.listview.connect('button-press-event', self._on_button_press_event) self.listview.connect('button-press-event', self._on_button_press_event)
self.listview.enable_model_drag_source( self.listview.enable_model_drag_source(
BUTTON1_MASK, [('text/plain', 0, 0)], ACTION_DEFAULT | ACTION_MOVE ModifierType.BUTTON1_MASK,
[('text/plain', 0, 0)],
DragAction.DEFAULT | DragAction.MOVE,
) )
self.listview.enable_model_drag_dest([('text/plain', 0, 0)], ACTION_DEFAULT) self.listview.enable_model_drag_dest([('text/plain', 0, 0)], DragAction.DEFAULT)
self.listview.connect('drag_data_get', self._on_drag_data_get_data) self.listview.connect('drag_data_get', self._on_drag_data_get_data)
self.listview.connect('drag_data_received', self._on_drag_data_received_data) self.listview.connect('drag_data_received', self._on_drag_data_received_data)
@ -244,7 +241,7 @@ class FilesTab(Tab):
cname = column.get_title() cname = column.get_title()
if cname in state['columns']: if cname in state['columns']:
cstate = state['columns'][cname] cstate = state['columns'][cname]
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
column.set_fixed_width(cstate['width'] if cstate['width'] > 0 else 10) column.set_fixed_width(cstate['width'] if cstate['width'] > 0 else 10)
if state['sort_id'] == index and state['sort_order'] is not None: if state['sort_id'] == index and state['sort_order'] is not None:
column.set_sort_indicator(True) column.set_sort_indicator(True)
@ -320,7 +317,7 @@ class FilesTab(Tab):
path = self.get_file_path(select).split('/') path = self.get_file_path(select).split('/')
filepath = os.path.join(status['download_location'], *path) filepath = os.path.join(status['download_location'], *path)
log.debug('Open file: %s', filepath) log.debug('Open file: %s', filepath)
timestamp = gtk.get_current_event_time() timestamp = Gtk.get_current_event_time()
open_file(filepath, timestamp=timestamp) open_file(filepath, timestamp=timestamp)
def _on_show_file(self, status): def _on_show_file(self, status):
@ -333,7 +330,7 @@ class FilesTab(Tab):
path = self.get_file_path(select).split('/') path = self.get_file_path(select).split('/')
filepath = os.path.join(status['download_location'], *path) filepath = os.path.join(status['download_location'], *path)
log.debug('Show file: %s', filepath) log.debug('Show file: %s', filepath)
timestamp = gtk.get_current_event_time() timestamp = Gtk.get_current_event_time()
show_file(filepath, timestamp=timestamp) show_file(filepath, timestamp=timestamp)
# The following 3 methods create the folder/file view in the treeview # The following 3 methods create the folder/file view in the treeview
@ -363,7 +360,7 @@ class FilesTab(Tab):
for key, value in split_files.items(): for key, value in split_files.items():
if key.endswith('/'): if key.endswith('/'):
chunk_iter = self.treestore.append( chunk_iter = self.treestore.append(
parent_iter, [key, 0, '', 0, 0, -1, gtk.STOCK_DIRECTORY] parent_iter, [key, 0, '', 0, 0, -1, Gtk.STOCK_DIRECTORY]
) )
chunk_size = self.add_files(chunk_iter, value) chunk_size = self.add_files(chunk_iter, value)
self.treestore.set(chunk_iter, 1, chunk_size) self.treestore.set(chunk_iter, 1, chunk_size)
@ -371,7 +368,7 @@ class FilesTab(Tab):
else: else:
self.treestore.append( self.treestore.append(
parent_iter, parent_iter,
[key, value[1]['size'], '', 0, 0, value[0], gtk.STOCK_FILE], [key, value[1]['size'], '', 0, 0, value[0], Gtk.STOCK_FILE],
) )
chunk_size_total += value[1]['size'] chunk_size_total += value[1]['size']
return chunk_size_total return chunk_size_total
@ -502,7 +499,7 @@ class FilesTab(Tab):
for widget in self.file_menu_priority_items: for widget in self.file_menu_priority_items:
widget.set_sensitive(not self.__is_seed) widget.set_sensitive(not self.__is_seed)
self.file_menu.popup(None, None, None, event.button, event.time) self.file_menu.popup(None, None, None, None, event.button, event.time)
return True return True
def _on_key_press_event(self, widget, event): def _on_key_press_event(self, widget, event):
@ -663,7 +660,7 @@ class FilesTab(Tab):
0, 0,
0, 0,
-1, -1,
gtk.STOCK_DIRECTORY, Gtk.STOCK_DIRECTORY,
], ],
) )
p_itr = self.get_iter_at_path('/'.join(parent_path) + '/') p_itr = self.get_iter_at_path('/'.join(parent_path) + '/')
@ -684,7 +681,7 @@ class FilesTab(Tab):
parent_iter = None parent_iter = None
for f in new_folders: for f in new_folders:
parent_iter = self.treestore.append( parent_iter = self.treestore.append(
parent_iter, [f + '/', 0, '', 0, 0, -1, gtk.STOCK_DIRECTORY] parent_iter, [f + '/', 0, '', 0, 0, -1, Gtk.STOCK_DIRECTORY]
) )
child = self.get_iter_at_path(old_name) child = self.get_iter_at_path(old_name)
self.treestore.append( self.treestore.append(
@ -793,7 +790,7 @@ class FilesTab(Tab):
if new_split: if new_split:
for ns in new_split[:-1]: for ns in new_split[:-1]:
parent = self.treestore.append( parent = self.treestore.append(
parent, [ns + '/', 0, '', 0, 0, -1, gtk.STOCK_DIRECTORY] parent, [ns + '/', 0, '', 0, 0, -1, Gtk.STOCK_DIRECTORY]
) )
self.treestore[old_folder_iter][0] = new_split[-1] + '/' self.treestore[old_folder_iter][0] = new_split[-1] + '/'

34
deluge/ui/gtkui/filtertreeview.py
View file

@ -15,9 +15,9 @@ import logging
import os import os
import warnings import warnings
import gtk from gi.repository import Gtk
from gtk.gdk import Pixbuf from gi.repository.GdkPixbuf import Pixbuf
from pango import ELLIPSIZE_END from gi.repository.Pango import EllipsizeMode
import deluge.component as component import deluge.component as component
from deluge.common import TORRENT_STATE, resource_filename from deluge.common import TORRENT_STATE, resource_filename
@ -53,7 +53,7 @@ class FilterTreeView(component.Component):
self.tracker_icons = component.get('TrackerIcons') self.tracker_icons = component.get('TrackerIcons')
self.sidebar = component.get('SideBar') self.sidebar = component.get('SideBar')
self.treeview = gtk.TreeView() self.treeview = Gtk.TreeView()
self.sidebar.add_tab(self.treeview, 'filters', 'Filters') self.sidebar.add_tab(self.treeview, 'filters', 'Filters')
# set filter to all when hidden: # set filter to all when hidden:
@ -61,22 +61,22 @@ class FilterTreeView(component.Component):
# Create the treestore # Create the treestore
# cat, value, label, count, pixmap, visible # cat, value, label, count, pixmap, visible
self.treestore = gtk.TreeStore(str, str, str, int, Pixbuf, bool) self.treestore = Gtk.TreeStore(str, str, str, int, Pixbuf, bool)
# Create the column and cells # Create the column and cells
column = gtk.TreeViewColumn('Filters') column = Gtk.TreeViewColumn('Filters')
column.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE) column.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
# icon cell # icon cell
self.cell_pix = gtk.CellRendererPixbuf() self.cell_pix = Gtk.CellRendererPixbuf()
column.pack_start(self.cell_pix, expand=False) column.pack_start(self.cell_pix, expand=False)
column.add_attribute(self.cell_pix, 'pixbuf', 4) column.add_attribute(self.cell_pix, 'pixbuf', 4)
# label cell # label cell
cell_label = gtk.CellRendererText() cell_label = Gtk.CellRendererText()
cell_label.set_property('ellipsize', ELLIPSIZE_END) cell_label.set_property('ellipsize', EllipsizeMode.END)
column.pack_start(cell_label, expand=True) column.pack_start(cell_label, expand=True)
column.set_cell_data_func(cell_label, self.render_cell_data, None) column.set_cell_data_func(cell_label, self.render_cell_data, None)
# count cell # count cell
self.cell_count = gtk.CellRendererText() self.cell_count = Gtk.CellRendererText()
self.cell_count.set_property('xalign', 1.0) self.cell_count.set_property('xalign', 1.0)
self.cell_count.set_padding(3, 0) self.cell_count.set_padding(3, 0)
column.pack_start(self.cell_count, expand=False) column.pack_start(self.cell_count, expand=False)
@ -88,7 +88,7 @@ class FilterTreeView(component.Component):
self.treeview.set_headers_visible(False) self.treeview.set_headers_visible(False)
self.treeview.set_level_indentation(-21) self.treeview.set_level_indentation(-21)
# Force theme to use expander-size so we don't cut out entries due to indentation hack. # Force theme to use expander-size so we don't cut out entries due to indentation hack.
gtk.rc_parse_string( Gtk.rc_parse_string(
"""style "treeview-style" {GtkTreeView::expander-size = 7} """style "treeview-style" {GtkTreeView::expander-size = 7}
class "GtkTreeView" style "treeview-style" """ class "GtkTreeView" style "treeview-style" """
) )
@ -100,12 +100,12 @@ class FilterTreeView(component.Component):
self.treeview.connect('button-press-event', self.on_button_press_event) self.treeview.connect('button-press-event', self.on_button_press_event)
# colors using current theme. # colors using current theme.
style = component.get('MainWindow').window.get_style() style_ctx = component.get('MainWindow').window.get_style_context()
self.colour_background = style.bg[gtk.STATE_NORMAL] self.colour_background = style_ctx.get_background_color(Gtk.StateFlags.NORMAL)
self.colour_foreground = style.fg[gtk.STATE_NORMAL] self.colour_foreground = style_ctx.get_color(Gtk.StateFlags.NORMAL)
# filtertree menu # filtertree menu
builder = gtk.Builder() builder = Gtk.Builder()
builder.add_from_file( builder.add_from_file(
resource_filename( resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'filtertree_menu.ui') 'deluge.ui.gtkui', os.path.join('glade', 'filtertree_menu.ui')
@ -338,7 +338,7 @@ class FilterTreeView(component.Component):
# Show the pop-up menu # Show the pop-up menu
self.set_menu_sensitivity() self.set_menu_sensitivity()
self.menu.hide() self.menu.hide()
self.menu.popup(None, None, None, event.button, event.time) self.menu.popup(None, None, None, None, event.button, event.time)
self.menu.show() self.menu.show()
if cat == 'cat': if cat == 'cat':

135
deluge/ui/gtkui/glade/add_torrent_dialog.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface> <interface>
<requires lib="gtk+" version="2.24"/> <requires lib="gtk+" version="3.0"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1"> <object class="GtkAdjustment" id="adjustment1">
<property name="lower">-1</property> <property name="lower">-1</property>
<property name="upper">9999</property> <property name="upper">9999</property>
@ -32,11 +32,59 @@
<property name="window_position">center-on-parent</property> <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property> <property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">2</property> <property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkVPaned" id="vpaned1"> <object class="GtkVPaned" id="vpaned1">
<property name="visible">True</property> <property name="visible">True</property>
@ -57,8 +105,6 @@
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="listview_torrents"> <object class="GtkTreeView" id="listview_torrents">
@ -66,6 +112,9 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="headers_visible">False</property> <property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -96,7 +145,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-open</property> <property name="stock">gtk-open</property>
<property name="icon-size">1</property> <property name="icon_size">1</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -142,7 +191,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-network</property> <property name="stock">gtk-network</property>
<property name="icon-size">1</property> <property name="icon_size">1</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -188,7 +237,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</property> <property name="stock">gtk-revert-to-saved</property>
<property name="icon-size">1</property> <property name="icon_size">1</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -289,7 +338,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="show_border">False</property> <property name="show_border">False</property>
<property name="tab_vborder">1</property>
<child> <child>
<object class="GtkVBox" id="vbox1"> <object class="GtkVBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
@ -346,8 +394,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="border_width">2</property> <property name="border_width">2</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="listview_files"> <object class="GtkTreeView" id="listview_files">
@ -356,6 +402,9 @@
<property name="border_width">1</property> <property name="border_width">1</property>
<property name="headers_visible">False</property> <property name="headers_visible">False</property>
<property name="enable_tree_lines">True</property> <property name="enable_tree_lines">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -504,7 +553,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkHSeparator" id="separator1"> <object class="GtkSeparator" id="separator1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
@ -607,6 +656,7 @@ used sparingly.</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_markup">Useful if adding a complete torrent for seeding.</property> <property name="tooltip_markup">Useful if adding a complete torrent for seeding.</property>
<property name="halign">start</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
@ -671,8 +721,6 @@ used sparingly.</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property> <property name="adjustment">adjustment1</property>
</object> </object>
<packing> <packing>
@ -687,8 +735,8 @@ used sparingly.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Maximum torrent download speed</property> <property name="tooltip_text" translatable="yes">Maximum torrent download speed</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Down Speed:</property> <property name="label" translatable="yes">Down Speed:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
@ -700,8 +748,8 @@ used sparingly.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Maximum torrent upload speed</property> <property name="tooltip_text" translatable="yes">Maximum torrent upload speed</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Up Speed:</property> <property name="label" translatable="yes">Up Speed:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">1</property> <property name="top_attach">1</property>
@ -715,8 +763,8 @@ used sparingly.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Maximum torrent connections</property> <property name="tooltip_text" translatable="yes">Maximum torrent connections</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Connections:</property> <property name="label" translatable="yes">Connections:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">2</property> <property name="top_attach">2</property>
@ -730,8 +778,8 @@ used sparingly.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Maximum torrent upload slots</property> <property name="tooltip_text" translatable="yes">Maximum torrent upload slots</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Upload Slots:</property> <property name="label" translatable="yes">Upload Slots:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">3</property> <property name="top_attach">3</property>
@ -747,8 +795,6 @@ used sparingly.</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment2</property> <property name="adjustment">adjustment2</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
</object> </object>
@ -768,8 +814,6 @@ used sparingly.</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment3</property> <property name="adjustment">adjustment3</property>
</object> </object>
<packing> <packing>
@ -788,8 +832,6 @@ used sparingly.</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment4</property> <property name="adjustment">adjustment4</property>
</object> </object>
<packing> <packing>
@ -866,8 +908,8 @@ used sparingly.</property>
<object class="GtkLabel" id="label18"> <object class="GtkLabel" id="label18">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Apply To All</property> <property name="label" translatable="yes">Apply To All</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1002,49 +1044,6 @@ used sparingly.</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_button_add_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
</child> </child>
<action-widgets> <action-widgets>

153
deluge/ui/gtkui/glade/main_window.tabs.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface> <interface>
<requires lib="gtk+" version="2.24"/> <requires lib="gtk+" version="3.0"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAdjustment" id="spin_max_connections_adjustment"> <object class="GtkAdjustment" id="spin_max_connections_adjustment">
<property name="lower">-1</property> <property name="lower">-1</property>
<property name="upper">999999</property> <property name="upper">999999</property>
@ -38,18 +38,18 @@
</object> </object>
<object class="GtkWindow" id="tabs"> <object class="GtkWindow" id="tabs">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkNotebook" id="dummy_nb_see_main_win_torrent_info"> <object class="GtkNotebook" id="dummy_nb_see_main_win_torrent_info">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tab_pos">left</property> <property name="tab_pos">left</property>
<property name="tab_hborder">8</property>
<child> <child>
<object class="GtkScrolledWindow" id="status_tab"> <object class="GtkScrolledWindow" id="status_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkViewport" id="viewport1"> <object class="GtkViewport" id="viewport1">
<property name="visible">True</property> <property name="visible">True</property>
@ -77,8 +77,8 @@
<object class="GtkProgressBar" id="progressbar"> <object class="GtkProgressBar" id="progressbar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="show_text">True</property>
<property name="pulse_step">0.10000000149</property> <property name="pulse_step">0.10000000149</property>
<property name="show_text">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -114,8 +114,8 @@
<object class="GtkLabel" id="summary_total_uploaded"> <object class="GtkLabel" id="summary_total_uploaded">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="width_chars">20</property> <property name="width_chars">20</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -143,8 +143,8 @@
<object class="GtkLabel" id="summary_upload_speed"> <object class="GtkLabel" id="summary_upload_speed">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="width_chars">15</property> <property name="width_chars">15</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -189,8 +189,8 @@
<object class="GtkLabel" id="label38"> <object class="GtkLabel" id="label38">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Downloaded:</property> <property name="label" translatable="yes">Downloaded:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -212,8 +212,8 @@
<object class="GtkLabel" id="label42"> <object class="GtkLabel" id="label42">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Down Speed:</property> <property name="label" translatable="yes">Down Speed:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -233,8 +233,8 @@
<object class="GtkLabel" id="label43"> <object class="GtkLabel" id="label43">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Up Speed:</property> <property name="label" translatable="yes">Up Speed:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -256,8 +256,8 @@
<object class="GtkLabel" id="label_seeds"> <object class="GtkLabel" id="label_seeds">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Seeds:</property> <property name="label" translatable="yes">Seeds:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -279,8 +279,8 @@
<object class="GtkLabel" id="label39"> <object class="GtkLabel" id="label39">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Uploaded:</property> <property name="label" translatable="yes">Uploaded:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -297,8 +297,8 @@
<object class="GtkLabel" id="label_last_seen_complete"> <object class="GtkLabel" id="label_last_seen_complete">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Complete Seen:</property> <property name="label" translatable="yes">Complete Seen:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -315,9 +315,9 @@
<object class="GtkLabel" id="summary_last_seen_complete"> <object class="GtkLabel" id="summary_last_seen_complete">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">7</property> <property name="left_attach">7</property>
@ -331,8 +331,8 @@
<object class="GtkLabel" id="label_last_transfer"> <object class="GtkLabel" id="label_last_transfer">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Last Transfer:</property> <property name="label" translatable="yes">Last Transfer:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -349,9 +349,9 @@
<object class="GtkLabel" id="summary_last_transfer"> <object class="GtkLabel" id="summary_last_transfer">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">7</property> <property name="left_attach">7</property>
@ -365,8 +365,8 @@
<object class="GtkLabel" id="label_seed_time"> <object class="GtkLabel" id="label_seed_time">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Seeding Time:</property> <property name="label" translatable="yes">Seeding Time:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -397,8 +397,8 @@
<object class="GtkLabel" id="label_active_time"> <object class="GtkLabel" id="label_active_time">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Active Time:</property> <property name="label" translatable="yes">Active Time:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -429,8 +429,8 @@
<object class="GtkLabel" id="label_eta"> <object class="GtkLabel" id="label_eta">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ETA Time:</property> <property name="label" translatable="yes">ETA Time:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -457,8 +457,8 @@
<object class="GtkLabel" id="label_peers"> <object class="GtkLabel" id="label_peers">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Peers:</property> <property name="label" translatable="yes">Peers:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -475,8 +475,8 @@
<object class="GtkLabel" id="summary_seeds"> <object class="GtkLabel" id="summary_seeds">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="width_chars">10</property> <property name="width_chars">10</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">4</property>
@ -488,8 +488,8 @@
<object class="GtkLabel" id="summary_peers"> <object class="GtkLabel" id="summary_peers">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="width_chars">10</property> <property name="width_chars">10</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">4</property>
@ -503,8 +503,8 @@
<object class="GtkLabel" id="label_seed_rank"> <object class="GtkLabel" id="label_seed_rank">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Seed Rank:</property> <property name="label" translatable="yes">Seed Rank:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -535,8 +535,8 @@
<object class="GtkLabel" id="label_availablity"> <object class="GtkLabel" id="label_availablity">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Availability:</property> <property name="label" translatable="yes">Availability:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -553,9 +553,9 @@
<object class="GtkLabel" id="summary_availability"> <object class="GtkLabel" id="summary_availability">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">word-char</property> <property name="wrap_mode">word-char</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">4</property> <property name="left_attach">4</property>
@ -569,8 +569,8 @@
<object class="GtkLabel" id="label41"> <object class="GtkLabel" id="label41">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Share Ratio:</property> <property name="label" translatable="yes">Share Ratio:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -587,8 +587,8 @@
<object class="GtkLabel" id="summary_download_speed"> <object class="GtkLabel" id="summary_download_speed">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="width_chars">15</property> <property name="width_chars">15</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -640,8 +640,6 @@
<object class="GtkScrolledWindow" id="details_tab"> <object class="GtkScrolledWindow" id="details_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkViewport" id="viewport2"> <object class="GtkViewport" id="viewport2">
<property name="visible">True</property> <property name="visible">True</property>
@ -670,11 +668,11 @@
<object class="GtkLabel" id="summary_name"> <object class="GtkLabel" id="summary_name">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">word-char</property> <property name="wrap_mode">word-char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -701,8 +699,8 @@
<object class="GtkLabel" id="label_name"> <object class="GtkLabel" id="label_name">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name:</property> <property name="label" translatable="yes">Name:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -716,8 +714,8 @@
<object class="GtkLabel" id="label_total_size"> <object class="GtkLabel" id="label_total_size">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Total Size:</property> <property name="label" translatable="yes">Total Size:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -733,8 +731,8 @@
<object class="GtkLabel" id="summary_total_size"> <object class="GtkLabel" id="summary_total_size">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -749,8 +747,8 @@
<object class="GtkLabel" id="label_num_files"> <object class="GtkLabel" id="label_num_files">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Total Files:</property> <property name="label" translatable="yes">Total Files:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -766,8 +764,8 @@
<object class="GtkLabel" id="summary_num_files"> <object class="GtkLabel" id="summary_num_files">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -782,8 +780,8 @@
<object class="GtkLabel" id="label_completed"> <object class="GtkLabel" id="label_completed">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Completed:</property> <property name="label" translatable="yes">Completed:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -815,8 +813,8 @@
<object class="GtkLabel" id="label_date_added"> <object class="GtkLabel" id="label_date_added">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Added:</property> <property name="label" translatable="yes">Added:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -849,8 +847,8 @@
<object class="GtkLabel" id="label_pieces"> <object class="GtkLabel" id="label_pieces">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Pieces:</property> <property name="label" translatable="yes">Pieces:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -882,8 +880,8 @@
<object class="GtkLabel" id="label_hash"> <object class="GtkLabel" id="label_hash">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Hash:</property> <property name="label" translatable="yes">Hash:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -899,10 +897,10 @@
<object class="GtkLabel" id="summary_hash"> <object class="GtkLabel" id="summary_hash">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="width_chars">40</property> <property name="width_chars">40</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -917,8 +915,8 @@
<object class="GtkLabel" id="label_path"> <object class="GtkLabel" id="label_path">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Download Folder:</property> <property name="label" translatable="yes">Download Folder:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -934,11 +932,11 @@
<object class="GtkLabel" id="summary_torrent_path"> <object class="GtkLabel" id="summary_torrent_path">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="ellipsize">start</property> <property name="ellipsize">start</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -952,10 +950,10 @@
<object class="GtkLabel" id="summary_comments"> <object class="GtkLabel" id="summary_comments">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -969,8 +967,8 @@
<object class="GtkLabel" id="label_comments"> <object class="GtkLabel" id="label_comments">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Comments:</property> <property name="label" translatable="yes">Comments:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -986,8 +984,8 @@
<object class="GtkLabel" id="label_creator"> <object class="GtkLabel" id="label_creator">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Created By:</property> <property name="label" translatable="yes">Created By:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1003,10 +1001,10 @@
<object class="GtkLabel" id="summary_creator"> <object class="GtkLabel" id="summary_creator">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -1043,12 +1041,13 @@
<object class="GtkScrolledWindow" id="files_tab"> <object class="GtkScrolledWindow" id="files_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkTreeView" id="files_listview"> <object class="GtkTreeView" id="files_listview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1072,12 +1071,13 @@
<object class="GtkScrolledWindow" id="peers_tab"> <object class="GtkScrolledWindow" id="peers_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkTreeView" id="peers_listview"> <object class="GtkTreeView" id="peers_listview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1101,8 +1101,6 @@
<object class="GtkScrolledWindow" id="options_tab"> <object class="GtkScrolledWindow" id="options_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkViewport" id="viewport3"> <object class="GtkViewport" id="viewport3">
<property name="visible">True</property> <property name="visible">True</property>
@ -1179,11 +1177,8 @@
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">spin_max_connections_adjustment</property> <property name="adjustment">spin_max_connections_adjustment</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</object> </object>
@ -1203,11 +1198,8 @@
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">spin_max_upload_adjustment</property> <property name="adjustment">spin_max_upload_adjustment</property>
<property name="digits">1</property> <property name="digits">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
@ -1228,11 +1220,8 @@
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">spin_max_download_adjustment</property> <property name="adjustment">spin_max_download_adjustment</property>
<property name="climb_rate">1</property> <property name="climb_rate">1</property>
<property name="digits">1</property> <property name="digits">1</property>
@ -1249,8 +1238,8 @@
<object class="GtkLabel" id="label12"> <object class="GtkLabel" id="label12">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Connections:</property> <property name="label" translatable="yes">Connections:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">2</property> <property name="top_attach">2</property>
@ -1263,8 +1252,8 @@
<object class="GtkLabel" id="label11"> <object class="GtkLabel" id="label11">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Upload Speed:</property> <property name="label" translatable="yes">Upload Speed:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">1</property> <property name="top_attach">1</property>
@ -1277,8 +1266,8 @@
<object class="GtkLabel" id="label9"> <object class="GtkLabel" id="label9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Download Speed:</property> <property name="label" translatable="yes">Download Speed:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
@ -1324,8 +1313,8 @@
<object class="GtkLabel" id="label15"> <object class="GtkLabel" id="label15">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Upload Slots:</property> <property name="label" translatable="yes">Upload Slots:</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="top_attach">3</property> <property name="top_attach">3</property>
@ -1341,11 +1330,8 @@
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">spin_max_upload_slots_adjustment</property> <property name="adjustment">spin_max_upload_slots_adjustment</property>
<property name="numeric">True</property> <property name="numeric">True</property>
</object> </object>
@ -1396,8 +1382,8 @@
<object class="GtkLabel" id="label_owner"> <object class="GtkLabel" id="label_owner">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Owner:</property> <property name="label" translatable="yes">Owner:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1412,9 +1398,9 @@
<object class="GtkLabel" id="summary_owner"> <object class="GtkLabel" id="summary_owner">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1584,11 +1570,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property> <property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">spin_stop_ratio_adjustment</property> <property name="adjustment">spin_stop_ratio_adjustment</property>
<property name="digits">1</property> <property name="digits">1</property>
<property name="numeric">True</property> <property name="numeric">True</property>
@ -1695,8 +1678,6 @@
<object class="GtkScrolledWindow" id="trackers_tab"> <object class="GtkScrolledWindow" id="trackers_tab">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child> <child>
<object class="GtkViewport" id="viewport4"> <object class="GtkViewport" id="viewport4">
<property name="visible">True</property> <property name="visible">True</property>
@ -1722,8 +1703,8 @@
<object class="GtkLabel" id="label_tracker"> <object class="GtkLabel" id="label_tracker">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Current Tracker:</property> <property name="label" translatable="yes">Current Tracker:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1739,8 +1720,8 @@
<object class="GtkLabel" id="summary_tracker"> <object class="GtkLabel" id="summary_tracker">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -1754,8 +1735,8 @@
<object class="GtkLabel" id="label_next_announce"> <object class="GtkLabel" id="label_next_announce">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Next Announce:</property> <property name="label" translatable="yes">Next Announce:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1771,8 +1752,8 @@
<object class="GtkLabel" id="summary_next_announce"> <object class="GtkLabel" id="summary_next_announce">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -1786,9 +1767,9 @@
<object class="GtkLabel" id="label_tracker_status"> <object class="GtkLabel" id="label_tracker_status">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Tracker Status:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property> <property name="yalign">0</property>
<property name="label" translatable="yes">Tracker Status:</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1804,10 +1785,10 @@
<object class="GtkLabel" id="summary_tracker_status"> <object class="GtkLabel" id="summary_tracker_status">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -1855,8 +1836,8 @@
<object class="GtkLabel" id="label_tracker_total"> <object class="GtkLabel" id="label_tracker_total">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Total Trackers:</property> <property name="label" translatable="yes">Total Trackers:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1870,8 +1851,8 @@
<object class="GtkLabel" id="summary_tracker_total"> <object class="GtkLabel" id="summary_tracker_total">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -1883,8 +1864,8 @@
<object class="GtkLabel" id="label_private"> <object class="GtkLabel" id="label_private">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Private Torrent:</property> <property name="label" translatable="yes">Private Torrent:</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
@ -1900,9 +1881,9 @@
<object class="GtkLabel" id="summary_private"> <object class="GtkLabel" id="summary_private">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>

171
deluge/ui/gtkui/glade/main_window.ui
View file

@ -1,80 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface> <interface>
<requires lib="gtk+" version="2.24"/> <requires lib="gtk+" version="3.0"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">-1</property>
<property name="upper">99999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment5">
<property name="upper">99999</property>
<property name="value">2</property>
<property name="step_increment">0.10000000000000001</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-no</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-yes</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-top</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-zoom-fit</property>
<property name="icon-size">1</property>
</object>
<object class="GtkWindow" id="main_window"> <object class="GtkWindow" id="main_window">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title">Deluge</property> <property name="title">Deluge</property>
<accel-groups> <accel-groups>
<group name="accelgroup1"/> <group name="accelgroup1"/>
</accel-groups> </accel-groups>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkVBox" id="vbox1"> <object class="GtkVBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
@ -102,8 +39,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
<accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_menuitem_addtorrent_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_addtorrent_activate" swapped="no"/>
<accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
<child> <child>
@ -114,8 +51,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
<accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_menuitem_createtorrent_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_createtorrent_activate" swapped="no"/>
<accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
<child> <child>
@ -130,8 +67,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
<accelerator key="Q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_menuitem_quitdaemon_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_quitdaemon_activate" swapped="no"/>
<accelerator key="Q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
<child> <child>
@ -176,8 +113,8 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property> <property name="accel_group">accelgroup1</property>
<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/>
<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
<child> <child>
@ -188,8 +125,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
<accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_menuitem_connectionmanager_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_connectionmanager_activate" swapped="no"/>
<accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
</object> </object>
@ -280,8 +217,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">_Find ...</property> <property name="label" translatable="yes">_Find ...</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_search_filter_toggle" swapped="no"/> <signal name="activate" handler="on_search_filter_toggle" swapped="no"/>
<accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
<child> <child>
@ -367,8 +304,8 @@
<property name="tooltip_text" translatable="yes">Frequently Asked Questions</property> <property name="tooltip_text" translatable="yes">Frequently Asked Questions</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">False</property> <property name="use_stock">False</property>
<accelerator key="F1" signal="activate"/>
<signal name="activate" handler="on_menuitem_faq_activate" swapped="no"/> <signal name="activate" handler="on_menuitem_faq_activate" swapped="no"/>
<accelerator key="F1" signal="activate"/>
</object> </object>
</child> </child>
<child> <child>
@ -461,8 +398,8 @@ This will filter torrents for the current selection on the sidebar.</property>
<property name="label" translatable="yes">_Filter</property> <property name="label" translatable="yes">_Filter</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="stock_id">gtk-find</property> <property name="stock_id">gtk-find</property>
<accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
<signal name="clicked" handler="on_search_filter_toggle" swapped="no"/> <signal name="clicked" handler="on_search_filter_toggle" swapped="no"/>
<accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -476,6 +413,7 @@ This will filter torrents for the current selection on the sidebar.</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">False</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -520,6 +458,7 @@ This will filter torrents for the current selection on the sidebar.</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">False</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -563,6 +502,7 @@ This will filter torrents for the current selection on the sidebar.</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">False</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -650,7 +590,7 @@ This will filter torrents for the current selection on the sidebar.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-close</property> <property name="stock">gtk-close</property>
<property name="icon-size">2</property> <property name="icon_size">2</property>
</object> </object>
</child> </child>
</object> </object>
@ -683,13 +623,9 @@ This will filter torrents for the current selection on the sidebar.</property>
This will filter torrents for the current selection on the sidebar.</property> This will filter torrents for the current selection on the sidebar.</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="truncate_multiline">True</property> <property name="truncate_multiline">True</property>
<property name="invisible_char_set">True</property>
<property name="caps_lock_warning">False</property> <property name="caps_lock_warning">False</property>
<property name="secondary_icon_stock">gtk-clear</property> <property name="secondary_icon_stock">gtk-clear</property>
<property name="primary_icon_activatable">True</property>
<property name="secondary_icon_activatable">True</property>
<property name="primary_icon_sensitive">False</property> <property name="primary_icon_sensitive">False</property>
<property name="secondary_icon_sensitive">True</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Clear the search</property> <property name="secondary_icon_tooltip_text" translatable="yes">Clear the search</property>
<property name="secondary_icon_tooltip_markup" translatable="yes">Clear the search</property> <property name="secondary_icon_tooltip_markup" translatable="yes">Clear the search</property>
<signal name="changed" handler="on_search_torrents_entry_changed" swapped="no"/> <signal name="changed" handler="on_search_torrents_entry_changed" swapped="no"/>
@ -731,8 +667,6 @@ This will filter torrents for the current selection on the sidebar.</property>
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">out</property> <property name="shadow_type">out</property>
<child> <child>
<object class="GtkTreeView" id="torrent_view"> <object class="GtkTreeView" id="torrent_view">
@ -740,6 +674,9 @@ This will filter torrents for the current selection on the sidebar.</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="rules_hint">True</property> <property name="rules_hint">True</property>
<property name="enable_search">False</property> <property name="enable_search">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -768,8 +705,6 @@ This will filter torrents for the current selection on the sidebar.</property>
<property name="tab_pos">left</property> <property name="tab_pos">left</property>
<property name="show_border">False</property> <property name="show_border">False</property>
<property name="scrollable">True</property> <property name="scrollable">True</property>
<property name="tab_hborder">8</property>
<property name="tab_vborder">0</property>
</object> </object>
<packing> <packing>
<property name="resize">False</property> <property name="resize">False</property>
@ -799,4 +734,70 @@ This will filter torrents for the current selection on the sidebar.</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">-1</property>
<property name="upper">99999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="lower">-1</property>
<property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment5">
<property name="upper">99999</property>
<property name="value">2</property>
<property name="step_increment">0.10000000000000001</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-no</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-yes</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-goto-top</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-zoom-fit</property>
<property name="icon_size">1</property>
</object>
</interface> </interface>

33
deluge/ui/gtkui/gtkui.py
View file

@ -16,21 +16,22 @@ import signal
import sys import sys
import time import time
import pygtk # isort:skip (Required before gtk import). import gi # isort:skip (Required before Gtk import).
pygtk.require('2.0') # NOQA: E402 gi.require_version('Gtk', '3.0') # NOQA: E402
gi.require_version('Gdk', '3.0') # NOQA: E402
# isort:imports-thirdparty # isort:imports-thirdparty
from gobject import set_prgname from gi.repository.Gdk import threads_enter, threads_init, threads_leave
from gtk import RESPONSE_YES from gi.repository.GObject import set_prgname
from gtk.gdk import WINDOWING, threads_enter, threads_init, threads_leave from gi.repository.Gtk import ResponseType
from twisted.internet import defer, gtk2reactor from twisted.internet import defer, gtk3reactor
from twisted.internet.error import ReactorAlreadyInstalledError from twisted.internet.error import ReactorAlreadyInstalledError
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
try: try:
# Install twisted reactor, before any other modules import reactor. # Install twisted reactor, before any other modules import reactor.
reactor = gtk2reactor.install() reactor = gtk3reactor.install()
except ReactorAlreadyInstalledError: except ReactorAlreadyInstalledError:
# Running unit tests so trial already installed a rector # Running unit tests so trial already installed a rector
from twisted.internet import reactor from twisted.internet import reactor
@ -69,7 +70,7 @@ from deluge.ui.sessionproxy import SessionProxy
from deluge.ui.tracker_icons import TrackerIcons from deluge.ui.tracker_icons import TrackerIcons
from deluge.ui.translations_util import set_language, setup_translations from deluge.ui.translations_util import set_language, setup_translations
set_prgname('deluge'.encode('utf8')) set_prgname('deluge')
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
try: try:
@ -160,7 +161,7 @@ class GtkUI(object):
SetConsoleCtrlHandler(on_die, True) SetConsoleCtrlHandler(on_die, True)
log.debug('Win32 "die" handler registered') log.debug('Win32 "die" handler registered')
elif osx_check() and WINDOWING == 'quartz': elif osx_check(): # TODO: Add this back: `and WINDOWING == 'quartz':`
import gtkosx_application import gtkosx_application
self.osxapp = gtkosx_application.gtkosx_application_get() self.osxapp = gtkosx_application.gtkosx_application_get()
@ -190,11 +191,9 @@ class GtkUI(object):
self.queuedtorrents = QueuedTorrents() self.queuedtorrents = QueuedTorrents()
self.ipcinterface = IPCInterface(args.torrents) self.ipcinterface = IPCInterface(args.torrents)
# FIXME: Verify that removing gdk threading has no adverse effects.
# There are the two commits [64a94ec] [1f3e930] that added gdk threading
# and my thinking is there is no need for the code anymore.
# Since PyGObject 3.10.2, calling GObject.threads_init() this is no longer needed. # Since PyGObject 3.10.2, calling GObject.threads_init() this is no longer needed.
# threads_init() # For details on need for threading, see: https://wiki.gnome.org/Projects/PyGObject/Threading
threads_init()
# We make sure that the UI components start once we get a core URI # We make sure that the UI components start once we get a core URI
client.set_disconnect_callback(self.__on_disconnect) client.set_disconnect_callback(self.__on_disconnect)
@ -214,7 +213,7 @@ class GtkUI(object):
self.statusbar = StatusBar() self.statusbar = StatusBar()
self.addtorrentdialog = AddTorrentDialog() self.addtorrentdialog = AddTorrentDialog()
if osx_check() and WINDOWING == 'quartz': if osx_check(): # TODO: Add this back: `and WINDOWING == 'quartz':`
def nsapp_open_file(osxapp, filename): def nsapp_open_file(osxapp, filename):
# Ignore command name which is raised at app launch (python opening main script). # Ignore command name which is raised at app launch (python opening main script).
@ -255,8 +254,8 @@ class GtkUI(object):
# Initialize gdk threading # Initialize gdk threading
threads_enter() threads_enter()
reactor.run() reactor.run()
# Reactor no longer running so async callbacks (Deferreds) cannot be # Reactor is not running. Any async callbacks (Deferreds) can no longer
# processed after this point. # be processed from this point on.
threads_leave() threads_leave()
def shutdown(self, *args, **kwargs): def shutdown(self, *args, **kwargs):
@ -349,7 +348,7 @@ class GtkUI(object):
def on_dialog_response(response): def on_dialog_response(response):
"""User response to switching mode dialog.""" """User response to switching mode dialog."""
if response == RESPONSE_YES: if response == ResponseType.Yes:
# Turning off standalone # Turning off standalone
self.config['standalone'] = False self.config['standalone'] = False
self._start_thinclient() self._start_thinclient()

2
deluge/ui/gtkui/ipcinterface.py
View file

@ -157,7 +157,7 @@ class IPCInterface(component.Component):
reactor.run() reactor.run()
if self.factory.stop: if self.factory.stop:
log.info('Success sending arguments to running Deluge.') log.info('Success sending arguments to running Deluge.')
from gtk.gdk import notify_startup_complete from gi.repository.Gdk import notify_startup_complete
notify_startup_complete() notify_startup_complete()
sys.exit(0) sys.exit(0)

58
deluge/ui/gtkui/listview.py
View file

@ -11,16 +11,16 @@ from __future__ import unicode_literals
import logging import logging
import gtk from gi.repository import GObject, Gtk
from gobject import SIGNAL_RUN_LAST, TYPE_NONE, signal_new from gi.repository.Gdk import Event # pylint: disable=ungrouped-imports
from gtk.gdk import Event # pylint: disable=ungrouped-imports from gi.repository.GObject import SIGNAL_RUN_LAST, TYPE_NONE, signal_new
from deluge.common import decode_bytes from deluge.common import decode_bytes
from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file
# FIXME: ? # FIXME: ?
signal_new( signal_new(
'button-press-event', gtk.TreeViewColumn, SIGNAL_RUN_LAST, TYPE_NONE, (Event,) 'button-press-event', Gtk.TreeViewColumn, SIGNAL_RUN_LAST, TYPE_NONE, (Event,)
) )
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -44,8 +44,8 @@ class ListViewColumnState: # pylint: disable=old-style-class
# FIXME: Why is this needed? # FIXME: Why is this needed?
class TreeModel(GObject.Object, Gtk.TreeModel): class TreeModel(GObject.Object, Gtk.TreeModel):
def __init__(self, filter): def __init__(self, filter_):
Gtk.TreeModel.__init__(self, filter) Gtk.TreeModel.__init__(self, filter_)
class ListView(object): class ListView(object):
@ -82,7 +82,7 @@ class ListView(object):
self.pixbuf_index = 0 self.pixbuf_index = 0
self.data_func = None self.data_func = None
class TreeviewColumn(gtk.TreeViewColumn, object): class TreeviewColumn(Gtk.TreeViewColumn, object):
""" """
TreeViewColumn does not signal right-click events, and we need them TreeViewColumn does not signal right-click events, and we need them
This subclass is equivalent to TreeViewColumn, but it signals these events This subclass is equivalent to TreeViewColumn, but it signals these events
@ -91,9 +91,9 @@ class ListView(object):
""" """
def __init__(self, title=None, cell_renderer=None, **args): def __init__(self, title=None, cell_renderer=None, **args):
""" Constructor, see gtk.TreeViewColumn """ """ Constructor, see Gtk.TreeViewColumn """
gtk.TreeViewColumn.__init__(self, title, cell_renderer, **args) Gtk.TreeViewColumn.__init__(self, title, cell_renderer, **args)
label = gtk.Label(title) label = Gtk.Label(label=title)
self.set_widget(label) self.set_widget(label)
label.show() label.show()
label.__realize = label.connect('realize', self.on_realize) label.__realize = label.connect('realize', self.on_realize)
@ -105,7 +105,7 @@ class ListView(object):
def on_realize(self, widget): def on_realize(self, widget):
widget.disconnect(widget.__realize) widget.disconnect(widget.__realize)
del widget.__realize del widget.__realize
button = widget.get_ancestor(gtk.Button) button = widget.get_ancestor(Gtk.Button)
if button is not None: if button is not None:
button.connect('button-press-event', self.on_button_pressed) button.connect('button-press-event', self.on_button_pressed)
@ -119,7 +119,7 @@ class ListView(object):
self.cell_renderer = cell_renderer self.cell_renderer = cell_renderer
def set_visible(self, visible): def set_visible(self, visible):
gtk.TreeViewColumn.set_visible(self, visible) Gtk.TreeViewColumn.set_visible(self, visible)
if self.data_func: if self.data_func:
if not visible: if not visible:
# Set data function to None to prevent unecessary calls when column is hidden # Set data function to None to prevent unecessary calls when column is hidden
@ -143,10 +143,10 @@ class ListView(object):
# User supplied a treeview widget # User supplied a treeview widget
self.treeview = treeview_widget self.treeview = treeview_widget
else: else:
self.treeview = gtk.TreeView() self.treeview = Gtk.TreeView()
self.treeview.set_enable_search(True) self.treeview.set_enable_search(True)
self.treeview.set_search_equal_func(self.on_keypress_search_by_name) self.treeview.set_search_equal_func(self.on_keypress_search_by_name, None)
if state_file: if state_file:
self.load_state(state_file) self.load_state(state_file)
@ -157,7 +157,7 @@ class ListView(object):
self.treeview.set_rules_hint(True) self.treeview.set_rules_hint(True)
self.treeview.set_reorderable(False) self.treeview.set_reorderable(False)
self.treeview.set_rubber_banding(True) # Enable mouse multi-row selection. self.treeview.set_rubber_banding(True) # Enable mouse multi-row selection.
self.treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) self.treeview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE)
# Dictionary of 'header' or 'name' to ListViewColumn object # Dictionary of 'header' or 'name' to ListViewColumn object
self.columns = {} self.columns = {}
@ -191,7 +191,7 @@ class ListView(object):
""" """
model_filter = self.liststore.filter_new() model_filter = self.liststore.filter_new()
model_filter.set_visible_column(self.columns['filter'].column_indices[0]) model_filter.set_visible_column(self.columns['filter'].column_indices[0])
self.model_filter = gtk.TreeModelSort(model_filter) self.model_filter = Gtk.TreeModelSort(model=model_filter)
self.model_filter.connect('sort-column-changed', self.on_model_sort_changed) self.model_filter.connect('sort-column-changed', self.on_model_sort_changed)
self.model_filter.connect('row-inserted', self.on_model_row_inserted) self.model_filter.connect('row-inserted', self.on_model_row_inserted)
self.treeview.set_model(self.model_filter) self.treeview.set_model(self.model_filter)
@ -207,7 +207,7 @@ class ListView(object):
# Using the default sort column # Using the default sort column
elif self.default_sort_column_id: elif self.default_sort_column_id:
self.model_filter.set_sort_column_id( self.model_filter.set_sort_column_id(
self.default_sort_column_id, gtk.SORT_ASCENDING self.default_sort_column_id, Gtk.SortType.ASCENDING
) )
self.model_filter.set_default_sort_func( self.model_filter.set_default_sort_func(
self.generic_sort_func, self.get_column_index('Added')[0] self.generic_sort_func, self.get_column_index('Added')[0]
@ -359,7 +359,7 @@ class ListView(object):
def on_treeview_header_right_clicked(self, column, event): def on_treeview_header_right_clicked(self, column, event):
if event.button == 3: if event.button == 3:
self.menu.popup(None, None, None, event.button, event.get_time()) self.menu.popup(None, None, None, None, event.button, event.get_time())
def register_checklist_menu(self, menu): def register_checklist_menu(self, menu):
"""Register a checklist menu with the listview. It will automatically """Register a checklist menu with the listview. It will automatically
@ -369,7 +369,7 @@ class ListView(object):
def create_checklist_menu(self): def create_checklist_menu(self):
"""Creates a menu used for toggling the display of columns.""" """Creates a menu used for toggling the display of columns."""
menu = self.menu = gtk.Menu() menu = self.menu = Gtk.Menu()
# Iterate through the column_index list to preserve order # Iterate through the column_index list to preserve order
for name in self.column_index: for name in self.column_index:
column = self.columns[name] column = self.columns[name]
@ -377,7 +377,7 @@ class ListView(object):
# menu. # menu.
if column.hidden is True: if column.hidden is True:
continue continue
menuitem = gtk.CheckMenuItem(column.name) menuitem = Gtk.CheckMenuItem(column.name)
# If the column is currently visible, make sure it's set active # If the column is currently visible, make sure it's set active
# (or checked) in the menu. # (or checked) in the menu.
if column.column.get_visible() is True: if column.column.get_visible() is True:
@ -397,7 +397,7 @@ class ListView(object):
"""Creates a new GtkListStore based on the liststore_columns list""" """Creates a new GtkListStore based on the liststore_columns list"""
# Create a new liststore with added column and move the data from the # Create a new liststore with added column and move the data from the
# old one to the new one. # old one to the new one.
new_list = gtk.ListStore(*tuple(self.liststore_columns)) new_list = Gtk.ListStore(*tuple(self.liststore_columns))
# This function is used in the liststore.foreach method with user_data # This function is used in the liststore.foreach method with user_data
# being the new liststore and the columns list # being the new liststore and the columns list
@ -596,11 +596,11 @@ class ListView(object):
column_in_state = False column_in_state = False
if self.state is not None: if self.state is not None:
for column_state in self.state: for column_state in self.state:
if header == column_state.name.decode('utf-8'): if header == column_state.name:
# We found a loaded state # We found a loaded state
column_in_state = True column_in_state = True
if column_state.width > 0: if column_state.width > 0:
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
column.set_fixed_width(column_state.width) column.set_fixed_width(column_state.width)
column.set_visible(column_state.visible) column.set_visible(column_state.visible)
@ -642,7 +642,7 @@ class ListView(object):
): ):
"""Add a text column to the listview. Only the header name is required. """Add a text column to the listview. Only the header name is required.
""" """
render = gtk.CellRendererText() render = Gtk.CellRendererText()
self.add_column( self.add_column(
header, header,
render, render,
@ -674,7 +674,7 @@ class ListView(object):
default=True, default=True,
): ):
"""Add a bool column to the listview""" """Add a bool column to the listview"""
render = gtk.CellRendererToggle() render = Gtk.CellRendererToggle()
self.add_column( self.add_column(
header, header,
render, render,
@ -705,7 +705,7 @@ class ListView(object):
"""Add a function column to the listview. Need a header name, the """Add a function column to the listview. Need a header name, the
function and the column types.""" function and the column types."""
render = gtk.CellRendererText() render = Gtk.CellRendererText()
self.add_column( self.add_column(
header, header,
render, render,
@ -741,7 +741,7 @@ class ListView(object):
if col_types is None: if col_types is None:
col_types = [float, str] col_types = [float, str]
render = gtk.CellRendererProgress() render = Gtk.CellRendererProgress()
self.add_column( self.add_column(
header, header,
render, render,
@ -779,8 +779,8 @@ class ListView(object):
"""Adds a texticon column to the listview.""" """Adds a texticon column to the listview."""
if col_types is None: if col_types is None:
col_types = [str, str] col_types = [str, str]
render1 = gtk.CellRendererPixbuf() render1 = Gtk.CellRendererPixbuf()
render2 = gtk.CellRendererText() render2 = Gtk.CellRendererText()
self.add_column( self.add_column(
header, header,

55
deluge/ui/gtkui/mainwindow.py
View file

@ -9,18 +9,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import copy
import logging import logging
import os.path import os.path
from hashlib import sha1 as sha from hashlib import sha1 as sha
import gtk from gi.repository import Gtk
from gtk.gdk import ( from gi.repository.Gdk import DragAction, WindowState
ACTION_COPY,
WINDOW_STATE_ICONIFIED,
WINDOW_STATE_MAXIMIZED,
WINDOW_STATE_WITHDRAWN,
)
from twisted.internet import reactor from twisted.internet import reactor
from twisted.internet.error import ReactorNotRunning from twisted.internet.error import ReactorNotRunning
@ -33,9 +27,13 @@ from deluge.ui.gtkui.dialogs import PasswordDialog
from deluge.ui.gtkui.ipcinterface import process_args from deluge.ui.gtkui.ipcinterface import process_args
try: try:
import wnck import gi
gi.require_version('Wnck', '3.0')
from gi.repository import Wnck
except ImportError: except ImportError:
wnck = None Wnck = None
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -65,11 +63,11 @@ class _GtkBuilderSignalsHolder(object):
class MainWindow(component.Component): class MainWindow(component.Component):
def __init__(self): def __init__(self):
if wnck: if Wnck:
self.screen = wnck.screen_get_default() self.screen = Wnck.Screen.get_default()
component.Component.__init__(self, 'MainWindow', interval=2) component.Component.__init__(self, 'MainWindow', interval=2)
self.config = ConfigManager('gtkui.conf') self.config = ConfigManager('gtkui.conf')
self.main_builder = gtk.Builder() self.main_builder = Gtk.Builder()
# Patch this GtkBuilder to avoid connecting signals from elsewhere # Patch this GtkBuilder to avoid connecting signals from elsewhere
# #
@ -115,7 +113,9 @@ class MainWindow(component.Component):
self.restart = False self.restart = False
self.window.drag_dest_set( self.window.drag_dest_set(
gtk.DEST_DEFAULT_ALL, [('text/uri-list', 0, 80)], ACTION_COPY Gtk.DestDefaults.ALL,
[Gtk.TargetEntry.new(target='text/uri-list', flags=0, info=80)],
DragAction.COPY,
) )
# Connect events # Connect events
@ -124,7 +124,7 @@ class MainWindow(component.Component):
self.window.connect('delete-event', self.on_window_delete_event) self.window.connect('delete-event', self.on_window_delete_event)
self.window.connect('drag-data-received', self.on_drag_data_received_event) self.window.connect('drag-data-received', self.on_drag_data_received_event)
self.vpaned.connect('notify::position', self.on_vpaned_position_event) self.vpaned.connect('notify::position', self.on_vpaned_position_event)
self.window.connect('expose-event', self.on_expose_event) self.window.connect('draw', self.on_expose_event)
self.config.register_set_function( self.config.register_set_function(
'show_rate_in_title', self._on_set_show_rate_in_title, apply_now=False 'show_rate_in_title', self._on_set_show_rate_in_title, apply_now=False
@ -146,8 +146,8 @@ class MainWindow(component.Component):
log.debug('Showing window') log.debug('Showing window')
self.show() self.show()
while gtk.events_pending(): while Gtk.events_pending():
gtk.main_iteration() Gtk.main_iteration()
def show(self): def show(self):
component.resume(self.child_components) component.resume(self.child_components)
@ -174,7 +174,7 @@ class MainWindow(component.Component):
dialog = PasswordDialog(_('Enter your password to show Deluge...')) dialog = PasswordDialog(_('Enter your password to show Deluge...'))
def on_dialog_response(response_id): def on_dialog_response(response_id):
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
if ( if (
self.config['tray_password'] self.config['tray_password']
== sha(dialog.get_password()).hexdigest() == sha(dialog.get_password()).hexdigest()
@ -225,7 +225,7 @@ class MainWindow(component.Component):
dialog = PasswordDialog(_('Enter your password to Quit Deluge...')) dialog = PasswordDialog(_('Enter your password to Quit Deluge...'))
def on_dialog_response(response_id): def on_dialog_response(response_id):
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
if ( if (
self.config['tray_password'] self.config['tray_password']
== sha(dialog.get_password()).hexdigest() == sha(dialog.get_password()).hexdigest()
@ -257,14 +257,14 @@ class MainWindow(component.Component):
self.config['window_height'] = event.height self.config['window_height'] = event.height
def on_window_state_event(self, widget, event): def on_window_state_event(self, widget, event):
if event.changed_mask & WINDOW_STATE_MAXIMIZED: if event.changed_mask & WindowState.MAXIMIZED:
if event.new_window_state & WINDOW_STATE_MAXIMIZED: if event.new_window_state & WindowState.MAXIMIZED:
log.debug('pos: %s', self.window.get_position()) log.debug('pos: %s', self.window.get_position())
self.config['window_maximized'] = True self.config['window_maximized'] = True
elif not event.new_window_state & WINDOW_STATE_WITHDRAWN: elif not event.new_window_state & WindowState.WITHDRAWN:
self.config['window_maximized'] = False self.config['window_maximized'] = False
if event.changed_mask & WINDOW_STATE_ICONIFIED: if event.changed_mask & WindowState.ICONIFIED:
if event.new_window_state & WINDOW_STATE_ICONIFIED: if event.new_window_state & WindowState.ICONIFIED:
log.debug('MainWindow is minimized..') log.debug('MainWindow is minimized..')
component.get('TorrentView').save_state() component.get('TorrentView').save_state()
component.pause(self.child_components) component.pause(self.child_components)
@ -341,9 +341,12 @@ class MainWindow(component.Component):
bool: True if on active workspace (or wnck module not available), otherwise False. bool: True if on active workspace (or wnck module not available), otherwise False.
""" """
if wnck:
if Wnck:
self.screen.force_update() self.screen.force_update()
win = wnck.window_get(self.window.get_window().xid) from gi.repository import GdkX11 # NOQA
win = Wnck.Window.get(self.window.get_window().get_xid())
if win: if win:
active_wksp = win.get_screen().get_active_workspace() active_wksp = win.get_screen().get_active_workspace()
if active_wksp: if active_wksp:

44
deluge/ui/gtkui/menubar.py
View file

@ -14,7 +14,7 @@ from __future__ import unicode_literals
import logging import logging
import os.path import os.path
import gtk from gi.repository import Gtk
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
@ -34,7 +34,7 @@ class MenuBar(component.Component):
self.main_builder = self.mainwindow.get_builder() self.main_builder = self.mainwindow.get_builder()
self.config = ConfigManager('gtkui.conf') self.config = ConfigManager('gtkui.conf')
self.builder = gtk.Builder() self.builder = Gtk.Builder()
# Get the torrent menu from the gtk builder file # Get the torrent menu from the gtk builder file
self.builder.add_from_file( self.builder.add_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
@ -74,33 +74,33 @@ class MenuBar(component.Component):
'menuitem_max_connections', 'menuitem_max_connections',
'menuitem_upload_slots', 'menuitem_upload_slots',
): ):
submenu = gtk.Menu() submenu = Gtk.Menu()
item = gtk.MenuItem(_('Set Unlimited')) item = Gtk.MenuItem(_('Set Unlimited'))
item.set_name(menuitem) item.set_name(menuitem)
item.connect('activate', self.on_menuitem_set_unlimited) item.connect('activate', self.on_menuitem_set_unlimited)
submenu.append(item) submenu.append(item)
item = gtk.MenuItem(_('Other...')) item = Gtk.MenuItem(_('Other...'))
item.set_name(menuitem) item.set_name(menuitem)
item.connect('activate', self.on_menuitem_set_other) item.connect('activate', self.on_menuitem_set_other)
submenu.append(item) submenu.append(item)
submenu.show_all() submenu.show_all()
self.builder.get_object(menuitem).set_submenu(submenu) self.builder.get_object(menuitem).set_submenu(submenu)
submenu = gtk.Menu() submenu = Gtk.Menu()
item = gtk.MenuItem(_('On')) item = Gtk.MenuItem(_('On'))
item.connect('activate', self.on_menuitem_set_automanaged_on) item.connect('activate', self.on_menuitem_set_automanaged_on)
submenu.append(item) submenu.append(item)
item = gtk.MenuItem(_('Off')) item = Gtk.MenuItem(_('Off'))
item.connect('activate', self.on_menuitem_set_automanaged_off) item.connect('activate', self.on_menuitem_set_automanaged_off)
submenu.append(item) submenu.append(item)
submenu.show_all() submenu.show_all()
self.builder.get_object('menuitem_auto_managed').set_submenu(submenu) self.builder.get_object('menuitem_auto_managed').set_submenu(submenu)
submenu = gtk.Menu() submenu = Gtk.Menu()
item = gtk.MenuItem(_('Disable')) item = Gtk.MenuItem(_('Disable'))
item.connect('activate', self.on_menuitem_set_stop_seed_at_ratio_disable) item.connect('activate', self.on_menuitem_set_stop_seed_at_ratio_disable)
submenu.append(item) submenu.append(item)
item = gtk.MenuItem(_('Enable...')) item = Gtk.MenuItem(_('Enable...'))
item.set_name('menuitem_stop_seed_at_ratio') item.set_name('menuitem_stop_seed_at_ratio')
item.connect('activate', self.on_menuitem_set_other) item.connect('activate', self.on_menuitem_set_other)
submenu.append(item) submenu.append(item)
@ -223,7 +223,7 @@ class MenuBar(component.Component):
# Any better way than duplicating toolbar.py:update_buttons in here? # Any better way than duplicating toolbar.py:update_buttons in here?
def add_torrentmenu_separator(self): def add_torrentmenu_separator(self):
sep = gtk.SeparatorMenuItem() sep = Gtk.SeparatorMenuItem()
self.torrentmenu.append(sep) self.torrentmenu.append(sep)
sep.show() sep.show()
return sep return sep
@ -310,7 +310,7 @@ class MenuBar(component.Component):
log.debug('on_menuitem_open_folder') log.debug('on_menuitem_open_folder')
def _on_torrent_status(status): def _on_torrent_status(status):
timestamp = gtk.get_current_event_time() timestamp = Gtk.get_current_event_time()
path = os.path.join( path = os.path.join(
status['download_location'], status['files'][0]['path'].split('/')[0] status['download_location'], status['files'][0]['path'].split('/')[0]
) )
@ -329,7 +329,7 @@ class MenuBar(component.Component):
def show_move_storage_dialog(self, status): def show_move_storage_dialog(self, status):
log.debug('show_move_storage_dialog') log.debug('show_move_storage_dialog')
builder = gtk.Builder() builder = Gtk.Builder()
builder.add_from_file( builder.add_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'move_storage_dialog.ui') 'deluge.ui.gtkui', os.path.join('glade', 'move_storage_dialog.ui')
@ -352,10 +352,10 @@ class MenuBar(component.Component):
del self.move_storage_dialog del self.move_storage_dialog
del self.move_storage_dialog_hbox del self.move_storage_dialog_hbox
if response_id == gtk.RESPONSE_CANCEL: if response_id == Gtk.ResponseType.CANCEL:
on_core_result(None) on_core_result(None)
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
log.debug( log.debug(
'Moving torrents to %s', self.move_storage_path_chooser.get_text() 'Moving torrents to %s', self.move_storage_path_chooser.get_text()
) )
@ -454,13 +454,13 @@ class MenuBar(component.Component):
_('Incoming Connections'), _('Incoming Connections'),
_('Set the maximum incoming connections'), _('Set the maximum incoming connections'),
'', '',
gtk.STOCK_NETWORK, Gtk.STOCK_NETWORK,
], ],
'menuitem_upload_slots': [ 'menuitem_upload_slots': [
_('Peer Upload Slots'), _('Peer Upload Slots'),
_('Set the maximum upload slots'), _('Set the maximum upload slots'),
'', '',
gtk.STOCK_SORT_ASCENDING, Gtk.STOCK_SORT_ASCENDING,
], ],
'menuitem_stop_seed_at_ratio': [ 'menuitem_stop_seed_at_ratio': [
_('Stop Seed At Ratio'), _('Stop Seed At Ratio'),
@ -545,15 +545,15 @@ class MenuBar(component.Component):
self.builder.get_object('menuitem_change_owner').set_visible(True) self.builder.get_object('menuitem_change_owner').set_visible(True)
self.change_owner_submenu = gtk.Menu() self.change_owner_submenu = Gtk.Menu()
self.change_owner_submenu_items = {} self.change_owner_submenu_items = {}
maingroup = gtk.RadioMenuItem(None, None) maingroup = Gtk.RadioMenuItem(None, None)
self.change_owner_submenu_items[None] = gtk.RadioMenuItem(group=maingroup) self.change_owner_submenu_items[None] = Gtk.RadioMenuItem(group=maingroup)
for account in known_accounts: for account in known_accounts:
username = account['username'] username = account['username']
item = gtk.RadioMenuItem(group=maingroup, label=username) item = Gtk.RadioMenuItem(group=maingroup, label=username)
self.change_owner_submenu_items[username] = item self.change_owner_submenu_items[username] = item
self.change_owner_submenu.append(item) self.change_owner_submenu.append(item)
item.connect('toggled', self._on_change_owner_toggled, username) item.connect('toggled', self._on_change_owner_toggled, username)

17
deluge/ui/gtkui/menubar_osx.py
View file

@ -9,8 +9,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from gtk import ACCEL_VISIBLE, SeparatorMenuItem, accel_groups_from_object from gi.repository.Gdk import ModifierType
from gtk.gdk import CONTROL_MASK, META_MASK, SHIFT_MASK from gi.repository.Gtk import SeparatorMenuItem, accel_groups_from_object
from gi.repository.Gtk.AccelFlags import VISIBLE
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
@ -18,11 +19,11 @@ from deluge.configmanager import ConfigManager
def accel_swap(item, group, skey, smod, dkey, dmod): def accel_swap(item, group, skey, smod, dkey, dmod):
# Accel map hack broken, see ticket #3078 # Accel map hack broken, see ticket #3078
# item.remove_accelerator(group, ord(skey), smod) # item.remove_accelerator(group, ord(skey), smod)
item.add_accelerator('activate', group, ord(dkey), dmod, ACCEL_VISIBLE) item.add_accelerator('activate', group, ord(dkey), dmod, VISIBLE)
def accel_meta(item, group, key): def accel_meta(item, group, key):
accel_swap(item, group, key, CONTROL_MASK, key, META_MASK) accel_swap(item, group, key, ModifierType.CONTROL_MASK, key, ModifierType.META_MASK)
def menubar_osx(gtkui, osxapp): def menubar_osx(gtkui, osxapp):
@ -45,9 +46,9 @@ def menubar_osx(gtkui, osxapp):
quit_all_item, quit_all_item,
group, group,
'q', 'q',
SHIFT_MASK | CONTROL_MASK, ModifierType.SHIFT_MASK | ModifierType.CONTROL_MASK,
'q', 'q',
SHIFT_MASK | META_MASK, ModifierType.SHIFT_MASK | ModifierType.META_MASK,
) )
for item in range(2, len(file_items)): # remove quits for item in range(2, len(file_items)): # remove quits
file_menu.remove(file_items[item]) file_menu.remove(file_items[item])
@ -56,7 +57,9 @@ def menubar_osx(gtkui, osxapp):
edit_menu = menu_widget.get_submenu() edit_menu = menu_widget.get_submenu()
edit_items = edit_menu.get_children() edit_items = edit_menu.get_children()
pref_item = edit_items[0] pref_item = edit_items[0]
accel_swap(pref_item, group, 'p', CONTROL_MASK, ',', META_MASK) accel_swap(
pref_item, group, 'p', ModifierType.CONTROL_MASK, ',', ModifierType.META_MASK
)
edit_menu.remove(pref_item) edit_menu.remove(pref_item)
conn_item = edit_items[1] conn_item = edit_items[1]

2
deluge/ui/gtkui/options_tab.py
View file

@ -10,7 +10,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from gtk.gdk import keyval_name from gi.repository.Gdk import keyval_name
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client

223
deluge/ui/gtkui/path_combo_chooser.py
View file

@ -13,10 +13,10 @@ from __future__ import division, print_function, unicode_literals
import os import os
# FIXME: use this as fallback to get_introspection_module? # FIXME: use this as fallback to get_introspection_module?
from gi.importer import modules # from gi.importer import modules
from gi.module import get_introspection_module
# from gi.module import get_introspection_module
from gi.repository import Gdk, GObject, Gtk from gi.repository import Gdk, GObject, Gtk
from gi.repository.GObject import SignalFlags
import deluge.component as component import deluge.component as component
from deluge.common import resource_filename from deluge.common import resource_filename
@ -35,11 +35,11 @@ def is_ascii_value(keyval, ascii_key):
def key_is_up(keyval): def key_is_up(keyval):
return keyval == keysyms.Up or keyval == keysyms.KP_Up return keyval == Gdk.KEY_Up or keyval == Gdk.KEY_KP_Up
def key_is_down(keyval): def key_is_down(keyval):
return keyval == keysyms.Down or keyval == keysyms.KP_Down return keyval == Gdk.KEY_Down or keyval == Gdk.KEY_KP_Down
def key_is_up_or_down(keyval): def key_is_up_or_down(keyval):
@ -47,11 +47,11 @@ def key_is_up_or_down(keyval):
def key_is_pgup_or_pgdown(keyval): def key_is_pgup_or_pgdown(keyval):
return keyval == keysyms.Page_Down or keyval == keysyms.Page_Up return keyval == Gdk.KEY_Page_Down or keyval == Gdk.KEY_Page_Up
def key_is_enter(keyval): def key_is_enter(keyval):
return keyval == keysyms.Return or keyval == keysyms.KP_Enter return keyval == Gdk.KEY_Return or keyval == Gdk.KEY_KP_Enter
def path_without_trailing_path_sep(path): def path_without_trailing_path_sep(path):
@ -193,11 +193,9 @@ class ValueList(object):
Enter or Return : Select Enter or Return : Select
""" """
keyval = event.keyval keyval = event.keyval
state = event.get_state() & gtk.accelerator_get_default_mod_mask() state = event.get_state() & Gtk.accelerator_get_default_mod_mask()
alt_up = (state == Gdk.ModifierType.MOD1_MASK) and key_is_up(keyval)
if keyval == keysyms.Escape or ( if keyval == Gdk.KEY_Escape or alt_up:
key_is_up(keyval) and state == gdk.MOD1_MASK
): # ALT Key
self.popdown() self.popdown()
return True return True
# Set entry value to the selected row # Set entry value to the selected row
@ -218,8 +216,8 @@ class ValueList(object):
if event.button != 3: if event.button != 3:
# Double clicked a row, set this as the entry value # Double clicked a row, set this as the entry value
# and close the popup # and close the popup
if (double_click and event.type == gdk._2BUTTON_PRESS) or ( if (double_click and event.type == Gdk.EventType._2BUTTON_PRESS) or (
not double_click and event.type == gdk.BUTTON_PRESS not double_click and event.type == Gdk.EventType.BUTTON_PRESS
): ):
path = self.get_selection_path() path = self.get_selection_path()
if path: if path:
@ -358,12 +356,12 @@ class StoredValuesList(ValueList):
:param path: the paths to edit :param path: the paths to edit
:type path: tuple :type path: tuple
:param column: the column to edit :param column: the column to edit
:type column: gtk.TreeViewColumn :type column: Gtk.TreeViewColumn
""" """
self.rendererText.set_property('editable', True) self.rendererText.set_property('editable', True)
self.treeview.grab_focus() self.treeview.grab_focus()
self.treeview.set_cursor(path, focus_column=column, start_editing=True) self.treeview.set_cursor(path, column=column, start_editing=True)
def on_treeview_mouse_button_press_event(self, treeview, event): def on_treeview_mouse_button_press_event(self, treeview, event):
""" """
@ -389,10 +387,10 @@ class StoredValuesList(ValueList):
treeview.grab_focus() treeview.grab_focus()
treeview.set_cursor(path, col, 0) treeview.set_cursor(path, col, 0)
self.path_list_popup = gtk.Menu() self.path_list_popup = Gtk.Menu()
menuitem_edit = gtk.MenuItem('Edit path') menuitem_edit = Gtk.MenuItem('Edit path')
self.path_list_popup.append(menuitem_edit) self.path_list_popup.append(menuitem_edit)
menuitem_remove = gtk.MenuItem('Remove path') menuitem_remove = Gtk.MenuItem('Remove path')
self.path_list_popup.append(menuitem_remove) self.path_list_popup.append(menuitem_remove)
def on_edit_clicked(widget, path): def on_edit_clicked(widget, path):
@ -428,16 +426,16 @@ class StoredValuesList(ValueList):
""" """
keyval = event.keyval keyval = event.keyval
ctrl = event.get_state() & gdk.CONTROL_MASK ctrl = event.get_state() & Gdk.ModifierType.CONTROL_MASK
# Edit selected row # Edit selected row
if keyval in [keysyms.Left, keysyms.Right, keysyms.space]: if keyval in [Gdk.KEY_Left, Gdk.KEY_Right, Gdk.KEY_space]:
path = self.get_selection_path() path = self.get_selection_path()
if path: if path:
self.on_edit_path(path, self.tree_column) self.on_edit_path(path, self.tree_column)
elif key_is_up_or_down(keyval): elif key_is_up_or_down(keyval):
# Swap the row value # Swap the row value
if event.get_state() & gdk.CONTROL_MASK: if event.get_state() & Gdk.ModifierType.CONTROL_MASK:
self.handle_list_scroll(_next=key_is_down(keyval), swap=True) self.handle_list_scroll(_next=key_is_down(keyval), swap=True)
else: else:
self.handle_list_scroll(_next=key_is_down(keyval)) self.handle_list_scroll(_next=key_is_down(keyval))
@ -505,7 +503,7 @@ class CompletionList(ValueList):
if ret: if ret:
return ret return ret
keyval = event.keyval keyval = event.keyval
ctrl = event.get_state() & gdk.CONTROL_MASK ctrl = event.get_state() & Gdk.ModifierType.CONTROL_MASK
if key_is_up_or_down(keyval): if key_is_up_or_down(keyval):
self.handle_list_scroll(_next=key_is_down(keyval)) self.handle_list_scroll(_next=key_is_down(keyval))
return True return True
@ -555,7 +553,7 @@ class PathChooserPopup(object):
if not self.path_entry.get_realized(): if not self.path_entry.get_realized():
return return
self.popup_window.grab_remove() self.popup_window.grab_remove()
self.popup_window.hide_all() self.popup_window.hide()
def is_popped_up(self): def is_popped_up(self):
"""Check if window is popped up. """Check if window is popped up.
@ -586,7 +584,7 @@ class PathChooserPopup(object):
self.treeview.realize() self.treeview.realize()
# We start with the coordinates of the parent window # We start with the coordinates of the parent window
x, y = self.path_entry.get_window().get_origin() z, x, y = self.path_entry.get_window().get_origin()
# Add the position of the alignment_widget relative to the parent window. # Add the position of the alignment_widget relative to the parent window.
x += self.alignment_widget.get_allocation().x x += self.alignment_widget.get_allocation().x
@ -594,20 +592,20 @@ class PathChooserPopup(object):
height_extra = 8 height_extra = 8
buttonbox_width = 0 buttonbox_width = 0
height = self.popup_window.size_request()[1] height = self.popup_window.get_preferred_size().height
width = self.popup_window.size_request()[0] width = self.popup_window.get_preferred_size().width
if self.popup_buttonbox: if self.popup_buttonbox:
buttonbox_height = max( buttonbox_height = max(
self.popup_buttonbox.size_request()[1], self.popup_buttonbox.get_preferred_size().height,
self.popup_buttonbox.get_allocation().height, self.popup_buttonbox.get_allocation().height,
) )
buttonbox_width = max( buttonbox_width = max(
self.popup_buttonbox.size_request()[0], self.popup_buttonbox.get_preferred_size().width,
self.popup_buttonbox.get_allocation().width, self.popup_buttonbox.get_allocation().width,
) )
treeview_width = self.treeview.size_request()[0] treeview_width = self.treeview.get_preferred_size().width
# After removing an element from the tree store, self.treeview.size_request()[0] # After removing an element from the tree store, self.treeview.get_preferred_size()[0]
# returns -1 for some reason, so the requested width cannot be used until the treeview # returns -1 for some reason, so the requested width cannot be used until the treeview
# has been displayed once. # has been displayed once.
if treeview_width != -1: if treeview_width != -1:
@ -621,12 +619,14 @@ class PathChooserPopup(object):
width = self.alignment_widget.get_allocation().width width = self.alignment_widget.get_allocation().width
# 10 is extra spacing # 10 is extra spacing
content_width = self.treeview.size_request()[0] + buttonbox_width + 10 content_width = self.treeview.get_preferred_size().width + buttonbox_width + 10
# Adjust height according to number of list items # Adjust height according to number of list items
if len(self.tree_store) > 0 and self.max_visible_rows > 0: if len(self.tree_store) > 0 and self.max_visible_rows > 0:
# The height for one row in the list # The height for one row in the list
self.row_height = self.treeview.size_request()[1] // len(self.tree_store) self.row_height = self.treeview.get_preferred_size().height / len(
self.tree_store
)
# Set height to number of rows # Set height to number of rows
height = len(self.tree_store) * self.row_height + height_extra height = len(self.tree_store) * self.row_height + height_extra
# Adjust the height according to the max number of rows # Adjust the height according to the max number of rows
@ -679,13 +679,13 @@ class PathChooserPopup(object):
def popup_grab_window(self): def popup_grab_window(self):
activate_time = 0 activate_time = 0
if ( if (
gdk.pointer_grab( Gdk.pointer_grab(
self.popup_window.get_window(), self.popup_window.get_window(),
True, True,
( (
gdk.BUTTON_PRESS_MASK Gdk.EventMask.BUTTON_PRESS_MASK
| gdk.BUTTON_RELEASE_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK
| gdk.POINTER_MOTION_MASK | Gdk.EventMask.POINTER_MOTION_MASK
), ),
None, None,
None, None,
@ -694,7 +694,7 @@ class PathChooserPopup(object):
== 0 == 0
): ):
if ( if (
gdk.keyboard_grab(self.popup_window.get_window(), True, activate_time) Gdk.keyboard_grab(self.popup_window.get_window(), True, activate_time)
== 0 == 0
): ):
return True return True
@ -733,25 +733,11 @@ class PathChooserPopup(object):
def on_popup_window_button_press_event(self, window, event): def on_popup_window_button_press_event(self, window, event):
# If we're clicking outside of the window close the popup # If we're clicking outside of the window close the popup
hide = False allocation = self.popup_window.get_allocation()
# Also if the intersection of self and the event is empty, hide
# the path_list
if tuple(
self.popup_window.get_allocation().intersect(
gdk.Rectangle(x=int(event.x), y=int(event.y), width=1, height=1)
)
) == (0, 0, 0, 0):
hide = True
# Toplevel is the window that received the event, and parent is the
# path_list window. If they are not the same, means the popup should
# be hidden. This is necessary for when the event happens on another
# widget
toplevel = event.window.get_toplevel()
parent = self.popup_window.get_window()
if toplevel != parent: if (event.x < allocation.x or event.x > allocation.width) or (
hide = True event.y < allocation.y or event.y > allocation.height
if hide: ):
self.popdown() self.popdown()
@ -846,10 +832,11 @@ class StoredValuesPopup(StoredValuesList, PathChooserPopup):
Handles scroll events from text entry, toggle button and treeview Handles scroll events from text entry, toggle button and treeview
""" """
swap = event.get_state() & gdk.CONTROL_MASK
scroll_window = event.get_state() & gdk.SHIFT_MASK swap = event.get_state() & Gdk.ModifierType.CONTROL_MASK
scroll_window = event.get_state() & Gdk.ModifierType.SHIFT_MASK
self.handle_list_scroll( self.handle_list_scroll(
_next=event.direction == gdk.SCROLL_DOWN, _next=event.direction == Gdk.ScrollDirection.DOWN,
set_entry=widget != self.treeview, set_entry=widget != self.treeview,
swap=swap, swap=swap,
scroll_window=scroll_window, scroll_window=scroll_window,
@ -862,8 +849,10 @@ class StoredValuesPopup(StoredValuesList, PathChooserPopup):
is on any of the buttons in the popup is on any of the buttons in the popup
""" """
keyval = event.keyval keyval = event.keyval
state = event.get_state() & gtk.accelerator_get_default_mod_mask() state = event.get_state() & Gtk.accelerator_get_default_mod_mask()
if keyval == keysyms.Escape or (key_is_up(keyval) and state == gdk.MOD1_MASK): if keyval == Gdk.KEY_Escape or (
key_is_up(keyval) and state == Gdk.ModifierType.MOD1_MASK
):
self.popdown() self.popdown()
return True return True
return False return False
@ -983,7 +972,7 @@ class PathCompletionPopup(CompletionList, PathChooserPopup):
""" """
x, y, state = event.window.get_pointer() x, y, state = event.window.get_pointer()
self.handle_list_scroll( self.handle_list_scroll(
_next=event.direction == gdk.SCROLL_DOWN, _next=event.direction == Gdk.ScrollDirection.DOWN,
set_entry=widget != self.treeview, set_entry=widget != self.treeview,
scroll_window=True, scroll_window=True,
) )
@ -1013,7 +1002,7 @@ class PathAutoCompleter(object):
self.signal_handlers[ self.signal_handlers[
'on_entry_text_insert_text' 'on_entry_text_insert_text'
] = self.on_entry_text_insert_text ] = self.on_entry_text_insert_text
self.accelerator_string = gtk.accelerator_name(keysyms.Tab, 0) self.accelerator_string = Gtk.accelerator_name(Gdk.KEY_Tab, 0)
def on_entry_text_insert_text(self, entry, new_text, new_text_length, position): def on_entry_text_insert_text(self, entry, new_text, new_text_length, position):
if self.path_entry.get_realized(): if self.path_entry.get_realized():
@ -1050,7 +1039,7 @@ class PathAutoCompleter(object):
if ret: if ret:
return ret return ret
keyval = event.keyval keyval = event.keyval
state = event.get_state() & gtk.accelerator_get_default_mod_mask() state = event.get_state() & Gtk.accelerator_get_default_mod_mask()
if ( if (
self.is_auto_completion_accelerator(keyval, state) self.is_auto_completion_accelerator(keyval, state)
and self.auto_complete_enabled and self.auto_complete_enabled
@ -1061,10 +1050,23 @@ class PathAutoCompleter(object):
else: else:
self.completion_popup.handle_list_scroll(_next=True) self.completion_popup.handle_list_scroll(_next=True)
return True return True
self.path_entry.text_entry.emit('key-press-event', event) # Buggy stuff (in pygobject?) causing type mismatch between EventKey and GdkEvent. Convert manually...
n = Gdk.Event()
n.type = event.type
n.window = event.window
n.send_event = event.send_event
n.time = event.time
n.state = event.state
n.keyval = event.keyval
n.length = event.length
n.string = event.string
n.hardware_keycode = event.hardware_keycode
n.group = event.group
n.is_modifier = event.is_modifier
self.path_entry.text_entry.emit('key-press-event', n)
def is_auto_completion_accelerator(self, keyval, state): def is_auto_completion_accelerator(self, keyval, state):
return gtk.accelerator_name(keyval, state.numerator) == self.accelerator_string return Gtk.accelerator_name(keyval, state) == self.accelerator_string
def do_completion(self, value=None, forward_completion=True): def do_completion(self, value=None, forward_completion=True):
if not value: if not value:
@ -1100,28 +1102,34 @@ class PathAutoCompleter(object):
self.completion_popup.popdown() self.completion_popup.popdown()
class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject): # FIXME: use this as fallback to get_introspection_module?
# GtkGI = modules['Gtk']._introspection_module
GtkGI = get_introspection_module('Gtk')
class PathChooserComboBox(GtkGI.Box, StoredValuesPopup, GObject.GObject):
__gsignals__ = { __gsignals__ = {
b'list-value-added': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'list-value-added': (SignalFlags.RUN_FIRST, None, (object,)),
b'list-value-removed': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'list-value-removed': (SignalFlags.RUN_FIRST, None, (object,)),
b'list-values-reordered': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'list-values-reordered': (SignalFlags.RUN_FIRST, None, (object,)),
b'list-values-changed': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'list-values-changed': (SignalFlags.RUN_FIRST, None, (object,)),
b'auto-complete-enabled-toggled': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'auto-complete-enabled-toggled': (SignalFlags.RUN_FIRST, None, (object,)),
b'show-filechooser-toggled': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'show-filechooser-toggled': (SignalFlags.RUN_FIRST, None, (object,)),
b'show-path-entry-toggled': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'show-path-entry-toggled': (SignalFlags.RUN_FIRST, None, (object,)),
b'show-folder-name-on-button': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'show-folder-name-on-button': (SignalFlags.RUN_FIRST, None, (object,)),
b'show-hidden-files-toggled': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'show-hidden-files-toggled': (SignalFlags.RUN_FIRST, None, (object,)),
b'accelerator-set': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'accelerator-set': (SignalFlags.RUN_FIRST, None, (object,)),
b'max-rows-changed': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'max-rows-changed': (SignalFlags.RUN_FIRST, None, (object,)),
b'text-changed': (SIGNAL_RUN_FIRST, TYPE_NONE, (object,)), b'text-changed': (SignalFlags.RUN_FIRST, None, (object,)),
} }
def __init__( def __init__(
self, max_visible_rows=20, auto_complete=True, use_completer_popup=True self, max_visible_rows=20, auto_complete=True, use_completer_popup=True
): ):
gtk.HBox.__init__(self) GtkGI.Box.__init__(self)
GObject.__init__(self) GObject.GObject.__init__(self)
self.list_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
self._stored_values_popping_down = False self._stored_values_popping_down = False
self.filechooser_visible = True self.filechooser_visible = True
self.filechooser_enabled = True self.filechooser_enabled = True
@ -1129,7 +1137,7 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
self.properties_enabled = True self.properties_enabled = True
self.show_folder_name_on_button = False self.show_folder_name_on_button = False
self.setting_accelerator_key = False self.setting_accelerator_key = False
self.builder = gtk.Builder() self.builder = Gtk.Builder()
self.popup_buttonbox = self.builder.get_object('buttonbox') self.popup_buttonbox = self.builder.get_object('buttonbox')
self.builder.add_from_file( self.builder.add_from_file(
resource_filename( resource_filename(
@ -1147,13 +1155,19 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
self.folder_name_label = self.builder.get_object('folder_name_label') self.folder_name_label = self.builder.get_object('folder_name_label')
self.default_text = None self.default_text = None
self.button_properties = self.builder.get_object('button_properties') self.button_properties = self.builder.get_object('button_properties')
# FIXME: These are commented out but should be fixed.
# self.combobox_window = self.builder.get_object('combobox_window')
self.combo_hbox = self.builder.get_object('entry_combobox_hbox') self.combo_hbox = self.builder.get_object('entry_combobox_hbox')
# Change the parent of the hbox from the glade Window to this hbox. # Change the parent of the hbox from the glade Window to this hbox.
self.combo_hbox.reparent(self) # self.combobox_window.remove(self.combo_hbox)
self.combobox_window = self.get_window()
self.add(self.combo_hbox)
StoredValuesPopup.__init__( StoredValuesPopup.__init__(
self, self.builder, self, max_visible_rows, self.combo_hbox self, self.builder, self, max_visible_rows, self.combo_hbox
) )
self.tooltips = Gtk.Tooltip()
self.auto_completer = PathAutoCompleter(self.builder, self, max_visible_rows) self.auto_completer = PathAutoCompleter(self.builder, self, max_visible_rows)
self.auto_completer.set_use_popup(use_completer_popup) self.auto_completer.set_use_popup(use_completer_popup)
self.auto_completer.auto_complete_enabled = auto_complete self.auto_completer.auto_complete_enabled = auto_complete
@ -1246,7 +1260,7 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
return return
try: try:
# Verify that the accelerator can be parsed # Verify that the accelerator can be parsed
keyval, mask = gtk.accelerator_parse(self.auto_completer.accelerator_string) keyval, mask = Gtk.accelerator_parse(self.auto_completer.accelerator_string)
self.auto_completer.accelerator_string = accelerator self.auto_completer.accelerator_string = accelerator
except TypeError as ex: except TypeError as ex:
raise TypeError('TypeError when setting accelerator string: %s' % ex) raise TypeError('TypeError when setting accelerator string: %s' % ex)
@ -1374,7 +1388,7 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
def _set_path_entry_filechooser_widths(self): def _set_path_entry_filechooser_widths(self):
if self.path_entry_visible: if self.path_entry_visible:
self.combo_hbox.set_child_packing( self.combo_hbox.set_child_packing(
self.filechooser_button, 0, 0, 0, gtk.PACK_START self.filechooser_button, 0, 0, 0, Gtk.PackType.START
) )
width, height = self.folder_name_label.get_size_request() width, height = self.folder_name_label.get_size_request()
width = 120 width = 120
@ -1382,11 +1396,11 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
width = 0 width = 0
self.folder_name_label.set_size_request(width, height) self.folder_name_label.set_size_request(width, height)
self.combo_hbox.set_child_packing( self.combo_hbox.set_child_packing(
self.filechooser_button, 0, 0, 0, gtk.PACK_START self.filechooser_button, 0, 0, 0, Gtk.PackType.START
) )
else: else:
self.combo_hbox.set_child_packing( self.combo_hbox.set_child_packing(
self.filechooser_button, 1, 1, 0, gtk.PACK_START self.filechooser_button, 1, 1, 0, Gtk.PackType.START
) )
self.folder_name_label.set_size_request(-1, -1) self.folder_name_label.set_size_request(-1, -1)
# Update text on the button label # Update text on the button label
@ -1418,9 +1432,10 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
Return True whenever we want no other event listeners to be called. Return True whenever we want no other event listeners to be called.
""" """
# on_entry_text_key_press_event Errors follow here when pressing ALT key while popup is visible")
keyval = event.keyval keyval = event.keyval
state = event.get_state() & gtk.accelerator_get_default_mod_mask() state = event.get_state() & Gtk.accelerator_get_default_mod_mask()
ctrl = event.get_state() & gdk.CONTROL_MASK ctrl = event.get_state() & Gdk.ModifierType.CONTROL_MASK
# Select new row with arrow up/down is pressed # Select new row with arrow up/down is pressed
if key_is_up_or_down(keyval): if key_is_up_or_down(keyval):
@ -1484,8 +1499,8 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
self.popdown() self.popdown()
self.enable_completion.set_active(self.get_auto_complete_enabled()) self.enable_completion.set_active(self.get_auto_complete_enabled())
# Set the value of the label to the current accelerator # Set the value of the label to the current accelerator
keyval, mask = gtk.accelerator_parse(self.auto_completer.accelerator_string) keyval, mask = Gtk.accelerator_parse(self.auto_completer.accelerator_string)
self.accelerator_label.set_text(gtk.accelerator_get_label(keyval, mask)) self.accelerator_label.set_text(Gtk.accelerator_get_label(keyval, mask))
self.visible_rows.set_value(self.get_max_popup_rows()) self.visible_rows.set_value(self.get_max_popup_rows())
self.show_filechooser_checkbutton.set_active( self.show_filechooser_checkbutton.set_active(
self.get_filechooser_button_visible() self.get_filechooser_button_visible()
@ -1611,23 +1626,23 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
def on_completion_config_dialog_key_release_event(widget, event): def on_completion_config_dialog_key_release_event(widget, event):
# We are listening for a new key # We are listening for a new key
if set_key_button.get_active(): if set_key_button.get_active():
state = event.get_state() & gtk.accelerator_get_default_mod_mask() state = event.get_state() & Gtk.accelerator_get_default_mod_mask()
accelerator_mask = state.numerator accelerator_mask = state.numerator
# If e.g. only CTRL key is pressed. # If e.g. only CTRL key is pressed.
if not gtk.accelerator_valid(event.keyval, accelerator_mask): if not Gtk.accelerator_valid(event.keyval, accelerator_mask):
accelerator_mask = 0 accelerator_mask = 0
self.auto_completer.accelerator_string = gtk.accelerator_name( self.auto_completer.accelerator_string = Gtk.accelerator_name(
event.keyval, accelerator_mask event.keyval, accelerator_mask
) )
self.accelerator_label.set_text( self.accelerator_label.set_text(
gtk.accelerator_get_label(event.keyval, accelerator_mask) Gtk.accelerator_get_label(event.keyval, accelerator_mask)
) )
self.emit('accelerator-set', self.auto_completer.accelerator_string) self.emit('accelerator-set', self.auto_completer.accelerator_string)
stop_setting_accelerator() stop_setting_accelerator()
return True return True
else: else:
keyval = event.keyval keyval = event.keyval
ctrl = event.get_state() & gdk.CONTROL_MASK ctrl = event.get_state() & Gdk.ModifierType.CONTROL_MASK
if ctrl: if ctrl:
# Set show/hide hidden files # Set show/hide hidden files
if is_ascii_value(keyval, 'h'): if is_ascii_value(keyval, 'h'):
@ -1656,19 +1671,23 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, GObject):
} }
type_register(PathChooserComboBox) GObject.type_register(PathChooserComboBox)
if __name__ == '__main__': if __name__ == '__main__':
import signal
# necessary to exit with CTRL-C (https://bugzilla.gnome.org/show_bug.cgi?id=622084)
signal.signal(signal.SIGINT, signal.SIG_DFL)
import sys import sys
w = gtk.Window() w = Gtk.Window()
w.set_position(gtk.WIN_POS_CENTER) w.set_position(Gtk.WindowPosition.CENTER)
w.set_size_request(600, -1) w.set_size_request(600, -1)
w.set_title('ComboEntry example') w.set_title('ComboEntry example')
w.connect('delete-event', gtk.main_quit) w.connect('delete-event', Gtk.main_quit)
box1 = gtk.VBox(gtk.FALSE, 0) box1 = Gtk.VBox(False, 0)
def get_resource2(filename): def get_resource2(filename):
return '%s/glade/%s' % (os.path.abspath(os.path.dirname(sys.argv[0])), filename) return '%s/glade/%s' % (os.path.abspath(os.path.dirname(sys.argv[0])), filename)
@ -1713,4 +1732,4 @@ if __name__ == '__main__':
entry2.connect('list-value-added', list_value_added_event) entry2.connect('list-value-added', list_value_added_event)
w.add(box1) w.add(box1)
w.show_all() w.show_all()
gtk.main() Gtk.main()

20
deluge/ui/gtkui/peers_tab.py
View file

@ -12,16 +12,16 @@ from __future__ import unicode_literals
import logging import logging
import os.path import os.path
from gtk import ( from gi.repository.GdkPixbuf import Pixbuf
TREE_VIEW_COLUMN_FIXED, from gi.repository.Gtk import (
Builder, Builder,
CellRendererPixbuf, CellRendererPixbuf,
CellRendererProgress, CellRendererProgress,
CellRendererText, CellRendererText,
ListStore, ListStore,
TreeViewColumn, TreeViewColumn,
TreeViewColumnSizing,
) )
from gtk.gdk import Pixbuf, pixbuf_new_from_file
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
@ -197,7 +197,7 @@ class PeersTab(Tab):
cname = column.get_title() cname = column.get_title()
if cname in state['columns']: if cname in state['columns']:
cstate = state['columns'][cname] cstate = state['columns'][cname]
column.set_sizing(TREE_VIEW_COLUMN_FIXED) column.set_sizing(TreeViewColumnSizing.FIXED)
column.set_fixed_width(cstate['width'] if cstate['width'] > 0 else 10) column.set_fixed_width(cstate['width'] if cstate['width'] > 0 else 10)
if state['sort_id'] == index and state['sort_order'] is not None: if state['sort_id'] == index and state['sort_order'] is not None:
column.set_sort_indicator(True) column.set_sort_indicator(True)
@ -243,7 +243,7 @@ class PeersTab(Tab):
if country not in self.cached_flag_pixbufs: if country not in self.cached_flag_pixbufs:
# We haven't created a pixbuf for this country yet # We haven't created a pixbuf for this country yet
try: try:
self.cached_flag_pixbufs[country] = pixbuf_new_from_file( self.cached_flag_pixbufs[country] = Pixbuf.new_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
'deluge', 'deluge',
os.path.join( os.path.join(
@ -351,18 +351,16 @@ class PeersTab(Tab):
return True return True
def _on_query_tooltip(self, widget, x, y, keyboard_tip, tooltip): def _on_query_tooltip(self, widget, x, y, keyboard_tip, tooltip):
if not widget.get_tooltip_context(x, y, keyboard_tip): tooltip, x, y, model, path, _iter = widget.get_tooltip_context(
return False x, y, keyboard_tip
else: )
model, path, _iter = widget.get_tooltip_context(x, y, keyboard_tip) if tooltip:
country_code = model.get(_iter, 5)[0] country_code = model.get(_iter, 5)[0]
if country_code != ' ' and country_code in COUNTRIES: if country_code != ' ' and country_code in COUNTRIES:
tooltip.set_text(COUNTRIES[country_code]) tooltip.set_text(COUNTRIES[country_code])
# widget here is self.listview # widget here is self.listview
widget.set_tooltip_cell(tooltip, path, widget.get_column(0), None) widget.set_tooltip_cell(tooltip, path, widget.get_column(0), None)
return True return True
else:
return False return False
def on_menuitem_add_peer_activate(self, menuitem): def on_menuitem_add_peer_activate(self, menuitem):

41
deluge/ui/gtkui/piecesbar.py
View file

@ -11,12 +11,16 @@ from __future__ import division, unicode_literals
from math import pi from math import pi
from cairo import FORMAT_ARGB32, Context, ImageSurface import gi # isort:skip (Version check required before import).
from gtk import DrawingArea, ProgressBar
from gtk.gdk import colormap_get_system
from pango import SCALE, WEIGHT_BOLD
from pangocairo import CairoContext
gi.require_version('PangoCairo', '1.0') # NOQA: E402
# isort:imports-thirdparty
from gi.repository import PangoCairo, cairo
from gi.repository.Gtk import DrawingArea, ProgressBar
from gi.repository.Pango import SCALE, Weight
# isort:imports-firstparty
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
COLOR_STATES = ['missing', 'waiting', 'downloading', 'completed'] COLOR_STATES = ['missing', 'waiting', 'downloading', 'completed']
@ -24,7 +28,7 @@ COLOR_STATES = ['missing', 'waiting', 'downloading', 'completed']
class PiecesBar(DrawingArea): class PiecesBar(DrawingArea):
# Draw in response to an expose-event # Draw in response to an expose-event
__gsignals__ = {b'expose-event': b'override'} __gsignals__ = {b'draw': b'override'}
def __init__(self): def __init__(self):
super(PiecesBar, self).__init__() super(PiecesBar, self).__init__()
@ -32,7 +36,7 @@ class PiecesBar(DrawingArea):
pb = ProgressBar() pb = ProgressBar()
pb_style = pb.get_style() pb_style = pb.get_style()
self.text_font = pb_style.font_desc self.text_font = pb_style.font_desc
self.text_font.set_weight(WEIGHT_BOLD) self.text_font.set_weight(Weight.BOLD)
# Done with the ProgressBar styles, don't keep refs of it # Done with the ProgressBar styles, don't keep refs of it
del pb, pb_style del pb, pb_style
@ -49,7 +53,6 @@ class PiecesBar(DrawingArea):
self.cr = None self.cr = None
self.connect('size-allocate', self.do_size_allocate_event) self.connect('size-allocate', self.do_size_allocate_event)
self.set_colormap(colormap_get_system())
self.show() self.show()
def do_size_allocate_event(self, widget, size): def do_size_allocate_event(self, widget, size):
@ -59,7 +62,7 @@ class PiecesBar(DrawingArea):
self.height = size.height self.height = size.height
# Handle the expose-event by drawing # Handle the expose-event by drawing
def do_expose_event(self, event): def do_draw(self, event):
# Create cairo context # Create cairo context
self.cr = self.window.cairo_create() self.cr = self.window.cairo_create()
self.cr.set_line_width(max(self.cr.device_to_user_distance(0.5, 0.5))) self.cr.set_line_width(max(self.cr.device_to_user_distance(0.5, 0.5)))
@ -115,8 +118,10 @@ class PiecesBar(DrawingArea):
or self.pieces_overlay is None or self.pieces_overlay is None
): ):
# Need to recreate the cache drawing # Need to recreate the cache drawing
self.pieces_overlay = ImageSurface(FORMAT_ARGB32, self.width, self.height) self.pieces_overlay = cairo.ImageSurface(
ctx = Context(self.pieces_overlay) cairo.FORMAT_ARGB32, self.width, self.height
)
ctx = cairo.Context(self.pieces_overlay)
if self.pieces: if self.pieces:
pieces = self.pieces pieces = self.pieces
@ -152,8 +157,10 @@ class PiecesBar(DrawingArea):
or self.progress_overlay is None or self.progress_overlay is None
): ):
# Need to recreate the cache drawing # Need to recreate the cache drawing
self.progress_overlay = ImageSurface(FORMAT_ARGB32, self.width, self.height) self.progress_overlay = cairo.ImageSurface(
ctx = Context(self.progress_overlay) cairo.FORMAT_ARGB32, self.width, self.height
)
ctx = cairo.Context(self.progress_overlay)
ctx.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent ctx.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent
ctx.rectangle(0, 0, self.width * self.fraction, self.height) ctx.rectangle(0, 0, self.width * self.fraction, self.height)
ctx.fill() ctx.fill()
@ -167,9 +174,11 @@ class PiecesBar(DrawingArea):
if self.resized() or self.text != self.prev_text or self.text_overlay is None: if self.resized() or self.text != self.prev_text or self.text_overlay is None:
# Need to recreate the cache drawing # Need to recreate the cache drawing
self.text_overlay = ImageSurface(FORMAT_ARGB32, self.width, self.height) self.text_overlay = cairo.ImageSurface(
ctx = Context(self.text_overlay) cairo.FORMAT_ARGB32, self.width, self.height
pg = CairoContext(ctx) )
ctx = cairo.Context(self.text_overlay)
pg = PangoCairo.create_context(ctx)
pl = pg.create_layout() pl = pg.create_layout()
pl.set_font_description(self.text_font) pl.set_font_description(self.text_font)
pl.set_width(-1) # No text wrapping pl.set_width(-1) # No text wrapping

82
deluge/ui/gtkui/preferences.py
View file

@ -14,8 +14,8 @@ import logging
import os import os
from hashlib import sha1 as sha from hashlib import sha1 as sha
import gtk from gi.repository import Gtk
from gtk.gdk import Color from gi.repository.Gdk import Color
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
@ -64,7 +64,7 @@ COLOR_STATES = {
class Preferences(component.Component): class Preferences(component.Component):
def __init__(self): def __init__(self):
component.Component.__init__(self, 'Preferences') component.Component.__init__(self, 'Preferences')
self.builder = gtk.Builder() self.builder = Gtk.Builder()
self.builder.add_from_file( self.builder.add_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'preferences_dialog.ui') 'deluge.ui.gtkui', os.path.join('glade', 'preferences_dialog.ui')
@ -89,10 +89,10 @@ class Preferences(component.Component):
self.builder.get_object('button_associate_magnet').hide() self.builder.get_object('button_associate_magnet').hide()
# Setup the liststore for the categories (tab pages) # Setup the liststore for the categories (tab pages)
self.liststore = gtk.ListStore(int, str, str) self.liststore = Gtk.ListStore(int, str, str)
self.treeview.set_model(self.liststore) self.treeview.set_model(self.liststore)
render = gtk.CellRendererText() render = Gtk.CellRendererText()
column = gtk.TreeViewColumn(None, render, text=2) column = Gtk.TreeViewColumn(None, render, text=2)
self.treeview.append_column(column) self.treeview.append_column(column)
# Add the default categories # Add the default categories
@ -119,26 +119,26 @@ class Preferences(component.Component):
self.treeview.set_row_separator_func(set_separator, None) self.treeview.set_row_separator_func(set_separator, None)
self.liststore.append([len(self.liststore), '_separator_', '']) self.liststore.append([len(self.liststore), '_separator_', ''])
# Add a dummy notebook page to keep indexing synced with liststore. # Add a dummy notebook page to keep indexing synced with liststore.
self.notebook.append_page(gtk.HSeparator()) self.notebook.append_page(Gtk.HSeparator())
# Setup accounts tab lisview # Setup accounts tab lisview
self.accounts_levels_mapping = None self.accounts_levels_mapping = None
self.accounts_authlevel = self.builder.get_object('accounts_authlevel') self.accounts_authlevel = self.builder.get_object('accounts_authlevel')
self.accounts_liststore = gtk.ListStore(str, str, str, int) self.accounts_liststore = Gtk.ListStore(str, str, str, int)
self.accounts_liststore.set_sort_column_id( self.accounts_liststore.set_sort_column_id(
ACCOUNTS_USERNAME, gtk.SORT_ASCENDING ACCOUNTS_USERNAME, Gtk.SortType.ASCENDING
) )
self.accounts_listview = self.builder.get_object('accounts_listview') self.accounts_listview = self.builder.get_object('accounts_listview')
self.accounts_listview.append_column( self.accounts_listview.append_column(
gtk.TreeViewColumn( Gtk.TreeViewColumn(
_('Username'), gtk.CellRendererText(), text=ACCOUNTS_USERNAME _('Username'), Gtk.CellRendererText(), text=ACCOUNTS_USERNAME
) )
) )
self.accounts_listview.append_column( self.accounts_listview.append_column(
gtk.TreeViewColumn(_('Level'), gtk.CellRendererText(), text=ACCOUNTS_LEVEL) Gtk.TreeViewColumn(_('Level'), Gtk.CellRendererText(), text=ACCOUNTS_LEVEL)
) )
password_column = gtk.TreeViewColumn( password_column = Gtk.TreeViewColumn(
'password', gtk.CellRendererText(), text=ACCOUNTS_PASSWORD 'password', Gtk.CellRendererText(), text=ACCOUNTS_PASSWORD
) )
self.accounts_listview.append_column(password_column) self.accounts_listview.append_column(password_column)
password_column.set_visible(False) password_column.set_visible(False)
@ -151,18 +151,18 @@ class Preferences(component.Component):
# Setup plugin tab listview # Setup plugin tab listview
# The third entry is for holding translated plugin names # The third entry is for holding translated plugin names
self.plugin_liststore = gtk.ListStore(str, bool, str) self.plugin_liststore = Gtk.ListStore(str, bool, str)
self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.plugin_liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
self.plugin_listview = self.builder.get_object('plugin_listview') self.plugin_listview = self.builder.get_object('plugin_listview')
self.plugin_listview.set_model(self.plugin_liststore) self.plugin_listview.set_model(self.plugin_liststore)
render = gtk.CellRendererToggle() render = Gtk.CellRendererToggle()
render.connect('toggled', self.on_plugin_toggled) render.connect('toggled', self.on_plugin_toggled)
render.set_property('activatable', True) render.set_property('activatable', True)
self.plugin_listview.append_column( self.plugin_listview.append_column(
gtk.TreeViewColumn(_('Enabled'), render, active=1) Gtk.TreeViewColumn(_('Enabled'), render, active=1)
) )
self.plugin_listview.append_column( self.plugin_listview.append_column(
gtk.TreeViewColumn(_('Plugin'), gtk.CellRendererText(), text=2) Gtk.TreeViewColumn(_('Plugin'), Gtk.CellRendererText(), text=2)
) )
# Connect to the 'changed' event of TreeViewSelection to get selection # Connect to the 'changed' event of TreeViewSelection to get selection
@ -247,26 +247,26 @@ class Preferences(component.Component):
parent = widget.get_parent() parent = widget.get_parent()
if parent: if parent:
parent.remove(widget) parent.remove(widget)
vbox = gtk.VBox() vbox = Gtk.VBox()
label = gtk.Label() label = Gtk.Label()
label.set_use_markup(True) label.set_use_markup(True)
label.set_markup('<b><i><big>' + name + '</big></i></b>') label.set_markup('<b><i><big>' + name + '</big></i></b>')
label.set_alignment(0.00, 0.50) label.set_alignment(0.00, 0.50)
label.set_padding(10, 10) label.set_padding(10, 10)
vbox.pack_start(label, False, True, 0) vbox.pack_start(label, False, True, 0)
sep = gtk.HSeparator() sep = Gtk.HSeparator()
vbox.pack_start(sep, False, True, 0) vbox.pack_start(sep, False, True, 0)
align = gtk.Alignment() align = Gtk.Alignment()
align.set_padding(5, 0, 0, 0) align.set_padding(5, 0, 0, 0)
align.set(0, 0, 1, 1) align.set(0, 0, 1, 1)
align.add(widget) align.add(widget)
vbox.pack_start(align, True, True, 0) vbox.pack_start(align, True, True, 0)
scrolled = gtk.ScrolledWindow() scrolled = Gtk.ScrolledWindow()
viewport = gtk.Viewport() viewport = Gtk.Viewport()
viewport.set_shadow_type(gtk.SHADOW_NONE) viewport.set_shadow_type(Gtk.ShadowType.NONE)
viewport.add(vbox) viewport.add(vbox)
scrolled.add(viewport) scrolled.add(viewport)
scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
scrolled.show_all() scrolled.show_all()
# Add this page to the notebook # Add this page to the notebook
index = self.notebook.append_page(scrolled, None) index = self.notebook.append_page(scrolled, None)
@ -918,7 +918,7 @@ class Preferences(component.Component):
if was_standalone != new_gtkui_standalone: if was_standalone != new_gtkui_standalone:
def on_response(response): def on_response(response):
if response == gtk.RESPONSE_YES: if response == Gtk.ResponseType.YES:
shutdown_daemon = ( shutdown_daemon = (
not client.is_standalone() not client.is_standalone()
and client.connected() and client.connected()
@ -1091,11 +1091,11 @@ class Preferences(component.Component):
def on_get_test(status): def on_get_test(status):
if status: if status:
self.builder.get_object('port_img').set_from_stock(gtk.STOCK_YES, 4) self.builder.get_object('port_img').set_from_stock(Gtk.STOCK_YES, 4)
self.builder.get_object('port_img').show() self.builder.get_object('port_img').show()
else: else:
self.builder.get_object('port_img').set_from_stock( self.builder.get_object('port_img').set_from_stock(
gtk.STOCK_DIALOG_WARNING, 4 Gtk.STOCK_DIALOG_WARNING, 4
) )
self.builder.get_object('port_img').show() self.builder.get_object('port_img').show()
@ -1147,15 +1147,15 @@ class Preferences(component.Component):
def on_button_plugin_install_clicked(self, widget): def on_button_plugin_install_clicked(self, widget):
log.debug('on_button_plugin_install_clicked') log.debug('on_button_plugin_install_clicked')
chooser = gtk.FileChooserDialog( chooser = Gtk.FileChooserDialog(
_('Select the Plugin'), _('Select the Plugin'),
self.pref_dialog, self.pref_dialog,
gtk.FILE_CHOOSER_ACTION_OPEN, Gtk.FileChooserAction.OPEN,
buttons=( buttons=(
gtk.STOCK_CANCEL, Gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL, Gtk.ResponseType.CANCEL,
gtk.STOCK_OPEN, Gtk.STOCK_OPEN,
gtk.RESPONSE_OK, Gtk.ResponseType.OK,
), ),
) )
@ -1163,7 +1163,7 @@ class Preferences(component.Component):
chooser.set_select_multiple(False) chooser.set_select_multiple(False)
chooser.set_property('skip-taskbar-hint', True) chooser.set_property('skip-taskbar-hint', True)
file_filter = gtk.FileFilter() file_filter = Gtk.FileFilter()
file_filter.set_name(_('Plugin Eggs')) file_filter.set_name(_('Plugin Eggs'))
file_filter.add_pattern('*.' + 'egg') file_filter.add_pattern('*.' + 'egg')
chooser.add_filter(file_filter) chooser.add_filter(file_filter)
@ -1171,7 +1171,7 @@ class Preferences(component.Component):
# Run the dialog # Run the dialog
response = chooser.run() response = chooser.run()
if response == gtk.RESPONSE_OK: if response == Gtk.ResponseType.OK:
filepath = deluge.common.decode_bytes(chooser.get_filename()) filepath = deluge.common.decode_bytes(chooser.get_filename())
else: else:
chooser.destroy() chooser.destroy()
@ -1375,7 +1375,7 @@ class Preferences(component.Component):
details=failure.getErrorMessage(), details=failure.getErrorMessage(),
).run() ).run()
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
client.core.create_account(username, password, authlevel).addCallback( client.core.create_account(username, password, authlevel).addCallback(
add_ok add_ok
).addErrback(add_fail) ).addErrback(add_fail)
@ -1408,7 +1408,7 @@ class Preferences(component.Component):
details=failure.getErrorMessage(), details=failure.getErrorMessage(),
).run() ).run()
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
client.core.update_account( client.core.update_account(
dialog.get_username(), dialog.get_password(), dialog.get_authlevel() dialog.get_username(), dialog.get_password(), dialog.get_authlevel()
).addCallback(update_ok).addErrback(update_fail) ).addCallback(update_ok).addErrback(update_fail)
@ -1448,7 +1448,7 @@ class Preferences(component.Component):
details=failure.getErrorMessage(), details=failure.getErrorMessage(),
).run() ).run()
if response_id == gtk.RESPONSE_YES: if response_id == Gtk.ResponseType.YES:
client.core.remove_account(username).addCallback(remove_ok).addErrback( client.core.remove_account(username).addCallback(remove_ok).addErrback(
remove_fail remove_fail
) )

4
deluge/ui/gtkui/queuedtorrents.py
View file

@ -12,8 +12,8 @@ from __future__ import unicode_literals
import logging import logging
import os.path import os.path
from gobject import timeout_add from gi.repository.GObject import timeout_add
from gtk import ( from gi.repository.Gtk import (
STOCK_SORT_DESCENDING, STOCK_SORT_DESCENDING,
Builder, Builder,
CellRendererText, CellRendererText,

6
deluge/ui/gtkui/removetorrentdialog.py
View file

@ -12,7 +12,7 @@ from __future__ import unicode_literals
import logging import logging
import os import os
import gtk from gi.repository import Gtk
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
@ -42,7 +42,7 @@ class RemoveTorrentDialog(object):
self.__torrent_ids = torrent_ids self.__torrent_ids = torrent_ids
self.builder = gtk.Builder() self.builder = Gtk.Builder()
self.builder.add_from_file( self.builder.add_from_file(
deluge.common.resource_filename( deluge.common.resource_filename(
'deluge.ui.gtkui', os.path.join('glade', 'remove_torrent_dialog.ui') 'deluge.ui.gtkui', os.path.join('glade', 'remove_torrent_dialog.ui')
@ -88,6 +88,6 @@ class RemoveTorrentDialog(object):
Shows the dialog and awaits for user input. The user can select to Shows the dialog and awaits for user input. The user can select to
remove the torrent(s) from the session with or without their data. remove the torrent(s) from the session with or without their data.
""" """
if self.__dialog.run() == gtk.RESPONSE_OK: if self.__dialog.run() == Gtk.ResponseType.OK:
self.__remove_torrents(self.builder.get_object('delete_files').get_active()) self.__remove_torrents(self.builder.get_object('delete_files').get_active())
self.__dialog.destroy() self.__dialog.destroy()

6
deluge/ui/gtkui/sidebar.py
View file

@ -12,7 +12,7 @@ from __future__ import unicode_literals
import logging import logging
from gtk import POLICY_AUTOMATIC, Label, ScrolledWindow from gi.repository.Gtk import Label, PolicyType, ScrolledWindow
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
@ -62,9 +62,9 @@ class SideBar(component.Component):
log.debug('add tab: %s', tab_name) log.debug('add tab: %s', tab_name)
self.tabs[tab_name] = widget self.tabs[tab_name] = widget
scrolled = ScrolledWindow() scrolled = ScrolledWindow()
scrolled.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC) scrolled.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC)
scrolled.add(widget) scrolled.add(widget)
self.notebook.insert_page(scrolled, Label(label), -1) self.notebook.insert_page(scrolled, Label(label=label), -1)
scrolled.show_all() scrolled.show_all()
self.after_update() self.after_update()

2
deluge/ui/gtkui/status_tab.py
View file

@ -106,7 +106,7 @@ class StatusTab(Tab):
# Update all the label widgets # Update all the label widgets
for widget in self.tab_widgets.values(): for widget in self.tab_widgets.values():
txt = self.widget_status_as_fstr(widget, status) txt = self.widget_status_as_fstr(widget, status)
if widget[0].get_text() != txt: if widget[0].get_text().decode('utf-8') != txt:
widget[0].set_text(txt) widget[0].set_text(txt)
# Update progress bar seperately as it's a special case (not a label). # Update progress bar seperately as it's a special case (not a label).

38
deluge/ui/gtkui/statusbar.py
View file

@ -11,8 +11,8 @@ from __future__ import division, unicode_literals
import logging import logging
import gtk from gi.repository import Gtk
from gobject import timeout_add from gi.repository.GObject import timeout_add
import deluge.component as component import deluge.component as component
from deluge.common import fsize, fspeed, get_pixmap from deluge.common import fsize, fspeed, get_pixmap
@ -34,11 +34,11 @@ class StatusBarItem(object):
tooltip=None, tooltip=None,
): ):
self._widgets = [] self._widgets = []
self._ebox = gtk.EventBox() self._ebox = Gtk.EventBox()
self._hbox = gtk.HBox() self._hbox = Gtk.HBox()
self._hbox.set_spacing(3) self._hbox.set_spacing(3)
self._image = gtk.Image() self._image = Gtk.Image()
self._label = gtk.Label() self._label = Gtk.Label()
self._hbox.add(self._image) self._hbox.add(self._image)
self._hbox.add(self._label) self._hbox.add(self._label)
self._ebox.add(self._hbox) self._ebox.add(self._hbox)
@ -76,7 +76,7 @@ class StatusBarItem(object):
self._image.set_from_file(image) self._image.set_from_file(image)
def set_image_from_stock(self, stock): def set_image_from_stock(self, stock):
self._image.set_from_stock(stock, gtk.ICON_SIZE_MENU) self._image.set_from_stock(stock, Gtk.IconSize.MENU)
def set_text(self, text): def set_text(self, text):
if not text: if not text:
@ -134,9 +134,9 @@ class StatusBar(component.Component):
} }
self.current_warnings = [] self.current_warnings = []
# Add a HBox to the statusbar after removing the initial label widget # Add a HBox to the statusbar after removing the initial label widget
self.hbox = gtk.HBox() self.hbox = Gtk.HBox()
self.hbox.set_spacing(10) self.hbox.set_spacing(10)
align = gtk.Alignment() align = Gtk.Alignment()
align.set_padding(2, 0, 3, 0) align.set_padding(2, 0, 3, 0)
align.add(self.hbox) align.add(self.hbox)
frame = self.statusbar.get_children()[0] frame = self.statusbar.get_children()[0]
@ -145,7 +145,7 @@ class StatusBar(component.Component):
self.statusbar.show_all() self.statusbar.show_all()
# Create the not connected item # Create the not connected item
self.not_connected_item = StatusBarItem( self.not_connected_item = StatusBarItem(
stock=gtk.STOCK_STOP, stock=Gtk.STOCK_STOP,
text=_('Not Connected'), text=_('Not Connected'),
callback=self._on_notconnected_item_clicked, callback=self._on_notconnected_item_clicked,
) )
@ -164,7 +164,7 @@ class StatusBar(component.Component):
self.remove_item(self.not_connected_item) self.remove_item(self.not_connected_item)
self.connections_item = self.add_item( self.connections_item = self.add_item(
stock=gtk.STOCK_NETWORK, stock=Gtk.STOCK_NETWORK,
callback=self._on_connection_item_clicked, callback=self._on_connection_item_clicked,
tooltip=_('Connections (Limit)'), tooltip=_('Connections (Limit)'),
pack_start=True, pack_start=True,
@ -196,14 +196,14 @@ class StatusBar(component.Component):
) )
self.diskspace_item = self.add_item( self.diskspace_item = self.add_item(
stock=gtk.STOCK_HARDDISK, stock=Gtk.STOCK_HARDDISK,
callback=self._on_diskspace_item_clicked, callback=self._on_diskspace_item_clicked,
tooltip=_('Free Disk Space'), tooltip=_('Free Disk Space'),
pack_start=True, pack_start=True,
) )
self.health_item = self.add_item( self.health_item = self.add_item(
stock=gtk.STOCK_DIALOG_ERROR, stock=Gtk.STOCK_DIALOG_ERROR,
text=_('<b><small>Port Issue</small></b>'), text=_('<b><small>Port Issue</small></b>'),
markup=True, markup=True,
tooltip=_('No incoming connections, check port forwarding'), tooltip=_('No incoming connections, check port forwarding'),
@ -293,7 +293,7 @@ class StatusBar(component.Component):
"""Displays a warning to the user in the status bar""" """Displays a warning to the user in the status bar"""
if text not in self.current_warnings: if text not in self.current_warnings:
item = self.add_item( item = self.add_item(
stock=gtk.STOCK_DIALOG_WARNING, text=text, callback=callback stock=Gtk.STOCK_DIALOG_WARNING, text=text, callback=callback
) )
self.current_warnings.append(text) self.current_warnings.append(text)
timeout_add(3000, self.remove_warning, item) timeout_add(3000, self.remove_warning, item)
@ -472,7 +472,7 @@ class StatusBar(component.Component):
_('Incoming Connections'), _('Incoming Connections'),
_('Set the maximum incoming connections'), _('Set the maximum incoming connections'),
'', '',
gtk.STOCK_NETWORK, Gtk.STOCK_NETWORK,
self.max_connections_global, self.max_connections_global,
), ),
} }
@ -492,7 +492,7 @@ class StatusBar(component.Component):
elif widget.get_name() == 'other': elif widget.get_name() == 'other':
def dialog_finished(response_id): def dialog_finished(response_id):
if response_id == gtk.RESPONSE_OK: if response_id == Gtk.ResponseType.OK:
set_value(dialog.get_value()) set_value(dialog.get_value())
dialog = dialogs.OtherDialog(*other_dialog_info[core_key]) dialog = dialogs.OtherDialog(*other_dialog_info[core_key])
@ -511,7 +511,7 @@ class StatusBar(component.Component):
show_other=True, show_other=True,
) )
menu.show_all() menu.show_all()
menu.popup(None, None, None, event.button, event.time) menu.popup(None, None, None, None, event.button, event.time)
def _on_set_download_speed(self, widget): def _on_set_download_speed(self, widget):
log.debug('_on_set_download_speed') log.debug('_on_set_download_speed')
@ -527,7 +527,7 @@ class StatusBar(component.Component):
show_other=True, show_other=True,
) )
menu.show_all() menu.show_all()
menu.popup(None, None, None, event.button, event.time) menu.popup(None, None, None, None, event.button, event.time)
def _on_set_upload_speed(self, widget): def _on_set_upload_speed(self, widget):
log.debug('_on_set_upload_speed') log.debug('_on_set_upload_speed')
@ -542,7 +542,7 @@ class StatusBar(component.Component):
show_other=True, show_other=True,
) )
menu.show_all() menu.show_all()
menu.popup(None, None, None, event.button, event.time) menu.popup(None, None, None, None, event.button, event.time)
def _on_set_connection_limit(self, widget): def _on_set_connection_limit(self, widget):
log.debug('_on_set_connection_limit') log.debug('_on_set_connection_limit')

14
deluge/ui/gtkui/systemtray.py
View file

@ -12,13 +12,7 @@ from __future__ import unicode_literals
import logging import logging
import os import os
from gtk import ( from gi.repository.Gtk import Builder, RadioMenuItem, StatusIcon
Builder,
RadioMenuItem,
status_icon_new_from_icon_name,
status_icon_new_from_pixbuf,
status_icon_position_menu,
)
import deluge.component as component import deluge.component as component
from deluge.common import ( from deluge.common import (
@ -120,9 +114,9 @@ class SystemTray(component.Component):
else: else:
log.debug('Enabling the system tray icon..') log.debug('Enabling the system tray icon..')
if windows_check() or osx_check(): if windows_check() or osx_check():
self.tray = status_icon_new_from_pixbuf(get_logo(32)) self.tray = StatusIcon.new_from_pixbuf(get_logo(32))
else: else:
self.tray = status_icon_new_from_icon_name('deluge-panel') self.tray = StatusIcon.new_from_icon_name('deluge-panel')
self.tray.connect('activate', self.on_tray_clicked) self.tray.connect('activate', self.on_tray_clicked)
self.tray.connect('popup-menu', self.on_tray_popup) self.tray.connect('popup-menu', self.on_tray_popup)
@ -353,7 +347,7 @@ class SystemTray(component.Component):
else: else:
self.builder.get_object('menuitem_show_deluge').set_active(False) self.builder.get_object('menuitem_show_deluge').set_active(False)
popup_function = status_icon_position_menu popup_function = StatusIcon.position_menu
if windows_check() or osx_check(): if windows_check() or osx_check():
popup_function = None popup_function = None
button = 0 button = 0

2
deluge/ui/gtkui/toolbar.py
View file

@ -11,7 +11,7 @@ from __future__ import unicode_literals
import logging import logging
from gtk import SeparatorToolItem, ToolButton from gi.repository.Gtk import SeparatorToolItem, ToolButton
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager

6
deluge/ui/gtkui/torrentdetails.py
View file

@ -14,7 +14,7 @@ from __future__ import unicode_literals
import logging import logging
from collections import namedtuple from collections import namedtuple
from gtk import CheckMenuItem, Menu, SeparatorMenuItem from gi.repository.Gtk import CheckMenuItem, Menu, SeparatorMenuItem
import deluge.component as component import deluge.component as component
from deluge.ui.client import client from deluge.ui.client import client
@ -314,7 +314,7 @@ class TorrentDetails(component.Component):
"""Generates the checklist menu for all the tabs and attaches it""" """Generates the checklist menu for all the tabs and attaches it"""
menu = Menu() menu = Menu()
# Create 'All' menuitem and a separator # Create 'All' menuitem and a separator
menuitem = CheckMenuItem(self.translate_tabs['All'], True) menuitem = CheckMenuItem.new_with_mnemonic(self.translate_tabs['All'])
menuitem.set_name('All') menuitem.set_name('All')
all_tabs = True all_tabs = True
@ -337,7 +337,7 @@ class TorrentDetails(component.Component):
menuitem_list.sort() menuitem_list.sort()
for pos, name in menuitem_list: for pos, name in menuitem_list:
menuitem = CheckMenuItem(self.translate_tabs[name], True) menuitem = CheckMenuItem.new_with_mnemonic(self.translate_tabs[name])
menuitem.set_name(name) menuitem.set_name(name)
menuitem.set_active(self.tabs[name].is_visible) menuitem.set_active(self.tabs[name].is_visible)
menuitem.connect('toggled', self._on_menuitem_toggled) menuitem.connect('toggled', self._on_menuitem_toggled)

24
deluge/ui/gtkui/torrentview.py
View file

@ -13,9 +13,9 @@ from __future__ import unicode_literals
import logging import logging
from locale import strcoll from locale import strcoll
from gobject import TYPE_UINT64, idle_add from gi.repository.Gdk import ModifierType, keyval_name
from gtk import ENTRY_ICON_SECONDARY from gi.repository.GObject import TYPE_UINT64, idle_add
from gtk.gdk import CONTROL_MASK, MOD1_MASK, SHIFT_MASK, keyval_name from gi.repository.Gtk import EntryIconPosition
from twisted.internet import reactor from twisted.internet import reactor
import deluge.component as component import deluge.component as component
@ -27,7 +27,7 @@ from deluge.ui.gtkui.removetorrentdialog import RemoveTorrentDialog
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
try: try:
CTRL_ALT_MASK = CONTROL_MASK | MOD1_MASK CTRL_ALT_MASK = ModifierType.CONTROL_MASK | ModifierType.MOD1_MASK
except TypeError: except TypeError:
# Sphinx AutoDoc has a mock issue with gtk.gdk masks. # Sphinx AutoDoc has a mock issue with gtk.gdk masks.
pass pass
@ -126,7 +126,7 @@ class SearchBox(object):
def hide(self): def hide(self):
self.visible = False self.visible = False
self.clear_search() self.clear_search()
self.search_box.hide_all() self.search_box.hide()
self.search_pending = self.prefiltered = None self.search_pending = self.prefiltered = None
def clear_search(self): def clear_search(self):
@ -223,7 +223,7 @@ class SearchBox(object):
self.search_pending = reactor.callLater(0.7, self.torrentview.update) self.search_pending = reactor.callLater(0.7, self.torrentview.update)
def on_search_torrents_entry_icon_press(self, entry, icon, event): def on_search_torrents_entry_icon_press(self, entry, icon, event):
if icon != ENTRY_ICON_SECONDARY: if icon != EntryIconPosition.SECONDARY:
return return
self.clear_search() self.clear_search()
@ -753,9 +753,7 @@ class TorrentView(ListView, component.Component):
log.debug('Unable to get iter from path: %s', ex) log.debug('Unable to get iter from path: %s', ex)
continue continue
child_row = self.treeview.get_model().convert_iter_to_child_iter( child_row = self.treeview.get_model().convert_iter_to_child_iter(row)
None, row
)
child_row = ( child_row = (
self.treeview.get_model() self.treeview.get_model()
.get_model() .get_model()
@ -811,7 +809,7 @@ class TorrentView(ListView, component.Component):
else: else:
self.treeview.get_selection().select_iter(row) self.treeview.get_selection().select_iter(row)
torrentmenu = component.get('MenuBar').torrentmenu torrentmenu = component.get('MenuBar').torrentmenu
torrentmenu.popup(None, None, None, event.button, event.time) torrentmenu.popup(None, None, None, None, event.button, event.time)
return True return True
def on_selection_changed(self, treeselection): def on_selection_changed(self, treeselection):
@ -895,7 +893,7 @@ class TorrentView(ListView, component.Component):
# Move queue position up with Ctrl+Alt or Ctrl+Alt+Shift # Move queue position up with Ctrl+Alt or Ctrl+Alt+Shift
if event.get_state() & CTRL_ALT_MASK: if event.get_state() & CTRL_ALT_MASK:
if event.get_state() & SHIFT_MASK: if event.get_state() & ModifierType.SHIFT_MASK:
client.core.queue_top(torrents) client.core.queue_top(torrents)
else: else:
client.core.queue_up(torrents) client.core.queue_up(torrents)
@ -909,7 +907,7 @@ class TorrentView(ListView, component.Component):
# Move queue position down with Ctrl+Alt or Ctrl+Alt+Shift # Move queue position down with Ctrl+Alt or Ctrl+Alt+Shift
if event.get_state() & CTRL_ALT_MASK: if event.get_state() & CTRL_ALT_MASK:
if event.get_state() & SHIFT_MASK: if event.get_state() & ModifierType.SHIFT_MASK:
client.core.queue_bottom(torrents) client.core.queue_bottom(torrents)
else: else:
client.core.queue_down(torrents) client.core.queue_down(torrents)
@ -918,7 +916,7 @@ class TorrentView(ListView, component.Component):
log.debug('keypress_delete') log.debug('keypress_delete')
torrents = self.get_selected_torrents() torrents = self.get_selected_torrents()
if torrents: if torrents:
if event.get_state() & SHIFT_MASK: if event.get_state() & ModifierType.SHIFT_MASK:
RemoveTorrentDialog(torrents, delete_files=True).run() RemoveTorrentDialog(torrents, delete_files=True).run()
else: else:
RemoveTorrentDialog(torrents).run() RemoveTorrentDialog(torrents).run()