[Krusader-commits] SF.net SVN: krusader:[6070] trunk/krusader_kde4

[<ck...@us...>]

Revision: 6070
          http://krusader.svn.sourceforge.net/krusader/?rev=6070&view=rev
Author:   ckarai
Date:     2008-08-22 20:51:40 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
FIXED: [ 1845105 ] mimetype magic can be disabled again

Modified Paths:
--------------
    trunk/krusader_kde4/ChangeLog
    trunk/krusader_kde4/krusader/VFS/vfile.cpp
    trunk/krusader_kde4/krusader/VFS/vfile.h
    trunk/krusader_kde4/krusader/krslots.cpp
    trunk/krusader_kde4/krusader/krusader.cpp

Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog	2008-08-21 21:41:41 UTC (rev 6069)
+++ trunk/krusader_kde4/ChangeLog	2008-08-22 20:51:40 UTC (rev 6070)
@@ -7,6 +7,7 @@
      ARCH: QuickSearch is moved to KrView from Detailed/Brief views
      ARCH: Keyboard handling is moved to KrView from Detailed/Brief views
 
+    FIXED: [ 1845105 ] mimetype magic can be disabled again
     FIXED: [ 2062651 ] Ctrl+Up selects the URL in the origin editbox
     FIXED: [ 1988893 ] konsole is started in a wrong directory
            please set "konsole --workdir %d" for the terminal (Konfigurator)

Modified: trunk/krusader_kde4/krusader/VFS/vfile.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfile.cpp	2008-08-21 21:41:41 UTC (rev 6069)
+++ trunk/krusader_kde4/krusader/VFS/vfile.cpp	2008-08-22 20:51:40 UTC (rev 6070)
@@ -47,6 +47,7 @@
 #include <kdebug.h>
 
 bool vfile::vfile_userDefinedFolderIcons = true;
+bool vfile::vfile_useMimeTypeMagic = true;
 
 vfile::vfile(const QString& name,	                  // useful construtor
              const KIO::filesize_t size,

Modified: trunk/krusader_kde4/krusader/VFS/vfile.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfile.h	2008-08-21 21:41:41 UTC (rev 6069)
+++ trunk/krusader_kde4/krusader/VFS/vfile.h	2008-08-22 20:51:40 UTC (rev 6070)
@@ -124,6 +124,7 @@
 	virtual ~vfile(){}
 	
 	inline static void      vfile_loadUserDefinedFolderIcons( bool load ) { vfile_userDefinedFolderIcons = load; }
+	inline static void      vfile_enableMimeTypeMagic( bool enable )      { vfile_useMimeTypeMagic = enable; }
 
 private:
 	void                    vfile_loadACL();
@@ -153,12 +154,13 @@
 	QString          vfile_def_acl;  //< ACL default string
 	
 	static bool      vfile_userDefinedFolderIcons;
+	static bool      vfile_useMimeTypeMagic;
 };
 
 	
 QString vfile::vfile_getIcon(){
 	if( vfile_icon.isEmpty() ){
-		QString mime = this->vfile_getMime();
+		QString mime = this->vfile_getMime( !vfile_useMimeTypeMagic );
       if ( mime == "Broken Link !" )
          vfile_icon = "file-broken";
       else if( vfile_icon.isEmpty() ) {

Modified: trunk/krusader_kde4/krusader/krslots.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krslots.cpp	2008-08-21 21:41:41 UTC (rev 6069)
+++ trunk/krusader_kde4/krusader/krslots.cpp	2008-08-22 20:51:40 UTC (rev 6070)
@@ -326,10 +326,12 @@
 void KRslots::runKonfigurator(bool firstTime) {
 
   KConfigGroup group( krConfig, "Look&Feel");
+  KConfigGroup groupgen( krConfig, "General");
   int size = (group.readEntry("Filelist Icon Size",_FilelistIconSize)).toInt();
   
   Konfigurator *konfigurator = new Konfigurator(firstTime);
 
+  vfile::vfile_enableMimeTypeMagic( groupgen.readEntry( "Mimetype Magic", _MimetypeMagic ) );
   if( konfigurator->isGUIRestartNeeded() )
   {
     vfile::vfile_loadUserDefinedFolderIcons( group.readEntry( "Load User Defined Folder Icons", _UserDefinedFolderIcons ) );

Modified: trunk/krusader_kde4/krusader/krusader.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krusader.cpp	2008-08-21 21:41:41 UTC (rev 6069)
+++ trunk/krusader_kde4/krusader/krusader.cpp	2008-08-22 20:51:40 UTC (rev 6070)
@@ -282,8 +282,10 @@
    initChecksumModule();
 
    KConfigGroup gl( krConfig, "Look&Feel");
+   KConfigGroup glgen( krConfig, "General");
    int defaultType = gl.readEntry( "Default Panel Type", KrViewFactory::defaultViewId() );
    vfile::vfile_loadUserDefinedFolderIcons( gl.readEntry( "Load User Defined Folder Icons", _UserDefinedFolderIcons ) );
+   vfile::vfile_enableMimeTypeMagic( glgen.readEntry( "Mimetype Magic", _MimetypeMagic ) );
 
    KConfigGroup gs( krConfig, "Startup" );
    QStringList leftTabs = gs.readPathEntry( "Left Tab Bar",QStringList() );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.