branding attempt 2

7 files changed, 71 insertions, 11 deletions

diff --git a/branding/branding-common.mozbuild b/branding/branding-common.mozbuild
new file mode 100644
index 0000000..347338d
--- /dev/null
+++ b/branding/branding-common.mozbuild
@@ -0,0 +1,59 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+@template
+def ApplicationBranding():
+    JS_PREFERENCE_FILES += [
+        'pref/iceweasel-branding.js',
+    ]
+
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+        FINAL_TARGET_FILES['..'] += [
+            'iceweasel.VisualElementsManifest.xml',
+        ]
+        FINAL_TARGET_FILES.VisualElements += [
+            'VisualElements_150.png',
+            'VisualElements_70.png',
+        ]
+        BRANDING_FILES += [
+            'appname.bmp',
+            'bgintro.bmp',
+            'branding.nsi',
+            'clock.bmp',
+            'document.ico',
+            'iceweasel.ico',
+            'newtab.ico',
+            'newwindow.ico',
+            'particles.bmp',
+            'pbmode.ico',
+            'pencil-rtl.bmp',
+            'pencil.bmp',
+            'wizHeader.bmp',
+            'wizHeaderRTL.bmp',
+            'wizWatermark.bmp',
+         ]
+#     TODO: Mac branding	 
+#    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+#        BRANDING_FILES += [
+#            'background.png',
+#            'disk.icns',
+#            'document.icns',
+#            'dsstore',
+#            'firefox.icns',
+#        ]
+    elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+        BRANDING_FILES += [
+            'default16.png',
+            'default32.png',
+            'default48.png',
+            'mozicon128.png',
+        ]
+        FINAL_TARGET_FILES.icons += ['mozicon128.png']
+        FINAL_TARGET_FILES.chrome.icons.default += [
+            'default16.png',
+            'default32.png',
+            'default48.png',
+]
\ No newline at end of file
diff --git a/branding/iceweasel/VisualElements_150.png b/branding/iceweasel/VisualElements_150.png
new file mode 100644
index 0000000..1d17f58
--- /dev/null
+++ b/branding/iceweasel/VisualElements_150.png
diff --git a/branding/iceweasel/VisualElements_70.png b/branding/iceweasel/VisualElements_70.png
new file mode 100644
index 0000000..09a50b0
--- /dev/null
+++ b/branding/iceweasel/VisualElements_70.png
diff --git a/branding/iceweasel/firefox.ico b/branding/iceweasel/iceweasel.ico
index eed3919..eed3919 100644
--- a/branding/iceweasel/firefox.ico
+++ b/branding/iceweasel/iceweasel.ico
diff --git a/branding/iceweasel/locales/jar.mn b/branding/iceweasel/locales/jar.mn
index 8515d5c..b1121f9 100644
--- a/branding/iceweasel/locales/jar.mn
+++ b/branding/iceweasel/locales/jar.mn
@@ -9,4 +9,4 @@
 # Unofficial branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
   locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties
+  locale/branding/browserconfig.properties
\ No newline at end of file
diff --git a/branding/iceweasel/pref/firefox-branding.js b/branding/iceweasel/pref/iceweasel-branding.js
index b20a3a3..b20a3a3 100644
--- a/branding/iceweasel/pref/firefox-branding.js
+++ b/branding/iceweasel/pref/iceweasel-branding.js
diff --git a/branding/shared/branding.mozbuild b/branding/shared/branding.mozbuild
index 7256e6e..76925e8 100644
--- a/branding/shared/branding.mozbuild
+++ b/branding/shared/branding.mozbuild
@@ -7,7 +7,7 @@
 @template
 def ApplicationBranding():
     JS_PREFERENCE_PP_FILES += [
-        'pref/firefox-branding.js',
+        'pref/iceweasel-branding.js',
     ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
@@ -25,19 +25,20 @@ def ApplicationBranding():
             'appname.bmp',
             'branding.nsi',
             'document.ico',
-            'firefox.ico',
+            'iceweasel.ico',
             'wizHeader.bmp',
             'wizHeaderRTL.bmp',
             'wizWatermark.bmp',
         ]
-    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-        BRANDING_FILES += [
-            '../shared/dsstore',
-            'background.png',
-            'disk.icns',
-            'document.icns',
-            'firefox.icns',
-        ]
+#    TODO: Mac branding	
+#    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+#        BRANDING_FILES += [
+#            '../shared/dsstore',
+#            'background.png',
+#            'disk.icns',
+#            'document.icns',
+#            'firefox.icns',
+#        ]
     elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
         BRANDING_FILES += [
             'default16.png',