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.

[patch] tdebase patch for konqueror tab mouse wheel scroll support

tdebase_konqueror_tabbar_mouse_wheel.diff (text/plain), 17.74 KB, created by Michele Calgaro on 2013-10-17 09:51:47 CDT

(hide)

Description: tdebase patch for konqueror tab mouse wheel scroll support

Filename:

MIME Type:

Creator: Michele Calgaro

Created: 2013-10-17 09:51:47 CDT

Size: 17.74 KB

patch

obsolete

>diff -Nur original/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp new/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp >--- original/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp 2013-10-17 22:24:14.000000000 +0900 >@@ -15,6 +15,11 @@ > * > * You should have received a copy of the GNU General Public License > * along with this program; if not, write to the Free Software >+ >+ -------------------------------------------------------------- >+ Additional changes: >+ - 2013/10/16 Michele Calgaro: >+ * centralized "tabbed browsing" options in this dialog > */ > > #include <tqbuttongroup.h> >@@ -58,6 +63,9 @@ > layout->addSpacing( 20 ); > layout->addStretch(); > >+ connect(m_advancedWidget->m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); >+ connect(m_advancedWidget->m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); >+ connect(m_advancedWidget->m_pDynamicTabbarCycle, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); > 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())); >@@ -77,6 +85,9 @@ > void advancedTabDialog::load() > { > m_pConfig->setGroup("FMSettings"); >+ m_advancedWidget->m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) ); >+ m_advancedWidget->m_pDynamicTabbarHide->setChecked( !(m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) ); >+ m_advancedWidget->m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", false ) ); > 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 ) ); >@@ -98,6 +109,9 @@ > void advancedTabDialog::save() > { > m_pConfig->setGroup("FMSettings"); >+ m_pConfig->writeEntry( "MMBOpensTab", (m_advancedWidget->m_pShowMMBInTabs->isChecked()) ); >+ m_pConfig->writeEntry( "AlwaysTabbedMode", ( !(m_advancedWidget->m_pDynamicTabbarHide->isChecked())) ); >+ m_pConfig->writeEntry( "TabsCycleWheel", (m_advancedWidget->m_pDynamicTabbarCycle->isChecked()) ); > 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() ); >diff -Nur original/tdebase/kcontrol/konqhtml/advancedTabOptions.ui new/tdebase/kcontrol/konqhtml/advancedTabOptions.ui >--- original/tdebase/kcontrol/konqhtml/advancedTabOptions.ui 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/kcontrol/konqhtml/advancedTabOptions.ui 2013-10-16 20:46:21.037283629 +0900 >@@ -24,7 +24,7 @@ > <cstring>TextLabel3</cstring> > </property> > <property name="text"> >- <string>&lt;b&gt;Advanced Options&lt;/b&gt;</string> >+ <string>&lt;b&gt;Tab Options&lt;/b&gt;</string> > </property> > </widget> > <widget class="Line"> >@@ -50,6 +50,39 @@ > <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> >diff -Nur original/tdebase/kcontrol/konqhtml/htmlopts.cpp new/tdebase/kcontrol/konqhtml/htmlopts.cpp >--- original/tdebase/kcontrol/konqhtml/htmlopts.cpp 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/kcontrol/konqhtml/htmlopts.cpp 2013-10-17 22:19:45.663136312 +0900 >@@ -4,6 +4,10 @@ > // (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> >@@ -82,26 +86,9 @@ > // Tabbed Browsing > > TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); >- TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); >- >- m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), 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 ); >+ TQHBoxLayout *laytab = new TQHBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint()); >+ >+ TQPushButton *advancedTabButton = new TQPushButton( i18n( "Show &tab options"), bgTabbedBrowsing ); > laytab->addWidget(advancedTabButton); > laytab->addStretch(); > connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog())); >@@ -299,14 +286,9 @@ > 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"); >+ config.setGroup("Bookmarks"); > m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) ); > m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) ); > >@@ -372,11 +354,6 @@ > > 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); >diff -Nur original/tdebase/kcontrol/konqhtml/htmlopts.h new/tdebase/kcontrol/konqhtml/htmlopts.h >--- original/tdebase/kcontrol/konqhtml/htmlopts.h 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/kcontrol/konqhtml/htmlopts.h 2013-10-17 22:19:29.195136743 +0900 >@@ -4,7 +4,11 @@ > // > // (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 > >@@ -60,10 +64,7 @@ > 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; >diff -Nur original/tdebase/konqueror/konq_mainwindow.cc new/tdebase/konqueror/konq_mainwindow.cc >--- original/tdebase/konqueror/konq_mainwindow.cc 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/konqueror/konq_mainwindow.cc 2013-10-17 22:45:26.231095929 +0900 >@@ -17,6 +17,12 @@ > along with this program; see the file COPYING. If not, write to > the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA 02110-1301, USA. >+ >+ -------------------------------------------------------------- >+ Additional changes: >+ - 2013/10/17 Michele Calgaro: >+ * add support for updating tab options at runtime (no need to restart Konqueror >+ or reload the profile > */ > > #include "konq_mainwindow.h" >@@ -4234,7 +4240,7 @@ > KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(docContainer); > bool state = (tabContainer->count()>1); > m_paRemoveTab->setEnabled( state ); >- m_paRemoveOtherTabs->setEnabled( state ); >+ m_paRemoveOtherTabs->setEnabled( state ); > m_paBreakOffTab->setEnabled( state ); > m_paActivateNextTab->setEnabled( state ); > m_paActivatePrevTab->setEnabled( state ); >@@ -4772,8 +4778,8 @@ > > > // Those actions go into the PopupMenuGUIClient, since that's the one defining them. >- TDEAction *actNewWindow = 0L, *actNewTab = 0L; >- if( doTabHandling ) >+ TDEAction *actNewWindow = 0L; >+ if (doTabHandling) > { > if (_args.forcesNewWindow()) { > actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); >@@ -4879,7 +4885,6 @@ > popupItems.clear(); > > // Deleted by konqyMenuClient's actioncollection >- //delete actNewTab; > //delete actNewWindow; > > delete actPaste; >@@ -4979,6 +4984,9 @@ > MapViews::ConstIterator end = m_mapViews.end(); > for (; it != end; ++it ) > (*it)->reparseConfiguration(); >+ >+ // Push updates to KonqViewManager as well >+ viewManager()->reparseConfiguration(); > } > > void KonqMainWindow::saveProperties( TDEConfig *config ) >diff -Nur original/tdebase/konqueror/konq_tabs.cc new/tdebase/konqueror/konq_tabs.cc >--- original/tdebase/konqueror/konq_tabs.cc 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/konqueror/konq_tabs.cc 2013-10-17 21:54:22.000000000 +0900 >@@ -17,6 +17,11 @@ > along with this program; if not, write to the Free Software > Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, > MA 02110-1301, USA. >+ >+ -------------------------------------------------------------- >+ Additional changes: >+ - 2013/10/16 Michele Calgaro: >+ add "scroll tabs on mouse wheel event" functionality > */ > > #include "konq_tabs.h" >@@ -188,6 +193,8 @@ > TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); > connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )), > TQT_SLOT( slotInitiateDrag( TQWidget * ) ) ); >+ >+ setMouseWheelScroll(KonqSettings::tabsCycleWheel()); > } > > KonqFrameTabs::~KonqFrameTabs() >diff -Nur original/tdebase/konqueror/konq_tabs.h new/tdebase/konqueror/konq_tabs.h >--- original/tdebase/konqueror/konq_tabs.h 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/konqueror/konq_tabs.h 2013-10-17 21:53:58.000000000 +0900 >@@ -88,8 +88,8 @@ > > > public slots: >- void slotCurrentChanged( TQWidget* newPage ); >- void setAlwaysTabbedMode( bool ); >+ void slotCurrentChanged(TQWidget* newPage); >+ void setAlwaysTabbedMode(bool enable); > > signals: > void ctrlTabPressed(); >@@ -124,7 +124,7 @@ > bool m_permanentCloseButtons; > bool m_alwaysTabBar; > bool m_MouseMiddleClickClosesTab; >- int m_closeOtherTabsId; >+ int m_closeOtherTabsId; > }; > > #endif >diff -Nur original/tdebase/konqueror/konq_viewmgr.cc new/tdebase/konqueror/konq_viewmgr.cc >--- original/tdebase/konqueror/konq_viewmgr.cc 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/konqueror/konq_viewmgr.cc 2013-10-17 21:57:28.091171373 +0900 >@@ -16,6 +16,12 @@ > along with this program; if not, write to the Free Software > Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > >+ -------------------------------------------------------------- >+ Additional changes: >+ - 2013/10/17 Michele Calgaro: >+ * add "scroll tabs on mouse wheel event" functionality >+ * add support for updating options at runtime (no need to restart Konqueror >+ or reload the profile > */ > > #include "konq_viewmgr.h" >@@ -78,9 +84,9 @@ > setActivePart( childView->part() ); > m_pDocContainer = childView->frame(); > >- convertDocContainer(); >- static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode( >- KonqSettings::alwaysTabbedMode() ); >+ convertDocContainer(); >+ static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode(KonqSettings::alwaysTabbedMode()); >+ static_cast<KonqFrameTabs*>( m_pDocContainer )->setMouseWheelScroll(KonqSettings::tabsCycleWheel()); > > m_pDocContainer->widget()->show(); > return childView; >@@ -1244,6 +1250,7 @@ > convertDocContainer(); > > static_cast<KonqFrameTabs*>( m_pDocContainer )->setAlwaysTabbedMode( alwaysTabbedMode ); >+ static_cast<KonqFrameTabs*>( m_pDocContainer )->setMouseWheelScroll(KonqSettings::tabsCycleWheel()); > > // Set an active part first so that we open the URL in the current view > // (to set the location bar correctly and asap) >@@ -1694,12 +1701,14 @@ > if ( !broadcast ) > { > m_bProfileListDirty = true; >-#if 0 >+ >+ // #if 0 causes problems with TDevelop syntax highlighting. Converted to comments >+ // #if 0 > // There's always one profile at least, now... >- TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); >- if ( m_pamProfiles ) >- m_pamProfiles->setEnabled( profiles.count() > 0 ); >-#endif >+ //TQStringList profiles = KonqFactory::instance()->dirs()->findAllResources( "data", "konqueror/profiles/*", false, true ); >+ //if ( m_pamProfiles ) >+ // m_pamProfiles->setEnabled( profiles.count() > 0 ); >+ // #endif > return; > } > >@@ -1793,6 +1802,16 @@ > } > } > >+void KonqViewManager::reparseConfiguration() >+{ >+ KonqFrameTabs *frameTabs=static_cast<KonqFrameTabs*>(m_pDocContainer); >+ if (frameTabs) >+ { >+ frameTabs->setAlwaysTabbedMode(KonqSettings::alwaysTabbedMode()); >+ frameTabs->setMouseWheelScroll(KonqSettings::tabsCycleWheel()); >+ } >+} >+ > > > ///////////////// Debug stuff //////////////// >diff -Nur original/tdebase/konqueror/konq_viewmgr.h new/tdebase/konqueror/konq_viewmgr.h >--- original/tdebase/konqueror/konq_viewmgr.h 2013-07-27 02:36:58.000000000 +0900 >+++ new/tdebase/konqueror/konq_viewmgr.h 2013-10-17 21:57:38.279171106 +0900 >@@ -15,6 +15,11 @@ > along with this program; if not, write to the Free Software > Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > >+ -------------------------------------------------------------- >+ Additional changes: >+ - 2013/10/17 Michele Calgaro: >+ * add support for updating options at runtime (no need to restart Konqueror >+ or reload the profile > */ > > #ifndef __konq_viewmgr_h__ >@@ -286,6 +291,9 @@ > > TQString profileHomeURL() const { return m_profileHomeURL; } > >+ //Update options >+ void reparseConfiguration(); >+ > protected slots: > void emitActivePartChanged(); > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]