A new user interface for you! Read more...

File ploader-rename_modules.patch of Package ploader

diff -uNpr src.old/Uploader/GUI/DlgCommon.pm src/Uploader/GUI/DlgCommon.pm
--- src.old/Uploader/GUI/DlgCommon.pm	2010-11-26 10:43:03.503926866 +0100
+++ src/Uploader/GUI/DlgCommon.pm	2010-11-26 10:45:16.087787860 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::DlgCommon;
+package Ploader::Uploader::GUI::DlgCommon;
 use strict;
 use Wx qw/wxDP_ALLOWNONE wxDefaultPosition wxDefaultSize/;
 use Wx::Calendar;
@@ -49,7 +49,7 @@ sub InitHandler {
                               Wx::Event::EVT_TEXT( $ctrl, $ctrl, sub { $self->OnComboBoxText(@_) } );
                           },
         'Wx::DatePickerCtrl' => sub { my ( $ctrl ) = @_; Wx::Event::EVT_DATE_CHANGED( $ctrl, $ctrl, sub { $self->OnDatePicker(@_) } ); },
-        'Uploader::GUI::wxCategoryTreeCtrl' => sub { my ( $ctrl ) = @_;
+        'Ploader::Uploader::GUI::wxCategoryTreeCtrl' => sub { my ( $ctrl ) = @_;
                                                    Wx::Event::EVT_TREE_SEL_CHANGED(
                                                        $ctrl,
                                                        $ctrl,
@@ -289,7 +289,7 @@ my $clear_value = {
     'Wx::TextCtrl' => sub { my ($ctrl) = @_; $ctrl->Clear},
     'Wx::CheckBox' => sub { my ($ctrl) = @_; $ctrl->SetValue(0)},
     'Wx::DatePickerCtrl' => sub { my ($ctrl) = @_; $ctrl->SetValue(Wx::DateTime->new->SetToCurrent)},
-    'Uploader::GUI::wxCategoryTreeCtrl' => sub { my ( $ctrl ) = @_;
+    'Ploader::Uploader::GUI::wxCategoryTreeCtrl' => sub { my ( $ctrl ) = @_;
                                                $ctrl->SelectItem($ctrl->GetRootItem);
                                            },
 };    
diff -uNpr src.old/Uploader/GUI/Frame.pm src/Uploader/GUI/Frame.pm
--- src.old/Uploader/GUI/Frame.pm	2010-05-07 18:37:05.000000000 +0200
+++ src/Uploader/GUI/Frame.pm	2010-11-26 10:45:15.847838787 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::Frame;
+package Ploader::Uploader::GUI::Frame;
 use strict;
 use Data::Dumper;
 use Carp;
@@ -131,15 +131,15 @@ my @properties =
 __PACKAGE__->mk_accessors( @properties );
 
 use Wx::Perl::TextValidator;
-use Uploader::GUI::wxImageListCtrl;
-use Uploader::GUI::wxPropertyListDlg;
-use Uploader::GUI::wxGlobalSettings;
-use Uploader::GUI::wxImagePreview;
-use Uploader::GUI::wxPhotoProperties;
-use Uploader::GUI::wxImageReuploadDlg;
-use Uploader::GUI::wxImageProcessingProgressDlg;
-use Uploader::GUI::wxDestinationCategoryDlg;
-use Uploader::GUI::wxCategoryTreeCtrl;
+use Ploader::Uploader::GUI::wxImageListCtrl;
+use Ploader::Uploader::GUI::wxPropertyListDlg;
+use Ploader::Uploader::GUI::wxGlobalSettings;
+use Ploader::Uploader::GUI::wxImagePreview;
+use Ploader::Uploader::GUI::wxPhotoProperties;
+use Ploader::Uploader::GUI::wxImageReuploadDlg;
+use Ploader::Uploader::GUI::wxImageProcessingProgressDlg;
+use Ploader::Uploader::GUI::wxDestinationCategoryDlg;
+use Ploader::Uploader::GUI::wxCategoryTreeCtrl;
 use utf8;
 $|=1;
 
@@ -218,7 +218,7 @@ sub init_gui_callbacks {
     $self->imagelist->ReuploadCallback(
     sub 
     {
-        Uploader::GUI::wxImageReuploadDlg->new(
+        Ploader::Uploader::GUI::wxImageReuploadDlg->new(
         { 
             title => gettext("Photo update management"),
             properties => 
@@ -685,7 +685,7 @@ sub init_frame {
 
 
     $self->imageviewer(
-        Uploader::GUI::wxImageListCtrl->new( 
+        Ploader::Uploader::GUI::wxImageListCtrl->new( 
             { 
                 parentwnd => $self,
                 imagelist => $self->imagelist,
@@ -697,7 +697,7 @@ sub init_frame {
 
 
     $self->piwigo_photo_properties_dlg (
-        Uploader::GUI::wxPhotoProperties->new(
+        Ploader::Uploader::GUI::wxPhotoProperties->new(
             {
                 parentwnd  => $self,
                 categories => [ @{$self->pwg->categories}],
@@ -794,7 +794,7 @@ sub init_dialogs {
 
 
     $self->exif_dlg(
-        Uploader::GUI::wxPropertyListDlg->new( 
+        Ploader::Uploader::GUI::wxPropertyListDlg->new( 
             { 
                 parentwnd       => $self,
                 properties      => $self->exif_properties,
@@ -805,7 +805,7 @@ sub init_dialogs {
     $self->exif_dlg->Hide;
 
     $self->global_settings_dlg(
-        Uploader::GUI::wxGlobalSettings->new( 
+        Ploader::Uploader::GUI::wxGlobalSettings->new( 
             { 
                 parentwnd       => $self,
                 caption         => gettext("Global settings"),
@@ -816,7 +816,7 @@ sub init_dialogs {
     $self->global_settings_dlg->Hide;
 
     $self->image_preview_dlg(
-        Uploader::GUI::wxImagePreview->new(
+        Ploader::Uploader::GUI::wxImagePreview->new(
             { 
                 parentwnd    => $self,
                 caption      => gettext("Preview"),
@@ -825,7 +825,7 @@ sub init_dialogs {
     );
 
     $self->destination_category_dlg(
-        Uploader::GUI::wxDestinationCategoryDlg->new(
+        Ploader::Uploader::GUI::wxDestinationCategoryDlg->new(
             { 
                 parentwnd    => $self,
                 caption      => gettext("Upload to Piwigo"),
@@ -1202,7 +1202,7 @@ sub SetNewFiles {
     
     $self->progressdlg->Destroy if defined $self->progressdlg;
     $self->progressdlg( 
-        Uploader::GUI::wxImageProcessingProgressDlg->new(
+        Ploader::Uploader::GUI::wxImageProcessingProgressDlg->new(
             { 
                 title => gettext("Image processing progress information"),
                 bt_label => gettext("Cancel image processing"), 
@@ -1688,7 +1688,7 @@ sub ProcessImageSelection {
         
     $self->upload_progressdlg->Destroy if defined $self->upload_progressdlg;
     $self->upload_progressdlg(
-        Uploader::GUI::wxImageProcessingProgressDlg->new(
+        Ploader::Uploader::GUI::wxImageProcessingProgressDlg->new(
             { 
                 title    => gettext("Image upload progress information"),
                 bt_label => gettext("Cancel upload"),
diff -uNpr src.old/Uploader/GUI/Layout/DestinationCategory.pm src/Uploader/GUI/Layout/DestinationCategory.pm
--- src.old/Uploader/GUI/Layout/DestinationCategory.pm	2010-11-26 10:29:46.000000000 +0100
+++ src/Uploader/GUI/Layout/DestinationCategory.pm	2010-11-26 10:45:16.483703833 +0100
@@ -11,7 +11,7 @@ use Wx qw/
              wxDefaultSize
              wxDefaultPosition
          /;
-use Uploader::GUI::wxCategoryTreeCtrl;
+use Ploader::Uploader::GUI::wxCategoryTreeCtrl;
 
 use vars qw($CHOOSE_DESTINATION); $CHOOSE_DESTINATION = 10000;
 use vars qw($DESTINATION_CATEGORIES); $DESTINATION_CATEGORIES = 10001;
@@ -40,7 +40,7 @@ sub DestinationCategory {
 
     $top_sizer->AddWindow( $item1, 0, wxALIGN_LEFT|wxALL, 5 );
     $top_sizer->AddWindow(
-        Uploader::GUI::wxCategoryTreeCtrl->new(
+        Ploader::Uploader::GUI::wxCategoryTreeCtrl->new(
             {
                 parentwnd      => $parent,
                 id             => $main::DESTINATION_CATEGORIES,
diff -uNpr src.old/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm src/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm
--- src.old/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm	2010-11-26 10:29:46.000000000 +0100
+++ src/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm	2010-11-26 10:45:16.583682614 +0100
@@ -4,7 +4,7 @@ use Wx::DateTime;
 use strict;
 use Data::Dumper;
 # Custom source
-use Uploader::GUI::wxChoiceFilteredPanel;
+use Ploader::Uploader::GUI::wxChoiceFilteredPanel;
 
 use Wx qw( wxDefaultSize wxDefaultPosition wxNullAnimation wxNullFont wxBLACK );
 use Wx qw( wxID_OK wxID_APPLY wxID_SAVE wxID_SAVEAS wxID_CANCEL wxID_YES wxID_NO wxID_EXIT wxID_ABOUT wxID_HELP );
@@ -63,7 +63,7 @@ sub PhotoPropertiesCategoriesTags {
     $topsizer->Add( $item1, 2, wxEXPAND|wxALL, 5 );
 
     # the notebook has adaptive size : stretch factor 1, wxEXPAND
-    my ( $tree_categories ) = Uploader::GUI::wxCategoryTreeCtrl->new(
+    my ( $tree_categories ) = Ploader::Uploader::GUI::wxCategoryTreeCtrl->new(
         {
             parentwnd  => $parent,
             id         => $main::PHOTO_PROPERTIES_CATEGORIES,
@@ -98,7 +98,7 @@ sub photo_properties_tags {
     my( $topsizer ) = Wx::BoxSizer->new( wxVERTICAL );
     
     $tags->{parentwnd}=$parent;
-    my( $panel ) = Uploader::GUI::wxChoiceFilteredPanel->new($tags);
+    my( $panel ) = Ploader::Uploader::GUI::wxChoiceFilteredPanel->new($tags);
     # the panel has adaptive size : stretch factor 1, wxEXPAND
     $topsizer->AddWindow( $panel, 1, wxEXPAND|wxALL, 5 );
 
diff -uNpr src.old/Uploader/GUI/Layout/PhotoProperties.pm src/Uploader/GUI/Layout/PhotoProperties.pm
--- src.old/Uploader/GUI/Layout/PhotoProperties.pm	2010-11-26 10:29:46.000000000 +0100
+++ src/Uploader/GUI/Layout/PhotoProperties.pm	2010-11-26 10:45:16.707656303 +0100
@@ -9,7 +9,7 @@ use Wx::DateTime;
 use strict;
 
 # Custom source
-use Uploader::GUI::wxChoiceFilteredPanel;
+use Ploader::Uploader::GUI::wxChoiceFilteredPanel;
 
 use Wx qw( wxDefaultSize wxDefaultPosition wxNullAnimation wxNullFont wxBLACK );
 use Wx qw( wxID_OK wxID_APPLY wxID_SAVE wxID_SAVEAS wxID_CANCEL wxID_YES wxID_NO wxID_EXIT wxID_ABOUT wxID_HELP );
@@ -77,7 +77,7 @@ sub PhotoProperties {
 
     my $tags = $_[1];
     $tags->{parentwnd}=$parent;
-    my( $item13 ) = Uploader::GUI::wxChoiceFilteredPanel->new($tags);
+    my( $item13 ) = Ploader::Uploader::GUI::wxChoiceFilteredPanel->new($tags);
     $item11->AddWindow( $item13, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
     $item1->Add( $item11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
diff -uNpr src.old/Uploader/GUI/wxApp.pm src/Uploader/GUI/wxApp.pm
--- src.old/Uploader/GUI/wxApp.pm	2010-05-07 19:46:58.000000000 +0200
+++ src/Uploader/GUI/wxApp.pm	2010-11-26 10:45:16.283746272 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxApp;
+package Ploader::Uploader::GUI::wxApp;
 use strict;
 use base qw/Wx::App Class::Accessor::Fast/;    
 use Wx qw/
@@ -61,9 +61,9 @@ use Data::Dumper;
 use Storable;
 use File::HomeDir;
 use File::Spec;
-use Uploader::PWG;
-use Uploader::ImageList;
-use Uploader::GUI::wxLoginDlg;
+use Ploader::Uploader::PWG;
+use Ploader::Uploader::ImageList;
+use Ploader::Uploader::GUI::wxLoginDlg;
 use Wx::Locale qw/:default/;
 use utf8;
 
@@ -576,7 +576,7 @@ sub _init_imagelist {
 
 
     $self->imagelist(
-        Uploader::ImageList->new(
+        Ploader::Uploader::ImageList->new(
             $stored_imagelist
         )
     );
@@ -653,7 +653,7 @@ sub Login {
     my ( $self ) = @_;    
 
     $self->login_dlg( 
-        Uploader::GUI::wxLoginDlg->new(
+        Ploader::Uploader::GUI::wxLoginDlg->new(
             {
                 title         => gettext("Piwigo login"),
                 site_url      => sub { $self->site_url(@_) },
@@ -689,7 +689,7 @@ sub Login {
 
     $self->pwg(
         # get these parameters from dialog or from file
-        Uploader::PWG->new(
+        Ploader::Uploader::PWG->new(
             {
                 site_url       => $self->site_url,
                 site_username  => $self->site_username,
diff -uNpr src.old/Uploader/GUI/wxCategoryTreeCtrl.pm src/Uploader/GUI/wxCategoryTreeCtrl.pm
--- src.old/Uploader/GUI/wxCategoryTreeCtrl.pm	2010-03-26 21:04:59.000000000 +0100
+++ src/Uploader/GUI/wxCategoryTreeCtrl.pm	2010-11-26 10:45:16.023801441 +0100
@@ -1,4 +1,4 @@
-package Uploader::GUI::wxCategoryTreeCtrl;
+package Ploader::Uploader::GUI::wxCategoryTreeCtrl;
 use strict;
 use Wx;
 use Wx::DND;
diff -uNpr src.old/Uploader/GUI/wxChoiceFilteredPanel.pm src/Uploader/GUI/wxChoiceFilteredPanel.pm
--- src.old/Uploader/GUI/wxChoiceFilteredPanel.pm	2010-04-01 18:43:37.000000000 +0200
+++ src/Uploader/GUI/wxChoiceFilteredPanel.pm	2010-11-26 10:45:15.879831996 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxChoiceFilteredPanel;
+package Ploader::Uploader::GUI::wxChoiceFilteredPanel;
 use strict;
 use Wx qw/
              wxDefaultSize
@@ -33,7 +33,7 @@ use Wx qw/
              wxEXPAND
          /;
 
-use base qw/Wx::Panel Uploader::Object2/;
+use base qw/Wx::Panel Ploader::Uploader::Object2/;
 use Wx::Locale qw/:default/;
 
 use Data::Dumper;
diff -uNpr src.old/Uploader/GUI/wxDestinationCategoryDlg.pm src/Uploader/GUI/wxDestinationCategoryDlg.pm
--- src.old/Uploader/GUI/wxDestinationCategoryDlg.pm	2010-04-01 16:38:54.000000000 +0200
+++ src/Uploader/GUI/wxDestinationCategoryDlg.pm	2010-11-26 10:45:16.239755608 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxDestinationCategoryDlg;
+package Ploader::Uploader::GUI::wxDestinationCategoryDlg;
 use strict;
 use Wx qw/
              wxDefaultSize
@@ -29,7 +29,7 @@ use Wx qw/
              wxID_CANCEL
              wxID_OK
          /;
-use base qw/Wx::Dialog Uploader::GUI::DlgCommon Class::Accessor::Fast/;
+use base qw/Wx::Dialog Ploader::Uploader::GUI::DlgCommon Class::Accessor::Fast/;
 use Wx::Event qw/
                     EVT_BUTTON
                 /;
@@ -40,7 +40,7 @@ __PACKAGE__->mk_accessors(
       / 
 );
 use Carp;
-use Uploader::GUI::wxCategoryTreeCtrl;
+use Ploader::Uploader::GUI::wxCategoryTreeCtrl;
 
 sub new {
     my ($this, $params) = @_;
diff -uNpr src.old/Uploader/GUI/wxGlobalSettings.pm src/Uploader/GUI/wxGlobalSettings.pm
--- src.old/Uploader/GUI/wxGlobalSettings.pm	2010-04-01 16:38:54.000000000 +0200
+++ src/Uploader/GUI/wxGlobalSettings.pm	2010-11-26 10:45:15.807847274 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxGlobalSettings;
+package Ploader::Uploader::GUI::wxGlobalSettings;
 use strict;
 use Wx qw/
             wxDefaultSize
@@ -43,7 +43,7 @@ use Wx qw/
             wxBK_LEFT
             wxHORIZONTAL
         /;
-use base qw/Wx::Dialog Uploader::GUI::DlgCommon/;
+use base qw/Wx::Dialog Ploader::Uploader::GUI::DlgCommon/;
 use Wx::Locale qw/:default/;
 use Wx::Event qw/
             EVT_CLOSE
diff -uNpr src.old/Uploader/GUI/wxImageListCtrl.pm src/Uploader/GUI/wxImageListCtrl.pm
--- src.old/Uploader/GUI/wxImageListCtrl.pm	2010-03-26 21:25:56.000000000 +0100
+++ src/Uploader/GUI/wxImageListCtrl.pm	2010-11-26 10:45:16.195764944 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxImageListCtrl;
+package Ploader::Uploader::GUI::wxImageListCtrl;
 use strict;
 use Wx;
 use Wx::DND;
diff -uNpr src.old/Uploader/GUI/wxImagePreview.pm src/Uploader/GUI/wxImagePreview.pm
--- src.old/Uploader/GUI/wxImagePreview.pm	2010-04-02 11:39:06.000000000 +0200
+++ src/Uploader/GUI/wxImagePreview.pm	2010-11-26 10:45:16.115781919 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxImagePreview;
+package Ploader::Uploader::GUI::wxImagePreview;
 use strict;
 use base qw/Wx::Dialog Class::Accessor::Fast/;
 use Wx qw/
diff -uNpr src.old/Uploader/GUI/wxImageProcessingProgressDlg.pm src/Uploader/GUI/wxImageProcessingProgressDlg.pm
--- src.old/Uploader/GUI/wxImageProcessingProgressDlg.pm	2010-04-01 16:38:54.000000000 +0200
+++ src/Uploader/GUI/wxImageProcessingProgressDlg.pm	2010-11-26 10:45:15.963814172 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxImageProcessingProgressDlg;
+package Ploader::Uploader::GUI::wxImageProcessingProgressDlg;
 use strict;
 use Wx qw/
              wxDefaultSize
diff -uNpr src.old/Uploader/GUI/wxImageReuploadDlg.pm src/Uploader/GUI/wxImageReuploadDlg.pm
--- src.old/Uploader/GUI/wxImageReuploadDlg.pm	2010-01-28 00:55:45.000000000 +0100
+++ src/Uploader/GUI/wxImageReuploadDlg.pm	2010-11-26 10:45:15.931820962 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxImageReuploadDlg;
+package Ploader::Uploader::GUI::wxImageReuploadDlg;
 use strict;
 use Wx qw/
              wxDefaultSize
@@ -26,8 +26,8 @@ use Wx qw/
              wxID_OK
              wxSTAY_ON_TOP
          /;
-#use base qw/Wx::Dialog Class::Accessor::Fast Uploader::GUI::DlgCommon/;
-use base qw/Wx::Dialog Uploader::GUI::DlgCommon/;
+#use base qw/Wx::Dialog Class::Accessor::Fast Ploader::Uploader::GUI::DlgCommon/;
+use base qw/Wx::Dialog Ploader::Uploader::GUI::DlgCommon/;
 use Wx::Event qw/
                     EVT_BUTTON
                     EVT_CLOSE
diff -uNpr src.old/Uploader/GUI/wxImageView.pm src/Uploader/GUI/wxImageView.pm
--- src.old/Uploader/GUI/wxImageView.pm	2010-01-28 00:55:45.000000000 +0100
+++ src/Uploader/GUI/wxImageView.pm	2010-11-26 10:45:15.743860854 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxImageView;
+package Ploader::Uploader::GUI::wxImageView;
 use Wx qw/wxDefaultPosition wxDefaultSize wxLC_ICON wxIMAGE_LIST_NORMAL wxLC_LIST
                                        wxSUNKEN_BORDER wxLC_EDIT_LABELS/;
 use base qw/Wx::ListCtrl/;
diff -uNpr src.old/Uploader/GUI/wxLoginDlg.pm src/Uploader/GUI/wxLoginDlg.pm
--- src.old/Uploader/GUI/wxLoginDlg.pm	2010-01-28 00:55:45.000000000 +0100
+++ src/Uploader/GUI/wxLoginDlg.pm	2010-11-26 10:45:16.063792954 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxLoginDlg;
+package Ploader::Uploader::GUI::wxLoginDlg;
 use strict;
 use Wx qw/
              wxDefaultSize
diff -uNpr src.old/Uploader/GUI/wxPhotoProperties.pm src/Uploader/GUI/wxPhotoProperties.pm
--- src.old/Uploader/GUI/wxPhotoProperties.pm	2010-04-01 16:23:43.000000000 +0200
+++ src/Uploader/GUI/wxPhotoProperties.pm	2010-11-26 10:45:16.339734389 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxPhotoProperties;
+package Ploader::Uploader::GUI::wxPhotoProperties;
 use strict;
 use Wx qw/
              wxDefaultSize
@@ -27,7 +27,7 @@ use Wx qw/
              wxID_OK
              wxGREEN
          /;
-use base qw/Wx::Panel Uploader::GUI::DlgCommon/;
+use base qw/Wx::Panel Ploader::Uploader::GUI::DlgCommon/;
 use Wx::Event qw/
                     EVT_BUTTON
                     EVT_CLOSE
diff -uNpr src.old/Uploader/GUI/wxPropertyListDlg.pm src/Uploader/GUI/wxPropertyListDlg.pm
--- src.old/Uploader/GUI/wxPropertyListDlg.pm	2010-04-01 16:38:54.000000000 +0200
+++ src/Uploader/GUI/wxPropertyListDlg.pm	2010-11-26 10:45:16.163771735 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::GUI::wxPropertyListDlg;
+package Ploader::Uploader::GUI::wxPropertyListDlg;
 use strict;
 use Wx qw/
              wxDefaultSize
@@ -29,7 +29,7 @@ use Wx qw/
              wxLC_NO_HEADER
          /;
 use Wx::Locale qw/:default/;
-use base qw/Wx::Dialog Uploader::Object2/;
+use base qw/Wx::Dialog Ploader::Uploader::Object2/;
 
 use Data::Dumper;
 __PACKAGE__->mk_accessors(     
diff -uNpr src.old/Uploader/ImageList.pm src/Uploader/ImageList.pm
--- src.old/Uploader/ImageList.pm	2010-05-07 18:37:05.000000000 +0200
+++ src/Uploader/ImageList.pm	2010-11-26 10:45:15.551901594 +0100
@@ -17,14 +17,14 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::ImageList;
+package Ploader::Uploader::ImageList;
 use strict;
 use Carp;
-use base qw/Uploader::Object/;
+use base qw/Ploader::Uploader::Object/;
 use Image::ExifTool qw(:Public);
 use Image::Magick;
 use File::Spec;
-use Uploader::Image;
+use Ploader::Uploader::Image;
 use Data::Dumper;
 use Storable;
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
@@ -220,7 +220,7 @@ sub SetCurrentImage {
     my ( $self, $indx ) = @_;    
 
     $self->current_image(
-        $indx != -1 ? $self->GetImage($indx) : Uploader::Image->new()
+        $indx != -1 ? $self->GetImage($indx) : Ploader::Uploader::Image->new()
     );
 }
 
@@ -315,7 +315,7 @@ sub _add_image {
     if ( !exists $self->image_sums->{$sum} ){
         #print "_add_image ", Dumper $file, "\n";
         # append to image list
-        $image = Uploader::Image->new(
+        $image = Ploader::Uploader::Image->new(
         {
                 file              => $file->{ANSIPathName},
                 file_sum          => $sum,
diff -uNpr src.old/Uploader/Image.pm src/Uploader/Image.pm
--- src.old/Uploader/Image.pm	2010-03-30 14:29:37.000000000 +0200
+++ src/Uploader/Image.pm	2010-11-26 10:45:15.467919419 +0100
@@ -17,9 +17,9 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::Image;
+package Ploader::Uploader::Image;
 use strict;
-use base qw/Uploader::Object/;
+use base qw/Ploader::Uploader::Object/;
 
 __PACKAGE__->mk_accessors(
     qw/
diff -uNpr src.old/Uploader/Object2.pm src/Uploader/Object2.pm
--- src.old/Uploader/Object2.pm	2010-01-28 00:55:45.000000000 +0100
+++ src/Uploader/Object2.pm	2010-11-26 10:45:15.423928754 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::Object2;
+package Ploader::Uploader::Object2;
 use strict;
 
 use Data::Dumper;
diff -uNpr src.old/Uploader/Object.pm src/Uploader/Object.pm
--- src.old/Uploader/Object.pm	2010-01-28 00:55:45.000000000 +0100
+++ src/Uploader/Object.pm	2010-11-26 10:45:15.603890561 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::Object;
+package Ploader::Uploader::Object;
 use strict;
 use Data::Dumper;
 use Storable;
diff -uNpr src.old/Uploader/PWG/Categories.pm src/Uploader/PWG/Categories.pm
--- src.old/Uploader/PWG/Categories.pm	2010-04-26 02:29:29.000000000 +0200
+++ src/Uploader/PWG/Categories.pm	2010-11-26 10:45:15.643882073 +0100
@@ -17,12 +17,12 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::PWG::Categories;
+package Ploader::Uploader::PWG::Categories;
 use strict;
 use Data::Dumper;
 use Wx::Locale qw/:default/;
 use base qw/
-           Uploader::Object
+           Ploader::Uploader::Object
            Class::Accessor::Fast
            /;
 
diff -uNpr src.old/Uploader/PWG/WebServices.pm src/Uploader/PWG/WebServices.pm
--- src.old/Uploader/PWG/WebServices.pm	2010-05-06 22:40:05.000000000 +0200
+++ src/Uploader/PWG/WebServices.pm	2010-11-26 10:45:15.703869341 +0100
@@ -17,7 +17,7 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::PWG::WebServices;
+package Ploader::Uploader::PWG::WebServices;
  
 use strict;
 use warnings;
@@ -30,7 +30,7 @@ use File::Slurp;
 use File::Spec;
 use POSIX qw(ceil floor);
 use base qw/
-           Uploader::Object
+           Ploader::Uploader::Object
            Class::Accessor::Fast
            /;
 
diff -uNpr src.old/Uploader/PWG.pm src/Uploader/PWG.pm
--- src.old/Uploader/PWG.pm	2010-05-06 22:40:05.000000000 +0200
+++ src/Uploader/PWG.pm	2010-11-26 10:45:15.519908384 +0100
@@ -17,16 +17,16 @@
 # | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 # | USA.                                                                  |
 # +-----------------------------------------------------------------------+
-package Uploader::PWG;
+package Ploader::Uploader::PWG;
 use strict;
 use Data::Dumper;
-use Uploader::PWG::WebServices;
-use Uploader::PWG::Categories;
+use Ploader::Uploader::PWG::WebServices;
+use Ploader::Uploader::PWG::Categories;
 use base qw/
-           Uploader::Object
+           Ploader::Uploader::Object
            Class::Accessor::Fast
-           Uploader::PWG::WebServices
-           Uploader::PWG::Categories
+           Ploader::Uploader::PWG::WebServices
+           Ploader::Uploader::PWG::Categories
            /;
 
 __PACKAGE__->mk_accessors(