Merge branch 'master' into develop

Conflicts:
	src/CMakeLists.txt
	src/autotype/xcb/AutoTypeXCB.cpp
	src/browser/BrowserAction.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/BrowserSettings.h
	src/browser/NativeMessagingHost.cpp
	src/browser/NativeMessagingHost.h
	src/gui/EditWidgetIcons.cpp
	src/gui/EditWidgetIcons.h
	src/gui/MainWindow.cpp
	src/proxy/NativeMessagingHost.cpp
	tests/TestOpenSSHKey.cpp

src/autotype/AutoType.cpp

@@ -220,7 +220,7 @@ void AutoType::executeAutoTypeActions(const Entry* entry, QWidget* hideWindow, c
 #endif
     }
 
-    Tools::wait(m_plugin->initialTimeout());
+    Tools::wait(qMax(100, config()->get("AutoTypeStartDelay", 500).toInt()));
 
     if (!window) {
         window = m_plugin->activeWindow();
@@ -364,7 +364,7 @@ bool AutoType::parseActions(const QString& actionSequence, const Entry* entry, Q
 {
     QString tmpl;
     bool inTmpl = false;
-    m_autoTypeDelay = config()->get("AutoTypeDelay").toInt();
+    m_autoTypeDelay = qMax(config()->get("AutoTypeDelay").toInt(), 0);
 
     QString sequence = actionSequence;
     sequence.replace("{{}", "{LEFTBRACE}");

src/autotype/AutoTypePlatformPlugin.h

@@ -35,7 +35,6 @@ public:
     virtual bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) = 0;
     virtual void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) = 0;
     virtual int platformEventFilter(void* event) = 0;
-    virtual int initialTimeout() = 0;
     virtual bool raiseWindow(WId window) = 0;
     virtual void unload()
     {

src/autotype/mac/AutoTypeMac.cpp

@@ -154,11 +154,6 @@ AutoTypeExecutor* AutoTypePlatformMac::createExecutor()
     return new AutoTypeExecutorMac(this);
 }
 
-int AutoTypePlatformMac::initialTimeout()
-{
-    return 500;
-}
-
 //
 // Activate window by process id
 //

src/autotype/mac/AutoTypeMac.h

@@ -42,7 +42,6 @@ public:
     bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     int platformEventFilter(void* event) override;
-    int initialTimeout() override;
     bool raiseWindow(WId pid) override;
     AutoTypeExecutor* createExecutor() override;
 

src/autotype/test/AutoTypeTest.cpp

@@ -103,11 +103,6 @@ void AutoTypePlatformTest::addActionKey(AutoTypeKey* action)
     m_actionChars.append(keyToString(action->key));
 }
 
-int AutoTypePlatformTest::initialTimeout()
-{
-    return 0;
-}
-
 bool AutoTypePlatformTest::raiseWindow(WId window)
 {
     Q_UNUSED(window);

src/autotype/test/AutoTypeTest.h

@@ -40,7 +40,6 @@ public:
     bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     int platformEventFilter(void* event) override;
-    int initialTimeout() override;
     bool raiseWindow(WId window) override;
     AutoTypeExecutor* createExecutor() override;
 

src/autotype/windows/AutoTypeWindows.cpp

@@ -109,11 +109,6 @@ AutoTypeExecutor* AutoTypePlatformWin::createExecutor()
     return new AutoTypeExecutorWin(this);
 }
 
-int AutoTypePlatformWin::initialTimeout()
-{
-    return 500;
-}
-
 //
 // Set foreground window
 //

src/autotype/windows/AutoTypeWindows.h

@@ -39,7 +39,6 @@ public:
     bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     int platformEventFilter(void* event) override;
-    int initialTimeout() override;
     bool raiseWindow(WId window) override;
     AutoTypeExecutor* createExecutor() override;
 

src/autotype/xcb/AutoTypeXCB.cpp

@@ -830,11 +830,6 @@ void AutoTypeExecutorX11::execClearField(AutoTypeClearField* action = nullptr)
     nanosleep(&ts, nullptr);
 }
 
-int AutoTypePlatformX11::initialTimeout()
-{
-    return 500;
-}
-
 bool AutoTypePlatformX11::raiseWindow(WId window)
 {
     if (m_atomNetActiveWindow == None) {

src/autotype/xcb/AutoTypeXCB.h

@@ -51,7 +51,6 @@ public:
     bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
     int platformEventFilter(void* event) override;
-    int initialTimeout() override;
     bool raiseWindow(WId window) override;
     AutoTypeExecutor* createExecutor() override;