From 506a98aee28ccf3d9310dab848b7aa3f7d90372c Mon Sep 17 00:00:00 2001 From: Asmageddon Date: Mon, 28 May 2012 21:24:12 +0200 Subject: [PATCH] Implemented the .clear() -> .erase() change which supposedly fixes a lot of flicker issues --- deluge/ui/console/modes/alltorrents.py | 4 ++-- deluge/ui/console/modes/connectionmanager.py | 8 ++++---- deluge/ui/console/modes/eventview.py | 2 +- deluge/ui/console/modes/preferences.py | 2 +- deluge/ui/console/modes/torrentdetail.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 929c511d1..4e54dabcd 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -551,7 +551,7 @@ class AllTorrents(BaseMode, component.Component): def show_torrent_details(self,tid): def dodeets(arg): if arg and True in arg[0]: - self.stdscr.clear() + self.stdscr.erase() component.get("ConsoleUI").set_mode(TorrentDetail(self,tid,self.stdscr, self.config, self.encoding)) else: self.messages.append(("Error","An error occured trying to display torrent details")) @@ -588,7 +588,7 @@ class AllTorrents(BaseMode, component.Component): def __legacy_mode(self): def dolegacy(arg): if arg and True in arg[0]: - self.stdscr.clear() + self.stdscr.erase() component.get("ConsoleUI").set_mode(self.legacy_mode) self.legacy_mode.refresh() curses.curs_set(2) diff --git a/deluge/ui/console/modes/connectionmanager.py b/deluge/ui/console/modes/connectionmanager.py index de946ed5f..0b3fcb5e5 100644 --- a/deluge/ui/console/modes/connectionmanager.py +++ b/deluge/ui/console/modes/connectionmanager.py @@ -121,7 +121,7 @@ class ConnectionManager(BaseMode): def __on_connected(self,result): component.start() - self.stdscr.clear() + self.stdscr.erase() at = AllTorrents(self.stdscr, self.encoding) component.get("ConsoleUI").set_mode(at) at.resume() @@ -144,7 +144,7 @@ class ConnectionManager(BaseMode): for host in self.config["hosts"]: if (host[1],host[2],host[3]) == (hostname, port, username): self.report_message("Can't add host","Host already in list") - return + return newid = hashlib.sha1(str(time.time())).hexdigest() self.config["hosts"].append((newid, hostname, port, username, password)) self.config.save() @@ -186,7 +186,7 @@ class ConnectionManager(BaseMode): self.popup.refresh() curses.doupdate() - + def _doRead(self): # Read the character c = self.stdscr.getch() @@ -200,7 +200,7 @@ class ConnectionManager(BaseMode): reactor.stop() client.disconnect().addCallback(on_disconnect) else: - reactor.stop() + reactor.stop() return if chr(c) == 'D' and self.inlist: self.__delete_current_host() diff --git a/deluge/ui/console/modes/eventview.py b/deluge/ui/console/modes/eventview.py index 31a765703..670144840 100644 --- a/deluge/ui/console/modes/eventview.py +++ b/deluge/ui/console/modes/eventview.py @@ -80,7 +80,7 @@ class EventView(BaseMode): curses.doupdate() def back_to_overview(self): - self.stdscr.clear() + self.stdscr.erase() component.get("ConsoleUI").set_mode(self.parent_mode) self.parent_mode.resume() diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index e46e0431b..f73b8f114 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -256,7 +256,7 @@ class Preferences(BaseMode): def back_to_parent(self): - self.stdscr.clear() + self.stdscr.erase() component.get("ConsoleUI").set_mode(self.parent_mode) self.parent_mode.resume() diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 349afe9ca..72206ef87 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -478,7 +478,7 @@ class TorrentDetail(BaseMode, component.Component): def back_to_overview(self): component.stop(["TorrentDetail"]) component.deregister(self) - self.stdscr.clear() + self.stdscr.erase() component.get("ConsoleUI").set_mode(self.alltorrentmode) self.alltorrentmode._go_top = False self.alltorrentmode.resume()