TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-05 21:41:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

opt dialog button style

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-01-15 19:46:16 +08:00
parent b466bb013f
commit 62791613a7
18 changed files with 166 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
flutter/lib/mobile/pages/file_manager_page.dart
View File

@@ -174,23 +174,18 @@ class _FileManagerPageState extends State<FileManagerPage> {
],
),
actions: [
TextButton(
style: flatButtonStyle,
dialogButton("Cancel",
onPressed: () => close(false),
child: Text(translate("Cancel"))),
ElevatedButton(
style: flatButtonStyle,
onPressed: () {
if (name.value.text.isNotEmpty) {
model.createDir(PathUtil.join(
model.currentDir.path,
name.value.text,
model
.getCurrentIsWindows()));
close();
}
},
child: Text(translate("OK")))
isOutline: true),
dialogButton("OK", onPressed: () {
if (name.value.text.isNotEmpty) {
model.createDir(PathUtil.join(
model.currentDir.path,
name.value.text,
model.getCurrentIsWindows()));
close();
}
})
]));
} else if (v == "hidden") {
model.toggleShowHidden();

13
flutter/lib/mobile/pages/remote_page.dart
View File

@@ -1098,15 +1098,9 @@ void showSetOSPassword(
),
]),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: () {
close();
},
child: Text(translate('Cancel')),
),
TextButton(
style: flatButtonStyle,
dialogButton('Cancel', onPressed: close, isOutline: true),
dialogButton(
'OK',
onPressed: () {
var text = controller.text.trim();
bind.sessionPeerOption(id: id, name: "os-password", value: text);
@@ -1117,7 +1111,6 @@ void showSetOSPassword(
}
close();
},
child: Text(translate('OK')),
),
]);
});

13
flutter/lib/mobile/pages/settings_page.dart
View File

@@ -273,13 +273,12 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
content: Text(translate(
"android_open_battery_optimizations_tip")),
actions: [
TextButton(
onPressed: () => close(),
child: Text(translate("Cancel"))),
ElevatedButton(
onPressed: () => close(true),
child:
Text(translate("Open System Setting"))),
dialogButton("Cancel",
onPressed: () => close(), isOutline: true),
dialogButton(
"Open System Setting",
onPressed: () => close(true),
),
],
));
if (res == true) {

99
flutter/lib/mobile/widgets/dialog.dart
View File

@@ -1,6 +1,7 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/desktop/widgets/button.dart';
import 'package:get/get.dart';
import '../../common.dart';
@@ -33,10 +34,8 @@ void showRestartRemoteDevice(
content: Text(
"${translate('Are you sure you want to restart')} \n${pi.username}@${pi.hostname}($id) ?"),
actions: [
TextButton(
onPressed: () => close(), child: Text(translate("Cancel"))),
ElevatedButton(
onPressed: () => close(true), child: Text(translate("OK"))),
dialogButton("Cancel", onPressed: () => close(), isOutline: true),
dialogButton("OK", onPressed: () => close(true)),
],
));
if (res == true) bind.sessionRestartRemoteDevice(id: id);
@@ -96,15 +95,15 @@ void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
),
])),
actions: [
TextButton(
style: flatButtonStyle,
dialogButton(
'Cancel',
onPressed: () {
close();
},
child: Text(translate('Cancel')),
isOutline: true,
),
TextButton(
style: flatButtonStyle,
dialogButton(
'OK',
onPressed: (validateLength && validateSame)
? () async {
close();
@@ -118,7 +117,6 @@ void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
}
}
: null,
child: Text(translate('OK')),
),
],
);
@@ -198,16 +196,8 @@ void enterPasswordDialog(String id, OverlayDialogManager dialogManager) async {
),
]),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: cancel,
child: Text(translate('Cancel')),
),
TextButton(
style: flatButtonStyle,
onPressed: submit,
child: Text(translate('OK')),
),
dialogButton('Cancel', onPressed: cancel, isOutline: true),
dialogButton('OK', onPressed: submit),
],
onSubmit: submit,
onCancel: cancel,
@@ -220,20 +210,19 @@ void wrongPasswordDialog(String id, OverlayDialogManager dialogManager) {
title: Text(translate('Wrong Password')),
content: Text(translate('Do you want to enter again?')),
actions: [
TextButton(
style: flatButtonStyle,
dialogButton(
'Cancel',
onPressed: () {
close();
closeConnection();
},
child: Text(translate('Cancel')),
isOutline: true,
),
TextButton(
style: flatButtonStyle,
dialogButton(
'Retry',
onPressed: () {
enterPasswordDialog(id, dialogManager);
},
child: Text(translate('Retry')),
),
]));
}
@@ -321,15 +310,11 @@ void showServerSettingsWithValue(
child: LinearProgressIndicator())
])),
actions: [
TextButton(
style: flatButtonStyle,
onPressed: () {
close();
},
child: Text(translate('Cancel')),
),
TextButton(
style: flatButtonStyle,
dialogButton('Cancel', onPressed: () {
close();
}, isOutline: true),
dialogButton(
'OK',
onPressed: () async {
setState(() {
idServerMsg = null;
@@ -361,7 +346,6 @@ void showServerSettingsWithValue(
isInProgress = false;
});
},
child: Text(translate('OK')),
),
],
);
@@ -512,17 +496,8 @@ void _showRequestElevationDialog(
title: Text(translate('Request Elevation')),
content: content,
actions: [
ElevatedButton(
style: ElevatedButton.styleFrom(elevation: 0),
onPressed: submit,
child: Text(translate('OK')),
),
OutlinedButton(
onPressed: () {
close();
},
child: Text(translate('Cancel')),
),
dialogButton('Cancel', onPressed: close, isOutline: true),
dialogButton('OK', onPressed: submit),
],
onSubmit: submit,
onCancel: close,
@@ -561,17 +536,10 @@ void showOnBlockDialog(
title: Text(translate(title)),
content: content,
actions: [
ElevatedButton(
style: ElevatedButton.styleFrom(elevation: 0),
onPressed: submit,
child: Text(translate('Request Elevation')),
),
OutlinedButton(
onPressed: () {
close();
},
child: Text(translate('Wait')),
),
dialogButton('Wait', onPressed: () {
close();
}, isOutline: true),
dialogButton('Request Elevation', onPressed: submit),
],
onSubmit: submit,
onCancel: close,
@@ -591,17 +559,10 @@ void showElevationError(String id, String type, String title, String text,
title: Text(translate(title)),
content: Text(translate(text)),
actions: [
ElevatedButton(
style: ElevatedButton.styleFrom(elevation: 0),
onPressed: submit,
child: Text(translate('Retry')),
),
OutlinedButton(
onPressed: () {
close();
},
child: Text(translate('Cancel')),
),
dialogButton('Cancel', onPressed: () {
close();
}, isOutline: true),
dialogButton('Retry', onPressed: submit),
],
onSubmit: submit,
onCancel: close,