Merge lp:~rockstar/entertainer/filemoves into lp:entertainer

[Paul Hummer]

[Joshua Scotton (joshuascotton)]

This fixes everything with the tray icon and the frontend. The tools still don't work though

=== modified file 'entertainer'
--- entertainer 2008-06-23 04:31:01 +0000
+++ entertainer 2008-06-23 14:06:03 +0000
@@ -11,7 +11,7 @@
 import gobject
 import ConfigParser
 from ConfigParser import ParsingError
-from frontend.frontend_client import FrontendClient
+from entertainerlib.frontend.frontend_client import FrontendClient

 from entertainerlib.utils.configuration import Configuration

=== modified file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py 2008-06-22 05:08:20 +0000
+++ entertainerlib/utils/content_management_dialog.py 2008-06-23 14:20:46 +0000
@@ -62,7 +62,7 @@
             sys.exit(1)

         # Load glade UI
- self.gladefile = "utils/glade/entertainer-content-management.glade"
+ self.gladefile = "entertainerlib/utils/glade/entertainer-content-management.glade"
         self.widgets = gtk.glade.XML(self.gladefile)

         # Get content management dialog and bind signal callbacks

=== modified file 'entertainerlib/utils/log_viewer.py'
--- entertainerlib/utils/log_viewer.py 2008-06-22 05:08:20 +0000
+++ entertainerlib/utils/log_viewer.py 2008-06-23 14:20:33 +0000
@@ -45,7 +45,7 @@
     log_store = None
     log_rows = []

- gladefile = "utils/glade/log_dialog.glade"
+ gladefile = "entertainerlib/utils/glade/log_dialog.glade"
     logfile_entertainer = os.path.expanduser(Configuration().get_cfg_path() +
         'entertainer.log')

=== modified file 'entertainerlib/utils/preferences_dialog.py'
--- entertainerlib/utils/preferences_dialog.py 2008-06-22 05:08:20 +0000
+++ entertainerlib/utils/preferences_dialog.py 2008-06-23 14:22:18 +0000
@@ -64,7 +64,7 @@
             sys.exit(1)

         # Load glade UI
- self.gladefile = "utils/glade/entertainer-preferences.glade"
+ self.gladefile = "entertainerlib/utils/glade/entertainer-preferences.glade"
         self.widgets = gtk.glade.XML(self.gladefile)

         # Get preferences dialog and bind signal callbacks

=== modified file 'entertainerlib/utils/system_tray_icon.py'
--- entertainerlib/utils/system_tray_icon.py 2008-06-22 05:08:20 +0000
+++ entertainerlib/utils/system_tray_icon.py 2008-06-23 14:08:30 +0000
@@ -64,7 +64,7 @@
         # Load glade files
         try:
             self.menu_widgets = \
- gtk.glade.XML("utils/glade/system_tray_icon_menu.glade")
+ gtk.glade.XML("entertainerlib/utils/glade/system_tray_icon_menu.glade")
         except:
             sys.exit(1)
         # Bind menu signals

[lp:~rockstar/entertainer/filemoves]

263. By Paul Hummer on 2008-06-23

Fixes issues with imports

264. By Paul Hummer on 2008-06-28

Fixes the static paths in the tests so that the tests run regardless of where
the test runner is called

265. By Paul Hummer on 2008-06-28

Fixes Configuration tests

266. By Paul Hummer on 2008-06-28

Fixes lint tests

267. By Paul Hummer on 2008-06-29

Merges from trunk