Attachment #1554 for bug #910

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 910
Collapse All | Expand All

Lines 15-20 Link Here

(-)original/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp (+14 lines)
15	*	15	*
16	* You should have received a copy of the GNU General Public License	16	* You should have received a copy of the GNU General Public License
17	* along with this program; if not, write to the Free Software	17	* along with this program; if not, write to the Free Software
		18
		19	--------------------------------------------------------------
		20	Additional changes:
		21	- 2013/10/16 Michele Calgaro:
		22	* centralized "tabbed browsing" options in this dialog
18	*/	23	*/
19		24
20	#include <tqbuttongroup.h>	25	#include <tqbuttongroup.h>
Lines 58-63 Link Here
58	layout->addSpacing( 20 );	63	layout->addSpacing( 20 );
59	layout->addStretch();	64	layout->addStretch();
60		65
		66	connect(m_advancedWidget->m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
		67	connect(m_advancedWidget->m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
		68	connect(m_advancedWidget->m_pDynamicTabbarCycle, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
61	connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	69	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()));	70	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()));	71	connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
Lines 77-82 Link Here
77	void advancedTabDialog::load()	85	void advancedTabDialog::load()
78	{	86	{
79	m_pConfig->setGroup("FMSettings");	87	m_pConfig->setGroup("FMSettings");
		88	m_advancedWidget->m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
		89	m_advancedWidget->m_pDynamicTabbarHide->setChecked( !(m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
		90	m_advancedWidget->m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", false ) );
80	m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );	91	m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
81	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );	92	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
82	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );	93	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
Lines 98-103 Link Here
98	void advancedTabDialog::save()	109	void advancedTabDialog::save()
99	{	110	{
100	m_pConfig->setGroup("FMSettings");	111	m_pConfig->setGroup("FMSettings");
		112	m_pConfig->writeEntry( "MMBOpensTab", (m_advancedWidget->m_pShowMMBInTabs->isChecked()) );
		113	m_pConfig->writeEntry( "AlwaysTabbedMode", ( !(m_advancedWidget->m_pDynamicTabbarHide->isChecked())) );
		114	m_pConfig->writeEntry( "TabsCycleWheel", (m_advancedWidget->m_pDynamicTabbarCycle->isChecked()) );
101	m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );	115	m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
102	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );	116	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
103	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );	117	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );




                <cstring>TextLabel3</cstring>
            </property>
            <property name="text">
                <string>&lt;b&gt;Tab Options&lt;/b&gt;</string>
            </property>
        </widget>
        <widget class="Line">

                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQCheckBox">
                  <property name="name">
                    <cstring>m_pShowMMBInTabs</cstring>
                  </property>
                  <property name="text">
                    <string>Open &amp;links in new tab instead of in new window</string>
                  </property>
                  <property name="whatsThis" stdset="0">
                    <string>This will open a new tab instead of a new window in various situations, such as choosing a link or a folder with the middle mouse button.</string>
                  </property>             
                </widget>
                <widget class="TQCheckBox">
                  <property name="name">
                    <cstring>m_pDynamicTabbarHide</cstring>
                  </property>
                  <property name="text">
                    <string>&amp;Hide the tab bar when only one tab is open</string>
                  </property>
                  <property name="whatsThis" stdset="0">
                    <string>This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.</string>
                  </property>             
                </widget>
                <widget class="TQCheckBox">
                  <property name="name">
                    <cstring>m_pDynamicTabbarCycle</cstring>
                  </property>
                  <property name="text">
                    <string>C&amp;ycle tabs with mouse wheel</string>
                  </property>
                  <property name="whatsThis" stdset="0">
                    <string>This will cycle through tabs when there are two or more tabs using the mouse wheel.</string>
                  </property>             
                </widget>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>m_pNewTabsInBackground</cstring>
                    </property>




// (c) Sven Radej 1998
// (c) David Faure 1998
// (c) 2001 Waldo Bastian <bastian@kde.org>
//
// --------------------------------------------------------------
// - 2013/10/16 Michele Calgaro:
//   Move some options to the 'advancedTabDialog' dialog

