Merge pull request #4 from cmacrae/cleanup/remove_status_bar_prefix

cleanup: Remove 'status_bar_' config prefixes
This commit is contained in:
Doron Somech 2020-04-16 18:39:51 +03:00 committed by GitHub
commit 1d05218e6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 46 deletions

View file

@ -53,14 +53,14 @@ All of the configuration options can be changed at runtime as well.
Example configuration: Example configuration:
``` ```
spacebar -m config status_bar_text_font "Helvetica Neue:Bold:12.0" spacebar -m config text_font "Helvetica Neue:Bold:12.0"
spacebar -m config status_bar_icon_font "Font Awesome 5:Regular:12.0" spacebar -m config icon_font "Font Awesome 5:Regular:12.0"
spacebar -m config status_bar_background_color 0xff202020 spacebar -m config background_color 0xff202020
spacebar -m config status_bar_foreground_color 0xffa8a8a8 spacebar -m config foreground_color 0xffa8a8a8
spacebar -m config status_bar_space_icon_strip I II III IV V VI VII VIII IX X spacebar -m config space_icon_strip I II III IV V VI VII VIII IX X
spacebar -m config status_bar_power_icon_strip   spacebar -m config power_icon_strip  
spacebar -m config status_bar_space_icon  spacebar -m config space_icon 
spacebar -m config status_bar_clock_icon  spacebar -m config clock_icon 
``` ```
- Sample configuration files can be found in the [↗ examples][spacebar-examples] directory. Refer to the [↗ documentation][spacebar-docs]. - Sample configuration files can be found in the [↗ examples][spacebar-examples] directory. Refer to the [↗ documentation][spacebar-docs].

View file

