fix on help tools and tranlating 'Failed'

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

View File

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

View File

@ -741,7 +741,10 @@ final langs = <String, Map<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 v = tmp[name];
if (v == null) {

View File

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