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

refs #697, BlackGui settings renamed

Browse Source
This commit is contained in:
Klaus Basan
2016-08-01 15:37:42 +02:00
parent 8013a6ac9c
commit 862a84b661
12 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
#include "blackcore/settings/network.h"
#include "blackcore/data/vatsimsetup.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/settingsgui.h"
#include "blackgui/settings/guisettings.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/server.h"
@@ -166,7 +166,7 @@ namespace BlackGui
const int LogoffIntervalSeconds = 10;
QTimer *m_logoffCountdownTimer { nullptr };
BlackMisc::CSettingReadOnly<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackGui::Settings::OwnAircraftModel> m_currentAircraftModel { this };
BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this };
BlackMisc::CData<BlackCore::Data::VatsimCurrentServer> m_currentVatsimServer { this };
};
} // namespace

4
src/blackgui/components/navigatordialog.cpp
View File

@@ -118,7 +118,7 @@ namespace BlackGui
void CNavigatorDialog::restoreFromSettings()
{
const CSettingsNavigator s = this->m_settings.get();
const CNavigatorSettings s = this->m_settings.get();
this->setContentsMargins(s.getMargins());
if (this->isFrameless() != s.isFramless()) { this->toggleFrameless(); }
this->buildNavigator(s.getColumns());
@@ -128,7 +128,7 @@ namespace BlackGui
void CNavigatorDialog::saveToSettings()
{
CSettingsNavigator s = this->m_settings.get();
CNavigatorSettings s = this->m_settings.get();
s.setFrameless(this->isFrameless());
s.setMargins(this->contentsMargins());
s.setGeometry(this->saveGeometry());

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

@@ -14,7 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/settings/settingsnavigator.h"
#include "blackgui/settings/navigatorsettings.h"
#include <QDialog>
#include <QObject>
@@ -118,7 +118,7 @@ namespace BlackGui
int m_currentColumns = 1;
QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
CMarginsInput *m_input = nullptr; //!< margins widget
BlackMisc::CSetting<BlackGui::Settings::SettingsNavigator> m_settings { this, &CNavigatorDialog::ps_settingsChanged };
BlackMisc::CSetting<BlackGui::Settings::TNavigator> m_settings { this, &CNavigatorDialog::ps_settingsChanged };
};
} // ns
} // ns

26
src/blackgui/dockwidget.cpp
View File

