Compare commits
	
		
			6 Commits
		
	
	
		
			deceafb4f4
			...
			v0.3.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						9dc1d20d6c
	
				 | 
					
					
						|||
| 
						
						
							
						
						66a3b3e259
	
				 | 
					
					
						|||
| 
						
						
							
						
						3ff0f117f9
	
				 | 
					
					
						|||
| 
						
						
							
						
						de291ffddb
	
				 | 
					
					
						|||
| 
						
						
							
						
						baaca4c58f
	
				 | 
					
					
						|||
| 
						
						
							
						
						7499f92811
	
				 | 
					
					
						
@@ -1,6 +1,6 @@
 | 
				
			|||||||
# The last version with Windows XP support is 3.13, we want to keep that
 | 
					# The last version with Windows XP support is 3.13, we want to keep that
 | 
				
			||||||
cmake_minimum_required (VERSION 3.10)
 | 
					cmake_minimum_required (VERSION 3.10)
 | 
				
			||||||
project (logdiag VERSION 0.2.1 DESCRIPTION "Schematic editor" LANGUAGES C)
 | 
					project (logdiag VERSION 0.3.0 DESCRIPTION "Schematic editor" LANGUAGES C)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Options
 | 
					# Options
 | 
				
			||||||
option (OPTION_CLANG_TIDY "Enable use of clang-tidy" OFF)
 | 
					option (OPTION_CLANG_TIDY "Enable use of clang-tidy" OFF)
 | 
				
			||||||
@@ -68,9 +68,11 @@ endif ()
 | 
				
			|||||||
# Dependencies
 | 
					# Dependencies
 | 
				
			||||||
find_package (PkgConfig REQUIRED)
 | 
					find_package (PkgConfig REQUIRED)
 | 
				
			||||||
pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
 | 
					pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
 | 
				
			||||||
 | 
					link_directories (${GTK3_LIBRARY_DIRS})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (NOT WIN32)
 | 
					if (NOT WIN32)
 | 
				
			||||||
	pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
 | 
						pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
 | 
				
			||||||
 | 
						link_directories (${Lua_LIBRARY_DIRS})
 | 
				
			||||||
else ()
 | 
					else ()
 | 
				
			||||||
	# For whatever reason this now seems to be required
 | 
						# For whatever reason this now seems to be required
 | 
				
			||||||
	set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
 | 
						set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")
 | 
				
			||||||
@@ -83,9 +85,6 @@ else ()
 | 
				
			|||||||
	set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 | 
						set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 | 
				
			||||||
endif ()
 | 
					endif ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This actually fucks up MinGW cross-compilation if omitted
 | 
					 | 
				
			||||||
link_directories (${GTK3_LIBRARY_DIRS})
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Localization
 | 
					# Localization
 | 
				
			||||||
find_package (Gettext REQUIRED)
 | 
					find_package (Gettext REQUIRED)
 | 
				
			||||||
