From f870fb3cf967dce7ea063151a9190ff76d971bbb Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 18 Apr 2015 15:24:35 +0200 Subject: [PATCH] refs #312, some minor adjustments: * cpp check (Jenkins) * init style sheet in navigator * shorter names in JSON plugin names --- src/blackgui/components/navigatordockwidget.cpp | 1 + src/blackgui/guiutility.cpp | 4 ++-- src/plugins/simulator/fs9/simulator_fs9.json | 4 ++-- src/plugins/simulator/fsx/simulator_fsx.json | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/blackgui/components/navigatordockwidget.cpp b/src/blackgui/components/navigatordockwidget.cpp index bcae84234..ac70241cb 100644 --- a/src/blackgui/components/navigatordockwidget.cpp +++ b/src/blackgui/components/navigatordockwidget.cpp @@ -30,6 +30,7 @@ namespace BlackGui { this->allowStatusBar(false); ui->setupUi(this); + this->ps_onStyleSheetsChanged(); } CNavigatorDockWidget::~CNavigatorDockWidget() diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index bdb82b193..cb42663bd 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -89,10 +89,10 @@ namespace BlackGui // http://stackoverflow.com/a/7569928/356726 if (!layout) { return; } QLayoutItem *item {nullptr}; - QLayout *sublayout {nullptr}; - QWidget *widget {nullptr}; while ((item = layout->takeAt(0))) { + QLayout *sublayout {nullptr}; + QWidget *widget {nullptr}; if ((sublayout = item->layout())) { deleteLayout(sublayout, deleteWidgets); diff --git a/src/plugins/simulator/fs9/simulator_fs9.json b/src/plugins/simulator/fs9/simulator_fs9.json index dc9c6b58a..54fdf363c 100644 --- a/src/plugins/simulator/fs9/simulator_fs9.json +++ b/src/plugins/simulator/fs9/simulator_fs9.json @@ -1,6 +1,6 @@ { "identifier" : "org.swift-project.plugins.simulator.fs9", - "name" : "Microsoft Flight Simulator 2004", + "name" : "Flight Simulator 2004", "simulator" : "fs9", "description" : "Microsoft Flight Simulator 2004" -} \ No newline at end of file +} diff --git a/src/plugins/simulator/fsx/simulator_fsx.json b/src/plugins/simulator/fsx/simulator_fsx.json index 93bd04a47..e089531b9 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.json +++ b/src/plugins/simulator/fsx/simulator_fsx.json @@ -1,6 +1,6 @@ { "identifier" : "org.swift-project.plugins.simulator.fsx", - "name" : "Microsoft Flight Simulator X", + "name" : "Flight Simulator X", "simulator" : "fsx", "description" : "Microsoft Flight Simulator X (2006)" -} \ No newline at end of file +}