diff --git a/External/SimpleUI b/External/SimpleUI index 60614de..4fa9094 160000 --- a/External/SimpleUI +++ b/External/SimpleUI @@ -1 +1 @@ -Subproject commit 60614ded85c411484c0b4b6cade2738be50df496 +Subproject commit 4fa90941c5b44d3a1b439aedb80b43214fe26392 diff --git a/Playstation/OrbisLibAPI/Version.h b/Playstation/OrbisLibAPI/Version.h index 5ef05b4..301acba 100644 --- a/Playstation/OrbisLibAPI/Version.h +++ b/Playstation/OrbisLibAPI/Version.h @@ -1,11 +1,11 @@ -#pragma once -#define ORBISLIB_MAJOR 3 -#define ORBISLIB_MINOR 0 -#define ORBISLIB_BUILDVERSION 715 -#define stringify(a) stringify_(a) -#define stringify_(a) #a -#if defined(_DEBUG) -#define ORBISLIB_BUILDSTRING ("[OrbisLib Daemon " stringify(ORBISLIB_MAJOR) "." stringify(ORBISLIB_MINOR) "] Dev Build " stringify(ORBISLIB_BUILDVERSION) " " __DATE__ " " __TIME__) -#else -#define ORBISLIB_BUILDSTRING ("[OrbisLib Daemon " stringify(ORBISLIB_MAJOR) "." stringify(ORBISLIB_MINOR) "] Build " stringify(ORBISLIB_BUILDVERSION) " " __DATE__ " " __TIME__) -#endif +#pragma once +#define ORBISLIB_MAJOR 3 +#define ORBISLIB_MINOR 0 +#define ORBISLIB_BUILDVERSION 717 +#define stringify(a) stringify_(a) +#define stringify_(a) #a +#if defined(_DEBUG) +#define ORBISLIB_BUILDSTRING ("[OrbisLib Daemon " stringify(ORBISLIB_MAJOR) "." stringify(ORBISLIB_MINOR) "] Dev Build " stringify(ORBISLIB_BUILDVERSION) " " __DATE__ " " __TIME__) +#else +#define ORBISLIB_BUILDSTRING ("[OrbisLib Daemon " stringify(ORBISLIB_MAJOR) "." stringify(ORBISLIB_MINOR) "] Build " stringify(ORBISLIB_BUILDVERSION) " " __DATE__ " " __TIME__) +#endif diff --git a/Playstation/OrbisLibAPI/main.cpp b/Playstation/OrbisLibAPI/main.cpp index 1a4761e..d4d42bb 100644 --- a/Playstation/OrbisLibAPI/main.cpp +++ b/Playstation/OrbisLibAPI/main.cpp @@ -84,7 +84,7 @@ int main() // Init App install utils. sceAppInstUtilInitialize(); -#define LOADTOOLBOX +// #define LOADTOOLBOX #ifdef LOADTOOLBOX auto handle = sys_sdk_proc_prx_load("SceShellUI", "/user/data/Orbis Toolbox/OrbisToolbox-2.0.sprx"); if (handle > 0) { diff --git a/Windows/Libraries/OrbisLib2/Common/Helpers/Helper.cs b/Windows/Libraries/OrbisLib2/Common/Helpers/Helper.cs index cbb510f..a53c935 100644 --- a/Windows/Libraries/OrbisLib2/Common/Helpers/Helper.cs +++ b/Windows/Libraries/OrbisLib2/Common/Helpers/Helper.cs @@ -1,10 +1,6 @@ -using System.Data; -using System.Net.NetworkInformation; -using System.Net.Sockets; +using System.IO; using System.Runtime.InteropServices; using System.Runtime.Serialization.Formatters.Binary; -using System.Text; -using static SQLite.SQLite3; namespace OrbisLib2.Common.Helpers { diff --git a/Windows/Libraries/OrbisLib2/Common/ValueConverters/AppIdConverter.cs b/Windows/Libraries/OrbisLib2/Common/ValueConverters/AppIdConverter.cs new file mode 100644 index 0000000..151965d --- /dev/null +++ b/Windows/Libraries/OrbisLib2/Common/ValueConverters/AppIdConverter.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace OrbisLib2.Common.ValueConverters +{ + public class AppIdConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if(value == null || (int)value == 0) + { + return string.Empty; + } + + return ((int)value).ToString("X"); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return int.Parse(value.ToString()); + } + } +} diff --git a/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml b/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml new file mode 100644 index 0000000..6fa7feb --- /dev/null +++ b/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml.cs b/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml.cs new file mode 100644 index 0000000..cb78dcc --- /dev/null +++ b/Windows/Libraries/OrbisLib2/Dialog/SelectProcess.xaml.cs @@ -0,0 +1,57 @@ +using OrbisLib2.Targets; +using SimpleUI.Dialogs; +using System.Windows; + +namespace OrbisLib2.Dialog +{ + /// + /// Interaction logic for SelectProcess.xaml + /// + public partial class SelectProcess : SimpleDialog + { + public SelectProcess(Window Owner) + : base(Owner, "Select", "Cancel", "Select Process") + { + InitializeComponent(); + + // Get initial process list. + RefreshProcessList(); + } + + public static SimpleDialogResult ShowDialog(Window Owner) + { + var dlg = new SelectProcess(Owner); + dlg.ShowDialog(); + return dlg.Result; + } + + private void RefreshProcessList() + { + Task.Run(() => + { + var procList = TargetManager.SelectedTarget.Process.GetList(); + + if(procList != null && procList.Count > 0) + { + Dispatcher.Invoke(() => + { + ProcessList.ItemsSource = procList; + ProcessList.Items.Refresh(); + }); + } + else + { + Dispatcher.Invoke(() => + { + ProcessList.ItemsSource = null; + }); + } + }); + } + + private void Refresh_Click(object sender, RoutedEventArgs e) + { + RefreshProcessList(); + } + } +} diff --git a/Windows/Libraries/OrbisLib2/OrbisLib2.csproj b/Windows/Libraries/OrbisLib2/OrbisLib2.csproj index 080883c..14fd291 100644 --- a/Windows/Libraries/OrbisLib2/OrbisLib2.csproj +++ b/Windows/Libraries/OrbisLib2/OrbisLib2.csproj @@ -1,9 +1,10 @@  - net6.0 + net6.0-windows enable annotations + true @@ -15,6 +16,12 @@ + + + ..\..\..\External\SimpleUI\SimpleUI\bin\Debug\net6.0-windows\SimpleUI.dll + + + diff --git a/Windows/Libraries/OrbisLib2/Targets/FTP.cs b/Windows/Libraries/OrbisLib2/Targets/FTP.cs index 3d1f113..06b5793 100644 --- a/Windows/Libraries/OrbisLib2/Targets/FTP.cs +++ b/Windows/Libraries/OrbisLib2/Targets/FTP.cs @@ -1,10 +1,6 @@ using Limilabs.FTP.Client; using OrbisLib2.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.IO; namespace OrbisLib2.Targets { diff --git a/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml b/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml index 97feacf..768a44b 100644 --- a/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml +++ b/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml @@ -7,13 +7,14 @@ xmlns:simpleControls="clr-namespace:SimpleUI.Controls;assembly=SimpleUI" xmlns:controls="clr-namespace:OrbisLibraryManager.Controls" mc:Ignorable="d" - Title="LibraryManager" Height="640" Width="960" - MinHeight="640" MinWidth="960" - MaxHeight="640" MaxWidth="960" + Title="LibraryManager" Height="640" Width="980" + MinHeight="640" MinWidth="980" + MaxHeight="640" MaxWidth="980" ResizeMode="CanMinimize"> + @@ -24,19 +25,18 @@ + Fill="{DynamicResource WindowBar}" Grid.ColumnSpan="2"/> + Fill="{DynamicResource WindowBackground}" Grid.ColumnSpan="2"/> - + + HorizontalAlignment="Left" Grid.ColumnSpan="2" Margin="582,0,0,0"> - + - + @@ -109,7 +109,8 @@ Height="25" ToolTip="Attach to new process" ImageSource="/OrbisLibraryManager;component/Images/Attached.png" - ImageMargin="1"/> + ImageMargin="1" + Click="AttachProcess_Click"/> + AlternationCount="2" Grid.ColumnSpan="2" Margin="13,0,13,0"> @@ -186,5 +187,5 @@ - + diff --git a/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml.cs b/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml.cs index da00918..21753a7 100644 --- a/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml.cs +++ b/Windows/OrbisLibraryManager/OrbisLibraryManager.xaml.cs @@ -1,5 +1,7 @@ using OrbisLib2.Common.Dispatcher; +using OrbisLib2.Targets; using SimpleUI.Controls; +using System.Windows; namespace OrbisLibraryManager { @@ -13,5 +15,10 @@ namespace OrbisLibraryManager InitializeComponent(); DispatcherClient.Subscribe(); } + + private void AttachProcess_Click(object sender, RoutedEventArgs e) + { + OrbisLib2.Dialog.SelectProcess.ShowDialog(GetWindow(this)); + } } } diff --git a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt index 1905eb8..f52b3ac 100644 --- a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt +++ b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt @@ -1 +1 @@ -2163 +2176 diff --git a/Windows/OrbisNeighborHood/Resources/BuildString.txt b/Windows/OrbisNeighborHood/Resources/BuildString.txt index ca66626..df87f3c 100644 --- a/Windows/OrbisNeighborHood/Resources/BuildString.txt +++ b/Windows/OrbisNeighborHood/Resources/BuildString.txt @@ -1 +1 @@ -Version 3.0.2163 Debug Build Tuesday December 27 2022 5:28 PM +Version 3.0.2176 Debug Build Friday December 30 2022 12:43 AM