mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-08-06 14:26:20 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3385 from NicKoehler/file-manager-redesign-fix

Browse Source 
Fixes to file manager discussed in #3334
This commit is contained in:
RustDesk 2023-02-26 17:25:23 +08:00 committed by GitHub
commit 3731b30062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 211 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/assets/transfer.svg Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="298.171 98.799 32 32" width="32pt" height="32pt"><g><path d=" M 298.171 98.799 L 330.171 98.799 L 330.171 130.799 L 298.171 130.799 L 298.171 98.799 Z " fill="none"/><path d=" M 310.278 119.949 L 321.825 119.949 C 322.772 119.949 323.542 119.18 323.542 118.233 L 323.542 118.233 C 323.542 117.285 322.772 116.516 321.825 116.516 L 307.25 116.516 C 304.69 116.516 304.031 118.035 305.779 119.905 L 311.537 126.064 C 312.207 126.734 313.295 126.734 313.965 126.064 L 313.965 126.064 C 314.635 125.394 314.635 124.306 313.965 123.636 L 310.278 119.949 Z M 318.065 109.649 L 306.518 109.649 C 305.57 109.649 304.801 110.419 304.801 111.366 L 304.801 111.366 C 304.801 112.313 305.57 113.083 306.518 113.083 L 321.092 113.083 C 323.653 113.083 324.312 111.564 322.563 109.693 L 316.806 103.535 C 316.136 102.865 315.048 102.865 314.378 103.535 L 314.378 103.535 C 313.708 104.205 313.708 105.293 314.378 105.963 L 318.065 109.649 Z " fill-rule="evenodd" fill="rgb(0,0,0)"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

312
flutter/lib/desktop/pages/file_manager_page.dart
View File

