extraicons: merge more than one icon with same name and some fixes

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@161 c086bb3d-8645-0410-b8da-73a8550f86e7

1 files changed, 11 insertions, 1 deletions

diff --git a/Plugins/extraicons/ExtraIcon.cpp b/Plugins/extraicons/ExtraIcon.cpp
index 6dd63b8..7fc60dc 100644
--- a/Plugins/extraicons/ExtraIcon.cpp
+++ b/Plugins/extraicons/ExtraIcon.cpp
@@ -21,7 +21,7 @@
 

 ExtraIcon::ExtraIcon(const char *name, const char *description, const char *descIcon, int(*OnClick)(WPARAM wParam,

 		LPARAM lParam)) :

-	name(name), description(Translate(description)), descIcon(descIcon), OnClick(OnClick), slot(-1)

+	name(name), description(description), descIcon(descIcon), OnClick(OnClick), slot(-1)

 {

 }

 

@@ -39,11 +39,21 @@ const char *ExtraIcon::getDescription() const
 	return description.c_str();

 }

 

+void ExtraIcon::setDescription(const char *desc)

+{

+	description = desc;

+}

+

 const char *ExtraIcon::getDescIcon() const

 {

 	return descIcon.c_str();

 }

 

+void ExtraIcon::setDescIcon(const char *icon)

+{

+	descIcon = icon;

+}

+

 int ExtraIcon::getSlot() const

 {

 	return slot;