Bump version, update NEWS

CMake 3.9 has been proven to successfully unpack 7z archives.

CMakeLists.txt

@@ -1,9 +1,6 @@
-project (logdiag C)
 # The last version with Windows XP support is 3.13, we want to keep that
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required (VERSION 3.9)
-
+project (logdiag VERSION 0.2.1 LANGUAGES C)
-# Default to 2.8.12 behaviour
-cmake_policy (VERSION 2.8.12)
 
 # Options
 option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)
@@ -11,14 +8,6 @@ option (OPTION_NOINSTALL "Only for developers; work without installing" OFF)
 option (BUILD_TESTING "Build tests" OFF)
 
 # Project information
-set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "2")
-set (project_VERSION_PATCH "0")
-
-set (project_VERSION "${project_VERSION_MAJOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
-
 set (project_URL "https://git.janouch.name/p/logdiag")
 
 # For custom modules
@@ -91,7 +80,6 @@ else (NOT WIN32)
 	# For whatever reason this now seems to be required
 	set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
 
-	# XXX: this seems to require CMake 3.0 ... include it in the project?
 	find_package (Lua REQUIRED)
 	if (LUA_VERSION_STRING VERSION_LESS "5.2")
 		message (FATAL_ERROR "Lua 5.2 not found")
@@ -115,7 +103,7 @@ foreach (file ${project_PO_FILES})
 	list (APPEND project_TRANSLATIONS "${translation}")
 endforeach (file)
 
-# Documentation
+# Documentation--gtk-doc 1.25 is required
 find_package (GtkDoc 1.25)
 set (project_DOC_DIR "${PROJECT_BINARY_DIR}/liblogdiag")
 
@@ -251,9 +239,13 @@ if (BUILD_TESTING)
 	foreach (name ${logdiag_TESTS})
 		add_executable (test-${name} tests/${name}.c)
 		target_link_libraries (test-${name} liblogdiag ${logdiag_LIBS})
-
+		add_test (NAME test-${name} COMMAND test-${name})
-		add_test (test-${name} test-${name})
+		list (APPEND logdiag_TEST_TARGETS test-${name})
 	endforeach (name)
+	if (WIN32 AND NOT CMAKE_CROSSCOMPILING)
+		set_tests_properties (${logdiag_TEST_TARGETS}
+			PROPERTIES ENVIRONMENT "PATH=${WIN32_DEPENDS_PATH}/bin")
+	endif ()
 endif (BUILD_TESTING)
 
 # Generate documentation
@@ -385,25 +377,20 @@ else (WIN32)
 	install (FILES LICENSE NEWS DESTINATION share/doc/${PROJECT_NAME})
 endif (WIN32)
 
-install (FILES ${GSETTINGS_SCHEMAS}
+install (DIRECTORY share/gui share/library DESTINATION share/${PROJECT_NAME})
-	DESTINATION share/glib-2.0/schemas)
+install (FILES ${GSETTINGS_SCHEMAS} DESTINATION share/glib-2.0/schemas)
 install (CODE " # DESTDIR is not in use on Windows
 	if (WIN32 OR \"\$ENV{DESTDIR}\" STREQUAL \"\")
-		execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS_EXECUTABLE}
+		execute_process (COMMAND \"${GLIB_COMPILE_SCHEMAS_EXECUTABLE}\"
 			\"\${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas\")
 	endif (WIN32 OR \"\$ENV{DESTDIR}\" STREQUAL \"\")")
 
-install (DIRECTORY share/gui share/library
-	DESTINATION share/${PROJECT_NAME})
-
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Schematic editor")
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})
-set (CPACK_PACKAGE_VERSION_PATCH ${project_VERSION_PATCH})
 
 if (WIN32)
 	set (CPACK_GENERATOR "NSIS;ZIP")
@@ -413,11 +400,13 @@ else (WIN32)
 endif (WIN32)
 
 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${CPACK_PACKAGE_VERSION}")
-	"${PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+
+# XXX: It is still possible to install multiple copies, making commands collide.
+set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${PROJECT_NAME}")
 
-# FIXME: It is possible to install multiple copies. Everything screws up then.
 set (CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/share\\\\header.bmp")
 set (CPACK_NSIS_INSTALLED_ICON_NAME "logdiag.exe")
 set (CPACK_NSIS_CREATE_ICONS_EXTRA "
@@ -451,7 +440,7 @@ set (CPACK_RPM_PACKAGE_URL "${project_URL}")
 
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user;/win32-depends;/liblogdiag/ld-marshal.[ch]")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 
 include (CPack)
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2018, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2010 - 2021, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

NEWS

@@ -1,3 +1,9 @@
+Version 0.2.1
+ - Set up grounds for 64-bit Windows builds using the latest GTK+ 3.
+ - Made the Windows installer ask to uninstall previous versions first.
+ - Worked around a mysterious recent GTK+ bug with symbol dragging.
+ - Put a default filename in the save dialog, ensuring a file extension.
+
 Version 0.2.0
  - Added a library pane instead of a toolbar.
  - Added scrolling using the middle mouse button.

README.adoc

@@ -15,7 +15,7 @@ a package with the latest development version from Archlinux's AUR.
 Requirements
 ------------
 Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 +
-Build dependencies: CMake >= 2.8.12
+Build dependencies: CMake >= 3.9
 
 Build from source on Unix-like systems
 --------------------------------------
@@ -53,8 +53,11 @@ Build from source on Windows
 ----------------------------
 _Note that with the current method we're stuck with GTK+ 3.8.2._
 
-First install CMake >= 3.1 and MinGW. Add both to your system path. If you want
+First install CMake and MinGW. Add both to your system path. If you want
-to build an installation package, also install NSIS.
+to build an installation package, also install NSIS. If you want to build within
+a path containing spaces, fix your FindPkgConfig.cmake to say:
+
+ separate_arguments(_pkgconfig_invoke_result UNIX_COMMAND "${_pkgconfig_invoke_result}")
 
 Run the following command in the directory with source files to automatically
 fetch and setup all dependencies (contact me if the script becomes obsolete,
@@ -63,6 +66,8 @@ releasing a new version in order to resolve compatibility issues):
 
  > cmake -P Win32Depends.cmake
 
+Note that Windows XP is no longer able to reliably download from HTTPS sources.
+
 Reserve a directory for an out-of-source build:
 
  > mkdir build
@@ -99,7 +104,7 @@ Just install MinGW-w64 and let automation take care of the rest.
 
 Alternatively, for an unnecessarily bloated MSYS2-based 64-bit build:
 
- $ sh Win64Depends.cmake
+ $ sh Win64Depends.sh
  $ cmake -DCMAKE_TOOLCHAIN_FILE=ToolchainCrossWin64.cmake \
    -DCMAKE_BUILD_TYPE=Release -B build
  $ cmake --build build -- package

Win32Depends.cmake

@@ -1,13 +1,11 @@
 # Usage: cmake -P Win32Depends.cmake
 
-# Only CMake 3.1+ supports XZ archives and 7z doesn't also untar automatically
+# Only CMake 3.1+ supports XZ archives, not sure when 7z support comes from
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.9)
 
 # Directories
 set (working_dir ${CMAKE_CURRENT_BINARY_DIR}/win32-depends)
 set (pkg_dir ${working_dir}/packages)
-set (tools_dir ${working_dir}/tools)
-set (sevenzip_executable ${tools_dir}/7za)
 set (tmp_dir ${working_dir}/tmp)
 file (MAKE_DIRECTORY ${working_dir})
 file (MAKE_DIRECTORY ${pkg_dir})
@@ -21,15 +19,15 @@ if (files)
 endif (files)
 
 # Packages
-set (pkg_list "7za" "gtk" "gtkalt" "winlibs" "mingw_lua")
+set (pkg_list "gtk" "gtkalt" "winlibs" "mingw_lua")
-
-set (pkg_7za_root "http://sourceforge.net/projects/sevenzip/files")
-set (pkg_7za_urls "${pkg_7za_root}/7-Zip/9.20/7za920.zip")
-set (pkg_7za_md5 "2fac454a90ae96021f4ffc607d4c00f8")
 
 set (pkg_gtk_root "http://ftp.gnome.org/pub/gnome/binaries/win32")
-set (pkg_gtk_urls "${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip")
+set (pkg_gtk_urls
-set (pkg_gtk_md5 "09baff956ebd1c391c7f71e9bd768edd")
+	"${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip"
+	"${pkg_gtk_root}/dependencies/gettext-runtime-0.17-1.zip")
+set (pkg_gtk_md5
+	"09baff956ebd1c391c7f71e9bd768edd"
+	"110394b4b1e0a50cd440f1e8729d159c")
 
 # https://sourceforge.net/projects/urlget/files
 # /GTK%2B%203%20binary%20for%20Windows/GTK%2B%203.16.6/
@@ -64,11 +62,11 @@ foreach (pkg_set ${pkg_list})
 			message (WARNING "MD5 checksum missing for ${basename}")
 			set (pkg_md5_sum)
 			set (pkg_md5_param)
-		else (NOT pkg_md5)
+		else ()
 			list (GET pkg_md5 0 pkg_md5_sum)
 			list (REMOVE_AT pkg_md5 0)
 			set (pkg_md5_param EXPECTED_MD5 ${pkg_md5_sum})
-		endif (NOT pkg_md5)
+		endif ()
 
 		if (NOT EXISTS ${filename})
 			message (STATUS "Downloading ${url}...")
@@ -86,74 +84,39 @@ foreach (pkg_set ${pkg_list})
 			if (NOT output MATCHES "^${pkg_md5_sum}")
 				message (FATAL_ERROR "MD5 mismatch for ${basename}")
 			endif (NOT output MATCHES "^${pkg_md5_sum}")
-		endif (NOT EXISTS ${filename})
+		endif ()
 	endforeach (url)
 endforeach (pkg_set)
 
-if (NOT WIN32)
+# Stage 2: extract the rest of packages
-	unset (sevenzip_executable)
-	find_program (sevenzip_executable 7za)
-	if (NOT sevenzip_executable)
-		message (FATAL_ERROR "Could not find 7za (part of p7zip)")
-	endif (NOT sevenzip_executable)
-endif (NOT WIN32)
-
-# Stage 2: setup 7za first
-file (MAKE_DIRECTORY ${tmp_dir})
-foreach (url ${pkg_7za_urls})
-	get_filename_component (filename ${url} NAME)
-	message (STATUS "Extracting ${filename}...")
-
-	set (filename ${pkg_dir}/${filename})
-	execute_process (COMMAND ${CMAKE_COMMAND} -E tar xf ${filename}
-		WORKING_DIRECTORY ${tmp_dir}
-		RESULT_VARIABLE status)
-	if (status)
-		message (FATAL_ERROR "Extraction failed: ${status}")
-	endif (status)
-endforeach (url)
-
-file (MAKE_DIRECTORY ${tools_dir})
-file (COPY ${tmp_dir}/7za.exe DESTINATION ${tools_dir})
-file (REMOVE_RECURSE ${tmp_dir})
-list (REMOVE_ITEM pkg_list "7za")
-
-# Stage 3: extract the rest of packages
 foreach (pkg_set ${pkg_list})
 	foreach (url ${pkg_${pkg_set}_urls})
 		get_filename_component (filename ${url} NAME)
 		message (STATUS "Extracting ${filename}...")
-
-		if (filename MATCHES "\\.7z$")
-			set (extract_command ${sevenzip_executable} x)
-			set (quiet OUTPUT_QUIET)
-		else (filename MATCHES "\\.7z$")
 		set (extract_command ${CMAKE_COMMAND} -E tar xf)
-			set (quiet)
-		endif (filename MATCHES "\\.7z$")
 
 		set (filename ${pkg_dir}/${filename})
 		if (pkg_${pkg_set}_strip)
 			file (MAKE_DIRECTORY ${tmp_dir})
 			execute_process (COMMAND ${extract_command} ${filename}
 				WORKING_DIRECTORY ${tmp_dir}
-				RESULT_VARIABLE status ${quiet})
+				RESULT_VARIABLE status)
 			file (COPY ${tmp_dir}/${pkg_${pkg_set}_strip}/
 				DESTINATION ${working_dir})
 			file (REMOVE_RECURSE ${tmp_dir})
-		else (pkg_${pkg_set}_strip)
+		else ()
 			execute_process (COMMAND ${extract_command} ${filename}
 				WORKING_DIRECTORY ${working_dir}
-				RESULT_VARIABLE status ${quiet})
+				RESULT_VARIABLE status)
-		endif (pkg_${pkg_set}_strip)
+		endif ()
 
 		if (status)
 			message (FATAL_ERROR "Extraction failed: ${status}")
