Skip to content

Commit ebbd1da

Browse files
committed
Use direct binding to set auto-startup
Also includes better messaging (single message for registry failure)
1 parent c557031 commit ebbd1da

26 files changed

+25
-89
lines changed

Flow.Launcher/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void AutoStartup()
119119
// but if it fails (permissions, etc) then don't keep retrying
120120
// this also gives the user a visual indication in the Settings widget
121121
_settings.StartFlowLauncherOnSystemStartup = false;
122-
Notification.Show(InternationalizationManager.Instance.GetTranslation("registerAutoStartFailed"), e.Message);
122+
Notification.Show(InternationalizationManager.Instance.GetTranslation("setAutoStartFailed"), e.Message);
123123
}
124124
}
125125
}

Flow.Launcher/Languages/da.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Portable Mode</system:String>
2929
<system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher ved system start</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">Vis ikke notifikationer om nye versioner</system:String>
3533
<system:String x:Key="rememberLastLocation">Husk seneste position</system:String>

Flow.Launcher/Languages/de.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Portabler Modus</system:String>
2929
<system:String x:Key="portableModeToolTIp">Speichern Sie alle Einstellungen und Benutzerdaten in einem Ordner (nützlich bei Verwendung mit Wechseldatenträgern oder Clouddiensten).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Starte Flow Launcher bei Systemstart</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Verstecke Flow Launcher wenn der Fokus verloren geht</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">Zeige keine Nachricht wenn eine neue Version vorhanden ist</system:String>
3533
<system:String x:Key="rememberLastLocation">Merke letzte Ausführungsposition</system:String>

Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
<system:String x:Key="portableMode">Portable Mode</system:String>
3131
<system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
3232
<system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
33-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
34-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
33+
<system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
3534
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
3635
<system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
3736
<system:String x:Key="rememberLastLocation">Remember last launch location</system:String>

Flow.Launcher/Languages/es-419.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Modo portable</system:String>
2929
<system:String x:Key="portableModeToolTIp">Almacena todos los ajustes y datos de usuario en una sola carpeta (útil cuando se utiliza con unidades extraíbles o servicios en la nube).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Iniciar Flow Launcher al arrancar el sistema</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Ocultar Flow Launcher cuando se pierde el enfoque</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">No mostrar notificaciones de nuevas versiones</system:String>
3533
<system:String x:Key="rememberLastLocation">Recordar última ubicación de inicio</system:String>

Flow.Launcher/Languages/es.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Modo Portable</system:String>
2929
<system:String x:Key="portableModeToolTIp">Guarda toda la configuración y datos de usuario en una carpeta (Útil cuando se utiliza con unidades extraíbles o servicios en la nube).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Cargar Flow Launcher al iniciar el sistema</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Ocultar Flow Launcher cuando se pierda el foco</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">No mostrar notificaciones de nuevas versiones</system:String>
3533
<system:String x:Key="rememberLastLocation">Recordar última posición de Flow Launcher</system:String>

Flow.Launcher/Languages/fr.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Mode Portable</system:String>
2929
<system:String x:Key="portableModeToolTIp">Stocker tous les paramètres et données utilisateur dans un seul dossier (Pratique en cas d'utilisation de disques amovibles ou de services cloud).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Lancer Flow Launcher au démarrage du système</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Cacher Flow Launcher lors de la perte de focus</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">Ne pas afficher les notifications lors d'une nouvelle version</system:String>
3533
<system:String x:Key="rememberLastLocation">Se souvenir du dernier emplacement de la fenêtre</system:String>

Flow.Launcher/Languages/it.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Portable Mode</system:String>
2929
<system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">Avvia Wow all'avvio di Windows</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Nascondi Flow Launcher quando perde il focus</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">Non mostrare le notifiche per una nuova versione</system:String>
3533
<system:String x:Key="rememberLastLocation">Ricorda l'ultima posizione di avvio del launcher</system:String>

Flow.Launcher/Languages/ja.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">Portable Mode</system:String>
2929
<system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">スタートアップ時にFlow Launcherを起動する</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">フォーカスを失った時にFlow Launcherを隠す</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">最新版が入手可能であっても、アップグレードメッセージを表示しない</system:String>
3533
<system:String x:Key="rememberLastLocation">前回のランチャーの位置を記憶</system:String>

Flow.Launcher/Languages/ko.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<system:String x:Key="portableMode">포터블 모드</system:String>
2929
<system:String x:Key="portableModeToolTIp">모든 설정이 폴더안에 들어갑니다. USB 드라이브나 클라우드로 사용 가능합니다.</system:String>
3030
<system:String x:Key="startFlowLauncherOnSystemStartup">시스템 시작 시 Flow Launcher 실행</system:String>
31-
<system:String x:Key="registerAutoStartFailed">Error enabling launch on startup</system:String>
32-
<system:String x:Key="deregisterAutoStartFailed">Error disabling launch on startup</system:String>
3331
<system:String x:Key="hideFlowLauncherWhenLoseFocus">포커스 잃으면 Flow Launcher 숨김</system:String>
3432
<system:String x:Key="dontPromptUpdateMsg">새 버전 알림 끄기</system:String>
3533
<system:String x:Key="rememberLastLocation">마지막 실행 위치 기억</system:String>

0 commit comments

Comments
 (0)