Skip to content

Commit

Permalink
Windows: Updated project after changes on other platforms. Renamed fr…
Browse files Browse the repository at this point in the history
…mSettings to frmPreferences. Preferences and Sync window can now be opened through the MainPresenter. Added Sync, SyncMenu and SyncDownload windows (they are empty for now).

Related to issue #422.
  • Loading branch information
ycastonguay committed Aug 13, 2013
1 parent c1105e8 commit c56d76d
Show file tree
Hide file tree
Showing 20 changed files with 2,537 additions and 1,004 deletions.
4 changes: 4 additions & 0 deletions MPfm/MPfm.Windows/Classes/Forms/BaseForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ public class BaseForm : MPfm.WindowsControls.Form, IBaseView
{
protected Action<IBaseView> OnViewReady { get; set; }

public BaseForm()
{
}

public BaseForm(Action<IBaseView> onViewReady)
{
OnViewReady = onViewReady;
Expand Down
82 changes: 33 additions & 49 deletions MPfm/MPfm.Windows/Classes/Forms/frmMain.Designer.cs

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

60 changes: 34 additions & 26 deletions MPfm/MPfm.Windows/Classes/Forms/frmMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1804,8 +1804,12 @@ private void btnThemes_Click(object sender, EventArgs e)
/// <param name="e">Event arguments</param>
private void btnSettings_Click(object sender, EventArgs e)
{
// Show Settings window
//formSettings.ShowDialog(this);
OnOpenPreferencesWindow();
}

private void btnSync_Click(object sender, EventArgs e)
{
OnOpenSyncWindow();
}

#endregion
Expand Down Expand Up @@ -3984,27 +3988,17 @@ public void ResetQuery()
#region IMainView implementation

public Action<IBaseView> OnViewDestroy { get; set; }
public void ShowView(bool shown)
{
}

public Action<AudioFileFormat> OnAudioFileFormatFilterChanged { get; set; }
public Action<LibraryBrowserEntity> OnTreeNodeSelected { get; set; }
public Action<LibraryBrowserEntity> OnTreeNodeDoubleClicked { get; set; }
public Action<LibraryBrowserEntity, object> OnTreeNodeExpanded { get; set; }
public Func<LibraryBrowserEntity, IEnumerable<LibraryBrowserEntity>> OnTreeNodeExpandable { get; set; }
public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities)
{
}

public void RefreshLibraryBrowserNode(LibraryBrowserEntity entity, IEnumerable<LibraryBrowserEntity> entities, object userData)
{
}

public Action<AudioFile> OnTableRowDoubleClicked { get; set; }
public void RefreshSongBrowser(IEnumerable<AudioFile> audioFiles)
{
}

public Action OnOpenPreferencesWindow { get; set; }
public Action OnOpenEffectsWindow { get; set; }
public Action OnOpenPlaylistWindow { get; set; }
public Action OnOpenSyncWindow { get; set; }

public Action OnPlayerPlay { get; set; }
public Action<IEnumerable<string>> OnPlayerPlayFiles { get; set; }
Expand All @@ -4017,6 +4011,27 @@ public void RefreshSongBrowser(IEnumerable<AudioFile> audioFiles)
public Action<float> OnPlayerSetTimeShifting { get; set; }
public Action<float> OnPlayerSetPosition { get; set; }
public Func<float, PlayerPositionEntity> OnPlayerRequestPosition { get; set; }

public void PlayerError(Exception ex)
{
}

public void ShowView(bool shown)
{
}

public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities)
{
}

public void RefreshLibraryBrowserNode(LibraryBrowserEntity entity, IEnumerable<LibraryBrowserEntity> entities, object userData)
{
}

public void RefreshSongBrowser(IEnumerable<AudioFile> audioFiles)
{
}

public void RefreshPlayerStatus(PlayerStatusType status)
{
}
Expand Down Expand Up @@ -4045,17 +4060,10 @@ public void RefreshPlayerTimeShifting(PlayerTimeShiftingEntity entity)
{
}

public void PlayerError(Exception ex)
{
}

public Action OnOpenPreferencesWindow { get; set; }
public Action OnOpenEffectsWindow { get; set; }
public Action OnOpenPlaylistWindow { get; set; }
public Action OnOpenSyncWindow { get; set; }


#endregion


}

#region Classes and enums
Expand Down
Loading

0 comments on commit c56d76d

Please sign in to comment.