From 5fc06663b1d53f9077e70d7b9868561416e1c1ad Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sun, 30 Dec 2007 23:48:26 +0000
Subject: [PATCH] Added icon for MSE in packages window; Added
 resample(image,width,height), instead of always passing in images

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@806 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/data/installer.cpp                    |  26 ++++-
 src/data/installer.hpp                    |   1 +
 src/gfx/generated_image.cpp               |  22 +---
 src/gfx/gfx.hpp                           |   2 +
 src/gfx/resample_image.cpp                |  19 +++
 src/gui/control/image_card_list.cpp       |   4 +-
 src/gui/image_slice_window.cpp            |   3 +-
 src/gui/packages_window.cpp               | 134 ++++++++++++++--------
 src/gui/set/stats_panel.cpp               |   6 +-
 src/render/value/image.cpp                |   4 +-
 src/render/value/package_choice.cpp       |   4 +-
 src/resource/common/installer_program.png | Bin 0 -> 6520 bytes
 src/resource/msw/mse.rc                   |   1 +
 src/util/string.cpp                       |   2 +-
 14 files changed, 145 insertions(+), 83 deletions(-)
 create mode 100644 src/resource/common/installer_program.png

diff --git a/src/data/installer.cpp b/src/data/installer.cpp
index 6f72e986..cd315603 100644
--- a/src/data/installer.cpp
+++ b/src/data/installer.cpp
@@ -15,7 +15,7 @@
 #include <data/export_template.hpp>
 #include <util/io/package_manager.hpp>
 #include <util/platform.hpp>
-#include <script/to_value.hpp>
+#include <gui/util.hpp> // load_resource_image
 #include <wx/filename.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
@@ -195,10 +195,20 @@ PackageDescription::PackageDescription(const Packaged& package)
 	if (full_name.empty()) full_name = short_name;
 	// installer group
 	if (installer_group.empty()) {
-		// "game-style.mse-something" -> "game/style" -> "game"
-		installer_group = replace_all(package.name(),_("-"),_("/"));
-		size_t pos = installer_group.find_last_of(_('/'));
+		// "game-style.mse-something" -> "game/style_short_name"
+		installer_group = package.name();
+		size_t pos = installer_group.find_last_of(_('-'));
 		if (pos != String::npos) installer_group.resize(pos);
+		if (!installer_group.empty()) {
+			installer_group = _("unclassified/") + replace_all(installer_group,_("-"),_("/")) + _("/");
+		} else {
+			installer_group = _("unclassified/");
+		}
+		if (dynamic_cast<const Game*>(&package)) {
+			installer_group += _("Game files");
+		} else {
+			installer_group += short_name;
+		}
 	}
 	// icon
 	InputStreamP file = const_cast<Packaged&>(package).openIconFile();
