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

List:       kde-commits
Subject:    extragear/graphics/digikamimageplugins
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2007-03-15 12:26:44
Message-ID: 1173961604.170581.20666.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 642795 by cgilles:

optimize layout

 M  +7 -4      channelmixer/channelmixer.cpp  
 M  +5 -4      colorfx/imageeffect_colorfx.cpp  
 M  +8 -5      whitebalance/imageeffect_whitebalance.cpp  


--- trunk/extragear/graphics/digikamimageplugins/channelmixer/channelmixer.cpp \
#642794:642795 @@ -41,6 +41,7 @@
 #include <qpainter.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
+#include <qvbox.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
@@ -154,16 +155,18 @@
 
     grid->addMultiCellLayout(l1, 0, 0, 0, 4);
 
-    m_histogramWidget = new Digikam::HistogramWidget(256, 140, gboxSettings, false, \
true, true); +    // -------------------------------------------------------------
+
+    QVBox *histoBox   = new QVBox(gboxSettings);
+    m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, \
                true, true);
     QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview \
                image histogram drawing of the "
                                              "selected image channel. This one is \
re-computed at any mixer "  "settings changes."));
     
-    m_hGradient = new Digikam::ColorGradientWidget( \
Digikam::ColorGradientWidget::Horizontal, 10, gboxSettings ); +    m_hGradient = new \
Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox \
);  m_hGradient->setColors( QColor( "black" ), QColor( "red" ) );
     
-    grid->addMultiCellWidget(m_histogramWidget, 1, 1, 0, 4);
-    grid->addMultiCellWidget(m_hGradient, 2, 2, 0, 4);
+    grid->addMultiCellWidget(histoBox, 1, 2, 0, 4);
     
     // -------------------------------------------------------------
         
--- trunk/extragear/graphics/digikamimageplugins/colorfx/imageeffect_colorfx.cpp \
#642794:642795 @@ -32,6 +32,7 @@
 #include <qwhatsthis.h>
 #include <qlayout.h>
 #include <qframe.h>
+#include <qvbox.h>
 
 // KDE includes.
 
@@ -140,16 +141,16 @@
 
     // -------------------------------------------------------------
 
-    m_histogramWidget = new Digikam::HistogramWidget(256, 140, gboxSettings, false, \
true, true); +    QVBox *histoBox   = new QVBox(gboxSettings);
+    m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, \
                true, true);
     QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview \
                image histogram drawing "
                                              "of the selected image channel. This \
one is re-computed at any "  "settings changes."));
     
-    m_hGradient = new Digikam::ColorGradientWidget( \
Digikam::ColorGradientWidget::Horizontal, 10, gboxSettings ); +    m_hGradient = new \
Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox \
);  m_hGradient->setColors( QColor( "black" ), QColor( "white" ) );
     
-    gridSettings->addMultiCellWidget(m_histogramWidget, 1, 1, 0, 4);
-    gridSettings->addMultiCellWidget(m_hGradient, 2, 2, 0, 4);
+    gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4);
 
     // -------------------------------------------------------------
 
--- trunk/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp \
#642794:642795 @@ -35,6 +35,7 @@
 #include <qpixmap.h>
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qvbox.h>
 
 // KDE includes.
 
@@ -153,16 +154,18 @@
 
     grid->addMultiCellLayout(l1, 0, 0, 0, 4);
 
-    m_histogramWidget = new Digikam::HistogramWidget(256, 140,
-                                                     gboxSettings, false, true, \
true); +    // -------------------------------------------------------------
+
+    QVBox *histoBox   = new QVBox(gboxSettings);
+    m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, \
                true, true);
     QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview \
                image histogram "
                                              "drawing of the selected image channel. \
                This one is "
                                              "re-computed at any filter settings \
                changes."));
-    grid->addMultiCellWidget(m_histogramWidget, 1, 1, 0, 4);
     
-    m_hGradient = new Digikam::ColorGradientWidget( \
Digikam::ColorGradientWidget::Horizontal, 10, gboxSettings ); +    m_hGradient = new \
Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox \
);  m_hGradient->setColors( QColor( "black" ), QColor( "white" ) );
-    grid->addMultiCellWidget(m_hGradient, 2, 2, 0, 4);
+
+    grid->addMultiCellWidget(histoBox, 1, 2, 0, 4);
     
     // -------------------------------------------------------------
 


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