Mercurial > octave-nkf
comparison libgui/src/octave-qt-link.cc @ 19359:2b708273548d gui-release
button order in dialog for creating a non-existing file (bug #43537)
* file-editor.cc (request_open_file): use custom buttons named create and cancel
in dialog asking whether to create a new file or notice
* octave-qt-link.cc (do_prompt_new_edit_file): use buttons named create and
cancel and set appropriate roles in order to get a correct button ordering
depending on the platform
author | Torsten <ttl@justmail.de> |
---|---|
date | Sat, 08 Nov 2014 16:45:13 +0100 |
parents | dfc6ef6ac455 |
children | cbc838b3020c fe689210525c |
comparison
equal
deleted
inserted
replaced
19358:5fb4505b84ff | 19359:2b708273548d |
---|---|
91 return true; | 91 return true; |
92 | 92 |
93 QFileInfo file_info (QString::fromStdString (file)); | 93 QFileInfo file_info (QString::fromStdString (file)); |
94 QStringList btn; | 94 QStringList btn; |
95 QStringList role; | 95 QStringList role; |
96 role << "AcceptRole" << "AcceptRole"; | 96 role << "YesRole" << "RejectRole"; |
97 btn << tr ("Yes") << tr ("No"); | 97 btn << tr ("Create") << tr ("Cancel"); |
98 | 98 |
99 uiwidget_creator.signal_dialog ( | 99 uiwidget_creator.signal_dialog ( |
100 tr ("File\n%1\ndoes not exist. Do you want to create it?"). | 100 tr ("File\n%1\ndoes not exist. Do you want to create it?"). |
101 arg (QDir::currentPath () + QDir::separator () | 101 arg (QDir::currentPath () + QDir::separator () |
102 + QString::fromStdString (file)), | 102 + QString::fromStdString (file)), |
103 tr ("Octave Editor"), "quest", btn, tr ("Yes"), role ); | 103 tr ("Octave Editor"), "quest", btn, tr ("Create"), role ); |
104 | 104 |
105 // Wait while the user is responding to message box. | 105 // Wait while the user is responding to message box. |
106 uiwidget_creator.wait (); | 106 uiwidget_creator.wait (); |
107 // The GUI has sent a signal and the process has been awakened. | 107 // The GUI has sent a signal and the process has been awakened. |
108 QString answer = uiwidget_creator.get_dialog_button (); | 108 QString answer = uiwidget_creator.get_dialog_button (); |
109 | 109 |
110 return (answer == tr ("Yes")); | 110 return (answer == tr ("Create")); |
111 } | 111 } |
112 | 112 |
113 int | 113 int |
114 octave_qt_link::do_message_dialog (const std::string& dlg, | 114 octave_qt_link::do_message_dialog (const std::string& dlg, |
115 const std::string& msg, | 115 const std::string& msg, |