Skip to content

Commit

Permalink
Windows: Library Browser is now working except for contextual menu. S…
Browse files Browse the repository at this point in the history
…ong Browser is now refreshed correctly and a song can be started by double clicking on an item. The song info and album art now load correctly. Removed a lot of buttons in the main toolbar. Fixed a bug in SQLiteGateway.Select where a crash would happen when trying to load an enum.

Related to issue #422.
  • Loading branch information
ycastonguay committed Aug 18, 2013
1 parent 4ee7490 commit 6c054c3
Show file tree
Hide file tree
Showing 14 changed files with 2,014 additions and 3,079 deletions.
4 changes: 1 addition & 3 deletions MPfm/MPfm.Library/Database/SQLiteGateway.cs
Expand Up @@ -458,9 +458,7 @@ public List<T> Select<T>(string sql) where T : new()
// Check if the type is an enum
if (info.PropertyType.IsEnum)
{
// Try to cast dynamically
MethodInfo castMethod = typeof(Conversion).GetMethod("GetEnumValue").MakeGenericMethod(info.PropertyType);
fieldValue = castMethod.Invoke(null, new object[] { fieldValue.ToString() });
fieldValue = Enum.Parse(info.PropertyType, fieldValue.ToString());
}
else if (info.PropertyType.FullName.ToUpper() == "SYSTEM.GUID")
{
Expand Down
111 changes: 31 additions & 80 deletions MPfm/MPfm.Windows/Classes/Forms/frmMain.Designer.cs

Large diffs are not rendered by default.

1,334 changes: 144 additions & 1,190 deletions MPfm/MPfm.Windows/Classes/Forms/frmMain.cs

Large diffs are not rendered by default.

137 changes: 53 additions & 84 deletions MPfm/MPfm.Windows/Classes/Forms/frmMain.resx

Large diffs are not rendered by default.

3,332 changes: 1,666 additions & 1,666 deletions MPfm/MPfm.Windows/Classes/Forms/frmPreferences.Designer.cs

Large diffs are not rendered by default.

36 changes: 22 additions & 14 deletions MPfm/MPfm.Windows/Classes/Forms/frmPreferences.resx
Expand Up @@ -136,21 +136,29 @@
<value>928, 25</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnResetLibrary.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="btnTestSaveAudioSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJ5SURBVDhPpZP9SxNxHMf9WzRMeyAkgvAHzQfE7MHY
mQ/pMbc5N2v5wMikvOkeJFckaohJhC5zKAQFVlCpiYRIhFEWUZeR2m3twYd557xZ8O57N27LiiD6wPu4
u8/39f58P9+HBAD/pd9+fG87nbTlqGEiNgO72arnNyw6nm/WsKELamb1PJ306/htHwSkIjajZ8VeC8Hd
DfH+gCze3QUfY0TAXObxNRRTPzOxl4jdSInWaiHU68C38RGIg5cRdp6RJd5yYmtsGMHuFnwxqYTFmsKY
ifwQrYbEcIueW+u1y/CGTSdLCd6iAd9cicgjN/xXL+JTVQHHavMTSSpqQPq0BK2mOGzVQmjVyrAUpH+s
Namx2khDfDCE+Xoa7+gcC0lFDcgAVupTdLXLoFJRCQlcMVcgWF+O0DUbgtedeF2awZJU1GC5sTwsPnRB
cBhkUKmohAQGak/BbyqDr06N0PANzFLpYZKKGvgaSsKbowNYb9XHpipV3Ho/JxtI4NeaUngNJfCaaISG
+vC88EDcgDurYtf6OyD0OWJTlSqGbnaCv+uWQY++GJz2JAJOBt6uNkwXpMVbWDAet3w2V2Jz9HZsqlJF
JSRwSVOERTWF9ZF+vNKcwFTe3vgiftQdTvxQmcd52puwcW8wVnG520n2vl0GF2iVDM8zdZjM3c1NZKfG
t1HS24psaq4sU1hynINwx4XgFXJoDBVYqi6H/xJDFo7AzXV4mpMqjGft3H6QFL0sSqdeqA563lSp4O0k
6zHQg+X+HnAddszSRzGeleJ5kpn856OsaObY/qTpI2nMs/x97FTeHn4ydxc/kZ3Cjh1KZh5n7Pj7Zfp3
IeEHcq/UGnhekRIAAAAASUVORK5CYII=
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADIGlUWHRYTUw6Y29tLmFkb2Jl
LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
cmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJE
RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20v
eGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxu
czpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1w
OkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9
InhtcC5paWQ6OEYzMjczRTcwN0FGMTFFMzgyQUNEQTM5QTI1RDVERTkiIHhtcE1NOkRvY3VtZW50SUQ9
InhtcC5kaWQ6OEYzMjczRTgwN0FGMTFFMzgyQUNEQTM5QTI1RDVERTkiPiA8eG1wTU06RGVyaXZlZEZy
b20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4RjMyNzNFNTA3QUYxMUUzODJBQ0RBMzlBMjVENURF
OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4RjMyNzNFNjA3QUYxMUUzODJBQ0RBMzlBMjVENURF
OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVu
ZD0iciI/PpvMUlIAAAERSURBVDhPtdNPK0RRGMfxISUWvACykmwQC96R2HoLkmjsJ8SK18CCd8BCzPiz
VFLszFLd+X7rnHrmdCdJnvo0zz3n3t/9c840qqr6k9pBLGG3GIuGcl9OaArPOAxj0R5uMOFxOTmDF1gx
YAynmMcKvnCOvgDvnC+2DJjFMsbxiA5GsQ5rzQvvkg9HQhlwAO9m0CK+sYERvKJlwKAyYBLvOILnXuIq
9S08/BTgvL8+uv0O3lK/he6/B7hUvsIxPPcC16n3Fdo298knYhnQRBdzWIAfcRN9HzFzGZ+Qy4ByGdtw
GV0JazUGaBqDNtIJfBI3kk91htqtnENiQLSPW9Ru5cxNs12MZf6RhvNxOflLVaMHYX9e0H/Oby0AAAAA
SUVORK5CYII=
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Expand Down
5 changes: 2 additions & 3 deletions MPfm/MPfm.Windows/Classes/Forms/frmSync.cs
Expand Up @@ -43,15 +43,14 @@ public frmSync(Action<IBaseView> onViewReady)

private void RefreshDeviceListButton()
{
//string[] all = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceNames();
if (_isDiscovering)
{
btnRefreshDevices.Image = new Bitmap(MPfm.Windows.Properties.Resources.icon_button_cancel_16); //Assembly.GetEntryAssembly().GetManifestResourceStream("MPfm.Windows.Resources.icon_button_cancel_16.png"));
btnRefreshDevices.Image = new Bitmap(MPfm.Windows.Properties.Resources.icon_button_cancel_16);
btnRefreshDevices.Text = "Cancel refresh";
}
else
{
btnRefreshDevices.Image = new Bitmap(MPfm.Windows.Properties.Resources.icon_button_refresh_16);//(Assembly.GetEntryAssembly().GetManifestResourceStream("MPfm.Windows.Resources.icon_button_refresh_16.png"));
btnRefreshDevices.Image = new Bitmap(MPfm.Windows.Properties.Resources.icon_button_refresh_16);
btnRefreshDevices.Text = "Refresh devices";
}
}
Expand Down
4 changes: 4 additions & 0 deletions MPfm/MPfm.Windows/MPfm.Windows.csproj
Expand Up @@ -290,10 +290,14 @@
<SubType>Designer</SubType>
</Content>
<Content Include="Resources\icon_android_16.png" />
<None Include="Resources\icon_button_add_16.png" />
<Content Include="Resources\icon_button_cancel_16.png" />
<Content Include="Resources\icon_button_connect_16.png" />
<None Include="Resources\icon_button_delete_16.png" />
<Content Include="Resources\icon_button_download_16.png" />
<Content Include="Resources\icon_button_refresh_16.png" />
<None Include="Resources\icon_button_speaker_16.png" />
<None Include="Resources\icon_button_reset_16.png" />
<Content Include="Resources\icon_linux_16.png" />
<Content Include="Resources\icon_osx_16.png" />
<Content Include="Resources\icon_phone_16.png" />
Expand Down
40 changes: 40 additions & 0 deletions MPfm/MPfm.Windows/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6c054c3

Please sign in to comment.