aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kernel/KviCoreActions.cpp2
-rw-r--r--src/kvirc/kernel/KviIconManager.cpp6
-rw-r--r--src/kvirc/kernel/KviIconManager.h5
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp1
-rw-r--r--src/modules/options/OptionsWidget_connection.h4
-rw-r--r--src/modules/options/OptionsWidget_dcc.h10
-rw-r--r--src/modules/options/OptionsWidget_identity.h8
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
8 files changed, 23 insertions, 15 deletions
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index ba45b77a4..16e38be24 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -129,7 +129,7 @@ void register_core_actions(KviActionManager * m)
__tr2qs("Allows you to configure nickname, username, avatar etc..."),
KviActionManager::categorySettings(),
"kvi_bigicon_identity.png",
- KviIconManager::Who,
+ KviIconManager::Ident,
0,
KVI_SHORTCUTS_IDENTITY);
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index 3e2ef41e7..a38e6c5e7 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -407,7 +407,9 @@ static const char * g_szIconNames[KviIconManager::IconCount] =
"eventeditor", // 321
"actioneditor", // 322
"aliaseditor", // 323
- "popupeditor" // 324
+ "popupeditor", // 324
+ "dcc", // 325
+ "socket" // 326
};
@@ -929,6 +931,8 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon)
case 322: return KviIconManager::ActionEditor; break;
case 323: return KviIconManager::AliasEditor; break;
case 324: return KviIconManager::PopupEditor; break;
+ case 325: return KviIconManager::Dcc; break;
+ case 326: return KviIconManager::Socket; 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 e279c0915..1a0ed0da6 100644
--- a/src/kvirc/kernel/KviIconManager.h
+++ b/src/kvirc/kernel/KviIconManager.h
@@ -47,6 +47,7 @@
#define KVI_BIGICON_CONNECTED "kvi_bigicon_connected.png"
#define KVI_BIGICON_TOOLS "kvi_bigicon_tools.png"
#define KVI_BIGICON_ACTIONS "kvi_bigicon_actions.png"
+#define KVI_BIGICON_USERACTION "kvi_bigicon_useraction.png"
#define KVI_BIGICON_FOLDER "kvi_bigicon_folder.png"
#define KVI_BIGICON_UNKNOWN "kvi_bigicon_unknown.png"
#define KVI_BIGICON_SEPARATOR "kvi_bigicon_separator.png"
@@ -489,7 +490,9 @@ public:
ActionEditor = 322,
AliasEditor = 323,
PopupEditor = 324,
- IconCount = 325
+ Dcc = 325,
+ Socket = 326,
+ IconCount = 327
};
/**
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 069442ede..661ffd1b0 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -782,6 +782,7 @@ void ActionEditor::newAction()
szVis,
szDes,
KviActionManager::categoryGeneric()->name(),
+ KVI_BIGICON_USERACTION,
QString(),
QString(),
0,
diff --git a/src/modules/options/OptionsWidget_connection.h b/src/modules/options/OptionsWidget_connection.h
index 8cca4c325..41af5fc60 100644
--- a/src/modules/options/OptionsWidget_connection.h
+++ b/src/modules/options/OptionsWidget_connection.h
@@ -42,7 +42,7 @@ public:
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced KviIconManager::World
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced KviIconManager::Gui
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced __tr2qs_no_lookup("Advanced")
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_connectionAdvanced OptionsWidget_connection
#define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced true
@@ -73,7 +73,7 @@ public:
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket KviIconManager::SocketError
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket KviIconManager::Socket
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket __tr2qs_no_lookup("Socket")
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_connectionSocket OptionsWidget_connectionAdvanced
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket 20
diff --git a/src/modules/options/OptionsWidget_dcc.h b/src/modules/options/OptionsWidget_dcc.h
index 90f70733d..1d1d71e58 100644
--- a/src/modules/options/OptionsWidget_dcc.h
+++ b/src/modules/options/OptionsWidget_dcc.h
@@ -27,7 +27,7 @@
#include "KviOptionsWidget.h"
#include "KviIconManager.h"
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc KviIconManager::DccError
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc KviIconManager::Dcc
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dcc __tr2qs_no_lookup("DCC")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc 70000
#define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dcc true
@@ -42,7 +42,7 @@ public:
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral KviIconManager::DccError
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral KviIconManager::Dcc
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral __tr2qs_no_lookup("General")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral 70000
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccGeneral OptionsWidget_dcc
@@ -55,7 +55,7 @@ public:
~OptionsWidget_dccGeneral();
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced KviIconManager::DccError
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced KviIconManager::Gui
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced __tr2qs_no_lookup("Advanced")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced 70000
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccAdvanced OptionsWidget_dcc
@@ -85,7 +85,7 @@ public:
~OptionsWidget_dccSend();
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KviIconManager::DccMsg
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KviIconManager::Dcc
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral __tr2qs_no_lookup("General")
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSendGeneral OptionsWidget_dccSend
@@ -99,7 +99,7 @@ public:
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced KviIconManager::DccMsg
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced KviIconManager::Gui
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced __tr2qs_no_lookup("Advanced")
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSendAdvanced OptionsWidget_dccSend
diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h
index a412686af..f3dde822a 100644
--- a/src/modules/options/OptionsWidget_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -133,7 +133,7 @@ protected slots:
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Who
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Look
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity __tr2qs_no_lookup("Identity")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity 99998
#define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity true
@@ -149,7 +149,7 @@ public:
-#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Who
+#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Default
#define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General")
#define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000
#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity
@@ -198,7 +198,7 @@ protected:
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Spy
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Gui
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced __tr2qs_no_lookup("Advanced")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced 70000
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityAdvanced OptionsWidget_identity
@@ -223,7 +223,7 @@ protected:
};
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile KviIconManager::RegUsers
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile KviIconManager::UserWindow
#define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile __tr2qs_no_lookup("Profiles")
#define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile 60000
#define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityProfile OptionsWidget_identity
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index ee1ce7a29..73b37c74f 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -644,7 +644,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
gl->setRowStretch(2,1);
- tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Who)),__tr2qs_ctx("Identity","options"));
+ tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Ident)),__tr2qs_ctx("Identity","options"));
// Connection tab