Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:33:02 +01:00
Code Issues Projects Releases Wiki Activity

manpage fixes/rm redundant comments & make alerts setting more intuitive

Browse Source
This commit is contained in:
Jfreegman 2014-06-28 22:05:05 -04:00
parent 97536d2a72
commit ebc5cd9285
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/toxic.conf.5
View File

@ -35,11 +35,11 @@ Enable or disable autologging.
Values: 1 to enable, 0 to disable Values: 1 to enable, 0 to disable
.RE .RE
.PP .PP
.B disable_alerts .B alerts
.RS .RS
Enable or disable terminal alerts on messages. Enable or disable terminal alerts on events.
.br .br
Values: 0 to enable, 1 to disable Values: 1 to enable, 0 to disable
.RE .RE
.PP .PP
.B history_size .B history_size
@ -51,7 +51,7 @@ Values: <INTEGER> (for example: 700)
.PP .PP
.B colour_theme .B colour_theme
.RS .RS
Select between toxic colour theme and notive terminal colours. Select between toxic colour theme and native terminal colours.
.br .br
Values: 0 for toxic colours, 1 for terminal colours Values: 0 for toxic colours, 1 for terminal colours
.RE .RE
@ -78,38 +78,24 @@ Values: <STRING> (absolute path where to store downloaded files)
.RE .RE
.RE .RE
.SH EXAMPLES .SH EXAMPLES
This is from __DATADIR__/toxic.conf.exmaple: Default settings from __DATADIR__/toxic.conf.exmaple:
.PP .PP
# 24 or 12 hour time
.br
time:24; time:24;
.br .br
# 1 to enable autologging, 0 to disable timestamps:1;
.br .br
autolog:0; autolog:0;
.br .br
# 1 to disbale terminal alerts on messages, 0 to enable alerts:1;
.br
disable_alerts:0;
.br
# maximum lines for chat window history
.br .br
history_size:700; history_size:700;
.br .br
# 1 to use native terminal colours, 0 to use toxic default colour theme
.br
colour_theme:0; colour_theme:0;
.br .br
# preferred audio input device; numbers correspond to /lsdev in
.br
audio_in_dev:0; audio_in_dev:0;
.br .br
# preferred audio output device; numbers correspond to /lsdev out
.br
audio_out_dev:0; audio_out_dev:0;
.br .br
# preferred path for downloads
.br
download_path:/home/USERNAME/Downloads/; download_path:/home/USERNAME/Downloads/;
.SH FILES .SH FILES
.IP ~/.config/tox/toxic.conf .IP ~/.config/tox/toxic.conf

2
misc/toxic.conf.example
View File

@ -8,7 +8,7 @@ timestamps:1;
autolog:0; autolog:0;
# 1 to disbale terminal alerts on messages, 0 to enable # 1 to disbale terminal alerts on messages, 0 to enable
disable_alerts:0; alerts:1;
# maximum lines for chat window history # maximum lines for chat window history
history_size:700; history_size:700;

4
src/settings.c
View File

@ -54,7 +54,7 @@ struct {
{ "autolog", uset_autolog }, { "autolog", uset_autolog },
{ "time", uset_time }, { "time", uset_time },
{ "timestamps", uset_timestamps }, { "timestamps", uset_timestamps },
{ "disable_alerts", uset_alerts }, { "alerts", uset_alerts },
{ "colour_theme", uset_colours }, { "colour_theme", uset_colours },
{ "history_size", uset_hst_size }, { "history_size", uset_hst_size },
{ "download_path", uset_dwnld_path }, { "download_path", uset_dwnld_path },
@ -166,7 +166,7 @@ static void set_default_settings(struct user_settings *s)
uset_autolog(s, "0"); uset_autolog(s, "0");
uset_time(s, "24"); uset_time(s, "24");
uset_timestamps(s, "1"); uset_timestamps(s, "1");
uset_alerts(s, "0"); uset_alerts(s, "1");
uset_colours(s, "0"); uset_colours(s, "0");
uset_hst_size(s, "700"); uset_hst_size(s, "700");
uset_dwnld_path(s, NULL); uset_dwnld_path(s, NULL);

4
src/settings.h
View File

@ -57,8 +57,8 @@ enum {
TIMESTAMPS_OFF = 0, TIMESTAMPS_OFF = 0,
TIMESTAMPS_ON = 1, TIMESTAMPS_ON = 1,
ALERTS_DISABLED = 1, ALERTS_DISABLED = 0,
ALERTS_ENABLED = 0, ALERTS_ENABLED = 1,
NATIVE_COLS = 1, NATIVE_COLS = 1,
DFLT_COLS = 0, DFLT_COLS = 0,