Skip to content

apply changes to make the app to run on focal #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Danfro wants to merge 2 commits into
base: main
Choose a base branch
from
Open

apply changes to make the app to run on focal #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b081531
adapt the app to run on focal
Danfro Nov 1, 2023
b1db8a1
upgrade framework in gitlab ci to 20.04
Danfro Nov 1, 2023
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
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# `stage`
stage_build: &stage_build 'build'
# `image`
image_clickable_amd64: &image_clickable_amd64 'clickable/ci-16.04-amd64'
image_clickable_arm64: &image_clickable_arm64 'clickable/ci-16.04-arm64'
image_clickable_armhf: &image_clickable_armhf 'clickable/ci-16.04-armhf'
image_clickable_amd64: &image_clickable_amd64 'clickable/ci-20.04-amd64'
image_clickable_arm64: &image_clickable_arm64 'clickable/ci-20.04-arm64'
image_clickable_armhf: &image_clickable_armhf 'clickable/ci-20.04-armhf'
# `artifacts.paths`
paths_amd64: &paths_amd64
- 'build/x86_64-linux-gnu/app/*.click'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop)
if(DEFINED ENV{SDK_FRAMEWORK})
set(CLICK_FRAMEWORK "$ENV{SDK_FRAMEWORK}")
else()
set(CLICK_FRAMEWORK "ubuntu-sdk-16.04.3")
set(CLICK_FRAMEWORK "ubuntu-sdk-20.04")
endif()

# This figures out the target architecture for use in the manifest file.
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<value type="QString">LD_LIBRARY_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">QML2_IMPORT_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/qml:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">PATH=/home/stas/translate/build/all/app/install:/home/stas/translate:/usr/local/nvidia/bin:/bin:/usr/bin:/home/stas/translate/build/all/app/install</value>
<value type="QString">QT_QPA_PLATFORMTHEME=ubuntuappmenu</value>
<value type="QString">QT_QPA_PLATFORMTHEME=lomiriappmenu</value>
</valuelist>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">qmlscene</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Run qmlscene</value>
Expand Down Expand Up @@ -331,7 +331,7 @@
<value type="QString">LD_LIBRARY_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">QML2_IMPORT_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/qml:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">PATH=/home/stas/translate/build/all/app/install:/home/stas/translate:/usr/local/nvidia/bin:/bin:/usr/bin:/home/stas/translate/build/all/app/install</value>
<value type="QString">QT_QPA_PLATFORMTHEME=ubuntuappmenu</value>
<value type="QString">QT_QPA_PLATFORMTHEME=lomiriappmenu</value>
</valuelist>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Run qmlscene2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmlscene</value>
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt.user.shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<value type="QString">LD_LIBRARY_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">QML2_IMPORT_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/qml:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">PATH=/home/stas/translate/build/all/app/install:/home/stas/translate:/usr/local/nvidia/bin:/bin:/usr/bin:/home/stas/translate/build/all/app/install</value>
<value type="QString">QT_QPA_PLATFORMTHEME=ubuntuappmenu</value>
<value type="QString">QT_QPA_PLATFORMTHEME=lomiriappmenu</value>
</valuelist>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments">qml/Main.qml</value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">qmlscene</value>
Expand Down Expand Up @@ -229,7 +229,7 @@
<value type="QString">LD_LIBRARY_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">QML2_IMPORT_PATH=/home/stas/translate/lib/all:/home/stas/translate/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/home/stas/translate/build/all/app/install/qml:/home/stas/translate/build/all/app/install/lib</value>
<value type="QString">PATH=/home/stas/translate/build/all/app/install:/home/stas/translate:/usr/local/nvidia/bin:/bin:/usr/bin:/home/stas/translate/build/all/app/install</value>
<value type="QString">QT_QPA_PLATFORMTHEME=ubuntuappmenu</value>
<value type="QString">QT_QPA_PLATFORMTHEME=lomiriappmenu</value>
</valuelist>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run qmlscene</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Run qmlscene</value>
Expand Down
6 changes: 3 additions & 3 deletions qml/Components/AboutItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import QtQuick 2.7
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

