Merge pull request #451 from ionite34/downmerge

Downmerge

CHANGELOG.md

@@ -43,6 +43,17 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added image and model details in model selection boxes
 - Added CLIP Skip setting, toggleable from the model settings button
 
+## v2.7.7
+### Added
+- Added `--use-directml` launch argument for SDWebUI DirectML fork
+### Changed
+- Model Browser downloads will no longer be disabled if the free drive space is unavailable
+- Default Linux installation folder changed to prevent issues with hidden folders
+- Changed default Period to "AllTime" in the Model Browser
+### Fixed
+- Fixed error where Environment Variables were not editable
+- Fixed SDTurboScheduler's missing denoise parameter
+
 ## v2.7.6
 ### Added
 - Added SDXL Turbo and Stable Video Diffusion to the Hugging Face tab

StabilityMatrix.Avalonia/Languages/Resources.tr-TR.resx

@@ -133,7 +133,7 @@
     <value>Dil</value>
   </data>
   <data name="Text_RelaunchRequiredToApplyLanguage" xml:space="preserve">
-    <value>Yeni dil seçeneğinin etkili olması için yeniden başlatma gerekiyor</value>
+    <value>Yeni dil seçeneğinin etkili olması için yeniden başlatma gerekir.</value>
   </data>
   <data name="Action_Relaunch" xml:space="preserve">
     <value>Yeniden başlat</value>
@@ -166,7 +166,7 @@
     <value>Dallar</value>
   </data>
   <data name="Label_DragAndDropCheckpointsHereToImport" xml:space="preserve">
-    <value>İçe aktarmak için chekpoints&apos;leri buraya sürükleyip bırakın</value>
+    <value>İçe aktarmak için chekpoints&apos;leri buraya sürükleyip bırakın.</value>
   </data>
   <data name="Label_Emphasis" xml:space="preserve">
     <value>Vurgu</value>
@@ -235,7 +235,7 @@
     <value>Sponsor Ol</value>
   </data>
   <data name="Label_JoinDiscord" xml:space="preserve">
-    <value>Discord Sunucusuna Katıl</value>
+    <value>Discord Sunucumuza Katıl</value>
   </data>
   <data name="Label_Downloads" xml:space="preserve">
     <value>İndirmeler</value>
@@ -313,22 +313,22 @@
     <value>Tüm Sürümler</value>
   </data>
   <data name="Label_ModelSearchWatermark" xml:space="preserve">
