Commit 1b5c6fe6 authored by camilo higuita's avatar camilo higuita

more updates for latest mauikit

parent 0252f378
...@@ -50,19 +50,18 @@ import AlbumsList 1.0 ...@@ -50,19 +50,18 @@ import AlbumsList 1.0
import TagsModel 1.0 import TagsModel 1.0
import TagsList 1.0 import TagsList 1.0
import SyncingModel 1.0 //import SyncingModel 1.0
import SyncingList 1.0 //import SyncingList 1.0
import StoreList 1.0 import StoreList 1.0
Maui.ApplicationWindow Maui.ApplicationWindow
{ {
id: root id: root
title: qsTr("Pix") title: qsTr("Pix")
showAccounts: false
// visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed // visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed
// altToolBars: true // 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.") 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.")
about.appIcon: "qrc:/img/assets/pix.svg" Maui.App.iconName: "qrc:/img/assets/pix.svg"
property alias dialog : dialogLoader.item property alias dialog : dialogLoader.item
/*READONLY PROPS*/ /*READONLY PROPS*/
...@@ -358,9 +357,10 @@ Maui.ApplicationWindow ...@@ -358,9 +357,10 @@ Maui.ApplicationWindow
id: fmDialogComponent id: fmDialogComponent
Maui.FileDialog Maui.FileDialog
{ {
onlyDirs: false
mode: modes.SAVE mode: modes.SAVE
filterType: Maui.FMList.IMAGE settings.filterType: Maui.FMList.IMAGE
settings.onlyDirs: false
} }
} }
......
...@@ -5,7 +5,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) ...@@ -5,7 +5,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent)
this->fm = new FM(this); this->fm = new FM(this);
this->setList(); 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); Q_UNUSED(url);
emit this->preListChanged(); emit this->preListChanged();
...@@ -19,7 +19,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) ...@@ -19,7 +19,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent)
emit this->warning(message); 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; qDebug()<< "REQUESTED CLOUD IMAGE READY << " << item;
Q_UNUSED(path); Q_UNUSED(path);
...@@ -33,8 +33,8 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) ...@@ -33,8 +33,8 @@ Cloud::Cloud(QObject *parent) : BaseList (parent)
newItem[FMH::MODEL_KEY::TITLE] = item[FMH::MODEL_KEY::LABEL]; 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]))); 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(FM::toMap(newItem)); emit this->cloudImageReady(FMH::toMap(newItem));
}); });
} }
...@@ -63,7 +63,7 @@ void Cloud::setList() ...@@ -63,7 +63,7 @@ void Cloud::setList()
{ {
emit this->preListChanged(); emit this->preListChanged();
this->list.clear(); 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(); emit this->postListChanged();
} }
...@@ -103,7 +103,7 @@ void Cloud::requestImage(const int &index) ...@@ -103,7 +103,7 @@ void Cloud::requestImage(const int &index)
this->pending.insert(this->list[index][FMH::MODEL_KEY::PATH], index); this->pending.insert(this->list[index][FMH::MODEL_KEY::PATH], index);
qDebug()<< "1-PEDNIGN CLOUD"<< this->pending; 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) bool Cloud::update(const QVariantMap &data, const int &index)
......
...@@ -31,7 +31,6 @@ Maui.Page ...@@ -31,7 +31,6 @@ Maui.Page
/*signals*/ /*signals*/
signal picClicked(int index) signal picClicked(int index)
headBar.drawBorder: false
padding: space.big padding: space.big
Maui.Holder Maui.Holder
......
...@@ -171,7 +171,7 @@ ItemDelegate ...@@ -171,7 +171,7 @@ ItemDelegate
visible: parent.visible && showSelectionBackground visible: parent.visible && showSelectionBackground
anchors.fill: parent anchors.fill: parent
z: -1 z: -1
radius: radiusV radius: Maui.Style.radiusV
color: hightlightedColor color: hightlightedColor
opacity: hovered ? 0.25 : 1 opacity: hovered ? 0.25 : 1
} }
......
...@@ -30,7 +30,7 @@ ListView ...@@ -30,7 +30,7 @@ ListView
{ {
id: delegate id: delegate
label: album label: album
radius: radiusV radius: Maui.Style.radiusV
Connections Connections
{ {
......
...@@ -31,7 +31,7 @@ ListView ...@@ -31,7 +31,7 @@ ListView
{ {
id: delegate id: delegate
label: tag label: tag
radius: radiusV radius: Maui.Style.radiusV
Connections Connections
{ {
target: delegate target: delegate
......
...@@ -24,7 +24,6 @@ import org.kde.mauikit 1.0 as Maui ...@@ -24,7 +24,6 @@ import org.kde.mauikit 1.0 as Maui
footBar.visible: true footBar.visible: true
footBar.drawBorder: false
footBar.middleContent: Maui.TextField footBar.middleContent: Maui.TextField
{ {
id: searchInput id: searchInput
......
...@@ -191,7 +191,7 @@ Maui.Page ...@@ -191,7 +191,7 @@ Maui.Page
delegate: Maui.ListDelegate delegate: Maui.ListDelegate
{ {
id: delegate id: delegate
radius: radiusV radius: Maui.Style.radiusV
Connections Connections
{ {
......
...@@ -32,7 +32,7 @@ Maui.Page ...@@ -32,7 +32,7 @@ Maui.Page
z: 999 z: 999
} }
Maui.SideBar Maui.ListBrowser
{ {
id: _tagsList id: _tagsList
anchors.fill: parent anchors.fill: parent
...@@ -42,7 +42,7 @@ Maui.Page ...@@ -42,7 +42,7 @@ Maui.Page
{ {
id: delegate id: delegate
label: tag label: tag
radius: radiusV radius: Maui.Style.radiusV
Connections Connections
{ {
......
...@@ -170,7 +170,6 @@ Maui.Page ...@@ -170,7 +170,6 @@ Maui.Page
id: tagBar id: tagBar
visible: !holder.visible && tagBarVisible && !fullScreen visible: !holder.visible && tagBarVisible && !fullScreen
Layout.fillWidth: true Layout.fillWidth: true
bgColor: viewerBackgroundColor
allowEditMode: true allowEditMode: true
list.urls: [currentPic.url] list.urls: [currentPic.url]
onTagClicked: PIX.searchFor(tag) onTagClicked: PIX.searchFor(tag)
......
...@@ -16,7 +16,7 @@ Maui.ImageViewer ...@@ -16,7 +16,7 @@ Maui.ImageViewer
readonly property string currentImageSource: "file://"+model.url readonly property string currentImageSource: "file://"+model.url
image.source : currentImageSource source : currentImageSource
width: itemWidth width: itemWidth
height: itemHeight height: itemHeight
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment