anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 05:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of QT3_SUPPORT and some cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14758 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-08-17 08:58:28 +00:00
parent be9ae60c82
commit a9a6a5447d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontends/qt4/QRef.C
View File

@ -68,7 +68,7 @@ void QRef::update_contents()
{ {
InsetCommandParams const & params = controller().params(); InsetCommandParams const & params = controller().params();
int orig_type = dialog_->typeCO->currentItem(); int orig_type = dialog_->typeCO->currentIndex();
dialog_->referenceED->setText(toqstr(params.getContents())); dialog_->referenceED->setText(toqstr(params.getContents()));
@ -77,12 +77,12 @@ void QRef::update_contents()
// restore type settings for new insets // restore type settings for new insets
if (params.getContents().empty()) if (params.getContents().empty())
dialog_->typeCO->setCurrentItem(orig_type); dialog_->typeCO->setCurrentIndex(orig_type);
else else
dialog_->typeCO->setCurrentItem(InsetRef::getType(params.getCmdName())); dialog_->typeCO->setCurrentIndex(InsetRef::getType(params.getCmdName()));
dialog_->typeCO->setEnabled(typeAllowed() && !readOnly()); dialog_->typeCO->setEnabled(typeAllowed() && !readOnly());
if (!typeAllowed()) if (!typeAllowed())
dialog_->typeCO->setCurrentItem(0); dialog_->typeCO->setCurrentIndex(0);
dialog_->sortCB->setChecked(sort_); dialog_->sortCB->setChecked(sort_);
@ -91,14 +91,14 @@ void QRef::update_contents()
vector<string> const buffers = controller().getBufferList(); vector<string> const buffers = controller().getBufferList();
for (vector<string>::const_iterator it = buffers.begin(); for (vector<string>::const_iterator it = buffers.begin();
it != buffers.end(); ++it) { it != buffers.end(); ++it) {
dialog_->bufferCO->insertItem(toqstr(*it)); dialog_->bufferCO->addItem(toqstr(*it));
} }
// restore the buffer combo setting for new insets // restore the buffer combo setting for new insets
if (params.getContents().empty() && restored_buffer_ != -1 if (params.getContents().empty() && restored_buffer_ != -1
&& restored_buffer_ < dialog_->bufferCO->count()) && restored_buffer_ < dialog_->bufferCO->count())
dialog_->bufferCO->setCurrentItem(restored_buffer_); dialog_->bufferCO->setCurrentIndex(restored_buffer_);
else else
dialog_->bufferCO->setCurrentItem(controller().getBufferNum()); dialog_->bufferCO->setCurrentIndex(controller().getBufferNum());
updateRefs(); updateRefs();
bc().valid(false); bc().valid(false);
@ -109,11 +109,11 @@ void QRef::apply()
{ {
InsetCommandParams & params = controller().params(); InsetCommandParams & params = controller().params();
params.setCmdName(InsetRef::getName(dialog_->typeCO->currentItem())); params.setCmdName(InsetRef::getName(dialog_->typeCO->currentIndex()));
params.setContents(fromqstr(dialog_->referenceED->text())); params.setContents(fromqstr(dialog_->referenceED->text()));
params.setOptions(fromqstr(dialog_->nameED->text())); params.setOptions(fromqstr(dialog_->nameED->text()));
restored_buffer_ = dialog_->bufferCO->currentItem(); restored_buffer_ = dialog_->bufferCO->currentIndex();
} }
@ -136,16 +136,16 @@ bool QRef::typeAllowed()
void QRef::setGoBack() void QRef::setGoBack()
{ {
dialog_->gotoPB->setText(qt_("&Go Back")); dialog_->gotoPB->setText(qt_("&Go Back"));
QToolTip::remove(dialog_->gotoPB); dialog_->gotoPB->setToolTip("");
QToolTip::add(dialog_->gotoPB, qt_("Jump back")); dialog_->gotoPB->setToolTip(qt_("Jump back"));
} }
void QRef::setGotoRef() void QRef::setGotoRef()
{ {
dialog_->gotoPB->setText(qt_("&Go to Label")); dialog_->gotoPB->setText(qt_("&Go to Label"));
QToolTip::remove(dialog_->gotoPB); dialog_->gotoPB->setToolTip("");
QToolTip::add(dialog_->gotoPB, qt_("Jump to label")); dialog_->gotoPB->setToolTip(qt_("Jump to label"));
} }
@ -219,7 +219,7 @@ void QRef::updateRefs()
refs_.clear(); refs_.clear();
if (at_ref_) if (at_ref_)
gotoRef(); gotoRef();
string const name = controller().getBufferName(dialog_->bufferCO->currentItem()); string const name = controller().getBufferName(dialog_->bufferCO->currentIndex());
refs_ = controller().getLabelList(name); refs_ = controller().getLabelList(name);
dialog_->sortCB->setEnabled(!refs_.empty()); dialog_->sortCB->setEnabled(!refs_.empty());
dialog_->refsLW->setEnabled(!refs_.empty()); dialog_->refsLW->setEnabled(!refs_.empty());