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

default.ui fix ; compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1792 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-03-19 15:06:18 +00:00
parent 32fed6ce08
commit bff6a87b5e
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2001-03-19 Kayvan A. Sylvan <kayvan@sylvan.com>
* ui/default.ui: cleanup the entries for the NEW_INSETS changes.
2001-03-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-03-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* CREDITS: add Edwin Leuven * CREDITS: add Edwin Leuven

16
lib/ui/default.ui
View File

@ -170,9 +170,9 @@ Menuset
Item "Cross Reference...|R" "reference-insert" Item "Cross Reference...|R" "reference-insert"
Item "Label...|L" "label-insert" Item "Label...|L" "label-insert"
Item "Footnote|F" "footnote-insert" Item "Footnote|F" "footnote-insert"
Item "Marginal Note|M" "marginpar-insert" Item "Marginal Note|M" "marginalnote-insert"
Item "Index Entry...|I" "index-insert" Item "Index Entry...|I" "index-insert"
Item "Index Entry of Preceeding Word|W" "index-insert-last" Item "Index Entry of Preceding Word|W" "index-insert-last"
Item "URL...|U" "url-insert" Item "URL...|U" "url-insert"
Item "Note...|N" "note-insert" Item "Note...|N" "note-insert"
Submenu "Lists & TOC|O" "insert_toc" Submenu "Lists & TOC|O" "insert_toc"
@ -200,12 +200,12 @@ Menuset
End End
Menu "insert_floats" Menu "insert_floats"
Item "Figure|F" "buffer-float-insert figure" Item "Figure|F" "float-insert figure"
Item "Table|T" "buffer-float-insert table" Item "Table|T" "float-insert table"
Item "Wide Figure|W" "buffer-float-insert wide-fig" Item "Wide Figure|W" "float-insert wide-fig"
Item "Wide Table|d" "buffer-float-insert wide-tab" Item "Wide Table|d" "float-insert wide-tab"
Separator Separator
Item "Algorithm|A" "buffer-float-insert algorithm" Item "Algorithm|A" "float-insert algorithm"
End End
Menu "insert_toc" Menu "insert_toc"
@ -351,7 +351,7 @@ Toolbar
Icon "math-mode" Icon "math-mode"
Separator Separator
Icon "footnote-insert" Icon "footnote-insert"
Icon "marginpar-insert" Icon "marginalnote-insert"
Icon "depth-next" Icon "depth-next"
Separator Separator
Icon "figure-insert" Icon "figure-insert"

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2001-03-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* FormMinipage.C (FormMinipage): add SigC:: namespace specifier.
(showInset): ditto
(updateInset): ditto
2001-03-16 Juergen Vigna <jug@sad.it> 2001-03-16 Juergen Vigna <jug@sad.it>
* Dialogs.C (Dialogs): create minipage options dialog. * Dialogs.C (Dialogs): create minipage options dialog.

8
src/frontends/xforms/FormMinipage.C
View File

@ -33,8 +33,8 @@ FormMinipage::FormMinipage(LyXView * lv, Dialogs * d)
// let the dialog be shown // let the dialog be shown
// This is a permanent connection so we won't bother // This is a permanent connection so we won't bother
// storing a copy because we won't be disconnecting. // storing a copy because we won't be disconnecting.
d->showMinipage.connect(slot(this, &FormMinipage::showInset)); d->showMinipage.connect(SigC::slot(this, &FormMinipage::showInset));
d->updateMinipage.connect(slot(this, &FormMinipage::updateInset)); d->updateMinipage.connect(SigC::slot(this, &FormMinipage::updateInset));
} }
@ -60,7 +60,7 @@ void FormMinipage::showInset(InsetMinipage * inset)
// If connected to another inset, disconnect from it. // If connected to another inset, disconnect from it.
if (inset_ != inset) { if (inset_ != inset) {
ih_.disconnect(); ih_.disconnect();
ih_ = inset->hideDialog.connect(slot(this, &FormMinipage::hide)); ih_ = inset->hideDialog.connect(SigC::slot(this, &FormMinipage::hide));
inset_ = inset; inset_ = inset;
} }
@ -75,7 +75,7 @@ void FormMinipage::updateInset(InsetMinipage * inset)
// If connected to another inset, disconnect from it. // If connected to another inset, disconnect from it.
if (inset_ != inset) { if (inset_ != inset) {
ih_.disconnect(); ih_.disconnect();
ih_ = inset->hideDialog.connect(slot(this, &FormMinipage::hide)); ih_ = inset->hideDialog.connect(SigC::slot(this, &FormMinipage::hide));
inset_ = inset; inset_ = inset;
} }