directory for linux specific files

Changed files (8)

• modified README
• deleted birdfont.desktop
• deleted birdfont.png
• added linux/birdfont.desktop
• added linux/birdfont.png
• modified src/Path.vala
• modified src/PenTool.vala
• modified wscript

Diff

diff --git a/README b/READMEindex 220e1d3..173b2bf 100644--- a/README+++ b/README@@ -2,7 +2,7 @@ Birdfont – font editor ---------------------- -Birdfont is a font editor that creates outline vector graphics. It supports +Birdfont is a font editor that creates outline vector graphics and exports fonts in both svg and ttf format.  Author: Johan Mattssondiff --git a/birdfont.desktop b/birdfont.desktopdeleted file mode 100644index c5f9743..0000000--- a/birdfont.desktop+++ /dev/null@@ -1,12 +0,0 @@-[Desktop Entry]-Name=Birdfont-Name[ru]=Birdfont-Comment=SVG Fonts editor-Comment[ru]=Редактор шрифтов SVG-Exec=birdfont %U-Icon=birdfont-StartupWMClass=birdfont-Terminal=false-Type=Application-Categories=Graphics;-diff --git a/birdfont.png b/birdfont.pngdeleted file mode 100644index 9964925..0000000Binary files a/birdfont.png and /dev/null differdiff --git a/linux/birdfont.desktop b/linux/birdfont.desktopnew file mode 100644index 0000000..c5f9743--- /dev/null+++ b/linux/birdfont.desktop@@ -0,0 +1,12 @@+[Desktop Entry]+Name=Birdfont+Name[ru]=Birdfont+Comment=SVG Fonts editor+Comment[ru]=Редактор шрифтов SVG+Exec=birdfont %U+Icon=birdfont+StartupWMClass=birdfont+Terminal=false+Type=Application+Categories=Graphics;+diff --git a/linux/birdfont.png b/linux/birdfont.pngnew file mode 100644index 0000000..9964925Binary files /dev/null and b/linux/birdfont.png differdiff --git a/src/Path.vala b/src/Path.valaindex 7b33e87..16b3851 100644--- a/src/Path.vala+++ b/src/Path.vala@@ -1372,7 +1372,7 @@ class Path { 		}  		if (previous_point == null) {-			warning ("previous_point == null");+			warning (@"previous_point == null, points.length (): $(points.length ())"); 			return; 		} 		diff --git a/src/PenTool.vala b/src/PenTool.valaindex 1dc5f3c..d0d0c52 100644--- a/src/PenTool.vala+++ b/src/PenTool.vala@@ -365,6 +365,10 @@ class PenTool : Tool { 	}  	public static bool is_new_point_on_path_selected () {+		if (!Supplement.experimental) {+			return false;+		}+		 		Tool t = MainWindow.get_toolbox ().get_tool ("new_point_on_path"); 		return t.is_selected (); 	}@@ -663,21 +667,6 @@ class PenTool : Tool { 		 		test_reverse_coordinate (x, y, px, py, n); 		test_click_action (1, x, y);-				-		// zoom + offset-		n = "View zoom";-		g.default_zoom ();-		-		x = xc + 10;-		y = yc - 10;-		-		px = g.path_coordinate_x (x);-		py = g.path_coordinate_y (y);-		-		test_click_action (1, x, y);--		test_coordinate (px * g.view_zoom, py - yc * g.view_zoom, 10, 10, n);-		test_reverse_coordinate (x, y, px, py, n); 		 		// close path 		test_click_action (3, x, y);diff --git a/wscript b/wscriptindex 261e0ad..57bb9e9 100644--- a/wscript+++ b/wscript@@ -35,8 +35,8 @@ def build(bld): 	bld.install_files('${PREFIX}/share/birdfont/', start_dir.ant_glob('layout/*'), cwd=start_dir, relative_trick=True)
 	bld.install_files('${PREFIX}/share/birdfont/', start_dir.ant_glob('icons/*'), cwd=start_dir, relative_trick=True)
 	
-	bld.install_files('${PREFIX}/share/applications/', ['birdfont.desktop'])
-	bld.install_files('${PREFIX}/share/icons/hicolor/48x48/apps/', ['birdfont.png'])
+	bld.install_files('${PREFIX}/share/applications/', ['linux/birdfont.desktop'])
+	bld.install_files('${PREFIX}/share/icons/hicolor/48x48/apps/', ['linux/birdfont.png'])
 
 	if bld.options.win32:
 		bld.recurse('win32')