Enhancement - attributes and stringtable
- Modified Att to contain a vector of Mods, not std::strings, even though a Mod is a std::string. - Added a StringTable object to Context, to start getting the I18N infrastructure in place before it is needed. Only a few strings are expected to be migrated.
This commit is contained in:
@@ -29,6 +29,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "Mod.h"
|
||||||
|
|
||||||
class Att
|
class Att
|
||||||
{
|
{
|
||||||
@@ -66,7 +67,7 @@ private:
|
|||||||
private:
|
private:
|
||||||
std::string mName;
|
std::string mName;
|
||||||
std::string mValue;
|
std::string mValue;
|
||||||
std::vector <std::string> mMods;
|
std::vector <Mod> mMods;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -47,12 +47,13 @@ Context::Context ()
|
|||||||
Context::Context (const Context& other)
|
Context::Context (const Context& other)
|
||||||
{
|
{
|
||||||
throw std::string ("unimplemented Context::Context");
|
throw std::string ("unimplemented Context::Context");
|
||||||
config = other.config;
|
config = other.config;
|
||||||
filter = other.filter;
|
filter = other.filter;
|
||||||
keymap = other.keymap;
|
keymap = other.keymap;
|
||||||
sequence = other.sequence;
|
sequence = other.sequence;
|
||||||
task = other.task;
|
task = other.task;
|
||||||
tdb = other.tdb;
|
tdb = other.tdb;
|
||||||
|
stringtable = other.stringtable;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -61,12 +62,13 @@ Context& Context::operator= (const Context& other)
|
|||||||
throw std::string ("unimplemented Context::operator=");
|
throw std::string ("unimplemented Context::operator=");
|
||||||
if (this != &other)
|
if (this != &other)
|
||||||
{
|
{
|
||||||
config = other.config;
|
config = other.config;
|
||||||
filter = other.filter;
|
filter = other.filter;
|
||||||
keymap = other.keymap;
|
keymap = other.keymap;
|
||||||
sequence = other.sequence;
|
sequence = other.sequence;
|
||||||
task = other.task;
|
task = other.task;
|
||||||
tdb = other.tdb;
|
tdb = other.tdb;
|
||||||
|
stringtable = other.stringtable;
|
||||||
}
|
}
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
@@ -105,6 +107,7 @@ void Context::initialize (int argc, char** argv)
|
|||||||
// Allow user override of file locking. Solaris/NFS machines may want this.
|
// Allow user override of file locking. Solaris/NFS machines may want this.
|
||||||
tdb.lock (config.get ("locking", true));
|
tdb.lock (config.get ("locking", true));
|
||||||
|
|
||||||
|
// TODO Load appropriate stringtable.
|
||||||
// TODO Load pending.data.
|
// TODO Load pending.data.
|
||||||
// TODO Load completed.data.
|
// TODO Load completed.data.
|
||||||
// TODO Load deleted.data.
|
// TODO Load deleted.data.
|
||||||
@@ -122,6 +125,13 @@ int Context::run ()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
int Context::interactive ()
|
||||||
|
{
|
||||||
|
throw std::string ("unimplemented Context::interactive");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
void Context::loadCorrectConfigFile (int argc, char** argv)
|
void Context::loadCorrectConfigFile (int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
#include "Sequence.h"
|
#include "Sequence.h"
|
||||||
#include "T.h"
|
#include "T.h"
|
||||||
#include "TDB.h"
|
#include "TDB.h"
|
||||||
|
#include "StringTable.h"
|
||||||
|
|
||||||
class Context
|
class Context
|
||||||
{
|
{
|
||||||
@@ -45,17 +45,19 @@ public:
|
|||||||
|
|
||||||
void initialize (int, char**);
|
void initialize (int, char**);
|
||||||
int run ();
|
int run ();
|
||||||
|
int interactive ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void loadCorrectConfigFile (int, char**);
|
void loadCorrectConfigFile (int, char**);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Config config;
|
Config config;
|
||||||
Filter filter;
|
Filter filter;
|
||||||
Keymap keymap;
|
Keymap keymap;
|
||||||
Sequence sequence;
|
Sequence sequence;
|
||||||
T task;
|
T task;
|
||||||
TDB tdb;
|
TDB tdb;
|
||||||
|
StringTable stringtable;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user