зеркало из https://github.com/mozilla/pjs.git
Minimo only. Get spacing right. Also enabled global history
This commit is contained in:
Родитель
05d1e61030
Коммит
9f41654bb3
|
@ -361,6 +361,9 @@ void DoPreferences()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
prefBranch->SetIntPref("snav.keyCode.modifier", 0);
|
prefBranch->SetIntPref("snav.keyCode.modifier", 0);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
prefBranch->GetBoolPref("config.wince.dumpJSConsole", &gDumpJSConsole);
|
prefBranch->GetBoolPref("config.wince.dumpJSConsole", &gDumpJSConsole);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -559,64 +562,66 @@ int main(int argc, char *argv[])
|
||||||
gtk_set_locale();
|
gtk_set_locale();
|
||||||
gtk_init(&argc, &argv);
|
gtk_init(&argc, &argv);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (DoesProcessAlreadyExist())
|
if (DoesProcessAlreadyExist())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
CreateSplashScreen();
|
CreateSplashScreen();
|
||||||
|
|
||||||
#ifdef HACKY_PRE_LOAD_LIBRARY
|
#ifdef HACKY_PRE_LOAD_LIBRARY
|
||||||
LoadKnownLibs();
|
LoadKnownLibs();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _BUILD_STATIC_BIN
|
#ifdef _BUILD_STATIC_BIN
|
||||||
NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
|
NS_InitEmbedding(nsnull, nsnull, kPStaticModules, kStaticModuleCount);
|
||||||
#else
|
#else
|
||||||
NS_InitEmbedding(nsnull, nsnull);
|
NS_InitEmbedding(nsnull, nsnull);
|
||||||
#endif
|
#endif
|
||||||
// Choose the new profile
|
// Choose the new profile
|
||||||
if (NS_FAILED(StartupProfile()))
|
if (NS_FAILED(StartupProfile()))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
DoPreferences();
|
DoPreferences();
|
||||||
OverrideComponents();
|
OverrideComponents();
|
||||||
|
|
||||||
NS_TIMELINE_ENTER("appStartup");
|
NS_TIMELINE_ENTER("appStartup");
|
||||||
nsCOMPtr<nsIAppShell> appShell = do_CreateInstance(kAppShellCID);
|
nsCOMPtr<nsIAppShell> appShell = do_CreateInstance(kAppShellCID);
|
||||||
appShell->Create(nsnull, nsnull);
|
appShell->Create(nsnull, nsnull);
|
||||||
|
|
||||||
ApplicationObserver *appObserver = new ApplicationObserver(appShell);
|
ApplicationObserver *appObserver = new ApplicationObserver(appShell);
|
||||||
if (!appObserver)
|
if (!appObserver)
|
||||||
return 1;
|
return 1;
|
||||||
NS_ADDREF(appObserver);
|
NS_ADDREF(appObserver);
|
||||||
|
|
||||||
WindowCreator *creatorCallback = new WindowCreator(appShell);
|
WindowCreator *creatorCallback = new WindowCreator(appShell);
|
||||||
if (!creatorCallback)
|
if (!creatorCallback)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
|
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
|
||||||
wwatch->SetWindowCreator(creatorCallback);
|
wwatch->SetWindowCreator(creatorCallback);
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMWindow> newWindow;
|
nsCOMPtr<nsIDOMWindow> newWindow;
|
||||||
wwatch->OpenWindow(nsnull, start_url, "_blank", "chrome,dialog=no,all", nsnull, getter_AddRefs(newWindow));
|
wwatch->OpenWindow(nsnull, start_url, "_blank", "chrome,dialog=no,all", nsnull, getter_AddRefs(newWindow));
|
||||||
|
|
||||||
appShell->Run();
|
appShell->Run();
|
||||||
|
|
||||||
appShell = nsnull;
|
appShell = nsnull;
|
||||||
wwatch = nsnull;
|
wwatch = nsnull;
|
||||||
newWindow = nsnull;
|
newWindow = nsnull;
|
||||||
|
|
||||||
delete appObserver;
|
delete appObserver;
|
||||||
delete creatorCallback;
|
delete creatorCallback;
|
||||||
|
|
||||||
if (gDumpJSConsole)
|
if (gDumpJSConsole)
|
||||||
WriteConsoleLog();
|
WriteConsoleLog();
|
||||||
|
|
||||||
// Close down Embedding APIs
|
// Close down Embedding APIs
|
||||||
NS_TermEmbedding();
|
NS_TermEmbedding();
|
||||||
|
|
||||||
#ifdef HACKY_PRE_LOAD_LIBRARY
|
#ifdef HACKY_PRE_LOAD_LIBRARY
|
||||||
UnloadKnownLibs();
|
UnloadKnownLibs();
|
||||||
#endif
|
#endif
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,33 +1,33 @@
|
||||||
xpconect
|
xpconect
|
||||||
mozuconv
|
mozuconv
|
||||||
i18n
|
i18n
|
||||||
necko
|
necko
|
||||||
jar50
|
jar50
|
||||||
rdf
|
rdf
|
||||||
pref
|
pref
|
||||||
caps
|
caps
|
||||||
gkparser
|
gkparser
|
||||||
gkgfxwin
|
gkgfxwin
|
||||||
imglib2
|
imglib2
|
||||||
gkwidget
|
gkwidget
|
||||||
gklayout
|
gklayout
|
||||||
docshell
|
docshell
|
||||||
embedcmp
|
embedcmp
|
||||||
webbrwsr
|
webbrwsr
|
||||||
texteditor
|
texteditor
|
||||||
txmgr
|
txmgr
|
||||||
appshell
|
appshell
|
||||||
chrome
|
chrome
|
||||||
mork
|
mork
|
||||||
tkitcmps
|
tkitcmps
|
||||||
xmlextra
|
xmlextra
|
||||||
t8iix
|
t8iix
|
||||||
websrvcs
|
websrvcs
|
||||||
gkplugin
|
gkplugin
|
||||||
softkey
|
softkey
|
||||||
pipboot
|
pipboot
|
||||||
pipnss
|
pipnss
|
||||||
pippki
|
pippki
|
||||||
phone
|
phone
|
||||||
snav
|
snav
|
||||||
ssr
|
ssr
|
||||||
|
|
|
@ -1,33 +1,33 @@
|
||||||
xpconnect
|
xpconnect
|
||||||
nsUConvModule
|
nsUConvModule
|
||||||
nsI18nModule
|
nsI18nModule
|
||||||
necko_core_and_primary_protocols
|
necko_core_and_primary_protocols
|
||||||
nsJarModule
|
nsJarModule
|
||||||
nsPrefModule
|
nsPrefModule
|
||||||
nsSecurityManagerModule
|
nsSecurityManagerModule
|
||||||
nsRDFModule
|
nsRDFModule
|
||||||
nsParserModule
|
nsParserModule
|
||||||
nsGfxModule
|
nsGfxModule
|
||||||
nsImageLib2Module
|
nsImageLib2Module
|
||||||
nsPluginModule
|
nsPluginModule
|
||||||
nsWidgetModule
|
nsWidgetModule
|
||||||
nsLayoutModule
|
nsLayoutModule
|
||||||
docshell_provider
|
docshell_provider
|
||||||
embedcomponents
|
embedcomponents
|
||||||
Browser_Embedding_Module
|
Browser_Embedding_Module
|
||||||
nsEditorModule
|
nsEditorModule
|
||||||
nsTransactionManagerModule
|
nsTransactionManagerModule
|
||||||
appshell
|
appshell
|
||||||
nsChromeModule
|
nsChromeModule
|
||||||
nsMorkModule
|
nsMorkModule
|
||||||
nsToolkitCompsModule
|
nsToolkitCompsModule
|
||||||
nsXMLExtrasModule
|
nsXMLExtrasModule
|
||||||
TransformiixModule
|
TransformiixModule
|
||||||
nsWebServicesModule
|
nsWebServicesModule
|
||||||
SoftKeyBoardModule
|
SoftKeyBoardModule
|
||||||
BOOT
|
BOOT
|
||||||
NSS
|
NSS
|
||||||
PKI
|
PKI
|
||||||
nsPhoneSupportModule
|
nsPhoneSupportModule
|
||||||
SpatialNavigationModule
|
SpatialNavigationModule
|
||||||
SSRModule
|
SSRModule
|
||||||
|
|
|
@ -223,9 +223,14 @@ function browserInit(refTab)
|
||||||
|
|
||||||
getBrowser().addProgressListener(BrowserStatusHandler, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
|
getBrowser().addProgressListener(BrowserStatusHandler, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
|
||||||
gBrowserStatusHandlerArray.push(BrowserStatusHandler);
|
gBrowserStatusHandlerArray.push(BrowserStatusHandler);
|
||||||
|
|
||||||
var refBrowser=getBrowser().getBrowserForTab(refTab);
|
var refBrowser=getBrowser().getBrowserForTab(refTab);
|
||||||
var webNavigation=refBrowser.webNavigation;
|
var webNavigation=refBrowser.webNavigation;
|
||||||
webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"].createInstance(Components.interfaces.nsISHistory);
|
webNavigation.sessionHistory = Components.classes["@mozilla.org/browser/shistory;1"].createInstance(Components.interfaces.nsISHistory);
|
||||||
|
|
||||||
|
// enable global history
|
||||||
|
getBrowser().docShell.QueryInterface(Components.interfaces.nsIDocShellHistory).useGlobalHistory = true;
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
alert("Error trying to startup browser. Please report this as a bug:\n" + e);
|
alert("Error trying to startup browser. Please report this as a bug:\n" + e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,3 +154,4 @@ pref("security.warn_submit_insecure", false);
|
||||||
pref("network.autodial-helper.enabled", true);
|
pref("network.autodial-helper.enabled", true);
|
||||||
|
|
||||||
pref("config.wince.useOKBtn", true);
|
pref("config.wince.useOKBtn", true);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче