Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [851] trunk/plugins/myGUIProgramsAlt
|
From: <nor...@us...> - 2007-08-21 23:00:32
|
Revision: 851
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=851&view=rev
Author: northern_sky
Date: 2007-08-21 16:00:30 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
Code cleanups, bugfixes,Dynamic filesettings added
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/DirectoryImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemFactory.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/FilelinkItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Added Paths:
-----------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileSettingsBox.resx
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesImportProgress.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -42,7 +42,7 @@
//
// shellexecuteCheckBox
//
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
// applicationArgumentsLabel
@@ -69,7 +69,7 @@
// startupDirTextBox
//
this.toolTip.SetToolTip(this.startupDirComboBox, "Optional path that is passed as the launch-directory \r\n\r\n(advanced hint: Use %FIL" +
- "EDIR% if you want to use the directory where the launched file is stored)");
+ "EDIR% if you want to use the directory where the launched fileItem is stored)");
//
// quoteCheckBox
//
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -43,27 +43,14 @@
this.updateDatabaseButton = new System.Windows.Forms.Button();
this.contextFavouritesMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.grouperToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.fileExtensionsTextBox = new System.Windows.Forms.TextBox();
- this.imageDirsTextBox = new System.Windows.Forms.TextBox();
- this.fileDirTextBox = new System.Windows.Forms.TextBox();
- this.fileDirButton = new System.Windows.Forms.Button();
- this.fileExtensionsbutton = new System.Windows.Forms.Button();
- this.imageDirButton = new System.Windows.Forms.Button();
- this.fileExtensionsLabel = new System.Windows.Forms.Label();
- this.imageDirsLabel = new System.Windows.Forms.Label();
- this.fileDirLabel = new System.Windows.Forms.Label();
this.filesGroupBox = new System.Windows.Forms.GroupBox();
this.importOptionsCheckedListBox = new System.Windows.Forms.CheckedListBox();
- this.FileSettingsGroupBox = new System.Windows.Forms.GroupBox();
- this.gamebaseDBTextBox = new System.Windows.Forms.TextBox();
- this.gamebaseLabel = new System.Windows.Forms.Label();
- this.gamebaseDBButton = new System.Windows.Forms.Button();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+ this.filesettingsPanel = new System.Windows.Forms.Panel();
this.contextFavouritesMenuStrip.SuspendLayout();
this.filesGroupBox.SuspendLayout();
- this.FileSettingsGroupBox.SuspendLayout();
this.SuspendLayout();
//
// fileListView
@@ -92,7 +79,7 @@
this.smallImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallImageList.ImageStream")));
this.smallImageList.TransparentColor = System.Drawing.Color.Transparent;
this.smallImageList.Images.SetKeyName(0, "folder.ico");
- this.smallImageList.Images.SetKeyName(1, "file.ico");
+ this.smallImageList.Images.SetKeyName(1, "fileItem.ico");
this.smallImageList.Images.SetKeyName(2, "shortcut.ico");
//
// newButton
@@ -189,87 +176,6 @@
this.grouperToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.grouperToolStripMenuItem.Text = "Grouper";
//
- // fileExtensionsTextBox
- //
- this.fileExtensionsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.fileExtensionsTextBox.Location = new System.Drawing.Point(85, 71);
- this.fileExtensionsTextBox.Name = "fileExtensionsTextBox";
- this.fileExtensionsTextBox.Size = new System.Drawing.Size(330, 20);
- this.fileExtensionsTextBox.TabIndex = 28;
- //
- // imageDirsTextBox
- //
- this.imageDirsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.imageDirsTextBox.Location = new System.Drawing.Point(85, 45);
- this.imageDirsTextBox.Name = "imageDirsTextBox";
- this.imageDirsTextBox.Size = new System.Drawing.Size(330, 20);
- this.imageDirsTextBox.TabIndex = 27;
- //
- // fileDirTextBox
- //
- this.fileDirTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.fileDirTextBox.Location = new System.Drawing.Point(85, 19);
- this.fileDirTextBox.Name = "fileDirTextBox";
- this.fileDirTextBox.Size = new System.Drawing.Size(330, 20);
- this.fileDirTextBox.TabIndex = 26;
- //
- // fileDirButton
- //
- this.fileDirButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.fileDirButton.Location = new System.Drawing.Point(426, 16);
- this.fileDirButton.Name = "fileDirButton";
- this.fileDirButton.Size = new System.Drawing.Size(31, 23);
- this.fileDirButton.TabIndex = 39;
- this.fileDirButton.UseVisualStyleBackColor = true;
- this.fileDirButton.Click += new System.EventHandler(this.fileDirButton_Click);
- //
- // fileExtensionsbutton
- //
- this.fileExtensionsbutton.Image = global::GUIPrograms.Properties.Resources.searchButton_Image;
- this.fileExtensionsbutton.Location = new System.Drawing.Point(426, 68);
- this.fileExtensionsbutton.Name = "fileExtensionsbutton";
- this.fileExtensionsbutton.Size = new System.Drawing.Size(31, 23);
- this.fileExtensionsbutton.TabIndex = 38;
- this.fileExtensionsbutton.UseVisualStyleBackColor = true;
- this.fileExtensionsbutton.Click += new System.EventHandler(this.fileExtensionsbutton_Click);
- //
- // imageDirButton
- //
- this.imageDirButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.imageDirButton.Location = new System.Drawing.Point(426, 42);
- this.imageDirButton.Name = "imageDirButton";
- this.imageDirButton.Size = new System.Drawing.Size(31, 23);
- this.imageDirButton.TabIndex = 37;
- this.imageDirButton.UseVisualStyleBackColor = true;
- this.imageDirButton.Click += new System.EventHandler(this.imageDirButton_Click);
- //
- // fileExtensionsLabel
- //
- this.fileExtensionsLabel.Location = new System.Drawing.Point(2, 71);
- this.fileExtensionsLabel.Name = "fileExtensionsLabel";
- this.fileExtensionsLabel.Size = new System.Drawing.Size(93, 20);
- this.fileExtensionsLabel.TabIndex = 36;
- this.fileExtensionsLabel.Text = "Fileextensions:";
- this.fileExtensionsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // imageDirsLabel
- //
- this.imageDirsLabel.Location = new System.Drawing.Point(2, 43);
- this.imageDirsLabel.Name = "imageDirsLabel";
- this.imageDirsLabel.Size = new System.Drawing.Size(93, 20);
- this.imageDirsLabel.TabIndex = 35;
- this.imageDirsLabel.Text = "Image Dir:";
- this.imageDirsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // fileDirLabel
- //
- this.fileDirLabel.Location = new System.Drawing.Point(2, 19);
- this.fileDirLabel.Name = "fileDirLabel";
- this.fileDirLabel.Size = new System.Drawing.Size(93, 20);
- this.fileDirLabel.TabIndex = 34;
- this.fileDirLabel.Text = "File Directory(s):";
- this.fileDirLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
// filesGroupBox
//
this.filesGroupBox.BackColor = System.Drawing.SystemColors.Control;
@@ -305,73 +211,30 @@
this.importOptionsCheckedListBox.Sorted = true;
this.importOptionsCheckedListBox.TabIndex = 88;
//
- // FileSettingsGroupBox
- //
- this.FileSettingsGroupBox.BackColor = System.Drawing.SystemColors.Control;
- this.FileSettingsGroupBox.Controls.Add(this.fileDirTextBox);
- this.FileSettingsGroupBox.Controls.Add(this.gamebaseDBTextBox);
- this.FileSettingsGroupBox.Controls.Add(this.gamebaseLabel);
- this.FileSettingsGroupBox.Controls.Add(this.fileDirLabel);
- this.FileSettingsGroupBox.Controls.Add(this.gamebaseDBButton);
- this.FileSettingsGroupBox.Controls.Add(this.fileDirButton);
- this.FileSettingsGroupBox.Controls.Add(this.fileExtensionsbutton);
- this.FileSettingsGroupBox.Controls.Add(this.imageDirsTextBox);
- this.FileSettingsGroupBox.Controls.Add(this.imageDirButton);
- this.FileSettingsGroupBox.Controls.Add(this.fileExtensionsTextBox);
- this.FileSettingsGroupBox.Controls.Add(this.fileExtensionsLabel);
- this.FileSettingsGroupBox.Controls.Add(this.imageDirsLabel);
- this.FileSettingsGroupBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.FileSettingsGroupBox.Location = new System.Drawing.Point(6, 397);
- this.FileSettingsGroupBox.Name = "FileSettingsGroupBox";
- this.FileSettingsGroupBox.Size = new System.Drawing.Size(478, 150);
- this.FileSettingsGroupBox.TabIndex = 41;
- this.FileSettingsGroupBox.TabStop = false;
- this.FileSettingsGroupBox.Text = "Filesettings";
- //
- // gamebaseDBTextBox
- //
- this.gamebaseDBTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.gamebaseDBTextBox.Location = new System.Drawing.Point(85, 96);
- this.gamebaseDBTextBox.Name = "gamebaseDBTextBox";
- this.gamebaseDBTextBox.Size = new System.Drawing.Size(330, 20);
- this.gamebaseDBTextBox.TabIndex = 89;
- this.toolTip.SetToolTip(this.gamebaseDBTextBox, "Select a gamebase (*.mdb) file to import\r\n");
- //
- // gamebaseLabel
- //
- this.gamebaseLabel.Location = new System.Drawing.Point(2, 96);
- this.gamebaseLabel.Name = "gamebaseLabel";
- this.gamebaseLabel.Size = new System.Drawing.Size(93, 20);
- this.gamebaseLabel.TabIndex = 88;
- this.gamebaseLabel.Text = "Gamebase DB";
- //
- // gamebaseDBButton
- //
- this.gamebaseDBButton.Image = global::GUIPrograms.Properties.Resources.browseButton_Image;
- this.gamebaseDBButton.Location = new System.Drawing.Point(426, 93);
- this.gamebaseDBButton.Name = "gamebaseDBButton";
- this.gamebaseDBButton.Size = new System.Drawing.Size(31, 23);
- this.gamebaseDBButton.TabIndex = 90;
- this.gamebaseDBButton.UseVisualStyleBackColor = true;
- this.gamebaseDBButton.Click += new System.EventHandler(this.gamebaseDBButton_Click);
- //
// openFileDialog
//
this.openFileDialog.FileName = "openFileDialog1";
//
+ // filesettingsPanel
+ //
+ this.filesettingsPanel.AutoScroll = true;
+ this.filesettingsPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.filesettingsPanel.Location = new System.Drawing.Point(3, 397);
+ this.filesettingsPanel.Name = "filesettingsPanel";
+ this.filesettingsPanel.Size = new System.Drawing.Size(481, 162);
+ this.filesettingsPanel.TabIndex = 42;
+ //
// AppSettingsFilesView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.FileSettingsGroupBox);
+ this.Controls.Add(this.filesettingsPanel);
this.Controls.Add(this.filesGroupBox);
this.Name = "AppSettingsFilesView";
this.Size = new System.Drawing.Size(521, 574);
this.Load += new System.EventHandler(this.AppFilesView_Load);
this.contextFavouritesMenuStrip.ResumeLayout(false);
this.filesGroupBox.ResumeLayout(false);
- this.FileSettingsGroupBox.ResumeLayout(false);
- this.FileSettingsGroupBox.PerformLayout();
this.ResumeLayout(false);
}
@@ -391,23 +254,11 @@
private System.Windows.Forms.ContextMenuStrip contextFavouritesMenuStrip;
private System.Windows.Forms.ToolStripMenuItem grouperToolStripMenuItem;
private System.Windows.Forms.ImageList smallImageList;
- protected System.Windows.Forms.TextBox fileExtensionsTextBox;
- protected System.Windows.Forms.TextBox imageDirsTextBox;
- protected System.Windows.Forms.TextBox fileDirTextBox;
- protected System.Windows.Forms.Button fileDirButton;
- protected System.Windows.Forms.Button fileExtensionsbutton;
- protected System.Windows.Forms.Button imageDirButton;
- protected System.Windows.Forms.Label fileExtensionsLabel;
- protected System.Windows.Forms.Label imageDirsLabel;
- protected System.Windows.Forms.Label fileDirLabel;
private System.Windows.Forms.GroupBox filesGroupBox;
- private System.Windows.Forms.GroupBox FileSettingsGroupBox;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
- private System.Windows.Forms.TextBox gamebaseDBTextBox;
- private System.Windows.Forms.Label gamebaseLabel;
- private System.Windows.Forms.Button gamebaseDBButton;
private System.Windows.Forms.OpenFileDialog openFileDialog;
private System.Windows.Forms.CheckedListBox importOptionsCheckedListBox;
+ private System.Windows.Forms.Panel filesettingsPanel;
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -32,6 +32,7 @@
using System.Text;
using System.Windows.Forms;
+using Core.Util;
using GUIPrograms;
using GUIPrograms.Items;
using GUIPrograms.Database;
@@ -42,11 +43,18 @@
{
private List<ApplicationItem> apps = DatabaseHandler.DBHandlerInstance.ApplicationItemList;
public event EventHandler OnRefreshClick;
- private ApplicationItem currentApplication = null;
+ private ApplicationItem currentApplicationItem = null;
public event EventHandler OnImageFolderSearch;
+ private ConditionChecker conditionChecker = new ConditionChecker();
-
+ //globals,, should match enum fileSettings!
+ TextBox fileDirTextBox = null;
+ TextBox imageDirsTextBox = null;
+ TextBox gamebaseDBTextBox = null;
+ TextBox fileExtensionsTextBox = null;
+
+
public string ImportOptionToString(ImportOption importOption)
{
switch (importOption)
@@ -93,25 +101,24 @@
{
if (curApp == null) return;
- currentApplication = curApp;
- if (!currentApplication.filesAreLoaded)
+ currentApplicationItem = curApp;
+ if (!currentApplicationItem.filesAreLoaded)
{
- currentApplication.LoadFiles();
+ currentApplicationItem.LoadFiles();
}
SyncListView();
}
private void SyncListView()
{
- if (currentApplication == null) return;
-
- fileListView.BeginUpdate();
+ if (currentApplicationItem == null) return;
+
try
{
+ fileListView.BeginUpdate();
fileListView.Items.Clear();
-
- foreach (object item in currentApplication.ItemList)
+ foreach (object item in currentApplicationItem.ItemList)
{
// add all filelinks,
// or add all files
@@ -123,19 +130,14 @@
curItem.ImageIndex = 2;
fileListView.Items.Add(curItem);
}
- else if(item is FileItem)
+ else if (item is FileItem)
{
FileItem file = (FileItem)item;
ListViewItem curItem = new ListViewItem(file.Title);
curItem.Tag = file;
- /* if (file.IsFolder)
- {
- curItem.ImageIndex = 0;
- }
- else
- {*/
- curItem.ImageIndex = 1;
- // }
+
+ curItem.ImageIndex = 1;
+
fileListView.Items.Add(curItem);
}
}
@@ -147,7 +149,7 @@
}
SetupFileView();
SyncListViewButtons();
- SyncFilePath();
+ SetFileSettingsTextBoxes();
}
private void SyncListViewButtons()
@@ -162,13 +164,14 @@
if (fileListView.SelectedItems.Count == 1)
{
FileItem file = (FileItem)fileListView.SelectedItems[0].Tag;
+
if (file != null)
{
- // if (!file.IsFolder)
+ // if (!file.IsFolder)
//{
- editButton.Enabled = true;
- deleteButton.Enabled = true;
- launchButton.Enabled = (file.Filename != "");
+ editButton.Enabled = true;
+ deleteButton.Enabled = true;
+ launchButton.Enabled = (file.Filename != "");
//}
}
}
@@ -178,108 +181,85 @@
}
- if (currentApplication != null)
+ if (currentApplicationItem != null)
{
- newButton.Enabled = currentApplication.FileAddAllowed();
- addFavouriteButton.Enabled = currentApplication.FilesCanBeFavourites() && (fileListView.SelectedItems.Count > 0);
-
+ newButton.Enabled = currentApplicationItem.FileAddAllowed();
+ addFavouriteButton.Enabled = currentApplicationItem.FilesCanBeFavourites() && (fileListView.SelectedItems.Count > 0);
}
}
- private void SyncFilePath()
+ private void SetFileSettingsTextBoxes()
{
- this.fileDirTextBox.Text = currentApplication.FileDirectory;
+ if (fileDirTextBox != null)
+ {
+ fileDirTextBox.Text = currentApplicationItem.FileDirectory;
+ }
- if (ProgramUtils.UseThumbsDir())
+ if(imageDirsTextBox != null)
{
- ProgramUtils.GetApplicationImageFolder(currentApplication);
+ if (ProgramUtils.UseThumbsDir())
+ {
+ ProgramUtils.GetApplicationImageFolder(currentApplicationItem);
}
else
{
- string imageDirectorys = string.Join(";", currentApplication.ImageDirsSplitted);
- this.imageDirsTextBox.Text = imageDirectorys;
+ imageDirsTextBox.Text = currentApplicationItem.ImageDirectory;
}
-
- this.fileExtensionsTextBox.Text = currentApplication.ValidExtensions;
- // filePathsLabel.Text = currentApplication.CurrentFilePath().Replace("&", "&&");
+ }
+ if (fileExtensionsTextBox != null)
+ {
+ fileExtensionsTextBox.Text = currentApplicationItem.ValidExtensions;
+ }
+ if (gamebaseDBTextBox != null)
+ {
+ gamebaseDBTextBox.Text = currentApplicationItem.ApplicationItemSource;
+ }
+
+ //filePathsLabel.Text = currentApplicationItem.CurrentFilePath().Replace("&", "&&");
}
public string FileExtensionsText
{
- get { return fileExtensionsTextBox.Text; }
- set { fileExtensionsTextBox.Text = value; }
+ get { return fileExtensionsTextBox.Text; }
+ set { fileExtensionsTextBox.Text = value; }
}
- public bool EntriesOK()
- {//to do
- return true;
-
- /* string error = "The following entries are invalid: \r\n\r\n";
- bool isOk = true;
-
- if(this.fileDirTextBox.Text == "")
- {
- error += System.Environment.NewLine + "No filedirectory entered!";
- isOk = false;
- }
- if (FileExtensionsText == "")
- {
- error += System.Environment.NewLine + "No file extensions entered!";
- isOk = false;
- }
-
- if ((gamebaseDBTextBox.Text == "") && (gamebaseDBTextBox.Visible))
- {
- error += System.Environment.NewLine + "No sourcefile entered!";
- isOk = false;
- }
-
-
- if (!isOk)
- {
- string strFooter = "\r\n\r\n(Click DELETE to remove this item)";
- MessageBox.Show(error + strFooter, "Invalid Entries");
- }
- return isOk;
- */
- }
-
private void AddItem()
{
- FileItem file = new FileItem();
- file.AppID = currentApplication.ApplicationItemId; // CRUCIAL!! :-)
- FileDetailsForm frmFileDetails = new FileDetailsForm();
- frmFileDetails.CurApp = currentApplication;
- frmFileDetails.CurFile = file;
- DialogResult dialogResult = frmFileDetails.ShowDialog(this);
+ FileItem fileItem = new FileItem();
+ fileItem.ApplicationItemId = currentApplicationItem.ApplicationItemId;
+
+ FileDetailsForm fileDetailsForm = new FileDetailsForm();
+ fileDetailsForm.CurrentApplicationItem = currentApplicationItem;
+ fileDetailsForm.CurrentFileItem = fileItem;
+ DialogResult dialogResult = fileDetailsForm.ShowDialog(this);
if (dialogResult == DialogResult.OK)
{
- file.Write();
- currentApplication.LoadFiles();
+ fileItem.Write();
+ currentApplicationItem.LoadFiles();
SyncListView();
}
}
-
private void EditItem()
{
if (fileListView.SelectedItems.Count == 1)
{
- FileItem file = (FileItem)fileListView.SelectedItems[0].Tag;
- if (file != null)
+ FileItem fileItem = (FileItem)fileListView.SelectedItems[0].Tag;
+
+ if (fileItem != null)
{
- FileDetailsForm frmFileDetails = new FileDetailsForm();
- frmFileDetails.CurApp = currentApplication;
- frmFileDetails.CurFile = file;
- DialogResult dialogResult = frmFileDetails.ShowDialog(this);
+ FileDetailsForm fileDetailsForm = new FileDetailsForm();
+ fileDetailsForm.CurrentApplicationItem = currentApplicationItem;
+ fileDetailsForm.CurrentFileItem = fileItem;
+ DialogResult dialogResult = fileDetailsForm.ShowDialog(this);
if (dialogResult == DialogResult.OK)
{
- file.Write();
- currentApplication.LoadFiles();
+ fileItem.Write();
+ currentApplicationItem.LoadFiles();
SyncListView();
}
}
-
}
}
@@ -287,13 +267,15 @@
{
if (fileListView.SelectedItems.Count == 1)
{
- FileItem file = (FileItem)fileListView.SelectedItems[0].Tag;
- if (file != null)
+ FileItem fileItem = (FileItem)fileListView.SelectedItems[0].Tag;
+
+ if (fileItem != null)
{
- currentApplication.LaunchFile(file, false); //launch in non-blocking mode
- if ((currentApplication.LaunchErrorMsg != null) && (currentApplication.LaunchErrorMsg != ""))
+ currentApplicationItem.LaunchFile(fileItem, false); //launch in non-blocking mode
+
+ if ((currentApplicationItem.LaunchErrorMsg != null) && (currentApplicationItem.LaunchErrorMsg != ""))
{
- MessageBox.Show(currentApplication.LaunchErrorMsg, "Launch Error: (check LOG for details)");
+ MessageBox.Show(currentApplicationItem.LaunchErrorMsg, "Launch Error: (check LOG for details)");
}
}
}
@@ -307,10 +289,11 @@
MessageBoxIcon.Question);
if (dialogResult == DialogResult.Yes)
{
- foreach (ListViewItem curItem in fileListView.SelectedItems)
- if (curItem.Tag is FilelinkItem)
+ foreach (ListViewItem listViewItem in fileListView.SelectedItems)
+
+ if (listViewItem.Tag is FilelinkItem)
{
- FilelinkItem filelink = (FilelinkItem)curItem.Tag;
+ FilelinkItem filelink = (FilelinkItem)listViewItem.Tag;
if (filelink != null)
{
filelink.Delete();
@@ -318,7 +301,7 @@
}
else
{
- FileItem file = (FileItem)curItem.Tag;
+ FileItem file = (FileItem)listViewItem.Tag;
if (file != null)
{
file.Delete();
@@ -326,7 +309,7 @@
}
}
}
- currentApplication.LoadFiles();
+ currentApplicationItem.LoadFiles();
SyncListView();
}
@@ -339,29 +322,33 @@
this.addFavouriteButton.Enabled = enabled;
this.internetSearchButton.Enabled = enabled;
this.updateDatabaseButton.Enabled = enabled;
-
}
public bool FirstImageDirectoryValid()
{
if (ProgramUtils.UseThumbsDir()) return true;
- if (this.imageDirsTextBox.Text.Length == 0)
+ if (imageDirsTextBox != null)
{
- return false;
- }
- else
- {
- string firstDirectory = (this.imageDirsTextBox.Text.Split(';'))[0];
- if (firstDirectory == "")
+ if (imageDirsTextBox.Text.Length == 0)
{
return false;
}
else
{
- return System.IO.Directory.Exists(firstDirectory);
+ string firstDirectory = (this.imageDirsTextBox.Text.Split(';'))[0];
+ if (firstDirectory == "")
+ {
+ return false;
+ }
+ else
+ {
+ return System.IO.Directory.Exists(firstDirectory);
+ }
}
}
+ else
+ return false;
}
//scans all files in the fileviewlist
@@ -383,81 +370,71 @@
{
OnImageFolderSearch(this, null);
}
- //get all imagedirs
- /* for (int i = 0; i < currentApplication.imageDirsSplitted.Length; i++)
- {
- if (!currentApplication.imageDirsSplitted[i].ToString().Equals(""))
- {
- imageDirsList.Add(currentApplication.imageDirsSplitted[i]);
- }
- }
- */
-
if (this.imageDirsTextBox.Text != string.Empty)
- {
- string[] imageDirs = this.imageDirsTextBox.Text.Split(';');
- //get all imagedirs
- for (int i = 0; i < imageDirs.Length; i++)
- {
- if (!imageDirs[i].ToString().Equals(""))
- {
- imageDirsList.Add(imageDirs[i]);
- }
- }
+ {
+ string[] imageDirs = this.imageDirsTextBox.Text.Split(';');
+ //get all imagedirs
+ for (int i = 0; i < imageDirs.Length; i++)
+ {
+ if (!imageDirs[i].ToString().Equals(""))
+ {
+ imageDirsList.Add(imageDirs[i]);
+ }
+ }
+
+ try
+ {
+ //if any imagedirs given
+ if (imageDirsList.Count > 0)
+ {
+ //for every dir fiven...
+ foreach (string directory in imageDirsList)
+ {
- try
- {
- //if any imagedirs given
- if (imageDirsList.Count > 0)
- {
- //for every dir fiven...
- foreach (string directory in imageDirsList)
- {
+ DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+ //and for each file in dir
+ if (directoryInfo.Exists)
+ {
+ System.IO.FileInfo[] files = directoryInfo.GetFiles();
- DirectoryInfo directoryInfo = new DirectoryInfo(directory);
- //and for each file in dir
- if (directoryInfo.Exists)
- {
- System.IO.FileInfo[] files = directoryInfo.GetFiles();
+ for (int z = 0; z < currentApplicationItem.ItemList.Count; z++)
+ {
+ bool imageFound = false;
+ string foundImagePath = string.Empty;
+ FileItem fileItem = (FileItem)currentApplicationItem.ItemList[z];
+ string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileItem.Filename);
- for (int z = 0; z < currentApplication.ItemList.Count; z++)
- {
- bool imageFound = false;
- string foundImagePath = string.Empty;
- FileItem fileItem = (FileItem)currentApplication.ItemList[z];
- string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileItem.Filename);
+ //check all files if same name can be found
+ int i = 0;
+ while ((imageFound == false) && (i < files.Length))
+ {
+ if (fileNameWithoutExtension.Equals(Path.GetFileNameWithoutExtension(files[i].ToString())))
+ {
+ //found
+ imageFound = true;
+ foundImagePath = Path.Combine(directory, files[i].ToString());
+ }
+ i++;
+ }
- //check all files if same name can be found
- int i = 0;
- while ((imageFound == false) && (i < files.Length))
- {
- if (fileNameWithoutExtension.Equals(Path.GetFileNameWithoutExtension(files[i].ToString())))
- {
- //found
- imageFound = true;
- foundImagePath = Path.Combine(directory, files[i].ToString());
- }
- i++;
- }
+ // if an image with same name as file was found
+ if (foundImagePath != string.Empty)
+ {
+ fileItem.Imagefile = foundImagePath;
+ fileItem.Write();
- // if an image with same name as file was found
- if (foundImagePath != string.Empty)
- {
- fileItem.Imagefile = foundImagePath;
- fileItem.Write();
-
- }
- }
- }
- }
- }
- }
- catch (Exception ee)
- {
- MessageBox.Show(ee.ToString());
- SetEnabledComponents(true);
- }
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (Exception ee)
+ {
+ MessageBox.Show(ee.ToString());
+ SetEnabledComponents(true);
+ }
}
scanImageDirsButton.Enabled = true;
@@ -485,7 +462,7 @@
if (FirstImageDirectoryValid())
{
FileInfoScraperForm frmScraper = new FileInfoScraperForm();
- frmScraper.CurApp = currentApplication;
+ frmScraper.CurApp = currentApplicationItem;
frmScraper.Setup();
frmScraper.ShowDialog(this);
SyncListView();
@@ -525,13 +502,13 @@
FileItem file = (FileItem)fileListView.SelectedItems[0].Tag;
if (file != null)
{
- // if (file.IsFolder)
+ // if (file.IsFolder)
//{
- //ChangeFilePath(file.Executable); // executable becomes filepath in next view... :)
+ //ChangeFilePath(file.Executable); // executable becomes filepath in next view... :)
//}
//else
//{
- EditItem();
+ EditItem();
//}
}
}
@@ -539,7 +516,7 @@
private void FavouriteGrouperItem_Click(object sender, EventArgs e)
{
- if (currentApplication == null)
+ if (currentApplicationItem == null)
{
return;
}
@@ -552,19 +529,19 @@
// 'MAME' : targetAppID
// 'r-type': fileid
// 'top 20 shooters': GrouperAppID;
- newLink.AppID = GrouperAppID; // the applicationItem where the link belongs
+ newLink.ApplicationItemId = GrouperAppID; // the applicationItem where the link belongs
newLink.FileID = curFile.FileID;
- newLink.TargetAppID = curFile.AppID; // the applicationItem where the launch will effectively happen....
+ newLink.TargetAppID = curFile.ApplicationItemId; // the applicationItem where the launch will effectively happen....
newLink.Filename = curFile.Filename;
newLink.Write();
- // Log.Info("Add to Favourites groupAppID:{0} Title:{1} fileID:{2} appID:{3}", GrouperAppID, currentFileItem.Title, currentFileItem.FileID, currentFileItem.applicationId);
+ // Log.Info("Add to Favourites groupAppID:{0} Title:{1} fileID:{2} applicationItemId:{3}", GrouperAppID, currentFileItem.Title, currentFileItem.FileID, currentFileItem.applicationId);
}
foreach (object app in apps)
{
if (app is ApplicationItemGrouper)
{
- ApplicationItemGrouper appi = (ApplicationItemGrouper) app;
+ ApplicationItemGrouper appi = (ApplicationItemGrouper)app;
if (appi.ApplicationItemId == GrouperAppID)
{
appi.LoadFiles();
@@ -595,7 +572,6 @@
{
if (itemString == item.ToString())
{
-
return true;
}
}
@@ -606,12 +582,12 @@
{
if (applicationItem.ImportValidImagesOnly)
{
- importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.OnlyImportValidImages)),true);
+ importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.OnlyImportValidImages)), true);
}
if (applicationItem.ImportMameMahjong)
{
importOptionsCheckedListBox.SetItemChecked(importOptionsCheckedListBox.Items.IndexOf(ImportOptionToString(ImportOption.ImportMahjongGames)), true);
-
+
}
if (applicationItem.ImportMamePlaychoice10)
{
@@ -625,7 +601,6 @@
}
}
-
}
public void FillApplicationItem(ApplicationItem applicationItem)
@@ -634,29 +609,24 @@
if (!ProgramUtils.UseThumbsDir())
{
- applicationItem.ImageDirectory = imageDirsTextBox.Text;
+ applicationItem.ImageDirectory = (imageDirsTextBox == null) ? "" : imageDirsTextBox.Text;
}
- applicationItem.FileDirectory = fileDirTextBox.Text;
- applicationItem.ValidExtensions = fileExtensionsTextBox.Text;
+ applicationItem.FileDirectory = (fileDirTextBox == null) ? "" : fileDirTextBox.Text;
+ applicationItem.ValidExtensions = (fileExtensionsTextBox == null) ? "" : fileExtensionsTextBox.Text;
-
- if ((currentApplication is ApplicationItemMame) || ((currentApplication is ApplicationItemGameBase)))
- {
- applicationItem.ImportValidImagesOnly = IsItemChecked(ImportOptionToString(ImportOption.OnlyImportValidImages));
- }
+ applicationItem.ApplicationItemSource = (gamebaseDBTextBox == null) ? "" : gamebaseDBTextBox.Text;
- if ((currentApplication is ApplicationItemMame))
+
+ applicationItem.ImportValidImagesOnly = IsItemChecked(ImportOptionToString(ImportOption.OnlyImportValidImages));
+
+ if ((currentApplicationItem is ApplicationItemMame))
{
((ApplicationItemMame)applicationItem).ImportOriginalsOnly = IsItemChecked(ImportOptionToString(ImportOption.OnlyImportOriginals));
applicationItem.ImportMameMahjong = IsItemChecked(ImportOptionToString(ImportOption.ImportMahjongGames));
applicationItem.ImportMamePlaychoice10 = IsItemChecked(ImportOptionToString(ImportOption.ImportPlaychoiceGames));
}
- if ((currentApplication is ApplicationItemGameBase))
- {
- applicationItem.ApplicationItemSource = this.gamebaseDBTextBox.Text;
- }
-
+
}
private void AppFilesView_Load(object sender, EventArgs e)
@@ -665,13 +635,18 @@
toolTip.SetToolTip(fileDirTextBox, "Directorys where to look for files ,seperate with ; \r\n(mandatory)");
toolTip.SetToolTip(fileExtensionsTextBox, "Only files with matching extensions will be displayed. \r\nSeparate several extension" +
"s by a ; (.zip;.txt)\r\n(mandatory)");
+
toolTip.SetToolTip(imageDirsTextBox, "Optional directory where MediaPortal searches for matching images. \r\n MediaPort" +
"al will cycle through all the directories and display a mini-slideshow of all matching images.Separate with a ;");
+
+ if(gamebaseDBTextBox != null)
+ {
+ toolTip.SetToolTip(gamebaseDBTextBox, "Set the path to your gamebaseDB here");
+ }
}
protected void imageDirButton_Click(object sender, EventArgs e)
{
-
if (imageDirsTextBox.Text != "")
{
folderBrowserDialog.SelectedPath = imageDirsTextBox.Lines[0];
@@ -696,76 +671,109 @@
public void SetupFileView()
{
- //by default "dont show these...
-
- this.gamebaseDBTextBox.Visible = false;
- this.gamebaseDBButton.Visible = false;
- this.gamebaseLabel.Visible = false;
-
- //but these..
-
+ //by default show these...
this.scanImageDirsButton.Visible = true;
- this.FileSettingsGroupBox.Visible = true;
+ this.filesettingsPanel.Visible = true;
- if (currentApplication != null)
+ if (currentApplicationItem != null)
{
- if (ProgramUtils.UseThumbsDir())
- imageDirsTextBox.Text = ProgramUtils.GetApplicationImageFolder(currentApplication);
- else
- imageDirsTextBox.Text = currentApplication.ImageDirectory;
- imageDirsTextBox.ReadOnly = ProgramUtils.UseThumbsDir();
- imageDirButton.Visible = !ProgramUtils.UseThumbsDir();
-
- fileDirTextBox.Text = currentApplication.FileDirectory;
- fileExtensionsTextBox.Text = currentApplication.ValidExtensions;
-
-
- if ((currentApplication.ImportOptionList != null) && (currentApplication.ImportOptionList.Count > 0))
+ //fill import options
+ if ((currentApplicationItem.ImportOptionList != null) && (currentApplicationItem.ImportOptionList.Count > 0))
{
importOptionsCheckedListBox.Items.Clear();
importOptionsCheckedListBox.Visible = true;
- foreach (ImportOption importOption in currentApplication.ImportOptionList)
+ foreach (ImportOption importOption in currentApplicationItem.ImportOptionList)
{
importOptionsCheckedListBox.Items.Add(ImportOptionToString(importOption));
}
- CheckImportOption(currentApplication);
+ CheckImportOption(currentApplicationItem);
}
else
{
importOptionsCheckedListBox.Visible = false;
}
- if ((currentApplication is ApplicationItemGameBase))
+ //fill filesettings// just add them
+ int yPosition = 10;
+ if ((currentApplicationItem.FileSettingList != null) && (currentApplicationItem.FileSettingList.Count > 0))
{
- this.gamebaseDBTextBox.Visible = true;
- this.gamebaseDBButton.Visible = true;
- this.gamebaseLabel.Visible = true;
- this.gamebaseDBTextBox.Text = currentApplication.ApplicationItemSource;
+ filesettingsPanel.Controls.Clear();
+ filesettingsPanel.Visible = true;
+
+ foreach (FileSettingOption fileSetting in currentApplicationItem.FileSettingList)
+ {
+ FileSettingsBox fileSettingBox = new FileSettingsBox(fileSetting);
+ fileSettingBox.Location = new Point(0, yPosition);
+ this.filesettingsPanel.Controls.Add(fileSettingBox);
+ yPosition += 32;
+ }
+ SetUpFileSettingsBoxButtonEvents();
}
+ else
+ {
+ filesettingsPanel.Visible = false;
+ }
- if ((currentApplication is ApplicationItemGrouper))
+ if (ProgramUtils.UseThumbsDir())
{
+ imageDirsTextBox.Text = ProgramUtils.GetApplicationImageFolder(currentApplicationItem);
+ ((FileSettingsBox)imageDirsTextBox.Parent).Button.Visible = !ProgramUtils.UseThumbsDir();
+ }
+ else
+ imageDirsTextBox.Text = currentApplicationItem.ImageDirectory;
+
+ fileDirTextBox.Text = currentApplicationItem.FileDirectory;
+ fileExtensionsTextBox.Text = currentApplicationItem.ValidExtensions;
+
+ if ((currentApplicationItem is ApplicationItemGrouper))
+ {
this.scanImageDirsButton.Visible = false;
- this.FileSettingsGroupBox.Visible = false;
+ this.filesettingsPanel.Visible = false;
}
+ }
+ }
+ private void SetUpFileSettingsBoxButtonEvents()
+ {
+ foreach (FileSettingsBox fileSettingBox in filesettingsPanel.Controls)
+ {
+ switch (fileSettingBox.Button.Name)
+ {
+ case "Filefolder(s)" + "Button":
+ fileDirTextBox = fileSettingBox.TextBox;
+ fileSettingBox.Button.Click += new EventHandler(fileDirButton_Click);
+ break;
+ case "Fileextension(s)" + "Button":
+ fileExtensionsTextBox = fileSettingBox.TextBox;
+ fileSettingBox.Button.Click += new EventHandler(this.fileExtensionsbutton_Click);
+ break;
+ case "Gamebase DB" + "Button":
+ gamebaseDBTextBox = fileSettingBox.TextBox;
+ fileSettingBox.Button.Click += new EventHandler(this.gamebaseDBButton_Click);
+ break;
+ case "Imagefolder(s)" + "Button":
+ imageDirsTextBox = fileSettingBox.TextBox;
+ fileSettingBox.Button.Click += new EventHandler(this.imageDirButton_Click);
+ break;
+ default:
+ break;
+ }
}
-
}
protected void fileDirButton_Click(object sender, EventArgs e)
{
- folderBrowserDialog.SelectedPath = this.fileDirTextBox.Text;
+ folderBrowserDialog.SelectedPath = fileDirTextBox.Text;
+
if (folderBrowserDialog.ShowDialog(null) == DialogResult.OK)
{
if (fileDirTextBox.Text == "")
{
- this.fileDirTextBox.Text = folderBrowserDialog.SelectedPath;
-
+ fileDirTextBox.Text = folderBrowserDialog.SelectedPath;
}
else
{
- this.fileDirTextBox.Text = fileDirTextBox.Text + ";" + folderBrowserDialog.SelectedPath;
+ fileDirTextBox.Text = fileDirTextBox.Text + ";" + folderBrowserDialog.SelectedPath;
}
}
}
@@ -828,13 +836,11 @@
List<string> pathIniList = new List<string>();
string line;
- if (File.Exists(this.gamebaseDBTextBox.Text))
+ if (File.Exists(gamebaseDBTextBox.Text))
{
string pathIniFile = Path.GetDirectoryName(gamebaseDBTextBox.Text) + "\\Paths.ini";
if (File.Exists(pathIniFile))
{
-
-
using (StreamReader streamReader = File.OpenText(pathIniFile))
{
while ((line = streamReader.ReadLine()) != null)
@@ -911,8 +917,8 @@
{
gamebaseDBTextBox.Text = openFileDialog.FileName;
}
+
SetSourceDirectories();
-
}
}
}
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.resx 2007-08-21 23:00:30 UTC (rev 851)
@@ -175,13 +175,13 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>353, 17</value>
</metadata>
- <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>353, 17</value>
- </metadata>
<metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>443, 17</value>
</metadata>
<metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>606, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>52</value>
+ </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -112,21 +112,21 @@
// set tooltip-stuff.....
toolTip.SetToolTip(titleTextBox, "This text will appear in the listitem of MediaPortal\r\n(mandatory)");
- toolTip.SetToolTip(shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ toolTip.SetToolTip(shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\n Omit the \"Launching Application\" in this case.");
toolTip.SetToolTip(quoteCheckBox, "Quotes are usually needed to handle filenames with spaces correctly. \r\nAvoid double" + " quotes though!");
toolTip.SetToolTip(startupDirComboBox, "Optional path that is passed as the launch-directory \r\n\r\n(advanced hint: Use %FILEDIR" +
- "% if you want to use the directory where the launched file is stored)");
+ "% if you want to use the directory where the launched fileItem is stored)");
toolTip.SetToolTip(winStyleComboBox, "Appearance of the launched program. \r\nTry HIDDEN or MINIMIZED for a seamless integr" + "ation in MediaPortal");
toolTip.SetToolTip(applicationArgumentsTextBox, "Optional arguments that are needed to launch the program \r\n\r\n(advanced hint: Use %FIL" +
"E% if the filename needs to be placed in some specific place between several arg" + "uments)");
toolTip.SetToolTip(applicationImageTextBox, "Optional filename for an image to display in MediaPortal");
toolTip.SetToolTip(enabledCheckbox, "Only enabled items will appear in MediaPortal");
toolTip.SetToolTip(applicationExeTextBox, "Program you wish to execute, include the full path (mandatory if ShellExecute is " + "OFF)");
- toolTip.SetToolTip(allowRefreshCheckBox, "Check this if users can run the import through the REFRESH button in MediaPortal.");
- toolTip.SetToolTip(this.preCommandTextBox, "Configure an command to run as pre of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
+ toolTip.SetToolTip(allowRefreshCheckBox, "If you want to be able to run the import through the REFRESH button in MediaPortal.");
+ toolTip.SetToolTip(preCommandTextBox, "Configure an command to run as pre of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
toolTip.SetToolTip(postCommandTextBox, "Configure an command to run as post of the main filelaunching ie explorer; joy2key; etc .Separate with ;.");
-
+ toolTip.SetToolTip(waitExitCheckBox, "If you want mediaportal to wait for exit while running application.");
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -42,7 +42,7 @@
//
// shellexecuteCheckBox
//
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
// applicationArgumentsLabel
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -42,7 +42,7 @@
// shellexecuteCheckBox
//
this.shellexecuteCheckBox.Location = new System.Drawing.Point(7, 338);
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
// waitExitCheckBox
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGrouper.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -40,7 +40,7 @@
//
// shellexecuteCheckBox
//
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
// applicationArgumentsLabel
@@ -61,7 +61,7 @@
// startupDirTextBox
//
this.toolTip.SetToolTip(this.startupDirComboBox, "Optional path that is passed as the launch-directory \r\n\r\n(advanced hint: Use %FIL" +
- "EDIR% if you want to use the directory where the launched file is stored)");
+ "EDIR% if you want to use the directory where the launched fileItem is stored)");
//
// quoteCheckBox
//
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -45,7 +45,7 @@
//
// shellexecuteCheckBox
//
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific file-" +
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
"extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
// applicationArgumentsLabel
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.Designer.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -94,7 +94,7 @@
this.buttonViewImg.Name = "buttonViewImg";
this.buttonViewImg.Size = new System.Drawing.Size(31, 23);
this.buttonViewImg.TabIndex = 64;
- this.toolTip1.SetToolTip(this.buttonViewImg, "View the default image for this file");
+ this.toolTip1.SetToolTip(this.buttonViewImg, "View the default image for this fileItem");
this.buttonViewImg.UseVisualStyleBackColor = true;
this.buttonViewImg.Click += new System.EventHandler(this.buttonViewImg_Click);
//
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -46,13 +46,13 @@
private ConditionChecker conditionChecker;
- public ApplicationItem CurApp
+ public ApplicationItem CurrentApplicationItem
{
get { return m_CurApp; }
set { m_CurApp = value; }
}
- public FileItem CurFile
+ public FileItem CurrentFileItem
{
get { return m_CurFile; }
set { m_CurFile = value; }
@@ -68,13 +68,13 @@
private void updateDisplay()
{
- gbFileDetails.Text = CurApp.Title + ": " + CurFile.Title;
+ gbFileDetails.Text = CurrentApplicationItem.Title + ": " + CurrentFileItem.Title;
txtTitle.Text = m_CurFile.Title;
txtFilename.Text = m_CurFile.Filename;
if (ProgramUtils.UseThumbsDir())
{
- txtImageFile.Text = ProgramUtils.GetFileImage(CurApp, CurFile);
+ txtImageFile.Text = ProgramUtils.GetFileImage(CurrentApplicationItem, CurrentFileItem);
}
else
{
@@ -82,7 +82,7 @@
}
FileItemToGenre();
- manufacturerComboBox.SelectedValue = CurFile.ManufacturerId;
+ manufacturerComboBox.SelectedValue = CurrentFileItem.ManufacturerId;
//txtManufacturer.Text = m_CurFile.Manufacturer;
txtYear.Text = m_CurFile.Year.ToString();
@@ -215,7 +215,7 @@
private bool EntriesOK()
{
conditionChecker.Clear();
- conditionChecker.DoCheck(CurFile.Title != "", "No title entered!");
+ conditionChecker.DoCheck(CurrentFileItem.Title != "", "No title entered!");
//01.04.05 no executable is FINE :-) conditionChecker.DoCheck(CurFile.Executable != "", "No executable entered!");
if (!conditionChecker.IsOk)
{
@@ -228,29 +228,29 @@
void FileItemToGenre()
{
- genreComboBox.SelectedValue = CurFile.GenreId;
- genreStyleComboBox.SelectedValue = CurFile.GenreStyleId;
- manufacturerComboBox.SelectedValue = CurFile.ManufacturerId;
- systemComboBox.SelectedValue = CurFile.PlatformId;
+ genreComboBox.SelectedValue = CurrentFileItem.GenreId;
+ genreStyleComboBox.SelectedValue = CurrentFileItem.GenreStyleId;
+ manufacturerComboBox.SelectedValue = CurrentFileItem.ManufacturerId;
+ systemComboBox.SelectedValue = CurrentFileItem.PlatformId;
}
private void btnOk_Click(object sender, EventArgs e)
{
- CurFile.Title = txtTitle.Text;
- CurFile.Filename = txtFilename.Text;
+ CurrentFileItem.Title = txtTitle.Text;
+ CurrentFileItem.Filename = txtFilename.Text;
if (!ProgramUtils.UseThumbsDir())
- CurFile.Imagefile = txtImageFile.Text;
+ CurrentFileItem.Imagefile = txtImageFile.Text;
// CurFile.Genre = genreComboBox.SelectedText;
- CurFile.GenreId = (int)genreComboBox.SelectedValue;
+ CurrentFileItem.GenreId = (int)genreComboBox.SelectedValue;
//CurFile.GenreStyle = genreStyleComboBox.SelectedText;
- CurFile.GenreStyleId = (int)genreStyleComboBox.SelectedValue;
- CurFile.ManufacturerId = (int)manufacturerComboBox.SelectedValue;
- CurFile.Year = ProgramUtils.StringToInteger(txtYear.Text, -1);
- CurFile.Rating = cbRating.SelectedIndex;
- CurFile.Country = txtCountry.Text;
- CurFile.PlatformId = (int)systemComboBox.SelectedValue;
- CurFile.Overview = txtOverview.Text;
- CurFile.GameInfoURL = this.gameinfoURLTextBox.Text;
+ CurrentFileItem.GenreStyleId = (int)genreStyleComboBox.SelectedValue;
+ CurrentFileItem.ManufacturerId = (int)manufacturerComboBox.SelectedValue;
+ CurrentFileItem.Year = ProgramUtils.StringToInteger(txtYear.Text, -1);
+ CurrentFileItem.Rating = cbRating.SelectedIndex;
+ CurrentFileItem.Country = txtCountry.Text;
+ CurrentFileItem.PlatformId = (int)systemComboBox.SelectedValue;
+ CurrentFileItem.Overview = txtOverview.Text;
+ CurrentFileItem.GameInfoURL = this.gameinfoURLTextBox.Text;
if (EntriesOK())
{
this.DialogResult = DialogResult.OK;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-21 18:41:02 UTC (rev 850)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs 2007-08-21 23:00:30 UTC (rev 851)
@@ -347,7 +347,7 @@
strTimeRemaining = String.Format(" ({0}m {1}s remaining)", nMinutesRemaining, nSecondsRemaining);
}
- toolStripStatusLabel...
[truncated message content] |
