Skip to content

Draft: GTK3: Do not merge #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MakiWolf wants to merge 162 commits into from
Closed

Draft: GTK3: Do not merge #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
6ca69b5
Remove Stetic Gtk#2 GUI designer
Jul 23, 2018
1db6b06
Remove lingering glade-sharp references
Jul 23, 2018
6155274
Port to Gtk#3
Jul 23, 2018
abca952
moop
Jul 23, 2018
7065835
moop
Jul 23, 2018
17d164b
current wip
Jul 26, 2018
6297e23
Made it show an error popup!
Jul 26, 2018
b16963a
More build fixes
Jul 26, 2018
d30cfab
More build fixes
Jul 27, 2018
ed1ab72
Always use ToolkitType.Gtk3 for XWT
directhex Jul 27, 2018
feb07e0
Retrieve version number in a non-weird way
directhex Jul 27, 2018
d7a532b
Work around lack of font loading, due to style service stubs
directhex Jul 27, 2018
e5ae6e7
Get something displaying!!!
directhex Jul 27, 2018
85160e1
Fix natural_* == 0 in OnGetPreferred* events
directhex Jul 27, 2018
b615c4e
Minor natural_height fix
Jul 27, 2018
c5374d0
My first port from OnExposeEvent to OnDrawn
Jul 27, 2018
02d2dae
Fix Gtk3 on Mac
directhex Jul 28, 2018
765a54d
Better Linux OS name detection in Help/About
directhex Jul 28, 2018
0b740ae
more updates
directhex Jul 28, 2018
bcc8c79
More sourceeditor fixes
directhex Jul 28, 2018
6606b91
More build stubbing
directhex Jul 29, 2018
b08b7c5
Bump Xwt submodule, for Mac dllmap fix
Jul 30, 2018
fd4af9e
Update
MakiWolf Dec 4, 2023
7da6b8e
Update MonoDevelop.AspNet.csproj
MakiWolf Dec 4, 2023
2813a07
Update MonoDevelop.AspNet.Tests.csproj
MakiWolf Dec 4, 2023
5382325
Update CSharpBinding.AspNet.csproj
MakiWolf Dec 4, 2023
c0099bf
Update CSharpBinding.csproj
MakiWolf Dec 4, 2023
ba6a7b5
Update ChangeLogAddIn.csproj
MakiWolf Dec 4, 2023
22543e7
Update MonoDevelop.Deployment.Linux.csproj
MakiWolf Dec 4, 2023
962d499
Update MonoDevelop.Deployment.csproj
MakiWolf Dec 4, 2023
c81b862
Update GnomePlatform.csproj
MakiWolf Dec 4, 2023
02ed7dc
Update GnomePlatform.cs
MakiWolf Dec 4, 2023
cdf55fe
Update ILAsmBinding.csproj
MakiWolf Dec 4, 2023
ca4a6d8
Update MacPlatform.csproj
MakiWolf Dec 4, 2023
687b670
Update MonoDevelop.AspNetCore.csproj
MakiWolf Dec 4, 2023
af429f1
Update MonoDevelop.AssemblyBrowser.csproj
MakiWolf Dec 4, 2023
fd146a4
Update MonoDevelop.Autotools.csproj
MakiWolf Dec 4, 2023
c87d85c
Update MonoDevelop.ConnectedServices.csproj
MakiWolf Dec 4, 2023
520a4d9
Update MonoDevelop.Debugger.Soft.AspNet.csproj
MakiWolf Dec 4, 2023
eb9ce4a
Update MonoDevelop.Debugger.Soft.csproj
MakiWolf Dec 4, 2023
0361d43
Update MonoDevelop.Debugger.csproj
MakiWolf Dec 4, 2023
ea77cab
Update MonoDevelop.DesignerSupport.csproj
MakiWolf Dec 4, 2023
5c2479e
Update MonoDevelop.DocFood.csproj
MakiWolf Dec 4, 2023
206e13b
Update DotNetCoreTestBase.cs
MakiWolf Dec 4, 2023
331eadd
Update MonoDevelop.DotNetCore.csproj
MakiWolf Dec 4, 2023
da954e4
Update MonoDevelop.Gettext.csproj
MakiWolf Dec 4, 2023
ffe60ee
Update MonoDevelop.HexEditor.csproj
MakiWolf Dec 4, 2023
71979e7
Update MonoDevelop.PackageManagement.csproj
MakiWolf Dec 4, 2023
22629cd
Update MonoDevelop.Packaging.csproj
MakiWolf Dec 4, 2023
af3e148
Update MonoDevelop.UnitTesting.csproj
MakiWolf Dec 4, 2023
be49f29
Update MonoDevelop.WebReferences.csproj
MakiWolf Dec 4, 2023
148cff8
Update MonoDevelop.Refactoring.csproj
MakiWolf Dec 4, 2023
d5abead
Update MonoDevelop.RegexToolkit.csproj
MakiWolf Dec 4, 2023
17ab891
Update MonoDevelop.SourceEditor.csproj
MakiWolf Dec 4, 2023
5b56310
Update MonoDeveloperExtensions.csproj
MakiWolf Dec 4, 2023
8e84893
Update PerformanceDiagnosticsAddIn.csproj
MakiWolf Dec 4, 2023
07c4c3f
Update MonoDevelop.TextTemplating.csproj
MakiWolf Dec 4, 2023
5ba3fce
Update VBNetBinding.csproj
MakiWolf Dec 4, 2023
e0f5fc9
Update MonoDevelop.VersionControl.Git.Tests.csproj
MakiWolf Dec 4, 2023
dad8d99
Update MonoDevelop.VersionControl.Git.csproj
MakiWolf Dec 4, 2023
5ab92f3
Update MonoDevelop.VersionControl.Subversion.csproj
MakiWolf Dec 4, 2023
ff1da9e
Update MonoDevelop.VersionControl.csproj
MakiWolf Dec 4, 2023
bbedacc
Update WindowsPlatform.csproj
MakiWolf Dec 4, 2023
7c45b25
Update MonoDevelop.Xml.csproj
MakiWolf Dec 4, 2023
33a4e56
Update mdmonitor.csproj
MakiWolf Dec 4, 2023
b7c7a2d
Update MonoDevelop.Ide.csproj
MakiWolf Dec 4, 2023
587b2e0
Update MonoDevelop.TextEditor.Tests.csproj
MakiWolf Dec 4, 2023
cf1e8bf
Update TestHelpers.fs
MakiWolf Dec 8, 2023
a0c8729
Update DebugValueWindow.cs
MakiWolf Dec 8, 2023
8795ab6
Update MonoDevelop.UserInterfaceTesting.csproj
MakiWolf Dec 8, 2023
68b8dfc
Update UserInterfaceTests.csproj
MakiWolf Dec 8, 2023
14c77e7
Update TestRunner.csproj
MakiWolf Dec 8, 2023
5e7317a
Update IdeUnitTests.csproj
MakiWolf Dec 8, 2023
3a20fe8
Update IdeUnitTests.csproj
MakiWolf Dec 8, 2023
44d74ff
Update IdeStartup.cs
MakiWolf Dec 8, 2023
340503e
Update Ide.cs
MakiWolf Dec 8, 2023
5c156f3
Update Ide.cs
MakiWolf Dec 8, 2023
612df2e
Update DesktopService.cs
MakiWolf Dec 8, 2023
5cd97d5
Update MonoDevelop.Ide.csproj
MakiWolf Dec 8, 2023
d151faa
Update AddinsUpdateHandler.cs
MakiWolf Dec 8, 2023
3c241c3
Update TemplatePickerWidget.cs
MakiWolf Dec 8, 2023
394d950
Update ProjectReferencePanel.cs
MakiWolf Dec 8, 2023
1ebecc1
Update NewFileDialog.cs
MakiWolf Dec 8, 2023
a2ed3a8
Update CombineConfigurationPanel.cs
MakiWolf Dec 8, 2023
32aea31
Update CodeFormattingPanel.cs
MakiWolf Dec 8, 2023
fba35e4
Update ErrorListPad.cs
MakiWolf Dec 8, 2023
09b2407
Update TasksOptionsPanel.cs
MakiWolf Dec 8, 2023
b65f377
update
MakiWolf Dec 9, 2023
724f9a6
update
MakiWolf Dec 9, 2023
c3c3a31
update
MakiWolf Dec 9, 2023
fbed66f
Update MonoDevelop.CSharpBinding.Tests.csproj
MakiWolf Dec 9, 2023
9485d04
Update MonoDevelop.Refactoring.Tests.csproj
MakiWolf Dec 9, 2023
3d34aa4
Update MonoDevelop.Ide.Tests.csproj
MakiWolf Dec 9, 2023
85f469d
Update SetupApp.cs
MakiWolf Dec 9, 2023
0ad5431
Update ProgressDialog.cs
MakiWolf Dec 9, 2023
c4d06a8
Update OptionsDialog.cs
MakiWolf Dec 9, 2023
4ef0665
Update MultiConfigItemOptionsPanel.cs
MakiWolf Dec 9, 2023
0620a90
Update CodeSegmentPreviewWindow.cs
MakiWolf Dec 9, 2023
0bf1509
Update CommonAboutDialog.cs
MakiWolf Dec 9, 2023
3eab7b0
Update CommonAboutDialog.cs
MakiWolf Dec 9, 2023
dd98277
Update DirtyFilesDialog.cs
MakiWolf Dec 9, 2023
17fa4b9
Update KeyBindingsPanel.cs
MakiWolf Dec 9, 2023
67a9984
Update MonodocTreePad.cs
MakiWolf Dec 9, 2023
fa6d272
Update MonoDevelopStatusBar.cs
MakiWolf Dec 9, 2023
a49150d
Update ApplyPolicyDialog.cs
MakiWolf Dec 9, 2023
91ac7d3
Update DefaultPolicyOptionsDialog.cs
MakiWolf Dec 9, 2023
424a99a
Update GtkNewProjectDialogBackend.UI.cs
MakiWolf Dec 9, 2023
fb63a04
Update GtkNewProjectDialogBackend.cs
MakiWolf Dec 9, 2023
66a77df
Update GtkTemplateCellRenderer.cs
MakiWolf Dec 9, 2023
b657835
Update ExceptionCaughtDialog.cs
MakiWolf Dec 9, 2023
09e9fad
Update ObjectValueTreeView.cs
MakiWolf Dec 9, 2023
46b0041
Update ToolboxWidget.cs
MakiWolf Dec 9, 2023
2ca7615
Update BounceFadePopupWindow.cs
MakiWolf Dec 10, 2023
628a362
Update TextArea.cs
MakiWolf Dec 10, 2023
2faed61
Update QuickTaskOverviewMode.cs
MakiWolf Dec 10, 2023
a2d92b2
Update LogWidget.cs
MakiWolf Dec 10, 2023
f5c62fd
Update BasicChart.cs
MakiWolf Dec 10, 2023
950c118
Update DockBar.cs
MakiWolf Dec 10, 2023
ee9846e
Update MainToolbar.cs
MakiWolf Dec 10, 2023
7e51c03
Update CollectionEditor.cs
MakiWolf Dec 10, 2023
213c99a
Update EventEditor.cs
MakiWolf Dec 10, 2023
34df202
Update FlagsEditorCell.cs
MakiWolf Dec 10, 2023
204b498
Update CellRendererImage.cs
MakiWolf Dec 10, 2023
aa13e55
Update ContextMenuTreeView.cs
MakiWolf Dec 10, 2023
7a8520f
Update GtkWorkarounds.cs
MakiWolf Dec 10, 2023
dc8b2bb
Update IdeTheme.cs
MakiWolf Dec 10, 2023
895dd47
Update ProjectFileSelectorDialog.cs
MakiWolf Dec 10, 2023
4389fd0
Update LanguageCellRenderer.cs
MakiWolf Dec 10, 2023
12bdbfb
Update GtkNewProjectDialogBackend.cs
MakiWolf Dec 10, 2023
d3183c4
Update FileSelectorDialog.cs
MakiWolf Dec 10, 2023
e5709b0
Update DirtyFilesDialog.cs
MakiWolf Dec 10, 2023
2744797
Update TreeBuilder.cs
MakiWolf Dec 10, 2023
489e50a
Update ExtensibleTreeView.cs
MakiWolf Dec 10, 2023
a9a1e10
Update ExecutionModeComboBox.cs
MakiWolf Dec 10, 2023
89e150b
Update FontService.cs
MakiWolf Dec 10, 2023
edb5d1e
Update SearchResultWidget.cs
MakiWolf Dec 10, 2023
9622803
Update FindInFilesDialog.cs
MakiWolf Dec 10, 2023
6d3fedf
Update ExternalToolPanel.cs
MakiWolf Dec 10, 2023
8b850d6
Update TooltipProvider.cs
MakiWolf Dec 10, 2023
3286be4
Update CodeTemplatePanel.cs
MakiWolf Dec 10, 2023
a951afc
Update Tabstrip.cs
MakiWolf Dec 10, 2023
e04934e
Update PathBar.cs
MakiWolf Dec 10, 2023
8ff734c
Update HPanedThin.cs
MakiWolf Dec 10, 2023
cef1c3b
Update ReferencesGtk.props
MakiWolf Dec 10, 2023
290e13a
Update MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
MakiWolf Dec 10, 2023
91197e8
Update SearchEntry.cs
MakiWolf Dec 10, 2023
5d7c294
Update PadTreeView.cs
MakiWolf Dec 10, 2023
bc91295
Update SelectReferenceDialog.cs
MakiWolf Dec 10, 2023
3d4dc52
change to own fork
MakiWolf Dec 25, 2023
505e1ee
update
MakiWolf Dec 25, 2023
2e2670c
update
MakiWolf Dec 25, 2023
8fe8797
update
MakiWolf Dec 25, 2023
d330325
update
MakiWolf Dec 25, 2023
528a10e
older version
MakiWolf Dec 25, 2023
d884937
comment out
MakiWolf Dec 27, 2023
b572709
comment out
MakiWolf Dec 30, 2023
f383041
fix startup
MakiWolf Dec 30, 2023
530a73c
move references
MakiWolf Jan 2, 2024
949ddc3
delete crash
MakiWolf Jan 2, 2024
a236687
fix reference
MakiWolf Jan 2, 2024
ae129a3
update references
MakiWolf Jan 2, 2024
a2276de
update references
MakiWolf Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/monodevelop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# Synchronise Mono SSL certs
cert-sync /etc/ssl/certs/ca-certificates.crt
# Install extra packages required for dotdevelop build
sudo apt-get install -y sed git build-essential intltool nuget fsharp gtk-sharp2
sudo apt-get install -y sed git build-essential intltool nuget fsharp gtk-sharp3
sudo apt-get install -y software-properties-common
sudo apt-get update
- name: Verify OS and tools versions
Expand Down
10 changes: 4 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
url = https://github.com/dotdevelop/mdtestharness.git
[submodule "main/external/mono-addins"]
path = main/external/mono-addins
url = https://github.com/dotdevelop/mono-addins.git
branch = dotdevelop_gtksharp
url = https://github.com/MakiWolf/mono-addins.git
[submodule "main/external/mono-tools"]
path = main/external/mono-tools
url = https://github.com/dotdevelop/mono-tools.git
Expand All @@ -24,10 +23,6 @@
[submodule "main/external/sharpsvn-binary"]
path = main/external/sharpsvn-binary
url = https://github.com/dotdevelop/sharpsvn-binary.git
[submodule "main/external/xwt"]
path = main/external/xwt
url = https://github.com/dotdevelop/xwt
branch = dotdevelop
[submodule "main/external/Xamarin.PropertyEditing"]
path = main/external/Xamarin.PropertyEditing
url = https://github.com/dotdevelop/Xamarin.PropertyEditing
Expand All @@ -44,3 +39,6 @@
path = main/external/Samsung.Netcoredbg
url = https://github.com/dotdevelop/netcoredbg.git
branch = dotdevelop
[submodule "main/external/xwt"]
path = main/external/xwt
url = https://github.com/MakiWolf/xwt.git
72 changes: 37 additions & 35 deletions main/Main.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Subversion.W
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.GtkCore", "MonoDevelop.GtkCore", "{02280E65-C507-4931-AE68-AA2E89E15EEF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkCore", "src\addins\MonoDevelop.GtkCore\MonoDevelop.GtkCore.csproj", "{7FCDB0D9-AA7D-44E4-BE74-55312B432389}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libstetic", "src\addins\MonoDevelop.GtkCore\libstetic\libstetic.csproj", "{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsteticui", "src\addins\MonoDevelop.GtkCore\libsteticui\libsteticui.csproj", "{7926DB5B-96A7-47A7-9870-DB42FA5C3548}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBNetBinding", "VBNetBinding", "{481E1487-E0F1-4C6D-BD71-E572D9A19683}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\addins\VBNetBinding\VBNetBinding.csproj", "{EF91D0B8-53F6-4622-9F26-3ED27815878A}"
Expand Down Expand Up @@ -203,6 +197,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.CecilReflector"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Gui", "external\mono-addins\Mono.Addins.Gui\Mono.Addins.Gui.csproj", "{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.Setup", "external\mono-addins\Mono.Addins.Setup\Mono.Addins.Setup.csproj", "{A85C9721-C054-4BD8-A1F3-0227615F0A36}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{2D711139-8765-4929-BC7A-AA2DEE6F615D}"
Expand Down Expand Up @@ -478,10 +474,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIGtkUtil", "external\v
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.DotNetCore", "external\Monodevelop.Netcoredbg\MonoDevelop.Debugger.DotNetCore\MonoDevelop.Debugger.DotNetCore.csproj", "{F71A259D-C08F-48D9-93B7-EE51497EB390}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk2", "external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.GtkSharp", "external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk3", "external\xwt\Xwt.Gtk\Xwt.Gtk3.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}"
EndProject
#Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}"
#EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkExtensions", "src\core\MonoDevelop.GtkExtensions\MonoDevelop.GtkExtensions.csproj", "{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}"
Expand Down Expand Up @@ -1435,19 +1431,27 @@ Global
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|Any CPU.ActiveCfg = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -2867,26 +2871,26 @@ Global
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.Build.0 = Release|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.Build.0 = Release|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.ActiveCfg = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.ActiveCfg = Release|Any CPU
#{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.Build.0 = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.Build.0 = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -2948,9 +2952,6 @@ Global
{1038FBD8-750E-4081-BC65-D89FFED3C881} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
{E17829B5-8EAC-4714-8798-EB8ED3540191} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}
{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{7FCDB0D9-AA7D-44E4-BE74-55312B432389} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
{F870E2E7-FA64-4B2F-968A-90B36AB7AAA9} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
{7926DB5B-96A7-47A7-9870-DB42FA5C3548} = {02280E65-C507-4931-AE68-AA2E89E15EEF}
{481E1487-E0F1-4C6D-BD71-E572D9A19683} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{EF91D0B8-53F6-4622-9F26-3ED27815878A} = {481E1487-E0F1-4C6D-BD71-E572D9A19683}
{75B9F2DF-4DEA-4007-965D-339563735EBE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
Expand Down Expand Up @@ -3017,6 +3018,7 @@ Global
{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{42D1CE65-A14B-4218-B787-58AD7AA68513} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{410A7DC9-E7DA-43E6-B592-93E2A344B660} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{A85C9721-C054-4BD8-A1F3-0227615F0A36} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{2D711139-8765-4929-BC7A-AA2DEE6F615D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {2D711139-8765-4929-BC7A-AA2DEE6F615D}
Expand Down Expand Up @@ -3147,7 +3149,7 @@ Global
{209B27AE-712E-4B87-8846-BB149874D44E} = {745BF6CA-BC7C-4863-B1B4-C423A828820A}
{F71A259D-C08F-48D9-93B7-EE51497EB390} = {A026D596-3C8D-4521-BB42-2C898FA3BE2D}
{FED3E127-B64A-4E57-8D2A-C8817C5D593A} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{8F0B736F-8353-4A6C-B471-192D826BDD81} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
#{8F0B736F-8353-4A6C-B471-192D826BDD81} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{410A7DC9-E7DA-43E6-B592-93E2A344B660} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{0A8EB4EA-60B4-4708-BA45-68C5E730ED00} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
EndGlobalSection
Expand Down
8 changes: 4 additions & 4 deletions ...sharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public partial class FSharpCompilerOptionsWidget

private global::Gtk.HBox hbox2;

private global::Gtk.ComboBox comboDebug;
private global::Gtk.ComboBoxText comboDebug;

private global::Gtk.HBox hbox6;

private global::Gtk.ComboBox comboPlatforms;
private global::Gtk.ComboBoxText comboPlatforms;

private global::Gtk.Label label1;

Expand Down Expand Up @@ -181,7 +181,7 @@ protected virtual void Build()
this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 6;
// Container child hbox2.Gtk.Box+BoxChild
this.comboDebug = global::Gtk.ComboBox.NewText();
this.comboDebug = new global::Gtk.ComboBoxText();
this.comboDebug.AppendText(global::Mono.Unix.Catalog.GetString("Full"));
this.comboDebug.AppendText(global::Mono.Unix.Catalog.GetString("Symbols only"));
this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString("Portable"));
Expand All @@ -207,7 +207,7 @@ protected virtual void Build()
this.hbox6.Name = "hbox6";
this.hbox6.Spacing = 6;
// Container child hbox6.Gtk.Box+BoxChild
this.comboPlatforms = global::Gtk.ComboBox.NewText();
this.comboPlatforms = new global::Gtk.ComboBoxText();
this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("Any CPU"));
this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("x86"));
this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("x64"));
Expand Down
10 changes: 5 additions & 5 deletions main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Mono.Posix" />
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</ItemGroup>
<ItemGroup>
<Compile Include="generated.cs" />
Expand Down
32 changes: 16 additions & 16 deletions main/external/fsharpbinding/MonoDevelop.FSharp.Gui/generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ internal class BinContainer
public static BinContainer Attach(Gtk.Bin bin)
{
BinContainer bc = new BinContainer();
bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
// bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
// bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
bin.Added += new Gtk.AddedHandler(bc.OnAdded);
return bc;
}

