Merge pull request #1262 from RedBlackAka/master

 Remove restart notes from preferences where it doesn't apply and installer improvements

Author: stakira

OpenUtau.nsi

@@ -62,9 +62,7 @@ SectionEnd
 
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateDirectory "$SMPROGRAMS\OpenUtau"
-  CreateShortCut "$SMPROGRAMS\OpenUtau\OpenUtau.lnk" "$INSTDIR\OpenUtau.exe"
-  CreateShortCut "$SMPROGRAMS\OpenUtau\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\OpenUtau.lnk" "$INSTDIR\OpenUtau.exe"
 SectionEnd
 
 Section -Post
@@ -76,6 +74,7 @@ Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\OpenUtau.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -109,7 +108,7 @@ Section Uninstall
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\*"
 
-  Delete "$SMPROGRAMS\OpenUtau\Uninstall.lnk"
+  Delete "$SMPROGRAMS\OpenUtau.lnk"
 
   DeleteRegKey HKCR ".ustx"
   DeleteRegKey HKCR "OpenUtauFile\DefaultIcon"
@@ -118,7 +117,6 @@ Section Uninstall
   DeleteRegKey HKCR "OpenUtauFile\shell"
   DeleteRegKey HKCR "OpenUtauFile"
 
-  RMDir "$SMPROGRAMS\OpenUtau"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

OpenUtau/Views/PreferencesDialog.axaml

@@ -167,7 +167,6 @@
                 </DataTemplate>
               </ComboBox.ItemTemplate>
             </ComboBox>
-            <TextBlock Classes="restart"/>
             <TextBlock Text="{DynamicResource prefs.appearance.sortorder}" Margin="0,10,0,0"/>
             <ComboBox ItemsSource="{Binding SortingOrders}" SelectedItem="{Binding SortingOrder}">
               <ComboBox.ItemTemplate>
@@ -176,13 +175,11 @@
                 </DataTemplate>
               </ComboBox.ItemTemplate>
             </ComboBox>
-            <TextBlock Classes="restart"/>
             <TextBlock Text="{DynamicResource prefs.appearance.theme}" Margin="0,10,0,0"/>
             <ComboBox SelectedIndex="{Binding Theme}">
               <ComboBoxItem Content="{DynamicResource prefs.appearance.theme.light}"/>
               <ComboBoxItem Content="{DynamicResource prefs.appearance.theme.dark}"/>
             </ComboBox>
-            <TextBlock Classes="restart"/>
             <TextBlock Text="{DynamicResource prefs.appearance.degree}" Margin="0,10,0,0"/>
             <ComboBox SelectedIndex="{Binding DegreeStyle}">
               <ComboBoxItem Content="{DynamicResource prefs.appearance.degree.off}"/>
@@ -193,7 +190,6 @@
               <TextBlock Text="{DynamicResource prefs.appearance.trackcolor}" HorizontalAlignment="Left"/>
               <ToggleSwitch IsChecked="{Binding UseTrackColor}"/>
             </Grid>
-            <TextBlock Classes="restart"/>
             <Grid Margin="0,5,0,0">
               <TextBlock Text="{DynamicResource prefs.appearance.showportrait}" HorizontalAlignment="Left"/>
               <ToggleSwitch IsChecked="{Binding ShowPortrait}"/>