diff --git a/CMakeLists.txt b/CMakeLists.txt index f693a6c..a070c84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,5 +49,4 @@ endif () # Subdirectories #======================================= add_subdirectory (glabels) -add_subdirectory (libglabels) diff --git a/COPYING b/COPYING index 161a2d9..fe3a9cd 100644 --- a/COPYING +++ b/COPYING @@ -10,14 +10,6 @@ GLABELS: directory for details. -LIBGLABELS: - - The libglabels library, located in the "libglabels/" subdirectory, is licensed - under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL); either version 3 of the - License, or (at your option) any later version -- see the 'COPYING-LIBGLABELS' - in this directory for details. - - DOCUMENTATION: The gLabels and libglabels documentation, located in the "docs/" and "help/" diff --git a/COPYING-LIBGLABELS b/COPYING-LIBGLABELS deleted file mode 100644 index cca7fc2..0000000 --- a/COPYING-LIBGLABELS +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/CODING-STYLE.md b/docs/CODING-STYLE.md similarity index 100% rename from CODING-STYLE.md rename to docs/CODING-STYLE.md diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index ab20e09..d70bb38 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -10,6 +10,7 @@ project (app CXX) # Auto-generate Version.h #======================================= configure_file (Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h @ONLY) +configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY) #======================================= @@ -23,6 +24,7 @@ set (glabels_sources BarcodeMenuButton.cpp BarcodeMenuItem.cpp BarcodeStyle.cpp + Category.cpp ColorButton.cpp ColorHistory.cpp ColorNode.cpp @@ -31,10 +33,17 @@ set (glabels_sources ColorPaletteButtonItem.cpp ColorSwatch.cpp Cursors.cpp + Db.cpp + Distance.cpp EnumUtil.cpp FieldButton.cpp File.cpp FileUtil.cpp + Frame.cpp + FrameCd.cpp + FrameEllipse.cpp + FrameRect.cpp + FrameRound.cpp Handles.cpp Help.cpp Icons.cpp @@ -47,11 +56,16 @@ set (glabels_sources LabelModelLineObject.cpp LabelModelShapeObject.cpp LabelModelTextObject.cpp + Layout.cpp MainWindow.cpp + Markup.cpp MergeView.cpp + MiniPreviewPixmap.cpp ObjectEditor.cpp Outline.cpp PageRenderer.cpp + Paper.cpp + Point.cpp PreferencesDialog.cpp PrintView.cpp PropertiesView.cpp @@ -63,12 +77,22 @@ set (glabels_sources SimplePreview.cpp Size.cpp StartupView.cpp + StrUtil.cpp + Template.cpp TemplatePicker.cpp TemplatePickerItem.cpp TextNode.cpp UndoRedoModel.cpp + Units.cpp + Vendor.cpp + XmlCategoryParser.cpp XmlLabelCreator.cpp XmlLabelParser.cpp + XmlPaperParser.cpp + XmlTemplateCreator.cpp + XmlTemplateParser.cpp + XmlUtil.cpp + XmlVendorParser.cpp ) set (glabels_qobject_headers @@ -138,7 +162,6 @@ add_executable (glabels-qt target_link_libraries (glabels-qt Merge - libglabels ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Xml_LIBRARIES} diff --git a/libglabels/Category.cpp b/glabels/Category.cpp similarity index 100% rename from libglabels/Category.cpp rename to glabels/Category.cpp diff --git a/libglabels/Category.h b/glabels/Category.h similarity index 100% rename from libglabels/Category.h rename to glabels/Category.h diff --git a/libglabels/Config.h.in b/glabels/Config.h.in similarity index 100% rename from libglabels/Config.h.in rename to glabels/Config.h.in diff --git a/libglabels/Constants.h b/glabels/Constants.h similarity index 100% rename from libglabels/Constants.h rename to glabels/Constants.h diff --git a/libglabels/Db.cpp b/glabels/Db.cpp similarity index 100% rename from libglabels/Db.cpp rename to glabels/Db.cpp diff --git a/libglabels/Db.h b/glabels/Db.h similarity index 100% rename from libglabels/Db.h rename to glabels/Db.h diff --git a/libglabels/Distance.cpp b/glabels/Distance.cpp similarity index 100% rename from libglabels/Distance.cpp rename to glabels/Distance.cpp diff --git a/libglabels/Distance.h b/glabels/Distance.h similarity index 100% rename from libglabels/Distance.h rename to glabels/Distance.h diff --git a/libglabels/Distance.inl b/glabels/Distance.inl similarity index 100% rename from libglabels/Distance.inl rename to glabels/Distance.inl diff --git a/libglabels/Frame.cpp b/glabels/Frame.cpp similarity index 100% rename from libglabels/Frame.cpp rename to glabels/Frame.cpp diff --git a/libglabels/Frame.h b/glabels/Frame.h similarity index 100% rename from libglabels/Frame.h rename to glabels/Frame.h diff --git a/libglabels/FrameCd.cpp b/glabels/FrameCd.cpp similarity index 100% rename from libglabels/FrameCd.cpp rename to glabels/FrameCd.cpp diff --git a/libglabels/FrameCd.h b/glabels/FrameCd.h similarity index 100% rename from libglabels/FrameCd.h rename to glabels/FrameCd.h diff --git a/libglabels/FrameEllipse.cpp b/glabels/FrameEllipse.cpp similarity index 100% rename from libglabels/FrameEllipse.cpp rename to glabels/FrameEllipse.cpp diff --git a/libglabels/FrameEllipse.h b/glabels/FrameEllipse.h similarity index 100% rename from libglabels/FrameEllipse.h rename to glabels/FrameEllipse.h diff --git a/libglabels/FrameRect.cpp b/glabels/FrameRect.cpp similarity index 100% rename from libglabels/FrameRect.cpp rename to glabels/FrameRect.cpp diff --git a/libglabels/FrameRect.h b/glabels/FrameRect.h similarity index 100% rename from libglabels/FrameRect.h rename to glabels/FrameRect.h diff --git a/libglabels/FrameRound.cpp b/glabels/FrameRound.cpp similarity index 100% rename from libglabels/FrameRound.cpp rename to glabels/FrameRound.cpp diff --git a/libglabels/FrameRound.h b/glabels/FrameRound.h similarity index 100% rename from libglabels/FrameRound.h rename to glabels/FrameRound.h diff --git a/glabels/Handles.h b/glabels/Handles.h index 07c84f7..9b8710c 100644 --- a/glabels/Handles.h +++ b/glabels/Handles.h @@ -25,7 +25,7 @@ #include #include -#include "libglabels/Distance.h" +#include "Distance.h" // Forward References class LabelModelObject; diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index a104f16..b22e7be 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -26,6 +26,10 @@ #include #include "Cursors.h" +#include "FrameCd.h" +#include "FrameEllipse.h" +#include "FrameRect.h" +#include "FrameRound.h" #include "LabelModel.h" #include "LabelModelObject.h" #include "LabelModelBoxObject.h" @@ -33,15 +37,10 @@ #include "LabelModelImageObject.h" #include "LabelModelLineObject.h" #include "LabelModelTextObject.h" +#include "Markup.h" #include "Settings.h" #include "UndoRedoModel.h" -#include "libglabels/Markup.h" -#include "libglabels/FrameRect.h" -#include "libglabels/FrameRound.h" -#include "libglabels/FrameEllipse.h" -#include "libglabels/FrameCd.h" - // // Private Configuration Data diff --git a/glabels/LabelModel.h b/glabels/LabelModel.h index 9a4e1f9..7e00235 100644 --- a/glabels/LabelModel.h +++ b/glabels/LabelModel.h @@ -27,12 +27,11 @@ #include #include "Settings.h" +#include "Template.h" #include "Merge/Merge.h" #include "Merge/Record.h" -#include "libglabels/Template.h" - // Forward References class ColorNode; class Handle; diff --git a/glabels/LabelModelObject.h b/glabels/LabelModelObject.h index cd4cb79..2dcff3d 100644 --- a/glabels/LabelModelObject.h +++ b/glabels/LabelModelObject.h @@ -27,15 +27,15 @@ #include #include -#include "ColorNode.h" -#include "TextNode.h" #include "BarcodeStyle.h" +#include "ColorNode.h" +#include "Distance.h" #include "Handles.h" #include "Outline.h" +#include "TextNode.h" #include "Merge/Record.h" -#include "libglabels/Distance.h" // Forward References class Region; diff --git a/libglabels/Layout.cpp b/glabels/Layout.cpp similarity index 100% rename from libglabels/Layout.cpp rename to glabels/Layout.cpp diff --git a/libglabels/Layout.h b/glabels/Layout.h similarity index 100% rename from libglabels/Layout.h rename to glabels/Layout.h diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index 2006681..5e3b6c2 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -37,6 +37,7 @@ #include #include +#include "Db.h" #include "File.h" #include "Help.h" #include "Icons.h" @@ -50,8 +51,6 @@ #include "StartupView.h" #include "UndoRedoModel.h" -#include "libglabels/Db.h" - /// /// Constructor diff --git a/libglabels/Markup.cpp b/glabels/Markup.cpp similarity index 100% rename from libglabels/Markup.cpp rename to glabels/Markup.cpp diff --git a/libglabels/Markup.h b/glabels/Markup.h similarity index 100% rename from libglabels/Markup.h rename to glabels/Markup.h diff --git a/libglabels/MiniPreviewPixmap.cpp b/glabels/MiniPreviewPixmap.cpp similarity index 100% rename from libglabels/MiniPreviewPixmap.cpp rename to glabels/MiniPreviewPixmap.cpp diff --git a/libglabels/MiniPreviewPixmap.h b/glabels/MiniPreviewPixmap.h similarity index 100% rename from libglabels/MiniPreviewPixmap.h rename to glabels/MiniPreviewPixmap.h diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h index 4451850..d6cb2b8 100644 --- a/glabels/ObjectEditor.h +++ b/glabels/ObjectEditor.h @@ -26,7 +26,7 @@ #include "ui_ObjectEditor.h" -#include "libglabels/Distance.h" +#include "Distance.h" // Forward references class LabelModel; diff --git a/glabels/PageRenderer.h b/glabels/PageRenderer.h index 726f307..74a2088 100644 --- a/glabels/PageRenderer.h +++ b/glabels/PageRenderer.h @@ -26,11 +26,11 @@ #include #include +#include "Point.h" + #include "Merge/Merge.h" #include "Merge/Record.h" -#include "libglabels/Point.h" - // Forward references class LabelModel; diff --git a/libglabels/Paper.cpp b/glabels/Paper.cpp similarity index 100% rename from libglabels/Paper.cpp rename to glabels/Paper.cpp diff --git a/libglabels/Paper.h b/glabels/Paper.h similarity index 100% rename from libglabels/Paper.h rename to glabels/Paper.h diff --git a/libglabels/Point.cpp b/glabels/Point.cpp similarity index 100% rename from libglabels/Point.cpp rename to glabels/Point.cpp diff --git a/libglabels/Point.h b/glabels/Point.h similarity index 100% rename from libglabels/Point.h rename to glabels/Point.h diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp index b4cdcf8..eab1304 100644 --- a/glabels/PropertiesView.cpp +++ b/glabels/PropertiesView.cpp @@ -24,13 +24,12 @@ #include #include +#include "Db.h" #include "LabelModel.h" #include "SelectProductDialog.h" #include "Settings.h" #include "UndoRedoModel.h" -#include "libglabels/Db.h" - /// /// Constructor diff --git a/glabels/PropertiesView.h b/glabels/PropertiesView.h index b9a42d0..a2b8b89 100644 --- a/glabels/PropertiesView.h +++ b/glabels/PropertiesView.h @@ -24,7 +24,7 @@ #include "ui_PropertiesView.h" -#include "libglabels/Units.h" +#include "Units.h" // Forward references class LabelModel; diff --git a/glabels/Region.h b/glabels/Region.h index 763333b..1fc8e2f 100644 --- a/glabels/Region.h +++ b/glabels/Region.h @@ -24,7 +24,7 @@ #include -#include "libglabels/Distance.h" +#include "Distance.h" /// diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp index 6834956..bbfefe5 100644 --- a/glabels/SelectProductDialog.cpp +++ b/glabels/SelectProductDialog.cpp @@ -23,11 +23,10 @@ #include +#include "Db.h" #include "Settings.h" #include "TemplatePickerItem.h" -#include "libglabels/Db.h" - /// /// Constructor diff --git a/glabels/Settings.h b/glabels/Settings.h index cd534ab..a06ce07 100644 --- a/glabels/Settings.h +++ b/glabels/Settings.h @@ -25,7 +25,7 @@ #include #include -#include "libglabels/Distance.h" +#include "Distance.h" /// diff --git a/glabels/SimplePreview.h b/glabels/SimplePreview.h index 5f7b741..9482c7a 100644 --- a/glabels/SimplePreview.h +++ b/glabels/SimplePreview.h @@ -26,7 +26,7 @@ #include #include -#include "libglabels/Template.h" +#include "Template.h" /// diff --git a/glabels/Size.h b/glabels/Size.h index b6bebfa..c2f56de 100644 --- a/glabels/Size.h +++ b/glabels/Size.h @@ -24,7 +24,7 @@ #include -#include "libglabels/Distance.h" +#include "Distance.h" /// diff --git a/libglabels/StrUtil.cpp b/glabels/StrUtil.cpp similarity index 100% rename from libglabels/StrUtil.cpp rename to glabels/StrUtil.cpp diff --git a/libglabels/StrUtil.h b/glabels/StrUtil.h similarity index 100% rename from libglabels/StrUtil.h rename to glabels/StrUtil.h diff --git a/libglabels/Template.cpp b/glabels/Template.cpp similarity index 100% rename from libglabels/Template.cpp rename to glabels/Template.cpp diff --git a/libglabels/Template.h b/glabels/Template.h similarity index 100% rename from libglabels/Template.h rename to glabels/Template.h diff --git a/glabels/TemplatePicker.h b/glabels/TemplatePicker.h index eee0dbd..c0779c4 100644 --- a/glabels/TemplatePicker.h +++ b/glabels/TemplatePicker.h @@ -25,7 +25,7 @@ #include #include -#include "libglabels/Template.h" +#include "Template.h" /// diff --git a/glabels/TemplatePickerItem.h b/glabels/TemplatePickerItem.h index a6c4722..2c7167a 100644 --- a/glabels/TemplatePickerItem.h +++ b/glabels/TemplatePickerItem.h @@ -25,7 +25,7 @@ #include #include -#include "libglabels/Template.h" +#include "Template.h" /// diff --git a/libglabels/Units.cpp b/glabels/Units.cpp similarity index 100% rename from libglabels/Units.cpp rename to glabels/Units.cpp diff --git a/libglabels/Units.h b/glabels/Units.h similarity index 100% rename from libglabels/Units.h rename to glabels/Units.h diff --git a/libglabels/Vendor.cpp b/glabels/Vendor.cpp similarity index 100% rename from libglabels/Vendor.cpp rename to glabels/Vendor.cpp diff --git a/libglabels/Vendor.h b/glabels/Vendor.h similarity index 100% rename from libglabels/Vendor.h rename to glabels/Vendor.h diff --git a/libglabels/XmlCategoryParser.cpp b/glabels/XmlCategoryParser.cpp similarity index 100% rename from libglabels/XmlCategoryParser.cpp rename to glabels/XmlCategoryParser.cpp diff --git a/libglabels/XmlCategoryParser.h b/glabels/XmlCategoryParser.h similarity index 100% rename from libglabels/XmlCategoryParser.h rename to glabels/XmlCategoryParser.h diff --git a/glabels/XmlLabelCreator.cpp b/glabels/XmlLabelCreator.cpp index 76e00af..816f40d 100644 --- a/glabels/XmlLabelCreator.cpp +++ b/glabels/XmlLabelCreator.cpp @@ -36,13 +36,11 @@ #include "LabelModelLineObject.h" #include "LabelModelImageObject.h" #include "LabelModelTextObject.h" +#include "XmlTemplateCreator.h" +#include "XmlUtil.h" #include "Merge/None.h" -#include "libglabels/XmlTemplateCreator.h" -#include "libglabels/XmlUtil.h" - - void XmlLabelCreator::writeFile( const LabelModel* label, const QString& fileName ) diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp index 6963e3f..d6a4057 100644 --- a/glabels/XmlLabelParser.cpp +++ b/glabels/XmlLabelParser.cpp @@ -38,12 +38,11 @@ #include "LabelModelImageObject.h" #include "LabelModelLineObject.h" #include "LabelModelTextObject.h" +#include "XmlTemplateParser.h" +#include "XmlUtil.h" #include "Merge/Factory.h" -#include "libglabels/XmlTemplateParser.h" -#include "libglabels/XmlUtil.h" - LabelModel* XmlLabelParser::readFile( const QString& fileName ) diff --git a/libglabels/XmlPaperParser.cpp b/glabels/XmlPaperParser.cpp similarity index 100% rename from libglabels/XmlPaperParser.cpp rename to glabels/XmlPaperParser.cpp diff --git a/libglabels/XmlPaperParser.h b/glabels/XmlPaperParser.h similarity index 100% rename from libglabels/XmlPaperParser.h rename to glabels/XmlPaperParser.h diff --git a/libglabels/XmlTemplateCreator.cpp b/glabels/XmlTemplateCreator.cpp similarity index 100% rename from libglabels/XmlTemplateCreator.cpp rename to glabels/XmlTemplateCreator.cpp diff --git a/libglabels/XmlTemplateCreator.h b/glabels/XmlTemplateCreator.h similarity index 100% rename from libglabels/XmlTemplateCreator.h rename to glabels/XmlTemplateCreator.h diff --git a/libglabels/XmlTemplateParser.cpp b/glabels/XmlTemplateParser.cpp similarity index 100% rename from libglabels/XmlTemplateParser.cpp rename to glabels/XmlTemplateParser.cpp diff --git a/libglabels/XmlTemplateParser.h b/glabels/XmlTemplateParser.h similarity index 100% rename from libglabels/XmlTemplateParser.h rename to glabels/XmlTemplateParser.h diff --git a/libglabels/XmlUtil.cpp b/glabels/XmlUtil.cpp similarity index 100% rename from libglabels/XmlUtil.cpp rename to glabels/XmlUtil.cpp diff --git a/libglabels/XmlUtil.h b/glabels/XmlUtil.h similarity index 100% rename from libglabels/XmlUtil.h rename to glabels/XmlUtil.h diff --git a/libglabels/XmlVendorParser.cpp b/glabels/XmlVendorParser.cpp similarity index 100% rename from libglabels/XmlVendorParser.cpp rename to glabels/XmlVendorParser.cpp diff --git a/libglabels/XmlVendorParser.h b/glabels/XmlVendorParser.h similarity index 100% rename from libglabels/XmlVendorParser.h rename to glabels/XmlVendorParser.h diff --git a/glabels/glabels_main.cpp b/glabels/glabels_main.cpp index 594af78..e731fb2 100644 --- a/glabels/glabels_main.cpp +++ b/glabels/glabels_main.cpp @@ -21,13 +21,12 @@ #include -#include "Settings.h" +#include "Db.h" #include "MainWindow.h" +#include "Settings.h" #include "Merge/Factory.h" -#include "libglabels/Db.h" - int main( int argc, char **argv ) { diff --git a/libglabels/privateConstants.h b/glabels/privateConstants.h similarity index 100% rename from libglabels/privateConstants.h rename to glabels/privateConstants.h diff --git a/libglabels/CMakeLists.txt b/libglabels/CMakeLists.txt deleted file mode 100644 index 282016d..0000000 --- a/libglabels/CMakeLists.txt +++ /dev/null @@ -1,71 +0,0 @@ -cmake_minimum_required (VERSION 2.8.12) - -############################################################################### -# gLabels libglabels subproject -############################################################################### -project (libglabels CXX) - - -#======================================= -# Sources -#======================================= -configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY) - -set (libglabels_sources - Category.cpp - Paper.cpp - Vendor.cpp - Point.cpp - Layout.cpp - Markup.cpp - Frame.cpp - FrameRect.cpp - FrameCd.cpp - FrameRound.cpp - FrameEllipse.cpp - StrUtil.cpp - Template.cpp - Db.cpp - XmlCategoryParser.cpp - XmlPaperParser.cpp - XmlVendorParser.cpp - XmlTemplateParser.cpp - XmlTemplateCreator.cpp - XmlUtil.cpp - MiniPreviewPixmap.cpp - Units.cpp - Distance.cpp -) - -set (libglabels_qobject_headers -) - -set (libglabels_resource_files -) - -qt5_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers}) -qt5_add_resources(libglabels_qrc_sources ${libglabels_resource_files}) - -add_library (libglabels - ${libglabels_sources} - ${libglabels_moc_sources} - ${libglabels_qrc_sources} -) - - -#======================================= -# Where to find stuff -#======================================= -include_directories ( - ${Qt5Widgets_INCLUDE_DIRS} - ${Qt5Xml_INCLUDE_DIRS} -) - -link_directories ( -) - - -#======================================= -# Install -#======================================= -install (TARGETS libglabels ARCHIVE DESTINATION lib)