diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.ui similarity index 82% rename from deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.ui index 0a38c60c4..e6ba56f4a 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.glade +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/autoadd_options.ui @@ -1,33 +1,63 @@ - - + + - + + -1 + 10000 + 1 + 10 + + + -1 + 10000 + 1 + 10 + + + -1 + 10000 + 1 + 10 + + + -1 + 10000 + 1 + 10 + + + 100 + 2 + 0.10000000149 + 10 + + False Watch Folder Properties False True dialog - + - + True False - + True False end - + gtk-cancel True True True False True - - + + False False @@ -35,15 +65,15 @@ - + gtk-add True True True False True - - + + False False @@ -51,22 +81,22 @@ - + gtk-apply True True True False True - - + + False False 2 - + False True @@ -75,49 +105,49 @@ - + True False - + True True - + True False 6 - + True False 0 none - + True False 12 - + True False - + True False - + True True - If a .torrent file is added to this directory, + If a .torrent file is added to this directory, it will be added to the session. ● False False True True - + True True @@ -125,21 +155,21 @@ it will be added to the session. - + True False - If a .torrent file is added to this directory, + If a .torrent file is added to this directory, it will be added to the session. select-folder Select A Folder - + True True 1 - + True True @@ -147,37 +177,33 @@ it will be added to the session. - + Enable this watch folder True True False True True - - + False False 1 - + - + - - + + True False <b>Watch Folder</b> True - - - label_item - + - + True False @@ -188,35 +214,35 @@ it will be added to the session. - + True False 0 none - + True False 12 - + True False - + True False - + Delete .torrent after adding True True False - Once the torrent is added to the session, + Once the torrent is added to the session, the .torrent will be deleted. True - - + + True True @@ -224,22 +250,22 @@ the .torrent will be deleted. - + True False - + Append extension after adding: True True False - Once the torrent is added to the session, + Once the torrent is added to the session, an extension will be appended to the .torrent and it will remain in the same directory. True isnt_append_extension - - + + True True @@ -247,7 +273,7 @@ and it will remain in the same directory. - + True True • @@ -256,14 +282,14 @@ and it will remain in the same directory. False True True - + True True 1 - + True True @@ -271,31 +297,31 @@ and it will remain in the same directory. - + True False 2 2 - + Copy of .torrent files to: True True False - Once the torrent is added to the session, + Once the torrent is added to the session, the .torrent will copied to the chosen directory and deleted from the watch folder. True isnt_append_extension - - + + - + True False - + True True • @@ -303,7 +329,7 @@ and deleted from the watch folder. False True True - + True True @@ -311,35 +337,35 @@ and deleted from the watch folder. - + True False select-folder Select A Folder - + True True 1 - + 1 2 - + Delete copy of torrent file on remove True True False True - Once the torrent is deleted from the session, + Once the torrent is deleted from the session, also delete the .torrent file used to add it. True - + 2 1 @@ -347,31 +373,28 @@ also delete the .torrent file used to add it. 15 - + True True 2 - + - + - + - - + + True False <b>Torrent File Action</b> True - - - label_item - + - + True True @@ -379,31 +402,31 @@ also delete the .torrent file used to add it. - + True False 0 none - + True False 12 - + True False - + Set download folder True True False - This folder will be where the torrent data is downloaded to. + This folder will be where the torrent data is downloaded to. True True - - + + False False @@ -411,11 +434,11 @@ also delete the .torrent file used to add it. - + True False - + True True ● @@ -423,7 +446,7 @@ also delete the .torrent file used to add it. False True True - + True True @@ -431,41 +454,38 @@ also delete the .torrent file used to add it. - + True False select-folder Select A Folder - + True True 1 - + True False 1 - + - + - - + + True False <b>Download Folder</b> True - - - label_item - + - + True False @@ -473,30 +493,30 @@ also delete the .torrent file used to add it. - + True False 0 none - + True False 12 - + True False - + Set move completed folder True True False True True - - + + False False @@ -504,11 +524,11 @@ also delete the .torrent file used to add it. - + True False - + True True ● @@ -516,7 +536,7 @@ also delete the .torrent file used to add it. False True True - + True True @@ -524,12 +544,12 @@ also delete the .torrent file used to add it. - + True False select-folder Select A Folder - + True True @@ -537,43 +557,40 @@ also delete the .torrent file used to add it. - + False False False True True True - + False False 2 - + True False 1 - + - + - - + + True False <b>Move Completed</b> True - - - label_item - + - + True False @@ -581,29 +598,29 @@ also delete the .torrent file used to add it. - + False 0 none - + True False 12 - + True False - + Label: True True False True True - - + + False False @@ -611,90 +628,84 @@ also delete the .torrent file used to add it. - + True False - + True + True True 1 - + - + - - + + True False <b>Label</b> True - - - label_item - + - + True True 5 - + - - + + True False Main - + False - tab - + True False 6 5 - + True False 0 none - + True False 12 - + True False True - The user selected here will be the owner of the torrent. - + The user selected here will be the owner of the torrent. + - + - - + + True False <b>Owner</b> True - - - label_item - + - + True True @@ -702,18 +713,18 @@ also delete the .torrent file used to add it. - + True False 0 none - + True False 12 - + True False 3 @@ -722,201 +733,198 @@ also delete the .torrent file used to add it. 2 4 - + + + + + + + Max Upload Speed: True True False True True - - + + 1 2 GTK_FILL - + - + Max Connections: True True False True True - - + + 2 3 GTK_FILL - + - + Max Upload Slots: True True False True True - - + + 3 4 GTK_FILL - + - + True True False False True True - 0 -1 10000 1 10 0 + adjustment1 1 1 - + 1 2 - + - + True True False False True True - 0 -1 10000 1 10 0 + adjustment2 1 1 - + 1 2 1 2 - + - + True True False False True True - 0 -1 10000 1 10 0 + adjustment3 1 - + 1 2 2 3 - + - + True True False False True True - 0 -1 10000 1 10 0 + adjustment4 1 - + 1 2 3 4 - + - + True False 0 5 KiB/s - + 2 3 GTK_FILL - + - + True False 0 5 KiB/s - + 2 3 1 2 GTK_FILL - + - + Max Download Speed: True True False True True - - + + GTK_FILL - + - - - - - - - + - + - - + + True False <b>Bandwidth</b> True - - - label_item - + - + True True @@ -924,18 +932,18 @@ also delete the .torrent file used to add it. - + True False 0 none - + True False 12 - + True False 6 @@ -943,21 +951,33 @@ also delete the .torrent file used to add it. 2 4 - + + + + + + + + + + + + + True False - + Stop seed at ratio: True True False True True - - + + - + 3 4 @@ -965,83 +985,83 @@ also delete the .torrent file used to add it. - + True False 0 0 12 - + Remove at ratio True True False True True - + - + 4 5 - + Auto Managed: True True False True True - - + + 2 3 GTK_FILL - + - + False True False True True True - + 2 3 4 5 GTK_FILL - + - + False True False True True True - + 1 2 4 5 GTK_FILL - + - + True True ● @@ -1049,25 +1069,25 @@ also delete the .torrent file used to add it. False True True - 2 0 100 0.10000000149 10 0 + adjustment5 1 1 - + 1 2 3 4 - + - + True False True - + gtk-yes True True @@ -1075,7 +1095,7 @@ also delete the .torrent file used to add it. True True True - + True True @@ -1083,7 +1103,7 @@ also delete the .torrent file used to add it. - + gtk-no True True @@ -1091,14 +1111,14 @@ also delete the .torrent file used to add it. True True auto_managed - + True True 1 - + 1 2 @@ -1109,40 +1129,43 @@ also delete the .torrent file used to add it. - + False True False True True True - + 2 3 3 4 GTK_FILL - + - + + + + Add Paused: True True False True - - + + - + True False True - + gtk-yes True True @@ -1150,7 +1173,7 @@ also delete the .torrent file used to add it. True True True - + True True @@ -1158,7 +1181,7 @@ also delete the .torrent file used to add it. - + gtk-no True True @@ -1166,47 +1189,47 @@ also delete the .torrent file used to add it. True True add_paused - + True True 1 - + 1 2 - + Queue to: True True False True - - + + 1 2 - + True False True - + Top True True False True True - + True True @@ -1214,21 +1237,21 @@ also delete the .torrent file used to add it. - + Bottom True True False True queue_to_top - + True True 1 - + 1 2 @@ -1237,76 +1260,57 @@ also delete the .torrent file used to add it. - + Skip File Hash Check True True False True True - + 5 6 GTK_FILL - + - - - - - - - - - - - - - - - - + - + - - + + True False <b>Queue</b> True - - - label_item - + - + True True 2 - + 1 - - + + True False Options - + 1 False - tab - + True True @@ -1314,24 +1318,29 @@ also delete the .torrent file used to add it. - + True False - + True True 1 - + True True 2 - + - - + + opts_cancel_button + opts_add_button + opts_apply_button + + + diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.glade b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.ui similarity index 60% rename from deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.glade rename to deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.ui index 33ab498bd..c60e10f36 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.glade +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/data/config.ui @@ -1,116 +1,129 @@ - - - + + + - + + False - + True + False - + True + False - + 340 390 True + False 3 - vertical - - + True + False 0 none - + True - vertical + False True - + - - + + True + False <b>Watch Folders:</b> True - - - label_item - + - + + True + True 0 - + True + False - - gtk-add + + gtk-add True True True True True - - + + + False + False 0 - - gtk-remove + + gtk-remove True False True True True True - - + + + False + False 1 - - gtk-edit + + gtk-edit True False True True True True - - + + + False + False 2 - + False + True 1 - + - + + True + True 1 - + - - + + diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py index 05f9d8223..27e34449b 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py @@ -18,7 +18,6 @@ import logging import os import gtk -import gtk.glade import deluge.common import deluge.component as component @@ -49,127 +48,128 @@ class OptionsDialog(object): def show(self, options=None, watchdir_id=None): if options is None: options = {} - self.glade = gtk.glade.XML(get_resource('autoadd_options.glade')) - self.glade.signal_autoconnect({ + self.builder = gtk.Builder() + self.builder.add_from_file(get_resource('autoadd_options.ui')) + self.builder.connect_signals({ 'on_opts_add': self.on_add, 'on_opts_apply': self.on_apply, 'on_opts_cancel': self.on_cancel, 'on_options_dialog_close': self.on_cancel, 'on_toggle_toggled': self.on_toggle_toggled }) - self.dialog = self.glade.get_widget('options_dialog') + self.dialog = self.builder.get_object('options_dialog') self.dialog.set_transient_for(component.get('Preferences').pref_dialog) if watchdir_id: # We have an existing watchdir_id, we are editing - self.glade.get_widget('opts_add_button').hide() - self.glade.get_widget('opts_apply_button').show() + self.builder.get_object('opts_add_button').hide() + self.builder.get_object('opts_apply_button').show() self.watchdir_id = watchdir_id else: # We don't have an id, adding - self.glade.get_widget('opts_add_button').show() - self.glade.get_widget('opts_apply_button').hide() + self.builder.get_object('opts_add_button').show() + self.builder.get_object('opts_apply_button').hide() self.watchdir_id = None self.load_options(options) self.dialog.run() def load_options(self, options): - self.glade.get_widget('enabled').set_active(options.get('enabled', True)) - self.glade.get_widget('append_extension_toggle').set_active( + self.builder.get_object('enabled').set_active(options.get('enabled', True)) + self.builder.get_object('append_extension_toggle').set_active( options.get('append_extension_toggle', False) ) - self.glade.get_widget('append_extension').set_text( + self.builder.get_object('append_extension').set_text( options.get('append_extension', '.added') ) - self.glade.get_widget('download_location_toggle').set_active( + self.builder.get_object('download_location_toggle').set_active( options.get('download_location_toggle', False) ) - self.glade.get_widget('copy_torrent_toggle').set_active( + self.builder.get_object('copy_torrent_toggle').set_active( options.get('copy_torrent_toggle', False) ) - self.glade.get_widget('delete_copy_torrent_toggle').set_active( + self.builder.get_object('delete_copy_torrent_toggle').set_active( options.get('delete_copy_torrent_toggle', False) ) - self.glade.get_widget('seed_mode').set_active( + self.builder.get_object('seed_mode').set_active( options.get('seed_mode', False) ) self.accounts.clear() self.labels.clear() - combobox = self.glade.get_widget('OwnerCombobox') + combobox = self.builder.get_object('OwnerCombobox') combobox_render = gtk.CellRendererText() combobox.pack_start(combobox_render, True) combobox.add_attribute(combobox_render, 'text', 0) combobox.set_model(self.accounts) - label_widget = self.glade.get_widget('label') + label_widget = self.builder.get_object('label') label_widget.child.set_text(options.get('label', '')) label_widget.set_model(self.labels) - label_widget.set_text_column(0) - self.glade.get_widget('label_toggle').set_active(options.get('label_toggle', False)) + label_widget.set_entry_text_column(0) + self.builder.get_object('label_toggle').set_active(options.get('label_toggle', False)) for spin_id in self.spin_ids + self.spin_int_ids: - self.glade.get_widget(spin_id).set_value(options.get(spin_id, 0)) - self.glade.get_widget(spin_id + '_toggle').set_active(options.get(spin_id + '_toggle', False)) + self.builder.get_object(spin_id).set_value(options.get(spin_id, 0)) + self.builder.get_object(spin_id + '_toggle').set_active(options.get(spin_id + '_toggle', False)) for chk_id in self.chk_ids: - self.glade.get_widget(chk_id).set_active(bool(options.get(chk_id, True))) - self.glade.get_widget(chk_id + '_toggle').set_active(options.get(chk_id + '_toggle', False)) + self.builder.get_object(chk_id).set_active(bool(options.get(chk_id, True))) + self.builder.get_object(chk_id + '_toggle').set_active(options.get(chk_id + '_toggle', False)) if not options.get('add_paused', True): - self.glade.get_widget('isnt_add_paused').set_active(True) + self.builder.get_object('isnt_add_paused').set_active(True) if not options.get('queue_to_top', True): - self.glade.get_widget('isnt_queue_to_top').set_active(True) + self.builder.get_object('isnt_queue_to_top').set_active(True) if not options.get('auto_managed', True): - self.glade.get_widget('isnt_auto_managed').set_active(True) + self.builder.get_object('isnt_auto_managed').set_active(True) for field in ['move_completed_path', 'path', 'download_location', 'copy_torrent']: if client.is_localhost(): - self.glade.get_widget(field + '_chooser').set_current_folder( + self.builder.get_object(field + '_chooser').set_current_folder( options.get(field, os.path.expanduser('~')) ) - self.glade.get_widget(field + '_chooser').show() - self.glade.get_widget(field + '_entry').hide() + self.builder.get_object(field + '_chooser').show() + self.builder.get_object(field + '_entry').hide() else: - self.glade.get_widget(field + '_entry').set_text( + self.builder.get_object(field + '_entry').set_text( options.get(field, '') ) - self.glade.get_widget(field + '_entry').show() - self.glade.get_widget(field + '_chooser').hide() + self.builder.get_object(field + '_entry').show() + self.builder.get_object(field + '_chooser').hide() self.set_sensitive() def on_core_config(config): if client.is_localhost(): - self.glade.get_widget('download_location_chooser').set_current_folder( + self.builder.get_object('download_location_chooser').set_current_folder( options.get('download_location', config['download_location']) ) if options.get('move_completed_toggle', config['move_completed']): - self.glade.get_widget('move_completed_toggle').set_active(True) - self.glade.get_widget('move_completed_path_chooser').set_current_folder( + self.builder.get_object('move_completed_toggle').set_active(True) + self.builder.get_object('move_completed_path_chooser').set_current_folder( options.get('move_completed_path', config['move_completed_path']) ) if options.get('copy_torrent_toggle', config['copy_torrent_file']): - self.glade.get_widget('copy_torrent_toggle').set_active(True) - self.glade.get_widget('copy_torrent_chooser').set_current_folder( + self.builder.get_object('copy_torrent_toggle').set_active(True) + self.builder.get_object('copy_torrent_chooser').set_current_folder( options.get('copy_torrent', config['torrentfiles_location']) ) else: - self.glade.get_widget('download_location_entry').set_text( + self.builder.get_object('download_location_entry').set_text( options.get('download_location', config['download_location']) ) if options.get('move_completed_toggle', config['move_completed']): - self.glade.get_widget('move_completed_toggle').set_active( + self.builder.get_object('move_completed_toggle').set_active( options.get('move_completed_toggle', False) ) - self.glade.get_widget('move_completed_path_entry').set_text( + self.builder.get_object('move_completed_path_entry').set_text( options.get('move_completed_path', config['move_completed_path']) ) if options.get('copy_torrent_toggle', config['copy_torrent_file']): - self.glade.get_widget('copy_torrent_toggle').set_active(True) - self.glade.get_widget('copy_torrent_entry').set_text( + self.builder.get_object('copy_torrent_toggle').set_active(True) + self.builder.get_object('copy_torrent_entry').set_text( options.get('copy_torrent', config['torrentfiles_location']) ) if options.get('delete_copy_torrent_toggle', config['del_copy_torrent_file']): - self.glade.get_widget('delete_copy_torrent_toggle').set_active(True) + self.builder.get_object('delete_copy_torrent_toggle').set_active(True) if not options: client.core.get_config().addCallback(on_core_config) @@ -184,33 +184,33 @@ class OptionsDialog(object): ) if account['username'] == owner: selected_iter = acc_iter - self.glade.get_widget('OwnerCombobox').set_active_iter(selected_iter) + self.builder.get_object('OwnerCombobox').set_active_iter(selected_iter) def on_accounts_failure(failure): log.debug('Failed to get accounts!!! %s', failure) acc_iter = self.accounts.append() self.accounts.set_value(acc_iter, 0, client.get_auth_user()) - self.glade.get_widget('OwnerCombobox').set_active(0) - self.glade.get_widget('OwnerCombobox').set_sensitive(False) + self.builder.get_object('OwnerCombobox').set_active(0) + self.builder.get_object('OwnerCombobox').set_sensitive(False) def on_labels(labels): log.debug('Got Labels: %s', labels) for label in labels: self.labels.set_value(self.labels.append(), 0, label) - label_widget = self.glade.get_widget('label') + label_widget = self.builder.get_object('label') label_widget.set_model(self.labels) - label_widget.set_text_column(0) + label_widget.set_entry_text_column(0) def on_failure(failure): log.exception(failure) def on_get_enabled_plugins(result): if 'Label' in result: - self.glade.get_widget('label_frame').show() + self.builder.get_object('label_frame').show() client.label.get_labels().addCallback(on_labels).addErrback(on_failure) else: - self.glade.get_widget('label_frame').hide() - self.glade.get_widget('label_toggle').set_active(False) + self.builder.get_object('label_frame').hide() + self.builder.get_object('label_toggle').set_active(False) client.core.get_enabled_plugins().addCallback(on_get_enabled_plugins) if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN: @@ -220,8 +220,8 @@ class OptionsDialog(object): else: acc_iter = self.accounts.append() self.accounts.set_value(acc_iter, 0, client.get_auth_user()) - self.glade.get_widget('OwnerCombobox').set_active(0) - self.glade.get_widget('OwnerCombobox').set_sensitive(False) + self.builder.get_object('OwnerCombobox').set_active(0) + self.builder.get_object('OwnerCombobox').set_sensitive(False) def set_sensitive(self): maintoggles = ['download_location', 'append_extension', @@ -230,49 +230,49 @@ class OptionsDialog(object): 'max_upload_slots', 'add_paused', 'auto_managed', 'stop_at_ratio', 'queue_to_top', 'copy_torrent'] for maintoggle in maintoggles: - self.on_toggle_toggled(self.glade.get_widget(maintoggle + '_toggle')) + self.on_toggle_toggled(self.builder.get_object(maintoggle + '_toggle')) def on_toggle_toggled(self, tb): toggle = str(tb.name).replace('_toggle', '') isactive = tb.get_active() if toggle == 'download_location': - self.glade.get_widget('download_location_chooser').set_sensitive(isactive) - self.glade.get_widget('download_location_entry').set_sensitive(isactive) + self.builder.get_object('download_location_chooser').set_sensitive(isactive) + self.builder.get_object('download_location_entry').set_sensitive(isactive) elif toggle == 'append_extension': - self.glade.get_widget('append_extension').set_sensitive(isactive) + self.builder.get_object('append_extension').set_sensitive(isactive) elif toggle == 'copy_torrent': - self.glade.get_widget('copy_torrent_entry').set_sensitive(isactive) - self.glade.get_widget('copy_torrent_chooser').set_sensitive(isactive) - self.glade.get_widget('delete_copy_torrent_toggle').set_sensitive(isactive) + self.builder.get_object('copy_torrent_entry').set_sensitive(isactive) + self.builder.get_object('copy_torrent_chooser').set_sensitive(isactive) + self.builder.get_object('delete_copy_torrent_toggle').set_sensitive(isactive) elif toggle == 'move_completed': - self.glade.get_widget('move_completed_path_chooser').set_sensitive(isactive) - self.glade.get_widget('move_completed_path_entry').set_sensitive(isactive) - self.glade.get_widget('move_completed').set_active(isactive) + self.builder.get_object('move_completed_path_chooser').set_sensitive(isactive) + self.builder.get_object('move_completed_path_entry').set_sensitive(isactive) + self.builder.get_object('move_completed').set_active(isactive) elif toggle == 'label': - self.glade.get_widget('label').set_sensitive(isactive) + self.builder.get_object('label').set_sensitive(isactive) elif toggle == 'max_download_speed': - self.glade.get_widget('max_download_speed').set_sensitive(isactive) + self.builder.get_object('max_download_speed').set_sensitive(isactive) elif toggle == 'max_upload_speed': - self.glade.get_widget('max_upload_speed').set_sensitive(isactive) + self.builder.get_object('max_upload_speed').set_sensitive(isactive) elif toggle == 'max_connections': - self.glade.get_widget('max_connections').set_sensitive(isactive) + self.builder.get_object('max_connections').set_sensitive(isactive) elif toggle == 'max_upload_slots': - self.glade.get_widget('max_upload_slots').set_sensitive(isactive) + self.builder.get_object('max_upload_slots').set_sensitive(isactive) elif toggle == 'add_paused': - self.glade.get_widget('add_paused').set_sensitive(isactive) - self.glade.get_widget('isnt_add_paused').set_sensitive(isactive) + self.builder.get_object('add_paused').set_sensitive(isactive) + self.builder.get_object('isnt_add_paused').set_sensitive(isactive) elif toggle == 'queue_to_top': - self.glade.get_widget('queue_to_top').set_sensitive(isactive) - self.glade.get_widget('isnt_queue_to_top').set_sensitive(isactive) + self.builder.get_object('queue_to_top').set_sensitive(isactive) + self.builder.get_object('isnt_queue_to_top').set_sensitive(isactive) elif toggle == 'auto_managed': - self.glade.get_widget('auto_managed').set_sensitive(isactive) - self.glade.get_widget('isnt_auto_managed').set_sensitive(isactive) + self.builder.get_object('auto_managed').set_sensitive(isactive) + self.builder.get_object('isnt_auto_managed').set_sensitive(isactive) elif toggle == 'stop_at_ratio': - self.glade.get_widget('remove_at_ratio_toggle').set_active(isactive) - self.glade.get_widget('stop_ratio_toggle').set_active(isactive) - self.glade.get_widget('stop_at_ratio').set_active(isactive) - self.glade.get_widget('stop_ratio').set_sensitive(isactive) - self.glade.get_widget('remove_at_ratio').set_sensitive(isactive) + self.builder.get_object('remove_at_ratio_toggle').set_active(isactive) + self.builder.get_object('stop_ratio_toggle').set_active(isactive) + self.builder.get_object('stop_at_ratio').set_active(isactive) + self.builder.get_object('stop_ratio').set_sensitive(isactive) + self.builder.get_object('remove_at_ratio').set_sensitive(isactive) def on_apply(self, event=None): try: @@ -304,43 +304,43 @@ class OptionsDialog(object): def generate_opts(self): # generate options dict based on gtk objects options = {} - options['enabled'] = self.glade.get_widget('enabled').get_active() + options['enabled'] = self.builder.get_object('enabled').get_active() if client.is_localhost(): - options['path'] = self.glade.get_widget('path_chooser').get_filename() - options['download_location'] = self.glade.get_widget( + options['path'] = self.builder.get_object('path_chooser').get_filename() + options['download_location'] = self.builder.get_object( 'download_location_chooser').get_filename() - options['move_completed_path'] = self.glade.get_widget( + options['move_completed_path'] = self.builder.get_object( 'move_completed_path_chooser').get_filename() - options['copy_torrent'] = self.glade.get_widget( + options['copy_torrent'] = self.builder.get_object( 'copy_torrent_chooser').get_filename() else: - options['path'] = self.glade.get_widget('path_entry').get_text() - options['download_location'] = self.glade.get_widget( + options['path'] = self.builder.get_object('path_entry').get_text() + options['download_location'] = self.builder.get_object( 'download_location_entry').get_text() - options['move_completed_path'] = self.glade.get_widget( + options['move_completed_path'] = self.builder.get_object( 'move_completed_path_entry').get_text() - options['copy_torrent'] = self.glade.get_widget( + options['copy_torrent'] = self.builder.get_object( 'copy_torrent_entry').get_text() - options['label'] = self.glade.get_widget('label').child.get_text().lower() - options['append_extension'] = self.glade.get_widget('append_extension').get_text() + options['label'] = self.builder.get_object('label').child.get_text().lower() + options['append_extension'] = self.builder.get_object('append_extension').get_text() options['owner'] = self.accounts[ - self.glade.get_widget('OwnerCombobox').get_active()][0] + self.builder.get_object('OwnerCombobox').get_active()][0] for key in ['append_extension_toggle', 'download_location_toggle', 'label_toggle', 'copy_torrent_toggle', 'delete_copy_torrent_toggle', 'seed_mode']: - options[key] = self.glade.get_widget(key).get_active() + options[key] = self.builder.get_object(key).get_active() for spin_id in self.spin_ids: - options[spin_id] = self.glade.get_widget(spin_id).get_value() - options[spin_id + '_toggle'] = self.glade.get_widget(spin_id + '_toggle').get_active() + options[spin_id] = self.builder.get_object(spin_id).get_value() + options[spin_id + '_toggle'] = self.builder.get_object(spin_id + '_toggle').get_active() for spin_int_id in self.spin_int_ids: - options[spin_int_id] = self.glade.get_widget(spin_int_id).get_value_as_int() - options[spin_int_id + '_toggle'] = self.glade.get_widget(spin_int_id + '_toggle').get_active() + options[spin_int_id] = self.builder.get_object(spin_int_id).get_value_as_int() + options[spin_int_id + '_toggle'] = self.builder.get_object(spin_int_id + '_toggle').get_active() for chk_id in self.chk_ids: - options[chk_id] = self.glade.get_widget(chk_id).get_active() - options[chk_id + '_toggle'] = self.glade.get_widget(chk_id + '_toggle').get_active() + options[chk_id] = self.builder.get_object(chk_id).get_active() + options[chk_id + '_toggle'] = self.builder.get_object(chk_id + '_toggle').get_active() if options['copy_torrent_toggle'] and options['path'] == options['copy_torrent']: raise IncompatibleOption(_('"Watch Folder" directory and "Copy of .torrent' @@ -351,12 +351,9 @@ class OptionsDialog(object): class GtkUI(GtkPluginBase): def enable(self): - self.glade = gtk.glade.XML(get_resource('config.glade')) - self.glade.signal_autoconnect({ - 'on_add_button_clicked': self.on_add_button_clicked, - 'on_edit_button_clicked': self.on_edit_button_clicked, - 'on_remove_button_clicked': self.on_remove_button_clicked - }) + self.builder = gtk.Builder() + self.builder.add_from_file(get_resource('config.ui')) + self.builder.connect_signals(self) self.opts_dialog = OptionsDialog() component.get('PluginManager').register_hook( @@ -371,7 +368,7 @@ class GtkUI(GtkPluginBase): self.watchdirs = {} - vbox = self.glade.get_widget('watchdirs_vbox') + vbox = self.builder.get_object('watchdirs_vbox') sw = gtk.ScrolledWindow() sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) @@ -389,7 +386,7 @@ class GtkUI(GtkPluginBase): sw.add(self.treeView) sw.show_all() component.get('Preferences').add_page( - _('AutoAdd'), self.glade.get_widget('prefs_box') + _('AutoAdd'), self.builder.get_object('prefs_box') ) def disable(self): @@ -468,11 +465,11 @@ class GtkUI(GtkPluginBase): def on_listitem_activated(self, treeview): tree, tree_id = self.treeView.get_selection().get_selected() if tree_id: - self.glade.get_widget('edit_button').set_sensitive(True) - self.glade.get_widget('remove_button').set_sensitive(True) + self.builder.get_object('edit_button').set_sensitive(True) + self.builder.get_object('remove_button').set_sensitive(True) else: - self.glade.get_widget('edit_button').set_sensitive(False) - self.glade.get_widget('remove_button').set_sensitive(False) + self.builder.get_object('edit_button').set_sensitive(False) + self.builder.get_object('remove_button').set_sensitive(False) def on_apply_prefs(self): log.debug('applying prefs for AutoAdd') @@ -496,7 +493,7 @@ class GtkUI(GtkPluginBase): watchdir.get('owner', 'localclient'), watchdir['path'] ]) # Workaround for cached glade signal appearing when re-enabling plugin in same session - if self.glade.get_widget('edit_button'): + if self.builder.get_object('edit_button'): # Disable the remove and edit buttons, because nothing in the store is selected - self.glade.get_widget('remove_button').set_sensitive(False) - self.glade.get_widget('edit_button').set_sensitive(False) + self.builder.get_object('remove_button').set_sensitive(False) + self.builder.get_object('edit_button').set_sensitive(False)