Bug#260195: [patch] experimenting with requested functionality

[Luke Kenneth Casson Leighton]

well it helps to save a file before doing the diff -ru...

-- 
-- 
Information I post is with honesty, integrity, and the expectation that
you will take full responsibility if acting on the information contained,
and that, should you find it to be flawed or even mildly useful, you
will act with both honesty and integrity in return - and tell me.
--
<a href="http://lkcl.net";>      lkcl.net      </a> <br />
<a href="mailto:[EMAIL PROTECTED]"> [EMAIL PROTECTED] </a> <br />


diff -ur orig/kdebase-3.2.2/kcontrol/konq/behaviour.cpp 
kdebase-3.2.2/kcontrol/konq/behaviour.cpp
--- orig/kdebase-3.2.2/kcontrol/konq/behaviour.cpp      2003-10-28 
21:57:38.000000000 +0000
+++ kdebase-3.2.2/kcontrol/konq/behaviour.cpp   2004-07-19 12:52:17.000000000 
+0100
@@ -65,6 +65,14 @@
     connect(cbNewWin, SIGNAL(clicked()), this, SLOT(changed()));
     connect(cbNewWin, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool)));
 
+   // ----
+
+    cbClickExit = new QCheckBox(i18n("&Close Window on new"), vbox);
+    QWhatsThis::add( cbClickExit, i18n("If this option is checked, Konqueror 
will close the current"
+                                    "window when you run a program, URL or 
open a new folder."));
+    connect(cbClickExit, SIGNAL(clicked()), this, SLOT(changed()));
+    connect(cbClickExit, SIGNAL(toggled(bool)), SLOT(updateWinPixmap(bool)));
+
     // ----
 
     cbListProgress = new QCheckBox( i18n( "&Show network operations in a 
single window" ), vbox );
@@ -171,6 +179,9 @@
     cbNewWin->setChecked( g_pConfig->readBoolEntry("AlwaysNewWin", false) );
     updateWinPixmap(cbNewWin->isChecked());
 
+    cbClickExit->setChecked( g_pConfig->readBoolEntry("ClickExit", false) );
+    updateWinPixmap(cbClickExit->isChecked());
+
     homeURL->setURL(g_pConfig->readPathEntry("HomeURL", "~"));
 
     bool stips = g_pConfig->readBoolEntry( "ShowFileTips", true );
@@ -200,6 +211,7 @@
 void KBehaviourOptions::defaults()
 {
     cbNewWin->setChecked(false);
+    cbClickExit->setChecked(false);
 
     homeURL->setURL("~");
 
@@ -223,6 +235,7 @@
     g_pConfig->setGroup( groupname );
 
     g_pConfig->writeEntry( "AlwaysNewWin", cbNewWin->isChecked() );
+    g_pConfig->writeEntry( "ClickExit", cbClickExit->isChecked() );
     g_pConfig->writePathEntry( "HomeURL", homeURL->url().isEmpty()? "~" : 
homeURL->url() );
 
     g_pConfig->writeEntry( "ShowFileTips", cbShowTips->isChecked() );
diff -ur orig/kdebase-3.2.2/kcontrol/konq/behaviour.h 
kdebase-3.2.2/kcontrol/konq/behaviour.h
--- orig/kdebase-3.2.2/kcontrol/konq/behaviour.h        2003-10-28 
21:57:38.000000000 +0000
+++ kdebase-3.2.2/kcontrol/konq/behaviour.h     2004-07-19 11:25:17.000000000 
+0100
@@ -54,6 +54,7 @@
   QString groupname;
 
   QCheckBox *cbNewWin;
+  QCheckBox *cbClickExit;
   QCheckBox *cbListProgress;
 
   QLabel *winPixmap;
diff -ur orig/kdebase-3.2.2/libkonq/konq_dirpart.cc 
kdebase-3.2.2/libkonq/konq_dirpart.cc
--- orig/kdebase-3.2.2/libkonq/konq_dirpart.cc  2004-01-10 20:52:43.000000000 
+0000
+++ kdebase-3.2.2/libkonq/konq_dirpart.cc       2004-07-19 11:46:40.000000000 
+0100
@@ -205,12 +205,18 @@
         KParts::WindowArgs wargs;
         KParts::ReadOnlyPart* dummy;
         emit m_extension->createNewWindow( url, args, wargs, dummy );
+
     }
     else
     {
         kdDebug() << "emit m_extension->openURLRequest( " << url.url() << "," 
<< args.serviceType << ")" << endl;
         emit m_extension->openURLRequest( url, args );
     }
+       if (KonqFMSettings::settings()->alwaysNewWin() && 
+           KonqFMSettings::settings()->clickExit())
+       {
+               closeURL();
+       }
 }
 
 void KonqDirPart::mmbClicked( KFileItem * fileItem )
diff -ur orig/kdebase-3.2.2/libkonq/konq_settings.cc 
kdebase-3.2.2/libkonq/konq_settings.cc
--- orig/kdebase-3.2.2/libkonq/konq_settings.cc 2004-02-05 15:05:52.000000000 
+0000
+++ kdebase-3.2.2/libkonq/konq_settings.cc      2004-07-19 11:33:27.000000000 
+0100
@@ -95,6 +95,7 @@
 
   // Behaviour
   m_alwaysNewWin = config->readBoolEntry( "AlwaysNewWin", FALSE );
+  m_clickExit = config->readBoolEntry( "ClickExit", FALSE );
 
   m_homeURL = config->readPathEntry("HomeURL", "~");
 
diff -ur orig/kdebase-3.2.2/libkonq/konq_settings.h 
kdebase-3.2.2/libkonq/konq_settings.h
--- orig/kdebase-3.2.2/libkonq/konq_settings.h  2004-02-05 15:05:52.000000000 
+0000
+++ kdebase-3.2.2/libkonq/konq_settings.h       2004-07-19 11:32:15.000000000 
+0100
@@ -77,6 +77,7 @@
   bool underlineLink() const { return m_underlineLink; }
   bool fileSizeInBytes() const { return m_fileSizeInBytes; }
   bool alwaysNewWin() const { return m_alwaysNewWin; }
+  bool clickExit() const { return m_clickExit; }
   const QString & homeURL() const { return m_homeURL; }
 
   bool showFileTips() const {return m_showFileTips; }
@@ -103,6 +104,7 @@
   bool m_underlineLink;
   bool m_fileSizeInBytes;
   bool m_alwaysNewWin;
+  bool m_clickExit;
   bool m_bTreeFollow;
 
   QMap<QString, QString> m_embedMap;