@ -567,161 +567,187 @@ class _FileManagerPageState extends State<FileManagerPage>
return false;
}
Widget generateCard(Widget child) {
return Container(
decoration: BoxDecoration(
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.all(
Radius.circular(15.0),
),
),
child: child,
);
}
/// transfer status list
/// watch transfer status
Widget statusList() {
return PreferredSize(
preferredSize: const Size(200, double.infinity),
preferredSize: const Size(200, double.infinity),
child: Container(
margin: const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
padding: const EdgeInsets.all(8.0),
child: model.jobTable.isEmpty
? Center(child: Text(translate("Empty")))
: Container(
margin:
const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
padding: const EdgeInsets.all(8.0),
child: Obx(
() => ListView.builder(
controller: ScrollController(),
itemBuilder: (BuildContext context, int index) {
final item = model.jobTable[index];
return Padding(
padding: const EdgeInsets.only(bottom: 5),
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.all(
Radius.circular(15.0),
),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Transform.rotate(
angle: item.isRemote ? pi : 0,
child: SvgPicture.asset(
"assets/arrow.svg",
color: Theme.of(context)
.tabBarTheme
.labelColor,
),
).paddingOnly(left: 15),
const SizedBox(
width: 16.0,
? generateCard(
Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
"assets/transfer.svg",
color: Theme.of(context).tabBarTheme.labelColor,
height: 40,
).paddingOnly(bottom: 10),
Text(
translate("No transfers in progress"),
textAlign: TextAlign.center,
textScaleFactor: 1.20,
style: TextStyle(
color: Theme.of(context).tabBarTheme.labelColor),
),
],
),
),
)
: Obx(
() => ListView.builder(
controller: ScrollController(),
itemBuilder: (BuildContext context, int index) {
final item = model.jobTable[index];
return Padding(
padding: const EdgeInsets.only(bottom: 5),
child: generateCard(
Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Transform.rotate(
angle: item.isRemote ? pi : 0,
child: SvgPicture.asset(
"assets/arrow.svg",
color: Theme.of(context)
.tabBarTheme
.labelColor,
),
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Tooltip(
waitDuration:
Duration(milliseconds: 500),
message: item.jobName,
child: Text(
item.jobName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
).paddingSymmetric(vertical: 10),
).paddingOnly(left: 15),
const SizedBox(
width: 16.0,
),
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Tooltip(
waitDuration:
Duration(milliseconds: 500),
message: item.jobName,
child: Text(
item.jobName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
).paddingSymmetric(vertical: 10),
),
Text(
'${translate("Total")} ${readableFileSize(item.totalSize.toDouble())}',
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
Text(
'${translate("Total")} ${readableFileSize(item.totalSize.toDouble())}',
),
Offstage(
offstage:
item.state != JobState.inProgress,
child: Text(
'${translate("Speed")} ${readableFileSize(item.speed)}/s',
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
),
Offstage(
offstage:
item.state != JobState.inProgress,
child: Text(
'${translate("Speed")} ${readableFileSize(item.speed)}/s',
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
),
),
Offstage(
offstage:
item.state == JobState.inProgress,
child: Text(
translate(
item.display(),
),
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
),
),
Offstage(
offstage:
item.state != JobState.inProgress,
child: LinearPercentIndicator(
padding: EdgeInsets.only(right: 15),
animateFromLastPercent: true,
center: Text(
'${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
),
barRadius: Radius.circular(15),
percent: item.finishedSize /
item.totalSize,
progressColor: MyTheme.accent,
backgroundColor:
Theme.of(context).hoverColor,
lineHeight:
kDesktopFileTransferRowHeight,
).paddingSymmetric(vertical: 15),
),
],
),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
),
Offstage(
offstage: item.state != JobState.paused,
child: MenuButton(
onPressed: () {
model.resumeJob(item.id);
},
child: SvgPicture.asset(
"assets/refresh.svg",
color: Colors.white,
offstage:
item.state == JobState.inProgress,
child: Text(
translate(
item.display(),
),
style: TextStyle(
fontSize: 12,
color: MyTheme.darkGray,
),
color: MyTheme.accent,
hoverColor: MyTheme.accent80,
),
),
MenuButton(
padding: EdgeInsets.only(right: 15),
child: SvgPicture.asset(
"assets/close.svg",
color: Colors.white,
),
onPressed: () {
model.jobTable.removeAt(index);
model.cancelJob(item.id);
},
color: MyTheme.accent,
hoverColor: MyTheme.accent80,
Offstage(
offstage:
item.state != JobState.inProgress,
child: LinearPercentIndicator(
padding: EdgeInsets.only(right: 15),
animateFromLastPercent: true,
center: Text(
'${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
),
barRadius: Radius.circular(15),
percent: item.finishedSize /
item.totalSize,
progressColor: MyTheme.accent,
backgroundColor:
Theme.of(context).hoverColor,
lineHeight:
kDesktopFileTransferRowHeight,
).paddingSymmetric(vertical: 15),
),
],
),
],
),
],
).paddingSymmetric(vertical: 10),
),
);
},
itemCount: model.jobTable.length,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Offstage(
offstage: item.state != JobState.paused,
child: MenuButton(
onPressed: () {
model.resumeJob(item.id);
},
child: SvgPicture.asset(
"assets/refresh.svg",
color: Colors.white,
),
color: MyTheme.accent,
hoverColor: MyTheme.accent80,
),
),
MenuButton(
padding: EdgeInsets.only(right: 15),
child: SvgPicture.asset(
"assets/close.svg",
color: Colors.white,
),
onPressed: () {
model.jobTable.removeAt(index);
model.cancelJob(item.id);
},
color: MyTheme.accent,
hoverColor: MyTheme.accent80,
),
],
),
],
),
],
).paddingSymmetric(vertical: 10),
),
);
},
itemCount: model.jobTable.length,
),
));
),
),
);
}
Widget headTools(bool isLocal) {
@ -1028,7 +1054,9 @@ class _FileManagerPageState extends State<FileManagerPage>
textAlign: TextAlign.right,
style: TextStyle(
color: selectedItems.length == 0
? MyTheme.darkGray
? Theme.of(context).brightness == Brightness.light
? MyTheme.grayBg
: MyTheme.darkGray
: Colors.white,
),
)
@ -1037,7 +1065,9 @@ class _FileManagerPageState extends State<FileManagerPage>
child: SvgPicture.asset(
"assets/arrow.svg",
color: selectedItems.length == 0
? MyTheme.darkGray
? Theme.of(context).brightness == Brightness.light
? MyTheme.grayBg
: MyTheme.darkGray
: Colors.white,
alignment: Alignment.bottomRight,
),
@ -1046,14 +1076,18 @@ class _FileManagerPageState extends State<FileManagerPage>
? SvgPicture.asset(
"assets/arrow.svg",
color: selectedItems.length == 0
? MyTheme.darkGray
? Theme.of(context).brightness == Brightness.light
? MyTheme.grayBg
: MyTheme.darkGray
: Colors.white,
)
: Text(
translate('Receive'),
style: TextStyle(
color: selectedItems.length == 0
? MyTheme.darkGray
? Theme.of(context).brightness == Brightness.light
? MyTheme.grayBg
: MyTheme.darkGray
: Colors.white,
),
),

