* renamed "[x] Show Full Location" to "[x] Editable Location"

* renamed "Edit Location" to "Replace Location"

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1106c434fb443e4d282732f2916aabb8b3002ff5..3a46cd6df09a0a916dd06523037cb33d2561c86e 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -565,7 +565,7 @@ void DolphinMainWindow::toggleEditLocation()
     urlNavigator->setUrlEditable(action->isChecked());
 }
 
-void DolphinMainWindow::editLocation()
+void DolphinMainWindow::replaceLocation()
 {
     KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
     navigator->setUrlEditable(true);
@@ -995,16 +995,15 @@ void DolphinMainWindow::setupActions()
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
-    // TODO: the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
-    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
+    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
-    KAction* editLocation = actionCollection()->addAction("edit_location");
-    editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));
-    editLocation->setShortcut(Qt::Key_F6);
-    connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
+    KAction* replaceLocation = actionCollection()->addAction("replace_location");
+    replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
+    replaceLocation->setShortcut(Qt::Key_F6);
+    connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation()));
 
     // setup 'Go' menu
     KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index eb609938f525697271b094406fff580be3756800..4b223626798dd892a59e8425304de2074b22a255 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -238,10 +238,11 @@ private slots:
     void toggleEditLocation();
 
     /**
-     * Switches to the edit mode of the navigation bar. If the edit mode is
+     * Switches to the edit mode of the navigation bar and selects
+     * the whole URL, so that it can be replaced by the user. If the edit mode is
      * already active, it is assured that the navigation bar get focused.
      */
-    void editLocation();
+    void replaceLocation();
 
     /** Goes back on step of the URL history. */
     void goBack();

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 33172416aaa83da9ac53d99638f09e18ead972b0..5fdd9242d390c1a19f7f2c53e35bc0e4d82bc888 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="5">
+<kpartgui name="dolphin" version="6">
  <MenuBar>
   <Menu name="file">
    <Action name="create_new" />
@@ -64,7 +64,7 @@
    <Menu name="navigation_bar">
     <text context="@title:menu">Navigation Bar</text>
     <Action name="editable_location" />
-    <Action name="edit_location" />
+    <Action name="replace_location" />
    </Menu>
    <Separator/>
    <Action name="view_properties" />