kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #9350 from chennes/translateEditModeTooltips

Browse Source 
GUI: Translate the tooltip for EditMode menu
This commit is contained in:
Chris Hennes
2023-04-26 21:00:00 -05:00
committed by GitHub
parent cd829ad572 18cae6b903
commit 2684899b3f
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/Application.cpp
View File

@@ -1312,14 +1312,14 @@ int Application::getUserEditMode(const std::string &mode) const
return userEditMode;
}
for (auto const &uem : userEditModes) {
if (uem.second == mode) {
if (uem.second.first == mode) {
return uem.first;
}
}
return -1;
}
std::string Application::getUserEditModeName(int mode) const
std::pair<std::string,std::string> Application::getUserEditModeUIStrings(int mode) const
{
if (mode == -1) {
return userEditModes.at(userEditMode);
@@ -1327,7 +1327,7 @@ std::string Application::getUserEditModeName(int mode) const
if (userEditModes.find(mode) != userEditModes.end()) {
return userEditModes.at(mode);
}
return "";
return std::make_pair(std::string(), std::string());
}
bool Application::setUserEditMode(int mode)
@@ -1343,7 +1343,7 @@ bool Application::setUserEditMode(int mode)
bool Application::setUserEditMode(const std::string &mode)
{
for (auto const &uem : userEditModes) {
if (uem.second == mode) {
if (uem.second.first == mode) {
return setUserEditMode(uem.first);
}
}

31
src/Gui/Application.h
View File

@@ -248,18 +248,35 @@ protected:
// the below std::map is a translation of 'EditMode' enum in ViewProvider.h
// to add a new edit mode, it should first be added there
// this is only used for GUI user interaction (menu, toolbar, Python API)
const std::map <int, std::string> userEditModes {
{0, QT_TRANSLATE_NOOP("EditMode", "Default")},
{1, QT_TRANSLATE_NOOP("EditMode", "Transform")},
{2, QT_TRANSLATE_NOOP("EditMode", "Cutting")},
{3, QT_TRANSLATE_NOOP("EditMode", "Color")}
const std::map<int, std::pair<std::string, std::string>> userEditModes {
{0,
std::make_pair(
QT_TRANSLATE_NOOP("EditMode", "Default"),
QT_TRANSLATE_NOOP("EditMode",
"The object will be edited using the mode defined internally to be "
"the most appropriate for the object type"))},
{1,
std::make_pair(QT_TRANSLATE_NOOP("EditMode", "Transform"),
QT_TRANSLATE_NOOP("EditMode",
"The object will have its placement editable with the "
"Std TransformManip command"))},
{2,
std::make_pair(QT_TRANSLATE_NOOP("EditMode", "Cutting"),
QT_TRANSLATE_NOOP("EditMode",
"This edit mode is implemented as available but "
"currently does not seem to be used by any object"))},
{3,
std::make_pair(QT_TRANSLATE_NOOP("EditMode", "Color"),
QT_TRANSLATE_NOOP("EditMode",
"The object will have the color of its individual faces "
"editable with the Part FaceColors command"))},
};
int userEditMode = userEditModes.begin()->first;
public:
std::map <int, std::string> listUserEditModes() const { return userEditModes; }
std::map <int, std::pair<std::string,std::string>> listUserEditModes() const { return userEditModes; }
int getUserEditMode(const std::string &mode = "") const;
std::string getUserEditModeName(int mode = -1) const;
std::pair<std::string,std::string> getUserEditModeUIStrings(int mode = -1) const;
bool setUserEditMode(int mode);
bool setUserEditMode(const std::string &mode);
//@}

4
src/Gui/ApplicationPy.cpp
View File

@@ -1552,7 +1552,7 @@ PyObject* Application::sListUserEditModes(PyObject * /*self*/, PyObject *args)
return nullptr;
for (auto const &uem : Instance->listUserEditModes()) {
ret.append(Py::String(uem.second));
ret.append(Py::String(uem.second.first));
}
return Py::new_reference_to(ret);
@@ -1563,7 +1563,7 @@ PyObject* Application::sGetUserEditMode(PyObject * /*self*/, PyObject *args)
if (!PyArg_ParseTuple(args, ""))
return nullptr;
return Py::new_reference_to(Py::String(Instance->getUserEditModeName()));
return Py::new_reference_to(Py::String(Instance->getUserEditModeUIStrings().first));
}
PyObject* Application::sSetUserEditMode(PyObject * /*self*/, PyObject *args)

9
src/Gui/CommandStd.cpp
View File

@@ -888,11 +888,12 @@ Gui::Action * StdCmdUserEditMode::createAction()
for (auto const &uem : Gui::Application::Instance->listUserEditModes()) {
QAction* act = pcAction->addAction(QString());
auto modeName = QString::fromStdString(uem.second);
auto modeName = QString::fromStdString(uem.second.first);
act->setCheckable(true);
act->setIcon(BitmapFactory().iconFromTheme(qPrintable(QString::fromLatin1("Std_UserEditMode")+modeName)));
act->setObjectName(QString::fromLatin1("Std_UserEditMode")+modeName);
act->setWhatsThis(QString::fromLatin1(getWhatsThis()));
act->setToolTip(QString::fromStdString(uem.second.second));
if (uem.first == 0) {
pcAction->setIcon(act->icon());
@@ -920,11 +921,11 @@ void StdCmdUserEditMode::languageChange()
QList<QAction*> a = pcAction->actions();
for (int i = 0 ; i < a.count() ; i++) {
auto modeName = QString::fromStdString(Gui::Application::Instance->getUserEditModeName(i));
auto modeName = Gui::Application::Instance->getUserEditModeUIStrings(i);
a[i]->setText(QCoreApplication::translate(
"EditMode", qPrintable(modeName)));
"EditMode", modeName.first.c_str()));
a[i]->setToolTip(QCoreApplication::translate(
"EditMode", qPrintable(modeName+QString::fromLatin1(" mode"))));
"EditMode", modeName.second.c_str()));
}
}