mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 21:40:19 +00:00
delete unneeded Menubar virtual interface.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19751 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
77d4d1256d
commit
8381d36098
@ -84,9 +84,7 @@
|
||||
#include "frontends/Gui.h"
|
||||
#include "frontends/KeySymbol.h"
|
||||
#include "frontends/LyXView.h"
|
||||
#include "frontends/Menubar.h"
|
||||
#include "frontends/Selection.h"
|
||||
#include "frontends/Toolbars.h"
|
||||
#include "frontends/WorkArea.h"
|
||||
|
||||
#include "support/environment.h"
|
||||
|
@ -15,7 +15,6 @@
|
||||
|
||||
#include "Dialogs.h"
|
||||
#include "Toolbars.h"
|
||||
#include "Menubar.h"
|
||||
#include "WorkArea.h"
|
||||
#include "Gui.h"
|
||||
|
||||
|
@ -28,7 +28,6 @@ liblyxfrontends_la_SOURCES = \
|
||||
KeySymbol.h \
|
||||
LyXView.cpp \
|
||||
LyXView.h \
|
||||
Menubar.h \
|
||||
Painter.cpp \
|
||||
Painter.h \
|
||||
Toolbars.cpp \
|
||||
|
@ -1,39 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/**
|
||||
* \file Menubar.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author Lars Gullik Bjønnes
|
||||
* \author Jean-Marc Lasgouttes
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#ifndef MENUBAR_H
|
||||
#define MENUBAR_H
|
||||
|
||||
#include "support/docstring.h"
|
||||
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
/**
|
||||
* The LyX GUI independent menubar class
|
||||
* The GUI interface is implemented in the frontends
|
||||
*/
|
||||
class Menubar {
|
||||
public:
|
||||
///
|
||||
virtual ~Menubar() {}
|
||||
/// Opens a top-level submenu given its name
|
||||
virtual void openByName(docstring const &) = 0;
|
||||
/// update the state of the menuitems
|
||||
virtual void update() = 0;
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
} // namespace lyx
|
||||
|
||||
#endif // MENUBAR_H
|
@ -309,8 +309,6 @@ QMenu* GuiView::createPopupMenu()
|
||||
void GuiView::init()
|
||||
{
|
||||
d.menubar_ = new QLMenubar(this, menubackend);
|
||||
QObject::connect(menuBar(), SIGNAL(triggered(QAction *)),
|
||||
this, SLOT(updateMenu(QAction *)));
|
||||
|
||||
toolbars_->init();
|
||||
|
||||
@ -561,12 +559,6 @@ void GuiView::setGeometry(unsigned int width,
|
||||
}
|
||||
|
||||
|
||||
void GuiView::updateMenu(QAction * /*action*/)
|
||||
{
|
||||
d.menubar_->update();
|
||||
}
|
||||
|
||||
|
||||
void GuiView::setWindowTitle(docstring const & t, docstring const & it)
|
||||
{
|
||||
QString title = windowTitle();
|
||||
|
@ -92,9 +92,6 @@ public Q_SLOTS:
|
||||
/// idle timeout
|
||||
void update_view_state_qt();
|
||||
|
||||
/// populate a toplevel menu and all its children on demand
|
||||
void updateMenu(QAction *);
|
||||
|
||||
void currentTabChanged(int index);
|
||||
void closeCurrentTab();
|
||||
|
||||
|
@ -111,9 +111,6 @@ void QLMenubar::openByName(docstring const & name)
|
||||
}
|
||||
|
||||
|
||||
void QLMenubar::update()
|
||||
{ }
|
||||
|
||||
GuiView * QLMenubar::view()
|
||||
{
|
||||
return owner_;
|
||||
|
@ -13,8 +13,6 @@
|
||||
#ifndef QLMENUBAR_H
|
||||
#define QLMENUBAR_H
|
||||
|
||||
#include "frontends/Menubar.h"
|
||||
|
||||
#include "QLPopupMenu.h"
|
||||
|
||||
#include <map>
|
||||
@ -34,7 +32,7 @@ namespace frontend {
|
||||
class GuiView;
|
||||
class LyXView;
|
||||
|
||||
class QLMenubar : public QObject, public Menubar {
|
||||
class QLMenubar : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
QLMenubar(LyXView *, MenuBackend &);
|
||||
@ -54,10 +52,6 @@ public:
|
||||
/// update the state of the menuitems - not needed
|
||||
void update();
|
||||
|
||||
public Q_SLOTS:
|
||||
/// populate a toplevel menu and all its children on demand
|
||||
// void updateMenu();
|
||||
|
||||
private:
|
||||
/// Initialize specific MACOS X menubar
|
||||
void macxMenuBarInit();
|
||||
|
Loading…
Reference in New Issue
Block a user