diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/application.cpp | 15 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/rekonq.kcfg | 3 | ||||
| -rw-r--r-- | src/settings_general.ui | 10 | ||||
| -rw-r--r-- | src/tabbar.cpp | 57 |
5 files changed, 60 insertions, 31 deletions
diff --git a/src/application.cpp b/src/application.cpp index b5d2d292..f16b831d 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -87,6 +87,16 @@ int Application::newInstance() { KCmdLineArgs::setCwd(QDir::currentPath().toUtf8()); KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + + // we share one process for several mainwindows, + // so initialize only once + static bool first = true; + + if (first) + { + QTimer::singleShot(0, this, SLOT(postLaunch())); + first = false; + } // is your app session restored? restore session... // this mechanism also falls back to load usual plain rekonq @@ -151,6 +161,10 @@ void Application::postLaunch() Application::historyManager(); Application::sessionManager(); + + // bookmarks loading + connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), + Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); } @@ -400,7 +414,6 @@ MainWindow *Application::newMainWindow() m_mainWindows.prepend(w); w->show(); - QTimer::singleShot(0, this, SLOT(postLaunch())); return w; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ac9b83bb..59b69a32 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -204,10 +204,6 @@ void MainWindow::postLaunch() // Find Bar signal connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(slotFind(const QString &))); - // bookmarks loading - connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), - Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); - // setting up toolbars to NOT have context menu enabled setContextMenuPolicy(Qt::DefaultContextMenu); @@ -363,7 +359,7 @@ void MainWindow::setupActions() // Bookmark Menu KActionMenu *bmMenu = Application::bookmarkProvider()->bookmarkActionMenu(this); - bmMenu->setIcon(KIcon("rating")); + bmMenu->setIcon(KIcon("bookmarks-organize")); bmMenu->setDelayed(false); actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu); diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index 0bffa53d..0a63922f 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -44,6 +44,9 @@ <entry name="openTabsNearCurrent" type="Bool"> <default>false</default> </entry> + <entry name="alwaysShowTabPreviews" type="Bool"> + <default>true</default> + </entry> </group> <!-- Fonts Settings --> diff --git a/src/settings_general.ui b/src/settings_general.ui index d12d254f..844a0073 100644 --- a/src/settings_general.ui +++ b/src/settings_general.ui @@ -139,6 +139,16 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="kcfg_alwaysShowTabPreviews"> + <property name="text"> + <string>Always show tab previews</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 815a153d..569a59c5 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -32,6 +32,7 @@ #include "tabbar.moc" // Local Includes +#include "rekonq.h" #include "application.h" #include "mainwindow.h" #include "urlbar.h" @@ -265,47 +266,53 @@ void TabBar::showTabPreview(int tab) void TabBar::mouseMoveEvent(QMouseEvent *event) { - //Find the tab under the mouse - int i = 0; - int tab = -1; - while (i<count() && tab==-1) + if (ReKonfig::alwaysShowTabPreviews()) { - if (tabRect(i).contains(event->pos())) + //Find the tab under the mouse + int i = 0; + int tab = -1; + while (i<count() && tab==-1) { - tab = i; + if (tabRect(i).contains(event->pos())) + { + tab = i; + } + i++; } - i++; - } - //if found and not the current tab then show tab preview - if (tab != -1 && tab != currentIndex() && m_currentTabPreview != tab) - { - showTabPreview(tab); - m_currentTabPreview = tab; - } + //if found and not the current tab then show tab preview + if (tab != -1 && tab != currentIndex() && m_currentTabPreview != tab) + { + showTabPreview(tab); + m_currentTabPreview = tab; + } - //if current tab or not found then hide previous tab preview - if (tab==currentIndex() || tab==-1) - { - if ( m_previewPopup) + //if current tab or not found then hide previous tab preview + if (tab==currentIndex() || tab==-1) { - m_previewPopup->hide(); + if ( m_previewPopup) + { + m_previewPopup->hide(); + } + m_currentTabPreview = -1; } - m_currentTabPreview = -1; } - + KTabBar::mouseMoveEvent(event); } void TabBar::leaveEvent(QEvent *event) { - //if leave tabwidget then hide previous tab preview - if ( m_previewPopup) + if (ReKonfig::alwaysShowTabPreviews()) { - m_previewPopup->hide(); + //if leave tabwidget then hide previous tab preview + if ( m_previewPopup) + { + m_previewPopup->hide(); + } + m_currentTabPreview = -1; } - m_currentTabPreview = -1; KTabBar::leaveEvent(event); } |