anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make shortcuts consistent with the rest of LyX.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6296 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-02-27 15:53:23 +00:00
parent 7d394ab2e6
commit ea315a33e6
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontends/xforms/Alert_pimpl.C
View File

@ -31,29 +31,31 @@ void alert_pimpl(string const & s1, string const & s2, string const & s3)
bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3) bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3)
{ {
fl_set_resource("flQuestion.yes.label", idex(_("Yes|Yy#y")).c_str()); fl_set_resource("flQuestion.yes.label", idex(_("Yes|#y")).c_str());
fl_set_resource("flQuestion.no.label", idex(_("No|Nn#n")).c_str()); fl_set_resource("flQuestion.no.label", idex(_("No|#n")).c_str());
return fl_show_question((s1 + "\n" + s2 + "\n" + s3).c_str(), 0); return fl_show_question((s1 + "\n" + s2 + "\n" + s3).c_str(), 0);
} }
int askConfirmation_pimpl(string const & s1, string const & s2, string const & s3) int askConfirmation_pimpl(string const & s1, string const & s2, string const & s3)
{ {
fl_set_choices_shortcut(scex(_("Yes|Yy#y")).c_str(), string const yes = _("Yes|#Y");
scex(_("No|Nn#n")).c_str(), string const no = _("No|#N");
scex(_("Cancel|^[")).c_str()); string const cancel = _("Cancel|^[");
fl_set_choices_shortcut(scex(yes).c_str(), scex(no).c_str(),
scex(cancel).c_str());
return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(), return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(),
3, idex(_("Yes|Yy#y")).c_str(), 3, idex(yes).c_str(), idex(no).c_str(),
idex(_("No|Nn#n")).c_str(), idex(cancel).c_str(), 3);
idex(_("Cancel|^[")).c_str(), 3);
} }
pair<bool, string> const askForText_pimpl(string const & msg, string const & dflt) pair<bool, string> const askForText_pimpl(string const & msg, string const & dflt)
{ {
fl_set_resource("flInput.cancel.label", idex(_("Cancel|^[")).c_str()); fl_set_resource("flInput.cancel.label", idex(_("Cancel|^[")).c_str());
fl_set_resource("flInput.ok.label", idex(_("OK|#O")).c_str()); fl_set_resource("flInput.ok.label", idex(_("OK|^M")).c_str());
fl_set_resource("flInput.clear.label", idex(_("Clear|#e")).c_str()); fl_set_resource("flInput.clear.label", idex(_("Clear|#C")).c_str());
char const * tmp = fl_show_input(msg.c_str(), dflt.c_str()); char const * tmp = fl_show_input(msg.c_str(), dflt.c_str());
if (tmp != 0) if (tmp != 0)
return make_pair<bool, string>(true, string(tmp)); return make_pair<bool, string>(true, string(tmp));

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2003-02-27 Angus Leeming <angus@localhost.localdomain>
* Alert_pimpl.C: make shortcuts consistent with the rest of LyX.
2003-02-27 Rob Lahaye <lahaye@snu.ac.kr> 2003-02-27 Rob Lahaye <lahaye@snu.ac.kr>
* FormInclude.[Ch]: use RadiobuttonGroup code, add tooltips and add * FormInclude.[Ch]: use RadiobuttonGroup code, add tooltips and add