Some reorganization of source tree.

- Merged libglabels back into glabels.
- Created docs directory.
- Adjusted COPYING files to reflect above changes.

CMakeLists.txt

@@ -49,5 +49,4 @@ endif ()
 # Subdirectories
 #=======================================
 add_subdirectory (glabels)
-add_subdirectory (libglabels)
 

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/"

COPYING-LIBGLABELS

@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- 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.

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}

glabels/Handles.h

@@ -25,7 +25,7 @@
 #include <QPainter>
 #include <QPainterPath>
 
-#include "libglabels/Distance.h"
+#include "Distance.h"
 
 // Forward References
 class LabelModelObject;

glabels/LabelEditor.cpp

@@ -26,6 +26,10 @@
 #include <QtDebug>
 
 #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

glabels/LabelModel.h

@@ -27,12 +27,11 @@
 #include <QPainter>
 
 #include "Settings.h"
+#include "Template.h"
 
 #include "Merge/Merge.h"
 #include "Merge/Record.h"
 
-#include "libglabels/Template.h"
-
 // Forward References
 class ColorNode;
 class Handle;

glabels/LabelModelObject.h

@@ -27,15 +27,15 @@
 #include <QMatrix>
 #include <QPainter>
 
-#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;

glabels/MainWindow.cpp

@@ -37,6 +37,7 @@
 #include <QToolBar>
 #include <QtDebug>
 
+#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

glabels/ObjectEditor.h

@@ -26,7 +26,7 @@
 
 #include "ui_ObjectEditor.h"
 
-#include "libglabels/Distance.h"
+#include "Distance.h"
 
 // Forward references
 class LabelModel;

glabels/PageRenderer.h

@@ -26,11 +26,11 @@
 #include <QRect>
 #include <QVector>
 
+#include "Point.h"
+
 #include "Merge/Merge.h"
 #include "Merge/Record.h"
 
-#include "libglabels/Point.h"
-
 // Forward references
 class LabelModel;
 

glabels/PropertiesView.cpp

@@ -24,13 +24,12 @@
 #include <QStyledItemDelegate>
 #include <QtDebug>
 
+#include "Db.h"
 #include "LabelModel.h"
 #include "SelectProductDialog.h"
 #include "Settings.h"
 #include "UndoRedoModel.h"
 
-#include "libglabels/Db.h"
-
 
 ///
 /// Constructor

glabels/PropertiesView.h

@@ -24,7 +24,7 @@
 
 #include "ui_PropertiesView.h"
 
-#include "libglabels/Units.h"
+#include "Units.h"
 
 // Forward references
 class LabelModel;

glabels/Region.h

@@ -24,7 +24,7 @@
 
 #include <QRectF>
 
-#include "libglabels/Distance.h"
+#include "Distance.h"
 
 
 ///

glabels/SelectProductDialog.cpp

@@ -23,11 +23,10 @@
 
 #include <QtDebug>
 
+#include "Db.h"
 #include "Settings.h"
 #include "TemplatePickerItem.h"
 
-#include "libglabels/Db.h"
-
 
 ///
 /// Constructor

glabels/Settings.h

@@ -25,7 +25,7 @@
 #include <QSettings>
 #include <QStringList>
 
-#include "libglabels/Distance.h"
+#include "Distance.h"
 
 
 ///

glabels/SimplePreview.h

@@ -26,7 +26,7 @@
 #include <QGraphicsScene>
 #include <QList>
 
-#include "libglabels/Template.h"
+#include "Template.h"
 
 
 ///

glabels/Size.h

@@ -24,7 +24,7 @@
 
 #include <QSizeF>
 
-#include "libglabels/Distance.h"
+#include "Distance.h"
 
 
 ///

glabels/TemplatePicker.h

@@ -25,7 +25,7 @@
 #include <QList>
 #include <QListWidget>
 
-#include "libglabels/Template.h"
+#include "Template.h"
 
 
 ///

glabels/TemplatePickerItem.h

@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QListWidget>
 
-#include "libglabels/Template.h"
+#include "Template.h"
 
 
 ///

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 )

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 )

glabels/glabels_main.cpp

@@ -21,13 +21,12 @@
 
 #include <QApplication>
 
-#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 )
 {

libglabels/CMakeLists.txt

@@ -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)