Update translations

The appropriate interface will be chosen automatically.

.gitignore

@@ -3,9 +3,9 @@
 
 # Qt Creator files
 /CMakeLists.txt.user*
-/sdtui.cflags
+/tdv.cflags
-/sdtui.cxxflags
+/tdv.cxxflags
-/sdtui.config
+/tdv.config
-/sdtui.files
+/tdv.files
-/sdtui.creator*
+/tdv.creator*
-/sdtui.includes
+/tdv.includes

CMakeLists.txt

@@ -1,13 +1,15 @@
 cmake_minimum_required (VERSION 3.0)
-project (sdtui VERSION 0.1.0 LANGUAGES C)
+project (tdv VERSION 0.1.0 LANGUAGES C)
 
-# Moar warnings
+# Adjust warnings
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	set (ignores "-Wno-missing-field-initializers -Wno-cast-function-type")
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ${ignores}")
 	set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra")
 endif ()
 
+add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38)
+
 # For custom modules
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
@@ -108,6 +110,7 @@ if (WITH_GUI)
 		message (FATAL_ERROR "GTK+ not found")
 	endif ()
 
+	include_directories (${gtk_INCLUDE_DIRS})
 	link_directories (${gtk_LIBRARY_DIRS})
 endif ()
 
@@ -198,25 +201,7 @@ configure_file (${PROJECT_SOURCE_DIR}/config.h.in
 	${PROJECT_BINARY_DIR}/config.h)
 include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
-# Primary target source files
+# Icon generation utilities
-set (project_sources
-	src/${PROJECT_NAME}.c)
-set (project_headers
-	${project_common_headers})
-
-# Build the main executable and link it
-add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38)
-if (NOT WIN32)
-	add_executable (${PROJECT_NAME}
-		${project_sources} ${project_headers} ${project_common_sources})
-	target_link_libraries (${PROJECT_NAME} ${project_common_libraries}
-		${Ncursesw_LIBRARIES} termo-static)
-	if (WITH_X11)
-		target_link_libraries (${PROJECT_NAME} ${xcb_LIBRARIES})
-	endif ()
-endif (NOT WIN32)
-
-# The same for the alternative GTK+ UI
 if (NOT ${CMAKE_VERSION} VERSION_LESS 3.18.0)
 	set (find_program_REQUIRE REQUIRED)
 endif ()
@@ -224,7 +209,7 @@ endif ()
 function (icon_to_png svg size output_dir output)
 	set (_dimensions ${size}x${size})
 	set (_png_path ${output_dir}/hicolor/${_dimensions}/apps)
-	set (_png ${_png_path}/sdgui.png)
+	set (_png ${_png_path}/${PROJECT_NAME}.png)
 	set (${output} ${_png} PARENT_SCOPE)
 
 	find_program (rsvg_convert_EXECUTABLE rsvg-convert ${find_program_REQUIRE})
@@ -244,8 +229,17 @@ function (icon_for_win32 pngs ico)
 		COMMENT "Generating Windows program icon" VERBATIM)
 endfunction ()
 
+# Build the main executable and link it
+set (project_libraries
+	${project_common_libraries})
+set (project_sources
+	${project_common_sources}
+	src/${PROJECT_NAME}.c)
+set (project_headers
+	${project_common_headers})
+
 if (WITH_GUI)
-	set (icon_svg ${PROJECT_SOURCE_DIR}/sdgui.svg)
+	set (icon_svg ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}.svg)
 	set (icon_base ${PROJECT_BINARY_DIR}/icons)
 
 	# The largest size is mainly for an appropriately sized Windows icon
@@ -254,40 +248,54 @@ if (WITH_GUI)
 		icon_to_png (${icon_svg} ${icon_size} ${icon_base} icon_png)
 		list (APPEND icon_png_list ${icon_png})
 	endforeach ()
-	add_custom_target (sdgui-icons ALL DEPENDS ${icon_png_list})
+	add_custom_target (icons ALL DEPENDS ${icon_png_list})
-
-	set (sdgui_sources
-		src/sdgui.c
-		src/stardict-view.c
-		${project_common_sources})
-
-	if (WIN32)
-		set (icon_ico ${PROJECT_BINARY_DIR}/sdgui.ico)
-		icon_for_win32 ("${icon_png_list}" ${icon_ico})
-
-		set (resource_file ${PROJECT_BINARY_DIR}/sdgui.rc)
-		list (APPEND sdgui_sources ${resource_file})
-		add_custom_command (OUTPUT ${resource_file}
-			COMMAND ${CMAKE_COMMAND} -E echo "1 ICON \"sdgui.ico\""
-				> ${resource_file} VERBATIM)
-		set_property (SOURCE ${resource_file}
-			APPEND PROPERTY OBJECT_DEPENDS ${icon_ico})
-	endif ()
-
-	add_executable (sdgui WIN32 ${sdgui_sources})
-	target_include_directories (sdgui PUBLIC ${gtk_INCLUDE_DIRS})
-	target_link_libraries (sdgui ${project_common_libraries} ${gtk_LIBRARIES})
 endif ()
 
