anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 07:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the appropriate quote style when switching the main language

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-07-01 11:27:42 +02:00
parent 837869452a
commit 11f7efe2eb
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferParams.cpp
View File

@ -2257,6 +2257,12 @@ Font const BufferParams::getFont() const
}
InsetQuotes::QuoteLanguage BufferParams::getQuoteStyle(string const qs) const
{
return quoteslangtranslator().find(qs);
}
bool BufferParams::isLatex() const
{
return documentClass().outputType() == LATEX;

3
src/BufferParams.h
View File

@ -200,6 +200,9 @@ public:
/// returns the main font for the buffer (document)
Font const getFont() const;
/// translate quote style string to enum value
InsetQuotes::QuoteLanguage getQuoteStyle(std::string const qs) const;
/* these are for the PaperLayout */
/// the papersize
PAPER_SIZE papersize;

48
src/frontends/qt4/GuiDocument.cpp
View File

@ -1097,12 +1097,18 @@ GuiDocument::GuiDocument(GuiView & lv)
encodinglist.sort();
langModule->encodingCO->addItems(encodinglist);
langModule->quoteStyleCO->addItem(qt_("``text''"));
langModule->quoteStyleCO->addItem(qt_("''text''"));
langModule->quoteStyleCO->addItem(qt_(",,text``"));
langModule->quoteStyleCO->addItem(qt_(",,text''"));
langModule->quoteStyleCO->addItem(qt_("<<text>>"));
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
langModule->quoteStyleCO->addItem(
qt_("``text''"),InsetQuotes::EnglishQuotes);
langModule->quoteStyleCO->addItem(
qt_("''text''"), InsetQuotes::SwedishQuotes);
langModule->quoteStyleCO->addItem
(qt_(",,text``"), InsetQuotes::GermanQuotes);
langModule->quoteStyleCO->addItem(
qt_(",,text''"), InsetQuotes::PolishQuotes);
langModule->quoteStyleCO->addItem(
qt_("<<text>>"), InsetQuotes::FrenchQuotes);
langModule->quoteStyleCO->addItem(
qt_(">>text<<"), InsetQuotes::DanishQuotes);
langModule->languagePackageCO->addItem(
qt_("Default"), toqstr("default"));
@ -1770,6 +1776,12 @@ void GuiDocument::languageChanged(int i)
}
else
fontModule->osFontsCB->setEnabled(true);
// set appropriate quotation mark style
if (!lang->quoteStyle().empty()) {
langModule->quoteStyleCO->setCurrentIndex(
bp_.getQuoteStyle(lang->quoteStyle()));
}
}
@ -2450,28 +2462,8 @@ void GuiDocument::applyView()
}
}
InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
switch (langModule->quoteStyleCO->currentIndex()) {
case 0:
lga = InsetQuotes::EnglishQuotes;
break;
case 1:
lga = InsetQuotes::SwedishQuotes;
break;
case 2:
lga = InsetQuotes::GermanQuotes;
break;
case 3:
lga = InsetQuotes::PolishQuotes;
break;
case 4:
lga = InsetQuotes::FrenchQuotes;
break;
case 5:
lga = InsetQuotes::DanishQuotes;
break;
}
bp_.quotes_language = lga;
bp_.quotes_language = (InsetQuotes::QuoteLanguage) langModule->quoteStyleCO->itemData(
langModule->quoteStyleCO->currentIndex()).toInt();
QString const lang = langModule->languageCO->itemData(
langModule->languageCO->currentIndex()).toString();