diff --git a/AUTHORS b/AUTHORS index 6c6b4f76a..6bffc2410 100755 --- a/AUTHORS +++ b/AUTHORS @@ -1,15 +1,15 @@ Maintainers: + Harry Contributors: - Mike Kestner Aaron Bockover Age Bosma Alan McGovern - Alejandro Sánchez Acosta + Alejandro S�nchez Acosta Alex Launi Alexandre Gomes Alp Toker - Andrés G. Aragoneses + Andr�s G. Aragoneses Atsushi Eno Ben Maurer Ben Motmans @@ -17,7 +17,7 @@ Contributors: Bob Smith Brad Taylor Cameron White - Carlos Martín Nieto + Carlos Mart�n Nieto Charles Iliya Krempeaux Chris Turchin Christian Hergert @@ -60,20 +60,20 @@ Contributors: Miguel de Icaza Mike Gorse Mike Kestner - Mike Krüger + Mike Kr�ger Mirco Bauer - Néstor Salceda + N�stor Salceda Olivier Dufour Owen Fraser-Green Paolo Molaro - Pedro Martínez Juliá + Pedro Mart�nez Juli� Pete Johanson Peter Williams Rachel Hestilow Radek Doulik Raja R Harinath - Ricardo Fernández Pascual - Rickard Edström + Ricardo Fern�ndez Pascual + Rickard Edstr�m Robert McQueen Rodrigo Moya Shane Landrum diff --git a/CakeScripts/Settings.cs b/CakeScripts/Settings.cs index 48d72c531..335de16fe 100755 --- a/CakeScripts/Settings.cs +++ b/CakeScripts/Settings.cs @@ -4,50 +4,54 @@ class Settings public static ICakeContext Cake { get; set; } public static string BuildTarget { get; set; } public static string Assembly { get; set; } - - public static List AssemblyList = new List() + public static List AssemblyList { get; set; } + + public static void Init() { - new GAssembly("GLibSharp") + AssemblyList = new List() { - NativeDeps = new[] { - "libglib-2.0.so.0", "libglib-2.0-0", - "libgobject-2.0.so.0", "libgobject-2.0-0", - "libgthread-2.0.so.0", "libgthread-2.0-0" + new GAssembly("GLibSharp") + { + NativeDeps = new[] { + "libglib-2.0.so.0", "libglib-2.0-0", + "libgobject-2.0.so.0", "libgobject-2.0-0", + "libgthread-2.0.so.0", "libgthread-2.0-0" + } + }, + new GAssembly("GioSharp") + { + Deps = new[] { "GLibSharp" }, + NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0" } + }, + new GAssembly("AtkSharp") + { + Deps = new[] { "GLibSharp" }, + NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0" }, + ExtraArgs = "--abi-cs-usings=Atk,GLib" + }, + new GAssembly("CairoSharp") + { + NativeDeps = new[] { "libcairo.so.2", "libcairo-2" } + }, + new GAssembly("PangoSharp") + { + Deps = new[] { "GLibSharp", "CairoSharp" }, + NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0" } + }, + new GAssembly("GdkSharp") + { + Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" }, + NativeDeps = new[] { + "libgdk-3.so.0", "libgdk-3-0", + "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0" + } + }, + new GAssembly("GtkSharp") + { + Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" }, + NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0" }, + ExtraArgs = "--abi-cs-usings=Gtk,GLib" } - }, - new GAssembly("GioSharp") - { - Deps = new[] { "GLibSharp" }, - NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0" } - }, - new GAssembly("AtkSharp") - { - Deps = new[] { "GLibSharp" }, - NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0" }, - ExtraArgs = "--abi-cs-usings=Atk,GLib" - }, - new GAssembly("CairoSharp") - { - NativeDeps = new[] { "libcairo.so.2", "libcairo-2" } - }, - new GAssembly("PangoSharp") - { - Deps = new[] { "GLibSharp", "CairoSharp" }, - NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0" } - }, - new GAssembly("GdkSharp") - { - Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" }, - NativeDeps = new[] { - "libgdk-3.so.0", "libgdk-3-0", - "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0" - } - }, - new GAssembly("GtkSharp") - { - Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" }, - NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0" }, - ExtraArgs = "--abi-cs-usings=Gtk,GLib" - } - }; + }; + } } \ No newline at end of file diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj index fc56a1f8c..23f3dbad6 100755 --- a/Source/Libs/AtkSharp/AtkSharp.csproj +++ b/Source/Libs/AtkSharp/AtkSharp.csproj @@ -3,6 +3,10 @@ true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + AtkSharp is a C# wrapper for the Atk library. + atk;atksharp;atk-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj index db4a5be5e..a8192f3b8 100755 --- a/Source/Libs/CairoSharp/CairoSharp.csproj +++ b/Source/Libs/CairoSharp/CairoSharp.csproj @@ -3,6 +3,10 @@ true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + CairoSharp is a C# wrapper for the Cairo library. + cairo;cairosharp;cairo-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj index 23b73b4d6..544df64d4 100755 --- a/Source/Libs/GLibSharp/GLibSharp.csproj +++ b/Source/Libs/GLibSharp/GLibSharp.csproj @@ -3,6 +3,10 @@ true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + GLibSharp is a C# wrapper for the GLib library. + glib;glibsharp;glib-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj index 26a1d950c..4ccf4a04f 100755 --- a/Source/Libs/GdkSharp/GdkSharp.csproj +++ b/Source/Libs/GdkSharp/GdkSharp.csproj @@ -3,6 +3,10 @@ true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + GdkSharp is a C# wrapper for the Gdk library. + gdk;gdksharp;gdk-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj index 3b9acebc8..44ae07774 100755 --- a/Source/Libs/GioSharp/GioSharp.csproj +++ b/Source/Libs/GioSharp/GioSharp.csproj @@ -1,9 +1,12 @@ - true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + GioSharp is a C# wrapper for the Gio library. + gio;giosharp;gio-sharp;wrapper ..\..\..\BuildOutput\Debug @@ -20,5 +23,4 @@ - diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj index 6fa0b3708..4f8580a8f 100755 --- a/Source/Libs/GtkSharp/GtkSharp.csproj +++ b/Source/Libs/GtkSharp/GtkSharp.csproj @@ -4,6 +4,11 @@ true netstandard2.0 false + https://raw.githubusercontent.com/cra0zy/GtkSharp/Source/Libs/GtkSharp/Icon.png + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + GtkSharp is a C# wrapper for the Gtk library. + gtk;gtksharp;gtk-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Libs/GtkSharp/Icon.png b/Source/Libs/GtkSharp/Icon.png new file mode 100755 index 000000000..bc70c1eab Binary files /dev/null and b/Source/Libs/GtkSharp/Icon.png differ diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj index 6ff090b83..985c44707 100755 --- a/Source/Libs/PangoSharp/PangoSharp.csproj +++ b/Source/Libs/PangoSharp/PangoSharp.csproj @@ -3,6 +3,10 @@ true netstandard2.0 false + https://github.com/cra0zy/GtkSharp + https://github.com/cra0zy/GtkSharp + PangoSharp is a C# wrapper for the Pango library. + pango;pangosharp;pango-sharp;wrapper ..\..\..\BuildOutput\Debug diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec index 65fbdf14b..36d189b8c 100755 --- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec +++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/GtkSharp.Template.CSharp.nuspec @@ -6,8 +6,8 @@ Gtk template for CSharp A simple C# template for your .Net Core Gtk Application. A simple C# template for your .Net Core Gtk Application. - cra0zy - cra0zy + GtkSharp Contributors + GtkSharp Contributors https://github.com/cra0zy/GtkSharp false diff --git a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json index c022053bc..be14f43a6 100755 --- a/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json +++ b/Source/Templates/NetCore/GtkSharp.Template.CSharp/content/.template.config/template.json @@ -1,6 +1,6 @@ { "$schema": "http://json.schemastore.org/template", - "author": "cra0zy", + "author": "GtkSharp Contributors", "classifications": [ "Console" ], diff --git a/Source/Templates/NetCore/test/MainWindow.cs b/Source/Templates/NetCore/test/MainWindow.cs deleted file mode 100755 index 4ae890980..000000000 --- a/Source/Templates/NetCore/test/MainWindow.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using Gtk; -using UI = Gtk.Builder.ObjectAttribute; - -namespace test -{ - class MainWindow : Window - { -#pragma warning disable 0649 - [UI] private Label _label1; - [UI] private Button _button1; -#pragma warning restore 0649 - - private int _counter; - - public MainWindow() : this(new Builder("MainWindow.glade")) { } - - private MainWindow(Builder builder) : base(builder.GetObject("MainWindow").Handle) - { - builder.Autoconnect(this); - - DeleteEvent += OnDeleteEvent; - _button1.Clicked += Button1_Clicked; - } - - private void OnDeleteEvent(object sender, DeleteEventArgs a) - { - Application.Quit(); - } - - private void Button1_Clicked(object sender, EventArgs a) - { - _counter++; - _label1.Text = "Hello World! This button has been clicked " + _counter + " time(s)."; - } - } -} diff --git a/Source/Templates/NetCore/test/MainWindow.glade b/Source/Templates/NetCore/test/MainWindow.glade deleted file mode 100755 index a13c41b20..000000000 --- a/Source/Templates/NetCore/test/MainWindow.glade +++ /dev/null @@ -1,46 +0,0 @@ - - - - - False - Example Window - 480 - 240 - - - True - False - 4 - 4 - 4 - 4 - vertical - - - True - False - Hello World! - - - True - True - 0 - - - - - Click me! - True - False - True - - - False - True - 1 - - - - - - diff --git a/Source/Templates/NetCore/test/Program.cs b/Source/Templates/NetCore/test/Program.cs deleted file mode 100755 index 4132e2997..000000000 --- a/Source/Templates/NetCore/test/Program.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using Gtk; - -namespace test -{ - class Program - { - [STAThread] - public static void Main(string[] args) - { - Application.Init(); - - var app = new Application("org.test.test", GLib.ApplicationFlags.None); - app.Register(GLib.Cancellable.Current); - - var win = new MainWindow(); - app.AddWindow(win); - - win.Show(); - Application.Run(); - } - } -} diff --git a/Source/Templates/NetCore/test/test.csproj b/Source/Templates/NetCore/test/test.csproj deleted file mode 100755 index 7a37f7744..000000000 --- a/Source/Templates/NetCore/test/test.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - Exe - netcoreapp2.0 - - - - MainWindow.glade - - - - - - diff --git a/build.cake b/build.cake index 1dc85bdb3..884bdde69 100755 --- a/build.cake +++ b/build.cake @@ -17,11 +17,13 @@ var list = new List(); Task("Init") .Does(() => { - // Assign version - msbuildsettings = msbuildsettings.WithProperty("Version", "3.0.0.0"); - msbuildsettings = msbuildsettings.WithProperty("Authors", "'GLibSharp Team'"); + // Assign some common properties + msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.0"); + msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'"); + msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/cra0zy/GtkSharp/blob/cakecore/LICENSE'"); // Add stuff to list + Settings.Init(); foreach(var gassembly in Settings.AssemblyList) if(string.IsNullOrEmpty(Settings.Assembly) || Settings.Assembly == gassembly.Name) list.Add(gassembly);