[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/digikam
From:       Ralf Hoelzer <ralf () well ! com>
Date:       2004-08-26 15:42:33
Message-ID: 20040826154233.2374692B6 () office ! kde ! org
[Download RAW message or body]

CVS commit by rhoezler: 

- Fix order of transformation during EXIF auto rotate
- Add missing "horizontal flip" option that was lost when moving it to the image menu


  M +8 -4      digikam/digikamapp.cpp   1.50
  M +1 -0      digikam/digikamapp.h   1.18
  M +2 -2      utilities/imageeditor/imlibinterface.cpp   1.24


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.49:1.50
@@ -319,8 +319,9 @@ void DigikamApp::setupActions()
     mImageSetExifOrientation2Action = new KAction(i18n("Flipped \
                horizontally"),0,actionCollection());
     mImageSetExifOrientation3Action = new KAction(i18n("Rotated 180 \
                degrees"),0,actionCollection());
-    mImageSetExifOrientation4Action = new KAction(i18n("Rotated 90 degrees / horiz. \
                flipped"),0,actionCollection());
-    mImageSetExifOrientation5Action = new KAction(i18n("Rotated 90 \
                degrees"),0,actionCollection());
-    mImageSetExifOrientation6Action = new KAction(i18n("Rotated 90 degrees / vert. \
                flipped"),0,actionCollection());
-    mImageSetExifOrientation7Action = new KAction(i18n("Rotated 270 \
degrees"),0,actionCollection()); +    mImageSetExifOrientation4Action = new \
KAction(i18n("Flipped vertically"),0,actionCollection()); +    \
mImageSetExifOrientation5Action = new KAction(i18n("Rotated 90 degrees / horiz. \
flipped"),0,actionCollection()); +    mImageSetExifOrientation6Action = new \
KAction(i18n("Rotated 90 degrees"),0,actionCollection()); +    \
mImageSetExifOrientation7Action = new KAction(i18n("Rotated 90 degrees / vert. \
flipped"),0,actionCollection()); +    mImageSetExifOrientation8Action = new \
KAction(i18n("Rotated 270 degrees"),0,actionCollection());  
     mImageExifOrientationActionMenu->insert(mImageSetExifOrientation1Action);
@@ -331,4 +332,5 @@ void DigikamApp::setupActions()
     mImageExifOrientationActionMenu->insert(mImageSetExifOrientation6Action);
     mImageExifOrientationActionMenu->insert(mImageSetExifOrientation7Action);
+    mImageExifOrientationActionMenu->insert(mImageSetExifOrientation8Action);
 
     connect( mImageSetExifOrientation1Action, SIGNAL( activated() ), \
exifOrientationMapper, SLOT( map() ) ); @@ -339,4 +341,5 @@ void \
                DigikamApp::setupActions()
     connect( mImageSetExifOrientation6Action, SIGNAL( activated() ), \
                exifOrientationMapper, SLOT( map() ) );
     connect( mImageSetExifOrientation7Action, SIGNAL( activated() ), \
exifOrientationMapper, SLOT( map() ) ); +    connect( \
mImageSetExifOrientation8Action, SIGNAL( activated() ), exifOrientationMapper, SLOT( \
map() ) );  
     exifOrientationMapper->setMapping( mImageSetExifOrientation1Action, 1);
@@ -347,4 +350,5 @@ void DigikamApp::setupActions()
     exifOrientationMapper->setMapping( mImageSetExifOrientation6Action, 6);
     exifOrientationMapper->setMapping( mImageSetExifOrientation7Action, 7);
+    exifOrientationMapper->setMapping( mImageSetExifOrientation8Action, 8);
  
     // -----------------------------------------------------------------

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.17:1.18
@@ -146,4 +146,5 @@ private:
     KAction *mImageSetExifOrientation6Action;
     KAction *mImageSetExifOrientation7Action;
+    KAction *mImageSetExifOrientation8Action;
     KAction *mImageRenameAction;
     KAction *mImageDeleteAction;

--- kdeextragear-3/digikam/utilities/imageeditor/imlibinterface.cpp  #1.23:1.24
@@ -256,6 +256,6 @@ void ImlibInterface::exifRotate(QString 
 
             case KExifData::ROT_90_HFLIP:
-                imlib_image_flip_horizontal();
                 rotate90();
+                imlib_image_flip_horizontal();
                 break;
 
@@ -265,6 +265,6 @@ void ImlibInterface::exifRotate(QString 
 
             case KExifData::ROT_90_VFLIP:
-                imlib_image_flip_vertical();
                 rotate90();
+                imlib_image_flip_vertical();
                 break;
 


[prev in list] [next in list] [prev in thread] [next in thread]