Browse Source

Remove code references to having a flatpak version

Evan Husted 1 year ago
parent
commit
f898a5ecf4

+ 0 - 3
src/Ryujinx.Common/ReleaseInformation.cs

@@ -6,7 +6,6 @@ namespace Ryujinx.Common
     // DO NOT EDIT, filled by CI
     public static class ReleaseInformation
     {
-        private const string FlatHubChannel = "flathub";
         private const string CanaryChannel = "canary";
         private const string ReleaseChannel = "release";
 
@@ -29,8 +28,6 @@ namespace Ryujinx.Common
             !ReleaseChannelRepo.StartsWith("%%") &&
             !ConfigFileName.StartsWith("%%");
 
-        public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannel);
-
         public static bool IsCanaryBuild => IsValid && ReleaseChannelName.Equals(CanaryChannel);
         
         public static bool IsReleaseBuild => IsValid && ReleaseChannelName.Equals(ReleaseChannel);

+ 1 - 1
src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.UI.Common.Helper
         [LibraryImport("shell32.dll", SetLastError = true)]
         public static partial void SHChangeNotify(uint wEventId, uint uFlags, nint dwItem1, nint dwItem2);
 
-        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows()) && !ReleaseInformation.IsFlatHubBuild;
+        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows());
         
         public static bool AreMimeTypesRegistered
         {

+ 0 - 24
src/Ryujinx/Assets/locales.json

@@ -16173,30 +16173,6 @@
         "zh_TW": "CPU 模式"
       }
     },
-    {
-      "ID": "DialogUpdaterFlatpakNotSupportedMessage",
-      "Translations": {
-        "ar_SA": "الرجاء تحديث ريوجينكس عبر فلات هاب.",
-        "de_DE": "Bitte aktualisiere Ryujinx über FlatHub",
-        "el_GR": "Παρακαλούμε ενημερώστε το Ryujinx μέσω FlatHub.",
-        "en_US": "Please update Ryujinx via FlatHub.",
-        "es_ES": "Por favor, actualiza Ryujinx a través de FlatHub.",
-        "fr_FR": "Merci de mettre à jour Ryujinx via FlatHub.",
-        "he_IL": "בבקשה עדכן את ריוג'ינקס דרך פלאטהב.",
-        "it_IT": "Aggiorna Ryujinx tramite FlatHub.",
-        "ja_JP": "FlatHub を使用して Ryujinx をアップデートしてください.",
-        "ko_KR": "FlatHub를 통해 Ryujinx를 업데이트하세요.",
-        "no_NO": "Vennligst oppdater Ryujinx via FlatHub.",
-        "pl_PL": "Zaktualizuj Ryujinx przez FlatHub.",
-        "pt_BR": "Por favor, atualize o Ryujinx pelo FlatHub.",
-        "ru_RU": "Пожалуйста, обновите Ryujinx через FlatHub.",
-        "th_TH": "โปรดอัปเดต Ryujinx ผ่านช่องทาง FlatHub",
-        "tr_TR": "Lütfen Ryujinx'i FlatHub aracılığıyla güncelleyin.",
-        "uk_UA": "",
-        "zh_CN": "请通过 FlatHub 更新 Ryujinx 模拟器。",
-        "zh_TW": "請透過 Flathub 更新 Ryujinx。"
-      }
-    },
     {
       "ID": "UpdaterDisabledWarningTitle",
       "Translations": {

+ 0 - 1
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -17,7 +17,6 @@
     <MenuItem
         Click="CreateApplicationShortcut_Click"
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
-        IsEnabled="{Binding CreateShortcutEnabled}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />

+ 0 - 2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -424,8 +424,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
-        public bool CreateShortcutEnabled => !ReleaseInformation.IsFlatHubBuild;
-
         public string LoadHeading
         {
             get => _loadHeading;

+ 4 - 15
src/Ryujinx/Updater.cs

@@ -686,22 +686,11 @@ namespace Ryujinx.Ava
 #else
             if (showWarnings)
             {
-                if (ReleaseInformation.IsFlatHubBuild)
-                {
-                    Dispatcher.UIThread.InvokeAsync(() =>
-                        ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterFlatpakNotSupportedMessage])
-                    );
-                }
-                else
-                {
-                    Dispatcher.UIThread.InvokeAsync(() =>
-                        ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
+                Dispatcher.UIThread.InvokeAsync(() =>
+                    ContentDialogHelper.CreateWarningDialog(
+                        LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
+                        LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
                     );
-                }
             }
 
             return false;