From 1b5c6fe699bc36605dbe45ed6fcce1b24a8d040b Mon Sep 17 00:00:00 2001 From: Camilo Higuita Date: Thu, 24 Oct 2019 18:38:05 -0500 Subject: [PATCH] more updates for latest mauikit --- src/main.qml | 14 +++++++------- src/models/cloud/cloud.cpp | 12 ++++++------ src/view_models/PixGrid.qml | 1 - src/view_models/PixPic.qml | 2 +- src/widgets/dialogs/Albums/AlbumsList.qml | 2 +- src/widgets/dialogs/Tags/TagsList.qml | 2 +- src/widgets/views/Search/SearchView.qml | 1 - src/widgets/views/Store/StoreView.qml | 2 +- src/widgets/views/Tags/TagsSidebar.qml | 4 ++-- src/widgets/views/Viewer/PixViewer.qml | 1 - src/widgets/views/Viewer/ViewerDelegate.qml | 2 +- 11 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main.qml b/src/main.qml index 4871bc0..77f454f 100644 --- a/src/main.qml +++ b/src/main.qml @@ -50,19 +50,18 @@ import AlbumsList 1.0 import TagsModel 1.0 import TagsList 1.0 -import SyncingModel 1.0 -import SyncingList 1.0 +//import SyncingModel 1.0 +//import SyncingList 1.0 import StoreList 1.0 Maui.ApplicationWindow { id: root title: qsTr("Pix") - showAccounts: false // visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed // altToolBars: true - about.appDescription: qsTr("Pix is an image gallery manager made for Maui. Pix is a convergent and multiplatform app that works under Android and GNU Linux distros.") - about.appIcon: "qrc:/img/assets/pix.svg" + Maui.App.description: qsTr("Pix is an image gallery manager made for Maui. Pix is a convergent and multiplatform app that works under Android and GNU Linux distros.") + Maui.App.iconName: "qrc:/img/assets/pix.svg" property alias dialog : dialogLoader.item /*READONLY PROPS*/ @@ -358,9 +357,10 @@ Maui.ApplicationWindow id: fmDialogComponent Maui.FileDialog { - onlyDirs: false mode: modes.SAVE - filterType: Maui.FMList.IMAGE + settings.filterType: Maui.FMList.IMAGE + settings.onlyDirs: false + } } diff --git a/src/models/cloud/cloud.cpp b/src/models/cloud/cloud.cpp index 22b4643..af4e532 100644 --- a/src/models/cloud/cloud.cpp +++ b/src/models/cloud/cloud.cpp @@ -5,7 +5,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) this->fm = new FM(this); this->setList(); - connect(this->fm, &FM::cloudServerContentReady, [this](const FMH::MODEL_LIST &list, const QString &url) + connect(this->fm, &FM::cloudServerContentReady, [this](const FMH::MODEL_LIST &list, const QUrl &url) { Q_UNUSED(url); emit this->preListChanged(); @@ -19,7 +19,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) emit this->warning(message); }); - connect(this->fm, &FM::cloudItemReady, [this](const FMH::MODEL &item, const QString &path) + connect(this->fm, &FM::cloudItemReady, [this](const FMH::MODEL &item, const QUrl &path) { qDebug()<< "REQUESTED CLOUD IMAGE READY << " << item; Q_UNUSED(path); @@ -33,8 +33,8 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) newItem[FMH::MODEL_KEY::TITLE] = item[FMH::MODEL_KEY::LABEL]; - this->update(FM::toMap(newItem), this->pending.take(QString(item[FMH::MODEL_KEY::PATH]).replace(FMH::CloudCachePath+"opendesktop", FMH::PATHTYPE_NAME[FMH::PATHTYPE_KEY::CLOUD_PATH]))); - emit this->cloudImageReady(FM::toMap(newItem)); + this->update(FMH::toMap(newItem), this->pending.take(QString(item[FMH::MODEL_KEY::PATH]).replace(FMH::CloudCachePath+"opendesktop", FMH::PATHTYPE_URI[FMH::PATHTYPE_KEY::CLOUD_PATH]))); + emit this->cloudImageReady(FMH::toMap(newItem)); }); } @@ -63,7 +63,7 @@ void Cloud::setList() { emit this->preListChanged(); this->list.clear(); - this->fm->getCloudServerContent(FMH::PATHTYPE_NAME[FMH::PATHTYPE_KEY::CLOUD_PATH]+"/"+this->account, FMH::FILTER_LIST[FMH::FILTER_TYPE::IMAGE], 3); + this->fm->getCloudServerContent(FMH::PATHTYPE_URI[FMH::PATHTYPE_KEY::CLOUD_PATH]+"/"+this->account, FMH::FILTER_LIST[FMH::FILTER_TYPE::IMAGE], 3); emit this->postListChanged(); } @@ -103,7 +103,7 @@ void Cloud::requestImage(const int &index) this->pending.insert(this->list[index][FMH::MODEL_KEY::PATH], index); qDebug()<< "1-PEDNIGN CLOUD"<< this->pending; - this->fm->getCloudItem(FM::toMap(this->list[index])); + this->fm->getCloudItem(FMH::toMap(this->list[index])); } bool Cloud::update(const QVariantMap &data, const int &index) diff --git a/src/view_models/PixGrid.qml b/src/view_models/PixGrid.qml index 982e2ee..e78f999 100644 --- a/src/view_models/PixGrid.qml +++ b/src/view_models/PixGrid.qml @@ -31,7 +31,6 @@ Maui.Page /*signals*/ signal picClicked(int index) - headBar.drawBorder: false padding: space.big Maui.Holder diff --git a/src/view_models/PixPic.qml b/src/view_models/PixPic.qml index 9001ab9..4cacc46 100644 --- a/src/view_models/PixPic.qml +++ b/src/view_models/PixPic.qml @@ -171,7 +171,7 @@ ItemDelegate visible: parent.visible && showSelectionBackground anchors.fill: parent z: -1 - radius: radiusV + radius: Maui.Style.radiusV color: hightlightedColor opacity: hovered ? 0.25 : 1 } diff --git a/src/widgets/dialogs/Albums/AlbumsList.qml b/src/widgets/dialogs/Albums/AlbumsList.qml index 039967c..d88be4d 100644 --- a/src/widgets/dialogs/Albums/AlbumsList.qml +++ b/src/widgets/dialogs/Albums/AlbumsList.qml @@ -30,7 +30,7 @@ ListView { id: delegate label: album - radius: radiusV + radius: Maui.Style.radiusV Connections { diff --git a/src/widgets/dialogs/Tags/TagsList.qml b/src/widgets/dialogs/Tags/TagsList.qml index 6a3aae8..ca44e14 100644 --- a/src/widgets/dialogs/Tags/TagsList.qml +++ b/src/widgets/dialogs/Tags/TagsList.qml @@ -31,7 +31,7 @@ ListView { id: delegate label: tag - radius: radiusV + radius: Maui.Style.radiusV Connections { target: delegate diff --git a/src/widgets/views/Search/SearchView.qml b/src/widgets/views/Search/SearchView.qml index 147ddbe..302ad8c 100644 --- a/src/widgets/views/Search/SearchView.qml +++ b/src/widgets/views/Search/SearchView.qml @@ -24,7 +24,6 @@ import org.kde.mauikit 1.0 as Maui footBar.visible: true - footBar.drawBorder: false footBar.middleContent: Maui.TextField { id: searchInput diff --git a/src/widgets/views/Store/StoreView.qml b/src/widgets/views/Store/StoreView.qml index 53f431f..33cb20a 100644 --- a/src/widgets/views/Store/StoreView.qml +++ b/src/widgets/views/Store/StoreView.qml @@ -191,7 +191,7 @@ Maui.Page delegate: Maui.ListDelegate { id: delegate - radius: radiusV + radius: Maui.Style.radiusV Connections { diff --git a/src/widgets/views/Tags/TagsSidebar.qml b/src/widgets/views/Tags/TagsSidebar.qml index f4c390a..a0fa5c1 100644 --- a/src/widgets/views/Tags/TagsSidebar.qml +++ b/src/widgets/views/Tags/TagsSidebar.qml @@ -32,7 +32,7 @@ Maui.Page z: 999 } - Maui.SideBar + Maui.ListBrowser { id: _tagsList anchors.fill: parent @@ -42,7 +42,7 @@ Maui.Page { id: delegate label: tag - radius: radiusV + radius: Maui.Style.radiusV Connections { diff --git a/src/widgets/views/Viewer/PixViewer.qml b/src/widgets/views/Viewer/PixViewer.qml index 1a0935d..84d9ba0 100644 --- a/src/widgets/views/Viewer/PixViewer.qml +++ b/src/widgets/views/Viewer/PixViewer.qml @@ -170,7 +170,6 @@ Maui.Page id: tagBar visible: !holder.visible && tagBarVisible && !fullScreen Layout.fillWidth: true - bgColor: viewerBackgroundColor allowEditMode: true list.urls: [currentPic.url] onTagClicked: PIX.searchFor(tag) diff --git a/src/widgets/views/Viewer/ViewerDelegate.qml b/src/widgets/views/Viewer/ViewerDelegate.qml index 23d25bb..01f25b9 100644 --- a/src/widgets/views/Viewer/ViewerDelegate.qml +++ b/src/widgets/views/Viewer/ViewerDelegate.qml @@ -16,7 +16,7 @@ Maui.ImageViewer readonly property string currentImageSource: "file://"+model.url - image.source : currentImageSource + source : currentImageSource width: itemWidth height: itemHeight -- GitLab