Formatting, style

This commit is contained in:
Klaus Basan
2018-05-18 20:35:08 +02:00
parent 7965f67455
commit fc35e8b654
14 changed files with 66 additions and 65 deletions

View File

@@ -68,18 +68,10 @@ namespace BlackGui
this->setSortIndicator();
switch (mode)
{
case CAircraftModelListModel::StashModel:
m_menus = MenuDefaultNoClear;
break;
case CAircraftModelListModel::Database:
m_menus = MenuDefaultDbViews;
break;
case CAircraftModelListModel::VPilotRuleModel:
m_menus = MenuDefaultNoClear | MenuStashing;
break;
case CAircraftModelListModel::OwnAircraftModelMappingTool:
m_menus = MenuDefaultNoClear | MenuStashing | MenuLoadAndSave;
break;
case CAircraftModelListModel::StashModel: m_menus = MenuDefaultNoClear; break;
case CAircraftModelListModel::Database: m_menus = MenuDefaultDbViews; break;
case CAircraftModelListModel::VPilotRuleModel: m_menus = MenuDefaultNoClear | MenuStashing; break;
case CAircraftModelListModel::OwnAircraftModelMappingTool: m_menus = MenuDefaultNoClear | MenuStashing | MenuLoadAndSave; break;
case CAircraftModelListModel::OwnAircraftModelClient:
default:
m_menus = MenuDefaultNoClear | MenuBackend;

View File

@@ -7,8 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackgui/models/serverlistmodel.h"
#include "blackgui/views/serverview.h"
#include "serverview.h"
using namespace BlackMisc;
using namespace BlackGui::Models;

View File

@@ -13,13 +13,11 @@
#define BLACKGUI_VIEWS_SERVERVIEW_H
#include "blackgui/blackguiexport.h"
#include "blackgui/models/serverlistmodel.h"
#include "blackgui/views/viewbase.h"
#include "blackmisc/network/serverlist.h"
#include "blackgui/models/serverlistmodel.h"
class QWidget;
namespace BlackMisc { namespace Network { class CServer; } }
namespace BlackGui
{
namespace Views

View File

@@ -104,7 +104,7 @@ namespace BlackGui
saveJson->setContext(Qt::WidgetShortcut);
QShortcut *deleteRow = new QShortcut(CShortcut::keyDelete(), this);
connect(deleteRow, &QShortcut::activated, this, &CViewBaseNonTemplate::ps_removeSelectedRows);
connect(deleteRow, &QShortcut::activated, this, &CViewBaseNonTemplate::removeSelectedRowsChecked);
deleteRow->setObjectName("Remove selected rows for " + this->objectName());
deleteRow->setContext(Qt::WidgetShortcut);
@@ -258,7 +258,7 @@ namespace BlackGui
a->setChecked(this->displayAutomatically());
break;
}
case MenuRemoveSelectedRows: { ma.addAction(CIcons::delete16(), "Remove selected rows", CMenuAction::pathViewAddRemove(), { this, &CViewBaseNonTemplate::ps_removeSelectedRows }, CShortcut::keyDelete()); break; }
case MenuRemoveSelectedRows: { ma.addAction(CIcons::delete16(), "Remove selected rows", CMenuAction::pathViewAddRemove(), { this, &CViewBaseNonTemplate::removeSelectedRowsChecked }, CShortcut::keyDelete()); break; }
case MenuClear: { ma.addAction(CIcons::delete16(), "Clear", CMenuAction::pathViewAddRemove(), { this, &CViewBaseNonTemplate::clear }); break; }
case MenuFilter:
{
@@ -827,7 +827,7 @@ namespace BlackGui
}
}
void CViewBaseNonTemplate::ps_removeSelectedRows()
void CViewBaseNonTemplate::removeSelectedRowsChecked()
{
if (!m_enableDeleteSelectedRows) { return; }
this->removeSelectedRows();

View File

@@ -540,8 +540,8 @@ namespace BlackGui
void setSingleSelection();
//! @}
//! Remove selected rows
void ps_removeSelectedRows();
//! Remove selected rows if enabled
void removeSelectedRowsChecked();
//! Toggle auto display flag
void toggleAutoDisplay();