Some structure changes

5 files changed, 56 insertions, 45 deletions

diff --git a/geneticone/gui/__init__.py b/geneticone/gui/__init__.py
new file mode 100644
index 0000000..1efeeaf
--- /dev/null
+++ b/geneticone/gui/__init__.py
@@ -0,0 +1,3 @@
+#!/usr/bin/python
+
+from main import *
diff --git a/gui.py b/geneticone/gui/main.py
index fcaccd3..9398b91 100755..100644
--- a/gui.py
+++ b/geneticone/gui/main.py
@@ -457,7 +457,7 @@ class MainWindow:
 		self.window.connect("delete_event", self.cb_delete)
 		self.window.connect("destroy", self.cb_destroy)
 		self.window.set_border_width(2)
-		self.window.set_geometry_hints (self.window, min_width = 600, min_height = 700, max_height = gtk.gdk.screen_height(), max_width = gtk.gdk.screen_width())
+		self.window.set_geometry_hints (self.window, min_width = 600, min_height = 800, max_height = gtk.gdk.screen_height(), max_width = gtk.gdk.screen_width())
 		self.window.set_resizable(True)
 
 		# main vb
@@ -556,7 +556,3 @@ def blocked_dialog (blocked, blocks):
 	dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, blocked+" is blocked by "+blocks+".\nPlease unmerge the blocking package.")
 	dialog.run()
 	dialog.destroy()
-
-if __name__ == "__main__":
-	m = MainWindow()
-	m.main()
diff --git a/geneticone/helper.py b/geneticone/helper.py
index 8f801ce..1b6fe71 100644
--- a/geneticone/helper.py
+++ b/geneticone/helper.py
@@ -109,46 +109,6 @@ def am_i_root ():
 	else:
 		return False
 
-def old_export_to_dictionaries (list_of_packages):
-	'''DEPRECATED:
-	Exports some of the intrinsic data of a list of Package objects to a list of dictionaries.
-	This is meant to transmit data back to the genetic-client, just by eval()-uating the output.'''
-	dictionaries=[]
-	keys=['name','version','category','cpv','runtime_deps','compiletime_deps','postmerge_deps','is_installed', 'is_overlay', 'is_masked','mask_status', 'package_path', 'size','use_flags_when_installed','all_useflags','set_useflags']
-	package_methods=['get_name','get_version','get_category','get_cpv','get_runtime_deps', 'get_compiletime_deps','get_postmerge_deps','is_installed','is_overlay','is_masked','get_mask_status','get_package_path','size','get_use_flags','get_all_useflags','get_set_useflags']
-	
-	for item in list_of_packages:
-		dictionaries.append({})
-		for key,method in zip(keys,package_methods):
-			try:
-				dictionaries[-1][key]=eval('item.'+method+'()')
-			except AttributeError: #this may happen if, for example, package is not installed and I look for the path...
-				dictionaries[-1][key]=None
-	return dictionaries
-
-def export_to_dictionaries (packages):
-	'''Exports some of the intrinsic data of a list of Package objects to a list of dictionaries.
-	This is meant to transmit data back to the genetic-client, just by eval()-uating the output.'''
-	dictionaries=[]
-
-	for item in packages:
-		dictionaries.append({})
-		for method in dir(item):
-			if (method.startswith('get_') or method.startswith('is_'))\
-					and method != 'get_dependants': # bug in gentoolkit.Package.get_dependants --> see bug #137783
-				key = method[method.index('_')+1:] # the key is everything after the first underscore
-				try:
-					dictionaries[-1][key] = eval("item."+method+"()")
-				except AttributeError: # this may happen if, for example, package is not installed and I look for the path...
-					dictionaries[-1][key] = None
-				except TypeError:
-					pass # this method takes an argument - ignore it
-				except NotImplementedError:
-					pass # this method is not implemented - ignore
-				except "Not implemented yet!":
-					pass
-	return dictionaries
-
 use_descs = {}
 local_use_descs = {}
 def get_use_desc (flag, package = None):
diff --git a/main.py b/main.py
new file mode 100755
index 0000000..f1f3b7d
--- /dev/null
+++ b/main.py
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+from geneticone.gui import MainWindow
+
+if __name__ == "__main__":
+	m = MainWindow()
+	m.main()
diff --git a/obsolete/helper.py b/obsolete/helper.py
new file mode 100644
index 0000000..ce5618a
--- /dev/null
+++ b/obsolete/helper.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+from geneticone import helper
+
+"""Some obsolete functions from geneticone.helper."""
+
+def old_export_to_dictionaries (list_of_packages):
+	'''DEPRECATED:
+	Exports some of the intrinsic data of a list of Package objects to a list of dictionaries.
+	This is meant to transmit data back to the genetic-client, just by eval()-uating the output.'''
+	dictionaries=[]
+	keys=['name','version','category','cpv','runtime_deps','compiletime_deps','postmerge_deps','is_installed', 'is_overlay', 'is_masked','mask_status', 'package_path', 'size','use_flags_when_installed','all_useflags','set_useflags']
+	package_methods=['get_name','get_version','get_category','get_cpv','get_runtime_deps', 'get_compiletime_deps','get_postmerge_deps','is_installed','is_overlay','is_masked','get_mask_status','get_package_path','size','get_use_flags','get_all_useflags','get_set_useflags']
+	
+	for item in list_of_packages:
+		dictionaries.append({})
+		for key,method in zip(keys,package_methods):
+			try:
+				dictionaries[-1][key]=eval('item.'+method+'()')
+			except AttributeError: #this may happen if, for example, package is not installed and I look for the path...
+				dictionaries[-1][key]=None
+	return dictionaries
+
+def export_to_dictionaries (packages):
+	'''Exports some of the intrinsic data of a list of Package objects to a list of dictionaries.
+	This is meant to transmit data back to the genetic-client, just by eval()-uating the output.'''
+	dictionaries=[]
+
+	for item in packages:
+		dictionaries.append({})
+		for method in dir(item):
+			if (method.startswith('get_') or method.startswith('is_'))\
+					and method != 'get_dependants': # bug in gentoolkit.Package.get_dependants --> see bug #137783
+				key = method[method.index('_')+1:] # the key is everything after the first underscore
+				try:
+					dictionaries[-1][key] = eval("item."+method+"()")
+				except AttributeError: # this may happen if, for example, package is not installed and I look for the path...
+					dictionaries[-1][key] = None
+				except TypeError:
+					pass # this method takes an argument - ignore it
+				except NotImplementedError:
+					pass # this method is not implemented - ignore
+				except "Not implemented yet!":
+					pass
+	return dictionaries