unity-2d

Merge lp:~dyams/unity-2d/dash-to-Dash into lp:unity-2d

  1. dash-to-Dash
  2. Merge into trunk
Proposed by Lohith D Shivamurthy
Status: Rejected
Rejected by: Gerry Boland
Proposed branch: lp:~dyams/unity-2d/dash-to-Dash
Merge into: lp:unity-2d
Diff against target: 26 lines (+2/-2)
2 files modified
places/Home.qml (+1/-1)
places/app/places.cpp (+1/-1)
To merge this branch: bzr merge lp:~dyams/unity-2d/dash-to-Dash
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+85343@code.launchpad.net

Description of the change

[dash] renamed dash.qml to Dash.qml

<coding standard>
All QML documents name begins with an uppercase letter.
<coding standard>

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

I cannot deny that this is an inconsistency, but for now I won't accept this. Until we adopt the Unity-Shell work, I don't want to make any major changes to our code base, to keep the delta small. If Unity-Shell preserves this (I doubt it), then we'll apply this.

Unmerged revisions

826. By Lohith D Shivamurthy

[dash] renamed dash.qml to Dash.qml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'places/dash.qml' => 'places/Dash.qml'
2=== modified file 'places/Home.qml'
3--- places/Home.qml 2011-11-21 18:57:05 +0000
4+++ places/Home.qml 2011-12-12 14:38:05 +0000
5@@ -53,7 +53,7 @@
6 /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */
7 property bool globalSearchActive: model.searchQuery != ""
8
9- /* Used by dash.qml to bind to dashView "expanded" property */
10+ /* Used by Dash.qml to bind to dashView "expanded" property */
11 property bool expanded: globalSearchActive || shortcutsActive
12
13 AbstractButton {
14
15=== modified file 'places/app/places.cpp'
16--- places/app/places.cpp 2011-11-29 12:13:27 +0000
17+++ places/app/places.cpp 2011-12-12 14:38:05 +0000
18@@ -67,7 +67,7 @@
19 view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
20 view.rootContext()->setContextProperty("declarativeView", &view);
21 view.rootContext()->setContextProperty("dashView", &view);
22- view.setSource(QUrl("./dash.qml"));
23+ view.setSource(QUrl("./Dash.qml"));
24
25 /* When spawned via DBus activation, the current working directory is
26 inherited from the DBus daemon, and it usually is not the user’s home

Subscribers

People subscribed via source and target branches