refs #618, moved menus to menu subfolder

* 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

View File

@@ -14,7 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackmisc/statusmessagelist.h"
#include "blackgui/menudelegate.h"
#include "blackgui/menus/menudelegate.h"
#include <QPlainTextEdit>
#include <QFrame>
#include <QScopedPointer>
@@ -76,7 +76,7 @@ namespace BlackGui
QScopedPointer<Ui::CLogComponent> ui;
//! Custom menu for the log component
class CLogMenu : public BlackGui::IMenuDelegate
class CLogMenu : public BlackGui::Menus::IMenuDelegate
{
public:
//! Constructor