Attachment #208 for bug #245

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 245
Collapse All | Expand All




    layout->addSpacing( 20 );
    layout->addStretch();

    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
    connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
    connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
    connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));

void advancedTabDialog::load()
{
    m_pConfig->setGroup("FMSettings");
    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
    m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
    m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
    m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );

void advancedTabDialog::save()
{
    m_pConfig->setGroup("FMSettings");
    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
    m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
    m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
    m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );




                </property>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>m_pNewTabsInBackground</cstring>
                    </property>
                    <property name="text">
                        <string>O&amp;pen new tabs in the background</string>
                    </property>
                    <property name="whatsThis" stdset="0">
                        <string>This will open a new tab in the background, instead of in the foreground.</string>
                    </property>
                </widget>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>m_pOpenAfterCurrentPage</cstring>
                    </property>
                    <property name="text">




    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();
    bool newTabsInFront = KonqSettings::newTabsInFront();

    if (KApplication::keyboardMouseState() & ShiftButton)
      newTabsInFront = !newTabsInFront;

    popupNewTab(false, openAfterCurrentPage);
}

void KonqMainWindow::slotPopupNewTabRight()

  KFileItemListIterator it ( popupItems );
  KonqOpenURLRequest req;
  req.newTab = true;
  req.newTabInFront = infront;
  req.openAfterCurrentPage = openAfterCurrentPage;
  req.args = popupUrlArgs;

  for ( ; it.current(); ++it )
  {
    openURL( 0L, (*it)->url(), QString::null, req );
    {
      req.newTabInFront = true;
    }
    openURL( 0L, (*it)->url(), TQString::null, req );
  }
}


  reloadShortcut.append(KKey(CTRL + Key_R));
  m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
  m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );

  m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );

  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );

      else
        tab_new_x = "tab_new_bg" ;

      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;
  }


Lines 444-449 Link Here

(-)/dev/shm/kdebase/konqueror/konq_mainwindow.h (+1 lines)
444	void slotPopupNewWindow();	444	void slotPopupNewWindow();
445	void slotPopupThisWindow();	445	void slotPopupThisWindow();
446	void slotPopupNewTab();	446	void slotPopupNewTab();
		447	void slotPopupNewTabAtFront();
447	void slotPopupNewTabRight();	448	void slotPopupNewTabRight();
448	void slotPopupPasteTo();	449	void slotPopupPasteTo();
449	void slotRemoveView();	450	void slotRemoveView();

Return to bug 245

Lines 51-67 Link Here

(-)/dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui (-11 lines)
51	</property>	51	</property>
52	<widget class="TQCheckBox">	52	<widget class="TQCheckBox">
53	<property name="name">	53	<property name="name">
54	<cstring>m_pNewTabsInBackground</cstring>
55	</property>
56	<property name="text">
57	<string>O&pen new tabs in the background</string>
58	</property>
59	<property name="whatsThis" stdset="0">
60	<string>This will open a new tab in the background, instead of in the foreground.</string>
61	</property>
62	</widget>
63	<widget class="TQCheckBox">
64	<property name="name">
65	<cstring>m_pOpenAfterCurrentPage</cstring>	54	<cstring>m_pOpenAfterCurrentPage</cstring>
66	</property>	55	</property>
67	<property name="text">	56	<property name="text">

Lines 2726-2740 Link Here

(-)/dev/shm/kdebase/konqueror/konq_mainwindow.cc (-11 / +21 lines)
2726	openURL( 0L, popupItems.getFirst()->url() );	2726	openURL( 0L, popupItems.getFirst()->url() );
2727	}	2727	}
2728		2728
		2729	void KonqMainWindow::slotPopupNewTabAtFront()
		2730	{
		2731	KConfig *config = KGlobal::config();
		2732	KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
		2733	bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
		2734	popupNewTab(true, openAfterCurrentPage);
		2735	}
		2736
