From bff6a87b5e4e6e28924328ae2b261aa03a4fb75c Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 19 Mar 2001 15:06:18 +0000 Subject: [PATCH] default.ui fix ; compile fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1792 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 4 ++++ lib/ui/default.ui | 16 ++++++++-------- src/frontends/xforms/ChangeLog | 6 ++++++ src/frontends/xforms/FormMinipage.C | 8 ++++---- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 4c94446a5e..c21792cb72 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2001-03-19 Kayvan A. Sylvan + + * ui/default.ui: cleanup the entries for the NEW_INSETS changes. + 2001-03-08 Jean-Marc Lasgouttes * CREDITS: add Edwin Leuven diff --git a/lib/ui/default.ui b/lib/ui/default.ui index 50ead52ec3..6a86a2bd0a 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -170,9 +170,9 @@ Menuset Item "Cross Reference...|R" "reference-insert" Item "Label...|L" "label-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 of Preceeding Word|W" "index-insert-last" + Item "Index Entry of Preceding Word|W" "index-insert-last" Item "URL...|U" "url-insert" Item "Note...|N" "note-insert" Submenu "Lists & TOC|O" "insert_toc" @@ -200,12 +200,12 @@ Menuset End Menu "insert_floats" - Item "Figure|F" "buffer-float-insert figure" - Item "Table|T" "buffer-float-insert table" - Item "Wide Figure|W" "buffer-float-insert wide-fig" - Item "Wide Table|d" "buffer-float-insert wide-tab" + Item "Figure|F" "float-insert figure" + Item "Table|T" "float-insert table" + Item "Wide Figure|W" "float-insert wide-fig" + Item "Wide Table|d" "float-insert wide-tab" Separator - Item "Algorithm|A" "buffer-float-insert algorithm" + Item "Algorithm|A" "float-insert algorithm" End Menu "insert_toc" @@ -351,7 +351,7 @@ Toolbar Icon "math-mode" Separator Icon "footnote-insert" - Icon "marginpar-insert" + Icon "marginalnote-insert" Icon "depth-next" Separator Icon "figure-insert" diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 5c72b5fdbc..a414609281 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2001-03-19 Jean-Marc Lasgouttes + + * FormMinipage.C (FormMinipage): add SigC:: namespace specifier. + (showInset): ditto + (updateInset): ditto + 2001-03-16 Juergen Vigna * Dialogs.C (Dialogs): create minipage options dialog. diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C index 8c94bc57e7..62c4e3e963 100644 --- a/src/frontends/xforms/FormMinipage.C +++ b/src/frontends/xforms/FormMinipage.C @@ -33,8 +33,8 @@ FormMinipage::FormMinipage(LyXView * lv, Dialogs * d) // let the dialog be shown // This is a permanent connection so we won't bother // storing a copy because we won't be disconnecting. - d->showMinipage.connect(slot(this, &FormMinipage::showInset)); - d->updateMinipage.connect(slot(this, &FormMinipage::updateInset)); + d->showMinipage.connect(SigC::slot(this, &FormMinipage::showInset)); + 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 (inset_ != inset) { ih_.disconnect(); - ih_ = inset->hideDialog.connect(slot(this, &FormMinipage::hide)); + ih_ = inset->hideDialog.connect(SigC::slot(this, &FormMinipage::hide)); inset_ = inset; } @@ -75,7 +75,7 @@ void FormMinipage::updateInset(InsetMinipage * inset) // If connected to another inset, disconnect from it. if (inset_ != inset) { ih_.disconnect(); - ih_ = inset->hideDialog.connect(slot(this, &FormMinipage::hide)); + ih_ = inset->hideDialog.connect(SigC::slot(this, &FormMinipage::hide)); inset_ = inset; } -- 2.39.2