From kde-commits  Fri Sep 02 21:30:48 2005
From: Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date: Fri, 02 Sep 2005 21:30:48 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdebase
Message-Id: <1125696648.731057.7020.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112569665613206

SVN commit 456440 by wstephens:

Turn off the default 'Underline Filenames' setting in konqueror's file
view.


 M  +1 -1      kpersonalizer/Makefile.am  
 M  +6 -4      kpersonalizer/kospage.cpp  
 M  +1 -1      libkonq/konq_defaults.h  


--- branches/KDE/3.5/kdebase/kpersonalizer/Makefile.am #456439:456440
@@ -32,7 +32,7 @@
 # kde_wallpaperdir  Where general wallpapers should go to.
 
 # set the include path for X, qt and KDE
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(top_srcdir)
 
 METASOURCES = AUTO
 
--- branches/KDE/3.5/kdebase/kpersonalizer/kospage.cpp #456439:456440
@@ -32,6 +32,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
+#include "libkonq/konq_defaults.h"
+
 #include "kospage.h"
 
 KOSPage::KOSPage(QWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
@@ -158,10 +160,10 @@
 	cdesktop->setGroup( "Mouse Buttons" );
 	cdesktop->writeEntry("Middle", "WindowListMenu");
 	cdesktop->setGroup( "FMSettings" );
-	cdesktop->writeEntry("UnderlineLinks", true);
+	cdesktop->writeEntry("UnderlineLinks", false);
 
 	ckonqueror->setGroup( "FMSettings" );
-	ckonqueror->writeEntry("UnderlineLinks", true);
+	ckonqueror->writeEntry("UnderlineLinks", false);
 
 	ckcminput->setGroup("KDE");
 	ckcminput->writeEntry("ChangeCursor", true, true, true );
@@ -416,10 +418,10 @@
 	cdesktop->setGroup( "Mouse Buttons" );
 	s_MMB = cdesktop->readEntry("Middle", "WindowListMenu");
 	cdesktop->setGroup( "FMSettings" );
-	b_DesktopUnderline = cdesktop->readBoolEntry("UnderlineLinks", true);
+	b_DesktopUnderline = cdesktop->readBoolEntry("UnderlineLinks", DEFAULT_UNDERLINELINKS);
 
 	ckonqueror->setGroup( "FMSettings" );
-	b_KonqUnderline = ckonqueror->readBoolEntry("UnderlineLinks", true);
+	b_KonqUnderline = ckonqueror->readBoolEntry("UnderlineLinks", DEFAULT_UNDERLINELINKS);
 
 	ckcminput->setGroup("KDE");
 	b_ChangeCursor = ckcminput->readBoolEntry("ChangeCursor", true);
--- branches/KDE/3.5/kdebase/libkonq/konq_defaults.h #456439:456440
@@ -23,7 +23,7 @@
 // to share the same defaults
 
 // appearance tab
-#define DEFAULT_UNDERLINELINKS true
+#define DEFAULT_UNDERLINELINKS false
 #define DEFAULT_WORDWRAPTEXT true // kfm-like, sorry Reggie :-)
 #define DEFAULT_TEXTHEIGHT 2
 #define DEFAULT_TEXTWIDTH 0       // 0 = automatic (font depending)