1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 165988e6140a05143193f8828701e7888d6f9770 |
2 # Parent 2b1505c8ca6fc80da9cf517b029a93c452cb9876 |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
185 self.base = base |
185 self.base = base |
186 self.flags = Flags(*flags) |
186 self.flags = Flags(*flags) |
187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
188 --- a/toolkit/components/downloads/moz.build |
188 --- a/toolkit/components/downloads/moz.build |
189 +++ b/toolkit/components/downloads/moz.build |
189 +++ b/toolkit/components/downloads/moz.build |
190 @@ -57,16 +57,17 @@ if not CONFIG['MOZ_SUITE']: |
190 @@ -49,16 +49,17 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
191 'nsDownloadManagerUI.manifest', |
191 'nsDownloadScanner.cpp', |
192 ] |
192 ] |
193 |
193 |
194 FINAL_LIBRARY = 'xul' |
194 FINAL_LIBRARY = 'xul' |
195 |
195 |
196 LOCAL_INCLUDES += [ |
196 LOCAL_INCLUDES += [ |
227 |
227 |
228 #ifdef MOZ_WIDGET_ANDROID |
228 #ifdef MOZ_WIDGET_ANDROID |
229 #include "FennecJNIWrappers.h" |
229 #include "FennecJNIWrappers.h" |
230 #endif |
230 #endif |
231 |
231 |
232 @@ -2723,16 +2727,25 @@ nsDownload::SetState(DownloadState aStat |
232 @@ -2724,16 +2728,25 @@ nsDownload::SetState(DownloadState aStat |
233 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
233 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
234 |
234 |
235 // Master pref to control this function. |
235 // Master pref to control this function. |
236 bool showTaskbarAlert = true; |
236 bool showTaskbarAlert = true; |
237 if (pref) |
237 if (pref) |
253 |
253 |
254 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
254 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
255 int64_t goat = PR_Now() - mStartTime; |
255 int64_t goat = PR_Now() - mStartTime; |
256 showTaskbarAlert = goat > alertIntervalUSec; |
256 showTaskbarAlert = goat > alertIntervalUSec; |
257 |
257 |
258 @@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat |
258 @@ -2765,16 +2778,17 @@ nsDownload::SetState(DownloadState aStat |
259 message, !removeWhenDone, |
259 message, !removeWhenDone, |
260 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
260 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
261 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
261 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
262 EmptyString(), EmptyString(), nullptr, mPrivate, |
262 EmptyString(), EmptyString(), nullptr, mPrivate, |
263 false /* requireInteraction */); |
263 false /* requireInteraction */); |
274 if (fileURL && |
274 if (fileURL && |
275 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
275 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
276 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
276 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
277 --- a/toolkit/content/jar.mn |
277 --- a/toolkit/content/jar.mn |
278 +++ b/toolkit/content/jar.mn |
278 +++ b/toolkit/content/jar.mn |
279 @@ -71,29 +71,33 @@ toolkit.jar: |
279 @@ -73,29 +73,33 @@ toolkit.jar: |
280 content/global/bindings/button.xml (widgets/button.xml) |
|
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
|
282 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
280 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
|
281 content/global/bindings/datekeeper.js (widgets/datekeeper.js) |
|
282 content/global/bindings/datepicker.js (widgets/datepicker.js) |
283 content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) |
283 content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) |
284 content/global/bindings/datetimepopup.xml (widgets/datetimepopup.xml) |
284 content/global/bindings/datetimepopup.xml (widgets/datetimepopup.xml) |
285 content/global/bindings/datetimebox.xml (widgets/datetimebox.xml) |
285 content/global/bindings/datetimebox.xml (widgets/datetimebox.xml) |
286 content/global/bindings/datetimebox.css (widgets/datetimebox.css) |
286 content/global/bindings/datetimebox.css (widgets/datetimebox.css) |
287 * content/global/bindings/dialog.xml (widgets/dialog.xml) |
287 * content/global/bindings/dialog.xml (widgets/dialog.xml) |
308 content/global/bindings/resizer.xml (widgets/resizer.xml) |
308 content/global/bindings/resizer.xml (widgets/resizer.xml) |
309 content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) |
309 content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) |
310 content/global/bindings/scale.xml (widgets/scale.xml) |
310 content/global/bindings/scale.xml (widgets/scale.xml) |
311 content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) |
311 content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) |
312 content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) |
312 content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) |
313 @@ -113,9 +117,9 @@ toolkit.jar: |
|
314 content/global/bindings/videocontrols.css (widgets/videocontrols.css) |
|
315 * content/global/bindings/wizard.xml (widgets/wizard.xml) |
|
316 #ifdef XP_MACOSX |
|
317 content/global/macWindowMenu.js |
|
318 #endif |
|
319 content/global/svg/svgBindings.xml (/layout/svg/resources/content/svgBindings.xml) |
|
320 content/global/gmp-sources/eme-adobe.json (gmp-sources/eme-adobe.json) |
|
321 content/global/gmp-sources/openh264.json (gmp-sources/openh264.json) |
|
322 - content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json) |
|
323 \ No newline at end of file |
|
324 + content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json) |
|
325 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
313 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
326 new file mode 100644 |
314 new file mode 100644 |
327 --- /dev/null |
315 --- /dev/null |
328 +++ b/toolkit/content/widgets/dialog-kde.xml |
316 +++ b/toolkit/content/widgets/dialog-kde.xml |
329 @@ -0,0 +1,455 @@ |
317 @@ -0,0 +1,455 @@ |
2384 +} |
2372 +} |
2385 + |
2373 + |
2386 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
2374 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
2387 --- a/toolkit/xre/moz.build |
2375 --- a/toolkit/xre/moz.build |
2388 +++ b/toolkit/xre/moz.build |
2376 +++ b/toolkit/xre/moz.build |
2389 @@ -40,17 +40,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
2377 @@ -53,17 +53,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
2390 'updaterfileutils_osx.mm', |
2378 '../components/printingui/mac', |
2391 ] |
2379 ] |
2392 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
2380 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
2393 UNIFIED_SOURCES += [ |
2381 UNIFIED_SOURCES += [ |
2394 'nsNativeAppSupportDefault.cpp', |
2382 'nsNativeAppSupportDefault.cpp', |
2395 'UIKitDirProvider.mm', |
2383 'UIKitDirProvider.mm', |
3766 } |
3754 } |
3767 |
3755 |
3768 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3756 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3769 --- a/xpcom/components/moz.build |
3757 --- a/xpcom/components/moz.build |
3770 +++ b/xpcom/components/moz.build |
3758 +++ b/xpcom/components/moz.build |
3771 @@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul' |
3759 @@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul' |
3772 LOCAL_INCLUDES += [ |
3760 LOCAL_INCLUDES += [ |
3773 '!..', |
3761 '!..', |
3774 '../base', |
3762 '../base', |
3775 '../build', |
3763 '../build', |
3776 '../ds', |
3764 '../ds', |
3801 #include <Carbon/Carbon.h> |
3789 #include <Carbon/Carbon.h> |
3802 #include "CocoaFileUtils.h" |
3790 #include "CocoaFileUtils.h" |
3803 #include "prmem.h" |
3791 #include "prmem.h" |
3804 #include "plbase64.h" |
3792 #include "plbase64.h" |
3805 |
3793 |
3806 @@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con |
3794 @@ -1949,42 +1950,52 @@ nsLocalFile::SetPersistentDescriptor(con |
3807 return InitWithNativePath(aPersistentDescriptor); |
3795 return InitWithNativePath(aPersistentDescriptor); |
3808 #endif |
3796 #endif |
3809 } |
3797 } |
3810 |
3798 |
3811 NS_IMETHODIMP |
3799 NS_IMETHODIMP |