From bec5103d0950fefbdec8f9222164f883c69e475f Mon Sep 17 00:00:00 2001 From: asac Date: Wed, 21 Feb 2007 03:34:15 +0100 Subject: [PATCH] ubuntu look and feel patch + browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone to "ignore" (Closes LP#91798) --- browser/app/firefox-branding.js | 8 ++-- browser/app/profile/firefox.js | 12 +++++-- browser/base/content/baseMenuOverlay.xul | 7 ++++ browser/base/content/browser-menubar.inc | 7 ++++ browser/base/content/utilityOverlay.js | 10 ++++++ .../en-US/chrome/browser-region/region.properties | 5 +++ .../en-US/chrome/browser/baseMenuOverlay.dtd | 3 ++ browser/locales/en-US/profile/bookmarks.html | 12 ++++++- gfx/src/gtk/fontEncoding.properties | 4 +- modules/libpref/src/init/all.js | 32 ++++++++++---------- widget/src/gtk2/nsWindow.cpp | 5 ++- .../resources/locale/en-US/region.properties | 8 ++-- 12 files changed, 80 insertions(+), 33 deletions(-) diff --git a/browser/app/firefox-branding.js b/browser/app/firefox-branding.js index 21e20eb..eb11aaa 100644 --- a/browser/app/firefox-branding.js +++ b/browser/app/firefox-branding.js @@ -1,14 +1,14 @@ -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("startup.homepage_override_url","http://www.ubuntu.com/download/releasenotes/610"); +pref("startup.homepage_welcome_url","http://www.ubuntu.com/download/releasenotes/610"); // URL user can browse to manually if for some reason all update installation // attempts fail. pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); +pref("app.update.url.details", "file:///usr/share/ubuntu-artwork/home/index.html"); // Release notes URL -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +pref("app.releaseNotesURL", "http://www.ubuntu.com/download/releasenotes/610"); // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index c3ec787..f3231e4 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -178,7 +178,7 @@ pref("browser.shell.checkDefaultBrowser", true); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore pref("browser.startup.page", 1); -pref("browser.startup.homepage", "resource:/browserconfig.properties"); +pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); pref("browser.cache.disk.capacity", 50000); pref("browser.enable_automatic_image_resizing", true); @@ -247,7 +247,7 @@ pref("browser.sessionhistory.max_entries", 50); pref("browser.link.open_external", 3); // handle links targeting new windows -pref("browser.link.open_newwindow", 3); +pref("browser.link.open_newwindow", 2); // 0: no restrictions - divert everything // 1: don't divert window.open at all @@ -370,6 +370,8 @@ pref("mousewheel.withcontrolkey.action",3); pref("mousewheel.withcontrolkey.sysnumlines",false); pref("mousewheel.withcontrolkey.numlines",1); +pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page + pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code // Customizable toolbar stuff @@ -449,8 +451,8 @@ pref("browser.download.show_plugins_in_list", true); pref("browser.download.hide_plugins_without_extensions", true); // Setting this pref to |true| forces BiDi UI menu items and keyboard shortcuts -// to be exposed. By default, only expose it for bidi-associated system locales. -pref("bidi.browser.ui", false); +// to be exposed. +pref("bidi.browser.ui", true); // Backspace and Shift+Backspace behavior // 0 goes Back/Forward @@ -547,3 +549,5 @@ pref("browser.sessionstore.privacy_level", 1); pref("browser.sessionstore.max_tabs_undo", 10); pref("mozilla.widget.raise-on-setfocus", false); + +pref("browser.startup.homepage_override.mstone","ignore"); diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul index 23ac1f9..cd0ab67 100644 --- a/browser/base/content/baseMenuOverlay.xul +++ b/browser/base/content/baseMenuOverlay.xul @@ -97,6 +97,13 @@ label="&helpReleaseNotes.label;" oncommand="openReleaseNotes(event)" onclick="checkForMiddleClick(this, event);"/> + + + + + #endif +#if 0 +# The import wizard will usually show an empty nonfunctional dialogue. +# So we disable it to improve discoverability of +# Bookmarks / Manage Bookmarks ... // File / Import ... +# https://bugzilla.mozilla.org/show_bug.cgi?id=117844 +# bugs.debian.org/350599 +#endif #ifndef XP_MACOSX #endif diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index 894794a..6472c96 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -486,3 +486,13 @@ function buildHelpMenu() else checkForUpdates.removeAttribute("loading"); } + +function getHelpOnline(event) +{ + openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+gethelp", event, false, true); +} + +function helpTranslateLaunchpad(event) +{ + openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+translate", event, false, true); +} diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 11001bc..d42c244 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -13,5 +13,10 @@ browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s browser.contentHandlers.types.2.title=Google Reader browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s +releaseNotesURL=http://www.ubuntu.com/download/releasenotes/610 +homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html +browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html +browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html + # Keyword URL (for location bar searches) keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= diff --git a/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd index 5ab9d38..6b8c962 100644 --- a/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd +++ b/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd @@ -32,6 +32,9 @@ + + + diff --git a/browser/locales/en-US/profile/bookmarks.html b/browser/locales/en-US/profile/bookmarks.html index 45114d9..7619326 100644 --- a/browser/locales/en-US/profile/bookmarks.html +++ b/browser/locales/en-US/profile/bookmarks.html @@ -13,11 +13,19 @@
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar

Getting Started -
Latest Headlines +
Latest BBC Headlines

-

Mozilla Firefox

+

Ubuntu and Free Software links

+
Information and resources about Ubuntu, Debian and Free Software in general

+

Ubuntu +
Ubuntu Support Home +
Ubuntu Wiki (community-edited website) +
Make a Support Request to the Ubuntu Community +
Free Software Foundation +
Debian (Ubuntu is based on Debian) +

Mozilla Firefox

Help and Tutorials
Customize Firefox
Get Involved diff --git a/gfx/src/gtk/fontEncoding.properties b/gfx/src/gtk/fontEncoding.properties index ac21fee..10e9be0 100644 --- a/gfx/src/gtk/fontEncoding.properties +++ b/gfx/src/gtk/fontEncoding.properties @@ -70,8 +70,8 @@ # font, you do need them. # Symbol font -#encoding.symbol.ttf = Adobe-Symbol-Encoding -#encoding.symbol.ftcmap = mac_roman +encoding.symbol.ttf = Adobe-Symbol-Encoding +encoding.symbol.ftcmap = mac_roman # TeX's Computer Modern fonts (Roman, Math Italic, Symbol and Extension) diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index afb761e..c38d2f6 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -460,7 +460,7 @@ pref("dom.storage.enabled", true); // 2 = openAbused pref("privacy.popups.disable_from_plugins", 2); -pref("dom.event.contextmenu.enabled", true); +pref("dom.event.contextmenu.enabled", false); pref("javascript.enabled", true); pref("javascript.allow.mailnews", false); @@ -1211,7 +1211,7 @@ pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 13); -pref("font.default.el", "serif"); +pref("font.default.el", "sans-serif"); pref("font.size.variable.el", 16); pref("font.size.fixed.el", 13); @@ -1227,11 +1227,11 @@ pref("font.default.ko", "sans-serif"); pref("font.size.variable.ko", 16); pref("font.size.fixed.ko", 16); -pref("font.default.th", "serif"); +pref("font.default.th", "sans-serif"); pref("font.size.variable.th", 16); pref("font.size.fixed.th", 13); -pref("font.default.tr", "serif"); +pref("font.default.tr", "sans-serif"); pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 13); @@ -1471,7 +1471,7 @@ pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 15); pref("font.size.fixed.ar", 13); -pref("font.default.el", "serif"); +pref("font.default.el", "sans-serif"); pref("font.size.variable.el", 16); pref("font.size.fixed.el", 13); @@ -1487,11 +1487,11 @@ pref("font.default.ko", "sans-serif"); pref("font.size.variable.ko", 16); pref("font.size.fixed.ko", 16); -pref("font.default.th", "serif"); +pref("font.default.th", "sans-serif"); pref("font.size.variable.th", 16); pref("font.size.fixed.th", 13); -pref("font.default.tr", "serif"); +pref("font.default.tr", "sans-serif"); pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 13); @@ -1649,7 +1649,7 @@ pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 13); -pref("font.default.el", "serif"); +pref("font.default.el", "sans-serif"); pref("font.size.variable.el", 16); pref("font.size.fixed.el", 13); @@ -1665,11 +1665,11 @@ pref("font.default.ko", "sans-serif"); pref("font.size.variable.ko", 16); pref("font.size.fixed.ko", 16); -pref("font.default.th", "serif"); +pref("font.default.th", "sans-serif"); pref("font.size.variable.th", 16); pref("font.size.fixed.th", 13); -pref("font.default.tr", "serif"); +pref("font.default.tr", "sans-serif"); pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 13); @@ -1762,7 +1762,7 @@ pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 13); -pref("font.default.el", "serif"); +pref("font.default.el", "sans-serif"); pref("font.size.variable.el", 16); pref("font.size.fixed.el", 13); @@ -1778,11 +1778,11 @@ pref("font.default.ko", "sans-serif"); pref("font.size.variable.ko", 16); pref("font.size.fixed.ko", 16); -pref("font.default.th", "serif"); +pref("font.default.th", "sans-serif"); pref("font.size.variable.th", 16); pref("font.size.fixed.th", 13); -pref("font.default.tr", "serif"); +pref("font.default.tr", "sans-serif"); pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 13); @@ -2038,7 +2038,7 @@ pref("font.default.ar", "sans-serif"); pref("font.size.variable.ar", 16); pref("font.size.fixed.ar", 12); -pref("font.default.el", "serif"); +pref("font.default.el", "sans-serif"); pref("font.size.variable.el", 16); pref("font.size.fixed.el", 12); @@ -2054,11 +2054,11 @@ pref("font.default.ko", "sans-serif"); pref("font.size.variable.ko", 16); pref("font.size.fixed.ko", 16); -pref("font.default.th", "serif"); +pref("font.default.th", "sans-serif"); pref("font.size.variable.th", 16); pref("font.size.fixed.th", 12); -pref("font.default.tr", "serif"); +pref("font.default.tr", "sans-serif"); pref("font.size.variable.tr", 16); pref("font.size.fixed.tr", 12); diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp index 26413e5..3ff7984 100644 --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp @@ -1659,6 +1659,9 @@ nsWindow::OnButtonPressEvent(GtkWidget *aWidget, GdkEventButton *aEvent) return; switch (aEvent->button) { + case 1: + eventType = NS_MOUSE_LEFT_BUTTON_DOWN; + break; case 2: eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN; break; @@ -1666,7 +1669,7 @@ nsWindow::OnButtonPressEvent(GtkWidget *aWidget, GdkEventButton *aEvent) eventType = NS_MOUSE_RIGHT_BUTTON_DOWN; break; default: - eventType = NS_MOUSE_LEFT_BUTTON_DOWN; + return; break; } diff --git a/xpfe/browser/resources/locale/en-US/region.properties b/xpfe/browser/resources/locale/en-US/region.properties index 721d457..9f16e1f 100644 --- a/xpfe/browser/resources/locale/en-US/region.properties +++ b/xpfe/browser/resources/locale/en-US/region.properties @@ -1,5 +1,5 @@ # navigator.properties -homePageDefault=http://www.mozilla.org/ +homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html keywordList=http://home.netscape.com/escapes/keywords webmailKeyword=http://webmail.netscape.com fallbackDefaultSearchURL=http://www.google.com/search?q= @@ -7,8 +7,8 @@ otherSearchURL=http://www.google.com # # all.js # -browser.startup.homepage=http://www.mozilla.org/projects/seamonkey/start/ -browser.throbber.url=http://www.mozilla.org/projects/seamonkey/ +browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html +browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html browser.search.defaulturl=http://www.google.com/search?q= general.useragent.contentlocale=US @@ -17,4 +17,4 @@ browser.translation.serviceDomain=translate.google.com #config.js # -startup.homepage_override_url=http://www.mozilla.org/projects/seamonkey/start/ +startup.homepage_override_url=file:///usr/share/ubuntu-artwork/home/index.html -- 1.4.4.4