From 52e733d31d3bb53ad77678bdcb456d5f9bd4d8cc Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Sat, 25 Aug 2018 11:52:41 -0400
Subject: [PATCH] More work on a color-highlighting window.
---
colorhighlighting.cpp | 8 ++++++--
colorhighlighting.h | 1 +
mainwindow.cpp | 3 +--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/colorhighlighting.cpp b/colorhighlighting.cpp
index 47865da09..1f217c31d 100644
--- a/colorhighlighting.cpp
+++ b/colorhighlighting.cpp
@@ -1,18 +1,22 @@
#include "colorhighlighting.h"
#include "ui_colorhighlighting.h"
+#include <QApplication>
#include <QDebug>
ColorHighlighting::ColorHighlighting(QWidget *parent) :
QDialog(parent),
ui(new Ui::ColorHighlighting)
{
- qDebug() << "AA";
ui->setupUi(this);
- qDebug() << "BB";
}
ColorHighlighting::~ColorHighlighting()
{
delete ui;
}
+
+void ColorHighlighting::colorHighlightlingSetup()
+{
+ setWindowTitle(QApplication::applicationName() + " - Colors");
+}
diff --git a/colorhighlighting.h b/colorhighlighting.h
index 7a51b8b97..a7e1c4ba4 100644
--- a/colorhighlighting.h
+++ b/colorhighlighting.h
@@ -14,6 +14,7 @@ class ColorHighlighting : public QDialog
public:
explicit ColorHighlighting(QWidget *parent = 0);
~ColorHighlighting();
+ void colorHighlightlingSetup();
private:
Ui::ColorHighlighting *ui;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6feba786d..c07823f64 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2375,14 +2375,13 @@ void MainWindow::on_actionFox_Log_triggered()
void MainWindow::on_actionColors_triggered()
{
- qDebug() << "aa";
if (!m_colorHighlighting) {
m_colorHighlighting.reset (new ColorHighlighting);
}
m_colorHighlighting->showNormal();
m_colorHighlighting->raise ();
m_colorHighlighting->activateWindow ();
- qDebug() << "bb";
+ m_colorHighlighting->colorHighlightlingSetup();
}
void MainWindow::on_actionMessage_averaging_triggered()