diff --git a/CMakeLists.txt b/CMakeLists.txt index 3acf762..2cccaa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 2.8) -project (glabels-qt) +project (glabels_qt) set (Package_Name "glabels-qt") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 59ef7bc..f5bc55f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -34,14 +34,17 @@ include (${QT_USE_FILE}) include_directories ( + ${glabels_qt_SOURCE_DIR} ) link_directories ( + ${glabels_qt_SOURCE_DIR}/libglabels ) add_executable (glabels-qt ${glabels_sources} ${glabels_moc_sources} ${glabels_qrc_sources}) target_link_libraries (glabels-qt + libglabels ${QT_LIBRARIES} ) diff --git a/app/glabels_main.cpp b/app/glabels_main.cpp index 0e1c44e..f8d5a1a 100644 --- a/app/glabels_main.cpp +++ b/app/glabels_main.cpp @@ -22,9 +22,14 @@ #include #include "MainWindow.h" +#include "libglabels/Db.h" +////// TEMPORARY TESTING //////// +#include "libglabels/XmlPaperParser.h" +///////////////////////////////// using namespace gLabels; +using namespace libglabels; int main( int argc, char **argv ) @@ -35,6 +40,13 @@ int main( int argc, char **argv ) QCoreApplication::setOrganizationDomain( "glabels.org" ); QCoreApplication::setApplicationName( "glabels-qt" ); + Db::init(); + ////// TEMPORARY TESTING //////// + XmlPaperParser parser; + parser.readFile( "/usr/local/share/libglabels-3.0/templates/paper-sizes.xml" ); + Db::printKnownPapers(); + ///////////////////////////////// + MainWindow mainWin; mainWin.show(); diff --git a/libglabels/CMakeLists.txt b/libglabels/CMakeLists.txt index 0f83d16..5e52ed9 100644 --- a/libglabels/CMakeLists.txt +++ b/libglabels/CMakeLists.txt @@ -19,6 +19,7 @@ set (libglabels_sources Template.cpp Db.cpp XmlPaperParser.cpp + XmlUtil.cpp ) set (libglabels_qobject_headers diff --git a/libglabels/Db.cpp b/libglabels/Db.cpp index 47c83e6..fa3ea18 100644 --- a/libglabels/Db.cpp +++ b/libglabels/Db.cpp @@ -26,15 +26,17 @@ namespace libglabels { - std::list mPapers; - std::list mPaperIds; - std::list mPaperNames; - std::list mCategories; - std::list mCategoryIds; - std::list mCategoryNames; - std::list mVendors; - std::list mVendorNames; - std::list