Merge branch 'ContinuousRollLabels'

2018-11-30 21:04:41 -05:00
parent 1cdb3979ab 467ca9fc62
commit e5cb97441d
133 changed files with 7973 additions and 2822 deletions
@@ -31,6 +31,7 @@ set (glabels_sources
  PropertiesView.cpp
  Preview.cpp
  PreviewOverlayItem.cpp
+  RollTemplatePath.cpp
  SelectProductDialog.cpp
  SimplePreview.cpp
  StartupView.cpp
@@ -85,6 +86,8 @@ set (glabels_forms
  ui/TemplateDesignerRoundPage.ui
  ui/TemplateDesignerEllipsePage.ui
  ui/TemplateDesignerCdPage.ui
+  ui/TemplateDesignerPathPage.ui
+  ui/TemplateDesignerContinuousPage.ui
  ui/TemplateDesignerNLayoutsPage.ui
  ui/TemplateDesignerOneLayoutPage.ui
  ui/TemplateDesignerTwoLayoutPage.ui