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

List:       kde-commits
Subject:    KDE/kdelibs/kate/part
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2007-05-22 16:07:58
Message-ID: 1179850078.408058.19275.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667359 by cullmann:

allow modes without specified hl, this will allow again choosing first a hl mode, \
given autodetection, and then switch to some own mode, to overwrite some settings...

 M  +9 -4      document/katedocument.cpp  
 M  +1 -0      mode/katemodeconfigpage.cpp  
 M  +4 -7      mode/katemodemanager.cpp  
 M  +2 -2      mode/katemodemenu.cpp  


--- trunk/KDE/kdelibs/kate/part/document/katedocument.cpp #667358:667359
@@ -2726,10 +2726,12 @@
     openUrl (url);
   else completed(); //perhaps this should be emitted at the end of this function
   
-  
   // restore the filetype
-  updateFileType (kconfig.readEntry("Mode"));
+  updateFileType (kconfig.readEntry("Mode", "Normal"));
 
+  // restore the hl stuff
+  m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig.readEntry("Highlighting")));
 +  
   // indent mode
   config()->setIndentationMode( kconfig.readEntry("Indentation Mode", \
config()->indentationMode() ) );  
@@ -2751,7 +2753,10 @@
   
   // save file type
   kconfig.writeEntry("Mode", m_fileType);
-
+  
+  // save hl
+  kconfig.writeEntry("Highlighting", highlight()->name());
+  
   // indent mode
   kconfig.writeEntry("Indentation Mode", config()->indentationMode() );
 
@@ -5615,7 +5620,7 @@
 
           m_config->configStart();
           
-          if (!hlSetByUser)
+          if (!hlSetByUser && \
!KateGlobal::self()->modeManager()->fileType(newType).hl.isEmpty())  {
             int hl (KateHlManager::self()->nameFind \
(KateGlobal::self()->modeManager()->fileType(newType).hl));  
--- trunk/KDE/kdelibs/kate/part/mode/katemodeconfigpage.cpp #667358:667359
@@ -61,6 +61,7 @@
   ui = new Ui::FileTypeConfigWidget();
   ui->setupUi( this );
 
+ ui->cmbHl->addItem(i18n("<Unchanged>"), QVariant(""));
  for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
     if (KateHlManager::self()->hlSection(i).length() > 0)
       ui->cmbHl->addItem(KateHlManager::self()->hlSection(i) + QString ("/")
--- trunk/KDE/kdelibs/kate/part/mode/katemodemanager.cpp #667358:667359
@@ -88,11 +88,8 @@
     type->priority = cg.readEntry ("Priority", 0);
     type->varLine = cg.readEntry ("Variables");
     
-    type->hl = cg.readEntry ("Highlighting", "None");
-    
-    if (type->hl.isEmpty())
-      type->hl = "None";
-    
+    type->hl = cg.readEntry ("Highlighting");
+   
     // only for generated types...
     type->hlGenerated = cg.readEntry ("Highlighting Generated", false);
     type->version = cg.readEntry ("Highlighting Version");
@@ -157,7 +154,7 @@
 
   // add the none type...
   KateFileType *t = new KateFileType ();
-  t->name = "None";
+  t->name = "Normal";
   t->hl = "None";
   t->hlGenerated = true;
 
@@ -169,7 +166,7 @@
 //
 void KateModeManager::save (const QList<KateFileType *>& v)
 {
-  KConfig katerc("katefiletyperc", KConfig::NoGlobals);
+  KConfig katerc("katemoderc", KConfig::NoGlobals);
   KConfigGroup config(&katerc, QString());
 
   QStringList newg;
--- trunk/KDE/kdelibs/kate/part/mode/katemodemenu.cpp #667358:667359
@@ -125,9 +125,9 @@
   for ( int i = 0; i < actions.count(); ++i )
     actions[ i ]->setChecked( false );
 
-  if (doc->fileType().isEmpty() || doc->fileType() == "None") {
+  if (doc->fileType().isEmpty() || doc->fileType() == "Normal") {
     for ( int i = 0; i < actions.count(); ++i ) {
-      if ( actions[ i ]->data().toString() == "None" )
+      if ( actions[ i ]->data().toString() == "Normal" )
         actions[ i ]->setChecked( true );
     }
   } else {


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