Skip to content

GitLab

Commit b03b81ab authored by camilo higuita's avatar camilo higuita
Browse files
Options

style ux ui migration

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