file (GLOB project_PO_FILES ${PROJECT_SOURCE_DIR}/po/*.po)
 | 
					file (GLOB project_PO_FILES ${PROJECT_SOURCE_DIR}/po/*.po)
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										11
									
								
								NEWS
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								NEWS
									
									
									
									
									
								
							@@ -1,3 +1,14 @@
 | 
				
			|||||||
 | 
					Version 0.3.0
 | 
				
			||||||
 | 
					 - Added basic print functionality (lines may have the wrong width).
 | 
				
			||||||
 | 
					 - Fine-tuned rendering of a few symbols.
 | 
				
			||||||
 | 
					 - Bound toggling of the grid to the # key, following Inkscape.
 | 
				
			||||||
 | 
					 - Ensured all opened files are added to the list of recent files.
 | 
				
			||||||
 | 
					 - View position is reset when opening files.
 | 
				
			||||||
 | 
					 - Made the user guide available from the Help menu.
 | 
				
			||||||
 | 
					 - The website link in the About dialog now opens on Windows XP.
 | 
				
			||||||
 | 
					 - Put the project's license in the About dialog.
 | 
				
			||||||
 | 
					 - Made Windows builds considerably slimmer.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Version 0.2.1
 | 
					Version 0.2.1
 | 
				
			||||||
 - Set up grounds for 64-bit Windows builds using the latest GTK+ 3.
 | 
					 - Set up grounds for 64-bit Windows builds using the latest GTK+ 3.
 | 
				
			||||||
 - Made the Windows installer ask to uninstall previous versions first.
 | 
					 - Made the Windows installer ask to uninstall previous versions first.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@ q:lang(cs):after { content: "“"; }
 | 
				
			|||||||
<p class="details">
 | 
					<p class="details">
 | 
				
			||||||
<span id="author">Přemysl Eric Janouch</span><br>
 | 
					<span id="author">Přemysl Eric Janouch</span><br>
 | 
				
			||||||
<span id="email"><a href="mailto:p@janouch.name">p@janouch.name</a></span><br>
 | 
					<span id="email"><a href="mailto:p@janouch.name">p@janouch.name</a></span><br>
 | 
				
			||||||
<span id="revnumber">verze 0.2.2,</span>
 | 
					<span id="revnumber">verze 0.3.0,</span>
 | 
				
			||||||
<span id="revdate">2021-10-28</span>
 | 
					<span id="revdate">2021-10-28</span>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<p class="figure"><img src="logdiag-cs.png" alt="Okno programu logdiag">
 | 
					<p class="figure"><img src="logdiag-cs.png" alt="Okno programu logdiag">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@ q:lang(en):after { content: "’"; }
 | 
				
			|||||||
<p class="details">
 | 
					<p class="details">
 | 
				
			||||||
<span id="author">Přemysl Eric Janouch</span><br>
 | 
					<span id="author">Přemysl Eric Janouch</span><br>
 | 
				
			||||||
<span id="email"><a href="mailto:p@janouch.name">p@janouch.name</a></span><br>
 | 
					<span id="email"><a href="mailto:p@janouch.name">p@janouch.name</a></span><br>
 | 
				
			||||||
<span id="revnumber">version 0.2.2,</span>
 | 
					<span id="revnumber">version 0.3.0,</span>
 | 
				
			||||||
<span id="revdate">2021-10-28</span>
 | 
					<span id="revdate">2021-10-28</span>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<p class="figure"><img src="logdiag-en.png" alt="logdiag program window">
 | 
					<p class="figure"><img src="logdiag-en.png" alt="logdiag program window">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3002,6 +3002,9 @@ ld_diagram_view_get_export_bounds (LdDiagramView *self, LdRectangle *rect)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	LdRectangle intermediate;
 | 
						LdRectangle intermediate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/* Presumably, cairo_recording_surface_ink_extents() could also be used,
 | 
				
			||||||
 | 
						 * though DrawData::exposed_rect currently stands in the way.
 | 
				
			||||||
 | 
						 */
 | 
				
			||||||
	get_diagram_bounds (self, &intermediate);
 | 
						get_diagram_bounds (self, &intermediate);
 | 
				
			||||||
	ld_diagram_view_diagram_to_widget_coords_rect (self, &intermediate, rect);
 | 
						ld_diagram_view_diagram_to_widget_coords_rect (self, &intermediate, rect);
 | 
				
			||||||
	return ld_diagram_view_get_scale_in_px (self);
 | 
						return ld_diagram_view_get_scale_in_px (self);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
#, fuzzy
 | 
					#, fuzzy
 | 
				
			||||||
msgid ""
 | 
					msgid ""
 | 
				
			||||||
msgstr ""
 | 
					msgstr ""
 | 
				
			||||||
"Project-Id-Version: logdiag 0.2.2\n"
 | 
					"Project-Id-Version: logdiag 0.3.0\n"
 | 
				
			||||||
"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
 | 
					"Report-Msgid-Bugs-To: https://git.janouch.name/p/logdiag/issues\n"
 | 
				
			||||||
"POT-Creation-Date: 2021-10-28 20:07+0200\n"
 | 
					"POT-Creation-Date: 2021-10-28 20:07+0200\n"
 | 
				
			||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 | 
					"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,7 @@ local render = function (cr)
 | 
				
			|||||||
	cr:curve_to (3, 0, 2, 2, 0, 2)
 | 
						cr:curve_to (3, 0, 2, 2, 0, 2)
 | 
				
			||||||
	cr:line_to (-2, 2)
 | 
						cr:line_to (-2, 2)
 | 
				
			||||||
	cr:curve_to (-1, 1, -1, -1, -2, -2)
 | 
						cr:curve_to (-1, 1, -1, -1, -2, -2)
 | 
				
			||||||
 | 
						cr:close_path ()
 | 
				
			||||||
	cr:stroke ()
 | 
						cr:stroke ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	-- The terminals
 | 
						-- The terminals
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,8 +21,7 @@ local render = function (cr)
 | 
				
			|||||||
	cr:line_to (-1, 0)
 | 
						cr:line_to (-1, 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	-- The terminals
 | 
						-- The terminals
 | 
				
			||||||
	cr:move_to (-2, 0)
 | 
						cr:line_to (-2, 0)
 | 
				
			||||||
	cr:line_to (-1, 0)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cr:move_to (1, 0)
 | 
						cr:move_to (1, 0)
 | 
				
			||||||
	cr:line_to (2, 0)
 | 
						cr:line_to (2, 0)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,7 +48,7 @@ local render = function (cr)
 | 
				
			|||||||
	cr:move_to (-1, -1)
 | 
						cr:move_to (-1, -1)
 | 
				
			||||||
	cr:line_to (1, 0)
 | 
						cr:line_to (1, 0)
 | 
				
			||||||
	cr:line_to (-1, 1)
 | 
						cr:line_to (-1, 1)
 | 
				
			||||||
	cr:line_to (-1, -1)
 | 
						cr:close_path ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	-- The vertical line
 | 
						-- The vertical line
 | 
				
			||||||
	cr:move_to (1, 1)
 | 
						cr:move_to (1, 1)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,7 @@ local render = function (cr)
 | 
				
			|||||||
	cr:line_to (1.5, -0.5)
 | 
						cr:line_to (1.5, -0.5)
 | 
				
			||||||
	cr:line_to (1.5, 0.5)
 | 
						cr:line_to (1.5, 0.5)
 | 
				
			||||||
	cr:line_to (-1.5, 0.5)
 | 
						cr:line_to (-1.5, 0.5)
 | 
				
			||||||
	cr:line_to (-1.5, -0.5)
 | 
						cr:close_path ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	-- The terminals
 | 
						-- The terminals
 | 
				
			||||||
	cr:move_to (-2, 0)
 | 
						cr:move_to (-2, 0)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -712,9 +712,10 @@ diagram_save (LdWindowMain *self, GtkWindow *dialog_parent,
 | 
				
			|||||||
static gboolean
 | 
					static gboolean
 | 
				
			||||||
diagram_open (LdWindowMain *self, const gchar *filename)
 | 
					diagram_open (LdWindowMain *self, const gchar *filename)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	GError *error;
 | 
						GError *error = NULL;
 | 
				
			||||||
 | 
						GFile *file;
 | 
				
			||||||
 | 
						gchar *uri;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	error = NULL;
 | 
					 | 
				
			||||||
	ld_diagram_load_from_file (self->priv->diagram, filename, &error);
 | 
						ld_diagram_load_from_file (self->priv->diagram, filename, &error);
 | 
				
			||||||
	if (error)
 | 
						if (error)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
@@ -748,8 +749,17 @@ diagram_open (LdWindowMain *self, const gchar *filename)
 | 
				
			|||||||
		return FALSE;
 | 
							return FALSE;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						file = g_file_new_for_path (filename);
 | 
				
			||||||
 | 
						uri = g_file_get_uri (file);
 | 
				
			||||||
 | 
						g_object_unref (file);
 | 
				
			||||||
 | 
						gtk_recent_manager_add_item (gtk_recent_manager_get_default (), uri);
 | 
				
			||||||
 | 
						g_free (uri);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ld_diagram_set_modified (self->priv->diagram, FALSE);
 | 
						ld_diagram_set_modified (self->priv->diagram, FALSE);
 | 
				
			||||||
	diagram_set_filename (self, g_strdup (filename));
 | 
						diagram_set_filename (self, g_strdup (filename));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ld_diagram_view_set_x (self->priv->view, 0);
 | 
				
			||||||
 | 
						ld_diagram_view_set_y (self->priv->view, 0);
 | 
				
			||||||
	return TRUE;
 | 
						return TRUE;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user