ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convenience shortcut to simplify command invocation via Bus

Browse source
This commit is contained in:
Fischlurch 2016-02-09 01:35:32 +01:00
parent 41c8c948e3
commit 44785859ea
4 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/model/tangible.hpp
View file

@ -133,6 +133,7 @@
#include <boost/noncopyable.hpp>
#include <sigc++/trackable.h>
#include <utility>
#include <string>
@ -174,6 +175,8 @@ namespace model {
void reset();
template<typename...ARGS>
void prepareCommand (Cmd const& prototype, ARGS&&...);
void prepareCommand (Cmd const& prototype, Rec&& arguments);
void issueCommand (Cmd const& preparedAction);
@ -202,6 +205,20 @@ namespace model {
/** convenience shortcut to issue a command with several arguments */
template<typename...ARGS>
inline void
Tangible::prepareCommand (Cmd const& prototype, ARGS&&... args)
{
using GenNodeIL = std::initializer_list<GenNode>;
prepareCommand (prototype,
Rec (Rec::TYPE_NIL_SYM, GenNodeIL{}
,GenNodeIL {std::forward<ARGS> (args)...}));
} // not typed, no attributes, all arguments as children
/** generic handler for all incoming "state mark" messages */
inline void
Tangible::mark (GenNode const& stateMark)

6
src/lib/diff/record.hpp
View file

@ -148,6 +148,7 @@ namespace diff{
public:
static const string TYPE_NIL;
static const Symbol TYPE_NIL_SYM;
Record()
: type_(TYPE_NIL)
@ -377,7 +378,10 @@ namespace diff{
};
template<typename VAL>
const string Record<VAL>::TYPE_NIL = "NIL";
const Symbol Record<VAL>::TYPE_NIL_SYM = "NIL";
template<typename VAL>
const string Record<VAL>::TYPE_NIL = string(TYPE_NIL_SYM);

2
tests/gui/bus-term-test.cpp
View file

@ -198,7 +198,7 @@ namespace test {
CHECK (not cmd.canExec());
mock.prepareCommand(cmd, Rec({text, clip, luid}));
mock.prepareCommand (cmd, text, clip, luid);
CHECK (cmd.canExec());
CHECK (gui::test::Nexus::wasBound(cmd, text, clip, luid));

14
wiki/thinkPad.ichthyo.mm
View file

@ -137,7 +137,7 @@
</node>
<node CREATED="1448078835044" ID="ID_358413966" MODIFIED="1448078844783" TEXT="bezieht daraufhin einen Diff"/>
<node CREATED="1448078845419" ID="ID_189415188" MODIFIED="1448078851438" TEXT="wendet diesen rekursiv an"/>
<node CREATED="1448078856722" ID="ID_1770248185" MODIFIED="1448078867148" TEXT="Hiweis: kann Kinder zeugen und zerst&#xf6;ren"/>
<node CREATED="1448078856722" ID="ID_1770248185" MODIFIED="1454975518746" TEXT="Hinweis: kann Kinder zeugen und zerst&#xf6;ren"/>
</node>
</node>
</node>
@ -167,7 +167,7 @@
</body>
</html></richcontent>
<icon BUILTIN="help"/>
<node CREATED="1448658692023" ID="ID_888978058" MODIFIED="1448659524029" TEXT="generische Commands">
<node CREATED="1448658692023" FOLDED="true" ID="ID_888978058" MODIFIED="1454975599341" TEXT="generische Commands">
<richcontent TYPE="NOTE"><html>
<head>
@ -282,7 +282,7 @@
<node CREATED="1451177719577" ID="ID_1175980404" MODIFIED="1451177726636" TEXT="wie finde ich den Vater..."/>
</node>
</node>
<node CREATED="1448658726090" ID="ID_37610818" MODIFIED="1448658733301" TEXT="Commands">
<node CREATED="1448658726090" FOLDED="true" ID="ID_37610818" MODIFIED="1454978057481" TEXT="Commands">
<node CREATED="1448658755071" ID="ID_1033500384" MODIFIED="1448658767933" TEXT="wie definieren">
<icon BUILTIN="help"/>
<node CREATED="1448658974985" ID="ID_974207484" MODIFIED="1448658989011" TEXT="Definition braucht Session-Modell"/>
@ -479,7 +479,7 @@
<node CREATED="1450490565739" ID="ID_849102091" MODIFIED="1452557610273" TEXT="implementiert ist: Erstellen im InvocationTrail">
<icon BUILTIN="button_ok"/>
</node>
<node CREATED="1452561062226" ID="ID_444925471" MODIFIED="1452561136752" TEXT="convenience overload f&#xfc;r mehrere Argumente">
<node CREATED="1452561062226" ID="ID_444925471" MODIFIED="1454978022494" TEXT="convenience overload f&#xfc;r mehrere Argumente">
<richcontent TYPE="NOTE"><html>
<head>
@ -493,10 +493,10 @@
</p>
</body>
</html></richcontent>
<icon BUILTIN="pencil"/>
<icon BUILTIN="button_ok"/>
</node>
<node CREATED="1450490580473" ID="ID_925248058" MODIFIED="1450490599519" TEXT="nicht implementiert: Empfangen und Binden">
<icon BUILTIN="flag-yellow"/>
<node CREATED="1450490580473" ID="ID_925248058" MODIFIED="1454975395091" TEXT="Empfangen und Binden">
<icon BUILTIN="button_ok"/>
</node>
</node>
<node CREATED="1448691875184" ID="ID_642935499" MODIFIED="1448691904352" TEXT="f&#xfc;r die Invocation gen&#xfc;gt dann die reine ID"/>