diff options
Diffstat (limited to 'src')
36 files changed, 67 insertions, 63 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 069096814..62d11584e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,4 @@ +include(ECMAddAppIcon) configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h) @@ -268,8 +269,9 @@ if(NOT WIN32) set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp) endif() -# TODO Does anything replace kde4_add_app_icon ? -#kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png") +# Sets the icon on Windows and OSX +file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png") +ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS}) kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS}) diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index 82cf91186..ccbecb0d6 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -38,13 +38,13 @@ public: DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {} virtual ~DolphinDockTitleBar() {} - virtual QSize minimumSizeHint() const + QSize minimumSizeHint() const Q_DECL_OVERRIDE { const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin); return QSize(border, border); } - virtual QSize sizeHint() const + QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); } diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index aa9ab2986..b55bcabb2 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -78,6 +78,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL this, &DolphinPart::slotErrorMessage); connect(m_view, &DolphinView::directoryLoadingCompleted, this, static_cast<void(DolphinPart::*)()>(&DolphinPart::completed)); + connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinPart::updatePasteAction); connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinPart::updateProgress); connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage); diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 6b9398da8..da0a659d3 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -2,7 +2,6 @@ Type=Service Name=Dolphin View Name[ar]=منظور دولفين -Name[ast]=Vista de Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin @@ -107,7 +106,6 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=متراصّ -Name[ast]=Compautu Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 22674d1bd..bcd4a49fd 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -32,7 +32,8 @@ DolphinTabWidget::DolphinTabWidget(QWidget* parent) : QTabWidget(parent), - m_placesSelectorVisible(true) + m_placesSelectorVisible(true), + m_previousTab(-1) { connect(this, &DolphinTabWidget::tabCloseRequested, this, static_cast<void (DolphinTabWidget::*)(int)>(&DolphinTabWidget::closeTab)); @@ -304,9 +305,15 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url) void DolphinTabWidget::currentTabChanged(int index) { DolphinViewContainer* viewContainer = tabPageAt(index)->activeViewContainer(); + viewContainer->setActive(true); emit activeViewChanged(viewContainer); emit currentUrlChanged(viewContainer->url()); viewContainer->view()->setFocus(); + + if (tabPageAt(m_previousTab)) { + tabPageAt(m_previousTab)->activeViewContainer()->setActive(false); + } + m_previousTab = index; } void DolphinTabWidget::tabInserted(int index) diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h index 7b3a18814..50ebd602a 100644 --- a/src/dolphintabwidget.h +++ b/src/dolphintabwidget.h @@ -186,6 +186,8 @@ private: private: /** Caches the (negated) places panel visibility */ bool m_placesSelectorVisible; + + int m_previousTab; }; #endif diff --git a/src/icons/128-system-file-manager.png b/src/icons/128-system-file-manager.png Binary files differnew file mode 100644 index 000000000..a199a712f --- /dev/null +++ b/src/icons/128-system-file-manager.png diff --git a/src/icons/16-system-file-manager.png b/src/icons/16-system-file-manager.png Binary files differnew file mode 100644 index 000000000..2771c8543 --- /dev/null +++ b/src/icons/16-system-file-manager.png diff --git a/src/icons/22-system-file-manager.png b/src/icons/22-system-file-manager.png Binary files differnew file mode 100644 index 000000000..ac0c54aca --- /dev/null +++ b/src/icons/22-system-file-manager.png diff --git a/src/icons/32-system-file-manager.png b/src/icons/32-system-file-manager.png Binary files differnew file mode 100644 index 000000000..c095d42d5 --- /dev/null +++ b/src/icons/32-system-file-manager.png diff --git a/src/icons/48-system-file-manager.png b/src/icons/48-system-file-manager.png Binary files differnew file mode 100644 index 000000000..a742a7344 --- /dev/null +++ b/src/icons/48-system-file-manager.png diff --git a/src/icons/64-system-file-manager.png b/src/icons/64-system-file-manager.png Binary files differnew file mode 100644 index 000000000..9a7ebdec4 --- /dev/null +++ b/src/icons/64-system-file-manager.png diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 05f85a633..c35d164e1 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -416,12 +416,15 @@ int KFileItemModel::index(const QUrl& url) const foreach (const QUrl& url, indexesForUrl.uniqueKeys()) { if (indexesForUrl.count(url) > 1) { qCWarning(DolphinDebug) << "Multiple items found with the URL" << url; - foreach (int index, indexesForUrl.values(url)) { - const ItemData* data = m_itemData.at(index); - qCWarning(DolphinDebug) << "index" << index << ":" << data->item; + + auto it = indexesForUrl.find(url); + while (it != indexesForUrl.end() && it.key() == url) { + const ItemData* data = m_itemData.at(it.value()); + qCWarning(DolphinDebug) << "index" << it.value() << ":" << data->item; if (data->parent) { qCWarning(DolphinDebug) << "parent" << data->parent->item; } + ++it; } } } @@ -590,7 +593,12 @@ int KFileItemModel::expandedParentsCount(int index) const QSet<QUrl> KFileItemModel::expandedDirectories() const { - return m_expandedDirs.values().toSet(); + QSet<QUrl> result; + const auto dirs = m_expandedDirs; + for (const auto &dir : dirs) { + result.insert(dir); + } + return result; } void KFileItemModel::restoreExpandedDirectories(const QSet<QUrl> &urls) @@ -2217,6 +2225,7 @@ const KFileItemModel::RoleInfoMap* KFileItemModel::rolesInfoMap(int& count) { "rating", RatingRole, I18N_NOOP2_NOSTRIP("@label", "Rating"), 0, 0, true, false }, { "tags", TagsRole, I18N_NOOP2_NOSTRIP("@label", "Tags"), 0, 0, true, false }, { "comment", CommentRole, I18N_NOOP2_NOSTRIP("@label", "Comment"), 0, 0, true, false }, + { "title", TitleRole, I18N_NOOP2_NOSTRIP("@label", "Title"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, { "wordCount", WordCountRole, I18N_NOOP2_NOSTRIP("@label", "Word Count"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, { "lineCount", LineCountRole, I18N_NOOP2_NOSTRIP("@label", "Line Count"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, { "imageSize", ImageSizeRole, I18N_NOOP2_NOSTRIP("@label", "Image Size"), I18N_NOOP2_NOSTRIP("@label", "Image"), true, true }, diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 8a0df72b9..717afb9a7 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -284,7 +284,7 @@ private: GroupRole, TypeRole, DestinationRole, PathRole, // User visible roles available with Baloo: CommentRole, TagsRole, RatingRole, ImageSizeRole, OrientationRole, - WordCountRole, LineCountRole, ArtistRole, AlbumRole, DurationRole, TrackRole, + WordCountRole, TitleRole, LineCountRole, ArtistRole, AlbumRole, DurationRole, TrackRole, OriginUrlRole, // Non-visible roles: IsDirRole, IsLinkRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole, diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 6a0c5756c..b4ea62fac 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -48,7 +48,7 @@ class KItemListContainerViewport : public QGraphicsView public: KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent); protected: - virtual void wheelEvent(QWheelEvent* event); + void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; }; KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) : diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index b8a93edac..5e5e6b7c3 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -59,7 +59,6 @@ class QTransform; class DOLPHIN_EXPORT KItemListController : public QObject { Q_OBJECT - Q_ENUMS(SelectionBehavior) Q_PROPERTY(KItemModelBase* model READ model WRITE setModel) Q_PROPERTY(KItemListView *view READ view WRITE setView) Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior) @@ -72,6 +71,7 @@ public: SingleSelection, MultiSelection }; + Q_ENUM(SelectionBehavior) enum AutoActivationBehavior { ActivationAndExpansion, diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp index 9c31155b3..65fc911bd 100644 --- a/src/kitemviews/kitemlistwidget.cpp +++ b/src/kitemviews/kitemlistwidget.cpp @@ -179,8 +179,8 @@ QList<QByteArray> KItemListWidget::visibleRoles() const void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width) { - if (m_columnWidths.value(role) != width) { - const qreal previousWidth = width; + const qreal previousWidth = m_columnWidths.value(role); + if (previousWidth != width) { m_columnWidths.insert(role, width); columnWidthChanged(role, width, previousWidth); update(); diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index e0b889e6c..9f151df92 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -138,6 +138,7 @@ KBalooRolesProvider::KBalooRolesProvider() : { "rating", "rating" }, { "tag", "tags" }, { "comment", "comment" }, + { "title", "title" }, { "wordCount", "wordCount" }, { "lineCount", "lineCount" }, { "width", "imageSize" }, diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h index c2c621aed..5aa2b6303 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.h +++ b/src/kitemviews/private/kfileitemmodeldirlister.h @@ -48,7 +48,7 @@ signals: void urlIsFileError(const QUrl& url); protected: - virtual void handleError(KIO::Job* job); + void handleError(KIO::Job* job) Q_DECL_OVERRIDE; }; #endif diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h index 2a80c205d..2342b4907 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.h +++ b/src/kitemviews/private/kitemlistheaderwidget.h @@ -64,7 +64,7 @@ public: qreal minimumColumnWidth() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; signals: /** @@ -104,13 +104,13 @@ signals: void sortRoleChanged(const QByteArray& current, const QByteArray& previous); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent* event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event); + void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; + void hoverMoveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; private slots: void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous); diff --git a/src/kitemviews/private/kitemlistroleeditor.h b/src/kitemviews/private/kitemlistroleeditor.h index 3b8f96865..f889ea4f4 100644 --- a/src/kitemviews/private/kitemlistroleeditor.h +++ b/src/kitemviews/private/kitemlistroleeditor.h @@ -44,15 +44,15 @@ public: void setRole(const QByteArray& role); QByteArray role() const; - virtual bool eventFilter(QObject* watched, QEvent* event); + bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; signals: void roleEditingFinished(const QByteArray& role, const QVariant& value); void roleEditingCanceled(const QByteArray& role, const QVariant& value); protected: - virtual bool event(QEvent* event); - virtual void keyPressEvent(QKeyEvent* event); + bool event(QEvent* event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index d058ee988..e3f5bb63c 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -42,10 +42,10 @@ public: void setHovered(bool hovered); - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; protected: - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; private: void updatePixmap(); diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h index a3576a3fd..7d01a6b62 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.h +++ b/src/kitemviews/private/kitemlistsmoothscroller.h @@ -83,7 +83,7 @@ public: void handleWheelEvent(QWheelEvent* event); protected: - virtual bool eventFilter(QObject* obj, QEvent* event); + bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; private slots: void slotAnimationStateChanged(QAbstractAnimation::State newState, diff --git a/src/main.cpp b/src/main.cpp index 8987d351f..acba8daed 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) { QApplication app(argc, argv); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon())); KCrash::initialize(); diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index d0cec5030..233819559 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -93,7 +93,7 @@ <description> <p>Dolphin is a lightweight file manager. It has been designed with ease of use and simplicity in mind, while still allowing flexibility and customisation. This means that you can do your file management exactly the way you want to do it.</p> <p xml:lang="ar">دولفين هو مدير ملفات خفيف. صُمِّم دولفين مع أخذ سهولة الاستخدام والبساطة بعين الاعتبار، مع السماح بالمرونة والتخصيص. يعني هذا أنه يمكنك إدارة ملفاتك كما تريد تمامًا.</p> - <p xml:lang="ast">Dolphin ye un xestor de ficheros llixeru. Diseñóse cola facilidá d'usu y cenciellez na miente entrín entá permite la flexibilidá y personalización. Esto quier dicir que pues facer la to xestión de ficheros exautamente como tu quies facela.</p> + <p xml:lang="ast">Dolphin ye un xestor de ficheros llixeru. Diseñóse cola facilidá y cenciellez d'usu en mente, el mesmu tiempu qu'entá permite la flixibilidá y personalización. Quier dicir que pues facer la to xestión de ficheros exautamente como quieras facelo.</p> <p xml:lang="bs">Dolphinje lagan file manager. On je bio dizajniran sa lakoćom korišćenja i jednostavnosti u vidu, još omogućavajući fleksibilnost i prilagođavanje. To znači da možete da radite svoje upravljanje datotekama onako kako želite da to uradi.</p> <p xml:lang="ca">El Dolphin és un gestor de fitxers lleuger. S'ha dissenyat pensant a facilitar el seu ús i que sigui simple, permetent la flexibilitat i la personalització. Això vol dir que podeu fer la gestió dels vostres fitxers de la manera exacta com ho vulgueu fer.</p> <p xml:lang="ca-valencia">El Dolphin és un gestor de fitxers lleuger. S'ha dissenyat pensant a facilitar el seu ús i que siga simple, permetent la flexibilitat i la personalització. Això vol dir que podeu fer la gestió dels vostres fitxers de la manera exacta com ho vulgueu fer.</p> @@ -133,7 +133,7 @@ <p xml:lang="zh-TW">Dolphin 是一套輕量級的檔案管理員。它設計的理念是易用與簡單，但仍然保持足夠的彈性。這表示您可以用您想要使用的方式來管理您的檔案。</p> <p>Features:</p> <p xml:lang="ar">المزايا:</p> - <p xml:lang="ast">Carauterístiques</p> + <p xml:lang="ast">Carauterístiques:</p> <p xml:lang="bs">Svojstva:</p> <p xml:lang="ca">Característiques:</p> <p xml:lang="ca-valencia">Característiques:</p> @@ -177,7 +177,6 @@ <p xml:lang="zh-TW">功能：</p> <ul> <li>Navigation (or breadcrumb) bar for URLs, allowing you to quickly navigate through the hierarchy of files and folders.</li> - <li xml:lang="ast">Barra de navegación </li> <li xml:lang="bs">Navigacijska (ili mrvična) traka za URL, dopušta vam da se brzo krećete kroz hijerarhiju datoteka i direktorija.</li> <li xml:lang="ca">Barra de navegació (o fil d'Ariadna) pels URL, permetent una navegació ràpida per la jerarquia dels fitxers i carpetes.</li> <li xml:lang="ca-valencia">Barra de navegació (o fil d'Ariadna) pels URL, permetent una navegació ràpida per la jerarquia dels fitxers i carpetes.</li> @@ -215,7 +214,6 @@ <li xml:lang="zh-TW">網址導覽列讓您可以快速瀏覽檔案與資料夾。</li> <li>Supports several different kinds of view styles and properties and allows you to configure the view exactly how you want it.</li> <li xml:lang="ar">يدعم العديد من الأنواع المختلفة من الخصائص وأنماط العرض ويسمح لك بضبط العرض كما تريد تمامًا.</li> - <li xml:lang="ast">Sofitalla delles tribes de vista y propiedaes diferentes y permítete configurar la vista exautamente como tu quies.</li> <li xml:lang="bs">Dopušta vište vrsta stilova pogleda i svojstava i dopšta vam da konfigurišete pogled baš kako želite.</li> <li xml:lang="ca">Accepta diferents classes diverses d'estils de visualització i propietats i us permet configurar la visualització exactament com la vulgueu.</li> <li xml:lang="ca-valencia">Accepta diferents classes diverses d'estils de visualització i propietats i vos permet configurar la visualització exactament com la vulgueu.</li> @@ -254,7 +252,6 @@ <li xml:lang="zh-TW">網址導覽列讓您可以快速瀏覽檔案與資料夾。</li> <li>Split view, allowing you to easily copy or move files between locations.</li> <li xml:lang="ar">العرض المقسوم، يسمح لك بنسخ ونقل الملفات بين مكانين بسهولة.</li> - <li xml:lang="ast">Vista dixebrada, permítete copiar y mover ficheros d'un mou cenciellu ente allugamientos.</li> <li xml:lang="bs">Razdvaja pogled, dopuštajući lako kopiranje ili pomijeranje datoteka između lokacija</li> <li xml:lang="ca">Divisió de visualització, permetent copiar o moure fitxers fàcilment entre les ubicacions.</li> <li xml:lang="ca-valencia">Divisió de visualització, permetent copiar o moure fitxers fàcilment entre les ubicacions.</li> @@ -293,7 +290,6 @@ <li xml:lang="zh-TW">支援數個檢視模式，您也可以調整檢視模式的屬性。</li> <li>Additional information and shortcuts are available as dock-able panels, allowing you to move them around freely and display exactly what you want.</li> <li xml:lang="ar">تتوفر معلومات واختصارات إضافية كلوحات قابلة للرصف، مما يسمح لك بنقلها بحريّة وعرضها بالضبط كما تريد.</li> - <li xml:lang="ast">Tán disponibles atayos ya información adicional como paneles anclables, permitiéndote movelos pehí d'un mou llibre y amosar exautamente lo tu quies.</li> <li xml:lang="bs">Dodatne informacije i kratice su dostupne kao usidreni paneli, dopuštajući vam da se krećete slobodno i prikažete šta želite.</li> <li xml:lang="ca">Hi ha informació addicional i dreceres disponibles com a plafons que es poden acoblar, permetent moure'ls lliurement i mostrar exactament el què vulgueu.</li> <li xml:lang="ca-valencia">Hi ha informació addicional i dreceres disponibles com a plafons que es poden acoblar, permetent moure'ls lliurement i mostrar exactament el què vulgueu.</li> @@ -331,7 +327,6 @@ <li xml:lang="zh-TW">分割檢視讓您可以輕鬆複製或移動檔案。</li> <li>Multiple tab support</li> <li xml:lang="ar">دعم تعدّد الألسنة</li> - <li xml:lang="ast">Sofitu de múltiples llingüetes</li> <li xml:lang="bs">Podrška za više kartica</li> <li xml:lang="ca">Admet pestanyes múltiples</li> <li xml:lang="ca-valencia">Admet pestanyes múltiples</li> @@ -374,7 +369,6 @@ <li xml:lang="zh-TW">額外資訊與嵌入式面板捷徑讓您可以輕易顯示您常用的項目。</li> <li>Informational dialogues are displayed in an unobtrusive way.</li> <li xml:lang="ar">حواريات المعلومات تُعرَض بطريقة غير مُزعجة.</li> - <li xml:lang="ast">Los diálogos d'información amuésense d'un mou discretu.</li> <li xml:lang="bs">Informativni dijalozi su prikazani na nenametljiv način.</li> <li xml:lang="ca">Els diàlegs informatius es mostren d'una manera no molesta.</li> <li xml:lang="ca-valencia">Els diàlegs informatius es mostren d'una manera no molesta.</li> @@ -412,7 +406,6 @@ <li xml:lang="zh-TW">支援多分頁</li> <li>Undo/redo support</li> <li xml:lang="ar">دعم التراجع والإعادة</li> - <li xml:lang="ast">Sofitu de desfechura/refechura</li> <li xml:lang="bs">Podrška za poništavanje/ponavljanje akcija</li> <li xml:lang="ca">Admet desfer/refer</li> <li xml:lang="ca-valencia">Admet desfer/refer</li> @@ -454,7 +447,6 @@ <li xml:lang="zh-TW">以不唐突的方式顯示資訊對話框。</li> <li>Transparent network access through the KIO system.</li> <li xml:lang="ar">اتصال شبكيّ مباشر باستخدام نظام KIO.</li> - <li xml:lang="ast">Accesu tresparente a la rede pente'l sistema KIO.</li> <li xml:lang="bs">Transparentni mrežni pristup kroz KIO sistem.</li> <li xml:lang="ca">Accés transparent a la xarxa a través del sistema KIO.</li> <li xml:lang="ca-valencia">Accés transparent a la xarxa a través del sistema KIO.</li> diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index e4885ab76..ac4a32506 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -52,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget updateGeometry(); } - virtual QSize sizeHint() const + QSize sizeHint() const Q_DECL_OVERRIDE { return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint(); } diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 962fb7778..556231e44 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,6 +1,5 @@ Name=Dolphin General Name[ar]=دولفين العامّ -Name[ast]=Xeneral de Dolphin Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin @@ -43,7 +42,6 @@ Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين العامّة. -Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. @@ -139,7 +137,6 @@ Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings Comment[ar]=اضبط إعدادات مدير الملفّات العامّة -Comment[ast]=Configura los axustes xenerales del xestor de ficheros Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[ca@valencia]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index eaca4f141..9280624d6 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -1,6 +1,5 @@ Name=Dolphin Navigation Name[ar]=التّنقّل في دولفين -Name[ast]=Navegación de Dolphin Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu @@ -43,7 +42,6 @@ Name[zh_CN]=Dolphin 导航 Name[zh_TW]=Dolphin 導覽 Comment=This service allows configuration of the Dolphin navigation. Comment[ar]=تسمح هذه الخدمة بضبط التّنقّل في دولفين. -Comment[ast]=Esti serviciu permite la configuración de la navegación de Dolphin. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. @@ -139,7 +137,6 @@ Name[zh_CN]=导航 Name[zh_TW]=導覽 Comment=Configure file manager navigation Comment[ar]=اضبط التّنقّل في مدير الملفّات -Comment[ast]=Configura la navegación del xestor de ficheros Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 1775f7eff..42e0538fa 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -95,7 +95,6 @@ Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services Comment[ar]=اضبط خدمات مدير الملفّات -Comment[ast]=Configura los servicios del xestor de ficheros Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index d1b5abe49..0be2656a0 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -1,6 +1,5 @@ Name=Dolphin View Modes Name[ar]=أوضاع المنظور في دولفين -Name[ast]=Moos de vista de Dolphin Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu @@ -43,7 +42,6 @@ Name[zh_CN]=Dolphin 视图模式 Name[zh_TW]=設定檔案管理員服務 Comment=This service allows configuration of the Dolphin view modes. Comment[ar]=تسمح هذه الخدمة بضبط أوضاع المنظور في دولفين. -Comment[ast]=Esti serviciu permite la configuración de los moos de vista de Dolphin. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. @@ -96,7 +94,6 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-viewmodes Name=View Modes Name[ar]=أوضاع المنظور -Name[ast]=Moos de vista Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu @@ -139,7 +136,6 @@ Name[zh_CN]=视图模式 Name[zh_TW]=檢視模式 Comment=Configure file manager view modes Comment[ar]=اضبط أوضاع المنظور في مدير الملفّات -Comment[ast]=Configura los moos de vista del xestor de ficheros Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp index 6c45e114b..ac15693b6 100644 --- a/src/tests/kfileitemmodeltest.cpp +++ b/src/tests/kfileitemmodeltest.cpp @@ -154,9 +154,9 @@ void KFileItemModelTest::testDefaultSortRole() QVERIFY(itemsInsertedSpy.wait()); QCOMPARE(m_model->count(), 3); - QCOMPARE(m_model->data(0)["text"].toString(), QString("a.txt")); - QCOMPARE(m_model->data(1)["text"].toString(), QString("b.txt")); - QCOMPARE(m_model->data(2)["text"].toString(), QString("c.txt")); + QCOMPARE(m_model->data(0).value("text").toString(), QString("a.txt")); + QCOMPARE(m_model->data(1).value("text").toString(), QString("b.txt")); + QCOMPARE(m_model->data(2).value("text").toString(), QString("c.txt")); } void KFileItemModelTest::testDefaultGroupedSorting() diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index e170e7b5b..92d05c4d4 100644 --- a/src/tests/kitemlistcontrollertest.cpp +++ b/src/tests/kitemlistcontrollertest.cpp @@ -37,6 +37,7 @@ */ class KItemListControllerTestStyle : public QProxyStyle { + Q_OBJECT public: KItemListControllerTestStyle(QStyle* style) : QProxyStyle(style), diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index b183de302..18a79bd3f 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -26,11 +26,12 @@ class DummyModel : public KItemModelBase { + Q_OBJECT public: DummyModel(); void setCount(int count); - virtual int count() const; - virtual QHash<QByteArray, QVariant> data(int index) const; + int count() const Q_DECL_OVERRIDE; + QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; private: int m_count; diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp index 0d14e20fa..f559475a6 100644 --- a/src/tests/kitemsettest.cpp +++ b/src/tests/kitemsettest.cpp @@ -72,14 +72,14 @@ QVector<int> KItemRangeList2QVector(const KItemRangeList& itemRanges) static QSet<int> KItemSet2QSet(const KItemSet& itemSet) { QSet<int> result; - foreach (int i, itemSet) { + for (int i : itemSet) { result.insert(i); } // Check that the conversion was successful. Q_ASSERT(itemSet.count() == result.count()); - foreach (int i, itemSet) { + for (int i : itemSet) { Q_ASSERT(result.contains(i)); } @@ -239,7 +239,7 @@ void KItemSetTest::testIterators() QCOMPARE(testQVector, itemsQVector); testQVector.clear(); - foreach (int i, itemSet) { + for (int i : itemSet) { testQVector.append(i); } QCOMPARE(testQVector, itemsQVector); diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp index 482e4127d..114afdc33 100644 --- a/src/tests/viewpropertiestest.cpp +++ b/src/tests/viewpropertiestest.cpp @@ -44,6 +44,7 @@ void ViewPropertiesTest::init() { m_globalViewProps = GeneralSettings::self()->globalViewProps(); GeneralSettings::self()->setGlobalViewProps(false); + GeneralSettings::self()->save(); // It is mandatory to create the test-directory inside the home-directory // of the user: ViewProperties does not write inside directories @@ -58,6 +59,7 @@ void ViewPropertiesTest::cleanup() m_testDir = 0; GeneralSettings::self()->setGlobalViewProps(m_globalViewProps); + GeneralSettings::self()->save(); } /** diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index cdec01b9d..67951cfe7 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -2,7 +2,6 @@ Type=ServiceType X-KDE-ServiceType=FileViewVersionControlPlugin Comment=Version Control Plugin for File Views -Comment[ast]=Complementu de control de versiones pa vistes de ficheros Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory |
