Separated colours from main preferences

This commit is contained in:
James Booth
2012-11-21 21:24:10 +00:00
parent 1a909fd6eb
commit e8b2b7196c
7 changed files with 478 additions and 348 deletions

View File

@@ -45,6 +45,7 @@
#include "preferences.h"
#include "release.h"
#include "room_chat.h"
#include "theme.h"
#include "ui.h"
#define CONS_WIN_TITLE "_cons"
@@ -113,39 +114,39 @@ gui_init(void)
start_color();
// main text
init_pair(1, prefs_get_maintext(), prefs_get_bkgnd());
init_pair(2, prefs_get_splashtext(), prefs_get_bkgnd());
init_pair(3, prefs_get_error(), prefs_get_bkgnd());
init_pair(4, prefs_get_incoming(), prefs_get_bkgnd());
init_pair(1, theme_get_maintext(), theme_get_bkgnd());
init_pair(2, theme_get_splashtext(), theme_get_bkgnd());
init_pair(3, theme_get_error(), theme_get_bkgnd());
init_pair(4, theme_get_incoming(), theme_get_bkgnd());
// title bar
init_pair(10, prefs_get_titlebartext(), prefs_get_titlebar());
init_pair(11, prefs_get_titlebarbrackets(), prefs_get_titlebar());
init_pair(10, theme_get_titlebartext(), theme_get_titlebar());
init_pair(11, theme_get_titlebarbrackets(), theme_get_titlebar());
// status bar
init_pair(20, prefs_get_statusbartext(), prefs_get_statusbar());
init_pair(21, prefs_get_statusbarbrackets(), prefs_get_statusbar());
init_pair(22, prefs_get_statusbaractive(), prefs_get_statusbar());
init_pair(23, prefs_get_statusbarnew(), prefs_get_statusbar());
init_pair(20, theme_get_statusbartext(), theme_get_statusbar());
init_pair(21, theme_get_statusbarbrackets(), theme_get_statusbar());
init_pair(22, theme_get_statusbaractive(), theme_get_statusbar());
init_pair(23, theme_get_statusbarnew(), theme_get_statusbar());
// chat
init_pair(30, prefs_get_me(), prefs_get_bkgnd());
init_pair(31, prefs_get_them(), prefs_get_bkgnd());
init_pair(30, theme_get_me(), theme_get_bkgnd());
init_pair(31, theme_get_them(), theme_get_bkgnd());
// room chat
init_pair(40, prefs_get_roominfo(), prefs_get_bkgnd());
init_pair(40, theme_get_roominfo(), theme_get_bkgnd());
// statuses
init_pair(50, prefs_get_online(), prefs_get_bkgnd());
init_pair(51, prefs_get_offline(), prefs_get_bkgnd());
init_pair(52, prefs_get_away(), prefs_get_bkgnd());
init_pair(53, prefs_get_chat(), prefs_get_bkgnd());
init_pair(54, prefs_get_dnd(), prefs_get_bkgnd());
init_pair(55, prefs_get_xa(), prefs_get_bkgnd());
init_pair(50, theme_get_online(), theme_get_bkgnd());
init_pair(51, theme_get_offline(), theme_get_bkgnd());
init_pair(52, theme_get_away(), theme_get_bkgnd());
init_pair(53, theme_get_chat(), theme_get_bkgnd());
init_pair(54, theme_get_dnd(), theme_get_bkgnd());
init_pair(55, theme_get_xa(), theme_get_bkgnd());
// states
init_pair(60, prefs_get_typing(), prefs_get_bkgnd());
init_pair(61, prefs_get_gone(), prefs_get_bkgnd());
init_pair(60, theme_get_typing(), theme_get_bkgnd());
init_pair(61, theme_get_gone(), theme_get_bkgnd());
}
refresh();