save
This commit is contained in:
parent
09bb58dcff
commit
0bb4d62545
|
@ -92,11 +92,11 @@ void WebBrowser::setHtml(const QString& html, const QUrl& base_url) {
|
|||
}
|
||||
|
||||
WebBrowser::~WebBrowser() {
|
||||
m_toolBar->removeAction(m_txtLocationAction);
|
||||
m_toolBar->removeAction(m_btnDiscoverFeedsAction);
|
||||
//m_toolBar->removeAction(m_txtLocationAction);
|
||||
//m_toolBar->removeAction(m_btnDiscoverFeedsAction);
|
||||
|
||||
// Delete members. Do not use scoped pointers here.
|
||||
delete m_layout;
|
||||
//delete m_layout;
|
||||
}
|
||||
|
||||
double WebBrowser::verticalScrollBarPosition() const {
|
||||
|
@ -284,7 +284,9 @@ void WebBrowser::initializeLayout() {
|
|||
m_actionOpenInSystemBrowser->setEnabled(false);
|
||||
m_actionReadabilePage->setEnabled(false);
|
||||
|
||||
m_btnDiscoverFeedsAction->setDefaultWidget(m_btnDiscoverFeeds);
|
||||
m_btnDiscoverFeedsAction->setDefaultWidget(new QWidget(this));
|
||||
|
||||
//m_btnDiscoverFeedsAction->setDefaultWidget(m_btnDiscoverFeeds);
|
||||
|
||||
// Add needed actions into toolbar.
|
||||
m_toolBar->addAction(m_actionBack);
|
||||
|
@ -294,8 +296,8 @@ void WebBrowser::initializeLayout() {
|
|||
m_toolBar->addAction(m_actionOpenInSystemBrowser);
|
||||
m_toolBar->addAction(m_actionReadabilePage);
|
||||
|
||||
m_toolBar->addAction(m_btnDiscoverFeedsAction);
|
||||
m_txtLocationAction = m_toolBar->addWidget(m_txtLocation);
|
||||
//m_toolBar->addAction(m_btnDiscoverFeedsAction);
|
||||
//m_txtLocationAction = m_toolBar->addWidget(m_txtLocation);
|
||||
|
||||
m_loadingProgress = new QProgressBar(this);
|
||||
m_loadingProgress->setFixedHeight(10);
|
||||
|
|
Loading…
Reference in New Issue