Changeset 4632 for extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.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/wxFrameAUI.pm (modified) (17 diffs)

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

@@ -814 +814 @@
     my ( $self ) = @_;    
 
-    my $file = sprintf(
-        "../locale/%s/gs.html",
-        wxTheApp->locale->GetCanonicalName
-    );
+    my $file = wxTheApp->locale_catalog_path('gs.html');
 
     $self->htmlhome(
@@ -1048 +1045 @@
         }
         (
-          '../res/tree_pwg.png',
-          '../res/tree_folder.png',
+          wxTheApp->resource_path('tree_pwg.png'),
+          wxTheApp->resource_path('tree_folder.png'),
         )    
     ];
@@ -1186 +1183 @@
             "",
             "",
-            '../res/mnu_folder_new.png',
+            wxTheApp->resource_path('mnu_folder_new.png'),
         ],
         [
@@ -1198 +1195 @@
                 wxTheApp->branding->{category},
             ),
-            '../res/mnu_folder_new.png',
+            wxTheApp->resource_path('mnu_folder_new.png'),
         ],
         [
@@ -1207 +1204 @@
                 wxTheApp->branding->{category},
             ),
-            '../res/mnu_refresh.png',
+            wxTheApp->resource_path('mnu_refresh.png'),
         ],
         [
@@ -1216 +1213 @@
                 wxTheApp->branding->{category},
             ),
-            '../res/mnu_expandall.png',
+            wxTheApp->resource_path('mnu_expandall.png'),
         ],
         [
@@ -1225 +1222 @@
                 wxTheApp->branding->{category},
             ),
-            '../res/mnu_collapseall.png',
+            wxTheApp->resource_path('mnu_collapseall.png'),
         ],
     );
@@ -1251 +1248 @@
             "",
             "",
-            '../res/mnu_properties.png',
+            wxTheApp->resource_path('mnu_properties.png'),
         ],
         [
@@ -1257 +1254 @@
             gettext("Properties"),
             gettext("Modify photo properties"),
-            '../res/mnu_properties.png',
+            wxTheApp->resource_path('mnu_properties.png'),
         ],
         [
@@ -1263 +1260 @@
             gettext("Preview"),
             gettext("Display photo preview"),
-            '../res/mnu_preview.png',
+            wxTheApp->resource_path('mnu_preview.png'),
         ],
     );
@@ -1957 +1954 @@
             100, 
             gettext("Getting started"), 
-            '../res/tb_getting_started.png', 
+            wxTheApp->resource_path('tb_getting_started.png'), 
             wxBITMAP_TYPE_PNG, 
             1, 
-            '../res/tb_getting_started.png', 
+            wxTheApp->resource_path('tb_getting_started.png'), 
             gettext("Display getting started panel")
         ],
@@ -1966 +1963 @@
             101, 
             gettext("Add photo to selection"), 
-            '../res/tb_add.png', 
+            wxTheApp->resource_path('tb_add.png'), 
             wxBITMAP_TYPE_PNG, 
             1, 
-            '../res/tb_add.png', 
+            wxTheApp->resource_path('tb_add.png'), 
             gettext("Add photo to selection for resizing and uploading")
         ],
@@ -1975 +1972 @@
             102, 
             gettext("Remove photo from selection"), 
-            '../res/tb_remove.png', 
+            wxTheApp->resource_path('tb_remove.png'), 
             wxBITMAP_TYPE_PNG, 
             1, 
-            '../res/tb_remove.png',
+            wxTheApp->resource_path('tb_remove.png'),
             gettext("Remove photo from selection. Files are not deleted ")
         ],
@@ -1984 +1981 @@
             103, 
             gettext("Upload to Piwigo"), 
-            '../res/tb_upload.png', 
+            wxTheApp->resource_path('tb_upload.png'), 
             wxBITMAP_TYPE_PNG, 
             wxTheApp->use_offline ? 0 : 1, 
-            '../res/tb_upload.png',
+            wxTheApp->resource_path('tb_upload.png'),
             gettext("Upload photos to Piwigo.")
         ],
@@ -1993 +1990 @@
             104, 
             gettext("Global settings"), 
-            '../res/tb_settings.png', 
+            wxTheApp->resource_path('tb_settings.png'), 
             wxBITMAP_TYPE_PNG, 
             0, 
-            '../res/tb_settings.png',
+            wxTheApp->resource_path('tb_settings.png'),
             gettext("Change global settings.")
         ],
@@ -2002 +1999 @@
             105, 
             gettext("Language choice"), 
-            '../res/tb_i18n.png', 
+            wxTheApp->resource_path('tb_i18n.png'), 
             wxBITMAP_TYPE_PNG, 
             1, 
-            '../res/tb_i18n.png',
+            wxTheApp->resource_path('tb_i18n.png'),
             gettext("Language choice")
         ],
@@ -2169 +2166 @@
 }
 
+
 1;