From 3c33c2d8d9047216249bc4820813790d5f1cb83e Mon Sep 17 00:00:00 2001 From: xiaoming <2014500726@smail.xtu.edu.cn> Date: Fri, 6 Sep 2024 12:57:41 +0800 Subject: [PATCH] fix ui Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn> --- README.md | 2 +- docs/roadmap.md | 5 ++- .../globaloptionsadvancedwidget.ui | 20 ++++++++- .../globaloptionsappearancewidget.ui | 42 +++++++++++++++++-- .../globaloptionsgeneralwidget.ui | 28 ++++++++++++- .../globaloptionsterminalwidget.ui | 36 ++++++++++++++-- .../globaloptionstransferwidget.ui | 34 ++++++++++++++- .../globaloptionswindowwidget.ui | 10 ++++- .../sessionoptionsgeneralwidget.ui | 6 +-- .../sessionoptionslocalshellproperties.ui | 8 +++- .../sessionoptionslocalshellstate.ui | 12 ++++-- .../sessionoptionsnamepipeproperties.ui | 4 +- .../sessionoptionsrawproperties.ui | 6 +-- .../sessionoptionsserialproperties.ui | 12 +++--- .../sessionoptionsserialstate.ui | 18 ++++++-- .../sessionoptionsssh2properties.ui | 10 ++--- .../sessionoptionstelnetproperties.ui | 22 +++++++++- .../sessionoptionsvncproperties.ui | 8 ++-- 18 files changed, 236 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index a4c51b82..104e0f51 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Protocol selection interface: | | | Session label tag color | | | -| block selection (Shift+click) and column selection (Alt+Shift+click) | +| Block selection (Shift+click) and column selection (Alt+Shift+click) | | | ## Planned features diff --git a/docs/roadmap.md b/docs/roadmap.md index 1a7e5d8b..046781bf 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -5,11 +5,14 @@ quardCRT's development plan and roadmap. - Version 0.5.x - - [ ] Scripts Engine + - [x] Scripts Engine - Version 0.4.x - [x] Modern and elegant main UI - [x] XYZmodem file transfer + - [x] Broadcast session + - [x] Session label tag color + - [x] Block selection (Shift+click) and column selection (Alt+Shift+click) - [x] Plugins system - [x] German/Portuguese(Brazil)/Czech/Arabic diff --git a/src/globaloptions/globaloptionsadvancedwidget.ui b/src/globaloptions/globaloptionsadvancedwidget.ui index 2b7bab34..effc8eb7 100644 --- a/src/globaloptions/globaloptionsadvancedwidget.ui +++ b/src/globaloptions/globaloptionsadvancedwidget.ui @@ -7,7 +7,7 @@ 0 0 449 - 397 + 459 @@ -58,6 +58,12 @@ + + + 0 + 0 + + Default LocalShell @@ -86,6 +92,12 @@ + + + 0 + 0 + + PowerShell Profile @@ -124,6 +136,12 @@ + + + 0 + 0 + + User Plugins Path diff --git a/src/globaloptions/globaloptionsappearancewidget.ui b/src/globaloptions/globaloptionsappearancewidget.ui index 4de497eb..096c3e15 100644 --- a/src/globaloptions/globaloptionsappearancewidget.ui +++ b/src/globaloptions/globaloptionsappearancewidget.ui @@ -7,7 +7,7 @@ 0 0 550 - 528 + 598 @@ -16,6 +16,12 @@ + + + 0 + 0 + + Color Schemes @@ -472,6 +478,12 @@ + + + 0 + 0 + + Pre-edit Color Index @@ -495,6 +507,12 @@ + + + 0 + 0 + + Font @@ -508,7 +526,7 @@ - + 0 0 @@ -531,7 +549,7 @@ - + 0 0 @@ -567,6 +585,12 @@ + + + 0 + 0 + + Background image @@ -608,6 +632,12 @@ + + + 0 + 0 + + Background mode @@ -658,6 +688,12 @@ + + + 0 + 0 + + Background opacity diff --git a/src/globaloptions/globaloptionsgeneralwidget.ui b/src/globaloptions/globaloptionsgeneralwidget.ui index 789c5906..38f00180 100644 --- a/src/globaloptions/globaloptionsgeneralwidget.ui +++ b/src/globaloptions/globaloptionsgeneralwidget.ui @@ -7,7 +7,7 @@ 0 0 379 - 363 + 412 @@ -21,6 +21,12 @@ + + + 0 + 0 + + New tab mode @@ -63,6 +69,12 @@ + + + 0 + 0 + + New tab workpath @@ -198,7 +210,7 @@ - + 0 0 @@ -236,6 +248,12 @@ + + + 0 + 0 + + WSL UserName @@ -243,6 +261,12 @@ + + + 0 + 0 + + WSL DistroName diff --git a/src/globaloptions/globaloptionsterminalwidget.ui b/src/globaloptions/globaloptionsterminalwidget.ui index 4725dee1..8f76f898 100644 --- a/src/globaloptions/globaloptionsterminalwidget.ui +++ b/src/globaloptions/globaloptionsterminalwidget.ui @@ -13,6 +13,12 @@ + + + 0 + 0 + + Scrollback lines @@ -33,6 +39,12 @@ + + + 0 + 0 + + Cursor Shape @@ -78,7 +90,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -90,6 +102,12 @@ + + + 0 + 0 + + Cursor Color @@ -109,6 +127,12 @@ + + + 0 + 0 + + Word Characters @@ -123,6 +147,12 @@ + + + 0 + 0 + + Selected text accent color transparency (inverse color at 100%) @@ -144,7 +174,7 @@ 50 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -181,7 +211,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/globaloptions/globaloptionstransferwidget.ui b/src/globaloptions/globaloptionstransferwidget.ui index 46e13339..68c44c61 100644 --- a/src/globaloptions/globaloptionstransferwidget.ui +++ b/src/globaloptions/globaloptionstransferwidget.ui @@ -16,6 +16,12 @@ + + + 0 + 0 + + Directories @@ -28,6 +34,12 @@ + + + 0 + 0 + + Download @@ -42,6 +54,12 @@ + + + 0 + 0 + + Upload @@ -78,6 +96,12 @@ + + + 0 + 0 + + X/Ymodem send packet size @@ -111,7 +135,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -125,6 +149,12 @@ + + + 0 + 0 + + Zmodem Online @@ -143,7 +173,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/globaloptions/globaloptionswindowwidget.ui b/src/globaloptions/globaloptionswindowwidget.ui index eedd4fcf..7343eea3 100644 --- a/src/globaloptions/globaloptionswindowwidget.ui +++ b/src/globaloptions/globaloptionswindowwidget.ui @@ -16,6 +16,12 @@ + + + 0 + 0 + + Transparent window @@ -30,14 +36,14 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsgeneralwidget.ui b/src/sessionoptions/sessionoptionsgeneralwidget.ui index 31bd00c9..128e7b44 100644 --- a/src/sessionoptions/sessionoptionsgeneralwidget.ui +++ b/src/sessionoptions/sessionoptionsgeneralwidget.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -45,7 +45,7 @@ - + 0 0 @@ -102,7 +102,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionslocalshellproperties.ui b/src/sessionoptions/sessionoptionslocalshellproperties.ui index fa990df2..b3f47015 100644 --- a/src/sessionoptions/sessionoptionslocalshellproperties.ui +++ b/src/sessionoptions/sessionoptionslocalshellproperties.ui @@ -21,6 +21,12 @@ + + + 0 + 0 + + Command @@ -34,7 +40,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionslocalshellstate.ui b/src/sessionoptions/sessionoptionslocalshellstate.ui index 061beb7b..3cbd0d2f 100644 --- a/src/sessionoptions/sessionoptionslocalshellstate.ui +++ b/src/sessionoptions/sessionoptionslocalshellstate.ui @@ -38,7 +38,7 @@ - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -47,17 +47,23 @@ - Qt::Horizontal + Qt::Orientation::Horizontal + + + 0 + 0 + + Process Tree - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter diff --git a/src/sessionoptions/sessionoptionsnamepipeproperties.ui b/src/sessionoptions/sessionoptionsnamepipeproperties.ui index 20d07293..986fa073 100644 --- a/src/sessionoptions/sessionoptionsnamepipeproperties.ui +++ b/src/sessionoptions/sessionoptionsnamepipeproperties.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -40,7 +40,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsrawproperties.ui b/src/sessionoptions/sessionoptionsrawproperties.ui index 7c5156ac..00413be5 100644 --- a/src/sessionoptions/sessionoptionsrawproperties.ui +++ b/src/sessionoptions/sessionoptionsrawproperties.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -45,7 +45,7 @@ - + 0 0 @@ -67,7 +67,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsserialproperties.ui b/src/sessionoptions/sessionoptionsserialproperties.ui index aefaa948..dd66225f 100644 --- a/src/sessionoptions/sessionoptionsserialproperties.ui +++ b/src/sessionoptions/sessionoptionsserialproperties.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -61,7 +61,7 @@ - + 0 0 @@ -91,7 +91,7 @@ - + 0 0 @@ -131,7 +131,7 @@ - + 0 0 @@ -173,7 +173,7 @@ - + 0 0 @@ -219,7 +219,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsserialstate.ui b/src/sessionoptions/sessionoptionsserialstate.ui index ca430ebb..a4c24902 100644 --- a/src/sessionoptions/sessionoptionsserialstate.ui +++ b/src/sessionoptions/sessionoptionsserialstate.ui @@ -38,7 +38,7 @@ - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -47,7 +47,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -62,6 +62,12 @@ + + + 0 + 0 + + Tx @@ -69,6 +75,12 @@ + + + 0 + 0 + + Rx @@ -100,7 +112,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsssh2properties.ui b/src/sessionoptions/sessionoptionsssh2properties.ui index da52886e..2e05f1f7 100644 --- a/src/sessionoptions/sessionoptionsssh2properties.ui +++ b/src/sessionoptions/sessionoptionsssh2properties.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -38,7 +38,7 @@ - + 0 0 @@ -65,7 +65,7 @@ - + 0 0 @@ -81,7 +81,7 @@ - + 0 0 @@ -96,7 +96,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionstelnetproperties.ui b/src/sessionoptions/sessionoptionstelnetproperties.ui index 46e106ca..aaf67569 100644 --- a/src/sessionoptions/sessionoptionstelnetproperties.ui +++ b/src/sessionoptions/sessionoptionstelnetproperties.ui @@ -6,7 +6,7 @@ 0 0 - 400 + 414 256 @@ -21,6 +21,12 @@ + + + 0 + 0 + + Hostname @@ -38,6 +44,12 @@ + + + 0 + 0 + + Port @@ -52,6 +64,12 @@ + + + 0 + 0 + + Websocket @@ -84,7 +102,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/sessionoptions/sessionoptionsvncproperties.ui b/src/sessionoptions/sessionoptionsvncproperties.ui index 3d95334e..1d7d9b5a 100644 --- a/src/sessionoptions/sessionoptionsvncproperties.ui +++ b/src/sessionoptions/sessionoptionsvncproperties.ui @@ -22,7 +22,7 @@ - + 0 0 @@ -38,7 +38,7 @@ - + 0 0 @@ -65,7 +65,7 @@ - + 0 0 @@ -80,7 +80,7 @@ - Qt::Vertical + Qt::Orientation::Vertical