@@ -219,6 +229,9 @@ IMPLEMENT_REFLECTION_NO_SCRIPT(PackageDescription) {
 
 void PackageDescription::merge(const PackageDescription& p2) {
 	if (!icon.Ok() && !icon_url) icon = p2.icon;
+	if (installer_group.empty()) installer_group = p2.installer_group;
+	if (short_name.empty()) short_name = p2.short_name;
+	if (full_name.empty()) full_name = p2.full_name;
 }
 
 IMPLEMENT_REFLECTION_NO_SCRIPT(InstallerDescription) {
@@ -454,9 +467,10 @@ InstallablePackageP mse_installable_package() {
 	mse_version->version = app_version;
 	PackageDescriptionP mse_description(new PackageDescription);
 	mse_description->name          = mse_package;
-	mse_description->short_name    = mse_description->full_name = _TITLE_("magic set editor");
+	mse_description->short_name    = mse_description->full_name = mse_description->installer_group
+	        = _TITLE_("magic set editor");
 	mse_description->position_hint = -100;
-	//mse_description->icon          = load_resource_image(_("mse_icon"));
+	mse_description->icon          = load_resource_image(_("installer_program"));
 	//mse_description->description   = _LABEL_("magic set editor package");
 	return new_intrusive2<InstallablePackage>(mse_version,mse_description);
 }
diff --git a/src/data/installer.hpp b/src/data/installer.hpp
index f05a52fe..d0c7a31f 100644
--- a/src/data/installer.hpp
+++ b/src/data/installer.hpp
@@ -99,6 +99,7 @@ enum PackageStatus
 ,	PACKAGE_INSTALLABLE   = 0x0110 ///< Package can be installed (it makes sense to do so)
 ,	PACKAGE_UPDATES       = 0x0111 ///< Remote updates available
 ,	PACKAGE_MODIFIED      = 0x1001 ///< Local changes made
+,	PACKAGE_MISSING_DEP   = 0x0200 ///< Missing a dependency for installation
 ,	PACKAGE_CONFLICTS     = PACKAGE_UPDATES | PACKAGE_MODIFIED
 };
 
diff --git a/src/gfx/generated_image.cpp b/src/gfx/generated_image.cpp
index 4d5fbe03..45c98768 100644
--- a/src/gfx/generated_image.cpp
+++ b/src/gfx/generated_image.cpp
@@ -31,24 +31,18 @@ Image conform_image(const Image& img, const GeneratedImage::Options& options) {
 	if ((iw == options.width && ih == options.height) || (options.width == 0 && options.height == 0)) {
 		// zoom?
 		if (options.zoom != 1.0) {
-			Image resampled_image(iw * options.zoom, ih * options.zoom, false);
-			resample(image, resampled_image);
-			image = resampled_image;
+			image = resample(image, iw * options.zoom, ih * options.zoom);
 		} else {
 			// already the right size
 		}
 	} else if (options.height == 0) {
 		// width is given, determine height
 		int h = options.width * ih / iw;
-		Image resampled_image(options.width, h, false);
-		resample(image, resampled_image);
-		image = resampled_image;
+		image = resample(image, options.width, h);
 	} else if (options.width == 0) {
 		// height is given, determine width
 		int w = options.height * iw / ih;
-		Image resampled_image(w, options.height, false);
-		resample(image, resampled_image);
-		image = resampled_image;
+		image = resample(image, w, options.height);
 	} else if (options.preserve_aspect == ASPECT_FIT) {
 		// determine actual size of resulting image
 		int w, h;
@@ -59,18 +53,14 @@ Image conform_image(const Image& img, const GeneratedImage::Options& options) {
 			w = options.height * iw / ih;
 			h = options.height;
 		}
-		Image resampled_image(w, h, false);
-		resample(image, resampled_image);
-		image = resampled_image;
+		image = resample(image, w, h);
 	} else {
-		Image resampled_image(options.width, options.height, false);
 		if (options.preserve_aspect == ASPECT_BORDER && (options.width < options.height * 3) && (options.height < options.width * 3)) {
 			// preserve the aspect ratio if there is not too much difference
-			resample_preserve_aspect(image, resampled_image);
+			image = resample_preserve_aspect(image, options.width, options.height);
 		} else {
-			resample(image, resampled_image);
+			image = resample(image, options.width, options.height);
 		}
-		image = resampled_image;
 	}
 	// saturate?
 	if (options.saturate) {
diff --git a/src/gfx/gfx.hpp b/src/gfx/gfx.hpp
index 86693859..4cbc750e 100644
--- a/src/gfx/gfx.hpp
+++ b/src/gfx/gfx.hpp
@@ -21,6 +21,7 @@
 
 /// Resample (resize) an image, uses bilenear filtering
 void resample(const Image& img_in, Image& img_out);
+Image resample(const Image& img_in, int width, int height);
 
 /// Resamples an image, first clips the input image to a specified rectangle
 /** The selected rectangle is resampled into the entire output image */
@@ -35,6 +36,7 @@ enum PreserveAspect
 
 /// Resample an image, but preserve the aspect ratio by adding a transparent border around the output if needed.
 void resample_preserve_aspect(const Image& img_in, Image& img_out);
+Image resample_preserve_aspect(const Image& img_in, int width, int height);
 
 /// Resample an image to create a sharp result by applying a sharpening filter
 /** Amount must be between 0 and 100 */
diff --git a/src/gfx/resample_image.cpp b/src/gfx/resample_image.cpp
index c69547a4..6d9e7b38 100644
--- a/src/gfx/resample_image.cpp
+++ b/src/gfx/resample_image.cpp
@@ -125,6 +125,15 @@ void resample_pass(const Image& img_in, Image& img_out, int offset_in, int offse
 void resample(const Image& img_in, Image& img_out) {
 	resample_and_clip(img_in, img_out, wxRect(0, 0, img_in.GetWidth(), img_in.GetHeight()));
 }
+Image resample(const Image& img_in, int width, int height) {
+	if (img_in.GetWidth() == width && img_in.GetHeight() == height) {
+		return img_in; // already the right size
+	} else {
+		Image img_out(width,height,false);
+		resample(img_in, img_out);
+		return img_out;
+	}
+}
 
 void resample_and_clip(const Image& img_in, Image& img_out, wxRect rect) {
 	// mask to alpha
@@ -171,6 +180,16 @@ void resample_preserve_aspect(const Image& img_in, Image& img_out) {
 	resample_pass(img_temp, img_out,  0, offset_out, img_in.GetHeight(), img_temp.GetWidth(), rheight, img_out.GetWidth(), rwidth,             1,                 1);
 }
 
+Image resample_preserve_aspect(const Image& img_in, int width, int height) {
+	if (img_in.GetWidth() == width && img_in.GetHeight() == height) {
+		return img_in; // already the right size
+	} else {
+		Image img_out(width,height,false);
+		resample_preserve_aspect(img_in, img_out);
+		return img_out;
+	}
+}
+
 // ----------------------------------------------------------------------------- : Sharpening
 
 void sharp_downsample(const Image& img_in, Image& img_out, int amount);
diff --git a/src/gui/control/image_card_list.cpp b/src/gui/control/image_card_list.cpp
index 45d1b09e..65e20705 100644
--- a/src/gui/control/image_card_list.cpp
+++ b/src/gui/control/image_card_list.cpp
@@ -65,9 +65,7 @@ class CardThumbnailRequest : public ThumbnailRequest {
 			if (image.LoadFile(*parent->set->openIn(filename))) {
 				// two step anti aliased resampling
 				image.Rescale(36, 28); // step 1: no anti aliassing
-				Image image2(18, 14, false); // step 2: with anti aliassing
-				resample(image, image2);
-				return image2;
+				return resample(image, 18, 14); // step 2: with anti aliassing
 			} else {
 				return Image();
 			}
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index 1fe37072..b238922c 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -541,8 +541,7 @@ void ImageSliceSelector::createBitmap() {
 	// create image, resampled to fit in control
 	wxSize s = GetClientSize();
 	int width = s.GetWidth() - 2*border, height = s.GetHeight() - 2*border;
-	Image img(width, height, false);
-	resample(slice.source, img);
+	Image img = resample(slice.source, width, height);
 	bitmap = Bitmap(img);
 	scaleX = (double)width  / slice.source.GetWidth();
 	scaleY = (double)height / slice.source.GetHeight();
diff --git a/src/gui/packages_window.cpp b/src/gui/packages_window.cpp
index 2e9d5275..f55413a5 100644
--- a/src/gui/packages_window.cpp
+++ b/src/gui/packages_window.cpp
@@ -139,14 +139,31 @@ class PackageUpdateList : public TreeList {
 	typedef intrusive_ptr<TreeItem> TreeItemP;
 	class TreeItem : public Item {
 	  public:
+		TreeItem() : position_type(TYPE_OTHER), position_hint(1000000) {}
 		String label;
 		vector<TreeItemP> children;
 		InstallablePackageP package;
 		Bitmap icon, icon_grey;
+		// positioning
+		enum PackageType {
+			TYPE_PROG,
+			TYPE_LOCALE,
+			TYPE_GAME,
+			TYPE_STYLESHEET,
+			TYPE_EXPORT_TEMPLATE,
+			TYPE_SYMBOL_FONT,
+			TYPE_INCLUDE,
+			TYPE_FONT,
+			TYPE_OTHER,
+		}   position_type;
+		int position_hint;
 		
 		void add(const InstallablePackageP& package, const String& path, int level = -1);
 		void toItems(vector<TreeList::ItemP>& items);
+		void setIcon(const Image& image);
 		bool highlight() const;
+		
+		static PackageType package_type(const PackageDescription& desc);
 	};
 };
 
@@ -156,6 +173,22 @@ DECLARE_TYPEOF_COLLECTION(PackageUpdateList::TreeItemP);
 
 
 void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const String& path, int level) {
+	// this node
+	this->level = level;
+	PackageType new_type = package_type(*package->description);
+	int new_hint = package->description->position_hint;
+	if (new_type < position_type || (new_type == position_type && new_hint < position_hint)) {
+		// this is a lower position hint, use it
+		position_type = new_type;
+		position_hint = new_hint;
+	}
+	// end of the path?
+	if (path.empty()) {
+		assert(!this->package);
+		this->package = package;
+		return;
+	}
+	// split path
 	size_t pos = path.find_first_of(_('/'));
 	String name = path.substr(0,pos);
 	String rest = pos == String::npos ? _("") : path.substr(pos+1);
@@ -163,17 +196,12 @@ void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const
 	FOR_EACH(ti, children) {
 		if (ti->label == name) {
 			// already have this child
-			if (pos == String::npos) {
-				if (ti->package) {
-					// two packages with the same path
-					TreeItemP ti2(new TreeItem);
-					ti2->level = level + 1;
-					ti2->label = name;
-					ti2->package = package;
-					children.insert(ti_IT.first, ti2);
-				} else {
-					ti->package = package;
-				}
+			if (pos == String::npos && ti->package) {
+				// two packages with the same path
+				TreeItemP ti2(new TreeItem);
+				ti2->label = name;
+				children.insert(ti_IT.first, ti2);
+				ti2->add(package, rest, level + 1);
 			} else {
 				ti->add(package, rest, level + 1);
 			}
@@ -183,20 +211,15 @@ void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const
 	// don't have this child
 	TreeItemP ti(new TreeItem);
 	children.push_back(ti);
-	ti->level = level + 1;
 	ti->label = name;
-	if (pos == String::npos) {
-		ti->package = package;
-	} else {
-		ti->add(package, rest, level + 1);
-	}
+	ti->add(package, rest, level + 1);
 }
 
 bool compare_pos_hint(const PackageUpdateList::TreeItemP& a, const PackageUpdateList::TreeItemP& b) {
-	int pa = a->package ? a->package->description->position_hint : 0;
-	int pb = b->package ? b->package->description->position_hint : 0;
-	if (pa < pb) return true;
-	if (pa > pb) return false;
+	if (a->position_type < b->position_type) return true;
+	if (a->position_type > b->position_type) return false;
+	if (a->position_hint < b->position_hint) return true;
+	if (a->position_hint > b->position_hint) return false;
 	return a->label < b->label;
 }
 
@@ -214,6 +237,38 @@ bool PackageUpdateList::TreeItem::highlight() const {
 	return false;
 }
 
+PackageUpdateList::TreeItem::PackageType PackageUpdateList::TreeItem::package_type(const PackageDescription& desc) {
+	if (desc.name == mse_package)                           return TYPE_PROG;
+	size_t pos = desc.name.find_last_of(_('.'));
+	if (pos == String::npos)                                return TYPE_OTHER;
+	if (is_substr(desc.name,pos,_(".mse-locale")))          return TYPE_LOCALE;
+	if (is_substr(desc.name,pos,_(".mse-game")))            return TYPE_GAME;
+	if (is_substr(desc.name,pos,_(".mse-style")))           return TYPE_STYLESHEET;
+	if (is_substr(desc.name,pos,_(".mse-export-template"))) return TYPE_EXPORT_TEMPLATE;
+	if (is_substr(desc.name,pos,_(".mse-symbol-font")))     return TYPE_SYMBOL_FONT;
+	if (is_substr(desc.name,pos,_(".mse-include")))         return TYPE_INCLUDE;
+	if (is_substr(desc.name,pos,_(".ttf")))                 return TYPE_FONT;
+	return TYPE_OTHER;
+}
+
+void PackageUpdateList::TreeItem::setIcon(const Image& img) {
+	Image image = img;
+	int iw = image.GetWidth(), ih = image.GetHeight();
+	if (ih > 107) {
+		int w = 107 * iw / ih;
+		image = resample(image, w, 107);
+	} else if (iw > 107) {
+		int h = 107 * ih / iw;
+		image = resample(image, 107, h);
+	}
+	if (package) package->description->icon = image;
+	Image resampled = resample_preserve_aspect(image,16,16);
+	icon = Bitmap(resampled);
+	saturate(resampled, -.75);
+	set_alpha(resampled,0.5);
+	icon_grey = Bitmap(resampled);
+}
+
 // ----------------------------------------------------------------------------- : PackageIconRequest
 
 /// wx doesn't allow seeking on InputStreams from a wxURL
@@ -273,13 +328,7 @@ class PackageIconRequest : public ThumbnailRequest {
 	}
 	virtual void store(const Image& image) {
 		if (!image.Ok()) return;
-		ti->package->description->icon = image;
-		Image resampled(16,16,false);
-		resample_preserve_aspect(image,resampled);
-		ti->icon = Bitmap(resampled);
-		saturate(resampled, -.75);
-		set_alpha(resampled,0.5);
-		ti->icon_grey = Bitmap(resampled);
+		ti->setIcon(image);
 		list->Refresh(false);
 	}
   private:
@@ -294,8 +343,7 @@ void PackageUpdateList::initItems() {
 	TreeItem root;
 	FOR_EACH(ip, parent->installable_packages) {
 		String group = ip->description->installer_group;
-		if (!group.empty()) group += _("/");
-		group += ip->description->short_name;
+		if (group.empty()) group = _("custom");
 		root.add(ip, group);
 	}
 	// tree to treelist items
@@ -307,23 +355,17 @@ void PackageUpdateList::initItems() {
 		const InstallablePackageP& p = ti.package;
 		Image image;
 		if (p && p->description->icon.Ok()) {
-			Image resampled(16,16,false);
-			resample_preserve_aspect(p->description->icon, resampled);
-			image = resampled;
+			ti.setIcon(p->description->icon);
 		} else if (p) {
-			image = load_resource_image(_("installer_package"));
-		} else if (ti.label == _("locales")) {
-			image = load_resource_image(_("installer_locales"));
+			ti.setIcon(load_resource_image(_("installer_package")));
+			if (!p->description->icon_url.empty()) {
+				// download icon
+				thumbnail_thread.request(new_intrusive2<PackageIconRequest>(this,&ti));
+			}
+		} else if (ti.position_type == TreeItem::TYPE_LOCALE) {
+			ti.setIcon(load_resource_image(_("installer_locales")));
 		} else {
-			image = load_resource_image(_("installer_group"));
-		}
-		ti.icon = Bitmap(image);
-		saturate(image, -.75);
-		set_alpha(image, 0.5);
-		ti.icon_grey = Bitmap(image);
-		if (p && !p->description->icon.Ok() && !p->description->icon_url.empty()) {
-			// download icon
-			thumbnail_thread.request(new_intrusive2<PackageIconRequest>(this,&ti));
+			ti.setIcon(load_resource_image(_("installer_group")));
 		}
 	}
 }
@@ -336,7 +378,7 @@ void PackageUpdateList::drawItem(DC& dc, size_t index, size_t column, int x, int
 		const Bitmap& bmp = ti.highlight() ? ti.icon : ti.icon_grey;
 		if (bmp.Ok()) dc.DrawBitmap(bmp,x,y);
 		dc.SetTextForeground(color);
-		dc.DrawText(ti.label, x+18, y+2);
+		dc.DrawText(capitalize_sentence(ti.label), x+18, y+2);
 	} else if (column == 1 && ti.package) {
 		// Status
 		int stat = ti.package->status;
diff --git a/src/gui/set/stats_panel.cpp b/src/gui/set/stats_panel.cpp
index d832800b..b50c63f1 100644
--- a/src/gui/set/stats_panel.cpp
+++ b/src/gui/set/stats_panel.cpp
@@ -77,9 +77,9 @@ void StatCategoryList::drawItem(DC& dc, int x, int y, size_t item, bool selected
 	if (!cat.icon_filename.empty() && !cat.icon.Ok()) {
 		InputStreamP file = game->openIn(cat.icon_filename);
 		Image img(*file);
-		Image resampled(21, 21);
-		resample_preserve_aspect(img, resampled);
-		if (img.Ok()) cat.icon = Bitmap(resampled);
+		if (img.Ok()) {
+			cat.icon = Bitmap(resample_preserve_aspect(img, 21, 21));
+		}
 	}
 	if (cat.icon.Ok()) {
 		dc.DrawBitmap(cat.icon, x+1, y+1);
diff --git a/src/render/value/image.cpp b/src/render/value/image.cpp
index 051e6542..44996a77 100644
--- a/src/render/value/image.cpp
+++ b/src/render/value/image.cpp
@@ -129,9 +129,7 @@ void ImageValueViewer::loadMask(const Rotation& rot) const {
 	Image image;
 	InputStreamP image_file = viewer.stylesheet->openIn(style().mask_filename);
 	if (image.LoadFile(*image_file)) {
-		Image resampled(w,h);
-		resample(image, resampled);
-		alpha_mask = new_intrusive1<AlphaMask>(resampled);
+		alpha_mask = new_intrusive1<AlphaMask>(resample(image,w,h));
 	}
 }
 
diff --git a/src/render/value/package_choice.cpp b/src/render/value/package_choice.cpp
index b6d0f24d..1eba2cfa 100644
--- a/src/render/value/package_choice.cpp
+++ b/src/render/value/package_choice.cpp
@@ -38,9 +38,7 @@ void PackageChoiceValueViewer::initItems() {
 		Image image;
 		InputStreamP stream = p->openIconFile();
 		if (stream && image.LoadFile(*stream)) {
-			Image resampled(16,16,false);
-			resample(image, resampled);
-			i.image = Bitmap(resampled);
+			i.image = Bitmap(resample(image, 16,16));
 		}
 		items.push_back(i);
 	}
diff --git a/src/resource/common/installer_program.png b/src/resource/common/installer_program.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4d37b0147660f9421c4102ac787d14400db8fa0
GIT binary patch
literal 6520
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

literal 0
HcmV?d00001

diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
index fc27744f..6534c016 100644
--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -172,6 +172,7 @@ edit_symbol				IMAGE	"../common/edit_symbol.png"
 installer_group			IMAGE	"../common/installer_group.png"
 installer_package		IMAGE	"../common/installer_package.png"
 installer_locales		IMAGE	"../common/installer_locales.png"
+installer_program		IMAGE	"../common/installer_program.png"
 //installer_font		IMAGE	"../common/installer_font.png"
 
 // -------------------------------------------------------- : WX
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 4807c1fc..4642c38b 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -155,7 +155,7 @@ String capitalize(const String& s) {
 }
 
 String capitalize_sentence(const String& s) {
-	String ret = s.Lower();
+	String ret = s;//.Lower();
 	if (!ret.empty()) {
 		ret[0] = toUpper(ret[0]);
 	}