Remove image import tab deleted: libbirdfont/BackgroundSelection.vala

Changed files (2)

• deleted libbirdfont/BackgroundSelection.vala
• modified libbirdfont/OpenFontFormat/Cmap.vala

Diff

diff --git a/libbirdfont/BackgroundSelection.vala b/libbirdfont/BackgroundSelection.valadeleted file mode 100644index 59f2f93..0000000--- a/libbirdfont/BackgroundSelection.vala+++ /dev/null@@ -1,319 +0,0 @@-/*-    Copyright (C) 2012, 2013, 2014 Johan Mattsson--    This library is free software; you can redistribute it and/or modify -    it under the terms of the GNU Lesser General Public License as -    published by the Free Software Foundation; either version 3 of the -    License, or (at your option) any later version.--    This library is distributed in the hope that it will be useful, but -    WITHOUT ANY WARRANTY; without even the implied warranty of -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -    Lesser General Public License for more details.-*/--using Cairo;-using Gdk;--namespace BirdFont {--class BackgroundSelection : FontDisplay {--	int active_box = -1;-	ImageSurface add_icon;-	Gee.ArrayList <string> background_images = new Gee.ArrayList<string> ();-	WidgetAllocation allocation;-	Glyph glyph;-	-	public BackgroundSelection () {-		ImageSurface? i;-		glyph = MainWindow.get_current_glyph ();-		-		i = Icons.get_icon ("add_background_image.png");-		if (i == null) {-			warning ("Could not find icon.");	-		}-		-		add_icon = (!) i;-	}--	public override string get_label () {-		return t_("Backgrounds");-	}-	-	public override string get_name () {-		return "Backgrounds";-	}--	public override void draw (WidgetAllocation allocation, Context cr) {		-		double x, y, zoom;-		int box_index = 0;-		Font font;--		this.allocation = allocation;--		// bg color-		cr.save ();-		cr.set_source_rgba (255/255.0, 255/255.0, 255/255.0, 1);-		cr.rectangle (0, 0, allocation.width, allocation.height);-		cr.fill ();-		cr.restore ();-		-		draw_box (box_index, 20, 20, cr);-		cr.set_source_surface (add_icon, 62, 62);-		cr.paint ();-			-		cr.save ();-		x = 160;-		y = 20;-		zoom = 0.04;-		-		font = BirdFont.get_current_font ();-		foreach (string file in background_images) {-			box_index++;--			if (x > allocation.width - 140) {-				x = 20;-				y += 140;-			}--			draw_box (box_index, x, y, cr);-			draw_thumbnail (file, x, y, cr, box_index);-			-			x += 140;	-		}-		cr.restore ();-			-	}-	-	private ImageSurface create_thumbnail (string file) throws GLib.Error {-		ImageSurface img_surface;-		ImageSurface thumbnail_surface;-		Cairo.Status status;-		BackgroundImage background_image;-		Context cr;-		double ratio;-		Font font = BirdFont.get_current_font ();-		File folder = font.get_backgrounds_folder ();-		string fn = Checksum.compute_for_string (ChecksumType.SHA1, file);-		File original = File.new_for_path (file);-		File thumbnail_folder = folder.get_child (@"thumbnail");-		File thumbnail_image = thumbnail_folder.get_child (@"$(fn).png");-				-		if (!thumbnail_folder.query_exists ()) {-			DirUtils.create ((!) thumbnail_folder.get_path (), 0xFFFFFF);-		}-		-		if (!thumbnail_image.query_exists ()) {-			background_image = new BackgroundImage ((!) original.get_path ());-			img_surface = background_image.get_img ();-			thumbnail_surface = new ImageSurface (Format.ARGB32, 100, 100);-			ratio = Math.fmin (100.0 / img_surface.get_width (), 100.0 / img_surface.get_height ());-			cr = new Context (thumbnail_surface);-			-			cr.save ();-			cr.scale (ratio, ratio);-			cr.set_source_surface (img_surface, 0, 0);-			cr.paint ();-			cr.restore ();-			-			status = thumbnail_surface.write_to_png ((!) thumbnail_image.get_path ());-			if (status != Cairo.Status.SUCCESS) {-				warning (@"Can't save $((!) thumbnail_image.get_path ())");-			}-		}-		-		return new ImageSurface.from_png ((!) thumbnail_image.get_path ());-	}-	-	private bool draw_thumbnail (string file, double x, double y, Context cr, int box_index) {-		ImageSurface img;-	-		try {-			img = create_thumbnail (file);-			-			if (img.status () == Cairo.Status.SUCCESS) {-				cr.set_source_surface (img, x + 10, y + 10);-				cr.paint ();-			}-		} catch (GLib.Error e) {-			warning (e.message);-			return false;-		}-		-		return true;	-	}-	-	private void draw_box (int index, double x, double y, Context cr) {-		cr.save ();-		cr.set_line_join (LineJoin.ROUND);-		cr.set_line_width (7);-		-		if (index == active_box) {-			cr.set_source_rgba (203/255.0, 220/255.0, 249/255.0, 1);-		} else {-			cr.set_source_rgba (183/255.0, 200/255.0, 223/255.0, 1);-		}-		-		cr.rectangle (x, y, 120, 120);-		cr.fill_preserve ();-		cr.stroke ();-		-		cr.restore ();		-	}-	-	public override void button_release (int button, double ex, double ey) {-		motion (ex, ey);-		-		if (active_box == 0) {-			add_image ();-		} else {-			select_image ();-		}-	}--	private void add_image () {-		string? file;--		file = MainWindow.file_chooser_open ("Add image");--		if (file != null) {-			BirdFont.get_current_font ().add_background_image ((!) file);-		}-		-		GlyphCanvas.redraw ();				-		-		collect_background_images ();-	}--	private void select_image () {-		Font font;-		string file;-		BackgroundImage bg;-		TabBar tb;-		Tool zoom_background;--		font = BirdFont.get_current_font ();-				-		if (!(0 <= active_box - 1 < background_images.size)) {-			return;-		}-		-		file = background_images.get (active_box - 1);-		bg = new BackgroundImage (file);-		tb = MainWindow.get_tab_bar ();-		-		bg.reset_scale (glyph);-		-		glyph.set_background_visible (true);-		-		MainWindow.get_current_glyph ().set_background_image (bg);-		tb.select_tab_name (MainWindow.get_current_glyph ().get_name ());--		zoom_background = MainWindow.get_tool ("zoom_background_image");-		zoom_background.select_action (zoom_background);--		Toolbox.select_tool_by_name ("cut_background");-	}--	private void add_unique_background (string file) {-		foreach (var f in background_images) {-			if (f == file) {-				return;-			}-		}-		-		background_images.insert (0, file);-	}--	public override void selected_canvas () {-		Font font = BirdFont.get_current_font ();-		File folder = font.get_backgrounds_folder ();-		-		if (!folder.query_exists ()) {-			DirUtils.create ((!) folder.get_path (), 0xFFFFFF);-		}-		-		collect_background_images ();-	}--	bool is_image (string file_name) {-		return file_name.index_of (".png") != -1 -			|| file_name.index_of (".jpg") != -1-			|| file_name.index_of (".jpeg") != -1;-	}--	void collect_background_images () {-		Font font = BirdFont.get_current_font ();-		File directory = font.get_folder ();-		FileEnumerator enumerator;-		FileInfo? file_info;-		FileInfo fi;-		File img_file;--		background_images.clear ();-		-		foreach (string file in font.background_images) {-			add_unique_background (file);-		}-				-		try {-			enumerator = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);-			-			while ((file_info = enumerator.next_file ()) != null) {-				fi = (!) file_info;-				-				if (is_image (fi.get_name ())) {-					img_file = directory.get_child (fi.get_name ());					-					add_unique_background ((!)img_file.get_path ());-				}-				-			}-		} catch (GLib.Error e) {-			warning (e.message);-		}-	}-	-	public override void key_press (uint e) {-	}--	public override void key_release (uint e) {-	}-	-	public override void motion_notify (double x, double y) {-		motion (x, y);-	}-	-	public void motion (double x, double y) {-		int active;-		-		active = (int) (x / 140); // column-		active += (int) (y / 140) * (int) (allocation.width / 140.0); // row-		-		if (active != active_box) {-			GlyphCanvas.redraw ();-			active_box = active;-		}-	}--	public override void button_press (uint button, double ex, double ey) {-		motion (ex, ey);-	}--	public override void store_current_view () {-	}-	-	public override void restore_last_view () {-	}--	public override void next_view () {-	}-	-	public override void scroll_wheel_up (double x, double y) {-	}--	public override void scroll_wheel_down (double x, double y) {-	}-}--}diff --git a/libbirdfont/OpenFontFormat/Cmap.vala b/libbirdfont/OpenFontFormat/Cmap.valaindex f531bcf..d181f8d 100644--- a/libbirdfont/OpenFontFormat/Cmap.vala+++ b/libbirdfont/OpenFontFormat/Cmap.vala@@ -72,7 +72,7 @@ public class CmapSubtableWindowsUnicode : CmapSubtable { 				} 			}  			-			warning (@"There is no char for glyph number $indice in cmap table. table.size: $(table.size ()))");+			warning (@"There is no character for glyph number $indice in cmap table. table.size: $(table.size ()))"); 			return 0; 		}