Merge pull request #1568 from uNiversaI/Mary-Poppins

[Editors] Menu/Toolbar - Improve icon assignments

3 files changed, 19 insertions, 6 deletions

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
 	};
 
 	/**