#include <tqlayout.h>//CT - 12Nov1998
#include <tqwhatsthis.h>

    // Tabbed Browsing

    TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
    TQHBoxLayout *laytab = new TQHBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint());
    
    TQPushButton *advancedTabButton = new TQPushButton( i18n( "Show &tab options"), bgTabbedBrowsing );
    TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
                          "such as choosing a link or a folder with the middle mouse button.") );
    connect(m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
    laygroup->addWidget(m_pShowMMBInTabs);

    m_pDynamicTabbarHide = new TQCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing );
    TQWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") );
    connect(m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
    laygroup->addWidget(m_pDynamicTabbarHide);

    m_pDynamicTabbarCycle = new TQCheckBox( i18n( "C&ycle tabs with mouse wheel" ), bgTabbedBrowsing );
    TQWhatsThis::add( m_pDynamicTabbarCycle, i18n("This will cycle through tabs when there are two or more tabs.") );
    connect(m_pDynamicTabbarCycle, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
    laygroup->addWidget(m_pDynamicTabbarCycle);

    TQHBoxLayout *laytab = new TQHBoxLayout(laygroup, KDialog::spacingHint());
    TQPushButton *advancedTabButton = new TQPushButton( i18n( "Advanced Options"), bgTabbedBrowsing );
    laytab->addWidget(advancedTabButton);
    laytab->addStretch();
    connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog()));

    m_pMaxFormCompletionItems->setValue( m_pConfig->readNumEntry( "MaxFormCompletionItems", 10 ) );
    m_pMaxFormCompletionItems->setEnabled( m_pFormCompletionCheckBox->isChecked() );

    m_pConfig->setGroup("FMSettings");
    m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
    m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
    m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", true ) );

    TDEConfig config("kbookmarkrc", true, false);
    config.setReadDefaults( useDefaults );
	  config.setGroup("Bookmarks");
    m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
    m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );



    m_pConfig->writeEntry( "FormCompletion", m_pFormCompletionCheckBox->isChecked() );
    m_pConfig->writeEntry( "MaxFormCompletionItems", m_pMaxFormCompletionItems->value() );

    m_pConfig->setGroup("FMSettings");
    m_pConfig->writeEntry( "MMBOpensTab", m_pShowMMBInTabs->isChecked() );
    m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) );
    m_pConfig->writeEntry( "TabsCycleWheel", m_pDynamicTabbarCycle->isChecked() );
    m_pConfig->sync();

    TDEConfig config("kbookmarkrc", false, false);




//
// (c) Sven Radej 1998
// (c) David Faure 1998
//
// --------------------------------------------------------------
// - 2013/10/16 Michele Calgaro:
//   Move some options to the 'advancedTabDialog' dialog
    
#ifndef __KMISCHTML_OPTIONS_H
#define __KMISCHTML_OPTIONS_H


    TQCheckBox* m_pAutoRedirectCheckBox;
    TQCheckBox* m_pOpenMiddleClick;
    TQCheckBox* m_pBackRightClick;
    TQCheckBox* m_pShowMMBInTabs;
    TQCheckBox* m_pFormCompletionCheckBox;
    TQCheckBox* m_pDynamicTabbarHide;
    TQCheckBox* m_pDynamicTabbarCycle;
    TQCheckBox* m_pAdvancedAddBookmarkCheckBox;
    TQCheckBox* m_pOnlyMarkedBookmarksCheckBox;
    KIntNumInput* m_pMaxFormCompletionItems;

Lines 17-22 Link Here

