diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cccaa9..ddf28c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,6 @@ add_definitions (-g) # # Subdirectories # -add_subdirectory (app) +add_subdirectory (glabels) add_subdirectory (libglabels) diff --git a/app/BarcodeBackends.cpp b/glabels/BarcodeBackends.cpp similarity index 100% rename from app/BarcodeBackends.cpp rename to glabels/BarcodeBackends.cpp diff --git a/app/BarcodeBackends.h b/glabels/BarcodeBackends.h similarity index 100% rename from app/BarcodeBackends.h rename to glabels/BarcodeBackends.h diff --git a/app/BarcodeMenu.cpp b/glabels/BarcodeMenu.cpp similarity index 100% rename from app/BarcodeMenu.cpp rename to glabels/BarcodeMenu.cpp diff --git a/app/BarcodeMenu.h b/glabels/BarcodeMenu.h similarity index 100% rename from app/BarcodeMenu.h rename to glabels/BarcodeMenu.h diff --git a/app/BarcodeMenuButton.cpp b/glabels/BarcodeMenuButton.cpp similarity index 100% rename from app/BarcodeMenuButton.cpp rename to glabels/BarcodeMenuButton.cpp diff --git a/app/BarcodeMenuButton.h b/glabels/BarcodeMenuButton.h similarity index 100% rename from app/BarcodeMenuButton.h rename to glabels/BarcodeMenuButton.h diff --git a/app/BarcodeMenuItem.cpp b/glabels/BarcodeMenuItem.cpp similarity index 100% rename from app/BarcodeMenuItem.cpp rename to glabels/BarcodeMenuItem.cpp diff --git a/app/BarcodeMenuItem.h b/glabels/BarcodeMenuItem.h similarity index 100% rename from app/BarcodeMenuItem.h rename to glabels/BarcodeMenuItem.h diff --git a/app/BarcodeStyle.cpp b/glabels/BarcodeStyle.cpp similarity index 100% rename from app/BarcodeStyle.cpp rename to glabels/BarcodeStyle.cpp diff --git a/app/BarcodeStyle.h b/glabels/BarcodeStyle.h similarity index 100% rename from app/BarcodeStyle.h rename to glabels/BarcodeStyle.h diff --git a/app/CMakeLists.txt b/glabels/CMakeLists.txt similarity index 100% rename from app/CMakeLists.txt rename to glabels/CMakeLists.txt diff --git a/app/ColorNode.cpp b/glabels/ColorNode.cpp similarity index 100% rename from app/ColorNode.cpp rename to glabels/ColorNode.cpp diff --git a/app/ColorNode.h b/glabels/ColorNode.h similarity index 100% rename from app/ColorNode.h rename to glabels/ColorNode.h diff --git a/app/ColorSwatch.cpp b/glabels/ColorSwatch.cpp similarity index 100% rename from app/ColorSwatch.cpp rename to glabels/ColorSwatch.cpp diff --git a/app/ColorSwatch.h b/glabels/ColorSwatch.h similarity index 100% rename from app/ColorSwatch.h rename to glabels/ColorSwatch.h diff --git a/app/File.cpp b/glabels/File.cpp similarity index 100% rename from app/File.cpp rename to glabels/File.cpp diff --git a/app/File.h b/glabels/File.h similarity index 100% rename from app/File.h rename to glabels/File.h diff --git a/app/Help.cpp b/glabels/Help.cpp similarity index 100% rename from app/Help.cpp rename to glabels/Help.cpp diff --git a/app/Help.h b/glabels/Help.h similarity index 100% rename from app/Help.h rename to glabels/Help.h diff --git a/app/Icons.h b/glabels/Icons.h similarity index 100% rename from app/Icons.h rename to glabels/Icons.h diff --git a/app/LabelModel.cpp b/glabels/LabelModel.cpp similarity index 100% rename from app/LabelModel.cpp rename to glabels/LabelModel.cpp diff --git a/app/LabelModel.h b/glabels/LabelModel.h similarity index 100% rename from app/LabelModel.h rename to glabels/LabelModel.h diff --git a/app/LabelModelBoxObject.cpp b/glabels/LabelModelBoxObject.cpp similarity index 100% rename from app/LabelModelBoxObject.cpp rename to glabels/LabelModelBoxObject.cpp diff --git a/app/LabelModelBoxObject.h b/glabels/LabelModelBoxObject.h similarity index 100% rename from app/LabelModelBoxObject.h rename to glabels/LabelModelBoxObject.h diff --git a/app/LabelModelObject.cpp b/glabels/LabelModelObject.cpp similarity index 100% rename from app/LabelModelObject.cpp rename to glabels/LabelModelObject.cpp diff --git a/app/LabelModelObject.h b/glabels/LabelModelObject.h similarity index 100% rename from app/LabelModelObject.h rename to glabels/LabelModelObject.h diff --git a/app/LabelRegion.cpp b/glabels/LabelRegion.cpp similarity index 100% rename from app/LabelRegion.cpp rename to glabels/LabelRegion.cpp diff --git a/app/LabelRegion.h b/glabels/LabelRegion.h similarity index 100% rename from app/LabelRegion.h rename to glabels/LabelRegion.h diff --git a/app/MainWindow.cpp b/glabels/MainWindow.cpp similarity index 100% rename from app/MainWindow.cpp rename to glabels/MainWindow.cpp diff --git a/app/MainWindow.h b/glabels/MainWindow.h similarity index 100% rename from app/MainWindow.h rename to glabels/MainWindow.h diff --git a/app/MergeField.cpp b/glabels/MergeField.cpp similarity index 100% rename from app/MergeField.cpp rename to glabels/MergeField.cpp diff --git a/app/MergeField.h b/glabels/MergeField.h similarity index 100% rename from app/MergeField.h rename to glabels/MergeField.h diff --git a/app/MergeRecord.cpp b/glabels/MergeRecord.cpp similarity index 100% rename from app/MergeRecord.cpp rename to glabels/MergeRecord.cpp diff --git a/app/MergeRecord.h b/glabels/MergeRecord.h similarity index 100% rename from app/MergeRecord.h rename to glabels/MergeRecord.h diff --git a/app/NewLabelDialog.cpp b/glabels/NewLabelDialog.cpp similarity index 100% rename from app/NewLabelDialog.cpp rename to glabels/NewLabelDialog.cpp diff --git a/app/NewLabelDialog.h b/glabels/NewLabelDialog.h similarity index 100% rename from app/NewLabelDialog.h rename to glabels/NewLabelDialog.h diff --git a/app/SimplePreview.cpp b/glabels/SimplePreview.cpp similarity index 100% rename from app/SimplePreview.cpp rename to glabels/SimplePreview.cpp diff --git a/app/SimplePreview.h b/glabels/SimplePreview.h similarity index 100% rename from app/SimplePreview.h rename to glabels/SimplePreview.h diff --git a/app/TemplatePicker.cpp b/glabels/TemplatePicker.cpp similarity index 100% rename from app/TemplatePicker.cpp rename to glabels/TemplatePicker.cpp diff --git a/app/TemplatePicker.h b/glabels/TemplatePicker.h similarity index 100% rename from app/TemplatePicker.h rename to glabels/TemplatePicker.h diff --git a/app/TemplatePickerItem.cpp b/glabels/TemplatePickerItem.cpp similarity index 100% rename from app/TemplatePickerItem.cpp rename to glabels/TemplatePickerItem.cpp diff --git a/app/TemplatePickerItem.h b/glabels/TemplatePickerItem.h similarity index 100% rename from app/TemplatePickerItem.h rename to glabels/TemplatePickerItem.h diff --git a/app/TextNode.cpp b/glabels/TextNode.cpp similarity index 100% rename from app/TextNode.cpp rename to glabels/TextNode.cpp diff --git a/app/TextNode.h b/glabels/TextNode.h similarity index 100% rename from app/TextNode.h rename to glabels/TextNode.h diff --git a/app/View.cpp b/glabels/View.cpp similarity index 100% rename from app/View.cpp rename to glabels/View.cpp diff --git a/app/View.h b/glabels/View.h similarity index 100% rename from app/View.h rename to glabels/View.h diff --git a/app/glabels_main.cpp b/glabels/glabels_main.cpp similarity index 100% rename from app/glabels_main.cpp rename to glabels/glabels_main.cpp diff --git a/app/icons.qrc b/glabels/icons.qrc similarity index 100% rename from app/icons.qrc rename to glabels/icons.qrc diff --git a/app/icons/16x16/actions/glabels-align-bottom.png b/glabels/icons/16x16/actions/glabels-align-bottom.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-bottom.png rename to glabels/icons/16x16/actions/glabels-align-bottom.png diff --git a/app/icons/16x16/actions/glabels-align-hcenter.png b/glabels/icons/16x16/actions/glabels-align-hcenter.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-hcenter.png rename to glabels/icons/16x16/actions/glabels-align-hcenter.png diff --git a/app/icons/16x16/actions/glabels-align-left.png b/glabels/icons/16x16/actions/glabels-align-left.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-left.png rename to glabels/icons/16x16/actions/glabels-align-left.png diff --git a/app/icons/16x16/actions/glabels-align-right.png b/glabels/icons/16x16/actions/glabels-align-right.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-right.png rename to glabels/icons/16x16/actions/glabels-align-right.png diff --git a/app/icons/16x16/actions/glabels-align-top.png b/glabels/icons/16x16/actions/glabels-align-top.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-top.png rename to glabels/icons/16x16/actions/glabels-align-top.png diff --git a/app/icons/16x16/actions/glabels-align-vcenter.png b/glabels/icons/16x16/actions/glabels-align-vcenter.png similarity index 100% rename from app/icons/16x16/actions/glabels-align-vcenter.png rename to glabels/icons/16x16/actions/glabels-align-vcenter.png diff --git a/app/icons/16x16/actions/glabels-arrow.png b/glabels/icons/16x16/actions/glabels-arrow.png similarity index 100% rename from app/icons/16x16/actions/glabels-arrow.png rename to glabels/icons/16x16/actions/glabels-arrow.png diff --git a/app/icons/16x16/actions/glabels-barcode.png b/glabels/icons/16x16/actions/glabels-barcode.png similarity index 100% rename from app/icons/16x16/actions/glabels-barcode.png rename to glabels/icons/16x16/actions/glabels-barcode.png diff --git a/app/icons/16x16/actions/glabels-box.png b/glabels/icons/16x16/actions/glabels-box.png similarity index 100% rename from app/icons/16x16/actions/glabels-box.png rename to glabels/icons/16x16/actions/glabels-box.png diff --git a/app/icons/16x16/actions/glabels-bucket-fill.png b/glabels/icons/16x16/actions/glabels-bucket-fill.png similarity index 100% rename from app/icons/16x16/actions/glabels-bucket-fill.png rename to glabels/icons/16x16/actions/glabels-bucket-fill.png diff --git a/app/icons/16x16/actions/glabels-center-horiz.png b/glabels/icons/16x16/actions/glabels-center-horiz.png similarity index 100% rename from app/icons/16x16/actions/glabels-center-horiz.png rename to glabels/icons/16x16/actions/glabels-center-horiz.png diff --git a/app/icons/16x16/actions/glabels-center-vert.png b/glabels/icons/16x16/actions/glabels-center-vert.png similarity index 100% rename from app/icons/16x16/actions/glabels-center-vert.png rename to glabels/icons/16x16/actions/glabels-center-vert.png diff --git a/app/icons/16x16/actions/glabels-ellipse.png b/glabels/icons/16x16/actions/glabels-ellipse.png similarity index 100% rename from app/icons/16x16/actions/glabels-ellipse.png rename to glabels/icons/16x16/actions/glabels-ellipse.png diff --git a/app/icons/16x16/actions/glabels-flip-horiz.png b/glabels/icons/16x16/actions/glabels-flip-horiz.png similarity index 100% rename from app/icons/16x16/actions/glabels-flip-horiz.png rename to glabels/icons/16x16/actions/glabels-flip-horiz.png diff --git a/app/icons/16x16/actions/glabels-flip-vert.png b/glabels/icons/16x16/actions/glabels-flip-vert.png similarity index 100% rename from app/icons/16x16/actions/glabels-flip-vert.png rename to glabels/icons/16x16/actions/glabels-flip-vert.png diff --git a/app/icons/16x16/actions/glabels-image.png b/glabels/icons/16x16/actions/glabels-image.png similarity index 100% rename from app/icons/16x16/actions/glabels-image.png rename to glabels/icons/16x16/actions/glabels-image.png diff --git a/app/icons/16x16/actions/glabels-line.png b/glabels/icons/16x16/actions/glabels-line.png similarity index 100% rename from app/icons/16x16/actions/glabels-line.png rename to glabels/icons/16x16/actions/glabels-line.png diff --git a/app/icons/16x16/actions/glabels-merge.png b/glabels/icons/16x16/actions/glabels-merge.png similarity index 100% rename from app/icons/16x16/actions/glabels-merge.png rename to glabels/icons/16x16/actions/glabels-merge.png diff --git a/app/icons/16x16/actions/glabels-object-properties.png b/glabels/icons/16x16/actions/glabels-object-properties.png similarity index 100% rename from app/icons/16x16/actions/glabels-object-properties.png rename to glabels/icons/16x16/actions/glabels-object-properties.png diff --git a/app/icons/16x16/actions/glabels-order-bottom.png b/glabels/icons/16x16/actions/glabels-order-bottom.png similarity index 100% rename from app/icons/16x16/actions/glabels-order-bottom.png rename to glabels/icons/16x16/actions/glabels-order-bottom.png diff --git a/app/icons/16x16/actions/glabels-order-top.png b/glabels/icons/16x16/actions/glabels-order-top.png similarity index 100% rename from app/icons/16x16/actions/glabels-order-top.png rename to glabels/icons/16x16/actions/glabels-order-top.png diff --git a/app/icons/16x16/actions/glabels-pencil.png b/glabels/icons/16x16/actions/glabels-pencil.png similarity index 100% rename from app/icons/16x16/actions/glabels-pencil.png rename to glabels/icons/16x16/actions/glabels-pencil.png diff --git a/app/icons/16x16/actions/glabels-rotate-left.png b/glabels/icons/16x16/actions/glabels-rotate-left.png similarity index 100% rename from app/icons/16x16/actions/glabels-rotate-left.png rename to glabels/icons/16x16/actions/glabels-rotate-left.png diff --git a/app/icons/16x16/actions/glabels-rotate-right.png b/glabels/icons/16x16/actions/glabels-rotate-right.png similarity index 100% rename from app/icons/16x16/actions/glabels-rotate-right.png rename to glabels/icons/16x16/actions/glabels-rotate-right.png diff --git a/app/icons/16x16/actions/glabels-text.png b/glabels/icons/16x16/actions/glabels-text.png similarity index 100% rename from app/icons/16x16/actions/glabels-text.png rename to glabels/icons/16x16/actions/glabels-text.png diff --git a/app/icons/16x16/apps/glabels.png b/glabels/icons/16x16/apps/glabels.png similarity index 100% rename from app/icons/16x16/apps/glabels.png rename to glabels/icons/16x16/apps/glabels.png diff --git a/app/icons/24x24/actions/fallback-edit-copy.png b/glabels/icons/24x24/actions/fallback-edit-copy.png similarity index 100% rename from app/icons/24x24/actions/fallback-edit-copy.png rename to glabels/icons/24x24/actions/fallback-edit-copy.png diff --git a/app/icons/24x24/actions/fallback-edit-cut.png b/glabels/icons/24x24/actions/fallback-edit-cut.png similarity index 100% rename from app/icons/24x24/actions/fallback-edit-cut.png rename to glabels/icons/24x24/actions/fallback-edit-cut.png diff --git a/app/icons/24x24/actions/fallback-edit-paste.png b/glabels/icons/24x24/actions/fallback-edit-paste.png similarity index 100% rename from app/icons/24x24/actions/fallback-edit-paste.png rename to glabels/icons/24x24/actions/fallback-edit-paste.png diff --git a/app/icons/24x24/actions/fallback-file-new.png b/glabels/icons/24x24/actions/fallback-file-new.png similarity index 100% rename from app/icons/24x24/actions/fallback-file-new.png rename to glabels/icons/24x24/actions/fallback-file-new.png diff --git a/app/icons/24x24/actions/fallback-file-open.png b/glabels/icons/24x24/actions/fallback-file-open.png similarity index 100% rename from app/icons/24x24/actions/fallback-file-open.png rename to glabels/icons/24x24/actions/fallback-file-open.png diff --git a/app/icons/24x24/actions/fallback-file-print.png b/glabels/icons/24x24/actions/fallback-file-print.png similarity index 100% rename from app/icons/24x24/actions/fallback-file-print.png rename to glabels/icons/24x24/actions/fallback-file-print.png diff --git a/app/icons/24x24/actions/fallback-file-save-as.png b/glabels/icons/24x24/actions/fallback-file-save-as.png similarity index 100% rename from app/icons/24x24/actions/fallback-file-save-as.png rename to glabels/icons/24x24/actions/fallback-file-save-as.png diff --git a/app/icons/24x24/actions/fallback-file-save.png b/glabels/icons/24x24/actions/fallback-file-save.png similarity index 100% rename from app/icons/24x24/actions/fallback-file-save.png rename to glabels/icons/24x24/actions/fallback-file-save.png diff --git a/app/icons/24x24/actions/fallback-zoom-best-fit.png b/glabels/icons/24x24/actions/fallback-zoom-best-fit.png similarity index 100% rename from app/icons/24x24/actions/fallback-zoom-best-fit.png rename to glabels/icons/24x24/actions/fallback-zoom-best-fit.png diff --git a/app/icons/24x24/actions/fallback-zoom-in.png b/glabels/icons/24x24/actions/fallback-zoom-in.png similarity index 100% rename from app/icons/24x24/actions/fallback-zoom-in.png rename to glabels/icons/24x24/actions/fallback-zoom-in.png diff --git a/app/icons/24x24/actions/fallback-zoom-original.png b/glabels/icons/24x24/actions/fallback-zoom-original.png similarity index 100% rename from app/icons/24x24/actions/fallback-zoom-original.png rename to glabels/icons/24x24/actions/fallback-zoom-original.png diff --git a/app/icons/24x24/actions/fallback-zoom-out.png b/glabels/icons/24x24/actions/fallback-zoom-out.png similarity index 100% rename from app/icons/24x24/actions/fallback-zoom-out.png rename to glabels/icons/24x24/actions/fallback-zoom-out.png diff --git a/app/icons/24x24/actions/glabels-align-text-bottom.png b/glabels/icons/24x24/actions/glabels-align-text-bottom.png similarity index 100% rename from app/icons/24x24/actions/glabels-align-text-bottom.png rename to glabels/icons/24x24/actions/glabels-align-text-bottom.png diff --git a/app/icons/24x24/actions/glabels-align-text-middle.png b/glabels/icons/24x24/actions/glabels-align-text-middle.png similarity index 100% rename from app/icons/24x24/actions/glabels-align-text-middle.png rename to glabels/icons/24x24/actions/glabels-align-text-middle.png diff --git a/app/icons/24x24/actions/glabels-align-text-top.png b/glabels/icons/24x24/actions/glabels-align-text-top.png similarity index 100% rename from app/icons/24x24/actions/glabels-align-text-top.png rename to glabels/icons/24x24/actions/glabels-align-text-top.png diff --git a/app/icons/24x24/actions/glabels-arrow.png b/glabels/icons/24x24/actions/glabels-arrow.png similarity index 100% rename from app/icons/24x24/actions/glabels-arrow.png rename to glabels/icons/24x24/actions/glabels-arrow.png diff --git a/app/icons/24x24/actions/glabels-barcode.png b/glabels/icons/24x24/actions/glabels-barcode.png similarity index 100% rename from app/icons/24x24/actions/glabels-barcode.png rename to glabels/icons/24x24/actions/glabels-barcode.png diff --git a/app/icons/24x24/actions/glabels-box.png b/glabels/icons/24x24/actions/glabels-box.png similarity index 100% rename from app/icons/24x24/actions/glabels-box.png rename to glabels/icons/24x24/actions/glabels-box.png diff --git a/app/icons/24x24/actions/glabels-bucket-fill.png b/glabels/icons/24x24/actions/glabels-bucket-fill.png similarity index 100% rename from app/icons/24x24/actions/glabels-bucket-fill.png rename to glabels/icons/24x24/actions/glabels-bucket-fill.png diff --git a/app/icons/24x24/actions/glabels-ellipse.png b/glabels/icons/24x24/actions/glabels-ellipse.png similarity index 100% rename from app/icons/24x24/actions/glabels-ellipse.png rename to glabels/icons/24x24/actions/glabels-ellipse.png diff --git a/app/icons/24x24/actions/glabels-image.png b/glabels/icons/24x24/actions/glabels-image.png similarity index 100% rename from app/icons/24x24/actions/glabels-image.png rename to glabels/icons/24x24/actions/glabels-image.png diff --git a/app/icons/24x24/actions/glabels-line.png b/glabels/icons/24x24/actions/glabels-line.png similarity index 100% rename from app/icons/24x24/actions/glabels-line.png rename to glabels/icons/24x24/actions/glabels-line.png diff --git a/app/icons/24x24/actions/glabels-merge.png b/glabels/icons/24x24/actions/glabels-merge.png similarity index 100% rename from app/icons/24x24/actions/glabels-merge.png rename to glabels/icons/24x24/actions/glabels-merge.png diff --git a/app/icons/24x24/actions/glabels-object-properties.png b/glabels/icons/24x24/actions/glabels-object-properties.png similarity index 100% rename from app/icons/24x24/actions/glabels-object-properties.png rename to glabels/icons/24x24/actions/glabels-object-properties.png diff --git a/app/icons/24x24/actions/glabels-pencil.png b/glabels/icons/24x24/actions/glabels-pencil.png similarity index 100% rename from app/icons/24x24/actions/glabels-pencil.png rename to glabels/icons/24x24/actions/glabels-pencil.png diff --git a/app/icons/24x24/actions/glabels-text.png b/glabels/icons/24x24/actions/glabels-text.png similarity index 100% rename from app/icons/24x24/actions/glabels-text.png rename to glabels/icons/24x24/actions/glabels-text.png diff --git a/app/icons/24x24/apps/glabels.png b/glabels/icons/24x24/apps/glabels.png similarity index 100% rename from app/icons/24x24/apps/glabels.png rename to glabels/icons/24x24/apps/glabels.png diff --git a/app/icons/32x32/apps/glabels.png b/glabels/icons/32x32/apps/glabels.png similarity index 100% rename from app/icons/32x32/apps/glabels.png rename to glabels/icons/32x32/apps/glabels.png diff --git a/app/icons/48x48/apps/glabels.png b/glabels/icons/48x48/apps/glabels.png similarity index 100% rename from app/icons/48x48/apps/glabels.png rename to glabels/icons/48x48/apps/glabels.png diff --git a/app/icons/scalable/apps/glabels.svg b/glabels/icons/scalable/apps/glabels.svg similarity index 100% rename from app/icons/scalable/apps/glabels.svg rename to glabels/icons/scalable/apps/glabels.svg diff --git a/app/images.qrc b/glabels/images.qrc similarity index 100% rename from app/images.qrc rename to glabels/images.qrc diff --git a/app/images/glabels-logo.png b/glabels/images/glabels-logo.png similarity index 100% rename from app/images/glabels-logo.png rename to glabels/images/glabels-logo.png diff --git a/app/ui/NewLabelDialog.ui b/glabels/ui/NewLabelDialog.ui similarity index 100% rename from app/ui/NewLabelDialog.ui rename to glabels/ui/NewLabelDialog.ui