refs #313 Change GUI classes to use new hotkey settings wrapper classes

This commit is contained in:
Roland Winklmeier
2014-08-19 14:38:24 +02:00
parent 4d60ca3a87
commit f76e0bc957
11 changed files with 50 additions and 48 deletions

View File

@@ -11,6 +11,7 @@
#define BLACKGUI_KEYBOARDKEYLISTMODEL_H
#include "blackmisc/hwkeyboardkeylist.h"
#include "blackmisc/setkeyboardhotkeylist.h"
#include "blackgui/models/listmodelbase.h"
#include <QAbstractItemModel>
#include <QDBusConnection>
@@ -24,7 +25,7 @@ namespace BlackGui
/*!
* Keyboard key list model
*/
class CKeyboardKeyListModel : public CListModelBase<BlackMisc::Hardware::CKeyboardKey, BlackMisc::Hardware::CKeyboardKeyList>
class CKeyboardKeyListModel : public CListModelBase<BlackMisc::Settings::CSettingKeyboardHotkey, BlackMisc::Settings::CSettingKeyboardHotkeyList>
{
public:
@@ -82,18 +83,18 @@ namespace BlackGui
public:
//! Constructor
CKeyboardLineEdit(BlackMisc::Hardware::CKeyboardKey &key, QWidget *parent = nullptr) :
QLineEdit(parent), m_key(key) { }
CKeyboardLineEdit(const BlackMisc::Settings::CSettingKeyboardHotkey &hotkey, QWidget *parent = nullptr) :
QLineEdit(parent), m_hotkey(hotkey) { }
//! get key
BlackMisc::Hardware::CKeyboardKey getKey() const { return this->m_key; }
const BlackMisc::Settings::CSettingKeyboardHotkey &getKey() const { return this->m_hotkey; }
protected:
//! Overriding and handling key press
virtual void keyPressEvent(QKeyEvent *event) override;
private:
BlackMisc::Hardware::CKeyboardKey m_key;
BlackMisc::Settings::CSettingKeyboardHotkey m_hotkey;
};
}
}