Attachment #859 for bug #895

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

Lines 63-68 Link Here

(-)tdebase/kcontrol/konqhtml/advancedTabDialog.cpp (-1 / +16 lines)
63	connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	63	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()));	64	connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
65	connect(m_advancedWidget->m_pPermanentCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	65	connect(m_advancedWidget->m_pPermanentCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
		66	connect(m_advancedWidget->m_pHoverCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
66	connect(m_advancedWidget->m_pKonquerorTabforExternalURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	67	connect(m_advancedWidget->m_pKonquerorTabforExternalURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
67	connect(m_advancedWidget->m_pPopupsWithinTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));	68	connect(m_advancedWidget->m_pPopupsWithinTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
68		69
Lines 79-84 Link Here
79	m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );	80	m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
80	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );	81	m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
81	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );	82	m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
		83	m_advancedWidget->m_pHoverCloseButton->setChecked( m_pConfig->readBoolEntry( "HoverCloseButton", false ) );
82	m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );	84	m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
83	m_advancedWidget->m_pPopupsWithinTabs->setChecked( m_pConfig->readBoolEntry( "PopupsWithinTabs", false ) );	85	m_advancedWidget->m_pPopupsWithinTabs->setChecked( m_pConfig->readBoolEntry( "PopupsWithinTabs", false ) );
84	m_advancedWidget->m_pTabCloseActivatePrevious->setChecked( m_pConfig->readBoolEntry( "TabCloseActivatePrevious", false ) );	86	m_advancedWidget->m_pTabCloseActivatePrevious->setChecked( m_pConfig->readBoolEntry( "TabCloseActivatePrevious", false ) );
Lines 86-91 Link Here
86	m_pConfig->setGroup("Notification Messages");	88	m_pConfig->setGroup("Notification Messages");
87	m_advancedWidget->m_pTabConfirm->setChecked( !m_pConfig->hasKey("MultipleTabConfirm") );	89	m_advancedWidget->m_pTabConfirm->setChecked( !m_pConfig->hasKey("MultipleTabConfirm") );
88		90
		91	if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
		92	m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
		93	else
		94	m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
89	actionButton(Apply)->setEnabled(false);	95	actionButton(Apply)->setEnabled(false);
90	}	96	}
91		97
Lines 95-106 Link Here
95	m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );	101	m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
96	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );	102	m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
97	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );	103	m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
		104	m_pConfig->writeEntry( "HoverCloseButton", m_advancedWidget->m_pHoverCloseButton->isChecked() );
98	m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );	105	m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
99	m_pConfig->writeEntry( "PopupsWithinTabs", m_advancedWidget->m_pPopupsWithinTabs->isChecked() );	106	m_pConfig->writeEntry( "PopupsWithinTabs", m_advancedWidget->m_pPopupsWithinTabs->isChecked() );
100	m_pConfig->writeEntry( "TabCloseActivatePrevious", m_advancedWidget->m_pTabCloseActivatePrevious->isChecked() );	107	m_pConfig->writeEntry( "TabCloseActivatePrevious", m_advancedWidget->m_pTabCloseActivatePrevious->isChecked() );
101	m_pConfig->sync();	108	m_pConfig->sync();
102		109
103	// It only matters wether the key is present, its value has no meaning	110	// It only matters whether the key is present, its value has no meaning
104	m_pConfig->setGroup("Notification Messages");	111	m_pConfig->setGroup("Notification Messages");
105	if ( m_advancedWidget->m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" );	112	if ( m_advancedWidget->m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" );
106	else m_pConfig->writeEntry( "MultipleTabConfirm", true );	113	else m_pConfig->writeEntry( "MultipleTabConfirm", true );
Lines 110-120 Link Here
110	kapp->dcopClient()->attach();	117	kapp->dcopClient()->attach();
111	KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );	118	KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
112		119
		120	if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
		121	m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
		122	else
		123	m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
113	actionButton(Apply)->setEnabled(false);	124	actionButton(Apply)->setEnabled(false);
114	}	125	}
115		126
116	void advancedTabDialog::changed()	127	void advancedTabDialog::changed()
117	{	128	{
		129	if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
		130	m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
		131	else
		132	m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
118	actionButton(Apply)->setEnabled(true);	133	actionButton(Apply)->setEnabled(true);
119	}	134	}
120		135




                </widget>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>m_pHoverCloseButton</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Show close button instead of website icon with mouse hover</string>
                    </property>
                    <property name="whatsThis" stdset="0">
                        <string>This will display a close button inside each tab instead of websites' icons when the mouse pointer hovers the icon.</string>
                    </property>
                </widget>
                <widget class="TQCheckBox">
                    <property name="name">
                       <cstring>m_pPopupsWithinTabs</cstring>
                    </property>
                   <property name="text">

Return to bug 895

Lines 95-100 Link Here

(-)tdebase/kcontrol/konqhtml/advancedTabOptions.ui (+11 lines)
95	</widget>	95	</widget>
96	<widget class="TQCheckBox">	96	<widget class="TQCheckBox">
97	<property name="name">	97	<property name="name">
		98	<cstring>m_pHoverCloseButton</cstring>
		99	</property>
		100	<property name="text">
		101	<string>&Show close button instead of website icon with mouse hover</string>
		102	</property>
		103	<property name="whatsThis" stdset="0">
		104	<string>This will display a close button inside each tab instead of websites' icons when the mouse pointer hovers the icon.</string>
		105	</property>
		106	</widget>
		107	<widget class="TQCheckBox">
		108	<property name="name">
98	<cstring>m_pPopupsWithinTabs</cstring>	109	<cstring>m_pPopupsWithinTabs</cstring>
99	</property>	110	</property>
100	<property name="text">	111	<property name="text">