2729	void KonqMainWindow::slotPopupNewTab()	2737	void KonqMainWindow::slotPopupNewTab()
2730	{	2738	{
2731	bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();	2739	bool openAfterCurrentPage = KonqSettings::openAfterCurrentPage();
2732	bool newTabsInFront = KonqSettings::newTabsInFront();	2740	bool newTabsInFront = KonqSettings::newTabsInFront();
2733		2741
2734	if (KApplication::keyboardMouseState() & TQt::ShiftButton)	2742	if (KApplication::keyboardMouseState() & ShiftButton)
2735	newTabsInFront = !newTabsInFront;	2743	newTabsInFront = !newTabsInFront;
2736		2744
2737	popupNewTab(newTabsInFront, openAfterCurrentPage);	2745	popupNewTab(false, openAfterCurrentPage);
2738	}	2746	}
2739		2747
2740	void KonqMainWindow::slotPopupNewTabRight()	2748	void KonqMainWindow::slotPopupNewTabRight()
Lines 2754-2770 Link Here
2754	KFileItemListIterator it ( popupItems );	2762	KFileItemListIterator it ( popupItems );
2755	KonqOpenURLRequest req;	2763	KonqOpenURLRequest req;
2756	req.newTab = true;	2764	req.newTab = true;
2757	req.newTabInFront = false;	2765	req.newTabInFront = infront;
2758	req.openAfterCurrentPage = openAfterCurrentPage;	2766	req.openAfterCurrentPage = openAfterCurrentPage;
2759	req.args = popupUrlArgs;	2767	req.args = popupUrlArgs;
2760		2768
2761	for ( ; it.current(); ++it )	2769	for ( ; it.current(); ++it )
2762	{	2770	{
2763	if ( infront && it.atLast() )	2771	openURL( 0L, (*it)->url(), QString::null, req );
2764	{
2765	req.newTabInFront = true;
2766	}
2767	openURL( 0L, (*it)->url(), TQString::null, req );
2768	}	2772	}
2769	}	2773	}
2770		2774
Lines 3926-3932 Link Here
3926	reloadShortcut.append(KKey(CTRL + Key_R));	3930	reloadShortcut.append(KKey(CTRL + Key_R));
3927	m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );	3931	m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
3928	m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );	3932	m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
3929		3933
3930	m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );	3934	m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
3931		3935
3932	m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );	3936	m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
Lines 4782-4789 Link Here
4782	else	4786	else
4783	tab_new_x = "tab_new_bg" ;	4787	tab_new_x = "tab_new_bg" ;
4784		4788
4785	actNewTab = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );	4789	KAction *actNewTab = new KAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
4786	actNewTab->setToolTip( i18n( "Open the document in a new tab" ) );	4790	actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
		4791	KAction *actNewTabFront = new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
		4792	actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
		4793	actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
		4794	actNewTabFront = new KAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
		4795	actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
		4796	actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
4787	doTabHandling = true;	4797	doTabHandling = true;
4788	}	4798	}
4789		4799

Lines 58-64 Link Here

(-)/dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp (-3 lines)
58	layout->addSpacing( 20 );	58	layout->addSpacing( 20 );
59	layout->addStretch();	59	layout->addStretch();
60		60
61	connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
62	connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	61	connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
63	connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	62	connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
64	connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	63	connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
Lines 76-82 Link Here
76	void advancedTabDialog::load()	75	void advancedTabDialog::load()
77	{	76	{
78	m_pConfig->setGroup("FMSettings");	77	m_pConfig->setGroup("FMSettings");
79	m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
80	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );	78	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
81	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );	79	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
82	m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );	80	m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
Lines 92-98 Link Here
92	void advancedTabDialog::save()	90	void advancedTabDialog::save()
93	{	91	{
94	m_pConfig->setGroup("FMSettings");	92	m_pConfig->setGroup("FMSettings");
95	m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
96	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );	93	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
97	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );	94	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
98	m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );	95	m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );

Lines 104-111 Link Here

(-)/dev/shm/kdebase/konqueror/konq_guiclients.cc (-2 / +7 lines)
104	openInSameWindow.setAttribute( "name", "sameview" );	104	openInSameWindow.setAttribute( "name", "sameview" );
105	openInSameWindow.setAttribute( "group", "tabhandling" );	105	openInSameWindow.setAttribute( "group", "tabhandling" );
106	menu.appendChild( openInSameWindow );	106	menu.appendChild( openInSameWindow );
107		107
108	TQDomElement openInWindow = m_doc.createElement( "action" );	108	TQDomElement openInWindow = m_doc.createElement( "action" );
109	openInWindow.setAttribute( "name", "newview" );	109	openInWindow.setAttribute( "name", "newview" );
110	openInWindow.setAttribute( "group", "tabhandling" );	110	openInWindow.setAttribute( "group", "tabhandling" );
111	menu.appendChild( openInWindow );	111	menu.appendChild( openInWindow );
Lines 115-120 Link Here
115	openInTabElement.setAttribute( "group", "tabhandling" );	115	openInTabElement.setAttribute( "group", "tabhandling" );
116	menu.appendChild( openInTabElement );	116	menu.appendChild( openInTabElement );
117		117
		118	TQDomElement openInTabFrontElement = m_doc.createElement( "action" );
		119	openInTabFrontElement.setAttribute( "name", "openintabfront" );
		120	openInTabFrontElement.setAttribute( "group", "tabhandling" );
		121	menu.appendChild( openInTabFrontElement );
		122
118	TQDomElement separatorElement = m_doc.createElement( "separator" );	123	TQDomElement separatorElement = m_doc.createElement( "separator" );
119	separatorElement.setAttribute( "group", "tabhandling" );	124	separatorElement.setAttribute( "group", "tabhandling" );
120	menu.appendChild( separatorElement );	125	menu.appendChild( separatorElement );