Command line: Fix auto-guessing of SVG file name.

doxygen target

CMakeLists.txt

@@ -43,3 +43,4 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c PROPER
 target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)
 
+add_custom_target(documentation DEPENDS doxygen)

doxygen/CMakeLists.txt

@@ -1,10 +1,10 @@
 find_package(Doxygen)
+
 if (DOXYGEN_FOUND)
  	add_custom_target(doxygen
 		COMMAND ./build-doxygen.sh "${PROJECT_BINARY_DIR}"
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 		COMMENT "Generating documentation with Doxygen")
-		
 else (DOXYGEN_FOUND)
   message("Doxygen need to be installed to generate the doxygen documentation")
 endif (DOXYGEN_FOUND)

layer-selector/layer-selector-dnd.c

@@ -193,8 +193,8 @@ static const char *dnd_additional_css =
   "  border-bottom: 1px solid alpha(gray,0.5); "
   "}"
   ".row.drag-icon { "
-  "  background: white; "
-  "  border: 1px solid black; "
+  "  background: #282828; "
+  "  border: 1px solid blue; "
   "}"
   ".row.drag-row { "
   "  color: gray; "

main.c

@@ -50,6 +50,7 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 	builder = gtk_builder_new_from_resource("/about.glade");
 	dialog = GTK_DIALOG(gtk_builder_get_object(builder, "about-dialog"));
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), appdata->main_window);
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), _app_version_string);
 	gtk_dialog_run(dialog);
 
 	gtk_widget_destroy(GTK_WIDGET(dialog));
@@ -57,8 +58,8 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 }
 
 const static GActionEntry app_actions[] = {
-	{"quit", app_quit},
-	{"about", app_about}
+	{"quit", app_quit, NULL, NULL, NULL, {0}},
+	{"about", app_about, NULL, NULL, NULL, {0}}
 };
 
 static void gapp_activate(GApplication *app, gpointer user_data)
@@ -82,7 +83,7 @@ static int start_gui(int argc, char **argv)
 	GMenu *m_quit;
 	GMenu *m_about;
 
-	gapp = gtk_application_new("de.shimatta.gds-render", G_APPLICATION_FLAGS_NONE);
+	gapp = gtk_application_new("de.shimatta.gds-render", G_APPLICATION_NON_UNIQUE);
 	g_application_register(G_APPLICATION(gapp), NULL, NULL);
 	g_signal_connect(gapp, "activate", G_CALLBACK(gapp_activate), &appdata);
 
@@ -181,8 +182,8 @@ int main(int argc, char **argv)
 		if (!pdfname)
 			pdfname = g_strdup_printf("./%s.pdf", basename);
 
-		if (!pdfname)
-			pdfname = g_strdup_printf("./%s.svg", basename);
+		if (!svgname)
+			svgname = g_strdup_printf("./%s.svg", basename);
 
 		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz,
 					 mappingname, cellname, (double)scale,