Change install rules, rm *.qm files, change default path for tralslat…

…ion files

CMakeLists.txt

@@ -9,11 +9,6 @@ message(STATUS "Processor: " ${CMAKE_HOST_SYSTEM_PROCESSOR})
 # add version define
 set(EASYPAINT_VERSION "0.0.1")
 
-# ------ install prefix --------------------------
-set(CMAKE_INSTALL_PREFIX "/usr")
-add_definitions( -DPREFIX="${CMAKE_INSTALL_PREFIX}")
-message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX})
-
 #------- headers --------
 set (HEADERS 
     sources/additionaltools.h
@@ -40,20 +35,16 @@ set (SOURCES
     sources/resizedialog.cpp
     sources/toolbar.cpp)
 
-#------- languages -------
-set (LANGUAGES
-    easypiant_ru_RU
-    easypiant_en_EN)
-
 #------- resources -------
 set (RESOURCE_PATH 
     sources)
 
 set (RESOURCES 
     ${RESOURCE_PATH}/resources.qrc)
 
-set (TRANSLATIONS_PATH 
-    sources/translations)
+#------- languages -------
+set (TRANSLATIONS
+    sources/translations/easypaint_ru_RU.ts)
 
 project (${PROJECT})
 
@@ -63,22 +54,7 @@ find_package (Qt4 REQUIRED)
 include (${QT_USE_FILE})
 qt4_add_resources (QRC_SOURCES ${RESOURCES})
 qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
-foreach (LANGUAGE ${LANGUAGES})
-    set (TS ${TRANSLATIONS_PATH}/${LANGUAGE}.ts)
-    set (QM ${TRANSLATIONS_PATH}/${LANGUAGE}.qm)
-    set (TRANSLATIONS ${TRANSLATIONS} ${TS})
-    set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
-    add_custom_command (
-        OUTPUT ${QM}
-        COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
-        MAIN_DEPENDENCY ${TS})
-endforeach()
-add_custom_target (
-    translations 
-    COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
-add_custom_command (
-    TARGET translations
-    COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+qt4_add_translation( TRANSLATIONS_QM ${TRANSLATIONS} )
 
 add_definitions (-Wall)
 
@@ -88,41 +64,20 @@ source_group ("Generated Files" FILES ${MOC_SOURCES})
 source_group ("Resource Files" FILES ${QRC_SOURCES})
 
 #-------  build executable from sources ----------
-add_executable (${PROJECT} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES})
+add_executable (${PROJECT} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS_QM})
 
 target_link_libraries (${PROJECT} ${QT_LIBRARIES})
 
-#-------  make src packae and installing ----------
+#-------  installing ----------
 if(UNIX AND NOT APPLE)
-    # make src.tar.gz
-    ADD_CUSTOM_TARGET (dist @echo create source package )
-    set(EASYPAINT_DIST "easypaint-${EASYPAINT_VERSION}")
-    add_custom_command(COMMAND cp 
-        ARGS -R ${CMAKE_CURRENT_SOURCE_DIR} "/tmp/${EASYPAINT_DIST}" 
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        TARGET  dist
-    )
-
-    ADD_CUSTOM_COMMAND(COMMAND tar 
-        ARGS cvfz ${CMAKE_CURRENT_BINARY_DIR}/${EASYPAINT_DIST}.tar.gz --exclude=*~ --exclude-vcs --exclude=localize/*qm --exclude=*.kdev4 --exclude=build --exclude=create-src.sh --exclude=win32 -C "/tmp" "${EASYPAINT_DIST}"  
-        WORKING_DIRECTORY "/tmp"
-        TARGET  dist
-    )
-
-    add_custom_command(COMMAND rm 
-        ARGS -rf "/tmp/${EASYPAINT_DIST}"
-        WORKING_DIRECTORY "/tmp"
-        TARGET  dist
-    )
-
     # installing
     INSTALL(TARGETS easypaint RUNTIME DESTINATION bin)
 
     # install desktop files
-    INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/sources/media/EasyPaint.desktop" DESTINATION share/applications)
+    INSTALL(FILES "sources/media/EasyPaint.desktop" DESTINATION share/applications)
 
     # install pixmap
     #~ INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/easypaint.png" DESTINATION share/pixmaps)
 
-    INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sources/translations/" DESTINATION share/easypaint/translations FILES_MATCHING PATTERN "*.qm")
+    INSTALL(FILES ${TRANSLATIONS_QM} DESTINATION share/easypaint/translations)
 endif(UNIX AND NOT APPLE)

sources/main.cpp

@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
     }
 
     QTranslator appTranslator;
-    appTranslator.load(":/translations/easypaint_" + QLocale::system().name());
+    appTranslator.load("/usr/share/easypaint/translations/easypaint_" + QLocale::system().name());
     a.installTranslator(&appTranslator);
 
     MainWindow w(filePaths);

sources/resources.qrc

@@ -10,6 +10,5 @@
         <file>media/instruments-icons/pipette.png</file>
         <file>media/instruments-icons/rectangle.png</file>
         <file>media/instruments-icons/spray.png</file>
-        <file>translations/easypaint_ru_RU.qm</file>
     </qresource>
 </RCC>