Merge pull request #1568 from uNiversaI/Mary-Poppins

[Editors] Menu/Toolbar - Improve icon assignments

19 files changed, 19 insertions, 6 deletions

diff --git a/data/pics/coresmall/kcs_action.png b/data/pics/coresmall/kcs_action.png
index 6effa57a9..ddfb4f572 100644
--- a/data/pics/coresmall/kcs_action.png
+++ b/data/pics/coresmall/kcs_action.png
diff --git a/data/pics/coresmall/kcs_actioneditor.png b/data/pics/coresmall/kcs_actioneditor.png
new file mode 100644
index 000000000..9d542e5f1
--- /dev/null
+++ b/data/pics/coresmall/kcs_actioneditor.png
diff --git a/data/pics/coresmall/kcs_alias.png b/data/pics/coresmall/kcs_alias.png
index ba87102ea..e6103f60e 100644
--- a/data/pics/coresmall/kcs_alias.png
+++ b/data/pics/coresmall/kcs_alias.png
diff --git a/data/pics/coresmall/kcs_aliaseditor.png b/data/pics/coresmall/kcs_aliaseditor.png
new file mode 100644
index 000000000..343d3d7de
--- /dev/null
+++ b/data/pics/coresmall/kcs_aliaseditor.png
diff --git a/data/pics/coresmall/kcs_class.png b/data/pics/coresmall/kcs_class.png
index 1e4c48618..9c7a9f615 100644
--- a/data/pics/coresmall/kcs_class.png
+++ b/data/pics/coresmall/kcs_class.png
diff --git a/data/pics/coresmall/kcs_classeditor.png b/data/pics/coresmall/kcs_classeditor.png
index 0c28903f9..1eead4d60 100644
--- a/data/pics/coresmall/kcs_classeditor.png
+++ b/data/pics/coresmall/kcs_classeditor.png
diff --git a/data/pics/coresmall/kcs_classnotbuilt.png b/data/pics/coresmall/kcs_classnotbuilt.png
index aea4faca1..463aec632 100644
--- a/data/pics/coresmall/kcs_classnotbuilt.png
+++ b/data/pics/coresmall/kcs_classnotbuilt.png
diff --git a/data/pics/coresmall/kcs_eventeditor.png b/data/pics/coresmall/kcs_eventeditor.png
new file mode 100644
index 000000000..16c318b65
--- /dev/null
+++ b/data/pics/coresmall/kcs_eventeditor.png
diff --git a/data/pics/coresmall/kcs_popup.png b/data/pics/coresmall/kcs_popup.png
index cab394b81..619b6f188 100644
--- a/data/pics/coresmall/kcs_popup.png
+++ b/data/pics/coresmall/kcs_popup.png
diff --git a/data/pics/coresmall/kcs_popupeditor.png b/data/pics/coresmall/kcs_popupeditor.png
new file mode 100644
index 000000000..c33588d0d
--- /dev/null
+++ b/data/pics/coresmall/kcs_popupeditor.png
diff --git a/data/pics/kvi_bigicon_actioneditor.png b/data/pics/kvi_bigicon_actioneditor.png
index ee9482656..1347084c0 100644
--- a/data/pics/kvi_bigicon_actioneditor.png
+++ b/data/pics/kvi_bigicon_actioneditor.png
diff --git a/data/pics/kvi_bigicon_aliaseditor.png b/data/pics/kvi_bigicon_aliaseditor.png
index 02e114f28..04b5e3cb7 100644
--- a/data/pics/kvi_bigicon_aliaseditor.png
+++ b/data/pics/kvi_bigicon_aliaseditor.png
diff --git a/data/pics/kvi_bigicon_classeditor.png b/data/pics/kvi_bigicon_classeditor.png
index b3bb26dee..9324e90c2 100644
--- a/data/pics/kvi_bigicon_classeditor.png
+++ b/data/pics/kvi_bigicon_classeditor.png
diff --git a/data/pics/kvi_bigicon_eventeditor.png b/data/pics/kvi_bigicon_eventeditor.png
index 3bf24aadd..0e432db6c 100644
--- a/data/pics/kvi_bigicon_eventeditor.png
+++ b/data/pics/kvi_bigicon_eventeditor.png
diff --git a/data/pics/kvi_bigicon_popupeditor.png b/data/pics/kvi_bigicon_popupeditor.png
index e06be2e3e..bc3ce5199 100644
--- a/data/pics/kvi_bigicon_popupeditor.png
+++ b/data/pics/kvi_bigicon_popupeditor.png
diff --git a/data/pics/kvi_bigicon_raweditor.png b/data/pics/kvi_bigicon_raweditor.png
index b61f15173..7be4e4021 100644
--- a/data/pics/kvi_bigicon_raweditor.png
+++ b/data/pics/kvi_bigicon_raweditor.png
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index 1c84c4237..ba45b77a4 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -228,7 +228,7 @@ void register_core_actions(KviActionManager * m)
 		__tr2qs("Shows a window that allows editing actions"),
 		KviActionManager::categoryScripting(),
 		"kvi_bigicon_actioneditor.png",
