Add a make inkscape_pot to regen potfile

(bzr r15239)

9 files changed, 47 insertions, 37 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e914863e..f51958c7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,10 +186,10 @@ endif()
 # -----------------------------------------------------------------------------
 # Installation
 # -----------------------------------------------------------------------------
-if(NOT WIN32)
+#if(NOT WIN32)
   # this should probably be done no matter what the platform is, just set SHARE_INSTALL first
   add_subdirectory(share)
-endif()
+#endif()
 	
 include(CMakeScripts/Install.cmake)
 
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 1aaf56106..2f5b83b5e 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -27,4 +27,20 @@ endif()
 
 add_dependencies(inkscape inkscape_desktop)
 
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/inkscape.pot 
+    COMMAND intltool-update --pot && mv untitled.pot ${CMAKE_CURRENT_SOURCE_DIR}/inkscape.pot
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/inkscape.pot PROPERTIES GENERATED TRUE)
+add_custom_target(inkscape_pot ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/inkscape.pot)
+add_dependencies(inkscape_pot filters_svg_h)
+add_dependencies(inkscape_pot palettes_h)
+add_dependencies(inkscape_pot patterns_svg_h)
+add_dependencies(inkscape_pot symbols_h)
+add_dependencies(inkscape_pot templates_h)
+
+
+
+
 endif()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fcab67441..ca084a4ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,19 +114,6 @@ src/gradient-drag.cpp
 src/inkscape.cpp
 src/knot.cpp
 src/knotholder.cpp
-src/libgdl/gdl-dock-bar.c
-src/libgdl/gdl-dock-item-grip.c
-src/libgdl/gdl-dock-item.c
-src/libgdl/gdl-dock-master.c
-src/libgdl/gdl-dock-notebook.c
-src/libgdl/gdl-dock-object.c
-src/libgdl/gdl-dock-paned.c
-src/libgdl/gdl-dock-placeholder.c
-src/libgdl/gdl-dock-tablabel.c
-src/libgdl/gdl-dock.c
-src/libgdl/gdl-i18n.c
-src/libgdl/gdl-i18n.h
-src/libgdl/gdl-switcher.c
 src/libnrtype/FontFactory.cpp
 src/live_effects/effect.cpp
 src/live_effects/lpe-attach-path.cpp
@@ -353,7 +340,7 @@ src/widgets/paint-selector.cpp
 src/widgets/paintbucket-toolbar.cpp
 src/widgets/pencil-toolbar.cpp
 src/widgets/rect-toolbar.cpp
-src/widgets/ruler.cpp
+src/widgets/gimp/ruler.cpp
 src/widgets/select-toolbar.cpp
 src/widgets/sp-attribute-widget.cpp
 src/widgets/sp-color-selector.cpp
diff --git a/share/filters/CMakeLists.txt b/share/filters/CMakeLists.txt
index 7f9708c52..97e1070e1 100644
--- a/share/filters/CMakeLists.txt
+++ b/share/filters/CMakeLists.txt
@@ -1,10 +1,12 @@
 add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h
+    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
 )
-add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h)
+set_source_files_properties(${CMAKE_SOURCE_DIR}/filters.svg.h PROPERTIES GENERATED TRUE)
+
+add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/filters)
 install(FILES "filters.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/filters)
diff --git a/share/palettes/CMakeLists.txt b/share/palettes/CMakeLists.txt
index 924e35e5a..a747ca798 100644
--- a/share/palettes/CMakeLists.txt
+++ b/share/palettes/CMakeLists.txt
@@ -1,13 +1,15 @@
 set(I18N_FILES "inkscape.gpl" "svg.gpl" "Tango-Palette.gpl")
 
 add_custom_command(
-  OUTPUT palettes.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/palettes.h
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES}
-)
-add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/palettes.h)
+)  
+set_source_files_properties(${CMAKE_SOURCE_DIR}/palettes.h PROPERTIES GENERATED TRUE)
+
+add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h)
 
 file(GLOB _FILES "*.gpl")
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/palettes.h DESTINATION ${SHARE_INSTALL}/inkscape/palettes)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h DESTINATION ${SHARE_INSTALL}/inkscape/palettes)
diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt
index de4a44797..4f038ffc3 100644
--- a/share/patterns/CMakeLists.txt
+++ b/share/patterns/CMakeLists.txt
@@ -1,10 +1,11 @@
 add_custom_command(
-  OUTPUT patterns.svg.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
 )
-add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h)
+set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE)
+add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
 install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
diff --git a/share/symbols/CMakeLists.txt b/share/symbols/CMakeLists.txt
index b578ff851..c74552f04 100644
--- a/share/symbols/CMakeLists.txt
+++ b/share/symbols/CMakeLists.txt
@@ -1,11 +1,12 @@
 file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg")
 
 add_custom_command(
-  OUTPUT symbols.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/symbols.h
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
 )
-add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/symbols.h)
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/symbols.h PROPERTIES GENERATED TRUE)
+add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h)
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/symbols.h DESTINATION ${SHARE_INSTALL}/inkscape/symbols)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h DESTINATION ${SHARE_INSTALL}/inkscape/symbols)
diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt
index af79e2ec5..3793ee44f 100644
--- a/share/templates/CMakeLists.txt
+++ b/share/templates/CMakeLists.txt
@@ -1,11 +1,12 @@
 file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg")
 
 add_custom_command(
-  OUTPUT templates.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/templates.h
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
 )
-add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/templates.h)
+set_source_files_properties(${CMAKE_SOURCE_DIR}/templates.h PROPERTIES GENERATED TRUE)
+add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/templates.h)
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/templates.h DESTINATION ${SHARE_INSTALL}/inkscape/templates)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/templates.h DESTINATION ${SHARE_INSTALL}/inkscape/templates)
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 8e9d3dbbf..3cdcf594a 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -936,7 +936,7 @@ CloneTiler::CloneTiler () :
             auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
             gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
             gtk_box_pack_start (GTK_BOX (mainbox), hb, FALSE, FALSE, 0);
-            GtkWidget *l = gtk_label_new(_(""));
+            GtkWidget *l = gtk_label_new("");
             gtk_label_set_markup (GTK_LABEL(l), _("Apply to tiled clones:"));
             gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
         }