1
Description: Upstream changes introduced in version 0.1-0ubuntu4
2
This patch has been created by dpkg-source during the package build.
3
Here's the last changelog entry, hopefully it gives details on why
4
those changes were made:
6
unity-2d (0.1-0ubuntu4) natty; urgency=low
8
* add Vcs-Bzr location to debian/control
9
* update branch location in debian/copyright
10
* pull in some upstream fixes
12
The person named in the Author field signed this changelog entry.
13
Author: Oliver Grawert <ogra@ubuntu.com>
16
The information above should follow the Patch Tagging Guidelines, please
17
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
18
are templates for supplementary fields that you might want to add:
20
Origin: <vendor|upstream|other>, <url of original patch>
21
Bug: <url in upstream bugtracker>
22
Bug-Debian: http://bugs.debian.org/<bugnumber>
23
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
24
Forwarded: <no|not-needed|url proving that it has been forwarded>
25
Reviewed-By: <name and email of someone who approved the patch>
26
Last-Update: <YYYY-MM-DD>
29
+++ unity-2d-0.1/spread/spread.qmlproject
31
+/* File generated by QtCreator */
33
+import QmlProject 1.0
36
+ /* Include .qml, .js, and image files from current directory and subdirectories */
46
+ /* List of plugin directories passed to QML runtime */
47
+ // importPaths: [ "../exampleplugin" ]
49
--- unity-2d-0.1.orig/places/dash.qml
50
+++ unity-2d-0.1/places/dash.qml
51
@@ -37,12 +37,18 @@ Item {
53
placeEntryModel.active = true
54
placeEntryModel.activeSection = section
55
- placeEntryView.model = placeEntryModel
56
- activatePage(placeEntryView)
57
+ pageLoader.source = "PlaceEntryView.qml"
58
+ /* Take advantage of the fact that the loaded qml is local and setting
59
+ the source loads it immediately making pageLoader.item valid */
60
+ pageLoader.item.model = placeEntryModel
61
+ activatePage(pageLoader.item)
64
function activateHome() {
66
+ pageLoader.source = "Home.qml"
67
+ /* Take advantage of the fact that the loaded qml is local and setting
68
+ the source loads it immediately making pageLoader.item valid */
69
+ activatePage(pageLoader.item)
72
property variant places: LauncherPlacesList {
73
@@ -77,8 +83,8 @@ Item {
82
anchors.top: search_bar.bottom
84
@@ -88,18 +94,6 @@ Item {
86
anchors.right: parent.right
87
anchors.rightMargin: 8
91
- anchors.fill: parent
97
- anchors.fill: parent
103
--- unity-2d-0.1.orig/places/RendererGrid.qml
104
+++ unity-2d-0.1/places/RendererGrid.qml
105
@@ -12,7 +12,15 @@ Renderer {
108
property variant cellRenderer
109
- property bool folded: true
110
+ property bool folded
112
+ /* Look for the groupId as a complete word inside the list of expanded groups.
113
+ Examples of ExpandedGroups hint: "2", "1 3 7", "1 2", etc.
115
+ var re = RegExp("\\b%1\\b".arg(renderer.groupId))
116
+ var expandedGroups = placeEntryModel.entryRendererHints["ExpandedGroups"]
117
+ return !re.test(expandedGroups)
120
property int cellWidth: 158
121
property int cellHeight: 76
122
--- unity-2d-0.1.orig/places/Renderer.qml
123
+++ unity-2d-0.1/places/Renderer.qml
124
@@ -11,6 +11,7 @@ import Qt 4.7
126
property string displayName /* Name of the group typically displayed in the header */
127
property string iconHint /* Icon id of the group */
128
+ property int groupId /* Index of the group */
129
property variant model /* List model containing the items to be displayed by the renderer */
130
property variant placeEntryModel /* Reference to the place entry the group belongs to */
131
property variant parentListView /* Reference to the ListView the renderer is nested into */
132
--- unity-2d-0.1.orig/places/PlaceEntryView.qml
133
+++ unity-2d-0.1/places/PlaceEntryView.qml
134
@@ -55,6 +55,7 @@ Item {
135
item.parentListView = results.list
136
item.displayName = displayName
137
item.iconHint = iconHint
138
+ item.groupId = groupId
139
item.model = group_model
140
item.placeEntryModel = placeEntryView.model
142
--- unity-2d-0.1.orig/launcher/UnityApplications/launcherapplication.cpp
143
+++ unity-2d-0.1/launcher/UnityApplications/launcherapplication.cpp
144
@@ -285,7 +285,9 @@ LauncherApplication::setIconGeometry(int
146
LauncherApplication::onWindowAdded(BamfWindow* window)
148
- windowAdded(window->xid());
149
+ if (window != NULL) {
150
+ windowAdded(window->xid());
added
removed
debian/patches/debian-changes-0.1-0ubuntu4
