Fixes 1-3 per wmeyer

This commit is contained in:
WandererFan 2016-07-01 11:32:53 -04:00 committed by wmayer
parent 31a8ca23f7
commit 26aff79a31
3 changed files with 4 additions and 7 deletions

View File

@ -37,7 +37,7 @@
namespace TechDraw {
class DrawHatch;
class WalkerEdge;
struct WalkerEdge;
}
namespace TechDraw

View File

@ -52,8 +52,8 @@ typedef adjacency_list
graph;
struct WalkerEdge {
int v1;
int v2;
std::size_t v1;
std::size_t v2;
int idx;
};

View File

@ -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;
}