diff options
| author |  Szymon Tomasz Stefanek | 2015-08-26 02:30:04 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-26 02:30:04 +0200 |
| commit | 8bf0fe152ebd97ee00ea8d13942bed4cc5ac7b72 (patch) | |
| tree | eae54f3334b563d6ce0e1d557984986bb174dd95 | |
| parent | Merge pull request #1504 from Pan7/master (diff) | |
| download | KVIrc-8bf0fe152ebd97ee00ea8d13942bed4cc5ac7b72.tar.gz KVIrc-8bf0fe152ebd97ee00ea8d13942bed4cc5ac7b72.tar.bz2 KVIrc-8bf0fe152ebd97ee00ea8d13942bed4cc5ac7b72.zip | |
Fix naming for commit 633ce49
| -rw-r--r-- | src/kvirc/kernel/KviOptions.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviOptions.h | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/KviWindowListBase.cpp | 6 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_windowList.cpp | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index d7b8b459c..81ac7d7d8 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -332,8 +332,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]= BOOL_OPTION("DisplayNotifierOnPrimaryScreen",true,KviOption_sectFlagFrame), BOOL_OPTION("ShowDialogOnChannelCtcpPage",false,KviOption_sectFlagCtcp), BOOL_OPTION("PopupNotifierOnNewNotices",true,KviOption_sectFlagFrame), - BOOL_OPTION("UserListViewUseAwayColor",true,KviOption_sectFlagUserListView), - BOOL_OPTION("ShowWindowListWithUserFlag",true,KviOption_sectFlagWindowList | KviOption_resetUpdateGui) + BOOL_OPTION("UserListViewUseAwayColor",true,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), + BOOL_OPTION("ShowUserFlagForChannelsInWindowList",true,KviOption_sectFlagWindowList | KviOption_resetUpdateGui) }; #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 7ebb603d5..946e5ca05 100644 --- a/src/kvirc/kernel/KviOptions.h +++ b/src/kvirc/kernel/KviOptions.h @@ -352,7 +352,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList) #define KviOption_boolShowDialogOnChannelCtcpPage 257 #define KviOption_boolPopupNotifierOnNewNotices 258 /* query */ #define KviOption_boolUserListViewUseAwayColor 259 /* userlist */ -#define KviOption_boolShowWindowListWithUserFlag 260 +#define KviOption_boolShowUserFlagForChannelsInWindowList 260 #define KVI_NUM_BOOL_OPTIONS 261 diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index ba0b0a95f..3af199c07 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -447,12 +447,10 @@ void KviWindowListButton::drawButtonLabel(QPainter * pPainter) break; case KviWindow::Channel: case KviWindow::DeadChannel: - if(KVI_OPTION_BOOL(KviOption_boolShowWindowListWithUserFlag)) - { + if(KVI_OPTION_BOOL(KviOption_boolShowUserFlagForChannelsInWindowList)) szText = ((KviChannelWindow *)m_pWindow)->nameWithUserFlag(); - } else { + else szText = ((KviChannelWindow *)m_pWindow)->target(); - } break; case KviWindow::Query: case KviWindow::DeadQuery: diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp index 1949daef1..be0a1eadd 100644 --- a/src/modules/options/OptionsWidget_windowList.cpp +++ b/src/modules/options/OptionsWidget_windowList.cpp @@ -50,7 +50,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent) 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,7,0,7,__tr2qs_ctx("Show user flag for channels","options"),KviOption_boolShowWindowListWithUserFlag); + addBoolSelector(0,7,0,7,__tr2qs_ctx("Show user flag for channels","options"),KviOption_boolShowUserFlagForChannelsInWindowList); addRowSpacer(0,8,0,8); } |