Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions AppGrid.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ LauncherPage {
anchors.fill: parent

property string textInput
property string favoritsLabel: "AAAA"
property real labelPointSize: 16

property var appGroups: [] // QML elements with app grids
Expand Down Expand Up @@ -116,7 +117,6 @@ LauncherPage {
app.customCategory = filteredGroupNames[0]
}
})
//appsAndShortcuts.sort(function(a, b) { return b["customCategory"] - a["customCategory"] })
createAppGroupsByCategory(appsAndShortcuts, groupedApps, true)
}

Expand All @@ -125,11 +125,11 @@ LauncherPage {

function createAppGroupsByCategory(appsToGroup, groupedApps, useCustomGroups) {
console.debug("AppGrid | createAppGroupsByCategory: ", appsToGroup.length, groupedApps.length, useCustomGroups)

var categoryKey = useCustomGroups ? "customCategory" : "category"

appsToGroup.sort(function(a, b) {
var aa = a[categoryKey] !== undefined ? a[categoryKey] : ""
var bb = b[categoryKey] !== undefined ? b[categoryKey] : ""
var aa = a[categoryKey] !== undefined ? a[categoryKey] : "ZZZZ"
var bb = b[categoryKey] !== undefined ? b[categoryKey] : "ZZZZ"
if (aa > bb) return 1
else if (aa < bb) return -1
else return 0
Expand Down Expand Up @@ -205,7 +205,7 @@ LauncherPage {
// console.debug(key, apps[i][key]);
// })
// }
var app = apps.filter(e => e.appId === appToUpdate || (e.shortcutId !== undefined && e.shortcutId === appToUpdate))[0]
var app = apps.filter(e => e.package === appToUpdate || (e.shortcutId !== undefined && e.shortcutId === appToUpdate))[0]
if (appGroupName !== undefined) {
app.customCategory = appGroupName
// Add to group
Expand Down Expand Up @@ -604,12 +604,17 @@ LauncherPage {

function createCustomGroupMenuItems() {
var customGroups = settings.getCustomGroups()

console.debug("AppGrid | Categories: " + JSON.stringify(customGroups))
if (Object.keys(customGroups).indexOf(favoritsLabel) === -1) customGroups[favoritsLabel] = new Array

Object.keys(customGroups).forEach(key => {
console.log("AppGrid | createCustomGroupMenuItems: Create custom group " + key)
var component = Qt.createComponent("/AppGridMenuItem.qml", appContextMenu)
var appId = app.shortcutId !== undefined ? app.shortcutId : app.package
var properties = { "height": appContextMenu.menuItemHeight, "innerSpacing" : mainView.innerSpacing,
"labelPointSize" : appLauncher.labelPointSize, "labelWidth" : appContextMenu.menuWidth,
"appId" : app.itemId, "appGroup" : key, "appLauncher": appLauncher}
"appId" : appId, "appGroup" : key, "appLauncher": appLauncher}
var object = component.createObject(appContextMenu, properties)
appContextMenu.addItem(object)
console.log("AppGrid | createCustomGroupMenuItems: Menu items " + appContextMenu.count)
Expand Down
2 changes: 1 addition & 1 deletion AppGridMenuItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MenuItem {
font.pointSize: labelPointSize
contentItem: Label {
width: appGridMenuItem.labelWidth
text: qsTr("Add to ") + appGridMenuItem.appGroup
text: appGridMenuItem.appGroup === "AAAA" ? "★ " + qsTr("Add to ") + qsTr("Favorits") : qsTr("Add to ") + appGridMenuItem.appGroup
font: appGridMenuItem.font
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
Expand Down
5 changes: 3 additions & 2 deletions AppGroup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ Item {
topPadding: groupItem.groupIndex === 0 ?
0 : groupItem.groupIndex === 1 && groupItem.selectedGroupIndex === 0 ?
groupItem.innerSpacing / 2 : groupItem.innerSpacing

Button {
id: groupHeader
visible: groupItem.isHeaderVisible
anchors.horizontalCenter: parent.horizontalCenter
flat: true
text: groupItem.groupLabel
contentItem: Label {
text: groupHeader.text
text: groupHeader.text === "AAAA" ? qsTr("Favorits") : groupHeader.text
padding: groupItem.innerSpacing / 2
color: Universal.foreground
opacity: 0.5
Expand All @@ -130,7 +131,7 @@ Item {
}

onPressAndHold: {
groupItem.parent.openGroupContextMenu(groupHeader, groupGrid)
if (groupHeader.text !== "AAAA") groupItem.parent.openGroupContextMenu(groupHeader, groupGrid)
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.1" android:versionCode="441" android:installLocation="auto">
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.2" android:versionCode="442" android:installLocation="auto">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>

<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_be.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@
<source>Add to </source>
<translation type="unfinished">Добави към </translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Checkbox</name>
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@
<source>Add to </source>
<translation type="unfinished">Добави към </translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished">Любими</translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished">Любими</translation>
</message>
</context>
<context>
<name>Browser</name>
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,17 @@
<source>Add to </source>
<translation type="unfinished">添加到</translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished">夹</translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished">夹</translation>
</message>
</context>
<context>
<name>Checkbox</name>
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@
<source>Add to </source>
<translation type="unfinished">Přidat do </translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished">Oblíbené</translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished">Oblíbené</translation>
</message>
</context>
<context>
<name>Checkbox</name>
Expand Down
37 changes: 25 additions & 12 deletions translations/Volla_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<translation type="obsolete">Musik</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="93"/>
<location filename="../AppGrid.qml" line="102"/>
<location filename="../AppGrid.qml" line="94"/>
<location filename="../AppGrid.qml" line="103"/>
<source>Most used</source>
<translation type="unfinished">Meist verwendet</translation>
</message>
Expand All @@ -31,7 +31,7 @@
<translation type="unfinished">Andere Apps</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="99"/>
<location filename="../AppGrid.qml" line="100"/>
<source>apps</source>
<translation type="unfinished">Apps</translation>
</message>
Expand Down Expand Up @@ -93,37 +93,37 @@
<translation type="unfinished">Benutzerdefinierte Gruppen verwenden</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="638"/>
<location filename="../AppGrid.qml" line="643"/>
<source>Remove group</source>
<translation type="unfinished">Gruppe entfernen</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="658"/>
<location filename="../AppGrid.qml" line="663"/>
<source>Edit groupname</source>
<translation type="unfinished">Gruppennamen bearbeiten</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="719"/>
<location filename="../AppGrid.qml" line="724"/>
<source>Group name</source>
<translation type="unfinished">Gruppenname</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="735"/>
<location filename="../AppGrid.qml" line="740"/>
<source>Enter a group name</source>
<translation type="unfinished">Gebe einen Gruppennamen ein</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="755"/>
<location filename="../AppGrid.qml" line="760"/>
<source>Cancel</source>
<translation type="unfinished">Abbrechen</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="780"/>
<location filename="../AppGrid.qml" line="785"/>
<source>Ok</source>
<translation type="unfinished">Ok</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="804"/>
<location filename="../AppGrid.qml" line="809"/>
<source>Group name must have at least one character.</source>
<translation type="unfinished">Der Gruppenname muss mindestens ein Zeichen enthalten.</translation>
</message>
Expand All @@ -132,12 +132,12 @@
<translation type="obsolete">Kurzbefehl entfernen</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="901"/>
<location filename="../AppGrid.qml" line="906"/>
<source>New pinned shortcut</source>
<translation type="unfinished">Neue angeheftete Verknüpfung</translation>
</message>
<message>
<location filename="../AppGrid.qml" line="908"/>
<location filename="../AppGrid.qml" line="913"/>
<source>Pinned shortcut already exists</source>
<translation type="unfinished">Angepinnte Verknüpfung existiert bereits</translation>
</message>
Expand All @@ -149,6 +149,19 @@
<source>Add to </source>
<translation type="unfinished">Hinzufügen zu </translation>
</message>
<message>
<location filename="../AppGridMenuItem.qml" line="18"/>
<source>Favorits</source>
<translation type="unfinished">Favoriten</translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<location filename="../AppGroup.qml" line="116"/>
<source>Favorits</source>
<translation type="unfinished">Favoriten</translation>
</message>
</context>
<context>
<name>Browser</name>
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_dk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@
<source>Add to </source>
<translation type="unfinished">Føj til </translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished">Favoritter</translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished">Favoritter</translation>
</message>
</context>
<context>
<name>Checkbox</name>
Expand Down
11 changes: 11 additions & 0 deletions translations/Volla_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,17 @@
<source>Add to </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Favorits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AppGroup</name>
<message>
<source>Favorits</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Checkbox</name>
Expand Down
Loading