From cf9d42c670dbe954b2aaef89c0fc7ddbf5d76b48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 13 Nov 2007 23:21:29 +0000 Subject: [PATCH] shuffle stuff around git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21591 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Alert_pimpl.h | 30 -------- src/frontends/Makefile.am | 2 - src/frontends/alert.cpp | 103 -------------------------- src/frontends/alert.h | 2 +- src/frontends/qt4/GuiSpellchecker.cpp | 2 +- src/frontends/qt4/alert_pimpl.cpp | 94 +++++++++++++++++++++-- 6 files changed, 91 insertions(+), 142 deletions(-) delete mode 100644 src/frontends/Alert_pimpl.h delete mode 100644 src/frontends/alert.cpp diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h deleted file mode 100644 index 4fc4d08dc9..0000000000 --- a/src/frontends/Alert_pimpl.h +++ /dev/null @@ -1,30 +0,0 @@ -// -*- C++ -*- -/** - * \file Alert_pimpl.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - - -#include "support/strfwd.h" - -namespace lyx { - -int prompt_pimpl(docstring const & title, docstring const & question, - int default_button, int escape_button, - docstring const & b1, - docstring const & b2, - docstring const & b3); - -void warning_pimpl(docstring const & title, docstring const & warning); -void error_pimpl(docstring const & title, docstring const & warning); -void information_pimpl(docstring const & title, docstring const & warning); - -bool askForText_pimpl(docstring & response, - docstring const & msg, docstring const & dflt); - -} // namespace lyx diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index f4d54265c3..60ebeea579 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -9,9 +9,7 @@ noinst_LTLIBRARIES = liblyxfrontends.la AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) liblyxfrontends_la_SOURCES = \ - alert.cpp \ alert.h \ - Alert_pimpl.h \ Application.cpp \ Application.h \ NoGuiFontLoader.h \ diff --git a/src/frontends/alert.cpp b/src/frontends/alert.cpp deleted file mode 100644 index 6f7febad9c..0000000000 --- a/src/frontends/alert.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/** - * \file alert.cpp - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "alert.h" -#include "Alert_pimpl.h" - -#include "debug.h" -#include "LyX.h" // for lyx::use_gui - -using std::endl; -using std::string; - - -namespace lyx { -namespace frontend { - -int Alert::prompt(docstring const & title, docstring const & question, - int default_button, int escape_button, - docstring const & b1, docstring const & b2, docstring const & b3) -{ - if (!use_gui || lyxerr.debugging()) { - lyxerr << to_utf8(title) << '\n' - << "----------------------------------------\n" - << to_utf8(question) << endl; - - lyxerr << "Assuming answer is "; - switch (default_button) { - case 0: lyxerr << to_utf8(b1) << endl; - case 1: lyxerr << to_utf8(b2) << endl; - case 2: lyxerr << to_utf8(b3) << endl; - } - if (!use_gui) - return default_button; - } - - return prompt_pimpl(title, question, - default_button, escape_button, b1, b2, b3); - -} - - -void Alert::warning(docstring const & title, docstring const & message) -{ - lyxerr << "Warning: " << to_utf8(title) << '\n' - << "----------------------------------------\n" - << to_utf8(message) << endl; - - if (use_gui) - warning_pimpl(title, message); -} - - -void Alert::error(docstring const & title, docstring const & message) -{ - lyxerr << "Error: " << to_utf8(title) << '\n' - << "----------------------------------------\n" - << to_utf8(message) << endl; - - if (use_gui) - error_pimpl(title, message); -} - - -void Alert::information(docstring const & title, docstring const & message) -{ - if (!use_gui || lyxerr.debugging()) - lyxerr << to_utf8(title) << '\n' - << "----------------------------------------\n" - << to_utf8(message) << endl; - - if (use_gui) - information_pimpl(title, message); -} - - -bool Alert::askForText(docstring & response, docstring const & msg, - docstring const & dflt) -{ - if (!use_gui || lyxerr.debugging()) { - lyxerr << "----------------------------------------\n" - << to_utf8(msg) << '\n' - << "Assuming answer is " << to_utf8(dflt) << '\n' - << "----------------------------------------" << endl; - if (!use_gui) { - response = dflt; - return true; - } - } - - return askForText_pimpl(response, msg, dflt); -} - -} // namespace frontend -} // namespace lyx diff --git a/src/frontends/alert.h b/src/frontends/alert.h index e10a73a5f8..004a179885 100644 --- a/src/frontends/alert.h +++ b/src/frontends/alert.h @@ -12,7 +12,7 @@ #ifndef LYX_ALERT_H #define LYX_ALERT_H -#include "support/lstrings.h" +#include "support/docstring.h" namespace lyx { diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp index f942304e08..030b86d830 100644 --- a/src/frontends/qt4/GuiSpellchecker.cpp +++ b/src/frontends/qt4/GuiSpellchecker.cpp @@ -27,8 +27,8 @@ #include "Paragraph.h" #include "support/textutils.h" -#include "support/convert.h" #include "support/docstring.h" +#include "support/lstrings.h" #include #include diff --git a/src/frontends/qt4/alert_pimpl.cpp b/src/frontends/qt4/alert_pimpl.cpp index 01885409de..36bf3eecfb 100644 --- a/src/frontends/qt4/alert_pimpl.cpp +++ b/src/frontends/qt4/alert_pimpl.cpp @@ -11,17 +11,19 @@ #include -#include "Alert_pimpl.h" #include "alert.h" -#include "qt_helpers.h" - -#include "ui_AskForTextUi.h" - #include "frontends/Application.h" +#include "qt_helpers.h" +#include "debug.h" +#include "LyX.h" // for lyx::use_gui +#include "ui_AskForTextUi.h" #include "gettext.h" +#include "support/docstring.h" +#include "support/lstrings.h" + #include #include #include @@ -29,6 +31,9 @@ #include #include +using std::endl; +using std::string; + namespace lyx { @@ -190,4 +195,83 @@ bool askForText_pimpl(docstring & response, docstring const & msg, } +namespace Alert { + +int prompt(docstring const & title, docstring const & question, + int default_button, int escape_button, + docstring const & b1, docstring const & b2, docstring const & b3) +{ + if (!use_gui || lyxerr.debugging()) { + lyxerr << to_utf8(title) << '\n' + << "----------------------------------------\n" + << to_utf8(question) << endl; + + lyxerr << "Assuming answer is "; + switch (default_button) { + case 0: lyxerr << to_utf8(b1) << endl; + case 1: lyxerr << to_utf8(b2) << endl; + case 2: lyxerr << to_utf8(b3) << endl; + } + if (!use_gui) + return default_button; + } + + return prompt_pimpl(title, question, + default_button, escape_button, b1, b2, b3); + +} + + +void warning(docstring const & title, docstring const & message) +{ + lyxerr << "Warning: " << to_utf8(title) << '\n' + << "----------------------------------------\n" + << to_utf8(message) << endl; + + if (use_gui) + warning_pimpl(title, message); +} + + +void error(docstring const & title, docstring const & message) +{ + lyxerr << "Error: " << to_utf8(title) << '\n' + << "----------------------------------------\n" + << to_utf8(message) << endl; + + if (use_gui) + error_pimpl(title, message); +} + + +void information(docstring const & title, docstring const & message) +{ + if (!use_gui || lyxerr.debugging()) + lyxerr << to_utf8(title) << '\n' + << "----------------------------------------\n" + << to_utf8(message) << endl; + + if (use_gui) + information_pimpl(title, message); +} + + +bool askForText(docstring & response, docstring const & msg, + docstring const & dflt) +{ + if (!use_gui || lyxerr.debugging()) { + lyxerr << "----------------------------------------\n" + << to_utf8(msg) << '\n' + << "Assuming answer is " << to_utf8(dflt) << '\n' + << "----------------------------------------" << endl; + if (!use_gui) { + response = dflt; + return true; + } + } + + return askForText_pimpl(response, msg, dflt); +} + +} // namespace Alert } // namespace lyx -- 2.39.2