From dc9146d2507eecbe9c988b2f90e681d1be590f65 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 8 Aug 2008 15:29:26 +0000 Subject: [PATCH] Patch from Vincent van Ravesteijn. I noticed that for instance the Hyperlink Dialog loses all information when clicking on the main buffer. The same occurs with the Include Child Document Dialog and probably also others. Do you agree on this being less intuitive ? If so, I included a small patch that will fix this for the two dialogs mentioned. I just adapted them to the design of the GuiGraphics Dialog. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26096 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiHyperlink.cpp | 3 ++- src/frontends/qt4/GuiHyperlink.h | 4 +++- src/frontends/qt4/GuiInclude.cpp | 3 ++- src/frontends/qt4/GuiInclude.h | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp index 488321973a..58819fd2e0 100644 --- a/src/frontends/qt4/GuiHyperlink.cpp +++ b/src/frontends/qt4/GuiHyperlink.cpp @@ -62,7 +62,7 @@ void GuiHyperlink::changed_adaptor() } -void GuiHyperlink::updateContents() +void GuiHyperlink::paramsToDialog(InsetCommandParams const & icp) { targetED->setText(toqstr(params_["target"])); nameED->setText(toqstr(params_["name"])); @@ -101,6 +101,7 @@ bool GuiHyperlink::initialiseParams(std::string const & data) // The name passed with LFUN_INSET_APPLY is also the name // used to identify the mailer. InsetCommand::string2params("href", data, params_); + paramsToDialog(params_); return true; } diff --git a/src/frontends/qt4/GuiHyperlink.h b/src/frontends/qt4/GuiHyperlink.h index 3b28c1aac3..f491f3fef7 100644 --- a/src/frontends/qt4/GuiHyperlink.h +++ b/src/frontends/qt4/GuiHyperlink.h @@ -38,9 +38,11 @@ private: /// apply dialog void applyView(); /// update dialog - void updateContents(); + void updateContents() { }; /// bool initialiseParams(std::string const & data); + /// + void paramsToDialog(InsetCommandParams const & icp); /// clean-up on hide. void clearParams() { params_.clear(); } /// clean-up on hide. diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 6e15b2666a..5ea4547537 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -166,7 +166,7 @@ void GuiInclude::typeChanged(int v) } -void GuiInclude::updateContents() +void GuiInclude::paramsToDialog(InsetCommandParams const & params_) { filenameED->setText(toqstr(params_["filename"])); @@ -329,6 +329,7 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const bool GuiInclude::initialiseParams(std::string const & data) { InsetCommand::string2params("include", data, params_); + paramsToDialog(params_); return true; } diff --git a/src/frontends/qt4/GuiInclude.h b/src/frontends/qt4/GuiInclude.h index 37f80fddf6..0fc998f644 100644 --- a/src/frontends/qt4/GuiInclude.h +++ b/src/frontends/qt4/GuiInclude.h @@ -48,6 +48,8 @@ private Q_SLOTS: private: /// bool initialiseParams(std::string const & data); + /// + void paramsToDialog(InsetCommandParams const & params_); /// clean-up on hide. void clearParams() { params_.clear(); } /// clean-up on hide. @@ -75,7 +77,7 @@ private: /// Apply changes void applyView(); /// update - void updateContents(); + void updateContents() { }; /// Browse for a file QString browse(QString const &, Type) const; -- 2.39.5