+if (WIN32)
+	set (icon_ico ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.ico)
+	icon_for_win32 ("${icon_png_list}" ${icon_ico})
+
+	set (resource_file ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.rc)
+	list (APPEND project_sources ${resource_file})
+	add_custom_command (OUTPUT ${resource_file}
+		COMMAND ${CMAKE_COMMAND} -E echo "1 ICON \"${PROJECT_NAME}.ico\""
+			> ${resource_file} VERBATIM)
+	set_property (SOURCE ${resource_file}
+		APPEND PROPERTY OBJECT_DEPENDS ${icon_ico})
+else ()
+	list (APPEND project_libraries ${Ncursesw_LIBRARIES} termo-static)
+	list (APPEND project_sources
+		src/${PROJECT_NAME}-tui.c)
+endif ()
+
+if (WITH_X11)
+	list (APPEND project_libraries ${xcb_LIBRARIES})
+endif ()
+if (WITH_GUI)
+	list (APPEND project_libraries ${gtk_LIBRARIES})
+	list (APPEND project_sources
+		src/${PROJECT_NAME}-gui.c
+		src/stardict-view.c)
+
+	add_executable (${PROJECT_NAME} WIN32 ${project_sources} ${project_headers})
+else ()
+	add_executable (${PROJECT_NAME} ${project_sources} ${project_headers})
+endif ()
+
+target_link_libraries (${PROJECT_NAME} ${project_libraries})
+
 # Tools
-set (tools tabfile add-pronunciation query-tool transform)
+set (tools tdv-tabfile tdv-add-pronunciation tdv-query-tool tdv-transform)
 foreach (tool ${tools})
 	add_executable (${tool} EXCLUDE_FROM_ALL
 		src/${tool}.c ${project_common_sources})
 	target_link_libraries (${tool} ${project_common_libraries})
 endforeach ()
 
-add_custom_target (tools DEPENDS ${tools})
+option (WITH_TOOLS "Build and install some StarDict tools" ${UNIX})
+if (WITH_TOOLS)
+	add_custom_target (tools ALL DEPENDS ${tools})
+endif ()
 
 # Example dictionaries
 file (GLOB dicts_scripts "${PROJECT_SOURCE_DIR}/dicts/*.*")
@@ -310,15 +318,17 @@ if (NOT WIN32)
 	install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 	install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
+	if (WITH_TOOLS)
+		install (TARGETS ${tools} DESTINATION ${CMAKE_INSTALL_BINDIR})
+	endif ()
 	if (WITH_GUI)
