From 4a516d8d296f0d32593c69c2b5ace4f0f14f7c08 Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Wed, 25 Aug 2021 18:12:49 +0200 Subject: [PATCH] Add msix, translate in french (wip) --- .../configuration_detail_screen.dart | 6 +-- lib/Screens/Main/components/body.dart | 4 +- lib/main.dart | 2 +- pubspec.lock | 49 ++++++++++++++++--- pubspec.yaml | 16 ++++++ 5 files changed, 64 insertions(+), 13 deletions(-) diff --git a/lib/Screens/Configurations/configuration_detail_screen.dart b/lib/Screens/Configurations/configuration_detail_screen.dart index 7e57b5c..06ece49 100644 --- a/lib/Screens/Configurations/configuration_detail_screen.dart +++ b/lib/Screens/Configurations/configuration_detail_screen.dart @@ -170,15 +170,15 @@ class _ConfigurationDetailScreenState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ - ColorPickerInputContainer( + /*ColorPickerInputContainer( label: "Couleur principal :", color: configurationDTO.primaryColor, onChanged: (value) { configurationDTO.primaryColor = value; }, - ), + ),*/ ColorPickerInputContainer( - label: "Couleur secondaire :", + label: "Couleur fond d'écran :", color: configurationDTO.secondaryColor, onChanged: (value) { configurationDTO.secondaryColor = value; diff --git a/lib/Screens/Main/components/body.dart b/lib/Screens/Main/components/body.dart index 7116f9c..80e29c7 100644 --- a/lib/Screens/Main/components/body.dart +++ b/lib/Screens/Main/components/body.dart @@ -28,9 +28,9 @@ class _BodyState extends State { int currentPosition = 0; var selectedElement; - MenuSection devices = new MenuSection(name: "Devices", type: "devices", order: 0); + MenuSection devices = new MenuSection(name: "Tablettes", type: "devices", order: 0); MenuSection configurations = new MenuSection(name: "Configurations", type: "configurations", order: 1); - MenuSection resources = new MenuSection(name: "Resources", type: "resources", order: 2); + MenuSection resources = new MenuSection(name: "Ressources", type: "resources", order: 2); Menu menu = new Menu(title: "Manager"); diff --git a/lib/main.dart b/lib/main.dart index 7be27dc..da45783 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -17,7 +17,7 @@ Future main() async { WidgetsFlutterBinding.ensureInitialized(); if (Platform.isWindows) { setWindowTitle("Manager"); - setWindowMinSize(Size(1100, 900)); + setWindowMinSize(Size(1250, 850)); setWindowMaxSize(Size(3840, 2160)); } diff --git a/pubspec.lock b/pubspec.lock index 0e60b01..6ed50e9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + ansicolor: + dependency: transitive + description: + name: ansicolor + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" args: dependency: transitive description: @@ -105,7 +112,7 @@ packages: name: dart_vlc_ffi url: "https://pub.dartlang.org" source: hosted - version: "0.0.8" + version: "0.0.9" drag_and_drop_lists: dependency: "direct main" description: @@ -119,7 +126,7 @@ packages: name: encrypt url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.0.1" fake_async: dependency: transitive description: @@ -154,7 +161,7 @@ packages: name: flare_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" flutter: dependency: "direct main" description: flutter @@ -191,6 +198,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" + injector: + dependency: transitive + description: + name: injector + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" intl: dependency: transitive description: @@ -233,6 +247,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.0" + msix: + dependency: "direct main" + description: + name: msix + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" multiselect_formfield: dependency: "direct main" description: @@ -247,6 +268,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" path: dependency: transitive description: @@ -302,7 +330,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.2" plugin_platform_interface: dependency: transitive description: @@ -316,7 +344,7 @@ packages: name: pointycastle url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.3.1" process: dependency: transitive description: @@ -405,7 +433,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.1.12" + version: "2.1.14" video_player_platform_interface: dependency: transitive description: @@ -419,7 +447,7 @@ packages: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" win32: dependency: transitive description: @@ -443,6 +471,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.0" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index fb22ec9..4794749 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ dependencies: drag_and_drop_lists: ^0.3.2 path_provider: ^2.0.2 encrypt: ^5.0.0 + msix: ^2.1.3 window_size: git: url: git://github.com/google/flutter-desktop-embedding.git @@ -72,6 +73,21 @@ flutter: - assets/animations/ - assets/files/ +msix_config: + display_name: Manager + publisher_name: Manager-App + identity_name: Unov.Manager + msix_version: 1.0.0.0 + certificate_path: C:/Users/Thomas Fransolet/AppData/Local/Pub/Cache/hosted/pub.dartlang.org/msix-2.1.3/lib/assets/test_certificate.pfx + certificate_password: 1234 + certificate_subject: CN=Unov + logo_path: C:\Users\Thomas Fransolet\Downloads\download.png + start_menu_icon_path: C:\Users\Thomas Fransolet\Downloads\download.png + tile_icon_path: C:\Users\Thomas Fransolet\Downloads\download.png + icons_background_color: ffffff + architecture: x64 + capabilities: 'internetClient' + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.