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

Ref T286, copy settings/cache improvements

Browse Source 
* removed old copy component from wizard and setup component
* using new copy component
* reloading in hotkey component
This commit is contained in:
Klaus Basan
2018-07-13 02:22:57 +02:00
parent 64d153b10b
commit e90eb06f44
7 changed files with 45 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/settingshotkeycomponent.h
View File

@@ -25,16 +25,13 @@
#include <QWizardPage>
#include <QScopedPointer>
class QWidget;
namespace Ui { class CSettingsHotkeyComponent; }
namespace BlackGui
{
namespace Components
{
//! Configure hotkeys
class BLACKGUI_EXPORT CSettingsHotkeyComponent :
public QFrame
class BLACKGUI_EXPORT CSettingsHotkeyComponent : public QFrame
{
Q_OBJECT
@@ -51,6 +48,9 @@ namespace BlackGui
//! Create dummy/emtpy Ptt entry for wizard
void registerDummyPttEntry();
//! Reload keys from settings
void reloadHotkeysFromSettings();
private:
void addEntry();
void editEntry();
@@ -60,12 +60,11 @@ namespace BlackGui
void updateHotkeyInSettings(const BlackMisc::Input::CActionHotkey &oldValue, const BlackMisc::Input::CActionHotkey &newValue);
void removeHotkeyFromSettings(const BlackMisc::Input::CActionHotkey &actionHotkey);
bool checkAndConfirmConflicts(const BlackMisc::Input::CActionHotkey &actionHotkey, const BlackMisc::Input::CActionHotkeyList &ignore = {});
void reloadHotkeysFromSettings();
BlackMisc::CIdentifierList getAllIdentifiers() const;
QScopedPointer<Ui::CSettingsHotkeyComponent> ui;
BlackGui::Models::CActionHotkeyListModel m_model;
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_actionHotkeys { this };
Models::CActionHotkeyListModel m_model; //!< hotkeys model
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_actionHotkeys { this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings };
BlackCore::CActionBind m_action { "/Test/Message", BlackMisc::CIcons::wrench16(), this, &CSettingsHotkeyComponent::hotkeySlot };
};
@@ -84,6 +83,9 @@ namespace BlackGui
//! \copydoc QWizardPage::validatePage
virtual bool validatePage() override;
//! \copydoc QWizardPage::initializePage
virtual void initializePage() override;
private:
CSettingsHotkeyComponent *m_config = nullptr;
};