Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

2 files changed, 14 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
index 15bf926..9d983a8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.cpp
@@ -164,6 +164,18 @@ QAction* ExtActionContainer::getAction(int action)
     return actionMap.value(action);
 }
 
+void ExtActionContainer::refreshShortcutTranslations()
+{
+    static const QString metaName = CFG_SHORTCUTS_METANAME;
+    for (CfgMain* cfgMain : CfgMain::getInstances())
+    {
+        if (cfgMain->getMetaName() != metaName)
+            continue;
+
+        cfgMain->translateTitle();
+    }
+}
+
 void ExtActionContainer::handleActionInsert(int toolbar, ActionDetails* details)
 {
     if (details->position > -1 && !actionMap.contains(details->position))
diff --git a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.h b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.h
index 808af3e..b9dadb9 100644
--- a/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.h
+++ b/SQLiteStudio3/guiSQLiteStudio/common/extactioncontainer.h
@@ -83,6 +83,8 @@ class GUI_API_EXPORT ExtActionContainer
         QAction* getAction(int action);
         virtual const QMetaObject* metaObject() const = 0;
 
+        static void refreshShortcutTranslations();
+
         template <class T>
         static void insertAction(ExtActionPrototype* action, int toolbar = -1);