Ignore:
Timestamp:
May 7, 2010, 6:37:05 PM (15 years ago)
Author:
ronosman
Message:

Feature 1650 added : ability to create square thumbnails.

Location:
extensions/pLoader/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • extensions/pLoader/trunk/locale/fr_FR/pLoader.po

    r6088 r6094  
    715715msgid "Change global settings"
    716716msgstr "Change les réglages"
     717
     718msgid "Rectangular"
     719msgstr "Rectangulaire"
     720
     721msgid "Square"
     722msgstr "Carrée"

  • extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

    r6088 r6094  
    369369            $main::GS_HD => { label => gettext("High definition") },
    370370            $main::GS_CLOSE => { label => gettext("Close")},
     371            $main::GS_THUMBNAIL_SHAPE => {
     372                selection => sub { $self->imagelist->thumbnail_shape_square(@_) },
     373                choices =>
     374                [
     375                    map { gettext $_ } ( "Rectangular", "Square" )
     376                ],
     377            },
    371378            $main::GS_DEFAULT_PHOTO_CAPTION => {
    372379                string_selection => sub { $self->imagelist->default_caption_pattern(@_) },

  • extensions/pLoader/trunk/src/Uploader/GUI/Layout/GlobalSettings.pm

    r5133 r6094  
    123123use vars qw($HD_IMG_INTERLACE); $HD_IMG_INTERLACE = 10043;
    124124use vars qw($GS_HD_IMG_INTERLACE); $GS_HD_IMG_INTERLACE = 10044;
     125use vars qw($GS_THUMBNAIL_SHAPE); $GS_THUMBNAIL_SHAPE = 10045;
    125126
    126127sub GS_photo_preparation {
    127128    my( $parent ) = $_[0];
     129    my( $topsizer ) = Wx::BoxSizer->new( wxVERTICAL );
     130   
     131    my( $sb ) = Wx::StaticBox->new( $parent, -1, "" );
     132    my( $sb_th ) = Wx::StaticBoxSizer->new( $sb, wxVERTICAL );
     133    $parent->{sb_thumbnail} = $sb_th;
     134   
     135    my( $stxt_th ) = Wx::StaticText->new( $parent, $main::GS_THUMBNAIL, "text", wxDefaultPosition, wxDefaultSize, 0 );
     136    $sb_th->AddWindow( $stxt_th, 0, wxALL, 5 );
     137
     138    my( $bh_th ) = Wx::BoxSizer->new( wxHORIZONTAL );
     139   
     140    my( $ch_th ) = Wx::Choice->new( $parent, $main::GS_THUMBNAIL_SHAPE, wxDefaultPosition, [250,-1], [], 0 );
     141    $bh_th->AddWindow( $ch_th, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
     142
     143
     144    my( $cp_th_option ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_THUMBNAIL, "Options", wxDefaultPosition, [300,-1], 0|wxCP_DEFAULT_STYLE );
     145    my( $oldparent ) = $parent;
     146    $parent = $cp_th_option->GetPane();
     147   
     148    my( $item5 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     149   
     150    my( $item6 ) = Wx::StaticText->new( $parent, $main::THUMBNAIL_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
     151    $item5->AddWindow( $item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     152
     153    my( $item7 ) = Wx::TextCtrl->new( $parent, $main::GS_THUMBNAIL_SIZE, "", wxDefaultPosition, [80,-1], 0 );
     154    $item5->AddWindow( $item7, 0, wxALIGN_CENTER|wxALL, 5 );
     155
     156    my( $item8 ) = Wx::StaticText->new( $parent, $main::THUMBNAIL_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
     157    $item5->AddWindow( $item8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     158
     159    my( $item9 ) = Wx::TextCtrl->new( $parent, $main::GS_THUMBNAIL_JPEG_QUALITY, "", wxDefaultPosition, [80,-1], 0 );
     160    $item5->AddWindow( $item9, 0, wxALIGN_CENTER|wxALL, 5 );
     161
     162    $parent->SetSizer( $item5 );
     163    $parent = $oldparent;
     164   
     165    #$sbsizer->AddWindow( $cp_th_options, 0, wxALL, 5 );
     166    $sb_th->Add( $bh_th, 0, wxALIGN_CENTER_VERTICAL, 5 );
     167    $bh_th->AddWindow( $cp_th_option, 0, wxALL, 5 );
     168
     169    $topsizer->Add( $sb_th, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     170
     171    my( $item11 ) = Wx::StaticBox->new( $parent, -1, "" );
     172    my( $sb_web ) = Wx::StaticBoxSizer->new( $item11, wxVERTICAL );
     173    $parent->{sb_web_sized_photo} = $sb_web;
     174   
     175    my( $stxt_web ) = Wx::StaticText->new( $parent, $main::GS_SITE_IMG, "text", wxDefaultPosition, wxDefaultSize, 0 );
     176    $sb_web->AddWindow( $stxt_web, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL, 5 );
     177
     178    my( $bh_web ) = Wx::BoxSizer->new( wxHORIZONTAL );
     179   
     180    my( $ch_web ) = Wx::Choice->new( $parent, $main::GS_CREATE_RESIZED, wxDefaultPosition, [250,-1], [], 0 );
     181    $bh_web->AddWindow( $ch_web, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
     182
     183    my( $cp_web_option ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_RESIZE, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     184    my( $oldparent ) = $parent;
     185    $parent = $cp_web_option->GetPane();
     186   
     187    my( $item16 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     188   
     189    my( $item17 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_WIDTH, "text", wxDefaultPosition, wxDefaultSize, 0 );
     190    $item16->AddWindow( $item17, 0, wxALL, 5 );
     191
     192    my( $item18 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_WIDTH, "", wxDefaultPosition, wxDefaultSize, 0 );
     193    $item16->AddWindow( $item18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     194
     195    my( $item19 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_HEIGHT, "text", wxDefaultPosition, wxDefaultSize, 0 );
     196    $item16->AddWindow( $item19, 0, wxALL, 5 );
     197
     198    my( $item20 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_HEIGHT, "", wxDefaultPosition, wxDefaultSize, 0 );
     199    $item16->AddWindow( $item20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     200
     201    my( $item21 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
     202    $item16->AddWindow( $item21, 0, wxALL, 5 );
     203
     204    my( $item22 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_JPEG_QUALITY, "", wxDefaultPosition, wxDefaultSize, 0 );
     205    $item16->AddWindow( $item22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     206
     207    $parent->SetSizer( $item16 );
     208    $parent = $oldparent;
     209   
     210    $bh_web->AddWindow( $cp_web_option, 0, wxALL, 5 );
     211
     212    my( $cp_web_adv ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_RESIZE_ADVANCED, "Advanced", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     213    my( $oldparent ) = $parent;
     214    $parent = $cp_web_adv->GetPane();
     215   
     216    my( $item24 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     217   
     218    my( $item25 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_FILTER, "text", wxDefaultPosition, wxDefaultSize, 0 );
     219    $item24->AddWindow( $item25, 0, wxALL, 5 );
     220
     221    my( $item26 ) = Wx::Choice->new( $parent, $main::GS_SITE_IMG_FILTER, wxDefaultPosition, [100,-1], [], 0 );
     222    $item24->AddWindow( $item26, 0, wxALIGN_CENTER|wxALL, 5 );
     223
     224    my( $item27 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_BLUR, "text", wxDefaultPosition, wxDefaultSize, 0 );
     225    $item24->AddWindow( $item27, 0, wxALL, 5 );
     226
     227    my( $item28 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_BLUR, "", wxDefaultPosition, wxDefaultSize, 0 );
     228    $item24->AddWindow( $item28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     229
     230    my( $item29 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_INTERLACE, "text", wxDefaultPosition, wxDefaultSize, 0 );
     231    $item24->AddWindow( $item29, 0, wxALL, 5 );
     232
     233    my( $item30 ) = Wx::Choice->new( $parent, $main::GS_SITE_IMG_INTERLACE, wxDefaultPosition, [100,-1], [], 0 );
     234    $item24->AddWindow( $item30, 0, wxALIGN_CENTER|wxALL, 5 );
     235
     236    $parent->SetSizer( $item24 );
     237    $parent = $oldparent;
     238   
     239    $bh_web->AddWindow( $cp_web_adv, 0, wxALL, 5 );
     240
     241    $sb_web->Add( $bh_web, 0, wxALIGN_CENTER_VERTICAL, 5 );
     242
     243    $topsizer->Add( $sb_web, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     244
     245    my( $item32 ) = Wx::StaticBox->new( $parent, -1, "" );
     246    my( $item31 ) = Wx::StaticBoxSizer->new( $item32, wxVERTICAL );
     247   
     248    my( $item33 ) = Wx::StaticText->new( $parent, $main::GS_HD, "text", wxDefaultPosition, wxDefaultSize, 0 );
     249    $item31->AddWindow( $item33, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     250
     251    my( $item34 ) = Wx::BoxSizer->new( wxHORIZONTAL );
     252    $parent->{sb_high_definition_photo} = $item34;
     253   
     254    my( $item35 ) = Wx::Choice->new( $parent, $main::GS_HD_UPLOAD, wxDefaultPosition, [250,-1], [], 0 );
     255    $item34->AddWindow( $item35, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
     256
     257    my( $item36 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_HD, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     258    my( $oldparent ) = $parent;
     259    $parent = $item36->GetPane();
     260   
     261    my( $item37 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     262   
     263    my( $item38 ) = Wx::StaticText->new( $parent, $main::HD_IMG_WIDTH, "text", wxDefaultPosition, wxDefaultSize, 0 );
     264    $item37->AddWindow( $item38, 0, wxALL, 5 );
     265
     266    my( $item39 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_WIDTH, "", wxDefaultPosition, wxDefaultSize, 0 );
     267    $item37->AddWindow( $item39, 0, wxALIGN_CENTER|wxALL, 5 );
     268
     269    my( $item40 ) = Wx::StaticText->new( $parent, $main::HD_IMG_HEIGHT, "text", wxDefaultPosition, wxDefaultSize, 0 );
     270    $item37->AddWindow( $item40, 0, wxALL, 5 );
     271
     272    my( $item41 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_HEIGHT, "", wxDefaultPosition, wxDefaultSize, 0 );
     273    $item37->AddWindow( $item41, 0, wxALIGN_CENTER|wxALL, 5 );
     274
     275    my( $item42 ) = Wx::StaticText->new( $parent, $main::HD_IMG_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
     276    $item37->AddWindow( $item42, 0, wxALL, 5 );
     277
     278    my( $item43 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_JPEG_QUALITY, "", wxDefaultPosition, wxDefaultSize, 0 );
     279    $item37->AddWindow( $item43, 0, wxALIGN_CENTER|wxALL, 5 );
     280
     281    $parent->SetSizer( $item37 );
     282    $parent = $oldparent;
     283   
     284    $item34->AddWindow( $item36, 0, wxALL, 5 );
     285
     286    my( $item44 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_HD_ADVANCED, "Advanced", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     287    my( $oldparent ) = $parent;
     288    $parent = $item44->GetPane();
     289   
     290    my( $item45 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     291   
     292    my( $item46 ) = Wx::StaticText->new( $parent, $main::HD_IMG_FILTER, "text", wxDefaultPosition, wxDefaultSize, 0 );
     293    $item45->AddWindow( $item46, 0, wxALL, 5 );
     294
     295    my( $item47 ) = Wx::Choice->new( $parent, $main::GS_HD_IMG_FILTER, wxDefaultPosition, [100,-1], [], 0 );
     296    $item45->AddWindow( $item47, 0, wxALL, 5 );
     297
     298    my( $item48 ) = Wx::StaticText->new( $parent, $main::HD_IMG_BLUR, "text", wxDefaultPosition, wxDefaultSize, 0 );
     299    $item45->AddWindow( $item48, 0, wxALL, 5 );
     300
     301    my( $item49 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_BLUR, "", wxDefaultPosition, wxDefaultSize, 0 );
     302    $item45->AddWindow( $item49, 0, wxALL, 5 );
     303
     304    my( $item50 ) = Wx::StaticText->new( $parent, $main::HD_IMG_INTERLACE, "text", wxDefaultPosition, wxDefaultSize, 0 );
     305    $item45->AddWindow( $item50, 0, wxALL, 5 );
     306
     307    my( $item51 ) = Wx::Choice->new( $parent, $main::GS_HD_IMG_INTERLACE, wxDefaultPosition, [100,-1], [], 0 );
     308    $item45->AddWindow( $item51, 0, wxALL, 5 );
     309
     310    $parent->SetSizer( $item45 );
     311    $parent = $oldparent;
     312   
     313    $item34->AddWindow( $item44, 0, wxALL, 5 );
     314
     315    $item31->Add( $item34, 0, wxALIGN_CENTER_VERTICAL, 5 );
     316
     317    $topsizer->Add( $item31, 0, wxALIGN_LEFT|wxALL, 5 );
     318
     319    my( $set_size ) = @_ >= 3 ? $_[2] : 1;
     320    my( $call_fit ) = @_ >= 2 ? $_[1] : 1;
     321    if( $set_size == 1 ) {
     322         $_[0]->SetSizer( $topsizer );
     323         
     324         if( $call_fit == 1 ) {
     325             $topsizer->SetSizeHints( $_[0] );
     326         }
     327    }
     328   
     329    $topsizer;
     330}
     331
     332use vars qw($GS_WMARK_ACTIVATE); $GS_WMARK_ACTIVATE = 10046;
     333use vars qw($GS_WMARK_ACTIVATE_HD); $GS_WMARK_ACTIVATE_HD = 10047;
     334use vars qw($CPANE_WATERMARK); $CPANE_WATERMARK = 10048;
     335use vars qw($WMARK_TEXT); $WMARK_TEXT = 10049;
     336use vars qw($GS_WMARK_TEXT); $GS_WMARK_TEXT = 10050;
     337use vars qw($WMARK_TEXT_SIZE); $WMARK_TEXT_SIZE = 10051;
     338use vars qw($GS_WMARK_TEXT_SIZE); $GS_WMARK_TEXT_SIZE = 10052;
     339use vars qw($WMARK_COLOR); $WMARK_COLOR = 10053;
     340use vars qw($GS_WMARK_COLOR); $GS_WMARK_COLOR = 10054;
     341use vars qw($WMARK_POSITION); $WMARK_POSITION = 10055;
     342use vars qw($GS_WMARK_POSITION); $GS_WMARK_POSITION = 10056;
     343use vars qw($WMARK_MARGIN_TOP); $WMARK_MARGIN_TOP = 10057;
     344use vars qw($GS_WMARK_MARGIN_TOP); $GS_WMARK_MARGIN_TOP = 10058;
     345use vars qw($WMARK_MARGIN_LEFT); $WMARK_MARGIN_LEFT = 10059;
     346use vars qw($GS_WMARK_MARGIN_LEFT); $GS_WMARK_MARGIN_LEFT = 10060;
     347
     348sub GS_photo_watermark {
     349    my( $parent ) = $_[0];
    128350    my( $item0 ) = Wx::BoxSizer->new( wxVERTICAL );
    129351   
    130352    my( $item2 ) = Wx::StaticBox->new( $parent, -1, "" );
    131353    my( $item1 ) = Wx::StaticBoxSizer->new( $item2, wxHORIZONTAL );
    132     $parent->{sb_thumbnail} = $item1;
    133    
    134     my( $item3 ) = Wx::StaticText->new( $parent, $main::GS_THUMBNAIL, "text", wxDefaultPosition, wxDefaultSize, 0 );
    135     $item1->AddWindow( $item3, 0, wxALL, 5 );
    136 
    137     my( $item4 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_THUMBNAIL, "Options", wxDefaultPosition, [300,-1], 0|wxCP_DEFAULT_STYLE );
    138     my( $oldparent ) = $parent;
    139     $parent = $item4->GetPane();
    140    
    141     my( $item5 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    142    
    143     my( $item6 ) = Wx::StaticText->new( $parent, $main::THUMBNAIL_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
    144     $item5->AddWindow( $item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    145 
    146     my( $item7 ) = Wx::TextCtrl->new( $parent, $main::GS_THUMBNAIL_SIZE, "", wxDefaultPosition, [80,-1], 0 );
    147     $item5->AddWindow( $item7, 0, wxALIGN_CENTER|wxALL, 5 );
    148 
    149     my( $item8 ) = Wx::StaticText->new( $parent, $main::THUMBNAIL_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
    150     $item5->AddWindow( $item8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    151 
    152     my( $item9 ) = Wx::TextCtrl->new( $parent, $main::GS_THUMBNAIL_JPEG_QUALITY, "", wxDefaultPosition, [80,-1], 0 );
    153     $item5->AddWindow( $item9, 0, wxALIGN_CENTER|wxALL, 5 );
    154 
    155     $parent->SetSizer( $item5 );
    156     $parent = $oldparent;
    157    
    158     $item1->AddWindow( $item4, 0, wxALL, 5 );
    159 
    160     $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    161 
    162     my( $item11 ) = Wx::StaticBox->new( $parent, -1, "" );
    163     my( $item10 ) = Wx::StaticBoxSizer->new( $item11, wxVERTICAL );
    164     $parent->{sb_web_sized_photo} = $item10;
    165    
    166     my( $item12 ) = Wx::StaticText->new( $parent, $main::GS_SITE_IMG, "text", wxDefaultPosition, wxDefaultSize, 0 );
    167     $item10->AddWindow( $item12, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL, 5 );
    168 
    169     my( $item13 ) = Wx::BoxSizer->new( wxHORIZONTAL );
    170    
    171     my( $item14 ) = Wx::Choice->new( $parent, $main::GS_CREATE_RESIZED, wxDefaultPosition, [250,-1], [], 0 );
    172     $item13->AddWindow( $item14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
    173 
    174     my( $item15 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_RESIZE, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    175     my( $oldparent ) = $parent;
    176     $parent = $item15->GetPane();
    177    
    178     my( $item16 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    179    
    180     my( $item17 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_WIDTH, "text", wxDefaultPosition, wxDefaultSize, 0 );
    181     $item16->AddWindow( $item17, 0, wxALL, 5 );
    182 
    183     my( $item18 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_WIDTH, "", wxDefaultPosition, wxDefaultSize, 0 );
    184     $item16->AddWindow( $item18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    185 
    186     my( $item19 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_HEIGHT, "text", wxDefaultPosition, wxDefaultSize, 0 );
    187     $item16->AddWindow( $item19, 0, wxALL, 5 );
    188 
    189     my( $item20 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_HEIGHT, "", wxDefaultPosition, wxDefaultSize, 0 );
    190     $item16->AddWindow( $item20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    191 
    192     my( $item21 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
    193     $item16->AddWindow( $item21, 0, wxALL, 5 );
    194 
    195     my( $item22 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_JPEG_QUALITY, "", wxDefaultPosition, wxDefaultSize, 0 );
    196     $item16->AddWindow( $item22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    197 
    198     $parent->SetSizer( $item16 );
    199     $parent = $oldparent;
    200    
    201     $item13->AddWindow( $item15, 0, wxALL, 5 );
    202 
    203     my( $item23 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_RESIZE_ADVANCED, "Advanced", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    204     my( $oldparent ) = $parent;
    205     $parent = $item23->GetPane();
    206    
    207     my( $item24 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    208    
    209     my( $item25 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_FILTER, "text", wxDefaultPosition, wxDefaultSize, 0 );
    210     $item24->AddWindow( $item25, 0, wxALL, 5 );
    211 
    212     my( $item26 ) = Wx::Choice->new( $parent, $main::GS_SITE_IMG_FILTER, wxDefaultPosition, [100,-1], [], 0 );
    213     $item24->AddWindow( $item26, 0, wxALIGN_CENTER|wxALL, 5 );
    214 
    215     my( $item27 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_BLUR, "text", wxDefaultPosition, wxDefaultSize, 0 );
    216     $item24->AddWindow( $item27, 0, wxALL, 5 );
    217 
    218     my( $item28 ) = Wx::TextCtrl->new( $parent, $main::GS_SITE_IMG_BLUR, "", wxDefaultPosition, wxDefaultSize, 0 );
    219     $item24->AddWindow( $item28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    220 
    221     my( $item29 ) = Wx::StaticText->new( $parent, $main::SITE_IMG_INTERLACE, "text", wxDefaultPosition, wxDefaultSize, 0 );
    222     $item24->AddWindow( $item29, 0, wxALL, 5 );
    223 
    224     my( $item30 ) = Wx::Choice->new( $parent, $main::GS_SITE_IMG_INTERLACE, wxDefaultPosition, [100,-1], [], 0 );
    225     $item24->AddWindow( $item30, 0, wxALIGN_CENTER|wxALL, 5 );
    226 
    227     $parent->SetSizer( $item24 );
    228     $parent = $oldparent;
    229    
    230     $item13->AddWindow( $item23, 0, wxALL, 5 );
    231 
    232     $item10->Add( $item13, 0, wxALIGN_CENTER_VERTICAL, 5 );
    233 
    234     $item0->Add( $item10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    235 
    236     my( $item32 ) = Wx::StaticBox->new( $parent, -1, "" );
    237     my( $item31 ) = Wx::StaticBoxSizer->new( $item32, wxVERTICAL );
    238    
    239     my( $item33 ) = Wx::StaticText->new( $parent, $main::GS_HD, "text", wxDefaultPosition, wxDefaultSize, 0 );
    240     $item31->AddWindow( $item33, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    241 
    242     my( $item34 ) = Wx::BoxSizer->new( wxHORIZONTAL );
    243     $parent->{sb_high_definition_photo} = $item34;
    244    
    245     my( $item35 ) = Wx::Choice->new( $parent, $main::GS_HD_UPLOAD, wxDefaultPosition, [250,-1], [], 0 );
    246     $item34->AddWindow( $item35, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
    247 
    248     my( $item36 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_HD, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    249     my( $oldparent ) = $parent;
    250     $parent = $item36->GetPane();
    251    
    252     my( $item37 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    253    
    254     my( $item38 ) = Wx::StaticText->new( $parent, $main::HD_IMG_WIDTH, "text", wxDefaultPosition, wxDefaultSize, 0 );
    255     $item37->AddWindow( $item38, 0, wxALL, 5 );
    256 
    257     my( $item39 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_WIDTH, "", wxDefaultPosition, wxDefaultSize, 0 );
    258     $item37->AddWindow( $item39, 0, wxALIGN_CENTER|wxALL, 5 );
    259 
    260     my( $item40 ) = Wx::StaticText->new( $parent, $main::HD_IMG_HEIGHT, "text", wxDefaultPosition, wxDefaultSize, 0 );
    261     $item37->AddWindow( $item40, 0, wxALL, 5 );
    262 
    263     my( $item41 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_HEIGHT, "", wxDefaultPosition, wxDefaultSize, 0 );
    264     $item37->AddWindow( $item41, 0, wxALIGN_CENTER|wxALL, 5 );
    265 
    266     my( $item42 ) = Wx::StaticText->new( $parent, $main::HD_IMG_JPEG_QUALITY, "text", wxDefaultPosition, wxDefaultSize, 0 );
    267     $item37->AddWindow( $item42, 0, wxALL, 5 );
    268 
    269     my( $item43 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_JPEG_QUALITY, "", wxDefaultPosition, wxDefaultSize, 0 );
    270     $item37->AddWindow( $item43, 0, wxALIGN_CENTER|wxALL, 5 );
    271 
    272     $parent->SetSizer( $item37 );
    273     $parent = $oldparent;
    274    
    275     $item34->AddWindow( $item36, 0, wxALL, 5 );
    276 
    277     my( $item44 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_HD_ADVANCED, "Advanced", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    278     my( $oldparent ) = $parent;
    279     $parent = $item44->GetPane();
    280    
    281     my( $item45 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    282    
    283     my( $item46 ) = Wx::StaticText->new( $parent, $main::HD_IMG_FILTER, "text", wxDefaultPosition, wxDefaultSize, 0 );
    284     $item45->AddWindow( $item46, 0, wxALL, 5 );
    285 
    286     my( $item47 ) = Wx::Choice->new( $parent, $main::GS_HD_IMG_FILTER, wxDefaultPosition, [100,-1], [], 0 );
    287     $item45->AddWindow( $item47, 0, wxALL, 5 );
    288 
    289     my( $item48 ) = Wx::StaticText->new( $parent, $main::HD_IMG_BLUR, "text", wxDefaultPosition, wxDefaultSize, 0 );
    290     $item45->AddWindow( $item48, 0, wxALL, 5 );
    291 
    292     my( $item49 ) = Wx::TextCtrl->new( $parent, $main::GS_HD_IMG_BLUR, "", wxDefaultPosition, wxDefaultSize, 0 );
    293     $item45->AddWindow( $item49, 0, wxALL, 5 );
    294 
    295     my( $item50 ) = Wx::StaticText->new( $parent, $main::HD_IMG_INTERLACE, "text", wxDefaultPosition, wxDefaultSize, 0 );
    296     $item45->AddWindow( $item50, 0, wxALL, 5 );
    297 
    298     my( $item51 ) = Wx::Choice->new( $parent, $main::GS_HD_IMG_INTERLACE, wxDefaultPosition, [100,-1], [], 0 );
    299     $item45->AddWindow( $item51, 0, wxALL, 5 );
    300 
    301     $parent->SetSizer( $item45 );
    302     $parent = $oldparent;
    303    
    304     $item34->AddWindow( $item44, 0, wxALL, 5 );
    305 
    306     $item31->Add( $item34, 0, wxALIGN_CENTER_VERTICAL, 5 );
    307 
    308     $item0->Add( $item31, 0, wxALIGN_LEFT|wxALL, 5 );
     354    $parent->{sb_watermark} = $item1;
     355   
     356    my( $item3 ) = Wx::BoxSizer->new( wxVERTICAL );
     357   
     358    my( $item4 ) = Wx::CheckBox->new( $parent, $main::GS_WMARK_ACTIVATE, "", wxDefaultPosition, wxDefaultSize, 0 );
     359    $item3->AddWindow( $item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     360
     361    my( $item5 ) = Wx::CheckBox->new( $parent, $main::GS_WMARK_ACTIVATE_HD, "", wxDefaultPosition, wxDefaultSize, 0 );
     362    $item3->AddWindow( $item5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     363
     364    $item1->Add( $item3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
     365
     366    my( $item6 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_WATERMARK, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     367    my( $oldparent ) = $parent;
     368    $parent = $item6->GetPane();
     369   
     370    my( $item7 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     371   
     372    my( $item8 ) = Wx::StaticText->new( $parent, $main::WMARK_TEXT, "text", wxDefaultPosition, wxDefaultSize, 0 );
     373    $item7->AddWindow( $item8, 0, wxALL, 5 );
     374
     375    my( $item9 ) = Wx::TextCtrl->new( $parent, $main::GS_WMARK_TEXT, "", wxDefaultPosition, [200,-1], 0 );
     376    $item7->AddWindow( $item9, 0, wxALL, 5 );
     377
     378    my( $item10 ) = Wx::StaticText->new( $parent, $main::WMARK_TEXT_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
     379    $item7->AddWindow( $item10, 0, wxALL, 5 );
     380
     381    my( $item11 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_TEXT_SIZE, "0", wxDefaultPosition, [50,-1], 0, 0, 100, 0 );
     382    $item7->AddWindow( $item11, 0, wxALL, 5 );
     383
     384    my( $item12 ) = Wx::StaticText->new( $parent, $main::WMARK_COLOR, "text", wxDefaultPosition, wxDefaultSize, 0 );
     385    $item7->AddWindow( $item12, 0, wxALL, 5 );
     386
     387    my( $item13 ) = Wx::Choice->new( $parent, $main::GS_WMARK_COLOR, wxDefaultPosition, [100,-1], [], 0 );
     388    $item7->AddWindow( $item13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     389
     390    my( $item14 ) = Wx::StaticText->new( $parent, $main::WMARK_POSITION, "text", wxDefaultPosition, wxDefaultSize, 0 );
     391    $item7->AddWindow( $item14, 0, wxALL, 5 );
     392
     393    my( $item15 ) = Wx::Choice->new( $parent, $main::GS_WMARK_POSITION, wxDefaultPosition, [100,-1], [], 0 );
     394    $item7->AddWindow( $item15, 0, wxALL, 5 );
     395
     396    my( $item16 ) = Wx::StaticText->new( $parent, $main::WMARK_MARGIN_TOP, "text", wxDefaultPosition, wxDefaultSize, 0 );
     397    $item7->AddWindow( $item16, 0, wxALL, 5 );
     398
     399    my( $item17 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_MARGIN_TOP, "0", wxDefaultPosition, [100,-1], 0, 0, 100, 0 );
     400    $item7->AddWindow( $item17, 0, wxALL, 5 );
     401
     402    my( $item18 ) = Wx::StaticText->new( $parent, $main::WMARK_MARGIN_LEFT, "text", wxDefaultPosition, wxDefaultSize, 0 );
     403    $item7->AddWindow( $item18, 0, wxALL, 5 );
     404
     405    my( $item19 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_MARGIN_LEFT, "0", wxDefaultPosition, [100,-1], 0, 0, 100, 0 );
     406    $item7->AddWindow( $item19, 0, wxALL, 5 );
     407
     408    $parent->SetSizer( $item7 );
     409    $parent = $oldparent;
     410   
     411    $item1->AddWindow( $item6, 0, wxALL, 5 );
     412
     413    $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
    309414
    310415    my( $set_size ) = @_ >= 3 ? $_[2] : 1;
    … …  
    321426}
    322427
    323 use vars qw($GS_WMARK_ACTIVATE); $GS_WMARK_ACTIVATE = 10045;
    324 use vars qw($GS_WMARK_ACTIVATE_HD); $GS_WMARK_ACTIVATE_HD = 10046;
    325 use vars qw($CPANE_WATERMARK); $CPANE_WATERMARK = 10047;
    326 use vars qw($WMARK_TEXT); $WMARK_TEXT = 10048;
    327 use vars qw($GS_WMARK_TEXT); $GS_WMARK_TEXT = 10049;
    328 use vars qw($WMARK_TEXT_SIZE); $WMARK_TEXT_SIZE = 10050;
    329 use vars qw($GS_WMARK_TEXT_SIZE); $GS_WMARK_TEXT_SIZE = 10051;
    330 use vars qw($WMARK_COLOR); $WMARK_COLOR = 10052;
    331 use vars qw($GS_WMARK_COLOR); $GS_WMARK_COLOR = 10053;
    332 use vars qw($WMARK_POSITION); $WMARK_POSITION = 10054;
    333 use vars qw($GS_WMARK_POSITION); $GS_WMARK_POSITION = 10055;
    334 use vars qw($WMARK_MARGIN_TOP); $WMARK_MARGIN_TOP = 10056;
    335 use vars qw($GS_WMARK_MARGIN_TOP); $GS_WMARK_MARGIN_TOP = 10057;
    336 use vars qw($WMARK_MARGIN_LEFT); $WMARK_MARGIN_LEFT = 10058;
    337 use vars qw($GS_WMARK_MARGIN_LEFT); $GS_WMARK_MARGIN_LEFT = 10059;
    338 
    339 sub GS_photo_watermark {
     428use vars qw($GS_REMOVE_UPLOADED_FROM_SELECTION); $GS_REMOVE_UPLOADED_FROM_SELECTION = 10070;
     429use vars qw($CPANE_TRANSFERT_ADVANCED); $CPANE_TRANSFERT_ADVANCED = 10071;
     430use vars qw($CHUNK_SIZE); $CHUNK_SIZE = 10072;
     431use vars qw($GS_CHUNK_SIZE); $GS_CHUNK_SIZE = 10073;
     432
     433sub GS_photo_transfer {
    340434    my( $parent ) = $_[0];
    341435    my( $item0 ) = Wx::BoxSizer->new( wxVERTICAL );
    … …  
    343437    my( $item2 ) = Wx::StaticBox->new( $parent, -1, "" );
    344438    my( $item1 ) = Wx::StaticBoxSizer->new( $item2, wxHORIZONTAL );
    345     $parent->{sb_watermark} = $item1;
    346    
    347     my( $item3 ) = Wx::BoxSizer->new( wxVERTICAL );
    348    
    349     my( $item4 ) = Wx::CheckBox->new( $parent, $main::GS_WMARK_ACTIVATE, "", wxDefaultPosition, wxDefaultSize, 0 );
    350     $item3->AddWindow( $item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    351 
    352     my( $item5 ) = Wx::CheckBox->new( $parent, $main::GS_WMARK_ACTIVATE_HD, "", wxDefaultPosition, wxDefaultSize, 0 );
    353     $item3->AddWindow( $item5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    354 
    355     $item1->Add( $item3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
    356 
    357     my( $item6 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_WATERMARK, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    358     my( $oldparent ) = $parent;
    359     $parent = $item6->GetPane();
    360    
    361     my( $item7 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    362    
    363     my( $item8 ) = Wx::StaticText->new( $parent, $main::WMARK_TEXT, "text", wxDefaultPosition, wxDefaultSize, 0 );
    364     $item7->AddWindow( $item8, 0, wxALL, 5 );
    365 
    366     my( $item9 ) = Wx::TextCtrl->new( $parent, $main::GS_WMARK_TEXT, "", wxDefaultPosition, [200,-1], 0 );
    367     $item7->AddWindow( $item9, 0, wxALL, 5 );
    368 
    369     my( $item10 ) = Wx::StaticText->new( $parent, $main::WMARK_TEXT_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
    370     $item7->AddWindow( $item10, 0, wxALL, 5 );
    371 
    372     my( $item11 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_TEXT_SIZE, "0", wxDefaultPosition, [50,-1], 0, 0, 100, 0 );
    373     $item7->AddWindow( $item11, 0, wxALL, 5 );
    374 
    375     my( $item12 ) = Wx::StaticText->new( $parent, $main::WMARK_COLOR, "text", wxDefaultPosition, wxDefaultSize, 0 );
    376     $item7->AddWindow( $item12, 0, wxALL, 5 );
    377 
    378     my( $item13 ) = Wx::Choice->new( $parent, $main::GS_WMARK_COLOR, wxDefaultPosition, [100,-1], [], 0 );
    379     $item7->AddWindow( $item13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    380 
    381     my( $item14 ) = Wx::StaticText->new( $parent, $main::WMARK_POSITION, "text", wxDefaultPosition, wxDefaultSize, 0 );
    382     $item7->AddWindow( $item14, 0, wxALL, 5 );
    383 
    384     my( $item15 ) = Wx::Choice->new( $parent, $main::GS_WMARK_POSITION, wxDefaultPosition, [100,-1], [], 0 );
    385     $item7->AddWindow( $item15, 0, wxALL, 5 );
    386 
    387     my( $item16 ) = Wx::StaticText->new( $parent, $main::WMARK_MARGIN_TOP, "text", wxDefaultPosition, wxDefaultSize, 0 );
    388     $item7->AddWindow( $item16, 0, wxALL, 5 );
    389 
    390     my( $item17 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_MARGIN_TOP, "0", wxDefaultPosition, [100,-1], 0, 0, 100, 0 );
    391     $item7->AddWindow( $item17, 0, wxALL, 5 );
    392 
    393     my( $item18 ) = Wx::StaticText->new( $parent, $main::WMARK_MARGIN_LEFT, "text", wxDefaultPosition, wxDefaultSize, 0 );
    394     $item7->AddWindow( $item18, 0, wxALL, 5 );
    395 
    396     my( $item19 ) = Wx::SpinCtrl->new( $parent, $main::GS_WMARK_MARGIN_LEFT, "0", wxDefaultPosition, [100,-1], 0, 0, 100, 0 );
    397     $item7->AddWindow( $item19, 0, wxALL, 5 );
    398 
    399     $parent->SetSizer( $item7 );
    400     $parent = $oldparent;
    401    
    402     $item1->AddWindow( $item6, 0, wxALL, 5 );
    403 
    404     $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
     439    $parent->{sb_transfert} = $item1;
     440   
     441    my( $item3 ) = Wx::CheckBox->new( $parent, $main::GS_REMOVE_UPLOADED_FROM_SELECTION, "", wxDefaultPosition, wxDefaultSize, 0 );
     442    $item1->AddWindow( $item3, 0, wxALIGN_CENTER|wxALL, 5 );
     443
     444    my( $item4 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_TRANSFERT_ADVANCED, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
     445    my( $oldparent ) = $parent;
     446    $parent = $item4->GetPane();
     447   
     448    my( $item5 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     449   
     450    my( $item6 ) = Wx::StaticText->new( $parent, $main::CHUNK_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
     451    $item5->AddWindow( $item6, 0, wxALL, 5 );
     452
     453    my( $item7 ) = Wx::TextCtrl->new( $parent, $main::GS_CHUNK_SIZE, "", wxDefaultPosition, wxDefaultSize, 0 );
     454    $item5->AddWindow( $item7, 0, wxALL, 5 );
     455
     456    $parent->SetSizer( $item5 );
     457    $parent = $oldparent;
     458   
     459    $item1->AddWindow( $item4, 0, wxALL, 5 );
     460
     461    $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    405462
    406463    my( $set_size ) = @_ >= 3 ? $_[2] : 1;
    … …  
    417474}
    418475
    419 use vars qw($GS_REMOVE_UPLOADED_FROM_SELECTION); $GS_REMOVE_UPLOADED_FROM_SELECTION = 10060;
    420 use vars qw($CPANE_TRANSFERT_ADVANCED); $CPANE_TRANSFERT_ADVANCED = 10061;
    421 use vars qw($CHUNK_SIZE); $CHUNK_SIZE = 10062;
    422 use vars qw($GS_CHUNK_SIZE); $GS_CHUNK_SIZE = 10063;
    423 
    424 sub GS_photo_transfer {
    425     my( $parent ) = $_[0];
    426     my( $item0 ) = Wx::BoxSizer->new( wxVERTICAL );
    427    
    428     my( $item2 ) = Wx::StaticBox->new( $parent, -1, "" );
    429     my( $item1 ) = Wx::StaticBoxSizer->new( $item2, wxHORIZONTAL );
    430     $parent->{sb_transfert} = $item1;
    431    
    432     my( $item3 ) = Wx::CheckBox->new( $parent, $main::GS_REMOVE_UPLOADED_FROM_SELECTION, "", wxDefaultPosition, wxDefaultSize, 0 );
    433     $item1->AddWindow( $item3, 0, wxALIGN_CENTER|wxALL, 5 );
    434 
    435     my( $item4 ) = Wx::CollapsiblePane->new( $parent, $main::CPANE_TRANSFERT_ADVANCED, "Options", wxDefaultPosition, wxDefaultSize, 0|wxCP_DEFAULT_STYLE );
    436     my( $oldparent ) = $parent;
    437     $parent = $item4->GetPane();
    438    
    439     my( $item5 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
    440    
    441     my( $item6 ) = Wx::StaticText->new( $parent, $main::CHUNK_SIZE, "text", wxDefaultPosition, wxDefaultSize, 0 );
    442     $item5->AddWindow( $item6, 0, wxALL, 5 );
    443 
    444     my( $item7 ) = Wx::TextCtrl->new( $parent, $main::GS_CHUNK_SIZE, "", wxDefaultPosition, wxDefaultSize, 0 );
    445     $item5->AddWindow( $item7, 0, wxALL, 5 );
    446 
    447     $parent->SetSizer( $item5 );
    448     $parent = $oldparent;
    449    
    450     $item1->AddWindow( $item4, 0, wxALL, 5 );
    451 
    452     $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
    453 
    454     my( $set_size ) = @_ >= 3 ? $_[2] : 1;
    455     my( $call_fit ) = @_ >= 2 ? $_[1] : 1;
    456     if( $set_size == 1 ) {
    457          $_[0]->SetSizer( $item0 );
    458          
    459          if( $call_fit == 1 ) {
    460              $item0->SetSizeHints( $_[0] );
    461          }
    462     }
    463    
    464     $item0;
    465 }
    466 
    467476
    468477use vars qw($LANGUAGE); $LANGUAGE = 10064;

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

    r6088 r6094  
    132132                image_selection_author
    133133                image_selection_create_date
     134                thumbnail_shape_square
    134135     /
    135136);
    … …  
    665666    warn "$status" if $status ;
    666667
    667    
     668    my $pattern = $self->thumbnail_shape_square ?
     669        "%sx%s^" :
     670        "%sx%s>" ;
    668671    $status = $image->Resize(
    669672        geometry => sprintf(
    670                                 "%sx%s>",
     673                                $pattern,
    671674                                $self->thumb_size,
    672675                                $self->thumb_size
    … …  
    677680    $status = $image->Set(Gravity=>"Center");
    678681    warn "$status" if $status ;
     682
     683    $status = $image->Crop(
     684        geometry=>sprintf("%sx%s+0+0", $self->thumb_size, $self->thumb_size)
     685    ) if $self->thumbnail_shape_square;
     686
    679687
    680688    $status = $image->Set(quality=>$self->th_quality);
    … …  
    790798                display_mode
    791799                image_selection_tags
     800                thumbnail_shape_square
    792801            /
    793802        ]
Note: See TracChangeset for help on using the changeset viewer.