nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toolbar: allow labeled general action buttons

Browse source 
With this patch you can add buttons like
*.toolbar.button.foo.label: F
*.toolbar.button.foo.commands: RootMenu:Exec foo
*.toolbar.tools: button.foo, iconbar, ...

button.*.label is mandatory
button.*.commands suppots 5 mouse buttons, but the way
stringtok works, it's required to add a blank
(or some junk) between to colons to skip a button
This commit is contained in:
Thomas Lübking 2016-04-05 14:14:13 +02:00 committed by Mathias Gumz
parent 5c1bb0a21f
commit 393ba45f91
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/ToolFactory.cc
View file

@ -37,6 +37,7 @@
#include "ButtonTheme.hh" #include "ButtonTheme.hh"
#include "FbTk/CommandParser.hh" #include "FbTk/CommandParser.hh"
#include "FbTk/Resource.hh"
#include "Screen.hh" #include "Screen.hh"
#include "ScreenPlacement.hh" #include "ScreenPlacement.hh"
#include "Toolbar.hh" #include "Toolbar.hh"
@ -109,13 +110,40 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow &
return 0; return 0;
} }
item = new SpacerTool(size); item = new SpacerTool(size);
} else { } else if (name.find("button.") == 0) {
// A generic button. Needs a label and a command (chain) configured
std::string label = FbTk::Resource<std::string>
(m_screen.resourceManager(), "",
m_screen.name() + ".toolbar." + name + ".label",
m_screen.altName() + ".Toolbar." + name + ".Label");
if (label.empty())
return 0;
FbTk::TextButton *btn = new FbTk::TextButton(parent, m_button_theme->font(), label);
std::string cmd_str = FbTk::Resource<std::string>
(m_screen.resourceManager(), "",
m_screen.name() + ".toolbar." + name + ".commands",
m_screen.altName() + ".Toolbar." + name + ".Commands");
std::list<std::string> commands;
FbTk::StringUtil::stringtok(commands, cmd_str, ":");
std::list<std::string>::iterator it = commands.begin();
int i = 1;
for (; it != commands.end(); ++it, ++i) {
std::string cmd_str = *it;
FbTk::StringUtil::removeTrailingWhitespace(cmd_str);
FbTk::StringUtil::removeFirstWhitespace(cmd_str);
FbTk::RefCount<FbTk::Command<void> > cmd(cp.parse(cmd_str));
if (cmd)
btn->setOnClick(cmd, i);
}
item = new ButtonTool(btn, ToolbarItem::FIXED,
dynamic_cast<ButtonTheme &>(*m_button_theme),
screen().imageControl());
} else {
std::string cmd_str = name; std::string cmd_str = name;
if (name == "prevwindow" || name == "nextwindow") { if (name == "prevwindow" || name == "nextwindow") {
cmd_str += " (workspace=[current])"; cmd_str += " (workspace=[current])";
} }
FbTk::RefCount<FbTk::Command<void> > cmd(cp.parse(cmd_str)); FbTk::RefCount<FbTk::Command<void> > cmd(cp.parse(cmd_str));
if (cmd == 0) // we need a command if (cmd == 0) // we need a command
return 0; return 0;
@ -129,7 +157,7 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow &
0, 0, 0, 0,
button_size, button_size); button_size, button_size);
win->setOnClick(cmd); win->setOnClick(cmd);
item = new ButtonTool(win, ToolbarItem::SQUARE, item = new ButtonTool(win, ToolbarItem::SQUARE,
dynamic_cast<ButtonTheme &>(*m_button_theme), dynamic_cast<ButtonTheme &>(*m_button_theme),
screen().imageControl()); screen().imageControl());
} }