From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 13 May 2014 16:42:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4cf04b91dd8804f2536fc31ae2f1b486bfc8cf9c

Merge remote-tracking branch 'origin/master' into frameworks

Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:kfm-devel@kde.org

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp
---

4cf04b91dd8804f2536fc31ae2f1b486bfc8cf9c
diff --cc src/dolphinmainwindow.cpp
index 53f9826c9,e6b911209..dc5e37ff7
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -1634,17 -1633,21 +1638,21 @@@ void DolphinMainWindow::setupActions(
      nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
  
      QList<QKeySequence> prevTabKeys;
 -    prevTabKeys.append(KStandardShortcut::tabPrev().primary());
 +    prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct
      prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
  
 -    KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
 +    QAction* 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()));
 +    connect(activateNextTab, &QAction::triggered, this, &DolphinMainWindow::activateNextTab);
      activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
  
 -    KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
 +    QAction* 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()));
 +    connect(activatePrevTab, &QAction::triggered, this, &DolphinMainWindow::activatePrevTab);
      activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
  
      // for context menu
diff --cc src/search/dolphinsearchbox.cpp
index d47996a78,46ca01a4c..f9942f98e
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@@ -424,10 -422,9 +423,9 @@@ void DolphinSearchBox::init(
      m_startSearchTimer = new QTimer(this);
      m_startSearchTimer->setSingleShot(true);
      m_startSearchTimer->setInterval(1000);
 -    connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest()));
 +    connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
  
      updateFacetsToggleButton();
-     applyReadOnlyState();
  }
  
  KUrl DolphinSearchBox::balooUrlForSearching() const
diff --cc src/search/filenamesearchprotocol.cpp
index fd56f68b7,fd7f09a88..3333dcc07
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@@ -92,8 -91,11 +92,11 @@@ void FileNameSearchProtocol::searchDire
          bool addItem = false;
          if (!m_regExp || item.name().contains(*m_regExp)) {
              addItem = true;
-         } else if (m_checkContent && item.mimetype().startsWith(QLatin1String("text/"))) {
 -        } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
++        } else if (m_checkContent && item.determineMimeType().inherits(QLatin1String("text/plain"))) {
+             qDebug() << "### Checking" << item;
              addItem = contentContainsPattern(item.url());
+         } else {
+             qDebug() << "### NOT Checking" << item;
          }
  
          if (addItem) {
diff --cc src/statusbar/dolphinstatusbar.cpp
index 79355fb55,169395e63..9f17c8ecd
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@@ -72,8 -72,9 +72,9 @@@ DolphinStatusBar::DolphinStatusBar(QWid
      m_zoomSlider->setPageStep(1);
      m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel());
  
 -    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SIGNAL(zoomLevelChanged(int)));
 -    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(updateZoomSliderToolTip(int)));
 -    connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
 +    connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged);
++    connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip);
 +    connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip);
  
      // Initialize space information
      m_spaceInfo = new StatusBarSpaceInfo(this);
diff --cc src/views/dolphinview.cpp
index 247b10bc8,c1f585da9..0e43dcda1
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@@ -1050,7 -1046,8 +1050,8 @@@ void DolphinView::slotItemDropEvent(in
      if (op && destUrl == url()) {
          // Mark the dropped urls as selected.
          m_clearSelectionBeforeSelectingNewItems = true;
+         m_markFirstNewlySelectedItemAsCurrent = true;
 -        connect(op, SIGNAL(aboutToCreate(KUrl::List)), this, SLOT(slotAboutToCreate(KUrl::List)));
 +        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
      }
  
      setActive(true);