Skip to content

Commit be8ec4a

Browse files
neumathoneumatho
committed
Updated module info window info tab to use themes.
1 parent 02da0ec commit be8ec4a

12 files changed

Lines changed: 254 additions & 122 deletions

File tree

‎Source/Clients/NostalgicPlayer/Windows/FavoriteSongSystemWindow/FavoriteSongSystemForm.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.IO;
99
using System.Linq;
1010
using System.Windows.Forms;
11-
using Krypton.Toolkit;
1211
using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
1312
using Polycode.NostalgicPlayer.Client.GuiPlayer.Controls;
1413
using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
@@ -202,9 +201,9 @@ public void RefreshWindow()
202201

203202
row.Cells.AddRange(
204203
[
205-
new KryptonDataGridViewTextBoxCell { Value = pos },
206-
new KryptonDataGridViewTextBoxCell { Value = fileName },
207-
new KryptonDataGridViewTextBoxCell { Value = pair.Value.ListenCount }
204+
new DataGridViewTextBoxCell { Value = pos },
205+
new DataGridViewTextBoxCell { Value = fileName },
206+
new DataGridViewTextBoxCell { Value = pair.Value.ListenCount }
208207
]);
209208

210209
row.Tag = pair.Key;

‎Source/Clients/NostalgicPlayer/Windows/ModuleInfoWindow/Pages/InfoPageControl.Designer.cs‎

Lines changed: 13 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Clients/NostalgicPlayer/Windows/ModuleInfoWindow/Pages/InfoPageControl.cs‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/******************************************************************************/
66
using System.Diagnostics;
77
using System.Windows.Forms;
8-
using Krypton.Toolkit;
98
using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
109
using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
1110
using Polycode.NostalgicPlayer.Kit.Containers;
@@ -49,15 +48,15 @@ public void InitControl(IMainWindowApi mainWindowApi, ModuleInfoWindowSettings s
4948
this.mainWindowApi = mainWindowApi;
5049

5150
// Add the columns to the controls
52-
moduleInfoInfoDataGridView.Columns.Add(new KryptonDataGridViewTextBoxColumn
51+
moduleInfoDataGridView.Columns.Add(new DataGridViewTextBoxColumn
5352
{
5453
Name = Resources.IDS_MODULE_INFO_COLUMN_DESCRIPTION,
5554
Resizable = DataGridViewTriState.True,
5655
SortMode = DataGridViewColumnSortMode.NotSortable,
5756
Width = settings.Column1Width
5857
});
5958

60-
moduleInfoInfoDataGridView.Columns.Add(new KryptonDataGridViewTextBoxColumn
59+
moduleInfoDataGridView.Columns.Add(new DataGridViewTextBoxColumn
6160
{
6261
Name = Resources.IDS_MODULE_INFO_COLUMN_VALUE,
6362
Resizable = DataGridViewTriState.True,
@@ -75,8 +74,8 @@ public void InitControl(IMainWindowApi mainWindowApi, ModuleInfoWindowSettings s
7574
/********************************************************************/
7675
public void SaveSettings(ModuleInfoWindowSettings settings)
7776
{
78-
settings.Column1Width = moduleInfoInfoDataGridView.Columns[0].Width;
79-
settings.Column2Width = moduleInfoInfoDataGridView.Columns[1].Width;
77+
settings.Column1Width = moduleInfoDataGridView.Columns[0].Width;
78+
settings.Column2Width = moduleInfoDataGridView.Columns[1].Width;
8079
}
8180

8281

@@ -88,7 +87,7 @@ public void SaveSettings(ModuleInfoWindowSettings settings)
8887
/********************************************************************/
8988
public void RefreshControl(bool isPlaying, ModuleInfoStatic staticInfo, ModuleInfoFloating floatingInfo)
9089
{
91-
moduleInfoInfoDataGridView.Rows.Clear();
90+
moduleInfoDataGridView.Rows.Clear();
9291

9392
// Check to see if there are any module loaded at the moment
9493
PlaylistFileInfo fileInfo;
@@ -102,59 +101,59 @@ public void RefreshControl(bool isPlaying, ModuleInfoStatic staticInfo, ModuleIn
102101
if (string.IsNullOrEmpty(val))
103102
val = fileInfo.DisplayName;
104103

105-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TITLE, val);
104+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TITLE, val);
106105

107106
val = staticInfo.Author;
108107
if (string.IsNullOrEmpty(val))
109108
val = Resources.IDS_MODULE_INFO_UNKNOWN;
110109

111-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_AUTHOR, val);
110+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_AUTHOR, val);
112111

113-
int row = moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULEFORMAT, staticInfo.Format);
114-
moduleInfoInfoDataGridView.Rows[row].Cells[1] = new KryptonDataGridViewTextBoxCell { Value = moduleInfoInfoDataGridView.Rows[row].Cells[1].Value, ToolTipText = string.Join("\r\n", staticInfo.FormatDescription.SplitIntoLines(moduleInfoInfoDataGridView.Handle, 400, moduleInfoInfoDataGridView.Font)) };
112+
int row = moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULEFORMAT, staticInfo.Format);
113+
moduleInfoDataGridView.Rows[row].Cells[1] = new DataGridViewTextBoxCell { Value = moduleInfoDataGridView.Rows[row].Cells[1].Value, ToolTipText = string.Join("\r\n", staticInfo.FormatDescription.SplitIntoLines(moduleInfoDataGridView.Handle, 400, moduleInfoDataGridView.Font)) };
115114

116-
row = moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_ACTIVEPLAYER, staticInfo.PlayerName);
117-
moduleInfoInfoDataGridView.Rows[row].Cells[1] = new KryptonDataGridViewTextBoxCell { Value = moduleInfoInfoDataGridView.Rows[row].Cells[1].Value, ToolTipText = string.Join("\r\n", staticInfo.PlayerDescription.SplitIntoLines(moduleInfoInfoDataGridView.Handle, 400, moduleInfoInfoDataGridView.Font)) };
115+
row = moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_ACTIVEPLAYER, staticInfo.PlayerName);
116+
moduleInfoDataGridView.Rows[row].Cells[1] = new DataGridViewTextBoxCell { Value = moduleInfoDataGridView.Rows[row].Cells[1].Value, ToolTipText = string.Join("\r\n", staticInfo.PlayerDescription.SplitIntoLines(moduleInfoDataGridView.Handle, 400, moduleInfoDataGridView.Font)) };
118117

119-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_CHANNELS, staticInfo.Channels);
118+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_CHANNELS, staticInfo.Channels);
120119

121120
if (floatingInfo.DurationInfo == null)
122121
val = Resources.IDS_MODULE_INFO_UNKNOWN;
123122
else
124123
val = floatingInfo.DurationInfo.TotalTime.ToFormattedString();
125124

126-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TIME, val);
125+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TIME, val);
127126

128127
showingFileName = false;
129128

130129
if (fileInfo.Type != PlaylistFileInfo.FileType.Audius)
131130
{
132131
if (fileInfo.Type == PlaylistFileInfo.FileType.Url)
133132
{
134-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_URL, fileInfo.Source);
133+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_URL, fileInfo.Source);
135134
firstCustomLine++;
136135
}
137136
else
138137
{
139138
val = string.Format(Resources.IDS_MODULE_INFO_ITEM_MODULESIZE_VALUE, staticInfo.ModuleSize.ToBeautifiedString());
140-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULESIZE, val);
139+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULESIZE, val);
141140
firstCustomLine++;
142141

143142
if (staticInfo.DecruncherAlgorithms != null)
144143
{
145144
val = staticInfo.CrunchedSize == -1 ? Resources.IDS_MODULE_INFO_UNKNOWN : string.Format(Resources.IDS_MODULE_INFO_ITEM_PACKEDSIZE_VALUE, staticInfo.CrunchedSize);
146-
val += string.Format(" / {0}", string.Join(" \u2b95 ", staticInfo.DecruncherAlgorithms));
145+
val += string.Format(" / {0}", string.Join(" ⮕ ", staticInfo.DecruncherAlgorithms));
147146

148-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_PACKEDSIZE, val);
147+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_PACKEDSIZE, val);
149148
firstCustomLine++;
150149
}
151150

152151
if (Env.IsWindows10S)
153-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, fileInfo.Source);
152+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, fileInfo.Source);
154153
else
155154
{
156-
row = moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, fileInfo.Source);
157-
moduleInfoInfoDataGridView.Rows[row].Cells[1] = new KryptonDataGridViewLinkCell { Value = moduleInfoInfoDataGridView.Rows[row].Cells[1].Value, TrackVisitedState = false };
155+
row = moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, fileInfo.Source);
156+
moduleInfoDataGridView.Rows[row].Cells[1] = new DataGridViewLinkCell { Value = moduleInfoDataGridView.Rows[row].Cells[1].Value, TrackVisitedState = false };
158157
}
159158

