From ed6a84516802096ad231cdb1d88060d442590b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 3 Aug 2014 14:56:07 +0200 Subject: [PATCH] Do some cleanup (remove unneeded, old client-server-stuff), another update of .gitignore --- .gitignore | 61 ++-- ClientServerLib/AndroidRemote.sln | 24 -- ClientServerLib/AndroidRemote/MainActivity.cs | 285 --------------- .../Newtonsoft.Json.MonoDroid.dll | Bin 325120 -> 0 bytes .../Properties/AndroidManifest.xml | 8 - .../AndroidRemote/Properties/AssemblyInfo.cs | 28 -- .../Resources/AboutResources.txt | 44 --- .../Resources/Resource.designer.cs | 175 --------- .../AndroidRemote/Resources/drawable/Icon.png | Bin 61770 -> 0 bytes .../AndroidRemote/Resources/layout/Main.axml | 71 ---- .../Resources/values/Strings.xml | 17 - .../AndroidRemote/Vocaluxe App.csproj | 163 --------- ClientServerLib/ClientServerLib.sln | 42 --- .../ClientTest/ClientTest.Designer.cs | 337 ------------------ ClientServerLib/ClientTest/ClientTest.cs | 284 --------------- ClientServerLib/ClientTest/ClientTest.csproj | 103 ------ ClientServerLib/ClientTest/ClientTest.resx | 123 ------- ClientServerLib/ClientTest/Program.cs | 21 -- .../ClientTest/Properties/AssemblyInfo.cs | 36 -- .../Properties/Resources.Designer.cs | 71 ---- .../ClientTest/Properties/Resources.resx | 117 ------ .../Properties/Settings.Designer.cs | 30 -- .../ClientTest/Properties/Settings.settings | 7 - .../CDiscover.cs | 0 .../ClientServerLib => ServerLib}/CServer.cs | 0 .../CWebservice.cs | 0 .../DataStructs.cs | 0 .../ICWebservice.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../ServerLib.csproj | 0 .../ClientServerLib => ServerLib}/Session.cs | 0 .../SessionControl.cs | 0 .../UserRights.cs | 0 .../UserRoleControl.cs | 0 .../UserRoles.cs | 0 .../bin/Newtonsoft.Json.dll | Bin Vocaluxe.sln | 2 +- Vocaluxe/Vocaluxe.csproj | 2 +- 38 files changed, 28 insertions(+), 2023 deletions(-) delete mode 100644 ClientServerLib/AndroidRemote.sln delete mode 100644 ClientServerLib/AndroidRemote/MainActivity.cs delete mode 100644 ClientServerLib/AndroidRemote/Newtonsoft.Json.MonoDroid.dll delete mode 100644 ClientServerLib/AndroidRemote/Properties/AndroidManifest.xml delete mode 100644 ClientServerLib/AndroidRemote/Properties/AssemblyInfo.cs delete mode 100644 ClientServerLib/AndroidRemote/Resources/AboutResources.txt delete mode 100644 ClientServerLib/AndroidRemote/Resources/Resource.designer.cs delete mode 100644 ClientServerLib/AndroidRemote/Resources/drawable/Icon.png delete mode 100644 ClientServerLib/AndroidRemote/Resources/layout/Main.axml delete mode 100644 ClientServerLib/AndroidRemote/Resources/values/Strings.xml delete mode 100644 ClientServerLib/AndroidRemote/Vocaluxe App.csproj delete mode 100644 ClientServerLib/ClientServerLib.sln delete mode 100644 ClientServerLib/ClientTest/ClientTest.Designer.cs delete mode 100644 ClientServerLib/ClientTest/ClientTest.cs delete mode 100644 ClientServerLib/ClientTest/ClientTest.csproj delete mode 100644 ClientServerLib/ClientTest/ClientTest.resx delete mode 100644 ClientServerLib/ClientTest/Program.cs delete mode 100644 ClientServerLib/ClientTest/Properties/AssemblyInfo.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Resources.Designer.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Resources.resx delete mode 100644 ClientServerLib/ClientTest/Properties/Settings.Designer.cs delete mode 100644 ClientServerLib/ClientTest/Properties/Settings.settings rename {ClientServerLib/ClientServerLib => ServerLib}/CDiscover.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/CServer.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/CWebservice.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/DataStructs.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/ICWebservice.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/Properties/AssemblyInfo.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/ServerLib.csproj (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/Session.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/SessionControl.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRights.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRoleControl.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/UserRoles.cs (100%) rename {ClientServerLib/ClientServerLib => ServerLib}/bin/Newtonsoft.Json.dll (100%) diff --git a/.gitignore b/.gitignore index 16bf32ec..b7c9123c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,12 @@ obj -Output/Songs +PitchTracker.dll +Thumbs.db *.mp4 *.pdb -/Output/Benchmark.log -/Output/CoverDB.sqlite -/Output/HighscoreDB.sqlite -/Output/PartyModes/*/Code/* -/Output/Vocaluxe.exe* -/Output/Vocaluxe.vshost.exe* -/Output/VocaluxeLib.dll -*.psess -/*.vsp -/*.ctl -/Output/Registration.xml -/Vocaluxe.suo *.csproj.user *.vcxproj.user -/Output/Config.xml *.ipch *.log -/Output/Playlists/*.xml -GstreamerHelper.dll *.tlog *.suo *.obj @@ -35,30 +21,35 @@ GstreamerHelper.dll *.codeanalysis* *.nativecodeanalysis* *.lastcodeanalysissucceeded -/PartyModes/*/*/*.dll *.Cache -/GstreamerHelper/bin/* -/VocaluxeLib/bin -ClientServerLib.dll -ClientTest.exe +*.psess *.vshost.* *.userprefs -AndroidRemote.dll.mdb -/ClientServerLib/AndroidRemote/bin/Newtonsoft.Json.MonoDroid.dll -/ClientServerLib/AndroidRemote/bin/AndroidRemote.dll -/ClientServerLib/ClientTest/bin/Debug/Newtonsoft.Json.dll -*.apk +/*.vsp +/*.ctl +/Output/Config.xml +/Output/CoverDB.sqlite +/Output/HighscoreDB.sqlite /Output/ClientServerLib.dll -Installer/VocaluxeSetup_0.3.0Beta.exe -Output/Vocaluxe_x64.exe -/WebserverInitalConfig/bin/Release +/Output/Vocaluxe.exe* +/Output/Vocaluxe_x64.exe* +/Output/Vocaluxe.vshost.exe* +/Output/VocaluxeLib.dll +/Output/VocaluxeServerConfig.exe +/Output/VocaluxeServerConfig.exe.config /Output/Photos /Output/Screenshots /Output/Website -/Output/VocaluxeServerConfig.exe -/Output/VocaluxeServerConfig.exe.config -/PhoneGap/ +/Output/Songs +/Output/Playlists/*.xml /Output/Profiles/*.xml -PitchTracker.dll -*.log -Thumbs.db \ No newline at end of file +/Output/PartyModes/*/Code/* +/PartyModes/*/*/*.dll +/VocaluxeLib/bin +/ServerLib/bin/ClientServerLib.dll +/Installer/setup-cache +/Installer/setup-SetupFiles +/Installer/VocaluxeSetup_0.3.0Beta.exe +/Installer/Vocaluxe*.rar +/WebserverInitalConfig/bin +/PhoneGap/ \ No newline at end of file diff --git a/ClientServerLib/AndroidRemote.sln b/ClientServerLib/AndroidRemote.sln deleted file mode 100644 index 321f91d1..00000000 --- a/ClientServerLib/AndroidRemote.sln +++ /dev/null @@ -1,24 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe App", "AndroidRemote\Vocaluxe App.csproj", "{D97EF6F3-7C3F-439F-B022-647948E206D2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D97EF6F3-7C3F-439F-B022-647948E206D2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = AndroidRemote\Vocaluxe App.csproj - Policies = $0 - $0.DotNetNamingPolicy = $1 - $1.DirectoryNamespaceAssociation = None - $1.ResourceNamePolicy = FileFormatDefault - EndGlobalSection -EndGlobal diff --git a/ClientServerLib/AndroidRemote/MainActivity.cs b/ClientServerLib/AndroidRemote/MainActivity.cs deleted file mode 100644 index 9c86ac57..00000000 --- a/ClientServerLib/AndroidRemote/MainActivity.cs +++ /dev/null @@ -1,285 +0,0 @@ -using System; -using System.Collections.Generic; - -using Android.App; -using Android.Content; -using Android.Content.PM; -using Android.Graphics; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using Android.OS; -using Android.Provider; - -using ClientServerLib; -using Vocaluxe.Base.Server; - -namespace org.vocaluxe.app -{ - [Activity (Label = "Vocaluxe App", MainLauncher = true, ConfigurationChanges=Android.Content.PM.ConfigChanges.Orientation)] - public class Activity1 : Activity - { - private readonly int REQUEST_TAKE_PICTURE = 1; - private readonly int REQUEST_PICK_PICTURE = 2; - - CClient client = new CClient(); - CDiscover discover; - Button bConnect; - Button bSendAvatar; - Button bSendProfile; - - TextView tIP; - TextView tPassword; - - ProgressDialog pDialog; - - byte[] fileBytes; - - Java.IO.File file; - Java.IO.File file2; - Java.IO.File dir; - System.IO.FileStream fs; - - bool sendProfile; - - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - SetContentView (Resource.Layout.Main); - pDialog = new ProgressDialog (this); - pDialog.SetCancelable (false); - - bConnect = FindViewById