UserVariables branch merge

glabels/CMakeLists.txt

@@ -13,9 +13,9 @@ set (glabels_sources
   ColorHistory.cpp
   ColorPaletteDialog.cpp
   ColorPaletteItem.cpp
-  ColorPaletteButtonItem.cpp
   ColorSwatch.cpp
   Cursors.cpp
+  EditVariableDialog.cpp
   FieldButton.cpp
   File.cpp
   Help.cpp
@@ -40,6 +40,7 @@ set (glabels_sources
   TemplatePicker.cpp
   TemplatePickerItem.cpp
   UndoRedoModel.cpp
+  VariablesView.cpp
 )
 
 set (glabels_qobject_headers
@@ -51,7 +52,7 @@ set (glabels_qobject_headers
   ColorHistory.h
   ColorPaletteDialog.h
   ColorPaletteItem.h
-  ColorPaletteButtonItem.h
+  EditVariableDialog.h
   FieldButton.h
   File.h
   LabelEditor.h
@@ -69,10 +70,12 @@ set (glabels_qobject_headers
   TemplateDesigner.h
   TemplatePicker.h
   UndoRedoModel.h
+  VariablesView.h
 )
 
 set (glabels_forms
   ui/AboutDialog.ui
+  ui/EditVariableDialog.ui
   ui/MergeView.ui
   ui/ObjectEditor.ui
   ui/PreferencesDialog.ui
@@ -95,6 +98,7 @@ set (glabels_forms
   ui/TemplateDesignerOneLayoutPage.ui
   ui/TemplateDesignerTwoLayoutPage.ui
   ui/TemplateDesignerApplyPage.ui
+  ui/VariablesView.ui
 )
 
 set (glabels_resource_files