Mago

Merge lp:~mago-contributors/mago/shotwell-updates into lp:~mago-contributors/mago/mago-testsuite

  1. shotwell-updates
  2. Merge into mago-testsuite
Proposed by Patrick Wright
Status: Merged
Merged at revision: 16
Proposed branch: lp:~mago-contributors/mago/shotwell-updates
Merge into: lp:~mago-contributors/mago/mago-testsuite
Diff against target: 352 lines (+112/-97)
4 files modified
shotwell/fspot/Accounts.xml (+2/-0)
shotwell/fspot/addin-db-001/hosts/f-spot.addins (+3/-0)
shotwell/shotwell_appmap.py (+88/-86)
shotwell/test_shotwell.py (+19/-11)
To merge this branch: bzr merge lp:~mago-contributors/mago/shotwell-updates
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+48829@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

looks good thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'shotwell/fspot/Accounts.xml'
2--- shotwell/fspot/Accounts.xml 1970-01-01 00:00:00 +0000
3+++ shotwell/fspot/Accounts.xml 2011-02-07 19:29:49 +0000
4@@ -0,0 +1,2 @@
5+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
6+<GalleryRemote />
7\ No newline at end of file
8
9=== added directory 'shotwell/fspot/addin-db-001'
10=== added directory 'shotwell/fspot/addin-db-001/addin-data'
11=== added directory 'shotwell/fspot/addin-db-001/addin-data/1'
12=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.BWEditor,0.8.maddin'
13Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.BWEditor,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.BWEditor,0.8.maddin 2011-02-07 19:29:49 +0000 differ
14=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.BlackoutEditor,0.8.maddin'
15Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.BlackoutEditor,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.BlackoutEditor,0.8.maddin 2011-02-07 19:29:49 +0000 differ
16=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.ChangePath,0.8.maddin'
17Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.ChangePath,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.ChangePath,0.8.maddin 2011-02-07 19:29:49 +0000 differ
18=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.Core,0.8.maddin'
19Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.Core,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.Core,0.8.maddin 2011-02-07 19:29:49 +0000 differ
20=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.CoverTransition,0.8.maddin'
21Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.CoverTransition,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.CoverTransition,0.8.maddin 2011-02-07 19:29:49 +0000 differ
22=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.DevelopInUFraw,0.8.maddin'
23Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.DevelopInUFraw,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.DevelopInUFraw,0.8.maddin 2011-02-07 19:29:49 +0000 differ
24=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.FacebookExport,0.8.maddin'
25Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.FacebookExport,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.FacebookExport,0.8.maddin 2011-02-07 19:29:49 +0000 differ
26=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.FlipEditor,0.8.maddin'
27Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.FlipEditor,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.FlipEditor,0.8.maddin 2011-02-07 19:29:49 +0000 differ
28=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.LiveWebGallery,0.8.maddin'
29Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.LiveWebGallery,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.LiveWebGallery,0.8.maddin 2011-02-07 19:29:49 +0000 differ
30=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.MergeDb,0.8.maddin'
31Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.MergeDb,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.MergeDb,0.8.maddin 2011-02-07 19:29:49 +0000 differ
32=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.PixelateEditor,0.8.maddin'
33Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.PixelateEditor,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.PixelateEditor,0.8.maddin 2011-02-07 19:29:49 +0000 differ
34=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.RawPlusJpeg,0.8.maddin'
35Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.RawPlusJpeg,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.RawPlusJpeg,0.8.maddin 2011-02-07 19:29:49 +0000 differ
36=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.ResizeEditor,0.8.maddin'
37Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.ResizeEditor,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.ResizeEditor,0.8.maddin 2011-02-07 19:29:49 +0000 differ
38=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.RetroactiveRoll,0.8.maddin'
39Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.RetroactiveRoll,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.RetroactiveRoll,0.8.maddin 2011-02-07 19:29:49 +0000 differ
40=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.ScreensaverConfig,0.8.maddin'
41Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.ScreensaverConfig,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.ScreensaverConfig,0.8.maddin 2011-02-07 19:29:49 +0000 differ
42=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.ZipExport,0.8.maddin'
43Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.ZipExport,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.ZipExport,0.8.maddin 2011-02-07 19:29:49 +0000 differ
44=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.CD,0.8.maddin'
45Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.CD,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.CD,0.8.maddin 2011-02-07 19:29:49 +0000 differ
46=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Flickr,0.8.maddin'
47Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Flickr,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Flickr,0.8.maddin 2011-02-07 19:29:49 +0000 differ
48=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Folder,0.8.maddin'
49Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Folder,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Folder,0.8.maddin 2011-02-07 19:29:49 +0000 differ
50=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Gallery,0.8.maddin'
51Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Gallery,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Gallery,0.8.maddin 2011-02-07 19:29:49 +0000 differ
52=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.PicasaWeb,0.8.maddin'
53Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.PicasaWeb,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.PicasaWeb,0.8.maddin 2011-02-07 19:29:49 +0000 differ
54=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.SmugMug,0.8.maddin'
55Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.SmugMug,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.SmugMug,0.8.maddin 2011-02-07 19:29:49 +0000 differ
56=== added file 'shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Tabblo,0.8.maddin'
57Binary files shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Tabblo,0.8.maddin 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-data/1/FSpot.__FSpot.Exporters.Tabblo,0.8.maddin 2011-02-07 19:29:49 +0000 differ
58=== added directory 'shotwell/fspot/addin-db-001/addin-dir-data'
59=== added file 'shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_Extensions_1769d366.data'
60Binary files shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_Extensions_1769d366.data 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_Extensions_1769d366.data 2011-02-07 19:29:49 +0000 differ
61=== added file 'shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_abddc21d.data'
62Binary files shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_abddc21d.data 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/addin-dir-data/usr_lib_f-spot_abddc21d.data 2011-02-07 19:29:49 +0000 differ
63=== added file 'shotwell/fspot/addin-db-001/fdb-lock'
64=== added file 'shotwell/fspot/addin-db-001/fdb-update-lock'
65=== added file 'shotwell/fspot/addin-db-001/host-index'
66Binary files shotwell/fspot/addin-db-001/host-index 1970-01-01 00:00:00 +0000 and shotwell/fspot/addin-db-001/host-index 2011-02-07 19:29:49 +0000 differ
67=== added directory 'shotwell/fspot/addin-db-001/hosts'
68=== added file 'shotwell/fspot/addin-db-001/hosts/f-spot.addins'
69--- shotwell/fspot/addin-db-001/hosts/f-spot.addins 1970-01-01 00:00:00 +0000
70+++ shotwell/fspot/addin-db-001/hosts/f-spot.addins 2011-02-07 19:29:49 +0000
71@@ -0,0 +1,3 @@
72+<Addins host-reference="/usr/lib/f-spot/f-spot.exe">
73+ <Directory shared="false">/usr/lib/f-spot</Directory>
74+</Addins>
75\ No newline at end of file
76
77=== modified file 'shotwell/fspot/photos.db'
78Binary files shotwell/fspot/photos.db 2011-01-21 09:25:39 +0000 and shotwell/fspot/photos.db 2011-02-07 19:29:49 +0000 differ
79=== modified file 'shotwell/shotwell_appmap.py'
80--- shotwell/shotwell_appmap.py 2011-01-21 09:25:39 +0000
81+++ shotwell/shotwell_appmap.py 2011-02-07 19:29:49 +0000
82@@ -45,6 +45,7 @@
83 button.trashFiles = 'btnTrashFiles'
84 button.typeAFilename = 'tbtnTypeafilename'
85 button.fSpotDbFile = 'btn(None)'
86+button.cancel = 'btnCancel'
87
88 checkbox.modifyOriginalFiles = 'chkModifyoriginalfile*'
89
90@@ -57,6 +58,7 @@
91 dialog.addTags = 'dlgAddTags'
92 dialog.exportPhotos = 'dlgExportPhoto*'
93 dialog.selectAFile = 'dlgSelectAFile'
94+dialog.welcome = 'dlgWelcome!'
95
96 menu.about = 'mnuAbount'
97 menu.addTags = 'mnuAddTags'
98@@ -87,92 +89,92 @@
99 #ico0 = "ico0"
100 #ico1 = "ico1"
101
102-#mnuAll_Rejected = "mnuAll+Rejected"
103-
104-#mnuAscending = "mnuAscending"
105-#mnuAscending1 = "mnuAscending1"
106-#mnuBasicInformation = "mnuBasicInformation"
107-#mnuByExposureDate = "mnuByExposureDate"
108-#mnuByRating = "mnuByRating"
109-#mnuByTitle = "mnuByTitle"
110-#mnuContents = "mnuContents"
111-#mnuDecrease = "mnuDecrease"
112-#mnuDescending = "mnuDescending"
113-#mnuDescending1 = "mnuDescending1"
114-#mnuDuplicate = "mnuDuplicate"
115-#mnuEdit = "mnuEdit"
116-#mnuEditTitle = "mnuEditTitle"
117-#mnuEmpty = "mnuEmpty"
118-#mnuEmpty1 = "mnuEmpty1"
119-#mnuEmpty10 = "mnuEmpty10"
120-#mnuEmpty2 = "mnuEmpty2"
121-#mnuEmpty3 = "mnuEmpty3"
122-#mnuEmpty4 = "mnuEmpty4"
123-#mnuEmpty5 = "mnuEmpty5"
124-#mnuEmpty6 = "mnuEmpty6"
125-#mnuEmpty7 = "mnuEmpty7"
126-#mnuEmpty8 = "mnuEmpty8"
127-#mnuEmpty9 = "mnuEmpty9"
128-
129-#mnuEnhance = "mnuEnhance"
130-#mnuEvents = "mnuEvents"
131-#mnuExtendedInformation = "mnuExtendedInformation"
132-#mnuFile = "mnuFile"
133-#mnuFilterPhotos = "mnuFilterPhotos"
134-#mnuFlag = "mnuFlag"
135-#mnuFlipHorizontally = "mnuFlipHorizontally"
136-#mnuFlipVertically = "mnuFlipVertically"
137-#mnuFullscreen = "mnuFullscreen"
138-#mnuGetHelpOnline = "mnuGetHelpOnline"
139-#mnuHelp = "mnuHelp"
140-#mnuIncrease = "mnuIncrease"
141-#mnuModifyTags = "mnuModifyTags"
142-#mnuNewEvent = "mnuNewEvent"
143-#mnuOpenWithExternalEditor = "mnuOpenWithExternalEditor"
144-#mnuOpenWithRAWEditor = "mnuOpenWithRAWEditor"
145-#mnuPhotos = "mnuPhotos"
146-#mnuPlayVideo = "mnuPlayVideo"
147-#mnuPreferences = "mnuPreferences"
148-#mnuPrint = "mnuPrint"
149-#mnuPublish = "mnuPublish"
150-#mnuQuit = "mnuQuit"
151-#mnuRatings = "mnuRatings"
152-#mnuRedo = "mnuRedo"
153-#mnuRejected = "mnuRejected"
154-#mnuRejectedOnly = "mnuRejectedOnly"
155-#mnuRemoveFromLibrary = "mnuRemoveFromLibrary"
156-#mnuReportaProblem = "mnuReportaProblem"
157-#mnuReverttoOriginal = "mnuReverttoOriginal"
158-#mnuRotateLeft = "mnuRotateLeft"
159-#mnuRotateRight = "mnuRotateRight"
160-
161-#mnuSendTo = "mnuSendTo"
162-#mnuSetRating = "mnuSetRating"
163-#mnuSetasDesktopBackground = "mnuSetasDesktopBackground"
164-#mnuShowinFileManager = "mnuShowinFileManager"
165-#mnuSlideshow = "mnuSlideshow"
166-#mnuSortEvents = "mnuSortEvents"
167-#mnuSortPhotos = "mnuSortPhotos"
168-#mnuTags = "mnuTags"
169-#mnuTags1 = "mnuTags1"
170-#mnuTitles = "mnuTitles"
171-#mnuTranslateThisApplication = "mnuTranslateThisApplication"
172-#mnuUndo = "mnuUndo"
173-#mnuUnrated = "mnuUnrated"
174-#mnuView = "mnuView"
175-#mnuViewEventforPhoto = "mnuViewEventforPhoto"
176-#mnuZoomIn = "mnuZoomIn"
177-#mnuZoomOut = "mnuZoomOut"
178-#mnu___ = "mnu*"
179-#mnu___orBetter = "mnu*orBetter"
180-#mnu______ = "mnu**"
181-#mnu______orBetter = "mnu**orBetter"
182-#mnu_________ = "mnu***"
183-#mnu_________orBetter = "mnu***orBetter"
184-#mnu____________ = "mnu****"
185-#mnu____________orBetter = "mnu****orBetter"
186-#mnu_______________ = "mnu*****"
187-#mnu_______________1 = "mnu*****1"
188+#menus = {
189+ #mnuAll_Rejected : "mnuAll+Rejected",
190+ #mnuAscending : "mnuAscending",
191+ #mnuAscending1 : "mnuAscending1",
192+ #mnuBasicInformation : "mnuBasicInformation",
193+ #mnuByExposureDate : "mnuByExposureDate",
194+ #mnuByRating : "mnuByRating",
195+ #mnuByTitle : "mnuByTitle",
196+ #mnuContents : "mnuContents",
197+ #mnuDecrease : "mnuDecrease",
198+ #mnuDescending : "mnuDescending",
199+ #mnuDescending1 : "mnuDescending1",
200+ #mnuDuplicate : "mnuDuplicate",
201+ #mnuEdit : "mnuEdit",
202+ #mnuEditTitle : "mnuEditTitle",
203+ #mnuEmpty : "mnuEmpty",
204+ #mnuEmpty1 : "mnuEmpty1",
205+ #mnuEmpty10 : "mnuEmpty10",
206+ #mnuEmpty2 : "mnuEmpty2",
207+ #mnuEmpty3 : "mnuEmpty3",
208+ #mnuEmpty4 : "mnuEmpty4",
209+ #mnuEmpty5 : "mnuEmpty5",
210+ #mnuEmpty6 : "mnuEmpty6",
211+ #mnuEmpty7 : "mnuEmpty7",
212+ #mnuEmpty8 : "mnuEmpty8",
213+ #mnuEmpty9 : "mnuEmpty9",
214+ #mnuEnhance : "mnuEnhance",
215+ #mnuEvents : "mnuEvents",
216+ #mnuExtendedInformation : "mnuExtendedInformation",
217+ #mnuFile : "mnuFile",
218+ #mnuFilterPhotos : "mnuFilterPhotos",
219+ #mnuFlag : "mnuFlag",
220+ #mnuFlipHorizontally : "mnuFlipHorizontally",
221+ #mnuFlipVertically : "mnuFlipVertically",
222+ #mnuFullscreen : "mnuFullscreen",
223+ #mnuGetHelpOnline : "mnuGetHelpOnline",
224+ #mnuHelp : "mnuHelp",
225+ #mnuIncrease : "mnuIncrease",
226+ #mnuModifyTags : "mnuModifyTags",
227+ #mnuNewEvent : "mnuNewEvent",
228+ #mnuOpenWithExternalEditor : "mnuOpenWithExternalEditor",
229+ #mnuOpenWithRAWEditor : "mnuOpenWithRAWEditor",
230+ #mnuPhotos : "mnuPhotos",
231+ #mnuPlayVideo : "mnuPlayVideo",
232+ #mnuPreferences : "mnuPreferences",
233+ #mnuPrint : "mnuPrint",
234+ #mnuPublish : "mnuPublish",
235+ #mnuQuit : "mnuQuit",
236+ #mnuRatings : "mnuRatings",
237+ #mnuRedo : "mnuRedo",
238+ #mnuRejected : "mnuRejected",
239+ #mnuRejectedOnly : "mnuRejectedOnly",
240+ #mnuRemoveFromLibrary : "mnuRemoveFromLibrary",
241+ #mnuReportaProblem : "mnuReportaProblem",
242+ #mnuReverttoOriginal : "mnuReverttoOriginal",
243+ #mnuRotateLeft : "mnuRotateLeft",
244+ #mnuRotateRight : "mnuRotateRight",
245+ #mnuSendTo : "mnuSendTo",
246+ #mnuSetRating : "mnuSetRating",
247+ #mnuSetasDesktopBackground : "mnuSetasDesktopBackground",
248+ #mnuShowinFileManager : "mnuShowinFileManager",
249+ #mnuSlideshow : "mnuSlideshow",
250+ #mnuSortEvents : "mnuSortEvents",
251+ #mnuSortPhotos : "mnuSortPhotos",
252+ #mnuTags : "mnuTags",
253+ #mnuTags1 : "mnuTags1",
254+ #mnuTitles : "mnuTitles",
255+ #mnuTranslateThisApplication : "mnuTranslateThisApplication",
256+ #mnuUndo : "mnuUndo",
257+ #mnuUnrated : "mnuUnrated",
258+ #mnuView : "mnuView",
259+ #mnuViewEventforPhoto : "mnuViewEventforPhoto",
260+ #mnuZoomIn : "mnuZoomIn",
261+ #mnuZoomOut : "mnuZoomOut",
262+ #mnu___ : "mnu*",
263+ #mnu___orBetter : "mnu*orBetter",
264+ #mnu______ : "mnu**",
265+ #mnu______orBetter : "mnu**orBetter",
266+ #mnu_________ : "mnu***",
267+ #mnu_________orBetter : "mnu***orBetter",
268+ #mnu____________ : "mnu****",
269+ #mnu____________orBetter : "mnu****orBetter",
270+ #mnu_______________ : "mnu*****",
271+ #mnu_______________1 : "mnu*****1"
272+#}
273+
274 #ptab0 = "ptab0"
275 #ptl0 = "ptl0"
276 #ttbl0 = "ttbl0"
277
278=== modified file 'shotwell/test_shotwell.py'
279--- shotwell/test_shotwell.py 2011-01-21 09:25:39 +0000
280+++ shotwell/test_shotwell.py 2011-02-07 19:29:49 +0000
281@@ -47,6 +47,13 @@
282 def setUp(self):
283 """Returns shotwell to a known state"""
284 super(TestShotwell, self).setUp()
285+ # Need to check for welcome dialog and disable it
286+ if ldtp.guiexist(dialog.welcome):
287+ ldtp.click(dialog.welcome, button.ok)
288+ ldtp.wait(2)
289+ # If Fspot is installed the import dialog displays - close it
290+ if ldtp.guiexist(dialog.importFromFSpot):
291+ ldtp.click(dialog.importFromFSpot, button.cancel)
292 self.tmpdir = self.testConfig.get('data', 'tmppath')
293 self.shotwell = self.application.context
294 self.shotwell.click(menu.allPhotos) #reset filter
295@@ -68,7 +75,7 @@
296 """
297 try:
298 shutil.rmtree(self.tmpdir)
299- except IOError, OSError:
300+ except OSError:
301 pass #continue
302 # copy images foldwe to tmpdir
303 shutil.copytree(os.path.join(os.path.dirname(__file__), 'images'), os.path.join(self.tmpdir, 'images'))
304@@ -165,14 +172,17 @@
305 self.fail("%s dir does not exist, export failed" % self.tmpdir)
306 ldtp.wait(1)
307
308+ @unittest.skip('Issue with importing fspot files more than once')
309 def test_import_from_fspot(self):
310 """Imports images from an F-Spot .db file"""
311 # import from f-spot menu
312 self.shotwell.click(menu.importFromFSpot)
313 # import from another db file
314- ldtp.waittillguiexist(dialog.importFromFSpot)
315+ ldtp.waittillguiexist(dialog.importFromFSpot)
316 importFSpotDialog = ooldtp.context(dialog.importFromFSpot)
317- importFSpotDialog.click(radioButton.importFSpotDbFile)
318+ # the radio buttons display if f-spot is installed, other wise just the button is displayed
319+ if ldtp.guiexist(radioButton.importFSpotDbFile):
320+ importFSpotDialog.click(radioButton.importFSpotDbFile)
321 importFSpotDialog.click(button.fSpotDbFile)
322 # click select a file
323 ldtp.waittillguiexist(dialog.selectAFile)
324@@ -182,14 +192,12 @@
325 # clear fspot files
326 try:
327 shutil.rmtree(self.tmpdir)
328- except OSError, IOError:
329+ except OSError:
330 pass # continue if path does not exist
331- # copy source file to a tmp dir
332- fSpotSrcFile = os.path.join(os.path.dirname(__file__), 'fspot', 'photos.db')
333- os.makedirs(os.path.join(self.tmpdir, 'fspot'))
334- tmpFSpotdir = os.path.join(self.tmpdir, 'fspot')
335- shutil.copy(fSpotSrcFile, tmpFSpotdir)
336- selectFileDialog.settextvalue(text.location, os.path.join(tmpFSpotdir, 'photos.db'))
337+ # copy the entire fspot dir to tmp
338+ fSpotSrcDir = os.path.join(os.path.dirname(__file__), 'fspot')
339+ shutil.copytree(fSpotSrcDir, os.path.join(self.tmpdir, 'fspot'))
340+ selectFileDialog.settextvalue(text.location, os.path.join(self.tmpdir, 'fspot', 'photos.db'))
341 ldtp.wait(2)
342 selectFileDialog.click(button.open)
343 ldtp.wait(5)
344@@ -216,7 +224,7 @@
345 self.assertFalse(dateTimeDialog.guiexist(label.originalDateTime))
346 if dateTimeDialog.guiexist(comboSelect.meridiem % meridiem.am):
347 dateTimeDialog.comboselect(comboSelect.meridiem % meridiem.am, menu.meridiem % meridiem.pm)
348- currentMeridiem = merdiem.pm
349+ currentMeridiem = meridiem.pm
350 else:
351 dateTimeDialog.comboselect(comboSelect.meridiem % meridiem.pm, menu.meridiem % meridiem.am)
352 currentMeridiem = meridiem.am

Subscribers

People subscribed via source and target branches