add button: modify editors.json to make hub think this unity version was installed from Hub

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -1015,14 +1015,14 @@
                             </DataGrid>
 
                             <StackPanel Grid.Column="1" Orientation="Vertical">
-                            <DataGrid  x:Name="gridBuildReportData"  SelectionMode="Single" CanUserAddRows="False" Margin="4,0,2,0" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" VerticalAlignment="Top" PreviewMouseDoubleClick="GridBuildReport_PreviewMouseDoubleClick" HorizontalContentAlignment="Stretch">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Header="Type" Binding="{Binding Category}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
-                                    <DataGridTextColumn Header="Size" Binding="{Binding Size}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
-                                    <DataGridTextColumn Header="%" Binding="{Binding Percentage}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
-                                </DataGrid.Columns>
-                                <local:BuildReportItem Category="Texture" Size="10.0 mb" Percentage="50.0%" />
-                            </DataGrid>
+                                <DataGrid  x:Name="gridBuildReportData"  SelectionMode="Single" CanUserAddRows="False" Margin="4,0,2,0" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" AutoGenerateColumns="False" VerticalAlignment="Top" PreviewMouseDoubleClick="GridBuildReport_PreviewMouseDoubleClick" HorizontalContentAlignment="Stretch">
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Header="Type" Binding="{Binding Category}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
+                                        <DataGridTextColumn Header="Size" Binding="{Binding Size}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
+                                        <DataGridTextColumn Header="%" Binding="{Binding Percentage}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
+                                    </DataGrid.Columns>
+                                    <local:BuildReportItem Category="Texture" Size="10.0 mb" Percentage="50.0%" />
+                                </DataGrid>
                                 <Label Content="Elapsed time:" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
                                 <TextBox CaretBrush="#FFE2E2E2" x:Name="txtBuildTime" Background="{DynamicResource ThemeTextBoxBackground}" BorderBrush="{x:Null}" Foreground="#FFC7C7C7" SelectionBrush="#FF003966" BorderThickness="0" UndoLimit="64" IsReadOnly="True" VerticalAlignment="Top" HorizontalAlignment="Stretch" Margin="4,0,4,0" />
                             </StackPanel>
@@ -1051,7 +1051,7 @@
                     </Grid.RowDefinitions>
 
                     <!-- top labels -->
-                    <Label Grid.Row="0" Content="Unity Installation Parent Folders" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" VerticalAlignment="Bottom" ToolTip="Search will try to find Unity installations under these folders"/>
+                    <Label Grid.Row="0" Content="Unity Installation(s) Parent Folder(s)" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Left" VerticalAlignment="Bottom" ToolTip="Search will try to find Unity installations under these folders"/>
                     <Label x:Name="lblFoundXInstallations" Grid.Row="0" Content="Found .. Installations" Foreground="{DynamicResource ThemeButtonForeground}" HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
                     <!-- locations list -->
                     <ListBox x:Name="lstRootFolders" Grid.Row="1" Background="{DynamicResource ThemeButtonBackground}" Margin="4,0,2,0" Foreground="{DynamicResource ThemeButtonForeground}" >
@@ -1147,6 +1147,10 @@
                                 <Button Style="{StaticResource CustomButton}" ToolTip="Explore Scripts folder" x:Name="btnExploreScriptsFolder" Content="..." Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="btnExploreScriptsFolder_Click" Margin="5,0,0,0"/>
                             </StackPanel>
 
+                            <Button  x:Name="btnPatchHubConfig" ToolTip="Modifies json file to set 'manual:true' values into 'false', so that can add modules using Hub. NOTE: This cannot be reversed (not keeping track which values was already 'false')" Style="{StaticResource CustomButton}" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top"  Click="btnPatchHubConfig_Click">
+                                <Label Content="Patch Hub editors.json" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
+                            </Button>
+
                         </StackPanel>
                     </StackPanel>
 

UnityLauncherPro/MainWindow.xaml.cs

@@ -582,7 +582,7 @@ async Task CallGetUnityUpdates()
             dataGridUpdates.ItemsSource = null;
             var task = GetUnityUpdates.Scan();
             var items = await task;
-            Console.WriteLine("CallGetUnityUpdates=" + items == null);
+            //Console.WriteLine("CallGetUnityUpdates=" + items == null);
             if (items == null) return;
             updatesSource = GetUnityUpdates.Parse(items);
             if (updatesSource == null) return;
@@ -1159,8 +1159,13 @@ private void BtnOpenEditorLogsFolder_Click(object sender, RoutedEventArgs e)
                 if (Tools.LaunchExplorer(logfolder) == false)
                 {
                     Console.WriteLine("Cannot open folder.." + logfolder);
+                    SetStatus("Cannot open folder: " + logfolder);
                 }
             }
+            else
+            {
+                SetStatus("Folder does not exist: " + logfolder);
+            }
         }
 
         private void BtnOpenPlayerLogs_Click(object sender, RoutedEventArgs e)
@@ -1170,7 +1175,11 @@ private void BtnOpenPlayerLogs_Click(object sender, RoutedEventArgs e)
 
         private void BtnOpenADBLogCat_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(adbLogCatArgs)) return;
