Fix: ControlWidget placement (#690)

[proxmark3-svn] / client / proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index ab0976cceb4442e3b157bbc1403ff1b18721329a..8fc1f990291a595dada84a688eebb25b526403a2 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -181,8 +181,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
        this->master = master;
        resize(800,500);
 
        this->master = master;
        resize(800,500);
 

-       /** Setup the controller widget **/
-
+       // Setup the controller widget

        controlWidget = new QWidget();
        opsController = new Ui::Form();
        opsController->setupUi(controlWidget);
        controlWidget = new QWidget();
        opsController = new Ui::Form();
        opsController->setupUi(controlWidget);


@@ -204,23 +203,17 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
        QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
        QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
 
        QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
        QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
 

-       controlWidget->show();
-

        // Set up the plot widget, which does the actual plotting
        // Set up the plot widget, which does the actual plotting

-

        plot = new Plot(this);
        plot = new Plot(this);

-       /*
-       QSlider* slider = new QSlider(Qt::Horizontal);
-       slider->setFocusPolicy(Qt::StrongFocus);
-       slider->setTickPosition(QSlider::TicksBothSides);
-       slider->setTickInterval(10);
-       slider->setSingleStep(1);
-       */

        QVBoxLayout *layout = new QVBoxLayout;
        QVBoxLayout *layout = new QVBoxLayout;

-       //layout->addWidget(slider);

        layout->addWidget(plot);
        setLayout(layout);
        layout->addWidget(plot);
        setLayout(layout);

-       //printf("Proxwidget Constructor just set layout\r\n");
+       show(); // places the window on the screen.
+
+       // Move controller widget below plot
+       controlWidget->move(x(),y()+frameSize().height());
+       controlWidget->resize(size().width(), controlWidget->size().height());
+       controlWidget->show();

 }
 
 // not 100% sure what i need in this block
 }
 
 // not 100% sure what i need in this block