hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix on help tools and tranlating 'Failed'

Browse Source
This commit is contained in:
rustdesk 2021-08-02 22:21:23 +08:00
parent 600f604611
commit 5df90d4fa1
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter_hbb/lib/common.dart
View File

@ -21,7 +21,6 @@ class MyTheme {
} }
final ButtonStyle flatButtonStyle = TextButton.styleFrom( final ButtonStyle flatButtonStyle = TextButton.styleFrom(
primary: MyTheme.accent,
minimumSize: Size(88, 36), minimumSize: Size(88, 36),
padding: EdgeInsets.symmetric(horizontal: 16.0), padding: EdgeInsets.symmetric(horizontal: 16.0),
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(

5
flutter_hbb/lib/model.dart
View File

@ -741,7 +741,10 @@ final langs = <String, Map<String, String>>{
'en': <String, String>{} 'en': <String, String>{}
}; };
String translate(name) { String translate(String name) {
if (name.startsWith('Failed') && name.contains(':')) {
return name.split(': ').map((x) => translate(x)).join(': ');
}
final tmp = isCn ? langs['cn'] : langs['en']; final tmp = isCn ? langs['cn'] : langs['en'];
final v = tmp[name]; final v = tmp[name];
if (v == null) { if (v == null) {

38
flutter_hbb/lib/remote_page.dart
View File

@ -352,26 +352,24 @@ class _RemotePageState extends State<RemotePage> {
} }
var wrap = var wrap =
(String text, void Function() onPressed, [bool active, IconData icon]) { (String text, void Function() onPressed, [bool active, IconData icon]) {
return ButtonTheme( return TextButton(
padding: EdgeInsets.symmetric( style: TextButton.styleFrom(
vertical: icon != null ? 3 : 6, minimumSize: Size(0, 0),
horizontal: 6), //adds padding inside the button padding: EdgeInsets.symmetric(
materialTapTargetSize: MaterialTapTargetSize vertical: icon != null ? 3 : 6,
.shrinkWrap, //limits the touch area to the button area horizontal: 6), //adds padding inside the button
minWidth: 0, //wraps child's width tapTargetSize: MaterialTapTargetSize
height: 0, .shrinkWrap, //limits the touch area to the button area
child: TextButton( shape: RoundedRectangleBorder(
style: TextButton.styleFrom( borderRadius: BorderRadius.circular(5.0),
shape: RoundedRectangleBorder( ),
borderRadius: BorderRadius.circular(5.0), backgroundColor: active == true ? MyTheme.accent80 : null,
), ),
primary: active == true ? MyTheme.accent80 : null, child: icon != null
), ? Icon(icon, size: 17, color: Colors.white)
child: icon != null : Text(translate(text),
? Icon(icon, size: 17, color: Colors.white) style: TextStyle(color: Colors.white, fontSize: 11)),
: Text(translate(text), onPressed: onPressed);
style: TextStyle(color: Colors.white, fontSize: 11)),
onPressed: onPressed));
}; };
final mouse = <Widget>[ final mouse = <Widget>[
wrap('Drag', () { wrap('Drag', () {