diff options
| -rw-r--r-- | src/application.cpp | 9 | ||||
| -rw-r--r-- | src/mainview.cpp | 6 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 10 | ||||
| -rw-r--r-- | src/tabbar.cpp | 4 |
4 files changed, 18 insertions, 11 deletions
diff --git a/src/application.cpp b/src/application.cpp index 366191f4..0fead4a6 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -167,7 +167,14 @@ int Application::newInstance() if (index > 0) { MainWindow *m = m_mainWindows.at(index - 1).data(); - m->activateWindow(); + if(m->isMinimized()) + m->showNormal(); + if( !m->isActiveWindow() ) + { + m->activateWindow(); + m->raise(); + } + Q_FOREACH(const KUrl &u, urlList) loadUrl(u, Rekonq::NewCurrentTab); } diff --git a/src/mainview.cpp b/src/mainview.cpp index a3f56958..33eb88af 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -518,7 +518,7 @@ void MainView::closeTab(int index, bool del) if (del) { - tab->deleteLater(); // tab is scheduled for deletion. + tab->deleteLater(); urlbar->deleteLater(); } @@ -716,7 +716,7 @@ void MainView::detachTab(int index) WebTab *tab = webTab(index); KUrl u = tab->url(); - kDebug() << u; + kDebug() << "detaching tab with url: " << u; if (u.scheme() == QL1S("about")) { closeTab(index); @@ -730,7 +730,7 @@ void MainView::detachTab(int index) MainWindow *w = Application::instance()->newMainWindow(false); w->mainView()->addTab(tab, Application::icon(u), label); - _widgetBar->insertWidget(0, bar); + w->mainView()->widgetBar()->insertWidget(0, bar); w->mainView()->updateTabBar(); } } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2aa67868..3e7c13b0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1320,10 +1320,10 @@ void MainWindow::populateEncodingMenu() m_encodingMenu->clear(); KMenu *isoMenu = new KMenu( QL1S("ISO"), m_encodingMenu); - KMenu *winMenu = new KMenu( QL1S("windows"), m_encodingMenu); - KMenu *isciiMenu = new KMenu( QL1S("Iscii"), m_encodingMenu); - KMenu *uniMenu = new KMenu( QL1S("UNICODE"), m_encodingMenu); - KMenu *otherMenu = new KMenu( QL1S("Other"), m_encodingMenu); + KMenu *winMenu = new KMenu( QL1S("Windows"), m_encodingMenu); + KMenu *isciiMenu = new KMenu( QL1S("ISCII"), m_encodingMenu); + KMenu *uniMenu = new KMenu( QL1S("Unicode"), m_encodingMenu); + KMenu *otherMenu = new KMenu( i18n("Other"), m_encodingMenu); QAction *a; bool isDefaultCodecUsed = true; @@ -1350,7 +1350,7 @@ void MainWindow::populateEncodingMenu() } } - a = new QAction( QL1S("Default"), this); + a = new QAction( i18nc("Default website encoding", "Default"), this); a->setCheckable(true); a->setChecked(isDefaultCodecUsed); diff --git a/src/tabbar.cpp b/src/tabbar.cpp index e8066715..2d29032f 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -206,6 +206,8 @@ void TabBar::mouseMoveEvent(QMouseEvent *event) QTimer::singleShot(200, view->addTabButton(), SLOT(hide())); } + KTabBar::mouseMoveEvent(event); + if (ReKonfig::alwaysShowTabPreviews()) { //Find the tab under the mouse @@ -243,8 +245,6 @@ void TabBar::mouseMoveEvent(QMouseEvent *event) m_currentTabPreviewIndex = -1; } } - - KTabBar::mouseMoveEvent(event); } |