mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-15 01:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

task(dsl): Replace colons with dashes

Browse Source 
Colons break ini syntax highlighters and linters.
This commit is contained in:
Michael Carlberg
2016-05-26 02:14:56 +02:00
parent 3b9dc784ba
commit 2c74cb06de
28 changed files with 1096 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/menu.cpp
View File

@ -12,17 +12,17 @@ MenuModule::MenuModule(const std::string& name_) : StaticModule(name_)
this->formatter->add(DEFAULT_FORMAT, default_format_string, { TAG_LABEL_TOGGLE, TAG_MENU });
if (this->formatter->has(TAG_LABEL_TOGGLE)) {
this->label_open = drawtypes::get_config_label(name(), "label:open");
this->label_close = drawtypes::get_optional_config_label(name(), "label:close", "x");
this->label_open = drawtypes::get_config_label(name(), "label-open");
this->label_close = drawtypes::get_optional_config_label(name(), "label-close", "x");
}
if (this->formatter->has(TAG_MENU)) {
int level_n = 0;
while (true) {
auto level_path = "menu:"+ std::to_string(level_n);
auto level_path = "menu-"+ std::to_string(level_n);
if (config::get<std::string>(name(), level_path +":0", "") == "")
if (config::get<std::string>(name(), level_path +"-0", "") == "")
break;
this->levels.emplace_back(std::make_unique<MenuTree>());
@ -30,7 +30,7 @@ MenuModule::MenuModule(const std::string& name_) : StaticModule(name_)
int item_n = 0;
while (true) {
auto item_path = level_path +":"+ std::to_string(item_n);
auto item_path = level_path +"-"+ std::to_string(item_n);
if (config::get<std::string>(name(), item_path, "") == "")
break;
@ -38,7 +38,7 @@ MenuModule::MenuModule(const std::string& name_) : StaticModule(name_)
auto item = std::make_unique<MenuTreeItem>();
item->label = drawtypes::get_config_label(name(), item_path);
item->exec = config::get<std::string>(name(), item_path +":exec", EVENT_MENU_CLOSE);
item->exec = config::get<std::string>(name(), item_path +"-exec", EVENT_MENU_CLOSE);
this->levels.back()->items.emplace_back(std::move(item));