slipenkomk/qalculate-qt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve title for items in conversion list for current result; Fix only first name shown in completion list for a few object; Add temporary option to unknown edit dialog; Disable editing of name for x, y, and z variables; Fix application not exiting

Browse Source
This commit is contained in:
Hanna K 2023-08-07 09:43:05 +02:00
parent 5496ec175d
commit 2e969233e5
14 changed files with 257 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
src/expressionedit.cpp
View File

@ -800,7 +800,7 @@ ExpressionEdit::ExpressionEdit(QWidget *parent, QWidget *toolbar) : QPlainTextEd
setUndoRedoEnabled(false); setUndoRedoEnabled(false);
completionModel = new ExpressionProxyModel(cdata, this); completionModel = new ExpressionProxyModel(cdata, this);
sourceModel = new QStandardItemModel(this); sourceModel = new QStandardItemModel(this);
sourceModel->setColumnCount(2); sourceModel->setColumnCount(3);
completionModel->setSourceModel(sourceModel); completionModel->setSourceModel(sourceModel);
completer = new QCompleter(completionModel, this); completer = new QCompleter(completionModel, this);
completer->setWidget(this); completer->setWidget(this);
@ -817,6 +817,7 @@ ExpressionEdit::ExpressionEdit(QWidget *parent, QWidget *toolbar) : QPlainTextEd
HTMLDelegate* delegate = new HTMLDelegate(); HTMLDelegate* delegate = new HTMLDelegate();
completionView->setItemDelegateForColumn(0, delegate); completionView->setItemDelegateForColumn(0, delegate);
completionView->setItemDelegateForColumn(1, delegate); completionView->setItemDelegateForColumn(1, delegate);
completionView->setItemDelegateForColumn(2, delegate);
completer->setPopup(completionView); completer->setPopup(completionView);
previous_pos = 0; previous_pos = 0;
if(settings->completion_delay > 0) { if(settings->completion_delay > 0) {
@ -875,7 +876,7 @@ bool ExpressionEdit::eventFilter(QObject *o, QEvent *e) {
return false; return false;
} }
#define COMPLETION_APPEND_M(x, y, z, m) items.clear(); \ #define COMPLETION_APPEND_M(x, y, z, m) {items.clear(); \
QStandardItem *item = new QStandardItem(x); \ QStandardItem *item = new QStandardItem(x); \
if(m) { \ if(m) { \
QFont font = completionView->font(); \ QFont font = completionView->font(); \
@ -892,10 +893,42 @@ bool ExpressionEdit::eventFilter(QObject *o, QEvent *e) {
item = new QStandardItem(y); \ item = new QStandardItem(y); \
item->setData(ifont, Qt::FontRole); \ item->setData(ifont, Qt::FontRole); \
items.append(item); \ items.append(item); \
sourceModel->appendRow(items); sourceModel->appendRow(items);}
#define COMPLETION_APPEND(x, y, z, p) items.clear(); \ #define COMPLETION_APPEND_2(x, y, y2, z, p) {items.clear(); \
{QStandardItem *item = new QStandardItem(x); \ QStandardItem *item = new QStandardItem(x); \
item->setData(completionView->font(), Qt::FontRole); \
item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \
item->setData(QVariant::fromValue(z), TYPE_ROLE); \
item->setData(QVariant::fromValue(0), MATCH_ROLE); \
item->setData(QVariant::fromValue(0), IMATCH_ROLE); \
items.append(item); \
item = new QStandardItem(y); \
item->setData(ifont, Qt::FontRole); \
items.append(item); \
item = new QStandardItem(y2); \
items.append(item); \
sourceModel->appendRow(items);}
#define COMPLETION_APPEND_C(x, y, z, p) COMPLETION_APPEND_2(x, y, y, z, p)
#define COMPLETION_APPEND_T(x, y, z, p, t) {items.clear(); \
QStandardItem *item = new QStandardItem(x); \
item->setData(completionView->font(), Qt::FontRole); \
item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \
item->setData(QVariant::fromValue(z), TYPE_ROLE); \
item->setData(QVariant::fromValue(0), MATCH_ROLE); \
item->setData(QVariant::fromValue(0), IMATCH_ROLE); \
if(!t.isEmpty()) item->setData("<p>" + t + "</p>", Qt::ToolTipRole);\
items.append(item); \
item = new QStandardItem(y); \
item->setData(ifont, Qt::FontRole); \
if(!t.isEmpty()) item->setData("<p>" + t + "</p>", Qt::ToolTipRole);\
items.append(item); \
sourceModel->appendRow(items);}
#define COMPLETION_APPEND(x, y, z, p) {items.clear(); \
QStandardItem *item = new QStandardItem(x); \
item->setData(completionView->font(), Qt::FontRole); \ item->setData(completionView->font(), Qt::FontRole); \
item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \ item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \
item->setData(QVariant::fromValue(z), TYPE_ROLE); \ item->setData(QVariant::fromValue(z), TYPE_ROLE); \
@ -907,35 +940,9 @@ bool ExpressionEdit::eventFilter(QObject *o, QEvent *e) {
items.append(item); \ items.append(item); \
sourceModel->appendRow(items);} sourceModel->appendRow(items);}
#define COMPLETION_APPEND_T(x, y, z, p, t) items.clear(); \ #define COMPLETION_APPEND_FLAG(x, y, y2, z, p) if(!QFile::exists(":/data/flags/" + QString::fromStdString(u->referenceName() + ".png"))) {COMPLETION_APPEND_2(x, y, y2, z, p)} \
QStandardItem *item = new QStandardItem(x); \ else if(flagheight <= 0) {COMPLETION_APPEND_2(x, QString("%1&nbsp;&nbsp;<img src=\":/data/flags/%2\"/>").arg(y).arg(QString::fromStdString(u->referenceName())), QString("%1&nbsp;&nbsp;<img src=\":/data/flags/%2\"/>").arg(y2).arg(QString::fromStdString(u->referenceName())), z, p)} \
item->setData(completionView->font(), Qt::FontRole); \ else {COMPLETION_APPEND_2(x, QString("%1&nbsp;&nbsp;<img height=\"%2\" src=\":/data/flags/%3\"/>").arg(y).arg(flagheight).arg(QString::fromStdString(u->referenceName())), QString("%1&nbsp;&nbsp;<img height=\"%2\" src=\":/data/flags/%3\"/>").arg(y2).arg(flagheight).arg(QString::fromStdString(u->referenceName())), z, p)}
item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \
item->setData(QVariant::fromValue(z), TYPE_ROLE); \
item->setData(QVariant::fromValue(0), MATCH_ROLE); \
item->setData(QVariant::fromValue(0), IMATCH_ROLE); \
if(!t.isEmpty()) item->setData("<p>" + t + "</p>", Qt::ToolTipRole);\
items.append(item); \
item = new QStandardItem(y); \
item->setData(ifont, Qt::FontRole); \
if(!t.isEmpty()) item->setData("<p>" + t + "</p>", Qt::ToolTipRole);\
items.append(item); \
sourceModel->appendRow(items);
#define COMPLETION_APPEND_FLAG(x, y, z, p) items.clear(); \
QStandardItem *item = new QStandardItem(x); \
item->setData(completionView->font(), Qt::FontRole); \
item->setData(QVariant::fromValue((void*) p), ITEM_ROLE); \
item->setData(QVariant::fromValue(z), TYPE_ROLE); \
item->setData(QVariant::fromValue(0), MATCH_ROLE); \
item->setData(QVariant::fromValue(0), IMATCH_ROLE); \
items.append(item); \
if(!QFile::exists(":/data/flags/" + QString::fromStdString(u->referenceName() + ".png"))) item = new QStandardItem(y); \
else if(flagheight <= 0) item = new QStandardItem(QString("%1&nbsp;&nbsp;<img src=\":/data/flags/%2\"/>").arg(y).arg(QString::fromStdString(u->referenceName()))); \
else item = new QStandardItem(QString("%1&nbsp;&nbsp;<img height=\"%2\" src=\":/data/flags/%3\"/>").arg(y).arg(flagheight).arg(QString::fromStdString(u->referenceName()))); \
item->setData(ifont, Qt::FontRole); \
items.append(item); \
sourceModel->appendRow(items);
#define MAX_COMPLETION_LENGTH_1 25 #define MAX_COMPLETION_LENGTH_1 25
#define MAX_COMPLETION_LENGTH_2 25 #define MAX_COMPLETION_LENGTH_2 25
@ -1002,21 +1009,22 @@ void ExpressionEdit::updateCompletion() {
sourceModel->clear(); sourceModel->clear();
capitalized_names.clear(); capitalized_names.clear();
std::string str, strs; std::string str, strs;
QString title; QString title, title2;
QList<QStandardItem *> items; QList<QStandardItem *> items;
QFont ifont(completionView->font()); QFont ifont(completionView->font());
QFontMetrics fm(ifont); QFontMetrics fm(ifont);
int flagheight = fm.ascent(); int flagheight = fm.ascent();
ifont.setStyle(QFont::StyleItalic); ifont.setStyle(QFont::StyleItalic);
for(size_t i = 0; i < CALCULATOR->functions.size(); i++) { for(size_t i = 0; i < CALCULATOR->functions.size(); i++) {
if(CALCULATOR->functions[i]->isActive()) { MathFunction *f = CALCULATOR->functions[i];
if(f->isActive()) {
const ExpressionName *ename, *ename_r; const ExpressionName *ename, *ename_r;
ename_r = &CALCULATOR->functions[i]->preferredInputName(false, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView); ename_r = &f->preferredInputName(false, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView);
if(name_has_formatting(ename_r)) str = format_name(ename_r, TYPE_FUNCTION); if(name_has_formatting(ename_r)) str = format_name(ename_r, TYPE_FUNCTION);
else str = ename_r->name; else str = ename_r->name;
str += "()"; str += "()";
for(size_t name_i = 1; name_i <= CALCULATOR->functions[i]->countNames(); name_i++) { for(size_t name_i = 1; name_i <= f->countNames(); name_i++) {
ename = &CALCULATOR->functions[i]->getName(name_i); ename = &f->getName(name_i);
if(ename && ename != ename_r && !ename->completion_only && !ename->plural && (!ename->unicode || can_display_unicode_string_function(ename->name.c_str(), this))) { if(ename && ename != ename_r && !ename->completion_only && !ename->plural && (!ename->unicode || can_display_unicode_string_function(ename->name.c_str(), this))) {
str += " <i>"; str += " <i>";
if(name_has_formatting(ename)) str += format_name(ename, TYPE_FUNCTION); if(name_has_formatting(ename)) str += format_name(ename, TYPE_FUNCTION);
@ -1025,16 +1033,17 @@ void ExpressionEdit::updateCompletion() {
} }
} }
ellipsize_completion_names(str); ellipsize_completion_names(str);
COMPLETION_APPEND_T(QString::fromStdString(str), QString::fromStdString(CALCULATOR->functions[i]->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView)), 1, CALCULATOR->functions[i], QString::fromStdString(CALCULATOR->functions[i]->description())) COMPLETION_APPEND_T(QString::fromStdString(str), QString::fromStdString(f->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView)), 1, f, QString::fromStdString(f->description()))
} }
} }
for(size_t i = 0; i < CALCULATOR->variables.size(); i++) { for(size_t i = 0; i < CALCULATOR->variables.size(); i++) {
if(CALCULATOR->variables[i]->isActive()) { Variable *v = CALCULATOR->variables[i];
if(v->isActive()) {
const ExpressionName *ename, *ename_r; const ExpressionName *ename, *ename_r;
bool b = false; bool b = false;
ename_r = &CALCULATOR->variables[i]->preferredInputName(false, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView); ename_r = &v->preferredInputName(false, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView);
for(size_t name_i = 1; name_i <= CALCULATOR->variables[i]->countNames(); name_i++) { for(size_t name_i = 1; name_i <= v->countNames(); name_i++) {
ename = &CALCULATOR->variables[i]->getName(name_i); ename = &v->getName(name_i);
if(ename && ename != ename_r && !ename->completion_only && !ename->plural && (!ename->unicode || can_display_unicode_string_function(ename->name.c_str(), completionView))) { if(ename && ename != ename_r && !ename->completion_only && !ename->plural && (!ename->unicode || can_display_unicode_string_function(ename->name.c_str(), completionView))) {
if(!b) { if(!b) {
if(name_has_formatting(ename_r)) { if(name_has_formatting(ename_r)) {
@ -1080,10 +1089,9 @@ void ExpressionEdit::updateCompletion() {
} }
} }
ellipsize_completion_names(str); ellipsize_completion_names(str);
if(!CALCULATOR->variables[i]->title(false).empty()) { if(!v->title(false).empty()) {
COMPLETION_APPEND(QString::fromStdString(b ? str : ename_r->name), QString::fromStdString(CALCULATOR->variables[i]->title()), 1, CALCULATOR->variables[i]) title = QString::fromStdString(v->title(false));
} else { } else {
Variable *v = CALCULATOR->variables[i];
if(v->isKnown()) { if(v->isKnown()) {
if(((KnownVariable*) v)->isExpression() && !v->isLocal()) { if(((KnownVariable*) v)->isExpression() && !v->isLocal()) {
ParseOptions pa = settings->evalops.parse_options; pa.base = 10; ParseOptions pa = settings->evalops.parse_options; pa.base = 10;
@ -1133,8 +1141,10 @@ void ExpressionEdit::updateCompletion() {
title = tr("default assumptions"); title = tr("default assumptions");
} }
} }
COMPLETION_APPEND(QString::fromStdString(b ? str : ename_r->name), title, 1, CALCULATOR->variables[i])
} }
if(v == CALCULATOR->getVariableById(VARIABLE_ID_PERCENT)) COMPLETION_APPEND_2(QString::fromStdString(b ? str : ename_r->name), title, title + " (%)", 1, v)
else if(v == CALCULATOR->getVariableById(VARIABLE_ID_PERMILLE)) COMPLETION_APPEND_2(QString::fromStdString(b ? str : ename_r->name), title, title + " (‰)", 1, v)
else COMPLETION_APPEND(QString::fromStdString(b ? str : ename_r->name), title, 1, v)
} }
} }
PrintOptions po = settings->printops; PrintOptions po = settings->printops;
@ -1168,15 +1178,31 @@ void ExpressionEdit::updateCompletion() {
str += "</i>"; str += "</i>";
} }
} }
if(name_has_formatting(ename_r)) { if(!b && name_has_formatting(ename_r)) {
str = format_name(ename_r, TYPE_UNIT); str = format_name(ename_r, TYPE_UNIT);
b = true; b = true;
} else { } else {
ellipsize_completion_names(str); ellipsize_completion_names(str);
} }
if(u->title(false).empty()) {
if(name_has_formatting(ename_r)) title2 = QString::fromStdString(format_name(ename_r, TYPE_UNIT));
else QString::fromStdString(ename_r->name);
} else {
title2 = QString::fromStdString(u->title(false));
ename = &u->preferredInputName(true, settings->printops.use_unicode_signs, false, u->isCurrency(), &can_display_unicode_string_function, completionView);
if(ename->abbreviation) {
bool tp = title2[title2.length() - 1] == ')';
title2 += " ";
if(!tp) title2 += "(";
if(name_has_formatting(ename)) title2 += QString::fromStdString(format_name(ename, TYPE_UNIT));
else title2 += QString::fromStdString(ename->name);
if(!tp) title2 += ")";
}
}
title = QString::fromStdString(u->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView)); title = QString::fromStdString(u->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView));
if(u->isCurrency()) { if(u->isCurrency()) {
COMPLETION_APPEND_FLAG(QString::fromStdString(b ? str : ename_r->name), title, 1, u) COMPLETION_APPEND_FLAG(QString::fromStdString(b ? str : ename_r->name), title, title2, 1, u)
} else { } else {
if(u->isSIUnit() && !u->category().empty() && title[title.length() - 1] != ')') { if(u->isSIUnit() && !u->category().empty() && title[title.length() - 1] != ')') {
size_t i_slash = std::string::npos; size_t i_slash = std::string::npos;
@ -1189,10 +1215,15 @@ void ExpressionEdit::updateCompletion() {
title += ")"; title += ")";
} }
} }
COMPLETION_APPEND(QString::fromStdString(b ? str : ename_r->name), title, 1, u) COMPLETION_APPEND_2(QString::fromStdString(b ? str : ename_r->name), title, title2.isEmpty() ? title : title2, 1, u)
} }
} else if(!u->isHidden()) { } else if(!u->isHidden()) {
CompositeUnit *cu = (CompositeUnit*) u; CompositeUnit *cu = (CompositeUnit*) u;
title = QString::fromStdString(cu->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView));
title2 = title;
bool tp = title2[title2.length() - 1] == ')';
title2 += " ";
if(!tp) title2 += "(";
Prefix *prefix = NULL; Prefix *prefix = NULL;
int exp = 1; int exp = 1;
if(cu->countUnits() == 1 && (u = cu->get(1, &exp, &prefix)) != NULL && prefix != NULL && exp == 1) { if(cu->countUnits() == 1 && (u = cu->get(1, &exp, &prefix)) != NULL && prefix != NULL && exp == 1) {
@ -1206,16 +1237,18 @@ void ExpressionEdit::updateCompletion() {
str += ename->formattedName(-1, false, true); str += ename->formattedName(-1, false, true);
str += u->preferredInputName(name_i != 1, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView).formattedName(TYPE_UNIT, true, true); str += u->preferredInputName(name_i != 1, settings->printops.use_unicode_signs, false, false, &can_display_unicode_string_function, completionView).formattedName(TYPE_UNIT, true, true);
if(b_italic) str += "</i>"; if(b_italic) str += "</i>";
if(!b_italic) title2 += QString::fromStdString(str);
} }
} }
ellipsize_completion_names(str); ellipsize_completion_names(str);
} else { } else {
str = cu->print(po, true, TAG_TYPE_HTML, true, false); str = cu->print(po, true, TAG_TYPE_HTML, true, false);
title2 += QString::fromStdString(str);
} }
if(!tp) title2 += ")";
size_t i_slash = std::string::npos; size_t i_slash = std::string::npos;
if(cu->category().length() > 1) i_slash = cu->category().rfind("/", cu->category().length() - 2); if(cu->category().length() > 1) i_slash = cu->category().rfind("/", cu->category().length() - 2);
if(i_slash != std::string::npos) i_slash++; if(i_slash != std::string::npos) i_slash++;
title = QString::fromStdString(cu->title(true, settings->printops.use_unicode_signs, &can_display_unicode_string_function, completionView));
if(cu->isSIUnit() && !cu->category().empty()) { if(cu->isSIUnit() && !cu->category().empty()) {
if(title.length() + cu->category().length() - (i_slash == std::string::npos ? 0 : i_slash) < MAX_COMPLETION_LENGTH_1 && title[title.length() - 1] != ')') { if(title.length() + cu->category().length() - (i_slash == std::string::npos ? 0 : i_slash) < MAX_COMPLETION_LENGTH_1 && title[title.length() - 1] != ')') {
title += " ("; title += " (";
@ -1227,7 +1260,7 @@ void ExpressionEdit::updateCompletion() {
else title = QString::fromStdString(cu->category().substr(i_slash, cu->category().length() - i_slash)); else title = QString::fromStdString(cu->category().substr(i_slash, cu->category().length() - i_slash));
} }
} }
COMPLETION_APPEND(QString::fromStdString(str), title, 1, cu) COMPLETION_APPEND_2(QString::fromStdString(str), title, title2, 1, cu)
} }
} }
} }
@ -1270,70 +1303,70 @@ void ExpressionEdit::updateCompletion() {
#define COMPLETION_CONVERT_STRING(x) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";} #define COMPLETION_CONVERT_STRING(x) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";}
#define COMPLETION_CONVERT_STRING2(x, y) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";} str2 = tr(y); str1 += " <i>"; str1 += str2; str1 += "</i>"; if(str2 != y) {str1 += " <i>"; str1 += y; str1 += "</i>";} #define COMPLETION_CONVERT_STRING2(x, y) str1 = tr(x); if(str1 != x) {str1 += " <i>"; str1 += x; str1 += "</i>";} str2 = tr(y); str1 += " <i>"; str1 += str2; str1 += "</i>"; if(str2 != y) {str1 += " <i>"; str1 += y; str1 += "</i>";}
COMPLETION_CONVERT_STRING2("angle", "phasor") COMPLETION_CONVERT_STRING2("angle", "phasor")
COMPLETION_APPEND(str1, tr("Complex Angle/Phasor Notation"), 400, NULL) COMPLETION_APPEND_C(str1, tr("Complex Angle/Phasor Notation"), 400, NULL)
/*COMPLETION_CONVERT_STRING("bases") /*COMPLETION_CONVERT_STRING("bases")
COMPLETION_APPEND(str1, tr("Number bases"), 201, NULL)*/ COMPLETION_APPEND_C(str1, tr("Number bases"), 201, NULL)*/
COMPLETION_CONVERT_STRING("base") COMPLETION_CONVERT_STRING("base")
COMPLETION_APPEND(str1, tr("Base units"), 101, NULL) COMPLETION_APPEND_C(str1, tr("Base units"), 101, NULL)
COMPLETION_CONVERT_STRING("base ") COMPLETION_CONVERT_STRING("base ")
COMPLETION_APPEND(str1, tr("Number Base"), 200, NULL) COMPLETION_APPEND_C(str1, tr("Number Base"), 200, NULL)
COMPLETION_APPEND("bcd", tr("Binary-Coded Decimal"), 285, NULL) COMPLETION_APPEND_C("bcd", tr("Binary-Coded Decimal"), 285, NULL)
COMPLETION_CONVERT_STRING("bijective") COMPLETION_CONVERT_STRING("bijective")
COMPLETION_APPEND(str1, tr("Bijective Base-26"), 290, NULL) COMPLETION_APPEND_C(str1, tr("Bijective Base-26"), 290, NULL)
COMPLETION_CONVERT_STRING("binary") str1 += " <i>"; str1 += "bin"; str1 += "</i>"; COMPLETION_CONVERT_STRING("binary") str1 += " <i>"; str1 += "bin"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Binary Number"), 202, NULL) COMPLETION_APPEND_C(str1, tr("Binary Number"), 202, NULL)
COMPLETION_CONVERT_STRING("calendars") COMPLETION_CONVERT_STRING("calendars")
COMPLETION_APPEND(str1, tr("Calendars"), 500, NULL) COMPLETION_APPEND_C(str1, tr("Calendars"), 500, NULL)
COMPLETION_CONVERT_STRING("cis") COMPLETION_CONVERT_STRING("cis")
COMPLETION_APPEND(str1, tr("Complex cis Form"), 401, NULL) COMPLETION_APPEND_C(str1, tr("Complex cis Form"), 401, NULL)
COMPLETION_CONVERT_STRING("decimal") str1 += " <i>"; str1 += "dec"; str1 += "</i>"; COMPLETION_CONVERT_STRING("decimal") str1 += " <i>"; str1 += "dec"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Decimal Number"), 210, NULL) COMPLETION_APPEND_C(str1, tr("Decimal Number"), 210, NULL)
COMPLETION_CONVERT_STRING("duodecimal") str1 += " <i>"; str1 += "duo"; str1 += "</i>"; COMPLETION_CONVERT_STRING("duodecimal") str1 += " <i>"; str1 += "duo"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Duodecimal Number"), 212, NULL) COMPLETION_APPEND_C(str1, tr("Duodecimal Number"), 212, NULL)
COMPLETION_CONVERT_STRING("exponential") COMPLETION_CONVERT_STRING("exponential")
COMPLETION_APPEND(str1, tr("Complex Exponential Form"), 402, NULL) COMPLETION_APPEND_C(str1, tr("Complex Exponential Form"), 402, NULL)
COMPLETION_CONVERT_STRING("factors") COMPLETION_CONVERT_STRING("factors")
COMPLETION_APPEND(str1, tr("Factors"), 600, NULL) COMPLETION_APPEND_C(str1, tr("Factors"), 600, NULL)
COMPLETION_CONVERT_STRING("fp16") str1 += " <i>"; str1 += "binary16"; str1 += "</i>"; COMPLETION_CONVERT_STRING("fp16") str1 += " <i>"; str1 += "binary16"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("16-bit Floating Point Binary Format"), 310, NULL) COMPLETION_APPEND_C(str1, tr("16-bit Floating Point Binary Format"), 310, NULL)
COMPLETION_CONVERT_STRING("fp32") str1 += " <i>"; str1 += "binary32"; str1 += "</i>"; str1 += " <i>"; str1 += "float"; str1 += "</i>"; COMPLETION_CONVERT_STRING("fp32") str1 += " <i>"; str1 += "binary32"; str1 += "</i>"; str1 += " <i>"; str1 += "float"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("32-bit Floating Point Binary Format"), 311, NULL) COMPLETION_APPEND_C(str1, tr("32-bit Floating Point Binary Format"), 311, NULL)
COMPLETION_CONVERT_STRING("fp64") str1 += " <i>"; str1 += "binary64"; str1 += "</i>"; str1 += " <i>"; str1 += "double"; str1 += "</i>"; COMPLETION_CONVERT_STRING("fp64") str1 += " <i>"; str1 += "binary64"; str1 += "</i>"; str1 += " <i>"; str1 += "double"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("64-bit Floating Point Binary Format"), 312, NULL) COMPLETION_APPEND_C(str1, tr("64-bit Floating Point Binary Format"), 312, NULL)
COMPLETION_CONVERT_STRING("fp80"); COMPLETION_CONVERT_STRING("fp80");
COMPLETION_APPEND(str1, tr("80-bit (x86) Floating Point Binary Format"), 313, NULL) COMPLETION_APPEND_C(str1, tr("80-bit (x86) Floating Point Binary Format"), 313, NULL)
COMPLETION_CONVERT_STRING("fp128") str1 += " <i>"; str1 += "binary128"; str1 += "</i>"; COMPLETION_CONVERT_STRING("fp128") str1 += " <i>"; str1 += "binary128"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("128-bit Floating Point Binary Format"), 314, NULL) COMPLETION_APPEND_C(str1, tr("128-bit Floating Point Binary Format"), 314, NULL)
COMPLETION_CONVERT_STRING("fraction") COMPLETION_CONVERT_STRING("fraction")
COMPLETION_APPEND(str1, tr("Fraction"), 300, NULL) COMPLETION_APPEND_C(str1, tr("Fraction"), 300, NULL)
COMPLETION_CONVERT_STRING("hexadecimal") str1 += " <i>"; str1 += "hex"; str1 += "</i>"; COMPLETION_CONVERT_STRING("hexadecimal") str1 += " <i>"; str1 += "hex"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Hexadecimal Number"), 216, NULL) COMPLETION_APPEND_C(str1, tr("Hexadecimal Number"), 216, NULL)
COMPLETION_CONVERT_STRING("latitude") str1 += " <i>"; str1 += "latitude2"; str1 += "</i>"; COMPLETION_CONVERT_STRING("latitude") str1 += " <i>"; str1 += "latitude2"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Latitude"), 294, NULL) COMPLETION_APPEND_C(str1, tr("Latitude"), 294, NULL)
COMPLETION_CONVERT_STRING("longitude") str1 += " <i>"; str1 += "longitude2"; str1 += "</i>"; COMPLETION_CONVERT_STRING("longitude") str1 += " <i>"; str1 += "longitude2"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Longitude"), 294, NULL) COMPLETION_APPEND_C(str1, tr("Longitude"), 294, NULL)
COMPLETION_CONVERT_STRING("mixed") COMPLETION_CONVERT_STRING("mixed")
COMPLETION_APPEND(str1, tr("Mixed Units"), 102, NULL) COMPLETION_APPEND_C(str1, tr("Mixed Units"), 102, NULL)
COMPLETION_CONVERT_STRING("octal") str1 += " <i>"; str1 += "oct"; str1 += "</i>"; COMPLETION_CONVERT_STRING("octal") str1 += " <i>"; str1 += "oct"; str1 += "</i>";
COMPLETION_APPEND(str1, tr("Octal Number"), 208, NULL) COMPLETION_APPEND_C(str1, tr("Octal Number"), 208, NULL)
COMPLETION_CONVERT_STRING("optimal") COMPLETION_CONVERT_STRING("optimal")
COMPLETION_APPEND(str1, tr("Optimal Unit"), 100, NULL) COMPLETION_APPEND_C(str1, tr("Optimal Unit"), 100, NULL)
COMPLETION_CONVERT_STRING("partial fraction") COMPLETION_CONVERT_STRING("partial fraction")
COMPLETION_APPEND(str1, tr("Expanded Partial Fractions"), 601, NULL) COMPLETION_APPEND_C(str1, tr("Expanded Partial Fractions"), 601, NULL)
COMPLETION_CONVERT_STRING("polar") COMPLETION_CONVERT_STRING("polar")
COMPLETION_APPEND(str1, tr("Complex Polar Form"), 403, NULL) COMPLETION_APPEND_C(str1, tr("Complex Polar Form"), 403, NULL)
COMPLETION_CONVERT_STRING2("rectangular", "cartesian") COMPLETION_CONVERT_STRING2("rectangular", "cartesian")
COMPLETION_APPEND(str1, tr("Complex Rectangular Form"), 404, NULL) COMPLETION_APPEND_C(str1, tr("Complex Rectangular Form"), 404, NULL)
COMPLETION_CONVERT_STRING("roman") COMPLETION_CONVERT_STRING("roman")
COMPLETION_APPEND(str1, tr("Roman Numerals"), 280, NULL) COMPLETION_APPEND_C(str1, tr("Roman Numerals"), 280, NULL)
COMPLETION_CONVERT_STRING("sexagesimal") str += " <i>"; str += "sexa"; str += "</i>"; str += " <i>"; str += "sexa2"; str += "</i>"; str += " <i>"; str += "sexa3"; str += "</i>"; COMPLETION_CONVERT_STRING("sexagesimal") str += " <i>"; str += "sexa"; str += "</i>"; str += " <i>"; str += "sexa2"; str += "</i>"; str += " <i>"; str += "sexa3"; str += "</i>";
COMPLETION_APPEND(str1, tr("Sexagesimal Number"), 292, NULL) COMPLETION_APPEND_C(str1, tr("Sexagesimal Number"), 292, NULL)
COMPLETION_CONVERT_STRING("time") COMPLETION_CONVERT_STRING("time")
COMPLETION_APPEND(str1, tr("Time Format"), 293, NULL) COMPLETION_APPEND_C(str1, tr("Time Format"), 293, NULL)
COMPLETION_CONVERT_STRING("unicode") COMPLETION_CONVERT_STRING("unicode")
COMPLETION_APPEND(str1, tr("Unicode"), 281, NULL) COMPLETION_APPEND_C(str1, tr("Unicode"), 281, NULL)
COMPLETION_CONVERT_STRING("utc") COMPLETION_CONVERT_STRING("utc")
COMPLETION_APPEND(str1, tr("UTC Time Zone"), 501, NULL) COMPLETION_APPEND_C(str1, tr("UTC Time Zone"), 501, NULL)
} }
void ExpressionEdit::setExpression(std::string str) { void ExpressionEdit::setExpression(std::string str) {
@ -2624,6 +2657,8 @@ bool ExpressionEdit::complete(MathStructure *mstruct_from, const QPoint &pos, bo
MathStructure *from_struct_bak = cdata->current_from_struct; MathStructure *from_struct_bak = cdata->current_from_struct;
Unit *from_unit_bak = cdata->current_from_unit; Unit *from_unit_bak = cdata->current_from_unit;
completionView->setColumnHidden(0, mstruct_from != NULL); completionView->setColumnHidden(0, mstruct_from != NULL);
completionView->setColumnHidden(1, mstruct_from != NULL);
completionView->setColumnHidden(2, mstruct_from == NULL);
if(mstruct_from) { if(mstruct_from) {
do_completion_signal = 1; do_completion_signal = 1;
cdata->current_from_struct = mstruct_from; cdata->current_from_struct = mstruct_from;

9
src/qalculatewindow.cpp
View File

@ -5717,6 +5717,15 @@ void QalculateWindow::closeEvent(QCloseEvent *e) {
settings->savePreferences(settings->save_mode_on_exit); settings->savePreferences(settings->save_mode_on_exit);
if(settings->save_defs_on_exit) CALCULATOR->saveDefinitions(); if(settings->save_defs_on_exit) CALCULATOR->saveDefinitions();
CALCULATOR->abort(); CALCULATOR->abort();
CALCULATOR->terminateThreads();
if(commandThread->running) {
commandThread->write((int) 0);
commandThread->write(NULL);
}
if(viewThread->running) {
viewThread->write((int) 0);
viewThread->write(NULL);
}
QMainWindow::closeEvent(e); QMainWindow::closeEvent(e);
qApp->closeAllWindows(); qApp->closeAllWindows();
} }

28
src/unknowneditdialog.cpp
View File

@ -61,6 +61,9 @@ UnknownEditDialog::UnknownEditDialog(QWidget *parent) : QDialog(parent) {
signCombo->addItem("Negative", ASSUMPTION_SIGN_NEGATIVE); signCombo->addItem("Negative", ASSUMPTION_SIGN_NEGATIVE);
signCombo->addItem("Non-positive", ASSUMPTION_SIGN_NONPOSITIVE); signCombo->addItem("Non-positive", ASSUMPTION_SIGN_NONPOSITIVE);
grid->addWidget(signCombo, 3, 1); grid->addWidget(signCombo, 3, 1);
temporaryBox = new QCheckBox(tr("Temporary"), this);
temporaryBox->setChecked(false);
grid->addWidget(temporaryBox, 4, 0, 1, 2, Qt::AlignRight);
typeCombo->setCurrentIndex(typeCombo->findData(CALCULATOR->defaultAssumptions()->type())); typeCombo->setCurrentIndex(typeCombo->findData(CALCULATOR->defaultAssumptions()->type()));
signCombo->setCurrentIndex(signCombo->findData(CALCULATOR->defaultAssumptions()->sign())); signCombo->setCurrentIndex(signCombo->findData(CALCULATOR->defaultAssumptions()->sign()));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal, this); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal, this);
@ -72,6 +75,7 @@ UnknownEditDialog::UnknownEditDialog(QWidget *parent) : QDialog(parent) {
connect(typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onTypeChanged(int))); connect(typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onTypeChanged(int)));
connect(signCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSignChanged(int))); connect(signCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSignChanged(int)));
connect(customBox, SIGNAL(toggled(bool)), this, SLOT(onCustomToggled(bool))); connect(customBox, SIGNAL(toggled(bool)), this, SLOT(onCustomToggled(bool)));
connect(temporaryBox, SIGNAL(clicked()), this, SLOT(onVariableChanged()));
connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject())); connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
okButton->setEnabled(false); okButton->setEnabled(false);
@ -87,7 +91,7 @@ void UnknownEditDialog::editNames() {
namesEditDialog->exec(); namesEditDialog->exec();
nameEdit->setText(namesEditDialog->firstName()); nameEdit->setText(namesEditDialog->firstName());
name_edited = false; name_edited = false;
okButton->setEnabled(!nameEdit->text().trimmed().isEmpty()); onVariableChanged();
} }
void UnknownEditDialog::onTypeChanged(int i) { void UnknownEditDialog::onTypeChanged(int i) {
int t = typeCombo->itemData(i).toInt(); int t = typeCombo->itemData(i).toInt();
@ -97,7 +101,7 @@ void UnknownEditDialog::onTypeChanged(int i) {
signCombo->setCurrentIndex(signCombo->findData(ASSUMPTION_SIGN_UNKNOWN)); signCombo->setCurrentIndex(signCombo->findData(ASSUMPTION_SIGN_UNKNOWN));
signCombo->blockSignals(false); signCombo->blockSignals(false);
} }
okButton->setEnabled(!nameEdit->text().trimmed().isEmpty()); onVariableChanged();
} }
void UnknownEditDialog::onSignChanged(int i) { void UnknownEditDialog::onSignChanged(int i) {
int t = typeCombo->currentData().toInt(); int t = typeCombo->currentData().toInt();
@ -107,12 +111,15 @@ void UnknownEditDialog::onSignChanged(int i) {
typeCombo->setCurrentIndex(typeCombo->findData(ASSUMPTION_TYPE_REAL)); typeCombo->setCurrentIndex(typeCombo->findData(ASSUMPTION_TYPE_REAL));
typeCombo->blockSignals(false); typeCombo->blockSignals(false);
} }
onVariableChanged();
}
void UnknownEditDialog::onVariableChanged() {
okButton->setEnabled(!nameEdit->text().trimmed().isEmpty()); okButton->setEnabled(!nameEdit->text().trimmed().isEmpty());
} }
void UnknownEditDialog::onCustomToggled(bool b) { void UnknownEditDialog::onCustomToggled(bool b) {
typeCombo->setEnabled(b); typeCombo->setEnabled(b);
signCombo->setEnabled(b); signCombo->setEnabled(b);
okButton->setEnabled(!nameEdit->text().trimmed().isEmpty()); onVariableChanged();
} }
UnknownVariable *UnknownEditDialog::createVariable(ExpressionItem **replaced_item) { UnknownVariable *UnknownEditDialog::createVariable(ExpressionItem **replaced_item) {
if(replaced_item) *replaced_item = NULL; if(replaced_item) *replaced_item = NULL;
@ -138,7 +145,8 @@ UnknownVariable *UnknownEditDialog::createVariable(ExpressionItem **replaced_ite
v = new UnknownVariable("", ""); v = new UnknownVariable("", "");
if(namesEditDialog) namesEditDialog->modifyNames(v, nameEdit->text()); if(namesEditDialog) namesEditDialog->modifyNames(v, nameEdit->text());
else NamesEditDialog::modifyName(v, nameEdit->text()); else NamesEditDialog::modifyName(v, nameEdit->text());
v->setCategory(CALCULATOR->getVariableById(VARIABLE_ID_X)->category()); if(temporaryBox->isChecked()) v->setCategory(CALCULATOR->temporaryCategory());
else v->setCategory(CALCULATOR->getVariableById(VARIABLE_ID_X)->category());
if(customBox->isChecked()) { if(customBox->isChecked()) {
v->setAssumptions(new Assumptions()); v->setAssumptions(new Assumptions());
v->assumptions()->setType((AssumptionType) typeCombo->currentData().toInt()); v->assumptions()->setType((AssumptionType) typeCombo->currentData().toInt());
@ -161,8 +169,12 @@ bool UnknownEditDialog::modifyVariable(UnknownVariable *v, ExpressionItem **repl
else if(var != v) *replaced_item = var; else if(var != v) *replaced_item = var;
} }
} }
if(namesEditDialog) namesEditDialog->modifyNames(v, nameEdit->text()); if(v->isLocal()) {
else NamesEditDialog::modifyName(v, nameEdit->text()); if(namesEditDialog) namesEditDialog->modifyNames(v, nameEdit->text());
else NamesEditDialog::modifyName(v, nameEdit->text());
if(temporaryBox->isChecked()) v->setCategory(CALCULATOR->temporaryCategory());
else if(v->category() == CALCULATOR->temporaryCategory()) v->setCategory(CALCULATOR->getVariableById(VARIABLE_ID_X)->category());
}
if(!customBox->isChecked()) { if(!customBox->isChecked()) {
v->setAssumptions(NULL); v->setAssumptions(NULL);
} else { } else {
@ -176,13 +188,17 @@ void UnknownEditDialog::setVariable(UnknownVariable *v) {
o_variable = v; o_variable = v;
name_edited = false; name_edited = false;
nameEdit->setText(QString::fromStdString(v->getName(1).name)); nameEdit->setText(QString::fromStdString(v->getName(1).name));
nameEdit->setEnabled(v->isLocal());
if(namesEditDialog) namesEditDialog->setNames(v, nameEdit->text()); if(namesEditDialog) namesEditDialog->setNames(v, nameEdit->text());
Assumptions *ass = v->assumptions(); Assumptions *ass = v->assumptions();
customBox->setChecked(ass); customBox->setChecked(ass);
if(!ass) ass = CALCULATOR->defaultAssumptions(); if(!ass) ass = CALCULATOR->defaultAssumptions();
typeCombo->setCurrentIndex(typeCombo->findData(ass->type())); typeCombo->setCurrentIndex(typeCombo->findData(ass->type()));
signCombo->setCurrentIndex(signCombo->findData(ass->sign())); signCombo->setCurrentIndex(signCombo->findData(ass->sign()));
temporaryBox->setChecked(v->category() == CALCULATOR->temporaryCategory());
temporaryBox->setEnabled(v->isLocal());
okButton->setEnabled(false); okButton->setEnabled(false);
} }
void UnknownEditDialog::onNameEdited(const QString &str) { void UnknownEditDialog::onNameEdited(const QString &str) {
if(!str.trimmed().isEmpty() && !CALCULATOR->variableNameIsValid(str.trimmed().toStdString())) { if(!str.trimmed().isEmpty() && !CALCULATOR->variableNameIsValid(str.trimmed().toStdString())) {

3
src/unknowneditdialog.h
View File

@ -29,7 +29,7 @@ class UnknownEditDialog : public QDialog {
protected: protected:
QLineEdit *nameEdit; QLineEdit *nameEdit;
QCheckBox *customBox; QCheckBox *customBox, *temporaryBox;
QComboBox *typeCombo, *signCombo; QComboBox *typeCombo, *signCombo;
QPushButton *okButton; QPushButton *okButton;
NamesEditDialog *namesEditDialog; NamesEditDialog *namesEditDialog;
@ -39,6 +39,7 @@ class UnknownEditDialog : public QDialog {
protected slots: protected slots:
void onNameEdited(const QString&); void onNameEdited(const QString&);
void onVariableChanged();
void onTypeChanged(int); void onTypeChanged(int);
void onSignChanged(int); void onSignChanged(int);
void onCustomToggled(bool); void onCustomToggled(bool);

17
translations/qalculate-qt_ca.ts
View File

@ -10876,26 +10876,31 @@ Voleu sobreescriure-la?</translation>
<translation type="unfinished">Signe:</translation> <translation type="unfinished">Signe:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Temporal</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished">Pregunta</translation> <translation type="unfinished">Pregunta</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Una unitat o variable amb el mateix nom ja existeix. <translation>Una unitat o variable amb el mateix nom ja existeix.
Voleu sobreescriure-la?</translation> Voleu sobreescriure-la?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Edició de variable desconeguda</translation> <translation>Edició de variable desconeguda</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Variable desconeguda nova</translation> <translation>Variable desconeguda nova</translation>
</message> </message>

17
translations/qalculate-qt_de.ts
View File

@ -11003,14 +11003,19 @@ Möchten Sie sie überschreiben?</translation>
<translation type="unfinished">Vorzeichen:</translation> <translation type="unfinished">Vorzeichen:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Temporär</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished">Frage</translation> <translation type="unfinished">Frage</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Eine Einheit oder Variable mit demselben Namen ist bereits vorhanden. <translation>Eine Einheit oder Variable mit demselben Namen ist bereits vorhanden.
@ -11023,12 +11028,12 @@ Do you want to overwrite it?</source>
Möchten Sie sie überschreiben?</translation> Möchten Sie sie überschreiben?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Unbekannte Variable bearbeiten</translation> <translation>Unbekannte Variable bearbeiten</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Neue Unbekannte Variable</translation> <translation>Neue Unbekannte Variable</translation>
</message> </message>

17
translations/qalculate-qt_es.ts
View File

@ -10769,26 +10769,31 @@ Do you want to overwrite it?</source>
<translation>Signo:</translation> <translation>Signo:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Temporal</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished">Pregunta</translation> <translation type="unfinished">Pregunta</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Una unidad o variable con el mismo nombre ya existe. <translation>Una unidad o variable con el mismo nombre ya existe.
¿Quiere sobreescribirla?</translation> ¿Quiere sobreescribirla?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Editar variable desconocida</translation> <translation>Editar variable desconocida</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Nueva variable desconocida</translation> <translation>Nueva variable desconocida</translation>
</message> </message>

17
translations/qalculate-qt_fr.ts
View File

@ -10231,26 +10231,31 @@ Voulez-vous l&apos;écraser ?</translation>
<translation type="unfinished">Signe :</translation> <translation type="unfinished">Signe :</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Temporaire</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished">Question</translation> <translation type="unfinished">Question</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Une unité ou variable portant le même nom existe déjà. <translation>Une unité ou variable portant le même nom existe déjà.
Voulez-vous l&apos;écraser ?</translation> Voulez-vous l&apos;écraser ?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Éditer la variable de l&apos;inconnue</translation> <translation>Éditer la variable de l&apos;inconnue</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Nouvelle variable de l&apos;inconnue</translation> <translation>Nouvelle variable de l&apos;inconnue</translation>
</message> </message>

17
translations/qalculate-qt_nl.ts
View File

@ -9691,26 +9691,31 @@ Wilt u die overschrijven?</translation>
<translation type="unfinished">Teken:</translation> <translation type="unfinished">Teken:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Tijdelijk</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished">Vraag</translation> <translation type="unfinished">Vraag</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Er bestaat al een eenheid of variabele met deze naam. <translation>Er bestaat al een eenheid of variabele met deze naam.
Wilt u die overschrijven?</translation> Wilt u die overschrijven?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Onbekende variabele bewerken</translation> <translation>Onbekende variabele bewerken</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Nieuwe onbekende variabele</translation> <translation>Nieuwe onbekende variabele</translation>
</message> </message>

17
translations/qalculate-qt_pt_BR.ts
View File

@ -10747,26 +10747,31 @@ Deseja sobrescrevê-la?</translation>
<translation type="unfinished">Sinal:</translation> <translation type="unfinished">Sinal:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Temporária</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>Uma unidade ou variável com o mesmo nome já existe. <translation>Uma unidade ou variável com o mesmo nome já existe.
Deseja sobrescrevê-la?</translation> Deseja sobrescrevê-la?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Editar Variável Desconhecida</translation> <translation>Editar Variável Desconhecida</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Nova variável desconhecida</translation> <translation>Nova variável desconhecida</translation>
</message> </message>

4
translations/qalculate-qt_ru.ts
View File

@ -4398,6 +4398,10 @@ Do you want to overwrite it?</source>
<source>Question</source> <source>Question</source>
<translation>Вопрос</translation> <translation>Вопрос</translation>
</message> </message>
<message>
<source>Temporary</source>
<translation type="unfinished">Временная</translation>
</message>
</context> </context>
<context> <context>
<name>VariableEditDialog</name> <name>VariableEditDialog</name>

17
translations/qalculate-qt_sl.ts
View File

@ -10744,26 +10744,31 @@ Jo želite prepisati?</translation>
<translation type="unfinished">Znak:</translation> <translation type="unfinished">Znak:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">Začasno</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation type="unfinished">Enota ali spremenljivka s tem imenom že obstaja. <translation type="unfinished">Enota ali spremenljivka s tem imenom že obstaja.
Jo želite prepisati?</translation> Jo želite prepisati?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation type="unfinished">Uredi neznano spremenljivko</translation> <translation type="unfinished">Uredi neznano spremenljivko</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation type="unfinished">Nova neznana spremenljivka</translation> <translation type="unfinished">Nova neznana spremenljivka</translation>
</message> </message>

17
translations/qalculate-qt_sv.ts
View File

@ -12029,14 +12029,19 @@ Vill du ersätta den?</translation>
<translation>Tecken:</translation> <translation>Tecken:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation>Temporär</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation>Fråga</translation> <translation>Fråga</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation>En enhet eller variabel med samma namn finns redan. <translation>En enhet eller variabel med samma namn finns redan.
@ -12049,12 +12054,12 @@ Do you want to overwrite it?</source>
Vill du ersätta den?</translation> Vill du ersätta den?</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation>Modifiera okänd variabel</translation> <translation>Modifiera okänd variabel</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation>Ny okänd variabel</translation> <translation>Ny okänd variabel</translation>
</message> </message>

17
translations/qalculate-qt_zh_CN.ts
View File

@ -10791,26 +10791,31 @@ Do you want to overwrite it?</source>
<translation type="unfinished">符号:</translation> <translation type="unfinished">符号:</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="64"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <source>Temporary</source>
<translation type="unfinished">临时</translation>
</message>
<message>
<location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>Question</source> <source>Question</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="122"/> <location filename="../src/unknowneditdialog.cpp" line="129"/>
<location filename="../src/unknowneditdialog.cpp" line="155"/> <location filename="../src/unknowneditdialog.cpp" line="163"/>
<source>A unit or variable with the same name already exists. <source>A unit or variable with the same name already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation type="unfinished">已存在同名的单位或变量。 <translation type="unfinished">已存在同名的单位或变量。
是否要覆盖它？</translation> 是否要覆盖它？</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="200"/> <location filename="../src/unknowneditdialog.cpp" line="212"/>
<source>Edit Unknown Variable</source> <source>Edit Unknown Variable</source>
<translation type="unfinished">编辑未知变量</translation> <translation type="unfinished">编辑未知变量</translation>
</message> </message>
<message> <message>
<location filename="../src/unknowneditdialog.cpp" line="213"/> <location filename="../src/unknowneditdialog.cpp" line="225"/>
<source>New Unknown Variable</source> <source>New Unknown Variable</source>
<translation type="unfinished">新建未知变量</translation> <translation type="unfinished">新建未知变量</translation>
</message> </message>