Fixes to the new menu code + a few other things

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@939 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-07-31 12:51:19 +00:00
parent f4bad86bda
commit c64f5752ae
7 changed files with 127 additions and 30 deletions

View File

@ -1,3 +1,29 @@
2000-07-31 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/lyxfunc.C (getStatus): add missing break for build-program
function; add test for Literate for export functions.
* lib/ui/default.ui: fix Insert->TOC->TOC; comment out invalid
entries in Options menu.
2000-07-31 Baruch Even <baruch.even@writeme.com>
* src/frontends/xforms/Toolbar_pimpl.C (toolbarItem::operator=):
protect against auto-allocation; release icon when needed.
2000-07-31 Matej Cepl <CeplM@seznam.cz>
* lib/kbd/czech.kmap: new file. standard Czech keyboard as found
on usual typewriter.
* lib/kbd/czech-prg.kmap: simpler czech kmap (which was the
earlier czech.kmap), useful only for programming.
2000-07-28 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/frontends/xforms/FormCitation.h: fix conditioning around
#pragma.
2000-07-31 Juergen Vigna <jug@sad.it>
* src/frontends/xforms/FormTabular.C (local_update): changed
@ -18,32 +44,34 @@
* src/frontends/Dialogs.h: Added showGraphics signals.
* src/frontends/xforms/forms/form_graphics.fd: Added file, the xforms
form definition of the graphics dialog.
* src/frontends/xforms/forms/form_graphics.fd: Added file, the
xforms form definition of the graphics dialog.
* src/frontends/xforms/FormGraphics.h:
* src/frontends/xforms/FormGraphics.C: Added files, the GUIndependent
code of InsetGraphics
* src/frontends/xforms/FormGraphics.C: Added files, the
GUIndependent code of InsetGraphics
* src/insets/insetgraphics.h:
* src/insets/insetgraphics.C: Major writing to make it work.
* src/insets/insetgraphicsParams.h:
* src/insets/insetgraphicsParams.C: Added files, parameter passing struct
between InsetGraphics and GUI.
* src/insets/insetgraphicsParams.C: Added files, parameter passing
struct between InsetGraphics and GUI.
* src/LaTeXFeatures.h:
* src/LaTeXFeatures.C (c-tor, require, getPackages):
Enabled support for graphicx package.
* src/LaTeXFeatures.C (c-tor, require, getPackages): Enabled
support for graphicx package.
* src/buffer.C (parseSingleLyXformat2Token):
Fixed read support for the graphics inset.
* src/buffer.C (parseSingleLyXformat2Token): Fixed read support
for the graphics inset.
* src/support/translator.h: Added file, used in InsetGraphicsParams. this is a template to translate between two types.
* src/support/translator.h: Added file, used in
InsetGraphicsParams. this is a template to translate between two
types.
* src/frontends/xforms/RadioButtonGroup.h:
* src/frontends/xforms/RadioButtonGroup.C: Added files, Comprise a way to
easily control a radio button group.
* src/frontends/xforms/RadioButtonGroup.C: Added files, Comprise a
way to easily control a radio button group.
2000-07-28 Juergen Vigna <jug@sad.it>

54
lib/kbd/czech-prg.kmap Normal file
View File

