Changeset 3159
- Timestamp:
- Feb 22, 2009, 6:33:24 PM (15 years ago)
- Location:
- extras/pLoader/trunk/src/Uploader
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm
r3140 r3159 39 39 wxICON_EXCLAMATION 40 40 wxOK 41 wxLANGUAGE_ABKHAZIAN 42 wxLANGUAGE_AFAR 43 wxLANGUAGE_AFRIKAANS 44 wxLANGUAGE_ALBANIAN 45 wxLANGUAGE_AMHARIC 46 wxLANGUAGE_ARABIC 47 wxLANGUAGE_ARABIC_ALGERIA 48 wxLANGUAGE_ARABIC_BAHRAIN 49 wxLANGUAGE_ARABIC_EGYPT 50 wxLANGUAGE_ARABIC_IRAQ 51 wxLANGUAGE_ARABIC_JORDAN 52 wxLANGUAGE_ARABIC_KUWAIT 53 wxLANGUAGE_ARABIC_LEBANON 54 wxLANGUAGE_ARABIC_LIBYA 55 wxLANGUAGE_ARABIC_MOROCCO 56 wxLANGUAGE_ARABIC_OMAN 57 wxLANGUAGE_ARABIC_QATAR 58 wxLANGUAGE_ARABIC_SAUDI_ARABIA 59 wxLANGUAGE_ARABIC_SUDAN 60 wxLANGUAGE_ARABIC_SYRIA 61 wxLANGUAGE_ARABIC_TUNISIA 62 wxLANGUAGE_ARABIC_UAE 63 wxLANGUAGE_ARABIC_YEMEN 64 wxLANGUAGE_ARMENIAN 65 wxLANGUAGE_ASSAMESE 66 wxLANGUAGE_AYMARA 67 wxLANGUAGE_AZERI 68 wxLANGUAGE_AZERI_CYRILLIC 69 wxLANGUAGE_AZERI_LATIN 70 wxLANGUAGE_BASHKIR 71 wxLANGUAGE_BASQUE 72 wxLANGUAGE_BELARUSIAN 73 wxLANGUAGE_BENGALI 74 wxLANGUAGE_BHUTANI 75 wxLANGUAGE_BIHARI 76 wxLANGUAGE_BISLAMA 77 wxLANGUAGE_BRETON 78 wxLANGUAGE_BULGARIAN 79 wxLANGUAGE_BURMESE 80 wxLANGUAGE_CAMBODIAN 81 wxLANGUAGE_CATALAN 82 wxLANGUAGE_CHINESE 83 wxLANGUAGE_CHINESE_SIMPLIFIED 84 wxLANGUAGE_CHINESE_TRADITIONAL 85 wxLANGUAGE_CHINESE_HONGKONG 86 wxLANGUAGE_CHINESE_MACAU 87 wxLANGUAGE_CHINESE_SINGAPORE 88 wxLANGUAGE_CHINESE_TAIWAN 89 wxLANGUAGE_CORSICAN 90 wxLANGUAGE_CROATIAN 91 wxLANGUAGE_CZECH 92 wxLANGUAGE_DANISH 93 wxLANGUAGE_DUTCH 94 wxLANGUAGE_DUTCH_BELGIAN 95 wxLANGUAGE_ENGLISH 96 wxLANGUAGE_ENGLISH_UK 97 wxLANGUAGE_ENGLISH_US 98 wxLANGUAGE_ENGLISH_AUSTRALIA 99 wxLANGUAGE_ENGLISH_BELIZE 100 wxLANGUAGE_ENGLISH_BOTSWANA 101 wxLANGUAGE_ENGLISH_CANADA 102 wxLANGUAGE_ENGLISH_CARIBBEAN 103 wxLANGUAGE_ENGLISH_DENMARK 104 wxLANGUAGE_ENGLISH_EIRE 105 wxLANGUAGE_ENGLISH_JAMAICA 106 wxLANGUAGE_ENGLISH_NEW_ZEALAND 107 wxLANGUAGE_ENGLISH_PHILIPPINES 108 wxLANGUAGE_ENGLISH_SOUTH_AFRICA 109 wxLANGUAGE_ENGLISH_TRINIDAD 110 wxLANGUAGE_ENGLISH_ZIMBABWE 111 wxLANGUAGE_ESPERANTO 112 wxLANGUAGE_ESTONIAN 113 wxLANGUAGE_FAEROESE 114 wxLANGUAGE_FARSI 115 wxLANGUAGE_FIJI 116 wxLANGUAGE_FINNISH 117 wxLANGUAGE_FRENCH 118 wxLANGUAGE_FRENCH_BELGIAN 119 wxLANGUAGE_FRENCH_CANADIAN 120 wxLANGUAGE_FRENCH_LUXEMBOURG 121 wxLANGUAGE_FRENCH_MONACO 122 wxLANGUAGE_FRENCH_SWISS 123 wxLANGUAGE_FRISIAN 124 wxLANGUAGE_GALICIAN 125 wxLANGUAGE_GEORGIAN 126 wxLANGUAGE_GERMAN 127 wxLANGUAGE_GERMAN_AUSTRIAN 128 wxLANGUAGE_GERMAN_BELGIUM 129 wxLANGUAGE_GERMAN_LIECHTENSTEIN 130 wxLANGUAGE_GERMAN_LUXEMBOURG 131 wxLANGUAGE_GERMAN_SWISS 132 wxLANGUAGE_GREEK 133 wxLANGUAGE_GREENLANDIC 134 wxLANGUAGE_GUARANI 135 wxLANGUAGE_GUJARATI 136 wxLANGUAGE_HAUSA 137 wxLANGUAGE_HEBREW 138 wxLANGUAGE_HINDI 139 wxLANGUAGE_HUNGARIAN 140 wxLANGUAGE_ICELANDIC 141 wxLANGUAGE_INDONESIAN 142 wxLANGUAGE_INTERLINGUA 143 wxLANGUAGE_INTERLINGUE 144 wxLANGUAGE_INUKTITUT 145 wxLANGUAGE_INUPIAK 146 wxLANGUAGE_IRISH 147 wxLANGUAGE_ITALIAN 148 wxLANGUAGE_ITALIAN_SWISS 149 wxLANGUAGE_JAPANESE 150 wxLANGUAGE_JAVANESE 151 wxLANGUAGE_KANNADA 152 wxLANGUAGE_KASHMIRI 153 wxLANGUAGE_KASHMIRI_INDIA 154 wxLANGUAGE_KAZAKH 155 wxLANGUAGE_KERNEWEK 156 wxLANGUAGE_KINYARWANDA 157 wxLANGUAGE_KIRGHIZ 158 wxLANGUAGE_KIRUNDI 159 wxLANGUAGE_KONKANI 160 wxLANGUAGE_KOREAN 161 wxLANGUAGE_KURDISH 162 wxLANGUAGE_LAOTHIAN 163 wxLANGUAGE_LATIN 164 wxLANGUAGE_LATVIAN 165 wxLANGUAGE_LINGALA 166 wxLANGUAGE_LITHUANIAN 167 wxLANGUAGE_MACEDONIAN 168 wxLANGUAGE_MALAGASY 169 wxLANGUAGE_MALAY 170 wxLANGUAGE_MALAYALAM 171 wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM 172 wxLANGUAGE_MALAY_MALAYSIA 173 wxLANGUAGE_MALTESE 174 wxLANGUAGE_MANIPURI 175 wxLANGUAGE_MAORI 176 wxLANGUAGE_MARATHI 177 wxLANGUAGE_MOLDAVIAN 178 wxLANGUAGE_MONGOLIAN 179 wxLANGUAGE_NAURU 180 wxLANGUAGE_NEPALI 181 wxLANGUAGE_NEPALI_INDIA 182 wxLANGUAGE_NORWEGIAN_BOKMAL 183 wxLANGUAGE_NORWEGIAN_NYNORSK 184 wxLANGUAGE_OCCITAN 185 wxLANGUAGE_ORIYA 186 wxLANGUAGE_OROMO 187 wxLANGUAGE_PASHTO 188 wxLANGUAGE_POLISH 189 wxLANGUAGE_PORTUGUESE 190 wxLANGUAGE_PORTUGUESE_BRAZILIAN 191 wxLANGUAGE_PUNJABI 192 wxLANGUAGE_QUECHUA 193 wxLANGUAGE_RHAETO_ROMANCE 194 wxLANGUAGE_ROMANIAN 195 wxLANGUAGE_RUSSIAN 196 wxLANGUAGE_RUSSIAN_UKRAINE 197 wxLANGUAGE_SAMI 198 wxLANGUAGE_SAMOAN 199 wxLANGUAGE_SANGHO 200 wxLANGUAGE_SANSKRIT 201 wxLANGUAGE_SCOTS_GAELIC 202 wxLANGUAGE_SERBIAN 203 wxLANGUAGE_SERBIAN_CYRILLIC 204 wxLANGUAGE_SERBIAN_LATIN 205 wxLANGUAGE_SERBO_CROATIAN 206 wxLANGUAGE_SESOTHO 207 wxLANGUAGE_SETSWANA 208 wxLANGUAGE_SHONA 209 wxLANGUAGE_SINDHI 210 wxLANGUAGE_SINHALESE 211 wxLANGUAGE_SISWATI 212 wxLANGUAGE_SLOVAK 213 wxLANGUAGE_SLOVENIAN 214 wxLANGUAGE_SOMALI 215 wxLANGUAGE_SPANISH 216 wxLANGUAGE_SPANISH_ARGENTINA 217 wxLANGUAGE_SPANISH_BOLIVIA 218 wxLANGUAGE_SPANISH_CHILE 219 wxLANGUAGE_SPANISH_COLOMBIA 220 wxLANGUAGE_SPANISH_COSTA_RICA 221 wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC 222 wxLANGUAGE_SPANISH_ECUADOR 223 wxLANGUAGE_SPANISH_EL_SALVADOR 224 wxLANGUAGE_SPANISH_GUATEMALA 225 wxLANGUAGE_SPANISH_HONDURAS 226 wxLANGUAGE_SPANISH_MEXICAN 227 wxLANGUAGE_SPANISH_MODERN 228 wxLANGUAGE_SPANISH_NICARAGUA 229 wxLANGUAGE_SPANISH_PANAMA 230 wxLANGUAGE_SPANISH_PARAGUAY 231 wxLANGUAGE_SPANISH_PERU 232 wxLANGUAGE_SPANISH_PUERTO_RICO 233 wxLANGUAGE_SPANISH_URUGUAY 234 wxLANGUAGE_SPANISH_US 235 wxLANGUAGE_SPANISH_VENEZUELA 236 wxLANGUAGE_SUNDANESE 237 wxLANGUAGE_SWAHILI 238 wxLANGUAGE_SWEDISH 239 wxLANGUAGE_SWEDISH_FINLAND 240 wxLANGUAGE_TAGALOG 241 wxLANGUAGE_TAJIK 242 wxLANGUAGE_TAMIL 243 wxLANGUAGE_TATAR 244 wxLANGUAGE_TELUGU 245 wxLANGUAGE_THAI 246 wxLANGUAGE_TIBETAN 247 wxLANGUAGE_TIGRINYA 248 wxLANGUAGE_TONGA 249 wxLANGUAGE_TSONGA 250 wxLANGUAGE_TURKISH 251 wxLANGUAGE_TURKMEN 252 wxLANGUAGE_TWI 253 wxLANGUAGE_UIGHUR 254 wxLANGUAGE_UKRAINIAN 255 wxLANGUAGE_URDU 256 wxLANGUAGE_URDU_INDIA 257 wxLANGUAGE_URDU_PAKISTAN 258 wxLANGUAGE_UZBEK 259 wxLANGUAGE_UZBEK_CYRILLIC 260 wxLANGUAGE_UZBEK_LATIN 261 wxLANGUAGE_VALENCIAN 262 wxLANGUAGE_VIETNAMESE 263 wxLANGUAGE_VOLAPUK 264 wxLANGUAGE_WELSH 265 wxLANGUAGE_WOLOF 266 wxLANGUAGE_XHOSA 267 wxLANGUAGE_YIDDISH 268 wxLANGUAGE_YORUBA 269 wxLANGUAGE_ZHUANG 270 wxLANGUAGE_ZULU 41 271 /; 42 272 use Uploader::GUI::wxFrameAUI; … … 49 279 use Uploader::ImageList; 50 280 use Uploader::GUI::wxLoginDlg; 281 use Wx::Locale qw/:default/; 51 282 52 283 … … 69 300 thumb_dir 70 301 conf_file 302 locale 303 current_language 71 304 / 72 305 ); … … 94 327 }; 95 328 329 $self->_readParams2( 'locale.ini' ) ; 330 96 331 $self->_init_userdir; 97 332 … … 106 341 } 107 342 343 108 344 $self->site_url( 109 345 $self->{site_url} … … 116 352 $self->{site_password} 117 353 ); 118 119 354 $self->current_language( 355 $self->{current_language}||wxLANGUAGE_ENGLISH 356 ); 357 358 359 $self->init_locale; 360 361 120 362 121 363 my $ok = $self->Login(); … … 143 385 } 144 386 387 my $locale; 388 sub init_locale { 389 my ( $self, $language ) = @_; 390 391 $self->current_language( 392 $language 393 ) if defined $language; 394 395 undef $locale; 396 $locale = Wx::Locale->new( 397 $self->current_language 398 ); 399 $locale->AddCatalogLookupPathPrefix( '../locale'); 400 if(!$locale->AddCatalog( 'pLoader' )){ 401 print "Cannot find translation catalog files. Use default language\n"; 402 } 403 404 } 405 145 406 sub StoreConnectionProperties { 146 407 my ( $self ) = @_; … … 156 417 site_username 157 418 site_password 419 current_language 158 420 / 159 421 }, … … 232 494 my $dlg = Uploader::GUI::wxLoginDlg->new( 233 495 { 234 title => "Piwigo login",496 title => gettext("Piwigo login"), 235 497 site_url => sub { $self->site_url(@_) }, 236 498 site_username => sub { $self->site_username(@_) }, … … 439 701 } 440 702 else{ 441 $url = "Not connected";703 $url = gettext("Not connected"); 442 704 Wx::MessageBox( 443 705 sprintf( 444 "%s\n\n Connection to %s failed",706 "%s\n\n%s %s %s", 445 707 $self->pwg->login_result->{message}, 708 gettext("Connection to"), 446 709 $self->site_url, 710 gettext("failed"), 447 711 ), 448 "Piwigo login error",712 gettext("Piwigo login error"), 449 713 wxOK | wxICON_EXCLAMATION, 450 714 ); … … 458 722 width => $w, 459 723 height => $h, 460 title => "pLoader - Piwigo uploader 1.0 RC4- [$url]" ,724 title => "pLoader - Piwigo uploader 2.0.0a - [$url]" , 461 725 pwg => $self->pwg, 462 726 imagelist => $self->imagelist, … … 500 764 } 501 765 766 sub _readParams2 { 767 my( $self, $file ) = @_ ; 768 769 770 my $expr_params ; 771 eval { $expr_params = read_file( $file ); } ; 772 773 my $paramValues = [] ; 774 if($expr_params){ 775 my $expr = '$paramValues = ' ; 776 $expr .= "$expr_params ; " ; 777 eval $expr ; 778 } 779 780 return unless 'HASH' eq ref $paramValues ; 781 782 $self->SetKeyValues($paramValues); 783 } 784 785 502 786 sub SetKeyValues { 503 787 my ( $self, $params )= @_; … … 508 792 } 509 793 794 510 795 1; -
extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm
r3141 r3159 24 24 use Wx::DND; 25 25 use Wx qw/ 26 wxID_OK 26 27 wxDEFAULT_FRAME_STYLE 27 28 wxVERTICAL … … 62 63 wxICON_INFORMATION 63 64 WXK_DELETE 65 wxLANGUAGE_ABKHAZIAN 66 wxLANGUAGE_AFAR 67 wxLANGUAGE_AFRIKAANS 68 wxLANGUAGE_ALBANIAN 69 wxLANGUAGE_AMHARIC 70 wxLANGUAGE_ARABIC 71 wxLANGUAGE_ARABIC_ALGERIA 72 wxLANGUAGE_ARABIC_BAHRAIN 73 wxLANGUAGE_ARABIC_EGYPT 74 wxLANGUAGE_ARABIC_IRAQ 75 wxLANGUAGE_ARABIC_JORDAN 76 wxLANGUAGE_ARABIC_KUWAIT 77 wxLANGUAGE_ARABIC_LEBANON 78 wxLANGUAGE_ARABIC_LIBYA 79 wxLANGUAGE_ARABIC_MOROCCO 80 wxLANGUAGE_ARABIC_OMAN 81 wxLANGUAGE_ARABIC_QATAR 82 wxLANGUAGE_ARABIC_SAUDI_ARABIA 83 wxLANGUAGE_ARABIC_SUDAN 84 wxLANGUAGE_ARABIC_SYRIA 85 wxLANGUAGE_ARABIC_TUNISIA 86 wxLANGUAGE_ARABIC_UAE 87 wxLANGUAGE_ARABIC_YEMEN 88 wxLANGUAGE_ARMENIAN 89 wxLANGUAGE_ASSAMESE 90 wxLANGUAGE_AYMARA 91 wxLANGUAGE_AZERI 92 wxLANGUAGE_AZERI_CYRILLIC 93 wxLANGUAGE_AZERI_LATIN 94 wxLANGUAGE_BASHKIR 95 wxLANGUAGE_BASQUE 96 wxLANGUAGE_BELARUSIAN 97 wxLANGUAGE_BENGALI 98 wxLANGUAGE_BHUTANI 99 wxLANGUAGE_BIHARI 100 wxLANGUAGE_BISLAMA 101 wxLANGUAGE_BRETON 102 wxLANGUAGE_BULGARIAN 103 wxLANGUAGE_BURMESE 104 wxLANGUAGE_CAMBODIAN 105 wxLANGUAGE_CATALAN 106 wxLANGUAGE_CHINESE 107 wxLANGUAGE_CHINESE_SIMPLIFIED 108 wxLANGUAGE_CHINESE_TRADITIONAL 109 wxLANGUAGE_CHINESE_HONGKONG 110 wxLANGUAGE_CHINESE_MACAU 111 wxLANGUAGE_CHINESE_SINGAPORE 112 wxLANGUAGE_CHINESE_TAIWAN 113 wxLANGUAGE_CORSICAN 114 wxLANGUAGE_CROATIAN 115 wxLANGUAGE_CZECH 116 wxLANGUAGE_DANISH 117 wxLANGUAGE_DUTCH 118 wxLANGUAGE_DUTCH_BELGIAN 119 wxLANGUAGE_ENGLISH 120 wxLANGUAGE_ENGLISH_UK 121 wxLANGUAGE_ENGLISH_US 122 wxLANGUAGE_ENGLISH_AUSTRALIA 123 wxLANGUAGE_ENGLISH_BELIZE 124 wxLANGUAGE_ENGLISH_BOTSWANA 125 wxLANGUAGE_ENGLISH_CANADA 126 wxLANGUAGE_ENGLISH_CARIBBEAN 127 wxLANGUAGE_ENGLISH_DENMARK 128 wxLANGUAGE_ENGLISH_EIRE 129 wxLANGUAGE_ENGLISH_JAMAICA 130 wxLANGUAGE_ENGLISH_NEW_ZEALAND 131 wxLANGUAGE_ENGLISH_PHILIPPINES 132 wxLANGUAGE_ENGLISH_SOUTH_AFRICA 133 wxLANGUAGE_ENGLISH_TRINIDAD 134 wxLANGUAGE_ENGLISH_ZIMBABWE 135 wxLANGUAGE_ESPERANTO 136 wxLANGUAGE_ESTONIAN 137 wxLANGUAGE_FAEROESE 138 wxLANGUAGE_FARSI 139 wxLANGUAGE_FIJI 140 wxLANGUAGE_FINNISH 141 wxLANGUAGE_FRENCH 142 wxLANGUAGE_FRENCH_BELGIAN 143 wxLANGUAGE_FRENCH_CANADIAN 144 wxLANGUAGE_FRENCH_LUXEMBOURG 145 wxLANGUAGE_FRENCH_MONACO 146 wxLANGUAGE_FRENCH_SWISS 147 wxLANGUAGE_FRISIAN 148 wxLANGUAGE_GALICIAN 149 wxLANGUAGE_GEORGIAN 150 wxLANGUAGE_GERMAN 151 wxLANGUAGE_GERMAN_AUSTRIAN 152 wxLANGUAGE_GERMAN_BELGIUM 153 wxLANGUAGE_GERMAN_LIECHTENSTEIN 154 wxLANGUAGE_GERMAN_LUXEMBOURG 155 wxLANGUAGE_GERMAN_SWISS 156 wxLANGUAGE_GREEK 157 wxLANGUAGE_GREENLANDIC 158 wxLANGUAGE_GUARANI 159 wxLANGUAGE_GUJARATI 160 wxLANGUAGE_HAUSA 161 wxLANGUAGE_HEBREW 162 wxLANGUAGE_HINDI 163 wxLANGUAGE_HUNGARIAN 164 wxLANGUAGE_ICELANDIC 165 wxLANGUAGE_INDONESIAN 166 wxLANGUAGE_INTERLINGUA 167 wxLANGUAGE_INTERLINGUE 168 wxLANGUAGE_INUKTITUT 169 wxLANGUAGE_INUPIAK 170 wxLANGUAGE_IRISH 171 wxLANGUAGE_ITALIAN 172 wxLANGUAGE_ITALIAN_SWISS 173 wxLANGUAGE_JAPANESE 174 wxLANGUAGE_JAVANESE 175 wxLANGUAGE_KANNADA 176 wxLANGUAGE_KASHMIRI 177 wxLANGUAGE_KASHMIRI_INDIA 178 wxLANGUAGE_KAZAKH 179 wxLANGUAGE_KERNEWEK 180 wxLANGUAGE_KINYARWANDA 181 wxLANGUAGE_KIRGHIZ 182 wxLANGUAGE_KIRUNDI 183 wxLANGUAGE_KONKANI 184 wxLANGUAGE_KOREAN 185 wxLANGUAGE_KURDISH 186 wxLANGUAGE_LAOTHIAN 187 wxLANGUAGE_LATIN 188 wxLANGUAGE_LATVIAN 189 wxLANGUAGE_LINGALA 190 wxLANGUAGE_LITHUANIAN 191 wxLANGUAGE_MACEDONIAN 192 wxLANGUAGE_MALAGASY 193 wxLANGUAGE_MALAY 194 wxLANGUAGE_MALAYALAM 195 wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM 196 wxLANGUAGE_MALAY_MALAYSIA 197 wxLANGUAGE_MALTESE 198 wxLANGUAGE_MANIPURI 199 wxLANGUAGE_MAORI 200 wxLANGUAGE_MARATHI 201 wxLANGUAGE_MOLDAVIAN 202 wxLANGUAGE_MONGOLIAN 203 wxLANGUAGE_NAURU 204 wxLANGUAGE_NEPALI 205 wxLANGUAGE_NEPALI_INDIA 206 wxLANGUAGE_NORWEGIAN_BOKMAL 207 wxLANGUAGE_NORWEGIAN_NYNORSK 208 wxLANGUAGE_OCCITAN 209 wxLANGUAGE_ORIYA 210 wxLANGUAGE_OROMO 211 wxLANGUAGE_PASHTO 212 wxLANGUAGE_POLISH 213 wxLANGUAGE_PORTUGUESE 214 wxLANGUAGE_PORTUGUESE_BRAZILIAN 215 wxLANGUAGE_PUNJABI 216 wxLANGUAGE_QUECHUA 217 wxLANGUAGE_RHAETO_ROMANCE 218 wxLANGUAGE_ROMANIAN 219 wxLANGUAGE_RUSSIAN 220 wxLANGUAGE_RUSSIAN_UKRAINE 221 wxLANGUAGE_SAMI 222 wxLANGUAGE_SAMOAN 223 wxLANGUAGE_SANGHO 224 wxLANGUAGE_SANSKRIT 225 wxLANGUAGE_SCOTS_GAELIC 226 wxLANGUAGE_SERBIAN 227 wxLANGUAGE_SERBIAN_CYRILLIC 228 wxLANGUAGE_SERBIAN_LATIN 229 wxLANGUAGE_SERBO_CROATIAN 230 wxLANGUAGE_SESOTHO 231 wxLANGUAGE_SETSWANA 232 wxLANGUAGE_SHONA 233 wxLANGUAGE_SINDHI 234 wxLANGUAGE_SINHALESE 235 wxLANGUAGE_SISWATI 236 wxLANGUAGE_SLOVAK 237 wxLANGUAGE_SLOVENIAN 238 wxLANGUAGE_SOMALI 239 wxLANGUAGE_SPANISH 240 wxLANGUAGE_SPANISH_ARGENTINA 241 wxLANGUAGE_SPANISH_BOLIVIA 242 wxLANGUAGE_SPANISH_CHILE 243 wxLANGUAGE_SPANISH_COLOMBIA 244 wxLANGUAGE_SPANISH_COSTA_RICA 245 wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC 246 wxLANGUAGE_SPANISH_ECUADOR 247 wxLANGUAGE_SPANISH_EL_SALVADOR 248 wxLANGUAGE_SPANISH_GUATEMALA 249 wxLANGUAGE_SPANISH_HONDURAS 250 wxLANGUAGE_SPANISH_MEXICAN 251 wxLANGUAGE_SPANISH_MODERN 252 wxLANGUAGE_SPANISH_NICARAGUA 253 wxLANGUAGE_SPANISH_PANAMA 254 wxLANGUAGE_SPANISH_PARAGUAY 255 wxLANGUAGE_SPANISH_PERU 256 wxLANGUAGE_SPANISH_PUERTO_RICO 257 wxLANGUAGE_SPANISH_URUGUAY 258 wxLANGUAGE_SPANISH_US 259 wxLANGUAGE_SPANISH_VENEZUELA 260 wxLANGUAGE_SUNDANESE 261 wxLANGUAGE_SWAHILI 262 wxLANGUAGE_SWEDISH 263 wxLANGUAGE_SWEDISH_FINLAND 264 wxLANGUAGE_TAGALOG 265 wxLANGUAGE_TAJIK 266 wxLANGUAGE_TAMIL 267 wxLANGUAGE_TATAR 268 wxLANGUAGE_TELUGU 269 wxLANGUAGE_THAI 270 wxLANGUAGE_TIBETAN 271 wxLANGUAGE_TIGRINYA 272 wxLANGUAGE_TONGA 273 wxLANGUAGE_TSONGA 274 wxLANGUAGE_TURKISH 275 wxLANGUAGE_TURKMEN 276 wxLANGUAGE_TWI 277 wxLANGUAGE_UIGHUR 278 wxLANGUAGE_UKRAINIAN 279 wxLANGUAGE_URDU 280 wxLANGUAGE_URDU_INDIA 281 wxLANGUAGE_URDU_PAKISTAN 282 wxLANGUAGE_UZBEK 283 wxLANGUAGE_UZBEK_CYRILLIC 284 wxLANGUAGE_UZBEK_LATIN 285 wxLANGUAGE_VALENCIAN 286 wxLANGUAGE_VIETNAMESE 287 wxLANGUAGE_VOLAPUK 288 wxLANGUAGE_WELSH 289 wxLANGUAGE_WOLOF 290 wxLANGUAGE_XHOSA 291 wxLANGUAGE_YIDDISH 292 wxLANGUAGE_YORUBA 293 wxLANGUAGE_ZHUANG 294 wxLANGUAGE_ZULU 64 295 /; 65 296 use base qw/Wx::Frame Class::Accessor::Fast/; 66 297 use File::Spec; 298 use Wx::Locale qw/:default/; 67 299 68 300 … … 88 320 image_prop_exif 89 321 notebook_image_properties 322 notebook_global_settings 90 323 global_settings_panel 91 324 /; … … 208 441 } 209 442 210 443 sub _refreshFrame { 444 my ( $self ) = @_; 445 446 $self->_destroy_settings_panels; 447 $self->manager->Update; 448 449 $self->_init_settings_panels; 450 $self->_init_aui_settings_panels; 451 452 $self->manager->Update; 453 } 454 455 sub _destroy_settings_panels { 456 my ( $self ) = @_; 457 458 459 460 map { 461 $self->manager->DetachPane( 462 $_ 463 ); 464 $_->Show(0); 465 $_->Destroy; 466 }( 467 $self->notebook_global_settings, 468 $self->notebook_image_properties, 469 ); 470 } 471 472 # 211 473 sub _initFrame { 212 474 my ( $self ) = @_; 213 475 214 476 215 $self->htmlhome( 216 Uploader::GUI::wxHtmlWindow->new( 217 $self, -1 218 ) 219 ); 220 $self->imageviewer( 221 Uploader::GUI::wxImageListCtrl->new( 222 { 223 parentwnd => $self, 224 imagelist => $self->imagelist, 225 } 226 ) 227 ); 228 477 $self->init_panels; 478 479 $self->imageviewer->Show(0); 480 481 $self->init_aui; 482 $self->init_dnd_targets; 483 484 if( $self->imagelist->wx_thumb_imglist->GetImageCount){ 485 $self->ShowImageViewer; 486 487 $self->imageviewer->Refresh( 488 $self->imagelist->wx_thumb_imglist 489 ); 490 } 491 492 } 493 494 sub _init_settings_panels { 495 my ( $self ) = @_; 496 229 497 $self->global_settings_panel( 230 498 $self->create_global_settings_panel() 231 499 ); 232 500 501 $self->global_settings_panel->Show(0); 502 233 503 $self->image_prop_general( 234 504 Uploader::GUI::wxPhotoPropertiesPanel->new( … … 265 535 ); 266 536 537 $self->image_prop_general->Show(0); 538 539 267 540 $self->image_prop_exif( 268 541 Uploader::GUI::wxPhotoExifPanel->new( … … 297 570 ) 298 571 ); 299 300 301 $self->imageviewer->Show(0); 572 573 $self->image_prop_exif->Show(0); 574 575 } 576 577 sub init_panels { 578 my ( $self ) = @_; 579 580 $self->htmlhome( 581 Uploader::GUI::wxHtmlWindow->new( 582 $self, -1 583 ) 584 ); 585 586 $self->imageviewer( 587 Uploader::GUI::wxImageListCtrl->new( 588 { 589 parentwnd => $self, 590 imagelist => $self->imagelist, 591 } 592 ) 593 ); 594 595 $self->_init_settings_panels; 596 } 597 598 sub init_dnd_targets { 599 my ( $self ) = @_; 302 600 303 601 $self->imageviewer->SetDropTarget( … … 312 610 ); 313 611 314 $self->manager->AddPane315 ( $self->create_notebook_imagelist, Wx::AuiPaneInfo->new->Name( "ImageViewer" )316 ->CenterPane->Resizable->CloseButton(0) );317 318 319 $self->manager->AddPane320 ( $self->create_tree, Wx::AuiPaneInfo->new->Name( "categories" )->Caption(321 sprintf("Piwigo categories - %s", wxTheApp->site_url )322 )323 ->Right->Position( 0 )->Resizable->CloseButton(0) );324 612 325 613 $self->tree->SetDropTarget( … … 328 616 ) 329 617 ); 330 618 619 } 620 621 sub init_aui { 622 my ( $self ) = @_; 331 623 332 624 $self->manager->AddPane 333 ( $self->create_notebook_image_properties, Wx::AuiPaneInfo->new->Name( "photo_properties" )->Caption("Photo properties") 625 ( $self->create_notebook_imagelist, Wx::AuiPaneInfo->new->Name( "ImageViewer" ) 626 ->CenterPane->Resizable->CloseButton(0) ); 627 628 $self->manager->AddPane 629 ( $self->create_tree, Wx::AuiPaneInfo->new->Name( "categories" )->Caption( 630 sprintf("%s - %s", gettext("Piwigo categories"), wxTheApp->site_url ) 631 ) 632 ->Right->Position( 0 )->Resizable->CloseButton(0) ); 633 634 $self->_init_aui_settings_panels; 635 636 my $tb = $self->create_toolbar; 637 638 $self->manager->AddPane 639 ( $tb, Wx::AuiPaneInfo->new->Name( "tb1" )->Caption( gettext("Tools") ) 640 ->ToolbarPane->Top->Row( 1 )->LeftDockable( 0 )->RightDockable( 0 ) ) if defined $tb; 641 642 $self->manager->Update; 643 644 } 645 646 sub _init_aui_settings_panels { 647 my ( $self ) = @_; 648 649 $self->manager->AddPane 650 ( $self->create_notebook_image_properties, Wx::AuiPaneInfo->new->Name( "photo_properties" )->Caption(gettext("Photo properties")) 334 651 ->Right->Position( 1 )->Resizable->CloseButton(0) ); 335 652 … … 337 654 ( $self->create_notebook_global_settings, Wx::AuiPaneInfo->new->Name( "global_settings" ) 338 655 ->Right->Position( 2 )->Resizable->CloseButton(1) ); 339 340 341 342 my $tb = $self->create_toolbar; 343 344 $self->manager->AddPane 345 ( $tb, Wx::AuiPaneInfo->new->Name( "tb1" )->Caption( "Tools" ) 346 ->ToolbarPane->Top->Row( 1 )->LeftDockable( 0 )->RightDockable( 0 ) ) if defined $tb; 347 348 $self->manager->Update; 349 350 if( $self->imagelist->wx_thumb_imglist->GetImageCount){ 351 $self->ShowImageViewer; 352 353 $self->imageviewer->Refresh( 354 $self->imagelist->wx_thumb_imglist 355 ); 356 } 357 358 } 359 656 657 } 360 658 361 659 sub OnGlobalSettings { … … 364 662 $self->manager->GetPane("global_settings")->Show(1); 365 663 $self->manager->Update(); 664 } 665 666 sub OnChooseLanguage { 667 my ( $self ) = @_; 668 669 my $languages = [ 670 ['Dutch', wxLANGUAGE_DUTCH, ], 671 ['English', wxLANGUAGE_ENGLISH, ], 672 ['French', wxLANGUAGE_FRENCH, ], 673 ['German', wxLANGUAGE_GERMAN, ], 674 ['Italian', wxLANGUAGE_ITALIAN, ], 675 ['Polish', wxLANGUAGE_POLISH, ], 676 ['Portuguese', wxLANGUAGE_PORTUGUESE, ], 677 ['Russian', wxLANGUAGE_RUSSIAN, ], 678 ['Spanish', wxLANGUAGE_SPANISH, ], 679 ]; 680 681 my $dialog = new Wx::SingleChoiceDialog 682 ( undef, gettext( "Choose a language" ), gettext( "Choose a language" ), 683 [ map { Wx::GetTranslation( ${$_}[0] ) } @$languages ] ); 684 685 if( $dialog->ShowModal() == wxID_OK ) { 686 wxTheApp->current_language( 687 $languages->[$dialog->GetSelection][1] 688 ); 689 wxTheApp->init_locale(); 690 $self->_refreshFrame; 691 } 692 693 $dialog->Destroy; 694 366 695 } 367 696 … … 374 703 [ 375 704 $self->htmlhome, 376 "Photo selection",705 gettext("Photo selection"), 377 706 '../res/images.png', 378 707 wxBITMAP_TYPE_PNG, … … 388 717 $self->_populate_notebook( $book, $pages ); 389 718 390 $self->logwnd(Wx::LogTextCtrl->new( $self->logwnd ));391 $self->oldlogwnd( Wx::Log::SetActiveTarget( $self->logwnd ) );719 #$self->logwnd(Wx::LogTextCtrl->new( $self->logwnd )); 720 #$self->oldlogwnd( Wx::Log::SetActiveTarget( $self->logwnd ) ); 392 721 $self->notebook($book); 393 722 return $book; … … 423 752 [ 424 753 $self->global_settings_panel, 425 "Global settings",754 gettext("Global settings"), 426 755 ], 427 756 ]; … … 429 758 $self->_populate_notebook( $book, $pages ); 430 759 431 $self->notebook_ image_properties($book);760 $self->notebook_global_settings($book); 432 761 433 762 return $book; … … 576 905 } 577 906 @{$tree_items}; 578 579 907 580 908 } … … 613 941 Wx::Event::EVT_MENU( $self, 103, \&OnUploadImages ); 614 942 Wx::Event::EVT_MENU( $self, 104, \&OnGlobalSettings ); 943 Wx::Event::EVT_MENU( $self, 105, \&OnChooseLanguage ); 615 944 EVT_TREE_SEL_CHANGED( $self, $self->tree, \&OnTreeSelChanged ); 616 945 EVT_TREE_ITEM_RIGHT_CLICK( $self->tree, $self->tree, \&OnTreeItemRightClick ); … … 723 1052 my $dialog = Wx::TextEntryDialog->new( 724 1053 $self, 725 "Category name :",726 "Add new category",727 "New category"1054 gettext("Category name :"), 1055 gettext("Add new category"), 1056 gettext("New category"), 728 1057 ); 729 1058 … … 843 1172 $self->upload_progressdlg->LogProgress(); 844 1173 }; 845 croak "Upload cancelled"if $@;1174 croak gettext("Upload cancelled") if $@; 846 1175 847 1176 Wx::Yield(); … … 869 1198 [ 870 1199 $self->imageviewer, 871 "Photo selection",1200 gettext("Photo selection"), 872 1201 '../res/images.png', 873 1202 wxBITMAP_TYPE_PNG, … … 921 1250 Uploader::GUI::wxImageProcessingProgressDlg->new( 922 1251 { 923 title => "Image upload progress information",924 bt_label => "Cancel upload",1252 title => gettext("Image upload progress information"), 1253 bt_label => gettext("Cancel upload"), 925 1254 } 926 1255 ) … … 935 1264 Wx::MessageBox( 936 1265 sprintf( 937 "Upload cancelled.",1266 gettext("Upload cancelled"), 938 1267 ), 939 "Piwigo upload information",1268 gettext("Piwigo upload information"), 940 1269 wxOK | wxICON_INFORMATION, 941 1270 ); … … 945 1274 Wx::MessageBox( 946 1275 sprintf( 947 "Please select a valid target category",1276 gettext("Please select a valid target category"), 948 1277 ), 949 "Piwigo upload error",1278 gettext("Piwigo upload error"), 950 1279 wxOK | wxICON_EXCLAMATION, 951 1280 ); … … 1022 1351 ( 1023 1352 [ 1024 101, "Add photo to selection", '../res/tb_add.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_add.png', "Add photo to selection for resizing and uploading"1353 101, gettext("Add photo to selection"), '../res/tb_add.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_add.png', gettext("Add photo to selection for resizing and uploading") 1025 1354 ], 1026 1355 [ 1027 102, "Remove photo from selection", '../res/tb_remove.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_remove.png',"Remove photo from selection. Files are not deleted "1356 102, gettext("Remove photo from selection"), '../res/tb_remove.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_remove.png',gettext("Remove photo from selection. Files are not deleted ") 1028 1357 ], 1029 1358 [ 1030 103, "Upload to Piwigo", '../res/tb_upload.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_upload.png',"Upload photos to Piwigo."1359 103, gettext("Upload to Piwigo"), '../res/tb_upload.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_upload.png',gettext("Upload photos to Piwigo.") 1031 1360 ], 1032 1361 [ 1033 104, "Global settings", '../res/tb_settings.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_settings.png',"Change global settings." 1362 104, gettext("Global settings"), '../res/tb_settings.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_settings.png',gettext("Change global settings.") 1363 ], 1364 [ 1365 105, gettext("Language choice"), '../res/tb_i18n.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_i18n.png',gettext("Language choice") 1034 1366 ], 1035 1367 -
extras/pLoader/trunk/src/Uploader/GUI/wxGlobalSettingsPanel.pm
r2696 r3159 61 61 ); 62 62 63 $self->Initialize; 64 65 $self; 66 } 67 68 sub Initialize { 69 my ( $self ) = @_; 70 63 71 # load controls 64 72 &main::GlobalSettings($self, 1); 65 73 74 $self->_set_validators; 75 $self->SetControlValues; 76 $self->_initEventHandlers(); 77 } 78 79 sub _set_validators { 80 my ( $self ) = @_; 66 81 67 82 map { … … 76 91 $main::ID_GLOBAL_RESIZED_H, 77 92 ); 78 79 80 81 $self->SetControlValues;82 $self->_initEventHandlers();83 84 85 $self;86 93 } 87 88 89 94 90 95 sub _initEventHandlers { -
extras/pLoader/trunk/src/Uploader/ImageList.pm
r3142 r3159 208 208 # an exif preview is available. we use it 209 209 if(defined $info->{PreviewImage}){ 210 printf("use preview\n"); 210 211 $self->_write_preview_image( $info->{PreviewImage} ); 211 212 } 212 213 # have to create a preview file 213 214 else { 215 printf("have to create a preview\n"); 214 216 eval { 215 217 if(!$self->CreateGUIPreview()){ 218 printf("use preview callback\n"); 216 219 # use method provided by the caller 217 220 # source, target, type, ratio … … 243 246 # try to thumbnail it 244 247 eval { 248 printf("create gui thumbnail\n"); 245 249 # use the preview image to create a gui display thumbnail 246 250 $self->CreateGUIThumbnail(); … … 331 335 return 1 if( -e $self->current_image->wx_thumb_file ); 332 336 my $rval = 0; 333 337 print "CreateGUIThumbnail ", $self->current_image->wx_thumb_file, "\n"; 334 338 my $image = new Image::Magick; 335 339 -
extras/pLoader/trunk/src/Uploader/PWG/Categories.pm
r2661 r3159 21 21 use strict; 22 22 use Data::Dumper; 23 use Wx::Locale qw/:default/; 23 24 use base qw/ 24 25 Uploader::Object … … 57 58 return [ 58 59 [ 59 'Categories',60 gettext("Categories"), 60 61 undef, 61 62 -1,
Note: See TracChangeset
for help on using the changeset viewer.