Merge 0.4 branch to trunk

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@319 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer
2009-06-20 15:18:24 +00:00
parent 82f4fc4749
commit 8ec1eeefa4
40 changed files with 2810 additions and 3407 deletions

View File

@@ -39,10 +39,11 @@ class AutoTypeX11 : public AutoType {
public:
AutoTypeX11(KeepassMainWindow* mainWin);
void perform(IEntryHandle* entry, bool hideWindow=true, int nr=0, bool wasLocked=false);
virtual void updateKeymap();
protected:
void sleepTime(int msec);
inline void sleepKeyStrokeDelay(){ sleep(config->autoTypeKeyStrokeDelay()); };
inline void sleepKeyStrokeDelay(){ sleepTime(config->autoTypeKeyStrokeDelay()); };
void templateToKeysyms(const QString& Template, QList<AutoTypeAction>& KeySymList,IEntryHandle* entry);
void stringToKeysyms(const QString& string,QList<AutoTypeAction>& KeySymList);
@@ -63,6 +64,7 @@ class AutoTypeX11 : public AutoType {
int meta_mask;
int altgr_mask;
KeySym altgr_keysym;
bool reReadKeymap;
};
#endif // _AUTOTYPEX11_H_