more button to show/hide more form

tstaerk · Sep 2, 2011 · c8bd236 · c8bd236
1 parent d786771
commit c8bd236
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -15,6 +15,7 @@ MainWindow::MainWindow(QWidget *parent) :
     drawscene* ds=new drawscene();
     ui->graphicsView->setScene(ds);
     page=1;
+    mf=0;
 }
 
 MainWindow::~MainWindow()
@@ -39,14 +40,19 @@ void MainWindow::setpencolor(QColor color)
     ((drawscene*)ui->graphicsView->scene())->setpencolor(color);
 }
 
+void MainWindow::deletemoreform()
+{
+    mf->deleteLater();
+    mf=0;
+}
+
 void MainWindow::on_actionSave_triggered()
 {
     QImage* image=new QImage(QSize((int)ui->graphicsView->scene()->width(),(int)ui->graphicsView->scene()->height()),QImage::Format_RGB32);
     image->fill(1);
     QPainter* painter=new QPainter(image);
     ui->graphicsView->scene()->render(painter);
 
-
     QByteArray ba;
     QBuffer buffer(&ba);
     buffer.open(QIODevice::WriteOnly);
@@ -86,10 +92,14 @@ void MainWindow::on_prevbutton_clicked()
 
 void MainWindow::on_morebutton_clicked()
 {
-    static bool moreformshown=false;
-    if (moreformshown)
+    if (mf)
+    {
+        mf->deleteLater();
+        mf=0;
+    }
+    else
     {
+        mf=new MoreForm(this);
+        ui->gridLayout->addWidget(mf,3,1);
     }
-    mf=new MoreForm(this);
-    ui->gridLayout->addWidget(mf,3,1);
 }
diff --git a/mainwindow.h b/mainwindow.h
@@ -16,6 +16,7 @@ class MainWindow : public QMainWindow {
     ~MainWindow();
     int page;
     void setpencolor(QColor color);
+    void deletemoreform();
 
 protected:
     void changeEvent(QEvent *e);

diff --git a/moreform.cpp b/moreform.cpp
@@ -18,53 +18,53 @@ MoreForm::~MoreForm()
 void MoreForm::on_red_clicked()
 {
     parent->setpencolor(QColor("red"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_black_clicked()
 {
     parent->setpencolor(QColor("black"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_yellow_clicked()
 {
     parent->setpencolor(QColor("yellow"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_gray_clicked()
 {
     parent->setpencolor(QColor("gray"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_green_clicked()
 {
     parent->setpencolor(QColor("green"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_blue_clicked()
 {
     parent->setpencolor(QColor("blue"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_white_clicked()
 {
     parent->setpencolor(QColor("white"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_purple_clicked()
 {
     parent->setpencolor(QColor("purple"));
-    this->deleteLater();
+    parent->deletemoreform();
 }
 
 void MoreForm::on_turquoise_clicked()
 {
     parent->setpencolor(QColor("turquoise"));
-    this->deleteLater();
+    parent->deletemoreform();
 }