UbuntuShape {
LomiriShape {
property string headerText
property string contentText
property string url
Expand All @@ -30,7 +30,7 @@ UbuntuShape {
}

radius: "small"
color: theme.name == "Ubuntu.Components.Themes.Ambiance" ? "#F7F7F7" : "#3B3B3B"
color: theme.name == "Lomiri.Components.Themes.Ambiance" ? "#F7F7F7" : "#3B3B3B"
height: (!!headerText ? headerLabel.contentHeight : 0) + contentLabel.contentHeight + (units.gu(2) * 2.5)

Label {
Expand Down
8 changes: 4 additions & 4 deletions qml/Components/Toast.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import QtQuick 2.9
import QtQuick.Layouts 1.1
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

UbuntuShape {
LomiriShape {

property var defaultTime: 3500
property bool stateVisible: false
Expand All @@ -30,8 +30,8 @@ UbuntuShape {
anchors.horizontalCenter: parent.horizontalCenter
width: label.width + units.gu(2)
height: label.height + units.gu(2)
backgroundColor: (Theme.name == "Ubuntu.Components.Themes.Ambiance") ? "white" : "#202020"
aspect: UbuntuShape.DropShadow
backgroundColor: (Theme.name == "Lomiri.Components.Themes.Ambiance") ? "white" : "#202020"
aspect: LomiriShape.DropShadow
radius: "large"
visible: false
z: 30
Expand Down
2 changes: 1 addition & 1 deletion qml/Main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import QtQuick 2.9
import Ubuntu.Components 1.3
import Lomiri.Components 1.3
//import QtQuick.Controls 2.2
//import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0
Expand Down
8 changes: 4 additions & 4 deletions qml/Pages/About.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.7
import Ubuntu.Components 1.3
import Lomiri.Components 1.3
import "../Components"

Page {
Expand Down Expand Up @@ -31,7 +31,7 @@ Page {
anchors.topMargin: units.gu(1)
spacing: units.gu(2)

UbuntuShape {
LomiriShape {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottomMargin: units.gu(2)
width: units.gu(16); height: width
Expand Down Expand Up @@ -65,7 +65,7 @@ Page {
text: Qt.application.version
color: "white"

UbuntuShape {
LomiriShape {
anchors {
fill: parent
leftMargin: units.gu(-0.6)
Expand All @@ -75,7 +75,7 @@ Page {
}
z: -1

color: UbuntuColors.blue
color: LomiriColors.blue
radius: "large"
}
}
Expand Down
8 changes: 4 additions & 4 deletions qml/Pages/MainPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


import QtQuick 2.9
import Ubuntu.Components 1.3
import Lomiri.Components 1.3
//import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.12 as QQC
Expand Down Expand Up @@ -63,7 +63,7 @@ Page {
id: input
placeholderText: i18n.tr("Hello!")
font.pixelSize: FontUtils.sizeToPixels("medium") * preferences.fontSize / 10

Layout.fillHeight: true; Layout.fillWidth: true
Layout.leftMargin: units.gu(preferences.commonMargin)
Layout.rightMargin: units.gu(preferences.commonMargin)
Expand Down Expand Up @@ -141,7 +141,7 @@ Page {
// rightMargin: units.gu(10)
// bottomMargin: units.gu(2)
// }

// iconName: "media-playback-start"
// onClicked: lingva.get_audio(
// output.text,
Expand Down Expand Up @@ -220,7 +220,7 @@ Page {
input.text
)

color: UbuntuColors.green
color: LomiriColors.green
enabled: input.length != 0 ? true : false

Layout.fillWidth: true
Expand Down
2 changes: 1 addition & 1 deletion qml/Pages/Settings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


import QtQuick 2.9
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

Page {
id: settingPage
Expand Down
2 changes: 1 addition & 1 deletion translate.apparmor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"policy_groups": [
"networking"
],
"policy_version": 16.04
"policy_version": 20.04
}
2 changes: 1 addition & 1 deletion translate.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Exec=qmlscene %U qml/Main.qml
Icon=assets/logo.png
Terminal=false
Type=Application
X-Ubuntu-Touch=true
X-Lomiri-Touch=true