From 95efac187b1bb3425f73fab15dae23df7541ab15 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 24 Nov 2010 16:12:10 +0100
Subject: [PATCH] Updated hscommon and adapted to changes in
 hscommon.gui.table.Table.refresh().

---
 README                     | 1 -
 core/gui/directory_tree.py | 2 +-
 core/gui/problem_table.py  | 3 +--
 core/gui/result_table.py   | 6 ++----
 package.py                 | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 4f1cf723..8f7eef90 100644
--- a/README
+++ b/README
@@ -13,7 +13,6 @@ There are also other sub-folder that comes from external repositories (automatic
 with svn:externals):
 
 - hscommon: A collection of helpers used across HS applications.
-- hsgui: Cross-toolkit GUI-related helper classes.
 - cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
 - qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
diff --git a/core/gui/directory_tree.py b/core/gui/directory_tree.py
index 52f52f01..c5a1eac5 100644
--- a/core/gui/directory_tree.py
+++ b/core/gui/directory_tree.py
@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from hsgui.tree import Tree, Node
+from hscommon.gui.tree import Tree, Node
 
 from ..directories import STATE_NORMAL, STATE_REFERENCE, STATE_EXCLUDED
 from .base import GUIObject
diff --git a/core/gui/problem_table.py b/core/gui/problem_table.py
index eee154f5..344a4316 100644
--- a/core/gui/problem_table.py
+++ b/core/gui/problem_table.py
@@ -8,7 +8,7 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from hscommon.notify import Listener
-from hsgui.table import GUITable, Row
+from hscommon.gui.table import GUITable, Row
 
 class ProblemTable(GUITable, Listener):
     def __init__(self, view, problem_dialog):
@@ -31,7 +31,6 @@ class ProblemTable(GUITable, Listener):
     #--- Event handlers
     def problems_changed(self):
         self.refresh()
-        self.view.refresh()
     
 
 class ProblemRow(Row):
diff --git a/core/gui/result_table.py b/core/gui/result_table.py
index e4cf2fa4..2fedb0be 100644
--- a/core/gui/result_table.py
+++ b/core/gui/result_table.py
@@ -9,7 +9,7 @@
 
 from operator import attrgetter
 
-from hsgui.table import GUITable, Row
+from hscommon.gui.table import GUITable, Row
 
 from .base import GUIObject
 
@@ -87,7 +87,6 @@ class ResultTable(GUIObject, GUITable):
     
     def _refresh_with_view(self):
         self.refresh()
-        self.view.refresh()
         self.view.show_selected_row()
     
     #--- Public
@@ -139,7 +138,6 @@ class ResultTable(GUIObject, GUITable):
             return
         self._delta_values = value
         self.refresh()
-        self.view.refresh()
     
     @property
     def selected_dupe_count(self):
@@ -156,7 +154,7 @@ class ResultTable(GUIObject, GUITable):
         # What we want to to here is that instead of restoring selected *dupes* after refresh, we
         # restore selected *paths*.
         indexes = self.selected_indexes
-        self.refresh()
+        self.refresh(refresh_view=False)
         self.select(indexes)
         self.view.refresh()
     
diff --git a/package.py b/package.py
index 6ed8f314..af51028b 100644
--- a/package.py
+++ b/package.py
@@ -86,7 +86,7 @@ def package_debian(edition):
     os.makedirs(destpath)
     os.makedirs(srcpath)
     shutil.copy('run.py', op.join(srcpath, 'run.py'))
-    packages = ['hscommon', 'hsgui', 'core', ed('core_{0}'), 'qtlib', 'qt', 'hsutil', 'send2trash', 'jobprogress']
+    packages = ['hscommon', 'core', ed('core_{0}'), 'qtlib', 'qt', 'hsutil', 'send2trash', 'jobprogress']
     if edition == 'me':
         packages.append('hsaudiotag')
     copy_packages(packages, srcpath)