X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=978f3dc84137d467fcc0d0dee4288710fb280838;hp=d9cccdb649e94a0669be4d30084323341cc5077d;hb=24c29d4f917ffac5a280d572cc04d1edb66a81b9;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d9cccdb6..978f3dc8 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
@@ -32,11 +31,13 @@
 #include "tracepalette.hpp"
 #include "view.hpp"
 
-#include <pv/widgets/colourbutton.hpp>
-#include <pv/widgets/popup.hpp>
+#include "pv/globalsettings.hpp"
+#include "pv/widgets/colourbutton.hpp"
+#include "pv/widgets/popup.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
@@ -46,10 +47,12 @@ const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
 
 Trace::Trace(std::shared_ptr<data::SignalBase> channel) :
 	base_(channel),
-	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
 	popup_(nullptr),
 	popup_form_(nullptr)
 {
+	GlobalSettings settings;
+	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
 	connect(channel.get(), SIGNAL(name_changed(const QString&)),
 		this, SLOT(on_name_changed(const QString&)));
 	connect(channel.get(), SIGNAL(colour_changed(const QColor&)),
@@ -140,8 +143,6 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
 QRectF Trace::label_rect(const QRectF &rect) const
 {
-	using pv::view::View;
-
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
 		m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
@@ -278,5 +279,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
 	set_colour(colour);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv