0004122: Folder.jpg displays (recommended) and is default setting for…

… Music Thumbs in ConfigurationTool and GUI Settings
MediaPortal · Jan 24, 2013 · 0c68054 · 0c68054
1 parent 9bb9a4b
commit 0c68054
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 65 deletions.
diff --git a/mediaportal/Configuration/Sections/MusicDatabase.cs b/mediaportal/Configuration/Sections/MusicDatabase.cs
@@ -160,10 +160,10 @@ public override void LoadSettings()
     {
       using (Settings xmlreader = new MPSettings())
       {
-        buildThumbsCheckBox.Checked = xmlreader.GetValueAsBool("musicfiles", "extractthumbs", false);
+        buildThumbsCheckBox.Checked = xmlreader.GetValueAsBool("musicfiles", "extractthumbs", true);
         checkBoxCreateArtist.Checked = xmlreader.GetValueAsBool("musicfiles", "createartistthumbs", false);
         checkBoxCreateGenre.Checked = xmlreader.GetValueAsBool("musicfiles", "creategenrethumbs", true);
-        checkBoxUseFolderThumb.Checked = xmlreader.GetValueAsBool("musicfiles", "useFolderThumbs", true);
+        checkBoxUseFolderThumb.Checked = xmlreader.GetValueAsBool("musicfiles", "useFolderThumbs", false);
         checkBoxAllImages.Checked = xmlreader.GetValueAsBool("musicfiles", "useAllImages",
                                                              checkBoxUseFolderThumb.Checked);
         folderAsAlbumCheckBox.Checked = xmlreader.GetValueAsBool("musicfiles", "treatFolderAsAlbum", false);
@@ -378,22 +378,22 @@ private void InitializeComponent()
       // checkBoxUseFolderThumb
       // 
       this.checkBoxUseFolderThumb.AutoSize = true;
-      this.checkBoxUseFolderThumb.Checked = true;
-      this.checkBoxUseFolderThumb.CheckState = System.Windows.Forms.CheckState.Checked;
       this.checkBoxUseFolderThumb.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.checkBoxUseFolderThumb.Location = new System.Drawing.Point(15, 22);
+      this.checkBoxUseFolderThumb.Location = new System.Drawing.Point(15, 68);
       this.checkBoxUseFolderThumb.Name = "checkBoxUseFolderThumb";
-      this.checkBoxUseFolderThumb.Size = new System.Drawing.Size(143, 17);
+      this.checkBoxUseFolderThumb.Size = new System.Drawing.Size(67, 17);
       this.checkBoxUseFolderThumb.TabIndex = 4;
-      this.checkBoxUseFolderThumb.Text = "folder.jpg (recommended)";
+      this.checkBoxUseFolderThumb.Text = "folder.jpg";
       this.checkBoxUseFolderThumb.UseVisualStyleBackColor = true;
       this.checkBoxUseFolderThumb.CheckedChanged += new System.EventHandler(this.checkBoxUseFolderThumb_CheckedChanged);
       // 
       // buildThumbsCheckBox
       // 
       this.buildThumbsCheckBox.AutoSize = true;
+      this.buildThumbsCheckBox.Checked = true;
+      this.buildThumbsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
       this.buildThumbsCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-      this.buildThumbsCheckBox.Location = new System.Drawing.Point(15, 68);
+      this.buildThumbsCheckBox.Location = new System.Drawing.Point(15, 22);
       this.buildThumbsCheckBox.Name = "buildThumbsCheckBox";
       this.buildThumbsCheckBox.Size = new System.Drawing.Size(177, 17);
       this.buildThumbsCheckBox.TabIndex = 6;

diff --git a/mediaportal/MediaPortal.Base/language/strings_en.xml b/mediaportal/MediaPortal.Base/language/strings_en.xml
@@ -2270,7 +2270,7 @@
     <String id="300166">Strip artist prefix (The Who -&gt; Who, The)</String>
     <String id="300167">Treat tracks in folder as an album</String>
     <String id="300168">Use for thumb creation</String>
-    <String id="300169">folder.jpg (recommended)</String>
+    <String id="300169">folder.jpg</String>
     <String id="300170">*.png, *jpg (prefers front cover)</String>
     <String id="300171">Cover art embedded in ID3-Tags</String>
     <String id="300172">Create genre preview thumbs</String>

diff --git a/mediaportal/MediaPortal.Base/skin/Default/settings_MyMusic_Database.xml b/mediaportal/MediaPortal.Base/skin/Default/settings_MyMusic_Database.xml
@@ -87,7 +87,7 @@
         <onup>17</onup>
         <ondown>11</ondown>
         <onleft>2</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Create scan date</description>
@@ -101,7 +101,7 @@
         <onup>14</onup>
         <ondown>12</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Only update by new date</description>
@@ -115,7 +115,7 @@
         <onup>11</onup>
         <ondown>13</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Auto update</description>
@@ -129,7 +129,7 @@
         <onup>12</onup>
         <ondown>3</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Strip prefixes button</description>
@@ -145,7 +145,7 @@
         <onup>13</onup>
         <ondown>4</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Treat tracks</description>
@@ -159,9 +159,9 @@
         <onleft>
         </onleft>
         <onup>3</onup>
-        <ondown>5</ondown>
+        <ondown>7</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
     </control>
     <control>
@@ -200,20 +200,20 @@
       <posX>502</posX>
       <posY>160</posY>
       <layout>StackLayout</layout>
-      <control>
-        <description>All extensions</description>
+			<control>
+        <description>Cover art in ID3</description>
         <type>checkbutton</type>
-        <id>5</id>
-        <label>300169</label>
+        <id>7</id>
+        <label>300171</label>
         <posX>52</posX>
-        <posY>435</posY>
+        <posY>505</posY>
         <width>375</width>
         <font>font10</font>
         <onup>4</onup>
         <ondown>6</ondown>
         <onleft>14</onleft>
         <onright>17</onright>
-      </control>
+      </control>      
       <control>
         <description>All extensions</description>
         <type>checkbutton</type>
@@ -225,18 +225,18 @@
         <font>font10</font>
         <onleft>
         </onleft>
-        <onup>5</onup>
-        <ondown>7</ondown>
+        <onup>7</onup>
+        <ondown>5</ondown>
         <onleft>14</onleft>
         <onright>17</onright>
       </control>
       <control>
-        <description>Cover art in ID3</description>
+        <description>folder.jpg</description>
         <type>checkbutton</type>
-        <id>7</id>
-        <label>300171</label>
+        <id>5</id>
+        <label>300169</label>
         <posX>52</posX>
-        <posY>505</posY>
+        <posY>435</posY>
         <width>375</width>
         <font>font10</font>
         <onup>6</onup>
@@ -253,7 +253,7 @@
         <posY>540</posY>
         <width>375</width>
         <font>font10</font>
-        <onup>7</onup>
+        <onup>5</onup>
         <ondown>9</ondown>
         <onleft>14</onleft>
         <onright>17</onright>

diff --git a/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_MyMusic_Database.xml b/mediaportal/MediaPortal.Base/skin/DefaultWide/settings_MyMusic_Database.xml
@@ -87,7 +87,7 @@
         <onup>2</onup>
         <ondown>11</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Create scan date</description>
@@ -101,7 +101,7 @@
         <onup>14</onup>
         <ondown>12</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Only update by new date</description>
@@ -115,7 +115,7 @@
         <onup>11</onup>
         <ondown>13</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Auto update</description>
@@ -129,7 +129,7 @@
         <onup>12</onup>
         <ondown>3</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Strip prefixes button</description>
@@ -145,7 +145,7 @@
         <onup>13</onup>
         <ondown>4</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
       <control>
         <description>Treat tracks</description>
@@ -158,9 +158,9 @@
         <font>font10</font>
         <onleft></onleft>
         <onup>3</onup>
-        <ondown>5</ondown>
+        <ondown>7</ondown>
         <onleft>17</onleft>
-        <onright>5</onright>
+        <onright>7</onright>
       </control>
     </control>
     <control>
@@ -200,20 +200,20 @@
       <posX>670</posX>
       <posY>160</posY>
       <layout>StackLayout</layout>
-      <control>
-        <description>All extensions</description>
+			<control>
+        <description>Cover art in ID3</description>
         <type>checkbutton</type>
-        <id>5</id>
-        <label>300169</label>
+        <id>7</id>
+        <label>300171</label>
         <posX>70</posX>
-        <posY>435</posY>
+        <posY>505</posY>
         <width>400</width>
         <font>font10</font>
         <onup>4</onup>
         <ondown>6</ondown>
         <onleft>14</onleft>
         <onright>17</onright>
-      </control>
+      </control>      
       <control>
         <description>All extensions</description>
         <type>checkbutton</type>
@@ -224,18 +224,18 @@
         <width>400</width>
         <font>font10</font>
         <onleft></onleft>
-        <onup>5</onup>
-        <ondown>7</ondown>
+        <onup>7</onup>
+        <ondown>5</ondown>
         <onleft>14</onleft>
         <onright>17</onright>
       </control>
       <control>
-        <description>Cover art in ID3</description>
+        <description>folder.jpg</description>
         <type>checkbutton</type>
-        <id>7</id>
-        <label>300171</label>
+        <id>5</id>
+        <label>300169</label>
         <posX>70</posX>
-        <posY>505</posY>
+        <posY>435</posY>
         <width>400</width>
         <font>font10</font>
         <onup>6</onup>
@@ -252,7 +252,7 @@
         <posY>540</posY>
         <width>400</width>
         <font>font10</font>
-        <onup>7</onup>
+        <onup>5</onup>
         <ondown>9</ondown>
         <onleft>14</onleft>
         <onright>17</onright>

diff --git a/mediaportal/MediaPortal.Base/skin/Titan/settings_MyMusic_Database.xml b/mediaportal/MediaPortal.Base/skin/Titan/settings_MyMusic_Database.xml
@@ -263,7 +263,7 @@
       <onleft>11</onleft>			
       <onright>2</onright>
       <onup>4</onup>
-      <ondown>5</ondown>			
+      <ondown>7</ondown>			
 			<animation effect="fade" time="150">WindowOpen</animation>
 			<animation effect="fade" time="150">WindowClose</animation>					
     </control>
@@ -281,19 +281,18 @@
 			<animation effect="fade" time="150">WindowClose</animation>						
     </control>
 
-
-		<control Style="SettingsCheckButtonMedium">
-      <description>All extensions</description>
+  	<control Style="SettingsCheckButtonMedium">
+      <description>Cover art in ID3</description>
       <type>checkbutton</type>
-      <id>5</id>
-      <label>300169</label>
+      <id>7</id>
+      <label>300171</label>
       <posX>655</posX>
       <posY>796</posY>
-      <onup>14</onup>
+			<onup>14</onup>
       <ondown>6</ondown>
 			<animation effect="fade" time="150">WindowOpen</animation>
 			<animation effect="fade" time="150">WindowClose</animation>	
-    </control>
+    </control>		
 
 		<control Style="SettingsCheckButtonMedium">
       <description>All extensions</description>
@@ -303,17 +302,17 @@
       <posX>655</posX>
       <posY>861</posY>
       <onleft></onleft>
-      <onup>5</onup>
-      <ondown>7</ondown>
+      <onup>7</onup>
+      <ondown>5</ondown>
 			<animation effect="fade" time="150">WindowOpen</animation>
 			<animation effect="fade" time="150">WindowClose</animation>	
     </control>
 
 		<control Style="SettingsCheckButtonMedium">
-      <description>Cover art in ID3</description>
+      <description>folder jpg</description>
       <type>checkbutton</type>
-      <id>7</id>
-      <label>300171</label>
+      <id>5</id>
+      <label>300169</label>
       <posX>655</posX>
       <posY>926</posY>
       <onup>6</onup>
@@ -329,7 +328,7 @@
       <label>300172</label>
       <posX>1240</posX>
       <posY>796</posY>
-      <onup>7</onup>
+      <onup>5</onup>
       <ondown>9</ondown>
 			<animation effect="fade" time="150">WindowOpen</animation>
 			<animation effect="fade" time="150">WindowClose</animation>	
@@ -355,6 +354,7 @@
       <label>300174</label>
       <posX>1240</posX>
       <posY>926</posY>
+			<onup>9</onup>
       <ondown>11</ondown>
 			<animation effect="fade" time="150">WindowOpen</animation>
 			<animation effect="fade" time="150">WindowClose</animation>	

diff --git a/mediaportal/WindowPlugins/GUISettings/MyMusic/GUISettingsMusic_Database.cs b/mediaportal/WindowPlugins/GUISettings/MyMusic/GUISettingsMusic_Database.cs
@@ -88,10 +88,10 @@ private void LoadSettings()
     {
       using (Profile.Settings xmlreader = new Profile.MPSettings())
       {
-        btnExtractthumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "extractthumbs", false);
+        btnExtractthumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "extractthumbs", true);
         btnCreateartistthumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "createartistthumbs", false);
         btnCreategenrethumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "creategenrethumbs", true);
-        btnUseFolderThumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "useFolderThumbs", true);
+        btnUseFolderThumbs.Selected = xmlreader.GetValueAsBool("musicfiles", "useFolderThumbs", false);
         btnUseAllImages.Selected = xmlreader.GetValueAsBool("musicfiles", "useAllImages",
                                                              btnUseFolderThumbs.Selected);
         btnTreatFolderAsAlbum.Selected = xmlreader.GetValueAsBool("musicfiles", "treatFolderAsAlbum", false);