[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/imageplugins
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2010-03-11 11:05:53
Message-ID: 1268305553.840514.14637.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1101919 by cgilles:
move ratio crop tool to Transform plugin
M +5 -4 TODO
M +0 -4 coreplugin/CMakeLists.txt
M +1 -5 coreplugin/digikamimageplugin_core_ui.rc
M +0 -19 coreplugin/imageplugin_core.cpp
M +0 -2 coreplugin/imageplugin_core.h
D coreplugin/ratiocrop (directory)
M +6 -1 transform/CMakeLists.txt
M +3 -1 transform/digikamimageplugin_transform_ui.rc
M +16 -2 transform/imageplugin_transform.cpp
M +2 -0 transform/imageplugin_transform.h
A transform/imageselectionwidget.cpp \
coreplugin/ratiocrop/imageselectionwidget.cpp#1101863 [License: GPL (v2+)] A \
transform/imageselectionwidget.h \
coreplugin/ratiocrop/imageselectionwidget.h#1101863 [License: GPL (v2+)] A \
transform/ratiocroptool.cpp coreplugin/ratiocrop/ratiocroptool.cpp#1101863 \
[License: GPL (v2+)] A transform/ratiocroptool.h \
coreplugin/ratiocrop/ratiocroptool.h#1101863 [License: GPL (v2+)]
--- trunk/extragear/graphics/digikam/imageplugins/TODO #1101918:1101919
@@ -7,18 +7,18 @@
/adjustlevels DONE DONE TODO
/autocorrectiontool DONE DONE DONE
/bcgtool DONE DONE DONE
- /blurtool DONE DONE DONE
/bwsepiatool DONE DONE DONE
/cbtool DONE DONE DONE
/channelmixer DONE DONE DONE
- /filmgrain DONE DONE DONE
/hsltool DONE DONE DONE
/localcontrast DONE DONE DONE
+ /profileconversiontool DONE DONE DONE
+ /whitebalance DONE DONE DONE
+ /filmgrain DONE DONE DONE
/noisereductiontool DONE DONE DONE
- /profileconversiontool DONE DONE DONE
/redeyetool DONE TODO NO
/sharpentool DONE DONE DONE
- /whitebalance DONE DONE DONE
+ /blurtool DONE DONE DONE
decorate
/border DONE NO TODO
@@ -46,6 +46,7 @@
superimpose NO NO NO
transform
+ /ratiocrop DONE NO NO
/resizetool DONE TODO DONE
/freerotation DONE NO TODO
/perspective NO NO NO
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/CMakeLists.txt \
#1101918:1101919 @@ -1,6 +1,4 @@
-INCLUDE_DIRECTORIES(../../imageplugins/coreplugin/ratiocrop)
-
SET(digikamimageplugin_core_PART_SRCS
../../imageplugins/coreplugin/autocorrectiontool.cpp
../../imageplugins/coreplugin/bcgtool.cpp
@@ -19,8 +17,6 @@
../../imageplugins/coreplugin/adjustcurvestool.cpp
../../imageplugins/coreplugin/adjustlevelstool.cpp
../../imageplugins/coreplugin/localcontrasttool.cpp
- ../../imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
- ../../imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
)
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/digikamimageplugin_core_ui.rc \
#1101918:1101919 @@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="23" name="digikamimageplugin_core" >
+<gui version="24" name="digikamimageplugin_core" >
<MenuBar>
@@ -33,10 +33,6 @@
<Action name="implugcore_redeye" />
</Menu>
- <Menu name="Transform" ><text>Tra&nsform</text>
- <Action name="implugcore_ratiocrop" />
- </Menu>
-
<Menu name="Filters" ><text>F&ilters</text>
<Action name="implugcore_filmgrain" />
</Menu>
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.cpp \
#1101918:1101919 @@ -51,7 +51,6 @@
#include "profileconversiontool.h"
#include "blurtool.h"
#include "noisereductiontool.h"
-#include "ratiocroptool.h"
#include "sharpentool.h"
#include "redeyetool.h"
#include "cbtool.h"
@@ -80,7 +79,6 @@
autoCorrectionAction(0),
invertAction(0),
BWAction(0),
- aspectRatioCropAction(0),
sharpenAction(0),
blurAction(0),
convertTo8Bits(0),
@@ -102,7 +100,6 @@
KAction* autoCorrectionAction;
KAction* invertAction;
KAction* BWAction;
- KAction* aspectRatioCropAction;
KAction* sharpenAction;
KAction* blurAction;
KAction* convertTo8Bits;
@@ -115,7 +112,6 @@
KAction* filmgrainAction;
KAction* localContrastAction;
-
IccProfilesMenuAction* profileMenuAction;
};
@@ -240,14 +236,6 @@
this, SLOT(slotLocalContrast()));
//-------------------------------
- // Transform menu actions.
-
- d->aspectRatioCropAction = new KAction(KIcon("ratiocrop"), i18n("Aspect Ratio \
Crop..."), this);
- actionCollection()->addAction("implugcore_ratiocrop", d->aspectRatioCropAction \
);
- connect(d->aspectRatioCropAction, SIGNAL(triggered(bool) ),
- this, SLOT(slotRatioCrop()));
-
- //-------------------------------
// Filter menu actions.
d->filmgrainAction = new KAction(KIcon("filmgrain"), i18n("Add Film Grain..."), \
this); @@ -285,7 +273,6 @@
d->BWAction->setEnabled(b);
d->HSLAction->setEnabled(b);
d->sharpenAction->setEnabled(b);
- d->aspectRatioCropAction->setEnabled(b);
d->profileMenuAction->setEnabled(b);
d->noiseReductionAction->setEnabled(b);
d->whitebalanceAction->setEnabled(b);
@@ -482,12 +469,6 @@
loadTool(tool);
}
-void ImagePlugin_Core::slotRatioCrop()
-{
- RatioCropTool* tool = new RatioCropTool(this);
- loadTool(tool);
-}
-
void ImagePlugin_Core::slotNoiseReduction()
{
NoiseReductionTool* tool = new NoiseReductionTool(this);
--- trunk/extragear/graphics/digikam/imageplugins/coreplugin/imageplugin_core.h \
#1101918:1101919 @@ -81,8 +81,6 @@
void slotLevelsAdjust();
void slotLocalContrast();
- void slotRatioCrop();
-
void slotUpdateColorSpaceMenu();
void slotSetupICC();
--- trunk/extragear/graphics/digikam/imageplugins/transform/CMakeLists.txt \
#1101918:1101919 @@ -5,10 +5,15 @@
SET(digikamimageplugin_transform_PART_SRCS imageplugin_transform.cpp
freerotationtool.cpp
sheartool.cpp
- resizetool.cpp \
perspectivetool.cpp + resizetool.cpp \
+
+ perspectivetool.cpp
perspectivewidget.cpp
triangle.cpp
matrix.cpp
+
+ imageselectionwidget.cpp
+ ratiocroptool.cpp
)
IF(GLIB2_FOUND)
--- trunk/extragear/graphics/digikam/imageplugins/transform/digikamimageplugin_transform_ui.rc \
#1101918:1101919 @@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="11" name="digikamimageplugin_transform" >
+<gui version="12" name="digikamimageplugin_transform" >
<MenuBar>
@@ -9,6 +9,7 @@
<Action name="imageplugin_freerotation" />
<Action name="imageplugin_sheartool" />
<Action name="imageplugin_contentawareresizing" />
+ <Action name="imageplugin_ratiocrop" />
</Menu>
</MenuBar>
@@ -18,6 +19,7 @@
</ToolBar>
<ActionProperties>
+ <Action shortcut="" name="imageplugin_ratiocrop" />
<Action shortcut="" name="imageplugin_resize" />
<Action shortcut="" name="imageplugin_perspective" />
<Action shortcut="" name="imageplugin_freerotation" />
--- trunk/extragear/graphics/digikam/imageplugins/transform/imageplugin_transform.cpp \
#1101918:1101919 @@ -41,6 +41,7 @@
#include "freerotationtool.h"
#include "sheartool.h"
#include "resizetool.h"
+#include "ratiocroptool.h"
#ifdef HAVE_GLIB2
#include "contentawareresizetool.h"
@@ -55,12 +56,12 @@
: ImagePlugin(parent, "ImagePlugin_Transform")
{
m_perspectiveAction = new KAction(KIcon("perspective"), i18n("Perspective \
Adjustment..."), this);
- actionCollection()->addAction("imageplugin_perspective", m_perspectiveAction );
+ actionCollection()->addAction("imageplugin_perspective", m_perspectiveAction);
connect(m_perspectiveAction, SIGNAL(triggered(bool)),
this, SLOT(slotPerspective()));
m_sheartoolAction = new KAction(KIcon("shear"), i18n("Shear..."), this);
- actionCollection()->addAction("imageplugin_sheartool", m_sheartoolAction );
+ actionCollection()->addAction("imageplugin_sheartool", m_sheartoolAction);
connect(m_sheartoolAction, SIGNAL(triggered(bool)),
this, SLOT(slotShearTool()));
@@ -69,6 +70,11 @@
connect(m_resizeAction, SIGNAL(triggered()),
this, SLOT(slotResize()));
+ m_aspectRatioCropAction = new KAction(KIcon("ratiocrop"), i18n("Aspect Ratio \
Crop..."), this); + actionCollection()->addAction("imageplugin_ratiocrop", \
m_aspectRatioCropAction); + connect(m_aspectRatioCropAction, \
SIGNAL(triggered(bool) ), + this, SLOT(slotRatioCrop()));
+
#ifdef HAVE_GLIB2
m_contentAwareResizingAction = new KAction(KIcon("transform-scale"), \
i18n("Liquid Rescale..."), this); @@ -124,6 +130,8 @@
m_perspectiveAction->setEnabled(b);
m_freerotationAction->setEnabled(b);
m_sheartoolAction->setEnabled(b);
+ m_aspectRatioCropAction->setEnabled(b);
+
#ifdef HAVE_GLIB2
m_contentAwareResizingAction->setEnabled(b);
#endif /* HAVE_GLIB2 */
@@ -147,6 +155,12 @@
loadTool(tool);
}
+void ImagePlugin_Transform::slotRatioCrop()
+{
+ RatioCropTool* tool = new RatioCropTool(this);
+ loadTool(tool);
+}
+
void ImagePlugin_Transform::slotContentAwareResizing()
{
#ifdef HAVE_GLIB2
--- trunk/extragear/graphics/digikam/imageplugins/transform/imageplugin_transform.h \
#1101918:1101919 @@ -61,9 +61,11 @@
void slotShearTool();
void slotContentAwareResizing();
void slotResize();
+ void slotRatioCrop();
private:
+ KAction* m_aspectRatioCropAction;
KAction* m_resizeAction;
KAction* m_contentAwareResizingAction;
KAction* m_sheartoolAction;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic