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

List:       kde-commits
Subject:    koffice/krita
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2006-03-03 7:53:03
Message-ID: 1141372383.298342.20300.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 515235 by rempt:

* More dynamic_casts instead of c-style casts
* Fix for initial image size


 M  +1 -1      plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc  
 M  +1 -0      todo-1.5  
 M  +11 -14    ui/kis_dlg_adj_layer_props.cc  
 M  +1 -1      ui/kis_doc.cc  
 M  +7 -3      ui/kis_view.cc  
 M  +3 -3      ui/kis_view.h  


--- trunk/koffice/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc #515234:515235
@@ -87,7 +87,7 @@
         m_labelNoCW->hide();
     }
     KisImageSP img = m_view->canvasSubject()->currentImg();
-    KisPaintLayerSP activeLayer = (KisPaintLayer*) img->activeLayer().data();
+    KisPaintLayerSP activeLayer = dynamic_cast<KisPaintLayer*>(img->activeLayer().data());
     
     if (activeLayer)
        m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, \
                activeLayer->paintDevice());
--- trunk/koffice/krita/todo-1.5 #515234:515235
@@ -26,6 +26,7 @@
 User interface
 
 P  * Try to optimize histogram docker
+P  * Try to fix display glitches in selection creation.
 
 Files and Import/Export
 
--- trunk/koffice/krita/ui/kis_dlg_adj_layer_props.cc #515234:515235
@@ -81,11 +81,18 @@
 
     setCaption(caption);
     QWidget * page = new QWidget(this, "page widget");
-    QVBoxLayout * layout = new QVBoxLayout(page, 0, 6);
+    QHBoxLayout * layout = new QHBoxLayout(page, 0, 6);
     setMainWidget(page);
 
-    QHBoxLayout *hl = new QHBoxLayout( layout );
+    m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
+    m_preview->slotSetDevice( dev );
 
+    connect( m_preview, SIGNAL(updated()), this, SLOT(refreshPreview()));
+    layout->addWidget(m_preview, 1, 1);
+
+    QVBoxLayout *v1 = new QVBoxLayout( layout );
+    QHBoxLayout *hl = new QHBoxLayout( v1 );
+
     QLabel * lblName = new QLabel(i18n("Layer name:"), page, "lblName");
     hl->addWidget(lblName, 0, 0);
 
@@ -95,9 +102,6 @@
     hl->addWidget(m_layerName, 0, 1);
     connect( m_layerName, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotNameChanged( const \
QString & ) ) );  
-    
-    QHBoxLayout * h2 = new QHBoxLayout( layout );
-
     if ( m_currentFilter ) {
         m_currentConfigWidget = m_currentFilter->createConfigurationWidget(page, dev);
         if (m_currentConfigWidget) {
@@ -106,20 +110,13 @@
     }
     if ( m_currentFilter == 0 || m_currentConfigWidget == 0 ) {
         QLabel * labelNoConfigWidget = new QLabel( i18n("No configuration options are available for this \
                filter"), page );
-        h2->addWidget( labelNoConfigWidget );
+        v1->addWidget( labelNoConfigWidget );
     }
     else {
-        h2->addWidget( m_currentConfigWidget );
+        v1->addWidget( m_currentConfigWidget );
         connect(m_currentConfigWidget, SIGNAL(sigPleaseUpdatePreview()), this, \
SLOT(slotConfigChanged()));  }
 
-    
-    m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
-    m_preview->slotSetDevice( dev );
-
-    connect( m_preview, SIGNAL(updated()), this, SLOT(refreshPreview()));
-    h2->addWidget(m_preview, 1, 1);
-
     refreshPreview();
     enableButtonOK( !m_layerName->text().isEmpty() );
 
--- trunk/koffice/krita/ui/kis_doc.cc #515234:515235
@@ -825,7 +825,7 @@
     int h = cfg.defImgHeight();
     
     QSize sz = KisClipboard::instance()->clipSize();
-    if (sz.isValid()) {
+    if (sz.isValid() && sz.width() != 0 && sz.height() != 0) {
         w = sz.width();
         h = sz.height();
     }
--- trunk/koffice/krita/ui/kis_view.cc #515234:515235
@@ -531,7 +531,7 @@
         m_statusBarProfileLabel -> setText(i18n("No profile"));
     }
     else {
-        m_statusBarProfileLabel -> setText(img -> getProfile() -> productName());
+        m_statusBarProfileLabel -> setText(img->colorSpace()->id().name() + "  " + img -> getProfile() \
-> productName());  }
 }
 
@@ -2653,8 +2653,10 @@
         KisDlgAdjLayerProps dlg(alayer, alayer->name(), i18n("Adjustment Layer Properties"), this, \
"dlgadjlayerprops");  if (dlg.exec() == QDialog::Accepted)
         {
+            QApplication::setOverrideCursor(KisCursor::waitCursor());
+            alayer -> setFilter( dlg.filterConfiguration() );
             alayer -> setDirty();
-            alayer -> setFilter( dlg.filterConfiguration() );
+            QApplication::restoreOverrideCursor();
         }
     }
     else
@@ -2669,10 +2671,12 @@
                 layer -> opacity() != dlg.getOpacity() ||
                 layer -> compositeOp() != dlg.getCompositeOp())
             {
+                QApplication::setOverrideCursor(KisCursor::waitCursor());
                 m_adapter -> beginMacro(i18n("Property Changes"));
                 layer -> image() -> setLayerProperties(layer, dlg.getOpacity(), dlg.getCompositeOp(), \
dlg.getName());  layer -> setDirty();
                 m_adapter -> endMacro();
+                QApplication::restoreOverrideCursor();
             }
         }
     }
@@ -3134,7 +3138,7 @@
     if (m_image) {
         connect(m_image, SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, \
                SLOT(imgSelectionChanged(KisImageSP)));
         connect(m_image, SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, SLOT(updateCanvas()));
-
+        connect(m_image, SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, \
                SLOT(updateStatusBarProfileLabel()));
         connect(m_image, SIGNAL(sigProfileChanged(KisProfile * )), SLOT(profileChanged(KisProfile * )));
 
         connect(m_image, SIGNAL(sigLayersChanged(KisGroupLayerSP)), SLOT(layersUpdated()));
--- trunk/koffice/krita/ui/kis_view.h #515234:515235
@@ -283,6 +283,9 @@
 private slots:
     virtual void updateCanvas();
 
+    void updateStatusBarZoomLabel();
+    void updateStatusBarProfileLabel();
+
 private:
     virtual KisCanvas *kiscanvas() const;
     
@@ -371,9 +374,6 @@
     void setupScrollBars();
     void setupStatusBar();
 
-    void updateStatusBarZoomLabel();
-    void updateStatusBarProfileLabel();
-
     /**
      * Import an image as a layer. If there is more than
      * one layer in the image, import all of them as separate


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