@@ -99,7 +99,7 @@ namespace BlackGui
void CDockWidget::setMarginsWhenFloating(const QMargins &margins)
{
CSettingsDockWidget s = this->getSettings();
CDockWidgetSettings s = this->getSettings();
s.setMarginsWhenFloating(margins);
this->setSettings(s);
}
@@ -116,7 +116,7 @@ namespace BlackGui
void CDockWidget::setMarginsWhenFramelessFloating(const QMargins &margins)
{
CSettingsDockWidget s = this->getSettings();
CDockWidgetSettings s = this->getSettings();
s.setMarginsWhenFramelessFloating(margins);
this->setSettings(s);
}
@@ -133,7 +133,7 @@ namespace BlackGui
void CDockWidget::setMarginsWhenDocked(const QMargins &margins)
{
CSettingsDockWidget s = this->getSettings();
CDockWidgetSettings s = this->getSettings();
s.setMarginsWhenDocked(margins);
this->setSettings(s);
}
@@ -272,7 +272,7 @@ namespace BlackGui
bool CDockWidget::restoreFromSettings()
{
const CSettingsDockWidget s = this->getSettings();
const CDockWidgetSettings s = this->getSettings();
if (s.isFloating() != this->isFloating())
{
this->toggleFloating();
@@ -536,7 +536,7 @@ namespace BlackGui
void CDockWidget::initSettings()
{
const QString name(this->getNameForSettings());
CSettingsDockWidgets all = this->m_settings.get();
CDockWidgetsSettings all = this->m_settings.get();
if (all.contains(name)) { return; }
all.getByNameOrInitToDefault(name);
this->m_settings.setAndSave(all);
@@ -549,19 +549,19 @@ namespace BlackGui
return n;
}
CSettingsDockWidget CDockWidget::getSettings() const
CDockWidgetSettings CDockWidget::getSettings() const
{
const CSettingsDockWidgets all = this->m_settings.get();
const CDockWidgetsSettings all = this->m_settings.get();
const QString name(this->getNameForSettings());
const CSettingsDockWidget s = all.value(name);
const CDockWidgetSettings s = all.value(name);
return s;
}
void CDockWidget::setSettings(const CSettingsDockWidget &settings)
void CDockWidget::setSettings(const CDockWidgetSettings &settings)
{
const CSettingsDockWidget current = getSettings();
const CDockWidgetSettings current = getSettings();
if (current == settings) { return; }
CSettingsDockWidgets all = this->m_settings.get();
CDockWidgetsSettings all = this->m_settings.get();
const QString name(this->getNameForSettings());
all.insert(name, settings);
const CStatusMessage m = this->m_settings.set(all); // saved when shutdown
@@ -573,7 +573,7 @@ namespace BlackGui
void CDockWidget::saveToSettings()
{
CSettingsDockWidget s = this->getSettings();
CDockWidgetSettings s = this->getSettings();
s.setFloating(this->isFloating());
s.setFrameless(this->isFrameless());
s.setGeometry(this->saveGeometry());
@@ -582,7 +582,7 @@ namespace BlackGui
void CDockWidget::resetSettings()
{
CSettingsDockWidget s = this->getSettings();
CDockWidgetSettings s = this->getSettings();
s.reset();
this->setSettings(s);
this->restoreFromSettings();

8
src/blackgui/dockwidget.h
View File

@@ -15,7 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/managedstatusbar.h"
#include "blackgui/settings/settingsdockwidget.h"
#include "blackgui/settings/dockwidgetsettings.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h"
@@ -232,7 +232,7 @@ namespace BlackGui
bool m_selected = false; //!< selected when tabbed
bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible()
bool m_wasFrameless = false; //!< frameless when last floating
BlackMisc::CSetting<BlackGui::Settings::SettingsDockWidgets> m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings
BlackMisc::CSetting<BlackGui::Settings::TDockWidgets> m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings
//! Empty widget with no size
void initTitleBarWidgets();
@@ -250,10 +250,10 @@ namespace BlackGui
QString getNameForSettings() const;
//! This widget`s settings
BlackGui::Settings::CSettingsDockWidget getSettings() const;
BlackGui::Settings::CDockWidgetSettings getSettings() const;
//! Save my updated settings
void setSettings(const BlackGui::Settings::CSettingsDockWidget &settings);
void setSettings(const BlackGui::Settings::CDockWidgetSettings &settings);
};
} // namespace

10
src/blackgui/registermetadata.cpp
View File

@@ -8,17 +8,17 @@
*/
#include "blackgui/registermetadata.h"
#include "blackgui/settings/settingsdockwidget.h"
#include "blackgui/settings/settingsnavigator.h"
#include "blackgui/settings/dockwidgetsettings.h"
#include "blackgui/settings/navigatorsettings.h"
#include "blackgui/components/registermetadatacomponents.h"
namespace BlackGui
{
void registerMetadata()
{
BlackGui::Settings::CSettingsDockWidget::registerMetadata();
BlackGui::Settings::CSettingsDockWidgets::registerMetadata();
BlackGui::Settings::CSettingsNavigator::registerMetadata();
BlackGui::Settings::CDockWidgetSettings::registerMetadata();
BlackGui::Settings::CDockWidgetsSettings::registerMetadata();
BlackGui::Settings::CNavigatorSettings::registerMetadata();
BlackGui::Components::registerMetadata();
}
}

40
src/blackgui/settings/settingsdockwidget.cpp → src/blackgui/settings/dockwidgetsettings.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "settingsdockwidget.h"
#include "dockwidgetsettings.h"
#include "blackgui/guiutility.h"
#include "blackmisc/stringutils.h"
#include <QStringList>
@@ -19,10 +19,10 @@ namespace BlackGui
{
namespace Settings
{
CSettingsDockWidget::CSettingsDockWidget()
CDockWidgetSettings::CDockWidgetSettings()
{ }
void CSettingsDockWidget::resetMarginsToDefault()
void CDockWidgetSettings::resetMarginsToDefault()
{
// this->setMarginsWhenFloating(QMargins(0, 3, 15, 35)); // found by trial and error on windows
this->setMarginsWhenFloating(QMargins(0, 0, 0, 0));
@@ -30,58 +30,58 @@ namespace BlackGui
this->setMarginsWhenDocked(QMargins(0, 0, 0, 0));
}
void CSettingsDockWidget::reset()
void CDockWidgetSettings::reset()
{
this->resetMarginsToDefault();
this->m_geometry = "";
}
void CSettingsDockWidget::setMarginsWhenFramelessFloating(const QMargins &margins)
void CDockWidgetSettings::setMarginsWhenFramelessFloating(const QMargins &margins)
{
this->m_floatingFramelessMargins = CGuiUtility::marginsToString(margins);
}
QMargins CSettingsDockWidget::getMarginsWhenFramelessFloating() const
QMargins CDockWidgetSettings::getMarginsWhenFramelessFloating() const
{
return CGuiUtility::stringToMargins(this->m_floatingFramelessMargins);
}
void CSettingsDockWidget::setMarginsWhenFloating(const QMargins &margins)
void CDockWidgetSettings::setMarginsWhenFloating(const QMargins &margins)
{
this->m_floatingMargins = CGuiUtility::marginsToString(margins);
}
QMargins CSettingsDockWidget::getMarginsWhenFloating() const
QMargins CDockWidgetSettings::getMarginsWhenFloating() const
{
return CGuiUtility::stringToMargins(this->m_floatingMargins);
}
void CSettingsDockWidget::setMarginsWhenDocked(const QMargins &margins)
void CDockWidgetSettings::setMarginsWhenDocked(const QMargins &margins)
{
this->m_dockedMargins = CGuiUtility::marginsToString(margins);
}
QMargins CSettingsDockWidget::getMarginsWhenDocked() const
QMargins CDockWidgetSettings::getMarginsWhenDocked() const
{
return CGuiUtility::stringToMargins(this->m_dockedMargins);
}
QByteArray CSettingsDockWidget::getGeometry() const
QByteArray CDockWidgetSettings::getGeometry() const
{
return byteArrayFromHexString(this->m_geometry);
}
void CSettingsDockWidget::setGeometry(const QByteArray &ba)
void CDockWidgetSettings::setGeometry(const QByteArray &ba)
{
this->m_geometry = bytesToHexString(ba);
}
QString CSettingsDockWidget::convertToQString(bool i18n) const
QString CDockWidgetSettings::convertToQString(bool i18n) const
{
return convertToQString(", ", i18n);
}
QString CSettingsDockWidget::convertToQString(const QString &separator, bool i18n) const
QString CDockWidgetSettings::convertToQString(const QString &separator, bool i18n) const
{
Q_UNUSED(i18n);
QString s("floating: ");
@@ -101,7 +101,7 @@ namespace BlackGui
return s;
}
CVariant CSettingsDockWidget::propertyByIndex(const CPropertyIndex &index) const
CVariant CDockWidgetSettings::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -122,9 +122,9 @@ namespace BlackGui
}
}
void CSettingsDockWidget::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
void CDockWidgetSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CSettingsDockWidget>(); return; }
if (index.isMyself()) { (*this) = variant.to<CDockWidgetSettings>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
@@ -150,10 +150,10 @@ namespace BlackGui
}
}
CSettingsDockWidget CSettingsDockWidgets::getByNameOrInitToDefault(const QString &name)
CDockWidgetSettings CDockWidgetsSettings::getByNameOrInitToDefault(const QString &name)
{
if (this->contains(name)) { return this->value(name); }
CSettingsDockWidget s;
CDockWidgetSettings s;
// default values can be set here, this could be enhanced if needed
// e.g. by platform dependent defaults
@@ -162,7 +162,7 @@ namespace BlackGui
return s;
}
void CSettingsDockWidgets::resetToDefaults(const QString &name)
void CDockWidgetsSettings::resetToDefaults(const QString &name)
{
if (this->contains(name))
{

36
src/blackgui/settings/settingsdockwidget.h → src/blackgui/settings/dockwidgetsettings.h
View File

@@ -27,14 +27,14 @@ namespace BlackGui
namespace Settings
{
//! Settings for dockwidget
class BLACKGUI_EXPORT CSettingsDockWidget :
public BlackMisc::CValueObject<CSettingsDockWidget>
class BLACKGUI_EXPORT CDockWidgetSettings :
public BlackMisc::CValueObject<CDockWidgetSettings>
{
public:
//! Properties by index
enum ColumnIndex
{
IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCSettingsDockWidget,
IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCDockWidgetSettings,
IndexFloatingFramelessMargins,
IndexDockedMargins,
IndexFrameless,
@@ -42,10 +42,10 @@ namespace BlackGui
};
//! Default constructor
CSettingsDockWidget();
CDockWidgetSettings();
//! Destructor.
~CSettingsDockWidget() {}
~CDockWidgetSettings() {}
//! Reset margins to default
void resetMarginsToDefault();
@@ -110,7 +110,7 @@ namespace BlackGui
bool m_frameless = false; //!< frameless
BLACK_METACLASS(
CSettingsDockWidget,
CDockWidgetSettings,
BLACK_METAMEMBER(floatingMargins),
BLACK_METAMEMBER(floatingFramelessMargins),
BLACK_METAMEMBER(dockedMargins),
@@ -121,29 +121,29 @@ namespace BlackGui
};
//! Needed to compile properly with Q_DECLARE_METATYPE
using CDockWidgetSettingsDictionary = BlackMisc::CDictionary<QString, CSettingsDockWidget, QMap>;
using CDockWidgetSettingsDictionary = BlackMisc::CDictionary<QString, CDockWidgetSettings, QMap>;
//! Settings for all dock widgets
class BLACKGUI_EXPORT CSettingsDockWidgets :
class BLACKGUI_EXPORT CDockWidgetsSettings :
public CDockWidgetSettingsDictionary,
public BlackMisc::Mixin::MetaType<CSettingsDockWidgets>,
public BlackMisc::Mixin::JsonOperators<CSettingsDockWidgets>
public BlackMisc::Mixin::MetaType<CDockWidgetsSettings>,
public BlackMisc::Mixin::JsonOperators<CDockWidgetsSettings>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSettingsDockWidgets)
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CDockWidgetsSettings)
//! Default constructor.
CSettingsDockWidgets() {}
CDockWidgetsSettings() {}
//! Get setting or init by estimated default values
CSettingsDockWidget getByNameOrInitToDefault(const QString &name);
CDockWidgetSettings getByNameOrInitToDefault(const QString &name);
//! Reset to defaults
void resetToDefaults(const QString &name);
};
//! Trait for settings for dock widget
struct SettingsDockWidgets : public BlackMisc::CSettingTrait<CSettingsDockWidgets>
struct TDockWidgets : public BlackMisc::CSettingTrait<CDockWidgetsSettings>
{
//! Key in data cache
static const char *key() { return "guidockwidget"; }
@@ -151,10 +151,10 @@ namespace BlackGui
} // ns
} // ns
Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsDockWidget)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CSettingsDockWidget>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CSettingsDockWidget>)
Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CDockWidgetSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CDockWidgetSettings>)
Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettingsDictionary)
Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsDockWidgets)
Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetsSettings)
#endif // guard

