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

refs #617, naming conventions for UI

Browse Source
This commit is contained in:
Klaus Basan
2017-02-03 02:56:11 +01:00
committed by Mathew Sutcliffe
parent 2b61213746
commit f87a06f6d2
6 changed files with 64 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/blackgui/components/hotkeydialog.cpp
View File

@@ -72,21 +72,21 @@ namespace BlackGui
m_inputManager = BlackCore::CInputManager::instance(); m_inputManager = BlackCore::CInputManager::instance();
ui->setupUi(this); ui->setupUi(this);
ui->advancedFrame->hide(); ui->qf_Advanced->hide();
ui->tv_actions->setModel(&m_actionModel); ui->tv_Actions->setModel(&m_actionModel);
ui->pb_advancedMode->setIcon(BlackMisc::CIcons::arrowMediumSouth16()); ui->pb_AdvancedMode->setIcon(BlackMisc::CIcons::arrowMediumSouth16());
selectAction(); selectAction();
if (!actionHotkey.getCombination().isEmpty()) { ui->pb_selectedHotkey->setText(actionHotkey.getCombination().toQString()); } if (!actionHotkey.getCombination().isEmpty()) { ui->pb_SelectedHotkey->setText(actionHotkey.getCombination().toQString()); }
connect(ui->pb_advancedMode, &QPushButton::clicked, this, &CHotkeyDialog::ps_advancedModeChanged); connect(ui->pb_AdvancedMode, &QPushButton::clicked, this, &CHotkeyDialog::ps_advancedModeChanged);
connect(ui->pb_selectedHotkey, &QPushButton::clicked, this, &CHotkeyDialog::ps_selectHotkey); connect(ui->pb_SelectedHotkey, &QPushButton::clicked, this, &CHotkeyDialog::ps_selectHotkey);
connect(ui->pb_accept, &QPushButton::clicked, this, &CHotkeyDialog::ps_accept); connect(ui->pb_Accept, &QPushButton::clicked, this, &CHotkeyDialog::ps_accept);
connect(ui->pb_cancel, &QPushButton::clicked, this, &CHotkeyDialog::reject); connect(ui->pb_Cancel, &QPushButton::clicked, this, &CHotkeyDialog::reject);
connect(m_inputManager, &BlackCore::CInputManager::combinationSelectionChanged, this, &CHotkeyDialog::ps_combinationSelectionChanged); connect(m_inputManager, &BlackCore::CInputManager::combinationSelectionChanged, this, &CHotkeyDialog::ps_combinationSelectionChanged);
connect(m_inputManager, &BlackCore::CInputManager::combinationSelectionFinished, this, &CHotkeyDialog::ps_combinationSelectionFinished); connect(m_inputManager, &BlackCore::CInputManager::combinationSelectionFinished, this, &CHotkeyDialog::ps_combinationSelectionFinished);
connect(ui->tv_actions->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CHotkeyDialog::ps_changeSelectedAction); connect(ui->tv_Actions->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CHotkeyDialog::ps_changeSelectedAction);
initStyleSheet(); initStyleSheet();
} }
@@ -99,7 +99,7 @@ namespace BlackGui
{ {
for (const auto &app : applications) for (const auto &app : applications)
{ {
ui->cb_identifier->addItem(app.getMachineName(), QVariant::fromValue(app)); ui->cb_Identifier->addItem(app.getMachineName(), QVariant::fromValue(app));
} }
} }
@@ -129,29 +129,29 @@ namespace BlackGui
{ {
if (m_actionHotkey.getCombination().isEmpty()) return; if (m_actionHotkey.getCombination().isEmpty()) return;
if (!ui->advancedFrame->isVisible()) if (!ui->qf_Advanced->isVisible())
{ {
setupAdvancedFrame(); setupAdvancedFrame();
ui->advancedFrame->show(); ui->qf_Advanced->show();
ui->pb_advancedMode->setIcon(BlackMisc::CIcons::arrowMediumNorth16()); ui->pb_AdvancedMode->setIcon(BlackMisc::CIcons::arrowMediumNorth16());
} }
else else
{ {
ui->pb_advancedMode->setIcon(BlackMisc::CIcons::arrowMediumSouth16()); ui->pb_AdvancedMode->setIcon(BlackMisc::CIcons::arrowMediumSouth16());
ui->advancedFrame->hide(); ui->qf_Advanced->hide();
ui->gb_hotkey->resize(0, 0); ui->gb_Hotkey->resize(0, 0);
} }
} }
void CHotkeyDialog::ps_selectHotkey() void CHotkeyDialog::ps_selectHotkey()
{ {
ui->pb_selectedHotkey->setText("Press any key/button..."); ui->pb_SelectedHotkey->setText("Press any key/button...");
m_inputManager->startCapture(); m_inputManager->startCapture();
} }
void CHotkeyDialog::ps_combinationSelectionChanged(const BlackMisc::Input::CHotkeyCombination &combination) void CHotkeyDialog::ps_combinationSelectionChanged(const BlackMisc::Input::CHotkeyCombination &combination)
{ {
ui->pb_selectedHotkey->setText(combination.toFormattedQString()); ui->pb_SelectedHotkey->setText(combination.toFormattedQString());
} }
void CHotkeyDialog::ps_combinationSelectionFinished(const BlackMisc::Input::CHotkeyCombination &combination) void CHotkeyDialog::ps_combinationSelectionFinished(const BlackMisc::Input::CHotkeyCombination &combination)
@@ -171,19 +171,19 @@ namespace BlackGui
{ {
if (m_actionHotkey.getApplicableMachine().getMachineName().isEmpty()) if (m_actionHotkey.getApplicableMachine().getMachineName().isEmpty())
{ {
CLogMessage().validationWarning("Missing %1") << ui->gb_machine->title(); CLogMessage().validationWarning("Missing %1") << ui->gb_Machine->title();
return; return;
} }
if (m_actionHotkey.getCombination().isEmpty()) if (m_actionHotkey.getCombination().isEmpty())
{ {
CLogMessage().validationWarning("Missing %1") << ui->gb_hotkey->title(); CLogMessage().validationWarning("Missing %1") << ui->gb_Hotkey->title();
return; return;
} }
if (m_actionHotkey.getAction().isEmpty()) if (m_actionHotkey.getAction().isEmpty())
{ {
CLogMessage().validationWarning("Missing %1") << ui->gb_action->title(); CLogMessage().validationWarning("Missing %1") << ui->gb_Action->title();
return; return;
} }
@@ -198,12 +198,12 @@ namespace BlackGui
void CHotkeyDialog::synchronizeSimpleSelection() void CHotkeyDialog::synchronizeSimpleSelection()
{ {
ui->pb_selectedHotkey->setText(m_actionHotkey.getCombination().toFormattedQString()); ui->pb_SelectedHotkey->setText(m_actionHotkey.getCombination().toFormattedQString());
} }
void CHotkeyDialog::synchronizeAdvancedSelection() void CHotkeyDialog::synchronizeAdvancedSelection()
{ {
if (ui->advancedFrame->isVisible()) { setupAdvancedFrame(); } if (ui->qf_Advanced->isVisible()) { setupAdvancedFrame(); }
} }
void CHotkeyDialog::setupAdvancedFrame() void CHotkeyDialog::setupAdvancedFrame()
@@ -217,7 +217,7 @@ namespace BlackGui
if (splittedKey == "+") continue; if (splittedKey == "+") continue;
int currentIndex = -1; int currentIndex = -1;
CKeySelectionBox *ksb = new CKeySelectionBox(ui->advancedFrame); CKeySelectionBox *ksb = new CKeySelectionBox(ui->qf_Advanced);
for (const auto &supportedKey : allSupportedKeys) for (const auto &supportedKey : allSupportedKeys)
{ {
QString supportedKeyAsString = supportedKey.toQString(); QString supportedKeyAsString = supportedKey.toQString();
@@ -228,8 +228,8 @@ namespace BlackGui
} }
} }
ksb->setSelectedIndex(currentIndex); ksb->setSelectedIndex(currentIndex);
ui->advancedFrame->layout()->addWidget(ksb); ui->qf_Advanced->layout()->addWidget(ksb);
int position = ui->advancedFrame->layout()->count() - 1; int position = ui->qf_Advanced->layout()->count() - 1;
ksb->setProperty("position", position); ksb->setProperty("position", position);
connect(ksb, &CKeySelectionBox::keySelectionChanged, this, &CHotkeyDialog::advancedKeyChanged); connect(ksb, &CKeySelectionBox::keySelectionChanged, this, &CHotkeyDialog::advancedKeyChanged);
} }
@@ -237,7 +237,7 @@ namespace BlackGui
void CHotkeyDialog::clearAdvancedFrame() void CHotkeyDialog::clearAdvancedFrame()
{ {
QLayout *layout = ui->advancedFrame->layout(); QLayout *layout = ui->qf_Advanced->layout();
QLayoutItem *child; QLayoutItem *child;
while ((child = layout->takeAt(0)) != 0) while ((child = layout->takeAt(0)) != 0)
@@ -273,10 +273,10 @@ namespace BlackGui
auto indexList = m_actionModel.match(startIndex, Qt::DisplayRole, QVariant::fromValue(token)); auto indexList = m_actionModel.match(startIndex, Qt::DisplayRole, QVariant::fromValue(token));
if (indexList.isEmpty()) return; if (indexList.isEmpty()) return;
parentIndex = indexList.first(); parentIndex = indexList.first();
ui->tv_actions->expand(parentIndex); ui->tv_Actions->expand(parentIndex);
} }
QItemSelectionModel *selectionModel = ui->tv_actions->selectionModel(); QItemSelectionModel *selectionModel = ui->tv_Actions->selectionModel();
selectionModel->select(parentIndex, QItemSelectionModel::Select); selectionModel->select(parentIndex, QItemSelectionModel::Select);
} }
} // ns } // ns

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

