Changeset 2618 for extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm

Timestamp:

Sep 28, 2008, 11:35:44 AM (16 years ago)

Author:

ronosman

Message:

Bugs fixed :

• Crash when uploading or deleting without selection. Add selection test and catch exceptions.
• Piwigo login errors are not logged. Add a message box for login return status + "Not connected" message in title bar.
• Global settings view and Photo properties view : Update buttons are not always visible. Change label to "Save" and left align
• Missing resource for notebook cause "can't load file errors". Now catch these exceptions.
• Missing libraries for Image Magick ( not detected by dependency scan ). Add them in build script.

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm (modified) (4 diffs)

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

@@ -35 +35 @@
              wxFRAME_NO_TASKBAR wxSTAY_ON_TOP
              wxWHITE
+             wxICON_EXCLAMATION
+             wxOK 
          /;
 use Uploader::GUI::wxFrameAUI;
@@ -45 +47 @@
 use Uploader::ImageList;
 use Uploader::GUI::wxLoginDlg;
+
 $|=1;
 
@@ -114 +117 @@
 
     my $ok = $self->Login();
+    # user pressed OK
     if($ok){
-
-
-    $self->pwg(
-        # get these parameters from dialog or from file
-        Uploader::PWG->new(
-            {
-                site_url       => $self->site_url,
-                site_username  => $self->site_username,
-                site_password  => $self->site_password,
-            }
-        )
-    );
-    
-
-    $self->_init_imagelist;
-    $self->_init_thumbimagelist;
-    
-    $self->_init_frame;
+        $self->pwg(
+            # get these parameters from dialog or from file
+            Uploader::PWG->new(
+                {
+                    site_url       => $self->site_url,
+                    site_username  => $self->site_username,
+                    site_password  => $self->site_password,
+                }
+            )
+        );
+      
+    
+        $self->_init_imagelist;
+        $self->_init_thumbimagelist;
+        
+        $self->_init_frame;
     }
 
@@ -326 +328 @@
 
 sub _init_frame {
-        my ( $self ) = @_ ;     
-
-        my $config = Wx::ConfigBase::Get;
-
-        my $x = $config->ReadInt( "X", 50 );
-        my $y = $config->ReadInt( "Y", 50 );
-        my $w = $config->ReadInt( "Width", 800 );
-        my $h = $config->ReadInt( "height", 600 );
-        my $sv = $config->ReadInt( "splitVertical", 150 );
-        my $sh = $config->ReadInt( "splitHorizontal", 300 );
-        
-
-        my $url = $self->site_url || "Not attached to a Piwigo site";
-
-        my ( $frame ) = Uploader::GUI::wxFrameAUI->new( 
-            {
-                x              => $x,
-                y              => $y,
-                width          => $w,
-                height         => $h,
-                title          => "pLoader - Piwigo uploader - [$url]" ,
-                pwg            => $self->pwg,
-                imagelist      => $self->imagelist,
-            }
-        );
+    my ( $self ) = @_ ; 
+
+    my $config = Wx::ConfigBase::Get;
+
+    my $x = $config->ReadInt( "X", 50 );
+    my $y = $config->ReadInt( "Y", 50 );
+    my $w = $config->ReadInt( "Width", 1024 );
+    my $h = $config->ReadInt( "height", 768 );
+    my $sv = $config->ReadInt( "splitVertical", 150 );
+    my $sh = $config->ReadInt( "splitHorizontal", 300 );
+        
+    my $url;
+    if($self->pwg->login_result->{stat} eq 'ok'){
+        $url = $self->site_url;    
+    }
+    else{
+        $url = "Not connected";
+        Wx::MessageBox( 
+            sprintf(
+                "%s\n\nConnection to %s failed",
+                $self->pwg->login_result->{message},
+                $self->site_url,
+            ),
+            "Piwigo login error",
+            wxOK | wxICON_EXCLAMATION, 
+        );
+    }   
+        
+
+    my ( $frame ) = Uploader::GUI::wxFrameAUI->new( 
+        {
+            x         => $x,
+            y         => $y,
+            width     => $w,
+            height    => $h,
+            title     => "pLoader - Piwigo uploader - [$url]" ,
+            pwg       => $self->pwg,
+            imagelist => $self->imagelist,
+        }
+    );
         
         #printf("Config x %s, y %s, w %s, h %s\n", $x, $y, $w, $h);
         #$frame->SetSize( $x, $y, $w, $h );
-        $frame->Show( 1 );
-        $self->SetTopWindow( $frame );
-
-        my $icon = Wx::Icon->new();
-        $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
-        $frame->SetIcon($icon); 
-
-
-        return 1;
+    $frame->Show( 1 );
+    $self->SetTopWindow( $frame );
+
+    my $icon = Wx::Icon->new();
+    $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
+    $frame->SetIcon($icon);     
+
+
+    return 1;
 }