anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QTabular/QCitation ui fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7332 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2003-07-21 13:43:01 +00:00
parent c9017030ab
commit a6e529ccce
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-16 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QCitation.C: don't reset natbib styleCO when inserting new entry.
* QTabular.C:
* QTabularDialog.C: use poweruser input for tabular width (bug 1156).
2003-07-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* xfont_loader.C (addFontPath): condition message to Debug::FONT

5
src/frontends/qt2/QCitation.C
View File

@ -112,6 +112,8 @@ void QCitation::fillStyles()
if (!citekeys.empty())
key = citekeys[0];
int const orig = dialog_->citationStyleCO->currentItem();
dialog_->citationStyleCO->clear();
vector<string> const & sty = controller().getCiteStrings(key);
@ -119,6 +121,9 @@ void QCitation::fillStyles()
it != sty.end(); ++it) {
dialog_->citationStyleCO->insertItem(toqstr(*it));
}
if (orig != -1 && orig < dialog_->citationStyleCO->count())
dialog_->citationStyleCO->setCurrentItem(orig);
}

13
src/frontends/qt2/QTabular.C
View File

@ -166,13 +166,12 @@ void QTabular::update_contents()
dialog_->specialAlignmentED->setEnabled(!isReadonly);
LyXLength::UNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN;
if (!pwidth.zero()) {
dialog_->widthED->setText(toqstr(tostr(pwidth.value())));
dialog_->widthUnit->setCurrentItem(pwidth.unit());
} else {
dialog_->widthED->setText("");
dialog_->widthUnit->setCurrentItem(default_unit);
}
string colwidth;
if (!pwidth.zero())
colwidth = pwidth.asString();
lengthToWidgets(dialog_->widthED, dialog_->widthUnit,
colwidth, default_unit);
dialog_->widthED->setEnabled(!isReadonly);
dialog_->widthUnit->setEnabled(!isReadonly);

4
src/frontends/qt2/QTabularDialog.C
View File

@ -147,9 +147,7 @@ void QTabularDialog::specialAlignment_changed()
void QTabularDialog::width_changed()
{
string const width =
LyXLength(widthED->text().toDouble(),
widthUnit->currentLengthItem()).asString();
string const width = widgetsToLength(widthED, widthUnit);
if (form_->controller().isMulticolumnCell())
form_->controller().set(LyXTabular::SET_MPWIDTH, width);
else