From 814b8194510a5607638f81b10c939723835c1145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 20 Oct 2002 01:48:28 +0000 Subject: [PATCH] the qtclean-2 patch with some very small changes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5447 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/ChangeLog | 8 + src/frontends/Liason.C | 9 +- src/frontends/Liason.h | 2 - src/frontends/LyXKeySym.h | 13 +- src/frontends/controllers/ChangeLog | 12 +- src/frontends/controllers/ControlCharacter.C | 7 +- src/frontends/controllers/ControlDocument.C | 37 ++- src/frontends/controllers/ControlDocument.h | 8 +- src/frontends/controllers/ControlParagraph.C | 8 +- src/frontends/controllers/ControlPreamble.C | 4 +- src/frontends/controllers/ControlSearch.C | 12 +- src/frontends/controllers/ControlThesaurus.C | 9 +- src/frontends/qt2/Alert_pimpl.C | 9 +- src/frontends/qt2/BulletsModule.C | 61 ++--- src/frontends/qt2/BulletsModule.h | 11 +- src/frontends/qt2/ChangeLog | 81 ++++++ src/frontends/qt2/Dialogs.C | 2 +- src/frontends/qt2/Dialogs2.C | 7 +- src/frontends/qt2/Dialogs_impl.h | 16 +- src/frontends/qt2/FileDialog.C | 15 +- src/frontends/qt2/FileDialog_private.C | 24 +- src/frontends/qt2/FileDialog_private.h | 5 +- src/frontends/qt2/LyXKeySymFactory.C | 6 +- src/frontends/qt2/LyXScreenFactory.C | 4 +- src/frontends/qt2/Menubar_pimpl.C | 5 +- src/frontends/qt2/Menubar_pimpl.h | 2 +- src/frontends/qt2/QAbout.C | 50 +++- src/frontends/qt2/QAbout.h | 1 - src/frontends/qt2/QAboutDialog.C | 6 +- src/frontends/qt2/QAboutDialog.h | 8 +- src/frontends/qt2/QBibitem.C | 5 +- src/frontends/qt2/QBibitem.h | 8 +- src/frontends/qt2/QBibitemDialog.C | 5 +- src/frontends/qt2/QBibitemDialog.h | 9 +- src/frontends/qt2/QBibtex.C | 9 +- src/frontends/qt2/QBibtex.h | 8 +- src/frontends/qt2/QBibtexDialog.C | 6 +- src/frontends/qt2/QBibtexDialog.h | 7 +- src/frontends/qt2/QBrowseBox.C | 20 +- src/frontends/qt2/QBrowseBox.h | 75 +++--- src/frontends/qt2/QCharacter.C | 41 +-- src/frontends/qt2/QCharacter.h | 8 +- src/frontends/qt2/QCharacterDialog.C | 1 + src/frontends/qt2/QCharacterDialog.h | 8 +- src/frontends/qt2/QCitation.C | 9 +- src/frontends/qt2/QCitation.h | 7 +- src/frontends/qt2/QCitationDialog.C | 1 + src/frontends/qt2/QCitationDialog.h | 8 +- src/frontends/qt2/QCommandBuffer.C | 29 +-- src/frontends/qt2/QCommandBuffer.h | 5 +- src/frontends/qt2/QCommandEdit.C | 47 ++-- src/frontends/qt2/QCommandEdit.h | 3 - src/frontends/qt2/QContentPane.C | 55 ++-- src/frontends/qt2/QContentPane.h | 6 +- src/frontends/qt2/QDelimiterDialog.C | 100 +++---- src/frontends/qt2/QDelimiterDialog.h | 7 +- src/frontends/qt2/QDocument.C | 259 ++++++++++--------- src/frontends/qt2/QDocument.h | 4 +- src/frontends/qt2/QDocumentDialog.C | 77 +++--- src/frontends/qt2/QDocumentDialog.h | 28 +- src/frontends/qt2/QERT.C | 9 +- src/frontends/qt2/QERT.h | 8 +- src/frontends/qt2/QERTDialog.C | 1 + src/frontends/qt2/QERTDialog.h | 8 +- src/frontends/qt2/QError.C | 5 +- src/frontends/qt2/QError.h | 9 +- src/frontends/qt2/QErrorDialog.C | 7 +- src/frontends/qt2/QErrorDialog.h | 7 +- src/frontends/qt2/QExternal.C | 27 +- src/frontends/qt2/QExternal.h | 8 +- src/frontends/qt2/QExternalDialog.C | 14 +- src/frontends/qt2/QExternalDialog.h | 8 +- src/frontends/qt2/QFloat.C | 29 ++- src/frontends/qt2/QFloatDialog.C | 13 +- src/frontends/qt2/QFloatDialog.h | 8 +- src/frontends/qt2/QGraphics.C | 29 ++- src/frontends/qt2/QGraphics.h | 2 - src/frontends/qt2/QGraphicsDialog.C | 11 +- src/frontends/qt2/QGraphicsDialog.h | 8 +- src/frontends/qt2/QInclude.C | 29 ++- src/frontends/qt2/QInclude.h | 2 - src/frontends/qt2/QIncludeDialog.C | 11 +- src/frontends/qt2/QIncludeDialog.h | 8 +- src/frontends/qt2/QIndex.C | 3 +- src/frontends/qt2/QIndex.h | 4 +- src/frontends/qt2/QIndexDialog.C | 9 +- src/frontends/qt2/QIndexDialog.h | 8 +- src/frontends/qt2/QLImage.C | 23 +- src/frontends/qt2/QLImage.h | 4 +- src/frontends/qt2/QLPainter.C | 89 ++++--- src/frontends/qt2/QLPainter.h | 1 - src/frontends/qt2/QLPopupMenu.C | 46 ++-- src/frontends/qt2/QLPopupMenu.h | 8 +- src/frontends/qt2/QLog.C | 18 +- src/frontends/qt2/QLog.h | 3 +- src/frontends/qt2/QLogDialog.C | 9 +- src/frontends/qt2/QLogDialog.h | 8 +- src/frontends/qt2/QLyXKeySym.C | 34 +-- src/frontends/qt2/QLyXKeySym.h | 7 +- src/frontends/qt2/QMath.C | 33 +-- src/frontends/qt2/QMath.h | 4 +- src/frontends/qt2/QMathDialog.C | 116 +++++---- src/frontends/qt2/QMathDialog.h | 8 +- src/frontends/qt2/QMinipage.C | 56 ++-- src/frontends/qt2/QMinipage.h | 1 - src/frontends/qt2/QMinipageDialog.C | 7 +- src/frontends/qt2/QMinipageDialog.h | 8 +- src/frontends/qt2/QParagraph.C | 108 ++++---- src/frontends/qt2/QParagraph.h | 7 +- src/frontends/qt2/QParagraphDialog.C | 5 + src/frontends/qt2/QParagraphDialog.h | 5 +- src/frontends/qt2/QPreamble.C | 6 +- src/frontends/qt2/QPreamble.h | 1 - src/frontends/qt2/QPreambleDialog.C | 21 +- src/frontends/qt2/QPreambleDialog.h | 8 +- src/frontends/qt2/QPrint.C | 20 +- src/frontends/qt2/QPrint.h | 1 - src/frontends/qt2/QPrintDialog.C | 14 +- src/frontends/qt2/QPrintDialog.h | 7 +- src/frontends/qt2/QRef.C | 26 +- src/frontends/qt2/QRef.h | 7 +- src/frontends/qt2/QRefDialog.C | 7 +- src/frontends/qt2/QRefDialog.h | 12 +- src/frontends/qt2/QSearch.C | 8 +- src/frontends/qt2/QSearch.h | 10 +- src/frontends/qt2/QSearchDialog.C | 3 +- src/frontends/qt2/QSearchDialog.h | 7 +- src/frontends/qt2/QSendto.C | 5 +- src/frontends/qt2/QSendto.h | 3 +- src/frontends/qt2/QSendtoDialog.h | 11 +- src/frontends/qt2/QShowFile.C | 5 +- src/frontends/qt2/QShowFile.h | 9 +- src/frontends/qt2/QShowFileDialog.C | 3 +- src/frontends/qt2/QShowFileDialog.h | 7 +- src/frontends/qt2/QSpellchecker.C | 7 +- src/frontends/qt2/QSpellchecker.h | 9 +- src/frontends/qt2/QSpellcheckerDialog.C | 5 +- src/frontends/qt2/QSpellcheckerDialog.h | 7 +- src/frontends/qt2/QTabularCreate.C | 3 +- src/frontends/qt2/QTabularCreate.h | 3 +- src/frontends/qt2/QTabularCreateDialog.C | 3 +- src/frontends/qt2/QTabularCreateDialog.h | 7 +- src/frontends/qt2/QTexinfo.C | 18 +- src/frontends/qt2/QTexinfo.h | 6 +- src/frontends/qt2/QTexinfoDialog.C | 20 +- src/frontends/qt2/QTexinfoDialog.h | 7 +- src/frontends/qt2/QThesaurus.C | 3 +- src/frontends/qt2/QThesaurus.h | 2 +- src/frontends/qt2/QThesaurusDialog.C | 7 +- src/frontends/qt2/QThesaurusDialog.h | 8 +- src/frontends/qt2/QToc.C | 40 +-- src/frontends/qt2/QToc.h | 5 +- src/frontends/qt2/QTocDialog.C | 5 +- src/frontends/qt2/QTocDialog.h | 8 +- src/frontends/qt2/QURL.C | 21 +- src/frontends/qt2/QURL.h | 4 +- src/frontends/qt2/QURLDialog.C | 5 +- src/frontends/qt2/QURLDialog.h | 8 +- src/frontends/qt2/QVCLog.C | 7 +- src/frontends/qt2/QVCLog.h | 3 +- src/frontends/qt2/QVCLogDialog.C | 5 +- src/frontends/qt2/QVCLogDialog.h | 8 +- src/frontends/qt2/QWorkArea.C | 37 ++- src/frontends/qt2/QWorkArea.h | 5 +- src/frontends/qt2/QWrap.C | 39 +-- src/frontends/qt2/QWrap.h | 2 - src/frontends/qt2/QWrapDialog.C | 5 +- src/frontends/qt2/QWrapDialog.h | 8 +- src/frontends/qt2/Qt2BC.C | 5 +- src/frontends/qt2/Qt2BC.h | 4 +- src/frontends/qt2/Qt2Base.C | 1 + src/frontends/qt2/Qt2Base.h | 9 +- src/frontends/qt2/QtView.C | 55 ++-- src/frontends/qt2/QtView.h | 3 - src/frontends/qt2/README | 20 ++ src/frontends/qt2/Timeout_pimpl.h | 2 - src/frontends/qt2/Toolbar_pimpl.C | 9 +- src/frontends/qt2/Toolbar_pimpl.h | 12 +- src/frontends/qt2/WorkAreaFactory.C | 12 +- src/frontends/qt2/emptytable.C | 11 +- src/frontends/qt2/emptytable.h | 6 +- src/frontends/qt2/iconpalette.C | 27 +- src/frontends/qt2/iconpalette.h | 4 - src/frontends/qt2/io_callback.C | 1 + src/frontends/qt2/io_callback.h | 2 - src/frontends/qt2/lengthcombo.C | 1 + src/frontends/qt2/lengthcombo.h | 2 - src/frontends/qt2/lyx_gui.C | 17 +- src/frontends/qt2/qfont_loader.C | 1 + src/frontends/qt2/qfont_loader.h | 1 - src/frontends/qt2/qfont_metrics.C | 13 +- src/frontends/qt2/qlkey.h | 2 + src/frontends/qt2/qscreen.C | 69 +++-- src/frontends/xforms/ChangeLog | 10 +- src/frontends/xforms/FormDocument.C | 8 +- src/frontends/xforms/XLyXKeySym.C | 37 ++- src/frontends/xforms/XLyXKeySym.h | 10 +- 197 files changed, 1593 insertions(+), 1482 deletions(-) diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 1eea239714..b6fce46ccd 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,11 @@ +2002-10-20 Lars Gullik Bjønnes + + * LyXKeySym.h: move operator== out of class. Separate + implementations for xforms and qt. + + * Liason.[Ch]: get rid of setMinibuffer, where used call message + directly through LyXView::message instead. + 2002-09-25 Angus Leeming * Dialogs.C: doxygen fix. diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C index 1c962dec52..eeddabae8f 100644 --- a/src/frontends/Liason.C +++ b/src/frontends/Liason.C @@ -87,7 +87,7 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) command += tostr(pp.count_copies); command += ' '; } - + if (pp.reverse_order) { command += lyxrc.print_reverse_flag + ' '; } @@ -154,11 +154,4 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) return res == 0; } - -void setMinibuffer(LyXView * lv, string const & msg) -{ - lyx::Assert(lv); - lv->message(msg); -} - } // namespace Liason diff --git a/src/frontends/Liason.h b/src/frontends/Liason.h index 817397bb25..bfab7fc22e 100644 --- a/src/frontends/Liason.h +++ b/src/frontends/Liason.h @@ -52,8 +52,6 @@ namespace Liason { PrinterParams getPrinterParams(Buffer *); /// print the current buffer bool printBuffer(Buffer *, PrinterParams const &); - /// set the minibuffer - void setMinibuffer(LyXView *, string const & msg); //@} } // namespace Liason diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h index 9841f06b4e..7c60b169ee 100644 --- a/src/frontends/LyXKeySym.h +++ b/src/frontends/LyXKeySym.h @@ -45,14 +45,15 @@ public: * This relies on user to use the right encoding. */ virtual char getISOEncoded() const = 0; - - /** - * We need to be able to equality compare these for the - * sake of the keymap business. - */ - virtual bool operator==(LyXKeySym const & k) const = 0; }; + +/** + * We need to be able to equality compare these for the + * sake of the keymap business. + */ +bool operator==(LyXKeySym const & k1, LyXKeySym const & k1); + typedef boost::shared_ptr LyXKeySymPtr; #endif diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index f2255bd00a..dda37955aa 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,13 @@ +2002-10-20 Lars Gullik Bjønnes + + * ControlCharacter.C (apply): setMinibuffer change + * ControlDocument.C (apply): ditto + (classApply): ditto + * ControlThesaurus.C (replace): ditto + * ControlSearch.C (find): ditto + (replace): ditto + * ControlPreamble.C (apply): ditto + * ControlParagraph.C (apply): ditto 2002-10-14 André Pönitz @@ -8,7 +18,7 @@ * ControlDocument.h: * ControlDocument.C: * Makefile.am: New document parameters controller - + 2002-09-24 Lars Gullik Bjønnes * Makefile.am (INCLUDES): loose SIGC_INCLUDES diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index 3dca5cb302..55182ad36b 100644 --- a/src/frontends/controllers/ControlCharacter.C +++ b/src/frontends/controllers/ControlCharacter.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Angus Leeming + * \author Angus Leeming * * Full author contact details are available in file CREDITS */ @@ -24,11 +24,8 @@ #include "gettext.h" #include "language.h" -#include "frontends/Liason.h" #include "frontends/LyXView.h" -using Liason::setMinibuffer; - ControlCharacter::ControlCharacter(LyXView & lv, Dialogs & d) : ControlDialogBD(lv, d), @@ -68,7 +65,7 @@ void ControlCharacter::apply() toggleAndShow(bufferview(), *(font_.get()), toggleall_); lv_.view_state_changed(); buffer()->markDirty(); - setMinibuffer(&lv_, _("Character set")); + lv_.message(_("Character set")); } diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C index 8b4c9ae484..55c05315d1 100644 --- a/src/frontends/controllers/ControlDocument.C +++ b/src/frontends/controllers/ControlDocument.C @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -29,15 +29,12 @@ #include "lyxtextclasslist.h" #include "CutAndPaste.h" -#include "frontends/Liason.h" #include "frontends/LyXView.h" #include "frontends/Alert.h" #include "support/lstrings.h" #include "support/filetools.h" -using Liason::setMinibuffer; - ControlDocument::ControlDocument(LyXView & lv, Dialogs & d) : ControlDialogBD(lv, d), bp_(0) @@ -58,27 +55,30 @@ BufferParams & ControlDocument::params() return *bp_; } + LyXTextClass ControlDocument::textClass() { return textclasslist[bp_->textclass]; } - + void ControlDocument::apply() { if (!bufferIsAvailable()) return; - + setLanguage(); - bool succes = classApply(); - lv_.view()->redoCurrentBuffer(); - + + // FIXME: do we need to use return value from classApply() here? (Lgb) + classApply(); + lv_.view()->redoCurrentBuffer(); + view().apply(); buffer()->params = *bp_; buffer()->markDirty(); - - Liason::setMinibuffer(&lv_, _("Document Settings Applied")); + + lv_.message(_("Document Settings Applied")); } @@ -86,7 +86,7 @@ void ControlDocument::setParams() { if (!bp_.get()) bp_.reset(new BufferParams()); - + /// Set the buffer parameters *bp_ = buffer()->params; } @@ -95,7 +95,7 @@ void ControlDocument::setLanguage() { Language const * oldL = buffer()->params.language; Language const * newL = bp_->language; - + if (oldL != newL && oldL->RightToLeft() == newL->RightToLeft() && !lv_.buffer()->isMultiLingual()) @@ -105,7 +105,7 @@ void ControlDocument::setLanguage() bool ControlDocument::classApply() { - BufferParams ¶ms = lv_.buffer()->params; + BufferParams & params = lv_.buffer()->params; unsigned int const old_class = bp_->textclass; // exit if nothing changes if (params.textclass == old_class) @@ -120,10 +120,9 @@ bool ControlDocument::classApply() _("Reverting to original document class.")); return false; } - + // successfully loaded - Liason::setMinibuffer(&lv_, - _("Converting document to new document class...")); + lv_.message(_("Converting document to new document class...")); int ret = CutAndPaste::SwitchLayoutsBetweenClasses( old_class, params.textclass, &*(lv_.buffer()->paragraphs.begin()), @@ -146,7 +145,7 @@ bool ControlDocument::classApply() void ControlDocument::saveAsDefault() { lv_.buffer()->params.preamble = bp_->preamble; - + string const fname = AddName(AddPath(user_lyxdir, "templates/"), "defaults.lyx"); Buffer defaults(fname); @@ -156,7 +155,7 @@ void ControlDocument::saveAsDefault() Paragraph * par = new Paragraph; par->layout(params().getLyXTextClass().defaultLayout()); defaults.paragraphs.set(par); - + defaults.writeFile(defaults.fileName()); } diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h index 796a7d644f..fc36386bb6 100644 --- a/src/frontends/controllers/ControlDocument.h +++ b/src/frontends/controllers/ControlDocument.h @@ -32,6 +32,7 @@ class ControlDocument : public ControlDialogBD { public: /// ControlDocument(LyXView &, Dialogs &); + /// ~ControlDocument(); /// show latex preamble void showPreamble(); @@ -43,9 +44,8 @@ public: BufferParams & params(); /// void saveAsDefault(); - /// - bool classApply(); - + /// + bool classApply(); private: /// apply settings void apply(); @@ -56,5 +56,3 @@ private: }; #endif // CONTROLDOCUMENT_H - - diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C index a0d96f6798..8b41e4b95a 100644 --- a/src/frontends/controllers/ControlParagraph.C +++ b/src/frontends/controllers/ControlParagraph.C @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -26,12 +26,10 @@ #include "lyxtext.h" #include "ParagraphParameters.h" -#include "frontends/Liason.h" +#include "frontends/LyXView.h" #include "support/LAssert.h" -using Liason::setMinibuffer; - ControlParagraph::ControlParagraph(LyXView & lv, Dialogs & d) : ControlDialogBD(lv, d), pp_(0), ininset_(false) @@ -89,7 +87,7 @@ void ControlParagraph::apply() buffer()->markDirty(); - setMinibuffer(&lv_, _("Paragraph layout set")); + lv_.message(_("Paragraph layout set")); } diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C index 25319b1c83..779c9a7f81 100644 --- a/src/frontends/controllers/ControlPreamble.C +++ b/src/frontends/controllers/ControlPreamble.C @@ -21,7 +21,7 @@ #include "buffer.h" #include "gettext.h" -#include "frontends/Liason.h" +#include "frontends/LyXView.h" ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d) @@ -39,7 +39,7 @@ void ControlPreamble::apply() buffer()->params.preamble = params(); buffer()->markDirty(); - Liason::setMinibuffer(&lv_, _("LaTeX preamble set")); + lv_.message(_("LaTeX preamble set")); } diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C index 218335cded..bfc42f2364 100644 --- a/src/frontends/controllers/ControlSearch.C +++ b/src/frontends/controllers/ControlSearch.C @@ -19,12 +19,10 @@ #include "gettext.h" #include "lyxfind.h" -#include "frontends/Liason.h" +#include "frontends/LyXView.h" #include "support/lstrings.h" -using Liason::setMinibuffer; - ControlSearch::ControlSearch(LyXView & lv, Dialogs & d) : ControlDialogBD(lv, d) @@ -39,7 +37,7 @@ void ControlSearch::find(string const & search, matchword); if (!found) - setMinibuffer(&lv_, _("String not found!")); + lv_.message(_("String not found!")); } @@ -56,14 +54,14 @@ void ControlSearch::replace(string const & search, string const & replace, matchword, all, once); if (replace_count == 0) { - setMinibuffer(&lv_, _("String not found!")); + lv_.message(_("String not found!")); } else { if (replace_count == 1) { - setMinibuffer(&lv_, _("String has been replaced.")); + lv_.message(_("String has been replaced.")); } else { string str = tostr(replace_count); str += _(" strings have been replaced."); - setMinibuffer(&lv_, str.c_str()); + lv_.message(str.c_str()); } } } diff --git a/src/frontends/controllers/ControlThesaurus.C b/src/frontends/controllers/ControlThesaurus.C index 0f9616d138..fce1fd661a 100644 --- a/src/frontends/controllers/ControlThesaurus.C +++ b/src/frontends/controllers/ControlThesaurus.C @@ -19,10 +19,7 @@ #include "gettext.h" #include "lyxfind.h" -#include "frontends/Liason.h" - - -using Liason::setMinibuffer; +#include "frontends/LyXView.h" ControlThesaurus::ControlThesaurus(LyXView & lv, Dialogs & d) @@ -50,9 +47,9 @@ void ControlThesaurus::replace(string const & newstr) oldstr_ = newstr; if (replace_count == 0) - setMinibuffer(&lv_, _("String not found!")); + lv_.message(_("String not found!")); else - setMinibuffer(&lv_, _("String has been replaced.")); + lv_.message(_("String has been replaced.")); } diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 657b473103..ea523bfda8 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -29,9 +29,11 @@ using std::pair; using std::make_pair; + void alert_pimpl(string const & s1, string const & s2, string const & s3) { - QMessageBox::warning(0, "LyX", (s1 + "\n" + "\n" + s2 + "\n" + s3).c_str()); + QMessageBox::warning(0, "LyX", + (s1 + "\n" + "\n" + s2 + "\n" + s3).c_str()); } @@ -49,7 +51,8 @@ int askConfirmation_pimpl(string const & s1, string const & s2, string const & s } -pair const askForText_pimpl(string const & msg, string const & dflt) +pair const +askForText_pimpl(string const & msg, string const & dflt) { string title = _("LyX: "); title += msg; diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index 55afd12508..5822e4cf66 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -22,52 +22,53 @@ #include "ui/BulletsModuleBase.h" #include "QBrowseBox.h" -BulletsModule::BulletsModule( QWidget* parent, const char* name, WFlags fl ) + +BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl) : BulletsModuleBase(parent, name, fl) { - standard = new QBrowseBox(6,6); - standard->insertItem(QPixmap("standard.xpm")); + standard = new QBrowseBox(6, 6); + standard->insertItem(QPixmap("standard.xpm")); - maths = new QBrowseBox(6,6); - maths->insertItem(QPixmap("amssymb.xpm")); + maths = new QBrowseBox(6, 6); + maths->insertItem(QPixmap("amssymb.xpm")); - QPopupMenu * pm = new QPopupMenu(); - - QPopupMenu * pm1 = new QPopupMenu(pm); - pm1->insertItem(standard); + QPopupMenu * pm = new QPopupMenu; - QPopupMenu * pm2 = new QPopupMenu(pm); - pm2->insertItem(maths); - - - pm->insertItem("Standard",pm1); - pm->insertItem("Maths",pm2); - pm->insertItem("Ding 1"); - pm->insertItem("Ding 2"); - pm->insertItem("Ding 3"); - pm->insertItem("Ding 4"); - - setbullet1TB->setPopup(pm); + QPopupMenu * pm1 = new QPopupMenu(pm); + pm1->insertItem(standard); + + QPopupMenu * pm2 = new QPopupMenu(pm); + pm2->insertItem(maths); + + pm->insertItem("Standard", pm1); + pm->insertItem("Maths", pm2); + pm->insertItem("Ding 1"); + pm->insertItem("Ding 2"); + pm->insertItem("Ding 3"); + pm->insertItem("Ding 4"); + + setbullet1TB->setPopup(pm); + + connect(standard, SIGNAL(selected(int, int)), + this, SLOT(checkThis(int, int))); - connect( standard, SIGNAL( selected(int,int) ), - this , SLOT( checkThis(int,int) ) ); - } + BulletsModule::~BulletsModule() { - delete standard; - delete maths; - + delete standard; + delete maths; } + void BulletsModule::setLevel1() { - qWarning("no setLevel1() yet"); + qWarning("no setLevel1() yet"); } + void BulletsModule::checkThis(int x, int y) { - qWarning("Check, x: %d y: %d ",x,y); + qWarning("Check, x: %d y: %d ", x, y); } - diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h index 3938f910f7..1e42fea016 100644 --- a/src/frontends/qt2/BulletsModule.h +++ b/src/frontends/qt2/BulletsModule.h @@ -18,21 +18,18 @@ #include "ui/BulletsModuleBase.h" #include "LString.h" + class QBrowseBox; -class BulletsModule : public BulletsModuleBase -{ +class BulletsModule : public BulletsModuleBase { Q_OBJECT public: - - BulletsModule( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + BulletsModule(QWidget* parent = 0, const char* name = 0, + WFlags fl = 0); ~BulletsModule(); - public slots: - void checkThis(int,int); void setLevel1(); - private: QBrowseBox * standard; QBrowseBox * maths; diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index e4f94a5331..2a4ea8a560 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,84 @@ +2002-10-20 Lars Gullik Bjønnes + + * Toolbar_pimpl.C (setLayout): initialize i to 0, don't + reinitialize. + + * README: add a comment about the strange moc behaviour. + + * QWrap.C (apply): local ref to params + (update_contents): ditto + (numtostr): use erase to clear string + + * QWorkArea.C (setScrollbarParams): use explicit std::max + + * QURL.C (update_contents): local ref to params + (apply): ditto + + * QRef.C (update_contents): local ref to params + (apply): ditto + + * QPreambleDialog.C (editClicked): no need to explicitly + initialize an std::string. + (editClicked): read file with smaller overhead. + + * QParagraph.C (apply): local ref to params + (update_contents): ditto + + * QMinipage.C (apply): local ref to params + (update_contents): ditto + (update_contents): handle InsetMinipage::top in switch + + * QMath.C (createMathPanel): use "new Type" not "new Type()" + + * QLyXKeySym.h: adda key_ accessor key(). + + * QLyXKeySym.C (operator=): out of class version. + + * QLog.C (update_contents): use a simpler and faster way to fill + the log dialog. + + * QLPopupMenu.C (getLabel): use subst directly on mi.label() + + * QLPainter.C (QLPainter): use "new Type" not "new Type()" + (lines): put int i inside for scope + (fillPolygon): put j insize for scope + + * QInclude.C (update_contents): local ref to params + (apply): ditto + + * QGraphics.C (update_contents): initialize item to 0 + (apply): use erase to clear string + + * QFloat.C (update_contents): local ref to params + (apply): ditto + + * QExternal.C (update_contents): local ref to params + (helpText): ditto + (apply): ditto + + * QERT.C (apply): local reference to params + + * QDocument.C (apply): have a local reference to the params + (update_contents): ditto + + * QCommandEdit.C: add missing include config.h + + * QCommandBuffer.C (QCommandBuffer): call method directly on + unnamed pointer objects. + (complete): use "new Type", not "new Type()" + (complete): use explict std::max + + * QCharacter.C (update_contents): use a local reference as + controller cache + (apply): ditto + + * QBibtex.C (update_contents): use erase to clear a string. + + * QAbout.C (build_dialog): fill the credits view in a bit more + elegant way + + * almost all files: clean up formatting and indenting. + 2002-10-19 Lars Gullik Bjønnes * qfont_loader.C (update): move loop vars into for scopes. diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index bff0b0265c..566117e504 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Allan Rae - * \author Angus Leeming + * \author Angus Leeming * * Full author contact details are available in file CREDITS */ diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C index 479dae737e..0c5cb49adc 100644 --- a/src/frontends/qt2/Dialogs2.C +++ b/src/frontends/qt2/Dialogs2.C @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Allan Rae - * \author Angus Leeming + * \author Angus Leeming * * Full author contact details are available in file CREDITS */ @@ -18,6 +18,7 @@ #include "Dialogs_impl.h" + void Dialogs::showAboutlyx() { pimpl_->aboutlyx.controller().show(); @@ -215,11 +216,11 @@ void Dialogs::showSpellchecker() } -void Dialogs::showTabular(InsetTabular * it) +void Dialogs::showTabular(InsetTabular *) {} -void Dialogs::updateTabular(InsetTabular * it) +void Dialogs::updateTabular(InsetTabular *) {} diff --git a/src/frontends/qt2/Dialogs_impl.h b/src/frontends/qt2/Dialogs_impl.h index d91b502d66..90617f27b4 100644 --- a/src/frontends/qt2/Dialogs_impl.h +++ b/src/frontends/qt2/Dialogs_impl.h @@ -223,20 +223,20 @@ WrapDialog; struct Dialogs::Impl { Impl(LyXView & lv, Dialogs & d); - AboutlyxDialog aboutlyx; + AboutlyxDialog aboutlyx; BibitemDialog bibitem; - BibtexDialog bibtex; - CharacterDialog character; + BibtexDialog bibtex; + CharacterDialog character; CitationDialog citation; DocumentDialog document; - ErrorDialog error; + ErrorDialog error; ERTDialog ert; - ExternalDialog external; + ExternalDialog external; FileDialog file; - FloatDialog floats; - GraphicsDialog graphics; + FloatDialog floats; + GraphicsDialog graphics; IncludeDialog include; - IndexDialog index; + IndexDialog index; LogFileDialog logfile; MinipageDialog minipage; ParagraphDialog paragraph; diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index a09eed329f..48c726bc23 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -29,12 +29,15 @@ using std::make_pair; using std::pair; using std::endl; + struct FileDialog::Private { Button b1; Button b2; }; -FileDialog::FileDialog(LyXView *lv, string const & t, kb_action s, Button b1, Button b2) + +FileDialog::FileDialog(LyXView * lv, string const & t, + kb_action s, Button b1, Button b2) : private_(new FileDialog::Private), lv_(lv), title_(t), success_(s) { private_->b1 = b1; @@ -48,14 +51,18 @@ FileDialog::~FileDialog() } -FileDialog::Result const FileDialog::Select(string const & path, string const & mask, string const & suggested) +FileDialog::Result const FileDialog::Select(string const & path, + string const & mask, + string const & suggested) { - string filter = mask; + string filter(mask); if (mask.empty()) filter = _("*|All files"); LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2); - lyxerr[Debug::GUI] << "Select with path \"" << path << "\", mask \"" << filter << "\", suggested \"" << suggested << endl; + lyxerr[Debug::GUI] << "Select with path \"" << path + << "\", mask \"" << filter + << "\", suggested \"" << suggested << endl; dlg.setMode(QFileDialog::AnyFile); diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C index 60d0f054a5..f8e915f3d8 100644 --- a/src/frontends/qt2/FileDialog_private.C +++ b/src/frontends/qt2/FileDialog_private.C @@ -28,20 +28,22 @@ namespace { - /// return the Qt form of the label - string const getLabel(string const & str) { - string label; - string sc(split(str, label, '|')); - if (sc.length() < 2) - return label; - string::size_type pos = label.find(sc[1]); - if (pos == string::npos) - return label; - label.insert(pos, "&"); + +/// return the Qt form of the label +string const getLabel(string const & str) { + string label; + string sc(split(str, label, '|')); + if (sc.length() < 2) return label; - } + string::size_type pos = label.find(sc[1]); + if (pos == string::npos) + return label; + label.insert(pos, "&"); + return label; } +} // namespace anon + LyXFileDialog::LyXFileDialog(string const & p, string const & m, string const & t, diff --git a/src/frontends/qt2/FileDialog_private.h b/src/frontends/qt2/FileDialog_private.h index 5062f226b2..1a7878da15 100644 --- a/src/frontends/qt2/FileDialog_private.h +++ b/src/frontends/qt2/FileDialog_private.h @@ -27,11 +27,10 @@ class LyXFileDialog : public QFileDialog Q_OBJECT public: LyXFileDialog(string const & p, string const & m, string const & t, - FileDialog::Button const & b1, FileDialog::Button const & b2); - + FileDialog::Button const & b1, + FileDialog::Button const & b2); public slots: void buttonClicked(); - private: QToolButton * b1_; string b1_dir_; diff --git a/src/frontends/qt2/LyXKeySymFactory.C b/src/frontends/qt2/LyXKeySymFactory.C index 8ec2d007ed..b5e3f9e513 100644 --- a/src/frontends/qt2/LyXKeySymFactory.C +++ b/src/frontends/qt2/LyXKeySymFactory.C @@ -9,7 +9,7 @@ */ #include - + #ifdef __GNUG__ #pragma implementation #endif @@ -24,5 +24,5 @@ LyXKeySym * create() { return new QLyXKeySym(); } - -} + +} // namespace LyXKeySymFactory diff --git a/src/frontends/qt2/LyXScreenFactory.C b/src/frontends/qt2/LyXScreenFactory.C index effea4d52e..3acfe6ed8c 100644 --- a/src/frontends/qt2/LyXScreenFactory.C +++ b/src/frontends/qt2/LyXScreenFactory.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -26,4 +26,4 @@ LyXScreen * create(WorkArea & owner) return new QScreen(static_cast(owner)); } -} +} // namespace LyXScreenFactory diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C index 03fec17cf7..b4c70ced49 100644 --- a/src/frontends/qt2/Menubar_pimpl.C +++ b/src/frontends/qt2/Menubar_pimpl.C @@ -10,8 +10,6 @@ #include -#include - #ifdef __GNUG__ #pragma implementation #endif @@ -34,6 +32,8 @@ #include #include +#include + using std::endl; using std::vector; using std::max; @@ -41,6 +41,7 @@ using std::min; using std::for_each; using std::pair; + Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) : owner_(static_cast(view)), menubackend_(mbe) { diff --git a/src/frontends/qt2/Menubar_pimpl.h b/src/frontends/qt2/Menubar_pimpl.h index fc249e0d26..6937bc0612 100644 --- a/src/frontends/qt2/Menubar_pimpl.h +++ b/src/frontends/qt2/Menubar_pimpl.h @@ -35,7 +35,7 @@ public: void openByName(string const &); /// update the state of the menuitems - not needed - void update() {}; + void update() {} /// return the owning view QtView * view() { return owner_; } diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index b342235839..8c7dfd943d 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer * * Full author contact details are available in file CREDITS */ @@ -21,7 +21,7 @@ #include "LyXView.h" #include "ButtonControllerBase.h" #include "ControlAboutlyx.h" - + #include #include #include @@ -34,6 +34,7 @@ using std::getline; typedef Qt2CB > base_class; + QAbout::QAbout() : base_class(_("About LyX")) { @@ -42,7 +43,7 @@ QAbout::QAbout() void QAbout::build_dialog() { - dialog_.reset(new QAboutDialog()); + dialog_.reset(new QAboutDialog); connect(dialog_.get()->closePB, SIGNAL(clicked()), this, SLOT(slotClose())); @@ -54,32 +55,59 @@ void QAbout::build_dialog() dialog_->versionLA->setText(controller().getVersion().c_str()); - stringstream in; + // The code below should depend on a autoconf test. (Lgb) +#if 0 + // There are a lot of buggy stringstream implementations..., but the + // code below will work on all of them (I hope). The drawback with + // this solutions os the extra copying. (Lgb) + + ostringstream in; controller().getCredits(in); istringstream ss(in.str().c_str()); string s; - string out; + ostringstream out; while (getline(ss, s)) { if (prefixIs(s, "@b")) - out += "" + s.substr(2) + ""; + out << "" << s.substr(2) << ""; else if (prefixIs(s, "@i")) - out += "" + s.substr(2) + ""; + out << "" << s.substr(2) << ""; else - out += s; - out += "
"; + out << s; + out << "
"; } +#else + // Good stringstream implementations can handle this. It avoids + // some copying, and should thus be faster and use less memory. (Lgb) + // I'll make this the default for a short while to see if anyone + // see the error... + stringstream in; + controller().getCredits(in); + in.seekg(0); + string s; + ostringstream out; - dialog_->creditsTV->setText(out.c_str()); + while (getline(in, s)) { + if (prefixIs(s, "@b")) + out << "" << s.substr(2) << ""; + else if (prefixIs(s, "@i")) + out << "" << s.substr(2) << ""; + else + out << s; + out << "
"; + } +#endif + + dialog_->creditsTV->setText(out.str().c_str()); // try to resize to a good size dialog_->copyright->hide(); dialog_->setMinimumSize(dialog_->copyright->sizeHint()); dialog_->copyright->show(); dialog_->setMinimumSize(dialog_->sizeHint()); - + // Manage the cancel/close button bc().setCancel(dialog_->closePB); bc().refresh(); diff --git a/src/frontends/qt2/QAbout.h b/src/frontends/qt2/QAbout.h index 3ae8d76b63..622510c755 100644 --- a/src/frontends/qt2/QAbout.h +++ b/src/frontends/qt2/QAbout.h @@ -26,7 +26,6 @@ class QAbout { public: QAbout(); - private: /// not needed virtual void apply() {} diff --git a/src/frontends/qt2/QAboutDialog.C b/src/frontends/qt2/QAboutDialog.C index e1b843c6ac..079888ccd1 100644 --- a/src/frontends/qt2/QAboutDialog.C +++ b/src/frontends/qt2/QAboutDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer * * Full author contact details are available in file CREDITS */ @@ -16,7 +16,9 @@ #include "QAboutDialog.h" -QAboutDialog::QAboutDialog(QWidget * parent, const char * name, bool modal, WFlags fl) + +QAboutDialog::QAboutDialog(QWidget * parent, char const * name, + bool modal, WFlags fl) : QAboutDialogBase(parent, name, modal, fl) { } diff --git a/src/frontends/qt2/QAboutDialog.h b/src/frontends/qt2/QAboutDialog.h index d14c568594..e990af3bd6 100644 --- a/src/frontends/qt2/QAboutDialog.h +++ b/src/frontends/qt2/QAboutDialog.h @@ -18,11 +18,11 @@ #include "ui/QAboutDialogBase.h" -class QAboutDialog : public QAboutDialogBase -{ -Q_OBJECT +class QAboutDialog : public QAboutDialogBase { + Q_OBJECT public: - QAboutDialog(QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0); + QAboutDialog(QWidget * parent = 0, const char * name = 0, + bool modal = FALSE, WFlags fl = 0); ~QAboutDialog(); }; diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C index 1b6c65caf3..b901c83540 100644 --- a/src/frontends/qt2/QBibitem.C +++ b/src/frontends/qt2/QBibitem.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -26,9 +26,10 @@ #include "QBibitemDialog.h" #include "QBibitem.h" #include "Qt2BC.h" - + typedef Qt2CB > base_class; + QBibitem::QBibitem() : base_class(_("Bibliography Item")) { diff --git a/src/frontends/qt2/QBibitem.h b/src/frontends/qt2/QBibitem.h index e1310d6bcb..a6db3bc11e 100644 --- a/src/frontends/qt2/QBibitem.h +++ b/src/frontends/qt2/QBibitem.h @@ -21,17 +21,15 @@ class ControlBibitem; class QBibitemDialog; -class QBibitem : - public Qt2CB > +class QBibitem + : public Qt2CB > { +public: friend class QBibitemDialog; -public: QBibitem(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C index 6029549722..92d1cf8b2c 100644 --- a/src/frontends/qt2/QBibitemDialog.C +++ b/src/frontends/qt2/QBibitemDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -21,7 +21,8 @@ #include "QBibitemDialog.h" #include "QBibitem.h" - + + QBibitemDialog::QBibitemDialog(QBibitem * form) : QBibitemDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QBibitemDialog.h b/src/frontends/qt2/QBibitemDialog.h index f64b3bda3f..249a88348f 100644 --- a/src/frontends/qt2/QBibitemDialog.h +++ b/src/frontends/qt2/QBibitemDialog.h @@ -20,19 +20,14 @@ class QBibitem; -class QBibitemDialog : public QBibitemDialogBase -{ Q_OBJECT - +class QBibitemDialog : public QBibitemDialogBase { + Q_OBJECT public: QBibitemDialog(QBibitem * form); - protected slots: virtual void change_adaptor(); - - protected: virtual void closeEvent(QCloseEvent * e); - private: QBibitem * form_; }; diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index d425ca1c89..c4294e36cd 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -19,8 +19,10 @@ #include "ControlBibtex.h" #include "gettext.h" #include "debug.h" + #include "support/filetools.h" // ChangeExtension #include "support/lstrings.h" // getVectorFromString + #include #include #include @@ -35,6 +37,7 @@ using std::vector; typedef Qt2CB > base_class; + QBibtex::QBibtex() : base_class(_("BibTeX")) { @@ -82,7 +85,7 @@ void QBibtex::update_contents() if (contains(bibstyle,',')) bibstyle = split(bibstyle, bibtotoc, ','); else - bibstyle = ""; + bibstyle.erase(); } else dialog_->bibtocCB->setChecked(false); @@ -91,7 +94,7 @@ void QBibtex::update_contents() controller().getBibStyles(),"\n"); for (vector::const_iterator it = str.begin(); it != str.end(); ++it) { - dialog_->styleCB->insertItem(ChangeExtension(*it,"").c_str()); + dialog_->styleCB->insertItem(ChangeExtension(*it, "").c_str()); } dialog_->styleCB->insertItem(bibstyle.c_str(),0); } diff --git a/src/frontends/qt2/QBibtex.h b/src/frontends/qt2/QBibtex.h index bea81b1645..66c5eaf721 100644 --- a/src/frontends/qt2/QBibtex.h +++ b/src/frontends/qt2/QBibtex.h @@ -21,17 +21,15 @@ class ControlBibtex; class QBibtexDialog; -class QBibtex : - public Qt2CB > +class QBibtex + : public Qt2CB > { +public: friend class QBibtexDialog; -public: QBibtex(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 460e319f13..38469d6f22 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -14,7 +14,6 @@ #pragma implementation #endif -#include #include "ControlBibtex.h" #include "gettext.h" #include "debug.h" @@ -32,6 +31,9 @@ #include "QBibtexDialog.h" #include "QBibtex.h" +#include + + QBibtexDialog::QBibtexDialog(QBibtex * form) : QBibtexDialogBase(0, 0, false, 0), form_(form) @@ -90,7 +92,7 @@ void QBibtexDialog::deletePressed() } -void QBibtexDialog::styleChanged(const QString & sel) +void QBibtexDialog::styleChanged(QString const & sel) { styleCB->insertItem(sel,0); } diff --git a/src/frontends/qt2/QBibtexDialog.h b/src/frontends/qt2/QBibtexDialog.h index 1363871ac5..6e927a4202 100644 --- a/src/frontends/qt2/QBibtexDialog.h +++ b/src/frontends/qt2/QBibtexDialog.h @@ -20,13 +20,10 @@ class QBibtex; -class QBibtexDialog : public QBibtexDialogBase -{ +class QBibtexDialog : public QBibtexDialogBase { Q_OBJECT - public: QBibtexDialog(QBibtex * form); - protected slots: virtual void change_adaptor(); virtual void browsePressed(); @@ -34,10 +31,8 @@ protected slots: virtual void deletePressed(); virtual void styleChanged(const QString &); virtual void databaseChanged(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QBibtex * form_; }; diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C index 86cdd25c73..533da0e6da 100644 --- a/src/frontends/qt2/QBrowseBox.C +++ b/src/frontends/qt2/QBrowseBox.C @@ -2,13 +2,14 @@ * \file QBrowseBox.C * * Original file taken from klyx 0.10 sources: - * $Id: QBrowseBox.C,v 1.5 2002/10/17 13:31:04 leeming Exp $ + * $Id: QBrowseBox.C,v 1.6 2002/10/20 01:48:27 larsbj Exp $ * * \author Kalle Dalheimer ? * * Full author contact details are available in file CREDITS */ +#include #include #include @@ -19,11 +20,11 @@ #include #include -#include -#include - #include "QBrowseBox.h" +#include +#include + QBrowseBox::QBrowseBox(int rows, int cols) : QGridView() @@ -182,19 +183,19 @@ void QBrowseBox::paintCell(QPainter * painter, int row, int col) if (activecell_.x() == row && activecell_.y() == col) { if (ispixmap) qDrawShadeRect(painter, 0, 0, cellWidth(), - cellHeight(), colorGroup(), false, 1); + cellHeight(), colorGroup(), false, 1); else qDrawShadePanel(painter, 0, 0, cellWidth(), - cellHeight(), colorGroup(), false, 1); + cellHeight(), colorGroup(), false, 1); } else { qDrawPlainRect(painter, 0, 0, cellWidth(), - cellHeight(), colorGroup().background(), 1); + cellHeight(), colorGroup().background(), 1); } if (!texts_[coordsToIndex(row, col)].isEmpty()) { painter->drawText(0, 0, cellWidth(), - cellHeight(), AlignLeft, - texts_[coordsToIndex(row, col)]); + cellHeight(), AlignLeft, + texts_[coordsToIndex(row, col)]); } painter->setClipping(false); } @@ -290,4 +291,3 @@ void QBrowseBox::moveDown() updateCell(x, activecell_.y()); updateCell(activecell_.x(), activecell_.y()); } - diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt2/QBrowseBox.h index 6372874ad9..83cb745b69 100644 --- a/src/frontends/qt2/QBrowseBox.h +++ b/src/frontends/qt2/QBrowseBox.h @@ -3,7 +3,7 @@ * \file QBrowseBox.h * * Original file taken from klyx 0.10 sources: - * $Id: QBrowseBox.h,v 1.3 2002/10/17 13:31:04 leeming Exp $ + * $Id: QBrowseBox.h,v 1.4 2002/10/20 01:48:27 larsbj Exp $ * * \author Kalle Dalheimer ? * @@ -25,52 +25,49 @@ class QPixmap; class QBrowseBox : public QGridView { - Q_OBJECT + Q_OBJECT public: - QBrowseBox(int rows, int cols); - ~QBrowseBox(); - - void insertItem(QString const & text, int x, int y); - void insertItem(char const * text, int x, int y); - void insertItem(QPixmap pixmap, int x, int y); - void insertItem(QPixmap pixmap); - void removeItem(int x, int y); - void clear(); - - QString text(int x, int y); - QPixmap pixmap(int x, int y); - -// int exec(QPoint const & pos); -// int exec(int x, int y); -// int exec(QWidget * trigger); - + QBrowseBox(int rows, int cols); + ~QBrowseBox(); + + void insertItem(QString const & text, int x, int y); + void insertItem(char const * text, int x, int y); + void insertItem(QPixmap pixmap, int x, int y); + void insertItem(QPixmap pixmap); + void removeItem(int x, int y); + void clear(); + + QString text(int x, int y); + QPixmap pixmap(int x, int y); + + // int exec(QPoint const & pos); + // int exec(int x, int y); + // int exec(QWidget * trigger); + signals: - void selected(int, int); - + void selected(int, int); + protected: - virtual void keyPressEvent(QKeyEvent * e); - virtual void resizeEvent(QResizeEvent * e); - virtual void mouseReleaseEvent(QMouseEvent * e); -// virtual void closeEvent(QCloseEvent * e); - virtual void mouseMoveEvent(QMouseEvent * e); - virtual void paintCell(QPainter *, int x, int y); - + virtual void keyPressEvent(QKeyEvent * e); + virtual void resizeEvent(QResizeEvent * e); + virtual void mouseReleaseEvent(QMouseEvent * e); + // virtual void closeEvent(QCloseEvent * e); + virtual void mouseMoveEvent(QMouseEvent * e); + virtual void paintCell(QPainter *, int x, int y); + private: // make sure the automatically generated one is not used - QBrowseBox & operator=(QBrowseBox const &); - + QBrowseBox & operator=(QBrowseBox const &); + void moveLeft(); void moveRight(); void moveUp(); void moveDown(); - - int coordsToIndex(int x, int y); - - QString * texts_; - QPixmap* pixmaps_; - QPoint activecell_; - + + int coordsToIndex(int x, int y); + + QString * texts_; + QPixmap* pixmaps_; + QPoint activecell_; }; - - #endif diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index 6812350db5..b6ebdf7b1d 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -34,6 +34,7 @@ using std::vector; typedef Qt2CB > base_class; + QCharacter::QCharacter() : base_class(_("Character")) { @@ -56,6 +57,7 @@ void QCharacter::build_dialog() cit != family.end(); ++cit) { dialog_->familyCO->insertItem(cit->first.c_str(), -1); } + for (vector::const_iterator cit = series.begin(); cit != series.end(); ++cit) { dialog_->seriesCO->insertItem(cit->first.c_str(), -1); @@ -117,27 +119,34 @@ int findPos2nd(vector > const & vec, B const & val) void QCharacter::update_contents() { - dialog_->familyCO->setCurrentItem(findPos2nd(family, controller().getFamily())); - dialog_->seriesCO->setCurrentItem(findPos2nd(series, controller().getSeries())); - dialog_->shapeCO->setCurrentItem(findPos2nd(shape, controller().getShape())); - dialog_->sizeCO->setCurrentItem(findPos2nd(size, controller().getSize())); - dialog_->miscCO->setCurrentItem(findPos2nd(bar, controller().getBar())); - dialog_->colorCO->setCurrentItem(findPos2nd(color, controller().getColor())); - dialog_->langCO->setCurrentItem(findPos2nd(language, controller().getLanguage())); + ControlCharacter const & ctrl = controller(); - dialog_->toggleallCB->setChecked(controller().getToggleAll()); + dialog_->familyCO->setCurrentItem(findPos2nd(family, + ctrl.getFamily())); + dialog_->seriesCO->setCurrentItem(findPos2nd(series, + ctrl.getSeries())); + dialog_->shapeCO->setCurrentItem(findPos2nd(shape, ctrl.getShape())); + dialog_->sizeCO->setCurrentItem(findPos2nd(size, ctrl.getSize())); + dialog_->miscCO->setCurrentItem(findPos2nd(bar, ctrl.getBar())); + dialog_->colorCO->setCurrentItem(findPos2nd(color, ctrl.getColor())); + dialog_->langCO->setCurrentItem(findPos2nd(language, + ctrl.getLanguage())); + + dialog_->toggleallCB->setChecked(ctrl.getToggleAll()); } void QCharacter::apply() { - controller().setFamily(family[dialog_->familyCO->currentItem()].second); - controller().setSeries(series[dialog_->seriesCO->currentItem()].second); - controller().setShape(shape[dialog_->shapeCO->currentItem()].second); - controller().setSize(size[dialog_->sizeCO->currentItem()].second); - controller().setBar(bar[dialog_->miscCO->currentItem()].second); - controller().setColor(color[dialog_->colorCO->currentItem()].second); - controller().setLanguage(language[dialog_->langCO->currentItem()].second); + ControlCharacter & ctrl = controller(); - controller().setToggleAll(dialog_->toggleallCB->isChecked()); + ctrl.setFamily(family[dialog_->familyCO->currentItem()].second); + ctrl.setSeries(series[dialog_->seriesCO->currentItem()].second); + ctrl.setShape(shape[dialog_->shapeCO->currentItem()].second); + ctrl.setSize(size[dialog_->sizeCO->currentItem()].second); + ctrl.setBar(bar[dialog_->miscCO->currentItem()].second); + ctrl.setColor(color[dialog_->colorCO->currentItem()].second); + ctrl.setLanguage(language[dialog_->langCO->currentItem()].second); + + ctrl.setToggleAll(dialog_->toggleallCB->isChecked()); } diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt2/QCharacter.h index e760d99bbe..4bb83ce8a5 100644 --- a/src/frontends/qt2/QCharacter.h +++ b/src/frontends/qt2/QCharacter.h @@ -22,6 +22,7 @@ #include "controllers/frnt_lang.h" #include "LString.h" + #include @@ -29,14 +30,13 @@ class ControlCharacter; class QCharacterDialog; -class QCharacter : - public Qt2CB > +class QCharacter + : public Qt2CB > { +public: friend class QCharacterDialog; -public: QCharacter(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C index 8afcf1ae7e..620caa42f0 100644 --- a/src/frontends/qt2/QCharacterDialog.C +++ b/src/frontends/qt2/QCharacterDialog.C @@ -21,6 +21,7 @@ #include #include + QCharacterDialog::QCharacterDialog(QCharacter * form) : QCharacterDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QCharacterDialog.h b/src/frontends/qt2/QCharacterDialog.h index 0827c66a58..135715483e 100644 --- a/src/frontends/qt2/QCharacterDialog.h +++ b/src/frontends/qt2/QCharacterDialog.h @@ -26,18 +26,14 @@ class LyXFont; -class QCharacterDialog : public QCharacterDialogBase -{ Q_OBJECT - +class QCharacterDialog : public QCharacterDialogBase { + Q_OBJECT public: QCharacterDialog(QCharacter * form); - protected: void closeEvent(QCloseEvent * e); - private: QCharacter * form_; - protected slots: void change_adaptor(); }; diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index e8b9d2048a..03fcd326c6 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Angus Leeming - * \author Kalle Dalheimer + * \author Angus Leeming + * \author Kalle Dalheimer * * Full author contact details are available in file CREDITS */ @@ -43,6 +43,7 @@ using std::vector; typedef Qt2CB > base_class; + QCitation::QCitation() : base_class(_("Citation")) {} @@ -63,7 +64,7 @@ void QCitation::apply() controller().params().setCmdName(command); controller().params().setContents(getStringFromVector(citekeys)); - string const after = dialog_->textAfterED->text().latin1(); + string const after = dialog_->textAfterED->text().latin1(); controller().params().setOptions(after); } @@ -174,7 +175,7 @@ void QCitation::update_contents() } -void QCitation::updateBrowser(QListBox* browser, +void QCitation::updateBrowser(QListBox * browser, vector const & keys) const { browser->clear(); diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h index 88af469afc..101f926557 100644 --- a/src/frontends/qt2/QCitation.h +++ b/src/frontends/qt2/QCitation.h @@ -24,14 +24,13 @@ class ControlCitation; class QCitationDialog; -class QCitation : public Qt2CB > +class QCitation + : public Qt2CB > { - friend class QCitationDialog; - public: + friend class QCitationDialog; /// QCitation(); - private: /// enum State { diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index 74d45f960c..282aa21f68 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -36,6 +36,7 @@ using std::vector; using std::find; using std::max; + QCitationDialog::QCitationDialog(QCitation * form) : QCitationDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QCitationDialog.h b/src/frontends/qt2/QCitationDialog.h index c1581ed4cb..707d00463b 100644 --- a/src/frontends/qt2/QCitationDialog.h +++ b/src/frontends/qt2/QCitationDialog.h @@ -21,13 +21,11 @@ class QCitation; -class QCitationDialog : public QCitationDialogBase -{ Q_OBJECT - +class QCitationDialog : public QCitationDialogBase { + Q_OBJECT public: QCitationDialog(QCitation * form); ~QCitationDialog(); - protected slots: virtual void slotBibHighlighted(int sel); virtual void slotBibSelected(int sel); @@ -39,10 +37,8 @@ protected slots: virtual void slotPreviousClicked(); virtual void slotNextClicked(); virtual void changed_adaptor(); - private: void doFind(biblio::Direction dir); - private: QCitation * form_; }; diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C index 65bee21cf8..e0b02d4b94 100644 --- a/src/frontends/qt2/QCommandBuffer.C +++ b/src/frontends/qt2/QCommandBuffer.C @@ -38,14 +38,13 @@ class QTempListBox : public QListBox { public: QTempListBox() : QListBox(0, 0, - WType_Modal | WType_Popup | WDestructiveClose) { + WType_Modal | WType_Popup | WDestructiveClose) { setHScrollBarMode(AlwaysOff); } - protected: void mouseReleaseEvent(QMouseEvent * e) { if (e->x() < 0 || e->y() < 0 - || e->x() > width() || e->y() > height()) { + || e->x() > width() || e->y() > height()) { hide(); } else { emit selected(currentText()); @@ -61,7 +60,8 @@ protected: } }; -} +} // end of anon + QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control) : QToolBar(view), view_(view), controller_(control) @@ -70,11 +70,8 @@ QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control) QPixmap qp(LibFileSearch("images", "unknown", "xpm").c_str()); - QToolButton * upb = new QToolButton(qp, _("Up"), "", this, SLOT(up()), this); - upb->show(); - - QToolButton * downb = new QToolButton(qp, _("Down"), "", this, SLOT(down()), this); - downb->show(); + (new QToolButton(qp, _("Up"), "", this, SLOT(up()), this))->show(); + (new QToolButton(qp, _("Down"), "", this, SLOT(down()), this))->show(); edit_ = new QCommandEdit(this); edit_->setMinimumSize(edit_->sizeHint()); @@ -132,7 +129,7 @@ void QCommandBuffer::complete() edit_->setText(new_input.c_str()); - QTempListBox * list = new QTempListBox(); + QTempListBox * list = new QTempListBox; // For some reason the scrollview's contents are larger // than the number of actual items... @@ -147,9 +144,9 @@ void QCommandBuffer::complete() list->resize(list->sizeHint()); QPoint pos(edit_->mapToGlobal(QPoint(0, 0))); - int y = pos.y() - list->height(); - if (y < 0) - y = 0; + + int y = std::max(0, pos.y() - list->height()); + list->move(pos.x(), y); connect(list, SIGNAL(selected(const QString &)), @@ -160,7 +157,7 @@ void QCommandBuffer::complete() } -void QCommandBuffer::complete_selected(const QString & str) +void QCommandBuffer::complete_selected(QString const & str) { edit_->setText(str + " "); QWidget const * widget = static_cast(sender()); @@ -170,7 +167,7 @@ void QCommandBuffer::complete_selected(const QString & str) void QCommandBuffer::up() { - string const input = edit_->text().latin1(); + string const input(edit_->text().latin1()); string const h(controller_.historyUp()); if (h.empty()) { @@ -183,7 +180,7 @@ void QCommandBuffer::up() void QCommandBuffer::down() { - string const input = edit_->text().latin1(); + string const input(edit_->text().latin1()); string const h(controller_.historyDown()); if (h.empty()) { diff --git a/src/frontends/qt2/QCommandBuffer.h b/src/frontends/qt2/QCommandBuffer.h index c59c0dfcd5..313242e666 100644 --- a/src/frontends/qt2/QCommandBuffer.h +++ b/src/frontends/qt2/QCommandBuffer.h @@ -26,12 +26,10 @@ class ControlCommandBuffer; class QCommandBuffer : public QToolBar { Q_OBJECT public: - QCommandBuffer(QtView * view, ControlCommandBuffer & control); /// focus the edit widget void focus_command(); - public slots: /// cancel command compose void cancel(); @@ -40,12 +38,11 @@ public slots: /// tab-complete void complete(); /// select-complete - void complete_selected(const QString & str); + void complete_selected(QString const & str); /// up void up(); /// down void down(); - private: /// owning view QtView * view_; diff --git a/src/frontends/qt2/QCommandEdit.C b/src/frontends/qt2/QCommandEdit.C index 1b4bbd4805..cc9836f617 100644 --- a/src/frontends/qt2/QCommandEdit.C +++ b/src/frontends/qt2/QCommandEdit.C @@ -3,44 +3,47 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ +#include + #include "QCommandEdit.h" - + + QCommandEdit::QCommandEdit(QWidget * parent) : QLineEdit(parent) -{ - setFocusPolicy(QWidget::ClickFocus); +{ + setFocusPolicy(QWidget::ClickFocus); } void QCommandEdit::keyPressEvent(QKeyEvent * e) { switch (e->key()) { - case Key_Escape: - emit escapePressed(); - break; - - case Key_Up: - emit upPressed(); + case Key_Escape: + emit escapePressed(); + break; + + case Key_Up: + emit upPressed(); break; - case Key_Down: - emit downPressed(); - break; + case Key_Down: + emit downPressed(); + break; - case Key_Right: - if (cursorPosition() == text().length()) - emit rightPressed(); - else - QLineEdit::keyPressEvent(e); - break; - - default: + case Key_Right: + if (cursorPosition() == text().length()) + emit rightPressed(); + else QLineEdit::keyPressEvent(e); - break; + break; + + default: + QLineEdit::keyPressEvent(e); + break; } } diff --git a/src/frontends/qt2/QCommandEdit.h b/src/frontends/qt2/QCommandEdit.h index 7b82677596..da8b34d47f 100644 --- a/src/frontends/qt2/QCommandEdit.h +++ b/src/frontends/qt2/QCommandEdit.h @@ -17,9 +17,7 @@ class QCommandEdit : public QLineEdit { Q_OBJECT public: - QCommandEdit(QWidget * parent); - signals: /// cancel void escapePressed(); @@ -32,7 +30,6 @@ signals: /// complete void rightPressed(); - protected: virtual void keyPressEvent(QKeyEvent * e); }; diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C index 6eb624e202..ccf92d74c2 100644 --- a/src/frontends/qt2/QContentPane.C +++ b/src/frontends/qt2/QContentPane.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -24,11 +24,11 @@ #include #include #include - + using std::endl; namespace { - + /// return the LyX key state from Qt's key_modifier::state q_key_state(Qt::ButtonState state) { @@ -42,6 +42,7 @@ key_modifier::state q_key_state(Qt::ButtonState state) return k; } + /// return the LyX mouse button state from Qt's mouse_button::state q_button_state(Qt::ButtonState button) { @@ -61,8 +62,8 @@ mouse_button::state q_button_state(Qt::ButtonState button) } return b; } - - + + /// return the LyX mouse button state from Qt's mouse_button::state q_motion_state(Qt::ButtonState state) { @@ -77,28 +78,28 @@ mouse_button::state q_motion_state(Qt::ButtonState state) } } // namespace anon - + QContentPane::QContentPane(QWorkArea * parent) - : QWidget(parent, "content_pane", WRepaintNoErase), + : QWidget(parent, "content_pane", WRepaintNoErase), wa_(parent) { setFocusPolicy(QWidget::WheelFocus); setFocus(); // stupid moc strikes again - connect(wa_->scrollbar_, SIGNAL(valueChanged(int)), + connect(wa_->scrollbar_, SIGNAL(valueChanged(int)), this, SLOT(scrollBarChanged(int))); - + } void QContentPane::scrollBarChanged(int val) { - wa_->scrollDocView(val); + wa_->scrollDocView(val); } - - + + void QContentPane::mousePressEvent(QMouseEvent * e) { if (dc_event_.active && dc_event_ == *e) { @@ -109,21 +110,21 @@ void QContentPane::mousePressEvent(QMouseEvent * e) wa_->dispatch(cmd); return; } - - FuncRequest cmd - (LFUN_MOUSE_PRESS, e->x(), e->y(), q_button_state(e->button())); + + FuncRequest cmd(LFUN_MOUSE_PRESS, e->x(), e->y(), + q_button_state(e->button())); wa_->dispatch(cmd); } void QContentPane::mouseReleaseEvent(QMouseEvent * e) { - FuncRequest cmd - (LFUN_MOUSE_RELEASE, e->x(), e->y(), q_button_state(e->button())); + FuncRequest cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(), + q_button_state(e->button())); wa_->dispatch(cmd); } - + void QContentPane::mouseMoveEvent(QMouseEvent * e) { FuncRequest cmd @@ -142,14 +143,14 @@ void QContentPane::keyPressEvent(QKeyEvent * e) wa_->workAreaKeyPress(LyXKeySymPtr(sym), q_key_state(e->state())); } - + void QContentPane::doubleClickTimeout() { if (!dc_event_.active) return; dc_event_.active = false; - + FuncRequest cmd(LFUN_MOUSE_DOUBLE, dc_event_.x, dc_event_.y, q_button_state(dc_event_.state)); @@ -165,8 +166,8 @@ void QContentPane::mouseDoubleClickEvent(QMouseEvent * e) QTimer::singleShot(int(QApplication::doubleClickInterval() / 1.5), this, SLOT(doubleClickTimeout())); } - - + + void QContentPane::resizeEvent(QResizeEvent *) { if (!pixmap_.get()) { @@ -177,7 +178,7 @@ void QContentPane::resizeEvent(QResizeEvent *) wa_->workAreaResize(); } - + void QContentPane::paintEvent(QPaintEvent * e) { if (!pixmap_.get()) { @@ -187,11 +188,11 @@ void QContentPane::paintEvent(QPaintEvent * e) } QRect r(e->rect()); - - lyxerr[Debug::GUI] << "repainting " << r.x() - << "," << r.y() << " " << r.width() + + lyxerr[Debug::GUI] << "repainting " << r.x() + << "," << r.y() << " " << r.width() << "," << r.height() << endl; QPainter q(this); q.drawPixmap(QPoint(r.x(), r.y()), - *pixmap_.get(), r); + *pixmap_.get(), r); } diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt2/QContentPane.h index d8a7e6c4a3..c0f9278b54 100644 --- a/src/frontends/qt2/QContentPane.h +++ b/src/frontends/qt2/QContentPane.h @@ -19,6 +19,7 @@ #include #include #include + #include class QWorkArea; @@ -43,18 +44,17 @@ struct double_click { state(e->button()), active(true) {} }; + /** * Widget for actually drawing the document on */ class QContentPane : public QWidget { Q_OBJECT - public: QContentPane(QWorkArea * parent); /// return the backing pixmap QPixmap * pixmap() const { return pixmap_.get(); } - protected: /// repaint part of the widget void paintEvent(QPaintEvent * e); @@ -72,12 +72,10 @@ protected: /// key press void keyPressEvent(QKeyEvent * e); - public slots: void doubleClickTimeout(); void scrollBarChanged(int); - private: /// owning widget QWorkArea * wa_; diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index 4be8063d0c..f4f84666ca 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/src/frontends/qt2/QDelimiterDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -17,52 +17,68 @@ #include "support/filetools.h" #include "gettext.h" #include "debug.h" - + #include "QMath.h" #include "QDelimiterDialog.h" #include "iconpalette.h" - + #include #include #include #include - -namespace { - char const * delim[] = { - "(", ")", "{", "}", "[", "]", - "lceil", "rceil", "lfloor", "rfloor", "langle", "rangle", - "uparrow", "Uparrow", "downarrow", "Downarrow", - "|", "Vert", "slash", "backslash", "" - }; - string do_match(string str) { - if (str == "(") return ")"; - if (str == ")") return "("; - if (str == "[") return "]"; - if (str == "]") return "["; - if (str == "{") return "}"; - if (str == "}") return "{"; - if (str == "l") return "r"; - if (str == "rceil") return "lceil"; - if (str == "lceil") return "rceil"; - if (str == "rfloor") return "lfloor"; - if (str == "lfloor") return "rfloor"; - if (str == "rangle") return "langle"; - if (str == "langle") return "rangle"; - if (str == "backslash") return "slash"; - if (str == "slash") return "backslash"; - return str; - } - +namespace { + +char const * delim[] = { + "(", ")", "{", "}", "[", "]", + "lceil", "rceil", "lfloor", "rfloor", "langle", "rangle", + "uparrow", "Uparrow", "downarrow", "Downarrow", + "|", "Vert", "slash", "backslash", "" +}; + + +string do_match(string const & str) +{ + if (str == "(") return ")"; + if (str == ")") return "("; + if (str == "[") return "]"; + if (str == "]") return "["; + if (str == "{") return "}"; + if (str == "}") return "{"; + if (str == "l") return "r"; + if (str == "rceil") return "lceil"; + if (str == "lceil") return "rceil"; + if (str == "rfloor") return "lfloor"; + if (str == "lfloor") return "rfloor"; + if (str == "rangle") return "langle"; + if (str == "langle") return "rangle"; + if (str == "backslash") return "slash"; + if (str == "slash") return "backslash"; + return str; } + +string fix_name(string const & str) +{ + if (str == "slash") + return "/"; + if (str == "backslash") + return "\\"; + if (str == "empty") + return "."; + return str; +} + +} // namespace anon + + QDelimiterDialog::QDelimiterDialog(QMath * form) : QDelimiterDialogBase(0, 0, false, 0), form_(form) { setCaption(_("LyX: Delimiters")); - + for (int i = 0; *delim[i]; ++i) { string xpm_name = LibFileSearch("images/math/", delim[i], "xpm"); leftIP->add(QPixmap(xpm_name.c_str()), delim[i], delim[i]); @@ -80,25 +96,13 @@ QDelimiterDialog::QDelimiterDialog(QMath * form) rdelim_clicked(")"); } - -namespace { - string fix_name(string const & str) { - if (str == "slash") - return "/"; - if (str == "backslash") - return "\\"; - if (str == "empty") - return "."; - return str; - } -} - + void QDelimiterDialog::insertClicked() { form_->insertDelim(fix_name(left_) + " " + fix_name(right_)); } - + void QDelimiterDialog::set_label(QLabel * label, string const & str) { string xpm_name = LibFileSearch("images/math/", str, "xpm"); @@ -108,11 +112,11 @@ void QDelimiterDialog::set_label(QLabel * label, string const & str) label->update(); } - + void QDelimiterDialog::ldelim_clicked(string str) { left_ = str; - + set_label(leftPI, left_); if (matchCB->isChecked()) { right_ = do_match(left_); @@ -124,7 +128,7 @@ void QDelimiterDialog::ldelim_clicked(string str) void QDelimiterDialog::rdelim_clicked(string str) { right_ = str; - + set_label(rightPI, right_); if (matchCB->isChecked()) { left_ = do_match(right_); diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h index 7c265259c2..b6213b0ea5 100644 --- a/src/frontends/qt2/QDelimiterDialog.h +++ b/src/frontends/qt2/QDelimiterDialog.h @@ -23,21 +23,16 @@ class QMath; class IconPalette; class QLabel; -class QDelimiterDialog : public QDelimiterDialogBase -{ +class QDelimiterDialog : public QDelimiterDialogBase { Q_OBJECT - public: QDelimiterDialog(QMath * form); - public slots: void ldelim_clicked(string str); void rdelim_clicked(string str); void insertClicked(); - protected: //needed ? virtual void closeEvent(QCloseEvent * e); - private: void set_label(QLabel * label, string const & str); diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index ab70d9e47a..b1b7b2ff1d 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -16,7 +16,6 @@ #include "gettext.h" - #include "ControlDocument.h" #include "QDocument.h" #include "QDocumentDialog.h" @@ -49,6 +48,7 @@ using std::vector; typedef Qt2CB > base_class; + QDocument::QDocument() : base_class(_("Document Settings")) { @@ -56,16 +56,17 @@ QDocument::QDocument() lang_ = getSecond(langs); } + void QDocument::build_dialog() { dialog_.reset(new QDocumentDialog(this)); - /* biblio */ + // biblio dialog_->biblioModule->citeStyleCO->insertItem(_("Author-year")); dialog_->biblioModule->citeStyleCO->insertItem(_("Numerical")); dialog_->biblioModule->citeStyleCO->setCurrentItem(0); - /* language & quotes */ + // language & quotes vector const langs = frnt::getLanguageData(false); vector::const_iterator lit = langs.begin(); vector::const_iterator lend = langs.end(); @@ -81,7 +82,7 @@ void QDocument::build_dialog() dialog_->langModule->quoteStyleCO->insertItem(_("«text»")); dialog_->langModule->quoteStyleCO->insertItem(_("»text«")); - /* packages */ + // packages char const * items[] = {"default","auto","latin1","latin2", "latin3","latin4","latin5","latin9", "koi8-r","koi8-u","cp866","cp1251", @@ -89,27 +90,27 @@ void QDocument::build_dialog() dialog_->packagesModule->encodingCO->insertStrList(items); dialog_->packagesModule->lspacingCO->insertItem( - _("Single"),Spacing::Single); + _("Single"), Spacing::Single); dialog_->packagesModule->lspacingCO->insertItem( - _("OneHalf"),Spacing::Onehalf); + _("OneHalf"), Spacing::Onehalf); dialog_->packagesModule->lspacingCO->insertItem( - _("Double"),Spacing::Double); + _("Double"), Spacing::Double); dialog_->packagesModule->lspacingCO->insertItem( - _("Custom"),Spacing::Other); + _("Custom"), Spacing::Other); for (int n = 0; tex_graphics[n][0]; ++n) { QString enc = tex_graphics[n]; dialog_->packagesModule->psdriverCO->insertItem(enc); } - /* paper */ + // paper QStringList papersize_; papersize_ << _("Default") << _("Custom") << _("US letter") << _("US legal") << _("US executive") << _("A3") << _("A4") << _("A5") << _("B3") << _("B4") << _("B5"); dialog_->paperModule->papersizeCO->insertStringList(papersize_); - /* layout */ + // layout for (LyXTextClassList::const_iterator cit = textclasslist.begin(); cit != textclasslist.end(); ++cit) { dialog_->layoutModule->classCO->insertItem(cit->description().c_str()); @@ -136,12 +137,11 @@ void QDocument::build_dialog() dialog_->layoutModule->pagestyleCO->insertItem(_("headings")); dialog_->layoutModule->pagestyleCO->insertItem(_("fancy")); - /* margins */ + // margins dialog_->setMargins(0); string const bmtablefile = LibFileSearch("images", "standard", "xpm"); QString s = bmtablefile.c_str(); - qWarning("%d", s); // Manage the restore, ok, apply, restore and cancel/close buttons bc().setOK(dialog_->okPB); @@ -153,21 +153,23 @@ void QDocument::build_dialog() void QDocument::apply() { - /* preamble */ - controller().params().preamble = + BufferParams & params = controller().params(); + + // preamble + params.preamble = dialog_->preambleModule->preambleMLE->text().latin1(); - /* biblio */ - controller().params().use_natbib = + // biblio + params.use_natbib = dialog_->biblioModule->natbibCB->isChecked(); - controller().params().use_numerical_citations = + params.use_numerical_citations = dialog_->biblioModule->citeStyleCO->currentItem(); - /* language & quotes */ + // language & quotes if (dialog_->langModule->singleQuoteRB->isChecked()) - controller().params().quotes_times = InsetQuotes::SingleQ; + params.quotes_times = InsetQuotes::SingleQ; else - controller().params().quotes_times = InsetQuotes::DoubleQ; + params.quotes_times = InsetQuotes::DoubleQ; InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; @@ -191,74 +193,74 @@ void QDocument::apply() lga = InsetQuotes::DanishQ; break; } - controller().params().quotes_language = lga; + params.quotes_language = lga; int const pos = dialog_->langModule->languageCO->currentItem(); - controller().params().language = languages.getLanguage(lang_[pos]); + params.language = languages.getLanguage(lang_[pos]); - /* numbering */ - controller().params().secnumdepth = + // numbering + params.secnumdepth = dialog_->numberingModule->tocDepthSB->value(); - controller().params().tocdepth = + params.tocdepth = dialog_->numberingModule->sectionnrDepthSB->value(); - /* packages */ + // packages switch (dialog_->packagesModule->lspacingCO->currentItem()) { case 0: - controller().params().spacing.set(Spacing::Single); + params.spacing.set(Spacing::Single); break; case 1: - controller().params().spacing.set(Spacing::Onehalf); + params.spacing.set(Spacing::Onehalf); break; case 2: - controller().params().spacing.set(Spacing::Double); + params.spacing.set(Spacing::Double); break; case 3: - controller().params().spacing.set(Spacing::Other, + params.spacing.set(Spacing::Other, dialog_->packagesModule-> lspacingLE->text().toFloat() ); break; } - controller().params().graphicsDriver = + params.graphicsDriver = dialog_->packagesModule->psdriverCO->currentText().latin1(); - controller().params().use_amsmath = + params.use_amsmath = dialog_->packagesModule->amsCB->isChecked(); - controller().params().inputenc = + params.inputenc = dialog_->packagesModule->encodingCO->currentText().latin1(); - /* layout */ - controller().params().textclass = + // layout + params.textclass = dialog_->layoutModule->classCO->currentItem(); //bool succes = controller().classApply(); - controller().params().fonts = + params.fonts = dialog_->layoutModule->fontsCO->currentText().latin1(); - controller().params().fontsize = + params.fontsize = dialog_->layoutModule->fontsizeCO->currentText().latin1(); - controller().params().pagestyle = + params.pagestyle = dialog_->layoutModule->pagestyleCO->currentText().latin1(); if (dialog_->layoutModule->indentRB->isChecked()) - controller().params().paragraph_separation = BufferParams::PARSEP_INDENT; + params.paragraph_separation = BufferParams::PARSEP_INDENT; else - controller().params().paragraph_separation = BufferParams::PARSEP_SKIP; + params.paragraph_separation = BufferParams::PARSEP_SKIP; switch (dialog_->layoutModule->skipCO->currentItem()) { case 0: - controller().params().setDefSkip(VSpace(VSpace::SMALLSKIP)); + params.setDefSkip(VSpace(VSpace::SMALLSKIP)); break; case 1: - controller().params().setDefSkip(VSpace(VSpace::MEDSKIP)); + params.setDefSkip(VSpace(VSpace::MEDSKIP)); break; case 2: - controller().params().setDefSkip(VSpace(VSpace::BIGSKIP)); + params.setDefSkip(VSpace(VSpace::BIGSKIP)); break; case 3: { @@ -268,102 +270,103 @@ void QDocument::apply() double length = dialog_->layoutModule->skipLE->text().toDouble(); VSpace vs = VSpace(LyXGlueLength(LyXLength(length,unit))); - controller().params().setDefSkip(vs); + params.setDefSkip(vs); break; } default: // DocumentDefskipCB assures that this never happens - controller().params().setDefSkip(VSpace(VSpace::MEDSKIP)); + params.setDefSkip(VSpace(VSpace::MEDSKIP)); break; } - controller().params().options = + params.options = dialog_->layoutModule->optionsLE->text().latin1(); - controller().params().float_placement = + params.float_placement = dialog_->layoutModule->floatPlacementLE->text().latin1(); - /* paper */ - controller().params().papersize2 = + // paper + params.papersize2 = dialog_->paperModule->papersizeCO->currentItem(); - controller().params().paperwidth = + params.paperwidth = LyXLength(dialog_->paperModule->paperwidthLE->text().toDouble(), dialog_->paperModule->paperwidthUnitCO->currentLengthItem() ).asString(); - controller().params().paperheight = + params.paperheight = LyXLength(dialog_->paperModule->paperheightLE->text().toDouble(), dialog_->paperModule->paperheightUnitCO->currentLengthItem() ).asString(); if (dialog_->paperModule->twoColumnCB->isChecked()) - controller().params().columns = 2; + params.columns = 2; else - controller().params().columns = 1; + params.columns = 1; if (dialog_->paperModule->facingPagesCB->isChecked()) - controller().params().sides = LyXTextClass::TwoSides; + params.sides = LyXTextClass::TwoSides; else - controller().params().sides = LyXTextClass::OneSide; + params.sides = LyXTextClass::OneSide; if (dialog_->paperModule->landscapeRB->isChecked()) - controller().params().orientation = BufferParams::ORIENTATION_LANDSCAPE; + params.orientation = BufferParams::ORIENTATION_LANDSCAPE; else - controller().params().orientation = BufferParams::ORIENTATION_PORTRAIT; + params.orientation = BufferParams::ORIENTATION_PORTRAIT; - /* margins */ - controller().params().use_geometry = - dialog_->marginsModule->marginCO->currentItem()==1; + // margins + params.use_geometry = + (dialog_->marginsModule->marginCO->currentItem() == 1); int margin = dialog_->marginsModule->marginCO->currentItem(); - if (margin>0) { + if (margin > 0) { margin = margin - 1; } - controller().params().paperpackage = char(margin); + params.paperpackage = char(margin); - controller().params().leftmargin = + params.leftmargin = LyXLength(dialog_->marginsModule->innerLE->text().toDouble(), dialog_->marginsModule->innerUnit->currentLengthItem() ).asString(); - controller().params().topmargin = + params.topmargin = LyXLength(dialog_->marginsModule->topLE->text().toDouble(), dialog_->marginsModule->topUnit->currentLengthItem() ).asString(); - controller().params().rightmargin = + params.rightmargin = LyXLength(dialog_->marginsModule->outerLE->text().toDouble(), dialog_->marginsModule->outerUnit->currentLengthItem() ).asString(); - controller().params().bottommargin = + params.bottommargin = LyXLength(dialog_->marginsModule->bottomLE->text().toDouble(), dialog_->marginsModule->bottomUnit->currentLengthItem() ).asString(); - controller().params().headheight = + params.headheight = LyXLength(dialog_->marginsModule->headheightLE->text().toDouble(), dialog_->marginsModule->headheightUnit->currentLengthItem() ).asString(); - controller().params().headsep = + params.headsep = LyXLength(dialog_->marginsModule->headsepLE->text().toDouble(), dialog_->marginsModule->headsepUnit->currentLengthItem() ).asString(); - controller().params().footskip = + params.footskip = LyXLength(dialog_->marginsModule->footskipLE->text().toDouble(), dialog_->marginsModule->footskipUnit->currentLengthItem() ).asString(); } + namespace { /** Return the position of val in the vector if found. @@ -382,41 +385,44 @@ findPos(std::vector const & vec, A const & val) } // namespace anom + void QDocument::update_contents() { if (!dialog_.get()) return; - /* preamble */ - QString preamble = controller().params().preamble.c_str(); + BufferParams const & params = controller().params(); + + // preamble + QString preamble = params.preamble.c_str(); dialog_->preambleModule->preambleMLE->setText(preamble); - /* biblio */ + // biblio dialog_->biblioModule->natbibCB->setChecked( - controller().params().use_natbib); + params.use_natbib); dialog_->biblioModule->citeStyleCO->setCurrentItem( - controller().params().use_numerical_citations ? 1 : 0); + params.use_numerical_citations ? 1 : 0); - /* language & quotes */ + // language & quotes dialog_->langModule->singleQuoteRB->setChecked( - controller().params().quotes_times == InsetQuotes::SingleQ); + params.quotes_times == InsetQuotes::SingleQ); dialog_->langModule->doubleQuoteRB->setChecked( - controller().params().quotes_times == InsetQuotes::DoubleQ); + params.quotes_times == InsetQuotes::DoubleQ); int const pos = int(findPos(lang_, - controller().params().language->lang())); + params.language->lang())); dialog_->langModule->languageCO->setCurrentItem(pos); dialog_->langModule->quoteStyleCO->setCurrentItem( - controller().params().quotes_language); + params.quotes_language); - /* numbering */ + // numbering dialog_->numberingModule->tocDepthSB->setValue( - controller().params().secnumdepth); + params.secnumdepth); dialog_->numberingModule->sectionnrDepthSB->setValue( - controller().params().tocdepth); + params.tocdepth); - /* packages */ + // packages QStringList enc; enc << "default" << "auto" << "latin1" << "latin2" << "latin3" << "latin4" << "latin5" << "latin9" << "koi8-r" << "koi8-u" << @@ -424,14 +430,14 @@ void QDocument::update_contents() int pos2 = 0; for (QStringList::Iterator it = enc.begin(); it!=enc.end(); ++it) { - if (*it==controller().params().inputenc.c_str()) { + if (*it == params.inputenc.c_str()) { dialog_->packagesModule->encodingCO->setCurrentItem(pos2); } ++pos2; } - QString text = controller().params().graphicsDriver.c_str(); + QString text = params.graphicsDriver.c_str(); int nitem = dialog_->packagesModule->psdriverCO->count(); for (int n = 0; n < nitem ; ++n) { QString enc = tex_graphics[n]; @@ -442,20 +448,19 @@ void QDocument::update_contents() dialog_->packagesModule->amsCB->setChecked( - controller().params().use_amsmath); + params.use_amsmath); dialog_->packagesModule->lspacingCO-> - setCurrentItem(controller().params().spacing.getSpace()); - if (controller().params().spacing.getSpace()== - Spacing::Other) { + setCurrentItem(params.spacing.getSpace()); + if (params.spacing.getSpace() == Spacing::Other) { dialog_->packagesModule->lspacingLE->setText( - tostr(controller().params().spacing.getValue()).c_str()); + tostr(params.spacing.getValue()).c_str()); dialog_->setLSpacing(3); } - /* layout */ + // layout for (int n = 0; nlayoutModule->classCO->count(); ++n) { - if (dialog_->layoutModule->classCO->text(n)== + if (dialog_->layoutModule->classCO->text(n) == controller().textClass().description().c_str()) { dialog_->layoutModule->classCO->setCurrentItem(n); break; @@ -463,19 +468,19 @@ void QDocument::update_contents() } dialog_->updateFontsize(controller().textClass().opt_fontsize(), - controller().params().fontsize); + params.fontsize); dialog_->updatePagestyle(controller().textClass().opt_pagestyle(), - controller().params().pagestyle); + params.pagestyle); for (int n = 0; tex_fonts[n][0]; ++n) { - if (tex_fonts[n]==controller().params().fonts) { + if (tex_fonts[n] == params.fonts) { dialog_->layoutModule->fontsCO->setCurrentItem(n); break; } } - if (controller().params().paragraph_separation + if (params.paragraph_separation == BufferParams::PARSEP_INDENT) { dialog_->layoutModule->indentRB->setChecked(true); } else { @@ -483,7 +488,7 @@ void QDocument::update_contents() } int skip = 0; - switch (controller().params().getDefSkip().kind()) { + switch (params.getDefSkip().kind()) { case VSpace::SMALLSKIP: skip = 0; break; @@ -496,7 +501,7 @@ void QDocument::update_contents() case VSpace::LENGTH: { skip = 3; - string const length = controller().params().getDefSkip().asLyXCommand(); + string const length = params.getDefSkip().asLyXCommand(); dialog_->layoutModule->skipLengthCO->setCurrentItem(LyXLength(length).unit()); dialog_->layoutModule->skipLE->setText(tostr(LyXLength(length).value()).c_str()); break; @@ -508,45 +513,45 @@ void QDocument::update_contents() dialog_->layoutModule->skipCO->setCurrentItem(skip); dialog_->setSkip(skip); - if (!controller().params().options.empty()) { + if (!params.options.empty()) { dialog_->layoutModule->optionsLE->setText( - controller().params().options.c_str()); + params.options.c_str()); } else { dialog_->layoutModule->optionsLE->setText(""); } - /* paper */ - int const psize = controller().params().papersize2; + // paper + int const psize = params.papersize2; dialog_->paperModule->papersizeCO->setCurrentItem(psize); dialog_->setMargins(psize); dialog_->setCustomPapersize(psize); bool const landscape = - controller().params().orientation == BufferParams::ORIENTATION_LANDSCAPE; + params.orientation == BufferParams::ORIENTATION_LANDSCAPE; dialog_->paperModule->landscapeRB->setChecked(landscape); dialog_->paperModule->portraitRB->setChecked(!landscape); dialog_->paperModule->facingPagesCB->setChecked( - controller().params().sides == LyXTextClass::TwoSides); + params.sides == LyXTextClass::TwoSides); dialog_->paperModule->twoColumnCB->setChecked( - controller().params().columns == 2); + params.columns == 2); dialog_->paperModule->paperwidthUnitCO->setCurrentItem( - LyXLength(controller().params().paperwidth).unit()); + LyXLength(params.paperwidth).unit()); dialog_->paperModule->paperwidthLE->setText( - tostr(LyXLength(controller().params().paperwidth).value()).c_str()); + tostr(LyXLength(params.paperwidth).value()).c_str()); dialog_->paperModule->paperheightUnitCO->setCurrentItem( - LyXLength(controller().params().paperheight).unit()); + LyXLength(params.paperheight).unit()); dialog_->paperModule->paperheightLE->setText( - tostr(LyXLength(controller().params().paperheight).value()).c_str()); + tostr(LyXLength(params.paperheight).value()).c_str()); - /* margins */ - int item = controller().params().paperpackage; - if (controller().params().use_geometry) { + // margins + int item = params.paperpackage; + if (params.use_geometry) { item = 1; } else if (item > 0) { item = item + 1; @@ -555,39 +560,37 @@ void QDocument::update_contents() dialog_->setCustomMargins(item); dialog_->marginsModule->topUnit->setCurrentItem( - LyXLength(controller().params().topmargin).unit()); + LyXLength(params.topmargin).unit()); dialog_->marginsModule->topLE->setText( - tostr(LyXLength(controller().params().topmargin).value()).c_str()); + tostr(LyXLength(params.topmargin).value()).c_str()); dialog_->marginsModule->bottomUnit->setCurrentItem( - LyXLength(controller().params().bottommargin).unit()); + LyXLength(params.bottommargin).unit()); dialog_->marginsModule->bottomLE->setText( - tostr(LyXLength(controller().params().bottommargin).value()).c_str()); + tostr(LyXLength(params.bottommargin).value()).c_str()); dialog_->marginsModule->innerUnit->setCurrentItem( - LyXLength(controller().params().leftmargin).unit()); + LyXLength(params.leftmargin).unit()); dialog_->marginsModule->innerLE->setText( - tostr(LyXLength(controller().params().leftmargin).value()).c_str()); + tostr(LyXLength(params.leftmargin).value()).c_str()); dialog_->marginsModule->outerUnit->setCurrentItem( - LyXLength(controller().params().rightmargin).unit()); + LyXLength(params.rightmargin).unit()); dialog_->marginsModule->outerLE->setText( - tostr(LyXLength(controller().params().rightmargin).value()).c_str()); + tostr(LyXLength(params.rightmargin).value()).c_str()); dialog_->marginsModule->headheightUnit->setCurrentItem( - LyXLength(controller().params().headheight).unit()); + LyXLength(params.headheight).unit()); dialog_->marginsModule->headheightLE->setText( - tostr(LyXLength(controller().params().headheight).value()).c_str()); + tostr(LyXLength(params.headheight).value()).c_str()); dialog_->marginsModule->headsepUnit->setCurrentItem( - LyXLength(controller().params().headsep).unit()); + LyXLength(params.headsep).unit()); dialog_->marginsModule->headsepLE->setText( - tostr(LyXLength(controller().params().headsep).value()).c_str()); + tostr(LyXLength(params.headsep).value()).c_str()); dialog_->marginsModule->footskipUnit->setCurrentItem( - LyXLength(controller().params().footskip).unit()); + LyXLength(params.footskip).unit()); dialog_->marginsModule->footskipLE->setText( - tostr(LyXLength(controller().params().footskip).value()).c_str()); - - + tostr(LyXLength(params.footskip).value()).c_str()); } diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h index 3fec721fb3..cceb8636bc 100644 --- a/src/frontends/qt2/QDocument.h +++ b/src/frontends/qt2/QDocument.h @@ -30,10 +30,10 @@ class QDocument : public Qt2CB > { public: - /// - QDocument(); /// friend class QDocumentDialog; + /// + QDocument(); private: /// Apply changes void apply(); diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 7dd89a7a24..8147388bff 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -51,9 +51,11 @@ #include #include #include "lengthcombo.h" -/* - * Constructs a DocumentDialog which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' + + +/* + * Constructs a DocumentDialog which is a child of 'parent', with the + * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. @@ -69,7 +71,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form) form, SLOT(slotClose())); connect(restorePB, SIGNAL(clicked()), form, SLOT(slotRestore())); - + moduleLB->clear(); moduleLB->insertItem( _("Layout"), LAYOUT ); moduleLB->insertItem( _("Packages"), PACKAGES ); @@ -101,7 +103,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form) moduleStack->addWidget(numberingModule,NUMBERING); moduleStack->addWidget(biblioModule,BIBLIOGRAPHY); moduleStack->addWidget(preambleModule,PREAMBLE); - + moduleStack->raiseWidget(LAYOUT); //QPixmap image("standard.xpm"); @@ -112,7 +114,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form) f.setWeight( QFont::Bold ); titleL->setFont( f ); setTitle(LAYOUT); - + /* preamble */ connect( preambleModule->preambleMLE, SIGNAL( textChanged() ), this , SLOT( change_adaptor() ) ); @@ -177,18 +179,18 @@ QDocumentDialog::QDocumentDialog( QDocument * form) this , SLOT( change_adaptor() ) ); connect( layoutModule->skipLengthCO, SIGNAL( activated(int) ), this , SLOT( change_adaptor() ) ); - + connect( layoutModule->classCO, SIGNAL( activated(int) ), this , SLOT( classChanged() ) ); connect( layoutModule->skipCO, SIGNAL( activated(int) ), this , SLOT( setSkip(int) ) ); connect( layoutModule->skipRB, SIGNAL( toggled(bool) ), this , SLOT( enableSkip(bool) ) ); - + /* margins */ connect( marginsModule->marginCO, SIGNAL( activated(int) ), this , SLOT( setCustomMargins(int) ) ); - + connect( marginsModule->marginCO, SIGNAL( activated(int) ), this , SLOT( change_adaptor() ) ); connect( marginsModule->topLE, SIGNAL( textChanged(const QString&) ), @@ -219,7 +221,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form) this , SLOT( change_adaptor() ) ); connect( marginsModule->footskipUnit, SIGNAL( activated(int) ), this , SLOT( change_adaptor() ) ); - + /* paper */ connect( paperModule->papersizeCO, SIGNAL( activated(int) ), this , SLOT( setMargins(int) ) ); @@ -227,7 +229,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form) this , SLOT( setCustomPapersize(int) ) ); connect( paperModule->papersizeCO, SIGNAL( activated(int) ), this , SLOT( setCustomPapersize(int) ) ); - + connect( paperModule->papersizeCO, SIGNAL( activated(int) ), this , SLOT( change_adaptor() ) ); connect( paperModule->paperheightLE, SIGNAL( textChanged(const QString&) ), @@ -246,9 +248,10 @@ QDocumentDialog::QDocumentDialog( QDocument * form) this , SLOT( change_adaptor() ) ); connect( paperModule->facingPagesCB, SIGNAL( toggled(bool) ), this , SLOT( change_adaptor() ) ); - + } + void QDocumentDialog::showPreamble() { moduleStack->raiseWidget(PREAMBLE); @@ -256,7 +259,8 @@ void QDocumentDialog::showPreamble() QDocumentDialogBase::show(); } -/* + +/* * Destroys the object and frees any allocated resources */ QDocumentDialog::~QDocumentDialog() @@ -264,7 +268,8 @@ QDocumentDialog::~QDocumentDialog() // no need to delete child widgets, Qt does it all for us } -/* + +/* * public slot */ @@ -301,51 +306,59 @@ void QDocumentDialog::setTitle(int item) } } -/* + +/* * public slot */ void QDocumentDialog::saveDocDefault() {} -/* + +/* * public slot */ void QDocumentDialog::restore() { - qWarning( "DocumentDialog::restore() not yet implemented!" ); + qWarning( "DocumentDialog::restore() not yet implemented!" ); } -/* + +/* * public slot */ void QDocumentDialog::useClassDefaults() { - qWarning( "DocumentDialog::useClassDefaults() not yet implemented!" ); + qWarning( "DocumentDialog::useClassDefaults() not yet implemented!" ); } + void QDocumentDialog::change_adaptor() { form_->changed(); } + void QDocumentDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } + void QDocumentDialog::setLSpacing(int item) { - packagesModule->lspacingLE->setEnabled(item==3); + packagesModule->lspacingLE->setEnabled(item == 3); } + void QDocumentDialog::setSkip(int item) { - bool enable = (item==3); + bool enable = (item == 3); layoutModule->skipLE->setEnabled(enable); layoutModule->skipLengthCO->setEnabled(enable); } + void QDocumentDialog::enableSkip(bool skip) { layoutModule->skipCO->setEnabled(skip); @@ -355,6 +368,7 @@ void QDocumentDialog::enableSkip(bool skip) setSkip(layoutModule->skipCO->currentItem()); } + void QDocumentDialog::setMargins(int papersize) { QStringList a4only; @@ -362,7 +376,7 @@ void QDocumentDialog::setMargins(int papersize) a4only << _("Small Margins") << _( "Very small Margins") << _("Very wide Margins "); normal << _("Default") << _("Custom"); - + int olditem = marginsModule->marginCO->currentItem(); marginsModule->marginCO->clear(); marginsModule->marginCO->insertStringList(normal); @@ -376,8 +390,8 @@ void QDocumentDialog::setMargins(int papersize) void QDocumentDialog::setCustomPapersize(int papersize) { - bool const custom = (papersize==1); - + bool const custom = (papersize == 1); + paperModule->paperwidthL->setEnabled(custom); paperModule->paperwidthLE->setEnabled(custom); paperModule->paperwidthUnitCO->setEnabled(custom); @@ -390,8 +404,8 @@ void QDocumentDialog::setCustomPapersize(int papersize) void QDocumentDialog::setCustomMargins(int margin) { - bool const custom = (margin==1); - + bool const custom = (margin == 1); + marginsModule->topL->setEnabled(custom); marginsModule->topLE->setEnabled(custom); marginsModule->topUnit->setEnabled(custom); @@ -422,11 +436,12 @@ void QDocumentDialog::setCustomMargins(int margin) } + void QDocumentDialog::updateFontsize(string const & items, string const & sel) { layoutModule->fontsizeCO->clear(); layoutModule->fontsizeCO->insertItem("default"); - + for (int n=0; !token(items,'|',n).empty(); ++n) layoutModule->fontsizeCO-> insertItem(token(items,'|',n).c_str()); @@ -439,6 +454,7 @@ void QDocumentDialog::updateFontsize(string const & items, string const & sel) } } + void QDocumentDialog::updatePagestyle(string const & items, string const & sel) { layoutModule->pagestyleCO->clear(); @@ -456,14 +472,13 @@ void QDocumentDialog::updatePagestyle(string const & items, string const & sel) } } + void QDocumentDialog::classChanged() { updateFontsize(form_->controller().textClass().opt_fontsize(), form_->controller().params().fontsize); - + updatePagestyle(form_->controller().textClass().opt_pagestyle(), form_->controller().params().pagestyle); - + } - - diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index 630a4d0277..708c8eee9c 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -33,34 +33,27 @@ class QDocument; -class QDocumentDialog : public QDocumentDialogBase -{ +class QDocumentDialog : public QDocumentDialogBase { Q_OBJECT - public: - - QDocumentDialog( QDocument * ); - + friend class QDocument; + + QDocumentDialog(QDocument *); + ~QDocumentDialog(); void showPreamble(); - - friend class QDocument; - void updateFontsize(string const & , string const & ); - - void updatePagestyle(string const & , string const & ); - + void updateFontsize(string const & , string const &); + + void updatePagestyle(string const & , string const &); public slots: - void setTitle(int); void change_adaptor(); void saveDocDefault(); void restore(); void useClassDefaults(); - protected slots: - void setLSpacing(int); void setMargins(int); void setCustomPapersize(int); @@ -68,11 +61,8 @@ protected slots: void setSkip(int); void enableSkip(bool); void classChanged(); - protected: - void closeEvent(QCloseEvent * e); - private: enum Module { LAYOUT, @@ -85,7 +75,7 @@ private: BIBLIOGRAPHY, PREAMBLE }; - + ClassModuleBase * layoutModule; PackagesModuleBase * packagesModule; PaperModuleBase * paperModule; diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C index 7507382aea..d52ac30cb2 100644 --- a/src/frontends/qt2/QERT.C +++ b/src/frontends/qt2/QERT.C @@ -26,6 +26,7 @@ typedef Qt2CB > base_class; + QERT::QERT() : base_class(_("LaTeX ERT")) { @@ -43,12 +44,14 @@ void QERT::build_dialog() void QERT::apply() { + ERTParams & params = controller().params(); + if (dialog_->openRB->isChecked()) - controller().params().status = InsetERT::Open; + params.status = InsetERT::Open; else if (dialog_->inlineRB->isChecked()) - controller().params().status = InsetERT::Inlined; + params.status = InsetERT::Inlined; else - controller().params().status = InsetERT::Collapsed; + params.status = InsetERT::Collapsed; } diff --git a/src/frontends/qt2/QERT.h b/src/frontends/qt2/QERT.h index f9d95e4b0f..cd0d8583ab 100644 --- a/src/frontends/qt2/QERT.h +++ b/src/frontends/qt2/QERT.h @@ -21,15 +21,13 @@ class ControlERT; class QERTDialog; - -class QERT : - public Qt2CB > +class QERT + : public Qt2CB > { +public: friend class QERTDialog; -public: QERT(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt2/QERTDialog.C index 809ef57d1c..5492da53fd 100644 --- a/src/frontends/qt2/QERTDialog.C +++ b/src/frontends/qt2/QERTDialog.C @@ -19,6 +19,7 @@ #include + QERTDialog::QERTDialog(QERT * form) : QERTDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QERTDialog.h b/src/frontends/qt2/QERTDialog.h index 70078da3a1..3281b666d7 100644 --- a/src/frontends/qt2/QERTDialog.h +++ b/src/frontends/qt2/QERTDialog.h @@ -20,18 +20,14 @@ class QERT; -class QERTDialog : public QERTDialogBase -{ Q_OBJECT - +class QERTDialog : public QERTDialogBase { + Q_OBJECT public: QERTDialog(QERT * form); - protected slots: virtual void change_adaptor(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QERT * form_; }; diff --git a/src/frontends/qt2/QError.C b/src/frontends/qt2/QError.C index 5ada44dee9..6adab2d681 100644 --- a/src/frontends/qt2/QError.C +++ b/src/frontends/qt2/QError.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -23,9 +23,10 @@ #include "QErrorDialog.h" #include "QError.h" #include "Qt2BC.h" - + typedef Qt2CB > base_class; + QError::QError() : base_class(_("LaTeX Error")) { diff --git a/src/frontends/qt2/QError.h b/src/frontends/qt2/QError.h index 9187a72743..dd58f80a5e 100644 --- a/src/frontends/qt2/QError.h +++ b/src/frontends/qt2/QError.h @@ -22,17 +22,16 @@ class ControlError; class QErrorDialog; -class QError : - public Qt2CB > +class QError + : public Qt2CB > { +public: friend class QErrorDialog; -public: QError(); - private: /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QErrorDialog.C b/src/frontends/qt2/QErrorDialog.C index 2fa04f6457..a223bd52e2 100644 --- a/src/frontends/qt2/QErrorDialog.C +++ b/src/frontends/qt2/QErrorDialog.C @@ -3,24 +3,25 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include - + #ifdef __GNUG__ #pragma implementation #endif #include "QError.h" - + #include #include #include "QErrorDialog.h" + QErrorDialog::QErrorDialog(QError * form) : QErrorDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QErrorDialog.h b/src/frontends/qt2/QErrorDialog.h index 012ee442d6..9f0ac4d5a2 100644 --- a/src/frontends/qt2/QErrorDialog.h +++ b/src/frontends/qt2/QErrorDialog.h @@ -20,15 +20,12 @@ class QError; -class QErrorDialog : public QErrorDialogBase -{ Q_OBJECT - +class QErrorDialog : public QErrorDialogBase { + Q_OBJECT public: QErrorDialog(QError * form); - protected: virtual void closeEvent(QCloseEvent * e); - private: QError * form_; }; diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C index 5fa7eadfa3..90042d0370 100644 --- a/src/frontends/qt2/QExternal.C +++ b/src/frontends/qt2/QExternal.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "ControlExternal.h" #include "gettext.h" @@ -27,9 +25,12 @@ #include "QExternalDialog.h" #include "QExternal.h" #include "Qt2BC.h" - + +#include + typedef Qt2CB > base_class; + QExternal::QExternal() : base_class(_("External")) { @@ -64,26 +65,28 @@ void QExternal::update_contents() dialog_->paramsED->setText(params.parameters.c_str()); dialog_->externalCO->setCurrentItem(controller().getTemplateNumber(params.templ.lyxName)); - dialog_->externalTV->setText(controller().params().templ.helpText.c_str()); + dialog_->externalTV->setText(params.templ.helpText.c_str()); isValid(); } string const & QExternal::helpText() { - controller().params().templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1); - return controller().params().templ.helpText; + InsetExternal::Params & params = controller().params(); + + params.templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1); + return params.templ.helpText; } void QExternal::apply() { - controller().params().filename = - string(dialog_->fileED->text().latin1()); - controller().params().parameters = - string(dialog_->paramsED->text().latin1()); + InsetExternal::Params & params = controller().params(); - controller().params().templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1); + params.filename = dialog_->fileED->text().latin1(); + params.parameters = dialog_->paramsED->text().latin1(); + + params.templ = controller().getTemplate(dialog_->externalCO->currentItem() + 1); } diff --git a/src/frontends/qt2/QExternal.h b/src/frontends/qt2/QExternal.h index 7810952c4d..b8da14c656 100644 --- a/src/frontends/qt2/QExternal.h +++ b/src/frontends/qt2/QExternal.h @@ -21,17 +21,15 @@ class ControlExternal; class QExternalDialog; -class QExternal : - public Qt2CB > +class QExternal + : public Qt2CB > { +public: friend class QExternalDialog; -public: QExternal(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index fab00475cc..179ab0e703 100644 --- a/src/frontends/qt2/QExternalDialog.C +++ b/src/frontends/qt2/QExternalDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -16,7 +16,7 @@ #include "gettext.h" #include "ControlExternal.h" - + #include #include #include @@ -27,6 +27,7 @@ #include "QExternalDialog.h" #include "QExternal.h" + QExternalDialog::QExternalDialog(QExternal * form) : QExternalDialogBase(0, 0, false, 0), form_(form) @@ -44,7 +45,7 @@ void QExternalDialog::show() fileED->setFocus(); } - + void QExternalDialog::change_adaptor() { form_->changed(); @@ -81,8 +82,11 @@ void QExternalDialog::updateClicked() void QExternalDialog::browseClicked() { - QString file = QFileDialog::getOpenFileName(QString::null, - _("External material (*)"), this, 0, _("Select external material")); + QString file = + QFileDialog::getOpenFileName(QString::null, + _("External material (*)"), + this, 0, + _("Select external material")); if (!file.isNull()) { fileED->setText(file.latin1()); form_->changed(); diff --git a/src/frontends/qt2/QExternalDialog.h b/src/frontends/qt2/QExternalDialog.h index b698d26d91..a71d3b70e5 100644 --- a/src/frontends/qt2/QExternalDialog.h +++ b/src/frontends/qt2/QExternalDialog.h @@ -20,14 +20,12 @@ class QExternal; -class QExternalDialog : public QExternalDialogBase -{ Q_OBJECT - +class QExternalDialog : public QExternalDialogBase { + Q_OBJECT public: QExternalDialog(QExternal * form); virtual void show(); - protected slots: virtual void change_adaptor(); virtual void editClicked(); @@ -35,10 +33,8 @@ protected slots: virtual void updateClicked(); virtual void browseClicked(); virtual void templateChanged(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QExternal * form_; }; diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index df8ba889f4..fe947a2506 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -27,6 +27,7 @@ typedef Qt2CB > base_class; + QFloat::QFloat() : base_class(_("Float Settings")) { @@ -63,7 +64,9 @@ void QFloat::update_contents() bool force = false; bool here_definitely = false; - string const placement(controller().params().placement); + FloatParams const & params = controller().params(); + + string const & placement = params.placement; if (placement.empty()) { def_placement = true; @@ -86,7 +89,7 @@ void QFloat::update_contents() here = true; } } - + dialog_->defaultsCB->setChecked(def_placement); dialog_->topCB->setChecked(top); dialog_->bottomCB->setChecked(bottom); @@ -95,25 +98,27 @@ void QFloat::update_contents() dialog_->ignoreCB->setChecked(force); dialog_->ignoreCB->setEnabled(top || bottom || page || here); dialog_->heredefinitelyCB->setChecked(here_definitely); - - if (controller().params().wide) { + + if (params.wide) { dialog_->herepossiblyCB->setChecked(false); dialog_->bottomCB->setChecked(false); } - - dialog_->spanCB->setChecked(controller().params().wide); + + dialog_->spanCB->setChecked(params.wide); } - + void QFloat::apply() { - controller().params().wide = dialog_->spanCB->isChecked(); + FloatParams & params = controller().params(); + + params.wide = dialog_->spanCB->isChecked(); if (dialog_->defaultsCB->isChecked()) { - controller().params().placement = ""; + params.placement.erase(); return; } - + string placement; if (dialog_->heredefinitelyCB->isChecked()) { @@ -135,5 +140,5 @@ void QFloat::apply() placement += "h"; } } - controller().params().placement = placement; + params.placement = placement; } diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C index c1af77b021..4e589e849a 100644 --- a/src/frontends/qt2/QFloatDialog.C +++ b/src/frontends/qt2/QFloatDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -23,7 +23,8 @@ #include "QFloatDialog.h" #include "QFloat.h" - + + QFloatDialog::QFloatDialog(QFloat * form) : QFloatDialogBase(0, 0, false, 0), form_(form) @@ -60,7 +61,7 @@ void QFloatDialog::tbhpClicked() allow |= herepossiblyCB->isChecked(); ignoreCB->setEnabled(allow); } - + void QFloatDialog::heredefinitelyClicked() { @@ -80,13 +81,13 @@ void QFloatDialog::spanClicked() bool const span(spanCB->isChecked()); if (!defaultsCB->isChecked()) { - herepossiblyCB->setEnabled(!span); - heredefinitelyCB->setEnabled(!span); + herepossiblyCB->setEnabled(!span); + heredefinitelyCB->setEnabled(!span); } if (!span) return; - + herepossiblyCB->setChecked(false); heredefinitelyCB->setChecked(false); } diff --git a/src/frontends/qt2/QFloatDialog.h b/src/frontends/qt2/QFloatDialog.h index 86f698f767..ae47773c2e 100644 --- a/src/frontends/qt2/QFloatDialog.h +++ b/src/frontends/qt2/QFloatDialog.h @@ -20,21 +20,17 @@ class QFloat; -class QFloatDialog : public QFloatDialogBase -{ Q_OBJECT - +class QFloatDialog : public QFloatDialogBase { + Q_OBJECT public: QFloatDialog(QFloat * form); - protected slots: virtual void change_adaptor(); virtual void tbhpClicked(); virtual void heredefinitelyClicked(); virtual void spanClicked(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QFloat * form_; }; diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 8a615bbeb7..8ced02f2ae 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Edwin Leuven + * \author John Levon + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -43,6 +43,7 @@ typedef Qt2CB > base_class; + QGraphics::QGraphics() : base_class(_("Graphics")) { @@ -103,15 +104,19 @@ void QGraphics::update_contents() string unit = "cm"; switch (lyxrc.default_papersize) { case BufferParams::PAPER_DEFAULT: break; - + case BufferParams::PAPER_USLETTER: case BufferParams::PAPER_LEGALPAPER: - case BufferParams::PAPER_EXECUTIVEPAPER: unit = "in"; break; - + case BufferParams::PAPER_EXECUTIVEPAPER: + unit = "in"; + break; + case BufferParams::PAPER_A3PAPER: case BufferParams::PAPER_A4PAPER: case BufferParams::PAPER_A5PAPER: - case BufferParams::PAPER_B5PAPER: unit = "cm"; break; + case BufferParams::PAPER_B5PAPER: + unit = "cm"; + break; } dialog_->filename->setText(igp.filename.c_str()); @@ -148,7 +153,7 @@ void QGraphics::update_contents() dialog_->subfigure->setChecked(igp.subcaption); dialog_->subcaption->setText(igp.subcaptionText.c_str()); - int item; + int item = 0; switch (igp.display) { case grfx::DefaultDisplay: item = 0; break; case grfx::MonochromeDisplay: item = 1; break; @@ -187,7 +192,7 @@ void QGraphics::apply() igp.filename = dialog_->filename->text(); if (!controller().bbChanged) { - igp.bb = string(); + igp.bb.erase(); } else { string bb; string lbX(dialog_->lbX->text()); @@ -230,7 +235,7 @@ void QGraphics::apply() if (!dialog_->displayCB->isChecked()) igp.display = grfx::NoDisplay; - + string value(dialog_->width->text()); igp.width = LyXLength(strToDbl(value), dialog_->widthUnit->currentLengthItem()); value = string(dialog_->height->text()); @@ -239,7 +244,7 @@ void QGraphics::apply() igp.keepAspectRatio = dialog_->aspectratio->isChecked(); igp.noUnzip = dialog_->unzipCB->isChecked(); - + igp.lyxscale = strToInt(string(dialog_->displayscale->text())); igp.rotateAngle = strToDbl(string(dialog_->angle->text())); @@ -251,7 +256,7 @@ void QGraphics::apply() if ((dialog_->origin->currentItem()) > 0) igp.rotateOrigin = dialog_->origin->currentText(); else - igp.rotateOrigin = string(); + igp.rotateOrigin.erase(); igp.special = dialog_->latexoptions->text(); } @@ -284,6 +289,6 @@ void QGraphics::get() bool QGraphics::isValid() { - // FIXME: we need more here. + // FIXME: we need more here. return !string(dialog_->filename->text().latin1()).empty(); } diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt2/QGraphics.h index 0e3a4a15da..c73a3223b1 100644 --- a/src/frontends/qt2/QGraphics.h +++ b/src/frontends/qt2/QGraphics.h @@ -31,10 +31,8 @@ public: friend class QGraphicsDialog; /// QGraphics(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C index 695aeb0066..c78c770aa5 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "ControlGraphics.h" #include "debug.h" #include "LString.h" @@ -28,6 +26,9 @@ #include "QGraphicsDialog.h" #include "QGraphics.h" +#include + + QGraphicsDialog::QGraphicsDialog(QGraphics * form) : QGraphicsDialogBase(0, 0, false, 0), form_(form) @@ -44,12 +45,12 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form) void QGraphicsDialog::show() -{ +{ QGraphicsDialogBase::show(); filename->setFocus(); } - + void QGraphicsDialog::change_adaptor() { form_->changed(); diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt2/QGraphicsDialog.h index 520a5d0e83..b1b601dec8 100644 --- a/src/frontends/qt2/QGraphicsDialog.h +++ b/src/frontends/qt2/QGraphicsDialog.h @@ -20,22 +20,18 @@ class QGraphics; -class QGraphicsDialog : public QGraphicsDialogBase -{ Q_OBJECT - +class QGraphicsDialog : public QGraphicsDialogBase { + Q_OBJECT public: QGraphicsDialog(QGraphics * form); virtual void show(); - protected slots: virtual void change_adaptor(); virtual void browse_clicked(); virtual void get_clicked(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QGraphics * form_; }; diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index a71ffdc6df..09238f778c 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -17,7 +17,7 @@ #include "ControlInclude.h" #include "gettext.h" #include "debug.h" - + #include "QIncludeDialog.h" #include "QInclude.h" #include "Qt2BC.h" @@ -27,8 +27,10 @@ #include #include + typedef Qt2CB > base_class; + QInclude::QInclude() : base_class(_("Include")) { @@ -50,9 +52,11 @@ void QInclude::build_dialog() void QInclude::update_contents() { - dialog_->filenameED->setText(controller().params().cparams.getContents().c_str()); + InsetInclude::Params const & params = controller().params(); - string const cmdname = controller().params().cparams.getCmdName(); + dialog_->filenameED->setText(params.cparams.getContents().c_str()); + + string const & cmdname = params.cparams.getCmdName(); dialog_->visiblespaceCB->setChecked(false); dialog_->visiblespaceCB->setEnabled(false); @@ -71,19 +75,20 @@ void QInclude::update_contents() void QInclude::apply() { - controller().params().cparams. - setContents(dialog_->filenameED->text().latin1()); + InsetInclude::Params & params = controller().params(); + + params.cparams.setContents(dialog_->filenameED->text().latin1()); int const item = dialog_->typeCO->currentItem(); if (item == 0) - controller().params().flag = InsetInclude::INPUT; + params.flag = InsetInclude::INPUT; else if (item == 1) - controller().params().flag = InsetInclude::INCLUDE; + params.flag = InsetInclude::INCLUDE; else { if (dialog_->visiblespaceCB->isChecked()) - controller().params().flag = InsetInclude::VERBAST; + params.flag = InsetInclude::VERBAST; else - controller().params().flag = InsetInclude::VERB; + params.flag = InsetInclude::VERB; } } @@ -93,9 +98,9 @@ void QInclude::browse() ControlInclude::Type type; int const item = dialog_->typeCO->currentItem(); - if (item==0) + if (item == 0) type = ControlInclude::INPUT; - else if (item==1) + else if (item == 1) type = ControlInclude::INCLUDE; else type = ControlInclude::VERBATIM; diff --git a/src/frontends/qt2/QInclude.h b/src/frontends/qt2/QInclude.h index 22458cc3d8..21c0049659 100644 --- a/src/frontends/qt2/QInclude.h +++ b/src/frontends/qt2/QInclude.h @@ -30,10 +30,8 @@ public: friend class QIncludeDialog; /// QInclude(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C index 88ac175225..37c9959b04 100644 --- a/src/frontends/qt2/QIncludeDialog.C +++ b/src/frontends/qt2/QIncludeDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "ControlInclude.h" #include "debug.h" #include "LString.h" @@ -28,6 +26,9 @@ #include "QIncludeDialog.h" #include "QInclude.h" +#include + + QIncludeDialog::QIncludeDialog(QInclude * form) : QIncludeDialogBase(0, 0, false, 0), form_(form) @@ -43,8 +44,8 @@ void QIncludeDialog::show() { QIncludeDialogBase::show(); filenameED->setFocus(); -} - +} + void QIncludeDialog::change_adaptor() { diff --git a/src/frontends/qt2/QIncludeDialog.h b/src/frontends/qt2/QIncludeDialog.h index a704ab09c6..cb0e31d9d3 100644 --- a/src/frontends/qt2/QIncludeDialog.h +++ b/src/frontends/qt2/QIncludeDialog.h @@ -20,25 +20,21 @@ class QInclude; -class QIncludeDialog : public QIncludeDialogBase -{ Q_OBJECT - +class QIncludeDialog : public QIncludeDialogBase { + Q_OBJECT public: QIncludeDialog(QInclude * form); void updateLists(); virtual void show(); - protected slots: virtual void change_adaptor(); virtual void loadClicked(); virtual void browseClicked(); virtual void typeChanged(int v); - protected: virtual void closeEvent(QCloseEvent * e); - private: QInclude * form_; }; diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index db885c9794..17afb21597 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -25,6 +25,7 @@ typedef Qt2CB > base_class; + QIndex::QIndex() : base_class(_("Index")) { diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt2/QIndex.h index e785bfd461..5256380a61 100644 --- a/src/frontends/qt2/QIndex.h +++ b/src/frontends/qt2/QIndex.h @@ -26,14 +26,12 @@ class QIndexDialog; class QIndex : public Qt2CB > { +public: friend class QIndexDialog; -public: QIndex(); - protected: virtual bool isValid(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C index 06ae362e2e..7dced6a366 100644 --- a/src/frontends/qt2/QIndexDialog.C +++ b/src/frontends/qt2/QIndexDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -18,11 +18,12 @@ #include "QIndex.h" #include "QIndexDialog.h" - + #include #include #include + QIndexDialog::QIndexDialog(QIndex * form) : QIndexDialogBase(0, 0, false, 0), form_(form) @@ -51,11 +52,11 @@ QIndexDialog::QIndexDialog(QIndex * form) void QIndexDialog::show() { - QIndexDialogBase::show(); + QIndexDialogBase::show(); keywordED->setFocus(); } - + void QIndexDialog::change_adaptor() { form_->changed(); diff --git a/src/frontends/qt2/QIndexDialog.h b/src/frontends/qt2/QIndexDialog.h index e78d0b61ea..5ee70d21db 100644 --- a/src/frontends/qt2/QIndexDialog.h +++ b/src/frontends/qt2/QIndexDialog.h @@ -20,20 +20,16 @@ class QIndex; -class QIndexDialog : public QIndexDialogBase -{ Q_OBJECT - +class QIndexDialog : public QIndexDialogBase { + Q_OBJECT public: QIndexDialog(QIndex * form); virtual void show(); - protected slots: virtual void change_adaptor(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QIndex * form_; }; diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C index 15577b4305..787bc17aa8 100644 --- a/src/frontends/qt2/QLImage.C +++ b/src/frontends/qt2/QLImage.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Angus Leeming - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -46,7 +46,7 @@ Image::ImagePtr QLImage::newImage() Image::FormatList QLImage::loadableFormats() { static FormatList fmts; - + if (!fmts.empty()) return fmts; @@ -58,14 +58,14 @@ Image::FormatList QLImage::loadableFormats() << "\nThe image loader can load the following directly:\n"; QStrList qt_formats = QImageIO::inputFormats(); - + QStrListIterator it(qt_formats); for (; it.current(); ++it) { lyxerr[Debug::GRAPHICS] << it.current() << endl; string ext = lowercase(it.current()); - + // special case if (ext == "jpeg") ext = "jpg"; @@ -99,7 +99,8 @@ QLImage::QLImage() QLImage::QLImage(QLImage const & other) - : Image(other), pixmap_(other.pixmap_), xformed_pixmap_(other.xformed_pixmap_) + : Image(other), pixmap_(other.pixmap_), + xformed_pixmap_(other.xformed_pixmap_) { } @@ -142,11 +143,11 @@ void QLImage::load(string const & filename) finishedLoading(false); return; } - lyxerr[Debug::GRAPHICS] << "just Loaded." << endl; + lyxerr[Debug::GRAPHICS] << "just Loaded." << endl; xformed_pixmap_ = pixmap_; lyxerr[Debug::GRAPHICS] << "pixmap isNull " << pixmap_.isNull() << " xformed_pixmap_ isNull " << xformed_pixmap_.isNull() << endl; - finishedLoading(true); + finishedLoading(true); } @@ -158,9 +159,9 @@ bool QLImage::setPixmap(Params const & params) return false; lyxerr[Debug::GRAPHICS] << "setPixmap()" << endl; - + // FIXME -#if 0 +#if 0 int color_key; switch (params.display) { case MonochromeDisplay: @@ -187,7 +188,7 @@ bool QLImage::setPixmap(Params const & params) flimage_replace_pixel(image_, image_->fill_color, fill); image_->fill_color = fill; } -#endif +#endif return true; } @@ -239,7 +240,7 @@ void QLImage::rotate(Params const & params) // degree units. lyxerr[Debug::GRAPHICS] << "rotating image by " << params.angle << " degrees" << endl; - + QWMatrix m; m.rotate(-params.angle); xformed_pixmap_ = xformed_pixmap_.xForm(m); diff --git a/src/frontends/qt2/QLImage.h b/src/frontends/qt2/QLImage.h index 16aad2453d..2e0f7f7f25 100644 --- a/src/frontends/qt2/QLImage.h +++ b/src/frontends/qt2/QLImage.h @@ -23,8 +23,7 @@ namespace grfx { -class QLImage : public Image -{ +class QLImage : public Image { public: /// Access to this class is through this static method. static ImagePtr newImage(); @@ -71,7 +70,6 @@ public: /// Scale the image using params. virtual void scale(Params const & params); - private: /// Access to the class is through newImage() and clone. QLImage(); diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index 197f39f315..07d6a085c5 100644 --- a/src/frontends/qt2/QLPainter.C +++ b/src/frontends/qt2/QLPainter.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,11 +14,8 @@ #pragma implementation #endif -#include -#include - #include "font_metrics.h" -#include "support/lstrings.h" +#include "support/lstrings.h" #include "lyxrc.h" #include "debug.h" #include "LyXView.h" @@ -29,17 +26,22 @@ #include "qfont_loader.h" #include "QLPainter.h" #include "QLImage.h" - + +#include + #include -#include +#include #include +#include + using std::endl; + QLPainter::QLPainter(QWorkArea & qwa) : Painter(), owner_(qwa), paint_check_(0) { - qp_.reset(new QPainter()); + qp_.reset(new QPainter); } @@ -49,7 +51,7 @@ void QLPainter::start() qp_->begin(owner_.getPixmap()); } - + void QLPainter::end() { if (paint_check_ == 0) { @@ -59,7 +61,7 @@ void QLPainter::end() } } - + int QLPainter::paperWidth() const { return owner_.workWidth(); @@ -71,29 +73,29 @@ int QLPainter::paperHeight() const return owner_.workHeight(); } - -QPainter & QLPainter::setPen(LColor::color c, + +QPainter & QLPainter::setPen(LColor::color c, Painter::line_style ls, Painter::line_width lw) { QPen pen = qp_->pen(); - + pen.setColor(lcolor.getX11Name(c).c_str()); - + switch (ls) { case line_solid: pen.setStyle(QPen::SolidLine); break; case line_onoffdash: pen.setStyle(QPen::DotLine); break; } - + switch (lw) { case line_thin: pen.setWidth(0); break; case line_thick: pen.setWidth(3); break; } - + qp_->setPen(pen); return *qp_; } - - + + Painter & QLPainter::point(int x, int y, LColor::color c) { setPen(c).drawPoint(x, y); @@ -101,7 +103,7 @@ Painter & QLPainter::point(int x, int y, LColor::color c) } -Painter & QLPainter::line(int x1, int y1, +Painter & QLPainter::line(int x1, int y1, int x2, int y2, LColor::color col, line_style ls, @@ -112,7 +114,7 @@ Painter & QLPainter::line(int x1, int y1, } -Painter & QLPainter::lines(int const * xp, int const * yp, +Painter & QLPainter::lines(int const * xp, int const * yp, int np, LColor::color col, line_style ls, @@ -123,9 +125,7 @@ Painter & QLPainter::lines(int const * xp, int const * yp, // Must use new as np is not known at compile time. boost::scoped_array points(new QCOORD[np * 2]); - int j = 0; - - for (int i = 0; i < np; ++i) { + for (int i = 0, j = 0; i < np; ++i) { points[j++] = xp[i]; points[j++] = yp[i]; } @@ -136,51 +136,50 @@ Painter & QLPainter::lines(int const * xp, int const * yp, } -Painter & QLPainter::rectangle(int x, int y, +Painter & QLPainter::rectangle(int x, int y, int w, int h, LColor::color col, line_style ls, line_width lw) { - //lyxerr << "rectangle " << x<<","<fillRect(x, y, w, h, QColor(lcolor.getX11Name(col).c_str())); return *this; } -Painter & QLPainter::fillPolygon(int const * xp, int const * yp, +Painter & QLPainter::fillPolygon(int const * xp, int const * yp, int np, LColor::color col) { // Must use new as np is not known at compile time. boost::scoped_array points(new QCOORD[np * 2]); - //if (1) return *this; - int j = 0; - - for (int i = 0; i < np; ++i) { + //if (1) return *this; + + for (int i = 0, j = 0; i < np; ++i) { points[j++] = xp[i]; points[j++] = yp[i]; } setPen(col); - qp_->setBrush(lcolor.getX11Name(col).c_str()); + qp_->setBrush(lcolor.getX11Name(col).c_str()); qp_->drawPolygon(QPointArray(np, points.get())); qp_->setBrush(Qt::NoBrush); return *this; } - + Painter & QLPainter::arc(int x, int y, unsigned int w, unsigned int h, int a1, int a2, LColor::color col) @@ -188,13 +187,13 @@ Painter & QLPainter::arc(int x, int y, lyxerr[Debug::GUI] << "arc: " << x<<","<ucs(s[i])); // HACK: QT3 refuses to show single compose characters if (ls = 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2) - str = ' '+str; + str = ' ' + str; #else for (size_t i = 0; i < ls; ++i) str += QChar(encoding->ucs(s[i])); @@ -285,6 +284,6 @@ Painter & QLPainter::text(int x, int y, if (f.underbar() == LyXFont::ON) { underline(f, x, y, font_metrics::width(s, ls, f)); } - + return *this; } diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h index 5a3b8375b2..b69bc8575b 100644 --- a/src/frontends/qt2/QLPainter.h +++ b/src/frontends/qt2/QLPainter.h @@ -119,7 +119,6 @@ public: /// draw a char at position x, y (y is the baseline) virtual Painter & text(int x, int y, char c, LyXFont const & f); - private: /// draw small caps text void smallCapsText(int x, int y, diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 4f99d1d44d..be720517a5 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/src/frontends/qt2/QLPopupMenu.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -17,49 +17,49 @@ #include "MenuBackend.h" #include "lyxfunc.h" #include "debug.h" - + #include "QtView.h" - + #include "QLPopupMenu.h" #include "support/lstrings.h" using std::pair; using std::make_pair; - + namespace { - + string const getLabel(MenuItem const & mi) { string const shortcut = mi.shortcut(); - string label = mi.label(); + string label = subst(mi.label(), "&", "&&"); - label = subst(label, "&", "&&"); - if (shortcut.empty()) return label; - + string::size_type pos = label.find(shortcut); if (pos == string::npos) return label; label.insert(pos, "&"); - + return label; } -} +} // namespace anon -pair createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel) +pair +createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel) { // FIXME: leaks ?? QLPopupMenu * pm = new QLPopupMenu(owner, item->submenuname(), is_toplevel); int id = parent->insertItem(getLabel(*item).c_str(), pm); return make_pair(id, pm); } - - -QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel) + + +QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, + string const & name, bool toplevel) : owner_(owner), name_(name) { if (toplevel) @@ -67,27 +67,29 @@ QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool tople connect(this, SIGNAL(activated(int)), owner_->view(), SLOT(activated(int))); } - + bool QLPopupMenu::disabled(Menu * menu) { bool disable = true; - + Menu::const_iterator m = menu->begin(); Menu::const_iterator end = menu->end(); for (; m != end; ++m) { - if (m->kind() == MenuItem::Submenu && !disabled(m->submenu())) { + if (m->kind() == MenuItem::Submenu + && !disabled(m->submenu())) { disable = false; } else { FuncStatus const status = - owner_->view()->getLyXFunc().getStatus(m->action()); + owner_->view()->getLyXFunc() + .getStatus(m->action()); if (!status.disabled()) disable = false; } } return disable; } - + void QLPopupMenu::populate(Menu * menu) { @@ -112,12 +114,12 @@ void QLPopupMenu::populate(Menu * menu) } } - + void QLPopupMenu::showing() { clear(); Menu tomenu; Menu const frommenu = owner_->backend().getMenu(name_); owner_->backend().expand(frommenu, tomenu, owner_->view()->buffer()); - populate(&tomenu); + populate(&tomenu); } diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h index 3a0726f957..b996780364 100644 --- a/src/frontends/qt2/QLPopupMenu.h +++ b/src/frontends/qt2/QLPopupMenu.h @@ -30,21 +30,21 @@ class QLPopupMenu; /// create a sub-menu std::pair - createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel = false); +createMenu(QMenuData * parent, MenuItem const * item, + Menubar::Pimpl * owner, bool is_toplevel = false); /// a submenu class QLPopupMenu : public QPopupMenu { Q_OBJECT public: - QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel); + QLPopupMenu(Menubar::Pimpl * owner, + string const & name, bool toplevel); /// populate the menu void populate(Menu * menu); - public slots: /// populate the toplevel menu and all children void showing(); - private: /// return true if the given submenu is disabled bool disabled(Menu * menu); diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 535ce1bf3d..4018ef8237 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -3,13 +3,12 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include -#include #ifdef __GNUG__ #pragma implementation @@ -18,6 +17,7 @@ #include "LyXView.h" #include "gettext.h" #include "ControlLog.h" +#include "Lsstream.h" #include #include @@ -26,6 +26,8 @@ #include "QLog.h" #include "Qt2BC.h" +#include + using std::ifstream; using std::getline; @@ -47,7 +49,8 @@ void QLog::build_dialog() void QLog::update_contents() { - std::pair const logfile = controller().logfile(); + std::pair const & logfile = + controller().logfile(); if (logfile.first == Buffer::buildlog) dialog_->setCaption(_("Build log")); @@ -65,11 +68,8 @@ void QLog::update_contents() return; } - string text; - string line; + ostringstream ost; + ost << ifstr.rdbuf(); - while (getline(ifstr, line)) - text += line + "\n"; - - dialog_->logTV->setText(text.c_str()); + dialog_->logTV->setText(ost.str().c_str()); } diff --git a/src/frontends/qt2/QLog.h b/src/frontends/qt2/QLog.h index 20bc00f433..ce2d16166e 100644 --- a/src/frontends/qt2/QLog.h +++ b/src/frontends/qt2/QLog.h @@ -30,10 +30,9 @@ public: friend class QLogDialog; /// QLog(); - private: /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C index 8f72a76ee2..a9a19dc0bc 100644 --- a/src/frontends/qt2/QLogDialog.C +++ b/src/frontends/qt2/QLogDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,17 +14,18 @@ #pragma implementation #endif -#include - #include "LyXView.h" #include "ControlLog.h" #include #include - + #include "QLogDialog.h" #include "QLog.h" +#include + + QLogDialog::QLogDialog(QLog * form) : QLogDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QLogDialog.h b/src/frontends/qt2/QLogDialog.h index e5483990c6..3d5ecc0405 100644 --- a/src/frontends/qt2/QLogDialog.h +++ b/src/frontends/qt2/QLogDialog.h @@ -20,18 +20,14 @@ class QLog; -class QLogDialog : public QLogDialogBase -{ Q_OBJECT - +class QLogDialog : public QLogDialogBase { + Q_OBJECT public: QLogDialog(QLog * form); - protected slots: virtual void updateClicked(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QLog * form_; }; diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index 042da02ce9..afe75d39a9 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Asger and Juergen - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -18,23 +18,24 @@ #include "QLyXKeySym.h" #include "qlkey.h" #include "debug.h" - + #include using std::endl; + QLyXKeySym::QLyXKeySym() : LyXKeySym(), key_(0) { } - - + + void QLyXKeySym::set(QKeyEvent * ev) { key_ = ev->key(); - text_ = ev->text(); + text_ = ev->text(); } - + void QLyXKeySym::init(string const & symbolname) { @@ -43,12 +44,12 @@ void QLyXKeySym::init(string const & symbolname) lyxerr[Debug::KEY] << "Init key to " << key_ << ", " << text_ << endl; } - + bool QLyXKeySym::isOK() const { return ! key_ == 0; } - + bool QLyXKeySym::isModifier() const { @@ -68,17 +69,20 @@ string QLyXKeySym::getSymbolName() const return sym; } - + char QLyXKeySym::getISOEncoded() const { lyxerr[Debug::KEY] << "getISO returning " << text_.latin1()[0] << endl; - return text_.latin1()[0]; + return text_.latin1()[0]; } - -bool QLyXKeySym::operator==(LyXKeySym const & k) const + +bool operator==(LyXKeySym const & k1, LyXKeySym const & k2) { - QLyXKeySym const & o = static_cast(k); - // ignore text_ ! - return o.key_ == key_; + // note we ignore text_ here (non-strict ==), because + // text_ is not filled out by keymap initialisation + + return static_cast(k1).key() + == static_cast(k2).key(); + } diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt2/QLyXKeySym.h index 76355de577..e104b262f9 100644 --- a/src/frontends/qt2/QLyXKeySym.h +++ b/src/frontends/qt2/QLyXKeySym.h @@ -56,9 +56,10 @@ public: * This relies on user to use the right encoding. */ virtual char getISOEncoded() const; - - virtual bool operator==(LyXKeySym const & k) const; - + /// + int key() const { + return key_; + } private: /// the Qt sym value int key_; diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt2/QMath.C index b0b2346848..a031238b94 100644 --- a/src/frontends/qt2/QMath.C +++ b/src/frontends/qt2/QMath.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -15,29 +15,33 @@ #endif #include "debug.h" - + #include "commandtags.h" #include "funcrequest.h" #include "LyXView.h" #include "BufferView.h" - + #include "QMathDialog.h" #include "QMath.h" #include "iconpalette.h" -// FIXME temporary HACK ! +// needless to say, this can't last for long +extern BufferView * current_view; + + +// FIXME temporary HACK ! void createMathPanel() { - static QMath * dialog = 0; + static QMath * dialog = 0; if (!dialog) { - dialog = new QMath(); + dialog = new QMath; dialog->build_dialog(); } dialog->do_show(); } - - + + QMath::QMath() { } @@ -47,16 +51,13 @@ void QMath::do_show() { dialog_->show(); } - - + + void QMath::build_dialog() { dialog_ = new QMathDialog(this); } - -// needless to say, this can't last for long -extern BufferView * current_view; void QMath::subscript() { @@ -74,7 +75,7 @@ void QMath::insert(string const & name) { current_view->owner()->dispatch(FuncRequest(LFUN_INSERT_MATH, '\\' + name)); } - + void QMath::insertCubeRoot() { @@ -89,13 +90,13 @@ void QMath::insertMatrix() current_view->owner()->dispatch(FuncRequest(LFUN_INSERT_MATRIX, "2 2")); } - + void QMath::insertDelim(string const & str) { current_view->owner()->dispatch(FuncRequest(LFUN_MATH_DELIM, str)); } - + void QMath::toggleDisplay() { current_view->owner()->dispatch(FuncRequest(LFUN_MATH_DISPLAY)); diff --git a/src/frontends/qt2/QMath.h b/src/frontends/qt2/QMath.h index 0856de3765..5fd1763d72 100644 --- a/src/frontends/qt2/QMath.h +++ b/src/frontends/qt2/QMath.h @@ -20,8 +20,7 @@ class QMathDialog; -class QMath -{ +class QMath { public: friend class QMathDialog; @@ -53,7 +52,6 @@ public: /// switch between display and inline void toggleDisplay(); - private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index 26f4e75a47..99a612e4c8 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/src/frontends/qt2/QMathDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -17,14 +17,14 @@ #include "support/filetools.h" #include "gettext.h" #include "debug.h" - + #include "QMathDialog.h" #include "QMath.h" #include "ControlMath.h" #include "iconpalette.h" #include "QDelimiterDialog.h" - + #include #include #include @@ -35,11 +35,12 @@ #include #include #include - + using std::min; using std::max; using std::endl; - + + class QScrollViewSingle : public QScrollView { public: QScrollViewSingle(QWidget * p) @@ -50,53 +51,54 @@ public: setBackgroundMode(PaletteBackground); viewport()->setBackgroundMode(PaletteBackground); } - + void setChild(QWidget * w) { - w_ = w; + w_ = w; setMinimumWidth(verticalScrollBar()->width() + w_->width() + 4); addChild(w_); } - protected: virtual void resizeEvent(QResizeEvent * e) { QScrollView::resizeEvent(e); if (!w_) return; - + w_->resize(viewport()->width(), w_->height()); // force the resize to get accurate scrollbars qApp->processEvents(); resizeContents(w_->width(), w_->height()); } - private: - QWidget * w_; + QWidget * w_; }; - -namespace { - char const ** panels[] = { - latex_bop, latex_varsz, latex_brel, latex_greek, latex_arrow, - latex_dots, latex_deco, latex_misc, latex_ams_ops, - latex_ams_rel, latex_ams_nrel, latex_ams_arrows, - latex_ams_misc - }; - int const nr_panels = sizeof(panels)/sizeof(panels[0]); + +namespace { + +char const ** panels[] = { + latex_bop, latex_varsz, latex_brel, latex_greek, latex_arrow, + latex_dots, latex_deco, latex_misc, latex_ams_ops, + latex_ams_rel, latex_ams_nrel, latex_ams_arrows, + latex_ams_misc +}; + +int const nr_panels = sizeof(panels)/sizeof(panels[0]); bool panel_initialised[nr_panels]; -} - - + +} // namespace anon + + QMathDialog::QMathDialog(QMath * form) : QMathDialogBase(0, 0, false, 0), form_(form) { - connect(symbolsCO, SIGNAL(activated(int)), symbolsWS, SLOT(raiseWidget(int))); + connect(symbolsCO, SIGNAL(activated(int)), symbolsWS, SLOT(raiseWidget(int))); for (int i = 0; *function_names[i]; ++i) { functionsLB->insertItem(function_names[i]); } - - for (int i = 0; i < nr_panels; ++i) { + + for (int i = 0; i < nr_panels; ++i) { QScrollViewSingle * view = new QScrollViewSingle(symbolsWS); symbolsWS->addWidget(view, i); } @@ -105,17 +107,17 @@ QMathDialog::QMathDialog(QMath * form) symbolsWS->raiseWidget(0); addPanel(0); panel_initialised[0] = true; - + connect(symbolsWS, SIGNAL(aboutToShow(int)), this, SLOT(showingPanel(int))); - + QPopupMenu * m = new QPopupMenu(spacePB); m->setCaption(_("LyX: Insert space")); m->insertTearOffHandle(); - m->insertItem(_("Thin space \\,"), 1); - m->insertItem(_("Medium space \\:"), 2); - m->insertItem(_("Thick space \\;"), 3); - m->insertItem(_("Quadratin space \\quad"), 4); - m->insertItem(_("Double quadratin space \\qquad"), 5); + m->insertItem(_("Thin space \\,"), 1); + m->insertItem(_("Medium space \\:"), 2); + m->insertItem(_("Thick space \\;"), 3); + m->insertItem(_("Quadratin space \\quad"), 4); + m->insertItem(_("Double quadratin space \\qquad"), 5); m->insertItem(_("Negative space \\!"), 6); connect(m, SIGNAL(activated(int)), this, SLOT(insertSpace(int))); spacePB->setPopup(m); @@ -126,7 +128,7 @@ QMathDialog::QMathDialog(QMath * form) m->insertItem(_("Square root \\sqrt"), 1); m->insertItem(_("Cube root \\root"), 2); m->insertItem(_("Other root \\root"), 3); - connect(m, SIGNAL(activated(int)), this, SLOT(insertRoot(int))); + connect(m, SIGNAL(activated(int)), this, SLOT(insertRoot(int))); sqrtPB->setPopup(m); m = new QPopupMenu(stylePB); @@ -163,13 +165,13 @@ void QMathDialog::showingPanel(int num) addPanel(num); - // Qt needs to catch up. Dunno why. + // Qt needs to catch up. Dunno why. qApp->processEvents(); - + panel_initialised[num] = true; } - + IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries) { IconPalette * p = new IconPalette(parent); @@ -178,11 +180,11 @@ IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries) p->add(QPixmap(xpm_name.c_str()), entries[i], string("\\") + entries[i]); } connect(p, SIGNAL(button_clicked(string)), this, SLOT(symbol_clicked(string))); - + return p; } - + void QMathDialog::addPanel(int num) { QScrollViewSingle * view = static_cast(symbolsWS->visibleWidget()); @@ -190,64 +192,64 @@ void QMathDialog::addPanel(int num) view->setChild(p); } - -void QMathDialog::symbol_clicked(string str) + +void QMathDialog::symbol_clicked(string const & str) { form_->insert(str); } - + void QMathDialog::fracClicked() { form_->insert("frac"); } - + void QMathDialog::delimiterClicked() { - // FIXME: leak + // FIXME: leak QDelimiterDialog * d = new QDelimiterDialog(form_); d->show(); } - + void QMathDialog::expandClicked() { int const id = symbolsWS->id(symbolsWS->visibleWidget()); IconPalette * p = makePanel(0, panels[id]); - string s = "LyX: "; + string s = "LyX: "; s += symbolsCO->text(id).latin1(); p->setCaption(s.c_str()); p->resize(40 * 5, p->height()); p->show(); p->setMaximumSize(p->width(), p->height()); } - - + + void QMathDialog::functionSelected(const QString & str) { - form_->insert(str.latin1()); + form_->insert(str.latin1()); } - + void QMathDialog::matrixClicked() { form_->insertMatrix(); } - + void QMathDialog::equationClicked() { form_->toggleDisplay(); } - + void QMathDialog::subscriptClicked() { form_->subscript(); } - + void QMathDialog::superscriptClicked() { form_->superscript(); @@ -268,7 +270,7 @@ void QMathDialog::insertSpace(int id) form_->insert(str); } - + void QMathDialog::insertRoot(int id) { switch (id) { @@ -284,7 +286,7 @@ void QMathDialog::insertRoot(int id) } } - + void QMathDialog::insertStyle(int id) { string str; @@ -293,11 +295,11 @@ void QMathDialog::insertStyle(int id) case 2: str = "textstyle"; break; case 3: str = "scriptstyle"; break; case 4: str = "scriptscriptstyle"; break; - } + } form_->insert(str); } - + void QMathDialog::insertFont(int id) { string str; diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h index 72e1753ec0..fdf4763ab1 100644 --- a/src/frontends/qt2/QMathDialog.h +++ b/src/frontends/qt2/QMathDialog.h @@ -25,20 +25,18 @@ class IconPalette; class QMathDialog : public QMathDialogBase { Q_OBJECT - public: QMathDialog(QMath * form); - public slots: virtual void delimiterClicked(); virtual void expandClicked(); virtual void fracClicked(); - virtual void functionSelected(const QString &); + virtual void functionSelected(QString const &); virtual void matrixClicked(); virtual void subscriptClicked(); virtual void superscriptClicked(); virtual void equationClicked(); - void symbol_clicked(string str); + void symbol_clicked(string const & str); void insertSpace(int id); void insertRoot(int id); void insertStyle(int id); @@ -46,10 +44,8 @@ public slots: /// about to show a symbol panel void showingPanel(int); - protected: //needed ? virtual void closeEvent(QCloseEvent * e); - private: /// make a symbol panel IconPalette * makePanel(QWidget * parent, char const ** entries); diff --git a/src/frontends/qt2/QMinipage.C b/src/frontends/qt2/QMinipage.C index 70631991b7..95b996ea0a 100644 --- a/src/frontends/qt2/QMinipage.C +++ b/src/frontends/qt2/QMinipage.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -24,13 +24,14 @@ #include "QMinipageDialog.h" #include "Qt2BC.h" #include "lengthcombo.h" - + #include #include #include typedef Qt2CB > base_class; + QMinipage::QMinipage() : base_class(_("Minipage")) { @@ -54,52 +55,63 @@ void QMinipage::build_dialog() void QMinipage::apply() { - double value = strToDbl(dialog_->widthED->text().latin1()); + double const value = strToDbl(dialog_->widthED->text().latin1()); LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem(); if (string(dialog_->widthED->text().latin1()).empty()) unit = LyXLength::UNIT_NONE; - controller().params().pageWidth = LyXLength(value, unit); + MinipageParams & params = controller().params(); + + params.pageWidth = LyXLength(value, unit); switch (dialog_->valignCO->currentItem()) { case 0: - controller().params().pos = InsetMinipage::top; + params.pos = InsetMinipage::top; break; case 1: - controller().params().pos = InsetMinipage::center; + params.pos = InsetMinipage::center; break; case 2: - controller().params().pos = InsetMinipage::bottom; + params.pos = InsetMinipage::bottom; break; } } namespace { - string const numtostr(double val) { - string a(tostr(val)); - if (a == "0") - a = ""; - return a; - } + +string const numtostr(double val) +{ + string a(tostr(val)); + if (a == "0") + a.erase(); + return a; +} + } // namespace anon void QMinipage::update_contents() { - LyXLength len(controller().params().pageWidth); + MinipageParams const & params = controller().params(); + + LyXLength len(params.pageWidth); dialog_->widthED->setText(numtostr(len.value()).c_str()); dialog_->unitsLC->setCurrentItem(len.unit()); - lyxerr << "width " << numtostr(len.value()).c_str() << " units " << len.unit() << std::endl; + lyxerr << "width " << numtostr(len.value()) + << " units " << len.unit() << std::endl; int item = 0; - switch (controller().params().pos) { - case InsetMinipage::center: - item = 1; - break; - case InsetMinipage::bottom: - item = 2; - break; + switch (params.pos) { + case InsetMinipage::top: + item = 0; + break; + case InsetMinipage::center: + item = 1; + break; + case InsetMinipage::bottom: + item = 2; + break; } dialog_->valignCO->setCurrentItem(item); } diff --git a/src/frontends/qt2/QMinipage.h b/src/frontends/qt2/QMinipage.h index 6684d7c413..e686f22c4d 100644 --- a/src/frontends/qt2/QMinipage.h +++ b/src/frontends/qt2/QMinipage.h @@ -30,7 +30,6 @@ public: friend class QMinipageDialog; /// QMinipage(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QMinipageDialog.C b/src/frontends/qt2/QMinipageDialog.C index 626fa0e39b..abb4f15935 100644 --- a/src/frontends/qt2/QMinipageDialog.C +++ b/src/frontends/qt2/QMinipageDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "ControlMinipage.h" #include "QMinipage.h" @@ -25,6 +23,9 @@ #include #include "lengthcombo.h" +#include + + QMinipageDialog::QMinipageDialog(QMinipage * form) : QMinipageDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QMinipageDialog.h b/src/frontends/qt2/QMinipageDialog.h index abe7111b91..4b46da3993 100644 --- a/src/frontends/qt2/QMinipageDialog.h +++ b/src/frontends/qt2/QMinipageDialog.h @@ -20,18 +20,14 @@ class QMinipage; -class QMinipageDialog : public QMinipageDialogBase -{ Q_OBJECT - +class QMinipageDialog : public QMinipageDialogBase { + Q_OBJECT public: QMinipageDialog(QMinipage * form); - protected slots: virtual void change_adaptor(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QMinipage * form_; }; diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index fe15456411..bceb180cc3 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -29,8 +29,6 @@ #include "support/lstrings.h" #include "support/LAssert.h" -#include - #include #include #include @@ -38,16 +36,20 @@ #include #include +#include + using std::vector; using std::bind2nd; using std::remove_if; typedef Qt2CB > base_class; + QParagraph::QParagraph() : base_class(_("Paragraph Layout")) {} + void QParagraph::build_dialog() { // the tabbed folder @@ -56,8 +58,9 @@ void QParagraph::build_dialog() // Create the contents of the unit choices // Don't include the "%" terms... units_ = getLatexUnits(); - vector::iterator del = remove_if(units_.begin(), units_.end(), - bind2nd(contains_functor(), "%")); + vector::iterator del = + remove_if(units_.begin(), units_.end(), + bind2nd(contains_functor(), "%")); units_.erase(del, units_.end()); for (vector::const_iterator it = units_.begin(); @@ -74,6 +77,7 @@ void QParagraph::build_dialog() bc().addReadOnly(dialog_->paragraphTab); } + namespace { VSpace setVSpaceFromWidgets(int spacing, @@ -123,12 +127,15 @@ VSpace setVSpaceFromWidgets(int spacing, } // namespace anon + void QParagraph::apply() { - /* SPACING ABOVE */ + ParagraphParameters & params = controller().params(); + + // SPACING ABOVE // If a vspace kind is "Length" but there's no text in // the input field, reset the kind to "None". - if (dialog_->spacingAbove->currentItem()==5 + if (dialog_->spacingAbove->currentItem() == 5 && dialog_->valueAbove->text().isEmpty()) dialog_->spacingAbove->setCurrentItem(0); @@ -138,11 +145,10 @@ void QParagraph::apply() string(dialog_->unitAbove->currentText()), dialog_->keepAbove->isChecked()); + params.spaceTop(space_top); - controller().params().spaceTop(space_top); - - /* SPACING BELOW */ - if (dialog_->spacingBelow->currentItem()==5 + // SPACING BELOW + if (dialog_->spacingBelow->currentItem() == 5 && dialog_->valueBelow->text().isEmpty()) dialog_->spacingBelow->setCurrentItem(0); @@ -152,9 +158,9 @@ void QParagraph::apply() string(dialog_->unitBelow->currentText()), dialog_->keepBelow->isChecked()); - controller().params().spaceBottom(space_bottom); + params.spaceBottom(space_bottom); - /* alignment */ + // alignment LyXAlignment align; switch (dialog_->align->currentItem()) { case 0: @@ -172,9 +178,9 @@ void QParagraph::apply() default: align = LYX_ALIGN_BLOCK; } - controller().params().align(align); + params.align(align); - /* get spacing */ + // get spacing Spacing::Space linespacing = Spacing::Default; string other; switch (dialog_->linespacing->currentItem()) { @@ -197,20 +203,21 @@ void QParagraph::apply() } Spacing const spacing(linespacing, other); - controller().params().spacing(spacing); + params.spacing(spacing); - /* lines and pagebreaks */ - controller().params().lineTop(dialog_->lineAbove->isChecked()); - controller().params().lineBottom(dialog_->lineBelow->isChecked()); - controller().params().pagebreakTop(dialog_->pagebreakAbove->isChecked()); - controller().params().pagebreakBottom(dialog_->pagebreakBelow->isChecked()); - /* label width */ - controller().params().labelWidthString(string(dialog_->labelWidth->text())); - /* indendation */ - controller().params().noindent(dialog_->noindent->isChecked()); + // lines and pagebreaks + params.lineTop(dialog_->lineAbove->isChecked()); + params.lineBottom(dialog_->lineBelow->isChecked()); + params.pagebreakTop(dialog_->pagebreakAbove->isChecked()); + params.pagebreakBottom(dialog_->pagebreakBelow->isChecked()); + // label width + params.labelWidthString(string(dialog_->labelWidth->text())); + // indendation + params.noindent(dialog_->noindent->isChecked()); } + namespace { void setWidgetsFromVSpace(VSpace const & space, @@ -248,23 +255,27 @@ void setWidgetsFromVSpace(VSpace const & space, value->setEnabled(true); unit->setEnabled(true); string length = space.length().asString(); - string const default_unit = (lyxrc.default_papersize>3) ? "cm" : "in"; + string const default_unit = + (lyxrc.default_papersize > 3) ? "cm" : "in"; string supplied_unit = default_unit; LyXLength len(length); - if ((isValidLength(length) || isStrDbl(length)) && !len.zero()) { + if ((isValidLength(length) + || isStrDbl(length)) && !len.zero()) { ostringstream buffer; buffer << len.value(); length = buffer.str(); - supplied_unit = subst(stringFromUnit(len.unit()),"%","%%"); + supplied_unit = subst(stringFromUnit(len.unit()), + "%", "%%"); } + int unit_item = 0; int i = 0; for (vector::const_iterator it = units_.begin(); it != units_.end(); ++it) { - if (*it==default_unit) { + if (*it == default_unit) { unit_item = i; } - if (*it==supplied_unit) { + if (*it == supplied_unit) { unit_item = i; break; } @@ -280,17 +291,20 @@ void setWidgetsFromVSpace(VSpace const & space, } // namespace anon + void QParagraph::update_contents() { - /* label width */ - string labelwidth = controller().params().labelWidthString(); + ParagraphParameters const & params = controller().params(); + + // label width + string const & labelwidth = params.labelWidthString(); dialog_->labelWidth->setText(labelwidth.c_str()); dialog_->labelwidthGB->setEnabled( labelwidth != _("Senseless with this layout!")); - /* alignment */ + // alignment int i; - switch (controller().params().align()) { + switch (params.align()) { case LYX_ALIGN_LEFT: i = 1; break; @@ -314,16 +328,16 @@ void QParagraph::update_contents() dialog_->pagebreakAbove->setEnabled(!ininset); dialog_->pagebreakBelow->setEnabled(!ininset); - /* lines, pagebreaks and indent */ - dialog_->lineAbove->setChecked(controller().params().lineTop()); - dialog_->lineBelow->setChecked(controller().params().lineBottom()); - dialog_->pagebreakAbove->setChecked(controller().params().pagebreakTop()); - dialog_->pagebreakBelow->setChecked(controller().params().pagebreakBottom()); - dialog_->noindent->setChecked(controller().params().noindent()); + // lines, pagebreaks and indent + dialog_->lineAbove->setChecked(params.lineTop()); + dialog_->lineBelow->setChecked(params.lineBottom()); + dialog_->pagebreakAbove->setChecked(params.pagebreakTop()); + dialog_->pagebreakBelow->setChecked(params.pagebreakBottom()); + dialog_->noindent->setChecked(params.noindent()); - /* linespacing */ + // linespacing int linespacing; - Spacing const space = controller().params().spacing(); + Spacing const & space = params.spacing(); switch (space.getSpace()) { case Spacing::Single: linespacing = 1; @@ -351,20 +365,20 @@ void QParagraph::update_contents() dialog_->linespacingValue->setEnabled(false); } - /* vspace top */ - setWidgetsFromVSpace(controller().params().spaceTop(), + // vspace top + setWidgetsFromVSpace(params.spaceTop(), dialog_->spacingAbove, dialog_->valueAbove, dialog_->unitAbove, dialog_->keepAbove,units_); - /* vspace bottom */ - setWidgetsFromVSpace(controller().params().spaceBottom(), + // vspace bottom + setWidgetsFromVSpace(params.spaceBottom(), dialog_->spacingBelow, dialog_->valueBelow, dialog_->unitBelow, dialog_->keepBelow,units_); - /* no indent */ - dialog_->noindent->setChecked(controller().params().noindent()); + // no indent + dialog_->noindent->setChecked(params.noindent()); } diff --git a/src/frontends/qt2/QParagraph.h b/src/frontends/qt2/QParagraph.h index 30e789b60d..f51890f76e 100644 --- a/src/frontends/qt2/QParagraph.h +++ b/src/frontends/qt2/QParagraph.h @@ -24,14 +24,13 @@ class ControlParagraph; class QParagraphDialog; -class QParagraph : - public Qt2CB > +class QParagraph + : public Qt2CB > { +public: friend class QParagraphDialog; -public: QParagraph(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C index 345a87c611..6aaa7d5582 100644 --- a/src/frontends/qt2/QParagraphDialog.C +++ b/src/frontends/qt2/QParagraphDialog.C @@ -27,6 +27,7 @@ using std::vector; + QParagraphDialog::QParagraphDialog(QParagraph * form) : QParagraphDialogBase(0, 0, false, 0), form_(form) @@ -45,6 +46,7 @@ QParagraphDialog::QParagraphDialog(QParagraph * form) //valueBelow->setValidator(new QDoubleValidator(valueBelow)); } + void QParagraphDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); @@ -57,6 +59,7 @@ void QParagraphDialog::change_adaptor() form_->changed(); } + void QParagraphDialog::enableAbove(int) { bool const enable = spacingAbove->currentItem()==6; @@ -65,6 +68,7 @@ void QParagraphDialog::enableAbove(int) } + void QParagraphDialog::enableBelow(int) { bool const enable = spacingBelow->currentItem()==6; @@ -72,6 +76,7 @@ void QParagraphDialog::enableBelow(int) unitBelow->setEnabled(enable); } + void QParagraphDialog::enableLinespacingValue(int) { bool const enable = linespacing->currentItem()==4; diff --git a/src/frontends/qt2/QParagraphDialog.h b/src/frontends/qt2/QParagraphDialog.h index cb8924d988..2159f5a184 100644 --- a/src/frontends/qt2/QParagraphDialog.h +++ b/src/frontends/qt2/QParagraphDialog.h @@ -21,17 +21,14 @@ class QParagraph; -class QParagraphDialog : public QParagraphDialogBase -{ +class QParagraphDialog : public QParagraphDialogBase { Q_OBJECT public: QParagraphDialog(QParagraph * form); - protected: void closeEvent (QCloseEvent * e); private: QParagraph * form_; - protected slots: void change_adaptor(); void enableAbove(int); diff --git a/src/frontends/qt2/QPreamble.C b/src/frontends/qt2/QPreamble.C index 66af4aff42..719a5af6d0 100644 --- a/src/frontends/qt2/QPreamble.C +++ b/src/frontends/qt2/QPreamble.C @@ -3,13 +3,12 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include -#include #ifdef __GNUG__ #pragma implementation @@ -18,7 +17,7 @@ #include "gettext.h" #include "LyXView.h" #include "ControlPreamble.h" - + #include "QPreamble.h" #include "QPreambleDialog.h" #include "Qt2BC.h" @@ -28,6 +27,7 @@ typedef Qt2CB > base_class; + QPreamble::QPreamble() : base_class(_("LaTeX Preamble")) { diff --git a/src/frontends/qt2/QPreamble.h b/src/frontends/qt2/QPreamble.h index 30257b757d..d2132d8b76 100644 --- a/src/frontends/qt2/QPreamble.h +++ b/src/frontends/qt2/QPreamble.h @@ -30,7 +30,6 @@ public: friend class QPreambleDialog; /// QPreamble(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QPreambleDialog.C b/src/frontends/qt2/QPreambleDialog.C index e1eda7b596..35311067e4 100644 --- a/src/frontends/qt2/QPreambleDialog.C +++ b/src/frontends/qt2/QPreambleDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,7 @@ #pragma implementation #endif -#include - +#include "Lsstream.h" #include "support/lyxlib.h" #include "support/forkedcall.h" #include "support/filetools.h" @@ -30,6 +29,8 @@ #include #include +#include + using std::getline; QPreambleDialog::QPreambleDialog(QPreamble * form) @@ -63,7 +64,7 @@ void QPreambleDialog::editClicked() // find an editor string editor = GetEnv("EDITOR"); if (editor.empty()) { - static string lastentry = ""; + static string lastentry; editor = QInputDialog::getText( _("Enter editor program"), _("Editor"), QLineEdit::Normal, lastentry.c_str()).latin1(); @@ -101,14 +102,12 @@ void QPreambleDialog::editClicked() return; } - string newtext; - string line; - - while (getline(in, line)) { - newtext += line + "\n"; - } + ostringstream newtext; + newtext << in.rdbuf(); + // close the files before we delete the file in.close(); + lyx::unlink(filename); - preambleLE->setText(newtext.c_str()); + preambleLE->setText(newtext.str().c_str()); } diff --git a/src/frontends/qt2/QPreambleDialog.h b/src/frontends/qt2/QPreambleDialog.h index 0e6e078dfc..8b5292c37d 100644 --- a/src/frontends/qt2/QPreambleDialog.h +++ b/src/frontends/qt2/QPreambleDialog.h @@ -20,19 +20,15 @@ class QPreamble; -class QPreambleDialog : public QPreambleDialogBase -{ Q_OBJECT - +class QPreambleDialog : public QPreambleDialogBase { + Q_OBJECT public: QPreambleDialog(QPreamble * form); - protected slots: virtual void editClicked(); virtual void change_adaptor(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QPreamble * form_; }; diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index 4a1b030a56..bff4975181 100644 --- a/src/frontends/qt2/QPrint.C +++ b/src/frontends/qt2/QPrint.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * \author Edwin Leuven * * Full author contact details are available in file CREDITS @@ -32,9 +32,11 @@ #include // FIXME FIXME QPrintDialog is getting destructed twice !!!! - + + typedef Qt2CB > base_class; + QPrint::QPrint() : base_class(_("Print")) { @@ -57,7 +59,7 @@ void QPrint::update_contents() // only reset params if a different buffer if (!pp.file_name.empty() && pp.file_name == dialog_->fileED->text().latin1()) return; - + dialog_->printerED->setText(pp.printer_name.c_str()); dialog_->fileED->setText(pp.file_name.c_str()); @@ -68,19 +70,19 @@ void QPrint::update_contents() dialog_->reverseCB->setChecked(pp.reverse_order); dialog_->copiesSB->setValue(pp.count_copies); - + dialog_->oddCB->setChecked(pp.odd_pages); dialog_->evenCB->setChecked(pp.even_pages); - + dialog_->collateCB->setChecked(pp.sorted_copies); - + if (pp.all_pages) { dialog_->allRB->setChecked(true); return; } dialog_->rangeRB->setChecked(true); - + QString s; s.setNum(pp.from_page); dialog_->fromED->setText(s); @@ -98,9 +100,9 @@ void QPrint::apply() PrinterParams const pp(t, dialog_->printerED->text().latin1(), dialog_->fileED->text().latin1(), - dialog_->allRB->isChecked(), + dialog_->allRB->isChecked(), dialog_->fromED->text().toUInt(), - dialog_->toED->text().toUInt(), + dialog_->toED->text().toUInt(), dialog_->oddCB->isChecked(), dialog_->evenCB->isChecked(), dialog_->copiesSB->text().toUInt(), diff --git a/src/frontends/qt2/QPrint.h b/src/frontends/qt2/QPrint.h index cb8e5149cf..f036a15a2a 100644 --- a/src/frontends/qt2/QPrint.h +++ b/src/frontends/qt2/QPrint.h @@ -31,7 +31,6 @@ public: friend class QPrintDialog; /// QPrint(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QPrintDialog.C b/src/frontends/qt2/QPrintDialog.C index 42b2e40cd1..573fb710f1 100644 --- a/src/frontends/qt2/QPrintDialog.C +++ b/src/frontends/qt2/QPrintDialog.C @@ -15,7 +15,7 @@ #pragma implementation #endif -#include +#include "gettext.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -30,6 +30,7 @@ #include #include + QPrintDialog::QPrintDialog(QPrint * f) : QPrintDialogBase(0, 0, false, 0), form_(f) @@ -49,8 +50,11 @@ void QPrintDialog::change_adaptor() void QPrintDialog::browseClicked() { - QString file = QFileDialog::getOpenFileName(QString::null, - _("PostScript files (*.ps)"), this, 0, _("Select a file to print to")); + QString file = + QFileDialog::getOpenFileName(QString::null, + _("PostScript files (*.ps)"), + this, 0, + _("Select a file to print to")); if (!file.isNull()) { fileED->setText(file); form_->changed(); @@ -82,8 +86,8 @@ void QPrintDialog::printerChanged() void QPrintDialog::pagerangeChanged() { - int from = strToUnsignedInt(fromED->text().latin1()); - int to = strToUnsignedInt(toED->text().latin1()); + int const from = strToUnsignedInt(fromED->text().latin1()); + int const to = strToUnsignedInt(toED->text().latin1()); if (!toED->text().isEmpty() && from > to) fromED->setText(toED->text()); diff --git a/src/frontends/qt2/QPrintDialog.h b/src/frontends/qt2/QPrintDialog.h index 595badac73..b28f872c70 100644 --- a/src/frontends/qt2/QPrintDialog.h +++ b/src/frontends/qt2/QPrintDialog.h @@ -21,12 +21,10 @@ class QPrint; -class QPrintDialog : public QPrintDialogBase -{ Q_OBJECT - +class QPrintDialog : public QPrintDialogBase { + Q_OBJECT public: QPrintDialog(QPrint * f); - protected slots: virtual void change_adaptor(); virtual void browseClicked(); @@ -34,7 +32,6 @@ protected slots: virtual void copiesChanged(int); virtual void printerChanged(); virtual void pagerangeChanged(); - private: QPrint * form_; }; diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index 52028535eb..6870d6ffb5 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -30,15 +30,17 @@ #include "support/lstrings.h" // frontStrip, strip #include "gettext.h" #include "insets/insetref.h" - + using std::find; using std::max; using std::sort; using std::vector; using std::endl; + typedef Qt2CB > base_class; + QRef::QRef() : base_class(_("Cross Reference")), sort_(false), at_ref_(false) @@ -63,19 +65,21 @@ void QRef::build_dialog() void QRef::update_contents() { - dialog_->referenceED->setText(controller().params().getContents().c_str()); + InsetCommandParams const & params = controller().params(); - dialog_->nameED->setText(controller().params().getOptions().c_str()); + dialog_->referenceED->setText(params.getContents().c_str()); + + dialog_->nameED->setText(params.getOptions().c_str()); dialog_->nameED->setReadOnly(!nameAllowed() && !readOnly()); - dialog_->typeCO->setCurrentItem(InsetRef::getType(controller().params().getCmdName())); + dialog_->typeCO->setCurrentItem(InsetRef::getType(params.getCmdName())); dialog_->typeCO->setEnabled(!typeAllowed() && !readOnly()); if (!typeAllowed()) dialog_->typeCO->setCurrentItem(0); dialog_->sortCB->setChecked(sort_); - /* insert buffer list */ + // insert buffer list dialog_->bufferCO->clear(); vector const buffers = controller().getBufferList(); for (vector::const_iterator it = buffers.begin(); @@ -83,16 +87,18 @@ void QRef::update_contents() dialog_->bufferCO->insertItem(it->c_str()); } dialog_->bufferCO->setCurrentItem(controller().getBufferNum()); - + updateRefs(); } void QRef::apply() { - controller().params().setCmdName(InsetRef::getName(dialog_->typeCO->currentItem())); - controller().params().setContents(dialog_->referenceED->text().latin1()); - controller().params().setOptions(dialog_->nameED->text().latin1()); + InsetCommandParams & params = controller().params(); + + params.setCmdName(InsetRef::getName(dialog_->typeCO->currentItem())); + params.setContents(dialog_->referenceED->text().latin1()); + params.setOptions(dialog_->nameED->text().latin1()); } @@ -149,7 +155,7 @@ void QRef::redoRefs() // need this because Qt will send a highlight() here for // the first item inserted - string tmp(dialog_->referenceED->text()); + string const tmp(dialog_->referenceED->text()); for (std::vector::const_iterator iter = refs_.begin(); iter != refs_.end(); ++iter) { diff --git a/src/frontends/qt2/QRef.h b/src/frontends/qt2/QRef.h index 093feab24b..6c25870a98 100644 --- a/src/frontends/qt2/QRef.h +++ b/src/frontends/qt2/QRef.h @@ -24,14 +24,13 @@ class ControlRef; class QRefDialog; -class QRef : - public Qt2CB > +class QRef + : public Qt2CB > { +public: friend class QRefDialog; -public: QRef(); - private: /// apply changes virtual void apply(); diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C index c3ecea3b4e..61f17d64ee 100644 --- a/src/frontends/qt2/QRefDialog.C +++ b/src/frontends/qt2/QRefDialog.C @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer - * \author John Levon + * \author Kalle Dalheimer + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -20,12 +20,13 @@ #include "QRef.h" #include "QRefDialog.h" - + #include #include #include #include + QRefDialog::QRefDialog(QRef * form) : QRefDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QRefDialog.h b/src/frontends/qt2/QRefDialog.h index 0a1571c4f1..81ea9bd23d 100644 --- a/src/frontends/qt2/QRefDialog.h +++ b/src/frontends/qt2/QRefDialog.h @@ -21,23 +21,19 @@ class QRef; -class QRefDialog : public QRefDialogBase -{ Q_OBJECT - +class QRefDialog : public QRefDialogBase { + Q_OBJECT public: QRefDialog(QRef * form); - public slots: void changed_adaptor(); void gotoClicked(); - void refHighlighted(const QString &); - void refSelected(const QString &); + void refHighlighted(QString const &); + void refSelected(QString const &); void sortToggled(bool); void updateClicked(); - protected: void closeEvent(QCloseEvent * e); - private: QRef * form_; }; diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C index 34a0d4ed96..d4ecf42e2f 100644 --- a/src/frontends/qt2/QSearch.C +++ b/src/frontends/qt2/QSearch.C @@ -3,13 +3,12 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include -#include #ifdef __GNUG__ #pragma implementation @@ -27,8 +26,10 @@ #include #include + typedef Qt2CB > base_class; + QSearch::QSearch() : base_class(_("Search")) { @@ -52,7 +53,8 @@ void QSearch::build_dialog() } -void QSearch::find(string const & str, bool casesens, bool words, bool backwards) +void QSearch::find(string const & str, bool casesens, + bool words, bool backwards) { controller().find(str, casesens, words, !backwards); } diff --git a/src/frontends/qt2/QSearch.h b/src/frontends/qt2/QSearch.h index 5674d2258d..3b27a63991 100644 --- a/src/frontends/qt2/QSearch.h +++ b/src/frontends/qt2/QSearch.h @@ -31,21 +31,19 @@ public: friend class QSearchDialog; /// QSearch(); - private: /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update - virtual void update_contents() {}; + virtual void update_contents() {} /// build the dialog virtual void build_dialog(); - - void find(string const & str, bool casesens, bool words, bool backwards); + void find(string const & str, bool casesens, + bool words, bool backwards); void replace(string const & findstr, string const & replacestr, bool casesens, bool words, bool all); - }; #endif // QSEARCH_H diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C index 5586610bd6..cbf882877d 100644 --- a/src/frontends/qt2/QSearchDialog.C +++ b/src/frontends/qt2/QSearchDialog.C @@ -25,6 +25,7 @@ #include #include + QSearchDialog::QSearchDialog(QSearch * form) : QSearchDialogBase(0, 0, false, 0), form_(form) @@ -41,7 +42,7 @@ void QSearchDialog::show() findCO->lineEdit()->setSelection(0, findCO->lineEdit()->text().length()); } - + void QSearchDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt2/QSearchDialog.h index 1bbe6ae19b..95d365344a 100644 --- a/src/frontends/qt2/QSearchDialog.h +++ b/src/frontends/qt2/QSearchDialog.h @@ -23,20 +23,17 @@ class QSearch; class QCloseEvent; class QComboBox; -class QSearchDialog : public QSearchDialogBase -{ Q_OBJECT - +class QSearchDialog : public QSearchDialogBase { + Q_OBJECT public: QSearchDialog(QSearch * form); virtual void show(); - protected slots: void findChanged(); void findClicked(); void replaceClicked(); void replaceallClicked(); - protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C index c0917d5412..cc129cb0c5 100644 --- a/src/frontends/qt2/QSendto.C +++ b/src/frontends/qt2/QSendto.C @@ -32,6 +32,7 @@ using std::vector; typedef Qt2CB > base_class; + QSendto::QSendto() : base_class(_("Send document to command")) { @@ -76,6 +77,7 @@ void QSendto::update_contents() dialog_->commandCO->insertItem(controller().getCommand().c_str()); } + void QSendto::apply() { int const line(dialog_->formatLB->currentItem()); @@ -89,13 +91,14 @@ void QSendto::apply() controller().setCommand(cmd); } + bool QSendto::isValid() { int const line(dialog_->formatLB->currentItem()); if (line < 0 || line > dialog_->formatLB->count()) return false; - + else return dialog_->formatLB->count() != 0 && !string(dialog_->commandCO->currentText()).empty(); } diff --git a/src/frontends/qt2/QSendto.h b/src/frontends/qt2/QSendto.h index fc50d495ee..61cacdf71f 100644 --- a/src/frontends/qt2/QSendto.h +++ b/src/frontends/qt2/QSendto.h @@ -17,6 +17,7 @@ #endif #include "Qt2Base.h" + #include class ControlSendto; @@ -33,10 +34,8 @@ public: friend class QSendtoDialog; /// QSendto(); - protected: virtual bool isValid(); - private: /// Apply from dialog virtual void apply(); diff --git a/src/frontends/qt2/QSendtoDialog.h b/src/frontends/qt2/QSendtoDialog.h index fff32b871f..47a3450599 100644 --- a/src/frontends/qt2/QSendtoDialog.h +++ b/src/frontends/qt2/QSendtoDialog.h @@ -20,21 +20,16 @@ class QSendto; -class QSendtoDialog : public QSendtoDialogBase -{ +class QSendtoDialog : public QSendtoDialogBase { Q_OBJECT - public: QSendtoDialog(QSendto * form); - protected slots: virtual void changed_adaptor(); - virtual void slotFormatHighlighted(const QString&) {}; - virtual void slotFormatSelected(const QString&) {}; - + virtual void slotFormatHighlighted(const QString&) {} + virtual void slotFormatSelected(const QString&) {} protected: virtual void closeEvent(QCloseEvent * e); - private: QSendto * form_; }; diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C index e099ddc574..11fff4398c 100644 --- a/src/frontends/qt2/QShowFile.C +++ b/src/frontends/qt2/QShowFile.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -20,12 +20,13 @@ #include "QShowFile.h" #include "QShowFileDialog.h" #include "Qt2BC.h" - + #include #include typedef Qt2CB > base_class; + QShowFile::QShowFile() : base_class(_("ShowFile")) { diff --git a/src/frontends/qt2/QShowFile.h b/src/frontends/qt2/QShowFile.h index c0418bf2f2..fa6db8f891 100644 --- a/src/frontends/qt2/QShowFile.h +++ b/src/frontends/qt2/QShowFile.h @@ -22,17 +22,16 @@ class ControlShowFile; class QShowFileDialog; -class QShowFile : - public Qt2CB > +class QShowFile + : public Qt2CB > { +public: friend class QShowFileDialog; -public: QShowFile(); - private: /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C index 1afcf24544..f1c9916a43 100644 --- a/src/frontends/qt2/QShowFileDialog.C +++ b/src/frontends/qt2/QShowFileDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -20,6 +20,7 @@ #include #include + QShowFileDialog::QShowFileDialog(QShowFile * form) : QShowFileDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QShowFileDialog.h b/src/frontends/qt2/QShowFileDialog.h index df603ae215..c4819f1cf4 100644 --- a/src/frontends/qt2/QShowFileDialog.h +++ b/src/frontends/qt2/QShowFileDialog.h @@ -20,15 +20,12 @@ class QShowFile; -class QShowFileDialog : public QShowFileDialogBase -{ Q_OBJECT - +class QShowFileDialog : public QShowFileDialogBase { + Q_OBJECT public: QShowFileDialog(QShowFile * form); - protected: virtual void closeEvent(QCloseEvent * e); - private: QShowFile * form_; }; diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index 29d19cd0d8..adeb9f643a 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -29,6 +29,7 @@ typedef Qt2CB > base_class; + QSpellchecker::QSpellchecker() : base_class(_("Spellchecker")) { @@ -111,7 +112,9 @@ void QSpellchecker::partialUpdate(int id) case 2: dialog_->spellcheckPB->setEnabled(true); hide(); - QMessageBox::information(0, _("Spellcheck complete"), controller().getMessage().c_str() , _("OK")); + QMessageBox::information(0, _("Spellcheck complete"), + controller().getMessage().c_str(), + _("OK")); break; } } diff --git a/src/frontends/qt2/QSpellchecker.h b/src/frontends/qt2/QSpellchecker.h index ba3466d888..ce82827e29 100644 --- a/src/frontends/qt2/QSpellchecker.h +++ b/src/frontends/qt2/QSpellchecker.h @@ -23,17 +23,16 @@ class ControlSpellchecker; class QSpellcheckerDialog; -class QSpellchecker : - public Qt2CB > +class QSpellchecker + : public Qt2CB > { +public: friend class QSpellcheckerDialog; -public: QSpellchecker(); /// update from controller void partialUpdate(int id); - private: void stop(); void accept(); @@ -43,7 +42,7 @@ private: void spellcheck(); /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C index 0e134b7d94..6e78cc267d 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.C +++ b/src/frontends/qt2/QSpellcheckerDialog.C @@ -23,6 +23,7 @@ #include #include + QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) : QSpellcheckerDialogBase(0, 0, false, 0), form_(form) @@ -68,7 +69,7 @@ void QSpellcheckerDialog::ignoreClicked() } -void QSpellcheckerDialog::suggestionChanged(const QString & str) +void QSpellcheckerDialog::suggestionChanged(QString const & str) { if (replaceCO->count() != 0) replaceCO->changeItem(str, 0); @@ -79,7 +80,7 @@ void QSpellcheckerDialog::suggestionChanged(const QString & str) } -void QSpellcheckerDialog::replaceChanged(const QString & str) +void QSpellcheckerDialog::replaceChanged(QString const & str) { if (suggestionsLB->currentText() == str) return; diff --git a/src/frontends/qt2/QSpellcheckerDialog.h b/src/frontends/qt2/QSpellcheckerDialog.h index 08ffeae406..eb895602d9 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.h +++ b/src/frontends/qt2/QSpellcheckerDialog.h @@ -20,12 +20,10 @@ class QSpellchecker; -class QSpellcheckerDialog : public QSpellcheckerDialogBase -{ Q_OBJECT - +class QSpellcheckerDialog : public QSpellcheckerDialogBase { + Q_OBJECT public: QSpellcheckerDialog(QSpellchecker * form); - protected slots: virtual void stop(); virtual void acceptClicked(); @@ -35,7 +33,6 @@ protected slots: virtual void ignoreClicked(); virtual void suggestionChanged(const QString &); virtual void replaceChanged(const QString &); - protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C index 5de46e3398..5ada6b6c73 100644 --- a/src/frontends/qt2/QTabularCreate.C +++ b/src/frontends/qt2/QTabularCreate.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -26,6 +26,7 @@ typedef Qt2CB > base_class; + QTabularCreate::QTabularCreate() : base_class(_("Insert table")) { diff --git a/src/frontends/qt2/QTabularCreate.h b/src/frontends/qt2/QTabularCreate.h index e4dbfa1ec5..6297d48870 100644 --- a/src/frontends/qt2/QTabularCreate.h +++ b/src/frontends/qt2/QTabularCreate.h @@ -31,12 +31,11 @@ public: friend class QTabularCreateDialog; /// QTabularCreate(); - private: /// Apply changes virtual void apply(); /// update - virtual void update_contents() {}; + virtual void update_contents() {} /// build the dialog virtual void build_dialog(); }; diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C index 4e9f0e27cb..579ef07fbb 100644 --- a/src/frontends/qt2/QTabularCreateDialog.C +++ b/src/frontends/qt2/QTabularCreateDialog.C @@ -15,7 +15,7 @@ #pragma implementation #endif -#include +#include "gettext.h" #include "support/lstrings.h" @@ -26,6 +26,7 @@ #include #include "emptytable.h" + QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form) : QTabularCreateDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QTabularCreateDialog.h b/src/frontends/qt2/QTabularCreateDialog.h index 0cf12397e6..0eecc66b72 100644 --- a/src/frontends/qt2/QTabularCreateDialog.h +++ b/src/frontends/qt2/QTabularCreateDialog.h @@ -21,16 +21,13 @@ class QTabularCreate; -class QTabularCreateDialog : public QTabularCreateDialogBase -{ Q_OBJECT - +class QTabularCreateDialog : public QTabularCreateDialogBase { + Q_OBJECT public: QTabularCreateDialog(QTabularCreate * form); - protected slots: virtual void columnsChanged(int); virtual void rowsChanged(int); - private: QTabularCreate * form_; }; diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index 776a4be3eb..c85deff008 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -3,15 +3,13 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ #include -#include - #ifdef __GNUG__ #pragma implementation #endif @@ -24,7 +22,7 @@ #include "helper_funcs.h" #include "support/lstrings.h" - + #include #include #include @@ -33,9 +31,9 @@ using std::vector; typedef Qt2CB > base_class; + QTexinfo::QTexinfo() : base_class(_("LaTeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls) - { } @@ -53,9 +51,9 @@ void QTexinfo::build_dialog() void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle) { string const fstr = controller().getContents(whichStyle, true); - + switch (whichStyle) { - case ControlTexinfo::bst: + case ControlTexinfo::bst: bst_ = getVectorFromString(fstr, "\n"); break; case ControlTexinfo::cls: @@ -84,9 +82,3 @@ void QTexinfo::updateStyles() { updateStyles(activeStyle); } - - - - - - diff --git a/src/frontends/qt2/QTexinfo.h b/src/frontends/qt2/QTexinfo.h index cadb749a7b..da04aeb79f 100644 --- a/src/frontends/qt2/QTexinfo.h +++ b/src/frontends/qt2/QTexinfo.h @@ -20,6 +20,8 @@ #include "ControlTexinfo.h" +#include + class QTexinfoDialog; /// @@ -33,9 +35,9 @@ public: QTexinfo(); private: /// Apply changes - virtual void apply() { }; + virtual void apply() {} /// update (do we need this?) - virtual void update_contents() {}; + virtual void update_contents() {} /// build the dialog virtual void build_dialog(); /// diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C index bf6261c97b..934270114d 100644 --- a/src/frontends/qt2/QTexinfoDialog.C +++ b/src/frontends/qt2/QTexinfoDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "LString.h" #include "ControlTexinfo.h" @@ -26,6 +24,9 @@ #include #include +#include + + QTexinfoDialog::QTexinfoDialog(QTexinfo * form) : QTexinfoDialogBase(0, 0, false, 0), form_(form) @@ -47,6 +48,7 @@ void QTexinfoDialog::closeEvent(QCloseEvent * e) e->accept(); } + void QTexinfoDialog::rescanClicked() { // build new *Files.lst @@ -55,6 +57,7 @@ void QTexinfoDialog::rescanClicked() enableViewPB(); } + void QTexinfoDialog::viewClicked() { int const fitem = fileList->currentItem(); @@ -73,13 +76,14 @@ void QTexinfoDialog::viewClicked() default: break; } - + // a valid entry? if (!sel.empty()) { form_->controller().viewFile(sel.c_str()); } } + void QTexinfoDialog::update() { switch (whatStyle->currentItem()) { @@ -95,14 +99,12 @@ void QTexinfoDialog::update() default: break; } - + enableViewPB(); } + void QTexinfoDialog::enableViewPB() { - viewPB->setEnabled(fileList->currentItem()>-1); + viewPB->setEnabled(fileList->currentItem() > -1); } - - - diff --git a/src/frontends/qt2/QTexinfoDialog.h b/src/frontends/qt2/QTexinfoDialog.h index cd83bb7d1c..fa2661b295 100644 --- a/src/frontends/qt2/QTexinfoDialog.h +++ b/src/frontends/qt2/QTexinfoDialog.h @@ -20,19 +20,16 @@ class QTexinfo; -class QTexinfoDialog : public QTexinfoDialogBase -{ Q_OBJECT - +class QTexinfoDialog : public QTexinfoDialogBase { + Q_OBJECT public: QTexinfoDialog(QTexinfo * form); - protected slots: virtual void change_adaptor(); virtual void rescanClicked(); virtual void viewClicked(); virtual void update(); virtual void enableViewPB(); - protected: virtual void closeEvent(QCloseEvent * e); private: diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C index 4dd9a6ddfb..76b2578c7e 100644 --- a/src/frontends/qt2/QThesaurus.C +++ b/src/frontends/qt2/QThesaurus.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -26,6 +26,7 @@ typedef Qt2CB > base_class; + QThesaurus::QThesaurus() : base_class(_("Thesaurus")) { diff --git a/src/frontends/qt2/QThesaurus.h b/src/frontends/qt2/QThesaurus.h index 6a29a8b6d0..4e355c0ace 100644 --- a/src/frontends/qt2/QThesaurus.h +++ b/src/frontends/qt2/QThesaurus.h @@ -32,7 +32,7 @@ public: QThesaurus(); private: /// Apply changes - virtual void apply() { }; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C index b90e9c0b88..a4c195f248 100644 --- a/src/frontends/qt2/QThesaurusDialog.C +++ b/src/frontends/qt2/QThesaurusDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "LString.h" #include "ControlThesaurus.h" @@ -26,6 +24,9 @@ #include #include +#include + + QThesaurusDialog::QThesaurusDialog(QThesaurus * form) : QThesaurusDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QThesaurusDialog.h b/src/frontends/qt2/QThesaurusDialog.h index 1bc413de5d..cca4c2e45b 100644 --- a/src/frontends/qt2/QThesaurusDialog.h +++ b/src/frontends/qt2/QThesaurusDialog.h @@ -21,24 +21,20 @@ class QThesaurus; class QListViewItem; -class QThesaurusDialog : public QThesaurusDialogBase -{ Q_OBJECT - +class QThesaurusDialog : public QThesaurusDialogBase { + Q_OBJECT public: QThesaurusDialog(QThesaurus * form); void updateLists(); - protected slots: virtual void change_adaptor(); virtual void entryChanged(); virtual void replaceClicked(); virtual void selectionChanged(QListViewItem *); virtual void selectionClicked(QListViewItem *); - protected: virtual void closeEvent(QCloseEvent * e); - private: QThesaurus * form_; }; diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index bba3d3f1b6..174db3adf8 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -101,33 +101,33 @@ void QToc::updateToc(int newdepth) dialog_->tocLV->setUpdatesEnabled(false); int curdepth = 0; - stack< pair< QListViewItem *, QListViewItem *> > istack; - QListViewItem *last = 0; - QListViewItem *parent = 0; - QListViewItem *item; + stack > istack; + QListViewItem * last = 0; + QListViewItem * parent = 0; + QListViewItem * item; - // Yes, it is this ugly. Two reasons - root items must have a QListView parent, - // rather than QListViewItem; and the TOC can move in and out an arbitrary number - // of levels + // Yes, it is this ugly. Two reasons - root items must have + // a QListView parent, rather than QListViewItem; and the + // TOC can move in and out an arbitrary number of levels for (toc::Toc::const_iterator iter = toclist.begin(); - iter != toclist.end(); ++iter) { + iter != toclist.end(); ++iter) { if (iter->depth == curdepth) { // insert it after the last one we processed if (!parent) - item = (last) ? (new QListViewItem(dialog_->tocLV,last)) : (new QListViewItem(dialog_->tocLV)); + item = (last ? new QListViewItem(dialog_->tocLV,last) : new QListViewItem(dialog_->tocLV)); else - item = (last) ? (new QListViewItem(parent,last)) : (new QListViewItem(parent)); + item = (last ? new QListViewItem(parent,last) : new QListViewItem(parent)); } else if (iter->depth > curdepth) { int diff = iter->depth - curdepth; // first save old parent and last while (diff--) istack.push(pair< QListViewItem *, QListViewItem * >(parent,last)); - item = (last) ? (new QListViewItem(last)) : (new QListViewItem(dialog_->tocLV)); + item = (last ? new QListViewItem(last) : new QListViewItem(dialog_->tocLV)); parent = last; } else { int diff = curdepth - iter->depth; - pair< QListViewItem *, QListViewItem * > top; + pair top; // restore context while (diff--) { top = istack.top(); @@ -137,14 +137,20 @@ void QToc::updateToc(int newdepth) last = top.second; // insert it after the last one we processed if (!parent) - item = (last) ? (new QListViewItem(dialog_->tocLV,last)) : (new QListViewItem(dialog_->tocLV)); + item = (last ? new QListViewItem(dialog_->tocLV,last) : new QListViewItem(dialog_->tocLV)); else - item = (last) ? (new QListViewItem(parent,last)) : (new QListViewItem(parent)); + item = (last ? new QListViewItem(parent,last) : new QListViewItem(parent)); } - lyxerr[Debug::GUI] << "Table of contents" << endl << "Added item " << iter->str.c_str() - << " at depth " << iter->depth << ", previous sibling \"" << (last ? last->text(0).latin1() : "0") - << "\", parent \"" << (parent ? parent->text(0).latin1() : "0") << "\"" << endl; + lyxerr[Debug::GUI] + << "Table of contents\n" + << "Added item " << iter->str.c_str() + << " at depth " << iter->depth + << ", previous sibling \"" + << (last ? last->text(0).latin1() : "0") + << "\", parent \"" + << (parent ? parent->text(0).latin1() : "0") << "\"" + << endl; item->setText(0,iter->str.c_str()); item->setOpen(iter->depth < depth_); curdepth = iter->depth; diff --git a/src/frontends/qt2/QToc.h b/src/frontends/qt2/QToc.h index 15e707cdfc..d3a8caf5f6 100644 --- a/src/frontends/qt2/QToc.h +++ b/src/frontends/qt2/QToc.h @@ -27,10 +27,9 @@ class QToc : public Qt2CB > { public: - QToc(); - friend class QTocDialog; + QToc(); private: /// update the listview void updateToc(int newdepth); @@ -44,7 +43,7 @@ private: /// set the depth void set_depth(int depth); - virtual void apply() {}; + virtual void apply() {} /// update dialog virtual void update_contents(); diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C index 9db0e95276..7c01d81548 100644 --- a/src/frontends/qt2/QTocDialog.C +++ b/src/frontends/qt2/QTocDialog.C @@ -3,13 +3,13 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include - + #ifdef __GNUG__ #pragma implementation #endif @@ -20,6 +20,7 @@ #include #include + QTocDialog::QTocDialog(QToc * form) : QTocDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QTocDialog.h b/src/frontends/qt2/QTocDialog.h index 8f56262033..474427fac0 100644 --- a/src/frontends/qt2/QTocDialog.h +++ b/src/frontends/qt2/QTocDialog.h @@ -20,22 +20,18 @@ class QToc; -class QTocDialog : public QTocDialogBase -{ Q_OBJECT - +class QTocDialog : public QTocDialogBase { + Q_OBJECT public: QTocDialog(QToc * form); ~QTocDialog(); - public slots: void activate_adaptor(int); void depth_adaptor(int); void select_adaptor(QListViewItem *); void update_adaptor(); - protected: void closeEvent(QCloseEvent * e); - private: QToc * form_; }; diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index ad6a1c275b..67b8023b90 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -17,7 +17,7 @@ #include "ControlUrl.h" #include "debug.h" #include "gettext.h" - + #include "QURL.h" #include "QURLDialog.h" #include "Qt2BC.h" @@ -28,6 +28,7 @@ typedef Qt2CB > base_class; + QURL::QURL() : base_class(_("URL")) { @@ -48,21 +49,25 @@ void QURL::build_dialog() void QURL::update_contents() { - dialog_->urlED->setText(controller().params().getContents().c_str()); - dialog_->nameED->setText(controller().params().getOptions().c_str()); - dialog_->hyperlinkCB->setChecked(controller().params().getCmdName() != "url"); + InsetCommandParams const & params = controller().params(); + + dialog_->urlED->setText(params.getContents().c_str()); + dialog_->nameED->setText(params.getOptions().c_str()); + dialog_->hyperlinkCB->setChecked(params.getCmdName() != "url"); } void QURL::apply() { - controller().params().setContents(dialog_->urlED->text().latin1()); - controller().params().setOptions(dialog_->nameED->text().latin1()); + InsetCommandParams & params = controller().params(); + + params.setContents(dialog_->urlED->text().latin1()); + params.setOptions(dialog_->nameED->text().latin1()); if (dialog_->hyperlinkCB->isChecked()) - controller().params().setCmdName("htmlurl"); + params.setCmdName("htmlurl"); else - controller().params().setCmdName("url"); + params.setCmdName("url"); } diff --git a/src/frontends/qt2/QURL.h b/src/frontends/qt2/QURL.h index eb4bb341a5..ef65400af3 100644 --- a/src/frontends/qt2/QURL.h +++ b/src/frontends/qt2/QURL.h @@ -25,13 +25,11 @@ class QURLDialog; class QURL : public Qt2CB > { - friend class QURLDialog; public: + friend class QURLDialog; QURL(); - protected: virtual bool isValid(); - private: /// apply dialog virtual void apply(); diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C index 0e9334f648..db345e37cd 100644 --- a/src/frontends/qt2/QURLDialog.C +++ b/src/frontends/qt2/QURLDialog.C @@ -19,7 +19,8 @@ #include #include - + + QURLDialog::QURLDialog(QURL * form) : QURLDialogBase(0, 0, false, 0), form_(form) @@ -42,7 +43,7 @@ void QURLDialog::show() urlED->setFocus(); } - + void QURLDialog::changed_adaptor() { form_->changed(); diff --git a/src/frontends/qt2/QURLDialog.h b/src/frontends/qt2/QURLDialog.h index f97c5e481e..865e4a7950 100644 --- a/src/frontends/qt2/QURLDialog.h +++ b/src/frontends/qt2/QURLDialog.h @@ -20,21 +20,17 @@ class QURL; -class QURLDialog : public QURLDialogBase -{ Q_OBJECT - +class QURLDialog : public QURLDialogBase { + Q_OBJECT public: QURLDialog(QURL * form); ~QURLDialog(); virtual void show(); - public slots: void changed_adaptor(); - protected: void closeEvent(QCloseEvent *); - private: QURL * form_; }; diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index a7cad7ca10..986769de20 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -3,22 +3,22 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include -#include "Lsstream.h" #ifdef __GNUG__ #pragma implementation #endif +#include "Lsstream.h" #include "gettext.h" #include "LyXView.h" #include "ControlVCLog.h" - + #include "QVCLog.h" #include "QVCLogDialog.h" #include "Qt2BC.h" @@ -28,6 +28,7 @@ typedef Qt2CB > base_class; + QVCLog::QVCLog() : base_class(_("VCLog")) { diff --git a/src/frontends/qt2/QVCLog.h b/src/frontends/qt2/QVCLog.h index 070a106302..066c114062 100644 --- a/src/frontends/qt2/QVCLog.h +++ b/src/frontends/qt2/QVCLog.h @@ -30,10 +30,9 @@ public: friend class QVCLogDialog; /// QVCLog(); - private: /// Apply changes - virtual void apply() {}; + virtual void apply() {} /// update virtual void update_contents(); /// build the dialog diff --git a/src/frontends/qt2/QVCLogDialog.C b/src/frontends/qt2/QVCLogDialog.C index 7f7bd8ac37..d29e134d4f 100644 --- a/src/frontends/qt2/QVCLogDialog.C +++ b/src/frontends/qt2/QVCLogDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -24,7 +24,8 @@ #include #include - + + QVCLogDialog::QVCLogDialog(QVCLog * form) : QVCLogDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QVCLogDialog.h b/src/frontends/qt2/QVCLogDialog.h index 405d1ae3a5..f86f3256d7 100644 --- a/src/frontends/qt2/QVCLogDialog.h +++ b/src/frontends/qt2/QVCLogDialog.h @@ -20,18 +20,14 @@ class QVCLog; -class QVCLogDialog : public QVCLogDialogBase -{ Q_OBJECT - +class QVCLogDialog : public QVCLogDialogBase { + Q_OBJECT public: QVCLogDialog(QVCLog * form); - protected slots: virtual void updateClicked(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QVCLog * form_; }; diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index 6f23701f10..15af3200e3 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -22,23 +22,23 @@ #include "support/lstrings.h" #include "support/LAssert.h" -#include -#include - #include "QWorkArea.h" - + #include -#include +#include #include #include #include #include - + +#include +#include + using std::endl; using std::abs; using std::hex; - + QWorkArea::QWorkArea(int, int, int, int) : WorkArea(), QWidget(qApp->mainWidget()), painter_(*this) { @@ -46,9 +46,9 @@ QWorkArea::QWorkArea(int, int, int, int) content_ = new QContentPane(this); (static_cast(qApp->mainWidget()))->setCentralWidget(this); - + setFocusProxy(content_); - + content_->show(); content_->setBackgroundColor(lcolor.getX11Name(LColor::background).c_str()); @@ -56,7 +56,7 @@ QWorkArea::QWorkArea(int, int, int, int) QHBoxLayout * vl = new QHBoxLayout(this); vl->addWidget(content_, 5); vl->addWidget(scrollbar_, 0); - + show(); } @@ -70,10 +70,9 @@ void QWorkArea::setScrollbarParams(int h, int pos, int line_h) { // do what cursor movement does (some grey) h += height() / 4; - - int max = h - height(); - if (max < 0) - max = 0; + + int max = std::max(0, h - height()); + scrollbar_->setRange(0, max); scrollbar_->setValue(pos); scrollbar_->setLineStep(line_h); @@ -86,16 +85,16 @@ void QWorkArea::haveSelection(bool) const // not possible in Qt ! } - -string const QWorkArea::getClipboard() const + +string const QWorkArea::getClipboard() const { - QString str = QApplication::clipboard()->text(); + QString str = QApplication::clipboard()->text(); if (str.isNull()) return string(); return str.latin1(); } - + void QWorkArea::putClipboard(string const & str) const { QApplication::clipboard()->setText(str.c_str()); diff --git a/src/frontends/qt2/QWorkArea.h b/src/frontends/qt2/QWorkArea.h index 900b5f7c6b..d397a91bc2 100644 --- a/src/frontends/qt2/QWorkArea.h +++ b/src/frontends/qt2/QWorkArea.h @@ -34,10 +34,8 @@ * Hopefully soon we can just use QScrollView ... */ class QWorkArea : public WorkArea, public QWidget { - - friend class QContentPane; - public: + friend class QContentPane; QWorkArea(int x, int y, int w, int h); @@ -63,7 +61,6 @@ public: /// get the content pane widget QWidget * getContent() const { return content_; } - private: /// scroll bar QScrollBar * scrollbar_; diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C index 458896226b..e09deb3f77 100644 --- a/src/frontends/qt2/QWrap.C +++ b/src/frontends/qt2/QWrap.C @@ -24,13 +24,14 @@ #include "QWrapDialog.h" #include "Qt2BC.h" #include "lengthcombo.h" - + #include #include #include typedef Qt2CB > base_class; + QWrap::QWrap() : base_class(_("Wrap Options")) { @@ -59,47 +60,53 @@ void QWrap::apply() if (string(dialog_->widthED->text().latin1()).empty()) unit = LyXLength::UNIT_NONE; - controller().params().pageWidth = LyXLength(value, unit); + WrapParams & params = controller().params(); + + params.pageWidth = LyXLength(value, unit); switch (dialog_->valignCO->currentItem()) { case 0: - controller().params().placement.erase(); + params.placement.erase(); break; case 1: - controller().params().placement = "l"; + params.placement = "l"; break; case 2: - controller().params().placement = "r"; + params.placement = "r"; break; case 3: - controller().params().placement = "p"; + params.placement = "p"; break; } } namespace { - string const numtostr(double val) { - string a(tostr(val)); - if (a == "0") - a = ""; - return a; - } + +string const numtostr(double val) { + string a(tostr(val)); + if (a == "0") + a.erase(); + return a; +} + } // namespace anon void QWrap::update_contents() { - LyXLength len(controller().params().pageWidth); + WrapParams & params = controller().params(); + + LyXLength len(params.pageWidth); dialog_->widthED->setText(numtostr(len.value()).c_str()); dialog_->unitsLC->setCurrentItem(len.unit()); int item = 0; - if (controller().params().placement == "l") + if (params.placement == "l") item = 1; - else if (controller().params().placement == "r") + else if (params.placement == "r") item = 2; - else if (controller().params().placement == "p") + else if (params.placement == "p") item = 3; dialog_->valignCO->setCurrentItem(item); diff --git a/src/frontends/qt2/QWrap.h b/src/frontends/qt2/QWrap.h index 3fc085df11..a451e86085 100644 --- a/src/frontends/qt2/QWrap.h +++ b/src/frontends/qt2/QWrap.h @@ -26,11 +26,9 @@ class QWrap : public Qt2CB > { public: - friend class QWrapDialog; QWrap(); - private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C index ea0bef8ff9..65a365dc59 100644 --- a/src/frontends/qt2/QWrapDialog.C +++ b/src/frontends/qt2/QWrapDialog.C @@ -14,8 +14,6 @@ #pragma implementation #endif -#include - #include "ControlWrap.h" #include "QWrap.h" @@ -25,6 +23,9 @@ #include #include "lengthcombo.h" +#include + + QWrapDialog::QWrapDialog(QWrap * form) : QWrapDialogBase(0, 0, false, 0), form_(form) diff --git a/src/frontends/qt2/QWrapDialog.h b/src/frontends/qt2/QWrapDialog.h index def8301d0c..3b2e59b490 100644 --- a/src/frontends/qt2/QWrapDialog.h +++ b/src/frontends/qt2/QWrapDialog.h @@ -20,18 +20,14 @@ class QWrap; -class QWrapDialog : public QWrapDialogBase -{ Q_OBJECT - +class QWrapDialog : public QWrapDialogBase { + Q_OBJECT public: QWrapDialog(QWrap * form); - protected slots: virtual void change_adaptor(); - protected: virtual void closeEvent(QCloseEvent * e); - private: QWrap * form_; }; diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index 83adf1e452..cd152b3c4a 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Allan Rae - * \author Angus Leeming + * \author Allan Rae + * \author Angus Leeming * * Full author contact details are available in file CREDITS */ @@ -21,6 +21,7 @@ #include #include + Qt2BC::Qt2BC(string const & cancel, string const & close) : GuiBC(cancel, close) {} diff --git a/src/frontends/qt2/Qt2BC.h b/src/frontends/qt2/Qt2BC.h index 9051fcbddd..08f8d7af29 100644 --- a/src/frontends/qt2/Qt2BC.h +++ b/src/frontends/qt2/Qt2BC.h @@ -29,12 +29,10 @@ class QButton; the activation policy and which buttons correspond to which output of the state machine. */ -class Qt2BC : public GuiBC -{ +class Qt2BC : public GuiBC { public: /// Qt2BC(string const &, string const &); - private: /// Updates the button sensitivity (enabled/disabled) void setButtonEnabled(QButton *, bool enabled); diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index 424aa764ae..94f63475f9 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -25,6 +25,7 @@ #include "ControlButtons.h" #include "support/LAssert.h" + Qt2Base::Qt2Base(QString const & t) : ViewBase(), updating_(false), title_(t) {} diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index e771848b7d..2491a9895c 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -28,15 +28,13 @@ class Qt2BC; /** This class is an Qt2 GUI base class. */ -class Qt2Base : public QObject, public ViewBase -{ +class Qt2Base : public QObject, public ViewBase { Q_OBJECT public: /// Qt2Base(QString const &); /// virtual ~Qt2Base() {} - protected: /// build the actual dialog virtual void build_dialog() = 0; @@ -58,7 +56,6 @@ protected: /// are we updating ? bool updating_; - protected slots: // dialog closed from WM void slotWMHide(); @@ -74,7 +71,6 @@ protected slots: // Close button clicked void slotClose(); - private: /// Pointer to the actual instantiation of xform's form virtual QDialog * form() const = 0; @@ -86,8 +82,7 @@ private: template -class Qt2DB: public Qt2Base -{ +class Qt2DB: public Qt2Base { protected: Qt2DB(QString const &); diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index 90b4e0f704..4496cec0ce 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjornes - * \author John Levon + * \author Lars Gullik Bjornes + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -29,36 +29,39 @@ #include "frontends/Menubar.h" #include "frontends/Dialogs.h" #include "frontends/Timeout.h" - + #include - + #include "QtView.h" #include "qfont_loader.h" #include "QCommandBuffer.h" - + #include #include #include #include - + using std::endl; namespace { - int const idle_timer_value = 3000; -} - + +int const idle_timer_value = 3000; + +} // namespace anon + // FIXME: this has to go away BufferView * current_view; qfont_loader fontloader; + QtView::QtView(unsigned int width, unsigned int height) : QMainWindow(), LyXView() { resize(width, height); - + qApp->setMainWidget(this); - + bufferview_.reset(new BufferView(this, 0, 0, width, height)); ::current_view = bufferview_.get(); @@ -66,19 +69,19 @@ QtView::QtView(unsigned int width, unsigned int height) toolbar_.reset(new Toolbar(this, 0, 0, toolbardefaults)); statusBar()->setSizeGripEnabled(false); - + view_state_changed.connect(boost::bind(&QtView::update_view_state, this)); connect(&idle_timer_, SIGNAL(timeout()), this, SLOT(update_view_state_qt())); - - idle_timer_.start(idle_timer_value); - + + idle_timer_.start(idle_timer_value); + focus_command_buffer.connect(boost::bind(&QtView::focus_command_widget, this)); - + commandbuffer_ = new QCommandBuffer(this, *controlcommand_); - + addToolBar(commandbuffer_, Bottom, true); - - // assign an icon to main form + + // assign an icon to main form string const iconname = LibFileSearch("images", "lyx", "xpm"); if (!iconname.empty()) setIcon(QPixmap(iconname.c_str())); @@ -95,12 +98,12 @@ QtView::~QtView() void QtView::message(string const & str) { - statusBar()->message(str.c_str()); + statusBar()->message(str.c_str()); idle_timer_.stop(); idle_timer_.start(idle_timer_value); } - + void QtView::focus_command_widget() { commandbuffer_->focus_command(); @@ -112,25 +115,25 @@ void QtView::update_view_state_qt() statusBar()->message(currentState(view().get()).c_str()); } - + void QtView::update_view_state() { statusBar()->message(currentState(view().get()).c_str()); } - + void QtView::activated(int id) { getLyXFunc().dispatch(id, true); } - - + + void QtView::closeEvent(QCloseEvent *) { QuitLyX(); } - + void QtView::show(int x, int y, string const & title) { move(x, y); diff --git a/src/frontends/qt2/QtView.h b/src/frontends/qt2/QtView.h index 69909fd617..381c0b5e71 100644 --- a/src/frontends/qt2/QtView.h +++ b/src/frontends/qt2/QtView.h @@ -52,18 +52,15 @@ public: /// display a status message virtual void message(string const & str); - public slots: /// menu item has been selected void activated(int id); /// idle timeout void update_view_state_qt(); - protected: /// make sure we quit cleanly virtual void closeEvent(QCloseEvent * e); - private: /// focus the command buffer widget void focus_command_widget(); diff --git a/src/frontends/qt2/README b/src/frontends/qt2/README index 97a79cef44..904dfce474 100644 --- a/src/frontends/qt2/README +++ b/src/frontends/qt2/README @@ -83,3 +83,23 @@ Thesaurus John Done Toc Kalle Waiting to be updated Url Kalle Done VCLog John Done + + +Stuff to be aware of +-------------------- + +The connect statement in Qt is a macro and its arguments does not follow +the C++ standard as it should. Using the construct "Type const &" as +argument will lead to runtime-errors, use "const Type &" instead. + +ex. + +--right-- + + connect(list, SIGNAL(selected(const QString &)), + this, SLOT(complete_selected(const QString &))); + +--wrong-- + + connect(list, SIGNAL(selected(QString const &)), + this, SLOT(complete_selected(QString const &))); diff --git a/src/frontends/qt2/Timeout_pimpl.h b/src/frontends/qt2/Timeout_pimpl.h index f35141aa74..e1b3c4bd28 100644 --- a/src/frontends/qt2/Timeout_pimpl.h +++ b/src/frontends/qt2/Timeout_pimpl.h @@ -38,11 +38,9 @@ public: void reset(); /// is the timer running ? bool running() const; - protected: /// slot virtual void timerEvent(QTimerEvent *); - private: /// the owning timer Timeout * owner_; diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index 80c5de749d..43ba1b6230 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -63,7 +63,7 @@ QPixmap getIconPixmap(int action) if (!fullname.empty()) { lyxerr[Debug::GUI] << "Full icon name is `" - << fullname << "'" << endl; + << fullname << "'" << endl; return QPixmap(fullname.c_str()); } @@ -71,7 +71,7 @@ QPixmap getIconPixmap(int action) fullname = LibFileSearch("images", "unknown", "xpm"); if (!fullname.empty()) { lyxerr[Debug::GUI] << "Using default `unknown' icon" - << endl; + << endl; } return QPixmap(fullname.c_str()); } @@ -161,9 +161,8 @@ void Toolbar::Pimpl::setLayout(string const & layout) string const & name = _(tc[layout]->name()); - int i; - - for (i = 0; i < combo_->count(); ++i) { + int i = 0; + for (; i < combo_->count(); ++i) { if (name == combo_->text(i).latin1()) break; } diff --git a/src/frontends/qt2/Toolbar_pimpl.h b/src/frontends/qt2/Toolbar_pimpl.h index 3be574cfe0..f913350807 100644 --- a/src/frontends/qt2/Toolbar_pimpl.h +++ b/src/frontends/qt2/Toolbar_pimpl.h @@ -31,16 +31,15 @@ class QLComboBox; class ToolbarProxy; struct Toolbar::Pimpl { - +public: friend class ToolbarProxy; -public: Pimpl(LyXView * o, int x, int y); ~Pimpl(); /// add a new button to the toolbar. - void add(int action); + void add(int action); /// update the state of the icons void update(); @@ -53,7 +52,6 @@ public: void openLayoutList(); /// Erase the layout list void clearLayoutList(); - private: void changed_layout(string const & sel); @@ -70,18 +68,15 @@ private: typedef std::map ButtonMap; ButtonMap map_; - }; // moc is mind-numbingly stupid class ToolbarProxy : public QObject { Q_OBJECT - public: ToolbarProxy(Toolbar::Pimpl & owner) - : owner_(owner) { }; - + : owner_(owner) {} public slots: void layout_selected(const QString & str) { @@ -94,7 +89,6 @@ public slots: static_cast(sender())) ); } - private: Toolbar::Pimpl & owner_; }; diff --git a/src/frontends/qt2/WorkAreaFactory.C b/src/frontends/qt2/WorkAreaFactory.C index 9123cd4e91..21a6fc9ddb 100644 --- a/src/frontends/qt2/WorkAreaFactory.C +++ b/src/frontends/qt2/WorkAreaFactory.C @@ -3,26 +3,26 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ #include - + #ifdef __GNUG__ #pragma implementation #endif #include "frontends/WorkAreaFactory.h" - + #include "QWorkArea.h" - + namespace WorkAreaFactory { - + WorkArea * create(int x, int y, int w, int h) { return new QWorkArea(x, y, w, h); } -} +} // namespace WorkAreaFactory diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt2/emptytable.C index 4c413129a9..4f99a215e8 100644 --- a/src/frontends/qt2/emptytable.C +++ b/src/frontends/qt2/emptytable.C @@ -20,7 +20,8 @@ * A simple widget for a quick "preview" in TabularCreateDialog */ -const unsigned int cellsize = 20; +unsigned int const cellsize = 20; + EmptyTable::EmptyTable(QWidget * parent, const char * name) : QtTableView(parent, name, WRepaintNoErase) @@ -32,13 +33,14 @@ EmptyTable::EmptyTable(QWidget * parent, const char * name) setTableFlags(Tbl_autoScrollBars); } + QSize EmptyTable::sizeHint() const { return QSize(cellsize * numCols(), cellsize * numRows()); } -void EmptyTable::paintCell(QPainter *p, int row, int col) +void EmptyTable::paintCell(QPainter * p, int row, int col) { int const x2 = cellWidth(col) - 1; int const y2 = cellHeight(row) - 1; @@ -49,7 +51,7 @@ void EmptyTable::paintCell(QPainter *p, int row, int col) if (row + 1 != numRows() || col + 1 != numCols()) return; - + // draw handle int const step = cellsize / 5; int const space = 4; @@ -64,6 +66,7 @@ void EmptyTable::paintCell(QPainter *p, int row, int col) } } + void EmptyTable::setNumberColumns(int nr_cols) { if (nr_cols < 1) @@ -78,6 +81,7 @@ void EmptyTable::setNumberColumns(int nr_cols) emit colsChanged(nr_cols); } + void EmptyTable::setNumberRows(int nr_rows) { if (nr_rows < 1) @@ -92,6 +96,7 @@ void EmptyTable::setNumberRows(int nr_rows) emit rowsChanged(nr_rows); } + void EmptyTable::mouseMoveEvent(QMouseEvent *ev) { int const x = ev->pos().x(); diff --git a/src/frontends/qt2/emptytable.h b/src/frontends/qt2/emptytable.h index 1f18fd09e1..d00e33bb03 100644 --- a/src/frontends/qt2/emptytable.h +++ b/src/frontends/qt2/emptytable.h @@ -28,27 +28,23 @@ class EmptyTable : public QtTableView { public: EmptyTable(QWidget * parent = 0, const char * name = 0); - ~EmptyTable() {}; + ~EmptyTable() {} virtual QSize sizeHint() const; - public slots: /// set the number of columns in the table and emit colsChanged() signal void setNumberColumns(int nr_cols); /// set the number of rows in the table and emit rowsChanged() signal void setNumberRows(int nr_rows); - signals: /// the number of columns changed void colsChanged(int); /// the number of rows changed void rowsChanged(int); - protected: /// fill in a cell virtual void paintCell(class QPainter *, int, int); virtual void mouseMoveEvent(QMouseEvent *); - private: /// number of current columns unsigned int cols; diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C index 202ed6b686..8f09504414 100644 --- a/src/frontends/qt2/iconpalette.C +++ b/src/frontends/qt2/iconpalette.C @@ -15,7 +15,7 @@ #endif #include "debug.h" - + #include "iconpalette.h" #include @@ -27,9 +27,10 @@ using std::endl; using std::make_pair; using std::vector; using std::max; - + int const button_size = 40; - + + IconPalette::IconPalette(QWidget * parent, char const * name) : QWidget(parent, name), maxcol_(-1) { @@ -47,7 +48,7 @@ void IconPalette::add(QPixmap const & pixmap, string name, string tooltip) p->setFixedSize(button_size, button_size); p->setPixmap(pixmap); QToolTip::add(p, tooltip.c_str()); - connect(p, SIGNAL(clicked()), this, SLOT(clicked())); + connect(p, SIGNAL(clicked()), this, SLOT(clicked())); buttons_.push_back(make_pair(p, name)); } @@ -68,12 +69,12 @@ void IconPalette::clicked() void IconPalette::resizeEvent(QResizeEvent * e) { QWidget::resizeEvent(e); - + lyxerr[Debug::GUI] << "resize panel to " << e->size().width() << "," << e->size().height() << endl; - + int maxcol = e->size().width() / button_size; - + if (!layout_->isEmpty() && maxcol == maxcol_) return; @@ -84,17 +85,17 @@ void IconPalette::resizeEvent(QResizeEvent * e) lyxerr[Debug::GUI] << "Laying out " << buttons_.size() << " widgets in a " << cols << "x" << rows << " grid." << endl; - + setUpdatesEnabled(false); - + // clear layout QLayoutIterator lit = layout_->iterator(); while (lit.current()) { lit.takeCurrent(); } - + layout_->invalidate(); - + vector