private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
{
if ((this.child != null))
{
args.Requisition = this.child.SizeRequest();
}
}
// private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
// {
// if ((this.child != null))
// {
// args.Requisition = this.child.SizeRequest();
// }
// }

private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
{
if ((this.child != null))
{
this.child.Allocation = args.Allocation;
}
}
// private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
// {
// if ((this.child != null))
// {
// this.child.Allocation = args.Allocation;
// }
// }

private void OnAdded(object sender, Gtk.AddedArgs args)
{
Expand Down
1 change: 1 addition & 0 deletions main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module FixtureSetup =
//Environment.SetEnvironmentVariable ("MONO_ADDINS_REGISTRY", "/tmp")
//Environment.SetEnvironmentVariable ("XDG_CONFIG_HOME", "/tmp")
MonoDevelop.FSharp.MDLanguageService.DisableVirtualFileSystem()
Xwt.Application.Initialize (Xwt.ToolkitType.Gtk3)
Runtime.Initialize (true)
do! IdeApp.Initialize ((new ConsoleProgressMonitor()))
do! Runtime.GetService<TypeSystemService> ()
Expand Down
4 changes: 2 additions & 2 deletions main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpOutlineTextEditorExtension.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ type FSharpOutlineTextEditorExtension() as x =
let treeStore = new TreeStore(typedefof<obj>)
let padTreeView = new PadTreeView(treeStore, HeadersVisible = true)

let setCellIcon _column (cellRenderer : CellRenderer) (treeModel : TreeModel) (iter : TreeIter) =
let setCellIcon _column (cellRenderer : CellRenderer) (treeModel : ITreeModel) (iter : TreeIter) =
let pixRenderer = cellRenderer :?> CellRendererImage
treeModel.GetValue(iter, 0)
|> Option.tryCast<FSharpNavigationDeclarationItem[]>
|> Option.iter(fun item ->
pixRenderer.Image <- ImageService.GetIcon(ServiceUtils.getIcon item.[0], Gtk.IconSize.Menu))

let setCellText _column (cellRenderer : CellRenderer) (treeModel : TreeModel) (iter : TreeIter) =
let setCellText _column (cellRenderer : CellRenderer) (treeModel : ITreeModel) (iter : TreeIter) =
let renderer = cellRenderer :?> CellRendererText
treeModel.GetValue(iter, 0)
|> Option.tryCast<FSharpNavigationDeclarationItem[]>
Expand Down
Loading