codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync rest

This commit is contained in:
Marcos Pinto 2008-01-07 01:36:35 +00:00
parent 294e1f6b76
commit dcefa152c0
6 changed files with 1302 additions and 1324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Deluge 0.5.9 (xx Januarary 2007)
* Change how we handle fastresume - should prevent rechecking
* New theme for windows
* Built with Visual Studio 2005 on windows, which should prevent a lot of those
runtime errors that some people were having
* Performance enhancements by removing needless casts
* Search & Anonymizing Browser are now plugins
Deluge 0.5.8 (29 December 2007)
* Fix handling of corrupt torrent files
* Fix having two instances of Deluge running on Ubuntu

1842
glade/delugegtk.glade
View File

File diff suppressed because it is too large Load Diff

86
glade/preferences_dialog.glade
View File

@ -2671,88 +2671,6 @@ Thunar</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame22">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="alignment40">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkCheckButton" id="chk_use_internal">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Use and show the anonymizing internal browser</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">&lt;b&gt;Internal Browser&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame23">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="alignment41">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkCheckButton" id="chk_show_search">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Show the search bar on the toolbar</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">&lt;b&gt;Search Bar&lt;/b&gt; - restart required</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame4">
<property name="visible">True</property>
@ -2802,7 +2720,7 @@ Thunar</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">5</property>
<property name="position">3</property>
</packing>
</child>
<child>
@ -2845,7 +2763,7 @@ information is sent.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">6</property>
<property name="position">4</property>
</packing>
</child>
</widget>

648
po/deluge.pot
View File

File diff suppressed because it is too large Load Diff

4
setup.py
View File

@ -181,8 +181,8 @@ else:
EXTRA_LINK_ARGS = ['-L.\win32\lib']
includedirs = ['./libtorrent', './libtorrent/include', './libtorrent/include/libtorrent', './win32/include']
librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
'boost_thread-mt', 'z', 'ssl' ,'wsock32' ,'crypto' ,'gdi32' ,'ws2_32']
librariestype = ['boost_filesystem', 'boost_date_time',
'boost_thread', 'rt', 'z', 'ssl' ,'wsock32' ,'crypto' ,'gdi32' ,'ws2_32']
# NOTE: The Rasterbar Libtorrent source code is in the libtorrent/ directory
# inside of Deluge's source tarball.

38
src/interface.py
View File

@ -64,15 +64,6 @@ class DelugeGTK:
domain='deluge')
self.window = self.wtree.get_widget("main_window")
self.toolbar = self.wtree.get_widget("tb_left")
self.browserbutton_image = gtk.Image()
self.browserbutton_image.set_from_pixbuf(\
gtk.gdk.pixbuf_new_from_file_at_size(\
common.get_pixmap('browser.png'), 18, 18))
self.browserbutton = gtk.ToolButton(self.browserbutton_image, _("Browser"))
self.browserbutton_tip = gtk.Tooltips()
self.browserbutton.set_tooltip(self.browserbutton_tip, _("Launch Browser"))
self.browserbutton.connect("clicked", self.launch_browser_clicked)
self.wtree.get_widget("tb_left").add(self.browserbutton)
self.window.drag_dest_set(gtk.DEST_DEFAULT_ALL, [('text/uri-list', 0,
80)], gtk.gdk.ACTION_COPY)
self.window.connect("delete_event", self.close)
@ -163,10 +154,6 @@ class DelugeGTK:
return result
SetConsoleCtrlHandler(win_handler)
if self.config.get("show_search"):
import search
search.Search(self)
self.dht_timer = 0
self.dht_skip = False
self.memory_timer = 0
@ -209,6 +196,7 @@ class DelugeGTK:
"launch_homepage": self.launch_homepage,
"launch_community": self.launch_community,
"launch_faq": self.launch_faq,
"launch_donate": self.launch_donate,
"show_about_dialog": self.show_about_dialog,
"launchpad": self.launchpad,
"run_wizard": self.run_wizard,
@ -961,10 +949,6 @@ window, please enter your password"))
"web_proxy_password"),
int(self.config.get("web_proxy_port")), self.config.get(
"web_proxy_type"), "web")
if self.config.get("use_internal"):
self.browserbutton.show_all()
else:
self.browserbutton.hide_all()
def get_message_from_state(self, unique_id, torrent_state):
state = torrent_state['state']
@ -1033,11 +1017,6 @@ window, please enter your password"))
if cmd_line_torrents is None:
cmd_line_torrents = []
if self.config.get("use_internal"):
self.browserbutton.show_all()
else:
self.browserbutton.hide_all()
if not(self.config.get("start_in_tray") and \
self.config.get("enable_system_tray") and
self.has_tray) and not self.window.get_property("visible"):
@ -1463,16 +1442,19 @@ nice_need + "\n" + _("Available Space:") + " " + nice_free)
def launchpad(self, obj=None):
common.open_url_in_browser('https://translations.launchpad.net/deluge/\
trunk/+pots/deluge')
trunk/+pots/deluge', self.plugins)
def launch_faq(self, obj=None):
common.open_url_in_browser('http://deluge-torrent.org/faq.php')
common.open_url_in_browser('http://deluge-torrent.org/faq.php', self.plugins)
def launch_donate(self, obj=None):
common.open_url_in_browser('http://deluge-torrent.org/downloads.php', self.plugins)
def launch_community(self, obj=None):
common.open_url_in_browser('http://forum.deluge-torrent.org/')
common.open_url_in_browser('http://forum.deluge-torrent.org/', self.plugins)
def launch_homepage(self, obj=None):
common.open_url_in_browser('http://deluge-torrent.org/')
common.open_url_in_browser('http://deluge-torrent.org/', self.plugins)
def add_torrent_clicked(self, obj=None):
torrent = dialogs.show_file_open_dialog(self.window)
@ -1516,7 +1498,9 @@ trunk/+pots/deluge')
glade = gtk.glade.XML(common.get_glade_file("dgtkpopups.glade"),
domain='deluge')
asker = glade.get_widget("remove_torrent_dlg")
asker.set_icon(common.get_logo(18))
if not common.windows_check():
asker.set_icon(common.get_logo(18))
asker.set_transient_for(self.window)
warning = glade.get_widget("warning")
warning.set_text(" ")