@@ -70,7 +70,7 @@ namespace BlackGui
CHotkeyDialog(const BlackMisc::Input::CActionHotkey &actionHotkey, QWidget *parent = nullptr); CHotkeyDialog(const BlackMisc::Input::CActionHotkey &actionHotkey, QWidget *parent = nullptr);
//! Destructor //! Destructor
~CHotkeyDialog(); virtual ~CHotkeyDialog();
//! Get hotkey selected by user //! Get hotkey selected by user
BlackMisc::Input::CActionHotkey getSelectedActionHotkey() const { return m_actionHotkey; } BlackMisc::Input::CActionHotkey getSelectedActionHotkey() const { return m_actionHotkey; }
@@ -81,7 +81,7 @@ namespace BlackGui
//! Init style sheet //! Init style sheet
void initStyleSheet(); void initStyleSheet();
//! getHotkey runs the hotkey dialog and returns the result //! Runs the hotkey dialog and returns the result
static BlackMisc::Input::CActionHotkey getActionHotkey(const BlackMisc::Input::CActionHotkey &initial, const BlackMisc::CIdentifierList &applications, static BlackMisc::Input::CActionHotkey getActionHotkey(const BlackMisc::Input::CActionHotkey &initial, const BlackMisc::CIdentifierList &applications,
QWidget *parent = nullptr); QWidget *parent = nullptr);