(-)original/tdebase/konqueror/konq_mainwindow.cc (-4 / +12 lines)
17	along with this program; see the file COPYING. If not, write to	17	along with this program; see the file COPYING. If not, write to
18	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	18	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19	Boston, MA 02110-1301, USA.	19	Boston, MA 02110-1301, USA.
		20
		21	--------------------------------------------------------------
		22	Additional changes:
		23	- 2013/10/17 Michele Calgaro:
		24	* add support for updating tab options at runtime (no need to restart Konqueror
		25	or reload the profile
20	*/	26	*/
21		27
22	#include "konq_mainwindow.h"	28	#include "konq_mainwindow.h"
Lines 4234-4240 Link Here
4234	KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(docContainer);	4240	KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(docContainer);
4235	bool state = (tabContainer->count()>1);	4241	bool state = (tabContainer->count()>1);
4236	m_paRemoveTab->setEnabled( state );	4242	m_paRemoveTab->setEnabled( state );
4237	m_paRemoveOtherTabs->setEnabled( state );	4243	m_paRemoveOtherTabs->setEnabled( state );
4238	m_paBreakOffTab->setEnabled( state );	4244	m_paBreakOffTab->setEnabled( state );
4239	m_paActivateNextTab->setEnabled( state );	4245	m_paActivateNextTab->setEnabled( state );
4240	m_paActivatePrevTab->setEnabled( state );	4246	m_paActivatePrevTab->setEnabled( state );
Lines 4772-4779 Link Here
4772		4778
4773		4779
4774	// Those actions go into the PopupMenuGUIClient, since that's the one defining them.	4780	// Those actions go into the PopupMenuGUIClient, since that's the one defining them.
4775	TDEAction actNewWindow = 0L, actNewTab = 0L;	4781	TDEAction *actNewWindow = 0L;
4776	if( doTabHandling )	4782	if (doTabHandling)
4777	{	4783	{
4778	if (_args.forcesNewWindow()) {	4784	if (_args.forcesNewWindow()) {
4779	actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );	4785	actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
Lines 4879-4885 Link Here
4879	popupItems.clear();	4885	popupItems.clear();
4880		4886
4881	// Deleted by konqyMenuClient's actioncollection	4887	// Deleted by konqyMenuClient's actioncollection
4882	//delete actNewTab;
4883	//delete actNewWindow;	4888	//delete actNewWindow;
4884		4889
4885	delete actPaste;	4890	delete actPaste;
Lines 4979-4984 Link Here
4979	MapViews::ConstIterator end = m_mapViews.end();	4984	MapViews::ConstIterator end = m_mapViews.end();
4980	for (; it != end; ++it )	4985	for (; it != end; ++it )
4981	(*it)->reparseConfiguration();	4986	(*it)->reparseConfiguration();
		4987
		4988	// Push updates to KonqViewManager as well
		4989	viewManager()->reparseConfiguration();
4982	}	4990	}
4983		4991
4984	void KonqMainWindow::saveProperties( TDEConfig *config )	4992	void KonqMainWindow::saveProperties( TDEConfig *config )

Lines 17-22 Link Here

(-)original/tdebase/konqueror/konq_tabs.cc (+7 lines)
17	along with this program; if not, write to the Free Software	17	along with this program; if not, write to the Free Software
18	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,	18	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19	MA 02110-1301, USA.	19	MA 02110-1301, USA.
		20
		21	--------------------------------------------------------------
		22	Additional changes:
		23	- 2013/10/16 Michele Calgaro:
		24	add "scroll tabs on mouse wheel event" functionality
20	*/	25	*/
21		26
22	#include "konq_tabs.h"	27	#include "konq_tabs.h"
Lines 188-193 Link Here
188	TQT_SLOT( slotReceivedDropEvent( TQWidget , TQDropEvent ) ) );	193	TQT_SLOT( slotReceivedDropEvent( TQWidget , TQDropEvent ) ) );
189	connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )),	194	connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )),
190	TQT_SLOT( slotInitiateDrag( TQWidget * ) ) );	195	TQT_SLOT( slotInitiateDrag( TQWidget * ) ) );
		196
		197	setMouseWheelScroll(KonqSettings::tabsCycleWheel());
191	}	198	}
192		199
193	KonqFrameTabs::~KonqFrameTabs()	200	KonqFrameTabs::~KonqFrameTabs()

Lines 88-95 Link Here

