aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar wodim2016-01-07 21:04:46 +0100
committerGravatar wodim2016-01-07 21:04:46 +0100
commit4f26aeab03c06dcff058fb490fe8f6958f79e6cf (patch)
tree034f4342da95914e785c7f54879ea0f3adc2f0c8
parentMake it so margins and spacings between the UI elements in all settings dialo... (diff)
downloadKVIrc-4f26aeab03c06dcff058fb490fe8f6958f79e6cf.tar.gz
KVIrc-4f26aeab03c06dcff058fb490fe8f6958f79e6cf.tar.bz2
KVIrc-4f26aeab03c06dcff058fb490fe8f6958f79e6cf.zip
Allow the window list handle to be hidden.
Implements #1812.
-rw-r--r--src/kvirc/kernel/KviOptions.cpp5
-rw-r--r--src/kvirc/kernel/KviOptions.h5
-rw-r--r--src/kvirc/ui/KviWindowListBase.cpp11
-rw-r--r--src/modules/options/OptionsWidget_windowList.cpp2
4 files changed, 10 insertions, 13 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 42da6d16b..af2af10d6 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -310,7 +310,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("AutoAcceptDccVideo", false, KviOption_sectFlagDcc),
BOOL_OPTION("CreateMinimizedDccVideo", false, KviOption_sectFlagDcc),
BOOL_OPTION("CreateMinimizedDccVideoWhenAutoAccepted",true,KviOption_sectFlagDcc),
- BOOL_OPTION("ShowTreeWindowListHeader",false,KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
+ BOOL_OPTION("UNUSED:ShowTreeWindowListHeader",false,KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
BOOL_OPTION("FlashDccChatWindowOnNewMessages",true,KviOption_sectFlagFrame),
BOOL_OPTION("PopupNotifierOnNewDccChatMessages",true,KviOption_sectFlagFrame),
BOOL_OPTION("UseAwayMessage",true,KviOption_sectFlagConnection),
@@ -340,7 +340,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("EnableCustomCursorWidth",false,KviOption_sectFlagGui | KviOption_resetUpdateGui),
BOOL_OPTION("ShowFavoriteServersOnly",false,KviOption_sectFlagFrame),
BOOL_OPTION("RequireControlToCopy",false,KviOption_sectFlagIrcView),
- BOOL_OPTION("Send64BitAckInDccRecv",false,KviOption_sectFlagDcc)
+ BOOL_OPTION("Send64BitAckInDccRecv",false,KviOption_sectFlagDcc),
+ BOOL_OPTION("ShowTreeWindowListHandle",true,KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
};
#define STRING_OPTION(_txt,_val,_flags) KviStringOption(KVI_STRING_OPTIONS_PREFIX _txt,_val,_flags)
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 62a71ab17..d554f200e 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -326,7 +326,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolAutoAcceptDccVideo 231 /* dcc::video */
#define KviOption_boolCreateMinimizedDccVideo 232 /* dcc::video */
#define KviOption_boolCreateMinimizedDccVideoWhenAutoAccepted 233 /* dcc::video */
-#define KviOption_boolShowTreeWindowListHeader 234
+// #define KviOption_boolShowTreeWindowListHeader 234
#define KviOption_boolFlashDccChatWindowOnNewMessages 235 /* dcc:chat */
#define KviOption_boolPopupNotifierOnNewDccChatMessages 236 /* dcc:chat */
#define KviOption_boolUseAwayMessage 237 /* away */
@@ -357,8 +357,9 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolShowFavoriteServersOnly 262 /* connection::ircservers */
#define KviOption_boolRequireControlToCopy 263 /* interface::ircview */
#define KviOption_boolSend64BitAckInDccRecv 264 /* dcc::send */
+#define KviOption_boolShowTreeWindowListHandle 265
-#define KVI_NUM_BOOL_OPTIONS 265
+#define KVI_NUM_BOOL_OPTIONS 266
#define KVI_STRING_OPTIONS_PREFIX "string"
diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp
index d5ef827d8..55ac3e2a9 100644
--- a/src/kvirc/ui/KviWindowListBase.cpp
+++ b/src/kvirc/ui/KviWindowListBase.cpp
@@ -176,16 +176,11 @@ void KviWindowListBase::applyOptions()
if(m_pTitleWidget)
delete m_pTitleWidget;
- if(KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHeader))
+ if(KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHandle))
{
- m_pTitleWidget = new QLabel();
- setTitleBarWidget( m_pTitleWidget );
-
- ((QLabel*)m_pTitleWidget)->setText(__tr2qs("Window List"));
- ((QLabel*)m_pTitleWidget)->setMargin(2);
- ((QLabel*)m_pTitleWidget)->setIndent(4);
- } else {
m_pTitleWidget = new KviWindowListTitleWidget(this);
+ } else {
+ m_pTitleWidget = new QWidget();
}
setTitleBarWidget(m_pTitleWidget);
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index a1b7b1f55..b2de711ad 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -49,7 +49,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
"activity causes the indicator to be shaded blue.</center>","options"));
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);
- addBoolSelector(0,6,0,6,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeWindowListHeader);
+ addBoolSelector(0,6,0,6,__tr2qs_ctx("Allow the window list to be moved","options"),KviOption_boolShowTreeWindowListHandle);
addBoolSelector(0,7,0,7,__tr2qs_ctx("Show user flag for channels","options"),KviOption_boolShowUserFlagForChannelsInWindowList);
addRowSpacer(0,8,0,8);
}