Changeset 7070 for extensions/jiwigo/trunk
- Timestamp:
- Oct 2, 2010, 1:10:49 PM (14 years ago)
- Location:
- extensions/jiwigo/trunk/src/main
- Files:
-
- 2 added
- 1 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.java
r6980 r7070 13 13 import fr.mael.jiwigo.Main; 14 14 import fr.mael.jiwigo.om.Image; 15 import fr.mael.jiwigo.transverse.ImagesManagement; 15 16 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum; 16 17 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; … … 172 173 .getThumbnail().getCanonicalPath()), "position", "1", "original_sum", Outil.getMD5Checksum(image 173 174 .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image 174 .getName(), "author", Main.sessionManager.getLogin())); 175 .getName(), "author", Main.sessionManager.getLogin(), "level", String 176 .valueOf(ImagesManagement.privacyLevel))); 177 LOG.debug("Response add : " + Outil.documentToString(reponseAjout)); 175 178 // System.out.println(Main.sessionManager.executerReturnString("pwg.images.add", "file_sum", Outil 176 179 // .getMD5Checksum(image.getOriginale().getAbsolutePath()), "thumbnail_sum", Outil.getMD5Checksum(image … … 178 181 // .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image 179 182 // .getName(), "author", Main.sessionManager.getLogin())); 183 // Document reponsePrivacy = null; 184 // if (Outil.checkOk(reponseAjout)) { 185 // reponsePrivacy = Main.sessionManager.executerReturnDocument(MethodsEnum.SET_PRIVACY_LEVEL.getLabel()); 186 // } 180 187 boolean reussite = true; 181 188 if (!Outil.checkOk(reponseThumb) || echec || !Outil.checkOk(reponseAjout)) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java
r6980 r7070 39 39 "pwg.images.getInfo"), AJOUTER_CATEGORIE("pwg.categories.add"), AJOUTER_COMMENTAIRE("pwg.images.addComment"), LISTER_TAGS( 40 40 "pwg.tags.getList"), TAGS_ADMIN_LIST("pwg.tags.getAdminList"), ADD_TAG("pwg.tags.add"), SET_INFO( 41 "pwg.images.setInfo"), SEARCH("pwg.images.search") ;41 "pwg.images.setInfo"), SEARCH("pwg.images.search"), SET_PRIVACY_LEVEL("pwg.images.setPrivacyLevel"); 42 42 43 43 protected String label; -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Messages.java
r6980 r7070 62 62 63 63 File root = new File(loader.getResource(bundlepackage.replace('.', '/')).getFile()); 64 //System.out.println(loader.getResource(bundlepackage.replace('.', '/')).getFile()); 64 65 File[] files = root.listFiles(new FilenameFilter() { 65 66 public boolean accept(File dir, String name) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r6992 r7070 15 15 import java.text.SimpleDateFormat; 16 16 import java.util.Arrays; 17 import java.util.List;18 17 import java.util.Locale; 19 18 … … 221 220 */ 222 221 class localeModel extends AbstractListModel implements ComboBoxModel { 223 //Locale[] locales = SimpleDateFormat.getAvailableLocales();224 List<Locale> locales = Messages.getAvailableBundles();222 Locale[] locales = SimpleDateFormat.getAvailableLocales(); 223 //List<Locale> locales = Messages.getAvailableBundles(); 225 224 String[] localesNames; 226 225 … … 228 227 229 228 public localeModel() { 230 localesNames = new String[locales. size()];229 localesNames = new String[locales.length]; 231 230 int compteur = 0; 232 231 for (Locale locale : locales) { … … 242 241 243 242 public int getSize() { 244 return locales. size();243 return locales.length; 245 244 } 246 245 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserFrame.java
r6980 r7070 30 30 31 31 import fr.mael.jiwigo.om.Image; 32 import fr.mael.jiwigo.transverse.ImagesManagement; 32 33 import fr.mael.jiwigo.transverse.util.ImagesUtil; 33 34 import fr.mael.jiwigo.transverse.util.Messages; 34 35 import fr.mael.jiwigo.transverse.util.Outil; 35 import fr.mael.jiwigo.ui.ImagesManagement;36 36 import fr.mael.jiwigo.ui.comments.CommentsDialog; 37 37 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java
r6980 r7070 10 10 import fr.mael.jiwigo.om.Image; 11 11 import fr.mael.jiwigo.service.ImageService; 12 import fr.mael.jiwigo.transverse.ImagesManagement; 12 13 import fr.mael.jiwigo.transverse.util.Messages; 13 14 import fr.mael.jiwigo.transverse.util.Outil; 14 15 import fr.mael.jiwigo.transverse.util.filedrop.FileDrop; 15 import fr.mael.jiwigo.ui.ImagesManagement;16 16 import fr.mael.jiwigo.ui.layout.VerticalLayout; 17 17 … … 76 76 new FileDrop(System.out, this, new FileDrop.Listener() { 77 77 public void filesDropped(final java.io.File[] files) { 78 if (!ImagesManagement.rememberPrivacyLevel) { 79 new DialogPrivacyLevel(); 80 } 78 81 new Thread(new ThreadEnvoiPhoto(files)).start(); 79 82 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java
r6980 r7070 30 30 import fr.mael.jiwigo.service.ImageService; 31 31 import fr.mael.jiwigo.service.TagService; 32 import fr.mael.jiwigo.transverse.ImagesManagement; 32 33 import fr.mael.jiwigo.transverse.util.Messages; 33 import fr.mael.jiwigo.ui.ImagesManagement;34 34 import fr.mael.jiwigo.ui.browser.BrowserFrame; 35 35 import fr.mael.jiwigo.ui.layout.VerticalLayout; -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailSearchPanel.java
r6980 r7070 9 9 import fr.mael.jiwigo.om.Image; 10 10 import fr.mael.jiwigo.service.ImageService; 11 import fr.mael.jiwigo.transverse.ImagesManagement; 11 12 import fr.mael.jiwigo.transverse.util.Messages; 12 13 import fr.mael.jiwigo.transverse.util.Outil; 13 import fr.mael.jiwigo.ui.ImagesManagement;14 14 import fr.mael.jiwigo.ui.layout.VerticalLayout; 15 15 -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties
r6972 r7070 97 97 imageBrowser_rotationL=Rotate to left 98 98 imageBrowser_rotationR=Rotate to right 99 100 ##################################################### 101 ################ Dialog privacy ##################### 102 ##################################################### 103 dialogPrivacy_remember=Remember my choice 104 dialogPrivacy_choosePrivacy=Choose a privacy level 105 dialogPrivacy_none=All 106 dialogPrivacy_contacts=Contacts 107 dialogPrivacy_friends=Friends 108 dialogPrivacy_family=Family 109 dialogPrivacy_admin=Admin -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties
r6972 r7070 97 97 imageBrowser_rotationL=Rotate to left 98 98 imageBrowser_rotationR=Rotate to right 99 100 ##################################################### 101 ################ Dialog privacy ##################### 102 ##################################################### 103 dialogPrivacy_remember=Remember my choice 104 dialogPrivacy_choosePrivacy=Choose a privacy level 105 dialogPrivacy_none=All 106 dialogPrivacy_contacts=Contacts 107 dialogPrivacy_friends=Friends 108 dialogPrivacy_family=Family 109 dialogPrivacy_admin=Admin -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties
r6972 r7070 97 97 imageBrowser_rotationL=Rotation à gauche 98 98 imageBrowser_rotationR=Rotation à droite 99 100 ##################################################### 101 ################ Dialog privacy ##################### 102 ##################################################### 103 dialogPrivacy_remember=<html>Se souvenir du choix <br/>(jusqu'à la fermeture de Jiwigo)</html> 104 dialogPrivacy_choosePrivacy=Choisir un niveau de confidentialité 105 dialogPrivacy_none=Tout le monde 106 dialogPrivacy_contacts=Contacts 107 dialogPrivacy_friends=Amis 108 dialogPrivacy_family=Famille 109 dialogPrivacy_admin=Admin
Note: See TracChangeset
for help on using the changeset viewer.