Swiftdiff options
Diffstat (limited to 'Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp')
| -rw-r--r-- | Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp index 74c5a5f..82744f8 100644 --- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp +++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp @@ -21,6 +21,7 @@ #include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h> #include <QMessageBox> +#include <QLabel> namespace Swift { QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession) : QWidget() { @@ -51,11 +52,19 @@ namespace Swift { moveDownButton = new QPushButton("Move Down", this); connect(moveDownButton, SIGNAL(clicked()), graphicsView, SLOT(moveDownSelectedItem())); - colorDialogButton = new QPushButton("Color", this); - connect(colorDialogButton, SIGNAL(clicked()), this, SLOT(showColorDialog())); + strokeLayout = new QHBoxLayout; + strokeColor = new ColorWidget; + strokeLayout->addWidget(new QLabel("Stroke:")); + strokeLayout->addWidget(strokeColor); + connect(strokeColor, SIGNAL(clicked()), this, SLOT(showColorDialog())); + connect(graphicsView, SIGNAL(lineColorChanged(QColor)), strokeColor, SLOT(setColor(QColor))); - brushColorDialogButton = new QPushButton("Brush", this); - connect(brushColorDialogButton, SIGNAL(clicked()), this, SLOT(showBrushColorDialog())); + fillLayout = new QHBoxLayout; + fillColor = new ColorWidget; + fillLayout->addWidget(new QLabel("Fill:")); + fillLayout->addWidget(fillColor); + connect(fillColor, SIGNAL(clicked()), this, SLOT(showBrushColorDialog())); + connect(graphicsView, SIGNAL(brushColorChanged(QColor)), fillColor, SLOT(setColor(QColor))); rubberButton = new QToolButton(this); rubberButton->setIcon(QIcon(":/icons/eraser.png")); @@ -115,13 +124,15 @@ namespace Swift { toolboxLayout->addWidget(textButton, 2, 0); toolboxLayout->addWidget(polygonButton, 2, 1); - sidebarLayout->addLayout(toolboxLayout); + sidebarLayout->addSpacing(30); sidebarLayout->addWidget(moveUpButton); sidebarLayout->addWidget(moveDownButton); + sidebarLayout->addSpacing(40); sidebarLayout->addWidget(widthBox); - sidebarLayout->addWidget(colorDialogButton); - sidebarLayout->addWidget(brushColorDialogButton); + sidebarLayout->addLayout(strokeLayout); + sidebarLayout->addLayout(fillLayout); + sidebarLayout->addStretch(); hLayout->addWidget(graphicsView); hLayout->addLayout(sidebarLayout); layout->addLayout(hLayout); |