From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 13 May 2014 17:14:25 +0000 (+0200)
Subject: Merge branch 'KDE/4.13'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d152bfc53bfe6cce2a69e0ab260b0d888d7c587c?hp=-c

Merge branch 'KDE/4.13'
---

d152bfc53bfe6cce2a69e0ab260b0d888d7c587c
diff --combined src/dolphinmainwindow.cpp
index e6b911209,7117c09ba..0ad224cbc
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -217,6 -217,7 +217,7 @@@ DolphinMainWindow::DolphinMainWindow() 
          toggleSplitView();
      }
      updateEditActions();
+     updatePasteAction();
      updateViewActions();
      updateGoActions();
  
@@@ -356,6 -357,7 +357,7 @@@ void DolphinMainWindow::changeUrl(cons
      if (view) {
          view->setUrl(url);
          updateEditActions();
+         updatePasteAction();
          updateViewActions();
          updateGoActions();
          setUrlAsCaption(url);
@@@ -1455,6 -1457,7 +1457,7 @@@ void DolphinMainWindow::setActiveViewCo
  
      updateHistory();
      updateEditActions();
+     updatePasteAction();
      updateViewActions();
      updateGoActions();
  
@@@ -1637,14 -1640,12 +1640,14 @@@ void DolphinMainWindow::setupActions(
      prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
  
      KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
 +    activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
      activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
      activateNextTab->setEnabled(false);
      connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
      activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
  
      KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
 +    activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
      activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
      activatePrevTab->setEnabled(false);
      connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
@@@ -1819,7 -1820,6 +1822,6 @@@ void DolphinMainWindow::updateEditActio
          deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);
          cutAction->setEnabled(capabilities.supportsMoving());
      }
-     updatePasteAction();
  }
  
  void DolphinMainWindow::updateViewActions()