[Digikam-devel] [Bug 103244] Usability: Merge multiple similar menus into one

Gilles Caulier caulier.gilles at gmail.com
Fri Mar 16 16:32:55 CET 2007


------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=103244         




------- Additional Comments From caulier.gilles gmail com  2007-03-16 16:32 -------
SVN commit 643216 by cgilles:

digiKam from trunk : Usability issue in Image Editor : Merge Blowup and Resize tools to reduce duplicate menu entries and functions. 

To packagers : Blowup tool is removed to DigikamImagePlugins. Please update you package rule for 0.9.2 release
To translators : Blowup i18n are moved to digikam.po. Take a care. Blowup plugin trnaslations files are invalid now.

CCMAIL: digikam-devel kde org
CCBUGS: 103244

 M  +1 -0      digikam/digikam/Makefile.am  
 M  +1 -3      digikam/showfoto/Makefile.am  
 M  +1 -4      digikam/utilities/imageeditor/canvas/Makefile.am  
 M  +5 -3      digikam/utilities/imageeditor/editor/Makefile.am  
 M  +3 -11     digikam/utilities/imageeditor/editor/editorwindow.cpp  
 M  +3 -1      digikam/utilities/imageeditor/tools/Makefile.am  
 AM            digikam/utilities/imageeditor/tools/imageresize.cpp   [License: GPL]
 AM            digikam/utilities/imageeditor/tools/imageresize.h   [License: GPL]
 D             digikam/utilities/imageeditor/tools/imageresizedlg.cpp  
 D             digikam/utilities/imageeditor/tools/imageresizedlg.h  
 M  +1 -1      digikamimageplugins/Makefile.am  
 M  +3 -8      digikamimageplugins/README  


--- trunk/extragear/graphics/digikam/digikam/Makefile.am #643215:643216
 @ -103,6 +103,7  @
 	               $(top_builddir)/digikam/libs/widgets/libwidgets.la \
 	               $(top_builddir)/digikam/libs/dialogs/libdialog.la \
 	               $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
+	               $(top_builddir)/digikam/libs/dimg/libdimg.la \
 	               $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesdigikam.la \
 	               $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
 	               $(top_builddir)/digikam/libs/greycstoration/libgreycstoration.la \
--- trunk/extragear/graphics/digikam/showfoto/Makefile.am #643215:643216
 @ -14,13 +14,12  @
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/threadimageio \
 	   -I$(top_srcdir)/digikam/digikam \
-	   $(LIBKEXIV2_CFLAGS) \
 	   -I$(top_srcdir)/digikam/utilities/slideshow \
 	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
 	   -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
 	   -I$(top_srcdir)/digikam/utilities/imageeditor/tools \
 	   -I$(top_srcdir)/digikam/utilities/splashscreen \
-	   $(LIBKDCRAW_CFLAGS) $(all_includes)
+	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
 
 showfoto_SOURCES = main.cpp showfoto.cpp 
 
 @ -28,7 +27,6  @
 	           $(top_builddir)/digikam/libs/dialogs/libdialogshowfoto.la \
 	           $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesshowfoto.la \
 	           $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
-	           $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
 	           $(top_builddir)/digikam/utilities/imageeditor/editor/libshowfoto.la \
 	           $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
 	           $(top_builddir)/digikam/utilities/slideshow/libslideshow.la \
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/Makefile.am #643215:643216
 @ -7,8 +7,6  @
 	                   undoaction.cpp undomanager.cpp \
 	                   imagepluginloader.cpp imageplugin.cpp
 
-libdimgcanvas_la_LIBADD  = $(top_builddir)/digikam/libs/dimg/libdimg.la 
-
 libdimgcanvas_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TIFF) 
 
 INCLUDES = -I$(top_srcdir)/digikam/digikam \
 @ -16,11 +14,10  @
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/dialogs \
-	   $(LIBKEXIV2_CFLAGS) \
 	   -I$(top_srcdir)/digikam/libs/histogram \
 	   -I$(top_srcdir)/digikam/libs/threadimageio \
 	   -I$(top_srcdir)/digikam/utilities/splashscreen \
-	   $(LIBKDCRAW_CFLAGS) $(all_includes) 
+	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
 
 digikaminclude_HEADERS = imageplugin.h 
 
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/Makefile.am #643215:643216
 @ -12,7 +12,10  @
 
 libshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) 
 
-libshowfoto_la_LIBADD = $(top_builddir)/digikam/utilities/imageeditor/tools/libdimgeditortools.la \
+libshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/dimg/libdimg.la \
+	                $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
+	                $(top_builddir)/digikam/libs/greycstoration/libgreycstoration.la \
+	                $(top_builddir)/digikam/utilities/imageeditor/tools/libdimgeditortools.la \
 	                $(top_builddir)/digikam/libs/widgets/libwidgets.la
 
 INCLUDES = -I$(top_srcdir)/digikam/digikam \
 @ -24,13 +27,12  @
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/libs/imageproperties \
 	   -I$(top_srcdir)/digikam/libs/threadimageio \
