i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some notifications are now channeled through BWebPage, the loading progress and

Browse Source 
status. This allows the browser to set those properties to the current page
when switching pages.

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@333 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2012-07-03 15:38:18 +02:00
committed by Alexandre Deckner
parent 0fc94bdcbc
commit cb8b9e4ffd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BrowserWindow.cpp
+7 -5
View File
@@ -832,7 +832,7 @@ BrowserWindow::CreateNewTab(const BString& url, bool select, BWebView* webView)
if (select) { if (select) {
fTabManager->SelectTab(fTabManager->CountTabs() - 1); fTabManager->SelectTab(fTabManager->CountTabs() - 1);
SetCurrentWebView(webView); SetCurrentWebView(webView);
NavigationCapabilitiesChanged(false, false, false, webView); webView->WebPage()->ResendNotifications();
if (fURLTextControl) { if (fURLTextControl) {
fURLTextControl->SetText(url.String()); fURLTextControl->SetText(url.String());
fURLTextControl->MakeFocus(true); fURLTextControl->MakeFocus(true);
@@ -880,7 +880,7 @@ BrowserWindow::LoadNegotiating(const BString& url, BWebView* view)
{ {
BString status("Requesting: "); BString status("Requesting: ");
status << url; status << url;
StatusChanged(status, view); view->WebPage()->SetStatusMessage(status);
} }
@@ -896,7 +896,7 @@ BrowserWindow::LoadCommitted(const BString& url, BWebView* view)
BString status("Loading: "); BString status("Loading: ");
status << url; status << url;
StatusChanged(status, view); view->WebPage()->SetStatusMessage(status);
} }
@@ -909,6 +909,8 @@ BrowserWindow::LoadProgress(float progress, BWebView* view)
if (fLoadingProgressBar) { if (fLoadingProgressBar) {
if (progress < 100 && fLoadingProgressBar->IsHidden()) if (progress < 100 && fLoadingProgressBar->IsHidden())
fLoadingProgressBar->Show(); fLoadingProgressBar->Show();
else if (progress == 100 && !fLoadingProgressBar->IsHidden())
fLoadingProgressBar->Hide();
fLoadingProgressBar->SetTo(progress); fLoadingProgressBar->SetTo(progress);
} }
} }
@@ -922,7 +924,7 @@ BrowserWindow::LoadFailed(const BString& url, BWebView* view)
BString status(url); BString status(url);
status << " failed."; status << " failed.";
StatusChanged(status, view); view->WebPage()->SetStatusMessage(status);
if (fLoadingProgressBar && !fLoadingProgressBar->IsHidden()) if (fLoadingProgressBar && !fLoadingProgressBar->IsHidden())
fLoadingProgressBar->Hide(); fLoadingProgressBar->Hide();
} }
@@ -936,7 +938,7 @@ BrowserWindow::LoadFinished(const BString& url, BWebView* view)
BString status(url); BString status(url);
status << " finished."; status << " finished.";
StatusChanged(status, view); view->WebPage()->SetStatusMessage(status);
if (fLoadingProgressBar && !fLoadingProgressBar->IsHidden()) if (fLoadingProgressBar && !fLoadingProgressBar->IsHidden())
fLoadingProgressBar->Hide(); fLoadingProgressBar->Hide();