anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix http://bugzilla.lyx.org/show_bug.cgi?id=5430 .

Browse Source 
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145723.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27197 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2008-10-30 13:47:41 +00:00
parent 76c074f19a
commit de7c7ea360
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/LyXVC.cpp
View File

@ -132,12 +132,12 @@ void LyXVC::registrer()
docstring response;
bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
_("(no initial description)"));
if (!ok || response.empty()) {
// should we insist on checking response.empty()?
if (!ok) {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
return;
}
if (response.empty())
response = _("(no initial description)");
vcs->registrer(to_utf8(response));
}

5
src/frontends/alert.h
View File

@ -54,7 +54,10 @@ void error(docstring const & title, docstring const & message);
*/
void information(docstring const & title, docstring const & message);
/// Asks for a text. DO NOT USE !!
/**
* Asks for a text. Returns true for OK. Obtained message is in response
* (even empty string). dflt stands for default message in the dialog.
*/
bool askForText(docstring & response, docstring const & msg,
docstring const & dflt = docstring());

2
src/frontends/qt4/GuiAlert.cpp
View File

@ -236,7 +236,7 @@ bool askForText(docstring & response, docstring const & msg,
QLineEdit::Normal,
toqstr(dflt), &ok);
if (ok && !text.isEmpty()) {
if (ok) {
response = qstring_to_ucs4(text);
return true;
}