@ -70,54 +70,59 @@ Get or set the value of <setting>.
Enable output of debug information to stdout. Enable output of debug information to stdout.
.RE .RE
.sp .sp
\fBstatus_bar_text_font\fP [\fI<font_family>:<font_style>:<font_size>\fP] \fBtext_font\fP [\fI<font_family>:<font_style>:<font_size>\fP]
.RS 4 .RS 4
Specify name, style and size of font to use for drawing text. Specify name, style and size of font to use for drawing text.
.br .br
Use \fIFont Book.app\fP to identify the correct name. Use \fIFont Book.app\fP to identify the correct name.
.RE .RE
.sp .sp
\fBstatus_bar_icon_font\fP [\fI<font_family>:<font_style>:<font_size>\fP] \fBicon_font\fP [\fI<font_family>:<font_style>:<font_size>\fP]
.RS 4 .RS 4
Specify name, style and size of font to use for drawing icon symbols. Specify name, style and size of font to use for drawing icon symbols.
.br .br
Use \fIFont Book.app\fP to identify the correct name. Use \fIFont Book.app\fP to identify the correct name.
.RE .RE
.sp .sp
\fBstatus_bar_background_color\fP [\fI<COLOR>\fP] \fBbackground_color\fP [\fI<COLOR>\fP]
.RS 4 .RS 4
Color to use for drawing status bar background. Color to use for drawing status bar background.
.RE .RE
.sp .sp
\fBstatus_bar_foreground_color\fP [\fI<COLOR>\fP] \fBforeground_color\fP [\fI<COLOR>\fP]
.RS 4 .RS 4
Color to use for drawing status bar elements. Color to use for drawing status bar elements.
.RE .RE
.sp .sp
\fBstatus_bar_space_icon_strip\fP [\fI<sym_1> <sym_2> <sym_n>\fP] \fBspace_icon_strip\fP [\fI<sym_1> <sym_2> <sym_n>\fP]
.RS 4 .RS 4
Specify symbols separated by whitespace to be used for visualizing spaces. Specify symbols separated by whitespace to be used for visualizing spaces.
.RE .RE
.sp .sp
\fBstatus_bar_power_icon_strip\fP [\fI<sym_battery> <sym_ac>\fP] \fBpower_icon_strip\fP [\fI<sym_battery> <sym_ac>\fP]
.RS 4 .RS 4
Specify two symbols separated by whitespace. Specify two symbols separated by whitespace.
.br .br
The first symbol represents battery power and the second symbol indicates AC. The first symbol represents battery power and the second symbol indicates AC.
.RE .RE
.sp .sp
\fBstatus_bar_space_icon\fP [\fI<sym>\fP] \fBspace_icon\fP [\fI<sym>\fP]
.RS 4 .RS 4
Specify a general symbol to use for any given space that does not have a match in \fIstatus_bar_space_icon_strip\fP. Specify a general symbol to use for any given space that does not have a match in \fIspace_icon_strip\fP.
.RE .RE
.sp .sp
\fBstatus_bar_clock_icon\fP [\fI<sym>\fP] \fBclock_icon\fP [\fI<sym>\fP]
.RS 4 .RS 4
Specify a symbol to represent the current time. Specify a symbol to represent the current time.
.RE .RE
.sp
\fBclock_format\fP [\fI<sym>\fP]
.RS 4
Specify a format for the current time, according to the strftime function.
.RE
.SH "EXIT CODES" .SH "EXIT CODES"
.sp .sp
If \fBspacebar\fP can\(cqt handle a message, it will return a non\-zero exit code. If \fBspacebar\fP can\(cqt handle a message, it will return a non\-zero exit code.
.SH "AUTHOR" .SH "AUTHOR"
.sp .sp
Doron Somech <somdoron at gmail.com> Doron Somech <somdoron at gmail.com>

View file

@ -60,34 +60,34 @@ Settings
*debug_output* ['<BOOL_SEL>']:: *debug_output* ['<BOOL_SEL>']::
Enable output of debug information to stdout. Enable output of debug information to stdout.
*status_bar_text_font* ['<font_family>:<font_style>:<font_size>']:: *text_font* ['<font_family>:<font_style>:<font_size>']::
Specify name, style and size of font to use for drawing text. + Specify name, style and size of font to use for drawing text. +
Use 'Font Book.app' to identify the correct name. Use 'Font Book.app' to identify the correct name.
*status_bar_icon_font* ['<font_family>:<font_style>:<font_size>']:: *icon_font* ['<font_family>:<font_style>:<font_size>']::
Specify name, style and size of font to use for drawing icon symbols. + Specify name, style and size of font to use for drawing icon symbols. +
Use 'Font Book.app' to identify the correct name. Use 'Font Book.app' to identify the correct name.
*status_bar_background_color* ['<COLOR>']:: *background_color* ['<COLOR>']::
Color to use for drawing status bar background. Color to use for drawing status bar background.
*status_bar_foreground_color* ['<COLOR>']:: *foreground_color* ['<COLOR>']::
Color to use for drawing status bar elements. Color to use for drawing status bar elements.
*status_bar_space_icon_strip* ['<sym_1> <sym_2> <sym_n>']:: *space_icon_strip* ['<sym_1> <sym_2> <sym_n>']::
Specify symbols separated by whitespace to be used for visualizing spaces. Specify symbols separated by whitespace to be used for visualizing spaces.
*status_bar_power_icon_strip* ['<sym_battery> <sym_ac>']:: *power_icon_strip* ['<sym_battery> <sym_ac>']::
Specify two symbols separated by whitespace. + Specify two symbols separated by whitespace. +
The first symbol represents battery power and the second symbol indicates AC. The first symbol represents battery power and the second symbol indicates AC.
*status_bar_space_icon* ['<sym>']:: *space_icon* ['<sym>']::
Specify a general symbol to use for any given space that does not have a match in 'status_bar_space_icon_strip'. Specify a general symbol to use for any given space that does not have a match in 'space_icon_strip'.
*status_bar_clock_icon* ['<sym>']:: *clock_icon* ['<sym>']::
Specify a symbol to represent the current time. Specify a symbol to represent the current time.
*status_bar_clock_format* ['<sym>']:: *clock_format* ['<sym>']::
Specify a format for the current time, according to the strftime function. Specify a format for the current time, according to the strftime function.
Exit Codes Exit Codes

View file

@ -1,13 +1,13 @@
#!/usr/bin/env sh #!/usr/bin/env sh
spacebar -m config status_bar_text_font "Helvetica Neue:Bold:12.0" spacebar -m config text_font "Helvetica Neue:Bold:12.0"
spacebar -m config status_bar_icon_font "Font Awesome 5 Free:Regular:12.0" spacebar -m config icon_font "Font Awesome 5 Free:Regular:12.0"
spacebar -m config status_bar_background_color 0xff202020 spacebar -m config background_color 0xff202020
spacebar -m config status_bar_foreground_color 0xffa8a8a8 spacebar -m config foreground_color 0xffa8a8a8
spacebar -m config status_bar_space_icon_strip I II III IV V VI VII VIII IX X spacebar -m config space_icon_strip I II III IV V VI VII VIII IX X
spacebar -m config status_bar_power_icon_strip   spacebar -m config power_icon_strip  
spacebar -m config status_bar_space_icon  spacebar -m config space_icon 
spacebar -m config status_bar_clock_icon  spacebar -m config clock_icon 
spacebar -m config status_bar_clock_format "%d/%m/%y %R" spacebar -m config clock_format "%d/%m/%y %R"
echo "spacebar configuration loaded.." echo "spacebar configuration loaded.."

View file

@ -12,15 +12,15 @@ extern bool g_verbose;
/* --------------------------------DOMAIN CONFIG-------------------------------- */ /* --------------------------------DOMAIN CONFIG-------------------------------- */
#define COMMAND_CONFIG_DEBUG_OUTPUT "debug_output" #define COMMAND_CONFIG_DEBUG_OUTPUT "debug_output"
#define COMMAND_CONFIG_BAR_TEXT_FONT "status_bar_text_font" #define COMMAND_CONFIG_BAR_TEXT_FONT "text_font"
#define COMMAND_CONFIG_BAR_ICON_FONT "status_bar_icon_font" #define COMMAND_CONFIG_BAR_ICON_FONT "icon_font"
#define COMMAND_CONFIG_BAR_BACKGROUND "status_bar_background_color" #define COMMAND_CONFIG_BAR_BACKGROUND "background_color"
#define COMMAND_CONFIG_BAR_FOREGROUND "status_bar_foreground_color" #define COMMAND_CONFIG_BAR_FOREGROUND "foreground_color"
#define COMMAND_CONFIG_BAR_SPACE_STRIP "status_bar_space_icon_strip" #define COMMAND_CONFIG_BAR_SPACE_STRIP "space_icon_strip"
#define COMMAND_CONFIG_BAR_POWER_STRIP "status_bar_power_icon_strip" #define COMMAND_CONFIG_BAR_POWER_STRIP "power_icon_strip"
#define COMMAND_CONFIG_BAR_SPACE_ICON "status_bar_space_icon" #define COMMAND_CONFIG_BAR_SPACE_ICON "space_icon"
#define COMMAND_CONFIG_BAR_CLOCK_ICON "status_bar_clock_icon" #define COMMAND_CONFIG_BAR_CLOCK_ICON "clock_icon"
#define COMMAND_CONFIG_BAR_CLOCK_FORMAT "status_bar_clock_format" #define COMMAND_CONFIG_BAR_CLOCK_FORMAT "clock_format"
/* --------------------------------COMMON ARGUMENTS----------------------------- */ /* --------------------------------COMMON ARGUMENTS----------------------------- */
#define ARGUMENT_COMMON_VAL_ON "on" #define ARGUMENT_COMMON_VAL_ON "on"