160159
firstCustomLine++;
@@ -170,16 +169,16 @@ public void RefreshControl(bool isPlaying, ModuleInfoStatic staticInfo, ModuleIn
170169
DataGridViewRow emptyRow = new DataGridViewRow();
171170
emptyRow.Cells.AddRange(new DataGridViewCell[]
172171
{
173-
new KryptonDataGridViewTextBoxCell { Value = string.Empty, ToolTipText = string.Empty },
174-
new KryptonDataGridViewTextBoxCell { Value = string.Empty, ToolTipText = string.Empty }
172+
new DataGridViewTextBoxCell { Value = string.Empty, ToolTipText = string.Empty },
173+
new DataGridViewTextBoxCell { Value = string.Empty, ToolTipText = string.Empty }
175174
});
176175

177-
moduleInfoInfoDataGridView.Rows.Add(emptyRow);
176+
moduleInfoDataGridView.Rows.Add(emptyRow);
178177

179178
foreach (string info in floatingInfo.ModuleInformation)
180179
{
181180
string[] splittedInfo = info.Split('\t');
182-
moduleInfoInfoDataGridView.Rows.Add(splittedInfo[0], splittedInfo[1]);
181+
moduleInfoDataGridView.Rows.Add(splittedInfo[0], splittedInfo[1]);
183182
}
184183
}
185184
}
@@ -188,18 +187,18 @@ public void RefreshControl(bool isPlaying, ModuleInfoStatic staticInfo, ModuleIn
188187
// No module in memory
189188
string na = Resources.IDS_MODULE_INFO_ITEM_NA;
190189

191-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TITLE, na);
192-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_AUTHOR, na);
193-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULEFORMAT, na);
194-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_ACTIVEPLAYER, na);
195-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_CHANNELS, na);
196-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TIME, na);
197-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULESIZE, na);
198-
moduleInfoInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, na);
190+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TITLE, na);
191+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_AUTHOR, na);
192+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULEFORMAT, na);
193+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_ACTIVEPLAYER, na);
194+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_CHANNELS, na);
195+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_TIME, na);
196+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_MODULESIZE, na);
197+
moduleInfoDataGridView.Rows.Add(Resources.IDS_MODULE_INFO_ITEM_FILE, na);
199198
}
200199

201200
// Resize the rows, so the lines are compacted
202-
moduleInfoInfoDataGridView.AutoResizeRows();
201+
moduleInfoDataGridView.AutoResizeRows();
203202
}
204203

205204

@@ -215,19 +214,19 @@ public void UpdateControl(int line, string newValue)
215214
{
216215
if (line == ModuleInfoChanged.ModuleNameChanged)
217216
{
218-
moduleInfoInfoDataGridView.Rows[0].Cells[1].Value = newValue;
219-
moduleInfoInfoDataGridView.InvalidateRow(0);
217+
moduleInfoDataGridView.Rows[0].Cells[1].Value = newValue;
218+
moduleInfoDataGridView.InvalidateRow(0);
220219
}
221220
else if (line == ModuleInfoChanged.AuthorChanged)
222221
{
223-
moduleInfoInfoDataGridView.Rows[1].Cells[1].Value = newValue;
224-
moduleInfoInfoDataGridView.InvalidateRow(1);
222+
moduleInfoDataGridView.Rows[1].Cells[1].Value = newValue;
223+
moduleInfoDataGridView.InvalidateRow(1);
225224
}
226225
}
227-
else if ((firstCustomLine + line) < moduleInfoInfoDataGridView.RowCount)
226+
else if ((firstCustomLine + line) < moduleInfoDataGridView.RowCount)
228227
{
229-
moduleInfoInfoDataGridView.Rows[firstCustomLine + line].Cells[1].Value = newValue;
230-
moduleInfoInfoDataGridView.InvalidateRow(firstCustomLine + line);
228+
moduleInfoDataGridView.Rows[firstCustomLine + line].Cells[1].Value = newValue;
229+
moduleInfoDataGridView.InvalidateRow(firstCustomLine + line);
231230
}
232231
}
233232

@@ -237,14 +236,14 @@ public void UpdateControl(int line, string newValue)
237236
/// Is called when the user clicks in a cell in the data grid
238237
/// </summary>
239238
/********************************************************************/
240-
private void ModuleInfoInfoDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
239+
private void ModuleInfoDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
241240
{
242241
if (!Env.IsWindows10S && showingFileName)
243242
{
244243
// Check if the file name has been clicked
245244
if ((e.RowIndex == 7) && (e.ColumnIndex == 1))
246245
{
247-
string fileName = moduleInfoInfoDataGridView[e.ColumnIndex, e.RowIndex].Value.ToString();
246+
string fileName = moduleInfoDataGridView[e.ColumnIndex, e.RowIndex].Value.ToString();
248247
if (ArchivePath.IsArchivePath(fileName))
249248
fileName = ArchivePath.GetArchiveName(fileName);
250249

‎Source/Clients/NostalgicPlayer/Windows/ModuleInfoWindow/Pages/InfoPageControl.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,4 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="fontPalette.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121-
<value>17, 17</value>
122-
</metadata>
123120
</root>

‎Source/NostalgicPlayer.Controls/Lists/NostalgicDataGridView.Designer.cs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)