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

Cosmetic changes and more assertions.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19551 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-08-14 08:53:34 +00:00
parent d53be50ec1
commit 55aafd2403
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/LyXFunc.cpp
View File

@ -105,6 +105,14 @@
#include <sstream> #include <sstream>
using std::endl;
using std::make_pair;
using std::pair;
using std::string;
using std::istringstream;
using std::ostringstream;
namespace fs = boost::filesystem;
namespace lyx { namespace lyx {
@ -136,15 +144,7 @@ using support::token;
using support::trim; using support::trim;
using support::prefixIs; using support::prefixIs;
using std::endl;
using std::make_pair;
using std::pair;
using std::string;
using std::istringstream;
using std::ostringstream;
namespace Alert = frontend::Alert; namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
namespace { namespace {
@ -234,6 +234,7 @@ void LyXFunc::handleKeyFunc(kb_action action)
if (keyseq->length()) if (keyseq->length())
c = 0; c = 0;
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
lyx_view_->view()->getIntl().getTransManager().deadkey( lyx_view_->view()->getIntl().getTransManager().deadkey(
c, get_accent(action).accent, view()->cursor().innerText(), view()->cursor()); c, get_accent(action).accent, view()->cursor().innerText(), view()->cursor());
// Need to clear, in case the minibuffer calls these // Need to clear, in case the minibuffer calls these
@ -456,7 +457,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
case LFUN_BUFFER_SWITCH: case LFUN_BUFFER_SWITCH:
// toggle on the current buffer, but do not toggle off // toggle on the current buffer, but do not toggle off
// the other ones (is that a good idea?) // the other ones (is that a good idea?)
if (to_utf8(cmd.argument()) == buf->fileName()) if (buf && to_utf8(cmd.argument()) == buf->fileName())
flag.setOnOff(true); flag.setOnOff(true);
break; break;
@ -608,8 +609,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
} }
case LFUN_BUFFER_WRITE: { case LFUN_BUFFER_WRITE: {
enable = view()->buffer()->isUnnamed() enable = lyx_view_->buffer()->isUnnamed()
|| !view()->buffer()->isClean(); || !lyx_view_->buffer()->isClean();
break; break;
} }
@ -877,7 +878,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
BOOST_ASSERT(lyx_view_ && lyx_view_->view()); BOOST_ASSERT(lyx_view_ && lyx_view_->view());
keyseq->reset(); keyseq->reset();
meta_fake_bit = key_modifier::none; meta_fake_bit = key_modifier::none;
if (view()->buffer()) if (lyx_view_->buffer())
// cancel any selection // cancel any selection
dispatch(FuncRequest(LFUN_MARK_OFF)); dispatch(FuncRequest(LFUN_MARK_OFF));
setMessage(from_ascii(N_("Cancel"))); setMessage(from_ascii(N_("Cancel")));
@ -957,7 +958,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
case LFUN_BUFFER_RELOAD: { case LFUN_BUFFER_RELOAD: {
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer()); BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
docstring const file = makeDisplayPath(view()->buffer()->fileName(), 20); docstring const file = makeDisplayPath(lyx_view_->buffer()->fileName(), 20);
docstring text = bformat(_("Any changes will be lost. Are you sure " docstring text = bformat(_("Any changes will be lost. Are you sure "
"you want to revert to the saved version of the document %1$s?"), file); "you want to revert to the saved version of the document %1$s?"), file);
int const ret = Alert::prompt(_("Revert to saved document?"), int const ret = Alert::prompt(_("Revert to saved document?"),
@ -1243,19 +1244,19 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
case LFUN_BUFFER_NEXT: case LFUN_BUFFER_NEXT:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_);
lyx_view_->setBuffer(theBufferList().next(view()->buffer())); lyx_view_->setBuffer(theBufferList().next(lyx_view_->buffer()));
updateFlags = Update::Force; updateFlags = Update::Force;
break; break;
case LFUN_BUFFER_PREVIOUS: case LFUN_BUFFER_PREVIOUS:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_);
lyx_view_->setBuffer(theBufferList().previous(view()->buffer())); lyx_view_->setBuffer(theBufferList().previous(lyx_view_->buffer()));
updateFlags = Update::Force; updateFlags = Update::Force;
break; break;
case LFUN_FILE_NEW: case LFUN_FILE_NEW:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_);
newFile(view(), argument); newFile(lyx_view_->view(), argument);
break; break;
case LFUN_FILE_OPEN: case LFUN_FILE_OPEN:
@ -1511,22 +1512,22 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
break; break;
case LFUN_KEYMAP_OFF: case LFUN_KEYMAP_OFF:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_ && lyx_view_->view());
lyx_view_->view()->getIntl().keyMapOn(false); lyx_view_->view()->getIntl().keyMapOn(false);
break; break;
case LFUN_KEYMAP_PRIMARY: case LFUN_KEYMAP_PRIMARY:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_ && lyx_view_->view());
lyx_view_->view()->getIntl().keyMapPrim(); lyx_view_->view()->getIntl().keyMapPrim();
break; break;
case LFUN_KEYMAP_SECONDARY: case LFUN_KEYMAP_SECONDARY:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_ && lyx_view_->view());
lyx_view_->view()->getIntl().keyMapSec(); lyx_view_->view()->getIntl().keyMapSec();
break; break;
case LFUN_KEYMAP_TOGGLE: case LFUN_KEYMAP_TOGGLE:
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_ && lyx_view_->view());
lyx_view_->view()->getIntl().toggleKeyMap(); lyx_view_->view()->getIntl().toggleKeyMap();
break; break;
@ -1862,7 +1863,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
} }
} }
if (lyx_view_ && view()->buffer()) { if (lyx_view_ && lyx_view_->buffer()) {
// BufferView::update() updates the ViewMetricsInfo and // BufferView::update() updates the ViewMetricsInfo and
// also initializes the position cache for all insets in // also initializes the position cache for all insets in
// (at least partially) visible top-level paragraphs. // (at least partially) visible top-level paragraphs.
@ -1871,7 +1872,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
// Buffer::changed() signals that a repaint is needed. // Buffer::changed() signals that a repaint is needed.
// The frontend (WorkArea) knows which area to repaint // The frontend (WorkArea) knows which area to repaint
// thanks to the ViewMetricsInfo updated above. // thanks to the ViewMetricsInfo updated above.
view()->buffer()->changed(); lyx_view_->buffer()->changed();
} }
lyx_view_->updateStatusBar(); lyx_view_->updateStatusBar();
@ -1880,7 +1881,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
if (flag.enabled() if (flag.enabled()
&& !lyxaction.funcHasFlag(action, LyXAction::NoBuffer) && !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(action, LyXAction::ReadOnly)) && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
view()->buffer()->markDirty(); lyx_view_->buffer()->markDirty();
//Do we have a selection? //Do we have a selection?
theSelection().haveSelection(view()->cursor().selection()); theSelection().haveSelection(view()->cursor().selection());
@ -1952,7 +1953,7 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
string initpath = lyxrc.document_path; string initpath = lyxrc.document_path;
string filename(name); string filename(name);
if (view()->buffer()) { if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath(); string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default. // If directory is writeable, use this as default.
if (isDirWriteable(FileName(trypath))) if (isDirWriteable(FileName(trypath)))
@ -2005,7 +2006,7 @@ void LyXFunc::open(string const & fname)
{ {
string initpath = lyxrc.document_path; string initpath = lyxrc.document_path;
if (view()->buffer()) { if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath(); string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default. // If directory is writeable, use this as default.
if (isDirWriteable(FileName(trypath))) if (isDirWriteable(FileName(trypath)))
@ -2078,7 +2079,7 @@ void LyXFunc::doImport(string const & argument)
if (filename.empty()) { if (filename.empty()) {
string initpath = lyxrc.document_path; string initpath = lyxrc.document_path;
if (view()->buffer()) { if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath(); string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default. // If directory is writeable, use this as default.
if (isDirWriteable(FileName(trypath))) if (isDirWriteable(FileName(trypath)))
@ -2200,7 +2201,8 @@ docstring const LyXFunc::viewStatusMessage()
if (keyseq->length() > 0 && !keyseq->deleted()) if (keyseq->length() > 0 && !keyseq->deleted())
return keyseq->printOptions(true); return keyseq->printOptions(true);
if (!view()->buffer()) BOOST_ASSERT(lyx_view_);
if (!lyx_view_->buffer())
return _("Welcome to LyX!"); return _("Welcome to LyX!");
return view()->cursor().currentState(); return view()->cursor().currentState();