URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/LyX.cpp?rev=21636
==============================================================================
--- lyx-devel/trunk/src/LyX.cpp (original)
+++ lyx-devel/trunk/src/LyX.cpp Thu Nov 15 23:30:16 2007
@@ -48,7 +48,6 @@
#include "frontends/alert.h"
#include "frontends/Application.h"
-#include "frontends/Dialogs.h"
#include "frontends/Gui.h"
#include "frontends/LyXView.h"
@@ -380,18 +379,7 @@
{
if (quitting || !inset)
return 0;
-
- Buffer const * buffer_ptr = 0;
- vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
- vector<int>::const_iterator it = view_ids.begin();
- vector<int>::const_iterator const end = view_ids.end();
- for (; it != end; ++it) {
- Buffer const * ptr =
-
pimpl_->application_->gui().view(*it).updateInset(inset);
- if (ptr)
- buffer_ptr = ptr;
- }
- return buffer_ptr;
+ return application().gui().updateInset(inset);
}
@@ -399,13 +387,7 @@
{
if (quitting || !use_gui)
return;
-
- vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
- vector<int>::const_iterator it = view_ids.begin();
- vector<int>::const_iterator const end = view_ids.end();
- for (; it != end; ++it)
- pimpl_->application_->gui().view(*it).getDialogs().
- hide(name, inset);
+ application().gui().hideDialogs(name, inset);
}
Modified: lyx-devel/trunk/src/LyXFunc.cpp
URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/LyXFunc.cpp?rev=21636
==============================================================================
--- lyx-devel/trunk/src/LyXFunc.cpp (original)
+++ lyx-devel/trunk/src/LyXFunc.cpp Thu Nov 15 23:30:16 2007
@@ -137,6 +137,7 @@
namespace Alert = frontend::Alert;
extern bool quitting;
+extern bool use_gui;
namespace {
@@ -1560,9 +1561,10 @@
break;
}
- case LFUN_DIALOG_HIDE:
+ case LFUN_DIALOG_HIDE: {
LyX::cref().hideDialogs(argument, 0);
break;
+ }
case LFUN_DIALOG_TOGGLE: {
BOOST_ASSERT(lyx_view_);
Modified: lyx-devel/trunk/src/frontends/Application.h
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/Application.h?rev=21636
==============================================================================
--- lyx-devel/trunk/src/frontends/Application.h (original)
+++ lyx-devel/trunk/src/frontends/Application.h Thu Nov 15 23:30:16 2007
@@ -150,6 +150,7 @@
///
virtual Gui & gui() = 0;
+ virtual Gui const & gui() const = 0;
/// Start the main event loop.
/// The batch command is programmed to be execute once
Modified: lyx-devel/trunk/src/frontends/Gui.h
URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/Gui.h?rev=21636
==============================================================================
--- lyx-devel/trunk/src/frontends/Gui.h (original)
+++ lyx-devel/trunk/src/frontends/Gui.h Thu Nov 15 23:30:16 2007
@@ -14,9 +14,16 @@
#ifndef BASE_GUI_H
#define BASE_GUI_H
+#include "support/strfwd.h"
+
#include <vector>
+
namespace lyx {
+
+class Buffer;
+class Inset;
+
namespace frontend {
class LyXView;
@@ -42,6 +49,11 @@
///
std::vector<int> const & viewIds() { return view_ids_; }
+ ///
+ virtual void hideDialogs(std::string const & name, Inset * inset) const
= 0;
+ ///
+ virtual Buffer const * updateInset(Inset const * inset) const = 0;
+
protected:
///
std::vector<int> view_ids_;
Modified: lyx-devel/trunk/src/frontends/qt4/GuiApplication.h
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiApplication.h?rev=21636
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiApplication.h (original)
+++ lyx-devel/trunk/src/frontends/qt4/GuiApplication.h Thu Nov 15 23:30:16 2007
@@ -59,6 +59,7 @@
virtual FontLoader & fontLoader() { return font_loader_; }
virtual int exec();
virtual Gui & gui() { return gui_; }
+ virtual Gui const & gui() const { return gui_; }
virtual void exit(int status);
virtual bool event(QEvent * e);
void syncEvents();
Modified: lyx-devel/trunk/src/frontends/qt4/GuiImplementation.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiImplementation.cpp?rev=21636
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiImplementation.cpp (original)
+++ lyx-devel/trunk/src/frontends/qt4/GuiImplementation.cpp Thu Nov 15 23:30:16
2007
@@ -14,6 +14,7 @@
#include "GuiImplementation.h"
#include "GuiView.h"
+#include "Dialogs.h"
#include <boost/assert.hpp>
@@ -21,6 +22,7 @@
using std::map;
using std::vector;
+using std::string;
namespace lyx {
@@ -104,6 +106,29 @@
}
+void GuiImplementation::hideDialogs(string const & name, Inset * inset) const
+{
+ vector<int>::const_iterator it = view_ids_.begin();
+ vector<int>::const_iterator const end = view_ids_.end();
+ for (; it != end; ++it)
+ view(*it).getDialogs().hide(name, inset);
+}
+
+
+Buffer const * GuiImplementation::updateInset(Inset const * inset) const
+{
+ Buffer const * buffer_ptr = 0;
+ vector<int>::const_iterator it = view_ids_.begin();
+ vector<int>::const_iterator const end = view_ids_.end();
+ for (; it != end; ++it) {
+ Buffer const * ptr = view(*it).updateInset(inset);
+ if (ptr)
+ buffer_ptr = ptr;
+ }
+ return buffer_ptr;
+}
+
+
} // namespace frontend
} // namespace lyx
Modified: lyx-devel/trunk/src/frontends/qt4/GuiImplementation.h
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/GuiImplementation.h?rev=21636
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiImplementation.h (original)
+++ lyx-devel/trunk/src/frontends/qt4/GuiImplementation.h Thu Nov 15 23:30:16
2007
@@ -41,9 +41,12 @@
virtual bool unregisterView(int id);
virtual LyXView& view(int id) const;
+ ///
+ virtual void hideDialogs(std::string const & name, Inset * inset) const;
+ ///
+ virtual Buffer const * updateInset(Inset const * inset) const;
private:
-
/// Multiple views container.
/**
* Warning: This must not be a smart pointer as the destruction of the