(-)original/tdebase/konqueror/konq_tabs.h (-3 / +3 lines)
88		88
89		89
90	public slots:	90	public slots:
91	void slotCurrentChanged( TQWidget* newPage );	91	void slotCurrentChanged(TQWidget* newPage);
92	void setAlwaysTabbedMode( bool );	92	void setAlwaysTabbedMode(bool enable);
93		93
94	signals:	94	signals:
95	void ctrlTabPressed();	95	void ctrlTabPressed();
Lines 124-130 Link Here
124	bool m_permanentCloseButtons;	124	bool m_permanentCloseButtons;
125	bool m_alwaysTabBar;	125	bool m_alwaysTabBar;
126	bool m_MouseMiddleClickClosesTab;	126	bool m_MouseMiddleClickClosesTab;
127	int m_closeOtherTabsId;	127	int m_closeOtherTabsId;
128	};	128	};
129		129
130	#endif	130	#endif

Lines 16-21 Link Here

(-)original/tdebase/konqueror/konq_viewmgr.cc (-8 / +27 lines)
16	along with this program; if not, write to the Free Software	16	along with this program; if not, write to the Free Software
17	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	17	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18		18
		19	--------------------------------------------------------------
		20	Additional changes:
		21	- 2013/10/17 Michele Calgaro:
		22	* add "scroll tabs on mouse wheel event" functionality
		23	* add support for updating options at runtime (no need to restart Konqueror
		24	or reload the profile
19	*/	25	*/
20		26
21	#include "konq_viewmgr.h"	27	#include "konq_viewmgr.h"
Lines 78-86 Link Here
78	setActivePart( childView->part() );	84	setActivePart( childView->part() );
79	m_pDocContainer = childView->frame();	85	m_pDocContainer = childView->frame();
80		86
81	convertDocContainer();	87	convertDocContainer();
82	static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode(	88	static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode(KonqSettings::alwaysTabbedMode());
83	KonqSettings::alwaysTabbedMode() );	89	static_cast<KonqFrameTabs*>( m_pDocContainer )->setMouseWheelScroll(KonqSettings::tabsCycleWheel());
84		90
85	m_pDocContainer->widget()->show();	91	m_pDocContainer->widget()->show();
86	return childView;	92	return childView;
Lines 1244-1249 Link Here
1244	convertDocContainer();	1250	convertDocContainer();
1245		1251
1246	static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode( alwaysTabbedMode );	1252	static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode( alwaysTabbedMode );
		1253	static_cast<KonqFrameTabs*>( m_pDocContainer )->setMouseWheelScroll(KonqSettings::tabsCycleWheel());
1247		1254
1248	// Set an active part first so that we open the URL in the current view	1255	// Set an active part first so that we open the URL in the current view
1249	// (to set the location bar correctly and asap)	1256	// (to set the location bar correctly and asap)
Lines 1694-1705 Link Here
1694	if ( !broadcast )	1701	if ( !broadcast )
1695	{	1702	{
1696	m_bProfileListDirty = true;	1703	m_bProfileListDirty = true;
1697	#if 0	1704
		1705	// #if 0 causes problems with TDevelop syntax highlighting. Converted to comments
		1706	// #if 0
1698	// There's always one profile at least, now...	1707	// There's always one profile at least, now...
1699	TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );	1708	//TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
1700	if ( m_pamProfiles )	1709	//if ( m_pamProfiles )
1701	m_pamProfiles->setEnabled( profiles.count() > 0 );	1710	// m_pamProfiles->setEnabled( profiles.count() > 0 );
1702	#endif	1711	// #endif
1703	return;	1712	return;
1704	}	1713	}
1705		1714
Lines 1793-1798 Link Here
1793	}	1802	}
1794	}	1803	}
1795		1804
		1805	void KonqViewManager::reparseConfiguration()
		1806	{
		1807	KonqFrameTabs frameTabs=static_cast<KonqFrameTabs>(m_pDocContainer);
		1808	if (frameTabs)
		1809	{
		1810	frameTabs->setAlwaysTabbedMode(KonqSettings::alwaysTabbedMode());
		1811	frameTabs->setMouseWheelScroll(KonqSettings::tabsCycleWheel());
		1812	}
		1813	}
		1814
