Fixes 1-3 per wmeyer
This commit is contained in:
parent
31a8ca23f7
commit
26aff79a31
|
@ -37,7 +37,7 @@
|
|||
|
||||
namespace TechDraw {
|
||||
class DrawHatch;
|
||||
class WalkerEdge;
|
||||
struct WalkerEdge;
|
||||
}
|
||||
|
||||
namespace TechDraw
|
||||
|
|
|
@ -52,8 +52,8 @@ typedef adjacency_list
|
|||
graph;
|
||||
|
||||
struct WalkerEdge {
|
||||
int v1;
|
||||
int v2;
|
||||
std::size_t v1;
|
||||
std::size_t v2;
|
||||
int idx;
|
||||
};
|
||||
|
||||
|
|
|
@ -217,7 +217,7 @@ void CmdTechDrawNewPage::activated(int iMsg)
|
|||
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
|
||||
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw");
|
||||
|
||||
std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/Templates";
|
||||
std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Templates";
|
||||
QString templateDir = QString::fromStdString(hGrp->GetASCII("TemplateDir", defaultDir.c_str()));
|
||||
QString templateFileName = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(),
|
||||
QString::fromUtf8(QT_TR_NOOP("Select a Template File")),
|
||||
|
@ -225,9 +225,6 @@ void CmdTechDrawNewPage::activated(int iMsg)
|
|||
QString::fromUtf8(QT_TR_NOOP("Template (*.svg *.dxf)")));
|
||||
|
||||
if (templateFileName.isEmpty()) {
|
||||
QMessageBox::critical(Gui::getMainWindow(),
|
||||
QLatin1String("No template"),
|
||||
QLatin1String("Must select a valid template file"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user