aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar un1versal2016-05-11 03:35:22 +0100
committerGravatar un1versal2016-05-11 04:08:56 +0100
commit73c0e49f372e7a88720fc67467951ce4d05ed405 (patch)
tree0dad3f8c1e975af491cfb09df61a9659004908b6
parentInternal themes: some fixes after #1979 (diff)
downloadKVIrc-73c0e49f372e7a88720fc67467951ce4d05ed405.tar.gz
KVIrc-73c0e49f372e7a88720fc67467951ce4d05ed405.tar.bz2
KVIrc-73c0e49f372e7a88720fc67467951ce4d05ed405.zip
fix double WindowList in bool name
this was a dealers choice, repo themes all use this option name, but its unlikely those themes will go unscathed in any case. Im not volunteering to fix them, but Ill write some news calling out to themers.
-rw-r--r--src/kvirc/kernel/KviOptions.cpp2
-rw-r--r--src/kvirc/kernel/KviOptions.h2
-rw-r--r--src/kvirc/ui/KviMainWindow.cpp2
-rw-r--r--src/modules/options/OptionsWidget_windowList.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 43bed59d2..7a7851794 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -135,7 +135,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS] = {
BOOL_OPTION("NotifyListSendUserhostForOnlineUsers", true, KviOption_sectFlagConnection),
BOOL_OPTION("UseIntelligentNotifyListManager", true, KviOption_sectFlagConnection | KviOption_resetRestartNotifyList),
BOOL_OPTION("UseWatchListIfAvailable", true, KviOption_sectFlagConnection),
- BOOL_OPTION("UseTreeWindowListWindowList", true, KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList | KviOption_groupTheme),
+ BOOL_OPTION("UseTreeWindowList", true, KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList | KviOption_groupTheme),
BOOL_OPTION("BindIrcIPv4ConnectionsToSpecifiedAddress", false, KviOption_sectFlagConnection),
BOOL_OPTION("BindIrcIPv6ConnectionsToSpecifiedAddress", false, KviOption_sectFlagConnection),
BOOL_OPTION("UseAntiSpamOnNotice", false, KviOption_sectFlagAntiSpam),
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 7e218536c..72c604603 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -163,7 +163,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
#define KviOption_boolNotifyListSendUserhostForOnlineUsers 72 /* ircengine::notifylist */
#define KviOption_boolUseIntelligentNotifyListManager 73 /* ircengine::notifylist */
#define KviOption_boolUseWatchListIfAvailable 74 /* ircengine::notifylist */
-#define KviOption_boolUseTreeWindowListWindowList 75 /* interface::features::global */
+#define KviOption_boolUseTreeWindowList 75 /* interface::features::global */
#define KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress 76 /* connection::transport */
#define KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress 77 /* connection::transport */
#define KviOption_boolUseAntiSpamOnNotice 78 /* ircengine::antispam */
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index 7c0178de9..08351e23e 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -1267,7 +1267,7 @@ void KviMainWindow::createWindowList()
delete m_pWindowList;
}
- if(KVI_OPTION_BOOL(KviOption_boolUseTreeWindowListWindowList))
+ if(KVI_OPTION_BOOL(KviOption_boolUseTreeWindowList))
{
m_pWindowList = new KviTreeWindowList();
m_pWindowList->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index cd3324b5e..86f9c5322 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -34,7 +34,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
setObjectName("windowlist_options_widget");
createLayout();
- addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Use tree window list", "options"), KviOption_boolUseTreeWindowListWindowList);
+ addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Use tree window list", "options"), KviOption_boolUseTreeWindowList);
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);