Fixed shortcuts, removed warnings.

svn path=/trunk/KDE/kdebase/apps/; revision=634634

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index b59f65f2c90d92b526d436a189c1b149a59108be..dda1bdd47efafd13d252057f5d3141cf21db7277 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -161,7 +161,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                               i18n("&Link Here") + "\t" + seq);\r
 \r
         popup.addSeparator();\r
-        QAction* cancelAction = popup.addAction(KIcon("stop"), i18n("Cancel"));\r
+        popup.addAction(KIcon("stop"), i18n("Cancel"));\r
 \r
         QAction* activatedAction = popup.exec(QCursor::pos());\r
         if (activatedAction == moveAction) {\r
@@ -767,8 +767,6 @@ void DolphinMainWindow::toggleEditLocation()
 \r
 void DolphinMainWindow::editLocation()\r
 {\r
-    KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));\r
-    action->setChecked(true);\r
     m_activeView->setUrlEditable(true);\r
 }\r
 \r
@@ -998,8 +996,8 @@ void DolphinMainWindow::setupActions()
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));\r
 \r
     QAction* properties = actionCollection()->addAction("properties");\r
-    properties->setText(i18n("Propert&ies"));\r
-    properties->setShortcut(Qt::Key_Alt | Qt::Key_Return);\r
+    properties->setText(i18n("Properties"));\r
+    properties->setShortcut(Qt::ALT | Qt::Key_Return);\r
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));\r
 \r
     KStandardAction::quit(this, SLOT(quit()), actionCollection());\r
@@ -1090,7 +1088,7 @@ void DolphinMainWindow::setupActions()
 \r
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");\r
     showHiddenFiles->setText(i18n("Show Hidden Files"));\r
-    //showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_      KDE4-TODO: what Qt-Key represents '.'?\r
+    showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);\r
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));\r
 \r
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");\r
@@ -1110,12 +1108,15 @@ void DolphinMainWindow::setupActions()
     stop->setIcon(KIcon("stop"));\r
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));\r
 \r
+    // TODO: the URL navigator must emit a signal if the editable state has been\r
+    // changed, so that the corresponding showFullLocation action is updated. Also\r
+    // the naming "Show full Location" is currently confusing...\r
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");\r
     showFullLocation->setText(i18n("Show Full Location"));\r
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);\r
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));\r
 \r
-    KToggleAction* editLocation = actionCollection()->add<KToggleAction>("edit_location");\r
+    QAction* editLocation = actionCollection()->addAction("edit_location");\r
     editLocation->setText(i18n("Edit Location"));\r
     editLocation->setShortcut(Qt::Key_F6);\r
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));\r
@@ -1273,6 +1274,10 @@ void DolphinMainWindow::updateViewActions()
 \r
     KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));\r
     splitAction->setChecked(m_view[SecondaryIdx] != 0);\r
+\r
+    KToggleAction* editableLocactionAction =\r
+        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));\r
+    editableLocactionAction->setChecked(m_activeView->isUrlEditable());\r
 }\r
 \r
 void DolphinMainWindow::updateGoActions()\r