diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviCoreActions.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviIconManager.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviIconManager.h | 4 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_alertsAndHighlighting.h | 6 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_interfaceFeatures.h | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_protection.h | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_tools.h | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_uparser.h | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_urlHandlers.h | 2 |
9 files changed, 17 insertions, 11 deletions
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp index f2aa9685c..1c84c4237 100644 --- a/src/kvirc/kernel/KviCoreActions.cpp +++ b/src/kvirc/kernel/KviCoreActions.cpp @@ -283,7 +283,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing raw scripting events"), KviActionManager::categoryScripting(), "kvi_bigicon_raweditor.png", - KviIconManager::RawEvent, + KviIconManager::RawEventEditor, 0, KVI_SHORTCUTS_EDITORS_RAW); diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index dc9a1c395..48ad4fe21 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -401,7 +401,9 @@ static const char * g_szIconNames[KviIconManager::IconCount] = "sexircop", // 315 "memoserv", // 316 "info", // 317 - "warning" // 318 + "warning", // 318 + "shield", // 319 + "raweventeditor" // 320 }; KviIconWidget::KviIconWidget() @@ -916,6 +918,8 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon) case 316: return KviIconManager::MemoServ; break; case 317: return KviIconManager::Info; break; case 318: return KviIconManager::Warning; break; + case 319: return KviIconManager::Shield; break; + case 320: return KviIconManager::RawEventEditor; 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 e540f86cd..a5dc30ee8 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -483,7 +483,9 @@ public: MemoServ = 316, Info = 317, Warning = 318, - IconCount = 319 + Shield = 319, + RawEventEditor = 320, + IconCount = 321 }; /** diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h index 2d72f1f27..5da61f72c 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.h +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h @@ -29,7 +29,7 @@ class QRadioButton; class QLineEdit; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting KviIconManager::Raw +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting KviIconManager::Warning #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting __tr2qs_no_lookup("Alert/Highlight") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_alertsAndHighlighting OptionsWidget_tools #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting true @@ -43,7 +43,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting KviIconManager::Raw +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting KviIconManager::QueryTrace #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting __tr2qs_no_lookup("Highlight") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_highlighting OptionsWidget_alertsAndHighlighting @@ -64,7 +64,7 @@ protected: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts KviIconManager::Raw +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts KviIconManager::Warning #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts __tr2qs_no_lookup("Window List Alert") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_alerts OptionsWidget_alertsAndHighlighting diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h index 166b8977f..ea0cd5e3f 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.h +++ b/src/modules/options/OptionsWidget_interfaceFeatures.h @@ -29,7 +29,7 @@ #include <QCheckBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures KviIconManager::Idea +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures KviIconManager::Theme #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_interfaceFeatures __tr2qs_no_lookup("Interface") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures 50000 diff --git a/src/modules/options/OptionsWidget_protection.h b/src/modules/options/OptionsWidget_protection.h index 8479964c5..50098d13f 100644 --- a/src/modules/options/OptionsWidget_protection.h +++ b/src/modules/options/OptionsWidget_protection.h @@ -28,7 +28,7 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection KviIconManager::Spy +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection KviIconManager::Shield #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection __tr2qs_no_lookup("Protection") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_protection OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection 60000 diff --git a/src/modules/options/OptionsWidget_tools.h b/src/modules/options/OptionsWidget_tools.h index 40f9f2aac..1c335ddb5 100644 --- a/src/modules/options/OptionsWidget_tools.h +++ b/src/modules/options/OptionsWidget_tools.h @@ -29,7 +29,7 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools KviIconManager::Addons +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools KviIconManager::ChanUnOwner #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools __tr2qs_no_lookup("Tools") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_tools OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools 50000 diff --git a/src/modules/options/OptionsWidget_uparser.h b/src/modules/options/OptionsWidget_uparser.h index d1689be9e..a4b82cfeb 100644 --- a/src/modules/options/OptionsWidget_uparser.h +++ b/src/modules/options/OptionsWidget_uparser.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser KviIconManager::ParserWarning +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser KviIconManager::ScriptCenter; #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser __tr2qs_no_lookup("Scripting Engine") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser __tr2qs_no_lookup("scripting,kvs,debug") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_uparser OptionsWidget_general diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h index 9a4868490..f2c9e4511 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.h +++ b/src/modules/options/OptionsWidget_urlHandlers.h @@ -28,7 +28,7 @@ class QRadioButton; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KviIconManager::World +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KviIconManager::Url #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL handlers") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_urlHandlers OptionsWidget_general #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers 70000 |