From 220317063e96968adeda07bb60f58b1c4fd43367 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 1 Dec 2003 07:54:02 +0000 Subject: [PATCH] The qbranch fixes, the lengthcombo enhancement and removal of dead code in QParagraph.C git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8165 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 13 ++++++++++++ src/frontends/qt2/QDocument.C | 5 +++++ src/frontends/qt2/QDocumentDialog.C | 32 +++++++++++++++++++++-------- src/frontends/qt2/QDocumentDialog.h | 2 ++ src/frontends/qt2/QParagraph.C | 22 +------------------- src/frontends/qt2/QParagraph.h | 3 --- src/frontends/qt2/QVSpace.C | 8 +------- src/frontends/qt2/lengthcombo.C | 13 ++++++++++++ src/frontends/qt2/lengthcombo.h | 2 ++ 9 files changed, 61 insertions(+), 39 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 06cdb7a066..1f52a161ed 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,16 @@ +2003-12-01 Juergen Spitzmueller + + * QDocumentDialog.[Ch]: (branches) don't insert a coloritem + for colorless branches; implement double click for (de)activating + branches. + + * lengthcombo.[Ch]: introduce a noPercents() method which allows + to use the widget without the %-items. + * QVSpace.C: + * QDocument.C: use noPercents() where appropriate. + + * QParagraph.[Ch]: remove dead code and dependencies. + 2003-11-30 Angus Leeming * QContentPane.C (QContentPane): squash warning about variables diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 59ca0641cd..cefd5ce5dd 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -114,6 +114,9 @@ void QDocument::build_dialog() cb->insertItem(qt_("B3")); cb->insertItem(qt_("B4")); cb->insertItem(qt_("B5")); + // remove the %-items from the unit choice + dialog_->pageLayoutModule->paperwidthUnitCO->noPercents(); + dialog_->pageLayoutModule->paperheightUnitCO->noPercents(); // layout for (LyXTextClassList::const_iterator cit = textclasslist.begin(); @@ -141,6 +144,8 @@ void QDocument::build_dialog() dialog_->textLayoutModule->skipCO->insertItem(qt_("MedSkip")); dialog_->textLayoutModule->skipCO->insertItem(qt_("BigSkip")); dialog_->textLayoutModule->skipCO->insertItem(qt_("Length")); + // remove the %-items from the unit choice + dialog_->textLayoutModule->skipLengthCO->noPercents(); dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("default")); dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("empty")); diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index efee6907a5..330d2577ca 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -167,6 +167,8 @@ QDocumentDialog::QDocumentDialog(QDocument * form) connect(branchesModule->addBranchPB, SIGNAL(pressed()), this, SLOT(addBranchPressed())); connect(branchesModule->removePB, SIGNAL(pressed()), this, SLOT(deleteBranchPressed())); connect(branchesModule->activatePB, SIGNAL(pressed()), this, SLOT(toggleBranchPressed())); + connect(branchesModule->branchesLV, SIGNAL(doubleClicked(QListViewItem *)), this, + SLOT(branchDoubleClicked(QListViewItem *))); connect(branchesModule->colorPB, SIGNAL(clicked()), this, SLOT(toggleBranchColor())); branchesModule->branchesLV->setSorting(0); } @@ -433,15 +435,17 @@ void QDocumentDialog::updateBranchView() QString const bname = toqstr(all[i].c_str()); QString const sel = (params.branchlist().selected(fromqstr(bname))) ? qt_("Yes") : qt_("No"); - QColor itemcolor(white); + QListViewItem * newItem = + new QListViewItem(branchesModule->branchesLV, bname, sel); + QColor itemcolor; string x11hexname = params.branchlist().getColor(fromqstr(bname)); if (x11hexname[0] == '#') itemcolor.setNamedColor(toqstr(x11hexname)); - QPixmap coloritem(30, 10); - coloritem.fill(itemcolor); - QListViewItem * newItem = - new QListViewItem(branchesModule->branchesLV, bname, sel); - newItem->setPixmap(2, coloritem); + if (itemcolor.isValid()) { + QPixmap coloritem(30, 10); + coloritem.fill(itemcolor); + newItem->setPixmap(2, coloritem); + } } } form_->branchlist_ = params.branchlist(); @@ -482,12 +486,24 @@ void QDocumentDialog::deleteBranchPressed() void QDocumentDialog::toggleBranchPressed() +{ + QListViewItem * selItem = + branchesModule->branchesLV->selectedItem(); + toggleBranch(selItem); +} + + +void QDocumentDialog::branchDoubleClicked(QListViewItem * selItem) +{ + toggleBranch(selItem); +} + + +void QDocumentDialog::toggleBranch(QListViewItem * selItem) { ControlDocument & cntrl = form_->controller(); BufferParams & params = cntrl.params(); - QListViewItem * selItem = - branchesModule->branchesLV->selectedItem(); QString sel_branch; if (selItem != 0) sel_branch = selItem->text(0); diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index 1a80ee5a7c..f1ced29df9 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -43,6 +43,7 @@ public: void updateFontsize(std::string const &, std::string const &); void updatePagestyle(std::string const &, std::string const &); void updateBranchView(); + void toggleBranch(QListViewItem * selItem); void showPreamble(); @@ -64,6 +65,7 @@ protected slots: void addBranchPressed(); void deleteBranchPressed(); void toggleBranchPressed(); + void branchDoubleClicked(QListViewItem * selItem); void toggleBranchColor(); protected: diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index 232835fad6..5ef2a5059c 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -16,32 +16,20 @@ #include "QParagraphDialog.h" #include "Qt2BC.h" #include "ParagraphParameters.h" -#include "lyxrc.h" // to set the deafult length values #include "qt_helpers.h" #include "helper_funcs.h" #include "Spacing.h" -#include "vspace.h" - -#include "support/lstrings.h" #include "support/tostr.h" #include #include #include #include -#include #include -using lyx::support::contains_functor; -using lyx::support::isStrDbl; -using lyx::support::subst; -using lyx::support::trim; -using std::bind2nd; -using std::remove_if; using std::string; -using std::vector; typedef QController > base_class; @@ -54,17 +42,9 @@ QParagraph::QParagraph(Dialog & parent) void QParagraph::build_dialog() { - // the tabbed folder + // the dialog dialog_.reset(new QParagraphDialog(this)); - // 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(), "%")); - units_.erase(del, units_.end()); - // Manage the ok, apply, restore and cancel/close buttons bcview().setOK(dialog_->okPB); bcview().setApply(dialog_->applyPB); diff --git a/src/frontends/qt2/QParagraph.h b/src/frontends/qt2/QParagraph.h index fb92a5b01b..3f314297fe 100644 --- a/src/frontends/qt2/QParagraph.h +++ b/src/frontends/qt2/QParagraph.h @@ -15,7 +15,6 @@ #include "QDialogView.h" -#include class ControlParagraph; class QParagraphDialog; @@ -35,8 +34,6 @@ private: virtual void update_contents(); /// build the dialog virtual void build_dialog(); - - std::vector units_; }; #endif // QPARAGRAPH_H diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt2/QVSpace.C index a3b896403f..642d7a3382 100644 --- a/src/frontends/qt2/QVSpace.C +++ b/src/frontends/qt2/QVSpace.C @@ -155,13 +155,7 @@ void QVSpace::build_dialog() bcview().addReadOnly(dialog_->keepCB); // remove the %-items from the unit choice - int num = dialog_->unitCO->count(); - for (int i=0; i < num; i++) { - if (dialog_->unitCO->text(i).contains("%") > 0) { - dialog_->unitCO->removeItem(i); - i -= 1; - } - } + dialog_->unitCO->noPercents(); } diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C index 7b8143b9ec..6b3bff3ced 100644 --- a/src/frontends/qt2/lengthcombo.C +++ b/src/frontends/qt2/lengthcombo.C @@ -50,3 +50,16 @@ void LengthCombo::setEnabled(bool b) { QComboBox::setEnabled(b); } + + +void LengthCombo::noPercents() +{ + int num = QComboBox::count(); + for (int i = 0; i < num; i++) { + if (QComboBox::text(i).contains("%") > 0) { + QComboBox::removeItem(i); + i -= 1; + num -= 1; + } + } +} diff --git a/src/frontends/qt2/lengthcombo.h b/src/frontends/qt2/lengthcombo.h index 311229e31d..caac0b6149 100644 --- a/src/frontends/qt2/lengthcombo.h +++ b/src/frontends/qt2/lengthcombo.h @@ -31,6 +31,8 @@ public: LyXLength::UNIT currentLengthItem() const; /// enable the widget virtual void setEnabled(bool b); + /// use the %-items? + virtual void noPercents(); protected slots: virtual void has_activated(int index); -- 2.39.2