28
src/blackgui/components/hotkeydialog.ui
View File

@@ -15,25 +15,25 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QGroupBox" name="gb_machine"> <widget class="QGroupBox" name="gb_Machine">
<property name="title"> <property name="title">
<string>Machine</string> <string>Machine</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QComboBox" name="cb_identifier"/> <widget class="QComboBox" name="cb_Identifier"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="gb_hotkey"> <widget class="QGroupBox" name="gb_Hotkey">
<property name="title"> <property name="title">
<string>Combination</string> <string>Combination</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="3" column="3"> <item row="3" column="3">
<widget class="QPushButton" name="pb_advancedMode"> <widget class="QPushButton" name="pb_AdvancedMode">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -58,7 +58,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QRadioButton" name="rb_press"> <widget class="QRadioButton" name="rb_Press">
<property name="text"> <property name="text">
<string>Press</string> <string>Press</string>
</property> </property>
@@ -68,7 +68,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<widget class="QPushButton" name="pb_selectedHotkey"> <widget class="QPushButton" name="pb_SelectedHotkey">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -81,7 +81,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="2" colspan="2"> <item row="2" column="2" colspan="2">
<spacer name="horizontalSpacer"> <spacer name="hs_Hotkey">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -94,14 +94,14 @@
</spacer> </spacer>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QRadioButton" name="rb_release"> <widget class="QRadioButton" name="rb_Release">
<property name="text"> <property name="text">
<string>Release</string> <string>Release</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="4"> <item row="4" column="0" colspan="4">
<widget class="QFrame" name="advancedFrame"> <widget class="QFrame" name="qf_Advanced">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@@ -118,13 +118,13 @@
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="gb_action"> <widget class="QGroupBox" name="gb_Action">
<property name="title"> <property name="title">
<string>Action</string> <string>Action</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeView" name="tv_actions"> <widget class="QTreeView" name="tv_Actions">
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
@@ -134,7 +134,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<spacer name="horizontalSpacer_2"> <spacer name="hs_Dialog">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -147,14 +147,14 @@
</spacer> </spacer>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QPushButton" name="pb_accept"> <widget class="QPushButton" name="pb_Accept">
<property name="text"> <property name="text">
<string>Ok</string> <string>Ok</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="3" column="2">
<widget class="QPushButton" name="pb_cancel"> <widget class="QPushButton" name="pb_Cancel">
<property name="text"> <property name="text">
<string>Cancel</string> <string>Cancel</string>
</property> </property>

18
src/blackgui/components/settingshotkeycomponent.cpp
View File

