diff --git a/Makefile b/Makefile index 22d8abb031..119821c130 100644 --- a/Makefile +++ b/Makefile @@ -257,41 +257,34 @@ $(DMG_TOOL): echo -e "\e[92mInstalling:\e[39m create-dmg" npm i -MACOS_OUTER_BUNDLE := tmp/macos/dist/Status.app -MACOS_INNER_BUNDLE := $(MACOS_OUTER_BUNDLE)/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app +MACOS_BUNDLE := tmp/macos/dist/Status.app STATUS_CLIENT_DMG ?= pkg/Status.dmg $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL) rm -rf tmp/macos pkg/*.dmg - mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/MacOS - mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/Resources - cp Info.plist $(MACOS_OUTER_BUNDLE)/Contents/ - cp bin/nim_status_client $(MACOS_OUTER_BUNDLE)/Contents/MacOS/ - cp nim_status_client.sh $(MACOS_OUTER_BUNDLE)/Contents/MacOS/ - chmod +x $(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client.sh - cp status-icon.icns $(MACOS_OUTER_BUNDLE)/Contents/Resources/ - cp status.svg $(MACOS_OUTER_BUNDLE)/Contents/ - cp -R resources.rcc $(MACOS_OUTER_BUNDLE)/Contents/ - mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/i18n - cp ui/i18n/* $(MACOS_OUTER_BUNDLE)/Contents/i18n + mkdir -p $(MACOS_BUNDLE)/Contents/MacOS + mkdir -p $(MACOS_BUNDLE)/Contents/Resources + cp Info.plist $(MACOS_BUNDLE)/Contents/ + cp bin/nim_status_client $(MACOS_BUNDLE)/Contents/MacOS/ + cp nim_status_client.sh $(MACOS_BUNDLE)/Contents/MacOS/ + chmod +x $(MACOS_BUNDLE)/Contents/MacOS/nim_status_client.sh + cp status-icon.icns $(MACOS_BUNDLE)/Contents/Resources/ + cp status.svg $(MACOS_BUNDLE)/Contents/ + cp -R resources.rcc $(MACOS_BUNDLE)/Contents/ + mkdir -p $(MACOS_BUNDLE)/Contents/i18n + cp ui/i18n/* $(MACOS_BUNDLE)/Contents/i18n echo -e $(BUILD_MSG) "app" macdeployqt \ - $(MACOS_OUTER_BUNDLE) \ - -executable=$(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client \ + $(MACOS_BUNDLE) \ + -executable=$(MACOS_BUNDLE)/Contents/MacOS/nim_status_client \ -qmldir=ui - cp Info.runner.plist $(MACOS_OUTER_BUNDLE)/Contents/Info.plist - macdeployqt \ - $(MACOS_INNER_BUNDLE) \ - -executable=$(MACOS_INNER_BUNDLE)/Contents/MacOS/QtWebEngineProcess + cp Info.runner.plist $(MACOS_BUNDLE)/Contents/Info.plist - # if MACOS_CODESIGN_IDENT is not set then the outer and inner .app - # bundles are not signed + # if MACOS_CODESIGN_IDENT is not set then the .app bundle is not signed ifdef MACOS_CODESIGN_IDENT - scripts/sign-macos-pkg.sh $(MACOS_OUTER_BUNDLE) $(MACOS_CODESIGN_IDENT) - scripts/sign-macos-pkg.sh $(MACOS_INNER_BUNDLE) $(MACOS_CODESIGN_IDENT) \ - --entitlements QtWebEngineProcess.plist + scripts/sign-macos-pkg.sh $(MACOS_BUNDLE) $(MACOS_CODESIGN_IDENT) endif echo -e $(BUILD_MSG) "dmg" mkdir -p pkg @@ -300,7 +293,7 @@ endif # DMG icon based on app icon, but should otherwise work without it npx create-dmg \ --identity="NOBODY" \ - $(MACOS_OUTER_BUNDLE) \ + $(MACOS_BUNDLE) \ pkg || true # We ignore failure above create-dmg can't skip signing. # To work around that a dummy identity - 'NOBODY' - is specified. diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml deleted file mode 100644 index ec758613fe..0000000000 --- a/ui/app/AppLayouts/Browser/BrowserLayout.qml +++ /dev/null @@ -1,30 +0,0 @@ -import QtQuick 2.13 -import QtQuick.Layouts 1.13 -import QtWebView 1.14 - -Item { - id: browserView - x: 0 - y: 0 - Layout.fillHeight: true - Layout.fillWidth: true - - WebView { - id: browserContainer - anchors.top: parent.top - anchors.topMargin: 0 - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - url: "https://dap.ps/" - } -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ diff --git a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml index b82f96f710..7be39415ab 100644 --- a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml @@ -47,31 +47,9 @@ Item { } } - RowLayout { - id: browserTabSettings - anchors.top: walletTabSettings.bottom - anchors.topMargin: 20 - anchors.left: parent.left - anchors.leftMargin: 24 - StyledText { - //% "Browser Tab" - text: qsTrId("browser-tab") - } - Switch { - checked: browserBtn.enabled - onCheckedChanged: function(value) { - browserBtn.enabled = this.checked - } - } - StyledText { - //% "experimental (web3 not supported yet)" - text: qsTrId("experimental-(web3-not-supported-yet)") - } - } - RowLayout { id: nodeTabSettings - anchors.top: browserTabSettings.bottom + anchors.top: walletTabSettings.bottom anchors.topMargin: 20 anchors.left: parent.left anchors.leftMargin: 24 @@ -90,7 +68,7 @@ Item { text: qsTrId("under-development") } } - + RowLayout { id: networkTabSettings anchors.top: nodeTabSettings.bottom diff --git a/ui/app/AppLayouts/qmldir b/ui/app/AppLayouts/qmldir index a13c2313a4..3d8e0ef697 100644 --- a/ui/app/AppLayouts/qmldir +++ b/ui/app/AppLayouts/qmldir @@ -1,4 +1,3 @@ -BrowserLayout 1.0 Browser/BrowserLayout.qml ChatLayout 1.0 Chat/ChatLayout.qml NodeLayout 1.0 Node/NodeLayout.qml ProfileLayout 1.0 Profile/ProfileLayout.qml diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml index 03d524ac55..d6147a5603 100644 --- a/ui/app/AppMain.qml +++ b/ui/app/AppMain.qml @@ -73,7 +73,7 @@ RowLayout { text: chatsModel.unreadMessagesCount } } - + } TabButton { @@ -103,33 +103,6 @@ RowLayout { } } - TabButton { - id: browserBtn - enabled: isExperimental === "1" - visible: this.enabled - width: 40 - height: this.enabled ? 40 : 0 - text: "" - anchors.topMargin: this.enabled ? 50 : 0 - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: walletBtn.top - background: Rectangle { - color: Style.current.secondaryBackground - opacity: parent.checked ? 1 : 0 - radius: 50 - } - - SVGImage { - id: image2 - height: 24 - width: 24 - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - fillMode: Image.PreserveAspectFit - source: parent.checked ? "img/compassActive.svg" : "img/compass.svg" - } - } - TabButton { id: profileBtn width: 40 @@ -137,7 +110,7 @@ RowLayout { text: "" anchors.topMargin: 50 anchors.horizontalCenter: parent.horizontalCenter - anchors.top: browserBtn.top + anchors.top: walletBtn.top background: Rectangle { color: Style.current.secondaryBackground opacity: parent.checked ? 1 : 0 @@ -205,13 +178,6 @@ RowLayout { appSettings: rowLayout.appSettings } - BrowserLayout { - id: browserLayoutContainer - Layout.fillWidth: true - Layout.alignment: Qt.AlignLeft | Qt.AlignTop - Layout.fillHeight: true - } - ProfileLayout { id: profileLayoutContainer Layout.fillWidth: true diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro index e8264035d4..4664176059 100644 --- a/ui/nim-status-client.pro +++ b/ui/nim-status-client.pro @@ -18,7 +18,6 @@ SOURCES = *.qml \ onboarding/*.qml \ onboarding/Login/*.qml \ app/AppLayouts/*.qml \ - app/AppLayouts/Browser/*.qml \ app/AppLayouts/Chat/*.qml \ app/AppLayouts/Chat/ChatColumn/*.qml \ app/AppLayouts/Chat/ContactsColumn/*.qml \ @@ -95,7 +94,7 @@ TRANSLATIONS += \ i18n/qml_zh_hant_sg.ts \ i18n/qml_zh_hant_tw.ts \ i18n/qml_zh_wuu.ts \ - i18n/qml_zh_yue.ts + i18n/qml_zh_yue.ts RESOURCES += \ imports/Constants.qml \ @@ -168,7 +167,6 @@ DISTFILES += \ fonts/InterStatus/InterStatus-Thin.otf \ fonts/InterStatus/InterStatus-ThinItalic.otf \ Theme.qml \ - app/AppLayouts/Browser/BrowserLayout.qml \ app/AppLayouts/Chat/ChatColumn.qml \ app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml \ app/AppLayouts/Chat/ChatColumn/samples/StickerData.qml \ diff --git a/ui/onboarding/Intro.qml b/ui/onboarding/Intro.qml index 8a02e753a8..db6756d1f2 100644 --- a/ui/onboarding/Intro.qml +++ b/ui/onboarding/Intro.qml @@ -39,15 +39,8 @@ RowLayout { //% "Secure crypto wallet" title: qsTrId("intro-title2") //% "Send and receive digital assets anywhere in the\nworld--no bank account required" - description: qsTrId("send-and-receive-digital-assets-anywhere-in-the-nworld--no-bank-account-required") - } - Slide { - image: "img/browser@2x.jpg" - //% "Decentralized apps" - title: qsTrId("intro-title3") - //% "Explore games, exchanges and social networks\nwhere you alone own your data" - description: qsTrId("explore-games--exchanges-and-social-networks-nwhere-you-alone-own-your-data") - isLast: true + description: qsTrId("send-and-receive-digital-assets-anywhere-in-the-nworld--no-bank-account-required") + isLast: true } }