diff --git a/ChangeLog b/ChangeLog index be2d734..7855efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ +2004-05-11 Pierre-Luc Paour (1.4-b10) + + * Fixed upload (and slideshow) applets when Gallery is embedded in a CMS. + * Applets now attempt to use the same language as the Gallery (GR language + support is sorely lacking at the moment). + * Cleaned up UI of upload applet, added config parameters for showing + Resize before upload and divider location. + 2004-05-07 Pierre-Luc Paour (1.4-b9) - * Fixed a slowdown when moving pas many pictures in slideshow. + * Fixed a slowdown when moving past many pictures in slideshow. 2004-05-07 Pierre-Luc Paour (1.4-b8) @@ -44,7 +52,7 @@ 2004-04-20 Pierre-Luc Paour (1.4-b4) - * Added German translation, courtesy of Hubert Baumgartner. + * Added German translation, by Hubert Baumgartner (extremely incomplete). 2004-04-20 Pierre-Luc Paour (1.4-b3) diff --git a/com/gallery/GalleryRemote/GRApplet.java b/com/gallery/GalleryRemote/GRApplet.java index ec9a855..ba04768 100644 --- a/com/gallery/GalleryRemote/GRApplet.java +++ b/com/gallery/GalleryRemote/GRApplet.java @@ -88,8 +88,10 @@ protected AppletInfo getGRAppletInfo() { AppletInfo info = new AppletInfo(); info.gallery = new Gallery(GalleryRemote._().getCore().getMainStatusUpdate()); + info.gallery.setBlockWrites(true); String url = getParameter("gr_url"); + String urlFull = getParameter("gr_url_full"); String cookieName = getParameter("gr_cookie_name"); String cookieValue = getParameter("gr_cookie_value"); String cookieDomain = getParameter("gr_cookie_domain"); @@ -97,12 +99,13 @@ protected AppletInfo getGRAppletInfo() { info.albumName = getParameter("gr_album"); - Log.log(Log.LEVEL_TRACE, MODULE, "Applet parameters: "); - Log.log(Log.LEVEL_TRACE, MODULE, "gr_url: " + url); - Log.log(Log.LEVEL_TRACE, MODULE, "gr_cookie_name: " + cookieName); - Log.log(Log.LEVEL_TRACE, MODULE, "gr_cookie_domain: " + cookieDomain); - Log.log(Log.LEVEL_TRACE, MODULE, "gr_cookie_path: " + cookiePath); - Log.log(Log.LEVEL_TRACE, MODULE, "gr_album: " + info.albumName); + Log.log(Log.LEVEL_INFO, MODULE, "Applet parameters:"); + Log.log(Log.LEVEL_INFO, MODULE, "gr_url:" + url); + Log.log(Log.LEVEL_INFO, MODULE, "gr_url_full:" + urlFull); + Log.log(Log.LEVEL_INFO, MODULE, "gr_cookie_name:" + cookieName); + Log.log(Log.LEVEL_INFO, MODULE, "gr_cookie_domain:" + cookieDomain); + Log.log(Log.LEVEL_INFO, MODULE, "gr_cookie_path:" + cookiePath); + Log.log(Log.LEVEL_INFO, MODULE, "gr_album:" + info.albumName); if (cookieDomain == null || cookieDomain.length() < 1) { try { @@ -118,14 +121,40 @@ protected AppletInfo getGRAppletInfo() { try { url = new URL(documentBase.getProtocol(), documentBase.getHost(), documentBase.getPort(), url).toString(); + + if (urlFull != null) { + } } catch (MalformedURLException e1) { Log.logException(Log.LEVEL_ERROR, MODULE, e1); } } } - info.gallery.setType(Gallery.TYPE_STANDALONE); - info.gallery.setStUrlString(url); + if (urlFull != null) { + try { + URL documentBase = getDocumentBase(); + String path = documentBase.getPath(); + int i = path.lastIndexOf("/"); + if (i != -1) { + path = path.substring(0, i); + } + urlFull = new URL(documentBase.getProtocol(), documentBase.getHost(), documentBase.getPort(), + path + "/" + urlFull).toString(); + info.gallery.setType(Gallery.TYPE_APPLET); + info.gallery.setApUrlString(urlFull); + Log.log(Log.LEVEL_TRACE, MODULE, "Full URL: " + urlFull); + } catch (MalformedURLException e) { + Log.logException(Log.LEVEL_ERROR, MODULE, e); + urlFull = null; + } + } + + if (urlFull == null) { + // old versions of Gallery, or bad urlFull + info.gallery.setType(Gallery.TYPE_STANDALONE); + info.gallery.setStUrlString(url); + } + info.gallery.cookieLogin = true; CookieModule.addCookie(new Cookie(cookieName, cookieValue, cookieDomain, cookiePath, null, false)); diff --git a/com/gallery/GalleryRemote/GRAppletMini.java b/com/gallery/GalleryRemote/GRAppletMini.java index 7f8d0f5..a93fe5e 100644 --- a/com/gallery/GalleryRemote/GRAppletMini.java +++ b/com/gallery/GalleryRemote/GRAppletMini.java @@ -44,11 +44,12 @@ public class GRAppletMini extends GRApplet implements GalleryRemoteCore, ActionL StatusBar jStatusBar; JScrollPane jScrollPane; DroppableList jPicturesList; - JPanel jContentPanel; + //JPanel jContentPanel; JCheckBox jResize; JPanel jInspector; JLabel captionLabel; JTextArea jCaption; + JSplitPane jDivider; DefaultComboBoxModel galleries = null; Album album = null; @@ -104,6 +105,7 @@ public void startup() { public void shutdown() { if (hasStarted) { + GalleryRemote._().properties.setIntProperty(APPLET_DIVIDER_LOCATION, jDivider.getDividerLocation()); GalleryRemote._().properties.write(); GalleryRemote.shutdownInstance(); } @@ -174,11 +176,12 @@ protected void jbInit() { jStatusBar = new StatusBar(75); jScrollPane = new JScrollPane(); jPicturesList = new DroppableList(); - jContentPanel = new JPanel(new GridBagLayout()); + //jContentPanel = new JPanel(new GridBagLayout()); jResize = new JCheckBox(); jInspector = new JPanel(new GridBagLayout()); captionLabel = new JLabel(); jCaption = new JTextArea(); + jDivider = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); jScrollPane.setBorder(new TitledBorder(BorderFactory.createEmptyBorder(), GRI18n.getString(MODULE, "pictures"))); @@ -201,25 +204,34 @@ protected void jbInit() { jCaption.setFont(UIManager.getFont("Label.font")); jCaption.setBackground(UIManager.getColor("TextField.inactiveBackground")); - jContentPanel.add(jScrollPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0 - ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); - jContentPanel.add(jResize, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 - ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 0, 0), 0, 0)); - jContentPanel.add(jInspector, new GridBagConstraints(1, 0, 1, 2, 0.0, 0.0 - ,GridBagConstraints.CENTER, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0)); - - jInspector.add(captionLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0 - ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jInspector.add(jCaption, new GridBagConstraints(0, 1, 1, 1, 0.0, 1.0 - ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + jDivider.setBorder(null); + jDivider.setOneTouchExpandable(true); + //jDivider.setResizeWeight(.75); + jDivider.setDividerLocation(GalleryRemote._().properties.getIntProperty(APPLET_DIVIDER_LOCATION)); + + jScrollPane.setMinimumSize(new Dimension(100, 0)); + jInspector.setMinimumSize(new Dimension(0, 0)); + jDivider.setLeftComponent(jScrollPane); + jDivider.setRightComponent(jInspector); +// jContentPanel.add(jScrollPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0 +// ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); +// jContentPanel.add(jInspector, new GridBagConstraints(1, 0, 1, 2, 0.0, 0.0 +// ,GridBagConstraints.CENTER, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0)); + + jInspector.add(captionLabel, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0 + ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 0), 0, 0)); + jInspector.add(jCaption, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0 + ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0)); this.getContentPane().setLayout(new GridBagLayout()); - this.getContentPane().add(jButtonPanel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 + this.getContentPane().add(jDivider, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0 + ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + this.getContentPane().add(jResize, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 + ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 0, 0), 0, 0)); + this.getContentPane().add(jButtonPanel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0 ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0)); - this.getContentPane().add(jStatusBar, new GridBagConstraints(0, 2, 1, 1, 1.0, 0.0 + this.getContentPane().add(jStatusBar, new GridBagConstraints(0, 3, 1, 1, 1.0, 0.0 ,GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - this.getContentPane().add(jContentPanel, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0 - ,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0)); jAdd.addActionListener(this); jUpload.addActionListener(this); diff --git a/com/gallery/GalleryRemote/GalleryComm2.java b/com/gallery/GalleryRemote/GalleryComm2.java index 1ee7c64..36f9485 100644 --- a/com/gallery/GalleryRemote/GalleryComm2.java +++ b/com/gallery/GalleryRemote/GalleryComm2.java @@ -308,7 +308,7 @@ private boolean login() { Object[] params = {g.toString()}; status(su, StatusUpdate.LEVEL_GENERIC, GRI18n.getString(MODULE, "logIn", params)); - if (g.getType() != Gallery.TYPE_STANDALONE) { + if (g.getType() != Gallery.TYPE_STANDALONE && g.getType() != Gallery.TYPE_APPLET) { try { requestResponse(null, null, g.getLoginUrl(scriptName), false, su); } catch (IOException ioe) { diff --git a/com/gallery/GalleryRemote/UploadProgress.java b/com/gallery/GalleryRemote/UploadProgress.java index 3db18a0..3fff630 100644 --- a/com/gallery/GalleryRemote/UploadProgress.java +++ b/com/gallery/GalleryRemote/UploadProgress.java @@ -210,7 +210,9 @@ public void actionPerformed(ActionEvent e) { final ActionEvent fe = e; new Thread() { public void run() { - cancelListener.actionPerformed(fe); + if (cancelListener != null) { + cancelListener.actionPerformed(fe); + } } }.start(); } diff --git a/com/gallery/GalleryRemote/model/Gallery.java b/com/gallery/GalleryRemote/model/Gallery.java index 465fdea..9c177fb 100644 --- a/com/gallery/GalleryRemote/model/Gallery.java +++ b/com/gallery/GalleryRemote/model/Gallery.java @@ -79,6 +79,8 @@ public class Gallery extends DefaultTreeModel implements Serializable, Preferenc public static final int TYPE_PHPNUKE = 2; public static final int TYPE_GEEKLOG = 3; + public static final int TYPE_APPLET = 99; + public static final int TOSTRING_MAXLEN = 40; public Gallery(StatusUpdate su) { @@ -564,6 +566,12 @@ public String getGlLoginUrlString() { } } + /* Applet URL */ + + public void setApUrlString(String urlString) { + stUrlString = urlString; + } + /* Generic */ public URL getLoginUrl(String galleryFile) { @@ -581,6 +589,9 @@ public URL getLoginUrl(String galleryFile) { case TYPE_GEEKLOG: return new URL(replace(glLoginUrlString, galleryFile)); + case TYPE_APPLET: + return new URL(stUrlString); + default: throw new RuntimeException("Unknown type: " + type); } @@ -608,13 +619,16 @@ public URL getGalleryUrl(String galleryFile) { case TYPE_GEEKLOG: return new URL(replace(glGalleryUrlString, galleryFile)); + case TYPE_APPLET: + return new URL(stUrlString); + default: throw new RuntimeException("Unknown type: " + type); } } catch (MalformedURLException e) { Log.log(Log.LEVEL_ERROR, MODULE, "Malformed URL."); Log.logException(Log.LEVEL_ERROR, MODULE, e); - JOptionPane.showMessageDialog((JFrame) su, "Malformed URL (" + e.getMessage() + ")", + JOptionPane.showMessageDialog((Component) su, "Malformed URL (" + e.getMessage() + ")", "Error", JOptionPane.ERROR_MESSAGE); return null; } @@ -851,6 +865,10 @@ public String toString(boolean disambiguate) { tmp = glGalleryUrlString; break; + case TYPE_APPLET: + tmp = stUrlString; + break; + default: throw new RuntimeException("Unknown type: " + type); } @@ -1049,7 +1067,7 @@ public Album getAlbumByName(String name) { return null; } - private void setBlockWrites(boolean blockWrites) { + public void setBlockWrites(boolean blockWrites) { this.blockWrites = blockWrites; } diff --git a/com/gallery/GalleryRemote/prefs/PreferenceNames.java b/com/gallery/GalleryRemote/prefs/PreferenceNames.java index e395b7c..b874982 100644 --- a/com/gallery/GalleryRemote/prefs/PreferenceNames.java +++ b/com/gallery/GalleryRemote/prefs/PreferenceNames.java @@ -40,6 +40,7 @@ public interface PreferenceNames { public static final String POSTNUKE = "PostNuke"; public static final String PHPNUKE = "PHPNuke"; public static final String GEEKLOG = "GeekLog"; + public static final String APPLET = "Applet"; public static final String PN_GALLERY_URL = "pnGalleryUrl."; public static final String PN_LOGIN_URL = "pnLoginUrl."; public static final String PHPN_GALLERY_URL = "phpnGalleryUrl."; @@ -74,4 +75,8 @@ public interface PreferenceNames { public static final String SUPPRESS_WARNING_JPEGTRAN = "suppressWarningJpegtran"; public static final String SUPPRESS_WARNING_JPEGTRAN_CROP = "suppressWarningJpegtranCrop"; public static final String SUPPRESS_WARNING_CORRUPTED = "suppressWarningCorrupted"; + + // Applet + public static final String APPLET_SHOW_RESIZE = "appletShowResize"; + public static final String APPLET_DIVIDER_LOCATION = "appletDividerLocation"; } diff --git a/com/gallery/GalleryRemote/resources/GRResources_de.properties b/com/gallery/GalleryRemote/resources/GRResources_de.properties index 84c40f3..6e5f398 100644 --- a/com/gallery/GalleryRemote/resources/GRResources_de.properties +++ b/com/gallery/GalleryRemote/resources/GRResources_de.properties @@ -60,34 +60,12 @@ Album.ro = (nur-lesen) #GEdiDlog module -GEdiDlog.title = Gallery Details -GEdiDlog.username = Username -GEdiDlog.passwd = Password GEdiDlog.type = Gallery Typ GEdiDlog.typeTip = Verwende Standalone wenn deine Gallery in kein Content \ Management System eingebettet ist (das ist die Standardauswahl). Wenn du ein CMS \ verwendest w\u00e4hle CMS. GEdiDlog.OK = OK GEdiDlog.cancel = Abbrechen -GEdiDlog.stndAln = Gallery URL -GEdiDlog.stndAlnHlp = Die Gallery URL ist die URL die Betrachter benutzen um deine Gallery anzuschaun. -GEdiDlog.pnLogin = PostNuke Login URL -GEdiDlog.gllryUrl = Gallery Module URL -GEdiDlog.pnHelp = Where $USERNAME$ and $PASSWORD$ will be replaced when Gallery \ - Remote tries to log in by the username and password you enter above \ - and $GALLERYFILE$ is replaced with the PHP file Gallery Remote uses \ - to communicate with Gallery (usually gallery_remote2.php).
\ - The name parameter is the PostNuke module name of your gallery; set it \ - accordingly.
\ - This functionality is only available with Gallery 1.3.5 (beta 10) and later. -GEdiDlog.phpNukeLogin = PHPNuke Login URL -GEdiDlog.phpNukeHelp = Where $USERNAME$ and $PASSWORD$ will be replaced when Gallery \ - Remote tries to log in by the username and password you enter above \ - and $GALLERYFILE$ is replaced with the PHP file Gallery Remote uses \ - to communicate with Gallery (usually gallery_remote2.php).
\ - The name parameter is the PHPNuke module name of your gallery; set it \ - accordingly.
\ - This functionality is only available with Gallery 1.3.5 (beta 10) and later. #GeneralPa module @@ -162,10 +140,6 @@ PrefsDlog.cancel = Abbrechen #ProxyPa module ProxyPa.icon = Proxy Einstellungen ProxyPa.useProxy = Verwende proxy -ProxyPa.proxyURL = Proxy URL -ProxyPa.proxyPort = Proxy port -ProxyPa.username = Username -ProxyPa.passwd = Password #FilePa module @@ -175,21 +149,7 @@ FilePa.numberOfMRU = Bitte w\u00e4hle wie viele Datein in diesem Men\u00fc angez FilePa.mainPanelTitle = Zuletzt verwendete Einstellungen -#QuickCPa module -QuickCPa.icon = Quick Config -QuickCPa.URL = URL -QuickCPa.setup = Setup -QuickCPa.info = \ - This panel allows you to connect to a web server and fetch configuration options from it, for easy setup. \ - Enter the URL of the setup file (your administrator needs to give it to you) and click Setup.
\ - Caution: this operation is not cancellable.
\ -
\ - Gallery administrators: to enable your users to use this functionality you merely need to put somewhere \ - on your web site a properties file that contains the settings you want to override and distribute that \ - URL to your users.\ - -QuickCPa.confLoaded = Loaded configuration file.
Overridden properties: -QuickCPa.done = Ferig +QuickCPa.done = Fertig QuickCPa.emptyConfFile = Leere Konfigurationsdatei. QuickCPa.error = Fehler @@ -198,28 +158,8 @@ UploadPa.icon = Auf Server \u00dcberspielen UploadPa.res_rot = Gr\u00f6\u00dfe andern/Rotieren UploadPa.res2W = \u00c4ndern auf Breite UploadPa.res2H = \u00c4ndern auf H\u00f6he -UploadPa.resBfrUpldTip = Instructs Gallery Remote to perform resizing on images before they're \ - sent to the server, which lowers bandwidth usage. Only possible if \ - ImageMagick is installed. UploadPa.resBfrUpld = Gr\u00f6\u00dfe \u00c4ndern bevor Bild auf Server \u00fcberspielt wird UploadPa.res2DefTip = Gr\u00f6\u00dfe auf Album standard anpassen -UploadPa.res2Def = Album standard -UploadPa.res2FrcTip = Force the resize dimension, and disregard the dimensions set by the Album -UploadPa.res2Frc = Force resize to -UploadPa.escCaptTip = When checked, you can (and have to) write your captions in HTML markup. \ - When unchecked, just type any text, and HTML markup will be generated for you. -UploadPa.autoRotTip = If your camera doesn't have an orientation sensor, you should disable this feature, as it slows down adding files -UploadPa.autoRot = Read EXIF from JPEG files to auto-rotate images -UploadPa.captions = Captions -UploadPa.capt = Pre-set captions with filenames -UploadPa.captTip = Sets the caption to the image file name when the image is loaded (it can later be changed by editing the caption) -UploadPa.captNone = None -UploadPa.captNoneTip = Don't pre-set captions -UploadPa.stripExt = Strip the filename extension -UploadPa.stripExtTip = Remove the extension (.gif, .jpeg, etc.) from the filename when using it as a caption -UploadPa.captMetadata = Pre-set captions with metadata caption -UploadPa.captMetadataTip = Sets the caption to the metadata caption when the image is loaded (it can be later changed by editing the caption) -UploadPa.escCapt = Allow HTML markup in captions and extra fields #URLPa module @@ -227,122 +167,7 @@ URLPa.icon = URLs URLPa.modify = \u00c4ndern... URLPa.new = Neu... URLPa.delete = L\u00f6schen... -URLPa.details = Details -URLPa.delConfirm = Are you sure you want to discard login information for {0}? -URLPa.gllryURL = Gallery URL: -URLPa.pnLoginURL = PostNuke login URL: -URLPa.pnGllryURL = PostNuke Gallery URL: -URLPa.phpnLoginURL = PHPNuke login URL: -URLPa.phpnGllryURL = PHPNuke Gallery URL: -URLPa.username = Username: - - -#About module -About.title = \u00dcber Gallery Remote -About.aboutAnim = About box animation thread - -#AddFileDialog module -AddFileDialog.Add = Hinzuf\u00fcgen -AddFileDialog.Title = F\u00fcge Bilder und/oder ganze Ordner hinzu - - -#AuthorizePopup module -AuthorizePopup.enterUsrPwd = Enter username and password for SOCKS server on host -AuthorizePopup.authMthd = Authentication Method: username/password -AuthorizePopup.enterUsrPwdRealm = Enter username and password for realm ` -AuthorizePopup.onHost = on host -AuthorizePopup.authScheme = Authentication Scheme: -AuthorizePopup.authreq = Authorization Request -AuthorizePopup.username = Username: -AuthorizePopup.passwd = Password: -AuthorizePopup.ok = OK -AuthorizePopup.clear = Clear -AuthorizePopup.cancel = Cancel - - -#Droplist module -Droplist.imgError = It was not possible to accept the images due to an error.Error Accepting Dragged Images -Droplist.dragError = Error Accepting Dragged Images - - -#GalComm module -GalComm.noAuth = The site you are trying to connect to is not signed by an authorized provider.\n\ - Please refer to the following document for help:\n\ - http://www.infy.com/knowledge_capital/thought-papers/usingHTTPwith_java.pdf -GalComm.error = Error - - -#GalComm1 module -GalComm1.logging = Logging in to {0} -GalComm1.redirect = Received redirect, following... -GalComm1.httpErr = HTTP Error: {0, number, integer} {1} -GalComm1.loggedIn = Logged in -GalComm1.logErr = Login Error: {0} -GalComm1.error = Error: {0} -GalComm1.errReq = Error handling request: {0} -GalComm1.uploadingPic = Uploading pictures -GalComm1.uploadingStat = Uploading {0} ({1, number, integer}/{2, number, integer}) -GalComm1.upldComplete = Upload complete -GalComm1.upldFailed = Upload failed -GalComm1.upldSucc = Upload successful -GalComm1.upldErr = Upload Error: {0} -GalComm1.ftchngAlbm = Fetching albums from {0} -GalComm1.ftchdAlbm = Fetched albums -GalComm1.ftchComplt = Fetch complete - - -#GalComm2 module -GalComm2.upStart = Starting upload... -GalComm2.redirect = Received redirect, following... -GalComm2.httpPostErr = HTTP POST failed (HTTP {0, number, integer} {1} ) -GalComm2.gllryNotFound = Server contacted, but Gallery not found at this URL ( {0} ) -GalComm2.addImgOk = Added image successfully -GalComm2.addImgErr = Adding image failed -GalComm2.logIn = Logging in to {0} -GalComm2.error = Error: {0} -GalComm2.errReq = Error handling request: {0} -GalComm2.usernameLbl = Username: -GalComm2.username = Username -GalComm2.passwdLbl = Password: -GalComm2.passwd = Password -GalComm2.loggedIn = Logged in -GalComm2.usrpwdErr = Invalid username/password.\n\n\ - If your Gallery is embedded inside a CMS like PostNuke,\n\ - you need to use the "native" (non-embedded) Gallery URL to log in,\n\ - as well as the native Gallery user and password.\n\ - You can test these by trying to go the native URL and trying to log in. -GalComm2.loginErr = Login Error: {0} -GalComm2.upPic = Uploading pictures -GalComm2.upStop = Stopping upload... -GalComm2.upStatus = Uploading {0} ({1, number, integer}/{2, number, integer}) -GalComm2.upComplete = Upload complete -GalComm2.upFailed = Upload failed -GalComm2.upPrep = Preparing to upload... -GalComm2.upSucc = Upload successful -GalComm2.upErr = Upload error: {0} -GalComm2.confErr = You may need to set LimitRequestBody 16777216 and memory_limit = 64M \ - in /etc/php.ini and /etc/httpd/conf.d/php.conf on your Gallery server\n\n{0} -GalComm2.albmFtchng = Fetching albums from {0} -GalComm2.fetchComplete = Fetch complete -GalComm2.ftchdAlbms = Fetched albums -GalComm2.getAlbmInfo = Getting album information from {0} -GalComm2.newAlbm = Creating album {0} in {1} -GalComm2.ftchdAlbmProp = Fetched album properties. -GalComm2.crateAlbmOk = Create album successful. -GalComm2.trnsfrStat = Transferring {0} / {1}kB ({2}kB/s) -GalComm2.upCompSrvrProc = Upload completed: server processing... -GalComm2.fetchAlbImages = Listing images in album {0} -GalComm2.fetchAlbImagesDone = Received {0} images descriptions. -GalComm2.moveAlbum = Moving album {0} to {1} -GalComm2.moveAlbumDone = Album successfully moved -GalComm2.rootAlbum = root album -GalComm2.fixCorrupted = The album called {0} at URL:

  {1}

is corrupted: \ - its containment hierarchy is an endless loop.
\ - Gallery Remote can help you fix this situation. Log in to the gallery that contains \ - this album with the administrator account, then click on the link below.
\ - This will fix the album by placing it at the root of the gallery.
\ - You will need then want to move it to a permanent location. -GalComm2.fixCorruptedUrl = gallery_remote2.php?cmd=move-album&protocol_version=2.7&set_albumName={0}&set_destalbumName=0 +U #NewAlbum module @@ -402,23 +227,6 @@ AlbmInspec.Beginning = Zum Anfang des Albums hinzuf\u00fcgen AlbmInspec.Fetch = Hole Bilder vom Server AlbmInspec.Slideshow = Diashow AlbmInspec.New = Neues Album -# todo -#AlbmInspec.Apply = Apply changes to server -AlbmInspec.Apply =
\ - Protocol support to apply changes to
\ - these values to Gallery is not yet implemented.
-AlbmInspec.Move = Move album to... -AlbmInspec.res2W = Resize to width -AlbmInspec.res2H = Resize to height -AlbmInspec.resBfrUpldTip = Instructs Gallery Remote to perform resizing on images before they're \ - sent to the server, which lowers bandwidth usage. Only possible if \ - ImageMagick is installed. -AlbmInspec.resBfrUpld = Resize before upload -AlbmInspec.res2DefTip = Resize to the Album's default -AlbmInspec.res2Def = Album default -AlbmInspec.res2FrcTip = Force the resize dimension, and disregard the dimensions set by the Album -AlbmInspec.res2Frc = Force resize to - #PreviewFrame module PreviewFrame.title = Voransicht @@ -432,18 +240,6 @@ ThumbCache.loadThmb = Ladet thumbnails ThumbCache.thmbLoaded = Thumbnails geladen -#Update module -Update.title = Gallery Remote new version -Update.newVerAvail = A new version of Gallery Remote is available! -Update.ver = Version -Update.relDate = Release date -Update.relNotes = Release Notes -Update.dnURL = Download URL -Update.openInBrwsr = Open in Browser -Update.restart.title = Gallery Remote updated -Update.restart.text = Gallery Remote has been updated, and needs to be restarted. It will now exit; start it again. - - #UploadProgress module UploadProgress.upImgNM = Bild n von m auf Server \u00fcbertragen UploadProgress.upImgGif = \u00dcbertragen von img.gif @@ -454,41 +250,4 @@ UploadProgress.Error = Fehler # Gallery model -Gallery.logoutQuestion = Logging out will lose all the work you have performed on this Gallery. You may want to save first.\n\nLog out anyway? Gallery.logoutQuestion.title = Warnung - - -# ImageUtils -ImageUtils.down.start = Downloading {0} from server... -ImageUtils.down.end = Finished downloading {0} -ImageUtils.down.fail = Downloading failed -ImageUtils.down.progress = Downloading {0}: {1, number, integer} / {2, number, integer}kB ({3, number, integer}kB/s) -ImageUtils.warningTitle=Warning -ImageUtils.warningOK=OK -ImageUtils.warningDontShow=Don't display this warning again -ImageUtils.warningTextIM=An optional part of Gallery Remote, ImageMagick, could not be found
\ - or is malfunctioning. Gallery Remote will not be able to resize images before
\ - uploading them, and loading thumbnails and previews will be much slower.
\ - You can find out how to fix this by going to this page: -ImageUtils.warningUrlIM=http://gallery.menalto.com/modules.php?op=modload&name=GalleryDocs&file=index&page=gallery-remote.problems.php -ImageUtils.warningUrlTextIM=Gallery Remote Known Problems -ImageUtils.warningTextJpegtran=An optional part of Gallery Remote, jpegtran, could not be found
\ - or is malfunctioning. Gallery Remote will not be able to rotate images before
\ - uploading them.
\ - You can find out how to fix this by going to this page: -ImageUtils.warningUrlJpegtran=http://gallery.menalto.com/modules.php?op=modload&name=GalleryDocs&file=index&page=gallery-remote.problems.php -ImageUtils.warningUrlTextJpegtran=Gallery Remote Known Problems - - -# AppletMini -AppletMini.Upload = Upload -AppletMini.Add = Add Pictures... -AppletMini.DefMessage = Add pictures to the list... -AppletMini.pictures = List of pictures to upload (drag and drop or click Add Pictures...) - - -# AppletSlideshow -AppletSlideshow.Start = Start slideshow -AppletSlideshow.Disabled = If some of the options above are greyed-out, the \ - administrator of this gallery has forced the corresponding settings. -AppletSlideshow.emptyAlbum = There are no pictures to show in this album. Use the navigation menu at the top to go back to the album view. diff --git a/defaults.properties b/defaults.properties index f18afb0..212c3dd 100644 --- a/defaults.properties +++ b/defaults.properties @@ -153,6 +153,16 @@ slideshowNoStretch=false # Preload all images from the server, not just the next one slideshowPreloadAll=false +# +# --- Applet --- +# + +# show resize before upload checkbox in applet mini mode +appletShowResize=true + +# divider location in applet mini mode +appletDividerLocation = 250 + # # --- Technical --- # @@ -188,6 +198,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p # # --- Do not edit below this line --- # -version=1.4-b9 -releaseDate=2004/05/07 +version=1.4-b10 +releaseDate=2004/05/11 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor