anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 18:24:48 +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@14736 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-08-17 08:51:30 +00:00
parent e6a07c092a
commit 7b6815810d
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/frontends/qt4/QBox.C
View File

@ -57,13 +57,13 @@ void QBox::build_dialog()
// fill the box type choice // fill the box type choice
box_gui_tokens(ids_, gui_names_); box_gui_tokens(ids_, gui_names_);
for (unsigned int i = 0; i < gui_names_.size(); ++i) for (unsigned int i = 0; i < gui_names_.size(); ++i)
dialog_->typeCO->insertItem(toqstr(gui_names_[i])); dialog_->typeCO->addItem(toqstr(gui_names_[i]));
// add the special units to the height choice // add the special units to the height choice
// width needs different handling // width needs different handling
box_gui_tokens_special_length(ids_spec_, gui_names_spec_); box_gui_tokens_special_length(ids_spec_, gui_names_spec_);
for (unsigned int i = 1; i < gui_names_spec_.size(); ++i) { for (unsigned int i = 1; i < gui_names_spec_.size(); ++i) {
dialog_->heightUnitsLC->insertItem(toqstr(gui_names_spec_[i])); dialog_->heightUnitsLC->addItem(toqstr(gui_names_spec_[i]));
} }
bcview().addReadOnly(dialog_->typeCO); bcview().addReadOnly(dialog_->typeCO);
@ -92,7 +92,7 @@ void QBox::update_contents()
string type(controller().params().type); string type(controller().params().type);
for (unsigned int i = 0; i < gui_names_.size(); ++i) { for (unsigned int i = 0; i < gui_names_.size(); ++i) {
if (type == ids_[i]) if (type == ids_[i])
dialog_->typeCO->setCurrentItem(i); dialog_->typeCO->setCurrentIndex(i);
} }
// default: minipage // default: minipage
@ -107,11 +107,11 @@ void QBox::update_contents()
setInnerType(frameless, inner_type); setInnerType(frameless, inner_type);
char c = controller().params().pos; char c = controller().params().pos;
dialog_->valignCO->setCurrentItem(string("tcb").find(c, 0)); dialog_->valignCO->setCurrentIndex(string("tcb").find(c, 0));
c = controller().params().inner_pos; c = controller().params().inner_pos;
dialog_->ialignCO->setCurrentItem(string("tcbs").find(c, 0)); dialog_->ialignCO->setCurrentIndex(string("tcbs").find(c, 0));
c = controller().params().hor_pos; c = controller().params().hor_pos;
dialog_->halignCO->setCurrentItem(string("lcrs").find(c, 0)); dialog_->halignCO->setCurrentIndex(string("lcrs").find(c, 0));
bool ibox = controller().params().inner_box; bool ibox = controller().params().inner_box;
dialog_->valignCO->setEnabled(ibox); dialog_->valignCO->setEnabled(ibox);
@ -133,8 +133,8 @@ void QBox::update_contents()
spc = toqstr(gui_names_spec_[i].c_str()); spc = toqstr(gui_names_spec_[i].c_str());
} }
for (int j = 0; j < dialog_->widthUnitsLC->count(); j++) { for (int j = 0; j < dialog_->widthUnitsLC->count(); j++) {
if (dialog_->widthUnitsLC->text(j) == spc) if (dialog_->widthUnitsLC->itemText(j) == spc)
dialog_->widthUnitsLC->setCurrentItem(j); dialog_->widthUnitsLC->setCurrentIndex(j);
} }
} }
@ -150,8 +150,8 @@ void QBox::update_contents()
} }
} }
for (int j = 0; j < dialog_->heightUnitsLC->count(); j++) { for (int j = 0; j < dialog_->heightUnitsLC->count(); j++) {
if (dialog_->heightUnitsLC->text(j) == hspc) { if (dialog_->heightUnitsLC->itemText(j) == hspc) {
dialog_->heightUnitsLC->setCurrentItem(j); dialog_->heightUnitsLC->setCurrentIndex(j);
} }
} }
} }
@ -164,7 +164,7 @@ void QBox::update_contents()
void QBox::apply() void QBox::apply()
{ {
controller().params().type = controller().params().type =
ids_[dialog_->typeCO->currentItem()]; ids_[dialog_->typeCO->currentIndex()];
controller().params().inner_box = controller().params().inner_box =
dialog_->innerBoxCO->currentText() != qt_("None"); dialog_->innerBoxCO->currentText() != qt_("None");
@ -172,11 +172,11 @@ void QBox::apply()
dialog_->innerBoxCO->currentText() == qt_("Parbox"); dialog_->innerBoxCO->currentText() == qt_("Parbox");
controller().params().pos = controller().params().pos =
"tcb"[dialog_->valignCO->currentItem()]; "tcb"[dialog_->valignCO->currentIndex()];
controller().params().inner_pos = controller().params().inner_pos =
"tcbs"[dialog_->ialignCO->currentItem()]; "tcbs"[dialog_->ialignCO->currentIndex()];
controller().params().hor_pos = controller().params().hor_pos =
"lcrs"[dialog_->halignCO->currentItem()]; "lcrs"[dialog_->halignCO->currentIndex()];
int i = 0; int i = 0;
bool spec = false; bool spec = false;
@ -255,17 +255,17 @@ void QBox::setSpecial(bool ibox)
int count = dialog_->widthUnitsLC->count(); int count = dialog_->widthUnitsLC->count();
bool has_special = false; bool has_special = false;
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
if (dialog_->widthUnitsLC->text(i).contains(qt_("Total Height")) > 0) if (dialog_->widthUnitsLC->itemText(i).contains(qt_("Total Height")) > 0)
has_special = true; has_special = true;
// insert 'em if needed... // insert 'em if needed...
if (!ibox && !has_special) { if (!ibox && !has_special) {
for (unsigned int i = 1; i < gui_names_spec_.size(); i++) for (unsigned int i = 1; i < gui_names_spec_.size(); i++)
dialog_->widthUnitsLC->insertItem(toqstr(gui_names_spec_[i])); dialog_->widthUnitsLC->addItem(toqstr(gui_names_spec_[i]));
// ... or remove 'em if needed // ... or remove 'em if needed
} else if (ibox && has_special) { } else if (ibox && has_special) {
dialog_->widthUnitsLC->clear(); dialog_->widthUnitsLC->clear();
for (int i = 0; i < num_units; i++) for (int i = 0; i < num_units; i++)
dialog_->widthUnitsLC->insertItem(unit_name_gui[i]); dialog_->widthUnitsLC->addItem(unit_name_gui[i]);
} }
} }
@ -276,17 +276,17 @@ void QBox::setInnerType(bool frameless, int i)
// we have to remove "none" then and adjust the combo // we have to remove "none" then and adjust the combo
if (frameless) { if (frameless) {
dialog_->innerBoxCO->clear(); dialog_->innerBoxCO->clear();
dialog_->innerBoxCO->insertItem(qt_("Parbox")); dialog_->innerBoxCO->addItem(qt_("Parbox"));
dialog_->innerBoxCO->insertItem(qt_("Minipage")); dialog_->innerBoxCO->addItem(qt_("Minipage"));
dialog_->innerBoxCO->setCurrentItem(i - 1); dialog_->innerBoxCO->setCurrentIndex(i - 1);
} else { } else {
if (dialog_->innerBoxCO->count() == 2) if (dialog_->innerBoxCO->count() == 2)
i += 1; i += 1;
dialog_->innerBoxCO->clear(); dialog_->innerBoxCO->clear();
dialog_->innerBoxCO->insertItem(qt_("None")); dialog_->innerBoxCO->addItem(qt_("None"));
dialog_->innerBoxCO->insertItem(qt_("Parbox")); dialog_->innerBoxCO->addItem(qt_("Parbox"));
dialog_->innerBoxCO->insertItem(qt_("Minipage")); dialog_->innerBoxCO->addItem(qt_("Minipage"));
dialog_->innerBoxCO->setCurrentItem(i); dialog_->innerBoxCO->setCurrentIndex(i);
} }
} }