anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update for frnt::etc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4092 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-04-30 00:26:16 +00:00
parent 898dd8a854
commit cc5e971556
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-30 John Levon <moz@compsoc.man.ac.uk>
* QCharacter.h:
* QCharacter.C: update for language i18n change
2002-04-16 John Levon <moz@compsoc.man.ac.uk>
* Dialogs.C: add tooltipsEnabled()

20
src/frontends/qt2/QCharacter.C
View File

@ -22,7 +22,7 @@
#include <qcheckbox.h>
#include <qpushbutton.h>
using namespace character;
using namespace frnt;
using std::vector;
typedef Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> > base_class;
@ -69,9 +69,9 @@ void QCharacter::build_dialog()
cit != color.end(); ++cit) {
dialog_->colorCO->insertItem(cit->first.c_str(), -1);
}
for (vector<string>::const_iterator cit = language.begin();
for (vector<LanguagePair>::const_iterator cit = language.begin();
cit != language.end(); ++cit) {
dialog_->langCO->insertItem(cit->c_str(), -1);
dialog_->langCO->insertItem(cit->first.c_str(), -1);
}
bc().setOK(dialog_->okPB);
@ -113,18 +113,9 @@ void QCharacter::update_contents()
dialog_->sizeCO->setCurrentItem(findPos2nd(size, controller().getSize()));
dialog_->miscCO->setCurrentItem(findPos2nd(bar, controller().getBar()));
dialog_->colorCO->setCurrentItem(findPos2nd(color, controller().getColor()));
dialog_->langCO->setCurrentItem(findPos2nd(language, controller().getLanguage()));
dialog_->toggleallCB->setChecked(controller().getToggleAll());
string const thelanguage(controller().getLanguage());
int i = 0;
for (vector<string>::const_iterator cit = language.begin();
cit != language.end(); ++i, ++cit) {
if (*cit == thelanguage) {
dialog_->langCO->setCurrentItem(i);
break;
}
}
}
@ -136,8 +127,7 @@ void QCharacter::apply()
controller().setSize(size[dialog_->sizeCO->currentItem()].second);
controller().setBar(bar[dialog_->miscCO->currentItem()].second);
controller().setColor(color[dialog_->colorCO->currentItem()].second);
controller().setLanguage(dialog_->langCO->currentText().latin1());
controller().setLanguage(language[dialog_->langCO->currentItem()].second);
controller().setToggleAll(dialog_->toggleallCB->isChecked());
}

15
src/frontends/qt2/QCharacter.h
View File

@ -17,6 +17,7 @@
#include "LString.h"
#include "Qt2Base.h"
#include "controllers/character.h"
#include "controllers/frnt_lang.h"
class ControlCharacter;
@ -38,13 +39,13 @@ private:
/// build the dialog
virtual void build_dialog();
std::vector<character::FamilyPair> family;
std::vector<character::SeriesPair> series;
std::vector<character::ShapePair> shape;
std::vector<character::SizePair> size;
std::vector<character::BarPair> bar;
std::vector<character::ColorPair> color;
std::vector<string> language;
std::vector<frnt::FamilyPair> family;
std::vector<frnt::SeriesPair> series;
std::vector<frnt::ShapePair> shape;
std::vector<frnt::SizePair> size;
std::vector<frnt::BarPair> bar;
std::vector<frnt::ColorPair> color;
std::vector<frnt::LanguagePair> language;
};
#endif // QCHARACTER_H