Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 83ecf8f3cf39318860f0dc9917c84068 > files > 28

kdebase4-workspace-4.6.5-1.4.mga1.src.rpm

commit ac13c4596050f79f66eb648a0c9513a5798138ea
Author: Ralf Jung <ralfjung-e@gmx.de>
Date:   Mon Sep 26 15:42:06 2011 +0200

    standard shortcuts KCM: Hide 'Global' column, and give the shortcut group a name
    
    BUG: 245603
    REVIEW: 102709
    FIXED-IN: 4.7.3
    
    (cherry picked from commit 14f173d4babe19dabfa4f886f3e519668c5d76ca)

diff --git a/kcontrol/standard_actions/standard_actions_module.cpp b/kcontrol/standard_actions/standard_actions_module.cpp
index f1bd45d..b2b4732 100644
--- a/kcontrol/standard_actions/standard_actions_module.cpp
+++ b/kcontrol/standard_actions/standard_actions_module.cpp
@@ -71,7 +71,7 @@ StandardActionsModule::StandardActionsModule(
     KCModule::setButtons(KCModule::Buttons(KCModule::Default | KCModule::Apply | KCModule::Help));
 
     // Create and configure the editor
-    m_editor = new KShortcutsEditor(this, KShortcutsEditor::AllActions);
+    m_editor = new KShortcutsEditor(this, KShortcutsEditor::WidgetAction | KShortcutsEditor::WindowAction | KShortcutsEditor::ApplicationAction); // there will be no global actions, so make sure that column is hidden
     connect(m_editor, SIGNAL(keyChange()), this, SLOT(keyChanged()));
 
     // Make a layout
@@ -137,7 +137,7 @@ void StandardActionsModule::load()
         }
 
     // Hand the collection to the editor
-    m_editor->addCollection(m_actionCollection);
+    m_editor->addCollection(m_actionCollection, i18n("Standard Shortcuts"));
     }