2
flutter/lib/desktop/widgets/menu_button.dart
View File

@ -37,7 +37,7 @@ class _MenuButtonState extends State<MenuButton> {
message: widget.tooltip,
child: Material(
type: MaterialType.transparency,
child: Ink(
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(_borderRadius),
color: _isHover ? widget.hoverColor : widget.color,

1
src/lang/ca.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/cn.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", "重连"),
("Codec", "编解码"),
("Resolution", "分辨率"),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/cs.rs
View File

@ -454,6 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Stop voice call", ""),
("relay_hint_tip", ""),
("Reconnect", ""),
("No transfers in progress", ""),
("Codec", ""),
("Resolution", ""),
].iter().cloned().collect();

1
src/lang/da.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/de.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", "Erneut verbinden"),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/en.rs
View File

@ -44,5 +44,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("still_click_uac_tip", "Still requires the remote user to click OK on the UAC window of running RustDesk."),
("config_microphone", "In order to speak remotely, you need to grant RustDesk \"Record Audio\" permissions."),
("relay_hint_tip", "It may not be possible to connect directly, you can try to connect via relay. \nIn addition, if you want to use relay on your first try, you can add the \"/r\" suffix to the ID, or select the option \"Always connect via relay\" in the peer card."),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/eo.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/es.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", "Reconectar"),
("Codec", "Códec"),
("Resolution", "Resolución"),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/fa.rs
View File

@ -454,6 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Stop voice call", "توقف تماس صوتی"),
("relay_hint_tip", " را به شناسه اضافه کنید یا گزینه \"همیشه از طریق رله متصل شوید\" را در کارت همتا انتخاب کنید. همچنین، اگر می‌خواهید فوراً از سرور رله استفاده کنید، می‌توانید پسوند \"/r\".\n اتصال مستقیم ممکن است امکان پذیر نباشد. در این صورت می توانید سعی کنید از طریق سرور رله متصل شوید"),
("Reconnect", "اتصال مجدد"),
("No transfers in progress", ""),
("Codec", ""),
("Resolution", ""),
].iter().cloned().collect();

1
src/lang/fr.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/gr.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/hu.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/id.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/it.rs
View File

@ -454,6 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Stop voice call", "Interrompi la chiamata vocale"),
("relay_hint_tip", "Se non è possibile connettersi direttamente, si può provare a farlo tramite relay.\nInoltre, se si desidera utilizzare il relay al primo tentativo, è possibile aggiungere il suffisso \"/r\" all'ID o selezionare l'opzione \"Collegati sempre tramite relay\" nella scheda peer."),
("Reconnect", "Riconnetti"),
("No transfers in progress", "Nessun trasferimento in corso"),
("Codec", "Codec"),
("Resolution", "Risoluzione"),
].iter().cloned().collect();

1
src/lang/ja.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/ko.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/kz.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/nl.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

3
src/lang/pl.rs
View File

@ -458,6 +458,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Resolution", "Rozdzielczość"),
("Use temporary password", "Użyj hasła tymczasowego"),
("Set temporary password length", "Ustaw długość hasła tymczasowego"),
("Key", "Klucz")
("Key", "Klucz"),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/pt_PT.rs
View File

@ -454,6 +454,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Stop voice call", ""),
("relay_hint_tip", ""),
("Reconnect", ""),
("No transfers in progress", ""),
("Codec", ""),
("Resolution", ""),
].iter().cloned().collect();

1
src/lang/ptbr.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/ro.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/ru.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", "Переподключить"),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/sk.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/sl.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/sq.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/sr.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/sv.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/template.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/th.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/tr.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/tw.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", "重連"),
("Codec", "編解碼"),
("Resolution", "分辨率"),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/ua.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}

1
src/lang/vn.rs
View File

@ -456,5 +456,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Reconnect", ""),
("Codec", ""),
("Resolution", ""),
("No transfers in progress", ""),
].iter().cloned().collect();
}