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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/kate/part
From:       Anders Lund <anders () alweb ! dk>
Date:       2004-03-30 19:35:24
Message-ID: 20040330193524.F2F5999D7 () office ! kde ! org
[Download RAW message or body]

CVS commit by alund: 

Backport: Use a dedicated group for saving the editor shortcuts.
It is now possible to set shortcuts for the editor, and they will be
remembered. to set a shortcut that is allready used, either restart the
editor, or use two config sessions.

CCMAIL: 76652@bugs.kde.org


  M +30 -28    katedialogs.cpp   1.106.2.2
  M +14 -13    katedialogs.h   1.55.2.1
  M +2 -2      kateview.cpp   1.333.2.4


--- kdelibs/kate/part/katedialogs.cpp  #1.106.2.1:1.106.2.2
@@ -668,7 +668,8 @@ void EditKeyConfiguration::showEvent ( Q
     (new QVBoxLayout(this))->setAutoAdd(true);
     KateView* view = (KateView*)m_doc->views().at(0);
-    m_keyChooser = new KKeyChooser( view->editActionCollection(), this, false );
+    m_ac = view->editActionCollection();
+    m_keyChooser = new KKeyChooser( m_ac, this, false );
     connect( m_keyChooser, SIGNAL( keyChange() ), this, SLOT( slotChanged() ) );
-    m_keyChooser->show ();
+    m_keyChooser->show();
 
     m_ready = true;
@@ -682,5 +683,6 @@ void EditKeyConfiguration::apply()
   if (m_ready)
   {
-    m_keyChooser->save();
+    m_keyChooser->commitChanges();
+    m_ac->writeShortcutSettings( "Katepart Shortcuts" );
   }
 }

--- kdelibs/kate/part/katedialogs.h  #1.55:1.55.2.1
@@ -238,4 +238,5 @@ class EditKeyConfiguration: public KateC
     bool m_ready;
     class KateDocument *m_doc;
+    class KActionCollection *m_ac;
     KKeyChooser* m_keyChooser;
 };

--- kdelibs/kate/part/kateview.cpp  #1.333.2.3:1.333.2.4
@@ -569,5 +569,5 @@ void KateView::setupEditActions()
     slotLostFocus();
 
-  m_editActions->readShortcutSettings();
+  m_editActions->readShortcutSettings( "Katepart Shortcuts" );
 }
 
@@ -1095,5 +1095,5 @@ void KateView::updateConfig ()
     return;
 
-  m_editActions->readShortcutSettings();
+  m_editActions->readShortcutSettings( "Katepart Shortcuts" );
 
   // dyn. word wrap & markers


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