Merge remote-tracking branch 'upstream/main'

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: {

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
         }

translations/en_US.ts

@@ -50,28 +50,38 @@
 <context>
     <name>Terminal</name>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="177"/>
+        <location filename="../src/qml/Terminal.qml" line="178"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="183"/>
-        <location filename="../src/qml/Terminal.qml" line="197"/>
+        <location filename="../src/qml/Terminal.qml" line="184"/>
+        <location filename="../src/qml/Terminal.qml" line="198"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="203"/>
+        <location filename="../src/qml/Terminal.qml" line="204"/>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="208"/>
+        <location filename="../src/qml/Terminal.qml" line="209"/>
         <source>Open File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="213"/>
+        <location filename="../src/qml/Terminal.qml" line="214"/>
+        <source>Exit full screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Terminal.qml" line="214"/>
+        <source>Full screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Terminal.qml" line="221"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>

translations/lv_LV.ts

@@ -6,17 +6,17 @@
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="49"/>
         <source>Process is running, are you sure you want to quit?</source>
-        <translation type="unfinished"></translation>
+        <translation>Process darbojas, vai jūs tiešām vēlaties iziet?</translation>
     </message>
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="63"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="57"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Atcelt</translation>
     </message>
 </context>
 <context>
@@ -24,27 +24,27 @@
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="10"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Iestatījumi</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="39"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Font</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="63"/>
         <source>Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Fontu Izmērs</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="82"/>
         <source>Transparency</source>
-        <translation type="unfinished"></translation>
+        <translation>Caurspīdīgums</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="101"/>
         <source>Window Blur</source>
-        <translation type="unfinished"></translation>
+        <translation>Logu Izplūšana</translation>
     </message>
 </context>
 <context>
@@ -52,28 +52,28 @@
     <message>
         <location filename="../src/qml/Terminal.qml" line="177"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopēt</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="183"/>
         <location filename="../src/qml/Terminal.qml" line="197"/>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Ielīmēt</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="203"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Atlasīt Visu</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="208"/>
         <source>Open File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Atvērt Failu Pārvaldnieku</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="213"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Iestatījumi</translation>
     </message>
 </context>
 </TS>

translations/ru_RU.ts

@@ -6,17 +6,17 @@
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="49"/>
         <source>Process is running, are you sure you want to quit?</source>
-        <translation type="unfinished"></translation>
+        <translation>Запущен процесс, вы точно хотите выйти?</translation>
     </message>
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="63"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>ОК</translation>
     </message>
     <message>
         <location filename="../src/qml/ExitPromptDialog.qml" line="57"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отмена</translation>
     </message>
 </context>
 <context>
@@ -24,27 +24,27 @@
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="10"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="39"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Шрифты</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="63"/>
         <source>Font Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер шрифтов</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="82"/>
         <source>Transparency</source>
-        <translation type="unfinished"></translation>
+        <translation>Прозрачность</translation>
     </message>
     <message>
         <location filename="../src/qml/SettingsDialog.qml" line="101"/>
         <source>Window Blur</source>
-        <translation type="unfinished"></translation>
+        <translation>Прозрачность окна</translation>
     </message>
 </context>
 <context>
@@ -52,28 +52,28 @@
     <message>
         <location filename="../src/qml/Terminal.qml" line="177"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="183"/>
         <location filename="../src/qml/Terminal.qml" line="197"/>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Вставить</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="203"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Выделить всё</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="208"/>
         <source>Open File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть файловый менеджер</translation>
     </message>
     <message>
         <location filename="../src/qml/Terminal.qml" line="213"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
 </context>
 </TS>

translations/zh_CN.ts

@@ -50,28 +50,38 @@
 <context>
     <name>Terminal</name>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="177"/>
+        <location filename="../src/qml/Terminal.qml" line="178"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="183"/>
-        <location filename="../src/qml/Terminal.qml" line="197"/>
+        <location filename="../src/qml/Terminal.qml" line="184"/>
+        <location filename="../src/qml/Terminal.qml" line="198"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="203"/>
+        <location filename="../src/qml/Terminal.qml" line="204"/>
         <source>Select All</source>
         <translation>全选</translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="208"/>
+        <location filename="../src/qml/Terminal.qml" line="209"/>
         <source>Open File Manager</source>
         <translation>打开文件管理器</translation>
     </message>
     <message>
-        <location filename="../src/qml/Terminal.qml" line="213"/>
+        <location filename="../src/qml/Terminal.qml" line="214"/>
+        <source>Exit full screen</source>
+        <translation>退出全屏</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Terminal.qml" line="214"/>
+        <source>Full screen</source>
+        <translation>全屏</translation>
+    </message>
+    <message>
+        <location filename="../src/qml/Terminal.qml" line="221"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>