1796		1815
1797		1816
1798	///////////////// Debug stuff ////////////////	1817	///////////////// Debug stuff ////////////////

Lines 15-20 Link Here

(-)original/tdebase/konqueror/konq_viewmgr.h (+8 lines)
15	along with this program; if not, write to the Free Software	15	along with this program; if not, write to the Free Software
16	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
		18	--------------------------------------------------------------
		19	Additional changes:
		20	- 2013/10/17 Michele Calgaro:
		21	* add support for updating options at runtime (no need to restart Konqueror
		22	or reload the profile
18	*/	23	*/
19		24
20	#ifndef __konq_viewmgr_h__	25	#ifndef __konq_viewmgr_h__
Lines 286-291 Link Here
286		291
287	TQString profileHomeURL() const { return m_profileHomeURL; }	292	TQString profileHomeURL() const { return m_profileHomeURL; }
288		293
		294	//Update options
		295	void reparseConfiguration();
		296
289	protected slots:	297	protected slots:
290	void emitActivePartChanged();	298	void emitActivePartChanged();
291		299

Return to bug 910

Lines 24-30 Link Here

(-)original/tdebase/kcontrol/konqhtml/advancedTabOptions.ui (-1 / +34 lines)
24	<cstring>TextLabel3</cstring>	24	<cstring>TextLabel3</cstring>
25	</property>	25	</property>
26	<property name="text">	26	<property name="text">
27	<string><b>Advanced Options</b></string>	27	<string><b>Tab Options</b></string>
28	</property>	28	</property>
29	</widget>	29	</widget>
30	<widget class="Line">	30	<widget class="Line">
Lines 50-55 Link Here
50	<cstring>unnamed</cstring>	50	<cstring>unnamed</cstring>
51	</property>	51	</property>
52	<widget class="TQCheckBox">	52	<widget class="TQCheckBox">
		53	<property name="name">
		54	<cstring>m_pShowMMBInTabs</cstring>
		55	</property>
		56	<property name="text">
		57	<string>Open &links in new tab instead of in new window</string>
		58	</property>
		59	<property name="whatsThis" stdset="0">
		60	<string>This will open a new tab instead of a new window in various situations, such as choosing a link or a folder with the middle mouse button.</string>
		61	</property>
		62	</widget>
		63	<widget class="TQCheckBox">
		64	<property name="name">
		65	<cstring>m_pDynamicTabbarHide</cstring>
		66	</property>
		67	<property name="text">
		68	<string>&Hide the tab bar when only one tab is open</string>
		69	</property>
		70	<property name="whatsThis" stdset="0">
		71	<string>This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.</string>
		72	</property>
		73	</widget>
		74	<widget class="TQCheckBox">
		75	<property name="name">
		76	<cstring>m_pDynamicTabbarCycle</cstring>
		77	</property>
		78	<property name="text">
		79	<string>C&ycle tabs with mouse wheel</string>
		80	</property>
		81	<property name="whatsThis" stdset="0">
		82	<string>This will cycle through tabs when there are two or more tabs using the mouse wheel.</string>
		83	</property>
		84	</widget>
		85	<widget class="TQCheckBox">
53	<property name="name">	86	<property name="name">
54	<cstring>m_pNewTabsInBackground</cstring>	87	<cstring>m_pNewTabsInBackground</cstring>
55	</property>	88	</property>

Lines 4-9 Link Here

(-)original/tdebase/kcontrol/konqhtml/htmlopts.cpp (-31 / +8 lines)
4	// (c) Sven Radej 1998	4	// (c) Sven Radej 1998
5	// (c) David Faure 1998	5	// (c) David Faure 1998
6	// (c) 2001 Waldo Bastian <bastian@kde.org>	6	// (c) 2001 Waldo Bastian <bastian@kde.org>
		7	//
		8	// --------------------------------------------------------------
		9	// - 2013/10/16 Michele Calgaro:
		10	// Move some options to the 'advancedTabDialog' dialog
7		11
8	#include <tqlayout.h>//CT - 12Nov1998	12	#include <tqlayout.h>//CT - 12Nov1998
9	#include <tqwhatsthis.h>	13	#include <tqwhatsthis.h>
Lines 82-107 Link Here
82	// Tabbed Browsing	86	// Tabbed Browsing
83		87
84	TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );	88	TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
85	TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );	89	TQHBoxLayout *laytab = new TQHBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint());
86		90
87	m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );	91	TQPushButton *advancedTabButton = new TQPushButton( i18n( "Show &tab options"), bgTabbedBrowsing );
88	TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
89	"such as choosing a link or a folder with the middle mouse button.") );
90	connect(m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
91	laygroup->addWidget(m_pShowMMBInTabs);
92
93	m_pDynamicTabbarHide = new TQCheckBox( i18n( "Hide the tab bar when only one tab is open" ), bgTabbedBrowsing );
94	TQWhatsThis::add( m_pDynamicTabbarHide, i18n("This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.") );
95	connect(m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
96	laygroup->addWidget(m_pDynamicTabbarHide);
97
98	m_pDynamicTabbarCycle = new TQCheckBox( i18n( "C&ycle tabs with mouse wheel" ), bgTabbedBrowsing );
99	TQWhatsThis::add( m_pDynamicTabbarCycle, i18n("This will cycle through tabs when there are two or more tabs.") );
100	connect(m_pDynamicTabbarCycle, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
101	laygroup->addWidget(m_pDynamicTabbarCycle);
102
103	TQHBoxLayout *laytab = new TQHBoxLayout(laygroup, KDialog::spacingHint());
104	TQPushButton *advancedTabButton = new TQPushButton( i18n( "Advanced Options"), bgTabbedBrowsing );
105	laytab->addWidget(advancedTabButton);	92	laytab->addWidget(advancedTabButton);
106	laytab->addStretch();	93	laytab->addStretch();
107	connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog()));	94	connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog()));
Lines 299-312 Link Here
299	m_pMaxFormCompletionItems->setValue( m_pConfig->readNumEntry( "MaxFormCompletionItems", 10 ) );	286	m_pMaxFormCompletionItems->setValue( m_pConfig->readNumEntry( "MaxFormCompletionItems", 10 ) );
300	m_pMaxFormCompletionItems->setEnabled( m_pFormCompletionCheckBox->isChecked() );	287	m_pMaxFormCompletionItems->setEnabled( m_pFormCompletionCheckBox->isChecked() );
301		288
302	m_pConfig->setGroup("FMSettings");
303	m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
304	m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
305	m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", true ) );
306
307	TDEConfig config("kbookmarkrc", true, false);	289	TDEConfig config("kbookmarkrc", true, false);
308	config.setReadDefaults( useDefaults );	290	config.setReadDefaults( useDefaults );
309	config.setGroup("Bookmarks");	291	config.setGroup("Bookmarks");
310	m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );	292	m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
311	m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );	293	m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
312		294
Lines 372-382 Link Here
372		354
373	m_pConfig->writeEntry( "FormCompletion", m_pFormCompletionCheckBox->isChecked() );	355	m_pConfig->writeEntry( "FormCompletion", m_pFormCompletionCheckBox->isChecked() );
374	m_pConfig->writeEntry( "MaxFormCompletionItems", m_pMaxFormCompletionItems->value() );	356	m_pConfig->writeEntry( "MaxFormCompletionItems", m_pMaxFormCompletionItems->value() );
375
376	m_pConfig->setGroup("FMSettings");
377	m_pConfig->writeEntry( "MMBOpensTab", m_pShowMMBInTabs->isChecked() );
378	m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) );
379	m_pConfig->writeEntry( "TabsCycleWheel", m_pDynamicTabbarCycle->isChecked() );
380	m_pConfig->sync();	357	m_pConfig->sync();
381		358
382	TDEConfig config("kbookmarkrc", false, false);	359	TDEConfig config("kbookmarkrc", false, false);