Changeset 2618


Ignore:
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.
Location:
extras/pLoader/trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • extras/pLoader/trunk/build/par_options.txt

    r2597 r2618  
    2121
    2222-M attributes.pm
     23-l C:/strawberry/perl/site/lib/Alien/wxWidgets/msw_2_8_8_uni_mslu_gcc_3_4/lib/mingwm10.dll
    2324-l C:/strawberry/perl/site/lib/Alien/wxWidgets/msw_2_8_8_uni_mslu_gcc_3_4/lib/wxmsw28u_adv_gcc_custom.dll
    2425-l C:/strawberry/perl/site/lib/Alien/wxWidgets/msw_2_8_8_uni_mslu_gcc_3_4/lib/wxmsw28u_qa_gcc_custom.dll
    … …  
    2930-l C:/strawberry/perl/site/lib/Alien/wxWidgets/msw_2_8_8_uni_mslu_gcc_3_4/lib/wxmsw28u_core_gcc_custom.dll
    3031-l C:/strawberry/perl/site/lib/Alien/wxWidgets/msw_2_8_8_uni_mslu_gcc_3_4/lib/wxbase28u_gcc_custom.dll
     32-l C:/strawberry/perl/site/lib/auto/Image/Magick/delegates.xml
     33-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_vicar_.dll
     34-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mpeg_.dll
     35-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_x_.dll
     36-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ept_.dll
     37-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_sun_.dll
     38-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_png_.dll
     39-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_wpg_.dll
     40-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pdb_.dll
     41-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_txt_.dll
     42-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_cip_.dll
     43-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xpm_.dll
     44-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xtrn_.dll
     45-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pwp_.dll
     46-l C:/strawberry/perl/site/lib/auto/Image/Magick/type.xml
     47-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_Magick++_.dll
     48-l C:/strawberry/perl/site/lib/auto/Image/Magick/X11.dll
     49-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_cin_.dll
     50-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_raw_.dll
     51-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pix_.dll
     52-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dib_.dll
     53-l C:/strawberry/perl/site/lib/auto/Image/Magick/Xext.dll
     54-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_plasma_.dll
     55-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_fax_.dll
     56-l C:/strawberry/perl/site/lib/auto/Image/Magick/configure.xml
     57-l C:/strawberry/perl/site/lib/auto/Image/Magick/magic.xml
     58-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_sfw_.dll
     59-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_map_.dll
     60-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_magick_.dll
     61-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pdf_.dll
     62-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_clip_.dll
     63-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_url_.dll
     64-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_rgb_.dll
     65-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_scr_.dll
     66-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_locale_.dll
     67-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_art_.dll
     68-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_tiff_.dll
     69-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_jpeg_.dll
     70-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_thumbnail_.dll
     71-l C:/strawberry/perl/site/lib/auto/Image/Magick/analyze.dll
     72-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_gray_.dll
     73-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_xlib_.dll
     74-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_jp2_.dll
     75-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_braille_.dll
     76-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ps3_.dll
     77-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_jbig_.dll
     78-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_tim_.dll
     79-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_rla_.dll
     80-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pnm_.dll
     81-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xwd_.dll
     82-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pcd_.dll
     83-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pcl_.dll
     84-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_rle_.dll
     85-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_cmyk_.dll
     86-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_svg_.dll
     87-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_histogram_.dll
     88-l C:/strawberry/perl/site/lib/auto/Image/Magick/thresholds.xml
     89-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_magick_.dll
     90-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_djvu_.dll
     91-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_label_.dll
     92-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_gif_.dll
     93-l C:/strawberry/perl/site/lib/auto/Image/Magick/Magick.dll
     94-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ps_.dll
     95-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mpc_.dll
     96-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_wbmp_.dll
     97-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_tga_.dll
     98-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mpr_.dll
     99-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mvg_.dll
     100-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_jbig_.dll
     101-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dpx_.dll
     102-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_viff_.dll
     103-l C:/strawberry/perl/site/lib/auto/Image/Magick/log.xml
     104-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_logo_.dll
     105-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dcm_.dll
     106-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_wand_.dll
     107-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dng_.dll
     108-l C:/strawberry/perl/site/lib/auto/Image/Magick/coder.xml
     109-l C:/strawberry/perl/site/lib/auto/Image/Magick/english.xml
     110-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_miff_.dll
     111-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_msl_.dll
     112-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_html_.dll
     113-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xbm_.dll
     114-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_exr_.dll
     115-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_jpeg_.dll
     116-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_avs_.dll
     117-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pict_.dll
     118-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_jp2_.dll
     119-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ycbcr_.dll
     120-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_emf_.dll
     121-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_topol_.dll
     122-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pcx_.dll
     123-l C:/strawberry/perl/site/lib/auto/Image/Magick/autosplit.ix
     124-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_zlib_.dll
     125-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xc_.dll
     126-l C:/strawberry/perl/site/lib/auto/Image/Magick/locale.xml
     127-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_cut_.dll
     128-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_uyvy_.dll
     129-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mat_.dll
     130-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_libxml_.dll
     131-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_meta_.dll
     132-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_matte_.dll
     133-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_uil_.dll
     134-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_caption_.dll
     135-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xps_.dll
     136-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mtv_.dll
     137-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_fpx_.dll
     138-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_yuv_.dll
     139-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_mono_.dll
     140-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ps2_.dll
     141-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_lcms_.dll
     142-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_sgi_.dll
     143-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_otb_.dll
     144-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_palm_.dll
     145-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_vid_.dll
     146-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_sct_.dll
     147-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_bmp_.dll
     148-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_clipboard_.dll
     149-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_tiff_.dll
     150-l C:/strawberry/perl/site/lib/auto/Image/Magick/colors.xml
     151-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_tile_.dll
     152-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_cineon_.dll
     153-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dps_.dll
     154-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_xcf_.dll
     155-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dot_.dll
     156-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_gradient_.dll
     157-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_fits_.dll
     158-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_avi_.dll
     159-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_psd_.dll
     160-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_bzlib_.dll
     161-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_ttf_.dll
     162-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_wmf_.dll
     163-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_stegano_.dll
     164-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_preview_.dll
     165-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_info_.dll
     166-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_null_.dll
     167-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_pattern_.dll
     168-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_icon_.dll
     169-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ttf_.dll
     170-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_ipl_.dll
     171-l C:/strawberry/perl/site/lib/auto/Image/Magick/CORE_RL_png_.dll
     172-l C:/strawberry/perl/site/lib/auto/Image/Magick/IM_MOD_RL_dds_.dll
     173-l C:/strawberry/perl/site/lib/auto/Image/Magick/type-ghostscript.xml
    31174-a "C:/strawberry/perl/site/lib/File/HomeDir/Windows.pm;lib/File/HomeDir/Windows.pm"
    32175-a "C:/strawberry/perl/site/lib/File/HomeDir/Darwin.pm;lib/File/HomeDir/Darwin.pm"

  • extras/pLoader/trunk/res/global_settings_wdr.pl

    r2597 r2618  
    6262    $item1->AddWindow( $item11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    6363
    64     my( $item12 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "", wxDefaultPosition, wxDefaultSize, 0 );
    65     $item1->AddWindow( $item12, 0, wxALIGN_CENTER|wxALL, 5 );
     64    $item1->AddSpace( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
    6665
    67     my( $item13 ) = Wx::BoxSizer->new( wxHORIZONTAL );
     66    my( $item12 ) = Wx::BoxSizer->new( wxHORIZONTAL );
    6867   
    69     my( $item14 ) = Wx::Button->new( $_[0], $main::ID_GLOBAL_OK, "Update", wxDefaultPosition, wxDefaultSize, 0 );
    70     $item14->SetDefault();
    71     $item13->AddWindow( $item14, 0, wxALIGN_CENTER|wxALL, 5 );
     68    my( $item13 ) = Wx::Button->new( $_[0], $main::ID_GLOBAL_OK, "Save", wxDefaultPosition, wxDefaultSize, 0 );
     69    $item13->SetDefault();
     70    $item12->AddWindow( $item13, 0, wxALIGN_CENTER|wxALL, 5 );
    7271
    73     my( $item15 ) = Wx::Button->new( $_[0], $main::ID_GLOBAL_CANCEL, "Cancel", wxDefaultPosition, wxDefaultSize, 0 );
    74     $item13->AddWindow( $item15, 0, wxALIGN_CENTER|wxALL, 5 );
     72    my( $item14 ) = Wx::Button->new( $_[0], $main::ID_GLOBAL_CANCEL, "Cancel", wxDefaultPosition, wxDefaultSize, 0 );
     73    $item12->AddWindow( $item14, 0, wxALIGN_CENTER|wxALL, 5 );
    7574
    76     $item1->Add( $item13, 0, wxALIGN_CENTER|wxALL, 5 );
     75    $item1->Add( $item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    7776
    7877    $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

  • extras/pLoader/trunk/res/photo_properties_wdr.pl

    r2597 r2618  
    5555    $item1->AddWindow( $item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    5656
    57     my( $item10 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "", wxDefaultPosition, wxDefaultSize, 0 );
    58     $item1->AddWindow( $item10, 0, wxALIGN_CENTER|wxALL, 5 );
     57    $item1->AddSpace( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
    5958
    60     my( $item11 ) = Wx::BoxSizer->new( wxHORIZONTAL );
     59    my( $item10 ) = Wx::BoxSizer->new( wxHORIZONTAL );
    6160   
    62     my( $item12 ) = Wx::Button->new( $_[0], $main::ID_PHOTO_OK, "Update", wxDefaultPosition, wxDefaultSize, 0 );
    63     $item12->SetDefault();
    64     $item11->AddWindow( $item12, 0, wxALIGN_CENTER|wxALL, 5 );
     61    my( $item11 ) = Wx::Button->new( $_[0], $main::ID_PHOTO_OK, "Save", wxDefaultPosition, wxDefaultSize, 0 );
     62    $item11->SetDefault();
     63    $item10->AddWindow( $item11, 0, wxALIGN_CENTER|wxALL, 5 );
    6564
    66     my( $item13 ) = Wx::Button->new( $_[0], $main::ID_PHOTO_CANCEL, "Cancel", wxDefaultPosition, wxDefaultSize, 0 );
    67     $item11->AddWindow( $item13, 0, wxALIGN_CENTER|wxALL, 5 );
     65    my( $item12 ) = Wx::Button->new( $_[0], $main::ID_PHOTO_CANCEL, "Cancel", wxDefaultPosition, wxDefaultSize, 0 );
     66    $item10->AddWindow( $item12, 0, wxALIGN_CENTER|wxALL, 5 );
    6867
    69     $item1->Add( $item11, 0, wxALIGN_CENTER|wxALL, 5 );
     68    $item1->Add( $item10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    7069
    7170    $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

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

    r2597 r2618  
    3535             wxFRAME_NO_TASKBAR wxSTAY_ON_TOP
    3636             wxWHITE
     37             wxICON_EXCLAMATION
     38             wxOK
    3739         /;
    3840use Uploader::GUI::wxFrameAUI;
    … …  
    4547use Uploader::ImageList;
    4648use Uploader::GUI::wxLoginDlg;
     49
    4750$|=1;
    4851
    … …  
    114117
    115118    my $ok = $self->Login();
     119    # user pressed OK
    116120    if($ok){
    117 
    118 
    119     $self->pwg(
    120         # get these parameters from dialog or from file
    121         Uploader::PWG->new(
    122             {
    123                 site_url       => $self->site_url,
    124                 site_username  => $self->site_username,
    125                 site_password  => $self->site_password,
    126             }
    127         )
    128     );
    129    
    130 
    131     $self->_init_imagelist;
    132     $self->_init_thumbimagelist;
    133    
    134     $self->_init_frame;
     121        $self->pwg(
     122            # get these parameters from dialog or from file
     123            Uploader::PWG->new(
     124                {
     125                    site_url       => $self->site_url,
     126                    site_username  => $self->site_username,
     127                    site_password  => $self->site_password,
     128                }
     129            )
     130        );
     131     
     132   
     133        $self->_init_imagelist;
     134        $self->_init_thumbimagelist;
     135       
     136        $self->_init_frame;
    135137    }
    136138
    … …  
    326328
    327329sub _init_frame {
    328         my ( $self ) = @_ ;     
    329 
    330         my $config = Wx::ConfigBase::Get;
    331 
    332         my $x = $config->ReadInt( "X", 50 );
    333         my $y = $config->ReadInt( "Y", 50 );
    334         my $w = $config->ReadInt( "Width", 800 );
    335         my $h = $config->ReadInt( "height", 600 );
    336         my $sv = $config->ReadInt( "splitVertical", 150 );
    337         my $sh = $config->ReadInt( "splitHorizontal", 300 );
    338        
    339 
    340         my $url = $self->site_url || "Not attached to a Piwigo site";
    341 
    342         my ( $frame ) = Uploader::GUI::wxFrameAUI->new(
    343             {
    344                 x              => $x,
    345                 y              => $y,
    346                 width          => $w,
    347                 height         => $h,
    348                 title          => "pLoader - Piwigo uploader - [$url]" ,
    349                 pwg            => $self->pwg,
    350                 imagelist      => $self->imagelist,
    351             }
    352         );
     330    my ( $self ) = @_ ;
     331
     332    my $config = Wx::ConfigBase::Get;
     333
     334    my $x = $config->ReadInt( "X", 50 );
     335    my $y = $config->ReadInt( "Y", 50 );
     336    my $w = $config->ReadInt( "Width", 1024 );
     337    my $h = $config->ReadInt( "height", 768 );
     338    my $sv = $config->ReadInt( "splitVertical", 150 );
     339    my $sh = $config->ReadInt( "splitHorizontal", 300 );
     340       
     341    my $url;
     342    if($self->pwg->login_result->{stat} eq 'ok'){
     343        $url = $self->site_url;   
     344    }
     345    else{
     346        $url = "Not connected";
     347        Wx::MessageBox(
     348            sprintf(
     349                "%s\n\nConnection to %s failed",
     350                $self->pwg->login_result->{message},
     351                $self->site_url,
     352            ),
     353            "Piwigo login error",
     354            wxOK | wxICON_EXCLAMATION,
     355        );
     356    }   
     357       
     358
     359    my ( $frame ) = Uploader::GUI::wxFrameAUI->new(
     360        {
     361            x         => $x,
     362            y         => $y,
     363            width     => $w,
     364            height    => $h,
     365            title     => "pLoader - Piwigo uploader - [$url]" ,
     366            pwg       => $self->pwg,
     367            imagelist => $self->imagelist,
     368        }
     369    );
    353370       
    354371        #printf("Config x %s, y %s, w %s, h %s\n", $x, $y, $w, $h);
    355372        #$frame->SetSize( $x, $y, $w, $h );
    356         $frame->Show( 1 );
    357         $self->SetTopWindow( $frame );
    358 
    359         my $icon = Wx::Icon->new();
    360         $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
    361         $frame->SetIcon($icon);
    362 
    363 
    364         return 1;
     373    $frame->Show( 1 );
     374    $self->SetTopWindow( $frame );
     375
     376    my $icon = Wx::Icon->new();
     377    $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
     378    $frame->SetIcon($icon);     
     379
     380
     381    return 1;
    365382}
    366383

  • extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

    r2597 r2618  
    5656             wxTR_HIDE_ROOT
    5757             wxTR_HAS_BUTTONS
     58             wxMAXIMIZE
    5859         /;
    5960use base qw/Wx::Frame Class::Accessor::Fast/;
    … …  
    116117                                      [ $params->{x}, $params->{y} ],
    117118                                      [ $params->{width}, $params->{height} ],
    118                                       wxDEFAULT_FRAME_STYLE
     119                                      wxDEFAULT_FRAME_STYLE|wxMAXIMIZE
    119120                                   );
    120121    $self->pwg( $params->{pwg} );
    … …  
    365366        ],
    366367        [
    367             $self->logwnd( $self->_create_textctrl( $book, undef, [300, 450] )),
     368            $self->logwnd( $self->_create_textctrl( $book, undef, [450, 450] )),
    368369            "Log",
    369370            '../res/nb_log.png',
    … …  
    382383sub create_notebook_image_properties {
    383384    my( $self ) = @_;
    384     my $book = Wx::AuiNotebook->new( $self, -1, [-1, -1], [300, 450],
     385    my $book = Wx::AuiNotebook->new( $self, -1, [-1, -1], [450, 450],
    385386                                     wxBORDER_NONE|wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT);
    386387    my $pages = [   
    … …  
    404405sub create_notebook_global_settings {
    405406    my( $self ) = @_;
    406     my $book = Wx::AuiNotebook->new( $self, -1, [-1, -1], [300, 450],
     407    my $book = Wx::AuiNotebook->new( $self, -1, [-1, -1], [450, 450],
    407408                                     wxBORDER_NONE|wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT);
    408409    my $pages = [   
    … …  
    577578}
    578579
    579 sub ResizeTo {
    580   my( $image, $size ) = @_;
    581 
    582   if( $image->GetWidth != $size || $image->GetHeight != $size ) {
    583     return Wx::Bitmap->new
    584       ( Wx::Image->new( $image )->Rescale( $size, $size ) );
    585   }
    586 
    587   return $image;
    588 }
    589580
    590581
    … …  
    596587    map {
    597588        my $icon = Wx::Icon->new();
    598         eval { $icon->LoadFile($_->[2], $_->[3]) ; };
     589        eval { $icon->LoadFile($_->[2], $_->[3]) ; }
     590            if defined $_->[2];
    599591        my $nb_icon = Wx::Bitmap->new( $icon );
    600592        defined $position ?
    … …  
    825817
    826818    if( scalar @{$self->imagelist->categories} ){
    827         #$self->imagelist->category_id(
    828         #    $self->category->{id}
    829         #);
    830 
     819        return if( !defined $self->imagelist->image_selection );
     820        return if( !scalar @{$self->imagelist->image_selection} );
     821       
    831822        $self->upload_progressdlg(
    832823            Uploader::GUI::wxImageProcessingProgressDlg->new(

  • extras/pLoader/trunk/src/Uploader/ImageList.pm

    r2597 r2618  
    230230   
    231231    return if (! scalar @{$self->images} );
     232    return if (! defined $self->image_selection );
    232233   
    233234    # higher first, to keep same indexes during remove
    234235    my @images = reverse @{$self->image_selection};     
    235236    map {
    236         print "removing ", $_, "\n";
    237237        my $image = $self->images->[$_]->file;
    238238        delete $self->images_h->{$image};
    … …  
    242242    }
    243243    @images;
     244   
     245    # clear image selection
     246    $self->image_selection([]);
    244247}
    245248
    … …  
    270273    warn "$status" if $status ;
    271274
    272     #$status = $image->Set(Gravity=>"Center");
    273     #warn "$status" if $status ;
     275    $status = $image->Set(Gravity=>"Center");
     276    warn "$status" if $status ;
    274277
    275278    $image->Extent(
    … …  
    520523    );
    521524
    522 
    523 
    524525    my $count = 1;
    525526    map {
    … …  
    574575       
    575576    }
    576     @{$self->image_selection};
     577    @{$self->image_selection} if defined
     578        $self->image_selection;
    577579}
    578580

  • extras/pLoader/trunk/src/Uploader/PWG/WebServices.pm

    r2597 r2618  
    5454           comment
    5555           date_creation
     56           uagent_response
     57           login_result
     58           action_result
    5659      /
    5760);
    … …  
    9396    };
    9497 
    95     my $result = $self->uagent->post(
    96         $self->urlbase.'/ws.php?format=json',
    97         $form
    98     );   
     98    $self->uagent_response(
     99        $self->uagent->post(
     100            $self->urlbase.'/ws.php?format=json',
     101            $form
     102        )
     103    );
     104   
     105    my $hresult = {} ;
     106
     107    if($self->uagent_response->is_success){
     108        eval {
     109            $hresult = from_json(
     110                $self->uagent_response->content
     111            );
     112        };
     113    }
     114    else{
     115        $hresult = {
     116            'message' => $self->uagent_response->message,
     117            'stat'    => 'fail',
     118        };
     119    }
     120       
     121    $self->login_result(
     122        $hresult
     123    );
     124
    99125}
    100126
Note: See TracChangeset for help on using the changeset viewer.