From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Thu, 16 Oct 2014 18:36:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into frameworks
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/01e4f60a0931aba506b184d384a4e2f926b2233c?hp=-c

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

Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	plasma/applets/folderview/folderview.cpp
---

01e4f60a0931aba506b184d384a4e2f926b2233c
diff --combined src/main.cpp
index c7c863e32,3ce3204e9..ca047bd16
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -22,26 -22,27 +22,29 @@@
  
  #include "dolphinmainwindow.h"
  
 -#include <KAboutData>
 +#include <k4aboutdata.h>
  #include <KCmdLineArgs>
  #include <KLocale>
  #include <kmainwindow.h>
 +#include <kdemacros.h>
 +#include <kdeversion.h>
  #include <KDebug>
  
  extern "C"
  KDE_EXPORT int kdemain(int argc, char **argv)
  {
 -    KAboutData about("dolphin", 0,
 +    K4AboutData about("dolphin", 0,
                       ki18nc("@title", "Dolphin"),
 -                     KDE_VERSION_STRING,
 +                     "4.60",
                       ki18nc("@title", "File Manager"),
 -                     KAboutData::License_GPL,
 +                     K4AboutData::License_GPL,
-                      ki18nc("@info:credit", "(C) 2006-2014 Peter Penz and Frank Reininghaus"));
+                      ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
      about.setHomepage("http://dolphin.kde.org");
+     about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
+                     ki18nc("@info:credit", "Maintainer (since 2014) and developer"),
+                     "emmanuelpescosta099@gmail.com");
      about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
-                     ki18nc("@info:credit", "Maintainer (since 2012) and developer"),
+                     ki18nc("@info:credit", "Maintainer (2012-2014) and developer"),
                      "frank78ac@googlemail.com");
      about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                      ki18nc("@info:credit", "Maintainer and developer (2006-2012)"),
@@@ -52,9 -53,6 +55,6 @@@
      about.addAuthor(ki18nc("@info:credit", "David Faure"),
                      ki18nc("@info:credit", "Developer"),
                      "faure@kde.org");
-     about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
-                     ki18nc("@info:credit", "Developer"),
-                     "emmanuelpescosta099@gmail.com");
      about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                      ki18nc("@info:credit", "Developer"),
                      "aseigo@kde.org");
diff --combined src/org.kde.dolphin.desktop
index e15a65cc6,364bf7920..84325c87f
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@@ -95,7 -95,7 +95,7 @@@ X-DocPath=dolphin/index.htm
  Categories=Qt;KDE;System;FileTools;FileManager;
  GenericName=File Manager
  GenericName[af]=Lêerbestuurder
- GenericName[ar]=مدير الملفات
+ GenericName[ar]=مدير ملفات
  GenericName[as]=নথিপত্ৰৰ পৰিচালক
  GenericName[ast]=Xestor de ficheros
  GenericName[be]=Кіраўнік файлаў
@@@ -186,4 -186,3 +186,4 @@@ GenericName[zh_TW]=檔案管理å“
  Terminal=false
  MimeType=inode/directory;
  InitialPreference=10
 +X-DBUS-ServiceName=org.kde.dolphin
diff --combined src/settings/kcm/kcmdolphingeneral.desktop
index a30b6b590,3573b63a6..6a5927703
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@@ -1,5 -1,4 +1,4 @@@
  Name=Dolphin General
- Name[ar]=عام دولفين
  Name[ast]=Dolphin xeneral
  Name[bg]=Общо за програмата
  Name[bn]=ডলফিন সাধারণ
@@@ -71,7 -70,7 +70,7 @@@ Name[x-test]=xxDolphin Generalx
  Name[zh_CN]=Dolphin 常规
  Name[zh_TW]=Dolphin 一般
  Comment=This service allows configuration of general Dolphin settings.
- Comment[ar]=هذه الخدمة تتيح التحكم بإعدادات دولفين العامة.
+ Comment[ar]=تسمح هذه الخدمة بضبك إعدادات دولفين العامّة.
  Comment[ast]=Esti serviciu déxate facer la configuración xeneral de Dolphin.
  Comment[bg]=Това ви позволява да зададете общите настройки на програмата.
  Comment[bs]=Ovaj servis omogućava podešavanje opštih Delfinovih postavki.
@@@ -144,7 -143,7 +143,7 @@@ Comment[zh_TW]=此服務允許設定 Do
  Icon=system-run
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphingeneral
 +Exec=kcmshell5 kcmdolphingeneral
  
  X-KDE-Library=kcm_dolphingeneral
  X-KDE-PluginKeyword=dolphingeneral
@@@ -152,7 -151,7 +151,7 @@@ X-KDE-ParentApp=kcontro
  X-DocPath=dolphin/index.html#preferences-dialog-general
  # ctxt: Random file browsing settings.
  Name=General
