|
|
@ -96,8 +96,11 @@ WBBrowserWindow::WBBrowserWindow(QWidget *parent, Ui::MainWindow* uniboardMainWi |
|
|
|
defaultSettings->setAttribute(QWebSettings::PluginsEnabled, true); |
|
|
|
defaultSettings->setAttribute(QWebSettings::PluginsEnabled, true); |
|
|
|
|
|
|
|
|
|
|
|
setupMenu(); |
|
|
|
setupMenu(); |
|
|
|
if(!isViewerWebInstance) |
|
|
|
// if(!isViewerWebInstance)
|
|
|
|
setupToolBar(); |
|
|
|
setupToolBar(); |
|
|
|
|
|
|
|
// else{
|
|
|
|
|
|
|
|
// setupToolBarForTutorial();
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
QVBoxLayout *layout = new QVBoxLayout; |
|
|
|
QVBoxLayout *layout = new QVBoxLayout; |
|
|
|
layout->setSpacing(0); |
|
|
|
layout->setSpacing(0); |
|
|
@ -215,6 +218,39 @@ void WBBrowserWindow::setupToolBar() |
|
|
|
mWebToolBar->show(); |
|
|
|
mWebToolBar->show(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void WBBrowserWindow::setupToolBarForTutorial() |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
mWebToolBar = mUniboardMainWindow->tutorialToolBar; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mTabWidget->addWebAction(mUniboardMainWindow->actionWebBack, QWebPage::Back); |
|
|
|
|
|
|
|
mTabWidget->addWebAction(mUniboardMainWindow->actionWebForward, QWebPage::Forward); |
|
|
|
|
|
|
|
// mTabWidget->addWebAction(mUniboardMainWindow->actionWebReload, QWebPage::Reload);
|
|
|
|
|
|
|
|
// mTabWidget->addWebAction(mUniboardMainWindow->actionStopLoading, QWebPage::Stop);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mTabWidget->lineEditStack());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// mSearchToolBar = new WBToolbarSearch(mWebToolBar);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// mSearchAction = mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mSearchToolBar);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// connect(mSearchToolBar, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// mChaseWidget = new WBChaseWidget(this);
|
|
|
|
|
|
|
|
// mWebToolBar->insertWidget(mUniboardMainWindow->actionWebBigger, mChaseWidget);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// mWebToolBar->insertSeparator(mUniboardMainWindow->actionWebBigger);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// connect(mUniboardMainWindow->actionHome, SIGNAL(triggered()), this , SLOT(slotHome()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// connect(mUniboardMainWindow->actionBookmarks, SIGNAL(triggered()), this , SLOT(bookmarks()));
|
|
|
|
|
|
|
|
// connect(mUniboardMainWindow->actionAddBookmark, SIGNAL(triggered()), this , SLOT(addBookmark()));
|
|
|
|
|
|
|
|
// connect(mUniboardMainWindow->actionWebBigger, SIGNAL(triggered()), this , SLOT(slotViewZoomIn()));
|
|
|
|
|
|
|
|
// connect(mUniboardMainWindow->actionWebSmaller, SIGNAL(triggered()), this , SLOT(slotViewZoomOut()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mWebToolBar->show(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void WBBrowserWindow::adaptToolBar(bool wideRes) |
|
|
|
void WBBrowserWindow::adaptToolBar(bool wideRes) |
|
|
|
{ |
|
|
|
{ |
|
|
|