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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2010-09-06 16:59:31
Message-ID: 20100906170345.08795AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172187 by winterz:

beautify sub-level calendar names when displaying them in the resource view.
kolab/issue4530
MERGE: trunk?


 M  +19 -2     resourceview.cpp  


--- branches/kdepim/enterprise/kdepim/korganizer/resourceview.cpp #1172186:1172187
@@ -57,6 +57,23 @@
 
 using namespace KCal;
 
+static QString scrubDirectory( const QString &subRes )
+{
+  QString nsubRes = subRes;
+
+  // first, replace leading ".foo.directory" with "foo"
+  if ( subRes.contains( QRegExp( "^\\..*\\.directory" ) ) ) {
+    nsubRes.remove( ".directory" );
+    nsubRes.remove( 0, 1 ); // remove leading '.'
+  }
+
+  // now replace "/." with "/"  (needed for sub-sublevel-directories)
+  nsubRes.replace( QRegExp( "/\\." ),  "/" );
+
+  // cleaning complete
+  return nsubRes;
+}
+
 static QString labelFromSubResName( ResourceCalendar *resource, const QString &subRes )
 {
 
@@ -72,10 +89,10 @@
     if( resource && !resource->resourceName().isEmpty() ) {
       label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() );
     } else {
-      label = i18n( "My %1" ).arg( subRes );
+      label = i18n( "My %1" ).arg( scrubDirectory( subRes ) );
     }
   } else {
-    label = i18n( "My %1" ).arg( subRes );
+    label = i18n( "My %1" ).arg( scrubDirectory( subRes ) );
   }
   return label;
 }
[prev in list] [next in list] [prev in thread] [next in thread]