flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 07:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc: removed redundant default value (settings), formatting, hide kill button

Browse Source
This commit is contained in:
Klaus Basan
2017-04-10 16:35:03 +02:00
committed by Mathew Sutcliffe
parent 78c618e589
commit 2d56167e65
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/audiosetupcomponent.h
View File

@@ -29,8 +29,7 @@ namespace BlackGui
namespace Components
{
//! Audio setup such as input / output devices
class BLACKGUI_EXPORT CAudioSetupComponent :
public QFrame
class BLACKGUI_EXPORT CAudioSetupComponent : public QFrame
{
Q_OBJECT
@@ -73,7 +72,6 @@ namespace BlackGui
QScopedPointer<Ui::CAudioSetupComponent> ui;
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
};
} // namespace
} // namespace

5
src/blackgui/components/flightplancomponent.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKGUI_FLIGHTPLANCOMPONENT_H
#define BLACKGUI_FLIGHTPLANCOMPONENT_H
#ifndef BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
#define BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
#include "blackgui/blackguiexport.h"
#include "blackmisc/aviation/flightplan.h"
@@ -29,7 +29,6 @@ class QWidget;
namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } }
namespace Ui { class CFlightPlanComponent; }
namespace BlackGui
{
namespace Components

6
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -108,8 +108,8 @@ namespace BlackGui
if (!model.hasFileName()) { return; }
if (QFile::exists(model.getFileName()))
{
const QString url("file:///" + model.getFileName());
QDesktopServices::openUrl(QUrl(url));
const QUrl url = QUrl::fromLocalFile(model.getFileName());
QDesktopServices::openUrl(url);
}
}
@@ -119,7 +119,7 @@ namespace BlackGui
if (!mv->hasSingleSelectedRow()) { return; }
const CAircraftModel model(mv->selectedObject());
if (model.getIconPath().isEmpty()) { return; }
CStatusMessage msg;
CStatusMessage msg(this);
const CPixmap pm(model.loadIcon(msg));
if (msg.isSuccess())
{

2
src/blackgui/overlaymessages.cpp
View File

@@ -52,6 +52,7 @@ namespace BlackGui
ui(new Ui::COverlayMessages)
{
this->init(w, h);
this->showKillButton(false);
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &COverlayMessages::ps_onStyleSheetsChanged);
connect(ui->pb_Ok, &QPushButton::clicked, this, &COverlayMessages::ps_okClicked);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &COverlayMessages::ps_cancelClicked);
@@ -325,6 +326,7 @@ namespace BlackGui
{
ui->sw_StatusMessagesComponent->setCurrentWidget(ui->pg_Image);
this->setHeader("Image");
this->showKillButton(false);
}
void COverlayMessages::setConfirmationMessage(const QString &message)