flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +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

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