ChangeLog&CREDITS cleanup, Gnome cleanup, clear minibuffer when clicking, warn when save failed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1112 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-10-13 12:20:38 +00:00
parent 5cd869d52d
commit 68cc667219
19 changed files with 306 additions and 242 deletions

206
ChangeLog
View File

@ -1,3 +1,57 @@
2000-10-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ChangeLog: cleanup.
* lib/CREDITS: update to add all the contributors we've forgotten.
I have obviously missed some, so tell me whether there were
errors.
2000-10-13 Marko Vendelin <markov@ioc.ee>
* src/frontends/gnome/FormCitation.C
* src/frontends/gnome/FormCitation.h
* src/frontends/gnome/FormError.C
* src/frontends/gnome/FormIndex.C
* src/frontends/gnome/FormRef.C
* src/frontends/gnome/FormRef.h
* src/frontends/gnome/FormUrl.C: hide dialogs on "update" signal
* src/frontends/gnome/FormCitation.C
* src/frontends/gnome/FormCopyright.C
* src/frontends/gnome/FormError.C
* src/frontends/gnome/FormIndex.C
* src/frontends/gnome/FormRef.C
* src/frontends/gnome/FormToc.C
* src/frontends/gnome/FormUrl.C: replacing gettext N_() with _() where
appropriate.
* src/frontends/gnome/Menubar_pimpl.C
* src/frontends/gnome/Menubar_pimpl.h: using new Menu::expand method to
fill the menus.
2000-10-11 Baruch Even <baruch.even@writeme.com>
* src/minibuffer.h:
* src/minibuffer.C: Changed the method ExecCommand to PrepareForCommand
to convey its real action.
* src/minibuffer.C (peek_event): Added action when mouse clicks to
clear the minibuffer and prepare to enter a command.
* src/mathed/formula.C (LocalDispatch): Changed to conform with
the rename from ExecCommand to PrepareForCommand.
* src/lyxfunc.C (Dispatch): ditto.
2000-10-11 Baruch Even <baruch.even@writeme.com>
* src/buffer.C (writeFile): Added test for errors on writing, this
catches all errors and not only file system full errors as intended.
2000-10-13 Dekel Tsur <dekelts@tau.ac.il>
* src/lyx_gui.C (create_forms): better fix for crash with
translated interface.
2000-10-12 John Levon <moz@compsoc.man.ac.uk>
* src/frontends/kde/Makefile.am:
@ -19,7 +73,7 @@
* lib/lyxrc.example: Fixed hebrew example.
2000-10-13 Allan Rae <rae@lyx.org>
2000-10-13 Allan Rae <rae@lyx.org>
* src/frontends/xforms/FormPreferences.C (input): reworking the
checking
@ -260,7 +314,7 @@
* lib/Makefile.am (EXTRA_DIST): add encodings and languages
2000-10-12 <larsbj@baywatch.lyx.org>
2000-10-12 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/support/lyxfunctional.h: add operator= that takes a reference
@ -464,7 +518,7 @@
* lib/encodings: New file.
* src/language.C (Languages): New class.
(read): New method. Reads the languages from the 'languages' file.
(read): New method. Reads the languages from the 'languages' file.
* src/encoding.C (Encodings): New class.
(read): New method. Reads the encodings from the 'encodings' file.
@ -485,33 +539,33 @@
2000-10-10 Angus Leeming <a.leeming@ic.ac.uk>
* src/BufferView_pimpl.C (buffer): cleaned up a little.
* src/BufferView_pimpl.C (buffer): cleaned up a little.
* src/insets/figinset.[Ch]:
* src/insets/insetinclude.[Ch]:
* src/insets/insetinclude.[Ch]:
* src/insets/insetparent.[Ch]:
* src/insets/insetref.[Ch]:
* src/insets/insettabular.[Ch] (c-tor): Buffer passed as const &.
* src/insets/figinset.[Ch]:
* src/insets/insetinclude.[Ch]:
* src/insets/insetinclude.[Ch]:
* src/insets/insetparent.[Ch]:
* src/insets/insetref.[Ch]:
* src/insets/insettabular.[Ch] (c-tor): Buffer passed as const &.
* src/insets/*.[Ch]:
* src/mathed/formula.[Ch]:
* src/mathed/formulamacro.C (Clone): passed Buffer const &.
* src/insets/*.[Ch]:
* src/mathed/formula.[Ch]:
* src/mathed/formulamacro.C (Clone): passed Buffer const &.
* src/buffer.C (parseSingleLyXformat2Token, readInset):
* src/lyx_cb.C (FigureApplyCB):
* src/lyxfunc.C (getStatus, Dispatch):
* src/frontends/xforms/FormTabular.C: use modified c-tors to some
insets.
* src/buffer.C (parseSingleLyXformat2Token, readInset):
* src/lyx_cb.C (FigureApplyCB):
* src/lyxfunc.C (getStatus, Dispatch):
* src/frontends/xforms/FormTabular.C: use modified c-tors to some
insets.
* src/lyxfunc.C (Dispatch): string "ref" not used. Removed.
* src/lyxfunc.C (Dispatch): string "ref" not used. Removed.
* src/converter.[Ch] (Formats::View):
* src/lyx_cb.[Ch] (ShowMessage): constify Buffer * parameter.
* src/converter.[Ch] (Formats::View):
* src/lyx_cb.[Ch] (ShowMessage): constify Buffer * parameter.
* src/paragraph.C (CopyIntoMinibuffer, Clone): Insets::Clone() passed
*current_view->buffer(). This will change later, but this patch is way
big enough already!
* src/paragraph.C (CopyIntoMinibuffer, Clone): Insets::Clone() passed
*current_view->buffer(). This will change later, but this patch is way
big enough already!
2000-10-09 Juergen Vigna <jug@sad.it>
@ -839,7 +893,7 @@
* src/lyx_cb.C: Remove old literate code.
* src/lyxrc.[Ch]: Remove many obsolete (due to new export code)
variables.
variables.
* src/lyxfunc.C (getStatus): Use Exporter::IsExportable
* src/converter.C (View, Convert): Use QuoteName.
@ -1088,7 +1142,7 @@
* src/frontends/xforms/ButtonController.h (class ButtonController):
Switch from template implementation to taking Policy parameter.
Allows FormBase to provide a ButtonController for any dialog.
Allows FormBase to provide a ButtonController for any dialog.
* src/frontends/xforms/FormPrint.C (connect): setup sizing at show-time
Probably should rename connect and disconnect.
@ -1773,10 +1827,10 @@
2000-09-13 John Levon <moz@compsoc.man.ac.uk>
* src/frontends/kde/formtocdialog.C
* src/frontends/kde/formtocdialog.h
* src/frontends/kde/FormToc.C
* src/frontends/kde/FormToc.h: change to make TOC hierarchical properly
* src/frontends/kde/formtocdialog.C
* src/frontends/kde/formtocdialog.h
* src/frontends/kde/FormToc.C
* src/frontends/kde/FormToc.h: change to make TOC hierarchical properly
2000-09-11 John Levon <moz@compsoc.man.ac.uk>
@ -1827,7 +1881,7 @@
for Ascii.
* src/lyx_main.C (LyX): Call to QuitLyX() to remove temporary
directory!
directory!
(easyParse): Fixed to work with new export code.
* src/support/filetools.C (DeleteAllFilesInDir) Fixed to delete
@ -1998,13 +2052,13 @@
2000-08-30 Dekel Tsur <dekel@math.tau.ac.il>
* src/commandtags.h: Added LFUN_GOTO_PARAGRAPH.
Removed LFUN_REF_CREATE.
Removed LFUN_REF_CREATE.
* src/MenuBackend.C: Added new tags: toc and references
* src/frontends/xforms/Menubar_pimpl.C: Removed the use of StrPool
(add_lastfiles, add_documents, add_formats): Removed the unused smn
parameter.
parameter.
(add_toc, add_references): New methods.
(create_submenu): Handle correctly the case when there is a
seperator after optional menu items.
@ -2544,7 +2598,7 @@
the set_[max|min]size workaround and a few other cleanups. Actually,
Angus' patch from 20000809.
2000-08-13 Baruch Even <baruch.even@writeme.com>
2000-08-13 Baruch Even <baruch.even@writeme.com>
* src/insets/insetgraphics.C (Clone): Added several fields that needed
copying.
@ -2587,7 +2641,7 @@
(InsetGraphics): initialized cacheHandle to 0.
(draw): changed call to updateInset to status=CHANGE_IN_DRAW.
2000-08-10 Baruch Even <baruch.even@writeme.com>
2000-08-10 Baruch Even <baruch.even@writeme.com>
* src/graphics/GraphicsCache.h:
* src/graphics/GraphicsCache.C (addFile, removeFile): Changed to work
@ -2793,11 +2847,11 @@
usefull.
* src/insets/insetgraphics.h:
* src/insets/insetgraphics.C: Added the use of the GraphicsCache and the
drawing of the inline image.
* src/insets/insetgraphics.C: Added the use of the GraphicsCache
and the drawing of the inline image.
* src/buffer.C: Fixed a bug where a loaded InsetGraphics would be loaded
into the wrong position.
* src/buffer.C: Fixed a bug where a loaded InsetGraphics would be
loaded into the wrong position.
* src/lyxfunc.C: When adding an InsetGraphics the edit dialog is now
launched.
@ -3626,7 +3680,7 @@
* acinclude.m4: recreated
2000-07-24 Amir Karger
2000-07-24 Amir Karger <karger@lyx.org>
* README: add Hebrew, Arabic kmaps
* ANNOUNCE: typo
@ -4201,7 +4255,7 @@
2000-07-07 Juergen Vigna <jug@sad.it>
* src/screen.C (ToggleSelection): added y_offset and x_offset
parameters.
parameters.
* src/insets/insettext.C (InsetMotionNotify): fixed selection with
mouse.
@ -4240,7 +4294,7 @@
processing inside class.
* src/insets/insetindex.h new struct Holder, consistent with other
insets.
insets.
* src/insets/insetcite.[Ch] and elsewhere: stripped out xforms
citation dialog from main code and placed it in src/frontends/xforms.
@ -5320,10 +5374,10 @@
* src/menus.C (Limit_string_length): New function
(ShowTocMenu): Limit the number of items/length of items in the
LOT/LOF/LOA menus.
LOT/LOF/LOA menus.
* src/paragraph.C (String): Correct result for a paragraph inside
a footnote.
a footnote.
2000-06-05 Lars Gullik Bjønnes <larsbj@lyx.org>
@ -5405,7 +5459,7 @@
2000-05-30 Dekel Tsur <dekel@math.tau.ac.il>
* src/text2.C (InsertStringA): Fix a bug with insertion into table
* src/text2.C (InsertStringA): Fix a bug with insertion into table
* src/trans_mgr.C (insertVerbatim): Do not use insetquote when the
text is Hebrew.
@ -5695,7 +5749,7 @@
* src/BufferView2.C (ChangeRefs): New method.
* src/buffer.C (getLabelList): New method. It replaces the old
getReferenceList. The return type is vector<string> instead of
getReferenceList. The return type is vector<string> instead of
string.
* src/insets/insetinclude.C (getLabelList): New method. Replaces
@ -5706,7 +5760,7 @@
* src/paragraph.C (String): New method.
* src/lyx_cb.C (TocSelectCB,TocUpdateCB): Rewritten.
Uses the new getTocList() method.
Uses the new getTocList() method.
TocSelectCB() now calls to TocUpdateCB() before moving the cursor,
which automatically updates the contents of the browser.
(RefUpdateCB): Use the new getLabelList method.
@ -6426,7 +6480,7 @@
* src/mathed/math_write.C
(MathMatrixInset::Write) Put \protect before \begin{array} and
\end{array} if fragile
(MathParInset::Write): Put \protect before \\ if fragile
(MathParInset::Write): Put \protect before \\ if fragile
2000-04-15 Lars Gullik Bjønnes <larsbj@lyx.org>
@ -6765,7 +6819,7 @@
* src/insets/insetcommand.C (draw): Increase x correctly.
* src/screen.C (ShowCursor): Change cursor shape if
current language != document language.
current language != document language.
* src/lyxfunc.C (dispatch): Added calls to owner->view()->setState()
@ -6931,7 +6985,7 @@
adding title elements to where they belong.
* lib/layouts/scrclass.inc: changed to include stdtitle.inc, then
define the additional tilte elements and then include
define the additional title elements and then include
stdstruct.inc.
* many other layout files: changed to include stdtitle.inc just
@ -6947,7 +7001,7 @@
* lib/lyxrc.example: Added descriptions of recently added variables
* src/insets/insetbib.[Ch]: Fixed few bugs (crash when editing a
bibtex inset, not closing the bibtex popup when deleting the inset)
bibtex inset, not closing the bibtex popup when deleting the inset)
2000-03-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
@ -6966,8 +7020,8 @@
2000-03-16 Dekel Tsur <dekel@math.tau.ac.il>
* src/lyxfont.h Replaced the member variable bits.direction by the
member variable lang. Made many changes in other files.
This allows having a multi-lingual document
member variable lang. Made many changes in other files.
This allows having a multi-lingual document
* src/lyxfunc.C, src/lyx_cb.C Added a new command "language <l>"
that change the current language to <l>.
@ -7209,20 +7263,20 @@
the containing paragraph's style.
* src/insets/inseturl.C, src/insets/inseturl.h (Latex):
Added free_spacing boolean arg to match inset.h
Added free_spacing boolean arg to match inset.h
* src/insets/insettext.C, src/insets/insettext.h (Latex):
Added free_spacing boolean arg to match inset.h
Added free_spacing boolean arg to match inset.h
* src/insets/insetspecialchar.C, src/insets/insetspecialchar.h (Latex):
Added free_spacing boolean and made sure that if in a free_spacing
paragraph, that we output normal space if there is a protected space.
Added free_spacing boolean and made sure that if in a free_spacing
paragraph, that we output normal space if there is a protected space.
* src/insets/insetref.C, src/insets/insetref.h (Latex):
Added free_spacing boolean arg to match inset.h
Added free_spacing boolean arg to match inset.h
* src/insets/insetquotes.C, src/insets/insetquotes.h (Latex):
Added free_spacing boolean arg to match inset.h
Added free_spacing boolean arg to match inset.h
* src/insets/insetparent.C, src/insets/insetparent.h (Latex):
Added free_spacing boolean arg to match inset.h
@ -7339,7 +7393,7 @@
* src/insets/insetfoot.[Ch]: added footnote inset
* src/insets/insetcollapsable.[Ch]: added this BaseClass for
collapsable insets (like footnote, ert, ...)
collapsable insets (like footnote, ert, ...)
2000-03-08 Lars Gullik Bjønnes <larsbj@lyx.org>
@ -7491,7 +7545,7 @@
2000-03-02 Juergen Vigna <jug@sad.it>
* src/insets/insettext.C (WriteParagraphData): Using the
par->writeFile() function for writing paragraph-data.
par->writeFile() function for writing paragraph-data.
(Read): Using buffer->parseSingleLyXformat2Token()-function
for parsing paragraph data!
@ -8776,13 +8830,13 @@
* configure.in: Attempted to use LYX_PATH_HEADER
* src/stl_string_fwd.h: Don't need HAVE_STL_STRING_FWD_H anymore
* src/stl_string_fwd.h: Don't need HAVE_STL_STRING_FWD_H anymore
* acconfig.h, acinclude.m4 (LYX_STL_STRING_FWD): totally revised after
input from JMarc. Now use preprocessor to find the header.
Also stopped making HAVE_STL_STRING_FWD_H and extended the comments.
input from JMarc. Now use preprocessor to find the header.
Also stopped making HAVE_STL_STRING_FWD_H and extended the comments.
(LYX_PATH_HEADER): My, so far, failed attempt to generalize
LYX_STL_STRING_FWD. See comments in file.
LYX_STL_STRING_FWD. See comments in file.
1999-12-19 Asger Alstrup Nielsen <alstrup@diku.dk>
@ -8909,7 +8963,7 @@
* src/stl_string_fwd.h, src/Makefile.am (lyx_SOURCES): added new
header that provides a wrapper around the very annoying SGI STL header
of the same name.
of the same name.
* src/support/lyxstring.C, src/LString.h:
removed old SGI-STL-compatability attempts.
@ -8918,7 +8972,7 @@
* acinclude.m4 (LYX_STL_STRING_FWD), acconfig.h: Test if
stl_string_fwd.h is around and try to determine it's location.
Major improvement over previous SGI STL 3.2 compatability.
Major improvement over previous SGI STL 3.2 compatability.
Three small problems remain with this function due to my zero
knowledge of autoconf. JMarc and lgb see the comments in the code.
@ -8964,7 +9018,7 @@
1999-12-13 Allan Rae <rae@lyx.org>
* src/mathed/math_hash.C (math_hash): renamed from hash(), name clash.
(in_word_set): hash() -> math_hash()
(in_word_set): hash() -> math_hash()
* src/LString.h: Used USING_EXCEPTIONS in SGI STL-3.2 support
@ -8979,8 +9033,8 @@
exceptions enabled so I've a bit more to add yet.
* src/insets/figinset.[Ch], src/insets/insetinclude.C,
src/insets/insetloa.C, src/layout.h, src/lyxparagraph.h,
src/support/LRegex.h, src/undo.h:
src/insets/insetloa.C, src/layout.h, src/lyxparagraph.h,
src/support/LRegex.h, src/undo.h:
Shuffle the order of the included files a little to ensure that
LString.h gets included before anything that includes stl_string_fwd.h
@ -10172,7 +10226,7 @@
* src/lyx.C (create_form_form_ref) +
* forms/lyx.fd: Changed Gravity on name input field so that it is
resized correctly.
resized correctly.
1999-10-22 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
@ -10247,7 +10301,7 @@
again. This avoids for now a segfault, but we have a memory leak!
* src/lyxfunc.C (processKeyEvent) (Dispatch): changed
'const char * argument' to 'string argument', this should
'const char * argument' to 'string argument', this should
fix some Asserts() in lyxstring.C.
* src/lyxfunc.h: Removed the function argAsString(const char *)
@ -10357,7 +10411,7 @@
* many files: change all callback functions to "C" linkage
functions to please strict C++ compilers like DEC cxx 6.1 in mode
strict_ansi. Those who were static are now global.
The case of callbacks which are static class members is
The case of callbacks which are static class members is
trickier, since we have to make C wrappers around them (see
InsetError, InsetInfo and InsetUrl). The same holds for friends. I
did not finish this yet, since it defeats the purpose of
@ -10372,9 +10426,9 @@
find_first(_not)_of with find_last_of.
* src/TableLayout.C (UpdateLayoutTable) (TableOptionsCB)
(TableOptCloseCB) (TableSpeCloseCB):
(TableOptCloseCB) (TableSpeCloseCB):
inserted fl_set_focus call for problem with fl_hide_form() in
xforms-0.89.
xforms-0.89.
1999-10-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
@ -10740,7 +10794,7 @@
from LString among others in that it does not allow null pointers
passed in and will abort if it gets any.
* Added the revtex4 files I forgot when setting up the repository.
* Added the revtex4 files I forgot when setting up the repository.
1999-09-27 Lars Gullik Bjønnes <larsbj@lyx.org>

View File

@ -35,21 +35,39 @@
@bFrancesc Burrull i Mestres
@iE-mail: fburrull@mat.upc.es
Catalan translation.
@bMatej Cepl
@iE-mail: CeplM@seznam.cz
Improvements to the czech keymaps
@bClaudio Coco
@iE-mail: lacocio@iol.it
Italian translation
@bedscott
@iE-mail: edscott@imp.mx
Various bug fixes
@bMatthias Ettrich
@iE-mail: ettrich@kde.org
started the project, implemented
the early versions, various improvements
including undo/redo, tables,
and much, much more.
@bBaruch Even
@iE-mail: baruch.even@writeme.com
New graphics handling scheme and more
@bJohn Michael Floyd
@iE-mail: jmf@pwd.nsw.gov.au
fix to spellchecker.C
@bStefano Ghirlanda
@istefano@zool.su.se
Improvements to lyxserver; LyX-Client perl package
@bHartmut Goebel
@iE-mail: goebel@noris.net
Improvements to Koma-Script classes
@bClaus Hentschel
@iE-mail claus.hentschel@mbau.fh-hannover.de
Win32 port of LyX 1.1.x
@bBernard Michael Hurley
@iE-mail: bernardh@westherts.ac.uk
Fixes to literate programming support.
@bBernhard Iselborn
@iE-mail: biselbor@rhrk.uni-kl.de
some minor bug-fixes, FAQ
@ -81,12 +99,21 @@
@bBernd Kümmerlen
@iE-mail: bkuemmer@ix.urz.uni-heidelberg.de
Initial version of the koma-script textclasses
@bR. Lahaye
@iE-mail: lahaye@postech.ac.kr
-geometry command line option
@bJean-Marc Lasgouttes
@iE-mail: Jean-Marc.Lasgouttes@inria.fr
configure and Makefile-stuff and more
@bVictor Lavrenko
@iE-mail: lyx@lavrenko.pp.ru
Russian translation
@bAngus Leeming
@iE-mail: a.leeming@ic.ac.uk
GUI-I-fication of insets and more
@bJohn Levon
@iE-mail moz@compsoc.man.ac.uk
KDE port
@bJose' Matos
@iE-mail: jamatos@novalis.fc.up.pt
linuxdoc sgml support
@ -154,13 +181,16 @@
@bDekel Tsur
@iE-mail: dekel@math.tau.ac.il
Hebrew support.
Few bug fixes.
Many bug fixes.
@bMatthias Ulrichs
@iE-mail: urlichs@smurf.noris.de
bug reports and small fixes
@bH. Turgut Uyar
@iE-mail: uyar@cs.itu.edu.tr
turkish kbmaps
@bMarko Vendelin
@iE-mail: markov@ioc.ee
Gnome frontend
@bMartin Vermeer
@iE-mail: mv@fgi.fi
svjour/svjog, egs and llncs document classes
@ -178,6 +208,9 @@
@iE-mail: edmar-w-jr@technologist.com
Literate programming support
Various bug fixes
@bSerge Winitzki
@iE-mail: winitzki@erebus.phys.cwru.edu
Updates to the Scientific Word bindings
@bStephan Witt
@iE-mail: stephan.witt@beusen.de
Support for page selection for printing

View File

@ -1238,9 +1238,31 @@ bool Buffer::writeFile(string const & fname, bool flag) const
// Write marker that shows file is complete
ofs << "\n\\the_end" << endl;
ofs.close();
// how to check if close went ok?
return true;
// Following is an attempt... (BE 20001011)
// good() returns false if any error occured, including some
// formatting error.
// bad() returns true if something bad happened in the buffer,
// which should include file system full errors.
bool status = true;
if (!ofs.good()) {
status = false;
#if 0
if (ofs.bad()) {
lyxerr << "Buffer::writeFile: BAD ERROR!" << endl;
} else {
lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!"
<< endl;
}
#endif
}
return status;
}

View File

@ -94,9 +94,6 @@ void FormCitation::showInset( InsetCommand * const inset )
inset_ = inset;
ih_ = inset_->hide.connect(slot(this, &FormCitation::hide));
#ifdef WITH_WARNINGS
#warning This connection to update will do nothing!
#endif
u_ = d_->updateBufferDependent.connect(slot(this, &FormCitation::update));
h_ = d_->hideBufferDependent.connect(slot(this, &FormCitation::hide));
@ -371,8 +368,8 @@ void FormCitation::showStageAction()
Gtk::Alignment * mbox = manage( new Gtk::Alignment(0.5, 0.5, 0, 0) );
Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
string const addlabel = N_("_Add new citation");
string const editlabel = N_("_Edit/remove citation(s)");
string const addlabel = _("_Add new citation");
string const editlabel = _("_Edit/remove citation(s)");
Gnome::PixButton * b_add = manage(new Gnome::PixButton(addlabel, GNOME_STOCK_PIXMAP_NEW));
Gnome::PixButton * b_edit = manage(new Gnome::PixButton(editlabel, GNOME_STOCK_PIXMAP_PROPERTIES));
@ -397,7 +394,7 @@ void FormCitation::showStageAction()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Citation: Select action "), false, accel);
mainAppWin->add_action(*dialog_, _(" Citation: Select action "), false, accel);
initWidgets();
@ -451,9 +448,9 @@ void FormCitation::showStageSearch()
search_text_ = manage( new Gnome::Entry() );
button_regexp_ = manage( new Gtk::CheckButton(N_("Use Regular Expression")) );
button_regexp_ = manage( new Gtk::CheckButton(_("Use Regular Expression")) );
b_ok = manage( new Gtk::Button(N_("Search")) );
b_ok = manage( new Gtk::Button(_("Search")) );
b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
// set up spacing
@ -471,7 +468,7 @@ void FormCitation::showStageSearch()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Insert Citation: Enter keyword(s) or regular expression "));
mainAppWin->add_action(*dialog_, _(" Insert Citation: Enter keyword(s) or regular expression "));
initWidgets();
@ -527,11 +524,11 @@ void FormCitation::showStageSelect()
// constructing CList
vector<string> colnames;
colnames.push_back("INVISIBLE");
colnames.push_back(N_("Key"));
colnames.push_back(N_("Author(s)"));
colnames.push_back(N_("Title"));
colnames.push_back(N_("Year"));
colnames.push_back(N_("Journal"));
colnames.push_back(_("Key"));
colnames.push_back(_("Author(s)"));
colnames.push_back(_("Title"));
colnames.push_back(_("Year"));
colnames.push_back(_("Journal"));
clist_bib_ = manage( new Gtk::CList(colnames) );
bbox->set_layout(GTK_BUTTONBOX_END);
@ -549,7 +546,7 @@ void FormCitation::showStageSelect()
bbox->children().push_back(Element(*b_ok, false, false));
bbox->children().push_back(Element(*b_cancel, false, false));
tbox->children().push_back(Element(*manage(new Gtk::Label(N_("Text after"))), false, false));
tbox->children().push_back(Element(*manage(new Gtk::Label(_("Text after"))), false, false));
tbox->children().push_back(Element(*text_after_, true, true));
tbox->children().push_back(Element(*manage(new Gtk::VSeparator()), false, false));
tbox->children().push_back(Element(*bbox, false, false));
@ -560,7 +557,7 @@ void FormCitation::showStageSelect()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Insert Citation: Select citation "), true);
mainAppWin->add_action(*dialog_, _(" Insert Citation: Select citation "), true);
initWidgets();
@ -607,9 +604,9 @@ void FormCitation::showStageEdit()
text_after_ = manage( new Gnome::Entry() );
button_unselect_ = manage( new Gnome::PixButton( N_("_Remove"), GNOME_STOCK_PIXMAP_TRASH ) );
button_up_ = manage( new Gnome::PixButton( N_("_Up"), GNOME_STOCK_PIXMAP_UP ) );
button_down_ = manage( new Gnome::PixButton( N_("_Down"), GNOME_STOCK_PIXMAP_DOWN ) );
button_unselect_ = manage( new Gnome::PixButton( _("_Remove"), GNOME_STOCK_PIXMAP_TRASH ) );
button_up_ = manage( new Gnome::PixButton( _("_Up"), GNOME_STOCK_PIXMAP_UP ) );
button_down_ = manage( new Gnome::PixButton( _("_Down"), GNOME_STOCK_PIXMAP_DOWN ) );
b_ok = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_OK) ) );
b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
@ -639,7 +636,7 @@ void FormCitation::showStageEdit()
t2box->children().push_back(Element(*sw, true, true));
t2box->children().push_back(Element(*actbbox, false, false));
tbox->children().push_back(Element(*manage(new Gtk::Label(N_("Text after"))), false, false));
tbox->children().push_back(Element(*manage(new Gtk::Label(_("Text after"))), false, false));
tbox->children().push_back(Element(*text_after_, true, true));
tbox->children().push_back(Element(*manage(new Gtk::VSeparator()), false, false));
tbox->children().push_back(Element(*bbox, false, false));
@ -657,7 +654,7 @@ void FormCitation::showStageEdit()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Citation: Edit "), true, accel);
mainAppWin->add_action(*dialog_, _(" Citation: Edit "), true, accel);
initWidgets();
@ -729,6 +726,13 @@ void FormCitation::updateButtons()
}
}
void FormCitation::update(bool buffchanged)
{
if (buffchanged) hide();
}
void FormCitation::selectionToggled(gint row,
gint ,//column,
GdkEvent * ,//event,
@ -749,7 +753,7 @@ void FormCitation::selectionToggled(gint row,
if (keyfound)
info_->show_string(info);
else
info_->show_string(N_("--- No such key in the database ---"));
info_->show_string(_("--- No such key in the database ---"));
}
else
{

View File

@ -45,8 +45,8 @@ private:
/// Slot launching dialog to an existing inset
void showInset( InsetCommand * const );
/// The following three methods do nothing in this implementation
virtual void update(bool = false) { }
virtual void update(bool = false);
/// The following two methods do nothing in this implementation
virtual void apply() { }
void show() { }

View File

@ -12,6 +12,7 @@
*/
#include <config.h>
#include "gettext.h"
#include "Dialogs.h"
#include "FormCopyright.h"
@ -42,9 +43,9 @@ void FormCopyright::show()
vector<string> authors; //null. Authors are not listed in LyX copyright dialogbox.
dialog_ = new Gnome::About(PACKAGE, VERSION,
"(C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team",
_("(C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team"),
authors,
"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\nLyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.",
_("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\nLyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."),
NULL);
// it should be disconnected before deleting dialog_ in FormCopyright::hide()

