From 550d0f0be870aeb3f2d1aeb07a2e65e315102bde Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Thu, 17 Aug 2006 08:54:12 +0000 Subject: [PATCH] get rid of QT3_SUPPORT and some cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14745 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QExternal.C | 65 ++++++++++++++++------------- src/frontends/qt4/QExternalDialog.C | 6 +-- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C index 283981d192..3df1956375 100644 --- a/src/frontends/qt4/QExternal.C +++ b/src/frontends/qt4/QExternal.C @@ -96,7 +96,7 @@ void setDisplay(QCheckBox & displayCB, QComboBox & showCO, QLineEdit & scaleED, break; } - showCO.setCurrentItem(item); + showCO.setCurrentIndex(item); bool const no_display = display == external::NoDisplay; showCO.setEnabled(!no_display && !read_only); displayCB.setChecked(!no_display); @@ -111,7 +111,7 @@ void getDisplay(external::DisplayType & display, QComboBox const & showCO, QLineEdit const & scaleED) { - switch (showCO.currentItem()) { + switch (showCO.currentIndex()) { case 0: display = external::DefaultDisplay; break; @@ -139,7 +139,7 @@ void getDisplay(external::DisplayType & display, void setRotation(QLineEdit & angleED, QComboBox & originCO, external::RotationData const & data) { - originCO.setCurrentItem(int(data.origin())); + originCO.setCurrentIndex(int(data.origin())); angleED.setText(toqstr(data.angle)); } @@ -149,7 +149,7 @@ void getRotation(external::RotationData & data, { typedef external::RotationData::OriginType OriginType; - data.origin(static_cast(originCO.currentItem())); + data.origin(static_cast(originCO.currentIndex())); data.angle = fromqstr(angleED.text()); } @@ -169,13 +169,13 @@ void setSize(QLineEdit & widthED, QComboBox & widthUnitCO, if (using_scale) { widthED.setText(toqstr(scale)); - widthUnitCO.setCurrentItem(0); + widthUnitCO.setCurrentIndex(0); } else { widthED.setText(toqstr(convert(data.width.value()))); // Because 'Scale' is position 0... // Note also that width cannot be zero here, so // we don't need to worry about the default unit. - widthUnitCO.setCurrentItem(data.width.unit() + 1); + widthUnitCO.setCurrentIndex(data.width.unit() + 1); } string const h = data.height.zero() ? string() : data.height.asString(); @@ -201,9 +201,9 @@ void getSize(external::ResizeData & data, { string const width = fromqstr(widthED.text()); - if (widthUnitCO.currentItem() > 0) { + if (widthUnitCO.currentIndex() > 0) { // Subtract one, because scale is 0. - int const unit = widthUnitCO.currentItem() - 1; + int const unit = widthUnitCO.currentIndex() - 1; LyXLength w; if (isValidLength(width, &w)) @@ -326,19 +326,19 @@ void QExternal::build_dialog() for (std::vector::const_iterator cit = templates.begin(); cit != templates.end(); ++cit) { - dialog_->externalCO->insertItem(toqstr(*cit), -1); + dialog_->externalCO->addItem(toqstr(*cit)); } // Fill the origins combo typedef vector Origins; Origins const & all_origins = external::all_origins(); for (Origins::size_type i = 0; i != all_origins.size(); ++i) - dialog_->originCO->insertItem(toqstr(external::origin_gui_str(i))); + dialog_->originCO->addItem(toqstr(external::origin_gui_str(i))); // Fill the width combo - dialog_->widthUnitCO->insertItem(qt_("Scale%")); + dialog_->widthUnitCO->addItem(qt_("Scale%")); for (int i = 0; i < num_units; i++) - dialog_->widthUnitCO->insertItem(unit_name_gui[i], -1); + dialog_->widthUnitCO->addItem(unit_name_gui[i]); } @@ -348,14 +348,14 @@ void QExternal::update_contents() if (path_validator) path_validator->setChecker(kernel().docType(), lyxrc); - dialog_->tab->setCurrentPage(0); + dialog_->tab->setCurrentIndex(0); InsetExternalParams const & params = controller().params(); string const name = params.filename.outputFilename(kernel().bufferFilepath()); dialog_->fileED->setText(toqstr(name)); - dialog_->externalCO->setCurrentItem( + dialog_->externalCO->setCurrentIndex( controller().getTemplateNumber(params.templatename())); updateTemplate(); @@ -385,7 +385,7 @@ void QExternal::update_contents() void QExternal::updateTemplate() { external::Template templ = - controller().getTemplate(dialog_->externalCO->currentItem()); + controller().getTemplate(dialog_->externalCO->currentIndex()); dialog_->externalTB->setPlainText(toqstr(templ.helpText)); // Ascertain which (if any) transformations the template supports @@ -396,16 +396,20 @@ void QExternal::updateTemplate() TransformIDs::const_iterator const tr_end = transformIds.end(); bool found = find(tr_begin, tr_end, external::Rotate) != tr_end; - dialog_->tab->setTabEnabled(dialog_->rotatetab, found); - + dialog_->tab->setTabEnabled( + dialog_->tab->indexOf(dialog_->rotatetab), found); found = find(tr_begin, tr_end, external::Resize) != tr_end; - dialog_->tab->setTabEnabled(dialog_->scaletab, found); + dialog_->tab->setTabEnabled( + dialog_->tab->indexOf(dialog_->scaletab), found); found = find(tr_begin, tr_end, external::Clip) != tr_end; - dialog_->tab->setTabEnabled(dialog_->croptab, found); + dialog_->tab->setTabEnabled( + dialog_->tab->indexOf(dialog_->croptab), found); found = find(tr_begin, tr_end, external::Extra) != tr_end; - dialog_->tab->setTabEnabled(dialog_->optionstab, found); + dialog_->tab->setTabEnabled( + dialog_->tab->indexOf(dialog_->optionstab), found); + if (!found) return; @@ -426,18 +430,19 @@ void QExternal::updateTemplate() continue; string const format = it->first; string const opt = controller().params().extradata.get(format); - extraCB->insertItem(toqstr(format)); + extraCB->addItem(toqstr(format)); extra_[format] = toqstr(opt); } bool const enabled = extraCB->count() > 0; - dialog_->tab->setTabEnabled(dialog_->optionstab, enabled); + dialog_->tab->setTabEnabled( + dialog_->tab->indexOf(dialog_->optionstab), enabled); extraED->setEnabled(enabled && !kernel().isBufferReadonly()); extraCB->setEnabled(enabled); if (enabled) { - extraCB->setCurrentItem(0); + extraCB->setCurrentIndex(0); extraED->setText(extra_[fromqstr(extraCB->currentText())]); } } @@ -451,7 +456,7 @@ void QExternal::apply() kernel().bufferFilepath()); params.settemplate(controller().getTemplate( - dialog_->externalCO->currentItem()).lyxName); + dialog_->externalCO->currentIndex()).lyxName); params.draft = dialog_->draftCB->isChecked(); @@ -459,24 +464,28 @@ void QExternal::apply() *dialog_->displayCB, *dialog_->showCO, *dialog_->displayscaleED); - if (dialog_->tab->isTabEnabled(dialog_->rotatetab)) + if (dialog_->tab->isTabEnabled( + dialog_->tab->indexOf(dialog_->rotatetab))) getRotation(params.rotationdata, *dialog_->angleED, *dialog_->originCO); - if (dialog_->tab->isTabEnabled(dialog_->scaletab)) + if (dialog_->tab->isTabEnabled( + dialog_->tab->indexOf(dialog_->scaletab))) getSize(params.resizedata, *dialog_->widthED, *dialog_->widthUnitCO, *dialog_->heightED, *dialog_->heightUnitCO, *dialog_->aspectratioCB); - if (dialog_->tab->isTabEnabled(dialog_->croptab)) + if (dialog_->tab->isTabEnabled( + dialog_->tab->indexOf(dialog_->croptab))) getCrop(params.clipdata, *dialog_->clipCB, *dialog_->xlED, *dialog_->ybED, *dialog_->xrED, *dialog_->ytED, controller().bbChanged()); - if (dialog_->tab->isTabEnabled(dialog_->optionstab)) + if (dialog_->tab->isTabEnabled( + dialog_->tab->indexOf(dialog_->optionstab))) getExtra(params.extradata, extra_); controller().setParams(params); diff --git a/src/frontends/qt4/QExternalDialog.C b/src/frontends/qt4/QExternalDialog.C index 9f4debec7d..adfe745e4b 100644 --- a/src/frontends/qt4/QExternalDialog.C +++ b/src/frontends/qt4/QExternalDialog.C @@ -108,7 +108,7 @@ void QExternalDialog::show() bool QExternalDialog::activateAspectratio() const { - if (widthUnitCO->currentItem() == 0) + if (widthUnitCO->currentIndex() == 0) return false; string const wstr = fromqstr(widthED->text()); @@ -143,7 +143,7 @@ void QExternalDialog::bbChanged() void QExternalDialog::browseClicked() { - int const choice = externalCO->currentItem(); + int const choice = externalCO->currentIndex(); string const template_name = form_->controller().getTemplate(choice).lyxName; string const str = @@ -210,7 +210,7 @@ void QExternalDialog::templateChanged() void QExternalDialog::widthUnitChanged() { - bool useHeight = (widthUnitCO->currentItem() > 0); + bool useHeight = (widthUnitCO->currentIndex() > 0); if (useHeight) widthED->setValidator(unsignedLengthValidator(widthED));