Still in the middle of fixing preview/snapper rendering...

[architektonas] / src / widgets / layerwidget.cpp

diff --git a/src/widgets/layerwidget.cpp b/src/widgets/layerwidget.cpp
index 447d4e7e1f991d1c98729c5ebde2e5ac3b8fc585..f60a6c1f0b16a742f5052cfa4949b21a3f7efb15 100644 (file)
--- a/src/widgets/layerwidget.cpp
+++ b/src/widgets/layerwidget.cpp
@@ -128,8 +128,6 @@ LayerWidget::LayerWidget(ActionHandler * ah, QWidget * parent,
 LayerWidget::~LayerWidget()
 {
        delete listBox;
-       //delete pxmVisible;
-       //delete pxmHidden;
 }
 
 /**
@@ -158,14 +156,13 @@ void LayerWidget::update()
 
        RS_Layer * activeLayer = NULL;
 
-       if (layerList != NULL)
+       if (layerList)
                activeLayer = layerList->getActive();
 
        RS_DEBUG->print("LayerWidget::update() clearing listBox");
-
        listBox->clear();
 
-       if (layerList == NULL)
+       if (!layerList)
        {
                RS_DEBUG->print("LayerWidget::update() abort");
                return;
@@ -178,46 +175,23 @@ void LayerWidget::update()
                RS_Layer * layer = layerList->at(i);
 
                // hide layer "ByBlock"?
-               if (showByBlock || layer->getName()!="ByBlock")
+               if (showByBlock || layer->getName() != "ByBlock")
                {
                        QPixmap * pm = NULL;
 
                        if (!layer->isFrozen())
-                       {
-                               if (!layer->isLocked())
-                               {
-                                       pm = &pxmLayerStatus10;
-                               }
-                               else
-                               {
-                                       pm = &pxmLayerStatus11;
-                               }
-                       }
+                               pm = (!layer->isLocked() ? &pxmLayerStatus10 : &pxmLayerStatus11);
                        else
-                       {
-                               if (!layer->isLocked())
-                               {
-                                       pm = &pxmLayerStatus00;
-                               }
-                               else
-                               {
-                                       pm = &pxmLayerStatus01;
-                               }
-                       }
-
-                       if (pm != NULL)
-                       {
-//                             listBox->insertItem(*pm, layer->getName());
-                               listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
-                       }
+                               pm = (!layer->isLocked() ? &pxmLayerStatus00 : &pxmLayerStatus01);
+
+//                     listBox->insertItem(*pm, layer->getName());
+                       listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
                }
        }
 
        RS_DEBUG->print("LayerWidget::update() sorting");
-
 //     listBox->sort();
        listBox->sortItems(Qt::AscendingOrder);
-
        RS_DEBUG->print("LayerWidget::update() reactivating current layer");
 
        RS_Layer * l = lastLayer;
@@ -225,7 +199,6 @@ void LayerWidget::update()
        lastLayer = l;
 #warning "!!!"
 //     listBox->setContentsPos(0, yPos);
-
        RS_DEBUG->print("LayerWidget::update() end");
 }
 
@@ -237,7 +210,7 @@ void LayerWidget::highlightLayer(RS_Layer * layer)
 {
        RS_DEBUG->print("LayerWidget::highlightLayer() begin");
 
-       if (layer == NULL || layerList == NULL)
+       if (!layer || !layerList)
        {
                RS_DEBUG->print("LayerWidget::highlightLayer() abort");
                return;
@@ -245,7 +218,6 @@ void LayerWidget::highlightLayer(RS_Layer * layer)
 
        QString name = layer->getName();
        highlightLayer(name);
-
        RS_DEBUG->print("LayerWidget::highlightLayer() end");
 }
 
@@ -257,7 +229,7 @@ void LayerWidget::highlightLayer(const QString & name)
 {
        RS_DEBUG->print("LayerWidget::highlightLayer(name) begin");
 
-       if (layerList == NULL)
+       if (!layerList)
        {
                RS_DEBUG->print("LayerWidget::highlightLayer(name) abort");
                return;
@@ -280,29 +252,29 @@ void LayerWidget::highlightLayer(const QString & name)
        RS_DEBUG->print("LayerWidget::highlightLayer(name) end");
 }
 
-/*virtual*/ void LayerWidget::layerActivated(RS_Layer * layer)
+void LayerWidget::layerActivated(RS_Layer * layer)
 {
        highlightLayer(layer);
 }
 
-/*virtual*/ void LayerWidget::layerAdded(RS_Layer * layer)
+void LayerWidget::layerAdded(RS_Layer * layer)
 {
        update();
        highlightLayer(layer);
 }
 
-/*virtual*/ void LayerWidget::layerEdited(RS_Layer *)
+void LayerWidget::layerEdited(RS_Layer *)
 {
        update();
 }
 
-/*virtual*/ void LayerWidget::layerRemoved(RS_Layer *)
+void LayerWidget::layerRemoved(RS_Layer *)
 {
        update();
        highlightLayer(layerList->at(0));
 }
 
-/*virtual*/ void LayerWidget::layerToggled(RS_Layer *)
+void LayerWidget::layerToggled(RS_Layer *)
 {
        update();
 }
@@ -316,7 +288,7 @@ void LayerWidget::slotActivated(void)
        QString layerName = listBox->currentItem()->text();
        RS_DEBUG->print("LayerWidget::slotActivated(): %s", layerName.toLatin1().data());
 
-       if (layerList == NULL)
+       if (!layerList)
                return;
 
        lastLayer = layerList->getActive();
@@ -334,6 +306,7 @@ void LayerWidget::slotMouseButtonClicked(QListWidgetItem * item)
        // only change state / no activation
        RS_Layer * l = lastLayer;
 
+#warning "!!! Bad implementation of lock/freeze functionality !!!"
        if (p.x() < 23)
        {
                actionHandler->slotLayersToggleView();
@@ -346,7 +319,7 @@ void LayerWidget::slotMouseButtonClicked(QListWidgetItem * item)
        }
        else
        {
-               if (item != NULL && layerList != NULL)
+               if (item && layerList)
                        lastLayer = layerList->find(item->text());
        }
 }
@@ -402,4 +375,3 @@ void LayerWidget::keyPressEvent(QKeyEvent * e)
         break;
     }
 }
-