Changeset 5104 for extensions/pLoader
- Timestamp:
- Mar 11, 2010, 6:15:33 PM (14 years ago)
- Location:
- extensions/pLoader/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/pLoader/trunk/locale/fr_FR/pLoader.po
r5103 r5104 658 658 msgid "Changes apply to the whole batch" 659 659 msgstr "Les modifications s'appliquent à toutes les photos de la sélection" 660 661 msgid "Drag photos here to get started" 662 msgstr "Glissez-déposez vos photos ici pour démarrer" 663 664 msgid "Or click" 665 msgstr "Ou cliquez sur" 666 667 msgid "to choose files on your computer" 668 msgstr "pour choisir des fichiers de votre ordinateur" -
extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm
r5103 r5104 43 43 wxBITMAP_TYPE_ANY 44 44 wxTB_FLAT 45 wxTB_TEXT 45 46 wxSIZE 46 47 wxWHITE … … 79 80 wxHORIZONTAL 80 81 wxVERTICAL 82 wxEXPAND 81 83 /; 82 84 use base qw/Wx::Frame Class::Accessor::Fast/; … … 101 103 logwnd 102 104 oldlogwnd 103 getting_started104 105 categories 105 106 imagelist … … 728 729 ); 729 730 731 # message displayed in the image listctrl when empty 732 $self->imageviewer->InitEmptyMsg; 730 733 731 734 $self->init_panels; … … 765 768 ); 766 769 770 $self->OnUpdateImageviewerNotEmpty; 771 } 772 else{ 773 $self->OnUpdateImageviewerEmpty; 767 774 } 768 775 769 776 # the imageviewer has a stretch factor of 1 : expands its size on frame resize 770 $sizer_h->AddWindow( $self->imageviewer, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL||wxSHAPED, 2 ); 771 $sizer_h->AddWindow( $self->dlg_piwigo_photo_properties, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL||wxSHAPED, 2 ); 777 $sizer_h->Add( $self->imageviewer, 1, wxEXPAND|wxALL, 2 ); 778 $sizer_h->Add( $self->dlg_piwigo_photo_properties, 0, wxEXPAND|wxALL, 2 ); 779 780 772 781 $self->SetSizer( 773 782 $sizer_h 774 783 ); 775 776 $sizer_h->SetSizeHints( 784 my $new_size = $sizer_h->Fit( 777 785 $self 778 786 ); 779 780 781 782 } 787 $self->SetMinSize([600, 500]); 788 $self->Center; 789 } 790 791 sub OnUpdateImageviewerEmpty { 792 my ( $self ) = @_; 793 794 $self->dlg_piwigo_photo_properties->Enable(0); 795 $self->imageviewer->OnEmpty; 796 } 797 798 sub OnUpdateImageviewerNotEmpty { 799 my ( $self ) = @_; 800 801 $self->dlg_piwigo_photo_properties->Enable(1); 802 $self->imageviewer->OnNotEmpty; 803 } 804 783 805 784 806 sub _refresh_settings_panels_properties { … … 842 864 my ( $self ) = @_; 843 865 844 $self->getting_started(845 Uploader::GUI::wxHtmlWindow->new(846 {847 html => $self->_gs_html(848 {849 label => gettext("Click links below to start using pLoader."),850 lnk1 => gettext("Add a new album."),851 lnk2 => gettext("Add photos to the selection."),852 lnk3 => gettext("Upload the photo selection into your album."),853 }854 ),855 caption => gettext("Getting started"),856 size => [450, 350],857 }858 )859 );860 861 862 $self->getting_started->InitHrefCallbacks(863 {864 new_album => sub {$self->OnAddCategories(@_) },865 add_photos => sub { $self->OnAddImages(@_) },866 upload_photos => sub { $self->ProcessImageSelection(@_)},867 }868 );869 $self->getting_started->Hide;870 871 866 $self->_init_settings_panels; 872 867 } 873 868 874 869 # HTML code for getting started dialog box 875 sub _gs_html {876 my ( $self, $params ) = @_;877 878 879 my $logo = File::Spec->catfile(wxTheApp->root_dir, wxTheApp->resource_dir, 'piwigo_logo.PNG');880 881 882 my $html = '<html>';883 $html .= '<body text="#E15918" link="#E15918">';884 $html .= '<font size=5 face="verdana, arial">';885 $html .= '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>';886 $html .= sprintf("<img src=\"%s\" /><br /><br />", $logo);887 $html .= $params->{label};888 $html .= "<br /><br /><br />";889 $html .= '1. <a href="new_album">';890 $html .= $params->{lnk1};891 $html .= '</a><br /><br />';892 $html .= '2. <a href="add_photos">';893 $html .= $params->{lnk2};894 $html .= '</a><br /><br />';895 $html .= '3. <a href="upload_photos">';896 $html .= $params->{lnk3};897 $html .= '</a><br /><br />';898 899 $html .= '</font></body></html>';900 901 $html;902 }903 870 904 871 … … 937 904 } 938 905 939 sub OnGettingStarted {940 my ( $self ) = @_;941 942 $self->getting_started->Show(1);943 }944 906 945 907 sub OnGlobalSettings { … … 1210 1172 my ( $self ) = @_ ; 1211 1173 1212 Wx::Event::EVT_MENU( $self, 100, \&OnGettingStarted );1213 1174 Wx::Event::EVT_MENU( $self, 101, \&OnAddImages ); 1214 1175 Wx::Event::EVT_MENU( $self, 102, \&OnRemoveImages ); … … 1240 1201 1241 1202 Wx::Event::EVT_BUTTON( $self, $main::PHOTO_PROPERTIES_UPLOAD, \&OnUploadImages ); 1203 Wx::Event::EVT_BUTTON( $self, $self->imageviewer->add_button->GetId, \&OnAddImages ); 1242 1204 1243 1205 } … … 1298 1260 $self->piwigo_photo_properties_tags->ClearAllSelection; 1299 1261 $self->imagelist->SetCurrentImage(-1); 1300 } 1262 $self->OnUpdateImageviewerEmpty; 1263 } 1264 else{ 1265 $self->OnUpdateImageviewerNotEmpty; 1266 } 1267 1301 1268 if(!$self->multi_selection_mode){ 1302 1269 $self->OnUpdateSingleSelectionModeUI; … … 1687 1654 $self->imageviewer->Refresh; 1688 1655 1689 $self->image_preview->image(1690 01691 ) if !$self->imageviewer->GetItemCount;1692 1656 if(!$self->imageviewer->GetItemCount){ 1657 $self->image_preview->image(0); 1658 $self->OnUpdateImageviewerEmpty; 1659 } 1693 1660 # reset previous selection 1694 1661 $self->imagelist->image_selection( … … 1808 1775 $wximagelist 1809 1776 ); 1777 1778 $self->OnUpdateImageviewerNotEmpty if $self->imageviewer->GetItemCount; 1810 1779 1811 1780 Wx::Yield(); … … 1934 1903 $self->image_preview->Destroy; 1935 1904 $self->image_prop_exif->Destroy; 1936 $self->getting_started->Destroy;1937 1905 1938 1906 $self->progressdlg->Destroy if defined $self->progressdlg; … … 1966 1934 } 1967 1935 ( 1968 [1969 100,1970 gettext("Getting started"),1971 wxTheApp->resource_path('tb_getting_started.png'),1972 wxBITMAP_TYPE_PNG,1973 1,1974 wxTheApp->resource_path('tb_getting_started.png'),1975 gettext("Display getting started panel")1976 ],1977 1936 [ 1978 1937 101, -
extensions/pLoader/trunk/src/Uploader/GUI/wxImageListCtrl.pm
r5041 r5104 23 23 use Wx::DND; 24 24 use POSIX qw(ceil floor); 25 use Wx::Locale qw/:default/; 25 26 use Wx qw/ 26 27 wxDefaultPosition … … 47 48 wxIMAGE_LIST_SMALL 48 49 wxTheApp 50 wxVERTICAL 51 wxALIGN_CENTER 52 wxHORIZONTAL 53 wxALIGN_CENTER_VERTICAL 54 wxALIGN_CENTER_HORIZONTAL 55 wxALL 56 wxGROW 57 wxWHITE 58 wxSWISS 59 wxNORMAL 60 wxBOLD 61 wxBITMAP_TYPE_PNG 49 62 /; 50 63 use Wx::Event qw/ … … 83 96 -1, 84 97 wxDefaultPosition, 85 [ 180, -1],98 [ -1, -1], 86 99 ); 87 100 … … 110 123 111 124 $self->prevItemCount(-1); 125 112 126 113 127 EVT_LIST_BEGIN_DRAG( $self, $self, \&OnBeginDrag); … … 135 149 $self->Refresh; 136 150 $self->change_display_mode(0); 137 } 138 $event->Skip; 139 } 140 ); 151 } 152 $event->Skip; 153 } 154 ); 155 156 # manages empty panel position 157 Wx::Event::EVT_PAINT( $self, sub { 158 my ( $self, $event ) = @_; 159 if(exists $self->{_empty_panel}){ 160 my ($w, $h) = $self->GetSizeWH; 161 my ($x, $y) = $self->GetPositionXY; 162 my ($wp, $hp) = $self->{_empty_panel}->GetSizeWH; 163 my $x_off = ($w-$wp)/3 > 0 ? ($w-$wp)/3 : 0; 164 my $y_off = ($h-$hp)/3 > 0 ? ($h-$hp)/3 : 0; 165 $self->{_empty_panel}->Move( 166 [ $x+$x_off, $y+$y_off ] 167 ); 168 } 169 $event->Skip; 170 } 171 ); 172 141 173 142 174 $self->initialize( … … 353 385 } 354 386 387 sub OnEmpty { 388 my ( $self ) = @_; 389 390 $self->_OnEmptyLayout; 391 392 } 393 394 sub OnNotEmpty { 395 my ( $self ) = @_; 396 397 $self->{_empty_panel}->Show(0) if exists $self->{_empty_panel}; 398 } 399 400 sub _OnEmptyLayout { 401 402 my( $self ) = @_; 403 $self->{_empty_panel}->Show(1); 404 405 } 406 407 sub add_button { 408 my ( $self ) = @_; 409 410 $self->{_add_bt}; 411 } 412 413 sub InitEmptyMsg { 414 415 my ( $self ) = @_; 416 # add a panel 417 my $empty_panel = Wx::Panel->new($self, -1, wxDefaultPosition, wxDefaultSize); 418 my( $item0 ) = Wx::BoxSizer->new( wxVERTICAL ); 419 420 my $fb = Wx::Font->new( 12, wxSWISS, wxNORMAL, wxBOLD ); 421 my $fn = Wx::Font->new( 12, wxSWISS, wxNORMAL, wxNORMAL ); 422 423 my( $item1 ) = Wx::StaticText->new( $empty_panel, -1, gettext("Drag photos here to get started"), wxDefaultPosition, wxDefaultSize, 0 ); 424 $item1->SetFont($fb); 425 $item0->AddWindow( $item1, 0, wxALIGN_CENTER|wxALL, 5 ); 426 427 my( $item2 ) = Wx::BoxSizer->new( wxHORIZONTAL ); 428 429 my( $item3 ) = Wx::StaticText->new( $empty_panel, -1, gettext("Or click"), wxDefaultPosition, wxDefaultSize, 0 ); 430 $item3->SetFont($fn); 431 $item2->AddWindow( $item3, 0, wxALIGN_CENTER|wxALL, 5 ); 432 433 my $icon1 = Wx::Icon->new(); 434 eval { 435 $icon1->LoadFile( 436 wxTheApp->resource_path('tb_add.png'), 437 wxBITMAP_TYPE_PNG 438 ); 439 }; 440 my $bmp = Wx::Bitmap->new( $icon1 ); 441 442 my( $item4 ) = Wx::BitmapButton->new( $empty_panel, -1, $bmp, wxDefaultPosition, wxDefaultSize ); 443 $item2->AddWindow( $item4, 0, wxALIGN_CENTER|wxALL, 5 ); 444 445 my( $item5 ) = Wx::StaticText->new( $empty_panel, -1, gettext("to choose files on your computer"), wxDefaultPosition, wxDefaultSize, 0 ); 446 $item5->SetFont($fn); 447 $item2->AddWindow( $item5, 0, wxALIGN_CENTER|wxALL, 5 ); 448 449 $item0->Add( $item2, 0, wxALIGN_CENTER|wxALL, 0 ); 450 451 $empty_panel->SetSizer( $item0 ); 452 $item0->SetSizeHints( $empty_panel ); 453 454 $self->{_empty_panel} = $empty_panel; 455 $self->{_add_bt} = $item4; 456 $self->{_empty_panel}->SetBackgroundColour(wxWHITE); 457 458 my ($wp, $hp) = $self->{_empty_panel}->GetSizeWH; 459 460 $self->SetMinSize( [20+$wp, -1 ]); 461 462 } 463 464 465 355 466 1; 356 467
Note: See TracChangeset
for help on using the changeset viewer.