Merge branch 'master' into ui_chore

linuxdeepin · Nov 29, 2024 · e0dd942 · e0dd942
2 parents f3d497d + 9d2f4fe
commit e0dd942
Show file tree

Hide file tree

Showing 168 changed files with 14,180 additions and 24,029 deletions.
diff --git a/3rdparty/terminalwidget/lib/translations/terminalwidget_hr.ts b/3rdparty/terminalwidget/lib/translations/terminalwidget_hr.ts
@@ -64,12 +64,12 @@
     <message>
         <location filename="../qtermwidget.cpp" line="451"/>
         <source>Color Scheme Error</source>
-        <translation type="unfinished"/>
+        <translation>Greška sheme boja</translation>
     </message>
     <message>
         <location filename="../qtermwidget.cpp" line="452"/>
         <source>Cannot load color scheme: %1</source>
-        <translation type="unfinished"/>
+        <translation>Ne mogu učitati shemu boja: %1</translation>
     </message>
 </context>
 <context>

diff --git a/3rdparty/terminalwidget/lib/translations/terminalwidget_pl.ts b/3rdparty/terminalwidget/lib/translations/terminalwidget_pl.ts
@@ -36,7 +36,7 @@
     <message>
         <location filename="../ColorScheme.cpp" line="464"/>
         <source>Accessible Color Scheme</source>
-        <translation>Paleta o zwiększonej przystępności</translation>
+        <translation>Przystępny schemat kolorów</translation>
     </message>
     <message>
         <location filename="../Filter.cpp" line="538"/>

diff --git a/3rdparty/terminalwidget/lib/translations/terminalwidget_sk.ts b/3rdparty/terminalwidget/lib/translations/terminalwidget_sk.ts
@@ -0,0 +1,123 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sk">
+<context>
+    <name>Konsole::TerminalDisplay</name>
+    <message>
+        <location filename="../TerminalDisplay.cpp" line="1279"/>
+        <source>Size: XXX x XXX</source>
+        <translation>Veľkosť: XXX x XXX</translation>
+    </message>
+    <message>
+        <location filename="../TerminalDisplay.cpp" line="1291"/>
+        <source>Size: %1 x %2</source>
+        <translation>Veľkosť: %1 x %2</translation>
+    </message>
+    <message>
+        <location filename="../TerminalDisplay.cpp" line="3178"/>
+        <source>&lt;qt&gt;Output has been &lt;a href=&quot;http://en.wikipedia.org/wiki/Flow_control&quot;&gt;suspended&lt;/a&gt; by pressing Ctrl+S.  Press &lt;b&gt;Ctrl+Q&lt;/b&gt; to resume.&lt;/qt&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Konsole::Vt102Emulation</name>
+    <message>
+        <location filename="../Vt102Emulation.cpp" line="1105"/>
+        <source>No keyboard translator available.  The information needed to convert key presses into characters to send to the terminal is missing.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../ColorScheme.cpp" line="278"/>
+        <location filename="../ColorScheme.cpp" line="293"/>
+        <source>Un-named Color Scheme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../ColorScheme.cpp" line="464"/>
+        <source>Accessible Color Scheme</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../Filter.cpp" line="538"/>
+        <source>Open link</source>
+        <translation>Otvoriť odkaz</translation>
+    </message>
+    <message>
+        <location filename="../Filter.cpp" line="539"/>
+        <source>Copy link</source>
+        <translation>Kopírovať odkaz</translation>
+    </message>
+    <message>
+        <location filename="../Filter.cpp" line="543"/>
+        <source>Send email to...</source>
+        <translation>Poslať email na...</translation>
+    </message>
+    <message>
+        <location filename="../Filter.cpp" line="544"/>
+        <source>Copy email address</source>
+        <translation>Kopírovať emailovú adresu</translation>
+    </message>
+</context>
+<context>
+    <name>QTermWidget</name>
+    <message>
+        <location filename="../qtermwidget.cpp" line="451"/>
+        <source>Color Scheme Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qtermwidget.cpp" line="452"/>
+        <source>Cannot load color scheme: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchBar</name>
+    <message>
+        <location filename="../SearchBar.cpp" line="40"/>
+        <source>Match case</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../SearchBar.cpp" line="46"/>
+        <source>Regular expression</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../SearchBar.cpp" line="50"/>
+        <source>Highlight all matches</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="14"/>
+        <source>SearchBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="20"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="32"/>
+        <source>Find:</source>
+        <translation>Hľadať:</translation>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="42"/>
+        <source>&lt;</source>
+        <translation>&lt;</translation>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="54"/>
+        <source>&gt;</source>
+        <translation>&gt;</translation>
+    </message>
+    <message>
+        <location filename="../SearchBar.ui" line="66"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+</TS>
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -276,9 +276,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/deepin-terminal
 install(FILES ${DTNG_QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-terminal/translations)
 
 install(DIRECTORY src/assets/deepin-terminal
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-manual/manual-assets/application/)
-
-# Unit Test
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-  add_subdirectory(tests)
-endif()
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-manual/manual-assets/application/)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,16 @@
+deepin-terminal (6.0.16) unstable; urgency=medium
+
+  * feat: Add debuginfod settings (#366)
+
+ -- Yutao Meng <[email protected]>  Tue, 19 Nov 2024 10:05:41 +0800
+
+deepin-terminal (6.0.15) unstable; urgency=medium
+
+  * Release 6.0.15
+  * feat: [UI] Adapt compact mode.(https://pms.uniontech.com/bug-view-279709.html)
+
+ -- Zhang Kun <[email protected]>  Fri, 25 Oct 2024 18:09:30 +0800
+
 deepin-terminal (6.0.14) unstable; urgency=medium
 
   * chore: Update translation (#346)

diff --git a/src/assets/other/default-config.json b/src/assets/other/default-config.json
@@ -421,6 +421,24 @@
                             "default": "false"
                         }
                     ]
+                },
+                {
+                    "key": "debuginfod",
+                    "name": "Debuginfod",
+                    "options": [
+                        {
+                            "key": "enable_debuginfod",
+                            "text": "The HTTP file server used for transmitting debugging information resources",
+                            "type": "checkbox",
+                            "default": "true"
+                        },
+                        {
+                            "key": "debuginfod_urls",
+                            "name": "debuginfod URLs",
+                            "type": "lineedit",
+                            "default": "https://debuginfod.deepin.com"
+                        }
+                    ]
                 }
             ]
         }

