- tweak Custom TreeViewOfd

RocksmithTookitGUI/BetaInfo.rtf

@@ -1,12 +1,12 @@
 {\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
-{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Microsoft Sans Serif;}{\f74\froman\fcharset238\fprq2 Times New Roman CE;}{\f75\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f77\froman\fcharset161\fprq2 Times New Roman Greek;}
-{\f78\froman\fcharset162\fprq2 Times New Roman Tur;}{\f79\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f80\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f81\froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\f82\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f94\fmodern\fcharset238\fprq1 Courier New CE;}{\f95\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f97\fmodern\fcharset161\fprq1 Courier New Greek;}
-{\f98\fmodern\fcharset162\fprq1 Courier New Tur;}{\f99\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f100\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f101\fmodern\fcharset186\fprq1 Courier New Baltic;}
-{\f102\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f434\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f435\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f437\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
-{\f438\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f439\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f440\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f441\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
-{\f442\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f443\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
+{\f36\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Microsoft Sans Serif;}{\f38\froman\fcharset238\fprq2 Times New Roman CE;}{\f39\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f41\froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f42\froman\fcharset162\fprq2 Times New Roman Tur;}{\f43\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f44\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f45\froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f46\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f58\fmodern\fcharset238\fprq1 Courier New CE;}{\f59\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f61\fmodern\fcharset161\fprq1 Courier New Greek;}
+{\f62\fmodern\fcharset162\fprq1 Courier New Tur;}{\f63\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f64\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f65\fmodern\fcharset186\fprq1 Courier New Baltic;}
+{\f66\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f398\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f399\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f401\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
+{\f402\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f403\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f404\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f405\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
+{\f406\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f407\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
 \red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
 {\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
 \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
@@ -62,16 +62,20 @@
 \levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
 \leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1685859046}}{\*\listoverridetable{\listoverride\listid845022685\listoverridecount0\ls1}{\listoverride\listid359166142
 \listoverridecount0\ls2}{\listoverride\listid1333413571\listoverridecount0\ls3}{\listoverride\listid1685859046\listoverridecount0\ls4}{\listoverride\listid338965384\listoverridecount0\ls5}{\listoverride\listid1120688297\listoverridecount0\ls6}}
-{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1596048\rsid2703131\rsid3495053\rsid6300002\rsid8091389\rsid9002083\rsid11038411\rsid12549519\rsid13593537\rsid13643383\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info
-{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo10\dy9\hr10\min1}{\version16}{\edmins27}{\nofpages1}{\nofwords306}{\nofchars1745}{\*\company Cozumel}{\nofcharsws2047}{\vern16389}}
-\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot13643383 \fet0\sectd 
-\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4
-\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}
-{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 
-\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f36\fs22\cf1\insrsid13643383 This beta update of the toolkit contains some minor changes.  
+{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1596048\rsid2703131\rsid3495053\rsid6300002\rsid8091389\rsid8338931\rsid9002083\rsid10357349\rsid11038411\rsid12549519\rsid13112591\rsid13593537\rsid13643383\rsid13981760\rsid14635904\rsid15667500}
+{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo10\dy10\hr12\min14}{\version19}{\edmins30}{\nofpages1}{\nofwords317}{\nofchars1812}{\*\company Cozumel}
+{\nofcharsws2125}{\vern16389}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot13643383 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
+\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
+\ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f36\fs22\cf1\insrsid13643383 This beta update of the toolkit contains some minor changes.  
 \par }{\b\f36\fs22\ul\cf13\insrsid13643383 
 \par What's new for the toolkit:
 \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid15667500 {\b\f36\fs22\ul\cf13\insrsid15667500 
+\par {\listtext\pard\plain\f3\fs20\cf1\insrsid8338931 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid8338931 Save most recent \lquote 
+Default Project }{\f36\fs20\cf1\insrsid10357349 Folder}{\f36\fs20\cf1\insrsid8338931 \rquote }{\f36\fs20\cf1\insrsid13112591  to Configuration}{\f36\fs20\cf1\insrsid8338931  }{\f36\fs20\cf1\insrsid10357349 from}{\f36\fs20\cf1\insrsid8338931  \lquote 
+Quick Add\rquote .}{\f3\fs20\cf1\insrsid8338931\charrsid8338931 
+\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid8338931 {\f3\fs20\cf1\insrsid8338931\charrsid8338931 
 \par {\listtext\pard\plain\f3\fs20\cf1\insrsid15667500 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid15667500 
 Added volume validation check when loading data.}{\f3\fs20\cf1\insrsid15667500\charrsid15667500 
 \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid15667500 {\f3\fs20\cf1\insrsid15667500\charrsid15667500 

RocksmithTookitGUI/Config/ConfigGlobals.cs

@@ -10,7 +10,7 @@ namespace RocksmithToolkitGUI.Config
     public static class ConfigGlobals
     {
         public static string DefaultToneFile { get; set; }
-        public static string DefaultProjectDir { get; set; }
+        public static string DefaultProjectFolder { get; set; }
         public static Logger Log { get; set; }
         public static bool IsUnitTest { get; set; }
     }

RocksmithTookitGUI/DLCPackageCreator/ArrangementForm.cs

@@ -958,15 +958,15 @@ private void btnBrowseXml_Click(object sender, EventArgs e)
         {
             using (var ofd = new OpenFileDialog())
             {
-                ofd.InitialDirectory = ConfigGlobals.DefaultProjectDir;
+                ofd.InitialDirectory = ConfigGlobals.DefaultProjectFolder;
                 ofd.Filter = "Rocksmith EOF XML Files (*.xml)|*.xml";
                 if (ofd.ShowDialog() != DialogResult.OK)
                 {
                     return;
                 }
 
                 XmlPath = ofd.FileName;
-                ConfigGlobals.DefaultProjectDir = Path.GetDirectoryName(XmlPath);
+                ConfigGlobals.DefaultProjectFolder = Path.GetDirectoryName(XmlPath);
 
                 if (IsAlreadyAdded(XmlPath))
                 {
@@ -1033,7 +1033,7 @@ private void btnOk_Click(object sender, EventArgs e)
                 return;
 
             LoadArrangementData(XmlPath);
-            ConfigGlobals.DefaultProjectDir = Path.GetDirectoryName(XmlPath);
+            ConfigGlobals.DefaultProjectFolder = Path.GetDirectoryName(XmlPath);
             DialogResult = DialogResult.OK;
             Close();
         }

RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs

@@ -1555,13 +1555,12 @@ private void SelectComboAppId(string appId)
 
         private void ReadConfigSettings()
         {
-            // read from RocksmithToolkitLib.Config.xml
             try
             {
                 numAudioQuality.Value = ConfigRepository.Instance().GetDecimal("creator_qualityfactor");
                 fixLowBass = ConfigRepository.Instance().GetBoolean("creator_fixlowbass");
                 fixMultiTone = ConfigRepository.Instance().GetBoolean("creator_fixmultitone");
-                ConfigGlobals.DefaultProjectDir = ConfigRepository.Instance()["creator_defaultproject"];
+                ConfigGlobals.DefaultProjectFolder = ConfigRepository.Instance()["creator_defaultproject"];
                 ConfigGlobals.DefaultToneFile = ConfigRepository.Instance()["creator_defaulttone"];
                 CurrentGameVersion = (GameVersion)Enum.Parse(typeof(GameVersion), ConfigRepository.Instance()["general_defaultgameversion"]);
                 var defaultPlatform = (GamePlatform)Enum.Parse(typeof(GamePlatform), ConfigRepository.Instance()["general_defaultplatform"]);
@@ -1983,13 +1982,13 @@ private void btnTemplateLoad_Click(object sender, EventArgs e)
             string dlcTemplatePath;
             using (var ofd = new OpenFileDialog())
             {
-                ofd.InitialDirectory = ConfigGlobals.DefaultProjectDir;
+                ofd.InitialDirectory = ConfigGlobals.DefaultProjectFolder;
                 ofd.SupportMultiDottedExtensions = true;
                 ofd.Filter = CurrentRocksmithTitle + " CDLC Template (*.dlc.xml)|*.dlc.xml";
                 if (ofd.ShowDialog() != DialogResult.OK)
                     return;
 
-                dlcTemplatePath = ConfigGlobals.DefaultProjectDir = ofd.FileName;
+                dlcTemplatePath = ConfigGlobals.DefaultProjectFolder = ofd.FileName;
             }
 
             UnpackedDir = Path.GetDirectoryName(dlcTemplatePath);
@@ -2204,6 +2203,7 @@ public void GeneratePackage(object sender, DoWorkEventArgs e)
 
         }
 
+        // capture listbox special keys
         private void ListBox_KeyDown(object sender, KeyEventArgs e)
         {
             var control = (ListBox)sender;
@@ -2382,16 +2382,19 @@ private void btnArrangementQuick_Click(object sender, EventArgs e)
             // use new Custom TreeViewOfd to keep arrangements in correct selected order
             using (var ofd = new TreeViewOfd())
             {
-                ofd.InitialDirectory = ConfigGlobals.DefaultProjectDir;
+                ofd.InitialDirectory = ConfigGlobals.DefaultProjectFolder;
                 ofd.Title = "Multiselect XML Arrangements and Arrange Order ...";
                 ofd.Filter = "Rocksmith Arrangement XML Files (*.xml)|*.xml|All Files (*.*)|*.*";
                 ofd.Multiselect = true;
 
                 if (ofd.ShowDialog() != DialogResult.OK)
                     return;
 
+                // save last visited project folder (InitialDirectory) to configuration
+                ConfigGlobals.DefaultProjectFolder = ofd.InitialDirectory;
+                ConfigRepository.Instance()["creator_defaultproject"] = ofd.InitialDirectory;
+
                 List<string> xmlFilePaths = ofd.FileNames;
-                ConfigGlobals.DefaultProjectDir = ofd.InitialDirectory;
                 AddArrangementsQuick(xmlFilePaths.ToArray());
             }
         }

RocksmithTookitGUI/Program.cs

@@ -46,8 +46,9 @@ static void Main(string[] args)
                 String.Format("OS: {0} ({1} bit)\r\n ", Environment.OSVersion, Environment.Is64BitOperatingSystem ? "64" : "32") +
                 String.Format(".NET Framework Runtime: v{0}\r\n ", Environment.Version) +
                 String.Format("JIT: {0}\r\n ", JitVersionInfo.GetJitVersion()) +
-                String.Format("Wine: {0}", GeneralExtensions.IsWine())
-            );
+                String.Format("WINE_INSTALLED: {0}\r\n ", GeneralExtensions.IsWine()) +
+                String.Format("MacOSX: {0}\r\n ", Environment.OSVersion.Platform == PlatformID.MacOSX)
+                );
 
             if (!Environment.Version.ToString().Contains("4.0.30319") &&
                 ConfigRepository.Instance().GetBoolean("general_firstrun"))

RocksmithTookitGUI/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
 [assembly: AssemblyVersion("2.9.1.0")]
-[assembly: AssemblyInformationalVersion("75a42866")]
+[assembly: AssemblyInformationalVersion("24b96b12")]
 [assembly: AssemblyConfiguration("BETA")]

RocksmithToolkitLib/Extensions/TreeViewBrowser.cs

@@ -12,13 +12,13 @@
 namespace RocksmithToolkitLib.Extensions
 {
     /// <summary>
-    /// A Custom TreeView Browser by Cozy1
+    /// Custom TreeView Browser by Cozy1
     /// </summary>
     public class TreeViewBrowser : TreeView
     {
         #region TreeViewBrowser Code
-        // some credit goes here: https://github.com/ItsEddie/system-explorer-treeview
-        
+        // some code from: https://github.com/ItsEddie/system-explorer-treeview
+
         // set variables here for debugging
         private bool enableEventHandlers = true;
         private bool enableOverrides = true;
@@ -71,18 +71,12 @@ public static extern IntPtr SHGetFileInfo(string pszPath,
         public List<string> DefaultFolders
         {
             get { return defaultFolders; }
-            set
-            {
-                defaultFolders = value;
-
-                //if (!IsDesignerHosted)
-                //    InitTreeViewBrowser();
-            }
+            set { defaultFolders = value; }
         }
 
         private string initialDirectory = "";
         /// <summary>
-        /// Gets/Sets the TreeView starup state InitialDirectory
+        /// Gets/Sets the TreeView startup state InitialDirectory
         /// </summary>
         public string InitialDirectory
         {
@@ -382,7 +376,7 @@ public void Dispose()
         #endregion
 
         #region TreeViewMultiselect Code
-        // some credit goes here: https://www.codeproject.com/Articles/2756/C-TreeView-with-multiple-selection
+        // some code from: https://www.codeproject.com/Articles/2756/C-TreeView-with-multiple-selection
 
         protected override void OnPaint(PaintEventArgs pe)
         {