-    <value>Modelleri, #etiketleri veya @kullanıcıları ara</value>
+    <value>Modelleri,Tagları (#tag) veya Kullanıcıları (@user) Buradan Arayabilirsin</value>
   </data>
   <data name="Action_Search" xml:space="preserve">
     <value>Ara</value>
   </data>
   <data name="Label_Sort" xml:space="preserve">
-    <value>Sırala</value>
+    <value>Sıralama Tipi</value>
   </data>
   <data name="Label_TimePeriod" xml:space="preserve">
-    <value>Süre</value>
+    <value>Sıralama Tarihi</value>
   </data>
   <data name="Label_ModelType" xml:space="preserve">
     <value>Model Türü</value>
   </data>
   <data name="Label_BaseModel" xml:space="preserve">
-    <value>Temel Model</value>
+    <value>Model Altyapısı</value>
   </data>
   <data name="Label_ShowNsfwContent" xml:space="preserve">
     <value>NSFW İçerik Göster</value>
@@ -376,10 +376,10 @@
     <value>Klasör</value>
   </data>
   <data name="Label_DropFileToImport" xml:space="preserve">
-    <value>İçe aktarma için dosyayı buraya bırakın</value>
+    <value>Dosyayı içeri aktarmak için lütfen sürükleyip işaretlenen alana bırakın.</value>
   </data>
   <data name="Label_ImportAsConnected" xml:space="preserve">
-    <value>Metadata ile içeri aktar</value>
+    <value>Dosyaları metadata ile içeri aktar</value>
   </data>
   <data name="Label_ImportAsConnectedExplanation" xml:space="preserve">
     <value>Yeni yerel içe aktarmalar için bağlı meta veri arayın</value>
@@ -448,7 +448,7 @@
     <value>Entegrasyonlar</value>
   </data>
   <data name="Label_DiscordRichPresence" xml:space="preserve">
-    <value>Discord Zengin Varlık</value>
+    <value>Discord Etkinliğini StabilityMatrix Olarak Göster.</value>
   </data>
   <data name="Label_System" xml:space="preserve">
     <value>Sistem</value>
@@ -469,10 +469,10 @@
     <value>Tüm Kullanıcılar İçin Ekle</value>
   </data>
   <data name="Label_SelectNewDataDirectory" xml:space="preserve">
-    <value>Yeni Veri Dizini Seç</value>
+    <value>Yeni Dosya Dizinini Seç</value>
   </data>
   <data name="Label_SelectNewDataDirectory_Details" xml:space="preserve">
-    <value>Mevcut veriyi taşımaz</value>
+    <value>Bu işlem mevcut veriyi yeni dizine taşımaz.</value>
   </data>
   <data name="Action_SelectDirectory" xml:space="preserve">
     <value>Dizin Seçin</value>
@@ -490,7 +490,7 @@
     <value>Başlamak için Başlat&apos;a tıklayın!</value>
   </data>
   <data name="Action_Stop" xml:space="preserve">
-    <value>Dur</value>
+    <value>Durdur</value>
   </data>
   <data name="Action_SendInput" xml:space="preserve">
     <value>Giriş Gönder</value>
@@ -694,10 +694,10 @@
     <value>{0} resim seçildi</value>
   </data>
   <data name="Label_OutputFolder" xml:space="preserve">
-    <value>Çıkış Klasörü</value>
+    <value>Çıktı Klasörü</value>
   </data>
   <data name="Label_OutputType" xml:space="preserve">
-    <value>Çıkış Türü</value>
+    <value>Çıktı Türü</value>
   </data>
   <data name="Action_ClearSelection" xml:space="preserve">
     <value>Seçimi Temizle</value>
@@ -721,7 +721,7 @@
     <value>Upscale</value>
   </data>
   <data name="Label_OutputsPageTitle" xml:space="preserve">
-    <value>Çıkış Tarayıcısı</value>
+    <value>Medya Kitaplığı</value>
   </data>
   <data name="Label_OneImageSelected" xml:space="preserve">
     <value>1 resim seçildi</value>

StabilityMatrix.Avalonia/ViewModels/Dialogs/SelectDataDirectoryViewModel.cs

@@ -24,13 +24,19 @@ namespace StabilityMatrix.Avalonia.ViewModels.Dialogs;
 public partial class SelectDataDirectoryViewModel : ContentDialogViewModelBase
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-    public static string DefaultInstallLocation => Compat.AppDataHome;
+
+    public static string DefaultInstallLocation =>
+        Compat.IsLinux
+            ? Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                "StabilityMatrix"
+            )
+            : Compat.AppDataHome;
 
     private readonly ISettingsManager settingsManager;
 
     private const string ValidExistingDirectoryText = "Valid existing data directory found";
-    private const string InvalidDirectoryText =
-        "Directory must be empty or have a valid settings.json file";
+    private const string InvalidDirectoryText = "Directory must be empty or have a valid settings.json file";
     private const string NotEnoughFreeSpaceText = "Not enough free space on the selected drive";
     private const string FatWarningText = "FAT32 / exFAT drives are not supported at this time";
 
@@ -38,7 +44,7 @@ public partial class SelectDataDirectoryViewModel : ContentDialogViewModelBase
     private string dataDirectory = DefaultInstallLocation;
 
     [ObservableProperty]
-    private bool isPortableMode;
+    private bool isPortableMode = Compat.IsLinux;
 
     [ObservableProperty]
     private string directoryStatusText = string.Empty;

StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs

@@ -31,9 +31,10 @@ public class StableDiffusionDirectMl(
     public override string LaunchCommand => "launch.py";
     public override Uri PreviewImageUri =>
         new("https://github.com/lshqqytiger/stable-diffusion-webui-directml/raw/master/screenshot.png");
-
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
 
+    public override TorchVersion GetRecommendedTorchVersion() => TorchVersion.DirectMl;
+
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;
 
     public override List<LaunchOptionDefinition> LaunchOptions
@@ -59,8 +60,6 @@ public class StableDiffusionDirectMl(
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.DirectMl };
 
-    public override TorchVersion GetRecommendedTorchVersion() => TorchVersion.DirectMl;
-
     public override bool ShouldIgnoreReleases => true;
 
     public override async Task InstallPackage(