View File

@ -86,7 +86,7 @@ void FormError::show()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Error "));
mainAppWin->add_action(*dialog_, _(" Error "));
// setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_close->gtkobj()), GTK_CAN_DEFAULT);
@ -102,8 +102,9 @@ void FormError::show()
}
}
void FormError::update(bool)
void FormError::update(bool buffchanged)
{
if (buffchanged) hide();
}
void FormError::hide()

View File

@ -86,7 +86,7 @@ void FormIndex::show()
{
using namespace Gtk::Box_Helpers;
Gtk::Label * label = manage( new Gtk::Label(N_("Keyword")) );
Gtk::Label * label = manage( new Gtk::Label(_("Keyword")) );
Gtk::Box * mbox = manage( new Gtk::HBox() );
Gtk::ButtonBox * bbox = manage( new Gtk::HButtonBox() );
Gtk::Separator * sep = manage( new Gtk::VSeparator() );
@ -116,7 +116,7 @@ void FormIndex::show()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Index "));
mainAppWin->add_action(*dialog_, _(" Index "));
// setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(keyword_->get_entry()->gtkobj()), GTK_CAN_DEFAULT);
@ -140,10 +140,11 @@ void FormIndex::show()
void FormIndex::update(bool switched)
{
if (switched) {
if (switched)
{
hide();
return;
}
}
if (dialog_ != NULL &&
lv_->view()->available())

View File

@ -113,7 +113,7 @@ void FormRef::showStageError(string const & mess)
// packing dialog to main window
dialog_ = alig;
mainAppWin->add_action(*dialog_, N_(" Reference "));
mainAppWin->add_action(*dialog_, _(" Reference "));
// setting focus
gtk_widget_grab_focus (GTK_WIDGET(b_cancel->gtkobj()));
@ -182,7 +182,7 @@ void FormRef::showStageSelect()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" Reference: Select reference "), true);
mainAppWin->add_action(*dialog_, _(" Reference: Select reference "), true);
// setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_ok->gtkobj()), GTK_CAN_DEFAULT);
@ -251,27 +251,27 @@ void FormRef::showStageAction()
Gtk::Menu * menu = manage( new Gtk::Menu() );
Gtk::MenuItem * e;
e = manage( new Gtk::MenuItem(N_("Ref")) );
e = manage( new Gtk::MenuItem(_("Ref")) );
e->activate.connect(bind<Type>(slot(this, &FormRef::changeType), REF));
e->show();
menu->append( *e );
e = manage( new Gtk::MenuItem(N_("Page")) );
e = manage( new Gtk::MenuItem(_("Page")) );
e->activate.connect(bind<Type>(slot(this, &FormRef::changeType), PAGEREF));
e->show();
menu->append( *e );
e = manage( new Gtk::MenuItem(N_("TextRef")) );
e = manage( new Gtk::MenuItem(_("TextRef")) );
e->activate.connect(bind<Type>(slot(this, &FormRef::changeType), VREF));
e->show();
menu->append( *e );
e = manage( new Gtk::MenuItem(N_("TextPage")) );
e = manage( new Gtk::MenuItem(_("TextPage")) );
e->activate.connect(bind<Type>(slot(this, &FormRef::changeType), VPAGEREF));
e->show();
menu->append( *e );
e = manage( new Gtk::MenuItem(N_("PrettyRef")) );
e = manage( new Gtk::MenuItem(_("PrettyRef")) );
e->activate.connect(bind<Type>(slot(this, &FormRef::changeType), PRETTYREF));
e->show();
menu->append( *e );
@ -297,8 +297,8 @@ void FormRef::showStageAction()
bbox->children().push_back(Element(*b_ok, false, false));
bbox->children().push_back(Element(*b_cancel, false, false));
table->attach( *manage( new Gtk::Label(N_("Type:")) ), 0, 1, 0, 1, 0, 0 );
table->attach( *manage( new Gtk::Label(N_("Name:")) ), 0, 1, 1, 2, 0, 0 );
table->attach( *manage( new Gtk::Label(_("Type:")) ), 0, 1, 0, 1, 0, 0 );
table->attach( *manage( new Gtk::Label(_("Name:")) ), 0, 1, 1, 2, 0, 0 );
table->attach( *choice_, 1, 2, 0, 1 );
table->attach( *name_, 1, 2, 1, 2 );
@ -308,7 +308,7 @@ void FormRef::showStageAction()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, string(N_(" Reference: ")) + params.getContents() + string(" "));
mainAppWin->add_action(*dialog_, string(_(" Reference: ")) + params.getContents() + string(" "));
// setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(b_cancel->gtkobj()), GTK_CAN_DEFAULT);
@ -329,6 +329,11 @@ void FormRef::showStageAction()
}
}
void FormRef::update(bool buffchanged)
{
if (buffchanged) hide();
}
void FormRef::hide()
{
if (dialog_!=NULL) mainAppWin->remove_action();

View File

@ -72,7 +72,7 @@ private:
void showInset( InsetCommand * const );
/// Update dialog before showing it (not used in this implementation)
virtual void update(bool = false) { hide(); }
virtual void update(bool = false);
/// Apply from dialog (modify or create inset)
virtual void apply();
/// Explicitly free the dialog.

View File

@ -97,19 +97,19 @@ void FormToc::show()
choice_->get_menu()->items().clear();
e = manage( new Gtk::MenuItem(N_("Table of Contents")) );
e = manage( new Gtk::MenuItem(_("Table of Contents")) );
e->activate.connect(bind<Buffer::TocType>(slot(this, &FormToc::changeList), Buffer::TOC_TOC));
choice_->get_menu()->append( *e );
e = manage( new Gtk::MenuItem(N_("List of Figures")) );
e = manage( new Gtk::MenuItem(_("List of Figures")) );
e->activate.connect(bind<Buffer::TocType>(slot(this, &FormToc::changeList), Buffer::TOC_LOF));
choice_->get_menu()->append( *e );
e = manage( new Gtk::MenuItem(N_("List of Tables")) );
e = manage( new Gtk::MenuItem(_("List of Tables")) );
e->activate.connect(bind<Buffer::TocType>(slot(this, &FormToc::changeList), Buffer::TOC_LOT));
choice_->get_menu()->append( *e );
e = manage( new Gtk::MenuItem(N_("List of Algorithms")) );
e = manage( new Gtk::MenuItem(_("List of Algorithms")) );
e->activate.connect(bind<Buffer::TocType>(slot(this, &FormToc::changeList), Buffer::TOC_LOA));
choice_->get_menu()->append( *e );
@ -117,7 +117,7 @@ void FormToc::show()
b_refresh = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_refresh") ) );
b_close = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_close") ) );
b_refresh->clicked.connect(slot(this, &FormToc::update));
b_refresh->clicked.connect(bind<bool>(slot(this, &FormToc::update),false));
b_close->clicked.connect(dialog_->destroy.slot());
dialog_->destroy.connect(slot(this, &FormToc::free));
@ -145,7 +145,7 @@ void FormToc::update(bool)
if (dialog_ != NULL &&
!lv_->view()->available())
{
wintitle = N_( "*** No Document ***");
wintitle = _( "*** No Document ***");
dialog_->set_title(wintitle);
list_->items().clear();
@ -164,25 +164,25 @@ void FormToc::update(bool)
if( params.getCmdName() == "tableofcontents" )
{
type = Buffer::TOC_TOC;
wintitle = N_("Table of Contents");
wintitle = _("Table of Contents");
selection = 0;
}
else if( params.getCmdName() == "listoffigures" )
{
type = Buffer::TOC_LOF;
wintitle = N_("List of Figures");
wintitle = _("List of Figures");
selection = 1;
}
else if( params.getCmdName() == "listofalgorithms" )
{
type = Buffer::TOC_LOA;
wintitle = N_("List of Algorithms");
wintitle = _("List of Algorithms");
selection = 3;
}
else
{
type = Buffer::TOC_LOT;
wintitle = N_("List of Tables");
wintitle = _("List of Tables");
selection = 2;
}

View File

@ -88,7 +88,7 @@ void FormUrl::show()
url_ = manage( new Gnome::Entry() );
name_ = manage( new Gnome::Entry() );
html_type_ = manage( new Gtk::CheckButton(N_("HTML type")) );
html_type_ = manage( new Gtk::CheckButton(_("HTML type")) );
b_ok = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_OK) ) );
b_cancel = Gtk::wrap( GTK_BUTTON( gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL) ) );
@ -114,9 +114,9 @@ void FormUrl::show()
bbox->children().push_back(Element(*b_ok, false, false));
bbox->children().push_back(Element(*b_cancel, false, false));
label = manage( new Gtk::Label(N_("URL")) );
label = manage( new Gtk::Label(_("URL")) );
table->attach( *label, 0, 1, 0, 1, 0, 0 );
label = manage( new Gtk::Label(N_("Name")) );
label = manage( new Gtk::Label(_("Name")) );
table->attach( *label, 0, 1, 1, 2, 0, 0 );
table->attach( *url_, 1, 2, 0, 1 );
table->attach( *name_, 1, 2, 1, 2 );
@ -128,7 +128,7 @@ void FormUrl::show()
// packing dialog to main window
dialog_ = mbox;
mainAppWin->add_action(*dialog_, N_(" URL "));
mainAppWin->add_action(*dialog_, _(" URL "));
// setting focus
GTK_WIDGET_SET_FLAGS (GTK_WIDGET(url_->get_entry()->gtkobj()), GTK_CAN_DEFAULT);
@ -152,10 +152,11 @@ void FormUrl::show()
void FormUrl::update(bool switched)
{
if (switched) {
if (switched)
{
hide();
return;
}
}
if (dialog_ != NULL &&
lv_->view()->available())

View File

@ -116,7 +116,7 @@ void Menubar::Pimpl::updateList(vector<Buffer::TocItem> * toclist, vector<ListsH
string label;
menu.push_back(Gnome::UI::Item(Gnome::UI::Icon(GNOME_STOCK_MENU_REFRESH),
N_("Refresh"), slot(this, &Menubar::Pimpl::updateAllLists)));
_("Refresh"), slot(this, &Menubar::Pimpl::updateAllLists)));
if (toclist->size() > max_number_of_items)
composeTocUIInfo(menu, *toclist, toclist->begin(), 0);
@ -146,7 +146,7 @@ Menubar::Pimpl::composeTocUIInfo(vector<Gnome::UI::Info> & menu,
vector<Buffer::TocItem>::const_iterator begin,
int mylevel)
{
string label = N_("<No Name>");
string label = _("<No Name>");
vector<Buffer::TocItem>::const_iterator end = toclist.end();
vector<Buffer::TocItem>::const_iterator it;
@ -210,7 +210,8 @@ void Menubar::Pimpl::composeUIInfo(string const & menu_name, vector<Gnome::UI::I
return;
}
Menu menu = menubackend_->getMenu(menu_name);
Menu menu = Menu();
menubackend_->getMenu(menu_name).expand(menu, owner_->buffer());
for (Menu::const_iterator i = menu.begin(); i != menu.end(); ++i)
{
@ -333,43 +334,6 @@ void Menubar::Pimpl::composeUIInfo(string const & menu_name, vector<Gnome::UI::I
break;
}
case MenuItem::Lastfiles: {
int ii = 1;
for (LastFiles::const_iterator cit = lastfiles->begin();
cit != lastfiles->end() && ii < 10; ++cit, ++ii)
{
int action = lyxaction.getPseudoAction(LFUN_FILE_OPEN, (*cit));
string label = tostr(ii) + ". " + MakeDisplayPath((*cit),30);
path = rootpath + label;
label = "_" + label;
Menus.push_back(Gnome::UI::Item(label,
bind<int>(slot(this, &Menubar::Pimpl::callback), action),
label));
}
break;
}
case MenuItem::Documents: {
std::vector<string> names = bufferlist.getFileNames();
for (std::vector<string>::const_iterator cit = names.begin();
cit != names.end() ; ++cit)
{
int action = lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *cit);
string label = MakeDisplayPath(*cit, 30);
path = rootpath + label;
Menus.push_back(Gnome::UI::Item(label,
bind<int>(slot(this, &Menubar::Pimpl::callback), action),
label));
}
break;
}
case MenuItem::Toc: {
ListsHolder t;
t.path = path;
@ -377,42 +341,18 @@ void Menubar::Pimpl::composeUIInfo(string const & menu_name, vector<Gnome::UI::I
break;
}
case MenuItem::ViewFormats: {
add_formats(Menus, LFUN_PREVIEW, true);
break;
}
case MenuItem::UpdateFormats: {
add_formats(Menus, LFUN_UPDATE, true);
break;
}
case MenuItem::ExportFormats: {
add_formats(Menus, LFUN_EXPORT, false);
break;
}
case MenuItem::Documents:
case MenuItem::Lastfiles:
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats:
lyxerr << "Menubar::Pimpl::create_submenu: "
"this should not happen" << endl;
break;
}
}
}
void Menubar::Pimpl::add_formats(vector<Gnome::UI::Info> & Menus, kb_action action, bool viewable)
{
vector<pair<string,string> > names =
viewable
? Exporter::GetViewableFormats(owner_->buffer())
: Exporter::GetExportableFormats(owner_->buffer());
for (vector<pair<string,string> >::const_iterator cit = names.begin();
cit != names.end() ; ++cit) {
int action2 = lyxaction.getPseudoAction(action, (*cit).first);
string label = (*cit).second;
Menus.push_back(Gnome::UI::Item(label,
bind<int>(slot(this, &Menubar::Pimpl::callback), action2),
label));
}
}
void Menubar::Pimpl::connectWidgetToAction(GnomeUIInfo * guinfo)
{
for (; guinfo->type != GnomeUIInfoType(GNOME_APP_UI_ENDOFINFO); ++guinfo)

View File

@ -16,6 +16,7 @@
#endif
#include <vector>
#include "gettext.h"
#include "LString.h"
#include <gnome--/app.h>
#include "frontends/Menubar.h"
@ -90,8 +91,6 @@ protected:
};
/// populate lists
void updateList(vector<Buffer::TocItem> *, vector<ListsHolder> *);
/// Add to "Menus" the list of exportable/viewable formats
void add_formats(vector<Gnome::UI::Info> & Menus, kb_action action, bool viewable);
private:
///

