still merge fixes...

--HG--
branch : develop
This commit is contained in:
Alex 2015-08-27 19:03:43 +03:00
parent 53e98f562f
commit 2ec0e31c2b
5 changed files with 24 additions and 2 deletions

View File

@ -48,6 +48,7 @@
#include <QMessageBox>
#include <QThread>
#include <QDateTime>
#include <QtXmlPatterns>
Q_LOGGING_CATEGORY(vApp, "v.application")

View File

@ -690,6 +690,17 @@ void DialogLayoutSettings::MinimumLayoutSize()
//---------------------------------------------------------------------------------------------------------------------
void DialogLayoutSettings::ReadSettings()
{
#ifdef STUPID_MARGE
InitPaperUnits();
InitLayoutUnits();
InitTemplates();
MinimumPaperSize();
MinimumLayoutSize();
SetLayoutWidth(qApp->ValentinaSettings()->GetLayoutWidth());
SetShift(qApp->ValentinaSettings()->GetLayoutShift());
#endif
SetLayoutWidth(qApp->Settings()->GetLayoutWidth());
SetShift(qApp->Settings()->GetLayoutShift());

View File

@ -65,11 +65,11 @@ int main(int argc, char *argv[])
QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", "Pattern making program."));
parser.addHelpOption();
// Process the actual command line arguments given by the user
parser.process(app);
QStringList args = parser.positionalArguments();
#endif
auto args = app.CommandLine()->OptInputFileNames();

View File

@ -28,6 +28,7 @@
#include "mainwindowsnogui.h"
#include "core/vapplication.h"
#include "../vpatterndb/vcontainer.h"
#include "../vobj/vobjpaintdevice.h"
@ -40,6 +41,10 @@
#include "dialogs/dialoglayoutprogress.h"
#include "dialogs/dialoglayoutsettings.h"
#include "../vlayout/vlayoutgenerator.h"
#include "dialogs/dialoglayoutprogress.h"
#include "dialogs/dialogsavelayout.h"
#include "../vlayout/vposter.h"
#include <QFileDialog>
#include <QFileInfo>

View File

@ -35,11 +35,16 @@
#define SceneSize 50000
#define DefPointRadius 1.5//mm
enum class NodeDetail : char { Contour, Modeling };
enum class SceneObject : char { Point, Line, Spline, Arc, SplinePath, Detail, Unknown };
#ifdef STUPIDMERGE
enum class MeasurementsType : char { Standard, Individual, Unknown };
enum class Unit : char { Mm, Cm, Inch, Px };
#endif
enum class MeasurementsType : char { Standard, Individual , Unknown};
enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE};
enum class Source : char { FromGui, FromFile, FromTool };
enum class Tool : unsigned char