devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 06:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change theme handling

Browse Source 
So far when loading a theme it also overwrote the preferences the user
set.

Lengthy discussion can be found at
https://github.com/profanity-im/profanity/issues/1077

Now we use `/theme load themename` to load the [colours] part of a
themem only.

`/theme full-load themename` will load the complete theme including
preferences set in there.

Regards https://github.com/profanity-im/profanity/issues/1077
This commit is contained in:
Michael Vetter
2020-01-29 12:33:55 +01:00
parent 5c41c5b380
commit cd80b6cbf2
6 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/theme.c
View File

@@ -154,7 +154,7 @@ theme_init(const char *const theme_name)
g_hash_table_insert(defaults, strdup("untrusted"), strdup("red"));
g_hash_table_insert(defaults, strdup("cmd.wins.unread"), strdup("default"));
_load_preferences();
//_load_preferences();
}
gboolean
@@ -174,12 +174,14 @@ theme_exists(const char *const theme_name)
}
gboolean
theme_load(const char *const theme_name)
theme_load(const char *const theme_name, gboolean load_theme_prefs)
{
color_pair_cache_reset();
if (_theme_load_file(theme_name)) {
_load_preferences();
if (load_theme_prefs) {
_load_preferences();
}
return TRUE;
} else {
return FALSE;

2
src/config/theme.h
View File

@@ -143,7 +143,7 @@ typedef enum {
void theme_init(const char *const theme_name);
void theme_init_colours(void);
gboolean theme_load(const char *const theme_name);
gboolean theme_load(const char *const theme_name, gboolean load_theme_prefs);
gboolean theme_exists(const char *const theme_name);
GSList* theme_list(void);
void theme_close(void);