# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2015-11-07 14:59:53 # Node ID 3b42589b1df8c0f669b24ffaf1a80f56b5602b17 # Parent 87f05e438f7f7fbb73a989c611f12895c420a6b9 renamed toolbars diff --git a/mainwindow.cpp b/mainwindow.cpp --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -64,7 +64,7 @@ MainWindow::MainWindow(QWidget *parent) ui->tabWidget->setCurrentIndex(0); addToolBar(portControl.toolBar()); - ui->mainToolBar->addAction(snapshotMan.takeSnapshotAction()); + ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction()); ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu()); setupAboutDialog(); diff --git a/mainwindow.ui b/mainwindow.ui --- a/mainwindow.ui +++ b/mainwindow.ui @@ -258,7 +258,10 @@ - + + + Plot Toolbar + TopToolBarArea diff --git a/portcontrol.cpp b/portcontrol.cpp --- a/portcontrol.cpp +++ b/portcontrol.cpp @@ -31,7 +31,7 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) : QWidget(parent), ui(new Ui::PortControl), - portToolBar("Port"), + portToolBar("Port Toolbar"), openAction("Open", this) { ui->setupUi(this);