Changeset 4632 for extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

Timestamp:

Jan 8, 2010, 4:41:15 PM (14 years ago)

Author:

ronosman

Message:

Feature 1369 added : no longer use relative path to access resource and locale directories.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm (modified) (8 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -113 +113 @@
           privacy_level
           user_defined_properties
+          bin_dir
+          resource_dir
+          locale_dir
       / 
 );
@@ -124 +127 @@
 }
 
+# not very clean but :
+# at that moment, object is not yet instanciated
+# only way : class variable
+my $bin_dir;
+my $resource_dir;
+my $locale_dir;
+sub new {
+    my ( $self, $params ) = @_;
+
+    $bin_dir = $params->{bin_dir}||'.';
+    $locale_dir = $params->{locale_dir}||'.';
+    $resource_dir = $params->{resource_dir}||'.';
+
+    $self->SUPER::new();
+}
 
 sub OnInit {
     my( $self ) = @_;
-    
+
+    $self->bin_dir(
+        $bin_dir
+    );
+
+    $self->locale_dir(
+        $locale_dir
+    );
+
+    $self->resource_dir(
+        $resource_dir
+    );
+
     $self->version(
         '2.0.7b'
@@ -178 +208 @@
     }
     else {
-        $self->_readParams( 'pLoader.ini' ) unless defined $conf ;
-    }
-
-    $self->_read_default_user_properties( 'properties.ini' ) ;
+        $self->_readParams( $self->bin_path('pLoader.ini') ) unless defined $conf ;
+    }
+
+    $self->_read_default_user_properties( $self->bin_path('properties.ini') ) ;
 
     $self->site_url(
@@ -233 +263 @@
 }
 
+
+# helper method to get the full path for a resource
+sub resource_path{
+    my ( $self, $file ) = @_;
+
+    File::Spec->catfile($self->bin_dir, '..', $self->resource_dir, $file);
+}
+
+sub bin_path{
+    my ( $self, $file ) = @_;
+
+    File::Spec->catfile($self->bin_dir, $file);
+}
+
+sub locale_path{
+    my ( $self, $file ) = @_;
+
+    File::Spec->catfile($self->bin_dir, '..', $self->locale_dir, $file);
+}
+
+sub locale_catalog_path{
+    my ( $self, $file ) = @_;
+
+    File::Spec->catfile($self->bin_dir, '..', $self->locale_dir, $self->locale->GetCanonicalName, $file);
+}
+
 sub _set_stored_layout {
     my ( $self ) = @_;
@@ -360 +416 @@
                             if(Wx::Locale::IsAvailable($_->[1])){
                             my $locale = Wx::Locale->new($_->[1]);
-                            $locale->AddCatalogLookupPathPrefix('../locale');
+                            $locale->AddCatalogLookupPathPrefix(
+                        File::Spec->catfile($self->bin_dir, '..', $self->locale_dir)
+                    );
                             $_ if $locale->AddCatalog('pLoader');
                                 }
@@ -407 +465 @@
         $self->current_language
     );
-    $locale->AddCatalogLookupPathPrefix( '../locale');
+    $locale->AddCatalogLookupPathPrefix(
+        File::Spec->catfile($self->bin_dir, '..', $self->locale_dir)
+    );
     if(!$locale->AddCatalog( 'pLoader.mo' )){
         Wx::LogMessage gettext("Cannot find translation catalog files for %s. Use default language"), $locale->GetCanonicalName();
@@ -592 +652 @@
 
     my $icon = Wx::Icon->new();
-    $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
+    $icon->LoadFile(
+        File::Spec->catfile($self->bin_dir, '..', 'res', 'favicon.ico'), 
+        wxBITMAP_TYPE_ICO
+    );
     $self->login_dlg->SetIcon($icon);   
 
@@ -934 +997 @@
 
     my $icon = Wx::Icon->new();
-    $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
+    $icon->LoadFile(
+        File::Spec->catfile(
+            $self->bin_dir, '..', 'res', 'favicon.ico'
+        ), 
+        wxBITMAP_TYPE_ICO
+    );
     $self->frame->SetIcon($icon);       
 }