aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/filetransferwindow/filetransferwindow.cpp3
-rw-r--r--src/modules/objects/class_dialog.cpp2
-rw-r--r--src/modules/options/CMakeLists.txt4
-rw-r--r--src/modules/options/instances.cpp504
-rw-r--r--src/modules/options/instances.h2
-rw-r--r--src/modules/options/optw_highlighting.cpp10
-rw-r--r--src/modules/options/optw_highlighting.h2
-rw-r--r--src/modules/options/optw_irc.cpp4
-rw-r--r--src/modules/options/optw_taskbar.h126
-rw-r--r--src/modules/options/optw_windowlist.cpp (renamed from src/modules/options/optw_taskbar.cpp)122
-rw-r--r--src/modules/options/optw_windowlist.h126
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp10
-rw-r--r--src/modules/url/libkviurl.cpp4
-rw-r--r--src/modules/window/libkviwindow.cpp10
14 files changed, 465 insertions, 464 deletions
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 8e5d05e6a..c9c7c1af0 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -124,7 +124,8 @@ void KviFileTransferWidget::paintEvent(QPaintEvent * event)
p->drawTiledPixmap(rect,*g_pShadedChildGlobalDesktopBackground,pnt);
} else {
#endif
- p->fillRect(rect,KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground));
+ //FIXME this is not the treewindowlist
+ p->fillRect(rect,KVI_OPTION_COLOR(KviOption_colorTreeWindowListBackground));
#ifdef COMPILE_PSEUDO_TRANSPARENCY
}
#endif
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index a49392c4d..882aa030e 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -45,7 +45,7 @@
Rappresents a dialog object. The class is really
similar to the widget class, it has only a couple of minor differences.
A dialog is always a top-level widget, but if it has a parent, its default
- location is centered on top of the parent. It will also share the parent's taskbar entry.
+ location is centered on top of the parent. It will also share the parent's windowlist entry.
If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
it will appear above its parent widget and block its input until it's closed.
@functions:
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index f87c2d51e..5993b9119 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(kvioptions_MOC_HDRS
optw_query.h
optw_servers.h
optw_sound.h
- optw_taskbar.h
+ optw_windowlist.h
optw_textencoding.h
optw_texticons.h
optw_tools.h
@@ -75,7 +75,7 @@ SET(kvioptions_SRCS
optw_query.cpp
optw_servers.cpp
optw_sound.cpp
- optw_taskbar.cpp
+ optw_windowlist.cpp
optw_textencoding.cpp
optw_texticons.cpp
optw_tools.cpp
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 9d37e7c03..ae44a382e 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -4,7 +4,7 @@
// File : instances.cpp
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2001 Szymon Stefanek (stefanek@tin.it)
+// Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -56,7 +56,6 @@
#include "optw_query.h"
#include "optw_servers.h"
#include "optw_sound.h"
-#include "optw_taskbar.h"
#include "optw_textencoding.h"
#include "optw_texticons.h"
#include "optw_tools.h"
@@ -65,6 +64,7 @@
#include "optw_uparser.h"
#include "optw_urlhandlers.h"
#include "optw_userlist.h"
+#include "optw_windowlist.h"
#include "kvi_locale.h"
#include "kvi_iconmanager.h"
@@ -392,36 +392,6 @@ KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(QWidget * pare
return new KviSoundsOptionsWidget(parent);
}
-KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviTaskBarOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviTreeTaskBarOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviTreeTaskBarForegroundOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviTreeTaskBarBackgroundOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviTreeTaskBarFeaturesOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
-{
- return new KviClassicTaskBarOptionsWidget(parent);
-}
-
KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(QWidget * parent)
{
return new KviTextEncodingOptionsWidget(parent);
@@ -482,6 +452,36 @@ KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(QWid
return new KviUserListFeaturesOptionsWidget(parent);
}
+KviOptionsWidget * classKviWindowListOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviWindowListOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviTreeWindowListOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviTreeWindowListOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviTreeWindowListForegroundOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviTreeWindowListForegroundOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviTreeWindowListBackgroundOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviTreeWindowListFeaturesOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviClassicWindowListOptionsWidget_createInstanceProc(QWidget * parent)
+{
+ return new KviClassicWindowListOptionsWidget(parent);
+}
+
static const char * g_szName_KviAntispamOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget;
@@ -612,18 +612,6 @@ static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_N
static const char * g_szClassName_KviSoundGeneralOptionsWidget = "KviSoundGeneralOptionsWidget";
static const char * g_szName_KviSoundsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget;
static const char * g_szClassName_KviSoundsOptionsWidget = "KviSoundsOptionsWidget";
-static const char * g_szName_KviTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTaskBarOptionsWidget;
-static const char * g_szClassName_KviTaskBarOptionsWidget = "KviTaskBarOptionsWidget";
-static const char * g_szName_KviTreeTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarOptionsWidget;
-static const char * g_szClassName_KviTreeTaskBarOptionsWidget = "KviTreeTaskBarOptionsWidget";
-static const char * g_szName_KviTreeTaskBarForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarForegroundOptionsWidget;
-static const char * g_szClassName_KviTreeTaskBarForegroundOptionsWidget = "KviTreeTaskBarForegroundOptionsWidget";
-static const char * g_szName_KviTreeTaskBarBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarBackgroundOptionsWidget;
-static const char * g_szClassName_KviTreeTaskBarBackgroundOptionsWidget = "KviTreeTaskBarBackgroundOptionsWidget";
-static const char * g_szName_KviTreeTaskBarFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarFeaturesOptionsWidget;
-static const char * g_szClassName_KviTreeTaskBarFeaturesOptionsWidget = "KviTreeTaskBarFeaturesOptionsWidget";
-static const char * g_szName_KviClassicTaskBarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviClassicTaskBarOptionsWidget;
-static const char * g_szClassName_KviClassicTaskBarOptionsWidget = "KviClassicTaskBarOptionsWidget";
static const char * g_szName_KviTextEncodingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget;
static const char * g_szClassName_KviTextEncodingOptionsWidget = "KviTextEncodingOptionsWidget";
static const char * g_szName_KviTextIconsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget;
@@ -648,6 +636,18 @@ static const char * g_szName_KviUserListGridOptionsWidget = KVI_OPTIONS_WIDGET_N
static const char * g_szClassName_KviUserListGridOptionsWidget = "KviUserListGridOptionsWidget";
static const char * g_szName_KviUserListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget;
static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "KviUserListFeaturesOptionsWidget";
+static const char * g_szName_KviWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviWindowListOptionsWidget;
+static const char * g_szClassName_KviWindowListOptionsWidget = "KviWindowListOptionsWidget";
+static const char * g_szName_KviTreeWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget;
+static const char * g_szClassName_KviTreeWindowListOptionsWidget = "KviTreeWindowListOptionsWidget";
+static const char * g_szName_KviTreeWindowListForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget;
+static const char * g_szClassName_KviTreeWindowListForegroundOptionsWidget = "KviTreeWindowListForegroundOptionsWidget";
+static const char * g_szName_KviTreeWindowListBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget;
+static const char * g_szClassName_KviTreeWindowListBackgroundOptionsWidget = "KviTreeWindowListBackgroundOptionsWidget";
+static const char * g_szName_KviTreeWindowListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget;
+static const char * g_szClassName_KviTreeWindowListFeaturesOptionsWidget = "KviTreeWindowListFeaturesOptionsWidget";
+static const char * g_szName_KviClassicWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget;
+static const char * g_szClassName_KviClassicWindowListOptionsWidget = "KviClassicWindowListOptionsWidget";
KviOptionsInstanceManager::KviOptionsInstanceManager()
: QObject(0)
@@ -3074,214 +3074,6 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
e0->pChildList = 0;
e0 = new KviOptionsWidgetInstanceEntry;
- e0->createProc = &classKviTaskBarOptionsWidget_createInstanceProc;
- e0->pWidget = 0;
- e0->szClassName = g_szClassName_KviTaskBarOptionsWidget;
- e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTaskBarOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTaskBarOptionsWidget
- e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTaskBarOptionsWidget;
- #else
- e0->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget
- e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget;
- e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget
- e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget;
- #else
- e0->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTaskBarOptionsWidget
- e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTaskBarOptionsWidget;
- #else
- e0->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTaskBarOptionsWidget
- e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTaskBarOptionsWidget;
- #else
- e0->bIsNotContained = false;
- #endif
- e0->szNameNoLocale = g_szName_KviTaskBarOptionsWidget;
- e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTaskBarOptionsWidget,"options");
- m_pInstanceTree->append(e0);
-
- e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
- e0->pChildList->setAutoDelete(true);
-
- e1 = new KviOptionsWidgetInstanceEntry;
- e1->createProc = &classKviTreeTaskBarOptionsWidget_createInstanceProc;
- e1->pWidget = 0;
- e1->szClassName = g_szClassName_KviTreeTaskBarOptionsWidget;
- e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarOptionsWidget
- e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarOptionsWidget;
- #else
- e1->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget
- e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget;
- e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget
- e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget;
- #else
- e1->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarOptionsWidget
- e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarOptionsWidget;
- #else
- e1->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarOptionsWidget
- e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarOptionsWidget;
- #else
- e1->bIsNotContained = false;
- #endif
- e1->szNameNoLocale = g_szName_KviTreeTaskBarOptionsWidget;
- e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarOptionsWidget,"options");
- e0->pChildList->append(e1);
-
- e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
- e1->pChildList->setAutoDelete(true);
-
- e2 = new KviOptionsWidgetInstanceEntry;
- e2->createProc = &classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc;
- e2->pWidget = 0;
- e2->szClassName = g_szClassName_KviTreeTaskBarForegroundOptionsWidget;
- e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarForegroundOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarForegroundOptionsWidget
- e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarForegroundOptionsWidget;
- #else
- e2->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget
- e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget;
- e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget
- e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget;
- #else
- e2->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarForegroundOptionsWidget
- e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarForegroundOptionsWidget;
- #else
- e2->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarForegroundOptionsWidget
- e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarForegroundOptionsWidget;
- #else
- e2->bIsNotContained = false;
- #endif
- e2->szNameNoLocale = g_szName_KviTreeTaskBarForegroundOptionsWidget;
- e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarForegroundOptionsWidget,"options");
- e1->pChildList->append(e2);
- e2->pChildList = 0;
-
- e2 = new KviOptionsWidgetInstanceEntry;
- e2->createProc = &classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc;
- e2->pWidget = 0;
- e2->szClassName = g_szClassName_KviTreeTaskBarBackgroundOptionsWidget;
- e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarBackgroundOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarBackgroundOptionsWidget
- e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarBackgroundOptionsWidget;
- #else
- e2->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget
- e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget;
- e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget
- e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget;
- #else
- e2->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarBackgroundOptionsWidget
- e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarBackgroundOptionsWidget;
- #else
- e2->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarBackgroundOptionsWidget
- e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarBackgroundOptionsWidget;
- #else
- e2->bIsNotContained = false;
- #endif
- e2->szNameNoLocale = g_szName_KviTreeTaskBarBackgroundOptionsWidget;
- e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarBackgroundOptionsWidget,"options");
- e1->pChildList->append(e2);
- e2->pChildList = 0;
-
- e2 = new KviOptionsWidgetInstanceEntry;
- e2->createProc = &classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc;
- e2->pWidget = 0;
- e2->szClassName = g_szClassName_KviTreeTaskBarFeaturesOptionsWidget;
- e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarFeaturesOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarFeaturesOptionsWidget
- e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeTaskBarFeaturesOptionsWidget;
- #else
- e2->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget
- e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget;
- e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget
- e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget;
- #else
- e2->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarFeaturesOptionsWidget
- e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarFeaturesOptionsWidget;
- #else
- e2->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarFeaturesOptionsWidget
- e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeTaskBarFeaturesOptionsWidget;
- #else
- e2->bIsNotContained = false;
- #endif
- e2->szNameNoLocale = g_szName_KviTreeTaskBarFeaturesOptionsWidget;
- e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarFeaturesOptionsWidget,"options");
- e1->pChildList->append(e2);
- e2->pChildList = 0;
-
- e1 = new KviOptionsWidgetInstanceEntry;
- e1->createProc = &classKviClassicTaskBarOptionsWidget_createInstanceProc;
- e1->pWidget = 0;
- e1->szClassName = g_szClassName_KviClassicTaskBarOptionsWidget;
- e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviClassicTaskBarOptionsWidget;
- #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviClassicTaskBarOptionsWidget
- e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviClassicTaskBarOptionsWidget;
- #else
- e1->iPriority = 0;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget
- e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget;
- e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget
- e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget;
- #else
- e1->szGroup = "general";
- #endif
- #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviClassicTaskBarOptionsWidget
- e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviClassicTaskBarOptionsWidget;
- #else
- e1->bIsContainer = false;
- #endif
- #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicTaskBarOptionsWidget
- e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicTaskBarOptionsWidget;
- #else
- e1->bIsNotContained = false;
- #endif
- e1->szNameNoLocale = g_szName_KviClassicTaskBarOptionsWidget;
- e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviClassicTaskBarOptionsWidget,"options");
- e0->pChildList->append(e1);
- e1->pChildList = 0;
-
- e0 = new KviOptionsWidgetInstanceEntry;
e0->createProc = &classKviTopicLabelLookOptionsWidget_createInstanceProc;
e0->pWidget = 0;
e0->szClassName = g_szClassName_KviTopicLabelLookOptionsWidget;
@@ -3487,6 +3279,214 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
e0->pChildList->append(e1);
e1->pChildList = 0;
+ e0 = new KviOptionsWidgetInstanceEntry;
+ e0->createProc = &classKviWindowListOptionsWidget_createInstanceProc;
+ e0->pWidget = 0;
+ e0->szClassName = g_szClassName_KviWindowListOptionsWidget;
+ e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviWindowListOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviWindowListOptionsWidget
+ e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviWindowListOptionsWidget;
+ #else
+ e0->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviWindowListOptionsWidget
+ e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviWindowListOptionsWidget;
+ e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviWindowListOptionsWidget
+ e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviWindowListOptionsWidget;
+ #else
+ e0->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviWindowListOptionsWidget
+ e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviWindowListOptionsWidget;
+ #else
+ e0->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviWindowListOptionsWidget
+ e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviWindowListOptionsWidget;
+ #else
+ e0->bIsNotContained = false;
+ #endif
+ e0->szNameNoLocale = g_szName_KviWindowListOptionsWidget;
+ e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviWindowListOptionsWidget,"options");
+ m_pInstanceTree->append(e0);
+
+ e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+ e0->pChildList->setAutoDelete(true);
+
+ e1 = new KviOptionsWidgetInstanceEntry;
+ e1->createProc = &classKviTreeWindowListOptionsWidget_createInstanceProc;
+ e1->pWidget = 0;
+ e1->szClassName = g_szClassName_KviTreeWindowListOptionsWidget;
+ e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListOptionsWidget
+ e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListOptionsWidget;
+ #else
+ e1->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListOptionsWidget
+ e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListOptionsWidget;
+ e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListOptionsWidget
+ e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListOptionsWidget;
+ #else
+ e1->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListOptionsWidget
+ e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListOptionsWidget;
+ #else
+ e1->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListOptionsWidget
+ e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListOptionsWidget;
+ #else
+ e1->bIsNotContained = false;
+ #endif
+ e1->szNameNoLocale = g_szName_KviTreeWindowListOptionsWidget;
+ e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListOptionsWidget,"options");
+ e0->pChildList->append(e1);
+
+ e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+ e1->pChildList->setAutoDelete(true);
+
+ e2 = new KviOptionsWidgetInstanceEntry;
+ e2->createProc = &classKviTreeWindowListForegroundOptionsWidget_createInstanceProc;
+ e2->pWidget = 0;
+ e2->szClassName = g_szClassName_KviTreeWindowListForegroundOptionsWidget;
+ e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListForegroundOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListForegroundOptionsWidget
+ e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListForegroundOptionsWidget;
+ #else
+ e2->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListForegroundOptionsWidget
+ e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListForegroundOptionsWidget;
+ e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListForegroundOptionsWidget
+ e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListForegroundOptionsWidget;
+ #else
+ e2->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListForegroundOptionsWidget
+ e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListForegroundOptionsWidget;
+ #else
+ e2->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListForegroundOptionsWidget
+ e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListForegroundOptionsWidget;
+ #else
+ e2->bIsNotContained = false;
+ #endif
+ e2->szNameNoLocale = g_szName_KviTreeWindowListForegroundOptionsWidget;
+ e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListForegroundOptionsWidget,"options");
+ e1->pChildList->append(e2);
+ e2->pChildList = 0;
+
+ e2 = new KviOptionsWidgetInstanceEntry;
+ e2->createProc = &classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc;
+ e2->pWidget = 0;
+ e2->szClassName = g_szClassName_KviTreeWindowListBackgroundOptionsWidget;
+ e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListBackgroundOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListBackgroundOptionsWidget
+ e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListBackgroundOptionsWidget;
+ #else
+ e2->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListBackgroundOptionsWidget
+ e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListBackgroundOptionsWidget;
+ e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListBackgroundOptionsWidget
+ e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListBackgroundOptionsWidget;
+ #else
+ e2->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListBackgroundOptionsWidget
+ e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListBackgroundOptionsWidget;
+ #else
+ e2->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListBackgroundOptionsWidget
+ e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListBackgroundOptionsWidget;
+ #else
+ e2->bIsNotContained = false;
+ #endif
+ e2->szNameNoLocale = g_szName_KviTreeWindowListBackgroundOptionsWidget;
+ e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListBackgroundOptionsWidget,"options");
+ e1->pChildList->append(e2);
+ e2->pChildList = 0;
+
+ e2 = new KviOptionsWidgetInstanceEntry;
+ e2->createProc = &classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc;
+ e2->pWidget = 0;
+ e2->szClassName = g_szClassName_KviTreeWindowListFeaturesOptionsWidget;
+ e2->iIcon = KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListFeaturesOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListFeaturesOptionsWidget
+ e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviTreeWindowListFeaturesOptionsWidget;
+ #else
+ e2->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListFeaturesOptionsWidget
+ e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListFeaturesOptionsWidget;
+ e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListFeaturesOptionsWidget
+ e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListFeaturesOptionsWidget;
+ #else
+ e2->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListFeaturesOptionsWidget
+ e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListFeaturesOptionsWidget;
+ #else
+ e2->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListFeaturesOptionsWidget
+ e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviTreeWindowListFeaturesOptionsWidget;
+ #else
+ e2->bIsNotContained = false;
+ #endif
+ e2->szNameNoLocale = g_szName_KviTreeWindowListFeaturesOptionsWidget;
+ e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListFeaturesOptionsWidget,"options");
+ e1->pChildList->append(e2);
+ e2->pChildList = 0;
+
+ e1 = new KviOptionsWidgetInstanceEntry;
+ e1->createProc = &classKviClassicWindowListOptionsWidget_createInstanceProc;
+ e1->pWidget = 0;
+ e1->szClassName = g_szClassName_KviClassicWindowListOptionsWidget;
+ e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviClassicWindowListOptionsWidget;
+ #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviClassicWindowListOptionsWidget
+ e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviClassicWindowListOptionsWidget;
+ #else
+ e1->iPriority = 0;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicWindowListOptionsWidget
+ e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicWindowListOptionsWidget;
+ e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_GROUP_KviClassicWindowListOptionsWidget
+ e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviClassicWindowListOptionsWidget;
+ #else
+ e1->szGroup = "general";
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviClassicWindowListOptionsWidget
+ e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviClassicWindowListOptionsWidget;
+ #else
+ e1->bIsContainer = false;
+ #endif
+ #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicWindowListOptionsWidget
+ e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviClassicWindowListOptionsWidget;
+ #else
+ e1->bIsNotContained = false;
+ #endif
+ e1->szNameNoLocale = g_szName_KviClassicWindowListOptionsWidget;
+ e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviClassicWindowListOptionsWidget,"options");
+ e0->pChildList->append(e1);
+ e1->pChildList = 0;
+
}
void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index 12f10a42c..ce2dabc26 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -7,7 +7,7 @@
// File : instances.h
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2001-2006 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 2585f0ac1..ba06ad172 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -80,22 +80,22 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Alert Restrictions","options"));
KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg);
- mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options"));
+ mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the window list only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options"));
KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Alert for highlighted words","options"),KviOption_boolHighlightOnlyNormalMsgHighlightInChanToo,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg));
- mergeTip(b4, __tr2qs_ctx("<center>If this option is enabled, the taskbar will also alert for messages which contain a word from the highlighted words list above.</center>","options"));
+ mergeTip(b4, __tr2qs_ctx("<center>If this option is enabled, the window list will also alert for messages which contain a word from the highlighted words list above.</center>","options"));
KviBoolSelector * b5 = addBoolSelector(g,__tr2qs_ctx("Alert for query messages","options"),KviOption_boolHighlightOnlyNormalMsgQueryToo,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg));
- mergeTip(b5, __tr2qs_ctx("<center>If this option is enabled, the taskbar will also alert for messages which are shown in queries.</center>","options"));
+ mergeTip(b5, __tr2qs_ctx("<center>If this option is enabled, the window list will also alert for messages which are shown in queries.</center>","options"));
connect(b3,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool)));
connect(b3,SIGNAL(toggled(bool)),b5,SLOT(setEnabled(bool)));
KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel);
- mergeTip(b6, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if the specified alert level is reached.</center>","options"));
+ mergeTip(b6, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the window list only if the specified alert level is reached.</center>","options"));
KviUIntSelector * b7 = addUIntSelector(g,__tr2qs_ctx("Minimum alert level:","options"),KviOption_uintMinHighlightLevel,1,KVI_MSGTYPE_MAXLEVEL,KVI_MSGTYPE_MAXLEVEL,KVI_OPTION_UINT(KviOption_boolHighlightOnlyAtCostumHighlightLevel));
b7->setEnabled(KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel));
- mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the taskbar.</center>","options"));
+ mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the window list.</center>","options"));
connect(b6,SIGNAL(toggled(bool)),b7,SLOT(setEnabled(bool)));
addRowSpacer(0,1,0,1);
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index fe3fd0e92..ddb7991dd 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -52,7 +52,7 @@ public:
#define KVI_OPTIONS_WIDGET_ICON_KviAlertOptionsWidget KVI_SMALLICON_RAW
-#define KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget __tr2qs_no_lookup("Taskbar Alert")
+#define KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget __tr2qs_no_lookup("Window List Alert")
#define KVI_OPTIONS_WIDGET_PARENT_KviAlertOptionsWidget KviAlertHighlightingOptionsWidget
class KviAlertOptionsWidget : public KviOptionsWidget
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index b461a7234..3521f9815 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -51,8 +51,8 @@ KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to minimize the console window after successfully logging into a server.</center>","options"));
- b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show network name in console taskbar entry","options"),KviOption_boolShowNetworkNameForConsoleTaskBarEntry);
- mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to show the network name as the console taskbar entry instead of the server name. This is nice to keep on unless your servers are not organized in networks or you often connect to two servers of the same network.</center>","options"));
+ b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show network name in console window list entry","options"),KviOption_boolShowNetworkNameForConsoleWindowListEntry);
+ mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to show the network name as the console window list entry instead of the server name. This is nice to keep on unless your servers are not organized in networks or you often connect to two servers of the same network.</center>","options"));
addRowSpacer(0,2,0,2);
}
diff --git a/src/modules/options/optw_taskbar.h b/src/modules/options/optw_taskbar.h
deleted file mode 100644
index 1d08f9148..000000000
--- a/src/modules/options/optw_taskbar.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _OPTW_TASKBAR_H_
-#define _OPTW_TASKBAR_H_
-
-//===============================================================================
-//
-// File : optw_taskbar.h
-// Creation date : Wed Jan 16 04:30:41 2002 GMT by Szymon Stefanek
-//
-// This file is part of the KVirc irc client distribution
-// Copyright (C) 2002-2006 Szymon Stefanek (pragma at kvirc dot net)
-//
-// This program is FREE software. You can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
-//
-// This program is distributed in the HOPE that it will be USEFUL,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, write to the Free Software Foundation,
-// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//===============================================================================
-
-
-#include "kvi_optionswidget.h"
-
-#include <QComboBox>
-
-#define KVI_OPTIONS_WIDGET_ICON_KviTaskBarOptionsWidget KVI_SMALLICON_CLASSICTASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviTaskBarOptionsWidget __tr2qs_no_lookup("Taskbar")
-#define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviTaskBarOptionsWidget 2
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget "theme"
-
-class KviTaskBarOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-public:
- KviTaskBarOptionsWidget(QWidget * parent);
- ~KviTaskBarOptionsWidget();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarOptionsWidget KVI_SMALLICON_TREETASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarOptionsWidget __tr2qs_no_lookup("Tree Taskbar")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeTaskBarOptionsWidget KviTaskBarOptionsWidget
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_CONTAINER_KviTreeTaskBarOptionsWidget true
-
-class KviTreeTaskBarOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-public:
- KviTreeTaskBarOptionsWidget(QWidget * pParent);
- ~KviTreeTaskBarOptionsWidget();
-};
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarForegroundOptionsWidget KVI_SMALLICON_TREETASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeTaskBarForegroundOptionsWidget KviTreeTaskBarOptionsWidget
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget "theme"
-
-class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-public:
- KviTreeTaskBarForegroundOptionsWidget(QWidget * parent);
- ~KviTreeTaskBarForegroundOptionsWidget();
-};
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarBackgroundOptionsWidget KVI_SMALLICON_TREETASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarBackgroundOptionsWidget __tr2qs_no_lookup("Background")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeTaskBarBackgroundOptionsWidget KviTreeTaskBarOptionsWidget
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget "theme"
-
-class KviTreeTaskBarBackgroundOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-private:
- QComboBox* m_pHorizontalAlign;
- QComboBox* m_pVerticalAlign;
-public:
- KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent);
- ~KviTreeTaskBarBackgroundOptionsWidget();
-
- virtual void commit();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviTreeTaskBarFeaturesOptionsWidget KVI_SMALLICON_TREETASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviTreeTaskBarFeaturesOptionsWidget __tr2qs_no_lookup("Features")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeTaskBarFeaturesOptionsWidget KviTreeTaskBarOptionsWidget
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskFeaturesBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget "theme"
-
-class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-public:
- KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent);
- ~KviTreeTaskBarFeaturesOptionsWidget();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviClassicTaskBarOptionsWidget KVI_SMALLICON_CLASSICTASKBAR
-#define KVI_OPTIONS_WIDGET_NAME_KviClassicTaskBarOptionsWidget __tr2qs_no_lookup("Classic Taskbar")
-#define KVI_OPTIONS_WIDGET_PARENT_KviClassicTaskBarOptionsWidget KviTaskBarOptionsWidget
-#define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviClassicTaskBarOptionsWidget 2
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget "theme"
-
-class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
-{
- Q_OBJECT
-public:
- KviClassicTaskBarOptionsWidget(QWidget * parent);
- ~KviClassicTaskBarOptionsWidget();
-};
-
-#endif //_OPTW_TASKBAR_H_
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_windowlist.cpp
index c31b28a25..8e46990a6 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_windowlist.cpp
@@ -1,5 +1,5 @@
//
-// File : optw_taskbar.cpp
+// File : optw_windowlist.cpp
// Creation date : Wed Jan 16 04:30:39 2002 GMT by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
@@ -20,38 +20,38 @@
// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
-#include "optw_taskbar.h"
+#include "optw_windowlist.h"
#include "kvi_settings.h"
#include "kvi_locale.h"
#include "kvi_options.h"
-KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(QWidget * parent)
+KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("taskbar_options_widget");
+ setObjectName("windowlist_options_widget");
createLayout();
- addBoolSelector(0,0,0,0,__tr2qs_ctx("Use tree taskbar","options"),KviOption_boolUseTreeWindowListTaskBar);
- addBoolSelector(0,1,0,1,__tr2qs_ctx("Sort windows by name","options"),KviOption_boolSortTaskBarItemsByName);
- addBoolSelector(0,2,0,2,__tr2qs_ctx("Show window icons in taskbar","options"),KviOption_boolUseTaskBarIcons);
- KviBoolSelector * b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show activity meter in taskbar","options"),KviOption_boolUseTaskBarActivityMeter);
- mergeTip(b,__tr2qs_ctx("<center>This option enables the usage of the taskbar activity meter. " \
+ addBoolSelector(0,0,0,0,__tr2qs_ctx("Use tree window list","options"),KviOption_boolUseTreeWindowListWindowList);
+ addBoolSelector(0,1,0,1,__tr2qs_ctx("Sort windows by name","options"),KviOption_boolSortWindowListItemsByName);
+ addBoolSelector(0,2,0,2,__tr2qs_ctx("Show window icons in window list","options"),KviOption_boolUseWindowListIcons);
+ KviBoolSelector * b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show activity meter in window list","options"),KviOption_boolUseWindowListActivityMeter);
+ mergeTip(b,__tr2qs_ctx("<center>This option enables the usage of the window list activity meter. " \
"Each window entry will have a small indicator of the activity that is going on in that window. " \
"The indicator is a small square that changes colors, dark colors mean low activity, " \
"while bright colors signal high activity. KVIrc also uses some heuristics to determine " \
"whether the activity is somewhat \"human\" or it is generated by automated entities (such as bots " \
"or IRC servers). \"Human\" activity causes the indicator to be shaded red while automated " \
"activity causes the indicator to be shaded blue.</center>","options"));
- addBoolSelector(0,4,0,4,__tr2qs_ctx("Show IRC context indicator in taskbar","options"),KviOption_boolUseTaskBarIrcContextIndicator);
- addBoolSelector(0,5,0,5,__tr2qs_ctx("Enable window tooltips","options"),KviOption_boolShowTaskBarToolTips);
+ addBoolSelector(0,4,0,4,__tr2qs_ctx("Show IRC context indicator in window list","options"),KviOption_boolUseWindowListIrcContextIndicator);
+ addBoolSelector(0,5,0,5,__tr2qs_ctx("Enable window tooltips","options"),KviOption_boolShowWindowListToolTips);
addRowSpacer(0,6,0,6);
}
-KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
+KviWindowListOptionsWidget::~KviWindowListOptionsWidget()
{
}
@@ -59,45 +59,45 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(QWidget * parent)
+KviTreeWindowListOptionsWidget::KviTreeWindowListOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("treetaskbar_options_widget");
+ setObjectName("treewindowlist_options_widget");
}
-KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
+KviTreeWindowListOptionsWidget::~KviTreeWindowListOptionsWidget()
{
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWidget * parent)
+KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("treetaskbar_options_widget");
+ setObjectName("treewindowlist_options_widget");
createLayout();
- addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeTaskbar);
+ addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeWindowList);
KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
- addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarForeground);
- addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveForeground);
- addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeTaskBarHighlight1Foreground);
- addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorTreeTaskBarHighlight2Foreground);
- addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorTreeTaskBarHighlight3Foreground);
- addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTreeTaskBarHighlight4Foreground);
- addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTreeTaskBarHighlight5Foreground);
+ addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground);
+ addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground);
- addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeTaskBarProgress);
+ addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeWindowListProgress);
addRowSpacer(0,3,0,3);
}
-KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
+KviTreeWindowListForegroundOptionsWidget::~KviTreeWindowListForegroundOptionsWidget()
{
}
@@ -106,18 +106,18 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent)
+KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("treetaskbar_options_widget");
+ setObjectName("treewindowlist_options_widget");
createLayout();
KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options"));
- addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarBackground);
- addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveBackground);
+ addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListBackground);
+ addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveBackground);
- addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapTreeTaskBarBackground);
+ addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapTreeWindowListBackground);
addLabel(0,2,0,2,__tr2qs_ctx("Horizontal align:","options"));
m_pHorizontalAlign=new QComboBox(this);
@@ -137,7 +137,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options"));
m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options"));
- switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignHorizontal_Mask)
+ switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignHorizontal_Mask)
{
case Qt::AlignLeft:
m_pHorizontalAlign->setCurrentIndex(1);
@@ -152,7 +152,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
m_pHorizontalAlign->setCurrentIndex(0);
}
- switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignVertical_Mask)
+ switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignVertical_Mask)
{
case Qt::AlignTop:
m_pVerticalAlign->setCurrentIndex(1);
@@ -171,11 +171,11 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
}
-KviTreeTaskBarBackgroundOptionsWidget::~KviTreeTaskBarBackgroundOptionsWidget()
+KviTreeWindowListBackgroundOptionsWidget::~KviTreeWindowListBackgroundOptionsWidget()
{
}
-void KviTreeTaskBarBackgroundOptionsWidget::commit()
+void KviTreeWindowListBackgroundOptionsWidget::commit()
{
KviOptionsWidget::commit();
@@ -205,64 +205,64 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
break;
}
- KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign)=iFlags;
+ KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign)=iFlags;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent)
+KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("treetaskbar_options_widget");
+ setObjectName("treewindowlist_options_widget");
createLayout();
- addBoolSelector(0,0,1,0,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeTaskbarHeader);
+ addBoolSelector(0,0,1,0,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeWindowListHeader);
- addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeTaskBarMinimumWidth,24,1024,125);
- addUIntSelector(0,2,0,2,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeTaskBarMaximumWidth,24,9999,125);
+ addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125);
+ addUIntSelector(0,2,0,2,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeWindowListMaximumWidth,24,9999,125);
addRowSpacer(0,3,0,3);
}
-KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
+KviTreeWindowListFeaturesOptionsWidget::~KviTreeWindowListFeaturesOptionsWidget()
{
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent)
+KviClassicWindowListOptionsWidget::KviClassicWindowListOptionsWidget(QWidget * parent)
: KviOptionsWidget(parent)
{
- setObjectName("classictaskbar_options_widget");
+ setObjectName("classicwindowlist_options_widget");
createLayout();
- addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
+ addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontWindowList);
KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
- addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText);
- addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorTaskBarMinimizedText);
- addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTaskBarHighlight1Text);
- addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorTaskBarHighlight2Text);
- addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorTaskBarHighlight3Text);
- addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTaskBarHighlight4Text);
- addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTaskBarHighlight5Text);
- addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTaskBarProgressBar);
- addUIntSelector(0,3,0,3,__tr2qs_ctx("Minimum width of buttons:","options"),KviOption_uintTaskBarButtonMinWidth,24,9999,100);
- //addUIntSelector(0,4,0,4,__tr2qs_ctx("Maximum number of rows:","options"),KviOption_uintTaskBarMaximumRows,1,16,2);
- addBoolSelector(0,4,0,4,__tr2qs_ctx("Set maximum button width","options"),KviOption_boolClassicTaskBarSetMaximumButtonWidth);
- addUIntSelector(0,5,0,5,__tr2qs_ctx("Maximum width of buttons:","options"),KviOption_uintClassicTaskBarMaximumButtonWidth,24,9999,100);
- addBoolSelector(0,6,0,6,__tr2qs_ctx("Use flat buttons","options"),KviOption_boolUseFlatClassicTaskbarButtons);
+ addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorWindowListNormalText);
+ addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorWindowListMinimizedText);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorWindowListHighlight1Text);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 2:","options"),KviOption_colorWindowListHighlight2Text);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 3:","options"),KviOption_colorWindowListHighlight3Text);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorWindowListHighlight4Text);
+ addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorWindowListHighlight5Text);
+ addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorWindowListProgressBar);
+ addUIntSelector(0,3,0,3,__tr2qs_ctx("Minimum width of buttons:","options"),KviOption_uintWindowListButtonMinWidth,24,9999,100);
+ //addUIntSelector(0,4,0,4,__tr2qs_ctx("Maximum number of rows:","options"),KviOption_uintWindowListMaximumRows,1,16,2);
+ addBoolSelector(0,4,0,4,__tr2qs_ctx("Set maximum button width","options"),KviOption_boolClassicWindowListSetMaximumButtonWidth);
+ addUIntSelector(0,5,0,5,__tr2qs_ctx("Maximum width of buttons:","options"),KviOption_uintClassicWindowListMaximumButtonWidth,24,9999,100);
+ addBoolSelector(0,6,0,6,__tr2qs_ctx("Use flat buttons","options"),KviOption_boolUseFlatClassicWindowListButtons);
addRowSpacer(0,7,0,7);
}
-KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget()
+KviClassicWindowListOptionsWidget::~KviClassicWindowListOptionsWidget()
{
}
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_taskbar.moc"
+#include "m_optw_windowlist.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/optw_windowlist.h
new file mode 100644
index 000000000..56b451f17
--- /dev/null
+++ b/src/modules/options/optw_windowlist.h
@@ -0,0 +1,126 @@
+#ifndef _OPTW_WINDOWLIST_H_
+#define _OPTW_WINDOWLIST_H_
+
+//===============================================================================
+//
+// File : optw_windowlist.h
+// Creation date : Wed Jan 16 04:30:41 2002 GMT by Szymon Stefanek
+//
+// This file is part of the KVirc irc client distribution
+// Copyright (C) 2002-2006 Szymon Stefanek (pragma at kvirc dot net)
+//
+// This program is FREE software. You can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your opinion) any later version.
+//
+// This program is distributed in the HOPE that it will be USEFUL,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, write to the Free Software Foundation,
+// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//===============================================================================
+
+
+#include "kvi_optionswidget.h"
+
+#include <QComboBox>
+
+#define KVI_OPTIONS_WIDGET_ICON_KviWindowListOptionsWidget KVI_SMALLICON_CLASSICWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviWindowListOptionsWidget __tr2qs_no_lookup("Window List")
+#define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviWindowListOptionsWidget 2
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviWindowListOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviWindowListOptionsWidget "theme"
+
+class KviWindowListOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+public:
+ KviWindowListOptionsWidget(QWidget * parent);
+ ~KviWindowListOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("Tree Window List")
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListOptionsWidget "theme"
+#define KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListOptionsWidget true
+
+class KviTreeWindowListOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+public:
+ KviTreeWindowListOptionsWidget(QWidget * pParent);
+ ~KviTreeWindowListOptionsWidget();
+};
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListForegroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListForegroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListForegroundOptionsWidget "theme"
+
+class KviTreeWindowListForegroundOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+public:
+ KviTreeWindowListForegroundOptionsWidget(QWidget * parent);
+ ~KviTreeWindowListForegroundOptionsWidget();
+};
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListBackgroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget __tr2qs_no_lookup("Background")
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListBackgroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListBackgroundOptionsWidget "theme"
+
+class KviTreeWindowListBackgroundOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+private:
+ QComboBox* m_pHorizontalAlign;
+ QComboBox* m_pVerticalAlign;
+public:
+ KviTreeWindowListBackgroundOptionsWidget(QWidget * parent);
+ ~KviTreeWindowListBackgroundOptionsWidget();
+
+ virtual void commit();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListFeaturesOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget __tr2qs_no_lookup("Features")
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListFeaturesOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskFeaturesBarOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListFeaturesOptionsWidget "theme"
+
+class KviTreeWindowListFeaturesOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+public:
+ KviTreeWindowListFeaturesOptionsWidget(QWidget * parent);
+ ~KviTreeWindowListFeaturesOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviClassicWindowListOptionsWidget KVI_SMALLICON_CLASSICWINDOWLIST
+#define KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("Classic Window List")
+#define KVI_OPTIONS_WIDGET_PARENT_KviClassicWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviClassicWindowListOptionsWidget 2
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviClassicWindowListOptionsWidget "theme"
+
+class KviClassicWindowListOptionsWidget : public KviOptionsWidget
+{
+ Q_OBJECT
+public:
+ KviClassicWindowListOptionsWidget(QWidget * parent);
+ ~KviClassicWindowListOptionsWidget();
+};
+
+#endif //_OPTW_WINDOWLIST_H_
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 3e591e89f..8c264c2bf 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -27,7 +27,7 @@
#include "kvi_module.h"
#include "kvi_locale.h"
#include "kvi_memmove.h"
-#include "kvi_taskbar.h"
+#include "kvi_windowlist.h"
#include "kvi_window.h"
#include "kvi_dynamictooltip.h"
#include "kvi_iconmanager.h"
@@ -157,11 +157,11 @@ void KviTrayIcon::tipRequest(KviDynamicToolTip *tip,const QPoint &pnt)
{
QString tmp;
- KviTaskBarBase * t = m_pFrm->taskBar();
+ KviWindowListBase * t = m_pFrm->windowListWidget();
QString line;
- for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem())
+ for(KviWindowListItem * b = t->firstItem();b;b = t->nextItem())
{
if(b->kviWindow()->view())
@@ -374,7 +374,7 @@ void KviTrayIcon::activatedSlot( QSystemTrayIcon::ActivationReason reason )
void KviTrayIcon::grabActivityInfo()
{
- KviTaskBarBase * t = m_pFrm->taskBar();
+ KviWindowListBase * t = m_pFrm->windowListWidget();
if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification))
{
@@ -393,7 +393,7 @@ void KviTrayIcon::grabActivityInfo()
m_iQueries = 0;
m_iOther = 0;
- for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem())
+ for(KviWindowListItem * b = t->firstItem();b;b = t->nextItem())
{
if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification))
{
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 9ad5c54f5..35ae1fce8 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -28,7 +28,7 @@
#include "kvi_iconmanager.h"
#include "kvi_action.h"
#include "kvi_actionmanager.h"
-#include "kvi_taskbar.h"
+#include "kvi_windowlist.h"
#include "kvi_pointerlist.h"
#include "kvi_kvs_eventmanager.h"
#include "kvi_tal_popupmenu.h"
@@ -754,7 +754,7 @@ bool urllist_module_event_onUrl(KviKvsModuleEventCall * c)
QString tmpCount;
tmpCount.setNum(tmp->count);
tmpitem->dlg->addUrl(QString(tmp->url), QString(tmp->window), tmpCount, QString(tmp->timestamp));
- tmpitem->dlg->taskBarItem()->highlight(false);
+ tmpitem->dlg->windowListItem()->highlight(false);
}
}
}
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 947dde9b8..999177fc8 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -721,11 +721,11 @@ static bool window_kvs_cmd_highlight(KviKvsModuleCommandCall * c)
$window.highlightLevel
$window.highlightLevel(<window_id>)
@description:
- Every window has a current alert level; it corresponds to an highlight color of that window in the taskbar.
- There are 6 defined levels, they start from 0 (normal) to 5 (max alarm level). The classic taskbar and the tree taskbar use different colors to represent these levels. Classic task bar uses options:
- [ul][li]colorTaskBarNormalText : normale state[/li][li]colorTaskBarHighlight1Text : highlight state 1[/li][li]...[/li][li]colorTaskBarHighlight5Text : highlight state 5[/li][/ul]
- While the tree taskbar uses options:
- [ul][li]colorTreeTaskBarForeground : normale state[/li][li]colorTreeTaskBarHighlight1Foreground : highlight state 1[/li][li]...[/li][li]colorTreeTaskBarHighlight5Foreground : highlight state 5[/li][/ul]
+ Every window has a current alert level; it corresponds to an highlight color of that window in the window list.
+ There are 6 defined levels, they start from 0 (normal) to 5 (max alarm level). The classic window list and the tree window list use different colors to represent these levels. Classic task bar uses options:
+ [ul][li]colorWindowListNormalText : normale state[/li][li]colorWindowListHighlight1Text : highlight state 1[/li][li]...[/li][li]colorWindowListHighlight5Text : highlight state 5[/li][/ul]
+ While the tree window list uses options:
+ [ul][li]colorTreeWindowListForeground : normale state[/li][li]colorTreeWindowListHighlight1Foreground : highlight state 1[/li][li]...[/li][li]colorTreeWindowListHighlight5Foreground : highlight state 5[/li][/ul]
You can use [fnc]$option[/fnc] to read these options and the [cmd]option[/cmd] command to set them.
@seealso:
[fnc]$window.activityTemperature[/fnc]
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 08:11:25 +0000