From 53b30ba060d23b7cc5f290d96e8eed64dad34d89 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 17 Jan 2001 17:33:22 +0000 Subject: [PATCH] The bell is dead git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1344 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 6 ++++++ INSTALL | 3 ++- src/BufferView2.C | 2 -- src/ChangeLog | 7 +++++++ src/insets/ChangeLog | 3 +++ src/insets/insettext.C | 1 - src/lyx_gui_misc.h | 7 ------- src/lyxfr1.C | 2 -- src/lyxfunc.C | 9 +-------- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0108b9ed6..4b67542186 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-01-15 Jean-Marc Lasgouttes + + * INSTALL (Problems): add tip about using --with-included-string + on solaris 2.6 with gcc 2.95.2 (ld does not like long symbol + names). + 2001-01-12 Lars Gullik Bjønnes * ChangeLog: store old and begin new diff --git a/INSTALL b/INSTALL index ad7aeb2d7a..b316df9385 100644 --- a/INSTALL +++ b/INSTALL @@ -317,7 +317,8 @@ notify us. o On Tru64 Unix, you may have to compile with --with-included-string to work around a Tru64 linker limitation - (the STL string template creates names which may be too long). + (the STL string template creates names which may be too long). We + also had reports that it helps with gcc 2.95.2 on solaris 2.6. o On Tru64 Unix with cxx, you may have a compilation error in lyx_main.C if you have GNU gettext installed. This is due to a bug diff --git a/src/BufferView2.C b/src/BufferView2.C index 734d7c1fbd..24258b3dfa 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -644,11 +644,9 @@ void BufferView::gotoInset(std::vector const & codes, if (!text->GotoNextInset(this, codes, contents)) { text->cursor = tmp; owner()->getMiniBuffer()->Set(_("No more insets")); - LyXBell(); } } else { owner()->getMiniBuffer()->Set(_("No more insets")); - LyXBell(); } } update(BufferView::SELECT|BufferView::FITCUR); diff --git a/src/ChangeLog b/src/ChangeLog index e73f5b1ccb..542768129e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2000-01-17 John Levon + + * BufferView2.C: + * lyx_gui_misc.h: + * lyxfr1.C: + * lyxfunc.C: kill LyXBell. + 2001-01-17 Dekel Tsur * WorkArea.C (work_area_handler): Decrease keyboard purge thershold. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index e69de29bb2..0506c89ceb 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -0,0 +1,3 @@ +2001-01-17 John Levon + + * insettext.C: kill LyXBell. diff --git a/src/insets/insettext.C b/src/insets/insettext.C index a1f98b5163..8dadb19924 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -783,7 +783,6 @@ InsetText::LocalDispatch(BufferView * bv, // Normal chars case LFUN_UNKNOWN_ACTION: if (bv->buffer()->isReadonly()) { - LyXBell(); // setErrorMessage(N_("Document is read only")); break; } diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h index e12fff1b61..02df389a00 100644 --- a/src/lyx_gui_misc.h +++ b/src/lyx_gui_misc.h @@ -78,11 +78,4 @@ void WarnReadonly(string const & file); /// Get the dpi setting of the current screen float getScreenDPI(); -/// rings the audio bell. -inline -void LyXBell() { - // if (audio()) ON/OFF switch yet to be implemented - //fl_ringbell(20); -} - #endif diff --git a/src/lyxfr1.C b/src/lyxfr1.C index 76a99e9cca..20734ff10c 100644 --- a/src/lyxfr1.C +++ b/src/lyxfr1.C @@ -187,7 +187,6 @@ void LyXFindReplace::SearchReplaceAllCB() } } while (SearchCB(true)); if (replace_count == 0) { - LyXBell(); bv->owner()->getMiniBuffer()->Set( _("String not found!")); } else { @@ -235,7 +234,6 @@ bool LyXFindReplace::SearchCB(bool fForward) bv->owner()->getMiniBuffer()->Set(_("Found.")); result = true; } else { - LyXBell(); bv->owner()->getMiniBuffer()->Set(_("String not found!")); result = false; } diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 0d97f80e20..3f9461e6ec 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -252,7 +252,6 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state) if (action == -1) { if (keyseq.length < -1) { // unknown key sequence... string buf; - LyXBell(); keyseq.print(buf); owner->getMiniBuffer()->Set(_("Unknown sequence:"), buf); return 0; @@ -711,8 +710,7 @@ string const LyXFunc::Dispatch(int ac, // set the new selection // SetSelectionOverLenChars(owner->view()->currentBuffer()->text, iLenSelected); owner->view()->toggleSelection(false); - } else - LyXBell(); + } // REMOVED : if (owner->view()->getWorkArea()->focus) owner->view()->showCursor(); @@ -2915,7 +2913,6 @@ string const LyXFunc::Dispatch(int ac, string lyx_name; string const x11_name = split(argument, lyx_name, ' '); if (lyx_name.empty() || x11_name.empty()) { - LyXBell(); setErrorMessage(N_("Syntax: set-color " " ")); break; @@ -2926,7 +2923,6 @@ string const LyXFunc::Dispatch(int ac, static string const err2 ( N_("\" failed - color is undefined " "or may not be redefined")); - LyXBell(); setErrorMessage(_(err1) + lyx_name + _(err2)); break; } @@ -2938,13 +2934,11 @@ string const LyXFunc::Dispatch(int ac, case LFUN_UNKNOWN_ACTION: { if (!owner->buffer()) { - LyXBell(); setErrorMessage(N_("No document open")); break; } if (owner->buffer()->isReadonly()) { - LyXBell(); setErrorMessage(N_("Document is read only")); break; } @@ -2999,7 +2993,6 @@ string const LyXFunc::Dispatch(int ac, // why is an "Unknown action" with empty // argument even dispatched in the first // place? I`ll probably change that. (Lgb) - LyXBell(); setErrorMessage(N_("Unknown action")); } break; -- 2.39.2