1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent f3e80d26a430dfa1c58421fb66144a3c23ffc166 |
2 # Parent 0e88a32ef7263e76f6970bab17458130d1f3677f |
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 |
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 @@ -2763,16 +2776,17 @@ nsDownload::SetState(DownloadState aStat |
258 @@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat |
259 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
|
260 message, !removeWhenDone, |
259 message, !removeWhenDone, |
261 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
260 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
262 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
261 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), |
263 EmptyString(), EmptyString(), nullptr, mPrivate); |
262 EmptyString(), EmptyString(), nullptr, mPrivate, |
|
263 false /* requireInteraction */); |
264 } |
264 } |
265 } |
265 } |
266 } |
266 } |
267 + } |
267 + } |
268 |
268 |
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 @@ -67,29 +67,33 @@ toolkit.jar: |
279 @@ -71,29 +71,33 @@ toolkit.jar: |
280 content/global/viewZoomOverlay.js |
|
281 content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
|
282 content/global/bindings/browser.xml (widgets/browser.xml) |
|
283 content/global/bindings/button.xml (widgets/button.xml) |
280 content/global/bindings/button.xml (widgets/button.xml) |
284 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
285 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
282 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
286 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) |
|
285 content/global/bindings/datetimebox.xml (widgets/datetimebox.xml) |
|
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) |
288 +* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) |
288 +* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) |
289 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde |
289 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde |
290 content/global/bindings/editor.xml (widgets/editor.xml) |
290 content/global/bindings/editor.xml (widgets/editor.xml) |
291 content/global/bindings/expander.xml (widgets/expander.xml) |
291 content/global/bindings/expander.xml (widgets/expander.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) |
313 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
325 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
314 new file mode 100644 |
326 new file mode 100644 |
315 --- /dev/null |
327 --- /dev/null |
316 +++ b/toolkit/content/widgets/dialog-kde.xml |
328 +++ b/toolkit/content/widgets/dialog-kde.xml |
317 @@ -0,0 +1,457 @@ |
329 @@ -0,0 +1,457 @@ |
458 + |
470 + |
459 + <method name="centerWindowOnScreen"> |
471 + <method name="centerWindowOnScreen"> |
460 + <body> |
472 + <body> |
461 + <![CDATA[ |
473 + <![CDATA[ |
462 + var xOffset = screen.availWidth/2 - window.outerWidth/2; |
474 + var xOffset = screen.availWidth/2 - window.outerWidth/2; |
463 + var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10; |
475 + var yOffset = screen.availHeight/2 - window.outerHeight/2; |
464 + |
476 + |
465 + xOffset = xOffset > 0 ? xOffset : 0; |
477 + xOffset = xOffset > 0 ? xOffset : 0; |
466 + yOffset = yOffset > 0 ? yOffset : 0; |
478 + yOffset = yOffset > 0 ? yOffset : 0; |
467 + window.moveTo(xOffset, yOffset); |
479 + window.moveTo(xOffset, yOffset); |
468 + ]]> |
480 + ]]> |
774 +</bindings> |
786 +</bindings> |
775 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml |
787 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml |
776 new file mode 100644 |
788 new file mode 100644 |
777 --- /dev/null |
789 --- /dev/null |
778 +++ b/toolkit/content/widgets/preferences-kde.xml |
790 +++ b/toolkit/content/widgets/preferences-kde.xml |
779 @@ -0,0 +1,1403 @@ |
791 @@ -0,0 +1,1411 @@ |
780 +<?xml version="1.0"?> |
792 +<?xml version="1.0"?> |
781 + |
793 + |
782 +<!DOCTYPE bindings [ |
794 +<!DOCTYPE bindings [ |
783 + <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd"> |
795 + <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd"> |
784 + %preferencesDTD; |
796 + %preferencesDTD; |
2040 + return temp.nodeType == Node.ELEMENT_NODE ? temp : aStartElement; |
2052 + return temp.nodeType == Node.ELEMENT_NODE ? temp : aStartElement; |
2041 + ]]> |
2053 + ]]> |
2042 + </body> |
2054 + </body> |
2043 + </method> |
2055 + </method> |
2044 + |
2056 + |
2045 + <field name="DeferredTask" readonly="true"> |
2057 + <property name="DeferredTask" readonly="true"> |
2046 + let targetObj = {}; |
2058 + <getter><![CDATA[ |
2047 + Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj); |
2059 + let module = {}; |
2048 + targetObj.DeferredTask; |
2060 + Components.utils.import("resource://gre/modules/DeferredTask.jsm", module); |
2049 + </field> |
2061 + Object.defineProperty(this, "DeferredTask", { |
|
2062 + configurable: true, |
|
2063 + enumerable: true, |
|
2064 + writable: true, |
|
2065 + value: module.DeferredTask |
|
2066 + }); |
|
2067 + return module.DeferredTask; |
|
2068 + ]]></getter> |
|
2069 + </property> |
2050 + <method name="_deferredValueUpdate"> |
2070 + <method name="_deferredValueUpdate"> |
2051 + <parameter name="aElement"/> |
2071 + <parameter name="aElement"/> |
2052 + <body> |
2072 + <body> |
2053 + <![CDATA[ |
2073 + <![CDATA[ |
2054 + delete aElement._deferredValueUpdateTask; |
2074 + delete aElement._deferredValueUpdateTask; |
3674 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
3694 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
3675 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3695 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3676 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3696 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3677 --- a/xpcom/io/nsLocalFileUnix.cpp |
3697 --- a/xpcom/io/nsLocalFileUnix.cpp |
3678 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3698 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3679 @@ -44,16 +44,17 @@ |
3699 @@ -45,16 +45,17 @@ |
3680 #include "prproces.h" |
3700 #include "prproces.h" |
3681 #include "nsIDirectoryEnumerator.h" |
3701 #include "nsIDirectoryEnumerator.h" |
3682 #include "nsISimpleEnumerator.h" |
3702 #include "nsISimpleEnumerator.h" |
3683 #include "private/pprio.h" |
3703 #include "private/pprio.h" |
3684 #include "prlink.h" |
3704 #include "prlink.h" |
3692 #include <Carbon/Carbon.h> |
3712 #include <Carbon/Carbon.h> |
3693 #include "CocoaFileUtils.h" |
3713 #include "CocoaFileUtils.h" |
3694 #include "prmem.h" |
3714 #include "prmem.h" |
3695 #include "plbase64.h" |
3715 #include "plbase64.h" |
3696 |
3716 |
3697 @@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con |
3717 @@ -1947,42 +1948,52 @@ nsLocalFile::SetPersistentDescriptor(con |
3698 return InitWithNativePath(aPersistentDescriptor); |
3718 return InitWithNativePath(aPersistentDescriptor); |
3699 #endif |
3719 #endif |
3700 } |
3720 } |
3701 |
3721 |
3702 NS_IMETHODIMP |
3722 NS_IMETHODIMP |