X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDelimiter.cpp;h=0d7ad5d219aff74912db2f268a47c1c2aa257d62;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1f96788b2d04679fa16339786036c09a9e859531;hpb=791ef980167a428cfe99939c249964b4adf486e7;p=lyx.git diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp index 1f96788b2d..0d7ad5d219 100644 --- a/src/frontends/qt4/GuiDelimiter.cpp +++ b/src/frontends/qt4/GuiDelimiter.cpp @@ -24,10 +24,12 @@ #include "support/debug.h" #include "support/docstring.h" #include "support/gettext.h" +#include "support/lstrings.h" #include #include #include +#include #include #include @@ -51,9 +53,9 @@ static char const * latex_delimiters[] = { static int const nr_latex_delimiters = sizeof(latex_delimiters) / sizeof(char const *); -static QString const bigleft[] = {"", "bigl", "Bigl", "biggl", "Biggl"}; +static string const bigleft[] = {"", "bigl", "Bigl", "biggl", "Biggl"}; -static QString const bigright[] = {"", "bigr", "Bigr", "biggr", "Biggr"}; +static string const bigright[] = {"", "bigr", "Bigr", "biggr", "Biggr"}; static char const * const biggui[] = { N_("big[[delimiter size]]"), @@ -66,15 +68,15 @@ static char const * const biggui[] = { // FIXME: It might be better to fix the big delim LFUN to not require // additional '\' prefix. -static QString fix_name(QString const & str, bool big) +static docstring fix_name(string const & str, bool big) { - if (str.isEmpty()) - return "."; + if (str.empty()) + return from_ascii("."); if (!big || str == "(" || str == ")" || str == "[" || str == "]" || str == "|" || str == "/") - return str; + return from_ascii(str); - return "\\" + str; + return "\\" + from_ascii(str); } struct MathSymbol { @@ -162,6 +164,19 @@ string const & texName(char_type math_symbol) return it->second; } + +void setDelimiterName(QListWidgetItem * lwi, string const & name) +{ + lwi->setData(Qt::UserRole, toqstr(name)); +} + + +string getDelimiterName(QListWidgetItem const * lwi) +{ + return fromqstr(lwi->data(Qt::UserRole).toString()); +} + + } // anon namespace @@ -187,19 +202,23 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) QFontMetrics fm(frontend::getFont(lyxfont)); QSize item_size(fm.maxWidth(), fm.height() + 8); + leftLW->setMinimumWidth(5 * item_size.width()); + rightLW->setMinimumWidth(5 * item_size.width()); + typedef map ListItems; ListItems list_items; // The last element is the empty one. int const end = nr_latex_delimiters - 1; for (int i = 0; i < end; ++i) { string const delim = latex_delimiters[i]; - MathSymbol const & ms = mathSymbol(delim); + MathSymbol const & ms = mathSymbol(delim); QString symbol(ms.fontcode? QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode))); QListWidgetItem * lwi = new QListWidgetItem(symbol); lyxfont.setFamily(ms.fontfamily); QFont font = frontend::getFont(lyxfont); lwi->setFont(font); + setDelimiterName(lwi, delim); lwi->setToolTip(toqstr(delim)); lwi->setSizeHint(item_size); switch (ms.fontfamily) { @@ -217,8 +236,7 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) } for (int i = 0; i != leftLW->count(); ++i) { - MathSymbol const & ms = mathSymbol( - fromqstr(leftLW->item(i)->toolTip())); + MathSymbol const & ms = mathSymbol(getDelimiterName(leftLW->item(i))); rightLW->addItem(list_items[doMatch(ms.unicode)]->clone()); } @@ -234,6 +252,8 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) sizeCO->addItem(qt_(biggui[i])); on_leftLW_currentRowChanged(0); + // synchronise the scroll bars + on_matchCB_stateChanged(matchCB->checkState()); bc().setPolicy(ButtonPolicy::IgnorantPolicy); } @@ -269,15 +289,17 @@ void GuiDelimiter::updateTeXCode(int size) { bool const bigsize = size != 0; - QString left_str = fix_name(leftLW->currentItem()->toolTip(), bigsize); - QString right_str = fix_name(rightLW->currentItem()->toolTip(), bigsize); + docstring left_str = fix_name(getDelimiterName(leftLW->currentItem()), + bigsize); + docstring right_str = fix_name(getDelimiterName(rightLW->currentItem()), + bigsize); if (!bigsize) tex_code_ = left_str + ' ' + right_str; else { - tex_code_ = bigleft[size] + ' ' + tex_code_ = from_ascii(bigleft[size]) + ' ' + left_str + ' ' - + bigright[size] + ' ' + + from_ascii(bigright[size]) + ' ' + right_str; } @@ -286,33 +308,41 @@ void GuiDelimiter::updateTeXCode(int size) // FIXME: retrieve the LateX code directly from mathed. // In all cases, we want the '\' prefix if needed, so we pass 'true' // to fix_name. - left_str = fix_name(leftLW->currentItem()->toolTip(), true); - right_str = fix_name(rightLW->currentItem()->toolTip(), true); - QString code_str; + left_str = fix_name(getDelimiterName(leftLW->currentItem()), + true); + right_str = fix_name(getDelimiterName(rightLW->currentItem()), + true); + docstring code_str; if (!bigsize) code_str = "\\left" + left_str + " \\right" + right_str; else { // There should be nothing in the TeX-code when the delimiter is "None". if (left_str != ".") - code_str = "\\" + bigleft[size] + left_str + ' '; + code_str = "\\" + from_ascii(bigleft[size]) + left_str + ' '; if (right_str != ".") - code_str += "\\" + bigright[size] + right_str; + code_str += "\\" + from_ascii(bigright[size]) + right_str; } - texCodeL->setText(qt_("TeX Code: ") + code_str); + texCodeL->setText(qt_("TeX Code: ") + toqstr(code_str)); + + // Enable the Swap button with non-matched pairs + bool const allow_swap = + (doMatch(mathSymbol(getDelimiterName(leftLW->currentItem())).unicode) + != mathSymbol(getDelimiterName(rightLW->currentItem())).unicode); + swapPB->setEnabled(allow_swap); } void GuiDelimiter::on_insertPB_clicked() { if (sizeCO->currentIndex() == 0) - dispatch(FuncRequest(LFUN_MATH_DELIM, fromqstr(tex_code_))); + dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_)); else { - QString command = '"' + tex_code_ + '"'; - command.replace(' ', "\" \""); - dispatch(FuncRequest(LFUN_MATH_BIGDELIM, fromqstr(command))); + docstring command = '"' + tex_code_ + '"'; + command = support::subst(command, from_ascii(" "), from_ascii("\" \"")); + dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command)); } - } +} void GuiDelimiter::on_sizeCO_activated(int index) @@ -361,9 +391,60 @@ void GuiDelimiter::on_rightLW_currentRowChanged(int item) void GuiDelimiter::on_matchCB_stateChanged(int state) { - if (state == Qt::Checked) + // Synchronise the vertical scroll bars when checked + QScrollBar * ls = leftLW->verticalScrollBar(); + QScrollBar * rs = rightLW->verticalScrollBar(); + + if (state == Qt::Checked) { on_leftLW_currentRowChanged(leftLW->currentRow()); + connect(ls, SIGNAL(valueChanged(int)), rs, SLOT(setValue(int)), + Qt::UniqueConnection); + connect(rs, SIGNAL(valueChanged(int)), ls, SLOT(setValue(int)), + Qt::UniqueConnection); + rs->setValue(ls->value()); + } else { + ls->disconnect(rs); + rs->disconnect(ls); + } + + updateTeXCode(sizeCO->currentIndex()); +} + +void GuiDelimiter::on_swapPB_clicked() +{ + // Get current math symbol for each side. + MathSymbol const & lms = + mathSymbol(getDelimiterName(leftLW->currentItem())); + MathSymbol const & rms = + mathSymbol(getDelimiterName(rightLW->currentItem())); + + // Swap and match. + char_type const lc = doMatch(rms.unicode); + char_type const rc = doMatch(lms.unicode); + + // Convert back to QString to locate them in the widget. + MathSymbol const & nlms = mathSymbol(texName(lc)); + MathSymbol const & nrms = mathSymbol(texName(rc)); + QString lqs(nlms.fontcode ? + QChar(nlms.fontcode) : toqstr(docstring(1, nlms.unicode))); + QString rqs(nrms.fontcode ? + QChar(nrms.fontcode) : toqstr(docstring(1, nrms.unicode))); + + // Handle unencoded "symbol" of "(None)". + if (lqs == "?") + lqs = qt_("(None)"); + if(rqs == "?") + rqs = qt_("(None)"); + + // Locate matching QListWidgetItem. + QList lwi = leftLW->findItems(lqs, Qt::MatchExactly); + QList rwi = rightLW->findItems(rqs, Qt::MatchExactly); + + // Select. + leftLW->setCurrentItem(lwi.first()); + rightLW->setCurrentItem(rwi.first()); + updateTeXCode(sizeCO->currentIndex()); }