- Name[ar]=عام
+ Name[ar]=عامّ
  Name[ast]=Xeneral
  Name[bg]=Общи
  Name[bn]=সাধারণ
@@@ -225,7 -224,7 +224,7 @@@ Name[x-test]=xxGeneralx
  Name[zh_CN]=常规
  Name[zh_TW]=一般
  Comment=Configure general file manager settings
- Comment[ar]=اضبط إعدادات مدير الملفات العامة
+ Comment[ar]=اضبط إعدادات مدير الملفات العامّة
  Comment[ast]=Configurar les preferencies del xestor de ficheros
  Comment[bg]=Общи настройки на файловия мениджър
  Comment[bn]=সাধারণ ফাইল ম্যানেজার সেটিংস কনফিগার করুন
diff --combined src/settings/kcm/kcmdolphinnavigation.desktop
index a9362a996,372df9eef..9c69c691a
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@@ -1,5 -1,4 +1,4 @@@
  Name=Dolphin Navigation
- Name[ar]=تصفح دولفين
  Name[ast]=Navegación de Dolphin
  Name[bg]=Навигация в програмата
  Name[bn]=ডলফিন ন্যাভিগেশন
@@@ -145,7 -144,7 +144,7 @@@ Comment[zh_TW]=此服務允許設定 Do
  Icon=input-mouse
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphinnavigation
 +Exec=kcmshell5 kcmdolphinnavigation
  
  X-KDE-Library=kcm_dolphinnavigation
  X-KDE-PluginKeyword=dolphinnavigation
diff --combined src/statusbar/dolphinstatusbar.cpp
index fd5ecd152,e0fdc8703..5feeaa361
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@@ -22,9 -22,9 +22,9 @@@
  #include "dolphin_generalsettings.h"
  
  #include <KIconLoader>
 -#include <KIcon>
 +#include <QIcon>
  #include <KLocale>
 -#include <KMenu>
 +#include <QMenu>
  #include <KVBox>
  
  #include "statusbarspaceinfo.h"
@@@ -72,21 -72,21 +72,21 @@@ 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);
  
      // Initialize progress information
      m_stopButton = new QToolButton(this);
 -    m_stopButton->setIcon(KIcon("process-stop"));
 +    m_stopButton->setIcon(QIcon::fromTheme("process-stop"));
      m_stopButton->setAccessibleName(i18n("Stop"));
      m_stopButton->setAutoRaise(true);
      m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading"));
      m_stopButton->hide();
 -    connect(m_stopButton, SIGNAL(clicked()), this, SIGNAL(stopPressed()));
 +    connect(m_stopButton, &QToolButton::clicked, this, &DolphinStatusBar::stopPressed);
  
      m_progressTextLabel = new QLabel(this);
      m_progressTextLabel->hide();
@@@ -97,12 -97,12 +97,12 @@@
      m_showProgressBarTimer = new QTimer(this);
      m_showProgressBarTimer->setInterval(500);
      m_showProgressBarTimer->setSingleShot(true);
 -    connect(m_showProgressBarTimer, SIGNAL(timeout()), this, SLOT(updateProgressInfo()));
 +    connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo);
  
      m_resetToDefaultTextTimer = new QTimer(this);
      m_resetToDefaultTextTimer->setInterval(ResetToDefaultTimeout);
      m_resetToDefaultTextTimer->setSingleShot(true);
 -    connect(m_resetToDefaultTextTimer, SIGNAL(timeout()), this, SLOT(slotResetToDefaultText()));
 +    connect(m_resetToDefaultTextTimer, &QTimer::timeout, this, &DolphinStatusBar::slotResetToDefaultText);
  
      // Initialize top layout and size policies
      const int fontHeight = QFontMetrics(m_label->font()).height();
@@@ -114,14 -114,14 +114,14 @@@
      m_label->setFixedHeight(contentHeight);
      m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
  
-     m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+     m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
  
      m_spaceInfo->setFixedHeight(contentHeight);
-     m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+     m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
      m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
  
      m_progressBar->setFixedHeight(contentHeight);
-     m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+     m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
  
      QHBoxLayout* topLayout = new QHBoxLayout(this);
      topLayout->setMargin(0);
@@@ -259,7 -259,7 +259,7 @@@ void DolphinStatusBar::contextMenuEvent
  {
      Q_UNUSED(event);
  
 -    KMenu menu(this);
 +    QMenu menu(this);
  
      QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
      showZoomSliderAction->setCheckable(true);
@@@ -357,3 -357,4 +357,3 @@@ void DolphinStatusBar::setExtensionsVis
      m_zoomSlider->setVisible(showZoomSlider);
  }
  
 -#include "dolphinstatusbar.moc"