diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
index 367b03f..db6f84e 100644
--- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
+++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
@@ -111,7 +111,7 @@ unix {
UI_SOURCES_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui
OBJECTS_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/obj
RCC_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/rcc
- DESTDIR = $$PWD/../../../lib/unix/$${BUILD_TYPE}
+ DESTDIR = $$PWD/../../../build/unix/$${BUILD_TYPE}/lib
DLLDESTDIR = $${DESTDIR}
}
@@ -124,7 +124,7 @@ win32 {
UI_SOURCES_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui
OBJECTS_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/obj
RCC_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/rcc
- DESTDIR = $$PWD/../../../lib/win32/$${BUILD_TYPE}
+ DESTDIR = $$PWD/../../../build/win32/$${BUILD_TYPE}/lib
DLLDESTDIR = $${DESTDIR}
}
diff --git a/demo/r1/demo_reports/categories.lrxml b/demo/r1/demo_reports/categories.lrxml
deleted file mode 100644
index 165a91e..0000000
--- a/demo/r1/demo_reports/categories.lrxml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
diff --git a/demo/r1/demo_reports/columns_demo.lrxml b/demo/r1/demo_reports/columns_demo.lrxml
deleted file mode 100644
index ad8a2ec..0000000
--- a/demo/r1/demo_reports/columns_demo.lrxml
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
diff --git a/demo/r1/demo_reports/demoReport1_report_header_group_subdetail.lrxml b/demo/r1/demo_reports/demoReport1_report_header_group_subdetail.lrxml
deleted file mode 100644
index e036b0e..0000000
--- a/demo/r1/demo_reports/demoReport1_report_header_group_subdetail.lrxml
+++ /dev/null
@@ -1,632 +0,0 @@
-
-
-
diff --git a/demo/r1/demo_reports/northwind.db b/demo/r1/demo_reports/northwind.db
deleted file mode 100644
index 42a4ef6..0000000
Binary files a/demo/r1/demo_reports/northwind.db and /dev/null differ
diff --git a/demo/r1/demo_reports/ordres_by_date.lrxml b/demo/r1/demo_reports/ordres_by_date.lrxml
deleted file mode 100644
index baf2cf9..0000000
--- a/demo/r1/demo_reports/ordres_by_date.lrxml
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
diff --git a/demo/r1/demo_reports/png/Beverage.png b/demo/r1/demo_reports/png/Beverage.png
deleted file mode 100644
index b818319..0000000
Binary files a/demo/r1/demo_reports/png/Beverage.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Condiments.png b/demo/r1/demo_reports/png/Condiments.png
deleted file mode 100644
index c658b6e..0000000
Binary files a/demo/r1/demo_reports/png/Condiments.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Confections.png b/demo/r1/demo_reports/png/Confections.png
deleted file mode 100644
index 11ca99c..0000000
Binary files a/demo/r1/demo_reports/png/Confections.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Confections1.png b/demo/r1/demo_reports/png/Confections1.png
deleted file mode 100644
index 55cc2e2..0000000
Binary files a/demo/r1/demo_reports/png/Confections1.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Confections2.png b/demo/r1/demo_reports/png/Confections2.png
deleted file mode 100644
index bc832a3..0000000
Binary files a/demo/r1/demo_reports/png/Confections2.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Dairy_Products.png b/demo/r1/demo_reports/png/Dairy_Products.png
deleted file mode 100644
index 3e9088b..0000000
Binary files a/demo/r1/demo_reports/png/Dairy_Products.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Grains_Cereals.png b/demo/r1/demo_reports/png/Grains_Cereals.png
deleted file mode 100644
index 10d43ca..0000000
Binary files a/demo/r1/demo_reports/png/Grains_Cereals.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Grains_Cereals1.png b/demo/r1/demo_reports/png/Grains_Cereals1.png
deleted file mode 100644
index 514e33a..0000000
Binary files a/demo/r1/demo_reports/png/Grains_Cereals1.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Meat_Poultry.png b/demo/r1/demo_reports/png/Meat_Poultry.png
deleted file mode 100644
index 3a1d2ef..0000000
Binary files a/demo/r1/demo_reports/png/Meat_Poultry.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Produce.png b/demo/r1/demo_reports/png/Produce.png
deleted file mode 100644
index 8955fe9..0000000
Binary files a/demo/r1/demo_reports/png/Produce.png and /dev/null differ
diff --git a/demo/r1/demo_reports/png/Seafood.png b/demo/r1/demo_reports/png/Seafood.png
deleted file mode 100644
index 88fd48e..0000000
Binary files a/demo/r1/demo_reports/png/Seafood.png and /dev/null differ
diff --git a/demo/r1/mainicon.rc b/demo/r1/mainicon.rc
deleted file mode 100644
index 83c0128..0000000
--- a/demo/r1/mainicon.rc
+++ /dev/null
@@ -1 +0,0 @@
-DI_ICON1 ICON "main.ico"
diff --git a/demo/r1/r1.pro b/demo/r1/r1.pro
deleted file mode 100644
index 98adb4c..0000000
--- a/demo/r1/r1.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-QT += core gui script sql
-greaterThan(QT_MAJOR_VERSION, 4){
- QT += widgets printsupport
- DEFINES += HAVE_QT5
-}
-TARGET = LRDemo
-TEMPLATE = app
-
-SOURCES += main.cpp\
- mainwindow.cpp
-
-HEADERS += mainwindow.h
-
-FORMS += mainwindow.ui
-
-INCLUDEPATH += $$PWD/../../include
-DEPENDPATH += $$PWD/../../include
-
-RESOURCES += \
- r1.qrc
-
-
-EXTRA_DIR += $$PWD/demo_reports/*
-
-CONFIG(release, debug|release){
- message(Release)
- BUILD_TYPE = release
-}else{
- message(Debug)
- BUILD_TYPE = debug
-}
-CONFIG -= app_bundle
-CONFIG += create_prl
-CONFIG += link_prl
-
-unix{
- UNIX_DIR = $$OUT_PWD/../build/unix
- DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo_reports
- MOC_DIR = $${DEST_DIR}/moc
- UI_DIR = $${DEST_DIR}/ui
- UI_HEADERS_DIR = $${DEST_DIR}/ui
- UI_SOURCES_DIR = $${DEST_DIR}/ui
- OBJECTS_DIR = $${DEST_DIR}/obj
- RCC_DIR = $${DEST_DIR}/rcc
-
- LIBS += -L$$PWD/../../lib/unix/$${BUILD_TYPE} -llimereport
- DESTDIR = $$DEST_DIR/bin
- QMAKE_POST_LINK += mkdir -p $$quote($$DESTDIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\n\t)
-}
-
-win32 {
- WIN32_DIR = $$OUT_PWD/../build/win32
- EXTRA_DIR ~= s,/,\\,g
-
- DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo_reports/
- DEST_DIR ~= s,/,\\,g
- MOC_DIR = $${DEST_DIR}/moc
- UI_DIR = $${DEST_DIR}/ui
- UI_HEADERS_DIR = $${DEST_DIR}/ui
- UI_SOURCES_DIR = $${DEST_DIR}/ui
- OBJECTS_DIR = $${DEST_DIR}/obj
- RCC_DIR = $${DEST_DIR}/rcc
-
- DESTDIR = $$DEST_DIR/bin
- RC_FILE += mainicon.rc
-
- QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\\n\\t)
- LIBS += -L$$PWD/../../lib/win32/$${BUILD_TYPE} -llimereport
-}
diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
new file mode 100644
index 0000000..779fb55
--- /dev/null
+++ b/demo_r1/demo_r1.pro
@@ -0,0 +1,74 @@
+QT += core gui script sql
+greaterThan(QT_MAJOR_VERSION, 4){
+ QT += widgets printsupport
+ DEFINES += HAVE_QT5
+}
+CONFIG -= app_bundle
+TARGET = LRDemo
+TEMPLATE = app
+
+SOURCES += main.cpp\
+ mainwindow.cpp
+
+HEADERS += mainwindow.h
+
+FORMS += mainwindow.ui
+
+INCLUDEPATH += $$PWD/../include
+DEPENDPATH += $$PWD/../include
+
+RESOURCES += \
+ r1.qrc
+
+
+EXTRA_DIR += $$PWD/demo_reports/*
+
+CONFIG(release, debug|release){
+ message(Release)
+ BUILD_TYPE = release
+}else{
+ message(Debug)
+ BUILD_TYPE = debug
+}
+
+unix{
+ UNIX_DIR = $$PWD/../build/unix
+ DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo_reports
+ MOC_DIR = $${OUT_PWD}/moc
+ UI_DIR = $${OUT_PWD}//ui
+ UI_HEADERS_DIR = $${OUT_PWD}//ui
+ UI_SOURCES_DIR = $${OUT_PWD}//ui
+ OBJECTS_DIR = $${OUT_PWD}//obj
+ RCC_DIR = $${OUT_PWD}//rcc
+
+ LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport
+ DESTDIR = $$DEST_DIR
+ QMAKE_POST_LINK += mkdir -p $$quote($$DESTDIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\n\t)
+ QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
+ QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
+ QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
+ QMAKE_LFLAGS_RPATH += #. .. ./libs
+ target.path = $${DEST_DIR}
+}
+
+win32 {
+ WIN32_DIR = $$PWD/../build/win32
+ EXTRA_DIR ~= s,/,\\,g
+
+ DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo_reports/
+ DEST_DIR ~= s,/,\\,g
+ MOC_DIR = $${OUT_PWD}/moc
+ UI_DIR = $${OUT_PWD}/ui
+ UI_HEADERS_DIR = $${OUT_PWD}/ui
+ UI_SOURCES_DIR = $${OUT_PWD}/ui
+ OBJECTS_DIR = $${OUT_PWD}/obj
+ RCC_DIR = $${OUT_PWD}/rcc
+
+ DESTDIR = $$DEST_DIR
+ RC_FILE += mainicon.rc
+
+ QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\\n\\t)
+ LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport
+}
+
+INSTALLS = target
diff --git a/demo/r1/images/logo.png b/demo_r1/images/logo.png
similarity index 100%
rename from demo/r1/images/logo.png
rename to demo_r1/images/logo.png
diff --git a/demo/r1/images/lr.png b/demo_r1/images/lr.png
similarity index 100%
rename from demo/r1/images/lr.png
rename to demo_r1/images/lr.png
diff --git a/demo/r1/lr1.ico b/demo_r1/lr1.ico
similarity index 100%
rename from demo/r1/lr1.ico
rename to demo_r1/lr1.ico
diff --git a/demo/r1/lr6.ico b/demo_r1/lr6.ico
similarity index 100%
rename from demo/r1/lr6.ico
rename to demo_r1/lr6.ico
diff --git a/demo/r1/main.cpp b/demo_r1/main.cpp
similarity index 100%
rename from demo/r1/main.cpp
rename to demo_r1/main.cpp
diff --git a/demo/r1/main.ico b/demo_r1/main.ico
similarity index 100%
rename from demo/r1/main.ico
rename to demo_r1/main.ico
diff --git a/demo/r1/mainwindow.cpp b/demo_r1/mainwindow.cpp
similarity index 100%
rename from demo/r1/mainwindow.cpp
rename to demo_r1/mainwindow.cpp
diff --git a/demo/r1/mainwindow.h b/demo_r1/mainwindow.h
similarity index 100%
rename from demo/r1/mainwindow.h
rename to demo_r1/mainwindow.h
diff --git a/demo/r1/mainwindow.ui b/demo_r1/mainwindow.ui
similarity index 100%
rename from demo/r1/mainwindow.ui
rename to demo_r1/mainwindow.ui
diff --git a/demo/r1/r1.qrc b/demo_r1/r1.qrc
similarity index 100%
rename from demo/r1/r1.qrc
rename to demo_r1/r1.qrc
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 591459e..0000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-release/*
-debug/*
-*.so.1.0.0.debug
-*.so.1.0.0
-/ReportGenerator.app/
diff --git a/limereport.pro b/limereport.pro
index e1d5a0f..319e7e8 100644
--- a/limereport.pro
+++ b/limereport.pro
@@ -1,75 +1,15 @@
-DEFINES += WITH_ZINT
-contains (DEFINES,WITH_ZINT){
- CONFIG +=zint
- include(3rdparty/3rdparty.pro)
+TEMPLATE = subdirs
+CONFIG += zint
+contains(CONFIG, zint){
+ SUBDIRS += 3rdparty
}
-include(report-lib.pri)
-TEMPLATE = lib
-QT += core xml sql script
-TARGET = limereport
+SUBDIRS += \
+ limereport
-DEFINES += LIMEREPORT_EXPORTS
+CONFIG += ordered
-CONFIG(release, debug|release){
- message(Release)
- BUILD_TYPE = release
-}else{
- message(Debug)
- BUILD_TYPE = debug
-}
-CONFIG += create_prl
-CONFIG += link_prl
+SUBDIRS += demo_r1
-EXTRA_FILES += \
- $$PWD/src/lrglobal.cpp \
- $$PWD/src/lrglobal.h \
- $$PWD/src/lrdatasourcemanagerintf.h \
- $$PWD/src/lrreportengine.h \
- $$PWD/src/lrscriptenginemanagerintf.h \
- $$PWD/src/lrcallbackdatasourceintf.h
-DEST_DIR = $$PWD/include/
-unix {
- for(FILE,EXTRA_FILES){
- QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}$$escape_expand(\n\t))
- }
- MOC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/moc
- UI_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
- UI_HEADERS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
- UI_SOURCES_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
- OBJECTS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/obj
- RCC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/rcc
- DESTDIR = $$PWD/lib/unix/$${BUILD_TYPE}
- for(FILE,EXTRA_FILES){
- QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include) $$escape_expand(\\n\\t)
- }
-
-}
-
-win32 {
- EXTRA_FILES ~= s,/,\\,g
- DEST_DIR ~= s,/,\\,g
- for(FILE,EXTRA_FILES){
- QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t)
- }
- MOC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/moc
- UI_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
- UI_HEADERS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
- UI_SOURCES_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
- OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj
- RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc
- DESTDIR = $$PWD/lib/win32/$${BUILD_TYPE}
-
-}
-
-DEPENDPATH += report report/bands report/base report/databrowser report/items report/objectinspector
-INCLUDEPATH += report report/bands report/base report/databrowser report/items report/objectinspector
-
-contains(DEFINES,WITH_ZINT){
-
- LIBS += -L$${DEST_DIR} -lQtZint
-}
-
-INSTALLS += target
diff --git a/src/bands/lrdataband.cpp b/limereport/bands/lrdataband.cpp
similarity index 100%
rename from src/bands/lrdataband.cpp
rename to limereport/bands/lrdataband.cpp
diff --git a/src/bands/lrdataband.h b/limereport/bands/lrdataband.h
similarity index 100%
rename from src/bands/lrdataband.h
rename to limereport/bands/lrdataband.h
diff --git a/src/bands/lrgroupbands.cpp b/limereport/bands/lrgroupbands.cpp
similarity index 100%
rename from src/bands/lrgroupbands.cpp
rename to limereport/bands/lrgroupbands.cpp
diff --git a/src/bands/lrgroupbands.h b/limereport/bands/lrgroupbands.h
similarity index 100%
rename from src/bands/lrgroupbands.h
rename to limereport/bands/lrgroupbands.h
diff --git a/src/bands/lrpagefooter.cpp b/limereport/bands/lrpagefooter.cpp
similarity index 100%
rename from src/bands/lrpagefooter.cpp
rename to limereport/bands/lrpagefooter.cpp
diff --git a/src/bands/lrpagefooter.h b/limereport/bands/lrpagefooter.h
similarity index 100%
rename from src/bands/lrpagefooter.h
rename to limereport/bands/lrpagefooter.h
diff --git a/src/bands/lrpageheader.cpp b/limereport/bands/lrpageheader.cpp
similarity index 100%
rename from src/bands/lrpageheader.cpp
rename to limereport/bands/lrpageheader.cpp
diff --git a/src/bands/lrpageheader.h b/limereport/bands/lrpageheader.h
similarity index 100%
rename from src/bands/lrpageheader.h
rename to limereport/bands/lrpageheader.h
diff --git a/src/bands/lrreportfooter.cpp b/limereport/bands/lrreportfooter.cpp
similarity index 100%
rename from src/bands/lrreportfooter.cpp
rename to limereport/bands/lrreportfooter.cpp
diff --git a/src/bands/lrreportfooter.h b/limereport/bands/lrreportfooter.h
similarity index 100%
rename from src/bands/lrreportfooter.h
rename to limereport/bands/lrreportfooter.h
diff --git a/src/bands/lrreportheader.cpp b/limereport/bands/lrreportheader.cpp
similarity index 100%
rename from src/bands/lrreportheader.cpp
rename to limereport/bands/lrreportheader.cpp
diff --git a/src/bands/lrreportheader.h b/limereport/bands/lrreportheader.h
similarity index 100%
rename from src/bands/lrreportheader.h
rename to limereport/bands/lrreportheader.h
diff --git a/src/bands/lrsubdetailband.cpp b/limereport/bands/lrsubdetailband.cpp
similarity index 100%
rename from src/bands/lrsubdetailband.cpp
rename to limereport/bands/lrsubdetailband.cpp
diff --git a/src/bands/lrsubdetailband.h b/limereport/bands/lrsubdetailband.h
similarity index 100%
rename from src/bands/lrsubdetailband.h
rename to limereport/bands/lrsubdetailband.h
diff --git a/src/base/lrattribsabstractfactory.h b/limereport/base/lrattribsabstractfactory.h
similarity index 100%
rename from src/base/lrattribsabstractfactory.h
rename to limereport/base/lrattribsabstractfactory.h
diff --git a/src/base/lrsimpleabstractfactory.h b/limereport/base/lrsimpleabstractfactory.h
similarity index 100%
rename from src/base/lrsimpleabstractfactory.h
rename to limereport/base/lrsimpleabstractfactory.h
diff --git a/src/base/lrsingleton.h b/limereport/base/lrsingleton.h
similarity index 100%
rename from src/base/lrsingleton.h
rename to limereport/base/lrsingleton.h
diff --git a/src/databrowser/images/add.png b/limereport/databrowser/images/add.png
similarity index 100%
rename from src/databrowser/images/add.png
rename to limereport/databrowser/images/add.png
diff --git a/src/databrowser/images/data.png b/limereport/databrowser/images/data.png
similarity index 100%
rename from src/databrowser/images/data.png
rename to limereport/databrowser/images/data.png
diff --git a/src/databrowser/images/data1.png b/limereport/databrowser/images/data1.png
similarity index 100%
rename from src/databrowser/images/data1.png
rename to limereport/databrowser/images/data1.png
diff --git a/src/databrowser/images/data_add.png b/limereport/databrowser/images/data_add.png
similarity index 100%
rename from src/databrowser/images/data_add.png
rename to limereport/databrowser/images/data_add.png
diff --git a/src/databrowser/images/data_add1.png b/limereport/databrowser/images/data_add1.png
similarity index 100%
rename from src/databrowser/images/data_add1.png
rename to limereport/databrowser/images/data_add1.png
diff --git a/src/databrowser/images/data_delete.png b/limereport/databrowser/images/data_delete.png
similarity index 100%
rename from src/databrowser/images/data_delete.png
rename to limereport/databrowser/images/data_delete.png
diff --git a/src/databrowser/images/data_delete1.png b/limereport/databrowser/images/data_delete1.png
similarity index 100%
rename from src/databrowser/images/data_delete1.png
rename to limereport/databrowser/images/data_delete1.png
diff --git a/src/databrowser/images/data_edit.png b/limereport/databrowser/images/data_edit.png
similarity index 100%
rename from src/databrowser/images/data_edit.png
rename to limereport/databrowser/images/data_edit.png
diff --git a/src/databrowser/images/data_edit1.png b/limereport/databrowser/images/data_edit1.png
similarity index 100%
rename from src/databrowser/images/data_edit1.png
rename to limereport/databrowser/images/data_edit1.png
diff --git a/src/databrowser/images/database_connect.png b/limereport/databrowser/images/database_connect.png
similarity index 100%
rename from src/databrowser/images/database_connect.png
rename to limereport/databrowser/images/database_connect.png
diff --git a/src/databrowser/images/database_connected.png b/limereport/databrowser/images/database_connected.png
similarity index 100%
rename from src/databrowser/images/database_connected.png
rename to limereport/databrowser/images/database_connected.png
diff --git a/src/databrowser/images/database_connected2.png b/limereport/databrowser/images/database_connected2.png
similarity index 100%
rename from src/databrowser/images/database_connected2.png
rename to limereport/databrowser/images/database_connected2.png
diff --git a/src/databrowser/images/database_connected3.png b/limereport/databrowser/images/database_connected3.png
similarity index 100%
rename from src/databrowser/images/database_connected3.png
rename to limereport/databrowser/images/database_connected3.png
diff --git a/src/databrowser/images/database_disconnect.png b/limereport/databrowser/images/database_disconnect.png
similarity index 100%
rename from src/databrowser/images/database_disconnect.png
rename to limereport/databrowser/images/database_disconnect.png
diff --git a/src/databrowser/images/edit_table.png b/limereport/databrowser/images/edit_table.png
similarity index 100%
rename from src/databrowser/images/edit_table.png
rename to limereport/databrowser/images/edit_table.png
diff --git a/src/databrowser/images/error_message.png b/limereport/databrowser/images/error_message.png
similarity index 100%
rename from src/databrowser/images/error_message.png
rename to limereport/databrowser/images/error_message.png
diff --git a/src/databrowser/images/error_message_2.png b/limereport/databrowser/images/error_message_2.png
similarity index 100%
rename from src/databrowser/images/error_message_2.png
rename to limereport/databrowser/images/error_message_2.png
diff --git a/src/databrowser/images/field.png b/limereport/databrowser/images/field.png
similarity index 100%
rename from src/databrowser/images/field.png
rename to limereport/databrowser/images/field.png
diff --git a/src/databrowser/images/plug-connect.png b/limereport/databrowser/images/plug-connect.png
similarity index 100%
rename from src/databrowser/images/plug-connect.png
rename to limereport/databrowser/images/plug-connect.png
diff --git a/src/databrowser/images/plug-disconnect.png b/limereport/databrowser/images/plug-disconnect.png
similarity index 100%
rename from src/databrowser/images/plug-disconnect.png
rename to limereport/databrowser/images/plug-disconnect.png
diff --git a/src/databrowser/images/remove.png b/limereport/databrowser/images/remove.png
similarity index 100%
rename from src/databrowser/images/remove.png
rename to limereport/databrowser/images/remove.png
diff --git a/src/databrowser/images/row.png b/limereport/databrowser/images/row.png
similarity index 100%
rename from src/databrowser/images/row.png
rename to limereport/databrowser/images/row.png
diff --git a/src/databrowser/images/table.png b/limereport/databrowser/images/table.png
similarity index 100%
rename from src/databrowser/images/table.png
rename to limereport/databrowser/images/table.png
diff --git a/src/databrowser/images/table_add.png b/limereport/databrowser/images/table_add.png
similarity index 100%
rename from src/databrowser/images/table_add.png
rename to limereport/databrowser/images/table_add.png
diff --git a/src/databrowser/images/table_delete.png b/limereport/databrowser/images/table_delete.png
similarity index 100%
rename from src/databrowser/images/table_delete.png
rename to limereport/databrowser/images/table_delete.png
diff --git a/src/databrowser/images/table_delete1.png b/limereport/databrowser/images/table_delete1.png
similarity index 100%
rename from src/databrowser/images/table_delete1.png
rename to limereport/databrowser/images/table_delete1.png
diff --git a/src/databrowser/images/table_edit.png b/limereport/databrowser/images/table_edit.png
similarity index 100%
rename from src/databrowser/images/table_edit.png
rename to limereport/databrowser/images/table_edit.png
diff --git a/src/databrowser/images/table_error.png b/limereport/databrowser/images/table_error.png
similarity index 100%
rename from src/databrowser/images/table_error.png
rename to limereport/databrowser/images/table_error.png
diff --git a/src/databrowser/images/table_error1.png b/limereport/databrowser/images/table_error1.png
similarity index 100%
rename from src/databrowser/images/table_error1.png
rename to limereport/databrowser/images/table_error1.png
diff --git a/src/databrowser/images/table_good.png b/limereport/databrowser/images/table_good.png
similarity index 100%
rename from src/databrowser/images/table_good.png
rename to limereport/databrowser/images/table_good.png
diff --git a/src/databrowser/images/table_good1.png b/limereport/databrowser/images/table_good1.png
similarity index 100%
rename from src/databrowser/images/table_good1.png
rename to limereport/databrowser/images/table_good1.png
diff --git a/src/databrowser/images/table_view.png b/limereport/databrowser/images/table_view.png
similarity index 100%
rename from src/databrowser/images/table_view.png
rename to limereport/databrowser/images/table_view.png
diff --git a/src/databrowser/images/table_view1.png b/limereport/databrowser/images/table_view1.png
similarity index 100%
rename from src/databrowser/images/table_view1.png
rename to limereport/databrowser/images/table_view1.png
diff --git a/src/databrowser/images/value.png b/limereport/databrowser/images/value.png
similarity index 100%
rename from src/databrowser/images/value.png
rename to limereport/databrowser/images/value.png
diff --git a/src/databrowser/images/value1.png b/limereport/databrowser/images/value1.png
similarity index 100%
rename from src/databrowser/images/value1.png
rename to limereport/databrowser/images/value1.png
diff --git a/src/databrowser/images/value_add.png b/limereport/databrowser/images/value_add.png
similarity index 100%
rename from src/databrowser/images/value_add.png
rename to limereport/databrowser/images/value_add.png
diff --git a/src/databrowser/images/value_add1.png b/limereport/databrowser/images/value_add1.png
similarity index 100%
rename from src/databrowser/images/value_add1.png
rename to limereport/databrowser/images/value_add1.png
diff --git a/src/databrowser/images/value_add2.png b/limereport/databrowser/images/value_add2.png
similarity index 100%
rename from src/databrowser/images/value_add2.png
rename to limereport/databrowser/images/value_add2.png
diff --git a/src/databrowser/images/value_delete.png b/limereport/databrowser/images/value_delete.png
similarity index 100%
rename from src/databrowser/images/value_delete.png
rename to limereport/databrowser/images/value_delete.png
diff --git a/src/databrowser/images/value_delete1.png b/limereport/databrowser/images/value_delete1.png
similarity index 100%
rename from src/databrowser/images/value_delete1.png
rename to limereport/databrowser/images/value_delete1.png
diff --git a/src/databrowser/images/value_edit.png b/limereport/databrowser/images/value_edit.png
similarity index 100%
rename from src/databrowser/images/value_edit.png
rename to limereport/databrowser/images/value_edit.png
diff --git a/src/databrowser/images/value_edit1.png b/limereport/databrowser/images/value_edit1.png
similarity index 100%
rename from src/databrowser/images/value_edit1.png
rename to limereport/databrowser/images/value_edit1.png
diff --git a/src/databrowser/images/value_edit2.png b/limereport/databrowser/images/value_edit2.png
similarity index 100%
rename from src/databrowser/images/value_edit2.png
rename to limereport/databrowser/images/value_edit2.png
diff --git a/src/databrowser/lrconnectiondialog.cpp b/limereport/databrowser/lrconnectiondialog.cpp
similarity index 100%
rename from src/databrowser/lrconnectiondialog.cpp
rename to limereport/databrowser/lrconnectiondialog.cpp
diff --git a/src/databrowser/lrconnectiondialog.h b/limereport/databrowser/lrconnectiondialog.h
similarity index 100%
rename from src/databrowser/lrconnectiondialog.h
rename to limereport/databrowser/lrconnectiondialog.h
diff --git a/src/databrowser/lrconnectiondialog.ui b/limereport/databrowser/lrconnectiondialog.ui
similarity index 100%
rename from src/databrowser/lrconnectiondialog.ui
rename to limereport/databrowser/lrconnectiondialog.ui
diff --git a/src/databrowser/lrdatabrowser.cpp b/limereport/databrowser/lrdatabrowser.cpp
similarity index 100%
rename from src/databrowser/lrdatabrowser.cpp
rename to limereport/databrowser/lrdatabrowser.cpp
diff --git a/src/databrowser/lrdatabrowser.h b/limereport/databrowser/lrdatabrowser.h
similarity index 100%
rename from src/databrowser/lrdatabrowser.h
rename to limereport/databrowser/lrdatabrowser.h
diff --git a/src/databrowser/lrdatabrowser.qrc b/limereport/databrowser/lrdatabrowser.qrc
similarity index 100%
rename from src/databrowser/lrdatabrowser.qrc
rename to limereport/databrowser/lrdatabrowser.qrc
diff --git a/src/databrowser/lrdatabrowser.ui b/limereport/databrowser/lrdatabrowser.ui
similarity index 100%
rename from src/databrowser/lrdatabrowser.ui
rename to limereport/databrowser/lrdatabrowser.ui
diff --git a/src/databrowser/lrdatabrowsertree.cpp b/limereport/databrowser/lrdatabrowsertree.cpp
similarity index 100%
rename from src/databrowser/lrdatabrowsertree.cpp
rename to limereport/databrowser/lrdatabrowsertree.cpp
diff --git a/src/databrowser/lrdatabrowsertree.h b/limereport/databrowser/lrdatabrowsertree.h
similarity index 100%
rename from src/databrowser/lrdatabrowsertree.h
rename to limereport/databrowser/lrdatabrowsertree.h
diff --git a/src/databrowser/lrsqleditdialog.cpp b/limereport/databrowser/lrsqleditdialog.cpp
similarity index 100%
rename from src/databrowser/lrsqleditdialog.cpp
rename to limereport/databrowser/lrsqleditdialog.cpp
diff --git a/src/databrowser/lrsqleditdialog.h b/limereport/databrowser/lrsqleditdialog.h
similarity index 100%
rename from src/databrowser/lrsqleditdialog.h
rename to limereport/databrowser/lrsqleditdialog.h
diff --git a/src/databrowser/lrsqleditdialog.ui b/limereport/databrowser/lrsqleditdialog.ui
similarity index 100%
rename from src/databrowser/lrsqleditdialog.ui
rename to limereport/databrowser/lrsqleditdialog.ui
diff --git a/src/databrowser/lrvariabledialog.cpp b/limereport/databrowser/lrvariabledialog.cpp
similarity index 100%
rename from src/databrowser/lrvariabledialog.cpp
rename to limereport/databrowser/lrvariabledialog.cpp
diff --git a/src/databrowser/lrvariabledialog.h b/limereport/databrowser/lrvariabledialog.h
similarity index 100%
rename from src/databrowser/lrvariabledialog.h
rename to limereport/databrowser/lrvariabledialog.h
diff --git a/src/databrowser/lrvariabledialog.ui b/limereport/databrowser/lrvariabledialog.ui
similarity index 100%
rename from src/databrowser/lrvariabledialog.ui
rename to limereport/databrowser/lrvariabledialog.ui
diff --git a/src/images/Control-Edit Box.png b/limereport/images/Control-Edit Box.png
similarity index 100%
rename from src/images/Control-Edit Box.png
rename to limereport/images/Control-Edit Box.png
diff --git a/src/images/Hourglass_80.png b/limereport/images/Hourglass_80.png
similarity index 100%
rename from src/images/Hourglass_80.png
rename to limereport/images/Hourglass_80.png
diff --git a/src/images/PDF2.png b/limereport/images/PDF2.png
similarity index 100%
rename from src/images/PDF2.png
rename to limereport/images/PDF2.png
diff --git a/src/images/addBand.png b/limereport/images/addBand.png
similarity index 100%
rename from src/images/addBand.png
rename to limereport/images/addBand.png
diff --git a/src/images/addBand1.png b/limereport/images/addBand1.png
similarity index 100%
rename from src/images/addBand1.png
rename to limereport/images/addBand1.png
diff --git a/src/images/allLines.png b/limereport/images/allLines.png
similarity index 100%
rename from src/images/allLines.png
rename to limereport/images/allLines.png
diff --git a/src/images/allLines1.png b/limereport/images/allLines1.png
similarity index 100%
rename from src/images/allLines1.png
rename to limereport/images/allLines1.png
diff --git a/src/images/barcode.png b/limereport/images/barcode.png
similarity index 100%
rename from src/images/barcode.png
rename to limereport/images/barcode.png
diff --git a/src/images/barcode2.png b/limereport/images/barcode2.png
similarity index 100%
rename from src/images/barcode2.png
rename to limereport/images/barcode2.png
diff --git a/src/images/bottomLine.png b/limereport/images/bottomLine.png
similarity index 100%
rename from src/images/bottomLine.png
rename to limereport/images/bottomLine.png
diff --git a/src/images/bottomLine1.png b/limereport/images/bottomLine1.png
similarity index 100%
rename from src/images/bottomLine1.png
rename to limereport/images/bottomLine1.png
diff --git a/src/images/bringToFront.png b/limereport/images/bringToFront.png
similarity index 100%
rename from src/images/bringToFront.png
rename to limereport/images/bringToFront.png
diff --git a/src/images/closebox.png b/limereport/images/closebox.png
similarity index 100%
rename from src/images/closebox.png
rename to limereport/images/closebox.png
diff --git a/src/images/copy.png b/limereport/images/copy.png
similarity index 100%
rename from src/images/copy.png
rename to limereport/images/copy.png
diff --git a/src/images/copy2.png b/limereport/images/copy2.png
similarity index 100%
rename from src/images/copy2.png
rename to limereport/images/copy2.png
diff --git a/src/images/copy24.png b/limereport/images/copy24.png
similarity index 100%
rename from src/images/copy24.png
rename to limereport/images/copy24.png
diff --git a/src/images/cpyright_logo.png b/limereport/images/cpyright_logo.png
similarity index 100%
rename from src/images/cpyright_logo.png
rename to limereport/images/cpyright_logo.png
diff --git a/src/images/cut.png b/limereport/images/cut.png
similarity index 100%
rename from src/images/cut.png
rename to limereport/images/cut.png
diff --git a/src/images/cut1.png b/limereport/images/cut1.png
similarity index 100%
rename from src/images/cut1.png
rename to limereport/images/cut1.png
diff --git a/src/images/cut24.png b/limereport/images/cut24.png
similarity index 100%
rename from src/images/cut24.png
rename to limereport/images/cut24.png
diff --git a/src/images/cut_24.png b/limereport/images/cut_24.png
similarity index 100%
rename from src/images/cut_24.png
rename to limereport/images/cut_24.png
diff --git a/src/images/dasabases.png b/limereport/images/dasabases.png
similarity index 100%
rename from src/images/dasabases.png
rename to limereport/images/dasabases.png
diff --git a/src/images/database.png b/limereport/images/database.png
similarity index 100%
rename from src/images/database.png
rename to limereport/images/database.png
diff --git a/src/images/delete.png b/limereport/images/delete.png
similarity index 100%
rename from src/images/delete.png
rename to limereport/images/delete.png
diff --git a/src/images/delete1.png b/limereport/images/delete1.png
similarity index 100%
rename from src/images/delete1.png
rename to limereport/images/delete1.png
diff --git a/src/images/design.png b/limereport/images/design.png
similarity index 100%
rename from src/images/design.png
rename to limereport/images/design.png
diff --git a/src/images/dialog-close.png b/limereport/images/dialog-close.png
similarity index 100%
rename from src/images/dialog-close.png
rename to limereport/images/dialog-close.png
diff --git a/src/images/dialog-close_red.png b/limereport/images/dialog-close_red.png
similarity index 100%
rename from src/images/dialog-close_red.png
rename to limereport/images/dialog-close_red.png
diff --git a/src/images/disk_blue.png b/limereport/images/disk_blue.png
similarity index 100%
rename from src/images/disk_blue.png
rename to limereport/images/disk_blue.png
diff --git a/src/images/document_add.png b/limereport/images/document_add.png
similarity index 100%
rename from src/images/document_add.png
rename to limereport/images/document_add.png
diff --git a/src/images/document_add_1.png b/limereport/images/document_add_1.png
similarity index 100%
rename from src/images/document_add_1.png
rename to limereport/images/document_add_1.png
diff --git a/src/images/document_zoom_in.png b/limereport/images/document_zoom_in.png
similarity index 100%
rename from src/images/document_zoom_in.png
rename to limereport/images/document_zoom_in.png
diff --git a/src/images/document_zoom_in_1.png b/limereport/images/document_zoom_in_1.png
similarity index 100%
rename from src/images/document_zoom_in_1.png
rename to limereport/images/document_zoom_in_1.png
diff --git a/src/images/document_zoom_out.png b/limereport/images/document_zoom_out.png
similarity index 100%
rename from src/images/document_zoom_out.png
rename to limereport/images/document_zoom_out.png
diff --git a/src/images/document_zoom_out_1.png b/limereport/images/document_zoom_out_1.png
similarity index 100%
rename from src/images/document_zoom_out_1.png
rename to limereport/images/document_zoom_out_1.png
diff --git a/src/images/edit-copy_1_24.png b/limereport/images/edit-copy_1_24.png
similarity index 100%
rename from src/images/edit-copy_1_24.png
rename to limereport/images/edit-copy_1_24.png
diff --git a/src/images/edit-paste_1_24.png b/limereport/images/edit-paste_1_24.png
similarity index 100%
rename from src/images/edit-paste_1_24.png
rename to limereport/images/edit-paste_1_24.png
diff --git a/src/images/edit.png b/limereport/images/edit.png
similarity index 100%
rename from src/images/edit.png
rename to limereport/images/edit.png
diff --git a/src/images/edit_control_24.png b/limereport/images/edit_control_24.png
similarity index 100%
rename from src/images/edit_control_24.png
rename to limereport/images/edit_control_24.png
diff --git a/src/images/edit_control_2_24.png b/limereport/images/edit_control_2_24.png
similarity index 100%
rename from src/images/edit_control_2_24.png
rename to limereport/images/edit_control_2_24.png
diff --git a/src/images/edit_control_3_24.png b/limereport/images/edit_control_3_24.png
similarity index 100%
rename from src/images/edit_control_3_24.png
rename to limereport/images/edit_control_3_24.png
diff --git a/src/images/edit_layout.png b/limereport/images/edit_layout.png
similarity index 100%
rename from src/images/edit_layout.png
rename to limereport/images/edit_layout.png
diff --git a/src/images/edit_layout_2_24.png b/limereport/images/edit_layout_2_24.png
similarity index 100%
rename from src/images/edit_layout_2_24.png
rename to limereport/images/edit_layout_2_24.png
diff --git a/src/images/edit_layout_3_24.png b/limereport/images/edit_layout_3_24.png
similarity index 100%
rename from src/images/edit_layout_3_24.png
rename to limereport/images/edit_layout_3_24.png
diff --git a/src/images/edit_layout_4_24.png b/limereport/images/edit_layout_4_24.png
similarity index 100%
rename from src/images/edit_layout_4_24.png
rename to limereport/images/edit_layout_4_24.png
diff --git a/src/images/edit_pecil2.png b/limereport/images/edit_pecil2.png
similarity index 100%
rename from src/images/edit_pecil2.png
rename to limereport/images/edit_pecil2.png
diff --git a/src/images/empty.png b/limereport/images/empty.png
similarity index 100%
rename from src/images/empty.png
rename to limereport/images/empty.png
diff --git a/src/images/errors.png b/limereport/images/errors.png
similarity index 100%
rename from src/images/errors.png
rename to limereport/images/errors.png
diff --git a/src/images/field.png b/limereport/images/field.png
similarity index 100%
rename from src/images/field.png
rename to limereport/images/field.png
diff --git a/src/images/first2.png b/limereport/images/first2.png
similarity index 100%
rename from src/images/first2.png
rename to limereport/images/first2.png
diff --git a/src/images/folder.png b/limereport/images/folder.png
similarity index 100%
rename from src/images/folder.png
rename to limereport/images/folder.png
diff --git a/src/images/folder1.png b/limereport/images/folder1.png
similarity index 100%
rename from src/images/folder1.png
rename to limereport/images/folder1.png
diff --git a/src/images/folder3.png b/limereport/images/folder3.png
similarity index 100%
rename from src/images/folder3.png
rename to limereport/images/folder3.png
diff --git a/src/images/function2.png b/limereport/images/function2.png
similarity index 100%
rename from src/images/function2.png
rename to limereport/images/function2.png
diff --git a/src/images/function3.png b/limereport/images/function3.png
similarity index 100%
rename from src/images/function3.png
rename to limereport/images/function3.png
diff --git a/src/images/go-next.png b/limereport/images/go-next.png
similarity index 100%
rename from src/images/go-next.png
rename to limereport/images/go-next.png
diff --git a/src/images/grid.png b/limereport/images/grid.png
similarity index 100%
rename from src/images/grid.png
rename to limereport/images/grid.png
diff --git a/src/images/hideLeftPanel.png b/limereport/images/hideLeftPanel.png
similarity index 100%
rename from src/images/hideLeftPanel.png
rename to limereport/images/hideLeftPanel.png
diff --git a/src/images/hideRightPanel.png b/limereport/images/hideRightPanel.png
similarity index 100%
rename from src/images/hideRightPanel.png
rename to limereport/images/hideRightPanel.png
diff --git a/src/images/hlayout.png b/limereport/images/hlayout.png
similarity index 100%
rename from src/images/hlayout.png
rename to limereport/images/hlayout.png
diff --git a/src/images/hlayuot_1_24.png b/limereport/images/hlayuot_1_24.png
similarity index 100%
rename from src/images/hlayuot_1_24.png
rename to limereport/images/hlayuot_1_24.png
diff --git a/src/images/hlayuot_2_24.png b/limereport/images/hlayuot_2_24.png
similarity index 100%
rename from src/images/hlayuot_2_24.png
rename to limereport/images/hlayuot_2_24.png
diff --git a/src/images/hlayuot_3_24.png b/limereport/images/hlayuot_3_24.png
similarity index 100%
rename from src/images/hlayuot_3_24.png
rename to limereport/images/hlayuot_3_24.png
diff --git a/src/images/last2.png b/limereport/images/last2.png
similarity index 100%
rename from src/images/last2.png
rename to limereport/images/last2.png
diff --git a/src/images/layuot_create.png b/limereport/images/layuot_create.png
similarity index 100%
rename from src/images/layuot_create.png
rename to limereport/images/layuot_create.png
diff --git a/src/images/layuot_create_24.png b/limereport/images/layuot_create_24.png
similarity index 100%
rename from src/images/layuot_create_24.png
rename to limereport/images/layuot_create_24.png
diff --git a/src/images/layuot_delete_24.png b/limereport/images/layuot_delete_24.png
similarity index 100%
rename from src/images/layuot_delete_24.png
rename to limereport/images/layuot_delete_24.png
diff --git a/src/images/layuot_move.png b/limereport/images/layuot_move.png
similarity index 100%
rename from src/images/layuot_move.png
rename to limereport/images/layuot_move.png
diff --git a/src/images/layuot_select.png b/limereport/images/layuot_select.png
similarity index 100%
rename from src/images/layuot_select.png
rename to limereport/images/layuot_select.png
diff --git a/src/images/layuot_select_24.png b/limereport/images/layuot_select_24.png
similarity index 100%
rename from src/images/layuot_select_24.png
rename to limereport/images/layuot_select_24.png
diff --git a/src/images/leftLine.png b/limereport/images/leftLine.png
similarity index 100%
rename from src/images/leftLine.png
rename to limereport/images/leftLine.png
diff --git a/src/images/leftLine1.png b/limereport/images/leftLine1.png
similarity index 100%
rename from src/images/leftLine1.png
rename to limereport/images/leftLine1.png
diff --git a/src/images/logo.png b/limereport/images/logo.png
similarity index 100%
rename from src/images/logo.png
rename to limereport/images/logo.png
diff --git a/src/images/logo_100.png b/limereport/images/logo_100.png
similarity index 100%
rename from src/images/logo_100.png
rename to limereport/images/logo_100.png
diff --git a/src/images/magnet.png b/limereport/images/magnet.png
similarity index 100%
rename from src/images/magnet.png
rename to limereport/images/magnet.png
diff --git a/src/images/main.png b/limereport/images/main.png
similarity index 100%
rename from src/images/main.png
rename to limereport/images/main.png
diff --git a/src/images/move_back.png b/limereport/images/move_back.png
similarity index 100%
rename from src/images/move_back.png
rename to limereport/images/move_back.png
diff --git a/src/images/move_top_1.png b/limereport/images/move_top_1.png
similarity index 100%
rename from src/images/move_top_1.png
rename to limereport/images/move_top_1.png
diff --git a/src/images/new_leaf.png b/limereport/images/new_leaf.png
similarity index 100%
rename from src/images/new_leaf.png
rename to limereport/images/new_leaf.png
diff --git a/src/images/new_leaf1.png b/limereport/images/new_leaf1.png
similarity index 100%
rename from src/images/new_leaf1.png
rename to limereport/images/new_leaf1.png
diff --git a/src/images/next.png b/limereport/images/next.png
similarity index 100%
rename from src/images/next.png
rename to limereport/images/next.png
diff --git a/src/images/next1.png b/limereport/images/next1.png
similarity index 100%
rename from src/images/next1.png
rename to limereport/images/next1.png
diff --git a/src/images/next2.png b/limereport/images/next2.png
similarity index 100%
rename from src/images/next2.png
rename to limereport/images/next2.png
diff --git a/src/images/noLines.png b/limereport/images/noLines.png
similarity index 100%
rename from src/images/noLines.png
rename to limereport/images/noLines.png
diff --git a/src/images/noLines1.png b/limereport/images/noLines1.png
similarity index 100%
rename from src/images/noLines1.png
rename to limereport/images/noLines1.png
diff --git a/src/images/paste.png b/limereport/images/paste.png
similarity index 100%
rename from src/images/paste.png
rename to limereport/images/paste.png
diff --git a/src/images/paste1.png b/limereport/images/paste1.png
similarity index 100%
rename from src/images/paste1.png
rename to limereport/images/paste1.png
diff --git a/src/images/paste_1_24.png b/limereport/images/paste_1_24.png
similarity index 100%
rename from src/images/paste_1_24.png
rename to limereport/images/paste_1_24.png
diff --git a/src/images/pin_green.png b/limereport/images/pin_green.png
similarity index 100%
rename from src/images/pin_green.png
rename to limereport/images/pin_green.png
diff --git a/src/images/prin-preview2.png b/limereport/images/prin-preview2.png
similarity index 100%
rename from src/images/prin-preview2.png
rename to limereport/images/prin-preview2.png
diff --git a/src/images/prin-preview_4_24.png b/limereport/images/prin-preview_4_24.png
similarity index 100%
rename from src/images/prin-preview_4_24.png
rename to limereport/images/prin-preview_4_24.png
diff --git a/src/images/print.png b/limereport/images/print.png
similarity index 100%
rename from src/images/print.png
rename to limereport/images/print.png
diff --git a/src/images/print2_big.png b/limereport/images/print2_big.png
similarity index 100%
rename from src/images/print2_big.png
rename to limereport/images/print2_big.png
diff --git a/src/images/print_2_24.png b/limereport/images/print_2_24.png
similarity index 100%
rename from src/images/print_2_24.png
rename to limereport/images/print_2_24.png
diff --git a/src/images/print_preview.png b/limereport/images/print_preview.png
similarity index 100%
rename from src/images/print_preview.png
rename to limereport/images/print_preview.png
diff --git a/src/images/print_preview1.png b/limereport/images/print_preview1.png
similarity index 100%
rename from src/images/print_preview1.png
rename to limereport/images/print_preview1.png
diff --git a/src/images/print_preview2.png b/limereport/images/print_preview2.png
similarity index 100%
rename from src/images/print_preview2.png
rename to limereport/images/print_preview2.png
diff --git a/src/images/prior.png b/limereport/images/prior.png
similarity index 100%
rename from src/images/prior.png
rename to limereport/images/prior.png
diff --git a/src/images/prior1.png b/limereport/images/prior1.png
similarity index 100%
rename from src/images/prior1.png
rename to limereport/images/prior1.png
diff --git a/src/images/prior2.png b/limereport/images/prior2.png
similarity index 100%
rename from src/images/prior2.png
rename to limereport/images/prior2.png
diff --git a/src/images/redo.png b/limereport/images/redo.png
similarity index 100%
rename from src/images/redo.png
rename to limereport/images/redo.png
diff --git a/src/images/redo1.png b/limereport/images/redo1.png
similarity index 100%
rename from src/images/redo1.png
rename to limereport/images/redo1.png
diff --git a/src/images/rightLine.png b/limereport/images/rightLine.png
similarity index 100%
rename from src/images/rightLine.png
rename to limereport/images/rightLine.png
diff --git a/src/images/rightLine1.png b/limereport/images/rightLine1.png
similarity index 100%
rename from src/images/rightLine1.png
rename to limereport/images/rightLine1.png
diff --git a/src/images/save.png b/limereport/images/save.png
similarity index 100%
rename from src/images/save.png
rename to limereport/images/save.png
diff --git a/src/images/save_as_1_24.png b/limereport/images/save_as_1_24.png
similarity index 100%
rename from src/images/save_as_1_24.png
rename to limereport/images/save_as_1_24.png
diff --git a/src/images/sendToBack.png b/limereport/images/sendToBack.png
similarity index 100%
rename from src/images/sendToBack.png
rename to limereport/images/sendToBack.png
diff --git a/src/images/settings.png b/limereport/images/settings.png
similarity index 100%
rename from src/images/settings.png
rename to limereport/images/settings.png
diff --git a/src/images/table1.png b/limereport/images/table1.png
similarity index 100%
rename from src/images/table1.png
rename to limereport/images/table1.png
diff --git a/src/images/text-align-botom.png b/limereport/images/text-align-botom.png
similarity index 100%
rename from src/images/text-align-botom.png
rename to limereport/images/text-align-botom.png
diff --git a/src/images/text-align-botom1.png b/limereport/images/text-align-botom1.png
similarity index 100%
rename from src/images/text-align-botom1.png
rename to limereport/images/text-align-botom1.png
diff --git a/src/images/text-align-justify.png b/limereport/images/text-align-justify.png
similarity index 100%
rename from src/images/text-align-justify.png
rename to limereport/images/text-align-justify.png
diff --git a/src/images/text-align-justify1.png b/limereport/images/text-align-justify1.png
similarity index 100%
rename from src/images/text-align-justify1.png
rename to limereport/images/text-align-justify1.png
diff --git a/src/images/text-align-top.png b/limereport/images/text-align-top.png
similarity index 100%
rename from src/images/text-align-top.png
rename to limereport/images/text-align-top.png
diff --git a/src/images/text-align-top1.png b/limereport/images/text-align-top1.png
similarity index 100%
rename from src/images/text-align-top1.png
rename to limereport/images/text-align-top1.png
diff --git a/src/images/text-align-v-center.png b/limereport/images/text-align-v-center.png
similarity index 100%
rename from src/images/text-align-v-center.png
rename to limereport/images/text-align-v-center.png
diff --git a/src/images/text-align-v-center1.png b/limereport/images/text-align-v-center1.png
similarity index 100%
rename from src/images/text-align-v-center1.png
rename to limereport/images/text-align-v-center1.png
diff --git a/src/images/text_align_center.png b/limereport/images/text_align_center.png
similarity index 100%
rename from src/images/text_align_center.png
rename to limereport/images/text_align_center.png
diff --git a/src/images/text_align_center1.png b/limereport/images/text_align_center1.png
similarity index 100%
rename from src/images/text_align_center1.png
rename to limereport/images/text_align_center1.png
diff --git a/src/images/text_align_left.png b/limereport/images/text_align_left.png
similarity index 100%
rename from src/images/text_align_left.png
rename to limereport/images/text_align_left.png
diff --git a/src/images/text_align_left1.png b/limereport/images/text_align_left1.png
similarity index 100%
rename from src/images/text_align_left1.png
rename to limereport/images/text_align_left1.png
diff --git a/src/images/text_align_right.png b/limereport/images/text_align_right.png
similarity index 100%
rename from src/images/text_align_right.png
rename to limereport/images/text_align_right.png
diff --git a/src/images/text_align_right1.png b/limereport/images/text_align_right1.png
similarity index 100%
rename from src/images/text_align_right1.png
rename to limereport/images/text_align_right1.png
diff --git a/src/images/text_bold.png b/limereport/images/text_bold.png
similarity index 100%
rename from src/images/text_bold.png
rename to limereport/images/text_bold.png
diff --git a/src/images/text_bold1.png b/limereport/images/text_bold1.png
similarity index 100%
rename from src/images/text_bold1.png
rename to limereport/images/text_bold1.png
diff --git a/src/images/text_italic.png b/limereport/images/text_italic.png
similarity index 100%
rename from src/images/text_italic.png
rename to limereport/images/text_italic.png
diff --git a/src/images/text_italic1.png b/limereport/images/text_italic1.png
similarity index 100%
rename from src/images/text_italic1.png
rename to limereport/images/text_italic1.png
diff --git a/src/images/text_underline.png b/limereport/images/text_underline.png
similarity index 100%
rename from src/images/text_underline.png
rename to limereport/images/text_underline.png
diff --git a/src/images/text_underline1.png b/limereport/images/text_underline1.png
similarity index 100%
rename from src/images/text_underline1.png
rename to limereport/images/text_underline1.png
diff --git a/src/images/toBack.png b/limereport/images/toBack.png
similarity index 100%
rename from src/images/toBack.png
rename to limereport/images/toBack.png
diff --git a/src/images/toBottom.png b/limereport/images/toBottom.png
similarity index 100%
rename from src/images/toBottom.png
rename to limereport/images/toBottom.png
diff --git a/src/images/toCenter.png b/limereport/images/toCenter.png
similarity index 100%
rename from src/images/toCenter.png
rename to limereport/images/toCenter.png
diff --git a/src/images/toFront.png b/limereport/images/toFront.png
similarity index 100%
rename from src/images/toFront.png
rename to limereport/images/toFront.png
diff --git a/src/images/toLeft1.png b/limereport/images/toLeft1.png
similarity index 100%
rename from src/images/toLeft1.png
rename to limereport/images/toLeft1.png
diff --git a/src/images/toRight.png b/limereport/images/toRight.png
similarity index 100%
rename from src/images/toRight.png
rename to limereport/images/toRight.png
diff --git a/src/images/toSameHeight.png b/limereport/images/toSameHeight.png
similarity index 100%
rename from src/images/toSameHeight.png
rename to limereport/images/toSameHeight.png
diff --git a/src/images/toSameWidth.png b/limereport/images/toSameWidth.png
similarity index 100%
rename from src/images/toSameWidth.png
rename to limereport/images/toSameWidth.png
diff --git a/src/images/toTop.png b/limereport/images/toTop.png
similarity index 100%
rename from src/images/toTop.png
rename to limereport/images/toTop.png
diff --git a/src/images/toVCernter.png b/limereport/images/toVCernter.png
similarity index 100%
rename from src/images/toVCernter.png
rename to limereport/images/toVCernter.png
diff --git a/src/images/to_bottom.png b/limereport/images/to_bottom.png
similarity index 100%
rename from src/images/to_bottom.png
rename to limereport/images/to_bottom.png
diff --git a/src/images/to_center.png b/limereport/images/to_center.png
similarity index 100%
rename from src/images/to_center.png
rename to limereport/images/to_center.png
diff --git a/src/images/to_h_center.png b/limereport/images/to_h_center.png
similarity index 100%
rename from src/images/to_h_center.png
rename to limereport/images/to_h_center.png
diff --git a/src/images/to_left.png b/limereport/images/to_left.png
similarity index 100%
rename from src/images/to_left.png
rename to limereport/images/to_left.png
diff --git a/src/images/to_right.png b/limereport/images/to_right.png
similarity index 100%
rename from src/images/to_right.png
rename to limereport/images/to_right.png
diff --git a/src/images/to_same_height.png b/limereport/images/to_same_height.png
similarity index 100%
rename from src/images/to_same_height.png
rename to limereport/images/to_same_height.png
diff --git a/src/images/to_same_width.png b/limereport/images/to_same_width.png
similarity index 100%
rename from src/images/to_same_width.png
rename to limereport/images/to_same_width.png
diff --git a/src/images/to_top.png b/limereport/images/to_top.png
similarity index 100%
rename from src/images/to_top.png
rename to limereport/images/to_top.png
diff --git a/src/images/topLine.png b/limereport/images/topLine.png
similarity index 100%
rename from src/images/topLine.png
rename to limereport/images/topLine.png
diff --git a/src/images/topLine1.png b/limereport/images/topLine1.png
similarity index 100%
rename from src/images/topLine1.png
rename to limereport/images/topLine1.png
diff --git a/src/images/undo.png b/limereport/images/undo.png
similarity index 100%
rename from src/images/undo.png
rename to limereport/images/undo.png
diff --git a/src/images/undo1.png b/limereport/images/undo1.png
similarity index 100%
rename from src/images/undo1.png
rename to limereport/images/undo1.png
diff --git a/src/images/value.png b/limereport/images/value.png
similarity index 100%
rename from src/images/value.png
rename to limereport/images/value.png
diff --git a/src/images/var1.png b/limereport/images/var1.png
similarity index 100%
rename from src/images/var1.png
rename to limereport/images/var1.png
diff --git a/src/images/variable.png b/limereport/images/variable.png
similarity index 100%
rename from src/images/variable.png
rename to limereport/images/variable.png
diff --git a/src/images/variable1.png b/limereport/images/variable1.png
similarity index 100%
rename from src/images/variable1.png
rename to limereport/images/variable1.png
diff --git a/src/images/vlayout.png b/limereport/images/vlayout.png
similarity index 100%
rename from src/images/vlayout.png
rename to limereport/images/vlayout.png
diff --git a/src/images/zoom-in_2_16.png b/limereport/images/zoom-in_2_16.png
similarity index 100%
rename from src/images/zoom-in_2_16.png
rename to limereport/images/zoom-in_2_16.png
diff --git a/src/images/zoom_in.png b/limereport/images/zoom_in.png
similarity index 100%
rename from src/images/zoom_in.png
rename to limereport/images/zoom_in.png
diff --git a/src/images/zoom_in1.png b/limereport/images/zoom_in1.png
similarity index 100%
rename from src/images/zoom_in1.png
rename to limereport/images/zoom_in1.png
diff --git a/src/images/zoom_out.png b/limereport/images/zoom_out.png
similarity index 100%
rename from src/images/zoom_out.png
rename to limereport/images/zoom_out.png
diff --git a/src/images/zoom_out1.png b/limereport/images/zoom_out1.png
similarity index 100%
rename from src/images/zoom_out1.png
rename to limereport/images/zoom_out1.png
diff --git a/src/items/editors/lrfonteditorwidget.cpp b/limereport/items/editors/lrfonteditorwidget.cpp
similarity index 100%
rename from src/items/editors/lrfonteditorwidget.cpp
rename to limereport/items/editors/lrfonteditorwidget.cpp
diff --git a/src/items/editors/lrfonteditorwidget.h b/limereport/items/editors/lrfonteditorwidget.h
similarity index 100%
rename from src/items/editors/lrfonteditorwidget.h
rename to limereport/items/editors/lrfonteditorwidget.h
diff --git a/src/items/editors/lritemeditorwidget.cpp b/limereport/items/editors/lritemeditorwidget.cpp
similarity index 100%
rename from src/items/editors/lritemeditorwidget.cpp
rename to limereport/items/editors/lritemeditorwidget.cpp
diff --git a/src/items/editors/lritemeditorwidget.h b/limereport/items/editors/lritemeditorwidget.h
similarity index 100%
rename from src/items/editors/lritemeditorwidget.h
rename to limereport/items/editors/lritemeditorwidget.h
diff --git a/src/items/editors/lritemsaligneditorwidget.cpp b/limereport/items/editors/lritemsaligneditorwidget.cpp
similarity index 100%
rename from src/items/editors/lritemsaligneditorwidget.cpp
rename to limereport/items/editors/lritemsaligneditorwidget.cpp
diff --git a/src/items/editors/lritemsaligneditorwidget.h b/limereport/items/editors/lritemsaligneditorwidget.h
similarity index 100%
rename from src/items/editors/lritemsaligneditorwidget.h
rename to limereport/items/editors/lritemsaligneditorwidget.h
diff --git a/src/items/editors/lritemsborderseditorwidget.cpp b/limereport/items/editors/lritemsborderseditorwidget.cpp
similarity index 100%
rename from src/items/editors/lritemsborderseditorwidget.cpp
rename to limereport/items/editors/lritemsborderseditorwidget.cpp
diff --git a/src/items/editors/lritemsborderseditorwidget.h b/limereport/items/editors/lritemsborderseditorwidget.h
similarity index 100%
rename from src/items/editors/lritemsborderseditorwidget.h
rename to limereport/items/editors/lritemsborderseditorwidget.h
diff --git a/src/items/editors/lrtextalignmenteditorwidget.cpp b/limereport/items/editors/lrtextalignmenteditorwidget.cpp
similarity index 100%
rename from src/items/editors/lrtextalignmenteditorwidget.cpp
rename to limereport/items/editors/lrtextalignmenteditorwidget.cpp
diff --git a/src/items/editors/lrtextalignmenteditorwidget.h b/limereport/items/editors/lrtextalignmenteditorwidget.h
similarity index 100%
rename from src/items/editors/lrtextalignmenteditorwidget.h
rename to limereport/items/editors/lrtextalignmenteditorwidget.h
diff --git a/src/items/images/DataBand.png b/limereport/items/images/DataBand.png
similarity index 100%
rename from src/items/images/DataBand.png
rename to limereport/items/images/DataBand.png
diff --git a/src/items/images/DataBand16.png b/limereport/items/images/DataBand16.png
similarity index 100%
rename from src/items/images/DataBand16.png
rename to limereport/items/images/DataBand16.png
diff --git a/src/items/images/GroupFooter16.png b/limereport/items/images/GroupFooter16.png
similarity index 100%
rename from src/items/images/GroupFooter16.png
rename to limereport/items/images/GroupFooter16.png
diff --git a/src/items/images/GroupHeader16.png b/limereport/items/images/GroupHeader16.png
similarity index 100%
rename from src/items/images/GroupHeader16.png
rename to limereport/items/images/GroupHeader16.png
diff --git a/src/items/images/PageFooter.png b/limereport/items/images/PageFooter.png
similarity index 100%
rename from src/items/images/PageFooter.png
rename to limereport/items/images/PageFooter.png
diff --git a/src/items/images/PageFooter16.png b/limereport/items/images/PageFooter16.png
similarity index 100%
rename from src/items/images/PageFooter16.png
rename to limereport/items/images/PageFooter16.png
diff --git a/src/items/images/PageHeader.png b/limereport/items/images/PageHeader.png
similarity index 100%
rename from src/items/images/PageHeader.png
rename to limereport/items/images/PageHeader.png
diff --git a/src/items/images/PageHeader16.png b/limereport/items/images/PageHeader16.png
similarity index 100%
rename from src/items/images/PageHeader16.png
rename to limereport/items/images/PageHeader16.png
diff --git a/src/items/images/ReportFooter.png b/limereport/items/images/ReportFooter.png
similarity index 100%
rename from src/items/images/ReportFooter.png
rename to limereport/items/images/ReportFooter.png
diff --git a/src/items/images/ReportFooter16.png b/limereport/items/images/ReportFooter16.png
similarity index 100%
rename from src/items/images/ReportFooter16.png
rename to limereport/items/images/ReportFooter16.png
diff --git a/src/items/images/ReportHeader.png b/limereport/items/images/ReportHeader.png
similarity index 100%
rename from src/items/images/ReportHeader.png
rename to limereport/items/images/ReportHeader.png
diff --git a/src/items/images/ReportHeader16.png b/limereport/items/images/ReportHeader16.png
similarity index 100%
rename from src/items/images/ReportHeader16.png
rename to limereport/items/images/ReportHeader16.png
diff --git a/src/items/images/ReportPage.png b/limereport/items/images/ReportPage.png
similarity index 100%
rename from src/items/images/ReportPage.png
rename to limereport/items/images/ReportPage.png
diff --git a/src/items/images/ReportPage16.png b/limereport/items/images/ReportPage16.png
similarity index 100%
rename from src/items/images/ReportPage16.png
rename to limereport/items/images/ReportPage16.png
diff --git a/src/items/images/SubDetailBand16.png b/limereport/items/images/SubDetailBand16.png
similarity index 100%
rename from src/items/images/SubDetailBand16.png
rename to limereport/items/images/SubDetailBand16.png
diff --git a/src/items/images/SubDetailFooterBand16.png b/limereport/items/images/SubDetailFooterBand16.png
similarity index 100%
rename from src/items/images/SubDetailFooterBand16.png
rename to limereport/items/images/SubDetailFooterBand16.png
diff --git a/src/items/images/SubDetailHeaderBand16.png b/limereport/items/images/SubDetailHeaderBand16.png
similarity index 100%
rename from src/items/images/SubDetailHeaderBand16.png
rename to limereport/items/images/SubDetailHeaderBand16.png
diff --git a/src/items/images/addBand1.png b/limereport/items/images/addBand1.png
similarity index 100%
rename from src/items/images/addBand1.png
rename to limereport/items/images/addBand1.png
diff --git a/src/items/images/barcode2.png b/limereport/items/images/barcode2.png
similarity index 100%
rename from src/items/images/barcode2.png
rename to limereport/items/images/barcode2.png
diff --git a/src/items/images/hlayout.png b/limereport/items/images/hlayout.png
similarity index 100%
rename from src/items/images/hlayout.png
rename to limereport/items/images/hlayout.png
diff --git a/src/items/images/hlayuot_3_24.png b/limereport/items/images/hlayuot_3_24.png
similarity index 100%
rename from src/items/images/hlayuot_3_24.png
rename to limereport/items/images/hlayuot_3_24.png
diff --git a/src/items/images/imageItem.png b/limereport/items/images/imageItem.png
similarity index 100%
rename from src/items/images/imageItem.png
rename to limereport/items/images/imageItem.png
diff --git a/src/items/images/imageItem1.png b/limereport/items/images/imageItem1.png
similarity index 100%
rename from src/items/images/imageItem1.png
rename to limereport/items/images/imageItem1.png
diff --git a/src/items/images/imageItem2.png b/limereport/items/images/imageItem2.png
similarity index 100%
rename from src/items/images/imageItem2.png
rename to limereport/items/images/imageItem2.png
diff --git a/src/items/images/insert-text.png b/limereport/items/images/insert-text.png
similarity index 100%
rename from src/items/images/insert-text.png
rename to limereport/items/images/insert-text.png
diff --git a/src/items/images/insert-text_2.png b/limereport/items/images/insert-text_2.png
similarity index 100%
rename from src/items/images/insert-text_2.png
rename to limereport/items/images/insert-text_2.png
diff --git a/src/items/images/insert-text_3.png b/limereport/items/images/insert-text_3.png
similarity index 100%
rename from src/items/images/insert-text_3.png
rename to limereport/items/images/insert-text_3.png
diff --git a/src/items/images/insert-text_5.png b/limereport/items/images/insert-text_5.png
similarity index 100%
rename from src/items/images/insert-text_5.png
rename to limereport/items/images/insert-text_5.png
diff --git a/src/items/images/settings.png b/limereport/items/images/settings.png
similarity index 100%
rename from src/items/images/settings.png
rename to limereport/items/images/settings.png
diff --git a/src/items/images/settings2.png b/limereport/items/images/settings2.png
similarity index 100%
rename from src/items/images/settings2.png
rename to limereport/items/images/settings2.png
diff --git a/src/items/images/shape2.png b/limereport/items/images/shape2.png
similarity index 100%
rename from src/items/images/shape2.png
rename to limereport/items/images/shape2.png
diff --git a/src/items/images/shape4.png b/limereport/items/images/shape4.png
similarity index 100%
rename from src/items/images/shape4.png
rename to limereport/items/images/shape4.png
diff --git a/src/items/images/shape5.png b/limereport/items/images/shape5.png
similarity index 100%
rename from src/items/images/shape5.png
rename to limereport/items/images/shape5.png
diff --git a/src/items/items.qrc b/limereport/items/items.qrc
similarity index 100%
rename from src/items/items.qrc
rename to limereport/items/items.qrc
diff --git a/src/items/lralignpropitem.cpp b/limereport/items/lralignpropitem.cpp
similarity index 100%
rename from src/items/lralignpropitem.cpp
rename to limereport/items/lralignpropitem.cpp
diff --git a/src/items/lralignpropitem.h b/limereport/items/lralignpropitem.h
similarity index 100%
rename from src/items/lralignpropitem.h
rename to limereport/items/lralignpropitem.h
diff --git a/src/items/lrbarcodeitem.cpp b/limereport/items/lrbarcodeitem.cpp
similarity index 100%
rename from src/items/lrbarcodeitem.cpp
rename to limereport/items/lrbarcodeitem.cpp
diff --git a/src/items/lrbarcodeitem.h b/limereport/items/lrbarcodeitem.h
similarity index 100%
rename from src/items/lrbarcodeitem.h
rename to limereport/items/lrbarcodeitem.h
diff --git a/src/items/lrhorizontallayout.cpp b/limereport/items/lrhorizontallayout.cpp
similarity index 100%
rename from src/items/lrhorizontallayout.cpp
rename to limereport/items/lrhorizontallayout.cpp
diff --git a/src/items/lrhorizontallayout.h b/limereport/items/lrhorizontallayout.h
similarity index 100%
rename from src/items/lrhorizontallayout.h
rename to limereport/items/lrhorizontallayout.h
diff --git a/src/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp
similarity index 100%
rename from src/items/lrimageitem.cpp
rename to limereport/items/lrimageitem.cpp
diff --git a/src/items/lrimageitem.h b/limereport/items/lrimageitem.h
similarity index 100%
rename from src/items/lrimageitem.h
rename to limereport/items/lrimageitem.h
diff --git a/src/items/lrshapeitem.cpp b/limereport/items/lrshapeitem.cpp
similarity index 100%
rename from src/items/lrshapeitem.cpp
rename to limereport/items/lrshapeitem.cpp
diff --git a/src/items/lrshapeitem.h b/limereport/items/lrshapeitem.h
similarity index 100%
rename from src/items/lrshapeitem.h
rename to limereport/items/lrshapeitem.h
diff --git a/src/items/lrsimpletagparser.cpp b/limereport/items/lrsimpletagparser.cpp
similarity index 100%
rename from src/items/lrsimpletagparser.cpp
rename to limereport/items/lrsimpletagparser.cpp
diff --git a/src/items/lrsimpletagparser.h b/limereport/items/lrsimpletagparser.h
similarity index 100%
rename from src/items/lrsimpletagparser.h
rename to limereport/items/lrsimpletagparser.h
diff --git a/src/items/lrsubitemparentpropitem.cpp b/limereport/items/lrsubitemparentpropitem.cpp
similarity index 100%
rename from src/items/lrsubitemparentpropitem.cpp
rename to limereport/items/lrsubitemparentpropitem.cpp
diff --git a/src/items/lrsubitemparentpropitem.h b/limereport/items/lrsubitemparentpropitem.h
similarity index 100%
rename from src/items/lrsubitemparentpropitem.h
rename to limereport/items/lrsubitemparentpropitem.h
diff --git a/src/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
similarity index 100%
rename from src/items/lrtextitem.cpp
rename to limereport/items/lrtextitem.cpp
diff --git a/src/items/lrtextitem.h b/limereport/items/lrtextitem.h
similarity index 100%
rename from src/items/lrtextitem.h
rename to limereport/items/lrtextitem.h
diff --git a/src/items/lrtextitemeditor.cpp b/limereport/items/lrtextitemeditor.cpp
similarity index 100%
rename from src/items/lrtextitemeditor.cpp
rename to limereport/items/lrtextitemeditor.cpp
diff --git a/src/items/lrtextitemeditor.h b/limereport/items/lrtextitemeditor.h
similarity index 100%
rename from src/items/lrtextitemeditor.h
rename to limereport/items/lrtextitemeditor.h
diff --git a/src/items/lrtextitemeditor.ui b/limereport/items/lrtextitemeditor.ui
similarity index 100%
rename from src/items/lrtextitemeditor.ui
rename to limereport/items/lrtextitemeditor.ui
diff --git a/report-lib.pri b/limereport/limereport.pro
similarity index 83%
rename from report-lib.pri
rename to limereport/limereport.pro
index f61d42c..6a2af27 100644
--- a/report-lib.pri
+++ b/limereport/limereport.pro
@@ -1,18 +1,9 @@
+TARGET = limereport
+TEMPLATE = lib
QT += script xml sql
-REPORT_PATH = $$PWD
-
-LIMEREPORT_VERSION_MAJOR = 1
-LIMEREPORT_VERSION_MINOR = 3
-LIMEREPORT_VERSION_RELEASE = 10
-
-LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
-DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
-DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION}
-
greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES+=HAVE_QT5
QT+= printsupport widgets
-
contains(QT,uitools){
message(uitools)
DEFINES += HAVE_UI_LOADER
@@ -26,9 +17,80 @@ lessThan(QT_MAJOR_VERSION, 5){
}
}
-DEFINES += INSPECT_BASEDESIGN
+CONFIG(release, debug|release){
+ message(Release)
+ BUILD_TYPE = release
+}else{
+ message(Debug)
+ BUILD_TYPE = debug
+}
+CONFIG += lib
+CONFIG += dll
+CONFIG += create_prl
+CONFIG += link_prl
+CONFIG -= app_bundle
-REPORT_PATH = $$PWD/src
+LIMEREPORT_VERSION_MAJOR = 1
+LIMEREPORT_VERSION_MINOR = 3
+LIMEREPORT_VERSION_RELEASE = 10
+LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
+
+DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
+DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION}
+
+DEFINES += INSPECT_BASEDESIGN
+DEFINES += LIMEREPORT_EXPORTS
+
+REPORT_PATH = $$PWD
+EXTRA_FILES += \
+ $$PWD/lrglobal.cpp \
+ $$PWD/lrglobal.h \
+ $$PWD/lrdatasourcemanagerintf.h \
+ $$PWD/lrreportengine.h \
+ $$PWD/lrscriptenginemanagerintf.h \
+ $$PWD/lrcallbackdatasourceintf.h
+
+DEST_DIR = $$PWD/../include/
+
+unix {
+ for(FILE,EXTRA_FILES){
+ QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}$$escape_expand(\n\t))
+ }
+ MOC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/moc
+ UI_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
+ UI_HEADERS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
+ UI_SOURCES_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
+ OBJECTS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/obj
+ RCC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/rcc
+ DESTDIR = $$PWD/../build/unix/$${BUILD_TYPE}/lib
+ for(FILE,EXTRA_FILES){
+ QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) | $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include/) $$escape_expand(\\n\\t)
+ }
+
+}
+
+win32 {
+ EXTRA_FILES ~= s,/,\\,g
+ DEST_DIR ~= s,/,\\,g
+ for(FILE,EXTRA_FILES){
+ QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t)
+ }
+ MOC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/moc
+ UI_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
+ UI_HEADERS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
+ UI_SOURCES_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
+ OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj
+ RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc
+ DESTDIR = $$PWD/../build/win32/$${BUILD_TYPE}/lib
+
+}
+
+DEPENDPATH += report report/bands report/base report/databrowser report/items report/objectinspector
+INCLUDEPATH += report report/bands report/base report/databrowser report/items report/objectinspector
+
+contains(CONFIG,zint){
+ LIBS += -L$${DEST_DIR} -lQtZint
+}
INCLUDEPATH += \
@@ -231,20 +293,19 @@ RESOURCES += \
$$REPORT_PATH/items/items.qrc
-TRANSLATIONS_PATH = $$PWD/translations
+
+
+#######
+####Automatically build required translation files (*.qm)
+TRANSLATIONS_PATH = $$PWD/../translations
TRANSLATIONS += $$TRANSLATIONS_PATH/limereport_ru.ts \
$$TRANSLATIONS_PATH/limereport_es_ES.ts
OTHER_FILES += $$TRANSLATIONS
-#######
-####Automatically build required translation files (*.qm)
all.depends = locale
-#QMAKE_EXTRA_TARGETS += all
-#"%.ts".commands = lupdate -ts $@ $<
-
-TRANSLATIONS_TARGETS = $$replace(TRANSLATIONS, ".ts", ".qm")
+TRANSLATIONS_TARGETS = $$replace(TRANSLATIONS, "\.ts", ".qm")
locale.depends = $$TRANSLATIONS_TARGETS
QMAKE_EXTRA_TARGETS += locale
@@ -255,3 +316,5 @@ QMAKE_EXTRA_TARGETS += "%.qm"
PRE_TARGETDEPS += locale
#### EN AUTOMATIC TRANSLATIONS
+
+#INSTALLS += target
diff --git a/src/lraboutdialog.cpp b/limereport/lraboutdialog.cpp
similarity index 100%
rename from src/lraboutdialog.cpp
rename to limereport/lraboutdialog.cpp
diff --git a/src/lraboutdialog.h b/limereport/lraboutdialog.h
similarity index 100%
rename from src/lraboutdialog.h
rename to limereport/lraboutdialog.h
diff --git a/src/lraboutdialog.ui b/limereport/lraboutdialog.ui
similarity index 100%
rename from src/lraboutdialog.ui
rename to limereport/lraboutdialog.ui
diff --git a/src/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
similarity index 100%
rename from src/lrbanddesignintf.cpp
rename to limereport/lrbanddesignintf.cpp
diff --git a/src/lrbanddesignintf.h b/limereport/lrbanddesignintf.h
similarity index 100%
rename from src/lrbanddesignintf.h
rename to limereport/lrbanddesignintf.h
diff --git a/src/lrbandsmanager.cpp b/limereport/lrbandsmanager.cpp
similarity index 100%
rename from src/lrbandsmanager.cpp
rename to limereport/lrbandsmanager.cpp
diff --git a/src/lrbandsmanager.h b/limereport/lrbandsmanager.h
similarity index 100%
rename from src/lrbandsmanager.h
rename to limereport/lrbandsmanager.h
diff --git a/src/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
similarity index 100%
rename from src/lrbasedesignintf.cpp
rename to limereport/lrbasedesignintf.cpp
diff --git a/src/lrbasedesignintf.h b/limereport/lrbasedesignintf.h
similarity index 100%
rename from src/lrbasedesignintf.h
rename to limereport/lrbasedesignintf.h
diff --git a/src/lrcallbackdatasourceintf.h b/limereport/lrcallbackdatasourceintf.h
similarity index 100%
rename from src/lrcallbackdatasourceintf.h
rename to limereport/lrcallbackdatasourceintf.h
diff --git a/src/lrcollection.h b/limereport/lrcollection.h
similarity index 100%
rename from src/lrcollection.h
rename to limereport/lrcollection.h
diff --git a/src/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
similarity index 100%
rename from src/lrdatadesignintf.cpp
rename to limereport/lrdatadesignintf.cpp
diff --git a/src/lrdatadesignintf.h b/limereport/lrdatadesignintf.h
similarity index 100%
rename from src/lrdatadesignintf.h
rename to limereport/lrdatadesignintf.h
diff --git a/src/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp
similarity index 100%
rename from src/lrdatasourcemanager.cpp
rename to limereport/lrdatasourcemanager.cpp
diff --git a/src/lrdatasourcemanager.h b/limereport/lrdatasourcemanager.h
similarity index 100%
rename from src/lrdatasourcemanager.h
rename to limereport/lrdatasourcemanager.h
diff --git a/src/lrdatasourcemanagerintf.h b/limereport/lrdatasourcemanagerintf.h
similarity index 100%
rename from src/lrdatasourcemanagerintf.h
rename to limereport/lrdatasourcemanagerintf.h
diff --git a/src/lrdesignelementsfactory.h b/limereport/lrdesignelementsfactory.h
similarity index 100%
rename from src/lrdesignelementsfactory.h
rename to limereport/lrdesignelementsfactory.h
diff --git a/src/lrglobal.cpp b/limereport/lrglobal.cpp
similarity index 100%
rename from src/lrglobal.cpp
rename to limereport/lrglobal.cpp
diff --git a/src/lrglobal.h b/limereport/lrglobal.h
similarity index 100%
rename from src/lrglobal.h
rename to limereport/lrglobal.h
diff --git a/src/lrgroupfunctions.cpp b/limereport/lrgroupfunctions.cpp
similarity index 100%
rename from src/lrgroupfunctions.cpp
rename to limereport/lrgroupfunctions.cpp
diff --git a/src/lrgroupfunctions.h b/limereport/lrgroupfunctions.h
similarity index 100%
rename from src/lrgroupfunctions.h
rename to limereport/lrgroupfunctions.h
diff --git a/src/lritemdesignintf.cpp b/limereport/lritemdesignintf.cpp
similarity index 100%
rename from src/lritemdesignintf.cpp
rename to limereport/lritemdesignintf.cpp
diff --git a/src/lritemdesignintf.h b/limereport/lritemdesignintf.h
similarity index 100%
rename from src/lritemdesignintf.h
rename to limereport/lritemdesignintf.h
diff --git a/src/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
similarity index 100%
rename from src/lrpagedesignintf.cpp
rename to limereport/lrpagedesignintf.cpp
diff --git a/src/lrpagedesignintf.h b/limereport/lrpagedesignintf.h
similarity index 100%
rename from src/lrpagedesignintf.h
rename to limereport/lrpagedesignintf.h
diff --git a/src/lrpageitemdesignintf.cpp b/limereport/lrpageitemdesignintf.cpp
similarity index 100%
rename from src/lrpageitemdesignintf.cpp
rename to limereport/lrpageitemdesignintf.cpp
diff --git a/src/lrpageitemdesignintf.h b/limereport/lrpageitemdesignintf.h
similarity index 100%
rename from src/lrpageitemdesignintf.h
rename to limereport/lrpageitemdesignintf.h
diff --git a/src/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp
similarity index 100%
rename from src/lrpreviewreportwindow.cpp
rename to limereport/lrpreviewreportwindow.cpp
diff --git a/src/lrpreviewreportwindow.h b/limereport/lrpreviewreportwindow.h
similarity index 100%
rename from src/lrpreviewreportwindow.h
rename to limereport/lrpreviewreportwindow.h
diff --git a/src/lrpreviewreportwindow.ui b/limereport/lrpreviewreportwindow.ui
similarity index 100%
rename from src/lrpreviewreportwindow.ui
rename to limereport/lrpreviewreportwindow.ui
diff --git a/src/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp
similarity index 100%
rename from src/lrreportdesignwidget.cpp
rename to limereport/lrreportdesignwidget.cpp
diff --git a/src/lrreportdesignwidget.h b/limereport/lrreportdesignwidget.h
similarity index 100%
rename from src/lrreportdesignwidget.h
rename to limereport/lrreportdesignwidget.h
diff --git a/src/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp
similarity index 100%
rename from src/lrreportdesignwindow.cpp
rename to limereport/lrreportdesignwindow.cpp
diff --git a/src/lrreportdesignwindow.h b/limereport/lrreportdesignwindow.h
similarity index 100%
rename from src/lrreportdesignwindow.h
rename to limereport/lrreportdesignwindow.h
diff --git a/src/lrreportengine.cpp b/limereport/lrreportengine.cpp
similarity index 100%
rename from src/lrreportengine.cpp
rename to limereport/lrreportengine.cpp
diff --git a/src/lrreportengine.h b/limereport/lrreportengine.h
similarity index 100%
rename from src/lrreportengine.h
rename to limereport/lrreportengine.h
diff --git a/src/lrreportengine_p.h b/limereport/lrreportengine_p.h
similarity index 100%
rename from src/lrreportengine_p.h
rename to limereport/lrreportengine_p.h
diff --git a/src/lrreportrender.cpp b/limereport/lrreportrender.cpp
similarity index 100%
rename from src/lrreportrender.cpp
rename to limereport/lrreportrender.cpp
diff --git a/src/lrreportrender.h b/limereport/lrreportrender.h
similarity index 100%
rename from src/lrreportrender.h
rename to limereport/lrreportrender.h
diff --git a/src/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
similarity index 100%
rename from src/lrscriptenginemanager.cpp
rename to limereport/lrscriptenginemanager.cpp
diff --git a/src/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h
similarity index 100%
rename from src/lrscriptenginemanager.h
rename to limereport/lrscriptenginemanager.h
diff --git a/src/lrscriptenginemanagerintf.h b/limereport/lrscriptenginemanagerintf.h
similarity index 100%
rename from src/lrscriptenginemanagerintf.h
rename to limereport/lrscriptenginemanagerintf.h
diff --git a/src/lrsettingdialog.cpp b/limereport/lrsettingdialog.cpp
similarity index 100%
rename from src/lrsettingdialog.cpp
rename to limereport/lrsettingdialog.cpp
diff --git a/src/lrsettingdialog.h b/limereport/lrsettingdialog.h
similarity index 100%
rename from src/lrsettingdialog.h
rename to limereport/lrsettingdialog.h
diff --git a/src/lrsettingdialog.ui b/limereport/lrsettingdialog.ui
similarity index 100%
rename from src/lrsettingdialog.ui
rename to limereport/lrsettingdialog.ui
diff --git a/src/lrsimplecrypt.cpp b/limereport/lrsimplecrypt.cpp
similarity index 100%
rename from src/lrsimplecrypt.cpp
rename to limereport/lrsimplecrypt.cpp
diff --git a/src/lrsimplecrypt.h b/limereport/lrsimplecrypt.h
similarity index 100%
rename from src/lrsimplecrypt.h
rename to limereport/lrsimplecrypt.h
diff --git a/src/lrvariablesholder.cpp b/limereport/lrvariablesholder.cpp
similarity index 100%
rename from src/lrvariablesholder.cpp
rename to limereport/lrvariablesholder.cpp
diff --git a/src/lrvariablesholder.h b/limereport/lrvariablesholder.h
similarity index 100%
rename from src/lrvariablesholder.h
rename to limereport/lrvariablesholder.h
diff --git a/src/objectinspector/editors/lrbuttonlineeditor.cpp b/limereport/objectinspector/editors/lrbuttonlineeditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrbuttonlineeditor.cpp
rename to limereport/objectinspector/editors/lrbuttonlineeditor.cpp
diff --git a/src/objectinspector/editors/lrbuttonlineeditor.h b/limereport/objectinspector/editors/lrbuttonlineeditor.h
similarity index 100%
rename from src/objectinspector/editors/lrbuttonlineeditor.h
rename to limereport/objectinspector/editors/lrbuttonlineeditor.h
diff --git a/src/objectinspector/editors/lrcheckboxeditor.cpp b/limereport/objectinspector/editors/lrcheckboxeditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrcheckboxeditor.cpp
rename to limereport/objectinspector/editors/lrcheckboxeditor.cpp
diff --git a/src/objectinspector/editors/lrcheckboxeditor.h b/limereport/objectinspector/editors/lrcheckboxeditor.h
similarity index 100%
rename from src/objectinspector/editors/lrcheckboxeditor.h
rename to limereport/objectinspector/editors/lrcheckboxeditor.h
diff --git a/src/objectinspector/editors/lrcoloreditor.cpp b/limereport/objectinspector/editors/lrcoloreditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrcoloreditor.cpp
rename to limereport/objectinspector/editors/lrcoloreditor.cpp
diff --git a/src/objectinspector/editors/lrcoloreditor.h b/limereport/objectinspector/editors/lrcoloreditor.h
similarity index 100%
rename from src/objectinspector/editors/lrcoloreditor.h
rename to limereport/objectinspector/editors/lrcoloreditor.h
diff --git a/src/objectinspector/editors/lrcomboboxeditor.cpp b/limereport/objectinspector/editors/lrcomboboxeditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrcomboboxeditor.cpp
rename to limereport/objectinspector/editors/lrcomboboxeditor.cpp
diff --git a/src/objectinspector/editors/lrcomboboxeditor.h b/limereport/objectinspector/editors/lrcomboboxeditor.h
similarity index 100%
rename from src/objectinspector/editors/lrcomboboxeditor.h
rename to limereport/objectinspector/editors/lrcomboboxeditor.h
diff --git a/src/objectinspector/editors/lrfonteditor.cpp b/limereport/objectinspector/editors/lrfonteditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrfonteditor.cpp
rename to limereport/objectinspector/editors/lrfonteditor.cpp
diff --git a/src/objectinspector/editors/lrfonteditor.h b/limereport/objectinspector/editors/lrfonteditor.h
similarity index 100%
rename from src/objectinspector/editors/lrfonteditor.h
rename to limereport/objectinspector/editors/lrfonteditor.h
diff --git a/src/objectinspector/editors/lrimageeditor.cpp b/limereport/objectinspector/editors/lrimageeditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrimageeditor.cpp
rename to limereport/objectinspector/editors/lrimageeditor.cpp
diff --git a/src/objectinspector/editors/lrimageeditor.h b/limereport/objectinspector/editors/lrimageeditor.h
similarity index 100%
rename from src/objectinspector/editors/lrimageeditor.h
rename to limereport/objectinspector/editors/lrimageeditor.h
diff --git a/src/objectinspector/editors/lrtextitempropertyeditor.cpp b/limereport/objectinspector/editors/lrtextitempropertyeditor.cpp
similarity index 100%
rename from src/objectinspector/editors/lrtextitempropertyeditor.cpp
rename to limereport/objectinspector/editors/lrtextitempropertyeditor.cpp
diff --git a/src/objectinspector/editors/lrtextitempropertyeditor.h b/limereport/objectinspector/editors/lrtextitempropertyeditor.h
similarity index 100%
rename from src/objectinspector/editors/lrtextitempropertyeditor.h
rename to limereport/objectinspector/editors/lrtextitempropertyeditor.h
diff --git a/src/objectinspector/editors/ltextitempropertyeditor.ui b/limereport/objectinspector/editors/ltextitempropertyeditor.ui
similarity index 100%
rename from src/objectinspector/editors/ltextitempropertyeditor.ui
rename to limereport/objectinspector/editors/ltextitempropertyeditor.ui
diff --git a/src/objectinspector/images/check.png b/limereport/objectinspector/images/check.png
similarity index 100%
rename from src/objectinspector/images/check.png
rename to limereport/objectinspector/images/check.png
diff --git a/src/objectinspector/images/check_w.png b/limereport/objectinspector/images/check_w.png
similarity index 100%
rename from src/objectinspector/images/check_w.png
rename to limereport/objectinspector/images/check_w.png
diff --git a/src/objectinspector/images/clear.png b/limereport/objectinspector/images/clear.png
similarity index 100%
rename from src/objectinspector/images/clear.png
rename to limereport/objectinspector/images/clear.png
diff --git a/src/objectinspector/images/edit_16.ico b/limereport/objectinspector/images/edit_16.ico
similarity index 100%
rename from src/objectinspector/images/edit_16.ico
rename to limereport/objectinspector/images/edit_16.ico
diff --git a/src/objectinspector/images/uncheck.png b/limereport/objectinspector/images/uncheck.png
similarity index 100%
rename from src/objectinspector/images/uncheck.png
rename to limereport/objectinspector/images/uncheck.png
diff --git a/src/objectinspector/images/uncheck_w.png b/limereport/objectinspector/images/uncheck_w.png
similarity index 100%
rename from src/objectinspector/images/uncheck_w.png
rename to limereport/objectinspector/images/uncheck_w.png
diff --git a/src/objectinspector/lobjectinspector.qrc b/limereport/objectinspector/lobjectinspector.qrc
similarity index 100%
rename from src/objectinspector/lobjectinspector.qrc
rename to limereport/objectinspector/lobjectinspector.qrc
diff --git a/src/objectinspector/lrbasedesignobjectmodel.cpp b/limereport/objectinspector/lrbasedesignobjectmodel.cpp
similarity index 100%
rename from src/objectinspector/lrbasedesignobjectmodel.cpp
rename to limereport/objectinspector/lrbasedesignobjectmodel.cpp
diff --git a/src/objectinspector/lrbasedesignobjectmodel.h b/limereport/objectinspector/lrbasedesignobjectmodel.h
similarity index 100%
rename from src/objectinspector/lrbasedesignobjectmodel.h
rename to limereport/objectinspector/lrbasedesignobjectmodel.h
diff --git a/src/objectinspector/lrobjectinspectorwidget.cpp b/limereport/objectinspector/lrobjectinspectorwidget.cpp
similarity index 100%
rename from src/objectinspector/lrobjectinspectorwidget.cpp
rename to limereport/objectinspector/lrobjectinspectorwidget.cpp
diff --git a/src/objectinspector/lrobjectinspectorwidget.h b/limereport/objectinspector/lrobjectinspectorwidget.h
similarity index 100%
rename from src/objectinspector/lrobjectinspectorwidget.h
rename to limereport/objectinspector/lrobjectinspectorwidget.h
diff --git a/src/objectinspector/lrobjectitemmodel.cpp b/limereport/objectinspector/lrobjectitemmodel.cpp
similarity index 100%
rename from src/objectinspector/lrobjectitemmodel.cpp
rename to limereport/objectinspector/lrobjectitemmodel.cpp
diff --git a/src/objectinspector/lrobjectitemmodel.h b/limereport/objectinspector/lrobjectitemmodel.h
similarity index 100%
rename from src/objectinspector/lrobjectitemmodel.h
rename to limereport/objectinspector/lrobjectitemmodel.h
diff --git a/src/objectinspector/lrobjectpropitem.cpp b/limereport/objectinspector/lrobjectpropitem.cpp
similarity index 100%
rename from src/objectinspector/lrobjectpropitem.cpp
rename to limereport/objectinspector/lrobjectpropitem.cpp
diff --git a/src/objectinspector/lrobjectpropitem.h b/limereport/objectinspector/lrobjectpropitem.h
similarity index 100%
rename from src/objectinspector/lrobjectpropitem.h
rename to limereport/objectinspector/lrobjectpropitem.h
diff --git a/src/objectinspector/lrpropertydelegate.cpp b/limereport/objectinspector/lrpropertydelegate.cpp
similarity index 100%
rename from src/objectinspector/lrpropertydelegate.cpp
rename to limereport/objectinspector/lrpropertydelegate.cpp
diff --git a/src/objectinspector/lrpropertydelegate.h b/limereport/objectinspector/lrpropertydelegate.h
similarity index 100%
rename from src/objectinspector/lrpropertydelegate.h
rename to limereport/objectinspector/lrpropertydelegate.h
diff --git a/src/objectinspector/propertyItems/lrboolpropitem.cpp b/limereport/objectinspector/propertyItems/lrboolpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrboolpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrboolpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrboolpropitem.h b/limereport/objectinspector/propertyItems/lrboolpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrboolpropitem.h
rename to limereport/objectinspector/propertyItems/lrboolpropitem.h
diff --git a/src/objectinspector/propertyItems/lrcolorpropitem.cpp b/limereport/objectinspector/propertyItems/lrcolorpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrcolorpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrcolorpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrcolorpropitem.h b/limereport/objectinspector/propertyItems/lrcolorpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrcolorpropitem.h
rename to limereport/objectinspector/propertyItems/lrcolorpropitem.h
diff --git a/src/objectinspector/propertyItems/lrcontentpropitem.cpp b/limereport/objectinspector/propertyItems/lrcontentpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrcontentpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrcontentpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrcontentpropitem.h b/limereport/objectinspector/propertyItems/lrcontentpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrcontentpropitem.h
rename to limereport/objectinspector/propertyItems/lrcontentpropitem.h
diff --git a/src/objectinspector/propertyItems/lrdatasourcepropitem.cpp b/limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrdatasourcepropitem.cpp
rename to limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrdatasourcepropitem.h b/limereport/objectinspector/propertyItems/lrdatasourcepropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrdatasourcepropitem.h
rename to limereport/objectinspector/propertyItems/lrdatasourcepropitem.h
diff --git a/src/objectinspector/propertyItems/lrenumpropitem.cpp b/limereport/objectinspector/propertyItems/lrenumpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrenumpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrenumpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrenumpropitem.h b/limereport/objectinspector/propertyItems/lrenumpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrenumpropitem.h
rename to limereport/objectinspector/propertyItems/lrenumpropitem.h
diff --git a/src/objectinspector/propertyItems/lrflagspropitem.cpp b/limereport/objectinspector/propertyItems/lrflagspropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrflagspropitem.cpp
rename to limereport/objectinspector/propertyItems/lrflagspropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrflagspropitem.h b/limereport/objectinspector/propertyItems/lrflagspropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrflagspropitem.h
rename to limereport/objectinspector/propertyItems/lrflagspropitem.h
diff --git a/src/objectinspector/propertyItems/lrfontpropitem.cpp b/limereport/objectinspector/propertyItems/lrfontpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrfontpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrfontpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrfontpropitem.h b/limereport/objectinspector/propertyItems/lrfontpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrfontpropitem.h
rename to limereport/objectinspector/propertyItems/lrfontpropitem.h
diff --git a/src/objectinspector/propertyItems/lrgroupfieldpropitem.cpp b/limereport/objectinspector/propertyItems/lrgroupfieldpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrgroupfieldpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrgroupfieldpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrgroupfieldpropitem.h b/limereport/objectinspector/propertyItems/lrgroupfieldpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrgroupfieldpropitem.h
rename to limereport/objectinspector/propertyItems/lrgroupfieldpropitem.h
diff --git a/src/objectinspector/propertyItems/lrimagepropitem.cpp b/limereport/objectinspector/propertyItems/lrimagepropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrimagepropitem.cpp
rename to limereport/objectinspector/propertyItems/lrimagepropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrimagepropitem.h b/limereport/objectinspector/propertyItems/lrimagepropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrimagepropitem.h
rename to limereport/objectinspector/propertyItems/lrimagepropitem.h
diff --git a/src/objectinspector/propertyItems/lrintpropitem.cpp b/limereport/objectinspector/propertyItems/lrintpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrintpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrintpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrintpropitem.h b/limereport/objectinspector/propertyItems/lrintpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrintpropitem.h
rename to limereport/objectinspector/propertyItems/lrintpropitem.h
diff --git a/src/objectinspector/propertyItems/lrqrealpropitem.cpp b/limereport/objectinspector/propertyItems/lrqrealpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrqrealpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrqrealpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrqrealpropitem.h b/limereport/objectinspector/propertyItems/lrqrealpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrqrealpropitem.h
rename to limereport/objectinspector/propertyItems/lrqrealpropitem.h
diff --git a/src/objectinspector/propertyItems/lrrectproptem.cpp b/limereport/objectinspector/propertyItems/lrrectproptem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrrectproptem.cpp
rename to limereport/objectinspector/propertyItems/lrrectproptem.cpp
diff --git a/src/objectinspector/propertyItems/lrrectproptem.h b/limereport/objectinspector/propertyItems/lrrectproptem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrrectproptem.h
rename to limereport/objectinspector/propertyItems/lrrectproptem.h
diff --git a/src/objectinspector/propertyItems/lrstringpropitem.cpp b/limereport/objectinspector/propertyItems/lrstringpropitem.cpp
similarity index 100%
rename from src/objectinspector/propertyItems/lrstringpropitem.cpp
rename to limereport/objectinspector/propertyItems/lrstringpropitem.cpp
diff --git a/src/objectinspector/propertyItems/lrstringpropitem.h b/limereport/objectinspector/propertyItems/lrstringpropitem.h
similarity index 100%
rename from src/objectinspector/propertyItems/lrstringpropitem.h
rename to limereport/objectinspector/propertyItems/lrstringpropitem.h
diff --git a/src/objectsbrowser/lrobjectbrowser.cpp b/limereport/objectsbrowser/lrobjectbrowser.cpp
similarity index 100%
rename from src/objectsbrowser/lrobjectbrowser.cpp
rename to limereport/objectsbrowser/lrobjectbrowser.cpp
diff --git a/src/objectsbrowser/lrobjectbrowser.h b/limereport/objectsbrowser/lrobjectbrowser.h
similarity index 100%
rename from src/objectsbrowser/lrobjectbrowser.h
rename to limereport/objectsbrowser/lrobjectbrowser.h
diff --git a/src/report.qrc b/limereport/report.qrc
similarity index 100%
rename from src/report.qrc
rename to limereport/report.qrc
diff --git a/src/serializators/lrserializatorintf.h b/limereport/serializators/lrserializatorintf.h
similarity index 100%
rename from src/serializators/lrserializatorintf.h
rename to limereport/serializators/lrserializatorintf.h
diff --git a/src/serializators/lrstorageintf.h b/limereport/serializators/lrstorageintf.h
similarity index 100%
rename from src/serializators/lrstorageintf.h
rename to limereport/serializators/lrstorageintf.h
diff --git a/src/serializators/lrxmlbasetypesserializators.cpp b/limereport/serializators/lrxmlbasetypesserializators.cpp
similarity index 100%
rename from src/serializators/lrxmlbasetypesserializators.cpp
rename to limereport/serializators/lrxmlbasetypesserializators.cpp
diff --git a/src/serializators/lrxmlbasetypesserializators.h b/limereport/serializators/lrxmlbasetypesserializators.h
similarity index 100%
rename from src/serializators/lrxmlbasetypesserializators.h
rename to limereport/serializators/lrxmlbasetypesserializators.h
diff --git a/src/serializators/lrxmlqrectserializator.cpp b/limereport/serializators/lrxmlqrectserializator.cpp
similarity index 100%
rename from src/serializators/lrxmlqrectserializator.cpp
rename to limereport/serializators/lrxmlqrectserializator.cpp
diff --git a/src/serializators/lrxmlqrectserializator.h b/limereport/serializators/lrxmlqrectserializator.h
similarity index 100%
rename from src/serializators/lrxmlqrectserializator.h
rename to limereport/serializators/lrxmlqrectserializator.h
diff --git a/src/serializators/lrxmlreader.cpp b/limereport/serializators/lrxmlreader.cpp
similarity index 100%
rename from src/serializators/lrxmlreader.cpp
rename to limereport/serializators/lrxmlreader.cpp
diff --git a/src/serializators/lrxmlreader.h b/limereport/serializators/lrxmlreader.h
similarity index 100%
rename from src/serializators/lrxmlreader.h
rename to limereport/serializators/lrxmlreader.h
diff --git a/src/serializators/lrxmlserializatorsfactory.h b/limereport/serializators/lrxmlserializatorsfactory.h
similarity index 100%
rename from src/serializators/lrxmlserializatorsfactory.h
rename to limereport/serializators/lrxmlserializatorsfactory.h
diff --git a/src/serializators/lrxmlwriter.cpp b/limereport/serializators/lrxmlwriter.cpp
similarity index 100%
rename from src/serializators/lrxmlwriter.cpp
rename to limereport/serializators/lrxmlwriter.cpp
diff --git a/src/serializators/lrxmlwriter.h b/limereport/serializators/lrxmlwriter.h
similarity index 100%
rename from src/serializators/lrxmlwriter.h
rename to limereport/serializators/lrxmlwriter.h
diff --git a/qzint.pri b/qzint.pri
deleted file mode 100644
index 51a6a50..0000000
--- a/qzint.pri
+++ /dev/null
@@ -1,64 +0,0 @@
-DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$ZINT_VERSION\\\" NO_PNG
-
-!contains(DEFINES, NO_PNG) {
- LIBS += -lpng
-}
-
-INCLUDEPATH += \
- $$ZINT_PATH/backend \
- $$ZINT_PATH/backend_qt4
-
-HEADERS += $$ZINT_PATH/backend/aztec.h \
- $$ZINT_PATH/backend/code1.h \
- $$ZINT_PATH/backend/code49.h \
- $$ZINT_PATH/backend/common.h \
- $$ZINT_PATH/backend/composite.h \
- $$ZINT_PATH/backend/dmatrix.h \
- $$ZINT_PATH/backend/font.h \
- $$ZINT_PATH/backend/gb2312.h \
- $$ZINT_PATH/backend/gridmtx.h \
- $$ZINT_PATH/backend/gs1.h \
- $$ZINT_PATH/backend/large.h \
- $$ZINT_PATH/backend/maxicode.h \
- $$ZINT_PATH/backend/maxipng.h \
- $$ZINT_PATH/backend/ms_stdint.h \
- $$ZINT_PATH/backend/pdf417.h \
- $$ZINT_PATH/backend/qr.h \
- $$ZINT_PATH/backend/reedsol.h \
- $$ZINT_PATH/backend/rss.h \
- $$ZINT_PATH/backend/sjis.h \
- $$ZINT_PATH/backend/zint.h \
- $$ZINT_PATH/backend_qt4/qzint.h
-
-SOURCES += $$ZINT_PATH/backend/2of5.c \
- $$ZINT_PATH/backend/auspost.c \
- $$ZINT_PATH/backend/aztec.c \
- $$ZINT_PATH/backend/code.c \
- $$ZINT_PATH/backend/code1.c \
- $$ZINT_PATH/backend/code128.c \
- $$ZINT_PATH/backend/code16k.c \
- $$ZINT_PATH/backend/code49.c \
- $$ZINT_PATH/backend/common.c \
- $$ZINT_PATH/backend/composite.c \
- $$ZINT_PATH/backend/dmatrix.c \
- $$ZINT_PATH/backend/gridmtx.c \
- $$ZINT_PATH/backend/gs1.c \
- $$ZINT_PATH/backend/imail.c \
- $$ZINT_PATH/backend/large.c \
- $$ZINT_PATH/backend/library.c \
- $$ZINT_PATH/backend/maxicode.c \
- $$ZINT_PATH/backend/medical.c \
- $$ZINT_PATH/backend/pdf417.c \
- $$ZINT_PATH/backend/plessey.c \
- $$ZINT_PATH/backend/postal.c \
- $$ZINT_PATH/backend/ps.c \
- $$ZINT_PATH/backend/qr.c \
- $$ZINT_PATH/backend/reedsol.c \
- $$ZINT_PATH/backend/render.c \
- $$ZINT_PATH/backend/rss.c \
- $$ZINT_PATH/backend/svg.c \
- $$ZINT_PATH/backend/telepen.c \
- $$ZINT_PATH/backend/upcean.c \
- $$ZINT_PATH/backend/dllversion.c \
- $$ZINT_PATH/backend/png.c \
- $$ZINT_PATH/backend_qt4/qzint.cpp
diff --git a/src/acollection.cpp b/src/acollection.cpp
deleted file mode 100644
index 5682a2b..0000000
--- a/src/acollection.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include "acollection.h"
diff --git a/src/areportpreviewwidget.h b/src/areportpreviewwidget.h
deleted file mode 100644
index d36294e..0000000
--- a/src/areportpreviewwidget.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#ifndef AREPORTPREVIEWINTF_H
-#define AREPORTPREVIEWINTF_H
-
-#include
-#include
-
-namespace ArReport{
-
-class ReportPreviewWidgetIntf : public QWidget
-{
- Q_OBJECT
-public:
- explicit ReportPreviewWidgetIntf(QWidget *parent=0);
-private:
- QGraphicsView* m_view;
-};
-
-}
-#endif // AREPORTPREVIEWINTF_H
diff --git a/src/databrowser/images/check.png b/src/databrowser/images/check.png
deleted file mode 100644
index 3bde53b..0000000
Binary files a/src/databrowser/images/check.png and /dev/null differ
diff --git a/src/databrowser/images/check_circle.png b/src/databrowser/images/check_circle.png
deleted file mode 100644
index 7fe467b..0000000
Binary files a/src/databrowser/images/check_circle.png and /dev/null differ
diff --git a/src/databrowser/images/cursor-small.png b/src/databrowser/images/cursor-small.png
deleted file mode 100644
index 7643a54..0000000
Binary files a/src/databrowser/images/cursor-small.png and /dev/null differ
diff --git a/src/databrowser/images/error.png b/src/databrowser/images/error.png
deleted file mode 100644
index 9cee887..0000000
Binary files a/src/databrowser/images/error.png and /dev/null differ
diff --git a/src/databrowser/images/greenled.png b/src/databrowser/images/greenled.png
deleted file mode 100644
index 0e10788..0000000
Binary files a/src/databrowser/images/greenled.png and /dev/null differ
diff --git a/src/databrowser/images/note_edit.png b/src/databrowser/images/note_edit.png
deleted file mode 100644
index c199961..0000000
Binary files a/src/databrowser/images/note_edit.png and /dev/null differ
diff --git a/src/databrowser/images/plug-disconnect-slash.png b/src/databrowser/images/plug-disconnect-slash.png
deleted file mode 100644
index 6010982..0000000
Binary files a/src/databrowser/images/plug-disconnect-slash.png and /dev/null differ
diff --git a/src/databrowser/images/pointer.png b/src/databrowser/images/pointer.png
deleted file mode 100644
index ea87a66..0000000
Binary files a/src/databrowser/images/pointer.png and /dev/null differ
diff --git a/src/databrowser/images/table_db.png b/src/databrowser/images/table_db.png
deleted file mode 100644
index fa41658..0000000
Binary files a/src/databrowser/images/table_db.png and /dev/null differ
diff --git a/src/images/PDF1.png b/src/images/PDF1.png
deleted file mode 100644
index 3caba4e..0000000
Binary files a/src/images/PDF1.png and /dev/null differ
diff --git a/src/images/barcode1.png b/src/images/barcode1.png
deleted file mode 100644
index 3360dd8..0000000
Binary files a/src/images/barcode1.png and /dev/null differ
diff --git a/src/images/barcode3_16.png b/src/images/barcode3_16.png
deleted file mode 100644
index 80d9397..0000000
Binary files a/src/images/barcode3_16.png and /dev/null differ
diff --git a/src/images/barcode3_24.png b/src/images/barcode3_24.png
deleted file mode 100644
index 10fd139..0000000
Binary files a/src/images/barcode3_24.png and /dev/null differ
diff --git a/src/images/copy16.png b/src/images/copy16.png
deleted file mode 100644
index 9c71808..0000000
Binary files a/src/images/copy16.png and /dev/null differ
diff --git a/src/images/copy_2_16.png b/src/images/copy_2_16.png
deleted file mode 100644
index db1d9fb..0000000
Binary files a/src/images/copy_2_16.png and /dev/null differ
diff --git a/src/images/copy_2_24.png b/src/images/copy_2_24.png
deleted file mode 100644
index 9f556a0..0000000
Binary files a/src/images/copy_2_24.png and /dev/null differ
diff --git a/src/images/cut16.png b/src/images/cut16.png
deleted file mode 100644
index edd1844..0000000
Binary files a/src/images/cut16.png and /dev/null differ
diff --git a/src/images/cut_1_24.png b/src/images/cut_1_24.png
deleted file mode 100644
index 62af544..0000000
Binary files a/src/images/cut_1_24.png and /dev/null differ
diff --git a/src/images/document-new_16.png b/src/images/document-new_16.png
deleted file mode 100644
index d3661a1..0000000
Binary files a/src/images/document-new_16.png and /dev/null differ
diff --git a/src/images/document-new_24.png b/src/images/document-new_24.png
deleted file mode 100644
index 5df5bd4..0000000
Binary files a/src/images/document-new_24.png and /dev/null differ
diff --git a/src/images/document_delete_16.png b/src/images/document_delete_16.png
deleted file mode 100644
index f4fb311..0000000
Binary files a/src/images/document_delete_16.png and /dev/null differ
diff --git a/src/images/document_delete_24.png b/src/images/document_delete_24.png
deleted file mode 100644
index 8199e63..0000000
Binary files a/src/images/document_delete_24.png and /dev/null differ
diff --git a/src/images/edit-copy_1_16.png b/src/images/edit-copy_1_16.png
deleted file mode 100644
index 8dd48c4..0000000
Binary files a/src/images/edit-copy_1_16.png and /dev/null differ
diff --git a/src/images/edit-paste_1_16.png b/src/images/edit-paste_1_16.png
deleted file mode 100644
index b0fa070..0000000
Binary files a/src/images/edit-paste_1_16.png and /dev/null differ
diff --git a/src/images/edit-paste_2_24.png b/src/images/edit-paste_2_24.png
deleted file mode 100644
index cc8b1bd..0000000
Binary files a/src/images/edit-paste_2_24.png and /dev/null differ
diff --git a/src/images/edit_cursor.png b/src/images/edit_cursor.png
deleted file mode 100644
index 21070fb..0000000
Binary files a/src/images/edit_cursor.png and /dev/null differ
diff --git a/src/images/edit_pencil.png b/src/images/edit_pencil.png
deleted file mode 100644
index c2b75d9..0000000
Binary files a/src/images/edit_pencil.png and /dev/null differ
diff --git a/src/images/function.png b/src/images/function.png
deleted file mode 100644
index 65186bd..0000000
Binary files a/src/images/function.png and /dev/null differ
diff --git a/src/images/hourglass.png b/src/images/hourglass.png
deleted file mode 100644
index 2cb94c7..0000000
Binary files a/src/images/hourglass.png and /dev/null differ
diff --git a/src/images/insert-text_16.png b/src/images/insert-text_16.png
deleted file mode 100644
index 0a1b7d0..0000000
Binary files a/src/images/insert-text_16.png and /dev/null differ
diff --git a/src/images/insert-text_1_24.png b/src/images/insert-text_1_24.png
deleted file mode 100644
index e5c6841..0000000
Binary files a/src/images/insert-text_1_24.png and /dev/null differ
diff --git a/src/images/insert-text_24.png b/src/images/insert-text_24.png
deleted file mode 100644
index de6c75f..0000000
Binary files a/src/images/insert-text_24.png and /dev/null differ
diff --git a/src/images/main.ico b/src/images/main.ico
deleted file mode 100644
index 7f11705..0000000
Binary files a/src/images/main.ico and /dev/null differ
diff --git a/src/images/new_1_16.png b/src/images/new_1_16.png
deleted file mode 100644
index 27e02bd..0000000
Binary files a/src/images/new_1_16.png and /dev/null differ
diff --git a/src/images/new_1_24.png b/src/images/new_1_24.png
deleted file mode 100644
index efa2da7..0000000
Binary files a/src/images/new_1_24.png and /dev/null differ
diff --git a/src/images/paste16.png b/src/images/paste16.png
deleted file mode 100644
index a4e0a02..0000000
Binary files a/src/images/paste16.png and /dev/null differ
diff --git a/src/images/paste24.png b/src/images/paste24.png
deleted file mode 100644
index bd6fe40..0000000
Binary files a/src/images/paste24.png and /dev/null differ
diff --git a/src/images/prin-preview_2.png b/src/images/prin-preview_2.png
deleted file mode 100644
index 6c6c63e..0000000
Binary files a/src/images/prin-preview_2.png and /dev/null differ
diff --git a/src/images/prin-preview_3.png b/src/images/prin-preview_3.png
deleted file mode 100644
index 370f695..0000000
Binary files a/src/images/prin-preview_3.png and /dev/null differ
diff --git a/src/images/print_2.png b/src/images/print_2.png
deleted file mode 100644
index 774ad17..0000000
Binary files a/src/images/print_2.png and /dev/null differ
diff --git a/src/images/redo_1_16.png b/src/images/redo_1_16.png
deleted file mode 100644
index 17f7ac0..0000000
Binary files a/src/images/redo_1_16.png and /dev/null differ
diff --git a/src/images/redo_1_24.png b/src/images/redo_1_24.png
deleted file mode 100644
index 7ae0543..0000000
Binary files a/src/images/redo_1_24.png and /dev/null differ
diff --git a/src/images/save_1_16.png b/src/images/save_1_16.png
deleted file mode 100644
index 4971653..0000000
Binary files a/src/images/save_1_16.png and /dev/null differ
diff --git a/src/images/save_1_24.png b/src/images/save_1_24.png
deleted file mode 100644
index 621fe37..0000000
Binary files a/src/images/save_1_24.png and /dev/null differ
diff --git a/src/images/save_as_1_16.png b/src/images/save_as_1_16.png
deleted file mode 100644
index 772e3f6..0000000
Binary files a/src/images/save_as_1_16.png and /dev/null differ
diff --git a/src/images/table.png b/src/images/table.png
deleted file mode 100644
index 936e4fc..0000000
Binary files a/src/images/table.png and /dev/null differ
diff --git a/src/images/to_bottom_2.png b/src/images/to_bottom_2.png
deleted file mode 100644
index 1161c42..0000000
Binary files a/src/images/to_bottom_2.png and /dev/null differ
diff --git a/src/images/to_center_2.png b/src/images/to_center_2.png
deleted file mode 100644
index 78b4935..0000000
Binary files a/src/images/to_center_2.png and /dev/null differ
diff --git a/src/images/to_h_center_2.png b/src/images/to_h_center_2.png
deleted file mode 100644
index 30679ff..0000000
Binary files a/src/images/to_h_center_2.png and /dev/null differ
diff --git a/src/images/to_left_2.png b/src/images/to_left_2.png
deleted file mode 100644
index c04d56a..0000000
Binary files a/src/images/to_left_2.png and /dev/null differ
diff --git a/src/images/to_right_2.png b/src/images/to_right_2.png
deleted file mode 100644
index 5ec05c6..0000000
Binary files a/src/images/to_right_2.png and /dev/null differ
diff --git a/src/images/to_same_height_2.png b/src/images/to_same_height_2.png
deleted file mode 100644
index eda1bda..0000000
Binary files a/src/images/to_same_height_2.png and /dev/null differ
diff --git a/src/images/to_same_width_2.png b/src/images/to_same_width_2.png
deleted file mode 100644
index 4f1b976..0000000
Binary files a/src/images/to_same_width_2.png and /dev/null differ
diff --git a/src/images/to_top_2.png b/src/images/to_top_2.png
deleted file mode 100644
index 85bed49..0000000
Binary files a/src/images/to_top_2.png and /dev/null differ
diff --git a/src/images/undo_1_16.png b/src/images/undo_1_16.png
deleted file mode 100644
index d4835eb..0000000
Binary files a/src/images/undo_1_16.png and /dev/null differ
diff --git a/src/images/undo_1_24.png b/src/images/undo_1_24.png
deleted file mode 100644
index d2ce600..0000000
Binary files a/src/images/undo_1_24.png and /dev/null differ
diff --git a/src/images/zoom-in_1_16.png b/src/images/zoom-in_1_16.png
deleted file mode 100644
index 4ec3c28..0000000
Binary files a/src/images/zoom-in_1_16.png and /dev/null differ
diff --git a/src/images/zoom-in_1_24.png b/src/images/zoom-in_1_24.png
deleted file mode 100644
index 9300db4..0000000
Binary files a/src/images/zoom-in_1_24.png and /dev/null differ
diff --git a/src/images/zoom-out_1_16.png b/src/images/zoom-out_1_16.png
deleted file mode 100644
index 39dc346..0000000
Binary files a/src/images/zoom-out_1_16.png and /dev/null differ
diff --git a/src/images/zoom-out_1_24.png b/src/images/zoom-out_1_24.png
deleted file mode 100644
index 01c6965..0000000
Binary files a/src/images/zoom-out_1_24.png and /dev/null differ
diff --git a/src/items/abordertextitem.cpp b/src/items/abordertextitem.cpp
deleted file mode 100644
index f322627..0000000
--- a/src/items/abordertextitem.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include
-#include
-
-#include "apagedesignintf.h"
-#include "abordertextitem.h"
-#include "adesignelementsfactory.h"
-#include "aglobal.h"
-#include "adatasourcemanager.h"
-#include "asimpletagparser.h"
-
-namespace{
-
-const QString xmlTag = "TextItem";
-
-ArReport::BaseDesignIntf * createTextItem(QObject* owner, ArReport::BaseDesignIntf* parent){
- return new ArReport::TextItem(owner,parent);
-}
-bool registred = ArReport::DesignElementsFactory::instance().registerCreator(xmlTag, ArReport::ItemAttribs(QObject::tr("Text Item"),"TextItem"), createTextItem);
-
-}
-
-namespace ArReport{
-
-TextItem::TextItem(QObject *owner, QGraphicsItem *parent)
- : ItemDesignIntf(xmlTag,owner,parent),m_spaceBorder(4){
- m_text = new QTextDocument();
- Init();
-}
-
-TextItem::TextItem(const QString& text, QObject* owner /*= 0*/, QGraphicsItem* parent /*= 0*/)
- :ItemDesignIntf(xmlTag, owner,parent),m_spaceBorder(4){
- m_strText = text;
- m_text = new QTextDocument(text);
- m_text->setHtml(m_strText);
- initText();
- Init();
-}
-
-TextItem::~TextItem()
-{
- delete m_text;
-}
-
-void TextItem::paint(QPainter* ppainter, const QStyleOptionGraphicsItem* style, QWidget* widget) {
- Q_UNUSED(widget);
- Q_UNUSED(style);
-
- ppainter->save();
-
- setupPainter(ppainter);
-
- if (isSelected()) {
- ppainter->setOpacity(0);
- ppainter->fillRect(rect(),QBrush(QColor(Qt::white)));
- ppainter->setOpacity(1);
- }
- else ppainter->fillRect(rect(),QBrush(Qt::white));
-
- //initText();
-
- QSizeF tmpSize = rect().size()-m_textSize;//m_text->size();
-
- if ((tmpSize.height()>0) && (m_alignment & Qt::AlignVCenter))
- ppainter->translate(0,tmpSize.height()/2);
-
- QRegion clipReg=ppainter->clipRegion().xored(ppainter->clipRegion().subtracted(rect().toRect()));
- ppainter->setClipRegion(clipReg);
- qreal pos=0;
- for(QTextBlock it=m_text->begin();it!=m_text->end();it=it.next()){
- for (int i=0;ilineCount();i++){
- pos+=it.layout()->lineAt(i).height();
- it.layout()->lineAt(i).draw(ppainter,QPointF(spaceBorderSize(),0));
- }
- }
-
- ppainter->restore();
- BaseDesignIntf::paint(ppainter, style, widget);
-}
-
-QString TextItem::text() const{
- return m_strText;
-}
-
-void TextItem::Init()
-{
- //setFlag(QGraphicsItem::ItemIsMovable);
- //setFlag(QGraphicsItem::ItemIsSelectable);
- m_autoWidth=NoneAutoWidth;
- m_alignment= Qt::AlignLeft|Qt::AlignTop;
- m_autoHeight=false;
- m_text->setDefaultFont(sceneFont());
- m_textSize=QSizeF();
-}
-
-void TextItem::setText(QString value)
-{
- if (m_strText.compare(value)!=0){
- m_strText=value;
- m_text->setHtml(value);
- m_text->setTextWidth(width());
- m_textSize=m_text->size();
- if (!isLoading()){
- update(rect());
- }
- }
-}
-
-void TextItem::updateItemSize(RenderPass pass, int /*maxHeight*/)
-{
- if (isNeedExpandContent())
- expandContent(pass);
- initText();
-
- if (m_textSize.width()>width() && (m_autoWidth==MaxWordLength)){
- setWidth(m_textSize.width());
- }
- if ((m_textSize.height()>height()) && (m_autoHeight) ){
- setHeight(m_textSize.height()+5);
- }
-}
-
-void TextItem::updateLayout()
-{
- m_layout.setText(text());
- qreal linePos = 0;
- m_layout.beginLayout();
- while(true){
- QTextLine line = m_layout.createLine();
- if (!line.isValid()) break;
- line.setLineWidth(width()-m_spaceBorder*2);
- line.setPosition(QPoint(m_spaceBorder,linePos));
- linePos+=line.height();
- }
- m_layout.endLayout();
-}
-
-bool TextItem::isNeedExpandContent() const
-{
- QRegExp rx("$*\\{[^{]*\\}");
- return text().contains(rx);
-}
-
-QString TextItem::expandDataFields(QString context)
-{
- DataManager* dm=DataManager::instance();
- QRegExp rx("\\$D\\{[^\\{]*\\}");
- if (context.contains(rx)){
-
- while ((rx.indexIn(context))!=-1){
- QString field=rx.cap(0);
- field.remove("$D{");
- field.remove("}");
- if (dm->isContainField(field)) {
- context.replace(rx.cap(0),dm->fieldData(field).toString());
- } else {
- context.replace(rx.cap(0),tr("Field %1 not found").arg(field));
- }
- }
- }
- return context;
-}
-
-void TextItem::initText()
-{
- QTextOption to;
- to.setAlignment(m_alignment);
- to.setWrapMode(QTextOption::WordWrap);
- m_text->setDocumentMargin(spaceBorderSize());
- m_text->setDefaultTextOption(to);
- m_text->setDefaultFont(sceneFont());
- m_text->setTextWidth(rect().width());
- m_textSize=m_text->size();
-}
-
-void TextItem::setGeometry(QRectF rect)
-{
- BaseDesignIntf::setGeometry(rect);
- m_text->setTextWidth(width());
-}
-
-bool TextItem::isNeedUpdateSize() const
-{
- return ((m_textSize.height()>geometry().height()||m_textSize.width()>geometry().width())&&
- (autoHeight()||autoWidth()))
- || isNeedExpandContent();
-}
-
-void TextItem::setSpaceBorderSize(int value)
-{
- m_spaceBorder=value;
- update(rect());
-}
-
-void TextItem::setAlignment(Qt::Alignment value)
-{
- m_alignment=value;
- m_layout.setTextOption(QTextOption(m_alignment));
- update(rect());
-}
-
-void TextItem::expandContent(RenderPass pass)
-{
- QString context=text();
- switch(pass){
- case FirstPass:
- context=expandDataFields(context);
- break;
- case SecondPass:;
- }
- setText(context);
-}
-
-bool TextItem::canBeSliced(int height) const
-{
- return height>(m_text->begin().layout()->lineAt(0).height());
-}
-
-BaseDesignIntf *TextItem::cloneUpperPart(int height, QObject *owner, QGraphicsItem *parent)
-{
- int linesHeight=0;
- initText();
- QString tmpText="";
- TextItem* upperPart = dynamic_cast(cloneItem(itemMode(),owner,parent));
-
- for (QTextBlock it=m_text->begin();it!=m_text->end();it=it.next()){
- for (int i=0;ilineCount();i++){
- linesHeight+=it.layout()->lineAt(i).height();
- if ((linesHeight>height)) {linesHeight-=it.layout()->lineAt(i).height(); goto loop_exit;}
- tmpText+=it.text().mid(it.layout()->lineAt(i).textStart(),it.layout()->lineAt(i).textLength());
- }
- }
- loop_exit:
- upperPart->setHeight(linesHeight);
- QScopedPointer context(new HtmlContext(m_strText));
- upperPart->setText(context->extendTextByTags(tmpText,0));
- return upperPart;
-}
-
-BaseDesignIntf *TextItem::cloneBottomPart(int height, QObject *owner, QGraphicsItem *parent)
-{
- TextItem* bottomPart = dynamic_cast(cloneItem(itemMode(),owner,parent));
- int linesHeight=0;
- int curLine=0;
- QTextBlock curBlock;
-
- QString tmpText="";
-
- for (curBlock=m_text->begin();curBlock!=m_text->end();curBlock=curBlock.next()){
- for (curLine=0;curLinelineCount();curLine++){
- linesHeight+=curBlock.layout()->lineAt(curLine).height();
- if (linesHeight>height) {goto loop_exit;}
- }
- }
- loop_exit:;
- int textPos=0;
- for (;curBlock!=m_text->end();curBlock=curBlock.next()){
- for (;curLinelineCount();curLine++){
- if (tmpText=="") textPos= curBlock.layout()->lineAt(curLine).textStart();
- tmpText+=curBlock.text().mid(curBlock.layout()->lineAt(curLine).textStart(),
- curBlock.layout()->lineAt(curLine).textLength());
- }
- }
- QScopedPointer context(new HtmlContext(m_strText));
- bottomPart->setText(context->extendTextByTags(tmpText,textPos));
- return bottomPart;
-}
-
-BaseDesignIntf *TextItem::createSameTypeItem(QObject *owner, QGraphicsItem *parent)
-{
- return new TextItem(owner,parent);
-}
-
-BaseDesignIntf *TextItem::cloneEmpty(int height, QObject *owner, QGraphicsItem *parent)
-{
- TextItem* empty=dynamic_cast(cloneItem(itemMode(),owner,parent));
- empty->setText("");
- empty->setHeight(height);
- return empty;
-}
-
-void TextItem::objectLoadFinished()
-{
- ItemDesignIntf::objectLoadFinished();
- initText();
-}
-
-void TextItem::setTextItemFont(QFont value)
-{
- setFont(value);
- m_text->setDefaultFont(sceneFont());
-}
-
-}
-
diff --git a/src/items/abordertextitem.h b/src/items/abordertextitem.h
deleted file mode 100644
index cc9bdee..0000000
--- a/src/items/abordertextitem.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#ifndef ABORDERTEXTITEM_H
-#define ABORDERTEXTITEM_H
-#include
-#include
-#include
-#include "aitemdesignintf.h"
-#include
-
-#include
-
-namespace ArReport {
-
-class Tag;
-class TextItem : public ArReport::ItemDesignIntf {
- Q_OBJECT
- Q_ENUMS(AutoWidth)
- Q_PROPERTY(QString content READ text WRITE setText)
- Q_PROPERTY(int margin READ spaceBorderSize WRITE setSpaceBorderSize)
- Q_PROPERTY(Qt::Alignment alignment READ alignment() WRITE setAlignment)
- Q_PROPERTY(AutoWidth autoWidth READ autoWidth() WRITE setAutoWidth())
- Q_PROPERTY(bool autoHeight READ autoHeight() WRITE setAutoHeight())
- Q_PROPERTY(QFont font READ font() WRITE setTextItemFont())
-public:
-
- enum AutoWidth{NoneAutoWidth,MaxWordLength,MaxStringLength};
-
- void Init();
- TextItem(QObject* owner,QGraphicsItem* parent);
- TextItem(const QString& text,QObject* owner = 0, QGraphicsItem* parent = 0);
- ~TextItem();
-
- void paint(QPainter* ppainter, const QStyleOptionGraphicsItem*, QWidget*);
- QString text() const;
- void setText(QString value);
-
- void setSpaceBorderSize(int value);
- int spaceBorderSize() const {return m_spaceBorder;}
-
- void setAlignment(Qt::Alignment value);
- Qt::Alignment alignment(){return m_alignment;}
-
- virtual void setGeometry(QRectF rect);
- virtual bool isNeedUpdateSize() const;
- virtual void updateItemSize(RenderPass pass, int);
- void expandContent(RenderPass pass);
-
- void setAutoHeight(bool value){m_autoHeight=value;}
- bool autoHeight() const {return m_autoHeight;}
-
- void setAutoWidth(AutoWidth value){m_autoWidth=value;}
- AutoWidth autoWidth() const {return m_autoWidth;}
-
- virtual bool canBeSliced(int height) const;
- virtual bool isEmpty() const{return m_text->isEmpty();}
- virtual BaseDesignIntf* cloneUpperPart(int height, QObject *owner, QGraphicsItem *parent);
- virtual BaseDesignIntf* cloneBottomPart(int height, QObject *owner, QGraphicsItem *parent);
- virtual BaseDesignIntf* createSameTypeItem(QObject* owner=0, QGraphicsItem* parent=0);
- virtual BaseDesignIntf* cloneEmpty(int height, QObject *owner, QGraphicsItem *parent);
- virtual void objectLoadFinished();
-
- void setTextItemFont(QFont value);
-protected:
- void updateLayout();
- bool isNeedExpandContent() const;
- QString expandDataFields(QString context);
-private:
- void initText();
-private:
- QString m_strText;
- int m_spaceBorder;
- QTextLayout m_layout;
- QTextDocument* m_text;
- Qt::Alignment m_alignment;
- bool m_autoHeight;
- AutoWidth m_autoWidth;
- QSizeF m_textSize;
- QFont m_font;
-};
-
-}
-#endif // ABORDERTEXTITEM_H
diff --git a/src/items/images/Control-Edit Box.png b/src/items/images/Control-Edit Box.png
deleted file mode 100644
index ea0fb75..0000000
Binary files a/src/items/images/Control-Edit Box.png and /dev/null differ
diff --git a/src/items/images/insert-text_1.png b/src/items/images/insert-text_1.png
deleted file mode 100644
index 86741ea..0000000
Binary files a/src/items/images/insert-text_1.png and /dev/null differ
diff --git a/src/lrserializatorsfactory.cpp b/src/lrserializatorsfactory.cpp
deleted file mode 100644
index b1757f5..0000000
--- a/src/lrserializatorsfactory.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-
diff --git a/src/lrserializatorsfactory.h b/src/lrserializatorsfactory.h
deleted file mode 100644
index 111484d..0000000
--- a/src/lrserializatorsfactory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#ifndef ASERIALIZATORSFACTORY_H
-#define ASERIALIZATORSFACTORY_H
-#include "asimpleabstractfactory.h"
-#include "serializators/aserializatorintf.h"
-
-namespace LimeReport{
-
-typedef SerializatorIntf* (*CreateSerializator)(QObject* parent);
-
-class SerializatorsFactory: public SimpleAbstractFactory
-{
-private:
- friend class Singleton;
-public:
- SerializatorsFactory();
- ~SerializatorsFactory(){}
- SerializatorsFactory(const SerializatorsFactory&){}
- SerializatorsFactory& operator = (const SerializatorsFactory&){return *this;}
-};
-
-}
-#endif // ASERIALIZATORSFACTORY_H
diff --git a/src/objectinspector/images/checked.png b/src/objectinspector/images/checked.png
deleted file mode 100644
index 07d1faf..0000000
Binary files a/src/objectinspector/images/checked.png and /dev/null differ
diff --git a/src/objectinspector/images/unchecked.png b/src/objectinspector/images/unchecked.png
deleted file mode 100644
index 574c0d4..0000000
Binary files a/src/objectinspector/images/unchecked.png and /dev/null differ
diff --git a/src/scriptbrowser/lrscriptbrowser.cpp b/src/scriptbrowser/lrscriptbrowser.cpp
deleted file mode 100644
index ea38798..0000000
--- a/src/scriptbrowser/lrscriptbrowser.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include "lrscriptbrowser.h"
-#include "ui_lrscriptbrowser.h"
-
-#ifdef HAVE_UI_LOADER
-#include
-#include
-#endif
-#include
-
-namespace LimeReport{
-
-ScriptBrowser::ScriptBrowser(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::ScriptBrowser)
-{
- ui->setupUi(this);
-#ifndef HAVE_UI_LOADER
- ui->tpDialogs->setVisible(false);
- ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tpDialogs));
-#endif
-}
-
-ScriptBrowser::~ScriptBrowser()
-{
- delete ui;
-}
-
-void ScriptBrowser::setReportEditor(ReportDesignWidget* report)
-{
- m_report=report;
- connect(m_report,SIGNAL(cleared()),this,SLOT(slotClear()));
- connect(m_report,SIGNAL(loaded()),this,SLOT(slotUpdate()));
- updateFunctionTree();
-}
-
-void ScriptBrowser::updateFunctionTree()
-{
- ScriptEngineManager* sm = reportEditor()->scriptManager();
- QMap categ;
- foreach(ScriptFunctionDesc fd, sm->functionsDescriber()){
- QString functionCategory = (fd.category!="") ? fd.category : tr("NO CATEGORY");
- if (categ.contains(functionCategory)){
- QTreeWidgetItem* item = new QTreeWidgetItem(categ.value(fd.category),QStringList(fd.name));
- item->setIcon(0,QIcon(":/report/images/function"));
- } else {
- QTreeWidgetItem* categItem = new QTreeWidgetItem(ui->twFunctions,QStringList(functionCategory));
- categItem->setIcon(0,QIcon(":/report/images/folder"));
- categ.insert(functionCategory,categItem);
- QTreeWidgetItem* item = new QTreeWidgetItem(categItem,QStringList(fd.name));
- item->setIcon(0,QIcon(":/report/images/function"));
- }
- }
-}
-
-#ifdef HAVE_UI_LOADER
-void ScriptBrowser::fillProperties(QTreeWidgetItem* objectItem, QObject* item){
- for(int i=0; imetaObject()->propertyCount(); ++i){
- QStringList row;
- row<metaObject()->property(i).typeName()<metaObject()->property(i).name();
- /*QTreeWidgetItem* propItem = */new QTreeWidgetItem(objectItem,row);
- }
-}
-
-void ScriptBrowser::fillDialog(QTreeWidgetItem* dialogItem,const QString& description){
-
- QUiLoader loader;
- QByteArray baDesc = description.toUtf8();
- QBuffer buff(&baDesc);
- buff.open(QIODevice::ReadOnly);
- QDialog* dialog = dynamic_cast(loader.load(&buff));
- if (dialog){
- foreach (QObject* child, dialog->children()) {
- if (!child->objectName().isEmpty()){
- QStringList row;
- row<metaObject()->className()<objectName();
- QTreeWidgetItem* item = new QTreeWidgetItem(dialogItem,row);
- item->setIcon(0,QIcon(":/scriptbrowser/images/item"));
- fillProperties(item,child);
- }
- }
- delete dialog;
- }
-
-}
-
-void ScriptBrowser::updateDialogsTree()
-{
- ui->twDialogs->clear();
- ScriptEngineContext* sc = reportEditor()->scriptContext();
- foreach(DialogDescriber::Ptr dc, sc->dialogsDescriber()){
- QTreeWidgetItem* dialogItem = new QTreeWidgetItem(ui->twDialogs,QStringList(dc->name()));
- dialogItem->setIcon(0,QIcon(":/scriptbrowser/images/dialog"));
- fillDialog(dialogItem,dc->description());
- }
-}
-#endif
-void ScriptBrowser::slotClear()
-{
- ui->twDialogs->clear();
- ui->twFunctions->clear();
-}
-
-void ScriptBrowser::slotUpdate()
-{
-#ifdef HAVE_UI_LOADER
- updateDialogsTree();
-#endif
- updateFunctionTree();
-}
-
-#ifdef HAVE_UI_LOADER
-void ScriptBrowser::on_tbAddDialog_clicked()
-{
- QFileDialog fileDialog(this);
- if (fileDialog.exec()==QDialog::Accepted){
- QStringList fileNames = fileDialog.selectedFiles();
- QUiLoader loader;
-
- if (!fileNames.isEmpty()){
- foreach (QString fileName, fileNames) {
- QFile file(fileName);
- file.open(QIODevice::ReadOnly);
- if (file.isOpen()){
- QWidget* widget = loader.load(&file);
- QDialog* dialog = dynamic_cast(widget);
- if (dialog){
- if (!m_report->scriptContext()->containsDialog(dialog->objectName())){
- file.seek(0);
- m_report->scriptContext()->addDialog(dialog->objectName(),file.readAll());
- updateDialogsTree();
- } else {
- QMessageBox::critical(this,tr("Error"),tr("Dialog with name: %1 already exists").arg(dialog->objectName()));
- }
- } else {
- if (widget)
- QMessageBox::critical(this,tr("Error"),tr("ui file must cointain QDialog instead QWidget or QMainWindow"));
- else
- QMessageBox::critical(this,tr("Error"),tr("wrong file format"));
- }
- if (widget) delete widget;
- }
- }
- }
- }
-}
-
-void ScriptBrowser::on_tbRunDialog_clicked()
-{
- if (ui->twDialogs->currentItem()&& ui->twDialogs->currentItem()->parent()==0){
- m_report->scriptContext()->previewDialog(ui->twDialogs->currentItem()->text(0));
- }
-}
-
-void ScriptBrowser::on_tbDeleteDialog_clicked()
-{
- if (ui->twDialogs->currentItem()&& ui->twDialogs->currentItem()->parent()==0){
- m_report->scriptContext()->deleteDialog(ui->twDialogs->currentItem()->text(0));
- updateDialogsTree();
- }
-}
-
-#endif
-
-} //namespace LimeReport
-
-
diff --git a/src/scriptbrowser/lrscriptbrowser.h b/src/scriptbrowser/lrscriptbrowser.h
deleted file mode 100644
index 214977b..0000000
--- a/src/scriptbrowser/lrscriptbrowser.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#ifndef LRSCRIPTBROWSER_H
-#define LRSCRIPTBROWSER_H
-
-#include
-#include
-#include
-#include "lrreportdesignwidget.h"
-
-namespace Ui {
-class ScriptBrowser;
-}
-
-namespace LimeReport{
-
-class ScriptBrowser : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit ScriptBrowser(QWidget *parent = 0);
- ~ScriptBrowser();
- void setReportEditor(LimeReport::ReportDesignWidget* report);
- inline ReportDesignWidget* reportEditor(){return m_report;}
- void updateFunctionTree();
-#ifdef HAVE_UI_LOADER
- void updateDialogsTree();
-#endif
-protected:
-#ifdef HAVE_UI_LOADER
- void fillDialog(QTreeWidgetItem *dialogItem, const QString &description);
- void fillProperties(QTreeWidgetItem *objectItem, QObject *item);
-#endif
-private slots:
- void slotClear();
- void slotUpdate();
-#ifdef HAVE_UI_LOADER
- void on_tbAddDialog_clicked();
- void on_tbRunDialog_clicked();
- void on_tbDeleteDialog_clicked();
-#endif
-
-private:
- Ui::ScriptBrowser *ui;
- ReportDesignWidget* m_report;
-};
-
-} // namespace LimeReport
-#endif // LRSCRIPTBROWSER_H
diff --git a/src/serializators/aserializatorintf.cpp b/src/serializators/aserializatorintf.cpp
deleted file mode 100644
index 91eb6c9..0000000
--- a/src/serializators/aserializatorintf.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include "lrserializatorintf.h"
diff --git a/src/serializators/astorageintf.cpp b/src/serializators/astorageintf.cpp
deleted file mode 100644
index 5812cf1..0000000
--- a/src/serializators/astorageintf.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include "astorageintf.h"
-
diff --git a/src/waitform.cpp b/src/waitform.cpp
deleted file mode 100644
index f359918..0000000
--- a/src/waitform.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#include "waitform.h"
-#include "ui_waitform.h"
-#include
-
-WaitForm::WaitForm(QWidget *parent) :
- QDialog(parent),
- ui(new Ui::WaitForm)
-{
- ui->setupUi(this);
-}
-
-WaitForm::~WaitForm()
-{
- delete ui;
-}
diff --git a/src/waitform.h b/src/waitform.h
deleted file mode 100644
index 658ce3b..0000000
--- a/src/waitform.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * This file is part of the Lime Report project *
- * Copyright (C) 2015 by Alexander Arin *
- * arin_a@bk.ru *
- * *
- ** GNU General Public License Usage **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 3 of the License, or *
- * (at your option) any later version. *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- * *
- ** GNU Lesser General Public License **
- * *
- * This library is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation, either version 3 of the *
- * License, or (at your option) any later version. *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this library. *
- * If not, see . *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- ****************************************************************************/
-#ifndef WAITFORM_H
-#define WAITFORM_H
-
-#include
-
-namespace Ui {
-class WaitForm;
-}
-
-class WaitForm : public QDialog
-{
- Q_OBJECT
-
-public:
- explicit WaitForm(QWidget *parent = 0);
- ~WaitForm();
-
-private:
- Ui::WaitForm *ui;
-};
-
-#endif // WAITFORM_H
diff --git a/src/waitform.ui b/src/waitform.ui
deleted file mode 100644
index 4549ef8..0000000
--- a/src/waitform.ui
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
- WaitForm
-
-
-
- 0
- 0
- 186
- 95
-
-
-
-
- 0
- 0
-
-
-
- Wait
-
-
- false
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- :/report/images/hourglass
-
-
- true
-
-
-
-
-
-
- Please wait ...
-
-
-
-
-
-
-
-
-
-