diff --git a/src/common/utils.h b/src/common/utils.h
@@ -48,10 +48,21 @@ extern __attribute__((visibility("default"))) int __maxFontSize;
 #define SPACEWIDTH 10
 // 控件通用高度
 #define COMMONHEIGHT 36
+#define COMMONHEIGHT_COMPACT 24
 // 图标大小
 #define ICONSIZE_50 50
 #define ICONSIZE_36 36
 #define ICONSIZE_20 20
+#define ICONSIZE_40_COMPACT 40
+#define ICON_CTX_SIZE_32 32
+#define ICON_CTX_SIZE_24 24
+// 竖向分割线高度
+#define VERTICAL_HEIGHT 28
+#define VERTICAL_WIDTH 3
+#define VERTICAL_HEIGHT_COMPACT 17
+#define VERTICAL_WIDTH_COMPACT 1
+// 设置框统一宽度
+#define SETTING_DIALOG_WIDTH 459
 
 // limit font size
 #define DEFAULT_MIN_FONT_SZIE 5
@@ -71,6 +82,7 @@ extern __attribute__((visibility("default"))) int __maxFontSize;
 #define WINDOW_DEFAULT_SIZE QSize(WINDOW_DEFAULT_WIDTH, WINDOW_DEFAULT_HEIGHT)      //终端窗口默认尺寸
 #define ICON_EXIT_FULL_SIZE QSize(ICONSIZE_36, ICONSIZE_36)                         //退出全屏按钮尺寸
 #define WIN_TITLE_BAR_HEIGHT 50 //标题栏高度
+#define WIN_TITLE_BAR_HEIGHT_COMPACT 40 //标题栏高度(紧凑模式)
 
 
 #define WINDOW_MIN_WIDTH 610   //终端窗口最小宽度
@@ -79,6 +91,7 @@ extern __attribute__((visibility("default"))) int __maxFontSize;
 //Encode Plugin
 #define ENCODE_ITEM_WIDTH 220
 #define ENCODE_ITEM_HEIGHT 60
+#define ENCODE_ITEM_HEIGHT_COMPACT 50
 
 //字体信息
 struct FontData{