-		install (TARGETS sdgui DESTINATION ${CMAKE_INSTALL_BINDIR})
+		install (FILES ${PROJECT_NAME}.svg
-		install (FILES sdgui.svg
 			DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
 		install (DIRECTORY ${PROJECT_BINARY_DIR}/icons
 			DESTINATION ${CMAKE_INSTALL_DATADIR})
-		install (FILES sdgui.desktop
+		install (FILES ${PROJECT_NAME}.desktop
 			DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-		install (FILES sdgui.xml
+		install (FILES ${PROJECT_NAME}.xml
 			DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
 	endif ()
 
@@ -329,7 +339,7 @@ if (NOT WIN32)
 	endforeach ()
 elseif (WITH_GUI)
 	# This rather crude filter has been mostly copied over from logdiag
-	install (TARGETS sdgui DESTINATION .)
+	install (TARGETS ${PROJECT_NAME} DESTINATION .)
 	install (DIRECTORY
 		${win32_deps_prefix}/bin/
 		DESTINATION .
@@ -377,7 +387,7 @@ if (BUILD_TESTING)
 
 	find_program (xmlwf_EXECUTABLE xmlwf)
 	find_program (xmllint_EXECUTABLE xmllint)
-	foreach (xml sdgui.xml)
+	foreach (xml ${PROJECT_NAME}.xml)
 		if (xmlwf_EXECUTABLE)
 			add_test (test-xmlwf-${xml} ${xmlwf_EXECUTABLE}
 				${PROJECT_SOURCE_DIR}/${xml})
@@ -397,7 +407,7 @@ if (BUILD_TESTING)
 endif ()
 
 # CPack
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "StarDict TUI and GUI")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Translation dictionary viewer")
 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")
@@ -413,17 +423,17 @@ set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${PROJECT_NAME}")
 
-set (CPACK_NSIS_INSTALLED_ICON_NAME sdgui.exe)
+set (CPACK_NSIS_INSTALLED_ICON_NAME ${PROJECT_NAME}.exe)
-set (CPACK_PACKAGE_EXECUTABLES sdgui sdgui)
+set (CPACK_PACKAGE_EXECUTABLES ${PROJECT_NAME} ${PROJECT_NAME})
 set (CPACK_NSIS_EXECUTABLES_DIRECTORY .)
 set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS [[
-	WriteRegStr HKCR '.ifo' '' 'sdgui.Dictionary'
+	WriteRegStr HKCR '.ifo' '' 'tdv.Dictionary'
-	WriteRegStr HKCR 'sdgui.Dictionary' '' 'StarDict Dictionary'
+	WriteRegStr HKCR 'tdv.Dictionary' '' 'StarDict Dictionary'
-	WriteRegStr HKCR 'sdgui.Dictionary\\shell\\open\\command' '' '\"$INSTDIR\\sdgui.exe\" \"%1\"'
+	WriteRegStr HKCR 'tdv.Dictionary\\shell\\open\\command' '' '\"$INSTDIR\\tdv.exe\" \"%1\"'
 	System::Call 'shell32::SHChangeNotify(i,i,i,i) (0x08000000, 0x1000, 0, 0)'
 ]])
 set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS [[
-	DeleteRegKey HKCR 'sdgui.Dictionary'
+	DeleteRegKey HKCR 'tdv.Dictionary'
 	System::Call 'shell32::SHChangeNotify(i,i,i,i) (0x08000000, 0x1000, 0, 0)'
 ]])
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2022, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2013 - 2023, 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.

README.adoc

@@ -1,20 +1,19 @@
-StarDict Terminal and Graphical UI
+Translation dictionary viewer
-==================================
+=============================
 
-'sdtui' aims to provide an easy way of viewing translation as well as other
+'tdv' aims to provide an easy way of viewing translation as well as other kinds
-kinds of dictionaries in your terminal, and is inspired by the dictionary
+of StarDict dictionaries, and is inspired by the dictionary component
-component of PC Translator.  I wasn't successful in finding any free software
+of PC Translator.  I was unsuccessful in finding any free software of this kind,
-of this kind, GUI or not, and thus decided to write my own.
+and thus decided to write my own.
 
 The project is covered by a permissive license, unlike vast majority of other
 similar projects, and can serve as a base for implementing other dictionary
 software.
 
-image::sdtui.png[align="center"]
+image::tdv.png[align="center"]
 
-As a recent addition, there is now an alternative GTK+ 3 based frontend as well,
+As a recent addition, the program also offers a GTK+ 3 based user interface,
-called 'sdgui'.  It shares its dictionary list with 'sdtui', but styling will
+whose styling will follow your theme, and may be customized from 'gtk.css'.
-follow your theme, and may be customized from 'gtk.css'.
 
 Packages
 --------
@@ -23,7 +22,7 @@ a package with the latest development version from Archlinux's AUR.
 
 Documentation
 -------------
-See the link:docs/sdtui.1.adoc[man page] for information about usage.
+See the link:docs/tdv.1.adoc[man page] for information about usage.
 The rest of this README will concern itself with externalities.
 
 Building and Running
@@ -51,16 +50,16 @@ To install the application, you can do either the usual:
 Or you can try telling CMake to make a package for you.  For Debian it is:
 
  $ cpack -G DEB
- # dpkg -i sdtui-*.deb
+ # dpkg -i tdv-*.deb
 
 Having the program installed, simply run it with a StarDict '.ifo' file as
 an argument.  It is, however, preferable to
-link:docs/sdtui.1.adoc#_configuration[configure it] to load your dictionaries
+link:docs/tdv.1.adoc#_configuration[configure it] to load your dictionaries
 automatically.
 
 Windows
 ~~~~~~~
-With the help of Mingw-w64 and WINE, 'sdgui' will successfully cross-compile
+With the help of Mingw-w64 and WINE, 'tdv' will successfully cross-compile
 for Windows.  It isn't particularly usable on that system, if only because
 selection watching is a very X11/Wayland-specific feature.  Beware that build
 dependencies take up almost a gigabyte of disk space.
@@ -82,16 +81,16 @@ The `make dicts` command will build some examples from freely available sources:
  - Czech foreign words (the site's export is broken as of 2022/08, no response)
  - Czech WordNet 1.9 PDT (synonyms, hypernyms, hyponyms)
 
-You can use the included 'transform' tool to convert already existing StarDict
+You can use the included 'tdv-transform' tool to convert already existing
-dictionaries that are nearly good as they are.  Remember that you can change
+StarDict dictionaries that are nearly good as they are.  Remember that you can
-the `sametypesequence` of the resulting '.ifo' file to another format, or run
+change the `sametypesequence` of the resulting '.ifo' file to another format,
-'dictzip' on '.dict' files to make them compact.
+or run 'dictzip' on '.dict' files to make them compact.
 
 https://mega.co.nz/#!axtD0QRK!sbtBgizksyfkPqKvKEgr8GQ11rsWhtqyRgUUV0B7pwg[CZ <--> EN/DE/PL/RU dictionaries]
 
 Further Development
 -------------------
-While I've been successfully using 'sdtui' for many years now, some issues
+While I've been successfully using 'tdv' for many years now, some issues
 should be addressed before including the software in regular Linux and/or
 BSD distributions:
 

config.h.in

@@ -8,6 +8,7 @@
 #define GETTEXT_DIRNAME "${CMAKE_INSTALL_PREFIX}/share/locale"
 
 #cmakedefine WITH_X11
+#cmakedefine WITH_GUI
 #cmakedefine HAVE_RESIZETERM
 
 #endif  // ! CONFIG_H

docs/tdv.1.adoc

@@ -1,21 +1,21 @@
-sdtui(1)
+tdv(1)
-========
+======
 :doctype: manpage
-:manmanual: sdtui Manual
+:manmanual: tdv Manual
-:mansource: sdtui {release-version}
+:mansource: tdv {release-version}
 
 Name
 ----
-sdtui - StarDict terminal UI
+tdv - Translation dictionary viewer
 
 Synopsis
 --------
-*sdtui* [_OPTION_]... [_DICTIONARY_.ifo]...
+*tdv* [_OPTION_]... [_DICTIONARY_.ifo]...
 
 Description
 -----------
-*sdtui* is a StarDict dictionary viewer, custom-tailored for translation
+*tdv* is a StarDict dictionary viewer, custom-tailored for translation
-dictionaries, with a simple curses-based terminal UI.
+dictionaries, with a simple curses-based terminal UI, and a GTK+ graphical UI.
 
 Without any command line arguments, the program expects to find a list of
 dictionaries to load on start-up in its configuration file.  The _.ifo_ files
@@ -32,7 +32,7 @@ Options
 
 Configuration
 -------------
-You can start your _sdtui.conf_ file with the following snippet:
+You can start your _tdv.conf_ file with the following snippet:
 
  [Settings]
  center-search = true     # Ensure visibility of preceding entries?
@@ -75,16 +75,16 @@ Extensions
 ----------
 Because the StarDict file format is a bit of a clusterfuck with regard to
 collation of dictionary entries, this software introduces an additional,
-optional "collation" field into the _.ifo_ file.  When *sdtui* discovers this
+optional "collation" field into the _.ifo_ file.  When *tdv* discovers this
 field while reading a dictionary, it automatically reorders the index according
 to that locale (e.g., "cs_CZ").  This operation may take a little while,
 in the order of seconds.
 
 Files
 -----
-*sdtui* follows the XDG Base Directory Specification.
+*tdv* follows the XDG Base Directory Specification.
 
-_~/.config/sdtui/sdtui.conf_::
+_~/.config/tdv/tdv.conf_::
 	The configuration file.
 
 Reporting bugs

po/cs.po

@@ -1,84 +1,95 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2013 Přemysl Eric Janouch
-# This file is distributed under the same license as the sdtui package.
+# This file is distributed under the same license as the tdv package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sdtui 0.1.0\n"
+"Project-Id-Version: tdv 0.1.0\n"
-"Report-Msgid-Bugs-To: https://git.janouch.name/p/sdtui/issues\n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/tdv/issues\n"
-"POT-Creation-Date: 2021-10-11 21:10+0200\n"
+"POT-Creation-Date: 2023-06-11 17:47+0200\n"
-"PO-Revision-Date: 2016-09-28 16:15+0200\n"
+"PO-Revision-Date: 2023-06-11 17:53+0200\n"
 "Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\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 1.8.9\n"
+"X-Generator: Poedit 3.3.1\n"
 
-#: ../src/sdgtk.c:304
+#: ../src/tdv-tui.c:572
-msgid "- StarDict GTK+ UI"
-msgstr ""
-
-#: ../src/sdtui.c:726
 msgid "Cannot load configuration"
 msgstr "Nemohu načíst konfiguraci"
 
-#: ../src/sdtui.c:2497
+#: ../src/tdv.c:77
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/sdtui.c:745
+#: ../src/tdv-tui.c:592
 msgid "Error loading dictionary"
 msgstr "Chyba při načítání slovníku"
 
-#: ../src/sdgtk.c:299
+#: ../src/tdv.c:60
-msgid "FILE..."
+msgid "Launch the GUI even when run from a terminal"
-msgstr ""
+msgstr "Spustit GUI i při běhu z terminálu"
 
-#: ../src/sdgtk.c:355
+#: ../src/tdv-gui.c:467 ../src/tdv-tui.c:597
-msgid "Follow selection"
+msgid "No dictionaries found either in the configuration or on the command line"
-msgstr ""
-
-#: ../src/sdtui.c:750
-msgid ""
-"No dictionaries found either in the configuration or on the command line"
 msgstr "V konfiguraci ani na příkazové řádce nebyly nalezeny žádné slovníky"
 
-#: ../src/sdtui.c:2476
+#: ../src/tdv-gui.c:367
+msgid "Open dictionary"
+msgstr "Otevřít slovník"
+
+#: ../src/tdv.c:55
 msgid "Output version information and exit"
 msgstr "Vypíše informace o verzi a ukončí se"
 
-#: ../src/sdtui.c:700
+#: ../src/tdv-tui.c:555
 msgid "Search"
 msgstr "Hledat"
 
-#: ../src/sdtui.c:1114
+#: ../src/tdv-tui.c:1068
 msgid "Terminal UI for StarDict dictionaries"
 msgstr "Terminálové UI pro stardictové slovníky"
 
-#: ../src/sdtui.c:1117
+#: ../src/tdv-tui.c:1071
 msgid "Type to search"
 msgstr "Zadejte vyhledávaný výraz"
 
-#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
+#: ../src/tdv.c:39
 msgid "Warning"
 msgstr "Varování"
 
-#: ../src/sdtui.c:2095
+#: ../src/tdv-tui.c:2071
 #, c-format
 msgid "X11 connection failed (error code %d)"
-msgstr ""
+msgstr "Spojení s X11 selhalo (chybový kód %d)"
 
-#: ../src/sdtui.c:2241
+#: ../src/tdv-tui.c:2217
 #, c-format
 msgid "X11 request error (%d, major %d, minor %d)"
-msgstr ""
+msgstr "Chyba X11 požadavku (%d, major %d, minor %d)"
 
-#: ../src/sdtui.c:2489
+#: ../src/tdv.c:67
-msgid "[dictionary.ifo...] - StarDict terminal UI"
+msgid "[dictionary.ifo...] - Translation dictionary viewer"
-msgstr "[slovník.ifo...] - terminálové UI pro StarDict"
+msgstr "[slovník.ifo...] - Prohlížeč překladových slovníků"
+
+#: ../src/tdv-gui.c:369
+msgid "_Cancel"
+msgstr "_Storno"
+
+#: ../src/tdv-gui.c:509
+msgid "_Follow selection"
+msgstr "_Sledovat výběr"
+
+#: ../src/tdv-gui.c:370
+msgid "_Open"
+msgstr "_Otevřít"
+
+#: ../src/tdv-gui.c:504
+msgid "_Open..."
+msgstr "_Otevřít..."
 
 #: ../src/stardict.c:850
 msgid "cannot find .dict file"
@@ -88,19 +99,19 @@ msgstr "nemohu najít .dict soubor"
 msgid "cannot find .idx file"
 msgstr "nemohu najít .idx soubor"
 
-#: ../src/sdtui.c:320
+#: ../src/tdv-tui.c:258
 msgid "error in entry"
 msgstr "chyba v záznamu"
 
-#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
+#: ../src/tdv.c:39
 msgid "failed to set the locale"
 msgstr "selhalo nastavení locale"
 
-#: ../src/stardict.c:330
+#: ../src/stardict.c:328
 msgid "index file size not specified"
 msgstr "nebyla určena velikost rejstříku"
 
-#: ../src/stardict.c:1153 ../src/stardict.c:1178
+#: ../src/stardict.c:1157 ../src/stardict.c:1182
 msgid "invalid data entry"
 msgstr "neplatná datová položka"
 
@@ -112,7 +123,7 @@ msgstr "neplatné kódování, musí být validní UTF-8"
 msgid "invalid header format"
 msgstr "neplatný formát hlavičky"
 
-#: ../src/stardict.c:339
+#: ../src/stardict.c:337
 msgid "invalid index offset bits"
 msgstr "neplatný počet bitů pro offset v rejstříku"
 
@@ -124,11 +135,11 @@ msgstr "neplatné číslo"
 msgid "invalid version"
 msgstr "neplatná verze"
 
-#: ../src/stardict.c:318
+#: ../src/stardict.c:316
 msgid "no book name specified"
 msgstr "nebyl určen název knihy"
 
-#: ../src/sdtui.c:415
+#: ../src/stardict-view.c:96 ../src/tdv-tui.c:340
 msgid "no usable field found"
 msgstr "nenalezeno žádné použitelné pole"
 
@@ -136,7 +147,7 @@ msgstr "nenalezeno žádné použitelné pole"
 msgid "option format error"
 msgstr "chyba v zápisu volby"
 
-#: ../src/sdtui.c:2497
+#: ../src/tdv.c:77
 msgid "option parsing failed"
 msgstr "zpracování přepínačů selhalo"
 
@@ -148,6 +159,9 @@ msgstr "neznámý klíč, ignoruji"
 msgid "version not specified"
 msgstr "nebyla určena verze"
 
-#: ../src/stardict.c:324
+#: ../src/stardict.c:322
 msgid "word count not specified"
 msgstr "nebyl určen počet slov"
+
+#~ msgid "FILE..."
+#~ msgstr "SOUBOR..."

po/tdv.pot

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Přemysl Eric Janouch
-# This file is distributed under the same license as the sdtui package.
+# This file is distributed under the same license as the tdv package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sdtui 0.1.0\n"
+"Project-Id-Version: tdv 0.1.0\n"
-"Report-Msgid-Bugs-To: https://git.janouch.name/p/sdtui/issues\n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/tdv/issues\n"
-"POT-Creation-Date: 2021-10-11 21:10+0200\n"
+"POT-Creation-Date: 2023-06-11 17:47+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"
@@ -17,85 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
+#: ../src/stardict-view.c:96 ../src/tdv-tui.c:340
-msgid "Warning"
-msgstr ""
-
-#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
-msgid "failed to set the locale"
-msgstr ""
-
-#: ../src/sdgtk.c:299
-msgid "FILE..."
-msgstr ""
-
-#: ../src/sdgtk.c:304
-msgid "- StarDict GTK+ UI"
-msgstr ""
-
-#: ../src/sdgtk.c:355
-msgid "Follow selection"
-msgstr ""
-
-#: ../src/sdtui.c:320
-msgid "error in entry"
-msgstr ""
-
-#: ../src/sdtui.c:415
 msgid "no usable field found"
 msgstr ""
 
-#: ../src/sdtui.c:700
-msgid "Search"
-msgstr ""
-
-#: ../src/sdtui.c:726
-msgid "Cannot load configuration"
-msgstr ""
-
-#: ../src/sdtui.c:745
-msgid "Error loading dictionary"
-msgstr ""
-
-#: ../src/sdtui.c:750
-msgid ""
-"No dictionaries found either in the configuration or on the command line"
-msgstr ""
-
-#: ../src/sdtui.c:1114
-msgid "Terminal UI for StarDict dictionaries"
-msgstr ""
-
-#: ../src/sdtui.c:1117
-msgid "Type to search"
-msgstr ""
-
-#: ../src/sdtui.c:2095
-#, c-format
-msgid "X11 connection failed (error code %d)"
-msgstr ""
-
-#: ../src/sdtui.c:2241
-#, c-format
-msgid "X11 request error (%d, major %d, minor %d)"
-msgstr ""
-
-#: ../src/sdtui.c:2476
-msgid "Output version information and exit"
-msgstr ""
-
-#: ../src/sdtui.c:2489
-msgid "[dictionary.ifo...] - StarDict terminal UI"
-msgstr ""
-
-#: ../src/sdtui.c:2497
-msgid "Error"
-msgstr ""
-
-#: ../src/sdtui.c:2497
-msgid "option parsing failed"
-msgstr ""
-
 #: ../src/stardict.c:89
 msgid "invalid header format"
 msgstr ""
@@ -124,19 +49,19 @@ msgstr ""
 msgid "option format error"
 msgstr ""
 
-#: ../src/stardict.c:318
+#: ../src/stardict.c:316
 msgid "no book name specified"
 msgstr ""
 
-#: ../src/stardict.c:324
+#: ../src/stardict.c:322
 msgid "word count not specified"
 msgstr ""
 
-#: ../src/stardict.c:330
+#: ../src/stardict.c:328
 msgid "index file size not specified"
 msgstr ""
 
-#: ../src/stardict.c:339
+#: ../src/stardict.c:337
 msgid "invalid index offset bits"
 msgstr ""
 
@@ -148,6 +73,93 @@ msgstr ""
 msgid "cannot find .dict file"
 msgstr ""
 
-#: ../src/stardict.c:1153 ../src/stardict.c:1178
+#: ../src/stardict.c:1157 ../src/stardict.c:1182
 msgid "invalid data entry"
 msgstr ""
+
+#: ../src/tdv-gui.c:367
+msgid "Open dictionary"
+msgstr ""
+
+#: ../src/tdv-gui.c:369
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/tdv-gui.c:370
+msgid "_Open"
+msgstr ""
+
+#: ../src/tdv-gui.c:467 ../src/tdv-tui.c:597
+msgid ""
+"No dictionaries found either in the configuration or on the command line"
+msgstr ""
+
+#: ../src/tdv-gui.c:504
+msgid "_Open..."
+msgstr ""
+
+#: ../src/tdv-gui.c:509
+msgid "_Follow selection"
+msgstr ""
+
+#: ../src/tdv-tui.c:258
+msgid "error in entry"
+msgstr ""
+
+#: ../src/tdv-tui.c:555
+msgid "Search"
+msgstr ""
+
+#: ../src/tdv-tui.c:572
+msgid "Cannot load configuration"
+msgstr ""
+
+#: ../src/tdv-tui.c:592
+msgid "Error loading dictionary"
+msgstr ""
+
+#: ../src/tdv-tui.c:1068
+msgid "Terminal UI for StarDict dictionaries"
+msgstr ""
+
+#: ../src/tdv-tui.c:1071
+msgid "Type to search"
+msgstr ""
+
+#: ../src/tdv-tui.c:2071
+#, c-format
+msgid "X11 connection failed (error code %d)"
+msgstr ""
+
+#: ../src/tdv-tui.c:2217
+#, c-format
+msgid "X11 request error (%d, major %d, minor %d)"
+msgstr ""
+
+#: ../src/tdv.c:39
+msgid "Warning"
+msgstr ""
+
+#: ../src/tdv.c:39
+msgid "failed to set the locale"
+msgstr ""
+
+#: ../src/tdv.c:55
+msgid "Output version information and exit"
+msgstr ""
+
+#: ../src/tdv.c:60
+msgid "Launch the GUI even when run from a terminal"
+msgstr ""
+
+#: ../src/tdv.c:67
+msgid "[dictionary.ifo...] - Translation dictionary viewer"
+msgstr ""
+
+#: ../src/tdv.c:77
+msgid "Error"
+msgstr ""
+
+#: ../src/tdv.c:77
+msgid "option parsing failed"
+msgstr ""

src/tdv-gui.c

@@ -19,7 +19,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <locale.h>
 #include <stdlib.h>
 
 #include "config.h"
@@ -27,9 +26,6 @@
 #include "utils.h"
 #include "stardict-view.h"
 
-#undef PROJECT_NAME
-#define PROJECT_NAME "sdgui"
-
 static struct
 {
 	GtkWidget    *window;            ///< Top-level window
@@ -452,42 +448,18 @@ die_with_dialog (const gchar *message)
 }
 
 int
-main (int argc, char *argv[])
+gui_main (char *argv[])
 {
-	if (!setlocale (LC_ALL, ""))
+	// Just like with GtkApplication, argv has been parsed by the option group.
-		g_printerr ("%s: %s\n", _("Warning"), _("failed to set the locale"));
+	gtk_init (NULL, NULL);
-
-	bindtextdomain (GETTEXT_PACKAGE, GETTEXT_DIRNAME);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	gchar **filenames = NULL;
-	GOptionEntry option_entries[] =
-	{
-		{G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
-			NULL, N_("[FILE]...")},
-		{},
-	};
-
-	GError *error = NULL;
-	gtk_init_with_args (&argc, &argv, N_("- StarDict GTK+ UI"),
-		option_entries, GETTEXT_PACKAGE, &error);
-	if (error)
-	{
-		g_warning ("%s", error->message);
-		g_error_free (error);
-		return 1;
-	}
 
 	gtk_window_set_default_icon_name (PROJECT_NAME);
 
+	GError *error = NULL;
 	GPtrArray *new_dictionaries =
 		g_ptr_array_new_with_free_func ((GDestroyNotify) dictionary_destroy);
-	if (filenames)
+	if (argv[0])
-	{
+		load_from_filenames (new_dictionaries, argv);
-		load_from_filenames (new_dictionaries, filenames);
-		g_strfreev (filenames);
-	}
 	else if (!load_from_config (new_dictionaries, &error) && error)
 		die_with_dialog (error->message);
 

src/tdv-query-tool.c

@@ -6,7 +6,7 @@
  * finalised with an empty line.  Newlines are escaped with `\n',
  * backslashes with `\\'.
  *
- * So far only the `m', `g`, and `x` fields are supported, as in sdtui.
+ * So far only the `m', `g`, and `x` fields are supported, as in tdv.
  *
  * Copyright (c) 2013 - 2021, Přemysl Eric Janouch <p@janouch.name>
  *

src/tdv-transform.c

@@ -3,7 +3,7 @@
  *
  * The external filter needs to process NUL-separated textual entries.
  *
- * Example: transform input.ifo output -- perl -p0e s/bullshit/soykaf/g
+ * Example: tdv-transform input.ifo output -- perl -p0e s/bullshit/soykaf/g
  *
  * Copyright (c) 2020, Přemysl Eric Janouch <p@janouch.name>
  *

src/tdv-tui.c

@@ -18,16 +18,15 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <locale.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <string.h>
 
 #include <glib.h>
 #include <glib-unix.h>
+#include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <pango/pango.h>
-#include <glib/gi18n.h>
 
 #include <unistd.h>
 #include <poll.h>
@@ -2438,53 +2437,10 @@ log_handler (const gchar *domain, GLogLevelFlags level,
 }
 
 int
-main (int argc, char *argv[])
+tui_main (char *argv[])
 {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-	if (glib_check_version (2, 36, 0))
-		g_type_init ();
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-	gboolean show_version = FALSE;
-	GOptionEntry entries[] =
-	{
-		{ "version", 0, G_OPTION_FLAG_IN_MAIN,
-		  G_OPTION_ARG_NONE, &show_version,
-		  N_("Output version information and exit"), NULL },
-		{ NULL }
-	};
-
-	if (!setlocale (LC_ALL, ""))
-		g_printerr ("%s: %s\n", _("Warning"), _("failed to set the locale"));
-
-	bindtextdomain (GETTEXT_PACKAGE, GETTEXT_DIRNAME);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	GError *error = NULL;
-	GOptionContext *ctx = g_option_context_new
-		(N_("[dictionary.ifo...] - StarDict terminal UI"));
-	GOptionGroup *group = g_option_group_new ("", "", "", NULL, NULL);
-	g_option_group_add_entries (group, entries);
-	g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
-	g_option_context_add_group (ctx, group);
-	g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE);
-	if (!g_option_context_parse (ctx, &argc, &argv, &error))
-	{
-		g_printerr ("%s: %s: %s\n", _("Error"), _("option parsing failed"),
-			error->message);
-		exit (EXIT_FAILURE);
-	}
-	g_option_context_free (ctx);
-
-	if (show_version)
-	{
-		g_print (PROJECT_NAME " " PROJECT_VERSION "\n");
-		exit (EXIT_SUCCESS);
-	}
-
 	Application app;
-	app_init (&app, argv + 1);
+	app_init (&app, argv);
 	app_init_terminal (&app);
 	app_redraw (&app);
 
@@ -2528,4 +2484,3 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
 	return 0;
 }
-

src/tdv.c

@@ -0,0 +1,98 @@
+/*
+ * Translation dictionary viewer
+ *
+ * Copyright (c) 2023, 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#ifdef WITH_GUI
+#include <gtk/gtk.h>
+#endif
+
+#include <locale.h>
+#ifndef G_OS_WIN32
+#include <unistd.h>
+#endif
+
+int tui_main (char *[]);
+int gui_main (char *[]);
+
+int
+main (int argc, char *argv[])
+{
+	if (!setlocale (LC_ALL, ""))
+		g_printerr ("%s: %s\n", _("Warning"), _("failed to set the locale"));
+
+	bindtextdomain (GETTEXT_PACKAGE, GETTEXT_DIRNAME);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
+	gboolean show_version = FALSE;
+#ifdef WITH_GUI
+# ifndef G_OS_WIN32
+	gboolean gui = FALSE;
+# endif
+#endif
+	GOptionEntry entries[] =
+	{
+		{ "version", 0, G_OPTION_FLAG_IN_MAIN,
+		  G_OPTION_ARG_NONE, &show_version,
+		  N_("Output version information and exit"), NULL },
+#ifdef WITH_GUI
+# ifndef G_OS_WIN32
+		{ "gui", 0, G_OPTION_FLAG_IN_MAIN,
+		  G_OPTION_ARG_NONE, &gui,
+		  N_("Launch the GUI even when run from a terminal"), NULL },
+# endif
+#endif
+		{ },
+	};
+
+	GOptionContext *ctx = g_option_context_new
+		(N_("[dictionary.ifo...] - Translation dictionary viewer"));
+	g_option_context_add_main_entries (ctx, entries, GETTEXT_PACKAGE);
+#ifdef WITH_GUI
+	g_option_context_add_group (ctx, gtk_get_option_group (FALSE));
+#endif
+	g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE);
+
+	GError *error = NULL;
+	if (!g_option_context_parse (ctx, &argc, &argv, &error))
+	{
+		g_printerr ("%s: %s: %s\n", _("Error"), _("option parsing failed"),
+			error->message);
+		exit (EXIT_FAILURE);
+	}
+	g_option_context_free (ctx);
+
+	if (show_version)
+	{
+		g_print (PROJECT_NAME " " PROJECT_VERSION "\n");
+		exit (EXIT_SUCCESS);
+	}
+
+#ifdef WITH_GUI
+# ifndef G_OS_WIN32
+	if (gui || !isatty (STDIN_FILENO))
+# endif
+		return gui_main (argv + 1);
+#endif
+#ifndef G_OS_WIN32
+	return tui_main (argv + 1);
+#endif
+}

tdv.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
-Name=sdgui
+Name=tdv
-GenericName=StarDict GUI
+GenericName=Translation dictionary viewer
-Icon=sdgui
+Icon=tdv
-Exec=sdgui %F
+Exec=tdv %F
 StartupNotify=true
 MimeType=application/x-stardict-ifo;
 Categories=Office;Dictionary;GTK;