View File

@ -325,8 +325,8 @@ void LyXGUI::create_forms()
lyxerr[Debug::INIT] << "Initializing form_character...done" << endl;
// build up the combox entries
combo_language2->addto(_("No change"));
combo_language2->addto(_("Reset"));
combo_language2->addline(_("No change"));
combo_language2->addline(_("Reset"));
for(Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) {
#ifdef DO_USE_DEFAULT_LANGUAGE
@ -334,7 +334,6 @@ void LyXGUI::create_forms()
#endif
combo_language2->addto((*cit).second.lang());
}
combo_language2->select_text(_("No change"));
// the preamble form
fd_form_preamble = create_form_form_preamble();

View File

@ -840,7 +840,7 @@ string const LyXFunc::Dispatch(int ac,
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
owner->getMiniBuffer()->ExecCommand();
owner->getMiniBuffer()->PrepareForCommand();
break;
case LFUN_CANCEL: // RVDK_PATCH_5

View File

@ -1090,7 +1090,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
//------- dummy actions
case LFUN_EXEC_COMMAND:
bv->owner()->getMiniBuffer()->ExecCommand();
bv->owner()->getMiniBuffer()->PrepareForCommand();
break;
default:

View File

@ -126,7 +126,11 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord,
default:
return 0;
}
}
} else if (event == FL_PUSH) {
// This actually clears the buffer.
mini->PrepareForCommand();
}
return 0;
}
@ -138,7 +142,7 @@ extern "C" int C_MiniBuffer_peek_event(FL_OBJECT * ob, int event,
}
void MiniBuffer::ExecCommand()
void MiniBuffer::PrepareForCommand()
{
text.erase();
fl_set_input(the_buffer, "");

View File

@ -35,7 +35,7 @@ public:
///
void Init();
///
void ExecCommand();
void PrepareForCommand();
/** allows to store and reset the contents one time. Usefull
for status messages like "load font" (Matthias)
*/