Changeset 3472
- Timestamp:
- Jun 28, 2009, 7:58:18 PM (15 years ago)
- Location:
- extensions/pLoader/trunk/src/Uploader
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm
r3467 r3472 646 646 branding => $self->branding, 647 647 chunk_size => $self->chunk_size, 648 use_offline => $self->use_offline, 648 649 } 649 650 ) 650 651 ); 651 652 652 653 $rval; 653 654 } -
extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm
r3467 r3472 324 324 image_prop_piwigo 325 325 image_prop_exif 326 image_prop_tags 326 327 notebook_image_properties 327 328 notebook_global_settings … … 346 347 imageviewer_select_multi 347 348 frameLayout 349 piwigo_tags 350 image_tags 348 351 /; 349 352 __PACKAGE__->mk_accessors( @properties ); … … 366 369 use Uploader::GUI::wxImageListCtrl; 367 370 use Uploader::GUI::wxImageProcessingProgressDlg; 371 use Uploader::GUI::wxChoiceGridPanel; 368 372 use Wx::Html; 369 373 use Uploader::GUI::wxHtmlWindow; … … 576 580 ] 577 581 ); 582 578 583 579 584 $self->general_settings( … … 711 716 ] 712 717 ); 713 718 719 $self->image_tags( 720 sub { $self->imagelist->current_image->site_tags(@_) } 721 ); 722 723 $self->piwigo_tags( 724 wxTheApp->pwg->tags||[] 725 ); 714 726 } 715 727 … … 725 737 $self->image_prop_piwigo, 726 738 $self->image_prop_exif, 739 $self->image_prop_tags, 727 740 $self->general_settings_panel, 728 741 $self->resized_settings_panel, … … 806 819 $self->advanced_settings, 807 820 ); 821 808 822 809 823 } … … 889 903 ) 890 904 ); 905 906 $self->image_prop_tags( 907 Uploader::GUI::wxChoiceGridPanel->new( 908 { 909 parentwnd => $self, 910 choices => $self->piwigo_tags, 911 selection => $self->image_tags, 912 } 913 ) 914 ); 915 891 916 892 917 $self->general_settings_panel->Show(0); … … 952 977 ) 953 978 ); 954 #$self->htmlhome->SetDropTarget(955 # DNDImageListDropTarget->new(956 # $self->imageviewer957 # )958 #);959 960 979 961 980 $self->tree->SetDropTarget( … … 1111 1130 } 1112 1131 1132 sub OnDefaultPhotoNameChanged { 1133 my ( $self ) = @_; 1134 1135 Wx::LogMessage("New default_photo_name %s", $self->imagelist->default_photo_name); 1136 } 1137 1113 1138 1114 1139 sub create_notebook_imagelist { … … 1139 1164 $self->image_prop_piwigo, 1140 1165 "Piwigo", 1166 ], 1167 [ 1168 $self->image_prop_tags, 1169 "Tags", 1141 1170 ], 1142 1171 [ … … 1746 1775 $self->image_prop_piwigo->Refresh; 1747 1776 $self->image_prop_exif->Refresh; 1777 $self->image_prop_tags->Refresh; 1748 1778 1749 1779 } … … 1869 1899 1870 1900 if(!$self->imageviewer->IsShown){ 1871 #my $imglistpage = [1872 # [1873 # $self->imageviewer,1874 # gettext("Photo selection"),1875 # '../res/images.png',1876 # wxBITMAP_TYPE_PNG,1877 # ],1878 #];1879 #$self->notebook->DeletePage(0);1880 1881 1901 $self->imageviewer->Show(1); 1882 #$self->_populate_notebook($self->notebook, $imglistpage, 0);1883 # load imagelist with loading.jpg1884 1902 } 1885 1886 1903 } 1887 1904 -
extensions/pLoader/trunk/src/Uploader/ImageList.pm
r3451 r3472 143 143 } 144 144 145 sub _set_current_image_filepaths__ {146 my ( $self ) = @_;147 148 my ( $vol, $dir, $file ) = File::Spec->splitpath(149 $self->current_image->file150 );151 152 my ( $filename, $ext ) = split /\./, $file ;153 154 155 $self->current_image->wx_thumb_file(156 File::Spec->catfile(157 $self->wx_thumb_dir,158 sprintf(159 "%s.%s",160 $filename,161 $self->type,162 )163 )164 );165 166 $self->current_image->preview_file(167 File::Spec->catfile(168 $self->preview_dir,169 sprintf(170 "%s.%s",171 $filename,172 $self->type,173 )174 )175 );176 $self->current_image->preview_file(177 encode('iso-8859-1', $self->current_image->preview_file)178 );179 180 $self->current_image->site_thumb_file(181 File::Spec->catfile(182 $self->site_thumb_dir,183 sprintf(184 "%s.%s",185 $filename,186 $self->type,187 )188 )189 );190 191 }192 145 193 146 sub _set_current_image_filepaths { … … 901 854 my $site_name = $self->current_image->site_name; 902 855 903 # my ( $filename, $ext ) = split /\./, $file ;904 856 my $filename = $self->current_image->file_sum ; 905 857 … … 1176 1128 ); 1177 1129 1178 $self->pwg-> tags(1179 #join(',', @{$self->current_image->site_tags})1130 $self->pwg->site_tags( 1131 join(',', @{$self->current_image->site_tags}) 1180 1132 ); 1181 1133 -
extensions/pLoader/trunk/src/Uploader/PWG.pm
r3285 r3472 38 38 http_password 39 39 branding 40 use_offline 40 41 / 41 42 ); … … 49 50 # for web services 50 51 $self->SUPER::Init(); 51 52 $self->RefreshCategories;53 52 53 if(!$self->use_offline){ 54 $self->RefreshCategories; 55 $self->RefreshTags; 56 } 54 57 } 55 58 … … 64 67 } 65 68 69 sub RefreshTags { 70 my ( $self ) = @_; 71 72 $self->tags( 73 $self->GetTags 74 ); 75 } 76 66 77 67 78 1; -
extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm
r3467 r3472 43 43 qry_list_categories 44 44 qry_add_categories 45 qry_list_tags 45 46 items 46 47 tags … … 50 51 site_thumb_file 51 52 site_image_name 53 site_tags 52 54 rank 53 55 site_author … … 105 107 ); 106 108 109 $self->qry_list_tags( sprintf 110 "%s/ws.php?format=json&method=%s", 111 $self->urlbase, 112 'pwg.tags.getAdminList', 113 ); 114 115 107 116 my $form = { 108 117 method => 'pwg.session.login', … … 170 179 $categories; 171 180 } 181 182 sub GetTags { 183 my ( $self ) = @_; 184 185 my $result; 186 eval { 187 $result = $self->uagent->get( 188 $self->qry_list_tags 189 ); 190 }; 191 192 if($@){ 193 printf("An error occured in query execution %s\n%s", 194 $self->qry_list_tags, 195 $@, 196 ); 197 } 198 my $hresult; 199 200 eval { 201 $hresult = from_json( 202 $result->content 203 ); 204 }; 205 206 $hresult ||= {}; 207 208 $hresult->{result}{tags}; 209 } 210 172 211 173 212 sub UploadImage { … … 256 295 comment => $self->site_comment, 257 296 date_creation => $self->site_img_date_creation, 297 tag_ids => $self->site_tags, 258 298 259 299 }; … … 286 326 comment => $self->site_comment, 287 327 date_creation => $self->site_img_date_creation, 328 tag_ids => $self->site_tags, 288 329 }; 289 330 }
Note: See TracChangeset
for help on using the changeset viewer.