diff --git a/MPfm/MPfm.Mac/Classes/Controls/MPfmTabButton.cs b/MPfm/MPfm.Mac/Classes/Controls/MPfmTabButton.cs
new file mode 100644
index 00000000..32180923
--- /dev/null
+++ b/MPfm/MPfm.Mac/Classes/Controls/MPfmTabButton.cs
@@ -0,0 +1,168 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see .
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using MonoMac.AppKit;
+using MonoMac.CoreGraphics;
+using MonoMac.Foundation;
+using MPfm.Mac.Classes.Helpers;
+using MPfm.Mac.Classes.Objects;
+
+namespace MPfm.Mac.Classes.Controls
+{
+ [Register("MPfmTabButton")]
+ public class MPfmTabButton : NSButton
+ {
+ bool _isMouseDown = false;
+ bool _isMouseOver = false;
+
+ public CGColor TextColor { get; set; }
+ public CGColor BackgroundColor { get; set; }
+ public CGColor BackgroundMouseDownColor { get; set; }
+ public CGColor BackgroundMouseOverColor { get; set; }
+ public CGColor BorderColor { get; set; }
+
+ private bool _isSelected = false;
+ public bool IsSelected
+ {
+ get
+ {
+ return _isSelected;
+ }
+ set
+ {
+ _isSelected = value;
+ SetNeedsDisplay();
+ }
+ }
+
+ public delegate void TabButtonSelected(MPfmTabButton button);
+ public event TabButtonSelected OnTabButtonSelected;
+
+ [Export("init")]
+ public MPfmTabButton() : base(NSObjectFlag.Empty)
+ {
+ Initialize();
+ }
+
+ // Called when created from unmanaged code
+ public MPfmTabButton(IntPtr handle) : base (handle)
+ {
+ Initialize();
+ }
+
+ private void Initialize()
+ {
+ TextColor = GlobalTheme.ButtonTextColor;
+ //BackgroundColor = GlobalTheme.ButtonToolbarBackgroundColor;
+ BackgroundColor = GlobalTheme.PanelHeaderColor1;
+ BackgroundMouseDownColor = GlobalTheme.ButtonToolbarBackgroundMouseOverColor;
+ BackgroundMouseOverColor = GlobalTheme.ButtonToolbarBackgroundMouseDownColor;
+ BorderColor = GlobalTheme.ButtonToolbarBorderColor;
+
+ // This allows MouseEntered and MouseExit to work
+ AddTrackingRect(Bounds, this, IntPtr.Zero, false);
+ }
+
+ [Export("mouseDown:")]
+ public override void MouseDown(NSEvent theEvent)
+ {
+ _isMouseDown = true;
+ base.MouseDown(theEvent);
+ this.MouseUp(theEvent);
+ }
+
+ [Export("mouseUp:")]
+ public override void MouseUp(NSEvent theEvent)
+ {
+ base.MouseUp(theEvent);
+ _isMouseDown = false;
+ IsSelected = true;
+
+ if(OnTabButtonSelected != null)
+ OnTabButtonSelected(this);
+ SetNeedsDisplay();
+ }
+
+ [Export("mouseEntered:")]
+ public override void MouseEntered(NSEvent theEvent)
+ {
+ base.MouseEntered(theEvent);
+ _isMouseOver = true;
+ SetNeedsDisplay();
+ }
+
+ [Export("mouseExited:")]
+ public override void MouseExited(NSEvent theEvent)
+ {
+ base.MouseExited(theEvent);
+ _isMouseOver = false;
+ SetNeedsDisplay();
+ }
+
+ public override void DrawRect(RectangleF dirtyRect)
+ {
+ float padding = 4;
+ CGContext context = NSGraphicsContext.CurrentContext.GraphicsPort;
+ context.SaveState();
+ context.TranslateCTM(0, Bounds.Height);
+ context.ScaleCTM(1, -1);
+
+ if (_isMouseDown)
+ CocoaHelper.FillRect(context, Bounds, BackgroundMouseDownColor);
+ else if (_isMouseOver)
+ CocoaHelper.FillRect(context, Bounds, BackgroundMouseOverColor);
+ else
+ CocoaHelper.FillRect(context, Bounds, BackgroundColor);
+
+ if(IsSelected)
+ CocoaHelper.DrawLine(context, new PointF[2] { new PointF(0, 1), new PointF(Bounds.Width, 1) }, 0.5f, new CGColor(0.4f, 1, 1, 1));
+
+ //CocoaHelper.DrawRect(context, Bounds, BorderColor);
+ //RectangleF rectTextSize = CocoaHelper.MeasureString(Bounds.Size, Title, "Junction", 11);
+ RectangleF rectTextSize = CocoaHelper.MeasureString(Bounds.Size, Title, "TitilliumText25L-800wt", 12);
+ RectangleF rectText;
+ if (Image != null)
+ {
+ float xImage = ((Bounds.Width - rectTextSize.Width - (padding * 2) - Image.Size.Width) / 2);
+ RectangleF rectImage = new RectangleF(xImage, (Bounds.Height - Image.Size.Height) / 2, Image.Size.Width, Image.Size.Height);
+ Image.DrawInRect(rectImage, new RectangleF(0, 0, Image.Size.Width, Image.Size.Height), NSCompositingOperation.SourceOver, 1.0f);
+
+ float xText = xImage + padding + Image.Size.Width + padding;
+ rectText = new RectangleF(xText, (Bounds.Height - rectTextSize.Height) / 2, rectTextSize.Width, rectTextSize.Height);
+ }
+ else
+ {
+ rectText = new RectangleF((Bounds.Width - rectTextSize.Width) / 2, (Bounds.Height - rectTextSize.Height) / 2, rectTextSize.Width, rectTextSize.Height);
+ }
+
+ context.RestoreState();
+ //CocoaHelper.DrawText(rectText, 0, 0, Title, "Junction", 11, NSColor.White);
+ CocoaHelper.DrawText(rectText, 0, 0, Title, "TitilliumText25L-800wt", 12, NSColor.White);
+ }
+
+ RectangleF Get1pxRect(RectangleF rect)
+ {
+ RectangleF newRect = new RectangleF(rect.X + 0.5f, rect.Y + 0.5f, rect.Width - 1, rect.Height - 1);
+ return newRect;
+ }
+ }
+}
diff --git a/MPfm/MPfm.Mac/Classes/Controls/MPfmView.cs b/MPfm/MPfm.Mac/Classes/Controls/MPfmView.cs
index fe5e80ba..cbd96cf4 100644
--- a/MPfm/MPfm.Mac/Classes/Controls/MPfmView.cs
+++ b/MPfm/MPfm.Mac/Classes/Controls/MPfmView.cs
@@ -103,6 +103,7 @@ public override void DrawRect(RectangleF dirtyRect)
{
RectangleF rectHeader = new RectangleF(0, Bounds.Height - 24, Bounds.Width, 24);
CocoaHelper.FillRect(context, rectHeader, HeaderColor1);
+ //CocoaHelper.DrawLine(context, new PointF[2] { new PointF(0, Bounds.Height - 24), new PointF(Bounds.Width, Bounds.Height - 24) }, 0.5f, new CGColor(0.4f, 1, 1, 1));
}
// context.SaveState();
diff --git a/MPfm/MPfm.Mac/MPfm.Mac.csproj b/MPfm/MPfm.Mac/MPfm.Mac.csproj
index ed87869b..0d9ad197 100644
--- a/MPfm/MPfm.Mac/MPfm.Mac.csproj
+++ b/MPfm/MPfm.Mac/MPfm.Mac.csproj
@@ -214,6 +214,7 @@
SyncDownloadWindow.cs
+
diff --git a/MPfm/MPfm.Mac/Windows/Controllers/MainWindowController.cs b/MPfm/MPfm.Mac/Windows/Controllers/MainWindowController.cs
index d13398a6..f517ebcc 100644
--- a/MPfm/MPfm.Mac/Windows/Controllers/MainWindowController.cs
+++ b/MPfm/MPfm.Mac/Windows/Controllers/MainWindowController.cs
@@ -39,6 +39,7 @@
using MPfm.Mac.Classes.Delegates;
using MPfm.Player.Objects;
using MPfm.MVP.Presenters;
+using MPfm.Mac.Classes.Controls;
namespace MPfm.Mac
{
@@ -120,11 +121,46 @@ public override void WindowDidLoad()
scrollViewAlbumCovers.SetSynchronizedScrollView(scrollViewSongBrowser);
scrollViewSongBrowser.SetSynchronizedScrollView(scrollViewAlbumCovers);
+ btnTabTimeShifting.IsSelected = true;
+ btnTabTimeShifting.OnTabButtonSelected += HandleOnTabButtonSelected;
+ btnTabPitchShifting.OnTabButtonSelected += HandleOnTabButtonSelected;
+ btnTabInfo.OnTabButtonSelected += HandleOnTabButtonSelected;
+ btnTabActions.OnTabButtonSelected += HandleOnTabButtonSelected;
+
NSNotificationCenter.DefaultCenter.AddObserver(new NSString("NSOutlineViewItemDidExpandNotification"), ItemDidExpand, outlineLibraryBrowser);
OnViewReady.Invoke(this);
}
+ private void HandleOnTabButtonSelected(MPfmTabButton button)
+ {
+ Console.WriteLine("Test: {0}", button.Title);
+
+ btnTabTimeShifting.IsSelected = button == btnTabTimeShifting;
+ btnTabPitchShifting.IsSelected = button == btnTabPitchShifting;
+ btnTabInfo.IsSelected = button == btnTabInfo;
+ btnTabActions.IsSelected = button == btnTabActions;
+
+ viewTimeShifting.Hidden = button != btnTabTimeShifting;
+ viewPitchShifting.Hidden = button != btnTabPitchShifting;
+ viewInformation.Hidden = button != btnTabInfo;
+ viewActions.Hidden = button != btnTabActions;
+
+// if (button == btnTabTimeShifting)
+// {
+//
+// }
+// else if (button == btnTabPitchShifting)
+// {
+// }
+// else if (button == btnTabInfo)
+// {
+// }
+// else if (button == btnTabActions)
+// {
+// }
+ }
+
private void SetTheme()
{
viewLeftHeader.BackgroundColor1 = GlobalTheme.PanelHeaderColor1;
@@ -179,11 +215,11 @@ private void SetTheme()
lblSongTitle.TextColor = NSColor.FromDeviceRgba(171f/255f, 186f/255f, 196f/255f, 1);
lblSongPath.TextColor = NSColor.FromDeviceRgba(97f/255f, 122f/255f, 140f/255f, 1);
- viewInformation.IsHeaderVisible = true;
+ //viewInformation.IsHeaderVisible = true;
viewSongPosition.IsHeaderVisible = true;
viewVolume.IsHeaderVisible = true;
- viewTimeShifting.IsHeaderVisible = true;
- viewPitchShifting.IsHeaderVisible = true;
+ //viewTimeShifting.IsHeaderVisible = true;
+ //viewPitchShifting.IsHeaderVisible = true;
lblArtistName.Font = NSFont.FromFontName("TitilliumText25L-800wt", 24);
lblAlbumTitle.Font = NSFont.FromFontName("TitilliumText25L-600wt", 20);
@@ -203,10 +239,10 @@ private void SetTheme()
lblTitleSongBrowser.Font = NSFont.FromFontName("TitilliumText25L-800wt", 14);
lblSubtitleSongPosition.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
- lblSubtitleTimeShifting.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
+ //lblSubtitleTimeShifting.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
lblSubtitleVolume.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
- lblSubtitleInformation.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
- lblSubtitlePitchShifting.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
+ //lblSubtitleInformation.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
+ //lblSubtitlePitchShifting.Font = NSFont.FromFontName("TitilliumText25L-800wt", 12);
lblPosition.Font = NSFont.FromFontName("DroidSansMono", 15f);
lblLength.Font = NSFont.FromFontName("DroidSansMono", 15f);
diff --git a/MPfm/MPfm.Mac/Windows/MainWindow.designer.cs b/MPfm/MPfm.Mac/Windows/MainWindow.designer.cs
index 9d2618c7..bf41bea1 100644
--- a/MPfm/MPfm.Mac/Windows/MainWindow.designer.cs
+++ b/MPfm/MPfm.Mac/Windows/MainWindow.designer.cs
@@ -188,9 +188,6 @@ partial class MainWindowController
[Outlet]
MonoMac.AppKit.NSTextField lblSubtitleVolume { get; set; }
- [Outlet]
- MonoMac.AppKit.NSTextField lblSubtitleTimeShifting { get; set; }
-
[Outlet]
MonoMac.AppKit.NSTextField lblFilterBySoundFormat { get; set; }
@@ -230,6 +227,21 @@ partial class MainWindowController
[Outlet]
MonoMac.AppKit.NSTextField lblSemitones { get; set; }
+ [Outlet]
+ MPfm.Mac.Classes.Controls.MPfmTabButton btnTabTimeShifting { get; set; }
+
+ [Outlet]
+ MPfm.Mac.Classes.Controls.MPfmTabButton btnTabPitchShifting { get; set; }
+
+ [Outlet]
+ MPfm.Mac.Classes.Controls.MPfmTabButton btnTabInfo { get; set; }
+
+ [Outlet]
+ MPfm.Mac.Classes.Controls.MPfmTabButton btnTabActions { get; set; }
+
+ [Outlet]
+ MPfm.Mac.Classes.Controls.MPfmView viewActions { get; set; }
+
[Action ("actionAddFilesToLibrary:")]
partial void actionAddFilesToLibrary (MonoMac.Foundation.NSObject sender);
@@ -322,6 +334,18 @@ partial class MainWindowController
[Action ("actionContextualMenuPlay:")]
partial void actionContextualMenuPlay (MonoMac.Foundation.NSObject sender);
+
+ [Action ("actionTabTimeShifting:")]
+ partial void actionTabTimeShifting (MonoMac.Foundation.NSObject sender);
+
+ [Action ("actionTabPitchShifting:")]
+ partial void actionTabPitchShifting (MonoMac.Foundation.NSObject sender);
+
+ [Action ("actionTabInfo:")]
+ partial void actionTabInfo (MonoMac.Foundation.NSObject sender);
+
+ [Action ("actionTabActions:")]
+ partial void actionTabActions (MonoMac.Foundation.NSObject sender);
void ReleaseDesignerOutlets ()
{
@@ -620,11 +644,6 @@ void ReleaseDesignerOutlets ()
lblSubtitleVolume = null;
}
- if (lblSubtitleTimeShifting != null) {
- lblSubtitleTimeShifting.Dispose ();
- lblSubtitleTimeShifting = null;
- }
-
if (lblFilterBySoundFormat != null) {
lblFilterBySoundFormat.Dispose ();
lblFilterBySoundFormat = null;
@@ -689,6 +708,31 @@ void ReleaseDesignerOutlets ()
lblSemitones.Dispose ();
lblSemitones = null;
}
+
+ if (btnTabTimeShifting != null) {
+ btnTabTimeShifting.Dispose ();
+ btnTabTimeShifting = null;
+ }
+
+ if (btnTabPitchShifting != null) {
+ btnTabPitchShifting.Dispose ();
+ btnTabPitchShifting = null;
+ }
+
+ if (btnTabInfo != null) {
+ btnTabInfo.Dispose ();
+ btnTabInfo = null;
+ }
+
+ if (btnTabActions != null) {
+ btnTabActions.Dispose ();
+ btnTabActions = null;
+ }
+
+ if (viewActions != null) {
+ viewActions.Dispose ();
+ viewActions = null;
+ }
}
}
diff --git a/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib
index 58e99f9a..5ec1ff39 100644
--- a/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib
+++ b/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib
@@ -567,7 +567,7 @@
MC41AA
- 20
+ 17
306184192
@@ -619,7 +619,7 @@
1
_doScroller:
- 0.99541284403669728
+ 0.219
{219, 543}
@@ -631,7 +631,7 @@
- QSAAAEEgAABBoAAAQaAAAA
+ QSAAAEEgAABBiAAAQYgAAA
0.25
4
1
@@ -850,94 +850,105 @@
266
- {{0, 17}, {523, 143}}
+ {{0, 17}, {523, 156}}
@@ -3101,6 +3235,7 @@
{{1, 161}, {422, 15}}
+
_NS:60
NO
1
@@ -3126,10 +3261,10 @@
- {523, 160}
+ {523, 173}
-
+
_NS:9
133680
@@ -3143,7 +3278,7 @@
1
- {{257, 0}, {523, 160}}
+ {{257, 0}, {523, 173}}
@@ -3151,7 +3286,7 @@
NSView
- {780, 160}
+ {780, 173}
@@ -3332,7 +3467,7 @@
NO
- {{0, 159}, {780, 27}}
+ {{0, 172}, {780, 27}}
@@ -3340,7 +3475,7 @@
MPfmView
- {{0, 191}, {780, 186}}
+ {{0, 208}, {780, 199}}
@@ -3348,7 +3483,7 @@
NSView
- {780, 377}
+ {780, 407}
@@ -3968,14 +4103,6 @@
551
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
@@ -7090,12 +7358,8 @@
509.IBPluginDependency
51.IBPluginDependency
510.IBPluginDependency
- 511.IBPluginDependency
- 518.IBPluginDependency
52.IBPluginDependency
520.IBPluginDependency
- 523.IBPluginDependency
- 524.IBPluginDependency
528.IBPluginDependency
53.IBPluginDependency
531.IBPluginDependency
@@ -7173,8 +7437,6 @@
710.IBPluginDependency
711.IBPluginDependency
713.IBPluginDependency
- 718.IBPluginDependency
- 719.IBPluginDependency
724.IBPluginDependency
725.IBPluginDependency
73.IBPluginDependency
@@ -7241,6 +7503,27 @@
86.IBPluginDependency
864.IBPluginDependency
864.userInterfaceItemIdentifier
+ 865.CustomClassName
+ 865.IBPluginDependency
+ 866.IBPluginDependency
+ 868.CustomClassName
+ 868.IBPluginDependency
+ 869.IBPluginDependency
+ 871.CustomClassName
+ 871.IBPluginDependency
+ 872.IBPluginDependency
+ 873.CustomClassName
+ 873.IBPluginDependency
+ 874.IBPluginDependency
+ 883.IBPluginDependency
+ 884.IBPluginDependency
+ 885.IBPluginDependency
+ 886.IBPluginDependency
+ 887.IBPluginDependency
+ 888.IBPluginDependency
+ 889.IBPluginDependency
+ 890.IBPluginDependency
+ 891.IBPluginDependency
- 864
+ 901
+
+
+
+
+
+
+
+
+
-
+
+
0