diff options
| author |  un1versal | 2016-01-15 15:51:15 +0000 |
|---|---|---|
| committer | un1versal | 2016-01-16 07:28:19 +0000 |
| commit | f1664d76f409373cb05e1b41fc446fcf9b775729 (patch) | |
| tree | b3a5c9497d55d91bf7bdd40231a99b898007c3f6 | |
| parent | KviOptions: rename/remove/comment out unused and updated options (diff) | |
| download | KVIrc-f1664d76f409373cb05e1b41fc446fcf9b775729.tar.gz KVIrc-f1664d76f409373cb05e1b41fc446fcf9b775729.tar.bz2 KVIrc-f1664d76f409373cb05e1b41fc446fcf9b775729.zip | |
further options/define + cleanup
| -rw-r--r-- | src/kvirc/kernel/KviOptions.cpp | 21 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviOptions.h | 11 |
2 files changed, 14 insertions, 18 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 42cdcb09b..8209e5f29 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -692,29 +692,26 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]= FONT_OPTION("UserListView","Arial",9,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), FONT_OPTION("Label","Arial",9,KviOption_sectFlagLabel | KviOption_resetUpdateGui), FONT_OPTION("Application","Arial",9,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), - FONT_OPTION("IrcToolBarApplet","Arial",9,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), FONT_OPTION("WindowList","Arial",9,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), FONT_OPTION("TreeWindowList","Arial",9,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), FONT_OPTION("Notifier","Arial",9,KviOption_sectFlagNotifier | KviOption_resetUpdateGui), FONT_OPTION("NotifierTitle","Arial",9,KviOption_sectFlagNotifier | KviOption_resetUpdateGui) #elif defined(COMPILE_ON_MAC) - FONT_OPTION("IrcView","Lucida Grande",12,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), - FONT_OPTION("Input","Lucida Grande",12,KviOption_sectFlagInput | KviOption_resetUpdateGui), - FONT_OPTION("UserListView","Lucida Grande",12,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), - FONT_OPTION("Label","Lucida Grande",12,KviOption_sectFlagLabel | KviOption_resetUpdateGui), - FONT_OPTION("Application","Lucida Grande",12,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), - FONT_OPTION("IrcToolBarApplet","Lucida Grande",12,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), - FONT_OPTION("WindowList","Lucida Grande",12,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), - FONT_OPTION("TreeWindowList","Lucida Grande",12,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), - FONT_OPTION("Notifier","Lucida Grande",12,KviOption_sectFlagNotifier | KviOption_resetUpdateNotifier), - FONT_OPTION("NotifierTitle","Lucida Grande",12,KviOption_sectFlagNotifier | KviOption_resetUpdateNotifier) + FONT_OPTION("IrcView","Lucida Grande",12,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), + FONT_OPTION("Input","Lucida Grande",12,KviOption_sectFlagInput | KviOption_resetUpdateGui), + FONT_OPTION("UserListView","Lucida Grande",12,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), + FONT_OPTION("Label","Lucida Grande",12,KviOption_sectFlagLabel | KviOption_resetUpdateGui), + FONT_OPTION("Application","Lucida Grande",12,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), + FONT_OPTION("WindowList","Lucida Grande",12,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), + FONT_OPTION("TreeWindowList","Lucida Grande",12,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), + FONT_OPTION("Notifier","Lucida Grande",12,KviOption_sectFlagNotifier | KviOption_resetUpdateNotifier), + FONT_OPTION("NotifierTitle","Lucida Grande",12,KviOption_sectFlagNotifier | KviOption_resetUpdateNotifier) #else FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui), FONT_OPTION("UserListView","Sans Serif",10,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui), FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), - FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), FONT_OPTION("WindowList","Sans Serif",10,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), FONT_OPTION("TreeWindowList","Sans Serif",10,KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList), FONT_OPTION("Notifier","Sans Serif",9,KviOption_sectFlagNotifier | KviOption_resetUpdateNotifier), diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h index 1cd6aad20..f28ab57ac 100644 --- a/src/kvirc/kernel/KviOptions.h +++ b/src/kvirc/kernel/KviOptions.h @@ -640,13 +640,12 @@ namespace KviIdentdOutputMode { #define KviOption_fontUserListView 2 /* look & feel::interface look::userlist */ #define KviOption_fontLabel 3 /* look & feel::interface look::topic label */ #define KviOption_fontApplication 4 /* interface::look::global */ -//#define KviOption_fontIrcToolBarApplet 5 /* theme::tool bar applet UNUSED FOR REUSE*/ -#define KviOption_fontWindowList 6 /* interface::look::WindowList::classic WindowList */ -#define KviOption_fontTreeWindowList 7 /* interface::look::WindowList::tree WindowList */ -#define KviOption_fontNotifier 8 /* interface::look::components::notifier */ -#define KviOption_fontNotifierTitle 9 /* interface::look::components::notifier */ +#define KviOption_fontWindowList 5 /* interface::look::WindowList::classic WindowList */ +#define KviOption_fontTreeWindowList 6 /* interface::look::WindowList::tree WindowList */ +#define KviOption_fontNotifier 7 /* interface::look::components::notifier */ +#define KviOption_fontNotifierTitle 8 /* interface::look::components::notifier */ -#define KVI_NUM_FONT_OPTIONS 10 +#define KVI_NUM_FONT_OPTIONS 9 |