You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/08/06 17:44:06 UTC
svn commit: r801682 - in
/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image:
ImageDialog.java messages.properties messages_de.properties
messages_fr.properties
Author: seelmann
Date: Thu Aug 6 15:44:06 2009
New Revision: 801682
URL: http://svn.apache.org/viewvc?rev=801682&view=rev
Log:
Fixed labels in image editor dialog
Modified:
directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties
directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_de.properties
directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties
Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java?rev=801682&r1=801681&r2=801682&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java (original)
+++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java Thu Aug 6 15:44:06 2009
@@ -421,8 +421,8 @@
currentImageLabel.setImage( currentImage );
currentImageTypeText.setText( getImageType( imageData.type ) );
currentImageSizeText.setText( getSizeString( currentImageRawData.length ) );
- currentImageWidthText.setText( imageData.width + Messages.getString( "ImageDialog.Pixel" ) ); //$NON-NLS-1$
- currentImageHeightText.setText( imageData.height + Messages.getString( "ImageDialog.Pixel" ) ); //$NON-NLS-1$
+ currentImageWidthText.setText( NLS.bind( Messages.getString( "ImageDialog.Pixel" ), imageData.width ) ); //$NON-NLS-1$
+ currentImageHeightText.setText( NLS.bind( Messages.getString( "ImageDialog.Pixel" ), imageData.height ) ); //$NON-NLS-1$
}
catch ( SWTException swte )
{
@@ -527,8 +527,8 @@
Messages.getString( "ImageDialog.WillBeConverted" ), new String[] { getImageType( requiredImageType ) } ) ); //$NON-NLS-1$
}
newImageSizeText.setText( getSizeString( newImageRawData.length ) );
- newImageWidthText.setText( imageData.width + Messages.getString( "ImageDialog.Pixel" ) ); //$NON-NLS-1$
- newImageHeightText.setText( imageData.height + Messages.getString( "ImageDialog.Pixel" ) ); //$NON-NLS-1$
+ newImageWidthText.setText( NLS.bind( Messages.getString( "ImageDialog.Pixel" ), imageData.width ) ); //$NON-NLS-1$
+ newImageHeightText.setText( NLS.bind( Messages.getString( "ImageDialog.Pixel" ), imageData.height ) ); //$NON-NLS-1$
}
catch ( SWTException swte )
{
@@ -698,12 +698,12 @@
{
if ( length > 1000000 )
{
- return ( length / 1000000 ) + NLS.bind( Messages.getString( "ImageDialog.MB" ), new int[] //$NON-NLS-1$
+ return ( length / 1000000 ) + NLS.bind( Messages.getString( "ImageDialog.MB" ), new Integer[] //$NON-NLS-1$
{ length } ); //$NON-NLS-1$
}
else if ( length > 1000 )
{
- return ( length / 1000 ) + NLS.bind( Messages.getString( "ImageDialog.KB" ), new int[] //$NON-NLS-1$
+ return ( length / 1000 ) + NLS.bind( Messages.getString( "ImageDialog.KB" ), new Integer[] //$NON-NLS-1$
{ length } ); //$NON-NLS-1$
}
else
@@ -728,20 +728,18 @@
return "NULL"; //$NON-NLS-1$
}
- String text = NLS.bind( Messages.getString( "ImageDialog.Image" ), new Object[] { imageRawData.length } ); //$NON-NLS-1$
+ String text;
try
{
ByteArrayInputStream bais = new ByteArrayInputStream( imageRawData );
ImageData imageData = new ImageData( bais );
-
String typePrefix = getImageType( imageData.type );
if ( !"".equals( typePrefix ) ) //$NON-NLS-1$
typePrefix += "-"; //$NON-NLS-1$
- text = typePrefix
- + NLS
- .bind(
- Messages.getString( "ImageDialog.Pixel" ), new Object[] { imageData.width, imageData.height, imageRawData.length } ); //$NON-NLS-1$
+ text = NLS
+ .bind(
+ Messages.getString( "ImageDialog.Image" ), new Object[] { typePrefix, imageData.width, imageData.height, imageRawData.length } ); //$NON-NLS-1$
}
catch ( SWTException swte )
{
Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties?rev=801682&r1=801681&r2=801682&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties (original)
+++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties Thu Aug 6 15:44:06 2009
@@ -23,7 +23,7 @@
ImageDialog.CurrentImage=Current Image
ImageDialog.ErrorFileNotFound=\ Error\: File not found
ImageDialog.ImageEditor=Image Editor
-ImageDialog.Image=({0} Bytes)
+ImageDialog.Image={0}Image ({1}x{2} Pixel, {3} Bytes)
ImageDialog.ImageHeight=Image Height:
ImageDialog.ImageSize=Image Size:
ImageDialog.ImageType=Image Type:
@@ -35,7 +35,7 @@
ImageDialog.NoImage=No Image
ImageDialog.NoImageSelected=\ No image selected
ImageDialog.NoImageSpaces=\ No Image
-ImageDialog.Pixel=Image ({0}x{1} Pixel {2})
+ImageDialog.Pixel={0} Pixel
ImageDialog.Save=Save...
ImageDialog.SaveImage=Save Image
ImageDialog.SelectImage=Select Image
Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_de.properties?rev=801682&r1=801681&r2=801682&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_de.properties (original)
+++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_de.properties Thu Aug 6 15:44:06 2009
@@ -19,6 +19,7 @@
ImageDialog.CantWriteFile=Datei kann nicht geschrieben werden
ImageDialog.CurrentImage=Aktuelles Bild
ImageDialog.ErrorFileNotFound=\ Fehler\: Datei nicht gefunden
+ImageDialog.Image={0}Bild ({1}x{2} Pixel, {3} Bytes)
ImageDialog.ImageEditor=Bild Editor
ImageDialog.ImageHeight=Bild H\u00F6he\:
ImageDialog.ImageSize=Bild Gr\u00F6sse\:
@@ -29,6 +30,7 @@
ImageDialog.NoImage=Kein Bild
ImageDialog.NoImageSelected=\ Kein Bild ausgew\u00E4hlt
ImageDialog.NoImageSpaces=\ Kein Bild
+ImageDialog.Pixel={0} Pixel
ImageDialog.Save=Speichern...
ImageDialog.SaveImage=Bild speichern
ImageDialog.SelectImage=Bild ausw\u00E4hlen
Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties?rev=801682&r1=801681&r2=801682&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties (original)
+++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties Thu Aug 6 15:44:06 2009
@@ -23,7 +23,7 @@
ImageDialog.CurrentImage=Image courante
ImageDialog.ErrorFileNotFound=\ Erreur : Fichier introuvable
ImageDialog.ImageEditor=Editeur d'image
-ImageDialog.Image=({0} octets)
+ImageDialog.Image={0}Image ({1}x{2} Pixels, {3} octets)
ImageDialog.ImageHeight=Hauteur de l'image :
ImageDialog.ImageSize=Taille de l'image :
ImageDialog.ImageType=Type d'image:
@@ -35,7 +35,7 @@
ImageDialog.NoImage=Aucune d'image
ImageDialog.NoImageSelected=\ Aucune image selectionn\u00E9e
ImageDialog.NoImageSpaces=\ Aucune d'image
-ImageDialog.Pixel=Image ({0}x{1} Pixels {2})
+ImageDialog.Pixel={0} Pixels
ImageDialog.Save=Sauvergarder...
ImageDialog.SaveImage=Sauvergarder l'image
ImageDialog.SelectImage=Image s\u00E9lectionn\u00E9e