@ -0,0 +1,54 @@
#
# Key definition file for Czech national keyboard for LyX - hope it's OK
#
# (c)1995 by Ivan Schreter, schreter@ccsun.tuke.sk
#
\kmod = acute aceilnorsuyzACEILNORSUYZ # acute is on '='
\kmod + caron cdelnrstzCDELNRSTZ # caron is on Shift-'='
\kmap ~ ;
\kmap 1 + # map numbers to Czech letters and
\kmap ! 1 # Shift-numbers to numbers
\kmap 2 "\\v{e}"
\kmap @ 2
\kmap 3 "\\v{s}"
\kmap \# 3
\kmap 4 "\\v{c}"
\kmap $ 4
\kmap 5 "\\v{r}"
\kmap % 5
\kmap 6 "\\v{z}"
\kmap ^ 6
\kmap 7 "\\'{y}"
\kmap & 7
\kmap 8 "\\'{a}"
\kmap * 8
\kmap 9 "\\'{\\i}"
\kmap ( 9
\kmap 0 "\\'{e}"
\kmap ) 0
\kmap - = # map other keys to reflect Slovak keyboard
\kmap _ %
\kmap ; "\\r{u}"
\kmap : \"
\kmap ' "\\S{}"
\kmap \" !
\kmap [ "\\'{u}"
\kmap { /
\kmap ] )
\kmap } (
\kmap < ?
\kmap > :
\kmap ? _
\kmap / -
\kxmod caron o "\\^{o}" # mapping exception - generate ^ instead for o
\kxmod caron O "\\^{O}"
\kxmod caron u "\\r{u}" # generate circle for u - it's a Czech letter
\kxmod caron U "\\r{U}"
\kxmod caron t "\\q{t}" # use proper caron mark for t, l, d and L
\kxmod caron l "\\q{l}"
\kxmod caron L "\\q{L}"
\kxmod caron d "\\q{d}"
\kxmod acute i "\\'{\\i}" # use only root of i for i acute

View File

@ -5,7 +5,7 @@
#
\kmod = acute aceilnorsuyzACEILNORSUYZ # acute is on '='
\kmod + caron cdelnrstzCDELNRSTZ # caron is on Shift-'='
\kmod + caron cdelnrstzCDELNRSTY # caron is on Shift-'='
\kmap ~ ;
\kmap 1 + # map numbers to Czech letters and
\kmap ! 1 # Shift-numbers to numbers
@ -50,5 +50,11 @@
\kxmod caron L "\\q{L}"
\kxmod caron d "\\q{d}"
\kxmod acute i "\\'{\\i}" # use only root of i for i acute
# Switch Z and Y as on the standard Czech professional keyboard
\kmap Z Y
\kmap Y Z
\kmap z y
\kmap y z
\kxmod caron Y "\\v{Z}"
\kxmod caron y "\\v{z}"

View File

@ -182,7 +182,7 @@ Menuset
End
Menu "insert_toc"
Item "Table of Contents|C" "toc-view"
Item "Table of Contents|C" "toc-insert"
Item "List of Figures|F" "lof-insert"
Item "List of Tables|T" "lot-insert"
Item "List of Algorithms|A" "loa-insert"
@ -216,10 +216,10 @@ Menuset
End
Menu "options"
Item "Screen Fonts...|F" "screen-options"
Item "Spellchecker Options...|S" "spellchecker-options"
Item "Keyboard...|K" "keyboard-options"
Separator
# Item "Screen Fonts...|F" "screen-options"
# Item "Spellchecker Options...|S" "spellchecker-options"
# Item "Keyboard...|K" "keyboard-options"
# Separator
Item "Reconfigure|R" "reconfigure"
Item "Preferences|P" "dialog-preferences"
End

View File

@ -18,7 +18,7 @@
#include "LString.h"
#include "support/utility.hpp"
#ifndef __GNUG__
#ifdef __GNUG__
#pragma interface
#endif

View File

@ -64,6 +64,13 @@ void Toolbar::Pimpl::toolbarItem::clean() {
Toolbar::Pimpl::toolbarItem &
Toolbar::Pimpl::toolbarItem::operator=(const toolbarItem & ti) {
// Are we assigning the object onto itself?
if (this == &ti)
return *this;
// If we already have an icon, release it.
clean();
// do we have to check icon too?
action = ti.action;
icon = 0; // locally we need to get the icon anew

View File

@ -388,7 +388,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
break;
case LFUN_EXPORT:
if (argument == "latex")
disable = ! buf->isLatex();
disable = (! buf->isLatex() && ! buf->isLiterate()) ;
else if (argument == "linuxdoc")
disable = ! buf->isLinuxDoc();
else if (argument == "docbook")
@ -403,7 +403,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
|| (! buf->isLinuxDoc() && ! buf->isDocBook()
&& lyxrc.html_command == "none");
else if (argument == "custom")
disable = ! buf->isLatex();
disable = (! buf->isLatex() && ! buf->isLiterate());
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
@ -420,6 +420,8 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
case LFUN_BUILDPROG:
disable = (lyxrc.literate_command == "none"
|| ! buf->isLiterate());
break;
#ifndef NEW_TABULAR
case LFUN_LAYOUT_TABLE:
disable = ! owner->view()->text->cursor.par()->table;