[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/konqhtml
From:       Clarence Dang <dang () kde ! org>
Date:       2004-06-13 11:56:12
Message-ID: 20040613115612.C4BCE126CD () office ! kde ! org
[Download RAW message or body]

CVS commit by dang: 

Make MMB-in-konqueror-view-pastes configurable Part 2/2.
This is an update of Per Winkvist's patch.

The behaviour defaults to on for compat for the time being (I will later propose
a patch that keeps it on for existing settings but for new users, off by default).

CCMAIL:44931@bugs.kde.org


  M +18 -8     htmlopts.cpp   1.85
  M +1 -0      htmlopts.h   1.34


--- kdebase/kcontrol/konqhtml/htmlopts.cpp  #1.84:1.85
@@ -97,10 +97,9 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConf
     row++;
 
-    // Misc
+    // Mouse behavior
 
-    m_cbCursor = new QCheckBox(i18n("Chan&ge cursor over links"), this);
-    lay->addMultiCellWidget(m_cbCursor, row, row, 0, 1);
-    row++;
+    QVGroupBox *bgMouse = new QVGroupBox( i18n("Mouse Beha&vior"), this );
 
+    m_cbCursor = new QCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
     QWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the \
cursor will change "  "(usually to a hand) if it is moved over a hyperlink.") );
@@ -108,12 +106,21 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConf
     connect(m_cbCursor, SIGNAL(clicked()), this, SLOT(slotChanged()));
 
-    m_pBackRightClick = new QCheckBox( i18n( "Right click goes &back in history" ), \
this ); +    m_pOpenMiddleClick = new QCheckBox( i18n ("M&iddle click opens URL in \
selection" ), bgMouse ); +    QWhatsThis::add( m_pOpenMiddleClick, i18n (
+      "If this box is checked, you can open the URL in the selection by middle \
clicking on a " +      "Konqueror view." ) );
+    connect(m_pOpenMiddleClick, SIGNAL(clicked()), this, SLOT(slotChanged()));
+
+    m_pBackRightClick = new QCheckBox( i18n( "Right click goes &back in history" ), \
bgMouse );  QWhatsThis::add( m_pBackRightClick, i18n(
       "If this box is checked, you can go back in history by right clicking on a \
                Konqueror view. "
       "To access the context menu, press the right mouse button and move." ) );
-    lay->addMultiCellWidget( m_pBackRightClick, row, row, 0, 1);
-    row++;
     connect(m_pBackRightClick, SIGNAL(clicked()), this, SLOT(slotChanged()));
 
+    lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
+    row++;
+
+    // Misc
+
     m_pAutoLoadImagesCheckBox = new QCheckBox( i18n( "A&utomatically load images"), \
this );  QWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, \
Konqueror will automatically load any images that are embedded in a web page. \
Otherwise, it will display placeholders for the images, and you can then manually \
load the images by clicking on the image button.<br>Unless you have a very slow \
network connection, you will probably want to check this box to enhance your browsing \
experience." ) ); @@ -194,4 +201,5 @@ void KMiscHTMLOptions::load()
     // *** load ***
     SET_GROUP( "MainView Settings" );
+    bool bOpenMiddleClick = READ_BOOL( "OpenMiddleClick", true );
     bool bBackRightClick = READ_BOOL( "BackRightClick", false );
     SET_GROUP( "HTML Settings" );
@@ -208,4 +216,5 @@ void KMiscHTMLOptions::load()
     m_pAutoLoadImagesCheckBox->setChecked( bAutoLoadImages );
     m_pAutoRedirectCheckBox->setChecked( bAutoRedirect );
+    m_pOpenMiddleClick->setChecked( bOpenMiddleClick );
     m_pBackRightClick->setChecked( bBackRightClick );
 
@@ -258,4 +267,5 @@ void KMiscHTMLOptions::save()
 {
     m_pConfig->setGroup( "MainView Settings" );
+    m_pConfig->writeEntry( "OpenMiddleClick", m_pOpenMiddleClick->isChecked() );
     m_pConfig->writeEntry( "BackRightClick", m_pBackRightClick->isChecked() );
     m_pConfig->setGroup( "HTML Settings" );

--- kdebase/kcontrol/konqhtml/htmlopts.h  #1.33:1.34
@@ -55,4 +55,5 @@ private:
     QCheckBox* m_pAutoLoadImagesCheckBox;
     QCheckBox* m_pAutoRedirectCheckBox;
+    QCheckBox* m_pOpenMiddleClick;
     QCheckBox* m_pBackRightClick;
     QCheckBox* m_pShowMMBInTabs;


[prev in list] [next in list] [prev in thread] [next in thread]