@@ -42,14 +42,14 @@ namespace BlackGui
ui(new Ui::CSettingsHotkeyComponent) ui(new Ui::CSettingsHotkeyComponent)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tv_hotkeys->setModel(&m_model); ui->tv_Hotkeys->setModel(&m_model);
connect(ui->pb_addHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_addEntry); connect(ui->pb_AddHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_addEntry);
connect(ui->pb_editHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_editEntry); connect(ui->pb_EditHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_editEntry);
connect(ui->pb_removeHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_removeEntry); connect(ui->pb_RemoveHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::ps_removeEntry);
reloadHotkeysFromSettings(); reloadHotkeysFromSettings();
ui->tv_hotkeys->selectRow(0); ui->tv_Hotkeys->selectRow(0);
} }
CSettingsHotkeyComponent::~CSettingsHotkeyComponent() CSettingsHotkeyComponent::~CSettingsHotkeyComponent()
@@ -75,10 +75,10 @@ namespace BlackGui
void CSettingsHotkeyComponent::ps_editEntry() void CSettingsHotkeyComponent::ps_editEntry()
{ {
auto index = ui->tv_hotkeys->selectionModel()->currentIndex(); auto index = ui->tv_Hotkeys->selectionModel()->currentIndex();
if (!index.isValid()) return; if (!index.isValid()) return;
const auto model = ui->tv_hotkeys->model(); const auto model = ui->tv_Hotkeys->model();
const QModelIndex indexHotkey = model->index(index.row(), 0, QModelIndex()); const QModelIndex indexHotkey = model->index(index.row(), 0, QModelIndex());
Q_ASSERT(indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).canConvert<CActionHotkey>()); Q_ASSERT(indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).canConvert<CActionHotkey>());
CActionHotkey actionHotkey = indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).value<CActionHotkey>(); CActionHotkey actionHotkey = indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).value<CActionHotkey>();
@@ -96,7 +96,7 @@ namespace BlackGui
void CSettingsHotkeyComponent::ps_removeEntry() void CSettingsHotkeyComponent::ps_removeEntry()
{ {
QModelIndexList indexes = ui->tv_hotkeys->selectionModel()->selectedRows(); QModelIndexList indexes = ui->tv_Hotkeys->selectionModel()->selectedRows();
for (const auto &index : indexes) for (const auto &index : indexes)
{ {
CActionHotkey actionHotkey = index.data(CActionHotkeyListModel::ActionHotkeyRole).value<CActionHotkey>(); CActionHotkey actionHotkey = index.data(CActionHotkeyListModel::ActionHotkeyRole).value<CActionHotkey>();
@@ -165,7 +165,7 @@ namespace BlackGui
void CSettingsHotkeyComponent::ps_hotkeySlot(bool keyDown) void CSettingsHotkeyComponent::ps_hotkeySlot(bool keyDown)
{ {
if (keyDown) QMessageBox::information(this, "Test", "Push-To-Talk"); if (keyDown) { QMessageBox::information(this, "Test", "Hotkey test"); }
} }
} // ns } // ns
} // ns } // ns

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

@@ -43,7 +43,7 @@ namespace BlackGui
CSettingsHotkeyComponent(QWidget *parent = nullptr); CSettingsHotkeyComponent(QWidget *parent = nullptr);
//! Destructor //! Destructor
~CSettingsHotkeyComponent(); virtual ~CSettingsHotkeyComponent();
private slots: private slots:
void ps_addEntry(); void ps_addEntry();

24
src/blackgui/components/settingshotkeycomponent.ui
View File

@@ -11,15 +11,9 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>sample_hotkeys</string> <string>Hotkeys</string>
</property> </property>
<property name="frameShape"> <layout class="QGridLayout" name="gl_HotKeyComponent">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>1</number> <number>1</number>
</property> </property>
@@ -30,21 +24,21 @@
<number>1</number> <number>1</number>
</property> </property>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="pb_addHotkey"> <widget class="QPushButton" name="pb_AddHotkey">
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="pb_editHotkey"> <widget class="QPushButton" name="pb_EditHotkey">
<property name="text"> <property name="text">
<string>Edit</string> <string>Edit</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QPushButton" name="pb_removeHotkey"> <widget class="QPushButton" name="pb_RemoveHotkey">
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
@@ -64,7 +58,10 @@
</spacer> </spacer>
</item> </item>
<item row="0" column="0" colspan="5"> <item row="0" column="0" colspan="5">
<widget class="QTableView" name="tv_hotkeys"> <widget class="QTableView" name="tv_Hotkeys">
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum> <enum>QAbstractItemView::SingleSelection</enum>
</property> </property>
@@ -77,9 +74,6 @@
<attribute name="verticalHeaderVisible"> <attribute name="verticalHeaderVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">