X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=0ca1359138d89317f4c630f6cda71d242c50bc34;hb=1887da2169397774c9563e9bf44c51ed7efc3646;hp=3bdf725df4f4bc52fb739586da259191c5b386e0;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 3bdf725d..0ca13591 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -14,13 +14,12 @@ * 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 . */ #include -#include +#include #include #include @@ -32,8 +31,9 @@ #include "tracepalette.hpp" #include "view.hpp" -#include -#include +#include "pv/globalsettings.hpp" +#include "pv/widgets/colourbutton.hpp" +#include "pv/widgets/popup.hpp" namespace pv { namespace views { @@ -47,10 +47,12 @@ const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100); Trace::Trace(std::shared_ptr 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&)),