xda-developers-app

Merge lp:~roman2861/xda-developers-app/xda-developers-app into lp:xda-developers-app

  1. xda-developers-app
  2. Merge into trunk
Proposed by Roman Zonov
Status: Merged
Merged at revision: 14
Proposed branch: lp:~roman2861/xda-developers-app/xda-developers-app
Merge into: lp:xda-developers-app
Diff against target: 356 lines (+206/-93) (has conflicts)
4 files modified
manifest.json (+7/-0)
ui/MessageBox.qml (+61/-89)
ui/ThreadList.qml (+2/-4)
xda-developers.qmlproject.user.OTHER (+136/-0)
Text conflict in manifest.json
Contents conflict in xda-developers.qmlproject.user
To merge this branch: bzr merge lp:~roman2861/xda-developers-app/xda-developers-app
Reviewer Review Type Date Requested Status
Michael Hall Approve
Review via email: mp+197300@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

I fixed the merge conflict, everything else was good, thanks for the improvements

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json'
2--- manifest.json 2013-11-30 21:08:40 +0000
3+++ manifest.json 2013-12-01 21:10:49 +0000
4@@ -7,8 +7,15 @@
5 "desktop": "xda-developers.desktop"
6 }
7 },
8+<<<<<<< TREE
9 "maintainer": "mhall119 <mhall119@ubuntu.com>",
10 "name": "com.ubuntu.developer.mhall119.xda-developers",
11 "title": "xda-developers-app",
12 "version": "0.1.7"
13+=======
14+ "maintainer": "Zonov Roman <roman2861@yandex.ru>",
15+ "name": "com.ubuntu.developer.username.xda-developers",
16+ "title": "xda-developers",
17+ "version": "0.1"
18+>>>>>>> MERGE-SOURCE
19 }
20
21=== modified file 'ui/MessageBox.qml'
22--- ui/MessageBox.qml 2013-08-10 04:43:36 +0000
23+++ ui/MessageBox.qml 2013-12-01 21:10:49 +0000
24@@ -2,94 +2,66 @@
25 import Ubuntu.Components 0.1
26 import Ubuntu.Components.ListItems 0.1
27
28-Base {
29- id: topicListItem
30- property alias avatar: avatarImage.source
31- property alias author: byline.text
32- property alias content: body.text
33-
34- __height: Math.max(middleVisuals.height, units.gu(6))
35-
36- /*!
37- \preliminary
38- The text that is shown in the list item as a label.
39- \qmlproperty string text
40- */
41- property alias text: label.text
42-
43- UbuntuShape {
44- color: "white"
45- anchors.fill: parent
46-
47- Item {
48- id: middleVisuals
49- anchors {
50- left: parent.left
51- right: parent.right
52- verticalCenter: parent.verticalCenter
53- }
54- height: childrenRect.height + label.anchors.topMargin + body.anchors.bottomMargin
55-
56- UbuntuShape {
57- id: avatarContainer
58- height: units.gu(5)
59- width: units.gu(5)
60- anchors {
61- top: parent.top
62- left: parent.left
63- }
64-
65- image: Image {
66- id: avatarImage
67- }
68- }
69-
70- Label {
71- id: label
72- //selected: topicListItem.selected
73- anchors {
74- top: parent.top
75- left: avatarContainer.right
76- right: parent.right
77- leftMargin: units.gu(2)
78- }
79- property bool selected: false
80- property bool secondary: false
81-
82- fontSize: "medium"
83- elide: Text.ElideRight
84- color: "black"
85- }
86- Label {
87- id: byline
88- //selected: topicListItem.selected
89- //secondary: true
90- anchors {
91- left: avatarContainer.right
92- right: parent.right
93- top: label.text == '' ? parent.top : label.bottom
94- leftMargin: units.gu(2)
95- }
96- color: "gray"
97- fontSize: "small"
98- wrapMode: Text.Wrap
99- maximumLineCount: 5
100- }
101- Label {
102- id: body
103- //selected: topicListItem.selected
104- //secondary: true
105- anchors {
106- left: avatarContainer.right
107- right: parent.right
108- top: byline.bottom
109- leftMargin: units.gu(2)
110- }
111- color: "black"
112- fontSize: "small"
113- wrapMode: Text.Wrap
114- maximumLineCount: 5
115- }
116- }
117+Rectangle {
118+ property var textt
119+ property var content
120+ property var avatar
121+ property var author
122+ width: mainview.width*0.95
123+ height: childrenRect.height
124+ anchors.horizontalCenter: parent.horizontalCenter
125+
126+ Rectangle {
127+ width: units.gu(7)
128+ height: units.gu(7)
129+ UbuntuShape {
130+ width: units.gu(5)
131+ height: width
132+ anchors.centerIn: parent
133+ image: Image {
134+ id: avatarp
135+ source: if(avatar === "") { "../graphics/vopros.gif" } else { avatar }
136+ anchors.fill: parent
137+ onStatusChanged: { if(avatarp.status == Image.Ready || avatar === "") { load_image.running=false; } }
138+ }
139+ }
140+ ActivityIndicator {
141+ id: load_image
142+ z: 100
143+ anchors.centerIn: parent
144+ running: true
145+ }
146+ }
147+ Text {
148+ id: authort
149+ text: author
150+ anchors.left: parent.left
151+ anchors.leftMargin: units.gu(8)
152+ anchors.top: parent.top
153+ anchors.topMargin: units.gu(1)
154+ color: "grey"
155+ }
156+
157+ Text {
158+ text: content
159+ width: mainview.width-units.gu(11)
160+ wrapMode: Text.WordWrap
161+ anchors.left: parent.left
162+ anchors.leftMargin: units.gu(8)
163+ anchors.top: authort.bottom
164+ }
165+
166+
167+ Rectangle {
168+ height: parent.height
169+ width: 1
170+ color: "black"
171+ anchors.left: parent.left
172+ anchors.leftMargin: units.gu(7)
173+ }
174+ Rectangle {
175+ width: parent.width
176+ height: 1
177+ color: "black"
178 }
179 }
180
181=== modified file 'ui/ThreadList.qml'
182--- ui/ThreadList.qml 2013-11-30 18:45:18 +0000
183+++ ui/ThreadList.qml 2013-12-01 21:10:49 +0000
184@@ -8,13 +8,13 @@
185 ListView {
186
187 property alias current_topic: threadModel.topic_id
188+ anchors.margins: 5
189
190 delegate: MessageBox {
191- text: StringUtils.base64_decode(model.title)
192+ textt: StringUtils.base64_decode(model.title)
193 content: StringUtils.base64_decode(model.content)
194 author: StringUtils.base64_decode(model.author)
195 avatar: model.avatar
196-
197 }
198
199 model: XmlListModel {
200@@ -31,7 +31,6 @@
201 XmlRole { name: "content"; query: "member[name='post_content']/value/base64/string()" }
202 XmlRole { name: "author"; query: "member[name='post_author_name']/value/base64/string()" }
203 XmlRole { name: "avatar"; query: "member[name='icon_url']/value/string/string()" }
204-
205 onTopic_idChanged: __loadForums()
206 //Component.onCompleted: __loadForums()
207 function __loadForums() {
208@@ -41,7 +40,6 @@
209 xhr.onreadystatechange = function() {
210 if (xhr.readyState == XMLHttpRequest.DONE) {
211 loading.running=false;
212- console.log();
213 threadModel.xml = xhr.responseText;
214 //console.log('Data: '+ threadModel.xml)
215 }
216
217=== added file 'xda-developers.qmlproject.user.OTHER'
218--- xda-developers.qmlproject.user.OTHER 1970-01-01 00:00:00 +0000
219+++ xda-developers.qmlproject.user.OTHER 2013-12-01 21:10:49 +0000
220@@ -0,0 +1,136 @@
221+<?xml version="1.0" encoding="UTF-8"?>
222+<!DOCTYPE QtCreatorProject>
223+<!-- Written by QtCreator 2.8.1, 2013-12-01T12:46:40. -->
224+<qtcreator>
225+ <data>
226+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
227+ <value type="int">0</value>
228+ </data>
229+ <data>
230+ <variable>ProjectExplorer.Project.EditorSettings</variable>
231+ <valuemap type="QVariantMap">
232+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
233+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
234+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
235+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
236+ <value type="QString" key="language">Cpp</value>
237+ <valuemap type="QVariantMap" key="value">
238+ <value type="QString" key="CurrentPreferences">CppGlobal</value>
239+ </valuemap>
240+ </valuemap>
241+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
242+ <value type="QString" key="language">QmlJS</value>
243+ <valuemap type="QVariantMap" key="value">
244+ <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
245+ </valuemap>
246+ </valuemap>
247+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
248+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
249+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
250+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
251+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
252+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
253+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
254+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
255+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
256+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
257+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
258+ <value type="int" key="EditorConfiguration.TabSize">8</value>
259+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
260+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
261+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
262+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
263+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
264+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
265+ </valuemap>
266+ </data>
267+ <data>
268+ <variable>ProjectExplorer.Project.PluginSettings</variable>
269+ <valuemap type="QVariantMap"/>
270+ </data>
271+ <data>
272+ <variable>ProjectExplorer.Project.Target.0</variable>
273+ <valuemap type="QVariantMap">
274+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
275+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
276+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{4e54895a-368d-48e4-a4e0-70929598ba68}</value>
277+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
278+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
279+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
280+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
281+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
282+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
283+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
284+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
285+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
286+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
287+ </valuemap>
288+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
289+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
290+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
291+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
292+ </valuemap>
293+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
294+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
295+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
296+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
297+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
298+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
299+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
300+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
301+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
302+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
303+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
304+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
305+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
306+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
307+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
308+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
309+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
310+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
311+ <value type="int">0</value>
312+ <value type="int">1</value>
313+ <value type="int">2</value>
314+ <value type="int">3</value>
315+ <value type="int">4</value>
316+ <value type="int">5</value>
317+ <value type="int">6</value>
318+ <value type="int">7</value>
319+ <value type="int">8</value>
320+ <value type="int">9</value>
321+ <value type="int">10</value>
322+ <value type="int">11</value>
323+ <value type="int">12</value>
324+ <value type="int">13</value>
325+ <value type="int">14</value>
326+ </valuelist>
327+ <value type="int" key="PE.EnvironmentAspect.Base">0</value>
328+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
329+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
330+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
331+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
332+ <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
333+ <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
334+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
335+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
336+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
337+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
338+ <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
339+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
340+ </valuemap>
341+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
342+ </valuemap>
343+ </data>
344+ <data>
345+ <variable>ProjectExplorer.Project.TargetCount</variable>
346+ <value type="int">1</value>
347+ </data>
348+ <data>
349+ <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
350+ <value type="QByteArray">{7f679a69-b53d-40b7-b80f-beaebabb3963}</value>
351+ </data>
352+ <data>
353+ <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
354+ <value type="int">14</value>
355+ </data>
356+</qtcreator>

Subscribers

People subscribed via source and target branches