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

Fix #577 adding torrents by drag n' drop in windows

Browse source
This commit is contained in:
Andrew Resch 2008-11-02 23:22:55 +00:00
commit 040337982f
4 changed files with 103 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Deluge 1.0.5 (In Development)
Windows:
* Fix #577 adding torrents by drag n' drop
Deluge 1.0.4 (31 October 2008) Deluge 1.0.4 (31 October 2008)
Core: Core:
* Fix #560 force an int value for global max connections * Fix #560 force an int value for global max connections

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

@ -2,19 +2,19 @@
# addtorrentdialog.py # addtorrentdialog.py
# #
# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> # Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
# #
# Deluge is free software. # Deluge is free software.
# #
# You may redistribute it and/or modify it under the terms of the # You may redistribute it and/or modify it under the terms of the
# GNU General Public License, as published by the Free Software # GNU General Public License, as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) # Foundation; either version 3 of the License, or (at your option)
# any later version. # any later version.
# #
# deluge is distributed in the hope that it will be useful, # deluge is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details. # See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with deluge. If not, write to: # along with deluge. If not, write to:
# The Free Software Foundation, Inc., # The Free Software Foundation, Inc.,
@ -52,7 +52,7 @@ class AddTorrentDialog(component.Component):
self.glade = gtk.glade.XML( self.glade = gtk.glade.XML(
pkg_resources.resource_filename( pkg_resources.resource_filename(
"deluge.ui.gtkui", "glade/add_torrent_dialog.glade")) "deluge.ui.gtkui", "glade/add_torrent_dialog.glade"))
self.dialog = self.glade.get_widget("dialog_add_torrent") self.dialog = self.glade.get_widget("dialog_add_torrent")
self.dialog.connect("delete-event", self._on_delete_event) self.dialog.connect("delete-event", self._on_delete_event)
@ -81,8 +81,8 @@ class AddTorrentDialog(component.Component):
self.core_config = {} self.core_config = {}
self.options = {} self.options = {}
self.previous_selected_torrent = None self.previous_selected_torrent = None
self.listview_torrents = self.glade.get_widget("listview_torrents") self.listview_torrents = self.glade.get_widget("listview_torrents")
self.listview_files = self.glade.get_widget("listview_files") self.listview_files = self.glade.get_widget("listview_files")
@ -110,12 +110,12 @@ class AddTorrentDialog(component.Component):
column.pack_start(render) column.pack_start(render)
column.set_cell_data_func(render, listview.cell_data_size, 2) column.set_cell_data_func(render, listview.cell_data_size, 2)
self.listview_files.append_column(column) self.listview_files.append_column(column)
self.listview_torrents.set_model(self.torrent_liststore) self.listview_torrents.set_model(self.torrent_liststore)
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.SELECTION_MULTIPLE)
self.listview_torrents.get_selection().connect("changed", self.listview_torrents.get_selection().connect("changed",
self._on_torrent_changed) self._on_torrent_changed)
# Get default config values from the core # Get default config values from the core
@ -130,10 +130,10 @@ class AddTorrentDialog(component.Component):
"add_paused" "add_paused"
] ]
self.core_config = {} self.core_config = {}
def start(self): def start(self):
self.update_core_config() self.update_core_config()
def show(self, focus=False): def show(self, focus=False):
self.update_core_config() self.update_core_config()
@ -142,15 +142,15 @@ class AddTorrentDialog(component.Component):
self.glade.get_widget("entry_download_path").hide() self.glade.get_widget("entry_download_path").hide()
else: else:
self.glade.get_widget("button_location").hide() self.glade.get_widget("button_location").hide()
self.glade.get_widget("entry_download_path").show() self.glade.get_widget("entry_download_path").show()
self.dialog.set_transient_for(component.get("MainWindow").window) self.dialog.set_transient_for(component.get("MainWindow").window)
self.dialog.present() self.dialog.present()
if focus: if focus:
self.dialog.window.focus() self.dialog.window.focus()
return None return None
def hide(self): def hide(self):
self.dialog.hide() self.dialog.hide()
self.files = {} self.files = {}
@ -159,9 +159,9 @@ class AddTorrentDialog(component.Component):
self.previous_selected_torrent = None self.previous_selected_torrent = None
self.torrent_liststore.clear() self.torrent_liststore.clear()
self.files_treestore.clear() self.files_treestore.clear()
self.dialog.set_transient_for(component.get("MainWindow").window) self.dialog.set_transient_for(component.get("MainWindow").window)
return None return None
def update_core_config(self): def update_core_config(self):
self.core_config = {} self.core_config = {}
# Send requests to the core for these config values # Send requests to the core for these config values
@ -171,13 +171,13 @@ class AddTorrentDialog(component.Component):
# Force a call to the core because we need this data now # Force a call to the core because we need this data now
client.force_call() client.force_call()
self.set_default_options() self.set_default_options()
def _on_config_value(self, value): def _on_config_value(self, value):
for key in self.core_keys: for key in self.core_keys:
if not self.core_config.has_key(key): if not self.core_config.has_key(key):
self.core_config[key] = value self.core_config[key] = value
break break
def add_from_files(self, filenames): def add_from_files(self, filenames):
try: try:
import libtorrent as lt import libtorrent as lt
@ -185,7 +185,7 @@ class AddTorrentDialog(component.Component):
import deluge.libtorrent as lt import deluge.libtorrent as lt
import os.path import os.path
new_row = None new_row = None
for filename in filenames: for filename in filenames:
# Get the torrent data from the torrent file # Get the torrent data from the torrent file
try: try:
@ -198,7 +198,7 @@ class AddTorrentDialog(component.Component):
filedump = lt.bdecode(filedump) filedump = lt.bdecode(filedump)
_file.close() _file.close()
except Exception, e: except Exception, e:
log.warning("Unable to open %s: e", filename, e) log.warning("Unable to open %s: %s", filename, e)
continue continue
try: try:
@ -210,7 +210,7 @@ class AddTorrentDialog(component.Component):
if str(info.info_hash()) in self.infos: if str(info.info_hash()) in self.infos:
log.debug("Torrent already in list!") log.debug("Torrent already in list!")
continue continue
# Get list of files from torrent info # Get list of files from torrent info
files = [] files = []
for f in info.files(): for f in info.files():
@ -229,22 +229,22 @@ class AddTorrentDialog(component.Component):
(model, row) = self.listview_torrents.get_selection().get_selected() (model, row) = self.listview_torrents.get_selection().get_selected()
if not row and new_row: if not row and new_row:
self.listview_torrents.get_selection().select_iter(new_row) self.listview_torrents.get_selection().select_iter(new_row)
def _on_torrent_changed(self, treeselection): def _on_torrent_changed(self, treeselection):
(model, row) = treeselection.get_selected() (model, row) = treeselection.get_selected()
self.files_treestore.clear() self.files_treestore.clear()
if row is None: if row is None:
return return
# Update files list # Update files list
files_list = self.files[model.get_value(row, 0)] files_list = self.files[model.get_value(row, 0)]
self.prepare_file_store(files_list) self.prepare_file_store(files_list)
if self.core_config == {}: if self.core_config == {}:
self.update_core_config() self.update_core_config()
# Save the previous torrents options # Save the previous torrents options
self.save_torrent_options() self.save_torrent_options()
# Update the options frame # Update the options frame
@ -290,16 +290,16 @@ class AddTorrentDialog(component.Component):
if torrent_id not in self.options: if torrent_id not in self.options:
self.set_default_options() self.set_default_options()
return return
options = self.options[torrent_id] options = self.options[torrent_id]
if client.is_localhost(): if client.is_localhost():
self.glade.get_widget("button_location").set_current_folder( self.glade.get_widget("button_location").set_current_folder(
options["download_location"]) options["download_location"])
else: else:
self.glade.get_widget("entry_download_path").set_text( self.glade.get_widget("entry_download_path").set_text(
options["download_location"]) options["download_location"])
self.glade.get_widget("radio_compact").set_active( self.glade.get_widget("radio_compact").set_active(
options["compact_allocation"]) options["compact_allocation"])
self.glade.get_widget("spin_maxdown").set_value( self.glade.get_widget("spin_maxdown").set_value(
@ -314,7 +314,7 @@ class AddTorrentDialog(component.Component):
options["add_paused"]) options["add_paused"])
self.glade.get_widget("chk_prioritize").set_active( self.glade.get_widget("chk_prioritize").set_active(
options["prioritize_first_last_pieces"]) options["prioritize_first_last_pieces"])
def save_torrent_options(self, row=None): def save_torrent_options(self, row=None):
# Keeps the torrent options dictionary up-to-date with what the user has # Keeps the torrent options dictionary up-to-date with what the user has
# selected. # selected.
@ -322,10 +322,10 @@ class AddTorrentDialog(component.Component):
row = self.previous_selected_torrent row = self.previous_selected_torrent
if row is None or not self.torrent_liststore.iter_is_valid(row): if row is None or not self.torrent_liststore.iter_is_valid(row):
return return
torrent_id = self.torrent_liststore.get_value(row, 0) torrent_id = self.torrent_liststore.get_value(row, 0)
options = {} options = {}
if client.is_localhost(): if client.is_localhost():
options["download_location"] = \ options["download_location"] = \
self.glade.get_widget("button_location").get_current_folder() self.glade.get_widget("button_location").get_current_folder()
@ -348,16 +348,16 @@ class AddTorrentDialog(component.Component):
self.glade.get_widget("chk_prioritize").get_active() self.glade.get_widget("chk_prioritize").get_active()
options["default_private"] = \ options["default_private"] = \
self.glade.get_widget("chk_private").get_active() self.glade.get_widget("chk_private").get_active()
self.options[torrent_id] = options self.options[torrent_id] = options
# Save the file priorities # Save the file priorities
files_priorities = self.build_priorities( files_priorities = self.build_priorities(
self.files_treestore.get_iter_first(), {}) self.files_treestore.get_iter_first(), {})
for i, file_dict in enumerate(self.files[torrent_id]): for i, file_dict in enumerate(self.files[torrent_id]):
file_dict["download"] = files_priorities[i] file_dict["download"] = files_priorities[i]
def build_priorities(self, iter, priorities): def build_priorities(self, iter, priorities):
while iter is not None: while iter is not None:
if self.files_treestore.iter_has_child(iter): if self.files_treestore.iter_has_child(iter):
@ -375,7 +375,7 @@ class AddTorrentDialog(component.Component):
else: else:
self.glade.get_widget("entry_download_path").set_text( self.glade.get_widget("entry_download_path").set_text(
self.core_config["download_location"]) self.core_config["download_location"])
self.glade.get_widget("radio_compact").set_active( self.glade.get_widget("radio_compact").set_active(
self.core_config["compact_allocation"]) self.core_config["compact_allocation"])
self.glade.get_widget("spin_maxdown").set_value( self.glade.get_widget("spin_maxdown").set_value(
@ -390,7 +390,7 @@ class AddTorrentDialog(component.Component):
self.core_config["add_paused"]) self.core_config["add_paused"])
self.glade.get_widget("chk_prioritize").set_active( self.glade.get_widget("chk_prioritize").set_active(
self.core_config["prioritize_first_last_pieces"]) self.core_config["prioritize_first_last_pieces"])
def get_file_priorities(self, torrent_id): def get_file_priorities(self, torrent_id):
# A list of priorities # A list of priorities
files_list = [] files_list = []
@ -400,9 +400,9 @@ class AddTorrentDialog(component.Component):
files_list.append(0) files_list.append(0)
else: else:
files_list.append(1) files_list.append(1)
return files_list return files_list
def _on_file_toggled(self, render, path): def _on_file_toggled(self, render, path):
(model, paths) = self.listview_files.get_selection().get_selected_rows() (model, paths) = self.listview_files.get_selection().get_selected_rows()
if len(paths) > 1: if len(paths) > 1:
@ -452,13 +452,13 @@ class AddTorrentDialog(component.Component):
chooser = gtk.FileChooserDialog(_("Choose a .torrent file"), chooser = gtk.FileChooserDialog(_("Choose a .torrent file"),
None, None,
gtk.FILE_CHOOSER_ACTION_OPEN, gtk.FILE_CHOOSER_ACTION_OPEN,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
gtk.RESPONSE_OK)) gtk.RESPONSE_OK))
chooser.set_transient_for(self.dialog) chooser.set_transient_for(self.dialog)
chooser.set_select_multiple(True) chooser.set_select_multiple(True)
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"))
@ -486,7 +486,7 @@ class AddTorrentDialog(component.Component):
chooser.destroy() chooser.destroy()
self.add_from_files(result) self.add_from_files(result)
def _on_button_url_clicked(self, widget): def _on_button_url_clicked(self, widget):
log.debug("_on_button_url_clicked") log.debug("_on_button_url_clicked")
dialog = self.glade.get_widget("url_dialog") dialog = self.glade.get_widget("url_dialog")
@ -495,13 +495,13 @@ class AddTorrentDialog(component.Component):
dialog.set_default_response(gtk.RESPONSE_OK) dialog.set_default_response(gtk.RESPONSE_OK)
dialog.set_transient_for(self.dialog) dialog.set_transient_for(self.dialog)
entry.grab_focus() entry.grab_focus()
if deluge.common.windows_check(): if deluge.common.windows_check():
import win32clipboard as clip import win32clipboard as clip
import win32con import win32con
clip.OpenClipboard() clip.OpenClipboard()
text = clip.GetClipboardData(win32con.CF_UNICODETEXT) text = clip.GetClipboardData(win32con.CF_UNICODETEXT)
clip.CloseClipboard() clip.CloseClipboard()
else: else:
clip = gtk.clipboard_get(selection='PRIMARY') clip = gtk.clipboard_get(selection='PRIMARY')
text = clip.wait_for_text() text = clip.wait_for_text()
@ -523,7 +523,7 @@ class AddTorrentDialog(component.Component):
log.debug("url: %s", url) log.debug("url: %s", url)
if url != None: if url != None:
self.add_from_url(url) self.add_from_url(url)
entry.set_text("") entry.set_text("")
dialog.hide() dialog.hide()
@ -538,7 +538,7 @@ class AddTorrentDialog(component.Component):
filename, headers = urllib.urlretrieve(url, tmp_file) filename, headers = urllib.urlretrieve(url, tmp_file)
log.debug("filename: %s", filename) log.debug("filename: %s", filename)
self.add_from_files([filename]) self.add_from_files([filename])
def _on_button_hash_clicked(self, widget): def _on_button_hash_clicked(self, widget):
log.debug("_on_button_hash_clicked") log.debug("_on_button_hash_clicked")
@ -547,9 +547,9 @@ class AddTorrentDialog(component.Component):
(model, row) = self.listview_torrents.get_selection().get_selected() (model, row) = self.listview_torrents.get_selection().get_selected()
if row is None: if row is None:
return return
torrent_id = model.get_value(row, 0) torrent_id = model.get_value(row, 0)
model.remove(row) model.remove(row)
del self.files[torrent_id] del self.files[torrent_id]
del self.infos[torrent_id] del self.infos[torrent_id]
@ -570,7 +570,7 @@ class AddTorrentDialog(component.Component):
torrent_filenames = [] torrent_filenames = []
torrent_options = [] torrent_options = []
row = self.torrent_liststore.get_iter_first() row = self.torrent_liststore.get_iter_first()
while row != None: while row != None:
torrent_id = self.torrent_liststore.get_value(row, 0) torrent_id = self.torrent_liststore.get_value(row, 0)
@ -579,16 +579,16 @@ class AddTorrentDialog(component.Component):
options = self.options[torrent_id] options = self.options[torrent_id]
except: except:
options = None options = None
file_priorities = self.get_file_priorities(torrent_id) file_priorities = self.get_file_priorities(torrent_id)
if options != None: if options != None:
options["file_priorities"] = file_priorities options["file_priorities"] = file_priorities
torrent_filenames.append(filename) torrent_filenames.append(filename)
torrent_options.append(options) torrent_options.append(options)
row = self.torrent_liststore.iter_next(row) row = self.torrent_liststore.iter_next(row)
client.add_torrent_file(torrent_filenames, torrent_options) client.add_torrent_file(torrent_filenames, torrent_options)
client.force_call() client.force_call()
self.hide() self.hide()
@ -598,25 +598,25 @@ class AddTorrentDialog(component.Component):
(model, row) = self.listview_torrents.get_selection().get_selected() (model, row) = self.listview_torrents.get_selection().get_selected()
if row is None: if row is None:
return return
self.save_torrent_options(row) self.save_torrent_options(row)
# The options we want all the torrents to have # The options we want all the torrents to have
options = self.options[model.get_value(row, 0)] options = self.options[model.get_value(row, 0)]
# Set all the torrent options # Set all the torrent options
row = model.get_iter_first() row = model.get_iter_first()
while row != None: while row != None:
torrent_id = model.get_value(row, 0) torrent_id = model.get_value(row, 0)
self.options[torrent_id] = options self.options[torrent_id] = options
row = model.iter_next(row) row = model.iter_next(row)
def _on_button_revert_clicked(self, widget): def _on_button_revert_clicked(self, widget):
log.debug("_on_button_revert_clicked") log.debug("_on_button_revert_clicked")
(model, row) = self.listview_torrents.get_selection().get_selected() (model, row) = self.listview_torrents.get_selection().get_selected()
if row is None: if row is None:
return return
del self.options[model.get_value(row, 0)] del self.options[model.get_value(row, 0)]
self.set_default_options() self.set_default_options()

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

