Fixing issue 966: ""Gripped" image movement not matching image scale." regarding the label of the tool, and issue 970: "Factor 1 in "Panning acceleration" works only in 1:1 view"

rtdata/languages/Francais

@@ -640,7 +640,7 @@ PREFERENCES_OUTDIRTEMPLATE;Utiliser le modèle
 PREFERENCES_OUTDIRTEMPLATEHINT;<i>Vous pouvez utiliser les paramètres de chaîne formatées suivants:</i>\n<b>%f, %d1, %d2, ..., %p1, %p2, ...</b>\n<i>\nCes paramètres de chaînes formatées se réfèrent aux dossiers et sous-chemins du chemin du fichier RAW.\n\nPar exemple, si </i> <b>/home/tom/image/02-09-2006/dsc0012.nef</b><i>a été ouvert, la signification des paramètres est:\n</i><b>%f=dsc0012, %d1=02-09-2006, %d2=image, ...\n%p1=/home/tom/image/02-09-2006, %p2=/home/tom/image, p3=/home/tom, ...\n</b><i>\nSi vous voulez enregistrer l'image de sortie là où se trouve l'original, écrivez:\n</i><b>%p1/%f\n</b><i>\nSi vous voulez enregistrer l'image de sortie dans un dossier 'convertis' situé dans le dossier de l'original, écrivez:\n</i><b>%p1/convertis/%f\n</b><i>\nSi vous voulez enregistrer l'image de sortie dans le dossier '/home/tom/convertis' en conservant le même sous-dossier de dates, écrivez:\n</i><b>%p2/convertis/%d1/%f</b>
 PREFERENCES_OVERLAY_FILENAMES;Superposer les noms de fichier sur les vignettes
 PREFERENCES_OVERWRITEOUTPUTFILE;Écraser le fichier s'il existe déjà
-PREFERENCES_PANFACTORFRAME;Accélération du déplacement
+PREFERENCES_PANFACTORFRAME;Amplification du déplacement
 PREFERENCES_PANFACTORLABEL;Facteur
 PREFERENCES_PARSEDEXT;Extensions considérées
 PREFERENCES_PARSEDEXTADD;Ajout de l'extension

rtdata/languages/default

@@ -635,7 +635,7 @@ PREFERENCES_OUTDIRTEMPLATE;Use Template
 PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ..., <b>%r</b>\n\nThese formatting strings refer to the different parts of the photo's pathname, or some attributes of the photo.\n\n%r will be replaced by the rank of the photo.  If the photo is unranked, %r will be replaced by '0'.  If the photo is in trash bin, %r will be replaced by 'x'.\n\nFor example, if the photo being processed has the following pathname:\n<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
 PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
-PREFERENCES_PANFACTORFRAME;Panning acceleration
+PREFERENCES_PANFACTORFRAME;Pan rate amplification
 PREFERENCES_PANFACTORLABEL;Factor
 PREFERENCES_PARSEDEXT;Parsed Extensions
 PREFERENCES_PARSEDEXTADD;Add Extension

rtgui/cropwindow.cc

@@ -380,9 +380,13 @@ void CropWindow::pointerMoved (int x, int y) {
         iarea->redraw ();
     }
     else if (state==SCropImgMove) {
-    	double accel = options.panAccelFactor * zoomSteps[cropZoom].zoom;
+        // multiplier is the amplification factor ; disabled if the user selected "1" (no amplification)
-        action_x =  (press_x - x) / zoomSteps[cropZoom].zoom * accel;
+        double factor = options.panAccelFactor == 1 ? 1.0 : options.panAccelFactor * zoomSteps[cropZoom].zoom;
-        action_y =  (press_y - y) / zoomSteps[cropZoom].zoom * accel;
+        // never move the preview slower than the cursor
+        if (factor < 1.0)
+        	factor = 1.0;
+        action_x =  (press_x - x) / zoomSteps[cropZoom].zoom * factor;
+        action_y =  (press_y - y) / zoomSteps[cropZoom].zoom * factor;
         for (std::list<CropWindowListener*>::iterator i=listeners.begin(); i!=listeners.end(); i++)
             (*i)->cropPositionChanged (this);
         iarea->redraw ();