Peter M. Groen / openhantek

Commit 831a7b0b6fbbf16524f26617aee2a347f740cd70

Authored by Clement Skau
1 parent 1c1c21fd

Removes floating doubles of widgets and panels.

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
openhantek/src/openhantek.cpp
  View file @831a7b0
... ... @@ -498,10 +498,10 @@ void OpenHantekMainWindow::applySettings() {
498 498  
499 499 for(int dockId = 0; dockId < docks.size(); ++dockId) {
500 500 docks[dockId]->setVisible(dockSettings[dockId]->visible);
  501 + docks[dockId]->setFloating(dockSettings[dockId]->floating);
501 502 if(!dockSettings[dockId]->position.isNull()) {
502 503 if(dockSettings[dockId]->floating) {
503 504 this->addDockWidget(Qt::RightDockWidgetArea, docks[dockId]);
504   - docks[dockId]->setFloating(dockSettings[dockId]->floating);
505 505 docks[dockId]->move(dockSettings[dockId]->position);
506 506 }
507 507 else {
... ... @@ -539,7 +539,7 @@ void OpenHantekMainWindow::applySettings() {
539 539  
540 540 for(int toolbarId = 0; toolbarId < toolbars.size(); ++toolbarId) {
541 541 toolbars[toolbarId]->setVisible(toolbarSettings[toolbarId]->visible);
542   - //toolbars[toolbarId]->setFloating(toolbarSettings[toolbarId]->floating); // setFloating missing, a bug in Qt?
  542 + toolbars[toolbarId]->setWindowFlags(Qt::Tool);
543 543 if(!toolbarSettings[toolbarId]->position.isNull() && !toolbarSettings[toolbarId]->floating) {
544 544 /*if(toolbarSettings[toolbarId]->floating) {
545 545 toolbars[toolbarId]->move(toolbarSettings[toolbarId]->position);
... ...
openhantek/src/settings.cpp
  View file @831a7b0
... ... @@ -146,7 +146,7 @@ void DsoSettings::setChannelCount(unsigned int channels) {
146 146 newVoltage.name = QApplication::tr("CH%1").arg(channel + 1);
147 147 newVoltage.offset = 0.0;
148 148 newVoltage.trigger = 0.0;
149   - newVoltage.used = (channel == 0);
  149 + newVoltage.used = false;
150 150 this->scope.voltage.insert(channel, newVoltage);
151 151 }
152 152  
... ...