@ -2,19 +2,19 @@
# ipcinterface.py # ipcinterface.py
# #
# Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com> # Copyright (C) 2008 Andrew Resch ('andar') <andrewresch@gmail.com>
# #
# Deluge is free software. # Deluge is free software.
# #
# You may redistribute it and/or modify it under the terms of the # You may redistribute it and/or modify it under the terms of the
# GNU General Public License, as published by the Free Software # GNU General Public License, as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) # Foundation; either version 3 of the License, or (at your option)
# any later version. # any later version.
# #
# deluge is distributed in the hope that it will be useful, # deluge is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details. # See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with deluge. If not, write to: # along with deluge. If not, write to:
# The Free Software Foundation, Inc., # The Free Software Foundation, Inc.,
@ -43,7 +43,7 @@ from deluge.log import LOG as log
class IPCInterface(component.Component): class IPCInterface(component.Component):
def __init__(self, args): def __init__(self, args):
component.Component.__init__(self, "IPCInterface") component.Component.__init__(self, "IPCInterface")
if deluge.common.windows_check(): if deluge.common.windows_check():
# If we're on windows we need to check the global mutex to see if deluge is # If we're on windows we need to check the global mutex to see if deluge is
# already running. # already running.
@ -72,7 +72,7 @@ class IPCInterface(component.Component):
if deluge.common.windows_check(): if deluge.common.windows_check():
import win32api import win32api
win32api.CloseHandle(self.mutex) win32api.CloseHandle(self.mutex)
def process_args(args): def process_args(args):
"""Process arguments sent to already running Deluge""" """Process arguments sent to already running Deluge"""
# Pythonize the values from Dbus # Pythonize the values from Dbus
@ -86,8 +86,10 @@ def process_args(args):
log.debug("Not connected to host.. Adding to queue.") log.debug("Not connected to host.. Adding to queue.")
component.get("QueuedTorrents").add_to_queue(args) component.get("QueuedTorrents").add_to_queue(args)
return return
config = ConfigManager("gtkui.conf") config = ConfigManager("gtkui.conf")
for arg in args: for arg in args:
if not arg:
continue
if deluge.common.is_url(arg): if deluge.common.is_url(arg):
log.debug("Attempting to add %s from external source..", log.debug("Attempting to add %s from external source..",
arg) arg)
@ -98,11 +100,10 @@ def process_args(args):
client.add_torrent_url(arg) client.add_torrent_url(arg)
else: else:
# Just a file # Just a file
log.debug("Attempting to add %s from external source..", log.debug("Attempting to add %s from external source..",
os.path.abspath(arg)) os.path.abspath(arg))
if config["interactive_add"]: if config["interactive_add"]:
component.get("AddTorrentDialog").add_from_files([os.path.abspath(arg)]) component.get("AddTorrentDialog").add_from_files([os.path.abspath(arg)])
component.get("AddTorrentDialog").show(config["focus_add_dialog"]) component.get("AddTorrentDialog").show(config["focus_add_dialog"])
else: else:
client.add_torrent_file([os.path.abspath(arg)]) client.add_torrent_file([os.path.abspath(arg)])

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