2
src/blackgui/settings/settingsgui.h → src/blackgui/settings/guisettings.h
View File

@@ -21,7 +21,7 @@ namespace BlackGui
namespace Settings
{
//! Settings for last manual entries of own aircraft mode
struct OwnAircraftModel : public BlackMisc::CSettingTrait<BlackMisc::Simulation::CAircraftModel>
struct TOwnAircraftModel : public BlackMisc::CSettingTrait<BlackMisc::Simulation::CAircraftModel>
{
//! Key in data cache
static const char *key() { return "guinownaircraftmodel"; }

24
src/blackgui/settings/settingsnavigator.cpp → src/blackgui/settings/navigatorsettings.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "settingsnavigator.h"
#include "navigatorsettings.h"
#include "blackgui/guiutility.h"
#include "blackmisc/stringutils.h"
#include <QStringList>
@@ -19,38 +19,38 @@ namespace BlackGui
{
namespace Settings
{
CSettingsNavigator::CSettingsNavigator()
CNavigatorSettings::CNavigatorSettings()
{ }
void CSettingsNavigator::reset()
void CNavigatorSettings::reset()
{ }
void CSettingsNavigator::setMargins(const QMargins &margins)
void CNavigatorSettings::setMargins(const QMargins &margins)
{
this->m_margins = CGuiUtility::marginsToString(margins);
}
QMargins CSettingsNavigator::getMargins() const
QMargins CNavigatorSettings::getMargins() const
{
return CGuiUtility::stringToMargins(this->m_margins);
}
QByteArray CSettingsNavigator::getGeometry() const
QByteArray CNavigatorSettings::getGeometry() const
{
return byteArrayFromHexString(this->m_geometry);
}
void CSettingsNavigator::setGeometry(const QByteArray &ba)
void CNavigatorSettings::setGeometry(const QByteArray &ba)
{
this->m_geometry = bytesToHexString(ba);
}
QString CSettingsNavigator::convertToQString(bool i18n) const
QString CNavigatorSettings::convertToQString(bool i18n) const
{
return convertToQString(", ", i18n);
}
QString CSettingsNavigator::convertToQString(const QString &separator, bool i18n) const
QString CNavigatorSettings::convertToQString(const QString &separator, bool i18n) const
{
Q_UNUSED(i18n);
QString s("margins: ");
@@ -64,7 +64,7 @@ namespace BlackGui
return s;
}
CVariant CSettingsNavigator::propertyByIndex(const CPropertyIndex &index) const
CVariant CNavigatorSettings::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -81,9 +81,9 @@ namespace BlackGui
}
}
void CSettingsNavigator::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
void CNavigatorSettings::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CSettingsNavigator>(); return; }
if (index.isMyself()) { (*this) = variant.to<CNavigatorSettings>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)

20
src/blackgui/settings/settingsnavigator.h → src/blackgui/settings/navigatorsettings.h
View File

@@ -26,23 +26,23 @@ namespace BlackGui
namespace Settings
{
//! Settings for dockwidget
class BLACKGUI_EXPORT CSettingsNavigator :
public BlackMisc::CValueObject<CSettingsNavigator>
class BLACKGUI_EXPORT CNavigatorSettings :
public BlackMisc::CValueObject<CNavigatorSettings>
{
public:
//! Properties by index
enum ColumnIndex
{
IndexMargins = BlackMisc::CPropertyIndex::GlobalIndexCSettingsNavigator,
IndexMargins = BlackMisc::CPropertyIndex::GlobalIndexCNavigatorSettings,
IndexFrameless,
IndexColumns
};
//! Default constructor
CSettingsNavigator();
CNavigatorSettings();
//! Destructor.
~CSettingsNavigator() {}
~CNavigatorSettings() {}
//! Reset to defaults
void reset();
@@ -90,7 +90,7 @@ namespace BlackGui
int m_columns = 1; //!< number of columns
BLACK_METACLASS(
CSettingsNavigator,
CNavigatorSettings,
BLACK_METAMEMBER(margins),
BLACK_METAMEMBER(frameless),
BLACK_METAMEMBER(columns),
@@ -99,7 +99,7 @@ namespace BlackGui
};
//! Trait for settings for navigator
struct SettingsNavigator : public BlackMisc::CSettingTrait<CSettingsNavigator>
struct TNavigator : public BlackMisc::CSettingTrait<CNavigatorSettings>
{
//! Key in data cache
static const char *key() { return "guinavigator"; }
@@ -107,8 +107,8 @@ namespace BlackGui
} // ns
} // ns
Q_DECLARE_METATYPE(BlackGui::Settings::CSettingsNavigator)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CSettingsNavigator>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CSettingsNavigator>)
Q_DECLARE_METATYPE(BlackGui::Settings::CNavigatorSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CNavigatorSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CNavigatorSettings>)
#endif // guard