diff --git a/MPfm/MPfm.GTK/Bass.Net.dll.config b/MPfm/MPfm.GTK/Bass.Net.dll.config
deleted file mode 100644
index f9a3fe99..00000000
--- a/MPfm/MPfm.GTK/Bass.Net.dll.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/MPfm/MPfm.GTK/Classes/ImageManipulation.cs b/MPfm/MPfm.GTK/Classes/Helpers/ImageManipulation.cs
similarity index 98%
rename from MPfm/MPfm.GTK/Classes/ImageManipulation.cs
rename to MPfm/MPfm.GTK/Classes/Helpers/ImageManipulation.cs
index 4b3082b3..fbc329dc 100644
--- a/MPfm/MPfm.GTK/Classes/ImageManipulation.cs
+++ b/MPfm/MPfm.GTK/Classes/Helpers/ImageManipulation.cs
@@ -19,7 +19,7 @@
using System.Drawing;
using System.Drawing.Drawing2D;
-namespace MPfm.GTK
+namespace MPfm.GTK.Helpers
{
///
/// The ImageManipulation class contains static functions for manipulating images.
diff --git a/MPfm/MPfm.GTK/Main.cs b/MPfm/MPfm.GTK/Classes/Main.cs
similarity index 96%
rename from MPfm/MPfm.GTK/Main.cs
rename to MPfm/MPfm.GTK/Classes/Main.cs
index b5f57610..9ea1e017 100644
--- a/MPfm/MPfm.GTK/Main.cs
+++ b/MPfm/MPfm.GTK/Classes/Main.cs
@@ -22,7 +22,9 @@
using MPfm.MVP;
using MPfm.MVP.Views;
using MPfm.MVP.Navigation;
-using MPfm.MVP.Bootstrapper;
+using MPfm.MVP.Bootstrap;
+using MPfm.GTK.Navigation;
+using MPfm.GTK.Windows;
namespace MPfm.GTK
{
diff --git a/MPfm/MPfm.GTK/Classes/GtkNavigationManager.cs b/MPfm/MPfm.GTK/Classes/Navigation/GtkNavigationManager.cs
similarity index 98%
rename from MPfm/MPfm.GTK/Classes/GtkNavigationManager.cs
rename to MPfm/MPfm.GTK/Classes/Navigation/GtkNavigationManager.cs
index f51d2c0f..acfde193 100644
--- a/MPfm/MPfm.GTK/Classes/GtkNavigationManager.cs
+++ b/MPfm/MPfm.GTK/Classes/Navigation/GtkNavigationManager.cs
@@ -21,7 +21,7 @@
using MPfm.MVP.Navigation;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Navigation
{
///
/// Navigation manager for Gtk.
diff --git a/MPfm/MPfm.GTK/MPfm.GTK.csproj b/MPfm/MPfm.GTK/MPfm.GTK.csproj
index f3688e92..27aeaab2 100644
--- a/MPfm/MPfm.GTK/MPfm.GTK.csproj
+++ b/MPfm/MPfm.GTK/MPfm.GTK.csproj
@@ -11,36 +11,36 @@
mpfm
- True
+ true
full
- False
+ false
..\Output\Debug
DEBUG;
prompt
4
- False
+ false
none
- False
+ false
..\Output
prompt
4
- False
+ false
- True
+ true
full
- False
+ false
..\Output\Debug_Linux
DEBUG;TRACE;LINUX
prompt
4
- True
+ true
full
- False
+ false
..\Output\Debug_Mac_GTK
DEBUG;TRACE;MACOSX
4
@@ -81,23 +81,23 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -149,10 +149,6 @@
-
- PreserveNewest
-
-
PreserveNewest
@@ -163,10 +159,12 @@
+
+
- True
+ true
PreserveNewest
diff --git a/MPfm/MPfm.GTK/Windows/BaseWindow.cs b/MPfm/MPfm.GTK/Windows/BaseWindow.cs
index b5fb12af..23ab4f4e 100644
--- a/MPfm/MPfm.GTK/Windows/BaseWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/BaseWindow.cs
@@ -21,7 +21,7 @@
using MPfm.MVP;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Base window for GTK.
diff --git a/MPfm/MPfm.GTK/Windows/EffectsWindow.cs b/MPfm/MPfm.GTK/Windows/EffectsWindow.cs
index 1ea1988b..cec81d0a 100644
--- a/MPfm/MPfm.GTK/Windows/EffectsWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/EffectsWindow.cs
@@ -21,7 +21,7 @@
using MPfm.MVP;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Effects window.
diff --git a/MPfm/MPfm.GTK/Windows/MainWindow.cs b/MPfm/MPfm.GTK/Windows/MainWindow.cs
index c0a366b5..d222c0d7 100644
--- a/MPfm/MPfm.GTK/Windows/MainWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/MainWindow.cs
@@ -16,30 +16,23 @@
// along with MPfm. If not, see .
using System;
-using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
-using System.Timers;
using Gtk;
using Gdk;
using Pango;
-using Mono.Posix;
using Mono.Unix;
-using MPfm.Core;
-using MPfm.Library;
-using MPfm.Player;
-using MPfm.Sound;
-using MPfm.MVP;
using System.Drawing.Imaging;
using System.Text;
using MPfm.MVP.Views;
using MPfm.Sound.AudioFiles;
using MPfm.MVP.Models;
using MPfm.Library.UpdateLibrary;
+using MPfm.GTK.Helpers;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Main window.
@@ -108,7 +101,7 @@ public MainWindow(Action onViewReady): base (Gtk.WindowType.Toplevel,
// Refresh other stuff
RefreshRepeatButton();
- RefreshSongInformation(new SongInformationEntity());
+ RefreshSongInformation(null);
// Fill sound format combo box
storeAudioFileFormat = new ListStore(typeof(string));
@@ -789,94 +782,97 @@ public void RefreshPlayerPosition(PlayerPositionEntity entity)
});
}
- public void RefreshSongInformation(SongInformationEntity entity)
+ public void RefreshSongInformation(AudioFile audioFile)
{
Gtk.Application.Invoke(delegate{
- // Refresh labels
- Console.WriteLine("MainWindow - RefreshSongInformation");
- lblArtistName.Text = entity.ArtistName;
- lblAlbumTitle.Text = entity.AlbumTitle;
- lblSongTitle.Text = entity.Title;
- lblSongFilePath.Text = entity.FilePath;
- lblCurrentPosition.Text = entity.Position;
- lblCurrentLength.Text = entity.Length;
-
- lblCurrentFileType.Text = entity.FileTypeString;
- lblCurrentBitrate.Text = entity.BitrateString;
- lblCurrentSampleRate.Text = entity.SampleRateString;
- lblCurrentBitsPerSample.Text = entity.BitsPerSampleString;
-
- //Pixbuf stuff = new Pixbuf("icon48.png");
- //stuff = stuff.ScaleSimple(150, 150, InterpType.Bilinear);
- //this.imageAlbumCover.Pixbuf = stuff;
-
- System.Drawing.Image drawingImage = AudioFile.ExtractImageForAudioFile(entity.FilePath);
-
- if(drawingImage != null)
+ if(audioFile != null)
{
- // Resize image
- drawingImage = ImageManipulation.ResizeImage(drawingImage, 150, 150);
+ // Refresh labels
+ Console.WriteLine("MainWindow - RefreshSongInformation");
+ lblArtistName.Text = audioFile.ArtistName;
+ lblAlbumTitle.Text = audioFile.AlbumTitle;
+ lblSongTitle.Text = audioFile.Title;
+ lblSongFilePath.Text = audioFile.FilePath;
+ //lblCurrentPosition.Text = audioFile.Position;
+ lblCurrentLength.Text = audioFile.Length;
+
+ lblCurrentFileType.Text = audioFile.FileType.ToString();
+ lblCurrentBitrate.Text = audioFile.Bitrate.ToString();
+ lblCurrentSampleRate.Text = audioFile.SampleRate.ToString();
+ lblCurrentBitsPerSample.Text = audioFile.BitsPerSample.ToString();
+
+ //Pixbuf stuff = new Pixbuf("icon48.png");
+ //stuff = stuff.ScaleSimple(150, 150, InterpType.Bilinear);
+ //this.imageAlbumCover.Pixbuf = stuff;
- // Set album cover
- imageAlbumCover.Pixbuf = ImageToPixbuf(drawingImage);
- }
- else
- {
- // Get Unix-style directory information (i.e. case sensitive file names)
- if(!String.IsNullOrEmpty(entity.FilePath))
+ System.Drawing.Image drawingImage = AudioFile.ExtractImageForAudioFile(audioFile.FilePath);
+
+ if(drawingImage != null)
{
- try
+ // Resize image
+ drawingImage = ImageManipulation.ResizeImage(drawingImage, 150, 150);
+
+ // Set album cover
+ imageAlbumCover.Pixbuf = ImageToPixbuf(drawingImage);
+ }
+ else
+ {
+ // Get Unix-style directory information (i.e. case sensitive file names)
+ if(!String.IsNullOrEmpty(audioFile.FilePath))
{
- bool imageFound = false;
- string folderPath = System.IO.Path.GetDirectoryName(entity.FilePath);
- UnixDirectoryInfo rootDirectoryInfo = new UnixDirectoryInfo(folderPath);
-
- // For each directory, search for new directories
- UnixFileSystemInfo[] infos = rootDirectoryInfo.GetFileSystemEntries();
- foreach (UnixFileSystemInfo fileInfo in rootDirectoryInfo.GetFileSystemEntries())
- {
- // Check if the file matches
- string fileName = fileInfo.Name.ToUpper();
- if((fileName.EndsWith(".JPG") ||
- fileName.EndsWith(".JPEG") ||
- fileName.EndsWith(".PNG") ||
- fileName.EndsWith(".GIF")) &&
- (fileName.StartsWith("FOLDER") ||
- fileName.StartsWith("COVER")))
+ try
+ {
+ bool imageFound = false;
+ string folderPath = System.IO.Path.GetDirectoryName(audioFile.FilePath);
+ UnixDirectoryInfo rootDirectoryInfo = new UnixDirectoryInfo(folderPath);
+
+ // For each directory, search for new directories
+ UnixFileSystemInfo[] infos = rootDirectoryInfo.GetFileSystemEntries();
+ foreach (UnixFileSystemInfo fileInfo in rootDirectoryInfo.GetFileSystemEntries())
+ {
+ // Check if the file matches
+ string fileName = fileInfo.Name.ToUpper();
+ if((fileName.EndsWith(".JPG") ||
+ fileName.EndsWith(".JPEG") ||
+ fileName.EndsWith(".PNG") ||
+ fileName.EndsWith(".GIF")) &&
+ (fileName.StartsWith("FOLDER") ||
+ fileName.StartsWith("COVER")))
+ {
+ // Get image from file
+ imageFound = true;
+ Pixbuf imageCover = new Pixbuf(fileInfo.FullName);
+ imageCover = imageCover.ScaleSimple(150, 150, InterpType.Bilinear);
+ this.imageAlbumCover.Pixbuf = imageCover;
+ }
+ }
+
+ // Set empty image if not cover not found
+ if(!imageFound)
{
- // Get image from file
- imageFound = true;
- Pixbuf imageCover = new Pixbuf(fileInfo.FullName);
- imageCover = imageCover.ScaleSimple(150, 150, InterpType.Bilinear);
- this.imageAlbumCover.Pixbuf = imageCover;
+ this.imageAlbumCover.Pixbuf = null;
}
}
-
- // Set empty image if not cover not found
- if(!imageFound)
+ catch
{
this.imageAlbumCover.Pixbuf = null;
}
}
- catch
+ else
{
- this.imageAlbumCover.Pixbuf = null;
+ // Set empty album cover
+ imageAlbumCover.Pixbuf = null;
}
}
- else
- {
- // Set empty album cover
- imageAlbumCover.Pixbuf = null;
+
+ // Check if image cover is still empty
+ if(imageAlbumCover.Pixbuf == null)
+ {
+ Pixbuf imageCover = new Pixbuf("black.png");
+ imageCover = imageCover.ScaleSimple(150, 150, InterpType.Bilinear);
+ this.imageAlbumCover.Pixbuf = imageCover;
}
}
-
- // Check if image cover is still empty
- if(imageAlbumCover.Pixbuf == null)
- {
- Pixbuf imageCover = new Pixbuf("black.png");
- imageCover = imageCover.ScaleSimple(150, 150, InterpType.Bilinear);
- this.imageAlbumCover.Pixbuf = imageCover;
- }
});
}
diff --git a/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs b/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs
index ea60c16f..01d0f6a1 100644
--- a/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs
@@ -19,7 +19,7 @@
using MPfm.MVP;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Playlist window.
diff --git a/MPfm/MPfm.GTK/Windows/PreferencesWindow.cs b/MPfm/MPfm.GTK/Windows/PreferencesWindow.cs
index b6c4cc19..9d6e6a91 100644
--- a/MPfm/MPfm.GTK/Windows/PreferencesWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/PreferencesWindow.cs
@@ -19,7 +19,7 @@
using MPfm.MVP;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Settings window.
diff --git a/MPfm/MPfm.GTK/Windows/SplashWindow.cs b/MPfm/MPfm.GTK/Windows/SplashWindow.cs
index cfeceb67..c4d56246 100644
--- a/MPfm/MPfm.GTK/Windows/SplashWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/SplashWindow.cs
@@ -20,7 +20,7 @@
using MPfm.MVP;
using MPfm.MVP.Views;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class SplashWindow : BaseWindow, ISplashView
{
diff --git a/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs b/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs
index e5e449e2..acb8f6a6 100644
--- a/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs
+++ b/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs
@@ -27,9 +27,9 @@
using MPfm.Library.UpdateLibrary;
using MPfm.MVP.Presenters;
using MPfm.MVP.Services;
-using MPfm.MVP.Bootstrapper;
+using MPfm.MVP.Bootstrap;
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
///
/// Update Library window.
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.EffectsWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.EffectsWindow.cs
similarity index 99%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.EffectsWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.EffectsWindow.cs
index 7bd0db4b..75eb0614 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.EffectsWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.EffectsWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class EffectsWindow
{
@@ -93,11 +93,11 @@ public partial class EffectsWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.EffectsWindow
- this.Name = "MPfm.GTK.EffectsWindow";
+ // Widget MPfm.GTK.Windows.EffectsWindow
+ this.Name = "MPfm.GTK.Windows.EffectsWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("Effects");
this.WindowPosition = ((global::Gtk.WindowPosition)(1));
- // Container child MPfm.GTK.EffectsWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.EffectsWindow.Gtk.Container+ContainerChild
this.hboxMain = new global::Gtk.HBox ();
this.hboxMain.Name = "hboxMain";
this.hboxMain.Spacing = 6;
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.MainWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.MainWindow.cs
similarity index 99%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.MainWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.MainWindow.cs
index dee3f68d..5a6de175 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.MainWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.MainWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class MainWindow
{
@@ -121,7 +121,7 @@ public partial class MainWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.MainWindow
+ // Widget MPfm.GTK.Windows.MainWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
this.FileAction = new global::Gtk.Action ("FileAction", global::Mono.Unix.Catalog.GetString ("File"), null, null);
@@ -205,12 +205,12 @@ protected virtual void Build ()
w1.Add (this.actionPlayLoop, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
- this.Name = "MPfm.GTK.MainWindow";
+ this.Name = "MPfm.GTK.Windows.MainWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("MPfm: Music Player for Musicians");
this.Icon = new global::Gdk.Pixbuf (global::System.IO.Path.Combine (global::System.AppDomain.CurrentDomain.BaseDirectory, "./icon48.png"));
this.WindowPosition = ((global::Gtk.WindowPosition)(1));
this.DefaultWidth = 100;
- // Container child MPfm.GTK.MainWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.MainWindow.Gtk.Container+ContainerChild
this.vboxMain = new global::Gtk.VBox ();
this.vboxMain.Name = "vboxMain";
// Container child vboxMain.Gtk.Box+BoxChild
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PlaylistWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PlaylistWindow.cs
similarity index 95%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PlaylistWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PlaylistWindow.cs
index 36ddd844..7ef04dd6 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PlaylistWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PlaylistWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class PlaylistWindow
{
@@ -21,7 +21,7 @@ public partial class PlaylistWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.PlaylistWindow
+ // Widget MPfm.GTK.Windows.PlaylistWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
this.newAction = new global::Gtk.Action ("newAction", global::Mono.Unix.Catalog.GetString ("New"), null, "gtk-new");
@@ -44,11 +44,11 @@ protected virtual void Build ()
w1.Add (this.actionSavePlaylistAs, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
- this.Name = "MPfm.GTK.PlaylistWindow";
+ this.Name = "MPfm.GTK.Windows.PlaylistWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("Playlist");
this.Icon = new global::Gdk.Pixbuf (global::System.IO.Path.Combine (global::System.AppDomain.CurrentDomain.BaseDirectory, "./icon48.png"));
this.WindowPosition = ((global::Gtk.WindowPosition)(1));
- // Container child MPfm.GTK.PlaylistWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.PlaylistWindow.Gtk.Container+ContainerChild
this.vbox1 = new global::Gtk.VBox ();
this.vbox1.Name = "vbox1";
// Container child vbox1.Gtk.Box+BoxChild
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PreferencesWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PreferencesWindow.cs
similarity index 99%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PreferencesWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PreferencesWindow.cs
index 54b6e163..ab995816 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.PreferencesWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.PreferencesWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class PreferencesWindow
{
@@ -51,7 +51,7 @@ public partial class PreferencesWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.PreferencesWindow
+ // Widget MPfm.GTK.Windows.PreferencesWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
this.actionAddFolder = new global::Gtk.Action ("actionAddFolder", null, null, "gtk-add");
@@ -62,10 +62,10 @@ protected virtual void Build ()
w1.Add (this.actionResetLibrary, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
- this.Name = "MPfm.GTK.PreferencesWindow";
+ this.Name = "MPfm.GTK.Windows.PreferencesWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("Preferences");
this.WindowPosition = ((global::Gtk.WindowPosition)(1));
- // Container child MPfm.GTK.PreferencesWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.PreferencesWindow.Gtk.Container+ContainerChild
this.notebookSettings = new global::Gtk.Notebook ();
this.notebookSettings.CanFocus = true;
this.notebookSettings.Name = "notebookSettings";
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.SplashWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.SplashWindow.cs
similarity index 88%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.SplashWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.SplashWindow.cs
index ffe1adab..820675b2 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.SplashWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.SplashWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class SplashWindow
{
@@ -11,14 +11,14 @@ public partial class SplashWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.SplashWindow
- this.Name = "MPfm.GTK.SplashWindow";
+ // Widget MPfm.GTK.Windows.SplashWindow
+ this.Name = "MPfm.GTK.Windows.SplashWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("SplashWindow");
this.WindowPosition = ((global::Gtk.WindowPosition)(3));
this.Resizable = false;
this.AllowGrow = false;
this.Decorated = false;
- // Container child MPfm.GTK.SplashWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.SplashWindow.Gtk.Container+ContainerChild
this.vbox1 = new global::Gtk.VBox ();
this.vbox1.Name = "vbox1";
// Container child vbox1.Gtk.Box+BoxChild
diff --git a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.UpdateLibraryWindow.cs b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.UpdateLibraryWindow.cs
similarity index 97%
rename from MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.UpdateLibraryWindow.cs
rename to MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.UpdateLibraryWindow.cs
index b46e29d4..8d6f02ab 100644
--- a/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.UpdateLibraryWindow.cs
+++ b/MPfm/MPfm.GTK/gtk-gui/MPfm.GTK.Windows.UpdateLibraryWindow.cs
@@ -1,6 +1,6 @@
// This file has been generated by the GUI designer. Do not modify.
-namespace MPfm.GTK
+namespace MPfm.GTK.Windows
{
public partial class UpdateLibraryWindow
{
@@ -26,7 +26,7 @@ public partial class UpdateLibraryWindow
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
- // Widget MPfm.GTK.UpdateLibraryWindow
+ // Widget MPfm.GTK.Windows.UpdateLibraryWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
this.actionOK = new global::Gtk.Action ("actionOK", global::Mono.Unix.Catalog.GetString ("OK"), null, "gtk-apply");
@@ -41,11 +41,11 @@ protected virtual void Build ()
w1.Add (this.actionSaveLog, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
- this.Name = "MPfm.GTK.UpdateLibraryWindow";
+ this.Name = "MPfm.GTK.Windows.UpdateLibraryWindow";
this.Title = global::Mono.Unix.Catalog.GetString ("Update Library");
this.WindowPosition = ((global::Gtk.WindowPosition)(1));
this.Modal = true;
- // Container child MPfm.GTK.UpdateLibraryWindow.Gtk.Container+ContainerChild
+ // Container child MPfm.GTK.Windows.UpdateLibraryWindow.Gtk.Container+ContainerChild
this.vboxMain = new global::Gtk.VBox ();
this.vboxMain.Name = "vboxMain";
this.vboxMain.Spacing = 6;
diff --git a/MPfm/MPfm.GTK/gtk-gui/gui.stetic b/MPfm/MPfm.GTK/gtk-gui/gui.stetic
index a1581146..9e4ab48b 100644
--- a/MPfm/MPfm.GTK/gtk-gui/gui.stetic
+++ b/MPfm/MPfm.GTK/gtk-gui/gui.stetic
@@ -20,7 +20,7 @@
-
+
Action
@@ -1280,7 +1280,7 @@
-
+
Action
@@ -1951,7 +1951,7 @@
-
+
Action
@@ -2047,7 +2047,7 @@
-
+
False
Effects
@@ -3220,7 +3220,7 @@
-
+
Action
@@ -3421,7 +3421,7 @@
-
+
SplashWindow
CenterAlways