From: Abdelrazak Younes Date: Fri, 13 Apr 2007 09:16:06 +0000 (+0000) Subject: * QPrefConvertersUi.ui X-Git-Tag: 1.6.10~10278 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=20c5d212cae78be2e59362df64b0222772411918;p=features.git * QPrefConvertersUi.ui - change GUI layout in accordance with latest "copiers" and "file format" changes. - add converter cache section. * QPrefsDialog: implement converter cache enabling and maximum age. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17791 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C index 840222b829..eaec85b425 100644 --- a/src/frontends/qt4/QPrefsDialog.C +++ b/src/frontends/qt4/QPrefsDialog.C @@ -876,16 +876,26 @@ PrefConverters::PrefConverters(QPrefs * form, QWidget * parent) this, SIGNAL(changed())); connect(converterModifyPB, SIGNAL(clicked()), this, SIGNAL(changed())); + connect(maxAgeLE, SIGNAL(textChanged(const QString&)), + this, SIGNAL(changed())); + + maxAgeLE->setValidator(new QDoubleValidator(maxAgeLE)); } -void PrefConverters::apply(LyXRC & /*rc*/) const +void PrefConverters::apply(LyXRC & rc) const { + rc.use_converter_cache = cacheCB->isChecked(); + rc.converter_cache_maxage = int(maxAgeLE->text().toDouble() * 86400.0); } -void PrefConverters::update(LyXRC const & /*rc*/) +void PrefConverters::update(LyXRC const & rc) { + cacheCB->setChecked(rc.use_converter_cache); + QString max_age; + max_age.setNum(double(rc.converter_cache_maxage) / 86400.0, 'g', 6); + maxAgeLE->setText(max_age); updateGui(); } @@ -978,6 +988,9 @@ void PrefConverters::updateButtons() converterModifyPB->setEnabled(valid && known && modified); converterNewPB->setEnabled(valid && !known); converterRemovePB->setEnabled(known); + + maxAgeLE->setEnabled(cacheCB->isChecked()); + maxAgeLA->setEnabled(cacheCB->isChecked()); } @@ -1011,6 +1024,14 @@ void PrefConverters::remove_converter() } +void PrefConverters::on_cacheCB_stateChanged(int state) +{ + maxAgeLE->setEnabled(state == Qt::Checked); + maxAgeLA->setEnabled(state == Qt::Checked); + changed(); +} + + PrefCopiers::PrefCopiers(QPrefs * form, QWidget * parent) : PrefModule(docstring(), _("Copiers"), form, parent) { diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h index 6447d1e9bd..e335a4338d 100644 --- a/src/frontends/qt4/QPrefsDialog.h +++ b/src/frontends/qt4/QPrefsDialog.h @@ -251,6 +251,7 @@ private Q_SLOTS: void switch_converter(); void converter_changed(); void remove_converter(); + void on_cacheCB_stateChanged(int state); private: void updateButtons(); diff --git a/src/frontends/qt4/ui/QPrefConvertersUi.ui b/src/frontends/qt4/ui/QPrefConvertersUi.ui index de5404f85b..6db6fcb370 100644 --- a/src/frontends/qt4/ui/QPrefConvertersUi.ui +++ b/src/frontends/qt4/ui/QPrefConvertersUi.ui @@ -1,219 +1,287 @@ - - - QPrefConvertersUi 0 0 - 297 - 307 + 423 + 394 - - - 9 + + + + 0 + 330 + 421 + 61 + - - 6 + + Converter File Cache - - - - Qt::Horizontal - - - - 20 - 231 - - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 97 - 31 - - - - - - - - A&dd - - - - - - - &Modify - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 121 - 112 - - - - - - - - 0 - - - 6 - - - - - &From: - - - converterFromCO - - - - - - - - - - - 3 - 0 - 0 - 0 - - - - - - - - E&xtra flag: - - - converterFlagED - - - - - - - C&onverter: - - - converterED - - - - - - - &To:[[as in 'From format x to format y']] - - - converterToCO - - - - - - - - - - - - - - - &Converters - - - convertersLW - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Remove - - - - - - - - - + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + &Enabled + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Maximum Age (in days) + + + maxAgeLE + + + + + + + + + + + + + + 0 + 0 + 421 + 331 + + + + Converter &Definitions + + + + 9 + + + 6 + + + + + + 7 + 7 + 0 + 0 + + + + + + + + 0 + + + 6 + + + + + A&dd + + + + + + + &Modify + + + + + + + + 1 + 0 + 0 + 0 + + + + &Remove + + + + + + + Qt::Vertical + + + + 75 + 16 + + + + + + + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + &From format: + + + converterFromCO + + + + + + + + 3 + 0 + 0 + 0 + + + + + + + + + + 0 + + + 6 + + + + + &To format: + + + converterFromCO + + + + + + + + 3 + 0 + 0 + 0 + + + + + + + + + + + + 0 + + + 6 + + + + + E&xtra flag: + + + converterFlagED + + + + + + + + + + + + 0 + + + 6 + + + + + C&onverter: + + + converterED + + + + + + + + + + - - - qt_helpers.h - convertersLW converterFromCO @@ -224,6 +292,9 @@ converterModifyPB converterRemovePB + + qt_helpers.h +