From: <nor...@us...> - 2007-09-09 09:59:33
|
Revision: 908 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=908&view=rev Author: northern_sky Date: 2007-09-09 02:59:29 -0700 (Sun, 09 Sep 2007) Log Message: ----------- added basic support for allgame lookup from gui Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs trunk/plugins/myGUIProgramsAlt/README.txt Added Paths: ----------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd Added: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd (rev 0) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd 2007-09-09 09:59:29 UTC (rev 908) @@ -0,0 +1,314 @@ +<?xml version="1.0" encoding="utf-8"?> +<ClassDiagram MajorVersion="1" MinorVersion="1"> + <Font Name="Segoe UI" Size="9" /> + <Class Name="GUIProgramsAlt.Database.DatabaseHandler" Collapsed="true"> + <Position X="18" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Database\DatabaseHandler.cs</FileName> + <HashCode>AKIYAABCAAEaMAEwAAAAAAAAAFlAAAEACEACAABEoAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsFilesImportProgress" Collapsed="true"> + <Position X="3" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppFilesImportProgress.cs</FileName> + <HashCode>gQAAAAAQAKAQCAAAAACAAQACgAAAAAAAQABAAIAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsFilesView" Collapsed="true"> + <Position X="16.25" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppFilesView.cs</FileName> + <HashCode>oAANBAJFSCBB8ECgSJCCQIRigVMQACQBQmSUgUQRCNE=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsBase" Collapsed="true"> + <Position X="5.25" Y="2" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppSettingsBase.cs</FileName> + <HashCode>AhoIgAAAADQAAJAgCUCFQCgSQiHAAUIgAICACAAQABg=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsDirCache" Collapsed="true"> + <Position X="5.25" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppSettingsDirCache.cs</FileName> + <HashCode>AAAAQAAAACAAEIAgACCAAAICQAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsGamebase" Collapsed="true"> + <Position X="7.5" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppSettingsGamebase.cs</FileName> + <HashCode>AAAAAAAAACAAAIAoACCAAEACAAAAAAAAAQAAAAAIAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsGrouper" Collapsed="true"> + <Position X="9.75" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppSettingsGrouper.cs</FileName> + <HashCode>AAAAAAAAACABAIAgAACAAAACAAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.AppSettingsMame" Collapsed="true"> + <Position X="0.75" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\AppSettingsMame.cs</FileName> + <HashCode>AAAAgAAAACAAAIAgQCCABEACAAAAAAgAASABAAAIBAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.FileDetailsForm" Collapsed="true"> + <Position X="19.75" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\FileDetailsForm.cs</FileName> + <HashCode>AABAAcAxCaFiEIcCKKGBwAACIgERBiAABQCABAABAAQ=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.FileInfoScraperForm" Collapsed="true"> + <Position X="21.5" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\FileInfoScraperForm.cs</FileName> + <HashCode>qQYYAAAAGSSQcJRDDMOAACcSD8AC1SgCkEChMIC7xEk=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.FileSettingsBox" Collapsed="true"> + <Position X="18" Y="1.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\FileSettingsBox.cs</FileName> + <HashCode>AEAAAAAAECIAAAAAAACAAAASAAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.ProgramViews" Collapsed="true"> + <Position X="14.5" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\ProgramViews.cs</FileName> + <HashCode>AIAAAQAAADBABhQgAECEAAACAAAgEBAIAAACgQIAAWQ=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.SettingsBase" Collapsed="true"> + <Position X="6.25" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\SettingsBase.cs</FileName> + <HashCode>AAAAAAAAACAAAIAgACCAAAACAAAQAAEAAgAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.SettingsRoot" Collapsed="true"> + <Position X="12" Y="2" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\SettingsRoot.cs</FileName> + <HashCode>AAAAACAAACAAAIAhIACDAAACAACAQAQAAAAAAACgCAg=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Design.SetupForm" Collapsed="true"> + <Position X="18" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Design\SetupForm.cs</FileName> + <HashCode>xqnowBGYG3JKfJwlBOCIEETiVZM6QmVoVEie0NAzAXM=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.GUIProgramsAlt" Collapsed="true" BaseTypeListCollapsed="true"> + <Position X="21.5" Y="1.5" Width="1.5" /> + <TypeIdentifier> + <FileName>GUIProgramsAlt.cs</FileName> + <HashCode>IPJEILBSQgAlAIR4ggEgCBMAAQBFb0FBKFGCZhAAZSg=</HashCode> + </TypeIdentifier> + <Lollipop Position="0.2" Collapsed="true" /> + </Class> + <Class Name="GUIProgramsAlt.GUIProgramsAltFileInfo" Collapsed="true" BaseTypeListCollapsed="true"> + <Position X="14.5" Y="2.5" Width="1.5" /> + <TypeIdentifier> + <FileName>GUIProgramsAltFileInfo.cs</FileName> + <HashCode>AEQIAQEBggFRANBACAgRCAgMBUAIAEBBgACLYAYEBAA=</HashCode> + </TypeIdentifier> + <Lollipop Position="0.2" Collapsed="true" /> + </Class> + <Class Name="GUIProgramsAlt.ProgramSort" Collapsed="true" BaseTypeListCollapsed="true"> + <Position X="18" Y="2.5" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramSort.cs</FileName> + <HashCode>AAAACAAAAAAEAAAAAAAAAAAAAAAAAAAAAABAAAAAAAA=</HashCode> + </TypeIdentifier> + <Lollipop Position="0.2" Collapsed="true" /> + </Class> + <Class Name="GUIProgramsAlt.ProgramUtils" Collapsed="true"> + <Position X="19.75" Y="2.5" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AABQIAAAhAAgQAAIAAAAg6AAGAAgAQABAAAWAAgCjCA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.ProgramViewHandler" Collapsed="true"> + <Position X="21.5" Y="2.5" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramViewHandler.cs</FileName> + <HashCode>AgAAAAACgRAAAgAAAAgVBCAAgAjFEAIARAAAAAIgAGA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.AllGameScraper" Collapsed="true"> + <Position X="14.5" Y="0.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\AllGameScraper.cs</FileName> + <HashCode>AhzAAAGgAAITAAAAAAAAAAAAAABQAAAAgIAAEQAAABA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.DirectoryImport" Collapsed="true"> + <Position X="0.5" Y="8.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\DirectoryImport.cs</FileName> + <HashCode>AAAAAAAAAAAAAAABAgAgAAAAAAAAAAAAAAAAAAEAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.FileReadEventArgs" Collapsed="true"> + <Position X="16.25" Y="1.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\FileReadEventArgs.cs</FileName> + <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.GamebaseImport" Collapsed="true"> + <Position X="2.75" Y="8.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\GamebaseImport.cs</FileName> + <HashCode>ABAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAEAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.ImportBase" Collapsed="true"> + <Position X="2.75" Y="7.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\ImportBase.cs</FileName> + <HashCode>AAAAAQBAAAAAAAgAAAAAgAAAAAAAAAEAAAAAAAEAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Imports.MameImport" Collapsed="true"> + <Position X="5" Y="8.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Imports\MameImport.cs</FileName> + <HashCode>qACAgAEAGAAAEAABAAAEAAgCgAASABAAGwAQBIEAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ApplicationItem" Collapsed="true"> + <Position X="3.75" Y="4.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItem.cs</FileName> + <HashCode>hD6AAsRiQzNHIuPwpIiN4gIAmZcqBAkYqGVmCZkEpYA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ApplicationItemDirectoryCache" Collapsed="true"> + <Position X="7.25" Y="5.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItemDirectoryCache.cs</FileName> + <HashCode>AAAAAAAAAABAAAAAIAAAIAAAAAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ItemFactory" Collapsed="true"> + <Position X="16.25" Y="2.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItemFactory.cs</FileName> + <HashCode>AAAAAAACAAAAAEAgAAQAIAAAAQAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ApplicationItemGameBase" Collapsed="true"> + <Position X="0.5" Y="5.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItemGameBase.cs</FileName> + <HashCode>AAAAAAAAAABAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ApplicationItemGrouper" Collapsed="true"> + <Position X="2.75" Y="5.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItemGrouper.cs</FileName> + <HashCode>AAAAAAAAAAACAAAAAAAAAAAAAAAABAAAAGAAAAAABAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.ApplicationItemMame" Collapsed="true"> + <Position X="5" Y="5.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\ApplicationItemMame.cs</FileName> + <HashCode>AAAAAAAIAABAAAAAIAAAAAAIgAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.FileItem" Collapsed="true"> + <Position X="8.25" Y="7.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\FileItem.cs</FileName> + <HashCode>hAwEAcRuRAEAZkAAACYIQAIGCQPCAEECjgBAAo9AQAI=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.FileItemInfo" Collapsed="true"> + <Position X="14.5" Y="1.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\FileItemInfo.cs</FileName> + <HashCode>AggEAAAqRAEBIsAAJAYICQIGCQEGAAEALAAAAAkAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.FilelinkItem" Collapsed="true"> + <Position X="8.25" Y="8.75" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\FilelinkItem.cs</FileName> + <HashCode>AAQAAEAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAEQAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Items.FilterItem" Collapsed="true"> + <Position X="19.75" Y="1.5" Width="1.5" /> + <TypeIdentifier> + <FileName>Items\FilterItem.cs</FileName> + <HashCode>AAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Class> + <Class Name="GUIProgramsAlt.Properties.Resources" Collapsed="true"> + <Position X="16.25" Y="3.5" Width="1.5" /> + <TypeIdentifier> + <HashCode>AAAAAAAAAAAAAAAAAAABEEAAQQAAAAIAAAAAAAAgAIA=</HashCode> + </TypeIdentifier> + </Class> + <Enum Name="GUIProgramsAlt.Layout" Collapsed="true"> + <Position X="19.75" Y="4.75" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAAAAAQAAAACAAAAAAAAAAAAAAAAAAEAAAAAAAAAI=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.ItemType" Collapsed="true"> + <Position X="18" Y="4.75" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAQAAAABAAAAAQCAAEABAAAAAAAAABAAAgAAAABAA=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.ScraperType" Collapsed="true"> + <Position X="16.25" Y="5.5" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAA=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.ScraperSaveType" Collapsed="true"> + <Position X="14.5" Y="5.5" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAAAAAAAAAIAAAAAAAAAAAAAAAABAAAAAAAAAAAAA=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.ProgramInfoAction" Collapsed="true"> + <Position X="21.5" Y="4.75" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAA=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.ImportOption" Collapsed="true"> + <Position X="16.25" Y="4.75" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAMAAAAAAAAAAAAAAAAAAAAAAAAgAAAACAAAAAAAA=</HashCode> + </TypeIdentifier> + </Enum> + <Enum Name="GUIProgramsAlt.FileSettingOption" Collapsed="true"> + <Position X="14.5" Y="4.75" Width="1.5" /> + <TypeIdentifier> + <FileName>ProgramUtils.cs</FileName> + <HashCode>AAAAAAAAAgAAAAAAAACAAAAAAAAAAAAAAAAQAAIAAAA=</HashCode> + </TypeIdentifier> + </Enum> +</ClassDiagram> \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-08 16:12:18 UTC (rev 907) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-09 09:59:29 UTC (rev 908) @@ -63,9 +63,10 @@ #region Variables bool currentSortAsc = true; + ProgramViewHandler viewHandler = ProgramViewHandler.Instance; List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList; - DirectoryHistory itemHistory = new DirectoryHistory(); + int slideSpeed = 3000; // speed in milliseconds between two slides long slideTime = 0; static string _thumbnailPath = string.Empty; @@ -158,7 +159,6 @@ return facadeView.SelectedListItemIndex; } - bool ApplicationItemSubItemsAllowed() { if (currentApplicationItem == null) @@ -176,8 +176,6 @@ return (currentApplicationItem != null); // all globalApplicationList can have files except the root } - #endregion - string GetViewLayoutAsText() { string result; @@ -203,6 +201,8 @@ return result; } + #endregion Properties / Helper Routines + public void SwitchToNextViewLayout() { switch (CurrentLayout) @@ -591,89 +591,10 @@ - //TO DO - //Fix this method//move it - void ImportFileItemInfo(FileItem curFile) - { - int minRelevance = 30; - bool bSuccess = false; - ScraperSaveType saveType = ScraperSaveType.DataAndImages; - GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK); - GUIDialogProgress dlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_PROGRESS); - dlgProgress.ShowWaitCursor = false; - dlgProgress.ShowProgressBar(false); - dlgProgress.SetHeading("Lookup Gameinfo"); - dlgProgress.SetLine(1, curFile.Title); - dlgProgress.SetLine(2, curFile.Platform); - dlgProgress.SetLine(3, ""); - dlgProgress.StartModal(GetID); - // dlgProgress.SetPercentage(60); - dlgProgress.Progress(); - bSuccess = curFile.FindFileInfo(ScraperType.ALLGAME); - if ((bSuccess && curFile.FileInfoList.Count > 0) && ((FileItemInfo)(curFile.FileInfoList[0])).RelevanceNorm >= minRelevance) - { - GUIDialogSelect pDlg = (GUIDialogSelect)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_SELECT); - if (null != pDlg) - { - pDlg.Reset(); - pDlg.SetHeading("Select Title"); - foreach (FileItemInfo item in curFile.FileInfoList) - { - if (item.RelevanceNorm >= minRelevance) - { - pDlg.Add(String.Format("{0} ({1})", item.Title, item.Platform)); - } - } - pDlg.DoModal(GetID); - // and wait till user selects one - int iSelectedGame = pDlg.SelectedLabel; - if (iSelectedGame < 0) return; - dlgProgress.StartModal(GetID); - dlgProgress.Progress(); - dlgProgress.ShowProgressBar(false); - curFile.FileInfoFavourite = (FileItemInfo)curFile.FileInfoList[iSelectedGame]; - curFile.FindFileInfoDetail(currentApplicationItem, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType); - if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data)) - { - // dlgProgress.SetPercentage(60); - dlgProgress.Progress(); - curFile.SaveFromFileInfoFavourite(false); - } - // dlgProgress.SetPercentage(100); - dlgProgress.Progress(); - dlgProgress.Close(); - dlgProgress = null; - } - ShowInfoWindow(); - } - else - { - string strMsg = ""; - if (!bSuccess) - { - strMsg = "Connection failed"; - Log.Info("myPrograms: RefreshData failed"); - } - else - { - strMsg = String.Format("No match for '{0}'", curFile.Title); - Log.Info("myPrograms: No data found for '{0}'", curFile.Title); - } - if (null != dlgOk) - { - dlgOk.SetHeading(187); - dlgOk.SetLine(1, strMsg); - dlgOk.SetLine(2, String.Empty); - dlgOk.DoModal(GetID); - } - } - } - - void SetItemThumb(GUIListItem item, GUIControl parent) { ThumbnailPath = ""; Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-09-08 16:12:18 UTC (rev 907) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-09-09 09:59:29 UTC (rev 908) @@ -237,6 +237,9 @@ <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <None Include="ClassDiagram1.cd" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-08 16:12:18 UTC (rev 907) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-09 09:59:29 UTC (rev 908) @@ -85,7 +85,7 @@ } string folderForThumbs = string.Empty; string[] coverArtUrls = new string[1]; - string imdbCoverArtUrl = String.Empty; + string amgCoverArtUrl = String.Empty; Thread imageSearchThread = null; @@ -99,7 +99,87 @@ return Load(GUIGraphicsContext.Skin + @"\myProgramsAltFileInfo.xml"); } + //TO DO + //Fix this method//move it + void ImportFileItemInfo(FileItem curFile) + { + int minRelevance = 40; + bool bSuccess = false; + ScraperSaveType saveType = ScraperSaveType.DataAndImages; + GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK); + GUIDialogProgress dlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_PROGRESS); + dlgProgress.ShowWaitCursor = false; + dlgProgress.ShowProgressBar(false); + dlgProgress.SetHeading("Lookup Gameinfo"); + dlgProgress.SetLine(1, curFile.Title); + dlgProgress.SetLine(2, curFile.Platform); + dlgProgress.SetLine(3, ""); + dlgProgress.StartModal(GetID); + // dlgProgress.SetPercentage(60); + dlgProgress.Progress(); + bSuccess = curFile.FindFileInfo(ScraperType.ALLGAME); + if ((bSuccess && curFile.FileInfoList.Count > 0) && ((FileItemInfo)(curFile.FileInfoList[0])).RelevanceNorm >= minRelevance) + { + GUIDialogSelect pDlg = (GUIDialogSelect)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_SELECT); + if (null != pDlg) + { + pDlg.Reset(); + pDlg.SetHeading("Select Title"); + foreach (FileItemInfo item in curFile.FileInfoList) + { + if (item.RelevanceNorm >= minRelevance) + { + pDlg.Add(String.Format("{0} ({1})", item.Title, item.Platform)); + } + } + pDlg.DoModal(GetID); + // and wait till user selects one + int iSelectedGame = pDlg.SelectedLabel; + if (iSelectedGame < 0) return; + + dlgProgress.StartModal(GetID); + dlgProgress.Progress(); + dlgProgress.ShowProgressBar(false); + curFile.FileInfoFavourite = (FileItemInfo)curFile.FileInfoList[iSelectedGame]; + + curFile.FindFileInfoDetail(currentApplicationItem, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType); + if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data)) + { + // dlgProgress.SetPercentage(60); + dlgProgress.Progress(); + curFile.SaveFromFileInfoFavourite(false); + } + // dlgProgress.SetPercentage(100); + dlgProgress.Progress(); + dlgProgress.Close(); + dlgProgress = null; + } + //ShowInfoWindow(); + } + else + { + string strMsg = ""; + if (!bSuccess) + { + strMsg = "Connection failed"; + Log.Info("myPrograms: RefreshData failed"); + } + else + { + strMsg = String.Format("No match for '{0}'", curFile.Title); + Log.Info("myPrograms: No data found for '{0}'", curFile.Title); + } + if (null != dlgOk) + { + dlgOk.SetHeading(187); + dlgOk.SetLine(1, strMsg); + dlgOk.SetLine(2, String.Empty); + dlgOk.DoModal(GetID); + } + } + } + protected override void OnPageLoad() { base.OnPageLoad(); @@ -110,9 +190,9 @@ return; } // Default picture - imdbCoverArtUrl = currentFileItem.Imagefile; + amgCoverArtUrl = currentFileItem.Imagefile; coverArtUrls = new string[1]; - coverArtUrls[0] = imdbCoverArtUrl; + coverArtUrls[0] = amgCoverArtUrl; ResetSpinControl(); @@ -137,7 +217,8 @@ base.OnClicked(controlId, control, actionType); if (control == btnRefresh) { - + ImportFileItemInfo(this.CurrentFileItem); + Update(); return; } @@ -248,33 +329,25 @@ { if (currentFileItem == null) return; // Search for more pictures - FileItem movie = currentFileItem; - IMPawardsSearch impSearch = new IMPawardsSearch(); - impSearch.Search(movie.Title); + FileItem fileItem = currentFileItem; + AmazonImageSearch amazonSearch = new AmazonImageSearch(); - amazonSearch.Search(movie.Title); + amazonSearch.Search(fileItem.Title); int thumb = 0; - if (movie.Imagefile != string.Empty) + if (fileItem.Imagefile != string.Empty) thumb = 1; - int pictureCount = amazonSearch.Count + impSearch.Count + thumb; + int pictureCount = amazonSearch.Count + thumb; if (pictureCount == 0) return; int pictureIndex = 0; coverArtUrls = new string[pictureCount]; - if (movie.Imagefile != string.Empty) - coverArtUrls[pictureIndex++] = movie.Imagefile; + if (fileItem.Imagefile != string.Empty) + coverArtUrls[pictureIndex++] = fileItem.Imagefile; - if ((impSearch.Count > 0) && (impSearch[0] != string.Empty)) - { - for (int i = 0; i < impSearch.Count; ++i) - { - coverArtUrls[pictureIndex++] = impSearch[i]; - } - } if (amazonSearch.Count > 0) { @@ -389,7 +462,7 @@ public bool OnDetailsStarting(IMDBFetcher fetcher) { GUIDialogProgress pDlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_PROGRESS); - // show dialog that we're downloading the movie info + // show dialog that we're downloading the fileItem info pDlgProgress.Reset(); pDlgProgress.SetHeading(198); pDlgProgress.SetLine(1, fetcher.MovieName); @@ -461,9 +534,9 @@ public bool OnSelectMovie(IMDBFetcher fetcher, out int selectedMovie) { GUIDialogSelect pDlgSelect = (GUIDialogSelect)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_SELECT); - // more then 1 movie found + // more then 1 fileItem found // ask user to select 1 - pDlgSelect.SetHeading(196);//select movie + pDlgSelect.SetHeading(196);//select fileItem pDlgSelect.Reset(); for (int i = 0; i < fetcher.Count; ++i) { @@ -533,6 +606,7 @@ { Render(timePassed); } + #endregion } } Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-08 16:12:18 UTC (rev 907) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-09 09:59:29 UTC (rev 908) @@ -39,14 +39,10 @@ -Add sort for filteritems too. --Fix brokenprogressdialogs in gui reimport --Allow the amg best match update from fileinfo window for fileitem - - BUGS: -- Just add em... +- Just add em.... FEATURES: Add some more specific emulator support.. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |