diff --git a/src/main.qml b/src/main.qml index 4871bc03d07ece901a99b86399725172053ca959..77f454f32205cd8634b0892b245f3ec9d7a56f82 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 22b46432af2713add5a15d32c9f3534c6eb71f9a..af4e532f246e91365822ee6d68526b069b868efb 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 982e2ee43abc7afa4a7aeab0a4b4c15535c3f5e0..e78f999926064be7f675181f73fffce80954dab4 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 9001ab9dbc16c1e3ed1a62c6a8bc2f5052a056b8..4cacc468b681a8db331cdac191f7196946c86109 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 039967ccc1853c6f07834910d5db40af7bf0bc7f..d88be4d9ce5edadf979664ec6647c556f460aa44 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 6a3aae88e4b641a559da8d19d5b48550346eafca..ca44e1459138b60b973195e5ac3c8675304f711f 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 147ddbe01e8d489bd43f6303df84af08f80b7777..302ad8c16c7d203529e2bda37798e1bcf035f139 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 53f431f8040e3cb4703faf63ee81edcdd268a03f..33cb20a777140f81c6facabd30145f8f5a01b059 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 f4c390ae5c87d35f412456961259155e738ae01a..a0fa5c1107b72f72c653bb917d7d8f4b9e3f1dba 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 1a0935d697fe997b242f4dfb4670a4e0b6fdf4cf..84d9ba0ba02f03a14b5a65625033f36bd20bc520 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 23d25bbfc30ef65abf8751dcc0d0fbba1675b364..01f25b971502141074f60f7300813c1b16ebef16 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