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
14 changes: 14 additions & 0 deletions Settings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,15 @@ LauncherPage {
object.activeCheckbox = true
designSettingsItemColumn.checkboxes.push(object)

component = Qt.createComponent("/Checkbox.qml", designSettingsItemColumn)
properties["actionId"] = "leftHandedMenu"
properties["text"] = qsTr("Left-handed quick menu")
properties["checked"] = designSettings.leftHandedMenu
properties["accentColor"] = mainView.accentColor
object = component.createObject(designSettingsItemColumn, properties)
object.activeCheckbox = true
designSettingsItemColumn.checkboxes.push(object)

console.log("Settings | Checkboxes created")
}

Expand Down Expand Up @@ -1304,6 +1313,10 @@ LauncherPage {
designSettings.useCategories = active
designSettings.sync()
mainView.updateGridView("useCategories", active)
} else if (actionId === "leftHandedMenu") {
designSettings.leftHandedMenu = active
designSettings.sync()
mainView.updateSettings("leftHandedMenu", active)
}
}
}
Expand Down Expand Up @@ -1331,6 +1344,7 @@ LauncherPage {
property bool useCategories: false
property bool showAppsAtStartup: false
property bool useHapticMenus: true
property bool leftHandedMenu: false
property double blurEffect: 30
}
}
Expand Down
2 changes: 2 additions & 0 deletions Shortcut.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ Label {
id: shortCut
font.pointSize: labelFontSize
anchors.left: parent.left
anchors.right: parent.right
color: mainView.accentTextColor
elide: Text.ElideRight
wrapMode: Text.NoWrap
horizontalAlignment: settings.leftHandedMenu ? Text.AlignLeft : Text.AlignLeft

property var actionId
property double labelFontSize
Expand Down
35 changes: 24 additions & 11 deletions Springboard.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1355,8 +1355,10 @@ LauncherPage {
width: Screen.desktopAvailableWidth > 445 ? springBoard.menuWidth : springBoard.width
height: dotShortcut ? mainView.innerSpacing * 4 : mainView.innerSpacing * 3
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.rightMargin: 0 - mainView.outerSpacing
anchors.right: mainView.useLeftHandedMenu ? undefined : parent.right
anchors.left: mainView.useLeftHandedMenu ? parent.left : undefined
anchors.rightMargin: mainView.useLeftHandedMenu ? undefined : (0 - mainView.outerSpacing)
anchors.leftMargin: mainView.useLeftHandedMenu ? (0 - mainView.outerSpacing) : undefined

preventStealing: true
enabled: !textInputArea.activeFocus && !defaultSuggestions
Expand Down Expand Up @@ -1442,7 +1444,8 @@ LauncherPage {
var properties = { "actionId": shortcuts[i]["id"],
"text": shortcuts[i]["name"],
"labelFontSize": mainView.largeFontSize,
"leftPadding": leftDistance,
"leftPadding": mainView.useLeftHandedMenu ? leftDistance / 2 : leftDistance,
"rightPadding": mainView.useLeftHandedMenu ? leftDistance : 0,
"bottomPadding": mainView.innerSpacing,
"width": componentWidth }
if (component.status !== Component.Ready) {
Expand Down Expand Up @@ -1549,8 +1552,10 @@ LauncherPage {
id: shortcutBackground
anchors.bottom: parent.bottom
anchors.bottomMargin: roundedShortcutMenu ? mainView.innerSpacing * 2 : 0
anchors.right: parent.right
anchors.rightMargin: roundedShortcutMenu ? mainView.innerSpacing * 2 : 0
anchors.right: mainView.useLeftHandedMenu ? undefined : parent.right
anchors.left: mainView.useLeftHandedMenu ? parent.left : undefined
anchors.rightMargin: mainView.useLeftHandedMenu ? undefined : (roundedShortcutMenu ? mainView.innerSpacing * 2 : 0)
anchors.leftMargin: mainView.useLeftHandedMenu ? (roundedShortcutMenu ? mainView.innerSpacing * 2 : 0) : undefined
height: dotShortcut ? mainView.innerSpacing * 2 : mainView.innerSpacing
width: dotShortcut ? mainView.innerSpacing * 2 : parent.width
color: mainView.accentColor
Expand Down Expand Up @@ -1580,8 +1585,10 @@ LauncherPage {
rightPadding: mainView.innerSpacing
leftPadding: mainView.innerSpacing
bottomPadding: mainView.innerSpacing
anchors.right: parent.right
anchors.rightMargin: roundedShortcutMenu ? mainView.innerSpacing * 2 : 0
anchors.right: mainView.useLeftHandedMenu ? undefined : parent.right
anchors.left: mainView.useLeftHandedMenu ? parent.left : undefined
anchors.rightMargin: mainView.useLeftHandedMenu ? undefined : (roundedShortcutMenu ? mainView.innerSpacing * 2 : 0)
anchors.leftMargin: mainView.useLeftHandedMenu ? (roundedShortcutMenu ? mainView.innerSpacing * 2 : 0) : undefined
anchors.bottom: parent.bottom
anchors.bottomMargin: roundedShortcutMenu ? mainView.innerSpacing * 2 : 0

Expand All @@ -1602,16 +1609,20 @@ LauncherPage {
width: dotShortcut ? mainView.innerSpacing * 2 : parent.width
color: mainView.accentColor
radius: dotShortcut ? width * 0.5 : 0.0
anchors.right: parent.right
anchors.rightMargin: dotShortcut ? mainView.innerSpacing * 2 : 0
anchors.right: mainView.useLeftHandedMenu ? undefined : parent.right
anchors.left: mainView.useLeftHandedMenu ? parent.left : undefined
anchors.rightMargin: mainView.useLeftHandedMenu ? undefined : (dotShortcut ? mainView.innerSpacing * 2 : 0)
anchors.leftMargin: mainView.useLeftHandedMenu ? (dotShortcut ? mainView.innerSpacing * 2 : 0) : undefined
anchors.bottom: parent.bottom
anchors.bottomMargin: dotShortcut ? mainView.innerSpacing * 2 : 0
}
}

Column {
id: appSwitcher
x: dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing
x: mainView.useLeftHandedMenu ?
(parent.width - (dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing) - width) :
(dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing)
anchors.bottom: closeAppsButton.top
anchors.bottomMargin: mainView.innerSpacing
spacing: mainView.innerSpacing
Expand All @@ -1620,7 +1631,9 @@ LauncherPage {

Button {
id: closeAppsButton
x: dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing
x: mainView.useLeftHandedMenu ?
(parent.width - (dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing) - width) :
(dotShortcut ? mainView.innerSpacing * 2 - mainView.outerSpacing : 0 - mainView.outerSpacing)
anchors.bottom: parent.bottom
anchors.bottomMargin: dotShortcut ? mainView.innerSpacing * 2 : 0
width: mainView.innerSpacing * 2
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.0.19" android:versionCode="439" android:installLocation="auto">
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.0" android:versionCode="440" 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
15 changes: 15 additions & 0 deletions main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ ApplicationWindow {
property bool useVibration: settings.useHapticMenus
property bool useColoredIcons: settings.useColoredIcons
property bool isTablet: Screen.desktopAvailableWidth > 520
property bool useLeftHandedMenu: settings.leftHandedMenu
property int maxTitleLength: 120

property string searchEngineName
Expand Down Expand Up @@ -1012,6 +1013,13 @@ ApplicationWindow {
} else if (key === "useHapticMenus") {
settings.useHapticMenus = value
mainView.useVibration = value
} else if (key === "leftHandedMenu") {
settings.leftHandedMenu = value
console.log("MainView | Refreshing Springboard due to quick menu side switch")
springboardLoader.active = false
springboardLoader.active = true
if (mainView.isTablet) AN.SystemDispatcher.dispatch("volla.launcher.runningAppsAction", {})
springboard.children[0].item.updateShortcuts(getActions())
} else if (key === "showAppsAtStartup") {
settings.showAppsAtStartup = value
} else if (key === "activateSignal") {
Expand Down Expand Up @@ -1259,6 +1267,7 @@ ApplicationWindow {
property bool useColoredIcons: false
property bool showAppsAtStartup: false
property bool useHapticMenus: true
property bool leftHandedMenu: false
property double blurEffect: 60.0
property double lastContactsCheck: 0.0
property string customAccentColor: ""
Expand Down Expand Up @@ -1349,6 +1358,12 @@ ApplicationWindow {
}
mainView.useVibration = useHapticMenus
mainView.useColoredIcons = useColoredIcons
// if (mainView.useLeftHandedMenu !== leftHandedMenu) {
// mainView.useLeftHandedMenu = leftHandedMenu
// springboardLoader.active = false
// springboardLoader.active = true
// springboard.children[0].item.updateShortcuts(getActions())
// }
if (settings.sync) {
settings.sync()
}
Expand Down
67 changes: 59 additions & 8 deletions translations/Volla_be.ts
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
</message>
<message>
<source>Weather</source>
<translation type="unfinished">Надвор'е</translation>
<translation type="unfinished">Надвор&apos;е</translation>
</message>
<message>
<source>Clock</source>
Expand All @@ -495,6 +495,41 @@
<source>Show frequently used apps</source>
<translation type="unfinished">Паказаць часта выкарыстоўваюцца прыкладанні</translation>
</message>
<message>
<source>Left-handed quick menu</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset to Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Setup</name>
<message>
<source>Now set up voice recognition for text input, which you can then activate using the microphone icon on the keyboard.</source>
<translation type="obsolete">Цяпер усталюйце распазнаванне голасу для ўводу тэксту, які вы можаце актываваць пры дапамозе значка мікрафона на клавіятуры.</translation>
</message>
<message>
<source>Cancel</source>
<translation type="obsolete">Скасаваць</translation>
</message>
<message>
<source>Ok</source>
<translation type="obsolete">Добра</translation>
</message>
</context>
<context>
<name>Springboard</name>
Expand Down Expand Up @@ -576,7 +611,7 @@
</message>
<message>
<source>weather</source>
<translation type="unfinished">Надвор'е</translation>
<translation type="unfinished">Надвор&apos;е</translation>
</message>
<message>
<source>Set location</source>
Expand Down Expand Up @@ -604,7 +639,7 @@
</message>
</context>
<context>
<name>Setup</name>
<name>SttSetup</name>
<message>
<source>Now set up voice recognition for text input, which you can then activate using the microphone icon on the keyboard.</source>
<translation type="unfinished">Цяпер усталюйце распазнаванне голасу для ўводу тэксту, які вы можаце актываваць пры дапамозе значка мікрафона на клавіятуры.</translation>
Expand Down Expand Up @@ -786,7 +821,7 @@
</message>
<message>
<source>You have already added the shortcut</source>
<translation>Вы ўжо дадалі ярлык</translation>
<translation type="vanished">Вы ўжо дадалі ярлык</translation>
</message>
<message>
<source>Not yet supported</source>
Expand Down Expand Up @@ -838,15 +873,15 @@
</message>
<message>
<source>Ban contact</source>
<translation type="unfinished">Забарона кантакт</translation>
<translation type="obsolete">Забарона кантакт</translation>
</message>
<message>
<source>De Trein</source>
<translation type="unfinished">Дэ Трэйн</translation>
</message>
<message>
<source>My health</source>
<translation type="unfinished">Маё здароўе</translation>
<translation type="obsolete">Маё здароўе</translation>
</message>
<message>
<source>Bonsai</source>
Expand Down Expand Up @@ -882,7 +917,7 @@
</message>
<message>
<source>F-Droid</source>
<translation type="unfinished">F-Droid</translation>
<translation type="obsolete">F-Droid</translation>
</message>
<message>
<source>Maps</source>
Expand All @@ -898,7 +933,7 @@
</message>
<message>
<source>Weather</source>
<translation type="unfinished">Надвор'е</translation>
<translation type="unfinished">Надвор&apos;е</translation>
</message>
<message>
<source>Redial</source>
Expand All @@ -912,5 +947,21 @@
<source>Create speed dial</source>
<translation type="unfinished"> Стварыце хуткасны набор</translation>
</message>
<message>
<source>Bancontact</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mynexuzhealth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A-Droid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You have alresdy added the shortcut</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
20 changes: 20 additions & 0 deletions translations/Volla_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,26 @@
<source>Show frequently used apps</source>
<translation type="unfinished">Показване на често използвани приложения</translation>
</message>
<message>
<source>Left-handed quick menu</source>
<translation type="unfinished">Бързо меню за левичари</translation>
</message>
<message>
<source>Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset to Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Springboard</name>
Expand Down
20 changes: 20 additions & 0 deletions translations/Volla_cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,26 @@
<source>Show frequently used apps</source>
<translation type="unfinished">显示常用应用程序</translation>
</message>
<message>
<source>Left-handed quick menu</source>
<translation type="unfinished">左撇子快速菜单</translation>
</message>
<message>
<source>Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset to Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Springboard</name>
Expand Down
20 changes: 20 additions & 0 deletions translations/Volla_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,26 @@
<source>Show frequently used apps</source>
<translation type="unfinished">Zobrazit často používané aplikace</translation>
</message>
<message>
<source>Left-handed quick menu</source>
<translation type="unfinished">Rychlé menu pro leváky</translation>
</message>
<message>
<source>Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Choose Accent Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset to Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Springboard</name>
Expand Down
Loading