-		KviIconManager::ScriptAction,
+		KviIconManager::ActionEditor,
 		0,
 		KVI_SHORTCUTS_EDITORS_ACTION);
 
@@ -239,7 +239,7 @@ void register_core_actions(KviActionManager * m)
 		__tr2qs("Shows a window that allows editing aliases"),
 		KviActionManager::categoryScripting(),
 		"kvi_bigicon_aliaseditor.png",
-		KviIconManager::Alias,
+		KviIconManager::AliasEditor,
 		0,
 		KVI_SHORTCUTS_EDITORS_ALIAS);
 
@@ -261,7 +261,7 @@ void register_core_actions(KviActionManager * m)
 		__tr2qs("Shows a window that allows editing script events"),
 		KviActionManager::categoryScripting(),
 		"kvi_bigicon_eventeditor.png",
-		KviIconManager::Event,
+		KviIconManager::EventEditor,
 		0,
 		KVI_SHORTCUTS_EDITORS_EVENT);
 
@@ -272,7 +272,7 @@ void register_core_actions(KviActionManager * m)
 		__tr2qs("Shows a window that allows editing popup menus"),
 		KviActionManager::categoryScripting(),
 		"kvi_bigicon_popupeditor.png",
-		KviIconManager::Popup,
+		KviIconManager::PopupEditor,
 		0,
 		KVI_SHORTCUTS_EDITORS_POPUP);
 
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index 48ad4fe21..3e2ef41e7 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -403,7 +403,12 @@ static const char * g_szIconNames[KviIconManager::IconCount] =
 	"info",                // 317
 	"warning",             // 318
 	"shield",              // 319
-	"raweventeditor"       // 320
+	"raweventeditor",      // 320
+	"eventeditor",         // 321
+	"actioneditor",        // 322
+	"aliaseditor",         // 323
+	"popupeditor"          // 324
+
 };
 
 KviIconWidget::KviIconWidget()
@@ -920,6 +925,10 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon)
 		case 318: return KviIconManager::Warning;              break;
 		case 319: return KviIconManager::Shield;               break;
 		case 320: return KviIconManager::RawEventEditor;       break;
+		case 321: return KviIconManager::EventEditor;          break;
+		case 322: return KviIconManager::ActionEditor;         break;
+		case 323: return KviIconManager::AliasEditor;          break;
+		case 324: return KviIconManager::PopupEditor;          break;
 		case   0:
 		case KviIconManager::IconCount:
 		default: return KviIconManager::None;                  break;
diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h
index a5dc30ee8..e279c0915 100644
--- a/src/kvirc/kernel/KviIconManager.h
+++ b/src/kvirc/kernel/KviIconManager.h
@@ -485,7 +485,11 @@ public:
 		Warning              = 318,
 		Shield               = 319,
 		RawEventEditor       = 320,
-		IconCount            = 321
+		EventEditor          = 321,
+		ActionEditor         = 322,
+		AliasEditor          = 323,
+		PopupEditor          = 324,
+		IconCount            = 325
 	};
 
 	/**