From 831a7b0b6fbbf16524f26617aee2a347f740cd70 Mon Sep 17 00:00:00 2001
From: Clement Skau <cskau+github@gmail.com>
Date: Tue, 8 Dec 2015 18:47:12 +0900
Subject: [PATCH] Removes floating doubles of widgets and panels.

---
 openhantek/src/openhantek.cpp | 4 ++--
 openhantek/src/settings.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openhantek/src/openhantek.cpp b/openhantek/src/openhantek.cpp
index 219a805..b053d3d 100644
--- a/openhantek/src/openhantek.cpp
+++ b/openhantek/src/openhantek.cpp
@@ -498,10 +498,10 @@ void OpenHantekMainWindow::applySettings() {
 	
 	for(int dockId = 0; dockId < docks.size(); ++dockId) {
 		docks[dockId]->setVisible(dockSettings[dockId]->visible);
+		docks[dockId]->setFloating(dockSettings[dockId]->floating);
 		if(!dockSettings[dockId]->position.isNull()) {
 			if(dockSettings[dockId]->floating) {
 				this->addDockWidget(Qt::RightDockWidgetArea, docks[dockId]);
-				docks[dockId]->setFloating(dockSettings[dockId]->floating);
 				docks[dockId]->move(dockSettings[dockId]->position);
 			}
 			else {
@@ -539,7 +539,7 @@ void OpenHantekMainWindow::applySettings() {
 	
 	for(int toolbarId = 0; toolbarId < toolbars.size(); ++toolbarId) {
 		toolbars[toolbarId]->setVisible(toolbarSettings[toolbarId]->visible);
-		//toolbars[toolbarId]->setFloating(toolbarSettings[toolbarId]->floating); // setFloating missing, a bug in Qt?
+		toolbars[toolbarId]->setWindowFlags(Qt::Tool);
 		if(!toolbarSettings[toolbarId]->position.isNull() && !toolbarSettings[toolbarId]->floating) {
 			/*if(toolbarSettings[toolbarId]->floating) {
 				toolbars[toolbarId]->move(toolbarSettings[toolbarId]->position);
diff --git a/openhantek/src/settings.cpp b/openhantek/src/settings.cpp
index 60d4c64..23dc206 100644
--- a/openhantek/src/settings.cpp
+++ b/openhantek/src/settings.cpp
@@ -146,7 +146,7 @@ void DsoSettings::setChannelCount(unsigned int channels) {
 			newVoltage.name = QApplication::tr("CH%1").arg(channel + 1);
 			newVoltage.offset = 0.0;
 			newVoltage.trigger = 0.0;
-			newVoltage.used = (channel == 0);
+			newVoltage.used = false;
 			this->scope.voltage.insert(channel, newVoltage);
 		}
 		
--
libgit2 0.21.4