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 #618, moved menus to menu subfolder

Browse Source 
* generated some generic menus which can be reused
* adjusted view base
* new menu to merge with DB data
This commit is contained in:
Klaus Basan
2016-03-22 07:39:43 +01:00
parent c339a3d1e0
commit 7beb5661a3
7 changed files with 294 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/views/viewbase.cpp
View File

@@ -31,6 +31,7 @@
using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackGui::Menus;
using namespace BlackGui::Models;
using namespace BlackGui::Filters;
@@ -151,7 +152,7 @@ namespace BlackGui
return this->ps_saveJson();
}
void CViewBaseNonTemplate::setCustomMenu(IMenuDelegate *menu, bool nestPreviousMenu)
IMenuDelegate *CViewBaseNonTemplate::setCustomMenu(IMenuDelegate *menu, bool nestPreviousMenu)
{
if (menu && nestPreviousMenu)
{
@@ -169,6 +170,7 @@ namespace BlackGui
// no nesting
m_menu = menu;
}
return menu;
}
void CViewBaseNonTemplate::customMenu(QMenu &menu) const

6
src/blackgui/views/viewbase.h
View File

@@ -16,7 +16,7 @@
#include "blackgui/filters/filterdialog.h"
#include "blackgui/filters/filterwidget.h"
#include "blackgui/models/modelfilter.h"
#include "blackgui/menudelegate.h"
#include "blackgui/menus/menudelegate.h"
#include "blackgui/loadindicator.h"
#include "blackgui/dropbase.h"
#include "blackgui/blackguiexport.h"
@@ -165,7 +165,7 @@ namespace BlackGui
void setFilterWidget(BlackGui::Filters::CFilterWidget *filterWidget);
//! Set custom menu if applicable
void setCustomMenu(BlackGui::IMenuDelegate *menu, bool nestPreviousMenu = true);
BlackGui::Menus::IMenuDelegate *setCustomMenu(BlackGui::Menus::IMenuDelegate *menu, bool nestPreviousMenu = true);
//! Enable loading indicator
void enableLoadIndicator(bool enable);
@@ -323,7 +323,7 @@ namespace BlackGui
bool m_enableDeleteSelectedRows = false; //!< selected rows can be deleted
QWidget *m_filterWidget = nullptr; //!< filter widget or dialog
Menu m_menus = MenuDefault; //!< Default menu settings
BlackGui::IMenuDelegate *m_menu = nullptr; //!< custom menu if any
BlackGui::Menus::IMenuDelegate *m_menu = nullptr; //!< custom menu if any
BlackGui::CLoadIndicator *m_loadIndicator = nullptr; //!< load indicator if neeeded
protected slots: