aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create and update manual layout from Valentina.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-09-13 09:04:11 +03:00
parent 3fea813b9c
commit f1e49a7fd6
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/puzzle/carousel/vpcarrousel.ui
View File

@ -34,6 +34,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>

19
src/app/valentina/mainwindow.cpp
View File

@ -69,6 +69,7 @@
#include "../vmisc/backport/qoverload.h" #include "../vmisc/backport/qoverload.h"
#include "../vlayout/vlayoutexporter.h" #include "../vlayout/vlayoutexporter.h"
#include "../vwidgets/vgraphicssimpletextitem.h" #include "../vwidgets/vgraphicssimpletextitem.h"
#include "../vlayout/dialogs/dialoglayoutscale.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
#include "../vmisc/backport/qscopeguard.h" #include "../vmisc/backport/qscopeguard.h"
@ -3419,10 +3420,15 @@ void MainWindow::on_actionCreateManualLayout_triggered()
return; return;
} }
DialogLayoutScale layoutScale(false, this);
layoutScale.SetXScale(1);
layoutScale.SetYScale(1);
layoutScale.exec();
VLayoutExporter exporter; VLayoutExporter exporter;
exporter.SetFileName(rldFile.fileName()); exporter.SetFileName(rldFile.fileName());
// exporter.SetXScale(m_dialogSaveLayout->GetXScale()); exporter.SetXScale(layoutScale.GetXScale());
// exporter.SetYScale(m_dialogSaveLayout->GetYScale()); exporter.SetYScale(layoutScale.GetYScale());
exporter.ExportToRLD(listDetails); exporter.ExportToRLD(listDetails);
QStringList arguments {"-r", rldFile.fileName()}; QStringList arguments {"-r", rldFile.fileName()};
@ -3501,10 +3507,15 @@ void MainWindow::on_actionUpdateManualLayout_triggered()
return; return;
} }
DialogLayoutScale layoutScale(false, this);
layoutScale.SetXScale(1);
layoutScale.SetYScale(1);
layoutScale.exec();
VLayoutExporter exporter; VLayoutExporter exporter;
exporter.SetFileName(rldFile.fileName()); exporter.SetFileName(rldFile.fileName());
// exporter.SetXScale(m_dialogSaveLayout->GetXScale()); exporter.SetXScale(layoutScale.GetXScale());
// exporter.SetYScale(m_dialogSaveLayout->GetYScale()); exporter.SetYScale(layoutScale.GetYScale());
exporter.ExportToRLD(listDetails); exporter.ExportToRLD(listDetails);
QStringList arguments {filePath, "-r", rldFile.fileName()}; QStringList arguments {filePath, "-r", rldFile.fileName()};

12
src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui
View File

@ -36,7 +36,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabMainPath"> <widget class="QWidget" name="tabMainPath">
<attribute name="title"> <attribute name="title">
@ -1127,16 +1127,16 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>VPlainTextEdit</class>
<extends>QPlainTextEdit</extends>
<header location="global">vplaintextedit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>VLineEdit</class> <class>VLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>vlineedit.h</header> <header>vlineedit.h</header>
</customwidget> </customwidget>
<customwidget>
<class>VPlainTextEdit</class>
<extends>QPlainTextEdit</extends>
<header>vplaintextedit.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../../../vmisc/share/resources/icon.qrc"/> <include location="../../../../../vmisc/share/resources/icon.qrc"/>