Commit b03b81ab authored by camilo higuita's avatar camilo higuita

style ux ui migration

parent 03e43f93
...@@ -18,11 +18,9 @@ You should have received a copy of the GNU General Public License ...@@ -18,11 +18,9 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
***/ ***/
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.1
import org.kde.kirigami 2.6 as Kirigami import org.kde.kirigami 2.6 as Kirigami
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
...@@ -54,8 +52,6 @@ import TagsList 1.0 ...@@ -54,8 +52,6 @@ import TagsList 1.0
import SyncingModel 1.0 import SyncingModel 1.0
import SyncingList 1.0 import SyncingList 1.0
import FMList 1.0
import StoreList 1.0 import StoreList 1.0
Maui.ApplicationWindow Maui.ApplicationWindow
...@@ -110,7 +106,7 @@ Maui.ApplicationWindow ...@@ -110,7 +106,7 @@ Maui.ApplicationWindow
/*************************************************/ /*************************************************/
onSearchButtonClicked: currentView = views.search onSearchButtonClicked: currentView = views.search
rightIcon.iconColor: currentView === views.search ? highlightColor : headBarFGColor // rightIcon.icon.color: currentView === views.search ? highlightColor : headBarFGColor
// rightIcon.showIndicator: currentView === views.search // rightIcon.showIndicator: currentView === views.search
// menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png" // menuDrawer.bannerImageSource: "qrc:/img/assets/banner.png"
...@@ -134,27 +130,27 @@ Maui.ApplicationWindow ...@@ -134,27 +130,27 @@ Maui.ApplicationWindow
Maui.MenuItem MenuItem
{ {
text: "Sources" text: "Sources"
icon.name: "folder-add" icon.name: "folder-add"
onTriggered: onTriggered:
{ {
// dialogLoader.sourceComponent = sourcesDialogComponent; dialogLoader.sourceComponent = sourcesDialogComponent;
// dialog.open() dialog.open()
dialogLoader.sourceComponent= fmDialogComponent // dialogLoader.sourceComponent= fmDialogComponent
dialog.mode= dialog.modes.OPEN // dialog.mode= dialog.modes.OPEN
dialog.onlyDirs= true // dialog.onlyDirs= true
dialog.show(function(paths) // dialog.show(function(paths)
{ // {
pix.addSources(paths) // pix.addSources(paths)
}) // })
} }
}, },
Maui.MenuItem MenuItem
{ {
text: "Open..." text: "Open..."
icon.name: "folder-open" icon.name: "folder-open"
...@@ -162,14 +158,12 @@ Maui.ApplicationWindow ...@@ -162,14 +158,12 @@ Maui.ApplicationWindow
{ {
dialogLoader.sourceComponent= fmDialogComponent dialogLoader.sourceComponent= fmDialogComponent
dialog.mode = dialog.modes.OPEN dialog.mode = dialog.modes.OPEN
dialog.filterType= FMList.IMAGE dialog.filterType= Maui.FMList.IMAGE
dialog.onlyDirs= false dialog.onlyDirs= false
dialog.show(function(paths) dialog.show(function(paths)
{ {
console.log("OPEN THIS PATHS", paths) console.log("OPEN THIS PATHS", paths)
pix.openPics(paths) pix.openPics(paths)
}); });
} }
} }
...@@ -380,7 +374,7 @@ Maui.ApplicationWindow ...@@ -380,7 +374,7 @@ Maui.ApplicationWindow
{ {
onlyDirs: false onlyDirs: false
mode: modes.SAVE mode: modes.SAVE
filterType: FMList.IMAGE filterType: Maui.FMList.IMAGE
} }
} }
...@@ -395,14 +389,14 @@ Maui.ApplicationWindow ...@@ -395,14 +389,14 @@ Maui.ApplicationWindow
headBarTitle: qsTr("Sources") headBarTitle: qsTr("Sources")
headBar.rightContent: [ headBar.rightContent: [
Maui.ToolButton ToolButton
{ {
iconName: "list-add" icon.name: "list-add"
}, },
Maui.ToolButton ToolButton
{ {
iconName: "list-remove" icon.name: "list-remove"
} }
] ]
......
...@@ -6,7 +6,6 @@ import org.kde.kirigami 2.6 as Kirigami ...@@ -6,7 +6,6 @@ import org.kde.kirigami 2.6 as Kirigami
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import PixModel 1.0 import PixModel 1.0
import GalleryList 1.0 import GalleryList 1.0
import FMList 1.0
import "../widgets/views/Viewer/Viewer.js" as VIEWER import "../widgets/views/Viewer/Viewer.js" as VIEWER
import "../widgets/views/Pix.js" as PIX import "../widgets/views/Pix.js" as PIX
...@@ -107,14 +106,6 @@ Maui.Page ...@@ -107,14 +106,6 @@ Maui.Page
onTriggered: pixList.sortBy = GalleryList.DATE onTriggered: pixList.sortBy = GalleryList.DATE
} }
// Maui.MenuItem
// {
// text: qsTr("Place")
// checkable: true
// checked: pixList.sortBy === FMList.PLACE
// onTriggered: pixList.sortBy = FMList.PLACE
// }
Kirigami.Action Kirigami.Action
{ {
text: qsTr("Format") text: qsTr("Format")
......
...@@ -2,10 +2,12 @@ import QtQuick 2.9 ...@@ -2,10 +2,12 @@ import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.6 as Kirigami
import "../db/Query.js" as Q import "../db/Query.js" as Q
import "../widgets/views/Pix.js" as PIX import "../widgets/views/Pix.js" as PIX
Maui.Menu Menu
{ {
id: control id: control
...@@ -14,7 +16,7 @@ Maui.Menu ...@@ -14,7 +16,7 @@ Maui.Menu
onOpened: isFav = dba.isFav(list.get(index).url) onOpened: isFav = dba.isFav(list.get(index).url)
Maui.MenuItem MenuItem
{ {
text: qsTr("Select") text: qsTr("Select")
onTriggered: PIX.selectItem(list.get(index)) onTriggered: PIX.selectItem(list.get(index))
...@@ -22,13 +24,13 @@ Maui.Menu ...@@ -22,13 +24,13 @@ Maui.Menu
MenuSeparator{} MenuSeparator{}
Maui.MenuItem MenuItem
{ {
text: qsTr(isFav ? "UnFav it": "Fav it") text: qsTr(isFav ? "UnFav it": "Fav it")
onTriggered: list.fav(index, !isFav) onTriggered: list.fav(index, !isFav)
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Add to...") text: qsTr("Add to...")
onTriggered: onTriggered:
...@@ -38,7 +40,7 @@ Maui.Menu ...@@ -38,7 +40,7 @@ Maui.Menu
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Tags...") text: qsTr("Tags...")
onTriggered: onTriggered:
...@@ -48,7 +50,7 @@ Maui.Menu ...@@ -48,7 +50,7 @@ Maui.Menu
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Share...") text: qsTr("Share...")
onTriggered: onTriggered:
...@@ -63,7 +65,7 @@ Maui.Menu ...@@ -63,7 +65,7 @@ Maui.Menu
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Save to...") text: qsTr("Save to...")
onTriggered: onTriggered:
...@@ -88,7 +90,7 @@ Maui.Menu ...@@ -88,7 +90,7 @@ Maui.Menu
} }
} }
Maui.MenuItem MenuItem
{ {
visible: !isAndroid visible: !isAndroid
text: qsTr("Show in folder...") text: qsTr("Show in folder...")
...@@ -112,10 +114,10 @@ Maui.Menu ...@@ -112,10 +114,10 @@ Maui.Menu
MenuSeparator{} MenuSeparator{}
Maui.MenuItem MenuItem
{ {
text: qsTr("Remove...") text: qsTr("Remove...")
colorScheme.textColor: dangerColor Kirigami.Theme.textColor: dangerColor
onTriggered: onTriggered:
{ {
removeDialog.open() removeDialog.open()
......
...@@ -2,6 +2,8 @@ import QtQuick 2.9 ...@@ -2,6 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.6 as Kirigami
import "../widgets/views/Pix.js" as PIX import "../widgets/views/Pix.js" as PIX
import "../widgets/views/Viewer/Viewer.js" as VIEWER import "../widgets/views/Viewer/Viewer.js" as VIEWER
...@@ -18,17 +20,17 @@ Maui.SelectionBar ...@@ -18,17 +20,17 @@ Maui.SelectionBar
onExitClicked: clear() onExitClicked: clear()
colorScheme.backgroundColor: "#212121" colorScheme.backgroundColor: "#212121"
Maui.Menu Menu
{ {
id: _menu id: _menu
Maui.MenuItem MenuItem
{ {
text: qsTr("Un/Fav them") text: qsTr("Un/Fav them")
onTriggered: VIEWER.fav(selectedPaths) onTriggered: VIEWER.fav(selectedPaths)
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Add to...") text: qsTr("Add to...")
onTriggered: onTriggered:
...@@ -38,7 +40,7 @@ Maui.SelectionBar ...@@ -38,7 +40,7 @@ Maui.SelectionBar
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Tags...") text: qsTr("Tags...")
onTriggered: onTriggered:
...@@ -48,7 +50,7 @@ Maui.SelectionBar ...@@ -48,7 +50,7 @@ Maui.SelectionBar
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Share...") text: qsTr("Share...")
onTriggered: onTriggered:
...@@ -63,7 +65,7 @@ Maui.SelectionBar ...@@ -63,7 +65,7 @@ Maui.SelectionBar
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Save to...") text: qsTr("Save to...")
onTriggered: onTriggered:
...@@ -79,7 +81,7 @@ Maui.SelectionBar ...@@ -79,7 +81,7 @@ Maui.SelectionBar
} }
} }
Maui.MenuItem MenuItem
{ {
text: qsTr("Show in folder...") text: qsTr("Show in folder...")
onTriggered: pix.showInFolder(selectedPaths) onTriggered: pix.showInFolder(selectedPaths)
...@@ -87,10 +89,10 @@ Maui.SelectionBar ...@@ -87,10 +89,10 @@ Maui.SelectionBar
MenuSeparator{} MenuSeparator{}
Maui.MenuItem MenuItem
{ {
text: qsTr("Remove...") text: qsTr("Remove...")
colorScheme.textColor: dangerColor Kirigami.Theme.textColor: dangerColor
onTriggered: onTriggered:
{ {
removeDialog.open() removeDialog.open()
......
...@@ -3,13 +3,12 @@ import QtQuick.Controls 2.2 ...@@ -3,13 +3,12 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.kde.kirigami 2.2 as Kirigami import org.kde.kirigami 2.2 as Kirigami
import org.kde.mauikit 1.0 as Maui import org.kde.mauikit 1.0 as Maui
import FMList 1.0
import "../../../view_models" import "../../../view_models"
Maui.Menu Menu
{ {
Maui.MenuItem MenuItem
{ {
checkable: true checkable: true
checked: tagBarVisible checked: tagBarVisible
...@@ -17,7 +16,7 @@ Maui.Menu ...@@ -17,7 +16,7 @@ Maui.Menu
onTriggered: toogleTagbar() onTriggered: toogleTagbar()
} }
Maui.MenuItem MenuItem
{ {
checkable: true checkable: true
checked: galleryRoll.visible checked: galleryRoll.visible
......
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