Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-bug-1169831 into lp:ubuntu-qtcreator-plugins

[Juhapekka Piiroinen]

Fix Bug #1169831: all edited files should be saved when Run on device is selected

Add support for saveRequired flag to menu.json.

Fix Bug #1169831: all edited files should be saved when Run on device is selected

Add support for saveRequired flag to menu.json.

=== modified file 'qtcreator/share/qtcreator/ubuntu/menu.json'
--- qtcreator/share/qtcreator/ubuntu/menu.json	2013-05-03 21:35:00 +0000
+++ qtcreator/share/qtcreator/ubuntu/menu.json	2013-05-04 21:44:23 +0000
@@ -13,6 +13,7 @@
                 "keysequence": "Ctrl+F12",
                 "deviceRequired": true,
                 "qmlProjectRequired": true,
+                "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications"
                 ]
@@ -33,6 +34,7 @@
                 "id": "Ubuntu.Build.Package",
                 "workingDirectory": "%0",
                 "projectRequired": true,
+                "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_packaging .",
                     "%SCRIPTDIRECTORY%/qtc_project_debuild",
@@ -46,6 +48,7 @@
                 "projectRequired": true,
                 "deviceRequired": true,
                 "qmlProjectRequired": true,
+                "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_create_package",
                     "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet"
@@ -58,6 +61,7 @@
                 "projectRequired": true,
                 "deviceRequired": true,
                 "qmakeProjectRequired": true,
+                "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_device_buildpackage %SERIALNUMBER% %FOLDERNAME%"
                 ]
@@ -69,6 +73,7 @@
                 "projectRequired": true,
                 "deviceRequired": true,
                 "qmakeProjectRequired": true,
+                "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %SERIALNUMBER% %FOLDERNAME%"
                 ]
@@ -142,6 +147,7 @@
                         "name": "Export \".pot\" File",
                         "id": "Ubuntu.Menu.i18n.pot",
                         "projectRequired": true,
+                        "saveRequired": true,
                         "actions": [
                             "mkdir -p po",
                             "xgettext -o po/%DISPLAYNAME%.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr %PROJECTFILES%"
@@ -151,6 +157,7 @@
                         "name": "Generate \".mo\" File",
                         "id": "Ubuntu.Menu.i18n.mo",
                         "projectRequired": true,
+                        "saveRequired": true,
                         "actions": [
                             "msgfmt po/*.po"
                         ]
 
=== modified file 'qtcreator/src/plugins/ubuntu/ubuntuconstants.h'
--- qtcreator/src/plugins/ubuntu/ubuntuconstants.h	2013-05-03 23:00:15 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntuconstants.h	2013-05-04 21:44:23 +0000
@@ -57,6 +57,7 @@
 const char UBUNTU_MENUJSON_DEVICEREQUIRED[] = "deviceRequired";
 const char UBUNTU_MENUJSON_QMLPROJECTREQUIRED[] = "qmlProjectRequired";
 const char UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED[] = "qmakeProjectRequired";
+const char UBUNTU_MENUJSON_SAVEREQUIRED[] = "saveRequired";
 const char UBUNTU_MENUJSON_MESSAGEDIALOG[] = "messageDialog";
 
 const char UBUNTU_MENUJSON_PARENT_TOOLS[] = "Tools";
 
=== modified file 'qtcreator/src/plugins/ubuntu/ubuntumenu.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntumenu.cpp	2013-05-01 18:28:10 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntumenu.cpp	2013-05-04 21:44:23 +0000
@@ -160,6 +160,7 @@
         bool actionDeviceRequired = false;
         bool actionQmlProjectRequired = false;
         bool actionQmakeProjectRequired = false;
+        bool actionSaveRequired = false;
 
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_NAME))) {
             actionName = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_NAME)).toString();
@@ -185,6 +186,9 @@
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED))) {
             actionQmakeProjectRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED)).toBool();
         }
+        if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED))) {
+            actionSaveRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED)).toBool();
+        }
 
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_ACTIONS)) && obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_ACTIONS)).isArray()) {
 
@@ -213,6 +217,7 @@
         act->setProperty(Constants::UBUNTU_MENUJSON_DEVICEREQUIRED,actionDeviceRequired);
         act->setProperty(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED,actionQmakeProjectRequired);
         act->setProperty(Constants::UBUNTU_MENUJSON_QMLPROJECTREQUIRED,actionQmlProjectRequired);
+        act->setProperty(Constants::UBUNTU_MENUJSON_SAVEREQUIRED,actionSaveRequired);
 
         connect(act, SIGNAL(triggered()), this, SLOT(menuItemTriggered()));
         m_actions.append(act);
@@ -246,6 +251,11 @@
             }
         }
 
+        QVariant saveModifiedFilesRequired = act->property(Constants::UBUNTU_MENUJSON_SAVEREQUIRED);
+        if (saveModifiedFilesRequired.isValid() && saveModifiedFilesRequired.toBool()==true) {
+            ProjectExplorer::ProjectExplorerPlugin::instance()->saveModifiedFiles();
+        }
+
         if (m_commandMap.contains(act->text())) {
             QJsonValueList actions = m_commandMap.value(act->text());