From 6d8655f4310d54c270686ea0ed8b11fdc5dfab3c Mon Sep 17 00:00:00 2001 From: reionwong Date: Sun, 12 Sep 2021 20:24:55 +0800 Subject: [PATCH 1/3] Add fullscreen switch --- src/qml/Terminal.qml | 8 ++++++++ src/qml/main.qml | 2 +- translations/en_US.ts | 22 ++++++++++++++++------ translations/zh_CN.ts | 22 ++++++++++++++++------ 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/qml/Terminal.qml b/src/qml/Terminal.qml index 4a0082c..33feb4f 100644 --- a/src/qml/Terminal.qml +++ b/src/qml/Terminal.qml @@ -21,6 +21,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 +import QtQuick.Window 2.12 import FishUI 1.0 as FishUI import Cutefish.TermWidget 1.0 @@ -209,6 +210,13 @@ Page { onTriggered: Process.openFileManager(_session.currentDir) } + MenuItem { + text: root.isFullScreen ? qsTr("Exit full screen") : qsTr("Full screen") + onTriggered: { + root.visibility = root.isFullScreen ? Window.Windowed : Window.FullScreen + } + } + MenuItem { text: qsTr("Settings") onTriggered: { diff --git a/src/qml/main.qml b/src/qml/main.qml index cacc120..b23dac9 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -62,7 +62,7 @@ FishUI.Window { } onClosing: { - if (!root.isMaximized) { + if (!root.isMaximized && !root.isFullScreen) { settings.width = root.width settings.height = root.height } diff --git a/translations/en_US.ts b/translations/en_US.ts index 2c88838..4766fa5 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -50,28 +50,38 @@ Terminal - + Copy - - + + Paste - + Select All - + Open File Manager - + + Exit full screen + + + + + Full screen + + + + Settings diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 0c958dc..19ceb1f 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -50,28 +50,38 @@ Terminal - + Copy 复制 - - + + Paste 粘贴 - + Select All 全选 - + Open File Manager 打开文件管理器 - + + Exit full screen + 退出全屏 + + + + Full screen + 全屏 + + + Settings 设置 From a464b35931d485f21a6a8679eeefd417f6cfe57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=84=20GUCKII=20=E3=83=84?= Date: Sat, 11 Sep 2021 12:40:58 +0000 Subject: [PATCH 2/3] Translated using Weblate (Russian) Currently translated at 100.0% (13 of 13 strings) Translation: CutefishOS/Terminal Translate-URL: https://hosted.weblate.org/projects/cutefishos/terminal/ru/ --- translations/ru_RU.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 3d5123e..bdff8ec 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -6,17 +6,17 @@ Process is running, are you sure you want to quit? - + Запущен процесс, вы точно хотите выйти? OK - + ОК Cancel - + Отмена @@ -24,27 +24,27 @@ Settings - + Настройки Font - + Шрифты Font Size - + Размер шрифтов Transparency - + Прозрачность Window Blur - + Прозрачность окна @@ -52,28 +52,28 @@ Copy - + Копировать Paste - + Вставить Select All - + Выделить всё Open File Manager - + Открыть файловый менеджер Settings - + Настройки From 248d42f36ffe124bd6a6df1127ce8c8d0b22a6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=84=20GUCKII=20=E3=83=84?= Date: Sat, 11 Sep 2021 13:25:18 +0000 Subject: [PATCH 3/3] Translated using Weblate (Latvian) Currently translated at 100.0% (13 of 13 strings) Translation: CutefishOS/Terminal Translate-URL: https://hosted.weblate.org/projects/cutefishos/terminal/lv/ --- translations/lv_LV.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/translations/lv_LV.ts b/translations/lv_LV.ts index 40344ac..598ee8a 100644 --- a/translations/lv_LV.ts +++ b/translations/lv_LV.ts @@ -6,17 +6,17 @@ Process is running, are you sure you want to quit? - + Process darbojas, vai jūs tiešām vēlaties iziet? OK - + OK Cancel - + Atcelt @@ -24,27 +24,27 @@ Settings - + Iestatījumi Font - + Font Font Size - + Fontu Izmērs Transparency - + Caurspīdīgums Window Blur - + Logu Izplūšana @@ -52,28 +52,28 @@ Copy - + Kopēt Paste - + Ielīmēt Select All - + Atlasīt Visu Open File Manager - + Atvērt Failu Pārvaldnieku Settings - + Iestatījumi