@ -2,19 +2,19 @@
# mainwindow.py # mainwindow.py
# #
# Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com> # Copyright (C) 2007 Andrew Resch ('andar') <andrewresch@gmail.com>
# #
# Deluge is free software. # Deluge is free software.
# #
# You may redistribute it and/or modify it under the terms of the # You may redistribute it and/or modify it under the terms of the
# GNU General Public License, as published by the Free Software # GNU General Public License, as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) # Foundation; either version 3 of the License, or (at your option)
# any later version. # any later version.
# #
# deluge is distributed in the hope that it will be useful, # deluge is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details. # See the GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with deluge. If not, write to: # along with deluge. If not, write to:
# The Free Software Foundation, Inc., # The Free Software Foundation, Inc.,
@ -54,23 +54,23 @@ class MainWindow(component.Component):
self.config = ConfigManager("gtkui.conf") self.config = ConfigManager("gtkui.conf")
# Get the glade file for the main window # Get the glade file for the main window
self.main_glade = gtk.glade.XML( self.main_glade = gtk.glade.XML(
pkg_resources.resource_filename("deluge.ui.gtkui", pkg_resources.resource_filename("deluge.ui.gtkui",
"glade/main_window.glade")) "glade/main_window.glade"))
self.window = self.main_glade.get_widget("main_window") self.window = self.main_glade.get_widget("main_window")
self.window.set_icon(deluge.common.get_logo(32)) self.window.set_icon(deluge.common.get_logo(32))
self.vpaned = self.main_glade.get_widget("vpaned") self.vpaned = self.main_glade.get_widget("vpaned")
# Load the window state # Load the window state
self.load_window_state() self.load_window_state()
# Keep track of window's minimization state so that we don't update the # Keep track of window's minimization state so that we don't update the
# UI when it is minimized. # UI when it is minimized.
self.is_minimized = False self.is_minimized = False
self.window.drag_dest_set(gtk.DEST_DEFAULT_ALL, [('text/uri-list', 0, self.window.drag_dest_set(gtk.DEST_DEFAULT_ALL, [('text/uri-list', 0,
80)], gtk.gdk.ACTION_COPY) 80)], gtk.gdk.ACTION_COPY)
# Connect events # Connect events
self.window.connect("window-state-event", self.on_window_state_event) self.window.connect("window-state-event", self.on_window_state_event)
self.window.connect("configure-event", self.on_window_configure_event) self.window.connect("configure-event", self.on_window_configure_event)
@ -93,7 +93,7 @@ class MainWindow(component.Component):
pass pass
self.window.show() self.window.show()
def hide(self): def hide(self):
component.pause("TorrentView") component.pause("TorrentView")
component.pause("StatusBar") component.pause("StatusBar")
@ -102,7 +102,7 @@ class MainWindow(component.Component):
self.window_x_pos = self.window.get_position()[0] self.window_x_pos = self.window.get_position()[0]
self.window_y_pos = self.window.get_position()[1] self.window_y_pos = self.window.get_position()[1]
self.window.hide() self.window.hide()
def present(self): def present(self):
# Restore the proper x,y coords for the window prior to showing it # Restore the proper x,y coords for the window prior to showing it
try: try:
@ -116,26 +116,26 @@ class MainWindow(component.Component):
component.resume("TorrentDetails") component.resume("TorrentDetails")
except: except:
pass pass
self.window.present() self.window.present()
self.load_window_state() self.load_window_state()
def active(self): def active(self):
"""Returns True if the window is active, False if not.""" """Returns True if the window is active, False if not."""
return self.window.is_active() return self.window.is_active()
def visible(self): def visible(self):
"""Returns True if window is visible, False if not.""" """Returns True if window is visible, False if not."""
return self.window.get_property("visible") return self.window.get_property("visible")
def get_glade(self): def get_glade(self):
"""Returns a reference to the main window glade object.""" """Returns a reference to the main window glade object."""
return self.main_glade return self.main_glade
def quit(self): def quit(self):
del self.config del self.config
gtk.main_quit() gtk.main_quit()
def load_window_state(self): def load_window_state(self):
x = self.config["window_x_pos"] x = self.config["window_x_pos"]
y = self.config["window_y_pos"] y = self.config["window_y_pos"]
@ -147,7 +147,7 @@ class MainWindow(component.Component):
self.window.maximize() self.window.maximize()
self.vpaned.set_position( self.vpaned.set_position(
self.config["window_height"] - self.config["window_pane_position"]) self.config["window_height"] - self.config["window_pane_position"])
def on_window_configure_event(self, widget, event): def on_window_configure_event(self, widget, event):
if not self.config["window_maximized"] and self.visible: if not self.config["window_maximized"] and self.visible:
self.config.set("window_x_pos", self.window.get_position()[0]) self.config.set("window_x_pos", self.window.get_position()[0])
@ -183,19 +183,19 @@ class MainWindow(component.Component):
self.hide() self.hide()
else: else:
self.quit() self.quit()
return True return True
def on_vpaned_position_event(self, obj, param): def on_vpaned_position_event(self, obj, param):
self.config.set("window_pane_position", self.config.set("window_pane_position",
self.config["window_height"] - self.vpaned.get_position()) self.config["window_height"] - self.vpaned.get_position())
def on_drag_data_received_event(self, widget, drag_context, x, y, selection_data, info, timestamp): def on_drag_data_received_event(self, widget, drag_context, x, y, selection_data, info, timestamp):
args = [] args = []
for uri in selection_data.data.split(): for uri in selection_data.data.split():
if deluge.common.windows_check(): if deluge.common.windows_check():
uri = uri[7:] args.append(urllib.url2pathname(uri[7:]))
uri = urllib.url2pathname(uri).strip("\r\n\x00") else:
args.append(urllib.unquote(urlparse(uri).path)) args.append(urllib.unquote(urlparse(uri).path))
process_args(args) process_args(args)
drag_context.finish(True, True) drag_context.finish(True, True)