Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [629] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-06-25 20:29:13
|
Revision: 629
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=629&view=rev
Author: northern_sky
Date: 2007-06-25 13:28:17 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
db: removed unneccesary patches. merged dbsetting and dbhandler
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsRoot.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -41,15 +41,14 @@
namespace GUIPrograms.Database
{
/// <summary>
- /// Summary description for DBPrograms.
+ /// DBhandling methods
/// </summary>
public class DatabaseHandler
{
public static SQLiteClient sqlDB = null;
static ApplicationItemList applicationItemList = null;
- static ProgramViewHandler viewHandler = null;
+ static private ProgramViewHandler viewHandler = null;
-
// singleton. Dont allow any instance of this class
private DatabaseHandler() { }
@@ -65,36 +64,19 @@
catch (Exception) { }
sqlDB = new SQLiteClient(Config.GetFile(Config.Dir.Database, "myProgramsAltDatabaseV1.db3"));
-
MediaPortal.Database.DatabaseUtility.SetPragmas(sqlDB);
- DatabaseSettings.sqlDB = sqlDB;
// make sure the DB-structure is complete
- CreateObjects();
- // patch old ContentID values...
- PatchContentID();
+ CreateDBTables();
-
- // patch old values, which were made empty by old versions...
- PatchEmptyValues();
-
- // patch genre-values
- PatchGenreValues();
- // remove trigger
- PatchAppTrigger();
- // add PreLaunch / PostLaunch fields
- PatchPrePostLaunch();
- // dirty hack: propagate the sqliteClient to the singleton objects...
- DatabaseSettings.sqlDB = sqlDB;
}
catch (SQLiteException ex)
{
Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
}
- viewHandler = new ProgramViewHandler();
- DatabaseSettings.viewHandler = viewHandler;
- applicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
+ ViewHandler = new ProgramViewHandler();
+ applicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
}
static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
@@ -106,175 +88,114 @@
}
}
-
- static bool ObjectExists(string strName, string strType)
+ /// <summary>
+ /// Create db tables etc,if not already exist
+ /// </summary>
+ /// <returns></returns>
+ static bool CreateDBTables()
{
- SQLiteResultSet results;
- bool res = false;
-
- results = sqlDB.Execute(@"
- SELECT
- name
-
- FROM
- sqlite_master
-
- WHERE
- name='" + strName + @"'
-
- AND type='" + strType + @"'
-
- UNION ALL
-
- SELECT
- name
-
- FROM
- sqlite_temp_master
-
- WHERE
- type='" + strType + @"'
-
- ORDER BY name");
-
- if (results != null && results.Rows.Count > 0)
- {
- if (results.Rows.Count == 1)
- {
- SQLiteResultSet.Row arr = results.Rows[0];
- if (arr.fields.Count == 1)
- {
- if (arr.fields[0] == strName)
- {
- res = true;
- }
- }
- }
- }
- return res;
- }
-
-
- static bool AddObject(string strName, string strType, string strSQL)
- // checks if object exists and returns true if it newly added the object
- {
if (sqlDB == null)
return false;
- if (ObjectExists(strName, strType))
- return false;
- try
- {
- sqlDB.Execute(strSQL);
- }
- catch (SQLiteException ex)
- {
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
- return false;
- }
- return true;
- }
-
- static bool CreateObjects()
- {
- bool skipPrePostPatch = false;
-
- if (sqlDB == null)
- return false;
-
- skipPrePostPatch = DatabaseUtility.AddTable(sqlDB, "tblApplicationItem", "CREATE TABLE tblApplicationItem (appid integer primary key, fatherID integer, title text, shorttitle text, filename text, arguments text, windowstyle text, startupdir text, useshellexecute text, usequotes text, source_type text, source text, imagefile text, filedirectory text, imagedirectory text, validextensions text, enabled text, importvalidimagesonly text, iposition integer, enableGUIRefresh text, GUIRefreshPossible text, contentID integer, systemdefault text, waitforexit text, preLaunch text, postLaunch text)");
+ DatabaseUtility.AddTable(sqlDB, "tblApplicationItem", "CREATE TABLE tblApplicationItem (appid integer primary key, fatherID integer, title text, shorttitle text, filename text, arguments text, windowstyle text, startupdir text, useshellexecute text, usequotes text, source_type text, source text, imagefile text, filedirectory text, imagedirectory text, validextensions text, enabled text, importvalidimagesonly text, iposition integer, enableGUIRefresh text, GUIRefreshPossible text, contentID integer, systemdefault text, waitforexit text, preLaunch text, postLaunch text)");
DatabaseUtility.AddTable(sqlDB, "tblFileItem", "CREATE TABLE tblFileItem (fileid integer primary key, appid integer, title text, filename text, imagefile text, mainGenre text, subGenre text, country text, manufacturer text, year integer, rating integer, overview text, system text, import_flag integer, manualfilename text, lastTimeLaunched text, launchcount integer, isfolder text, external_id integer, uppertitle text, tagdata text, categorydata text, gameInfoUrl text)");
DatabaseUtility.AddTable(sqlDB, "tblFilterItem", "CREATE TABLE tblFilterItem (appid integer, grouperAppID integer, fileID integer, filename text, tag integer)");
DatabaseUtility.AddTable(sqlDB, "tblSetting", "CREATE TABLE tblSetting (settingid integer primary key, key text, value text)");
+
DatabaseUtility.AddIndex(sqlDB, "idxFile1", "CREATE INDEX idxFile1 ON tblFileItem(appid)");
DatabaseUtility.AddIndex(sqlDB, "idxApp1", "CREATE INDEX idxApp1 ON tblApplicationItem(fatherID)");
DatabaseUtility.AddIndex(sqlDB, "idxFilterItem1", "CREATE UNIQUE INDEX idxFilterItem1 ON tblFilterItem(appID, fileID, grouperAppID)");
- if (skipPrePostPatch)
- {
- // don't need to add prelaunch / postlaunch anymore if table was created above
- DatabaseSettings.WriteSetting(ProgramUtils.cPREPOST_PATCH, "DONE");
- }
-
return true;
}
- static void PatchContentID()
+ static public string ReadSetting(string Key)
{
- if (sqlDB == null)
- return;
+ SQLiteResultSet results;
+ string res = null;
+ string SQL = @"
+ SELECT
+ value
+
+ FROM
+ tblSetting
+
+ WHERE
+ key ='" + Key + "'";
- if (!DatabaseSettings.KeyExists(ProgramUtils.cCONTENT_PATCH))
+ results = sqlDB.Execute(SQL);
+
+ if (results != null && results.Rows.Count > 0)
{
- Log.Info("myPrograms: applying contentID-patch");
- sqlDB.Execute("UPDATE tblApplicationItem SET contentID = 100 WHERE contentID IS NULL");
- sqlDB.Execute("UPDATE tblApplicationItem SET contentID = 100 WHERE contentID <= 0");
- DatabaseSettings.WriteSetting(ProgramUtils.cCONTENT_PATCH, "DONE");
+ SQLiteResultSet.Row arr = results.Rows[0];
+ res = arr.fields[0];
}
+ //Log.Info("dw read setting key:{0}\nvalue:{1}", Key, applicationItem);
+ return res;
}
- static void PatchEmptyValues()
+ static int CountKey(string Key)
{
- if (sqlDB == null)
- return;
+ SQLiteResultSet results;
+ int res = 0;
+ results = sqlDB.Execute(@"
+ SELECT
+ COUNT(*)
+
+ FROM
+ tblSetting
+
+ WHERE key ='" + Key + "'");
- Log.Info("myPrograms: applying empty-value-patch");
- sqlDB.Execute("UPDATE tblFileItem SET launchcount = 0 WHERE launchcount = ''");
- sqlDB.Execute("UPDATE tblFileItem SET launchcount = 0 WHERE launchcount <= 0");
- sqlDB.Execute("UPDATE tblFileItem SET lastTimeLaunched = '01.01.0001 00:00:00' WHERE lastTimeLaunched = ''");
+ if (results != null && results.Rows.Count > 0)
+ {
+ SQLiteResultSet.Row arr = results.Rows[0];
+ res = Int32.Parse(arr.fields[0]);
+ }
+ return res;
}
- static void PatchGenreValues()
+ static public bool KeyExists(string Key)
{
- if (sqlDB == null)
- return;
- if (!DatabaseSettings.KeyExists(ProgramUtils.cGENRE_PATCH))
- {
- Log.Info("myPrograms: applying genre-patch");
- sqlDB.Execute("UPDATE tblFileItem SET mainGenre = '' WHERE mainGenre IS NULL");
- sqlDB.Execute("UPDATE tblFileItem SET subGenre = '' WHERE subGenre IS NULL");
- DatabaseSettings.WriteSetting(ProgramUtils.cGENRE_PATCH, "DONE");
- }
+ return (CountKey(Key) > 0);
}
- // trigger prevents sqlitev3 client from deleting globalApplicationList....
- static void PatchAppTrigger()
+ static public void WriteSetting(string Key, string Value)
{
- if (sqlDB == null)
- return;
- if (ObjectExists("td_application", "trigger"))
+ if (KeyExists(Key))
{
- try
- {
- sqlDB.Execute("drop trigger td_application");
- }
- catch (SQLiteException ex)
- {
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
- }
+ sqlDB.Execute(@"
+ UPDATE
+ tblSetting
+
+ SET
+ value = '" + Value + @"'
+
+ WHERE
+ key = '" + Key + "'");
}
+ else
+ {
+ sqlDB.Execute(@"
+ INSERT INTO
+ tblSetting (key, value)
+
+ VALUES('" + Key + "', '" + Value + "')");
+ }
}
- static void PatchPrePostLaunch()
+ static public void DeleteSetting(string Key)
{
- if (sqlDB == null)
- return;
- if (!DatabaseSettings.KeyExists(ProgramUtils.cPREPOST_PATCH))
- {
- try
- {
- Log.Info("myPrograms: adding preLaunch / postLaunch fields");
- sqlDB.Execute("ALTER TABLE tblApplicationItem ADD COLUMN preLaunch TEXT");
- sqlDB.Execute("ALTER TABLE tblApplicationItem ADD COLUMN postLaunch TEXT");
- DatabaseSettings.WriteSetting(ProgramUtils.cPREPOST_PATCH, "DONE");
- }
- catch (SQLiteException ex)
- {
- Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
- }
- }
+ sqlDB.Execute("DELETE FROM tblSetting WHERE key = '" + Key + "'");
}
+ public static ProgramViewHandler ViewHandler
+ {
+ get { return viewHandler; }
+ set { viewHandler = value; }
+ }
+
+
static public ApplicationItemList ApplicationItemList
{
get
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsRoot.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsRoot.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsRoot.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -88,7 +88,7 @@
public override bool AppItemToForm(ApplicationItem curApp)
{
base.AppItemToForm(curApp);
- titleTextBox.Text = DatabaseSettings.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ titleTextBox.Text = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
if (titleTextBox.Text == "")
{
// PluginTitle.Text = GUILocalizeStrings.Get(0);
@@ -104,11 +104,11 @@
{
if ((titleTextBox.Text != ""))
{
- DatabaseSettings.WriteSetting(ProgramUtils.cPLUGINTITLE, titleTextBox.Text);
+ DatabaseHandler.WriteSetting(ProgramUtils.cPLUGINTITLE, titleTextBox.Text);
}
else
{
- DatabaseSettings.DeleteSetting(ProgramUtils.cPLUGINTITLE);
+ DatabaseHandler.DeleteSetting(ProgramUtils.cPLUGINTITLE);
}
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -627,7 +627,12 @@
{
strYear = String.Format("{0}", Year);
}
+ else
+ {
+ strYear = "-1";
+ }
+
try
{
string strSQL = String.Format(
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -147,7 +147,7 @@
//Debugger.Launch();
if (sqlDB == null)
return;
- if (DatabaseSettings.viewHandler == null)
+ if (DatabaseHandler.ViewHandler == null)
return;
try
@@ -157,7 +157,7 @@
return;
SQLiteResultSet results;
filePath = pathSubfolders;
- string sqlQuery = DatabaseSettings.viewHandler.BuildQuery(appID, pathSubfolders);
+ string sqlQuery = DatabaseHandler.ViewHandler.BuildQuery(appID, pathSubfolders);
// Log.Info("dw \n{0}", sqlQuery);
results = sqlDB.Execute(sqlQuery);
if (results.Rows.Count == 0)
@@ -165,7 +165,7 @@
for (int curRow = 0; curRow < results.Rows.Count; curRow++)
{
- if (DatabaseSettings.viewHandler.IsFilterQuery)
+ if (DatabaseHandler.ViewHandler.IsFilterQuery)
{
ProgramFilterItem curFilter = DBGetFilterItem(results, curRow);
Add(curFilter);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -69,7 +69,7 @@
/// false : plugin does not need its own button on home</returns>
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- string strText = DatabaseSettings.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ string strText = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
if ((strText != "") && (strText != null))
{
strButtonText = strText;
@@ -278,7 +278,7 @@
}
xmlwriter.SetValue("myprograms", "lastAppID", mapSettings.LastAppID.ToString());
// xmlwriter.SetValue("myprograms", "lastViewLevel", mapSettings.LastViewLevel.ToString());
- xmlwriter.SetValue("myprograms", "lastViewLevel", DatabaseSettings.viewHandler.CurrentLevel);
+ xmlwriter.SetValue("myprograms", "lastViewLevel", DatabaseHandler.ViewHandler.CurrentLevel);
xmlwriter.SetValue("myprograms", "sortby", mapSettings.SortBy);
// avoid bool conversion...... don't wanna know why it doesn't work! :-(
if (mapSettings.SortAscending)
@@ -306,7 +306,7 @@
void LoadSettings()
{
- string _slideSpeed = DatabaseSettings.ReadSetting(ProgramUtils.cSLIDESPEED);
+ string _slideSpeed = DatabaseHandler.ReadSetting(ProgramUtils.cSLIDESPEED);
if ((_slideSpeed != "") && (_slideSpeed != null))
{
slideSpeed = int.Parse(_slideSpeed);
@@ -452,7 +452,7 @@
lastFilepath = lastApp.DefaultFilepath();
lastApp.CurrentSortIndex = mapSettings.SortBy;
lastApp.CurrentSortIsAscending = mapSettings.SortAscending;
- DatabaseSettings.viewHandler.CurrentLevel = mapSettings.LastViewLevel;
+ DatabaseHandler.ViewHandler.CurrentLevel = mapSettings.LastViewLevel;
}
else
{
@@ -523,12 +523,12 @@
{//maybe we can remove this property, not sure if we would need it
get
{
- if (DatabaseSettings.viewHandler.View == null)
+ if (DatabaseHandler.ViewHandler.View == null)
return Layout.List;
if (layout == null)
{
- layout = new Layout[DatabaseSettings.viewHandler.Views.Count, 50];
+ layout = new Layout[DatabaseHandler.ViewHandler.Views.Count, 50];
List<String> viewStrings = new List<String>();
viewStrings.Add("List");
@@ -536,11 +536,11 @@
viewStrings.Add("Big Icons");
viewStrings.Add("Filmstrip");
- for (int i = 0; i < DatabaseSettings.viewHandler.Views.Count; ++i)
+ for (int i = 0; i < DatabaseHandler.ViewHandler.Views.Count; ++i)
{
- for (int j = 0; j < DatabaseSettings.viewHandler.Views[i].Filters.Count; ++j)
+ for (int j = 0; j < DatabaseHandler.ViewHandler.Views[i].Filters.Count; ++j)
{
- FilterDefinition def = (FilterDefinition)DatabaseSettings.viewHandler.Views[i].Filters[j];
+ FilterDefinition def = (FilterDefinition)DatabaseHandler.ViewHandler.Views[i].Filters[j];
int defaultView = viewStrings.IndexOf(def.DefaultView);
if (defaultView != -1)
@@ -551,11 +551,11 @@
}
}
- return layout[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel];
+ return layout[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel];
}
set
{
- layout[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel] = value;
+ layout[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel] = value;
}
}
@@ -563,28 +563,28 @@
{
get
{
- if (DatabaseSettings.viewHandler.View == null)
+ if (DatabaseHandler.ViewHandler.View == null)
return true;
if (sortasc == null)
{
- sortasc = new bool[DatabaseSettings.viewHandler.Views.Count, 50];
+ sortasc = new bool[DatabaseHandler.ViewHandler.Views.Count, 50];
- for (int i = 0; i < DatabaseSettings.viewHandler.Views.Count; ++i)
+ for (int i = 0; i < DatabaseHandler.ViewHandler.Views.Count; ++i)
{
- for (int j = 0; j < DatabaseSettings.viewHandler.Views[i].Filters.Count; ++j)
+ for (int j = 0; j < DatabaseHandler.ViewHandler.Views[i].Filters.Count; ++j)
{
- FilterDefinition def = (FilterDefinition)DatabaseSettings.viewHandler.Views[i].Filters[j];
+ FilterDefinition def = (FilterDefinition)DatabaseHandler.ViewHandler.Views[i].Filters[j];
sortasc[i, j] = def.SortAscending;
}
}
}
- return sortasc[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel];
+ return sortasc[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel];
}
set
{
- sortasc[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel] = value;
+ sortasc[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel] = value;
}
}
@@ -592,12 +592,12 @@
{
get
{
- if (DatabaseSettings.viewHandler.View == null)
+ if (DatabaseHandler.ViewHandler.View == null)
return ProgramSort.SortMethod.Name;
if (sortby == null)
{
- sortby = new ProgramSort.SortMethod[DatabaseSettings.viewHandler.Views.Count, 50];
+ sortby = new ProgramSort.SortMethod[DatabaseHandler.ViewHandler.Views.Count, 50];
List<String> sortStrings = new List<String>();
sortStrings.Add("Name");
@@ -607,11 +607,11 @@
sortStrings.Add("LaunchCount");
sortStrings.Add("LastTimeLaunched");
- for (int i = 0; i < DatabaseSettings.viewHandler.Views.Count; ++i)
+ for (int i = 0; i < DatabaseHandler.ViewHandler.Views.Count; ++i)
{
- for (int j = 0; j < DatabaseSettings.viewHandler.Views[i].Filters.Count; ++j)
+ for (int j = 0; j < DatabaseHandler.ViewHandler.Views[i].Filters.Count; ++j)
{
- FilterDefinition def = (FilterDefinition)DatabaseSettings.viewHandler.Views[i].Filters[j];
+ FilterDefinition def = (FilterDefinition)DatabaseHandler.ViewHandler.Views[i].Filters[j];
int defaultSort = sortStrings.IndexOf(def.DefaultSort);
if (defaultSort != -1)
@@ -622,11 +622,11 @@
}
}
- return sortby[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel];
+ return sortby[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel];
}
set
{
- sortby[DatabaseSettings.viewHandler.Views.IndexOf(DatabaseSettings.viewHandler.View), DatabaseSettings.viewHandler.CurrentLevel] = value;
+ sortby[DatabaseHandler.ViewHandler.Views.IndexOf(DatabaseHandler.ViewHandler.View), DatabaseHandler.ViewHandler.CurrentLevel] = value;
}
}
@@ -698,7 +698,7 @@
protected override void OnPageLoad()
{
string view = CurrentView;
- DatabaseSettings.viewHandler.CurrentView = view;
+ DatabaseHandler.ViewHandler.CurrentView = view;
base.OnPageLoad();
InitMyPrograms();
}
@@ -860,16 +860,16 @@
void UpdateButtons()
{
- GUIPropertyManager.SetProperty("#view", DatabaseSettings.viewHandler.LocalizedCurrentView);
+ GUIPropertyManager.SetProperty("#view", DatabaseHandler.ViewHandler.LocalizedCurrentView);
btnViewAs.Label = mapSettings.ViewAsText;
btnRefresh.IsVisible = RefreshButtonVisible();
// display apptitle if available.....
if (lastApp != null)
{
- if ((DatabaseSettings.viewHandler.CurrentView != null) && (DatabaseSettings.viewHandler.MaxLevels > 0))
+ if ((DatabaseHandler.ViewHandler.CurrentView != null) && (DatabaseHandler.ViewHandler.MaxLevels > 0))
{
- GUIPropertyManager.SetProperty("#curheader", DatabaseSettings.viewHandler.LocalizedCurrentView);
+ GUIPropertyManager.SetProperty("#curheader", DatabaseHandler.ViewHandler.LocalizedCurrentView);
}
else
{
@@ -878,7 +878,7 @@
}
else
{
- string strText = DatabaseSettings.ReadSetting(ProgramUtils.cPLUGINTITLE);
+ string strText = DatabaseHandler.ReadSetting(ProgramUtils.cPLUGINTITLE);
if ((strText != "") && (strText != null))
{
GUIPropertyManager.SetProperty("#curheader", strText);
@@ -1043,13 +1043,13 @@
void SaveItemIndex(string value, ApplicationItem app, string pathSub)
{
- string key = BuildHistoryKey(app, DatabaseSettings.viewHandler.CurrentLevel, pathSub);
+ string key = BuildHistoryKey(app, DatabaseHandler.ViewHandler.CurrentLevel, pathSub);
itemHistory.Set(value, key);
}
void RestoreItemIndex(ApplicationItem app, string pathSub)
{
- string key = BuildHistoryKey(app, DatabaseSettings.viewHandler.CurrentLevel, pathSub);
+ string key = BuildHistoryKey(app, DatabaseHandler.ViewHandler.CurrentLevel, pathSub);
string itemHist = itemHistory.Get(key);
if (itemHist != "")
{
@@ -1077,14 +1077,14 @@
}
else
{
- if (DatabaseSettings.viewHandler.RemoveFilterItem())
+ if (DatabaseHandler.ViewHandler.RemoveFilterItem())
{
ProgramFilterItem curFilter;
// force reload, this will load the next filter-level.....
lastApp.LoadFiles();
// auto-remove filters if there is only ONE EMPTY Filteritem
// displaying
- bool doAutoRemove = ((lastApp.Files.Count == 1) && (DatabaseSettings.viewHandler.IsFilterQuery));
+ bool doAutoRemove = ((lastApp.Files.Count == 1) && (DatabaseHandler.ViewHandler.IsFilterQuery));
while (doAutoRemove)
{
doAutoRemove = false;
@@ -1093,10 +1093,10 @@
curFilter = lastApp.Files[0] as ProgramFilterItem;
if ((curFilter.Title == "") && (curFilter.Title2 == ""))
{
- if (DatabaseSettings.viewHandler.RemoveFilterItem())
+ if (DatabaseHandler.ViewHandler.RemoveFilterItem())
{
lastApp.LoadFiles();
- doAutoRemove = ((lastApp.Files.Count == 1) && (DatabaseSettings.viewHandler.IsFilterQuery));
+ doAutoRemove = ((lastApp.Files.Count == 1) && (DatabaseHandler.ViewHandler.IsFilterQuery));
}
}
}
@@ -1158,7 +1158,7 @@
lastApp = candidate;
mapSettings.LastAppID = lastApp.AppID;
lastFilepath = lastApp.DefaultFilepath();
- DatabaseSettings.viewHandler.CurrentLevel = 0;
+ DatabaseHandler.ViewHandler.CurrentLevel = 0;
}
else if (item.MusicTag is FileItem)
@@ -1197,14 +1197,14 @@
{
ProgramFilterItem curFilter;
SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, lastFilepath);
- DatabaseSettings.viewHandler.AddFilterItem(item.MusicTag as ProgramFilterItem);
+ DatabaseHandler.ViewHandler.AddFilterItem(item.MusicTag as ProgramFilterItem);
if (lastApp != null)
{
// force reload, this will load the next filter-level.....
lastApp.LoadFiles();
// check if the next filter is only displaying ONE EMPTY item
// if yes, autoselect this filteritem
- bool doAutoSelect = ((lastApp.Files.Count == 1) && (DatabaseSettings.viewHandler.IsFilterQuery));
+ bool doAutoSelect = ((lastApp.Files.Count == 1) && (DatabaseHandler.ViewHandler.IsFilterQuery));
while (doAutoSelect)
{
doAutoSelect = false;
@@ -1213,9 +1213,9 @@
curFilter = lastApp.Files[0] as ProgramFilterItem;
if ((curFilter.Title == "") && (curFilter.Title2 == ""))
{
- DatabaseSettings.viewHandler.AddFilterItem(curFilter);
+ DatabaseHandler.ViewHandler.AddFilterItem(curFilter);
lastApp.LoadFiles();
- doAutoSelect = ((lastApp.Files.Count == 1) && (DatabaseSettings.viewHandler.IsFilterQuery));
+ doAutoSelect = ((lastApp.Files.Count == 1) && (DatabaseHandler.ViewHandler.IsFilterQuery));
}
}
}
@@ -1393,7 +1393,7 @@
dlg.Reset();
dlg.SetHeading(499); // Actions
dlg.Add(GUILocalizeStrings.Get(100000 + GetID)); // Files
- foreach (ViewDefinition view in DatabaseSettings.viewHandler.Views)
+ foreach (ViewDefinition view in DatabaseHandler.ViewHandler.Views)
{
dlg.Add(view.LocalizedName);
}
@@ -1404,7 +1404,7 @@
int nNewWindow = (int)Window.WINDOW_FILES;
StartWindow = nNewWindow;
CurrentView = "";
- DatabaseSettings.viewHandler.CurrentView = null;
+ DatabaseHandler.ViewHandler.CurrentView = null;
if (nNewWindow != GetID)
{
GUIWindowManager.ReplaceWindow(nNewWindow);
@@ -1412,9 +1412,9 @@
}
else
{
- ViewDefinition selectedView = (ViewDefinition)DatabaseSettings.viewHandler.Views[dlg.SelectedLabel - 1];
+ ViewDefinition selectedView = (ViewDefinition)DatabaseHandler.ViewHandler.Views[dlg.SelectedLabel - 1];
CurrentView = selectedView.Name;
- DatabaseSettings.viewHandler.CurrentView = selectedView.Name;
+ DatabaseHandler.ViewHandler.CurrentView = selectedView.Name;
int nNewWindow = (int)Window.WINDOW_FILES;
if (GetID != nNewWindow)
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-06-25 13:58:05 UTC (rev 628)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-06-25 20:28:17 UTC (rev 629)
@@ -107,10 +107,8 @@
public const string cSLIDESPEED = "SLIDESPEED";
public const string cPLUGINTITLE = "PLUGINTITLE";
- public const string cCONTENT_PATCH = "CONTENTPATCH";
- public const string cGENRE_PATCH = "GENREPATCH";
- public const string cPREPOST_PATCH = "PREPOSTPATCH";
+
#endregion Variables
#region Constructor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
