summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-03-07 22:21:23 -0600
committerTimothy Pearson <[email protected]>2012-03-07 22:21:23 -0600
commitb6609bb30d91121e98eb2bbe2cf89ff144680e84 (patch)
tree5d8a9133155e9e2e9cde60e2cc3670de03ae5d35 /konqueror
parent2242eb95a7bcd686207e2043340fed5ccc8b7609 (diff)
parent56a663b7c2cf18978a349015b6e19f1d898e8bb9 (diff)
downloadtdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.tar.gz
tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/konq_guiclients.cc9
-rw-r--r--konqueror/konq_mainwindow.cc18
-rw-r--r--konqueror/konq_mainwindow.h1
3 files changed, 24 insertions, 4 deletions
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index caf909d68..5a9742ae4 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -104,8 +104,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
openInSameWindow.setAttribute( "name", "sameview" );
openInSameWindow.setAttribute( "group", "tabhandling" );
menu.appendChild( openInSameWindow );
-
- TQDomElement openInWindow = m_doc.createElement( "action" );
+
+ TQDomElement openInWindow = m_doc.createElement( "action" );
openInWindow.setAttribute( "name", "newview" );
openInWindow.setAttribute( "group", "tabhandling" );
menu.appendChild( openInWindow );
@@ -115,6 +115,11 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
openInTabElement.setAttribute( "group", "tabhandling" );
menu.appendChild( openInTabElement );
+ TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
+ openInTabFrontElement.setAttribute( "name", "openintabfront" );
+ openInTabFrontElement.setAttribute( "group", "tabhandling" );
+ menu.appendChild( openInTabFrontElement );
+
TQDomElement separatorElement = m_doc.createElement( "separator" );
separatorElement.setAttribute( "group", "tabhandling" );
menu.appendChild( separatorElement );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index f6f4759e9..bc9bc4135 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -2726,6 +2726,14 @@ void KonqMainWindow::slotPopupThisWindow()
openURL( 0L, popupItems.getFirst()->url() );
}
+void KonqMainWindow::slotPopupNewTabAtFront()
+{
+ KConfig *config = KGlobal::config();
+ KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
+ bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
+ popupNewTab(true, openAfterCurrentPage);
+}
+
void KonqMainWindow::slotPopupNewTab()
{
bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
@@ -4782,8 +4790,14 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
else
tab_new_x = "tab_new_bg" ;
- actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
- actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );
+ KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
+ actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
+ KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
+ actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
+ actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+ actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
+ actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
+ actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
doTabHandling = true;
}
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index f5068d98f..12e7d8df4 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -444,6 +444,7 @@ protected slots:
void slotPopupNewWindow();
void slotPopupThisWindow();
void slotPopupNewTab();
+ void slotPopupNewTabAtFront();
void slotPopupNewTabRight();
void slotPopupPasteTo();
void slotRemoveView();