Pipette and "On Preview Widgets" branch. See issue 227

The pipette part is already working quite nice but need to be finished. The widgets part needs more work...
2014-01-21 23:37:36 +01:00
commit 8b2eac9a3d
1631 changed files with 379231 additions and 0 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -0,0 +1,70 @@
+
+set (BASESOURCEFILES
+    editwindow.cc batchtoolpanelcoord.cc paramsedited.cc cropwindow.cc previewhandler.cc previewwindow.cc navigator.cc indclippedpanel.cc previewmodepanel.cc filterpanel.cc
+    exportpanel.cc cursormanager.cc rtwindow.cc renamedlg.cc recentbrowser.cc placesbrowser.cc filepanel.cc editorpanel.cc batchqueuepanel.cc
+    ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc
+    cachemanager.cc cacheimagedata.cc shcselector.cc perspective.cc thresholdselector.cc thresholdadjuster.cc
+    clipboard.cc thumbimageupdater.cc bqentryupdater.cc lensgeom.cc coloredbar.cc
+    coarsepanel.cc cacorrection.cc  chmixer.cc blackwhite.cc
+    resize.cc icmpanel.cc crop.cc shadowshighlights.cc
+    impulsedenoise.cc dirpyrdenoise.cc epd.cc
+    exifpanel.cc toolpanel.cc lensprofile.cc
+    sharpening.cc vibrance.cc rgbcurves.cc
+    whitebalance.cc   vignetting.cc gradient.cc pcvignette.cc rotate.cc distortion.cc
+    crophandler.cc dirbrowser.cc
+    curveeditor.cc curveeditorgroup.cc diagonalcurveeditorsubgroup.cc flatcurveeditorsubgroup.cc
+    filecatalog.cc extprog.cc
+    previewloader.cc rtimage.cc
+    histogrampanel.cc history.cc  imagearea.cc
+    imageareapanel.cc iptcpanel.cc labcurve.cc main.cc
+    multilangmgr.cc mycurve.cc myflatcurve.cc mydiagonalcurve.cc options.cc
+    preferences.cc profilepanel.cc saveasdlg.cc
+    saveformatpanel.cc soundman.cc splash.cc
+    thumbnail.cc tonecurve.cc toolbar.cc
+    guiutils.cc zoompanel.cc toolpanelcoord.cc
+    thumbbrowserentrybase.cc batchqueueentry.cc
+    batchqueue.cc lwbutton.cc lwbuttonset.cc
+    batchqueuebuttonset.cc browserfilter.cc exiffiltersettings.cc
+    profilestore.cc partialpastedlg.cc rawprocess.cc preprocess.cc
+    darkframe.cc flatfield.cc rawcacorrection.cc rawexposure.cc
+    dirpyrequalizer.cc hsvequalizer.cc defringe.cc
+    popupcommon.cc popupbutton.cc popuptogglebutton.cc sharpenedge.cc sharpenmicro.cc colorappearance.cc)
+
+include_directories (BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
+
+if (APPLE)
+    # At the time of writing Cmake has no module finder for gtkmacintegration so here we have it hard-coded, if installed via macports it should be in /opt/local/...
+    set (EXTRA_LIB_RTGUI gtkmacintegration)
+    set (EXTRA_INCDIR ${EXTRA_INCDIR} /opt/local/include/gtkmacintegration)
+endif (APPLE)
+if (WIN32)
+    set (EXTRA_SRC windirmonitor.cc myicon.rc)
+    set (EXTRA_LIB_RTGUI winmm)
+    include_directories (${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
+        ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS})
+    link_directories (. "${PROJECT_SOURCE_DIR}/rtexif" ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS}
+        ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS})
+    #set_target_properties (rth PROPERTIES LINK_FLAGS "-mwindows")
+else (WIN32)
+    include_directories (${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
+        ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS}
+        ${LCMS_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS} ${FFTW3F_LIBRARY_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS}
+        ${CANBERRA-GTK_INCLUDE_DIRS})
+    link_directories (${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS}
+        ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS} ${IPTCDATA_LIBRARY_DIRS}
+        ${LCMS_LIBRARY_DIRS} ${EXPAT_LIBRARY_DIRS} ${FFTW3F_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${GOBJECT_LIBRARY_DIRS}
+        ${CANBERRA-GTK_LIBRARY_DIRS})
+endif (WIN32)
+# create config.h which defines where data are stored
+configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
+add_executable (rth ${EXTRA_SRC} ${BASESOURCEFILES})
+
+set_target_properties (rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)
+#target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
+#   ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES})
+target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
+   ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${EXPAT_LIBRARIES}
+   ${FFTW3F_LIBRARIES} ${IPTCDATA_LIBRARIES} ${CANBERRA-GTK_LIBRARIES} ${EXTRA_LIB_RTGUI})
+install (TARGETS rth DESTINATION ${BINDIR})
+