kopia lustrzana https://gitlab.com/eliggett/wfview
Add Pop-Out button for cluster screen
rodzic
22abc65849
commit
b7bcd58578
34
wfmain.cpp
34
wfmain.cpp
|
@ -6939,16 +6939,18 @@ void wfmain::setColorLineEditOperations(QColor *colorStore,
|
|||
void wfmain::on_colorPopOutBtn_clicked()
|
||||
{
|
||||
|
||||
if(settingsTabisAttached)
|
||||
if (settingsTabisAttached)
|
||||
{
|
||||
settingsTab = ui->tabWidget->currentWidget();
|
||||
ui->tabWidget->removeTab(ui->tabWidget->indexOf(settingsTab));
|
||||
settingsWidgetTab->addTab(settingsTab, "Settings");
|
||||
settingsWidgetWindow->show();
|
||||
ui->colorPopOutBtn->setText("Re-attach");
|
||||
ui->clusterPopOutBtn->setText("Re-attach");
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
settingsTabisAttached = false;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
settingsTab = settingsWidgetTab->currentWidget();
|
||||
|
||||
settingsWidgetTab->removeTab(settingsWidgetTab->indexOf(settingsTab));
|
||||
|
@ -6956,6 +6958,7 @@ void wfmain::on_colorPopOutBtn_clicked()
|
|||
settingsWidgetWindow->close();
|
||||
|
||||
ui->colorPopOutBtn->setText("Pop-Out");
|
||||
ui->clusterPopOutBtn->setText("Pop-Out");
|
||||
ui->tabWidget->setCurrentIndex(3);
|
||||
settingsTabisAttached = true;
|
||||
}
|
||||
|
@ -7777,3 +7780,30 @@ void wfmain::receiveSpots(QList<spotData> spots)
|
|||
qDebug(logCluster()) << "Processing took" << timer.nsecsElapsed() / 1000 << "us";
|
||||
}
|
||||
|
||||
void wfmain::on_clusterPopOutBtn_clicked()
|
||||
{
|
||||
|
||||
if (settingsTabisAttached)
|
||||
{
|
||||
settingsTab = ui->tabWidget->currentWidget();
|
||||
ui->tabWidget->removeTab(ui->tabWidget->indexOf(settingsTab));
|
||||
settingsWidgetTab->addTab(settingsTab, "Settings");
|
||||
settingsWidgetWindow->show();
|
||||
ui->clusterPopOutBtn->setText("Re-attach");
|
||||
ui->colorPopOutBtn->setText("Re-attach");
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
settingsTabisAttached = false;
|
||||
}
|
||||
else {
|
||||
settingsTab = settingsWidgetTab->currentWidget();
|
||||
|
||||
settingsWidgetTab->removeTab(settingsWidgetTab->indexOf(settingsTab));
|
||||
ui->tabWidget->addTab(settingsTab, "Settings");
|
||||
settingsWidgetWindow->close();
|
||||
|
||||
ui->clusterPopOutBtn->setText("Pop-Out");
|
||||
ui->colorPopOutBtn->setText("Pop-Out");
|
||||
ui->tabWidget->setCurrentIndex(3);
|
||||
settingsTabisAttached = true;
|
||||
}
|
||||
}
|
||||
|
|
2
wfmain.h
2
wfmain.h
|
@ -675,6 +675,8 @@ private slots:
|
|||
void on_clusterUsernameLineEdit_editingFinished();
|
||||
void on_clusterPasswordLineEdit_editingFinished();
|
||||
void on_clusterTimeoutLineEdit_editingFinished();
|
||||
void on_clusterPopOutBtn_clicked();
|
||||
|
||||
|
||||
void receiveClusterOutput(QString text);
|
||||
void receiveSpots(QList<spotData> spots);
|
||||
|
|
19
wfmain.ui
19
wfmain.ui
|
@ -2223,7 +2223,7 @@
|
|||
<item>
|
||||
<widget class="QStackedWidget" name="settingsStack">
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>5</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="radioAccess">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_21">
|
||||
|
@ -5067,10 +5067,27 @@
|
|||
<enum>QAbstractScrollArea::AdjustIgnored</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="clusterPopOutBtn">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>280</y>
|
||||
<width>75</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Pop out (or pop back in) the entire Settings tab. </p><p>NOTE: Press this button again to re-insert the tab when finished. </p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Pop-Out</string>
|
||||
</property>
|
||||
</widget>
|
||||
<zorder>groupBox_9</zorder>
|
||||
<zorder>horizontalLayoutWidget</zorder>
|
||||
<zorder>groupBox_10</zorder>
|
||||
<zorder>clusterOutputTextEdit</zorder>
|
||||
<zorder>clusterPopOutBtn</zorder>
|
||||
</widget>
|
||||
<widget class="QWidget" name="experimental">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_28">
|
||||
|
|
Ładowanie…
Reference in New Issue