Added wrapper for Tree and Console

4 files changed, 83 insertions, 5 deletions

diff --git a/geneticone/gui/gtk/__init__.py b/geneticone/gui/gtk/__init__.py
index e58319a..e7b1bb5 100644
--- a/geneticone/gui/gtk/__init__.py
+++ b/geneticone/gui/gtk/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: geneticone/gui/__init__.py
+# File: geneticone/gui/gtk/__init__.py
 # This file is part of the Genetic/One-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006 René 'Necoro' Neumann
diff --git a/geneticone/gui/gtk/dialogs.py b/geneticone/gui/gtk/dialogs.py
index 92b3c7f..cb643ce 100644
--- a/geneticone/gui/gtk/dialogs.py
+++ b/geneticone/gui/gtk/dialogs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: geneticone/gui/dialogs.py
+# File: geneticone/gui/gtk/dialogs.py
 # This file is part of the Genetic/One-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006 René 'Necoro' Neumann
diff --git a/geneticone/gui/gtk/windows.py b/geneticone/gui/gtk/windows.py
index 0277e51..7b9dd94 100644
--- a/geneticone/gui/gtk/windows.py
+++ b/geneticone/gui/gtk/windows.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: geneticone/gui/windows.py
+# File: geneticone/gui/gtk/windows.py
 # This file is part of the Genetic/One-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006 René 'Necoro' Neumann
@@ -10,7 +10,7 @@
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
-VERSION = "0.4.5"
+VERSION = "0.4.6-svn"
 CONFIG_LOCATION = "/etc/geneticone/geneticone.cfg"
 
 # gtk stuff
@@ -28,6 +28,7 @@ from geneticone.backend.exceptions import *
 # more GUI stuff
 from geneticone.gui.gui_helper import Database, Config, EmergeQueue
 from dialogs import *
+from wrapper import GtkTree, GtkConsole
 
 # for the terminal
 import vte
@@ -760,7 +761,7 @@ class MainWindow:
 		self.window.show_all()
 
 		# set emerge queue
-		self.queue = EmergeQueue(console=term, tree = emergeStore, db = self.db)
+		self.queue = EmergeQueue(console = GtkConsole(term), tree = GtkTree(emergeStore), db = self.db)
 
 	def create_uimanager(self):
 		ui ="""
diff --git a/geneticone/gui/gtk/wrapper.py b/geneticone/gui/gtk/wrapper.py
new file mode 100644
index 0000000..4407816
--- /dev/null
+++ b/geneticone/gui/gtk/wrapper.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+#
+# File: geneticone/gui/gtk/wrapper.py
+# This file is part of the Genetic/One-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2006 René 'Necoro' Neumann
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+from geneticone.gui.wrapper import Tree, Console
+
+class GtkTree (Tree):
+	"""The implementation of the abstract tree."""
+
+	def __init__ (self, tree, col = 0):
+		"""Constructor.
+
+		@param tree: original tree
+		@type tree: gtk.TreeStore
+		@param col: the column where the cpv is stored
+		@type col: int"""
+
+		self.tree = tree
+		self.cpv_col = col
+	
+	def iter_has_parent (self, it):
+		return (self.tree.iter_parent(it) != None)
+
+	def parent_iter (self, it):
+		return self.tree.iter_parent(it)
+
+	def first_child_iter (self, it):
+		return self.tree.iter_children(it)
+
+	def iter_has_children (self, it):
+		return self.tree.iter_has_children(it)
+
+	def next_iter (self, it):
+		return self.tree.iter_next(it)
+
+	def get_value (self, it, column):
+		return self.tree.get_value(it, column)
+
+	def get_path_from_iter (self, it):
+		return self.tree.get_string_from_iter(it)
+
+	def append (self, parent = None, values = None):
+		return self.tree.append(parent, values)
+
+	def remove (self, it):
+		return self.tree.remove(it)
+
+	def get_original (self):
+		return self.tree
+
+	def get_cpv_column (self):
+		return self.cpv_col
+
+class GtkConsole (Console):
+	"""The implementation of the abstract Console for GTK."""
+
+	def __init__ (self, console):
+		"""Constructor.
+
+		@param console: the original console
+		@type console: vte.Terminal"""
+		
+		self.console = console
+
+	def set_pty (self, pty):
+		self.console.set_pty(pty)
+
+	def get_original (self):
+		return self.console