Merge pull request #25 from newsages/master

ARCH_TYPE

.gitignore

@@ -24,6 +24,7 @@ qrc_*.cpp
 ui_*.h
 Makefile*
 *build-*
+*.qm
 
 # QtCreator
 

3rdparty/zint-2.4.4/backend_qt4/Zint.pro

@@ -95,7 +95,7 @@ SOURCES += \
     $$PWD/../backend/upcean.c
 
 
-DESTDIR        = $${BUILD_DIR}/$${BUILD_TYPE}/lib
+DESTDIR        = $${DEST_LIBS}
 DLLDESTDIR     = $${DESTDIR}
 unix {
     target.path = $${DESTDIR}

common.pri

@@ -12,16 +12,32 @@ CONFIG(release, debug|release){
 
 BUILD_DIR = $$PWD/build/$${QT_VERSION}
 DEST_INCLUDE_DIR = $$PWD/include
-
+unix{
-unix:!macx {
     ARCH_DIR       = $${OUT_PWD}/unix
+    ARCH_TYPE      = unix
+    macx{
+        ARCH_DIR       = $${OUT_PWD}/macx
+        ARCH_TYPE      = macx
+    }
+    linux{
+        !contains(QT_ARCH, x86_64){
+            message("Compiling for 32bit system")
+            ARCH_DIR       = $${OUT_PWD}/linux32
+            ARCH_TYPE      = linux32
+        }else{
+            message("Compiling for 64bit system")
+            ARCH_DIR       = $${OUT_PWD}/linux64
+            ARCH_TYPE      = linux64
+        }
+    }
 }
 win32 {
     ARCH_DIR       = $${OUT_PWD}/win32
+    ARCH_TYPE      = win32
 }
-macx{
+
-    ARCH_DIR       = $${OUT_PWD}/macx
+DEST_LIBS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
-}
+DEST_BINS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/$${TARGET}
 
 MOC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/moc
 UI_DIR         = $${ARCH_DIR}/$${BUILD_TYPE}/ui

demo_r1/demo_r1.pro

@@ -1,7 +1,7 @@
 include(../common.pri)
 QT += core gui
 
-TARGET = LRDemo
+TARGET = LRDemo_r1
 TEMPLATE = app
 
 SOURCES += main.cpp\
@@ -18,7 +18,7 @@ RESOURCES += \
     r1.qrc
 
 EXTRA_DIR     += $$PWD/demo_reports
-DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r1
+DEST_DIR       = $${DEST_BINS}
 REPORTS_DIR    = $${DEST_DIR}
 
 macx{
@@ -26,9 +26,9 @@ macx{
 }
 
 unix:{
-    LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
+    LIBS += -L$${DEST_LIBS} -llimereport
     contains(CONFIG,zint){
-        LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
+        LIBS += -L$${DEST_LIBS} -lQtZint
     }
     DESTDIR = $$DEST_DIR
 #    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@@ -54,9 +54,9 @@ win32 {
 
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
     contains(CONFIG,zint){
-        LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
+        LIBS += -L$${DEST_LIBS} -lQtZint
     }
-    LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
+    LIBS += -L$${DEST_LIBS} -llimereport
 }
 
 

demo_r2/demo_r2.pro

@@ -1,7 +1,7 @@
 include(../common.pri)
 QT += core gui
 
-TARGET = LRDemo
+TARGET = LRDemo_r2
 TEMPLATE = app
 
 SOURCES += main.cpp\
@@ -18,7 +18,7 @@ RESOURCES += \
     demo_r2.qrc
 
 EXTRA_DIR     += $$PWD/demo_reports
-DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r2
+DEST_DIR       = $${DEST_BINS}
 REPORTS_DIR    = $${DEST_DIR}
 
 macx{
@@ -26,9 +26,9 @@ macx{
 }
 
 unix:{
-    LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
+    LIBS += -L$${DEST_LIBS} -llimereport
     contains(CONFIG,zint){
-        LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
+        LIBS += -L$${DEST_LIBS} -lQtZint
     }
     DESTDIR = $$DEST_DIR
 #    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@@ -54,9 +54,8 @@ win32 {
 
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
     contains(CONFIG,zint){
-        LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
+        LIBS += -L$${DEST_LIBS} -lQtZint
     }
-    LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
+    LIBS += -L$${DEST_LIBS} -llimereport
 }
 
-

limereport/limereport.pro

@@ -26,7 +26,7 @@ EXTRA_FILES += \
 include(limereport.pri)
 
 unix:{
-    DESTDIR  = $${BUILD_DIR}/$${BUILD_TYPE}/lib
+    DESTDIR  = $${DEST_LIBS}
     linux{
         QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
         for(FILE,EXTRA_FILES){
@@ -45,7 +45,7 @@ unix:{
 win32 {
     EXTRA_FILES ~= s,/,\\,g
     BUILD_DIR ~= s,/,\\,g
-    DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
+    DESTDIR = $${DEST_LIBS}
     DEST_DIR = $$DESTDIR/include
     DEST_DIR ~= s,/,\\,g
     DEST_INCLUDE_DIR ~= s,/,\\,g
@@ -60,7 +60,7 @@ contains(CONFIG,zint){
     message(zint)
     INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
     DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
-    LIBS += -L$${DESTDIR} -lQtZint
+    LIBS += -L$${DEST_LIBS} -lQtZint
 }
 
 #######

translations/limereport_es_ES.ts

@@ -746,6 +746,18 @@ p, li { white-space: pre-wrap; }
         <source> of %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fit page width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fit page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One to one</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ProxyHolder</name>

translations/limereport_ru.ts

@@ -905,6 +905,18 @@ p, li { white-space: pre-wrap; }
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Fit page width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fit page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One to one</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ProxyHolder</name>