suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ issue #0001856: Add standard set of blank ISO drawing template sizes

Browse Source
This commit is contained in:
wmayer 2015-01-10 19:09:58 +01:00
parent f1e9966084
commit 3210d0d2a0
1 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Mod/Drawing/Gui/Command.cpp
View File

@ -126,15 +126,39 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
QAction* defaultAction = 0; QAction* defaultAction = 0;
int defaultId = 0; int defaultId = 0;
QString lastPaper;
int lastId = -1;
std::string path = App::Application::getResourceDir(); std::string path = App::Application::getResourceDir();
path += "Mod/Drawing/Templates/"; path += "Mod/Drawing/Templates/";
QDir dir(QString::fromUtf8(path.c_str()), QString::fromAscii("*.svg")); QDir dir(QString::fromUtf8(path.c_str()), QString::fromAscii("*.svg"));
for (unsigned int i=0; i<dir.count(); i++ ) { for (unsigned int i=0; i<dir.count(); i++ ) {
QRegExp rx(QString::fromAscii("(A|B|C|D|E)(\\d)_(Landscape|Portrait).svg")); QRegExp rx(QString::fromAscii("(A|B|C|D|E)(\\d)_(Landscape|Portrait)(_.*\\.|\\.)svg$"));
if (rx.indexIn(dir[i]) > -1) { if (rx.indexIn(dir[i]) > -1) {
QString paper = rx.cap(1); QString paper = rx.cap(1);
int id = rx.cap(2).toInt(); int id = rx.cap(2).toInt();
QString orientation = rx.cap(3); QString orientation = rx.cap(3);
QString info = rx.cap(4).mid(1);
info.chop(1);
if (!info.isEmpty()) {
info[0] = info[0].toUpper();
}
// group by paper size
if (!lastPaper.isEmpty()) {
if (lastPaper != paper) {
QAction* sep = pcAction->addAction(QString());
sep->setSeparator(true);
}
else if (lastId != id) {
QAction* sep = pcAction->addAction(QString());
sep->setSeparator(true);
}
}
lastPaper = paper;
lastId = id;
QFile file(QString::fromAscii(":/icons/actions/drawing-landscape-A0.svg")); QFile file(QString::fromAscii(":/icons/actions/drawing-landscape-A0.svg"));
QAction* a = pcAction->addAction(QString()); QAction* a = pcAction->addAction(QString());
if (file.open(QFile::ReadOnly)) { if (file.open(QFile::ReadOnly)) {
@ -147,6 +171,7 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
a->setProperty("TemplatePaper", paper); a->setProperty("TemplatePaper", paper);
a->setProperty("TemplateOrientation", orientation); a->setProperty("TemplateOrientation", orientation);
a->setProperty("TemplateId", id); a->setProperty("TemplateId", id);
a->setProperty("TemplateInfo", info);
a->setProperty("Template", dir.absoluteFilePath(dir[i])); a->setProperty("Template", dir.absoluteFilePath(dir[i]));
if (id == 3) { if (id == 3) {
@ -157,6 +182,7 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
} }
_pcAction = pcAction; _pcAction = pcAction;
languageChange(); languageChange();
if (defaultAction) { if (defaultAction) {
pcAction->setIcon(defaultAction->icon()); pcAction->setIcon(defaultAction->icon());
@ -179,6 +205,8 @@ void CmdDrawingNewPage::languageChange()
Gui::ActionGroup* pcAction = qobject_cast<Gui::ActionGroup*>(_pcAction); Gui::ActionGroup* pcAction = qobject_cast<Gui::ActionGroup*>(_pcAction);
QList<QAction*> a = pcAction->actions(); QList<QAction*> a = pcAction->actions();
for (QList<QAction*>::iterator it = a.begin(); it != a.end(); ++it) { for (QList<QAction*>::iterator it = a.begin(); it != a.end(); ++it) {
if ((*it)->isSeparator())
continue;
QString paper = (*it)->property("TemplatePaper").toString(); QString paper = (*it)->property("TemplatePaper").toString();
int id = (*it)->property("TemplateId").toInt(); int id = (*it)->property("TemplateId").toInt();
QString orientation = (*it)->property("TemplateOrientation").toString(); QString orientation = (*it)->property("TemplateOrientation").toString();
@ -186,7 +214,9 @@ void CmdDrawingNewPage::languageChange()
orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape", 0, QCoreApplication::CodecForTr); orientation = QCoreApplication::translate("Drawing_NewPage", "Landscape", 0, QCoreApplication::CodecForTr);
else if (orientation.compare(QLatin1String("portrait"), Qt::CaseInsensitive) == 0) else if (orientation.compare(QLatin1String("portrait"), Qt::CaseInsensitive) == 0)
orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait", 0, QCoreApplication::CodecForTr); orientation = QCoreApplication::translate("Drawing_NewPage", "Portrait", 0, QCoreApplication::CodecForTr);
QString info = (*it)->property("TemplateInfo").toString();
if (info.isEmpty()) {
(*it)->setText(QCoreApplication::translate( (*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3", 0, "Drawing_NewPage", "%1%2 %3", 0,
QCoreApplication::CodecForTr) QCoreApplication::CodecForTr)
@ -200,6 +230,23 @@ void CmdDrawingNewPage::languageChange()
.arg(id) .arg(id)
.arg(orientation)); .arg(orientation));
} }
else {
(*it)->setText(QCoreApplication::translate(
"Drawing_NewPage", "%1%2 %3 (%4)", 0,
QCoreApplication::CodecForTr)
.arg(paper)
.arg(id)
.arg(orientation)
.arg(info));
(*it)->setToolTip(QCoreApplication::translate(
"Drawing_NewPage", "Insert new %1%2 %3 (%4) drawing", 0,
QCoreApplication::CodecForTr)
.arg(paper)
.arg(id)
.arg(orientation)
.arg(info));
}
}
} }
bool CmdDrawingNewPage::isActive(void) bool CmdDrawingNewPage::isActive(void)