-	   $(LIBKEXIV2_CFLAGS) \
 	   -I$(top_srcdir)/digikam/utilities/setup \
 	   -I$(top_srcdir)/digikam/utilities/slideshow \
 	   -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
 	   -I$(top_srcdir)/digikam/utilities/imageeditor/tools \
 	   -I$(top_builddir)/digikam/libs/dialogs \
-	   $(LIBKDCRAW_CFLAGS) $(all_includes) 
+	   $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes) 
 
 digikaminclude_HEADERS = imageiface.h 
 
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp #643215:643216
 @ -70,7 +70,6  @
 #include <kstatusbar.h>
 #include <kprogress.h>
 #include <kwin.h>
-#include <kled.h>
 
 // Local includes.
 
 @ -80,7 +79,7  @
 #include "dimginterface.h"
 #include "imageplugin.h"
 #include "imagepluginloader.h"
-#include "imageresizedlg.h"
+#include "imageresize.h"
 #include "imageprint.h"
 #include "filesaveoptionsbox.h"
 #include "statusprogressbar.h"
 @ -560,15 +559,8  @
 
 void EditorWindow::slotResize()
 {
-    int width  = m_canvas->imageWidth();
-    int height = m_canvas->imageHeight();
-
-    ImageResizeDlg dlg(this, &width, &height);
-
-    if (dlg.exec() == QDialog::Accepted &&
-        (width != m_canvas->imageWidth() ||
-         height != m_canvas->imageHeight()))
-        m_canvas->resizeImage(width, height);
+    ImageResize dlg(this);
+    dlg.exec();
 }
 
 void EditorWindow::slotAboutToShowUndoMenu()
--- trunk/extragear/graphics/digikam/utilities/imageeditor/tools/Makefile.am #643215:643216
 @ -2,13 +2,15  @
 
 noinst_LTLIBRARIES = libdimgeditortools.la 
 
-libdimgeditortools_la_SOURCES = imageresizedlg.cpp imageprint.cpp
+libdimgeditortools_la_SOURCES = imageresize.cpp imageprint.cpp
 
 libdimgeditortools_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) 
 
 INCLUDES= -I$(top_srcdir)/digikam/digikam \
 	  -I$(top_srcdir)/digikam/libs/dimg \
 	  -I$(top_srcdir)/digikam/libs/dimg/filters \
+	  -I$(top_srcdir)/digikam/libs/dmetadata \
+	  -I$(top_srcdir)/digikam/libs/greycstoration \
 	  -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
 	  -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
 	  $(all_includes) 
** trunk/extragear/graphics/digikam/utilities/imageeditor/tools/imageresize.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/utilities/imageeditor/tools/imageresize.h #property svn:eol-style
   + native
--- trunk/extragear/graphics/digikamimageplugins/Makefile.am #643215:643216
 @ -2,7 +2,7  @
 	      raindrop filmgrain freerotation adjustcurves sheartool antivignetting \
 	      lensdistortion perspective border blurfx distortionfx superimpose \
 	      inserttext infrared channelmixer texture whitebalance restoration \
-	      inpainting blowup refocus hotpixels 
+	      inpainting refocus hotpixels 
 
 AUTOMAKE_OPTIONS = foreign 
 
--- trunk/extragear/graphics/digikamimageplugins/README #643215:643216
 @ -37,16 +37,11  @
 24) WhiteBalance     : A plugin to correct picture white color balance.
 25) Restoration      : An advanced filter to restore photograph using CImg library.
 26) Inpainting       : An advanced filter to inpaint photograph area using CImg library.
-27) Blowup           : An advanced filter to blowup photograph using CImg library.
-28) Refocus          : An advanced sharpness editor based on deconvolution filter to refocus a photograph.
-29) HotPixels        : A plugin to remove Stuff/Hot Pixels from pictures taken with deficient camera CCD.
+27) Refocus          : An advanced sharpness editor based on deconvolution filter to refocus a photograph.
+28) HotPixels        : A plugin to remove Stuff/Hot Pixels from pictures taken with deficient camera CCD.
 
-Visit the web project pages available at these url:
+Visit the web project page available at this url: http://www.digikam.org
 
-DIGIKAM             : http://www.digikam.org
-DIGIKAMIMAGEPLUGINS : http://extragear.kde.org/apps/digikamimageplugins
-
-
 -- CONTACT ------------------------------------------------------------
 
 If you have questions, comments, suggestions to make do email at :


More information about the Digikam-devel mailing list