Changeset View
Changeset View
Standalone View
Standalone View
src/dolphintabpage.cpp
Show First 20 Lines • Show All 314 Lines • ▼ Show 20 Line(s) | 313 | } else { | |||
---|---|---|---|---|---|
315 | if (m_secondaryViewContainer) { | 315 | if (m_secondaryViewContainer) { | ||
316 | m_secondaryViewContainer->setActive(false); | 316 | m_secondaryViewContainer->setActive(false); | ||
317 | } | 317 | } | ||
318 | } | 318 | } | ||
319 | } | 319 | } | ||
320 | 320 | | |||
321 | const DolphinView* newActiveView = activeViewContainer()->view(); | 321 | const DolphinView* newActiveView = activeViewContainer()->view(); | ||
322 | 322 | | |||
323 | if (newActiveView != oldActiveView) { | 323 | if (newActiveView == oldActiveView) { | ||
324 | return; | ||||
325 | } | ||||
326 | | ||||
324 | disconnect(oldActiveView, &DolphinView::urlChanged, | 327 | disconnect(oldActiveView, &DolphinView::urlChanged, | ||
325 | this, &DolphinTabPage::activeViewUrlChanged); | 328 | this, &DolphinTabPage::activeViewUrlChanged); | ||
326 | disconnect(oldActiveView, &DolphinView::redirection, | 329 | disconnect(oldActiveView, &DolphinView::redirection, | ||
327 | this, &DolphinTabPage::slotViewUrlRedirection); | 330 | this, &DolphinTabPage::slotViewUrlRedirection); | ||
328 | connect(newActiveView, &DolphinView::urlChanged, | 331 | connect(newActiveView, &DolphinView::urlChanged, | ||
329 | this, &DolphinTabPage::activeViewUrlChanged); | 332 | this, &DolphinTabPage::activeViewUrlChanged); | ||
330 | connect(newActiveView, &DolphinView::redirection, | 333 | connect(newActiveView, &DolphinView::redirection, | ||
331 | this, &DolphinTabPage::slotViewUrlRedirection); | 334 | this, &DolphinTabPage::slotViewUrlRedirection); | ||
332 | } | | |||
333 | | ||||
334 | emit activeViewChanged(activeViewContainer()); | 335 | emit activeViewChanged(activeViewContainer()); | ||
335 | emit activeViewUrlChanged(activeViewContainer()->url()); | 336 | emit activeViewUrlChanged(activeViewContainer()->url()); | ||
336 | } | 337 | } | ||
337 | 338 | | |||
338 | void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl) | 339 | void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl) | ||
339 | { | 340 | { | ||
340 | Q_UNUSED(oldUrl); | 341 | Q_UNUSED(oldUrl); | ||
341 | 342 | | |||
Show All 29 Lines |