LayerWidget closer to being functional. :-)

diff --git a/src/layeritemwidget.cpp b/src/layeritemwidget.cpp
index 273ebf1e4aa57d43b673072b953828bf52f2bdc0..57631388737686cf08085b5a9e18b8a6869009e7 100644 (file)
--- a/src/layeritemwidget.cpp
+++ b/src/layeritemwidget.cpp
@@ -45,6 +45,7 @@ LayerItemWidget::LayerItemWidget(QString s, bool invisible/*=false*/, bool locke
        mainLayout->addWidget(editibility);
        mainLayout->addWidget(name);
        setLayout(mainLayout);
+
 }
 
 

diff --git a/src/layerwidget.cpp b/src/layerwidget.cpp
index b45eed6a6da6a2f167ed0d2f3f7914331e4b3e3f..4a98037685c786312576396dc1a0cf4e34026308 100644 (file)
--- a/src/layerwidget.cpp
+++ b/src/layerwidget.cpp
@@ -15,74 +15,37 @@
 #include "layeritemwidget.h"
 
 
-#if 0
-OK, what it seems like we should do here, is instead of deriving from QDockWidget,
-we should derive from QWidget (or QScrollArea or somesuch). Then, when creating
-the dockwidget in the main window, we add the LayerWidget as the QDockWidget's
-main widget.
-#endif
-
 LayerWidget::LayerWidget(void): QWidget()
 {
-
-       // Make a QScrollArea, put in a QVBoxLayout.
-       // Use line widget (two checkboxes, one label), use setIcon() on the
-       // checkboxes to change their look (eye open/closed for visibility,
-       // lock open/closed for layer lock).
-
-       QIcon visible(":/res/eye-open.png");
-       visible.addFile(":/res/eye-closed.png", QSize(16, 16), QIcon::Normal, QIcon::On);
-       QIcon locked(":/res/lock-open.png");
-       locked.addFile(":/res/lock-closed.png", QSize(16, 16), QIcon::Normal, QIcon::On);
+       LayerItemWidget * liw1 = new LayerItemWidget("Background");
+       LayerItemWidget * liw2 = new LayerItemWidget("Guidelines");
+       LayerItemWidget * liw3 = new LayerItemWidget("Floor #1");
+       LayerItemWidget * liw4 = new LayerItemWidget("Mechanical");
+       LayerItemWidget * liw5 = new LayerItemWidget("List Widget");
+
+       QListWidget * qlw = new QListWidget;
+       QListWidgetItem * qli1 = new QListWidgetItem(qlw);
+       QListWidgetItem * qli2 = new QListWidgetItem(qlw);
+       QListWidgetItem * qli3 = new QListWidgetItem(qlw);
+       QListWidgetItem * qli4 = new QListWidgetItem(qlw);
+       QListWidgetItem * qli5 = new QListWidgetItem(qlw);
+       qlw->setItemWidget(qli1, liw1);
+       qlw->setItemWidget(qli2, liw2);
+       qlw->setItemWidget(qli3, liw3);
+       qlw->setItemWidget(qli4, liw4);
+       qlw->setItemWidget(qli5, liw5);
+
+       QPushButton * pb1 = new QPushButton("+");
+       QPushButton * pb2 = new QPushButton("-");
+
+       QHBoxLayout * hbox1 = new QHBoxLayout;
+       hbox1->addWidget(pb1);
+       hbox1->addWidget(pb2);
 
        QVBoxLayout * mainLayout = new QVBoxLayout;
-       QHBoxLayout * line1 = new QHBoxLayout;
-       QHBoxLayout * line2 = new QHBoxLayout;
-
-//     QCheckBox * box1 = new QCheckBox("bleah");
-//     box1->setIcon(visible);
-//     mainLayout->addWidget(box1);
-
-       QPushButton * button1 = new QPushButton;
-       button1->setFlat(true);
-       button1->setIcon(visible);
-       button1->setCheckable(true);
-       button1->setMaximumSize(QSize(20, 20));
-       QPushButton * button2 = new QPushButton;
-       button2->setFlat(true);
-       button2->setIcon(locked);
-       button2->setCheckable(true);
-       button2->setMaximumSize(QSize(20, 20));
-       QLabel * label1 = new QLabel("Background");
-
-       QPushButton * button3 = new QPushButton;
-       button3->setFlat(true);
-       button3->setIcon(visible);
-       button3->setCheckable(true);
-       button3->setMaximumSize(QSize(20, 20));
-       QPushButton * button4 = new QPushButton;
-       button4->setFlat(true);
-       button4->setIcon(locked);
-       button4->setCheckable(true);
-       button4->setMaximumSize(QSize(20, 20));
-       QLabel * label2 = new QLabel("Guides");
-
-       line1->addWidget(button1);
-       line1->addWidget(button2);
-       line1->addWidget(label1);
-
-       line2->addWidget(button3);
-       line2->addWidget(button4);
-       line2->addWidget(label2);
+       mainLayout->addWidget(qlw);
+       mainLayout->addLayout(hbox1);
 
-       LayerItemWidget * liw1 = new LayerItemWidget("Floor #1");
-       LayerItemWidget * liw2 = new LayerItemWidget("Mechanical");
-       
-       mainLayout->addLayout(line1);
-       mainLayout->addLayout(line2);
-       mainLayout->addWidget(liw1);
-       mainLayout->addWidget(liw2);
-       mainLayout->addStretch();
        setLayout(mainLayout);
 }