[obsolete] Ubuntu QtCreator Plugins

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

  1. fix-bug-1169831
  2. Merge into trunk
Proposed by Juhapekka Piiroinen
Status: Merged
Merged at revision: 188
Proposed branch: lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-bug-1169831
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 112 lines (+18/-0)
3 files modified
qtcreator/share/qtcreator/ubuntu/menu.json (+7/-0)
qtcreator/src/plugins/ubuntu/ubuntuconstants.h (+1/-0)
qtcreator/src/plugins/ubuntu/ubuntumenu.cpp (+10/-0)
To merge this branch: bzr merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/fix-bug-1169831
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+162523@code.launchpad.net

Commit message

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

Add support for saveRequired flag to menu.json.

Description of the change

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

Add support for saveRequired flag to menu.json.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qtcreator/share/qtcreator/ubuntu/menu.json'
2--- qtcreator/share/qtcreator/ubuntu/menu.json 2013-05-03 21:35:00 +0000
3+++ qtcreator/share/qtcreator/ubuntu/menu.json 2013-05-04 21:44:23 +0000
4@@ -13,6 +13,7 @@
5 "keysequence": "Ctrl+F12",
6 "deviceRequired": true,
7 "qmlProjectRequired": true,
8+ "saveRequired": true,
9 "actions": [
10 "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications"
11 ]
12@@ -33,6 +34,7 @@
13 "id": "Ubuntu.Build.Package",
14 "workingDirectory": "%0",
15 "projectRequired": true,
16+ "saveRequired": true,
17 "actions": [
18 "%SCRIPTDIRECTORY%/qtc_project_packaging .",
19 "%SCRIPTDIRECTORY%/qtc_project_debuild",
20@@ -46,6 +48,7 @@
21 "projectRequired": true,
22 "deviceRequired": true,
23 "qmlProjectRequired": true,
24+ "saveRequired": true,
25 "actions": [
26 "%SCRIPTDIRECTORY%/qtc_project_create_package",
27 "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet"
28@@ -58,6 +61,7 @@
29 "projectRequired": true,
30 "deviceRequired": true,
31 "qmakeProjectRequired": true,
32+ "saveRequired": true,
33 "actions": [
34 "%SCRIPTDIRECTORY%/qtc_device_buildpackage %SERIALNUMBER% %FOLDERNAME%"
35 ]
36@@ -69,6 +73,7 @@
37 "projectRequired": true,
38 "deviceRequired": true,
39 "qmakeProjectRequired": true,
40+ "saveRequired": true,
41 "actions": [
42 "%SCRIPTDIRECTORY%/qtc_device_buildanddeploypackage %SERIALNUMBER% %FOLDERNAME%"
43 ]
44@@ -142,6 +147,7 @@
45 "name": "Export \".pot\" File",
46 "id": "Ubuntu.Menu.i18n.pot",
47 "projectRequired": true,
48+ "saveRequired": true,
49 "actions": [
50 "mkdir -p po",
51 "xgettext -o po/%DISPLAYNAME%.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr %PROJECTFILES%"
52@@ -151,6 +157,7 @@
53 "name": "Generate \".mo\" File",
54 "id": "Ubuntu.Menu.i18n.mo",
55 "projectRequired": true,
56+ "saveRequired": true,
57 "actions": [
58 "msgfmt po/*.po"
59 ]
60
61=== modified file 'qtcreator/src/plugins/ubuntu/ubuntuconstants.h'
62--- qtcreator/src/plugins/ubuntu/ubuntuconstants.h 2013-05-03 23:00:15 +0000
63+++ qtcreator/src/plugins/ubuntu/ubuntuconstants.h 2013-05-04 21:44:23 +0000
64@@ -57,6 +57,7 @@
65 const char UBUNTU_MENUJSON_DEVICEREQUIRED[] = "deviceRequired";
66 const char UBUNTU_MENUJSON_QMLPROJECTREQUIRED[] = "qmlProjectRequired";
67 const char UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED[] = "qmakeProjectRequired";
68+const char UBUNTU_MENUJSON_SAVEREQUIRED[] = "saveRequired";
69 const char UBUNTU_MENUJSON_MESSAGEDIALOG[] = "messageDialog";
70
71 const char UBUNTU_MENUJSON_PARENT_TOOLS[] = "Tools";
72
73=== modified file 'qtcreator/src/plugins/ubuntu/ubuntumenu.cpp'
74--- qtcreator/src/plugins/ubuntu/ubuntumenu.cpp 2013-05-01 18:28:10 +0000
75+++ qtcreator/src/plugins/ubuntu/ubuntumenu.cpp 2013-05-04 21:44:23 +0000
76@@ -160,6 +160,7 @@
77 bool actionDeviceRequired = false;
78 bool actionQmlProjectRequired = false;
79 bool actionQmakeProjectRequired = false;
80+ bool actionSaveRequired = false;
81
82 if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_NAME))) {
83 actionName = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_NAME)).toString();
84@@ -185,6 +186,9 @@
85 if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED))) {
86 actionQmakeProjectRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED)).toBool();
87 }
88+ if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED))) {
89+ actionSaveRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED)).toBool();
90+ }
91
92 if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_ACTIONS)) && obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_ACTIONS)).isArray()) {
93
94@@ -213,6 +217,7 @@
95 act->setProperty(Constants::UBUNTU_MENUJSON_DEVICEREQUIRED,actionDeviceRequired);
96 act->setProperty(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED,actionQmakeProjectRequired);
97 act->setProperty(Constants::UBUNTU_MENUJSON_QMLPROJECTREQUIRED,actionQmlProjectRequired);
98+ act->setProperty(Constants::UBUNTU_MENUJSON_SAVEREQUIRED,actionSaveRequired);
99
100 connect(act, SIGNAL(triggered()), this, SLOT(menuItemTriggered()));
101 m_actions.append(act);
102@@ -246,6 +251,11 @@
103 }
104 }
105
106+ QVariant saveModifiedFilesRequired = act->property(Constants::UBUNTU_MENUJSON_SAVEREQUIRED);
107+ if (saveModifiedFilesRequired.isValid() && saveModifiedFilesRequired.toBool()==true) {
108+ ProjectExplorer::ProjectExplorerPlugin::instance()->saveModifiedFiles();
109+ }
110+
111 if (m_commandMap.contains(act->text())) {
112 QJsonValueList actions = m_commandMap.value(act->text());
113

Subscribers

People subscribed via source and target branches