-		endif (status)
+		endif ()
 	endforeach (url)
 endforeach (pkg_set)
 
-# Stage 4: final touches
+# Stage 3: final touches
 # We have to fix the prefix path as it is completely wrong everywhere
 file (GLOB files ${working_dir}/lib/pkgconfig/*.pc)
 foreach (file ${files})

cmake/FindGettext.cmake

@@ -1,99 +0,0 @@
-# - Find GNU gettext tools
-# This module looks for the GNU gettext tools. This module defines the
-# following values:
-#    GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
-#    GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
-#    GETTEXT_FOUND: True if gettext has been found.
-#
-# Additionally it provides the following macros:
-# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
-#    This will create a target "${PROJECT_NAME}_translations" which will
-#    convert the given input po files into the binary output mo file.
-#    If the ALL option is used, the translations will also be created
-#    when building the default target.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-# Copyright 2010-2011 Přemysl Eric Janouch
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the Kitware nor the names of contributors may be
-#       used to endorse or promote products derived from this software
-#       without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-#=============================================================================
-
-find_program (GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
-find_program (GETTEXT_MSGFMT_EXECUTABLE msgfmt)
-
-macro (GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
-	# Make it a real variable, so we can modify it here.
-	set (_firstPoFile "${_firstPoFileArg}")
-
-	set (_gmoFiles)
-	get_filename_component (_potBasename ${_potFile} NAME_WE)
-	get_filename_component (_absPotFile ${_potFile} ABSOLUTE)
-
-	set (_addToAll)
-	if (${_firstPoFile} STREQUAL "ALL")
-		set (_addToAll "ALL")
-		set (_firstPoFile)
-	endif (${_firstPoFile} STREQUAL "ALL")
-
-	foreach (_currentPoFile ${_firstPoFile} ${ARGN})
-		get_filename_component (_absFile ${_currentPoFile} ABSOLUTE)
-		get_filename_component (_abs_PATH ${_absFile} PATH)
-		get_filename_component (_lang ${_absFile} NAME_WE)
-		set (_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
-
-		# msgmerge versions older than 0.11 don't actually support --update
-		# and --backup, let's try to workaround that (tested on 0.10.40).
-		execute_process (COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} -V
-			OUTPUT_VARIABLE _msgmergeVersion)
-		string (REGEX MATCH "0[.][0-9]+" _msgmergeVersion ${_msgmergeVersion})
-		if ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-			set (_msgmergeParams --quiet -s
-				${_absFile} -o ${_absFile} ${_absPotFile})
-		else ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-			set (_msgmergeParams --quiet --update --backup=none -s
-				${_absFile} ${_absPotFile})
-		endif ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-
-		add_custom_command (
-			OUTPUT ${_gmoFile}
-			COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${_msgmergeParams}
-			COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
-			DEPENDS ${_absPotFile} ${_absFile}
-		)
-
-		install (FILES ${_gmoFile} DESTINATION
-			share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
-		set (_gmoFiles ${_gmoFiles} ${_gmoFile})
-	endforeach (_currentPoFile)
-
-	add_custom_target (${PROJECT_NAME}_translations ${_addToAll}
-		DEPENDS ${_gmoFiles})
-endmacro (GETTEXT_CREATE_TRANSLATIONS)
-
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (Gettext DEFAULT_MSG
-	GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE)
-
-

config.h.in

@@ -9,7 +9,7 @@
 #define __CONFIG_H__
 
 #define PROJECT_NAME "${PROJECT_NAME}"
-#define PROJECT_VERSION "${project_VERSION}"
+#define PROJECT_VERSION "${PROJECT_VERSION}"
 #define PROJECT_URL "${project_URL}"
 
 #cmakedefine OPTION_NOINSTALL

po/cs.po

@@ -6,27 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: logdiag\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
-"POT-Creation-Date: 2018-06-27 04:52+0200\n"
+"POT-Creation-Date: 2021-10-22 22:16+0200\n"
-"PO-Revision-Date: 2018-06-25 04:02+0200\n"
+"PO-Revision-Date: 2021-10-22 22:21+0200\n"
 "Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 3.0\n"
 
-#: ../src/ld-window-main.c:931
+#: ../src/ld-window-main.c:937
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/logdiag.c:146
+#: ../src/logdiag.c:147
 msgid "- Schematic editor"
 msgstr "- Editor schémat"
 
-#: ../src/ld-window-main.c:855
+#: ../src/ld-window-main.c:861
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
@@ -59,7 +59,7 @@ msgstr "Nelze otevřít soubor"
 msgid "Failed to save the diagram"
 msgstr "Nelze uložit diagram"
 
-#: ../src/ld-window-main.c:853
+#: ../src/ld-window-main.c:859
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud je neuložíte, budou změny navždy ztraceny."
 
@@ -87,7 +87,7 @@ msgstr "Provede posledně vrácenou akci"
 msgid "Reset zoom level back to the default"
 msgstr "Vrátí přiblížení na výchozí hodnotu"
 
-#: ../src/ld-window-main.c:790
+#: ../src/ld-window-main.c:792
 msgid "Save As..."
 msgstr "Uložit jako..."
 
@@ -97,17 +97,15 @@ msgstr "Uložit _jako..."
 
 #: ../src/ld-window-main.c:623
 #, c-format
-msgid ""
+msgid "Save the changes to diagram \"%s\" before closing it and creating a new one?"
-"Save the changes to diagram \"%s\" before closing it and creating a new one?"
 msgstr "Uložit změny v diagramu \"%s\" před jeho zavřením a vytvořením nového?"
 
 #: ../src/ld-window-main.c:755
 #, c-format
-msgid ""
+msgid "Save the changes to diagram \"%s\" before closing it and opening another one?"
-"Save the changes to diagram \"%s\" before closing it and opening another one?"
 msgstr "Uložit změny v diagramu \"%s\" před jeho zavřením a otevřením jiného?"
 
-#: ../src/ld-window-main.c:893
+#: ../src/ld-window-main.c:899
 #, c-format
 msgid "Save the changes to diagram \"%s\" before closing?"
 msgstr "Uložit změny v diagramu \"%s\" před jeho zavřením?"
@@ -160,6 +158,10 @@ msgstr "Vrátí poslední akci"
 msgid "Unsaved Diagram"
 msgstr "Neuložený diagram"
 
+#: ../src/ld-window-main.c:806
+msgid "Untitled diagram"
+msgstr "Nepojmenovaný diagram"
+
 #: ../src/ld-window-main.c:171
 msgid "Zoom _Out"
 msgstr "_Oddálit"
@@ -240,7 +242,7 @@ msgstr "_Zobrazení"
 msgid "_Zoom In"
 msgstr "_Přiblížit"
 
-#: ../src/ld-window-main.c:977
+#: ../src/ld-window-main.c:983
 msgid "translator-credits"
 msgstr "Přemysl Eric Janouch <p@janouch.name>"
 

po/de.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: logdiag\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
-"POT-Creation-Date: 2018-06-27 04:52+0200\n"
+"POT-Creation-Date: 2021-10-22 22:16+0200\n"
 "PO-Revision-Date: 2018-06-25 04:11+0200\n"
 "Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.8\n"
 
-#: ../src/ld-window-main.c:931
+#: ../src/ld-window-main.c:937
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/logdiag.c:146
+#: ../src/logdiag.c:147
 msgid "- Schematic editor"
 msgstr "- Schema Editor"
 
-#: ../src/ld-window-main.c:855
+#: ../src/ld-window-main.c:861
 msgid "Close _without Saving"
 msgstr "Schließen _ohne Speichern"
 
@@ -61,7 +61,7 @@ msgstr "Fehler beim Öffnen der Datei"
 msgid "Failed to save the diagram"
 msgstr "Fehler beim Speichern des Diagramms"
 
-#: ../src/ld-window-main.c:853
+#: ../src/ld-window-main.c:859
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Wenn Sie nicht speichern, gehen alle Änderungen verloren."
 
@@ -89,7 +89,7 @@ msgstr "Letzte nicht abgeschlossene Aktion wiederholen"
 msgid "Reset zoom level back to the default"
 msgstr "Zoom Bereich zurücksetzen"
 
-#: ../src/ld-window-main.c:790
+#: ../src/ld-window-main.c:792
 msgid "Save As..."
 msgstr "Speichern unter..."
 
@@ -111,7 +111,7 @@ msgstr ""
 "Änderungen im Diagramm \"%s\" speichern bevor es beendet und ein Weiteres "
 "geöffnet wird?"
 
-#: ../src/ld-window-main.c:893
+#: ../src/ld-window-main.c:899
 #, c-format
 msgid "Save the changes to diagram \"%s\" before closing?"
 msgstr "Änderungen im Diagramm \"%s\" vor dem Schließen speichern?"
@@ -164,6 +164,11 @@ msgstr "Letzte Aktion rückgangig machen"
 msgid "Unsaved Diagram"
 msgstr "Ungespeichertes Diagramm"
 
+#: ../src/ld-window-main.c:806
+#, fuzzy
+msgid "Untitled diagram"
+msgstr "Ungespeichertes Diagramm"
+
 #: ../src/ld-window-main.c:171
 msgid "Zoom _Out"
 msgstr "Zoom _heraus"
@@ -244,7 +249,7 @@ msgstr "_Ansicht"
 msgid "_Zoom In"
 msgstr "_Hineinzoomen"
 
-#: ../src/ld-window-main.c:977
+#: ../src/ld-window-main.c:983
 msgid "translator-credits"
 msgstr "Andy J."
 

po/logdiag.pot

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: logdiag 0.2.0\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
-"POT-Creation-Date: 2018-06-27 04:52+0200\n"
+"POT-Creation-Date: 2021-10-22 22:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -206,29 +206,33 @@ msgstr ""
 msgid "Open..."
 msgstr ""
 
-#: ../src/ld-window-main.c:790
+#: ../src/ld-window-main.c:792
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ld-window-main.c:853
+#: ../src/ld-window-main.c:806
+msgid "Untitled diagram"
+msgstr ""
+
+#: ../src/ld-window-main.c:859
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#: ../src/ld-window-main.c:855
+#: ../src/ld-window-main.c:861
 msgid "Close _without Saving"
 msgstr ""
 
-#: ../src/ld-window-main.c:893
+#: ../src/ld-window-main.c:899
 #, c-format
 msgid "Save the changes to diagram \"%s\" before closing?"
 msgstr ""
 
-#: ../src/ld-window-main.c:931
+#: ../src/ld-window-main.c:937
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: ../src/ld-window-main.c:977
+#: ../src/ld-window-main.c:983
 msgid "translator-credits"
 msgstr ""
 
@@ -236,7 +240,7 @@ msgstr ""
 msgid "[FILE...]"
 msgstr ""
 
-#: ../src/logdiag.c:146
+#: ../src/logdiag.c:147
 msgid "- Schematic editor"
 msgstr ""
 

po/make-template.sh

@@ -1,36 +1,21 @@
-#!/bin/bash
+#!/bin/sh -e
-# This script makes a translation template
+# This shell script generates the translation template.
-# The reason for this not being inside CMakeLists.txt
+#
-# is that the translator should not need to run
+# The reason for this not being inside CMakeLists.txt is that the translator
-# the whole configure process to get this single stupid file.
+# should not need to run the whole configuration process just to get this file.
+dir=$(dirname $0)
 
-# Source files
+export LC_ALL=C
-SOURCES=$(echo ../{src,liblogdiag}/*.c)
 
-# Get the package name from CMakeLists.txt
+re='^[ \t]*project *( *\([^ \t)]\{1,\}\) \{1,\}VERSION \{1,\}\([^ \t)]\{1,\}\).*'
-PACKAGE=$(sed -n '/^[ \t]*[pP][rR][oO][jJ][eE][cC][tT][ \t]*([ \t]*\([^ \t)]\{1,\}\).*).*/{s//\1/p;q}' \
+package=$(sed -n "s/$re/\\1/p" "$dir/../CMakeLists.txt")
-	../CMakeLists.txt)
+version=$(sed -n "s/$re/\\2/p" "$dir/../CMakeLists.txt")
-
+if [ -z "$package" -o -z "$version" ]; then
-# Get the package version from CMakeLists.txt
+	echo "Failed to get information from CMakeLists.txt"
-EXP_BEG='/^[ \t]*[sS][eE][tT][ \t]*([ \t]*project_VERSION_'
+	exit 1
-EXP_END='[ \t]\{1,\}"\{0,1\}\([^)"]\{1,\}\)"\{0,1\}).*/{s//\1/p;q}'
-
-MAJOR=$(sed -n "${EXP_BEG}MAJOR${EXP_END}" ../CMakeLists.txt)
-MINOR=$(sed -n "${EXP_BEG}MINOR${EXP_END}" ../CMakeLists.txt)
-PATCH=$(sed -n "${EXP_BEG}PATCH${EXP_END}" ../CMakeLists.txt)
-
-if [ "$MAJOR" != "" ]; then
-	VERSION=$MAJOR
-	if [ "$MINOR" != "" ]; then
-		VERSION=$VERSION.$MINOR
-		if [ "$PATCH" != "" ]; then
-			VERSION=$VERSION.$PATCH
-		fi
-	fi
 fi
 
-# Finally make the template
+xgettext -LC -k_ -kN_ "$dir"/../{src,liblogdiag}/*.c -o "$dir/$package.pot" \
-xgettext -LC -k_ -kN_ $SOURCES -o "$PACKAGE".pot \
+	--package-name="$package" --package-version="$version" \
-	--package-name="$PACKAGE" --package-version="$VERSION" \
+	--copyright-holder="Přemysl Eric Janouch" \
-	--copyright-holder="Přemysl Eric Janouch"
+	--msgid-bugs-address="https://git.janouch.name/p/$package/issues"
-

po/pl.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: logdiag\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
-"POT-Creation-Date: 2018-06-27 04:52+0200\n"
+"POT-Creation-Date: 2021-10-22 22:16+0200\n"
 "PO-Revision-Date: 2018-06-25 04:09+0200\n"
 "Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.8\n"
 
-#: ../src/ld-window-main.c:931
+#: ../src/ld-window-main.c:937
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/logdiag.c:146
+#: ../src/logdiag.c:147
 msgid "- Schematic editor"
 msgstr "- Edytor schematów"
 
-#: ../src/ld-window-main.c:855
+#: ../src/ld-window-main.c:861
 msgid "Close _without Saving"
 msgstr "Zamknąć _bez zapisu"
 
@@ -59,7 +59,7 @@ msgstr "Pliku nie da się otworzyć"
 msgid "Failed to save the diagram"
 msgstr "Nie udało się zapisać wykresu"
 
-#: ../src/ld-window-main.c:853
+#: ../src/ld-window-main.c:859
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jeżeli nie zapiszesz zmian, zostaną one trwale utracone"
 
@@ -87,7 +87,7 @@ msgstr "Powtórzy ostatnio cofniętą akcję"
 msgid "Reset zoom level back to the default"
 msgstr "Przywróci poziom zbliżenia na poziom wyjściowy"
 
-#: ../src/ld-window-main.c:790
+#: ../src/ld-window-main.c:792
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
@@ -109,7 +109,7 @@ msgid ""
 msgstr ""
 "Zapisać zmiany w wykresie \"%s\" przed jego zamknięciem i stworzeniem nowego?"
 
-#: ../src/ld-window-main.c:893
+#: ../src/ld-window-main.c:899
 #, c-format
 msgid "Save the changes to diagram \"%s\" before closing?"
 msgstr "Zapisać zmiany w wykresie \"%s\" przed jego zamknięciem?"
@@ -162,6 +162,11 @@ msgstr "Cofnie ostatnią akcję"
 msgid "Unsaved Diagram"
 msgstr "Niezapisany Wykres"
 
+#: ../src/ld-window-main.c:806
+#, fuzzy
+msgid "Untitled diagram"
+msgstr "Niezapisany Wykres"
+
 #: ../src/ld-window-main.c:171
 msgid "Zoom _Out"
 msgstr "_Oddalić widok"
@@ -242,7 +247,7 @@ msgstr "_Widok"
 msgid "_Zoom In"
 msgstr "_Przybliżyć"
 
-#: ../src/ld-window-main.c:977
+#: ../src/ld-window-main.c:983
 msgid "translator-credits"
 msgstr "Robert Svoboda <ravath@gmail.com>"
 

po/sk.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: logdiag\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
-"POT-Creation-Date: 2018-06-27 04:52+0200\n"
+"POT-Creation-Date: 2021-10-22 22:16+0200\n"
 "PO-Revision-Date: 2018-06-25 04:05+0200\n"
 "Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,16 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.8\n"
 
-#: ../src/ld-window-main.c:931
+#: ../src/ld-window-main.c:937
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/logdiag.c:146
+#: ../src/logdiag.c:147
 msgid "- Schematic editor"
 msgstr "- Editor schém"
 
-#: ../src/ld-window-main.c:855
+#: ../src/ld-window-main.c:861
 msgid "Close _without Saving"
 msgstr "Zatvoriť _bez uloženia"
 
@@ -59,7 +59,7 @@ msgstr "Nepodarilo sa otvoriť súbor"
 msgid "Failed to save the diagram"
 msgstr "Nepodarilo sa uložiť diagram"
 
-#: ../src/ld-window-main.c:853
+#: ../src/ld-window-main.c:859
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ak ich neuložíte, budú zmeny navždy stratené."
 
@@ -87,7 +87,7 @@ msgstr "Vykoná naposledy vrátenú akciu"
 msgid "Reset zoom level back to the default"
 msgstr "Vráti priblíženie na východiskovú hodnotu"
 
-#: ../src/ld-window-main.c:790
+#: ../src/ld-window-main.c:792
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
@@ -108,7 +108,7 @@ msgid ""
 "Save the changes to diagram \"%s\" before closing it and opening another one?"
 msgstr "Uložiť zmeny v diagrame \"%s\" pred jeho zatvorením a otvorením iného?"
 
-#: ../src/ld-window-main.c:893
+#: ../src/ld-window-main.c:899
 #, c-format
 msgid "Save the changes to diagram \"%s\" before closing?"
 msgstr "Uložiť zmeny v diagrame \"%s\" pred jeho zatvorením?"
@@ -161,6 +161,11 @@ msgstr "Vráti poslednú akciu"
 msgid "Unsaved Diagram"
 msgstr "Neuložený diagram"
 
+#: ../src/ld-window-main.c:806
+#, fuzzy
+msgid "Untitled diagram"
+msgstr "Neuložený diagram"
+
 #: ../src/ld-window-main.c:171
 msgid "Zoom _Out"
 msgstr "_Oddialiť"
@@ -241,7 +246,7 @@ msgstr "_Zobrazenie"
 msgid "_Zoom In"
 msgstr "_Priblížiť"
 
-#: ../src/ld-window-main.c:977
+#: ../src/ld-window-main.c:983
 msgid "translator-credits"
 msgstr "Miroslav Rigler <itsgoingd@luzer.sk>"
 

share/org.logdiag.gschema.xml

@@ -1,5 +1,5 @@
 <schemalist>
-	<schema id="org.logdiag" path="/apps/logdiag/" gettext-domain="logdiag">
+	<schema id="org.logdiag" path="/org/logdiag/" gettext-domain="logdiag">
 		<key name="show-main-toolbar" type="b">
 			<default>true</default>
 			<summary>Whether to show the main toolbar</summary>

src/ld-window-main.c

@@ -2,7 +2,7 @@
  * ld-window-main.c
  *
  * This file is a part of logdiag.
- * Copyright 2010, 2011, 2012, 2015 Přemysl Eric Janouch
+ * Copyright 2010 - 2021 Přemysl Eric Janouch
  *
  * See the file LICENSE for licensing information.
  *
@@ -784,6 +784,8 @@ static void
 diagram_show_save_as_dialog (LdWindowMain *self)
 {
 	GtkWidget *dialog;
+	GtkFileChooser *file_chooser;
+	gchar *filename;
 
 	g_return_if_fail (LD_IS_WINDOW_MAIN (self));
 
@@ -796,15 +798,19 @@ diagram_show_save_as_dialog (LdWindowMain *self)
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog),
 		diagram_get_file_filter ());
 
+	file_chooser = GTK_FILE_CHOOSER (dialog);
 	if (self->priv->filename)
-		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog),
+		gtk_file_chooser_set_filename (file_chooser, self->priv->filename);
-			self->priv->filename);
+	else
+	{
+		filename = g_strdup_printf ("%s.ldd", _("Untitled diagram"));
+		gtk_file_chooser_set_current_name (file_chooser, filename);
+		g_free (filename);
+	}
 
 	while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
 	{
-		gchar *filename;
+		filename = gtk_file_chooser_get_filename (file_chooser);
-
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 		if (diagram_save (self, GTK_WINDOW (dialog), filename))
 		{
 			diagram_set_filename (self, filename);
@@ -975,7 +981,7 @@ on_action_about (GtkAction *action, LdWindowMain *self)
 		"logo-icon-name", PROJECT_NAME,
 		"version", PROJECT_VERSION,
 		"translator-credits", _("translator-credits"),
-		"copyright", "Copyright 2010 - 2018 Přemysl Eric Janouch",
+		"copyright", "Copyright 2010 - 2021 Přemysl Eric Janouch",
 		"website", PROJECT_URL,
 		NULL);
 }