Merge pull request #264 from bostrot/upgrade-packages

Upgrade packages
bostrot · Nov 11, 2024 · de60697 · de60697
2 parents 16f6ef0 + dae7af6
commit de60697
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 169 deletions.
diff --git a/.github/workflows/publisher.yml b/.github/workflows/publisher.yml
@@ -7,7 +7,7 @@ on:
         description: Empty for latest tag or specify a tag to publish
         type: string
   release:
-    types: [published]
+    types: [created]
 
 jobs:
   # Publish to Microsoft Store

diff --git a/lib/api/wsl.dart b/lib/api/wsl.dart
@@ -75,7 +75,8 @@ class WSLApi {
       {String startPath = '',
       String startUser = '',
       String startCmd = ''}) async {
-    List<String> args = ['wsl', '-d', distribution];
+    List<String> args = [];
+    args.addAll(['wsl', '-d', distribution]);
     if (startPath != '') {
       args.addAll(['--cd', startPath]);
     }
@@ -91,7 +92,6 @@ class WSLApi {
     }
     await Process.start('start', args,
         mode: ProcessStartMode.detached, runInShell: true);
-
     if (kDebugMode) {
       print("Done starting $distribution");
     }
@@ -201,12 +201,15 @@ class WSLApi {
         mode: ProcessStartMode.normal, runInShell: true);
   }
 
-  /// Start Windows Terminal\
-  /// *(falls back to PowerShell on exception)*
+  /// Start Windows Terminal or PowerShell
   void startWindowsTerminal(String distribution) async {
     List<String> launchWslHome = ['wsl', '-d', distribution, '--cd', '~'];
     try {
-      await Process.start('wt', launchWslHome);
+      // Run windows terminal in same window wt -w 0 nt
+      var args = ['wt', '-w', '0', 'nt'];
+      args.addAll(launchWslHome);
+
+      await Process.run('start', args);
     } catch (_) {
       // Windows Terminal not installed
       Notify.message('openwithwt-not-found-error'.i18n());

diff --git a/lib/components/list_item.dart b/lib/components/list_item.dart
@@ -210,19 +210,6 @@ class Bar extends StatelessWidget {
                   ),
                 ),
               ),
-              Tooltip(
-                message: 'openwithwt-text'.i18n(),
-                child: MouseRegion(
-                  cursor: SystemMouseCursors.click,
-                  child: IconButton(
-                    icon: const Icon(FluentIcons.power_shell, size: 16.0),
-                    onPressed: () {
-                      plausible.event(name: "wsl_wt");
-                      WSLApi().startWindowsTerminal(widget.item);
-                    },
-                  ),
-                ),
-              ),
               Tooltip(
                 message: 'openwithvscode-text'.i18n(),
                 child: MouseRegion(

diff --git a/lib/nav/panelist.dart b/lib/nav/panelist.dart
@@ -14,7 +14,9 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('homepage-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/') router.pushNamed('home');
+      if (router.routerDelegate.currentConfiguration.uri.toString() != '/') {
+        router.pushNamed('home');
+      }
     },
   ),
   PaneItem(
@@ -23,7 +25,8 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('managequickactions-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/quickactions') {
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/quickactions') {
         router.pushNamed('quickactions');
       }
     },
@@ -34,7 +37,8 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('templates-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/templates') {
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/templates') {
         router.pushNamed('templates');
       }
     },
@@ -63,7 +67,8 @@ final List<NavigationPaneItem> footerItems = [
     title: Text('settings-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/settings') router.pushNamed('settings');
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/settings') router.pushNamed('settings');
     },
   ),
   LinkPaneItemAction(

diff --git a/lib/nav/root_screen.dart b/lib/nav/root_screen.dart
@@ -105,7 +105,7 @@ class RootPageState extends State<RootPage> with WindowListener {
   }
 
   int _calculateSelectedIndex(BuildContext context) {
-    final location = router.location;
+    final location = router.routerDelegate.currentConfiguration.uri.toString();
     int indexOriginal = originalItems
         .toList()
         .indexWhere((element) => element.key == Key(location));