diff --git a/.hgignore b/.hgignore index 828b54ff8..bdc63555d 100644 --- a/.hgignore +++ b/.hgignore @@ -19,6 +19,11 @@ syntax: glob # Ignore this directory. html/ latex/ +bin/ +moc/ +obj/ +uic/ +rcc/ # Ignore file used QtCreator for user profile. *.pro.user @@ -28,3 +33,6 @@ latex/ # Ignore Mercurial .orig files *.orig + +# Ignore Makefile +Makefile diff --git a/src/dialogs/tools/dialogalongline.cpp b/src/dialogs/tools/dialogalongline.cpp index d9c7b7532..32453506a 100644 --- a/src/dialogs/tools/dialogalongline.cpp +++ b/src/dialogs/tools/dialogalongline.cpp @@ -42,8 +42,8 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent) flagFormula = false; flagName = false; - CheckState(); InitOkCansel(ui); + CheckState(); FillComboBoxTypeLine(ui->comboBoxLineType); ui->comboBoxLineType->setCurrentIndex(0); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 82bf6651b..075b238b4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -987,14 +987,14 @@ void MainWindow::PatternWasModified() void MainWindow::ChangedSize(const QString & text) { qint32 size = text.toInt(); - pattern->SetSize(size*10); + pattern->SetSize(size); doc->FullUpdateTree(); } void MainWindow::ChangedHeight(const QString &text) { qint32 growth = text.toInt(); - pattern->SetHeight(growth*10); + pattern->SetHeight(growth); doc->FullUpdateTree(); }