+            if (string.IsNullOrEmpty(adbLogCatArgs))
+            {
+                SetStatus("ADB logcat args not set in Settings tab");
+                return;
+            }
 
             try
             {
@@ -1184,6 +1193,7 @@ private void BtnOpenADBLogCat_Click(object sender, RoutedEventArgs e)
             catch (Exception ex)
             {
                 Console.WriteLine(ex);
+                SetStatus("Cannot launch ADB logcat..");
             }
         }
 
@@ -1261,6 +1271,7 @@ private void BtnDonwloadInBrowser_Click(object sender, RoutedEventArgs e)
             else
             {
                 Console.WriteLine("Failed getting Unity Installer URL for " + unity?.Version);
+                SetStatus("Failed getting Unity Installer URL for " + unity?.Version);
             }
         }
 
@@ -1461,6 +1472,7 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
                 catch (Exception ex)
                 {
                     Console.WriteLine("Error saving launcher arguments: " + ex);
+                    SetStatus("Error saving launcher arguments: " + ex.Message);
                 }
             }
             else if (e.Column.DisplayIndex == 6) // platform dropdown
@@ -1640,6 +1652,7 @@ void CreateNewEmptyProject(string targetFolder = null)
                 if (string.IsNullOrEmpty(newVersion))
                 {
                     Console.WriteLine("Missing selected unity version");
+                    SetStatus("Missing selected unity version (its null)");
                     return;
                 }
 
@@ -1968,6 +1981,7 @@ void RefreshBuildReports()
                                 if (space1 == -1 || space2 == -1)
                                 {
                                     Console.WriteLine(("Failed to parse build report row: " + line2));
+                                    SetStatus("Failed to parse build report row: " + line2);
                                     continue;
                                 }
 
@@ -2000,6 +2014,7 @@ void RefreshBuildReports()
                                 if (space1 == -1 || space2 == -1)
                                 {
                                     Console.WriteLine(("(2) Failed to parse build report row: " + line2));
+                                    SetStatus("(2) Failed to parse build report row: " + line2);
                                     continue;
                                 }
 
@@ -2026,6 +2041,7 @@ void RefreshBuildReports()
                 txtBuildTime.Text = "";
 
                 Console.WriteLine("Failed to open editor log or other error in parsing: " + logFile);
+                SetStatus("Failed to open editor log or other error in parsing: " + logFile);
                 return;
             }
 
@@ -2041,6 +2057,7 @@ void RefreshBuildReports()
                 txtBuildTime.Text = "";
 
                 Console.WriteLine("Failed to parse Editor.Log (probably no build reports there)");
+                SetStatus("Failed to parse Editor.Log (probably no build reports there)");
                 return;
             }
 
@@ -2183,13 +2200,15 @@ void ApplyTheme(string themeFile)
                     catch (Exception e)
                     {
                         Console.WriteLine(e);
+                        SetStatus("Failed to parse color value: " + row[1]);
                     }
 
                 }
             }
             else
             {
                 Console.WriteLine("Theme file not found: " + themeFile);
+                SetStatus("Theme file not found: " + themeFile);
             }
         }
 
@@ -2339,7 +2358,7 @@ void ValidateCustomDateFormat(string format)
 
         void ValidateFolderFromTextbox(TextBox textBox)
         {
-            Console.WriteLine(textBox.Text);
+            //Console.WriteLine(textBox.Text);
             if (Directory.Exists(textBox.Text) == true)
             {
                 Properties.Settings.Default.shortcutBatchFileFolder = textBox.Text;
@@ -2627,6 +2646,7 @@ private void MenuCreateDesktopShortCut_Click(object sender, RoutedEventArgs e)
             if (res == false)
             {
                 Console.WriteLine("Failed to create shortcut, maybe batch folder location is invalid..");
+                SetStatus("Failed to create shortcut, maybe batch folder location is invalid: " + txtShortcutBatchFileFolder.Text);
             }
         }
 
@@ -2797,6 +2817,39 @@ private void Window_MouseDown(object sender, MouseButtonEventArgs e)
             gridSettingsBg.Focus();
         }
 
+        void SetStatus(string msg)
+        {
+            txtStatus.Text = msg;
+        }
+
+        private void btnPatchHubConfig_Click(object sender, RoutedEventArgs e)
+        {
+            // read the config file from %APPDATA%
+            var configFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "UnityHub", "editors.json");
+
+            var result = MessageBox.Show("This will modify current " + configFile + " file. Are you sure you want to continue? (This cannot be undone, we dont know which 'manual:'-value was already set to 'false' (but it shouldnt break anything)", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+            if (result == MessageBoxResult.Yes)
+            {
+                if (File.Exists(configFile) == true)
+                {
+                    // read the config file
+                    var json = File.ReadAllText(configFile);
+                    // replace the manual:true with manual:false using regex
+                    json = json.Replace("\"manual\":true", "\"manual\":false");
+
+                    Console.WriteLine(json);
+
+                    // write the config file
+                    File.WriteAllText(configFile, json);
+                    SetStatus("editors.json file saved");
+                }
+            }
+            else
+            {
+                SetStatus("Cancelled");
+            }
+        }
+
         //private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
         //{
         //    var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");