diff --git a/main/Main.sln b/main/Main.sln
index 5ee822a35e5..a2a1fb3d045 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -41,12 +41,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}"
@@ -188,6 +182,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk3", "external\xwt\Xwt.Gtk\Xwt.Gtk3.csproj", "{3B25FD1F-CEBA-4450-8893-DC330FDB56A7}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt\Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}"
@@ -204,6 +200,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}"
@@ -543,54 +541,6 @@ Global
{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.Build.0 = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.Release|Any CPU.Build.0 = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.Release|Any CPU.Build.0 = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1240,7 +1190,6 @@ Global
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1248,11 +1197,20 @@ Global
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1328,7 +1286,6 @@ 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
@@ -1336,11 +1293,20 @@ Global
{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
@@ -2110,9 +2076,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}
@@ -2173,6 +2136,7 @@ Global
{67A32B53-F719-4ECB-B5E1-FD0B04FEE258} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{C93D746E-1586-4D4F-B411-BF5A966E6A08} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{E95833C9-90AA-4366-9262-0A1BED148249} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{252117CA-0ABB-4F36-BFC8-DE23A8089BB9} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
@@ -2181,6 +2145,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}
diff --git a/main/configure.ac b/main/configure.ac
index 940e54af963..9d252307fe0 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -128,15 +128,13 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.6
-GTKSHARP_REQUIRED_VERSION=2.12.8
+GTKSHARP_REQUIRED_VERSION=2.99.3
MONODOC_REQUIRED_VERSION=1.0
-PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= $GTKSHARP_REQUIRED_VERSION)
AC_SUBST(GLIB_SHARP_LIBS)
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-3.0 >= $GTKSHARP_REQUIRED_VERSION)
AC_SUBST(GTK_SHARP_LIBS)
-PKG_CHECK_MODULES(GLADE_SHARP, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-AC_SUBST(GLADE_SHARP_LIBS)
PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION)
AC_SUBST(MONODOC_LIBS)
@@ -331,9 +329,6 @@ src/addins/CSharpBinding/AspNet/Makefile
src/addins/ILAsmBinding/Makefile
src/addins/VBNetBinding/Makefile
src/addins/ChangeLogAddIn/Makefile
-src/addins/MonoDevelop.GtkCore/Makefile
-src/addins/MonoDevelop.GtkCore/libstetic/Makefile
-src/addins/MonoDevelop.GtkCore/libsteticui/Makefile
src/addins/TextTemplating/Makefile
src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile
src/addins/AspNet/Makefile
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj
index 7cefc3189a0..59878cdd4c2 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj
@@ -38,11 +38,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
index 451c2c7b0f3..5f95167f4f3 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
@@ -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;
@@ -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("None"));
@@ -205,7 +205,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"));
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/generated.cs b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/generated.cs
index 453751b36af..85b8ce0d5f7 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/generated.cs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/gtk-gui/generated.cs
@@ -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)
{
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
index 6bb0846701a..6e0beed918c 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj
@@ -50,11 +50,11 @@
--publicsign
-
-
-
-
-
+
+
+
+
+
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs
index 9513d2ccf7b..ea898ded8eb 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs
+++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs
@@ -16,7 +16,7 @@ module FixtureSetup =
//Environment.SetEnvironmentVariable ("MONO_ADDINS_REGISTRY", "/tmp")
//Environment.SetEnvironmentVariable ("XDG_CONFIG_HOME", "/tmp")
MonoDevelop.FSharp.MDLanguageService.DisableVirtualFileSystem()
- Xwt.Application.Initialize (Xwt.ToolkitType.Gtk)
+ Xwt.Application.Initialize (Xwt.ToolkitType.Gtk3)
Runtime.Initialize (true)
MonoDevelop.Ide.DesktopService.Initialize()
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj
index a9f034e2ce9..79cbca75e1e 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj
@@ -126,11 +126,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml
index d5c6d9e5973..b6fef009ca0 100644
--- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml
+++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml
@@ -28,12 +28,11 @@
-
-
-
-
-
-
+
+
+
+
+
diff --git a/main/external/xwt b/main/external/xwt
index dba5955385d..3187770c012 160000
--- a/main/external/xwt
+++ b/main/external/xwt
@@ -1 +1 @@
-Subproject commit dba5955385d8d3c44cd5f38886fc94398619edea
+Subproject commit 3187770c01285054e48819ff1f2990d287953bb7
diff --git a/main/monodevelop.spec.in b/main/monodevelop.spec.in
index 2cc3ae8cbe3..97ff1809d3a 100644
--- a/main/monodevelop.spec.in
+++ b/main/monodevelop.spec.in
@@ -18,7 +18,6 @@
Name: monodevelop
BuildRequires: pkgconfig(gtk-sharp-2.0)
-BuildRequires: pkgconfig(glade-sharp-2.0)
BuildRequires: pkgconfig(glib-sharp-2.0)
BuildRequires: pkgconfig(gnome-sharp-2.0)
BuildRequires: pkgconfig(mono-addins)
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
index 294cc4bc289..69650cb7962 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
@@ -137,11 +137,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
index 876ac5072f8..a22ba88105e 100644
--- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
+++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
@@ -13,10 +13,10 @@
-
-
-
-
+
+
+
+
..\..\..\..\build\bin\System.Reflection.Metadata.dll
False
diff --git a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
index 82d29ecca99..e77a90ebdff 100644
--- a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
+++ b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
@@ -13,12 +13,12 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj
index 56f03b1dbf0..41ff2ada6d9 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.csproj
+++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj
@@ -90,11 +90,11 @@
..\..\..\packages\ICSharpCode.Decompiler.3.0.0.3403-beta4\lib\net46\ICSharpCode.Decompiler.dll
false
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml b/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
index eccb3c53825..7da317572fb 100644
--- a/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
@@ -31,12 +31,11 @@
-
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
index b6a2f0e20f9..05f68d0f4a6 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
@@ -59,11 +59,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs
index 120b92e40ad..198fe7ff466 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs
@@ -9,11 +9,11 @@ public partial class DotDesktopViewWidget
private global::Gtk.VBox vbox4;
private global::Gtk.HBox hbox2;
private global::Gtk.Label label9;
- private global::Gtk.ComboBox comboType;
+ private global::Gtk.ComboBoxText comboType;
private global::Gtk.HSeparator hseparator4;
private global::Gtk.HBox hbox3;
private global::Gtk.Label label1;
- private global::Gtk.ComboBox comboLocales;
+ private global::Gtk.ComboBoxText comboLocales;
private global::Gtk.Button buttonNewLocale;
private global::Gtk.Table table6;
private global::Gtk.Entry entryComment;
@@ -115,7 +115,7 @@ protected virtual void Build ()
w2.Expand = false;
w2.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
- this.comboType = global::Gtk.ComboBox.NewText ();
+ this.comboType = new global::Gtk.ComboBoxText ();
this.comboType.AppendText (global::Mono.Unix.Catalog.GetString ("Application"));
this.comboType.AppendText (global::Mono.Unix.Catalog.GetString ("Link"));
this.comboType.AppendText (global::Mono.Unix.Catalog.GetString ("Directory"));
@@ -154,7 +154,7 @@ protected virtual void Build ()
w6.Expand = false;
w6.Fill = false;
// Container child hbox3.Gtk.Box+BoxChild
- this.comboLocales = global::Gtk.ComboBox.NewText ();
+ this.comboLocales = new global::Gtk.ComboBoxText ();
this.comboLocales.Name = "comboLocales";
this.hbox3.Add (this.comboLocales);
global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.comboLocales]));
@@ -538,7 +538,7 @@ protected virtual void Build ()
this.radioAlwaysShow.Name = "radioAlwaysShow";
this.radioAlwaysShow.Active = true;
this.radioAlwaysShow.DrawIndicator = true;
- this.radioAlwaysShow.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioAlwaysShow.Group = new Gtk.RadioButton [0];
this.boxMenu.Add (this.radioAlwaysShow);
global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.boxMenu [this.radioAlwaysShow]));
w46.Position = 4;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs
index 015d510670b..9c2609cb98d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs
@@ -20,7 +20,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Menu Category Selection");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -55,7 +55,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
w5.Position = 0;
// Internal child MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.ActionArea
- global::Gtk.HButtonBox w6 = this.ActionArea;
+ global::Gtk.HButtonBox w6 = (Gtk.HButtonBox)this.ActionArea;
w6.Name = "dialog1_ActionArea";
w6.Spacing = 10;
w6.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
index 73312e8aa57..778f2a5d270 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
@@ -42,11 +42,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
index c1464cdb01d..8a8c7917eb8 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
@@ -15,8 +15,8 @@ public partial class BasicOptionPanelWidget : Gtk.Bin
public BasicOptionPanelWidget (Project entry, bool creatingProject)
{
this.Build();
-
- WidgetFlags |= Gtk.WidgetFlags.NoShowAll;
+
+ this.NoShowAll = true;
this.entry = entry;
if (entry is DotNetProject) {
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs
index 2b1e5435c02..093e3aaed35 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs
@@ -57,7 +57,7 @@ public ArrayList Selection {
get { return selection; }
}
- private int CompareNodes (TreeModel model, TreeIter iter1, TreeIter iter2)
+ private int CompareNodes (ITreeModel model, TreeIter iter1, TreeIter iter2)
{
if ((string) store.GetValue (iter1, 0) == "__other")
return 1;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.DeployFileListWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.DeployFileListWidget.cs
index 1bd1c7505fb..8f884d6643d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.DeployFileListWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.DeployFileListWidget.cs
@@ -7,7 +7,7 @@ internal partial class DeployFileListWidget
private global::Gtk.VBox vbox2;
private global::Gtk.HBox hbox1;
private global::Gtk.Label labelFiles;
- private global::Gtk.ComboBox comboConfigs;
+ private global::Gtk.ComboBoxText comboConfigs;
private global::Gtk.ScrolledWindow scrolledwindow1;
private global::Gtk.TreeView fileList;
private global::Gtk.HBox hbox2;
@@ -37,7 +37,7 @@ protected virtual void Build ()
w1.Expand = false;
w1.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboConfigs = global::Gtk.ComboBox.NewText ();
+ this.comboConfigs = new global::Gtk.ComboBoxText ();
this.comboConfigs.Name = "comboConfigs";
this.hbox1.Add (this.comboConfigs);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboConfigs]));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.FileReplaceDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.FileReplaceDialog.cs
index d03d1fcd67b..aeecc2b19f8 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.FileReplaceDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.FileReplaceDialog.cs
@@ -90,9 +90,9 @@ protected virtual void Build ()
this.Modal = true;
this.BorderWidth = ((uint)(6));
this.Resizable = false;
- this.AllowGrow = false;
+// this.AllowGrow = false;
// Internal child MonoDevelop.Deployment.FileReplaceDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.Spacing = 4;
w1.BorderWidth = ((uint)(2));
@@ -175,7 +175,7 @@ protected virtual void Build ()
this.radioReplace.Name = "radioReplace";
this.radioReplace.DrawIndicator = true;
this.radioReplace.UseUnderline = true;
- this.radioReplace.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioReplace.Group = new Gtk.RadioButton [0];
this.radioReplace.Remove (this.radioReplace.Child);
// Container child radioReplace.Gtk.Container+ContainerChild
this.vbox5 = new global::Gtk.VBox ();
@@ -418,7 +418,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox2]));
w37.Position = 2;
// Internal child MonoDevelop.Deployment.FileReplaceDialog.ActionArea
- global::Gtk.HButtonBox w38 = this.ActionArea;
+ global::Gtk.HButtonBox w38 = (Gtk.HButtonBox)this.ActionArea;
w38.Name = "dialog1_ActionArea";
w38.Spacing = 6;
w38.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs
index 54c24348827..00863935033 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs
@@ -7,12 +7,12 @@ internal partial class BinariesZipEditorWidget
private global::Gtk.VBox vbox2;
private global::Gtk.Label label4;
private global::Gtk.Table table1;
- private global::Gtk.ComboBox comboConfiguration;
- private global::Gtk.ComboBox comboPlatform;
+ private global::Gtk.ComboBoxText comboConfiguration;
+ private global::Gtk.ComboBoxText comboPlatform;
private global::MonoDevelop.Components.FolderEntry folderEntry;
private global::Gtk.HBox hbox1;
private global::Gtk.Entry entryZip;
- private global::Gtk.ComboBox comboZip;
+ private global::Gtk.ComboBoxText comboZip;
private global::Gtk.Label label1;
private global::Gtk.Label label2;
private global::Gtk.Label label3;
@@ -45,7 +45,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.comboConfiguration = global::Gtk.ComboBox.NewText ();
+ this.comboConfiguration = new global::Gtk.ComboBoxText ();
this.comboConfiguration.Name = "comboConfiguration";
this.table1.Add (this.comboConfiguration);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboConfiguration]));
@@ -54,7 +54,7 @@ protected virtual void Build ()
w2.XOptions = ((global::Gtk.AttachOptions)(4));
w2.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.comboPlatform = global::Gtk.ComboBox.NewText ();
+ this.comboPlatform = new global::Gtk.ComboBoxText ();
this.comboPlatform.Name = "comboPlatform";
this.table1.Add (this.comboPlatform);
global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboPlatform]));
@@ -88,7 +88,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryZip]));
w5.Position = 0;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboZip = global::Gtk.ComboBox.NewText ();
+ this.comboZip = new global::Gtk.ComboBoxText ();
this.comboZip.Name = "comboZip";
this.hbox1.Add (this.comboZip);
global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboZip]));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
index 470a2685c87..add11925578 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
@@ -84,7 +84,7 @@ internal partial class DeployDialog
private global::Gtk.Table tableNewProject;
- private global::Gtk.ComboBox comboCreateProject;
+ private global::Gtk.ComboBoxText comboCreateProject;
private global::Gtk.Entry entryProjectName;
@@ -100,7 +100,7 @@ internal partial class DeployDialog
private global::Gtk.Label label12;
- private global::Gtk.ComboBox comboSelProject;
+ private global::Gtk.ComboBoxText comboSelProject;
private global::Gtk.Label label8;
@@ -119,7 +119,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Create Package");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Deployment.Gui.DeployDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Events = ((global::Gdk.EventMask)(256));
w1.Name = "dialog_VBox";
w1.BorderWidth = ((uint)(2));
@@ -416,7 +416,7 @@ protected virtual void Build ()
this.radioCreateProject.Active = true;
this.radioCreateProject.DrawIndicator = true;
this.radioCreateProject.UseUnderline = true;
- this.radioCreateProject.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioCreateProject.Group = new Gtk.RadioButton [0];
this.vboxSaveProject.Add (this.radioCreateProject);
global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vboxSaveProject [this.radioCreateProject]));
w30.Position = 2;
@@ -441,7 +441,7 @@ protected virtual void Build ()
this.tableNewProject.RowSpacing = ((uint)(6));
this.tableNewProject.ColumnSpacing = ((uint)(6));
// Container child tableNewProject.Gtk.Table+TableChild
- this.comboCreateProject = global::Gtk.ComboBox.NewText ();
+ this.comboCreateProject = new global::Gtk.ComboBoxText ();
this.comboCreateProject.Name = "comboCreateProject";
this.tableNewProject.Add (this.comboCreateProject);
global::Gtk.Table.TableChild w32 = ((global::Gtk.Table.TableChild)(this.tableNewProject [this.comboCreateProject]));
@@ -528,7 +528,7 @@ protected virtual void Build ()
w40.Expand = false;
w40.Fill = false;
// Container child boxAddProject.Gtk.Box+BoxChild
- this.comboSelProject = global::Gtk.ComboBox.NewText ();
+ this.comboSelProject = new global::Gtk.ComboBoxText ();
this.comboSelProject.Name = "comboSelProject";
this.boxAddProject.Add (this.comboSelProject);
global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.boxAddProject [this.comboSelProject]));
@@ -566,7 +566,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w47 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
w47.Position = 0;
// Internal child MonoDevelop.Deployment.Gui.DeployDialog.ActionArea
- global::Gtk.HButtonBox w48 = this.ActionArea;
+ global::Gtk.HButtonBox w48 = (Gtk.HButtonBox)this.ActionArea;
w48.Name = "MonoDevelop.Deployment.DeployDialog_ActionArea";
w48.Spacing = 6;
w48.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs
index 45eb5ebf7e8..3a244163c91 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs
@@ -29,7 +29,7 @@ protected virtual void Build ()
this.Name = "MonoDevelop.Deployment.Gui.EditPackageDialog";
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Deployment.Gui.EditPackageDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -151,7 +151,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w13.Position = 0;
// Internal child MonoDevelop.Deployment.Gui.EditPackageDialog.ActionArea
- global::Gtk.HButtonBox w14 = this.ActionArea;
+ global::Gtk.HButtonBox w14 = (Gtk.HButtonBox)this.ActionArea;
w14.Name = "dialog1_ActionArea";
w14.Spacing = 6;
w14.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs
index 6e75b890ea3..ed5b35da4f0 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs
@@ -7,7 +7,7 @@ public partial class FileCopyConfigurationSelector
private global::Gtk.VBox vbox1;
private global::Gtk.HBox hbox1;
private global::Gtk.Label label1;
- private global::Gtk.ComboBox comboHandlers;
+ private global::Gtk.ComboBoxText comboHandlers;
private global::Gtk.HSeparator hseparator1;
private global::Gtk.EventBox editorBox;
@@ -37,7 +37,7 @@ protected virtual void Build ()
w1.Expand = false;
w1.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboHandlers = global::Gtk.ComboBox.NewText ();
+ this.comboHandlers = new global::Gtk.ComboBoxText ();
this.comboHandlers.Name = "comboHandlers";
this.hbox1.Add (this.comboHandlers);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboHandlers]));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.InstallDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.InstallDialog.cs
index 560a6db7e55..a099d4003af 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.InstallDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.InstallDialog.cs
@@ -22,7 +22,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Install Project");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Deployment.Gui.InstallDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Events = ((global::Gdk.EventMask)(256));
w1.Name = "dialog_VBox";
w1.BorderWidth = ((uint)(2));
@@ -85,7 +85,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Internal child MonoDevelop.Deployment.Gui.InstallDialog.ActionArea
- global::Gtk.HButtonBox w8 = this.ActionArea;
+ global::Gtk.HButtonBox w8 = (Gtk.HButtonBox)this.ActionArea;
w8.Name = "MonoDevelop.Deployment.InstallDialog_ActionArea";
w8.Spacing = 10;
w8.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs
index 189d5a04613..a8f420198aa 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs
@@ -7,11 +7,11 @@ internal partial class SourcesZipEditorWidget
private global::Gtk.VBox vbox2;
private global::Gtk.Label label4;
private global::Gtk.Table table1;
- private global::Gtk.ComboBox comboFormat;
+ private global::Gtk.ComboBoxText comboFormat;
private global::MonoDevelop.Components.FolderEntry folderEntry;
private global::Gtk.HBox hbox1;
private global::Gtk.Entry entryZip;
- private global::Gtk.ComboBox comboZip;
+ private global::Gtk.ComboBoxText comboZip;
private global::Gtk.Label label1;
private global::Gtk.Label label2;
private global::Gtk.Label label3;
@@ -43,7 +43,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.comboFormat = global::Gtk.ComboBox.NewText ();
+ this.comboFormat = new global::Gtk.ComboBoxText ();
this.comboFormat.Name = "comboFormat";
this.table1.Add (this.comboFormat);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboFormat]));
@@ -75,7 +75,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryZip]));
w4.Position = 0;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboZip = global::Gtk.ComboBox.NewText ();
+ this.comboZip = new global::Gtk.ComboBoxText ();
this.comboZip.Name = "comboZip";
this.hbox1.Add (this.comboZip);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboZip]));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
index 4fbe017f7ba..b079d56a9be 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
@@ -158,7 +158,7 @@ void SelectBuilder (PackageBuilder builder)
PackageBuilder GetBuilderSelection ()
{
- Gtk.TreeModel model;
+ Gtk.ITreeModel model;
Gtk.TreeIter iter;
if (targetsTree.Selection.GetSelected (out model, out iter)) {
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs
index a61c075a749..31010ad4cfb 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs
@@ -26,7 +26,7 @@ protected override IPropertyEditor CreateEditor (Rectangle cell_area, StateType
class DeployDirectoryInfoEditorWidget : Gtk.HBox, IPropertyEditor {
Gtk.EventBox ebox;
- Gtk.ComboBoxEntry combo;
+ Gtk.ComboBoxText combo;
DeployDirectoryInfo[] values;
public DeployDirectoryInfoEditorWidget () : base (false, 0)
@@ -40,7 +40,7 @@ public void Initialize (EditSession session)
ebox.Show ();
PackStart (ebox, true, true, 0);
- combo = Gtk.ComboBoxEntry.NewText ();
+ combo = new Gtk.ComboBoxText ();
combo.Changed += combo_Changed;
combo.Entry.IsEditable = false;
combo.Entry.HasFrame = false;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs
index 528de0a9074..834214a108e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs
@@ -46,7 +46,7 @@ public PackageBuilderEditor (PackageBuilder target)
PackStart (editor.CreateEditor (target), true, true, 0);
} catch (Exception ex) {
LoggingService.LogError (ex.ToString ());
- PackStart (new Gtk.Label ("Could not create editor for deploy target of type " + target));
+ PackStart (new Gtk.Label ("Could not create editor for deploy target of type " + target), false, true, 0);
}
ShowAll ();
}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
index d50e0b90f66..c2905003642 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
@@ -15,11 +15,11 @@
-
-
-
-
-
+
+
+
+
+
..\..\..\..\packages\JetBrains.SharpZipLib.Stripped.0.87.20170615.10\lib\net40\ICSharpCode.SharpZipLib.dll
False
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs
index 6f1abf8d73a..fa52aa921a7 100644
--- a/main/src/addins/GnomePlatform/GnomePlatform.cs
+++ b/main/src/addins/GnomePlatform/GnomePlatform.cs
@@ -97,6 +97,16 @@ public override string DefaultMonospaceFont {
}
}
}
+
+ public override string DefaultSansFont {
+ get {
+ try {
+ return (string)(Gio.GetGSettingsString ("org.gnome.desktop.interface", "document-font-name"));
+ } catch (Exception) {
+ return "Sans 11";
+ }
+ }
+ }
public override string Name {
get { return "Gnome"; }
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj
index c7c74ea572b..9cc68f2b9c3 100644
--- a/main/src/addins/GnomePlatform/GnomePlatform.csproj
+++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj
@@ -10,12 +10,12 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
index eadfb16e3cd..fe6663a7e92 100644
--- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
+++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
@@ -12,11 +12,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
index 279b9c9afd5..d93943c4d6f 100644
--- a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
+++ b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
@@ -109,7 +109,7 @@ public override void Initialize ()
};
toolbar = new CustomToolbar ();
- toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image);
+ toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).GetNativeImage (image);
toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight ();
MainBox.PackStart (toolbar, false, false, 0);
((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0;
diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
index 269b091e55a..53bd4722bac 100644
--- a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
+++ b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
@@ -110,7 +110,7 @@ public override void Initialize ()
};
toolbar = new CustomToolbar ();
- toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image);
+ toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).GetNativeImage (image);
toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight ();
MainBox.PackStart (toolbar, false, false, 0);
((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0;
diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj
index c727dff3c7d..c625bd53c81 100644
--- a/main/src/addins/MacPlatform/MacPlatform.csproj
+++ b/main/src/addins/MacPlatform/MacPlatform.csproj
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am
index e41a99aafcf..aecba0ceabd 100644
--- a/main/src/addins/Makefile.am
+++ b/main/src/addins/Makefile.am
@@ -21,7 +21,6 @@ SUBDIRS = \
MonoDevelop.UnitTesting.NUnit \
MonoDeveloperExtensions \
VBNetBinding \
- MonoDevelop.GtkCore \
ChangeLogAddIn \
MonoDevelop.WebReferences \
MonoDevelop.RegexToolkit \
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
index dfea01c7510..36fefef4341 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj
@@ -14,10 +14,10 @@
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
index d9e34e818aa..079adaf4927 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
@@ -17,11 +17,11 @@
..\..\..\packages\ICSharpCode.Decompiler.3.0.0.3403-beta4\lib\net46\ICSharpCode.Decompiler.dll
false
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs
index 7de0624318c..21e6ec3477b 100644
--- a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs
@@ -15,7 +15,7 @@ public partial class GenerateMakefilesDialog
private global::Gtk.Label label3;
private global::Gtk.HBox hbox1;
private global::Gtk.Label label1;
- private global::Gtk.ComboBox comboConfigs;
+ private global::Gtk.ComboBoxText comboConfigs;
private global::Gtk.Button buttonCancel;
private global::Gtk.Button buttonOk;
@@ -27,9 +27,9 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Generate Makefiles");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Resizable = false;
- this.AllowGrow = false;
+// this.AllowGrow = false;
// Internal child MonoDevelop.Autotools.GenerateMakefilesDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -57,7 +57,7 @@ protected virtual void Build ()
this.rbSimple.Name = "rbSimple";
this.rbSimple.DrawIndicator = true;
this.rbSimple.UseUnderline = true;
- this.rbSimple.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.rbSimple.Group = new Gtk.RadioButton [0];
this.rbSimple.Remove (this.rbSimple.Child);
// Container child rbSimple.Gtk.Container+ContainerChild
this.label4 = new global::Gtk.Label ();
@@ -132,7 +132,7 @@ protected virtual void Build ()
w10.Expand = false;
w10.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboConfigs = global::Gtk.ComboBox.NewText ();
+ this.comboConfigs = new global::Gtk.ComboBoxText ();
this.comboConfigs.Name = "comboConfigs";
this.hbox1.Add (this.comboConfigs);
global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboConfigs]));
@@ -151,7 +151,7 @@ protected virtual void Build ()
w13.Expand = false;
w13.Fill = false;
// Internal child MonoDevelop.Autotools.GenerateMakefilesDialog.ActionArea
- global::Gtk.HButtonBox w14 = this.ActionArea;
+ global::Gtk.HButtonBox w14 = (Gtk.HButtonBox)this.ActionArea;
w14.Name = "dialog1_ActionArea";
w14.Spacing = 6;
w14.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
index 17c232b52a4..a4f4e95287c 100644
--- a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
@@ -14,9 +14,9 @@ public partial class MakefileOptionPanelWidget
private global::Gtk.CheckButton cbRunTarget;
private global::MonoDevelop.Components.FileEntry fileEntryMakefilePath;
private global::Gtk.HBox hbox1;
- private global::Gtk.ComboBox comboAssemblyName;
+ private global::Gtk.ComboBoxText comboAssemblyName;
private global::Gtk.HBox hbox2;
- private global::Gtk.ComboBox comboOutputDir;
+ private global::Gtk.ComboBoxText comboOutputDir;
private global::Gtk.HBox hbox3;
private global::Gtk.Entry BuildTargetName;
private global::Gtk.HBox hbox4;
@@ -39,10 +39,10 @@ public partial class MakefileOptionPanelWidget
private global::Gtk.CheckButton cbKeepFilesSync;
private global::Gtk.CheckButton cbKeepOthersSync;
private global::Gtk.CheckButton cbKeepResourcesSync;
- private global::Gtk.ComboBox comboDeployFilesVar;
- private global::Gtk.ComboBox comboFilesVar;
- private global::Gtk.ComboBox comboOthersVar;
- private global::Gtk.ComboBox comboResourcesVar;
+ private global::Gtk.ComboBoxText comboDeployFilesVar;
+ private global::Gtk.ComboBoxText comboFilesVar;
+ private global::Gtk.ComboBoxText comboOthersVar;
+ private global::Gtk.ComboBoxText comboResourcesVar;
private global::Gtk.Entry entryDeployFilesPattern;
private global::Gtk.Entry entryFilesPattern;
private global::Gtk.Entry entryResourcesPattern;
@@ -57,9 +57,9 @@ public partial class MakefileOptionPanelWidget
private global::Gtk.HSeparator hseparator5;
private global::Gtk.Table table4;
private global::Gtk.CheckButton cbAutotoolsProject;
- private global::Gtk.ComboBox comboAsmRefVar;
- private global::Gtk.ComboBox comboPackageRefVar;
- private global::Gtk.ComboBox comboProjectRefVar;
+ private global::Gtk.ComboBoxText comboAsmRefVar;
+ private global::Gtk.ComboBoxText comboPackageRefVar;
+ private global::Gtk.ComboBoxText comboProjectRefVar;
private global::Gtk.Entry entryAsmRefPattern;
private global::Gtk.Entry entryPackageRefPattern;
private global::Gtk.Entry entryProjectRefPattern;
@@ -79,7 +79,7 @@ public partial class MakefileOptionPanelWidget
private global::Gtk.Entry entryErrorRegex;
private global::Gtk.Entry entryWarningRegex;
private global::Gtk.HBox hbox6;
- private global::Gtk.ComboBox comboMessageType;
+ private global::Gtk.ComboBoxText comboMessageType;
private global::Gtk.Label lblErrorRegex;
private global::Gtk.Label lblMessageType;
private global::Gtk.Label lblWarningRegex;
@@ -179,7 +179,7 @@ protected virtual void Build ()
this.hbox1 = new global::Gtk.HBox ();
this.hbox1.Name = "hbox1";
// Container child hbox1.Gtk.Box+BoxChild
- this.comboAssemblyName = global::Gtk.ComboBox.NewText ();
+ this.comboAssemblyName = new global::Gtk.ComboBoxText ();
this.comboAssemblyName.WidthRequest = 300;
this.comboAssemblyName.Name = "comboAssemblyName";
this.hbox1.Add (this.comboAssemblyName);
@@ -199,7 +199,7 @@ protected virtual void Build ()
this.hbox2 = new global::Gtk.HBox ();
this.hbox2.Name = "hbox2";
// Container child hbox2.Gtk.Box+BoxChild
- this.comboOutputDir = global::Gtk.ComboBox.NewText ();
+ this.comboOutputDir = new global::Gtk.ComboBoxText ();
this.comboOutputDir.WidthRequest = 300;
this.comboOutputDir.Name = "comboOutputDir";
this.hbox2.Add (this.comboOutputDir);
@@ -457,7 +457,7 @@ protected virtual void Build ()
w31.XOptions = ((global::Gtk.AttachOptions)(4));
w31.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
- this.comboDeployFilesVar = global::Gtk.ComboBox.NewText ();
+ this.comboDeployFilesVar = new global::Gtk.ComboBoxText ();
this.comboDeployFilesVar.WidthRequest = 200;
this.comboDeployFilesVar.Name = "comboDeployFilesVar";
this.table3.Add (this.comboDeployFilesVar);
@@ -468,7 +468,7 @@ protected virtual void Build ()
w32.RightAttach = ((uint)(2));
w32.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
- this.comboFilesVar = global::Gtk.ComboBox.NewText ();
+ this.comboFilesVar = new global::Gtk.ComboBoxText ();
this.comboFilesVar.WidthRequest = 200;
this.comboFilesVar.Name = "comboFilesVar";
this.table3.Add (this.comboFilesVar);
@@ -479,7 +479,7 @@ protected virtual void Build ()
w33.RightAttach = ((uint)(2));
w33.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
- this.comboOthersVar = global::Gtk.ComboBox.NewText ();
+ this.comboOthersVar = new global::Gtk.ComboBoxText ();
this.comboOthersVar.WidthRequest = 200;
this.comboOthersVar.Name = "comboOthersVar";
this.table3.Add (this.comboOthersVar);
@@ -490,7 +490,7 @@ protected virtual void Build ()
w34.RightAttach = ((uint)(2));
w34.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
- this.comboResourcesVar = global::Gtk.ComboBox.NewText ();
+ this.comboResourcesVar = new global::Gtk.ComboBoxText ();
this.comboResourcesVar.WidthRequest = 200;
this.comboResourcesVar.Name = "comboResourcesVar";
this.table3.Add (this.comboResourcesVar);
@@ -655,7 +655,7 @@ protected virtual void Build ()
w48.RightAttach = ((uint)(3));
w48.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
- this.comboAsmRefVar = global::Gtk.ComboBox.NewText ();
+ this.comboAsmRefVar = new global::Gtk.ComboBoxText ();
this.comboAsmRefVar.WidthRequest = 200;
this.comboAsmRefVar.Name = "comboAsmRefVar";
this.table4.Add (this.comboAsmRefVar);
@@ -666,7 +666,7 @@ protected virtual void Build ()
w49.RightAttach = ((uint)(2));
w49.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
- this.comboPackageRefVar = global::Gtk.ComboBox.NewText ();
+ this.comboPackageRefVar = new global::Gtk.ComboBoxText ();
this.comboPackageRefVar.WidthRequest = 200;
this.comboPackageRefVar.Name = "comboPackageRefVar";
this.table4.Add (this.comboPackageRefVar);
@@ -677,7 +677,7 @@ protected virtual void Build ()
w50.RightAttach = ((uint)(2));
w50.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
- this.comboProjectRefVar = global::Gtk.ComboBox.NewText ();
+ this.comboProjectRefVar = new global::Gtk.ComboBoxText ();
this.comboProjectRefVar.WidthRequest = 200;
this.comboProjectRefVar.Name = "comboProjectRefVar";
this.table4.Add (this.comboProjectRefVar);
@@ -904,7 +904,7 @@ protected virtual void Build ()
this.hbox6 = new global::Gtk.HBox ();
this.hbox6.Name = "hbox6";
// Container child hbox6.Gtk.Box+BoxChild
- this.comboMessageType = global::Gtk.ComboBox.NewText ();
+ this.comboMessageType = new global::Gtk.ComboBoxText ();
this.comboMessageType.WidthRequest = 150;
this.comboMessageType.Name = "comboMessageType";
this.hbox6.Add (this.comboMessageType);
diff --git a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs
index 4c84c767053..00a615a549e 100644
--- a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs
@@ -16,7 +16,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Switch editor");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Autotools.MakefileSwitchEditor.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -26,7 +26,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1 [this.align]));
w2.Position = 0;
// Internal child MonoDevelop.Autotools.MakefileSwitchEditor.ActionArea
- global::Gtk.HButtonBox w3 = this.ActionArea;
+ global::Gtk.HButtonBox w3 = (Gtk.HButtonBox)this.ActionArea;
w3.Name = "dialog1_ActionArea";
w3.Spacing = 6;
w3.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs
index f6c92ec5dba..6990cb47361 100644
--- a/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs
@@ -14,7 +14,7 @@ public partial class TarballBuilderEditorWidget
private global::Gtk.HBox boxConfig;
private global::Gtk.Label label4;
private global::Gtk.Label label3;
- private global::Gtk.ComboBox comboConfigs;
+ private global::Gtk.ComboBoxText comboConfigs;
private global::Gtk.HBox boxConfig1;
private global::Gtk.Label label5;
private global::Gtk.Label label6;
@@ -72,7 +72,7 @@ protected virtual void Build ()
this.radioUseExisting.Active = true;
this.radioUseExisting.DrawIndicator = true;
this.radioUseExisting.UseUnderline = true;
- this.radioUseExisting.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioUseExisting.Group = new Gtk.RadioButton [0];
this.vbox2.Add (this.radioUseExisting);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radioUseExisting]));
w4.Position = 1;
@@ -117,7 +117,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Container child boxConfig.Gtk.Box+BoxChild
- this.comboConfigs = global::Gtk.ComboBox.NewText ();
+ this.comboConfigs = new global::Gtk.ComboBoxText ();
this.comboConfigs.Name = "comboConfigs";
this.boxConfig.Add (this.comboConfigs);
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.boxConfig [this.comboConfigs]));
@@ -174,7 +174,7 @@ protected virtual void Build ()
this.rbAutotools.Active = true;
this.rbAutotools.DrawIndicator = true;
this.rbAutotools.UseUnderline = true;
- this.rbAutotools.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.rbAutotools.Group = new Gtk.RadioButton [0];
this.rbAutotools.Remove (this.rbAutotools.Child);
// Container child rbAutotools.Gtk.Container+ContainerChild
this.label9 = new global::Gtk.Label ();
diff --git a/main/src/addins/MonoDevelop.Autotools/ImportMakefileDialog.cs b/main/src/addins/MonoDevelop.Autotools/ImportMakefileDialog.cs
index 876d093afef..b44d638dd1f 100644
--- a/main/src/addins/MonoDevelop.Autotools/ImportMakefileDialog.cs
+++ b/main/src/addins/MonoDevelop.Autotools/ImportMakefileDialog.cs
@@ -48,7 +48,7 @@ public ImportMakefileDialog (Project project, MakefileData tmpData, string name)
box.PackStart (optionsWidget, false, false, 0);
box.BorderWidth = 6;
- this.VBox.PackStart (box, true, true, 0);
+ this.ContentArea.PackStart (box, true, true, 0);
this.AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
this.AddButton (Gtk.Stock.Ok, ResponseType.Ok);
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
index 2b8e9474dff..34773dabfe8 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
@@ -14,7 +14,7 @@ namespace MonoDevelop.Autotools
public partial class MakefileOptionPanelWidget : Gtk.Bin
{
MakefileData data;
- ComboBox [] combos = null;
+ ComboBoxText [] combos = null;
bool isDotNetProject;
bool loading = true;
Window parentDialog;
@@ -137,7 +137,7 @@ public void SetImportMode ()
public MakefileOptionPanelWidget()
{
this.Build();
- combos = new ComboBox [7] {
+ combos = new ComboBoxText [7] {
comboFilesVar, comboDeployFilesVar, comboResourcesVar, comboOthersVar,
comboPackageRefVar, comboAsmRefVar, comboProjectRefVar};
//comboAssemblyName, comboOutputDir};
diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
index 51ca8d67530..2c3a1509780 100644
--- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
+++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
@@ -39,11 +39,11 @@
-
-
-
-
-
+
+
+
+
+
..\..\..\build\bin\System.Collections.Immutable.dll
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/MonoDevelop.ConnectedServices.csproj b/main/src/addins/MonoDevelop.ConnectedServices/MonoDevelop.ConnectedServices.csproj
index 633c9ce62ab..9140a288611 100644
--- a/main/src/addins/MonoDevelop.ConnectedServices/MonoDevelop.ConnectedServices.csproj
+++ b/main/src/addins/MonoDevelop.ConnectedServices/MonoDevelop.ConnectedServices.csproj
@@ -12,12 +12,12 @@
-
-
-
-
+
+
+
+
-
+
..\..\..\build\bin\System.Collections.Immutable.dll
False
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
index c7e1895f35c..95314624bb6 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/MonoDevelop.Debugger.Soft.AspNet.csproj
@@ -12,11 +12,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
index bafd6278f61..c8639b5701f 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
@@ -216,7 +216,7 @@ public DebuggerOptionsDialog () : base (
var table = new Gtk.Table (5, 2, false);
table.BorderWidth = 6;
- VBox.PackStart (table, true, true, 0);
+ ContentArea.PackStart (table, true, true, 0);
table.Attach (new Gtk.Label ("Command:") { Xalign = 0 }, 0, 1, 0, 1);
table.Attach (new Gtk.Label ("Arguments:") { Xalign = 0 }, 0, 1, 1, 2);
@@ -290,7 +290,7 @@ public DebuggerOptionsDialog () : base (
CheckValid ();
- VBox.ShowAll ();
+ ContentArea.ShowAll ();
}
int? ParsePort (string port)
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
index 5973b076489..aee755216b0 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj
@@ -12,11 +12,21 @@
-
-
-
-
-
+
+ gtk-sharp-3.0
+
+
+ glib-sharp-3.0
+
+
+ gdk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll
False
@@ -33,6 +43,9 @@
..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll
False
+
+ gio-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.AttachToProcessDialog.cs b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.AttachToProcessDialog.cs
index 2223b616666..d53583a10e1 100644
--- a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.AttachToProcessDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.AttachToProcessDialog.cs
@@ -12,7 +12,7 @@ public partial class AttachToProcessDialog
private global::Gtk.TreeView tree;
private global::Gtk.HBox hbox2;
private global::Gtk.Label label2;
- private global::Gtk.ComboBox comboDebs;
+ private global::Gtk.ComboBoxText comboDebs;
private global::Gtk.Button buttonCancel;
private global::Gtk.Button buttonOk;
@@ -25,7 +25,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(3));
// Internal child MonoDevelop.Debugger.AttachToProcessDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -87,7 +87,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
- this.comboDebs = global::Gtk.ComboBox.NewText ();
+ this.comboDebs = new global::Gtk.ComboBoxText ();
this.comboDebs.Name = "comboDebs";
this.hbox2.Add (this.comboDebs);
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboDebs]));
@@ -103,7 +103,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w10.Position = 0;
// Internal child MonoDevelop.Debugger.AttachToProcessDialog.ActionArea
- global::Gtk.HButtonBox w11 = this.ActionArea;
+ global::Gtk.HButtonBox w11 = (Gtk.HButtonBox)this.ActionArea;
w11.Name = "dialog1_ActionArea";
w11.Spacing = 6;
w11.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs
index c9d8a12e761..ea425a263f1 100644
--- a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs
@@ -18,7 +18,7 @@ protected virtual void Build()
this.Title = global::Mono.Unix.Catalog.GetString("The Debugger is Busy");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Debugger.BusyEvaluatorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -40,7 +40,7 @@ protected virtual void Build()
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
w3.Position = 0;
// Internal child MonoDevelop.Debugger.BusyEvaluatorDialog.ActionArea
- global::Gtk.HButtonBox w4 = this.ActionArea;
+ global::Gtk.HButtonBox w4 = (Gtk.HButtonBox)this.ActionArea;
w4.Name = "dialog1_ActionArea";
w4.Spacing = 10;
w4.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.DebugApplicationDialog.cs b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.DebugApplicationDialog.cs
index 7eee0e3f583..5f6d2bedb8a 100644
--- a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.DebugApplicationDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.DebugApplicationDialog.cs
@@ -36,7 +36,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Debug Application");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Debugger.DebugApplicationDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -141,7 +141,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
w11.Position = 0;
// Internal child MonoDevelop.Debugger.DebugApplicationDialog.ActionArea
- global::Gtk.HButtonBox w12 = this.ActionArea;
+ global::Gtk.HButtonBox w12 = (Gtk.HButtonBox)this.ActionArea;
w12.Name = "dialog1_ActionArea";
w12.Spacing = 10;
w12.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs
index 38404d7c741..272bac9bef6 100644
--- a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs
@@ -20,7 +20,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Expression Evaluator");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Debugger.ExpressionEvaluatorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -82,7 +82,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w7.Position = 0;
// Internal child MonoDevelop.Debugger.ExpressionEvaluatorDialog.ActionArea
- global::Gtk.HButtonBox w8 = this.ActionArea;
+ global::Gtk.HButtonBox w8 = (Gtk.HButtonBox)this.ActionArea;
w8.Name = "dialog1_ActionArea";
w8.Spacing = 6;
w8.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs
index d328add073b..c71ae9855d2 100644
--- a/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs
@@ -22,7 +22,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Value Visualizer");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -52,7 +52,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.mainBox]));
w4.Position = 0;
// Internal child MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.ActionArea
- global::Gtk.HButtonBox w5 = this.ActionArea;
+ global::Gtk.HButtonBox w5 = (Gtk.HButtonBox)this.ActionArea;
w5.Name = "dialog1_ActionArea";
w5.Spacing = 10;
w5.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index 380f94226f4..140fc315891 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -91,7 +91,7 @@ public PreviewVisualizerWindow (ObjectValue val, Gtk.Widget invokingWidget) : ba
} else {
headerTable.Attach (new Label (), 2, 3, 0, 1, AttachOptions.Fill | AttachOptions.Expand, AttachOptions.Fill | AttachOptions.Expand, 10, 0);
}
- mainBox.PackStart (headerTable);
+ mainBox.PackStart (headerTable, false, true, 0);
mainBox.ShowAll ();
var previewVisualizer = DebuggingService.GetPreviewVisualizer (val);
@@ -109,7 +109,7 @@ public PreviewVisualizerWindow (ObjectValue val, Gtk.Widget invokingWidget) : ba
alignment.SetPadding (3, 5, 5, 5);
alignment.Show ();
alignment.Add (widget);
- mainBox.PackStart (alignment);
+ mainBox.PackStart (alignment, false, true, 0);
ContentBox.Add (mainBox);
}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index 50fc4d428d0..a75ba456d8b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -14,13 +14,23 @@
-
-
-
-
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gdk-sharp-3.0
+
-
+
+ gtk-sharp-3.0
+
@@ -48,6 +58,12 @@
..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
False
+
+ gio-sharp-3.0
+
+
+ gtk-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index 39b7352f9c5..ca51f5e859c 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -146,7 +146,7 @@ Widget CreateExceptionHeader ()
var frame = new Frame ();
frame.Add (hBox);
frame.BorderWidth = (uint)(Platform.IsWindows ? 5 : 10); // on Windows we need to have smaller border due to ExceptionTypeLabel vertical misalignment
- frame.Shadow = ShadowType.None;
+// frame.Shadow = ShadowType.None;
frame.ShadowType = ShadowType.None;
eventBox.Add (frame);
@@ -206,11 +206,12 @@ public ExpanderWithMinSize (string label) : base (label)
{
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
- requisition.Height = 28;
+ base.OnGetPreferredHeight (out minimum_height, out natural_height);
+ minimum_height = natural_height = 28;
}
+
}
Expander WrapInExpander (string title, Widget widget)
@@ -244,21 +245,21 @@ void Expander_Activated (object sender, EventArgs e)
paned.Position = paned.MinPosition;
}
- static void StackFrameLayout (CellLayout layout, CellRenderer cr, TreeModel model, TreeIter iter)
- {
- var frame = (ExceptionStackFrame)model.GetValue (iter, (int)ModelColumn.StackFrame);
- var renderer = (StackFrameCellRenderer)cr;
-
- renderer.Markup = (string)model.GetValue (iter, (int)ModelColumn.Markup);
- renderer.Frame = frame;
-
- if (frame == null) {
- renderer.IsUserCode = false;
- return;
- }
-
- renderer.IsUserCode = (bool)model.GetValue (iter, (int)ModelColumn.IsUserCode);
- }
+// static void StackFrameLayout (CellLayout layout, CellRenderer cr, ITreeModel model, TreeIter iter)
+// {
+// var frame = (ExceptionStackFrame)model.GetValue (iter, (int)ModelColumn.StackFrame);
+// var renderer = (StackFrameCellRenderer)cr;
+//
+// renderer.Markup = (string)model.GetValue (iter, (int)ModelColumn.Markup);
+// renderer.Frame = frame;
+//
+// if (frame == null) {
+// renderer.IsUserCode = false;
+// return;
+// }
+//
+// renderer.IsUserCode = (bool)model.GetValue (iter, (int)ModelColumn.IsUserCode);
+// }
Widget CreateStackTraceTreeView ()
{
@@ -273,7 +274,7 @@ Widget CreateStackTraceTreeView ()
var renderer = new StackFrameCellRenderer (StackTraceTreeView.PangoContext);
- StackTraceTreeView.AppendColumn ("", renderer, (CellLayoutDataFunc)StackFrameLayout);
+// StackTraceTreeView.AppendColumn ("", renderer, (CellLayoutDataFunc)StackFrameLayout);
StackTraceTreeView.RowActivated += StackFrameActivated;
@@ -681,53 +682,53 @@ class CellRendererInnerException : CellRenderer
Pango.FontDescription font = Pango.FontDescription.FromString (Platform.IsWindows ? "9" : "11");
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- using (var layout = new Pango.Layout (widget.PangoContext)) {
- layout.FontDescription = font;
- Pango.Rectangle ink, logical;
- layout.SetMarkup ("" + Text + "");
- layout.GetPixelExtents (out ink, out logical);
- width = logical.Width + 10;
- height = logical.Height + 2;
-
- x_offset = 0;
- y_offset = 0;
- }
- }
-
- protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
- {
- using (var cr = Gdk.CairoHelper.Create (window)) {
- cr.Rectangle (background_area.X, background_area.Y, background_area.Width, background_area.Height);
-
- using (var layout = new Pango.Layout (widget.PangoContext)) {
- layout.FontDescription = font;
-
- if ((flags & CellRendererState.Selected) != 0) {
- cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Red,
- Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Green,
- Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Blue); // selected
- cr.Fill ();
- cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Red,
- Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Green,
- Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Blue);
- } else {
- cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeBackgroundColor.Red,
- Styles.ExceptionCaughtDialog.TreeBackgroundColor.Green,
- Styles.ExceptionCaughtDialog.TreeBackgroundColor.Blue); // background
- cr.Fill ();
- cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeTextColor.Red,
- Styles.ExceptionCaughtDialog.TreeTextColor.Green,
- Styles.ExceptionCaughtDialog.TreeTextColor.Blue);
- }
-
- layout.SetMarkup (Text);
- cr.Translate (cell_area.X + 10, cell_area.Y + 1);
- cr.ShowLayout (layout);
- }
- }
- }
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// using (var layout = new Pango.Layout (widget.PangoContext)) {
+// layout.FontDescription = font;
+// Pango.Rectangle ink, logical;
+// layout.SetMarkup ("" + Text + "");
+// layout.GetPixelExtents (out ink, out logical);
+// width = logical.Width + 10;
+// height = logical.Height + 2;
+//
+// x_offset = 0;
+// y_offset = 0;
+// }
+// }
+
+// protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+// {
+// using (var cr = Gdk.CairoHelper.Create (window)) {
+// cr.Rectangle (background_area.X, background_area.Y, background_area.Width, background_area.Height);
+//
+// using (var layout = new Pango.Layout (widget.PangoContext)) {
+// layout.FontDescription = font;
+//
+// if ((flags & CellRendererState.Selected) != 0) {
+// cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Red,
+// Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Green,
+// Styles.ExceptionCaughtDialog.TreeSelectedBackgroundColor.Blue); // selected
+// cr.Fill ();
+// cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Red,
+// Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Green,
+// Styles.ExceptionCaughtDialog.TreeSelectedTextColor.Blue);
+// } else {
+// cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeBackgroundColor.Red,
+// Styles.ExceptionCaughtDialog.TreeBackgroundColor.Green,
+// Styles.ExceptionCaughtDialog.TreeBackgroundColor.Blue); // background
+// cr.Fill ();
+// cr.SetSourceRGB (Styles.ExceptionCaughtDialog.TreeTextColor.Red,
+// Styles.ExceptionCaughtDialog.TreeTextColor.Green,
+// Styles.ExceptionCaughtDialog.TreeTextColor.Blue);
+// }
+//
+// layout.SetMarkup (Text);
+// cr.Translate (cell_area.X + 10, cell_area.Y + 1);
+// cr.ShowLayout (layout);
+// }
+// }
+// }
}
protected override bool OnKeyReleaseEvent (Gdk.EventKey evnt)
@@ -793,43 +794,43 @@ string GetFileMarkup (bool selected)
return markup;
}
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- using (var layout = new Pango.Layout (Context)) {
- Pango.Rectangle ink, logical;
- layout.FontDescription = font;
- layout.SetMarkup (GetMethodMarkup (false));
- layout.GetPixelExtents (out ink, out logical);
-
- height = logical.Height;
- width = 0;
- x_offset = 0;
- y_offset = 0;
- }
- }
-
- protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
- {
- using (var cr = Gdk.CairoHelper.Create (window)) {
- Pango.Rectangle ink, logical;
- using (var layout = new Pango.Layout (Context)) {
- layout.FontDescription = font;
- layout.SetMarkup (GetFileMarkup ((flags & CellRendererState.Selected) != 0));
- layout.GetPixelExtents (out ink, out logical);
- var width = widget.Allocation.Width;
- cr.Translate (width - logical.Width - 10, cell_area.Y);
- cr.ShowLayout (layout);
-
- cr.IdentityMatrix ();
-
- layout.SetMarkup (GetMethodMarkup ((flags & CellRendererState.Selected) != 0));
- layout.Width = (int)((width - logical.Width - 35) * Pango.Scale.PangoScale);
- layout.Ellipsize = Pango.EllipsizeMode.Middle;
- cr.Translate (cell_area.X + 10, cell_area.Y);
- cr.ShowLayout (layout);
- }
- }
- }
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// using (var layout = new Pango.Layout (Context)) {
+// Pango.Rectangle ink, logical;
+// layout.FontDescription = font;
+// layout.SetMarkup (GetMethodMarkup (false));
+// layout.GetPixelExtents (out ink, out logical);
+//
+// height = logical.Height;
+// width = 0;
+// x_offset = 0;
+// y_offset = 0;
+// }
+// }
+
+// protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+// {
+// using (var cr = Gdk.CairoHelper.Create (window)) {
+// Pango.Rectangle ink, logical;
+// using (var layout = new Pango.Layout (Context)) {
+// layout.FontDescription = font;
+// layout.SetMarkup (GetFileMarkup ((flags & CellRendererState.Selected) != 0));
+// layout.GetPixelExtents (out ink, out logical);
+// var width = widget.Allocation.Width;
+// cr.Translate (width - logical.Width - 10, cell_area.Y);
+// cr.ShowLayout (layout);
+//
+// cr.IdentityMatrix ();
+//
+// layout.SetMarkup (GetMethodMarkup ((flags & CellRendererState.Selected) != 0));
+// layout.Width = (int)((width - logical.Width - 35) * Pango.Scale.PangoScale);
+// layout.Ellipsize = Pango.EllipsizeMode.Middle;
+// cr.Translate (cell_area.X + 10, cell_area.Y);
+// cr.ShowLayout (layout);
+// }
+// }
+// }
}
class ExceptionCaughtMessage : IDisposable
@@ -985,7 +986,7 @@ public override Control CreateWidget ()
CanFocus = false,
Name = "exceptionTypeLabel"
};
- vb.PackStart (typeLabel);
+ vb.PackStart (typeLabel, false, true, 0);
messageLabel = new Label {
Xalign = 0,
NoShowAll = true,
@@ -993,7 +994,7 @@ public override Control CreateWidget ()
CanFocus = false,
Name = "exceptionMessageLabel"
};
- vb.PackStart (messageLabel);
+ vb.PackStart (messageLabel, false, true, 0);
var detailsBtn = new Xwt.LinkLabel (GettextCatalog.GetString ("Show Details"));
var hh = new HBox ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index 89db6240e61..307e5eb6e61 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -152,31 +152,31 @@ Xwt.Drawing.Image img {
}
}
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- if (!icon.IsNull)
- width += (int)(Xpad * 2 + img.Width);
- }
-
- protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- if (!icon.IsNull) {
- using (var ctx = Gdk.CairoHelper.Create (window)) {
- using (var layout = new Pango.Layout (widget.PangoContext)) {
- layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
- layout.FontDescription.Family = Family;
- layout.SetText (Text);
- int w, h;
- layout.GetPixelSize (out w, out h);
- var x = cell_area.X + w + 3 * Xpad;
- var y = cell_area.Y + cell_area.Height / 2 - (int)(img.Height / 2);
- ctx.DrawImage (widget, img, x, y);
- }
- }
- }
- }
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
+// if (!icon.IsNull)
+// width += (int)(Xpad * 2 + img.Width);
+// }
+
+// protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+// {
+// base.Render (window, widget, background_area, cell_area, expose_area, flags);
+// if (!icon.IsNull) {
+// using (var ctx = Gdk.CairoHelper.Create (window)) {
+// using (var layout = new Pango.Layout (widget.PangoContext)) {
+// layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+// layout.FontDescription.Family = Family;
+// layout.SetText (Text);
+// int w, h;
+// layout.GetPixelSize (out w, out h);
+// var x = cell_area.X + w + 3 * Xpad;
+// var y = cell_area.Y + cell_area.Height / 2 - (int)(img.Height / 2);
+// ctx.DrawImage (widget, img, x, y);
+// }
+// }
+// }
+// }
}
class ValueCellRenderer : CellRendererText
@@ -207,44 +207,44 @@ public string TextUrl {
}
}
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- if (Compact)
- this.Ellipsize = Pango.EllipsizeMode.None;
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- if (Compact)
- this.Ellipsize = Pango.EllipsizeMode.End;
- }
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// if (Compact)
+// this.Ellipsize = Pango.EllipsizeMode.None;
+// base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
+// if (Compact)
+// this.Ellipsize = Pango.EllipsizeMode.End;
+// }
}
class CellRendererColorPreview : CellRenderer
{
- protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
- {
- var darkColor = Color.WithIncreasedLight (-0.15);
-
- using (Cairo.Context cr = Gdk.CairoHelper.Create (window)) {
- double center_x = cell_area.X + Math.Round ((double)(cell_area.Width / 2d));
- double center_y = cell_area.Y + Math.Round ((double)(cell_area.Height / 2d));
-
- // TODO: VV: On retina this should be LineWidth = 0.5 and Arc size needs to match
-
- // @1x:
- cr.LineWidth = 1;
- cr.Arc (center_x, center_y, 5.5f, 0, 2 * Math.PI);
-
- cr.SetSourceRGBA (Color.Red, Color.Green, Color.Blue, 1);
- cr.FillPreserve ();
- cr.SetSourceRGBA (darkColor.Red, darkColor.Green, darkColor.Blue, 1);
- cr.Stroke ();
- }
- }
-
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- x_offset = y_offset = 0;
- height = width = 16;
- }
+// protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+// {
+// var darkColor = Color.WithIncreasedLight (-0.15);
+//
+// using (Cairo.Context cr = Gdk.CairoHelper.Create (window)) {
+// double center_x = cell_area.X + Math.Round ((double)(cell_area.Width / 2d));
+// double center_y = cell_area.Y + Math.Round ((double)(cell_area.Height / 2d));
+//
+// // TODO: VV: On retina this should be LineWidth = 0.5 and Arc size needs to match
+//
+// // @1x:
+// cr.LineWidth = 1;
+// cr.Arc (center_x, center_y, 5.5f, 0, 2 * Math.PI);
+//
+// cr.SetSourceRGBA (Color.Red, Color.Green, Color.Blue, 1);
+// cr.FillPreserve ();
+// cr.SetSourceRGBA (darkColor.Red, darkColor.Green, darkColor.Blue, 1);
+// cr.Stroke ();
+// }
+// }
+
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// x_offset = y_offset = 0;
+// height = width = 16;
+// }
public Xwt.Drawing.Color Color { get; set; }
}
@@ -252,60 +252,60 @@ public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out in
class CellRendererRoundedButton : CellRendererText {
const int TopBottomPadding = 1;
- protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
- {
- if (string.IsNullOrEmpty (Text)) {
- return;
- }
- using (var cr = Gdk.CairoHelper.Create (window)) {
- using (var layout = new Pango.Layout (widget.PangoContext)) {
- layout.SetText (Text);
- layout.FontDescription = FontDesc;
- layout.FontDescription.Family = Family;
- int w, h;
- layout.GetPixelSize (out w, out h);
- int xpad = (int)Xpad;
- cr.RoundedRectangle (
- cell_area.X + xpad + 0.5,
- cell_area.Y + TopBottomPadding + 0.5,
- w + (cell_area.Height - 2 * TopBottomPadding) - 1,
- cell_area.Height - TopBottomPadding * 2 - 1,
- (cell_area.Height - (TopBottomPadding * 2)) / 2);
- cr.LineWidth = 1;
- cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBackground.ToCairoColor ());
- cr.FillPreserve ();
- cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBorder.ToCairoColor ());
- cr.Stroke ();
-
- int YOffset = (cell_area.Height - h) / 2;
- if (((ObjectValueTreeView)widget).CompactView && !Platform.IsWindows)
- YOffset += 1;
- cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonText.ToCairoColor ());
- cr.MoveTo (cell_area.X + (cell_area.Height - TopBottomPadding * 2 + 1) / 2 + xpad,
- cell_area.Y + YOffset);
- cr.ShowLayout (layout);
- }
- }
- }
-
- public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- x_offset = y_offset = 0;
- if (string.IsNullOrEmpty (Text)) {
- width = 0;
- height = 0;
- return;
- }
- using (var layout = new Pango.Layout (widget.PangoContext)) {
- layout.SetText (Text);
- layout.FontDescription = FontDesc;
- layout.FontDescription.Family = Family;
- int w, h;
- layout.GetPixelSize (out w, out h);
- width = w + (height - 2 * TopBottomPadding) + 2 * (int)Xpad;
- }
- }
+// protected override void Render (Gdk.Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+// {
+// if (string.IsNullOrEmpty (Text)) {
+// return;
+// }
+// using (var cr = Gdk.CairoHelper.Create (window)) {
+// using (var layout = new Pango.Layout (widget.PangoContext)) {
+// layout.SetText (Text);
+// layout.FontDescription = FontDesc;
+// layout.FontDescription.Family = Family;
+// int w, h;
+// layout.GetPixelSize (out w, out h);
+// int xpad = (int)Xpad;
+// cr.RoundedRectangle (
+// cell_area.X + xpad + 0.5,
+// cell_area.Y + TopBottomPadding + 0.5,
+// w + (cell_area.Height - 2 * TopBottomPadding) - 1,
+// cell_area.Height - TopBottomPadding * 2 - 1,
+// (cell_area.Height - (TopBottomPadding * 2)) / 2);
+// cr.LineWidth = 1;
+// cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBackground.ToCairoColor ());
+// cr.FillPreserve ();
+// cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBorder.ToCairoColor ());
+// cr.Stroke ();
+//
+// int YOffset = (cell_area.Height - h) / 2;
+// if (((ObjectValueTreeView)widget).CompactView && !Platform.IsWindows)
+// YOffset += 1;
+// cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonText.ToCairoColor ());
+// cr.MoveTo (cell_area.X + (cell_area.Height - TopBottomPadding * 2 + 1) / 2 + xpad,
+// cell_area.Y + YOffset);
+// cr.ShowLayout (layout);
+// }
+// }
+// }
+
+// public override void GetSize (Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
+// x_offset = y_offset = 0;
+// if (string.IsNullOrEmpty (Text)) {
+// width = 0;
+// height = 0;
+// return;
+// }
+// using (var layout = new Pango.Layout (widget.PangoContext)) {
+// layout.SetText (Text);
+// layout.FontDescription = FontDesc;
+// layout.FontDescription.Family = Family;
+// int w, h;
+// layout.GetPixelSize (out w, out h);
+// width = w + (height - 2 * TopBottomPadding) + 2 * (int)Xpad;
+// }
+// }
}
public ObjectValueTreeView ()
@@ -410,7 +410,7 @@ public ObjectValueTreeView ()
createMsg = GettextCatalog.GetString ("Click here to add a new watch");
CompletionWindowManager.WindowClosed += HandleCompletionWindowClosed;
PreviewWindowManager.WindowClosed += HandlePreviewWindowClosed;
- ScrollAdjustmentsSet += HandleScrollAdjustmentsSet;
+// ScrollAdjustmentsSet += HandleScrollAdjustmentsSet;
expanderSize = (int)this.StyleGetProperty ("expander-size") + 4;//+4 is hardcoded in gtk.c code
@@ -419,7 +419,7 @@ public ObjectValueTreeView ()
focus_line_width = (int)this.StyleGetProperty ("focus-line-width") * 2;//we just use *2 version in GetMaxWidth
}
- static void ValueDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void ValueDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
var val = (ObjectValue)model.GetValue (iter, ObjectColumn);
Xwt.Drawing.Color? color;
@@ -454,15 +454,15 @@ int GetMaxWidth (TreeViewColumn column, TreeIter iter)
column.CellSetCellData (Model, iter, false, false);
var area = new Gdk.Rectangle (0, 0, 1000, 1000);
bool firstCell = true;
- foreach (var cellRenderer in column.CellRenderers) {
- if (!cellRenderer.Visible)
- continue;
- if (!firstCell && columnWidth > 0)
- columnWidth += column.Spacing;
- cellRenderer.GetSize (this, ref area, out x, out y, out w, out h);
- columnWidth += w + focus_line_width;
- firstCell = false;
- }
+// foreach (var cellRenderer in column.CellRenderers) {
+// if (!cellRenderer.Visible)
+// continue;
+// if (!firstCell && columnWidth > 0)
+// columnWidth += column.Spacing;
+// cellRenderer.GetSize (this, ref area, out x, out y, out w, out h);
+// columnWidth += w + focus_line_width;
+// firstCell = false;
+// }
if (ExpanderColumn == column) {
columnWidth += horizontal_separator + (path.Depth - 1) * LevelIndentation;
if (ShowExpanders)
@@ -511,17 +511,17 @@ void HandleSelectionChanged (object sender, EventArgs e)
Adjustment oldHadjustment;
Adjustment oldVadjustment;
//Don't convert this event handler to override OnSetScrollAdjustments as it causes problems
- void HandleScrollAdjustmentsSet (object o, ScrollAdjustmentsSetArgs args)
- {
- if (oldHadjustment != null) {
- oldHadjustment.ValueChanged -= UpdatePreviewPosition;
- oldVadjustment.ValueChanged -= UpdatePreviewPosition;
- }
- oldHadjustment = Hadjustment;
- oldVadjustment = Vadjustment;
- oldHadjustment.ValueChanged += UpdatePreviewPosition;
- oldVadjustment.ValueChanged += UpdatePreviewPosition;
- }
+// void HandleScrollAdjustmentsSet (object o, ScrollAdjustmentsSetArgs args)
+// {
+// if (oldHadjustment != null) {
+// oldHadjustment.ValueChanged -= UpdatePreviewPosition;
+// oldVadjustment.ValueChanged -= UpdatePreviewPosition;
+// }
+// oldHadjustment = Hadjustment;
+// oldVadjustment = Vadjustment;
+// oldHadjustment.ValueChanged += UpdatePreviewPosition;
+// oldVadjustment.ValueChanged += UpdatePreviewPosition;
+// }
void UpdatePreviewPosition (object sender, EventArgs e)
{
@@ -577,7 +577,7 @@ protected override void OnDestroyed ()
valueCol.RemoveNotification ("width", OnColumnWidthChanged);
expCol.RemoveNotification ("width", OnColumnWidthChanged);
- ScrollAdjustmentsSet -= HandleScrollAdjustmentsSet;
+// ScrollAdjustmentsSet -= HandleScrollAdjustmentsSet;
if (oldHadjustment != null) {
oldHadjustment.ValueChanged -= UpdatePreviewPosition;
oldVadjustment.ValueChanged -= UpdatePreviewPosition;
@@ -2057,7 +2057,7 @@ protected void OnCopy ()
return;
if (selected.Length == 1) {
- var editable = IdeApp.Workbench.RootWindow.Focus as Editable;
+ var editable = IdeApp.Workbench.RootWindow.Focus as IEditable;
if (editable != null) {
editable.CopyClipboard ();
@@ -2198,28 +2198,28 @@ bool GetCellAtPos (int x, int y, out TreePath path, out TreeViewColumn col, out
if (GetPathAtPos (x, y, out path, out col)) {
var cellArea = GetCellArea (path, col);
x -= cellArea.X;
- foreach (CellRenderer cr in col.CellRenderers) {
- int xo, w;
- col.CellGetPosition (cr, out xo, out w);
- var visible = cr.Visible;
- if (cr == crpViewer) {
- if (store.GetIter (out var it, path)) {
- visible = (bool)store.GetValue (it, ViewerButtonVisibleColumn);
- }
- } else if (cr == evaluateStatusCell) {
- if (store.GetIter (out var it, path)) {
- visible = (bool)store.GetValue (it, EvaluateStatusIconVisibleColumn);
- }
- } else if (cr == crpButton) {
- if (store.GetIter (out var it, path)) {
- visible = (bool)store.GetValue (it, ValueButtonVisibleColumn);
- }
- }
- if (visible && x >= xo && x < xo + w) {
- cellRenderer = cr;
- return true;
- }
- }
+// foreach (CellRenderer cr in col.CellRenderers) {
+// int xo, w;
+// col.CellGetPosition (cr, out xo, out w);
+// var visible = cr.Visible;
+// if (cr == crpViewer) {
+// if (store.GetIter (out var it, path)) {
+// visible = (bool)store.GetValue (it, ViewerButtonVisibleColumn);
+// }
+// } else if (cr == evaluateStatusCell) {
+// if (store.GetIter (out var it, path)) {
+// visible = (bool)store.GetValue (it, EvaluateStatusIconVisibleColumn);
+// }
+// } else if (cr == crpButton) {
+// if (store.GetIter (out var it, path)) {
+// visible = (bool)store.GetValue (it, ValueButtonVisibleColumn);
+// }
+// }
+// if (visible && x >= xo && x < xo + w) {
+// cellRenderer = cr;
+// return true;
+// }
+// }
}
cellRenderer = null;
return false;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
index f2f694f3db9..7981d8d64c8 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
@@ -179,17 +179,17 @@ void LoadColumnsVisibility ()
void StoreColumnsVisibility ()
{
PropertyService.Set ("Monodevelop.StackTrace.ColumnsVisibility", string.Join (";", tree.Columns.Select (c => c.Visible ? "TRUE" : "FALSE")));
- }
+ }
void OnDebuggingServiceStopped (object sender, EventArgs e)
{
TreeIter iter;
-
+
if (store != null && store.GetIterFirst (out iter) && (store.GetValue (iter, FrameColumn) as StackFrame)?.DebuggerSession == sender)
- store.Clear ();
+ store.Clear ();
}
- static bool Search (TreeModel model, int column, string key, TreeIter iter)
+ static bool Search (ITreeModel model, int column, string key, TreeIter iter)
{
string value = (string)model.GetValue (iter, column);
@@ -298,15 +298,15 @@ bool GetCellAtPos (int x, int y, out TreePath path, out TreeViewColumn col, out
if (tree.GetPathAtPos (x, y, out path, out col, out cx, out cy)) {
tree.GetCellArea (path, col);
- foreach (CellRenderer cr in col.CellRenderers) {
- int xo, w;
-
- col.CellGetPosition (cr, out xo, out w);
- if (cr.Visible && cx >= xo && cx < xo + w) {
- cellRenderer = cr;
- return true;
- }
- }
+// foreach (CellRenderer cr in col.CellRenderers) {
+// int xo, w;
+//
+// col.CellGetPosition (cr, out xo, out w);
+// if (cr.Visible && cx >= xo && cx < xo + w) {
+// cellRenderer = cr;
+// return true;
+// }
+// }
}
cellRenderer = null;
@@ -485,7 +485,7 @@ internal void OnSelectAll ()
internal void OnCopy ()
{
var txt = new StringBuilder ();
- TreeModel model;
+ ITreeModel model;
TreeIter iter;
foreach (TreePath path in tree.Selection.GetSelectedRows (out model)) {
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
index 0435aeb74c7..3e9a9669aac 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
@@ -195,14 +195,14 @@ void CopyExecution_Clicked (object sender, ContextMenuItemClickedEventArgs e)
clipboard.Text = bufferText;
}
- public override void Dispose ()
- {
- base.Dispose ();
- DebuggingService.CallStackChanged -= OnStackChanged;
- DebuggingService.PausedEvent -= OnDebuggerPaused;
- DebuggingService.ResumedEvent -= OnDebuggerResumed;
- DebuggingService.StoppedEvent -= OnDebuggerStopped;
- }
+// public override void Dispose ()
+// {
+// base.Dispose ();
+// DebuggingService.CallStackChanged -= OnStackChanged;
+// DebuggingService.PausedEvent -= OnDebuggerPaused;
+// DebuggingService.ResumedEvent -= OnDebuggerResumed;
+// DebuggingService.StoppedEvent -= OnDebuggerStopped;
+// }
void OnStackChanged (object s, EventArgs a)
{
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TreePathReference.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TreePathReference.cs
index e35b3b8d4d4..9e6dcabc917 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TreePathReference.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TreePathReference.cs
@@ -34,7 +34,7 @@ public sealed class TreePathReference : IDisposable
int[] indices;
TreePath path;
- public TreePathReference (TreeModel model, TreePath path)
+ public TreePathReference (ITreeModel model, TreePath path)
{
model.RowsReordered += HandleRowsReordered;
model.RowInserted += HandleRowInserted;
@@ -122,7 +122,7 @@ void HandleRowDeleted (object o, RowDeletedArgs args)
}
}
- public TreeModel Model {
+ public ITreeModel Model {
get; private set;
}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
index b9e133f9494..87eaa4c23ad 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
@@ -60,7 +60,7 @@ public bool IsListMode {
set {
listMode = value;
this.QueueResize ();
- this.ScrollToSelectedItem ();
+// this.ScrollToSelectedItem ();
}
}
@@ -81,7 +81,7 @@ public bool ShowCategories {
set {
showCategories = value;
this.QueueResize ();
- this.ScrollToSelectedItem ();
+// this.ScrollToSelectedItem ();
}
}
@@ -153,7 +153,7 @@ public ToolboxWidget ()
handCursor = new Cursor (CursorType.Hand1);
var actionHandler = new ActionDelegate (this);
- actionHandler.PerformShowMenu += PerformShowMenu;
+// actionHandler.PerformShowMenu += PerformShowMenu;
}
protected override void OnStyleSet (Gtk.Style previous_style)
@@ -182,7 +182,7 @@ protected override void OnStyleSet (Gtk.Style previous_style)
protected override void OnDestroyed ()
{
- HideTooltipWindow ();
+// HideTooltipWindow ();
if (this.layout != null) {
this.layout.Dispose ();
this.layout = null;
@@ -208,123 +208,123 @@ static Cairo.Color Convert (Gdk.Color color)
const int ItemIconTextItemSpacing = 4;
const int IconModePadding = 2;
- protected override bool OnExposeEvent (Gdk.EventExpose e)
- {
- Cairo.Context cr = Gdk.CairoHelper.Create (e.Window);
-
- Gdk.Rectangle area = e.Area;
-
- if (this.categories.Count == 0 || !string.IsNullOrEmpty (CustomMessage)) {
- Pango.Layout messageLayout = new Pango.Layout (this.PangoContext);
- messageLayout.Alignment = Pango.Alignment.Center;
- messageLayout.Width = (int)(Allocation.Width * 2 / 3 * Pango.Scale.PangoScale);
- if (!string.IsNullOrEmpty (CustomMessage))
- messageLayout.SetText (CustomMessage);
- else
- messageLayout.SetText (MonoDevelop.Core.GettextCatalog.GetString ("There are no tools available for the current document."));
- cr.MoveTo (Allocation.Width * 1 / 6, 12);
- cr.SetSourceColor (Style.Text (StateType.Normal).ToCairoColor ());
- Pango.CairoHelper.ShowLayout (cr, messageLayout);
- messageLayout.Dispose ();
- ((IDisposable)cr).Dispose ();
- return true;
- }
-
- var backColor = Style.Base (StateType.Normal).ToCairoColor ();
- cr.SetSourceColor (backColor);
- cr.Rectangle (area.X, area.Y, area.Width, area.Height);
- cr.Fill ();
-
- int xpos = (this.hAdjustement != null ? (int)this.hAdjustement.Value : 0);
- int vadjustment = (this.vAdjustement != null ? (int)this.vAdjustement.Value : 0);
- int ypos = -vadjustment;
- Category lastCategory = null;
- int lastCategoryYpos = 0;
-
- cr.LineWidth = 1;
-
- Iterate (ref xpos, ref ypos, delegate (Category category, Gdk.Size itemDimension) {
- ProcessExpandAnimation (cr, lastCategory, lastCategoryYpos, backColor, area, ref ypos);
-
- if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
- return true;
- cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
- cr.SetSourceColor (Ide.Gui.Styles.PadCategoryBackgroundColor.ToCairoColor ());
- cr.Fill ();
-
- if (lastCategory == null || lastCategory.IsExpanded || lastCategory.AnimatingExpand) {
- cr.MoveTo (xpos, ypos + 0.5);
- cr.LineTo (itemDimension.Width, ypos + 0.5);
- }
- cr.MoveTo (0, ypos + itemDimension.Height - 0.5);
- cr.LineTo (xpos + Allocation.Width, ypos + itemDimension.Height - 0.5);
- cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
- cr.Stroke ();
-
- headerLayout.SetMarkup (category.Text);
- int width, height;
- cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryLabelColor.ToCairoColor ());
- layout.GetPixelSize (out width, out height);
- cr.MoveTo (xpos + CategoryLeftPadding, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
- Pango.CairoHelper.ShowLayout (cr, headerLayout);
-
- var img = category.IsExpanded ? discloseUp : discloseDown;
- cr.DrawImage (this, img, Allocation.Width - img.Width - CategoryRightPadding, ypos + Math.Round ((itemDimension.Height - img.Height) / 2));
-
- lastCategory = category;
- lastCategoryYpos = ypos + itemDimension.Height;
-
- return true;
- }, delegate (Category curCategory, Item item, Gdk.Size itemDimension) {
- if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
- return true;
-
- var icon = item.Icon;
- if (!icon.HasFixedSize) {
- var maxIconSize = Math.Min (itemDimension.Width, itemDimension.Height);
- var fittingIconSize = maxIconSize > 32 ? Xwt.IconSize.Large : maxIconSize > 16 ? Xwt.IconSize.Medium : Xwt.IconSize.Small;
- icon = item.Icon.WithSize (fittingIconSize);
- }
- if (item == SelectedItem) {
- icon = icon.WithStyles ("sel");
- cr.SetSourceColor (Style.Base (StateType.Selected).ToCairoColor ());
- cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
- cr.Fill ();
- }
- if (listMode || !curCategory.CanIconizeItems) {
- cr.DrawImage (this, icon, xpos + ItemLeftPadding, ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
- layout.SetMarkup (item.Text);
- int width, height;
- layout.GetPixelSize (out width, out height);
- cr.SetSourceColor (Style.Text (item != this.SelectedItem ? StateType.Normal : StateType.Selected).ToCairoColor ());
- cr.MoveTo (xpos + ItemLeftPadding + IconSize.Width + ItemIconTextItemSpacing, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
- Pango.CairoHelper.ShowLayout (cr, layout);
- } else {
- cr.DrawImage (this, icon, xpos + Math.Round ((itemDimension.Width - icon.Width) / 2), ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
- }
-
- if (item == mouseOverItem) {
- cr.SetSourceColor (Style.Dark (StateType.Prelight).ToCairoColor ());
- cr.Rectangle (xpos + 0.5, ypos + 0.5, itemDimension.Width - 1, itemDimension.Height - 1);
- cr.Stroke ();
- }
-
- return true;
- });
-
- ProcessExpandAnimation (cr, lastCategory, lastCategoryYpos, backColor, area, ref ypos);
-
- if (lastCategory != null && lastCategory.AnimatingExpand) {
- // Closing line when animating the last group of the toolbox
- cr.MoveTo (area.X, ypos + 0.5);
- cr.RelLineTo (area.Width, 0);
- cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
- cr.Stroke ();
- }
-
- ((IDisposable)cr).Dispose ();
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose e)
+// {
+// Cairo.Context cr = Gdk.CairoHelper.Create (e.Window);
+//
+// Gdk.Rectangle area = e.Area;
+//
+// if (this.categories.Count == 0 || !string.IsNullOrEmpty (CustomMessage)) {
+// Pango.Layout messageLayout = new Pango.Layout (this.PangoContext);
+// messageLayout.Alignment = Pango.Alignment.Center;
+// messageLayout.Width = (int)(Allocation.Width * 2 / 3 * Pango.Scale.PangoScale);
+// if (!string.IsNullOrEmpty (CustomMessage))
+// messageLayout.SetText (CustomMessage);
+// else
+// messageLayout.SetText (MonoDevelop.Core.GettextCatalog.GetString ("There are no tools available for the current document."));
+// cr.MoveTo (Allocation.Width * 1 / 6, 12);
+// cr.SetSourceColor (Style.Text (StateType.Normal).ToCairoColor ());
+// Pango.CairoHelper.ShowLayout (cr, messageLayout);
+// messageLayout.Dispose ();
+// ((IDisposable)cr).Dispose ();
+// return true;
+// }
+//
+// var backColor = Style.Base (StateType.Normal).ToCairoColor ();
+// cr.SetSourceColor (backColor);
+// cr.Rectangle (area.X, area.Y, area.Width, area.Height);
+// cr.Fill ();
+//
+// int xpos = (this.hAdjustement != null ? (int)this.hAdjustement.Value : 0);
+// int vadjustment = (this.vAdjustement != null ? (int)this.vAdjustement.Value : 0);
+// int ypos = -vadjustment;
+// Category lastCategory = null;
+// int lastCategoryYpos = 0;
+//
+// cr.LineWidth = 1;
+//
+// Iterate (ref xpos, ref ypos, delegate (Category category, Gdk.Size itemDimension) {
+// ProcessExpandAnimation (cr, lastCategory, lastCategoryYpos, backColor, area, ref ypos);
+//
+// if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
+// return true;
+// cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
+// cr.SetSourceColor (Ide.Gui.Styles.PadCategoryBackgroundColor.ToCairoColor ());
+// cr.Fill ();
+//
+// if (lastCategory == null || lastCategory.IsExpanded || lastCategory.AnimatingExpand) {
+// cr.MoveTo (xpos, ypos + 0.5);
+// cr.LineTo (itemDimension.Width, ypos + 0.5);
+// }
+// cr.MoveTo (0, ypos + itemDimension.Height - 0.5);
+// cr.LineTo (xpos + Allocation.Width, ypos + itemDimension.Height - 0.5);
+// cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
+// cr.Stroke ();
+//
+// headerLayout.SetMarkup (category.Text);
+// int width, height;
+// cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryLabelColor.ToCairoColor ());
+// layout.GetPixelSize (out width, out height);
+// cr.MoveTo (xpos + CategoryLeftPadding, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
+// Pango.CairoHelper.ShowLayout (cr, headerLayout);
+//
+// var img = category.IsExpanded ? discloseUp : discloseDown;
+// cr.DrawImage (this, img, Allocation.Width - img.Width - CategoryRightPadding, ypos + Math.Round ((itemDimension.Height - img.Height) / 2));
+//
+// lastCategory = category;
+// lastCategoryYpos = ypos + itemDimension.Height;
+//
+// return true;
+// }, delegate (Category curCategory, Item item, Gdk.Size itemDimension) {
+// if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
+// return true;
+//
+// var icon = item.Icon;
+// if (!icon.HasFixedSize) {
+// var maxIconSize = Math.Min (itemDimension.Width, itemDimension.Height);
+// var fittingIconSize = maxIconSize > 32 ? Xwt.IconSize.Large : maxIconSize > 16 ? Xwt.IconSize.Medium : Xwt.IconSize.Small;
+// icon = item.Icon.WithSize (fittingIconSize);
+// }
+// if (item == SelectedItem) {
+// icon = icon.WithStyles ("sel");
+// cr.SetSourceColor (Style.Base (StateType.Selected).ToCairoColor ());
+// cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
+// cr.Fill ();
+// }
+// if (listMode || !curCategory.CanIconizeItems) {
+// cr.DrawImage (this, icon, xpos + ItemLeftPadding, ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
+// layout.SetMarkup (item.Text);
+// int width, height;
+// layout.GetPixelSize (out width, out height);
+// cr.SetSourceColor (Style.Text (item != this.SelectedItem ? StateType.Normal : StateType.Selected).ToCairoColor ());
+// cr.MoveTo (xpos + ItemLeftPadding + IconSize.Width + ItemIconTextItemSpacing, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
+// Pango.CairoHelper.ShowLayout (cr, layout);
+// } else {
+// cr.DrawImage (this, icon, xpos + Math.Round ((itemDimension.Width - icon.Width) / 2), ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
+// }
+//
+// if (item == mouseOverItem) {
+// cr.SetSourceColor (Style.Dark (StateType.Prelight).ToCairoColor ());
+// cr.Rectangle (xpos + 0.5, ypos + 0.5, itemDimension.Width - 1, itemDimension.Height - 1);
+// cr.Stroke ();
+// }
+//
+// return true;
+// });
+//
+// ProcessExpandAnimation (cr, lastCategory, lastCategoryYpos, backColor, area, ref ypos);
+//
+// if (lastCategory != null && lastCategory.AnimatingExpand) {
+// // Closing line when animating the last group of the toolbox
+// cr.MoveTo (area.X, ypos + 0.5);
+// cr.RelLineTo (area.Width, 0);
+// cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
+// cr.Stroke ();
+// }
+//
+// ((IDisposable)cr).Dispose ();
+// return true;
+// }
void ProcessExpandAnimation (Cairo.Context cr, Category lastCategory, int lastCategoryYpos, Cairo.Color backColor, Gdk.Rectangle area, ref int ypos)
{
@@ -332,11 +332,11 @@ void ProcessExpandAnimation (Cairo.Context cr, Category lastCategory, int lastCa
int newypos = lastCategory.IsExpanded ? lastCategoryYpos + lastCategory.AnimationHeight : ypos + lastCategory.AnimationHeight;
if (newypos < lastCategoryYpos) {
newypos = lastCategoryYpos;
- StopExpandAnimation (lastCategory);
+// StopExpandAnimation (lastCategory);
}
if (newypos > ypos) {
newypos = ypos;
- StopExpandAnimation (lastCategory);
+// StopExpandAnimation (lastCategory);
}
// Clear the area where the category will be drawn since it will be
@@ -348,158 +348,158 @@ void ProcessExpandAnimation (Cairo.Context cr, Category lastCategory, int lastCa
}
}
- protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
- {
- Item nextItem;
-
- // Handle keyboard toolip popup
- if ((evnt.Key == Gdk.Key.F1 && (evnt.State & Gdk.ModifierType.ControlMask) == Gdk.ModifierType.ControlMask)) {
- if (this.SelectedItem != null) {
- int vadjustment = (this.vAdjustement != null ? (int)this.vAdjustement.Value : 0);
- Gdk.Rectangle rect = GetItemExtends (SelectedItem);
- ShowTooltip (SelectedItem, 0,rect.X, rect.Bottom - vadjustment );
- }
- return true;
- }
-
- switch (evnt.Key) {
- case Gdk.Key.KP_Enter:
- case Gdk.Key.Return:
- if (this.SelectedItem != null)
- this.OnActivateSelectedItem (EventArgs.Empty);
- return true;
- case Gdk.Key.KP_Up:
- case Gdk.Key.Up:
- if (this.listMode || this.SelectedItem is Category) {
- this.SelectedItem = GetPrevItem (this.SelectedItem);
- } else {
- nextItem = GetItemAbove (this.SelectedItem);
- this.SelectedItem = nextItem != this.SelectedItem ? nextItem : GetCategory (this.SelectedItem);
- }
- this.QueueDraw ();
- return true;
- case Gdk.Key.KP_Down:
- case Gdk.Key.Down:
- if (this.listMode || this.SelectedItem is Category) {
- this.SelectedItem = GetNextItem (this.SelectedItem);
- } else {
- nextItem = GetItemBelow (this.SelectedItem);
- if (nextItem == this.SelectedItem) {
- Category category = GetCategory (this.SelectedItem);
- nextItem = GetNextCategory (category);
- if (nextItem == category)
- nextItem = this.SelectedItem;
- }
- this.SelectedItem = nextItem;
- }
- this.QueueDraw ();
- return true;
-
- case Gdk.Key.KP_Left:
- case Gdk.Key.Left:
- if (this.SelectedItem is Category) {
- SetCategoryExpanded ((Category)this.SelectedItem, false);
- } else {
- if (this.listMode) {
- this.SelectedItem = GetCategory (this.SelectedItem);
- } else {
- this.SelectedItem = GetItemLeft (this.SelectedItem);
- }
- }
- this.QueueDraw ();
- return true;
-
- case Gdk.Key.KP_Right:
- case Gdk.Key.Right:
- if (this.SelectedItem is Category) {
- Category selectedCategory = ((Category)this.SelectedItem);
- if (selectedCategory.IsExpanded) {
- if (selectedCategory.ItemCount > 0)
- this.SelectedItem = selectedCategory.Items[0];
- } else {
- SetCategoryExpanded (selectedCategory, true);
- }
- } else {
- if (this.listMode) {
- // nothing
- } else {
- this.SelectedItem = GetItemRight (this.SelectedItem);
- }
- }
- this.QueueDraw ();
- return true;
-
- }
- return false;
- }
+// protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
+// {
+// Item nextItem;
+//
+// // Handle keyboard toolip popup
+// if ((evnt.Key == Gdk.Key.F1 && (evnt.State & Gdk.ModifierType.ControlMask) == Gdk.ModifierType.ControlMask)) {
+// if (this.SelectedItem != null) {
+// int vadjustment = (this.vAdjustement != null ? (int)this.vAdjustement.Value : 0);
+// Gdk.Rectangle rect = GetItemExtends (SelectedItem);
+// ShowTooltip (SelectedItem, 0,rect.X, rect.Bottom - vadjustment );
+// }
+// return true;
+// }
+//
+// switch (evnt.Key) {
+// case Gdk.Key.KP_Enter:
+// case Gdk.Key.Return:
+// if (this.SelectedItem != null)
+// this.OnActivateSelectedItem (EventArgs.Empty);
+// return true;
+// case Gdk.Key.KP_Up:
+// case Gdk.Key.Up:
+// if (this.listMode || this.SelectedItem is Category) {
+// this.SelectedItem = GetPrevItem (this.SelectedItem);
+// } else {
+// nextItem = GetItemAbove (this.SelectedItem);
+// this.SelectedItem = nextItem != this.SelectedItem ? nextItem : GetCategory (this.SelectedItem);
+// }
+// this.QueueDraw ();
+// return true;
+// case Gdk.Key.KP_Down:
+// case Gdk.Key.Down:
+// if (this.listMode || this.SelectedItem is Category) {
+// this.SelectedItem = GetNextItem (this.SelectedItem);
+// } else {
+// nextItem = GetItemBelow (this.SelectedItem);
+// if (nextItem == this.SelectedItem) {
+// Category category = GetCategory (this.SelectedItem);
+// nextItem = GetNextCategory (category);
+// if (nextItem == category)
+// nextItem = this.SelectedItem;
+// }
+// this.SelectedItem = nextItem;
+// }
+// this.QueueDraw ();
+// return true;
+//
+// case Gdk.Key.KP_Left:
+// case Gdk.Key.Left:
+// if (this.SelectedItem is Category) {
+// SetCategoryExpanded ((Category)this.SelectedItem, false);
+// } else {
+// if (this.listMode) {
+// this.SelectedItem = GetCategory (this.SelectedItem);
+// } else {
+// this.SelectedItem = GetItemLeft (this.SelectedItem);
+// }
+// }
+// this.QueueDraw ();
+// return true;
+//
+// case Gdk.Key.KP_Right:
+// case Gdk.Key.Right:
+// if (this.SelectedItem is Category) {
+// Category selectedCategory = ((Category)this.SelectedItem);
+// if (selectedCategory.IsExpanded) {
+// if (selectedCategory.ItemCount > 0)
+// this.SelectedItem = selectedCategory.Items[0];
+// } else {
+// SetCategoryExpanded (selectedCategory, true);
+// }
+// } else {
+// if (this.listMode) {
+// // nothing
+// } else {
+// this.SelectedItem = GetItemRight (this.SelectedItem);
+// }
+// }
+// this.QueueDraw ();
+// return true;
+//
+// }
+// return false;
+// }
- protected override void OnUnrealized ()
- {
- HideTooltipWindow ();
- base.OnUnrealized ();
- }
-
- protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing evnt)
- {
- if (evnt.Mode == CrossingMode.Normal) {
- HideTooltipWindow ();
- ClearMouseOverItem ();
- }
- GdkWindow.Cursor = null;
- return base.OnLeaveNotifyEvent (evnt);
- }
-
- protected override bool OnScrollEvent (Gdk.EventScroll evnt)
- {
- HideTooltipWindow ();
- ClearMouseOverItem ();
- return base.OnScrollEvent (evnt);
- }
+// protected override void OnUnrealized ()
+// {
+// HideTooltipWindow ();
+// base.OnUnrealized ();
+// }
+
+// protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing evnt)
+// {
+// if (evnt.Mode == CrossingMode.Normal) {
+// HideTooltipWindow ();
+// ClearMouseOverItem ();
+// }
+// GdkWindow.Cursor = null;
+// return base.OnLeaveNotifyEvent (evnt);
+// }
+
+// protected override bool OnScrollEvent (Gdk.EventScroll evnt)
+// {
+// HideTooltipWindow ();
+// ClearMouseOverItem ();
+// return base.OnScrollEvent (evnt);
+// }
public Action DoPopupMenu { get; set; }
- protected override bool OnButtonPressEvent (Gdk.EventButton e)
- {
- this.GrabFocus ();
- HideTooltipWindow ();
- if (this.mouseOverItem is Category) {
- if (!e.TriggersContextMenu () && e.Button == 1 && e.Type == EventType.ButtonPress) {
- Category mouseOverCateogry = (Category)this.mouseOverItem;
- SetCategoryExpanded (mouseOverCateogry, !mouseOverCateogry.IsExpanded);
- return true;
- }
- this.SelectedItem = mouseOverItem;
- this.QueueResize ();
- } else {
- this.SelectedItem = mouseOverItem;
- this.QueueDraw ();
- }
- if (e.TriggersContextMenu ()) {
- if (DoPopupMenu != null) {
- DoPopupMenu (e);
- return true;
- }
- } else if (e.Type == EventType.TwoButtonPress && this.SelectedItem != null) {
- this.OnActivateSelectedItem (EventArgs.Empty);
- return true;
- }
- return base.OnButtonPressEvent (e);
- }
+// protected override bool OnButtonPressEvent (Gdk.EventButton e)
+// {
+// this.GrabFocus ();
+// HideTooltipWindow ();
+// if (this.mouseOverItem is Category) {
+// if (!e.TriggersContextMenu () && e.Button == 1 && e.Type == EventType.ButtonPress) {
+// Category mouseOverCateogry = (Category)this.mouseOverItem;
+// SetCategoryExpanded (mouseOverCateogry, !mouseOverCateogry.IsExpanded);
+// return true;
+// }
+// this.SelectedItem = mouseOverItem;
+// this.QueueResize ();
+// } else {
+// this.SelectedItem = mouseOverItem;
+// this.QueueDraw ();
+// }
+// if (e.TriggersContextMenu ()) {
+// if (DoPopupMenu != null) {
+// DoPopupMenu (e);
+// return true;
+// }
+// } else if (e.Type == EventType.TwoButtonPress && this.SelectedItem != null) {
+// this.OnActivateSelectedItem (EventArgs.Empty);
+// return true;
+// }
+// return base.OnButtonPressEvent (e);
+// }
- void PerformShowMenu (object sender, EventArgs args)
- {
- DoPopupMenu?.Invoke (null);
- }
+// void PerformShowMenu (object sender, EventArgs args)
+// {
+// DoPopupMenu?.Invoke (null);
+// }
void SetCategoryExpanded (Category cat, bool expanded)
{
if (cat.IsExpanded == expanded)
return;
cat.IsExpanded = expanded;
- if (cat.IsExpanded)
- StartExpandAnimation (cat);
- else
- StartCollapseAnimation (cat);
+// if (cat.IsExpanded)
+// StartExpandAnimation (cat);
+// else
+// StartCollapseAnimation (cat);
}
void StartExpandAnimation (Category cat)
@@ -509,11 +509,11 @@ void StartExpandAnimation (Category cat)
cat.AnimationHeight = 0;
cat.AnimatingExpand = true;
- cat.AnimationHandle = GLib.Timeout.Add (animationTimeSpan, delegate {
- cat.AnimationHeight += animationStepSize;
- QueueResize ();
- return true;
- });
+// cat.AnimationHandle = GLib.Timeout.Add (animationTimeSpan, delegate {
+// cat.AnimationHeight += animationStepSize;
+// QueueResize ();
+// return true;
+// });
}
void StartCollapseAnimation (Category cat)
@@ -523,11 +523,11 @@ void StartCollapseAnimation (Category cat)
cat.AnimationHeight = 0;
cat.AnimatingExpand = true;
- cat.AnimationHandle = GLib.Timeout.Add (animationTimeSpan, delegate {
- cat.AnimationHeight -= animationStepSize;
- QueueResize ();
- return true;
- });
+// cat.AnimationHandle = GLib.Timeout.Add (animationTimeSpan, delegate {
+// cat.AnimationHeight -= animationStepSize;
+// QueueResize ();
+// return true;
+// });
}
void StopExpandAnimation (Category cat)
@@ -540,59 +540,60 @@ void StopExpandAnimation (Category cat)
protected override bool OnPopupMenu ()
{
- if (DoPopupMenu != null) {
- DoPopupMenu (null);
- return true;
- }
- return base.OnPopupMenu ();
+ // if (DoPopupMenu != null) {
+ // DoPopupMenu (null);
+ // return true;
+ // }
+ // return base.OnPopupMenu ();
+ return false;
}
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion e)
- {
- int xpos = 0;
- int ypos = 0;
- HideTooltipWindow ();
- var oldItem = mouseOverItem;
- mouseOverItem = null;
- Gdk.Rectangle newItemExtents = Gdk.Rectangle.Zero;
- this.mouseX = (int)e.X + (int)(this.hAdjustement != null ? this.hAdjustement.Value : 0);
- this.mouseY = (int)e.Y + (int)(this.vAdjustement != null ? this.vAdjustement.Value : 0);
- Iterate (ref xpos, ref ypos, delegate (Category category, Gdk.Size itemDimension) {
- if (xpos <= mouseX && mouseX <= xpos + itemDimension.Width &&
- ypos <= mouseY && mouseY <= ypos + itemDimension.Height) {
- mouseOverItem = category;
- GdkWindow.Cursor = handCursor;
- if (!e.State.HasFlag (ModifierType.Button1Mask))
- ShowTooltip (mouseOverItem, TipTimer, (int)e.X + 2, (int)e.Y + 16);
- newItemExtents = new Gdk.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
- return false;
- }
- return true;
- }, delegate (Category curCategory, Item item, Gdk.Size itemDimension) {
- if (xpos <= mouseX && mouseX <= xpos + itemDimension.Width &&
- ypos <= mouseY && mouseY <= ypos + itemDimension.Height) {
- mouseOverItem = item;
- GdkWindow.Cursor = null;
- if (!e.State.HasFlag (ModifierType.Button1Mask))
- ShowTooltip (mouseOverItem, TipTimer, (int)e.X + 2, (int)e.Y + 16);
- newItemExtents = new Gdk.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
- return false;
- }
- return true;
- });
-
- if (mouseOverItem == null)
- GdkWindow.Cursor = null;
-
- if (oldItem != mouseOverItem) {
- this.QueueDraw ();
- var oldItemExtents = GetItemExtends (oldItem);
- QueueDrawArea (oldItemExtents.X, oldItemExtents.Y, oldItemExtents.Width, oldItemExtents.Height);
- QueueDrawArea (newItemExtents.X, newItemExtents.Y, newItemExtents.Width, newItemExtents.Height);
- }
-
- return base.OnMotionNotifyEvent (e);
- }
+// protected override bool OnMotionNotifyEvent (Gdk.EventMotion e)
+// {
+// int xpos = 0;
+// int ypos = 0;
+// HideTooltipWindow ();
+// var oldItem = mouseOverItem;
+// mouseOverItem = null;
+// Gdk.Rectangle newItemExtents = Gdk.Rectangle.Zero;
+// this.mouseX = (int)e.X + (int)(this.hAdjustement != null ? this.hAdjustement.Value : 0);
+// this.mouseY = (int)e.Y + (int)(this.vAdjustement != null ? this.vAdjustement.Value : 0);
+// Iterate (ref xpos, ref ypos, delegate (Category category, Gdk.Size itemDimension) {
+// if (xpos <= mouseX && mouseX <= xpos + itemDimension.Width &&
+// ypos <= mouseY && mouseY <= ypos + itemDimension.Height) {
+// mouseOverItem = category;
+// GdkWindow.Cursor = handCursor;
+// if (!e.State.HasFlag (ModifierType.Button1Mask))
+// ShowTooltip (mouseOverItem, TipTimer, (int)e.X + 2, (int)e.Y + 16);
+// newItemExtents = new Gdk.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
+// return false;
+// }
+// return true;
+// }, delegate (Category curCategory, Item item, Gdk.Size itemDimension) {
+// if (xpos <= mouseX && mouseX <= xpos + itemDimension.Width &&
+// ypos <= mouseY && mouseY <= ypos + itemDimension.Height) {
+// mouseOverItem = item;
+// GdkWindow.Cursor = null;
+// if (!e.State.HasFlag (ModifierType.Button1Mask))
+// ShowTooltip (mouseOverItem, TipTimer, (int)e.X + 2, (int)e.Y + 16);
+// newItemExtents = new Gdk.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
+// return false;
+// }
+// return true;
+// });
+//
+// if (mouseOverItem == null)
+// GdkWindow.Cursor = null;
+//
+// if (oldItem != mouseOverItem) {
+// this.QueueDraw ();
+// var oldItemExtents = GetItemExtends (oldItem);
+// QueueDrawArea (oldItemExtents.X, oldItemExtents.Y, oldItemExtents.Width, oldItemExtents.Height);
+// QueueDrawArea (newItemExtents.X, newItemExtents.Y, newItemExtents.Width, newItemExtents.Height);
+// }
+//
+// return base.OnMotionNotifyEvent (e);
+// }
#region Item selection logic
Item selectedItem = null;
@@ -811,21 +812,21 @@ public void ScrollToSelectedItem ()
this.vAdjustement.Value = rect.Bottom - this.Allocation.Height;
}
- protected override void OnSetScrollAdjustments (Adjustment hAdjustement, Adjustment vAdjustement)
- {
- this.hAdjustement = hAdjustement;
- if (this.hAdjustement != null) {
- this.hAdjustement.ValueChanged += delegate {
- this.QueueDraw ();
- };
- }
- this.vAdjustement = vAdjustement;
- if (this.vAdjustement != null) {
- this.vAdjustement.ValueChanged += delegate {
- this.QueueDraw ();
- };
- }
- }
+// protected override void OnSetScrollAdjustments (Adjustment hAdjustement, Adjustment vAdjustement)
+// {
+// this.hAdjustement = hAdjustement;
+// if (this.hAdjustement != null) {
+// this.hAdjustement.ValueChanged += delegate {
+// this.QueueDraw ();
+// };
+// }
+// this.vAdjustement = vAdjustement;
+// if (this.vAdjustement != null) {
+// this.vAdjustement.ValueChanged += delegate {
+// this.QueueDraw ();
+// };
+// }
+// }
#endregion
#region Item & Category iteration
@@ -901,45 +902,45 @@ void Iterate (ref int xpos, ref int ypos, CategoryAction catAction, ItemAction a
#region Control size management
bool realSizeRequest;
- protected override void OnSizeRequested (ref Requisition req)
- {
- if (!realSizeRequest) {
- // Request a minimal width, to size recalculation infinite loops with
- // small widths, due to the vscrollbar being shown and hidden.
- req.Width = 50;
- req.Height = 0;
- return;
- }
- int xpos = 0;
- int ypos = 0;
- Iterate (ref xpos, ref ypos, null, null);
- req.Width = 50;
- req.Height = ypos;
- if (this.vAdjustement != null) {
- this.vAdjustement.SetBounds (0,
- ypos,
- 20,
- Allocation.Height,
- Allocation.Height);
- if (ypos < Allocation.Height)
- this.vAdjustement.Value = 0;
- if (vAdjustement.Value + vAdjustement.PageSize > vAdjustement.Upper)
- vAdjustement.Value = vAdjustement.Upper - vAdjustement.PageSize;
- if (vAdjustement.Value < 0)
- vAdjustement.Value = 0;
- }
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
- if (!realSizeRequest) {
- realSizeRequest = true;
- QueueResize ();
- }
- else
- realSizeRequest = false;
- }
+// protected override void OnSizeRequested (ref Requisition req)
+// {
+// if (!realSizeRequest) {
+// // Request a minimal width, to size recalculation infinite loops with
+// // small widths, due to the vscrollbar being shown and hidden.
+// req.Width = 50;
+// req.Height = 0;
+// return;
+// }
+// int xpos = 0;
+// int ypos = 0;
+// Iterate (ref xpos, ref ypos, null, null);
+// req.Width = 50;
+// req.Height = ypos;
+// if (this.vAdjustement != null) {
+// this.vAdjustement.SetBounds (0,
+// ypos,
+// 20,
+// Allocation.Height,
+// Allocation.Height);
+// if (ypos < Allocation.Height)
+// this.vAdjustement.Value = 0;
+// if (vAdjustement.Value + vAdjustement.PageSize > vAdjustement.Upper)
+// vAdjustement.Value = vAdjustement.Upper - vAdjustement.PageSize;
+// if (vAdjustement.Value < 0)
+// vAdjustement.Value = 0;
+// }
+// }
+
+// protected override void OnSizeAllocated (Gdk.Rectangle allocation)
+// {
+// base.OnSizeAllocated (allocation);
+// if (!realSizeRequest) {
+// realSizeRequest = true;
+// QueueResize ();
+// }
+// else
+// realSizeRequest = false;
+// }
#endregion
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
index 7d7004514d0..807f74848a8 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
@@ -17,11 +17,21 @@
-
-
-
-
-
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gdk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
@@ -52,6 +62,9 @@
..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll
False
+
+ gio-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
index b86f6f6ac12..cbc9a9d735e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
@@ -171,7 +171,7 @@ private class WrappedCentreLabel : Gtk.Widget
public WrappedCentreLabel ()
{
- WidgetFlags |= Gtk.WidgetFlags.NoWindow;
+ this.HasWindow = false;
}
public WrappedCentreLabel (string text)
@@ -207,16 +207,16 @@ void UpdateLayout ()
layout.SetText (text);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (evnt.Window != GdkWindow || layout == null) {
- return base.OnExposeEvent (evnt);
- }
- layout.Width = (int)(Allocation.Width * 2 / 3 * Pango.Scale.PangoScale);
- Gtk.Style.PaintLayout (Style, GdkWindow, State, false, evnt.Area,
- this, null, Allocation.Width * 1 / 6 + Allocation.X , 12 + Allocation.Y, layout);
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (evnt.Window != GdkWindow || layout == null) {
+// return base.OnExposeEvent (evnt);
+// }
+// layout.Width = (int)(Allocation.Width * 2 / 3 * Pango.Scale.PangoScale);
+// Gtk.Style.PaintLayout (Style, GdkWindow, State, false, evnt.Area,
+// this, null, Allocation.Width * 1 / 6 + Allocation.X , 12 + Allocation.Y, layout);
+// return true;
+// }
protected override void OnStyleSet (Gtk.Style previous_style)
{
@@ -225,14 +225,14 @@ protected override void OnStyleSet (Gtk.Style previous_style)
base.OnStyleSet (previous_style);
}
- public override void Dispose ()
- {
- if (layout != null) {
- layout.Dispose ();
- layout = null;
- }
- base.Dispose ();
- }
+// public override void Dispose ()
+// {
+// if (layout != null) {
+// layout.Dispose ();
+// layout = null;
+// }
+// base.Dispose ();
+// }
}
}
}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs
index 01a080e9fe3..4b44cf22b10 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs
@@ -55,8 +55,8 @@ public RemoteDesignerProcess ()
designerFrame = new Gtk.Frame ();
propGridFrame = new Gtk.Frame ();
- designerFrame.Shadow = ShadowType.None;
- propGridFrame.Shadow = ShadowType.None;
+// designerFrame.Shadow = ShadowType.None;
+// propGridFrame.Shadow = ShadowType.None;
designerFrame.BorderWidth = 0;
designerFrame.Show ();
@@ -151,7 +151,7 @@ protected void ShowText (string markup)
Frame padFrame = new Gtk.Frame ();
padFrame.Add (label);
padFrame.BorderWidth = 10;
- padFrame.Shadow = ShadowType.None;
+// padFrame.Shadow = ShadowType.None;
ScrolledWindow scrollW = new ScrolledWindow ();
scrollW.AddWithViewport (padFrame);
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
index 2aa30754454..273ee02fb77 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
@@ -5,184 +5,184 @@ namespace MonoDevelop.DesignerSupport.Toolbox
internal partial class ComponentSelectorDialog
{
private global::Gtk.VBox vbox2;
-
+
private global::Gtk.HBox hbox1;
-
+
private global::Gtk.Label label1;
-
- private global::Gtk.ComboBox comboType;
-
+
+ private global::Gtk.ComboBoxText comboType;
+
private global::Gtk.VSeparator vseparator1;
-
+
private global::Gtk.Button button24;
-
+
private global::Gtk.HBox hbox2;
-
+
private global::MonoDevelop.Components.ImageView imageview1;
-
+
private global::Gtk.Label label2;
-
+
private global::Gtk.ScrolledWindow scrolledwindow1;
-
+
private global::Gtk.TreeView listView;
-
+
private global::Gtk.CheckButton checkGroupByCat;
-
+
private global::Gtk.Button buttonCancel;
-
+
private global::Gtk.Button buttonOk;
- protected virtual void Build ()
+ protected virtual void Build()
{
- global::Stetic.Gui.Initialize (this);
+ global::Stetic.Gui.Initialize(this);
// Widget MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog
this.Name = "MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog";
- this.Title = global::Mono.Unix.Catalog.GetString ("Toolbox Item Selector");
+ this.Title = global::Mono.Unix.Catalog.GetString("Toolbox Item Selector");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
- this.vbox2 = new global::Gtk.VBox ();
+ this.vbox2 = new global::Gtk.VBox();
this.vbox2.Name = "vbox2";
this.vbox2.Spacing = 6;
this.vbox2.BorderWidth = ((uint)(6));
// Container child vbox2.Gtk.Box+BoxChild
- this.hbox1 = new global::Gtk.HBox ();
+ this.hbox1 = new global::Gtk.HBox();
this.hbox1.Name = "hbox1";
this.hbox1.Spacing = 6;
// Container child hbox1.Gtk.Box+BoxChild
- this.label1 = new global::Gtk.Label ();
+ this.label1 = new global::Gtk.Label();
this.label1.Name = "label1";
this.label1.Xalign = 0F;
- this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Type of component:");
- this.hbox1.Add (this.label1);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
+ this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Type of component:");
+ this.hbox1.Add(this.label1);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
w2.Position = 0;
w2.Expand = false;
w2.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboType = global::Gtk.ComboBox.NewText ();
+ this.comboType = new global::Gtk.ComboBoxText();
this.comboType.Name = "comboType";
- this.hbox1.Add (this.comboType);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboType]));
+ this.hbox1.Add(this.comboType);
+ global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.comboType]));
w3.Position = 1;
// Container child hbox1.Gtk.Box+BoxChild
- this.vseparator1 = new global::Gtk.VSeparator ();
+ this.vseparator1 = new global::Gtk.VSeparator();
this.vseparator1.Name = "vseparator1";
- this.hbox1.Add (this.vseparator1);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
+ this.hbox1.Add(this.vseparator1);
+ global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vseparator1]));
w4.Position = 2;
w4.Expand = false;
w4.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.button24 = new global::Gtk.Button ();
+ this.button24 = new global::Gtk.Button();
this.button24.CanFocus = true;
this.button24.Name = "button24";
// Container child button24.Gtk.Container+ContainerChild
- this.hbox2 = new global::Gtk.HBox ();
+ this.hbox2 = new global::Gtk.HBox();
this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 2;
// Container child hbox2.Gtk.Box+BoxChild
- this.imageview1 = new global::MonoDevelop.Components.ImageView ();
+ this.imageview1 = new global::MonoDevelop.Components.ImageView();
this.imageview1.Name = "imageview1";
this.imageview1.IconId = "gtk-add";
- this.imageview1.IconSize = ((global::Gtk.IconSize)(1));
- this.hbox2.Add (this.imageview1);
- global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageview1]));
+ this.hbox2.Add(this.imageview1);
+ global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.imageview1]));
w5.Position = 0;
w5.Expand = false;
w5.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
- this.label2 = new global::Gtk.Label ();
+ this.label2 = new global::Gtk.Label();
this.label2.Name = "label2";
- this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Add Assembly...");
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Add Assembly...");
this.label2.UseUnderline = true;
- this.hbox2.Add (this.label2);
- global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2]));
+ this.hbox2.Add(this.label2);
+ global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.label2]));
w6.Position = 1;
w6.Expand = false;
w6.Fill = false;
- this.button24.Add (this.hbox2);
- this.hbox1.Add (this.button24);
- global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.button24]));
+ this.button24.Add(this.hbox2);
+ this.hbox1.Add(this.button24);
+ global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.button24]));
w8.Position = 3;
w8.Expand = false;
- this.vbox2.Add (this.hbox1);
- global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
+ this.vbox2.Add(this.hbox1);
+ global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
w9.Position = 0;
w9.Expand = false;
w9.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
- this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
+ this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
this.scrolledwindow1.CanFocus = true;
this.scrolledwindow1.Name = "scrolledwindow1";
this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow1.Gtk.Container+ContainerChild
- this.listView = new global::Gtk.TreeView ();
+ this.listView = new global::Gtk.TreeView();
this.listView.CanFocus = true;
this.listView.Name = "listView";
- this.scrolledwindow1.Add (this.listView);
- this.vbox2.Add (this.scrolledwindow1);
- global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1]));
+ this.scrolledwindow1.Add(this.listView);
+ this.vbox2.Add(this.scrolledwindow1);
+ global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.scrolledwindow1]));
w11.Position = 1;
// Container child vbox2.Gtk.Box+BoxChild
- this.checkGroupByCat = new global::Gtk.CheckButton ();
+ this.checkGroupByCat = new global::Gtk.CheckButton();
this.checkGroupByCat.CanFocus = true;
this.checkGroupByCat.Name = "checkGroupByCat";
- this.checkGroupByCat.Label = global::Mono.Unix.Catalog.GetString ("Group by component category");
+ this.checkGroupByCat.Label = global::Mono.Unix.Catalog.GetString("Group by component category");
this.checkGroupByCat.DrawIndicator = true;
this.checkGroupByCat.UseUnderline = true;
- this.vbox2.Add (this.checkGroupByCat);
- global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkGroupByCat]));
+ this.vbox2.Add(this.checkGroupByCat);
+ global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.checkGroupByCat]));
w12.Position = 2;
w12.Expand = false;
w12.Fill = false;
- w1.Add (this.vbox2);
- global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
+ w1.Add(this.vbox2);
+ global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
w13.Position = 0;
// Internal child MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.ActionArea
- global::Gtk.HButtonBox w14 = this.ActionArea;
+ global::Gtk.HButtonBox w14 = (Gtk.HButtonBox)this.ActionArea;
w14.Name = "dialog1_ActionArea";
w14.Spacing = 10;
w14.BorderWidth = ((uint)(5));
w14.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
- this.buttonCancel = new global::Gtk.Button ();
+ this.buttonCancel = new global::Gtk.Button();
this.buttonCancel.CanDefault = true;
this.buttonCancel.CanFocus = true;
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.UseStock = true;
this.buttonCancel.UseUnderline = true;
this.buttonCancel.Label = "gtk-cancel";
- this.AddActionWidget (this.buttonCancel, -6);
- global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonCancel]));
+ this.AddActionWidget(this.buttonCancel, -6);
+ global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14[this.buttonCancel]));
w15.Expand = false;
w15.Fill = false;
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
- this.buttonOk = new global::Gtk.Button ();
+ this.buttonOk = new global::Gtk.Button();
this.buttonOk.CanDefault = true;
this.buttonOk.CanFocus = true;
this.buttonOk.Name = "buttonOk";
this.buttonOk.UseStock = true;
this.buttonOk.UseUnderline = true;
this.buttonOk.Label = "gtk-ok";
- w14.Add (this.buttonOk);
- global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonOk]));
+ w14.Add(this.buttonOk);
+ global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14[this.buttonOk]));
w16.Position = 1;
w16.Expand = false;
w16.Fill = false;
- if ((this.Child != null)) {
- this.Child.ShowAll ();
+ if ((this.Child != null))
+ {
+ this.Child.ShowAll();
}
this.DefaultWidth = 642;
this.DefaultHeight = 433;
- this.Hide ();
- this.comboType.Changed += new global::System.EventHandler (this.OnComboTypeChanged);
- this.button24.Clicked += new global::System.EventHandler (this.OnButton24Clicked);
- this.checkGroupByCat.Clicked += new global::System.EventHandler (this.OnCheckbutton1Clicked);
- this.buttonOk.Clicked += new global::System.EventHandler (this.OnButtonOkClicked);
+ this.Hide();
+ this.comboType.Changed += new global::System.EventHandler(this.OnComboTypeChanged);
+ this.button24.Clicked += new global::System.EventHandler(this.OnButton24Clicked);
+ this.checkGroupByCat.Clicked += new global::System.EventHandler(this.OnCheckbutton1Clicked);
+ this.buttonOk.Clicked += new global::System.EventHandler(this.OnButtonOkClicked);
}
}
}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
index be5dc01e5f1..d69a54be5d9 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
@@ -2,11 +2,10 @@
..
- 2.12
+ 3.0
-
@@ -80,7 +79,6 @@
gtk-add
- Menu
0
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
index ffa5d6ec22d..4f39a24c00e 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
@@ -11,14 +11,14 @@
-
-
-
+
+
+
-
-
+
+
..\..\..\build\bin\System.Reflection.Metadata.dll
False
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreTestBase.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreTestBase.cs
index 24633db2f9f..38b5e2bf757 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreTestBase.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreTestBase.cs
@@ -36,7 +36,7 @@ class DotNetCoreTestBase : TestBase
protected override void InternalSetup (string rootDir)
{
base.InternalSetup (rootDir);
- Xwt.Application.Initialize (Xwt.ToolkitType.Gtk);
+ Xwt.Application.Initialize (Xwt.ToolkitType.Gtk3);
DesktopService.Initialize ();
}
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
index bf733362659..985aea18161 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
@@ -24,10 +24,10 @@
-
-
-
-
+
+
+
+
..\..\..\external\nuget-binary\NuGet.Versioning.dll
False
diff --git a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs
index a013ebc396f..787b396f1ae 100644
--- a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs
@@ -21,7 +21,7 @@ internal partial class CatalogHeadersWidget
private global::Gtk.TextView textviewComments;
private global::Gtk.Label label3;
private global::Gtk.Table table2;
- private global::Gtk.ComboBoxEntry comboboxentryCharset;
+ private global::Gtk.ComboBoxText comboboxentryCharset;
private global::Gtk.Entry entryLanguageGroupEmail;
private global::Gtk.Entry entryLanguageGroupName;
private global::Gtk.Entry entryTranslatorEmail;
@@ -221,7 +221,7 @@ protected virtual void Build ()
this.table2.ColumnSpacing = ((uint)(6));
this.table2.BorderWidth = ((uint)(8));
// Container child table2.Gtk.Table+TableChild
- this.comboboxentryCharset = new global::Gtk.ComboBoxEntry ();
+ this.comboboxentryCharset = new global::Gtk.ComboBoxText ();
this.comboboxentryCharset.Name = "comboboxentryCharset";
this.table2.Add (this.comboboxentryCharset);
global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table2 [this.comboboxentryCharset]));
diff --git a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
index 59809433693..3e75522c0c7 100644
--- a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs
@@ -42,7 +42,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.Gettext.TranslationProjectOptionsDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -125,7 +125,7 @@ protected virtual void Build ()
this.radiobuttonRelPath.Name = "radiobuttonRelPath";
this.radiobuttonRelPath.DrawIndicator = true;
this.radiobuttonRelPath.UseUnderline = true;
- this.radiobuttonRelPath.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radiobuttonRelPath.Group = new Gtk.RadioButton [0];
this.table1.Add (this.radiobuttonRelPath);
global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.radiobuttonRelPath]));
w7.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -249,7 +249,7 @@ protected virtual void Build ()
w23.Expand = false;
w23.Fill = false;
// Internal child MonoDevelop.Gettext.TranslationProjectOptionsDialog.ActionArea
- global::Gtk.HButtonBox w24 = this.ActionArea;
+ global::Gtk.HButtonBox w24 = (Gtk.HButtonBox)this.ActionArea;
w24.Name = "dialog1_ActionArea";
w24.Spacing = 6;
w24.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs
index 71d7d8bd454..de130dfea3f 100644
--- a/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/Gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs
@@ -39,11 +39,11 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Modal = true;
this.Resizable = false;
- this.AllowGrow = false;
+// this.AllowGrow = false;
this.Gravity = ((global::Gdk.Gravity)(5));
this.SkipTaskbarHint = true;
// Internal child MonoDevelop.Gettext.Translator.LanguageChooserDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Events = ((global::Gdk.EventMask)(256));
w1.Name = "dialog_VBox";
w1.BorderWidth = ((uint)(2));
@@ -146,7 +146,7 @@ protected virtual void Build ()
this.radiobuttonKnown.Name = "radiobuttonKnown";
this.radiobuttonKnown.DrawIndicator = true;
this.radiobuttonKnown.UseUnderline = true;
- this.radiobuttonKnown.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radiobuttonKnown.Group = new Gtk.RadioButton [0];
this.frame1.LabelWidget = this.radiobuttonKnown;
this.vbox3.Add (this.frame1);
global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.frame1]));
@@ -205,7 +205,7 @@ protected virtual void Build ()
w19.Expand = false;
w19.Fill = false;
// Internal child MonoDevelop.Gettext.Translator.LanguageChooserDialog.ActionArea
- global::Gtk.HButtonBox w20 = this.ActionArea;
+ global::Gtk.HButtonBox w20 = (Gtk.HButtonBox)this.ActionArea;
w20.Name = "MonoDevelop.Gettext.LanguageChooserDialog_ActionArea";
w20.Spacing = 6;
w20.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 98cf507fa30..5d2a9dd4eeb 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -272,21 +272,21 @@ void HandleCellRendFuzzyToggled (object sender, ToggledArgs args)
}
}
- void CatalogIconDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void CatalogIconDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CatalogEntry entry = (CatalogEntry)model.GetValue (iter, 0);
((CellRendererImage)cell).Image = ImageService.GetIcon (GetStockForEntry (entry), IconSize.Menu);
cell.CellBackgroundGdk = GetRowColorForEntry (entry);
}
- void FuzzyToggleDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void FuzzyToggleDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CatalogEntry entry = (CatalogEntry)model.GetValue (iter, 0);
((CellRendererToggle)cell).Active = entry.IsFuzzy;
cell.CellBackgroundGdk = GetRowColorForEntry (entry);
}
- void OriginalTextDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void OriginalTextDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CatalogEntry entry = (CatalogEntry)model.GetValue (iter, 0);
((CellRendererText)cell).Text = EscapeForTreeView (entry.String);
@@ -294,7 +294,7 @@ void OriginalTextDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk
((CellRendererText)cell).ForegroundGdk = GetForeColorForEntry (entry);
}
- void TranslationTextDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void TranslationTextDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CatalogEntry entry = (CatalogEntry)model.GetValue (iter, 0);
((CellRendererText)cell).Text = EscapeForTreeView (entry.GetTranslation (0));
@@ -375,7 +375,7 @@ public Menu CreateOptionsMenu ()
Menu sub = new Menu ();
searchInMenu.Submenu = sub;
Gtk.RadioMenuItem original = null, translated = null, both = null;
- GLib.SList group = new GLib.SList (IntPtr.Zero);
+ Gtk.RadioMenuItem [] group = new Gtk.RadioMenuItem [0];
original = new Gtk.RadioMenuItem (group, GettextCatalog.GetString ("_Original"));
group = original.Group;
original.ButtonPressEvent += delegate { original.Activate (); };
@@ -832,17 +832,17 @@ void UpdateFromCatalog ()
}
- newStore.SetSortFunc (0, delegate (TreeModel model, TreeIter iter1, TreeIter iter2) {
+ newStore.SetSortFunc (0, delegate (ITreeModel model, TreeIter iter1, TreeIter iter2) {
CatalogEntry entry1 = (CatalogEntry)model.GetValue (iter1, 0);
CatalogEntry entry2 = (CatalogEntry)model.GetValue (iter2, 0);
return GetTypeSortIndicator (entry1).CompareTo (GetTypeSortIndicator (entry2));
});
- newStore.SetSortFunc (1, delegate (TreeModel model, TreeIter iter1, TreeIter iter2) {
+ newStore.SetSortFunc (1, delegate (ITreeModel model, TreeIter iter1, TreeIter iter2) {
CatalogEntry entry1 = (CatalogEntry)model.GetValue (iter1, 0);
CatalogEntry entry2 = (CatalogEntry)model.GetValue (iter2, 0);
return entry1.String.CompareTo (entry2.String);
});
- newStore.SetSortFunc (2, delegate (TreeModel model, TreeIter iter1, TreeIter iter2) {
+ newStore.SetSortFunc (2, delegate (ITreeModel model, TreeIter iter1, TreeIter iter2) {
CatalogEntry entry1 = (CatalogEntry)model.GetValue (iter1, 0);
CatalogEntry entry2 = (CatalogEntry)model.GetValue (iter2, 0);
return entry1.GetTranslation (0).CompareTo (entry2.GetTranslation (0));
@@ -1267,4 +1267,4 @@ public bool EnableRedo {
}
#endregion
}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
index f5a813e393d..29f84a4190d 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
@@ -13,11 +13,21 @@
-
-
-
-
-
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gdk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
..\..\..\build\bin\System.Reflection.Metadata.dll
@@ -31,6 +41,9 @@
..\..\..\build\bin\Microsoft.CodeAnalysis.dll
False
+
+ gio-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.GtkCore/AddinInfo.cs b/main/src/addins/MonoDevelop.GtkCore/AddinInfo.cs
deleted file mode 100644
index 904938eb23b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/AddinInfo.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-
-using System;
-using Mono.Addins;
-using Mono.Addins.Description;
-
-[assembly:Addin ("GtkCore",
- Namespace = "MonoDevelop",
- Version = MonoDevelop.BuildInfo.Version,
- Category = "IDE extensions")]
-
-[assembly:AddinName ("GTK# Visual Designer")]
-[assembly:AddinDescription ("Provides support for visual design of GTK# windows, dialogs and widgets")]
-
-[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/MonoDevelop.GtkCore/AssemblyInfo.cs b/main/src/addins/MonoDevelop.GtkCore/AssemblyInfo.cs
deleted file mode 100644
index d123b0eb9eb..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Autogenerated from MonoDevelop.GtkCore.addin.xml
-
-using System.Reflection;
-
-[assembly: AssemblyProduct ("MonoDevelop")]
-[assembly: AssemblyTitle ("GTK# Visual Designer")]
-[assembly: AssemblyDescription ("Provides support for visual design of GTK# windows, dialogs and widgets.")]
-[assembly: AssemblyVersion ("2.6")]
-[assembly: AssemblyCopyright ("X11")]
diff --git a/main/src/addins/MonoDevelop.GtkCore/Gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.GtkCore/Gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs
deleted file mode 100644
index 9483546d2de..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/Gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.GtkCore.Dialogs
-{
- public partial class GtkDesignerOptionsPanelWidget
- {
- private global::Gtk.VBox vbox2;
- private global::Gtk.CheckButton checkSwitchLayout;
-
- protected virtual void Build ()
- {
- MonoDevelop.Components.Gui.Initialize (this);
- // Widget MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget
- MonoDevelop.Components.BinContainer.Attach (this);
- this.Name = "MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget";
- // Container child MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.Gtk.Container+ContainerChild
- this.vbox2 = new global::Gtk.VBox ();
- this.vbox2.Name = "vbox2";
- this.vbox2.Spacing = 6;
- // Container child vbox2.Gtk.Box+BoxChild
- this.checkSwitchLayout = new global::Gtk.CheckButton ();
- this.checkSwitchLayout.CanFocus = true;
- this.checkSwitchLayout.Name = "checkSwitchLayout";
- this.checkSwitchLayout.Label = global::Mono.Unix.Catalog.GetString ("Automatically switch to the \"GUI Builder\" layout when opening the designer");
- this.checkSwitchLayout.DrawIndicator = true;
- this.checkSwitchLayout.UseUnderline = true;
- this.vbox2.Add (this.checkSwitchLayout);
- global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkSwitchLayout]));
- w1.Position = 0;
- w1.Expand = false;
- w1.Fill = false;
- this.Add (this.vbox2);
- if ((this.Child != null)) {
- this.Child.ShowAll ();
- }
- this.Hide ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/Makefile.am b/main/src/addins/MonoDevelop.GtkCore/Makefile.am
deleted file mode 100644
index bf3218efd0e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = libstetic libsteticui
-
-include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
deleted file mode 100644
index 9da1639402c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Commands/GladeCommands.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// GtkCommands.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace MonoDevelop.GtkCore
-{
- public enum GtkCommands
- {
- AddNewDialog,
- AddNewWindow,
- AddNewWidget,
- AddNewActionGroup,
- ImportGladeFile,
- EditIcons,
- GtkSettings
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
deleted file mode 100644
index bb7717969e5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// BindDesignDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-using Glade;
-using Gtk;
-using MonoDevelop.Core;
-using MonoDevelop.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- class BindDesignDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget ("BindDesignDialog")] protected Gtk.Dialog dialog;
- [Glade.Widget] protected Gtk.Label labelMessage;
- [Glade.Widget] protected Gtk.ComboBox comboClasses;
- [Glade.Widget] protected Gtk.Entry entryClassName;
- [Glade.Widget] protected Gtk.Entry entryNamespace;
- [Glade.Widget] protected Gtk.RadioButton radioSelect;
- [Glade.Widget] protected Gtk.RadioButton radioCreate;
- [Glade.Widget] protected Gtk.Table tableNewClass;
- [Glade.Widget] protected Gtk.Button okButton;
- [Glade.Widget] protected Gtk.EventBox fileEntryBox;
- #pragma warning restore 649
-
- FolderEntry fileEntry;
-
- ListStore store;
- static string lastNamespace = "";
-
- public BindDesignDialog (string id, ArrayList validClasses, string baseFolder)
- {
- XML glade = new XML (null, "gui.glade", "BindDesignDialog", null);
- glade.Autoconnect (this);
- labelMessage.Text = GettextCatalog.GetString ("The widget design {0} is not currently bound to a class.", id);
-
- fileEntry = new FolderEntry ();
- fileEntryBox.Add (fileEntry);
- fileEntry.ShowAll ();
-
- if (validClasses.Count > 0) {
-
- store = new ListStore (typeof (string));
- foreach (string cname in validClasses)
- store.AppendValues (cname);
- comboClasses.Model = store;
- CellRendererText cr = new CellRendererText ();
- comboClasses.PackStart (cr, true);
- comboClasses.AddAttribute (cr, "text", 0);
- comboClasses.Active = 0;
-
- } else {
- radioSelect.Sensitive = false;
- radioCreate.Active = true;
- }
-
- fileEntry.Path = baseFolder;
-
- // Initialize the class name using the widget name
- int i = id.IndexOf ('.');
- if (i != -1) {
- entryClassName.Text = id.Substring (i+1);
- entryNamespace.Text = id.Substring (0,i);
- } else {
- entryClassName.Text = id;
- entryNamespace.Text = lastNamespace;
- }
-
- dialog.Response += new Gtk.ResponseHandler (OnResponse);
- UpdateStatus ();
- }
-
- void OnResponse (object ob, Gtk.ResponseArgs args)
- {
- dialog.Response -= new Gtk.ResponseHandler (OnResponse);
- if (args.ResponseId == ResponseType.Ok && radioCreate.Active)
- lastNamespace = Namespace;
- }
-
- public bool Run ()
- {
- return MessageService.ShowCustomDialog (dialog) == (int) ResponseType.Ok;
- }
-
- public bool CreateNew {
- get { return radioCreate.Active; }
- }
-
- public string ClassName {
- get {
- if (radioCreate.Active) {
- return entryClassName.Text;
- } else {
- Gtk.TreeIter it;
- if (!comboClasses.GetActiveIter (out it))
- return "";
- string s = (string) store.GetValue (it, 0);
- int i = s.IndexOf ('.');
- if (i != -1)
- return s.Substring (i+1);
- else
- return s;
- }
- }
- }
-
- public string Namespace {
- get {
- if (radioCreate.Active) {
- return entryNamespace.Text;
- } else {
- Gtk.TreeIter it;
- if (!comboClasses.GetActiveIter (out it))
- return "";
- string s = (string) store.GetValue (it, 0);
- int i = s.IndexOf ('.');
- if (i != -1)
- return s.Substring (0, i);
- else
- return "";
- }
- }
- }
-
- public string Folder {
- get { return fileEntry.Path; }
- }
-
- protected void OnSelectToggled (object ob, EventArgs args)
- {
- UpdateStatus ();
- }
-
- protected void OnEntryChanged (object ob, EventArgs a)
- {
- UpdateStatus ();
- }
-
- void UpdateStatus ()
- {
- if (radioSelect.Active) {
- tableNewClass.Sensitive = false;
- comboClasses.Sensitive = true;
- okButton.Sensitive = true;
- } else {
- tableNewClass.Sensitive = true;
- comboClasses.Sensitive = false;
- okButton.Sensitive = ClassName != "" && Folder != "";
- }
- }
-
- public void Dispose ()
- {
- dialog.Dispose ();
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
deleted file mode 100644
index 7d66c092cb0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// ConfirmWindowDeleteDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Glade;
-using Gtk;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- class ConfirmWindowDeleteDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget ("ConfirmWindowDeleteDialog")] protected Gtk.Dialog dialog;
- [Glade.Widget] protected Gtk.Label label;
- [Glade.Widget] protected Gtk.CheckButton checkbox;
- #pragma warning restore 649
-
- public ConfirmWindowDeleteDialog (string windowName, string fileName, Stetic.ProjectItemInfo obj)
- {
- XML glade = new XML (null, "gui.glade", "ConfirmWindowDeleteDialog", null);
- glade.Autoconnect (this);
-
- if (obj is Stetic.WidgetInfo && ((Stetic.WidgetInfo)obj).IsWindow) {
- label.Text = GettextCatalog.GetString ("Are you sure you want to delete the window '{0}'?", windowName);
- } else if (obj is Stetic.WidgetInfo) {
- label.Text = GettextCatalog.GetString ("Are you sure you want to delete the widget '{0}'?", windowName);
- } else if (obj is Stetic.ActionGroupInfo) {
- label.Text = GettextCatalog.GetString ("Are you sure you want to delete the action group '{0}'?", windowName);
- } else
- label.Text = GettextCatalog.GetString ("Are you sure you want to delete '{0}'?", windowName);
-
- if (fileName != null) {
- checkbox.Label = string.Format (checkbox.Label, fileName);
- checkbox.Active = true;
- } else
- checkbox.Hide ();
- }
-
- public void Dispose ()
- {
- dialog.Dispose ();
- }
-
- public int Run ()
- {
- return MessageService.ShowCustomDialog (dialog);
- }
-
- public bool DeleteFile {
- get { return checkbox.Active; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs
deleted file mode 100644
index 41f1b27042b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// GtkDesignerOptionPanelWidget.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Gui.Dialogs;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- public class GtkDesignerOptionPanel: OptionsPanel
- {
- GtkDesignerOptionsPanelWidget widget;
-
- public override Control CreatePanelWidget ()
- {
- widget = new GtkDesignerOptionsPanelWidget ();
- widget.AutoSwitchLayout = GuiBuilderService.AutoSwitchGuiLayout;
- return widget;
- }
-
- public override void ApplyChanges ()
- {
- GuiBuilderService.AutoSwitchGuiLayout = widget.AutoSwitchLayout;
- }
- }
-
- [System.ComponentModel.ToolboxItem(true)]
- public partial class GtkDesignerOptionsPanelWidget : Gtk.Bin
- {
- public GtkDesignerOptionsPanelWidget()
- {
- this.Build();
- }
-
- public bool AutoSwitchLayout {
- get { return checkSwitchLayout.Active; }
- set { checkSwitchLayout.Active = value; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs
deleted file mode 100644
index c1cd93ba599..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-
-using System;
-using MonoDevelop.Ide.Templates;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using Gtk;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- class GtkFeatureWidget : Gtk.VBox
- {
- ComboBox versionCombo;
-
- public GtkFeatureWidget (DotNetProject project)
- {
- Spacing = 6;
-
- versionCombo = Gtk.ComboBox.NewText ();
- ReferenceManager refmgr = new ReferenceManager (project);
- foreach (string v in refmgr.SupportedGtkVersions)
- versionCombo.AppendText (v);
- versionCombo.Active = 0;
- refmgr.Dispose ();
-
- // GTK# version selector
- HBox box = new HBox (false, 6);
- Gtk.Label vlab = new Label (GettextCatalog.GetString ("Target GTK# version:"));
- box.PackStart (vlab, false, false, 0);
- box.PackStart (versionCombo, false, false, 0);
- box.PackStart (new Label (GettextCatalog.GetString ("(or upper)")), false, false, 0);
- PackStart (box, false, false, 0);
-
- ShowAll ();
- }
-
- public string SelectedVersion {
- get { return versionCombo.ActiveText; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
deleted file mode 100644
index 0b74290fe35..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// SelectRenamedClassDialog.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using Gtk;
-using Gdk;
-using Glade;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Components;
-using Microsoft.CodeAnalysis;
-using ICSharpCode.NRefactory6.CSharp;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- public class SelectRenamedClassDialog: IDisposable
- {
- [Glade.Widget ("SelectRenamedClassDialog")] protected Gtk.Dialog dialog;
- [Glade.Widget] protected Gtk.TreeView treeClasses;
- ListStore store;
-
- public SelectRenamedClassDialog (IEnumerable classes)
- {
- XML glade = new XML (null, "gui.glade", "SelectRenamedClassDialog", null);
- glade.Autoconnect (this);
-
- store = new ListStore (typeof(Xwt.Drawing.Image), typeof(string));
- treeClasses.Model = store;
-
- TreeViewColumn column = new TreeViewColumn ();
-
- var pr = new CellRendererImage ();
- column.PackStart (pr, false);
- column.AddAttribute (pr, "image", 0);
-
- CellRendererText crt = new CellRendererText ();
- column.PackStart (crt, true);
- column.AddAttribute (crt, "text", 1);
-
- treeClasses.AppendColumn (column);
-
- foreach (var cls in classes) {
- var pic = ImageService.GetIcon (cls.GetStockIcon ());
- store.AppendValues (pic, cls.GetFullName ());
- }
- }
-
- public bool Run ()
- {
- return MessageService.ShowCustomDialog (dialog) == (int) ResponseType.Ok;
- }
-
- public string SelectedClass {
- get {
- Gtk.TreeModel foo;
- Gtk.TreeIter iter;
- if (!treeClasses.Selection.GetSelected (out foo, out iter))
- return null;
- return (string) store.GetValue (iter, 1);
- }
- }
-
- public void Dispose ()
- {
- dialog.Dispose ();
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs
deleted file mode 100644
index 794b08476bd..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// WidgetBuilderOptionPanel.cs
-//
-// Author:
-// Lluis Sanchez Gual
-// Mike Kestner
-//
-// Copyright (C) 2006, 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using Gtk;
-
-using MonoDevelop.Components;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Dialogs;
-
-namespace MonoDevelop.GtkCore.Dialogs
-{
- class WidgetBuilderOptionPanel: ItemOptionsPanel
- {
- class WidgetBuilderOptionPanelWidget : Gtk.VBox
- {
- Gtk.CheckButton checkGettext;
- Gtk.Entry entryGettext;
- Gtk.Entry entryResourceLoader;
- Gtk.ComboBox comboVersions;
-
- DotNetProject project;
-
- public WidgetBuilderOptionPanelWidget (Project project) : base (false, 6)
- {
- this.project = project as DotNetProject;
-
- Gtk.HBox box = new Gtk.HBox (false, 3);
- Gtk.Label lbl = new Gtk.Label (GettextCatalog.GetString ("Target Gtk# version:"));
- box.PackStart (lbl, false, false, 0);
- comboVersions = ComboBox.NewText ();
- ReferenceManager refmgr = new ReferenceManager (project as DotNetProject);
- foreach (string v in refmgr.SupportedGtkVersions)
- comboVersions.AppendText (v);
- comboVersions.Active = refmgr.SupportedGtkVersions.IndexOf (refmgr.GtkPackageVersion);
- refmgr.Dispose ();
- box.PackStart (comboVersions, false, false, 0);
- box.ShowAll ();
- PackStart (box, false, false, 0);
-
- HSeparator sep = new HSeparator ();
- sep.Show ();
- PackStart (sep, false, false, 0);
-
- if (!GtkDesignInfo.HasDesignedObjects (project))
- return;
-
- GtkDesignInfo designInfo = GtkDesignInfo.FromProject (project);
- checkGettext = new CheckButton (GettextCatalog.GetString ("Enable gettext support"));
- checkGettext.Active = designInfo.GenerateGettext;
- checkGettext.Show ();
- PackStart (checkGettext, false, false, 0);
-
- box = new Gtk.HBox (false, 3);
- box.PackStart (new Label (GettextCatalog.GetString ("Gettext class:")), false, false, 0);
- entryGettext = new Gtk.Entry ();
- entryGettext.Text = designInfo.GettextClass;
- entryGettext.Sensitive = checkGettext.Active;
- box.PackStart (entryGettext, false, false, 0);
- box.ShowAll ();
- PackStart (box, false, false, 0);
-
- box = new Gtk.HBox (false, 3);
- box.PackStart (new Label (GettextCatalog.GetString ("Resource loader class:")), false, false, 0);
- entryResourceLoader = new Gtk.Entry ();
- entryResourceLoader.Text = designInfo.ImageResourceLoaderClass;
- entryResourceLoader.Sensitive = checkGettext.Active;
- box.PackStart (entryResourceLoader, false, false, 0);
- box.ShowAll ();
- PackStart (box, false, false, 0);
-
- checkGettext.Clicked += delegate {
- box.Sensitive = checkGettext.Active;
- if (checkGettext.Active)
- entryGettext.Text = "Mono.Unix.Catalog";
- };
- }
-
- public void Store ()
- {
- ReferenceManager refmgr = new ReferenceManager (project);
- if (!string.IsNullOrEmpty (comboVersions.ActiveText))
- refmgr.GtkPackageVersion = comboVersions.ActiveText;
- if (GtkDesignInfo.HasDesignedObjects (project)) {
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
- info.GenerateGettext = checkGettext.Active;
- info.GettextClass = entryGettext.Text;
- info.ImageResourceLoaderClass = entryResourceLoader.Text;
- info.GuiBuilderProject.SteticProject.TargetGtkVersion = comboVersions.ActiveText;
- info.GuiBuilderProject.SaveProject (false);
- }
- refmgr.Dispose ();
- }
- }
-
- WidgetBuilderOptionPanelWidget widget;
-
- public override Control CreatePanelWidget()
- {
- return (widget = new WidgetBuilderOptionPanelWidget (ConfiguredProject));
- }
-
- public override bool IsVisible ()
- {
- return GtkDesignInfo.SupportsDesigner (DataObject as Project);
- }
-
- public override void ApplyChanges ()
- {
- widget.Store ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
deleted file mode 100644
index 68871e78abc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// ActionGroupDisplayBinding.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System.Collections;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.GtkCore.Dialogs;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using System.Linq;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using MonoDevelop.Refactoring;
-
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class ActionGroupDisplayBinding : IViewDisplayBinding
- {
- bool excludeThis = false;
-
- public string Name {
- get { return MonoDevelop.Core.GettextCatalog.GetString ("Action Group Editor"); }
- }
-
- public bool CanUseAsDefault {
- get { return true; }
- }
-
- public bool CanHandle (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
- {
- if (excludeThis)
- return false;
-
- if (fileName.IsNullOrEmpty)
- return false;
-
- if (!IdeApp.Workspace.IsOpen)
- return false;
-
- if (GetActionGroup (fileName) == null)
- return false;
-
- excludeThis = true;
- var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
- excludeThis = false;
- return db != null;
- }
-
- public ViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
- {
- excludeThis = true;
- var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
- GtkDesignInfo info = GtkDesignInfo.FromProject ((DotNetProject) ownerProject);
-
- var content = db.CreateContent (fileName, mimeType, ownerProject);
- content.Binding = db;
- ActionGroupView view = new ActionGroupView (content, GetActionGroup (fileName), info.GuiBuilderProject);
- excludeThis = false;
- return view;
- }
-
- Stetic.ActionGroupInfo GetActionGroup (string file)
- {
- var project = IdeApp.Workspace.GetProjectsContainingFile (file).FirstOrDefault ();
- if (!GtkDesignInfo.HasDesignedObjects (project))
- return null;
-
- return GtkDesignInfo.FromProject (project).GuiBuilderProject.GetActionGroupForFile (file);
- }
-
- internal static string BindToClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupInfo group)
- {
- GuiBuilderProject gproject = GtkDesignInfo.FromProject (project).GuiBuilderProject;
- string file = gproject.GetSourceCodeFile (group);
- if (file != null)
- return file;
-
- // Find the classes that could be bound to this design
-
- ArrayList list = new ArrayList ();
- var ctx = gproject.GetParserContext ();
- foreach (var cls in ctx.GetAllTypesInMainAssembly ())
- if (IsValidClass (cls))
- list.Add (cls.GetFullName ());
-
- // Ask what to do
-
- using (BindDesignDialog dialog = new BindDesignDialog (group.Name, list, project.BaseDirectory)) {
- if (!dialog.Run ())
- return null;
-
- if (dialog.CreateNew)
- CreateClass (project, (Stetic.ActionGroupComponent) group.Component, dialog.ClassName, dialog.Namespace, dialog.Folder);
-
- string fullName = dialog.Namespace.Length > 0 ? dialog.Namespace + "." + dialog.ClassName : dialog.ClassName;
- group.Name = fullName;
- }
- return gproject.GetSourceCodeFile (group);
- }
-
- static ITypeSymbol CreateClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupComponent group, string name, string namspace, string folder)
- {
- string fullName = namspace.Length > 0 ? namspace + "." + name : name;
-
- var type = SyntaxFactory.ClassDeclaration (name)
- .AddBaseListTypes (SyntaxFactory.SimpleBaseType (SyntaxFactory.ParseTypeName ("Gtk.ActionGroup")));
-
- // Generate the constructor. It contains the call that builds the widget.
- var ctor = SyntaxFactory.ConstructorDeclaration (
- new SyntaxList (),
- SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),
- SyntaxFactory.Identifier (name),
- SyntaxFactory.ParameterList (),
- SyntaxFactory.ConstructorInitializer (SyntaxKind.BaseKeyword, SyntaxFactory.ArgumentList (new SeparatedSyntaxList { SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName)) } )),
- SyntaxFactory.Block (
- SyntaxFactory.ExpressionStatement (
- SyntaxFactory.InvocationExpression (
- SyntaxFactory.ParseExpression ("Stetic.Gui.Build"),
- SyntaxFactory.ArgumentList (
- new SeparatedSyntaxList {
- SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
- SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName))
- }
- )
- )
- )
- )
- );
-
- type = type.AddMembers (ctor);
-
- // Add signal handlers
- foreach (Stetic.ActionComponent action in group.GetActions ()) {
- foreach (Stetic.Signal signal in action.GetSignals ()) {
-
- var parameters = new SeparatedSyntaxList ();
- foreach (var p in signal.SignalDescriptor.HandlerParameters) {
- parameters = parameters.Add (SyntaxFactory.Parameter (new SyntaxList (), SyntaxFactory.TokenList (), SyntaxFactory.ParseTypeName (p.TypeName), SyntaxFactory.Identifier (p.Name), null));
- }
-
- var met = SyntaxFactory.MethodDeclaration (
- new SyntaxList (),
- SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword)),
- SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
- null,
- SyntaxFactory.Identifier (signal.Handler),
- null,
- SyntaxFactory.ParameterList (parameters),
- new SyntaxList (),
- SyntaxFactory.Block (),
- null
- );
-
-
- type = type.AddMembers (met);
- }
- }
-
- // Create the class
- return CodeGenerationService.AddType ((DotNetProject)project, folder, namspace, type);
- }
-
- internal static bool IsValidClass (ITypeSymbol cls)
- {
- if (cls.SpecialType == SpecialType.System_Object)
- return false;
- if (cls.BaseType.GetFullName () == "Gtk.ActionGroup")
- return true;
- return IsValidClass (cls.BaseType);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
deleted file mode 100644
index 9bd11bc1f68..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// ActionGroupView.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Linq;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.DesignerSupport;
-using Microsoft.CodeAnalysis;
-using MonoDevelop.Ide;
-using System.Threading.Tasks;
-using MonoDevelop.Refactoring;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class ActionGroupView: CombinedDesignView
- {
- Stetic.ActionGroupDesigner designer;
- CodeBinder codeBinder;
- GuiBuilderProject project;
- Stetic.ActionGroupComponent group;
- Stetic.ActionGroupInfo groupInfo;
- string groupName;
-
- public ActionGroupView (ViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content)
- {
- groupName = group.Name;
- this.project = project;
- LoadDesigner ();
- }
-
- void LoadDesigner ()
- {
- groupInfo = project.GetActionGroup (groupName);
- if (groupInfo == null)
- // Group not found
- return;
-
- group = (Stetic.ActionGroupComponent) groupInfo.Component;
- project.Unloaded += OnDisposeProject;
-
- designer = project.SteticProject.CreateActionGroupDesigner (groupInfo, false);
- designer.AllowActionBinding = project.Project.UsePartialTypes;
- designer.BindField += new EventHandler (OnBindField);
-
- ActionGroupPage actionsPage = new ActionGroupPage ();
- actionsPage.PackStart (designer, true, true, 0);
- actionsPage.ShowAll ();
-
- AddButton (GettextCatalog.GetString ("Actions"), actionsPage);
-
- designer.ModifiedChanged += OnGroupModified;
- designer.SignalAdded += OnSignalAdded;
- designer.SignalChanged += OnSignalChanged;
- designer.RootComponentChanged += OnRootComponentChanged;
-
- codeBinder = new CodeBinder (project.Project, new OpenDocumentFileProvider (), designer.RootComponent);
- }
-
- public void CloseDesigner ()
- {
- if (designer == null)
- return;
- project.Unloaded -= OnDisposeProject;
- designer.BindField -= OnBindField;
- designer.RootComponentChanged -= OnRootComponentChanged;
- designer.ModifiedChanged -= OnGroupModified;
- designer.SignalAdded -= OnSignalAdded;
- designer.SignalChanged -= OnSignalChanged;
- designer.Destroy ();
- designer = null;
-
- project.Reloaded += OnReloadProject;
- }
-
- public override Stetic.Designer Designer {
- get { return designer; }
- }
-
- void OnDisposeProject (object s, EventArgs args)
- {
- RemoveButton (1);
- CloseDesigner ();
- }
-
- void OnReloadProject (object s, EventArgs args)
- {
- if (designer == null)
- LoadDesigner ();
- }
-
- public Stetic.ActionGroupComponent ActionGroup {
- get { return group; }
- set { Load (value.Name); }
- }
-
- protected override void OnPageShown (int npage)
- {
- if (designer != null && group != null) {
- // At every page switch update the generated code, to make sure code completion works
- // for the generated fields. The call to GenerateSteticCodeStructure will generate
- // the code for the window (only the fields in fact) and update the parser database, it
- // will not save the code to disk.
- if (project.Project.UsePartialTypes)
- GuiBuilderService.GenerateSteticCodeStructure ((DotNetProject)project.Project, designer.RootComponent, null, false, false);
- }
- base.OnPageShown (npage);
- }
-
- void OnRootComponentChanged (object s, EventArgs args)
- {
- codeBinder.TargetObject = designer.RootComponent;
- }
-
- public override async Task Save (FileSaveInformation fileSaveInformation)
- {
- string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (project.Project, groupInfo.Name);
-
- await base.Save (fileSaveInformation);
- if (designer == null)
- return;
-
- codeBinder.UpdateBindings (fileSaveInformation.FileName);
-
- designer.Save ();
-
- string newBuildFile = GuiBuilderService.GetBuildCodeFileName (project.Project, groupInfo.Name);
- if (oldBuildFile != newBuildFile)
- FileService.MoveFile (oldBuildFile, newBuildFile);
-
- project.SaveProject (true);
- }
-
- public override void Dispose ()
- {
- CloseDesigner ();
- project.Reloaded -= OnReloadProject;
- base.Dispose ();
- }
-
- public void ShowDesignerView ()
- {
- ShowPage (1);
- }
-
- public void SelectAction (Stetic.ActionComponent action)
- {
- if (designer != null)
- designer.SelectedAction = action;
- }
-
- public override void JumpToSignalHandler (Stetic.Signal signal)
- {
- var cls = codeBinder.GetClass ();
- var met = cls.GetMembers (signal.Handler).OfType ().FirstOrDefault ();
- if (met != null) {
- ShowPage (1);
- RefactoringService.RoslynJumpToDeclaration(met);
- }
- }
-
- void OnGroupModified (object s, EventArgs a)
- {
- IsDirty = designer.Modified;
- }
-
- void OnSignalAdded (object s, Stetic.ComponentSignalEventArgs a)
- {
- codeBinder.BindSignal (a.Signal);
- }
-
- async void OnSignalChanged (object s, Stetic.ComponentSignalEventArgs a)
- {
- await codeBinder.UpdateSignal (a.OldSignal, a.Signal);
- }
-
- async void OnBindField (object s, EventArgs args)
- {
- if (designer.SelectedAction != null) {
- await codeBinder.BindToField (designer.SelectedAction);
- }
- }
- }
-
- class ActionGroupPage: Gtk.VBox, ICustomPropertyPadProvider
- {
- public ActionGroupPage ()
- {
- }
-
- Gtk.Widget ICustomPropertyPadProvider.GetCustomPropertyWidget ()
- {
- return PropertiesWidget.Instance;
- }
-
- void ICustomPropertyPadProvider.DisposeCustomPropertyWidget ()
- {
- }
-
- public void ClearChild ()
- {
- if (Children.Length > 0) {
- Gtk.Widget w = Children [0];
- Remove (w);
- w.Destroy ();
- }
- }
-
- Stetic.ActionGroupDesigner actionsBox {
- get { return Children[0] as Stetic.ActionGroupDesigner; }
- }
-
- [CommandHandler (EditCommands.Delete)]
- protected void OnDelete ()
- {
- actionsBox.DeleteSelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Delete)]
- protected void OnUpdateDelete (CommandInfo cinfo)
- {
- cinfo.Enabled = actionsBox != null && actionsBox.SelectedAction != null;
- }
-
- [CommandHandler (EditCommands.Copy)]
- protected void OnCopy ()
- {
- actionsBox.CopySelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Copy)]
- protected void OnUpdateCopy (CommandInfo cinfo)
- {
- cinfo.Enabled = actionsBox != null && actionsBox.SelectedAction != null;
- }
-
- [CommandHandler (EditCommands.Cut)]
- protected void OnCut ()
- {
- actionsBox.CutSelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Cut)]
- protected void OnUpdateCut (CommandInfo cinfo)
- {
- cinfo.Enabled = actionsBox != null && actionsBox.SelectedAction != null;
- }
-
- [CommandHandler (EditCommands.Paste)]
- protected void OnPaste ()
- {
- actionsBox.PasteToSelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Paste)]
- protected void OnUpdatePaste (CommandInfo cinfo)
- {
- cinfo.Enabled = false;
- }
-
- [CommandHandler (EditCommands.Undo)]
- protected void OnUndo ()
- {
- actionsBox.UndoQueue.Undo ();
- }
-
- [CommandHandler (EditCommands.Redo)]
- protected void OnRedo ()
- {
- actionsBox.UndoQueue.Redo ();
- }
-
- [CommandUpdateHandler (EditCommands.Undo)]
- protected void OnUpdateUndo (CommandInfo cinfo)
- {
- cinfo.Enabled = actionsBox != null && actionsBox.UndoQueue.CanUndo;
- }
-
- [CommandUpdateHandler (EditCommands.Redo)]
- protected void OnUpdateRedo (CommandInfo cinfo)
- {
- cinfo.Enabled = actionsBox != null && actionsBox.UndoQueue.CanRedo;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
deleted file mode 100644
index 8c5d0a54622..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// ClassUtils.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using System;
-using System.Collections;
-using System.CodeDom;
-using Microsoft.CodeAnalysis;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- internal class ClassUtils
- {
- public static IFieldSymbol FindWidgetField (ITypeSymbol cls, string name)
- {
- foreach (var field in cls.GetMembers ().OfType ()) {
- if (name == GetWidgetFieldName (field))
- return field;
- }
- return null;
- }
-
- public static string GetWidgetFieldName (IFieldSymbol field)
- {
- foreach (AttributeData att in field.GetAttributes ()) {
- var type = att.AttributeClass;
- if (type.Name == "Widget" || type.Name == "WidgetAttribute") {
- var pArgs = att.ConstructorArguments;
- if (pArgs != null && pArgs.Length > 0) {
- var exp = pArgs[0].Value;
- if (exp != null)
- return exp.ToString ();
- } else {
- return field.Name;
- }
- }
- }
- return field.Name;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
deleted file mode 100644
index 4a998d7201f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-//
-// CodeBinder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.CodeDom;
-using System.Collections.Generic;
-using System.Linq;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.GtkCore.Dialogs;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using ICSharpCode.NRefactory6.CSharp;
-using MonoDevelop.CSharp.Refactoring;
-using MonoDevelop.Refactoring;
-using System.Xml.XPath;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- /// This class provides several methods for managing the relation
- /// between an object (e.g. a window) and the source code that will implement the
- /// code for that object.
- ///
- /// Once created, a CodeBinder object will keep track of the class bound to the
- /// object. If the class is renamed, it will properly update the object name.
-
- public class CodeBinder
- {
- ITextFileProvider textFileProvider;
- Stetic.Component targetObject;
- MonoDevelop.Projects.Project project;
- GuiBuilderProject gproject;
- string className;
- string classFile;
-
- public CodeBinder (MonoDevelop.Projects.Project project, ITextFileProvider textFileProvider, Stetic.Component targetObject)
- {
- this.project = project;
- this.textFileProvider = textFileProvider;
-
- gproject = GtkDesignInfo.FromProject (project).GuiBuilderProject;
-
- TargetObject = targetObject;
- }
-
- public Stetic.Component TargetObject {
- get { return targetObject; }
- set {
- this.targetObject = value;
- if (targetObject != null) {
- var cls = gproject.FindClass (GetClassName (targetObject));
- if (cls != null) {
- className = cls.GetFullName ();
- classFile = cls.Locations.First ().SourceTree.FilePath;
- }
- }
- }
- }
-
- /// Synchronizes the bindings between the object and the source code
- public void UpdateBindings (string fileName)
- {
- if (targetObject == null)
- return;
-
- classFile = fileName;
-
- var cls = GetClass ();
- if (cls != null) {
- UpdateBindings (targetObject, cls);
- targetObject.GeneratePublic = cls.DeclaredAccessibility == Accessibility.Public;
- }
- }
-
- void UpdateBindings (Stetic.Component obj, ITypeSymbol cls)
- {
- if (targetObject == null || cls == null)
- return;
-
- // Remove signals for which there isn't a handler in the class
-
- Stetic.SignalCollection objectSignals = obj.GetSignals ();
- if (objectSignals != null) {
- Stetic.Signal[] signals = new Stetic.Signal [objectSignals.Count];
- objectSignals.CopyTo (signals, 0);
- foreach (Stetic.Signal signal in signals) {
- if (FindSignalHandler (cls, signal) == null) {
- obj.RemoveSignal (signal);
- }
- }
- }
-
- // Update children
-
- foreach (Stetic.Component ob in obj.GetChildren ())
- UpdateBindings (ob, cls);
- }
-
- static IMethodSymbol FindSignalHandler (ITypeSymbol cls, Stetic.Signal signal)
- {
- return cls.GetMembers (signal.Handler).OfType ().FirstOrDefault ();
- }
-
- public async Task UpdateField (Stetic.Component obj, string oldName)
- {
- if (targetObject == null)
- return;
-
- if (obj == targetObject)
- return; // The root widget name can only be changed internally.
-
- var cls = GetClass (false);
-
- string newName = GetObjectName (obj);
- if (newName.Length == 0)
- return;
-
- if (cls != null) {
- var f = ClassUtils.FindWidgetField (cls, oldName);
- if (f != null) {
- await MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (f, newName);
- }
- }
- }
-
- /// Adds a signal handler to the class
- public void BindSignal (Stetic.Signal signal)
- {
- if (targetObject == null)
- return;
-
- var cls = GetClass ();
- if (cls == null)
- return;
-
- if (FindSignalHandler (cls, signal) != null)
- return;
-
- var met = SyntaxFactory.MethodDeclaration (SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
- signal.Handler)
- .WithBody (SyntaxFactory.Block ())
- .AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
-
- var parameters = new List ();
- foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
- parameters.Add (SyntaxFactory.Parameter (new SyntaxList (), new SyntaxTokenList (), SyntaxFactory.ParseTypeName (pinfo.TypeName), SyntaxFactory.Identifier (pinfo.Name), null));
- met = met.AddParameterListParameters (parameters.ToArray ());
-
- CodeGenerationService.AddNewMember (project, cls, GetSourceLocation (cls), met);
- }
-
- static Location GetSourceLocation (INamedTypeSymbol cls)
- {
- foreach (var loc in cls.Locations) {
- if (loc.IsInSource) {
- if (!Path.GetDirectoryName (loc.SourceTree.FilePath).EndsWith ("gtk-gui", FilePath.PathComparison))
- return loc;
- }
- }
-
- return cls.Locations.First ();
- }
-
- public async Task UpdateSignal (Stetic.Signal oldSignal, Stetic.Signal newSignal)
- {
- if (targetObject == null)
- return;
-
- if (oldSignal.Handler == newSignal.Handler)
- return;
-
- var cls = GetClass ();
- if (cls == null)
- return;
- var met = FindSignalHandler (cls, oldSignal);
- if (met == null)
- return;
- await MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (met, newSignal.Handler);
- }
-
- /// Adds a field to the class
- public async Task BindToField (Stetic.Component obj)
- {
- if (targetObject == null)
- return;
-
- string name = GetMemberName (obj);
- var cls = GetClass ();
-
- if (FindField (cls, name) != null)
- return;
-
- var location = GetSourceLocation(cls);
- var doc = await IdeApp.Workbench.OpenDocument (location.SourceTree.FilePath, project, true);
-
- var editor = doc.Editor;
- if (editor != null) {
- await CodeGenerationService.AddNewMember (project, cls, cls.Locations.First (), GetFieldCode (cls, obj, name));
- }
- }
-
- FieldDeclarationSyntax GetFieldCode (ITypeSymbol cls, Stetic.Component obj, string name)
- {
- return SyntaxFactory.FieldDeclaration (
- SyntaxFactory.VariableDeclaration (
- SyntaxFactory.ParseTypeName (obj.Type.ClassName),
- new SeparatedSyntaxList {
- SyntaxFactory.VariableDeclarator (name)
- }
- )
- ).AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
- }
-
-
- static IFieldSymbol FindField (ITypeSymbol cls, string name)
- {
- return cls
- .GetMembers (name)
- .OfType ()
- .FirstOrDefault ();
- }
-
- public INamedTypeSymbol GetClass ()
- {
- return GetClass (true);
- }
-
- public INamedTypeSymbol GetClass (bool getUserClass)
- {
- if (targetObject == null)
- return null;
-
- var cls = gproject.FindClass (className, getUserClass);
- if (cls != null)
- return cls;
-
- // The class name may have changed. Try to guess the new name.
-// TODO (roslyn port) - is that really required ?
-// var matches = new List ();
-// ParsedDocument unit = null;
-// var ctx = gproject.GetParserContext ();
-// var doc = TypeSystemService.ParseFile (project, classFile);
-// if (doc != null) {
-// unit = doc;
-// foreach (var fcls in unit.TopLevelTypeDefinitions) {
-// if (IsValidClass (fcls, targetObject))
-// matches.Add (fcls);
-// }
-// }
-//
-// // If found the class, just return it
-// if (matches.Count == 1) {
-// cls = matches [0];
-// className = cls.GetFullName ();
-// targetObject.Name = className;
-// gproject.SaveWindow (true, targetObject.Name);
-// return cls;
-// }
-//
-// // If not found, warn the user.
-//
-// if (unit != null && unit.TopLevelTypeDefinitions.Count > 0) {
-// using (var dialog = new SelectRenamedClassDialog (unit.TopLevelTypeDefinitions.Select (c => c.Resolve (project)))) {
-// if (dialog.Run ()) {
-// className = dialog.SelectedClass;
-// if (className == null)
-// return null;
-// else {
-// targetObject.Name = className;
-// gproject.SaveWindow (true, targetObject.Name);
-// return gproject.FindClass (className);
-// }
-// }
-// }
-// } else {
-// MessageService.ShowError (GettextCatalog.GetString ("The class bound to the component '{0}' could not be found. This may be due to syntax errors in the source code file.", GetObjectName(targetObject)));
-// }
-
- return null;
- }
-
- static bool IsValidClass (ITypeSymbol cls, Stetic.Component obj)
- {
- if (cls.BaseType.SpecialType == SpecialType.System_Object)
- return false;
- string typeName = obj.Type.ClassName;
-
- if (cls.BaseType.GetFullName () == typeName)
- return true;
- return IsValidClass (cls.BaseType, obj);
- }
-
- internal static string GetClassName (Stetic.Component obj)
- {
- return GetObjectName (obj);
- }
-
- internal static string GetMemberName (Stetic.Component obj)
- {
- return obj.Name;
- }
-
- internal static string GetObjectName (Stetic.Component obj)
- {
- return obj.Name;
- }
-
- internal static string GetClassName (Stetic.ProjectItemInfo obj)
- {
- return GetObjectName (obj);
- }
-
- internal static string GetObjectName (Stetic.ProjectItemInfo obj)
- {
- return obj.Name;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
deleted file mode 100644
index eb93b3efe01..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// CombinedDesignView.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Linq;
-using Gtk;
-using MonoDevelop.Components;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide;
-using System.Collections.Generic;
-using MonoDevelop.Ide.Editor;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class CombinedDesignView : ViewContent
- {
- ViewContent content;
- Gtk.Widget control;
- List tabs = new List ();
-
- public CombinedDesignView (ViewContent content)
- {
- this.content = content;
- /* This code causes that chagnes in a version control view always select the source code view.
- if (content is IEditableTextBuffer) {
- ((IEditableTextBuffer)content).CaretPositionSet += delegate {
- ShowPage (0);
- };
- }*/
- content.DirtyChanged += new EventHandler (OnTextDirtyChanged);
-
- CommandRouterContainer crc = new CommandRouterContainer (content.Control, content, true);
- crc.Show ();
- control = crc;
-
- IdeApp.Workbench.ActiveDocumentChanged += new EventHandler (OnActiveDocumentChanged);
- }
-
- public virtual Stetic.Designer Designer {
- get { return null; }
- }
-
- public override string TabPageLabel {
- get {
- return GettextCatalog.GetString ("Source");
- }
- }
-
- protected void AddButton (string label, Gtk.Widget page)
- {
- TabView view = new TabView (label, page);
- tabs.Add (view);
- if (WorkbenchWindow != null) {
- view.WorkbenchWindow = WorkbenchWindow;
- WorkbenchWindow.AttachViewContent (view);
- }
- }
-
- public bool HasPage (Gtk.Widget page)
- {
- return tabs.Any (p => p.Control.GetNativeWidget () == page);
- }
-
- public void RemoveButton (Gtk.Widget page)
- {
-/* int i = notebook.PageNum (page);
- if (i != -1)
- RemoveButton (i);*/
- }
-
- public void RemoveButton (int npage)
- {
-/* if (npage >= toolbar.Children.Length)
- return;
- notebook.RemovePage (npage);
- Gtk.Widget cw = toolbar.Children [npage];
- toolbar.Remove (cw);
- cw.Destroy ();
- ShowPage (0);*/
- }
-
- protected override void OnSetProject (Projects.Project project)
- {
- base.OnSetProject (project);
- content.Project = project;
- }
-
- public override ProjectReloadCapability ProjectReloadCapability {
- get {
- return content.ProjectReloadCapability;
- }
- }
-
- protected override void OnWorkbenchWindowChanged ()
- {
- base.OnWorkbenchWindowChanged ();
- if (content != null)
- content.WorkbenchWindow = WorkbenchWindow;
- if (WorkbenchWindow != null) {
- foreach (TabView view in tabs) {
- view.WorkbenchWindow = WorkbenchWindow;
- WorkbenchWindow.AttachViewContent (view);
- }
- WorkbenchWindow.ActiveViewContentChanged += OnActiveViewContentChanged;
- }
- }
-
- void OnActiveViewContentChanged (object o, ActiveViewContentEventArgs e)
- {
- if (WorkbenchWindow.ActiveViewContent == this)
- OnPageShown (0);
- else {
- TabView tab = WorkbenchWindow.ActiveViewContent as TabView;
- if (tab != null) {
- int n = tabs.IndexOf (tab);
- if (n != -1)
- OnPageShown (n + 1);
- }
- }
- }
-
- public void ShowPage (int npage)
- {
- if (WorkbenchWindow != null) {
- if (npage == 0)
- WorkbenchWindow.SwitchView (0);
- else {
- var view = tabs [npage - 1];
- WorkbenchWindow.SwitchView (view);
- }
- }
- }
-
- protected virtual void OnPageShown (int npage)
- {
- }
-
- public override void Dispose ()
- {
- if (content == null)
- return;
-
- content.DirtyChanged -= new EventHandler (OnTextDirtyChanged);
- IdeApp.Workbench.ActiveDocumentChanged -= new EventHandler (OnActiveDocumentChanged);
- content.Dispose ();
-
- content = null;
- control = null;
-
- base.Dispose ();
- }
-
- public override Task Load (FileOpenInformation fileOpenInformation)
- {
- ContentName = fileOpenInformation.FileName;
- return content.Load (ContentName);
- }
-
- public override Control Control {
- get { return control; }
- }
-
- public override Task Save (FileSaveInformation fileSaveInformation)
- {
- return content.Save (fileSaveInformation);
- }
-
- public override bool IsDirty {
- get {
- return content.IsDirty;
- }
- set {
- content.IsDirty = value;
- }
- }
-
- public override bool IsReadOnly
- {
- get {
- return content.IsReadOnly;
- }
- }
-
- public virtual void AddCurrentWidgetToClass ()
- {
- }
-
- public virtual void JumpToSignalHandler (Stetic.Signal signal)
- {
- }
-
- void OnTextDirtyChanged (object s, EventArgs args)
- {
- OnDirtyChanged ();
- }
-
- void OnActiveDocumentChanged (object s, EventArgs args)
- {
- if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.GetContent() == this)
- OnDocumentActivated ();
- }
-
- protected virtual void OnDocumentActivated ()
- {
- }
-
- protected override object OnGetContent (Type type)
- {
-// if (type == typeof(IEditableTextBuffer)) {
-// // Intercept the IPositionable interface, since we need to
-// // switch to the text editor when jumping to a line
-// if (content.GetContent (type) != null)
-// return this;
-// else
-// return null;
-// }
-//
- return base.OnGetContent (type) ?? (content !=null ? content.GetContent (type) : null);
- }
-
- public void JumpTo (int line, int column)
- {
- var ip = (TextEditor) content.GetContent (typeof(TextEditor));
- if (ip != null) {
- ShowPage (0);
- ip.SetCaretLocation (line, column);
- }
- }
- }
-
- class TabView: BaseViewContent
- {
- string label;
- Gtk.Widget content;
-
- public TabView (string label, Gtk.Widget content)
- {
- this.label = label;
- this.content = content;
- }
-
- protected override object OnGetContent (Type type)
- {
- if (type.IsInstanceOfType (content))
- return content;
- return base.OnGetContent (type);
- }
-
- public override Control Control {
- get {
- return content;
- }
- }
-
- public override string TabPageLabel {
- get {
- return label;
- }
- }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
deleted file mode 100644
index 04e2b66bd2d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-
-using System;
-using System.Threading;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Ide;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class GtkProjectServiceExtension: DotNetProjectExtension
- {
- [ItemProperty ("GtkDesignInfo", IsExternal = true, SkipEmpty = true)]
- GtkDesignInfo info;
-
- protected override bool SupportsObject (WorkspaceObject item)
- {
- return base.SupportsObject (item) && IdeApp.IsInitialized;
- }
-
- protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
- {
- base.OnReadProject (monitor, msproject);
- if (info != null)
- info.Project = Project;
- }
-
- public GtkDesignInfo DesignInfo {
- get {
- if (info == null)
- info = new GtkDesignInfo (Project);
- return info;
- }
- set {
- info = value;
- }
- }
-
- protected async override Task OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
- {
- if (Project.References.Count == 0 || !GtkDesignInfo.HasDesignedObjects (Project))
- return await base.OnBuild (monitor, configuration, operationContext);
-
- Generator gen = new Generator ();
- if (!await gen.Run (monitor, Project, configuration)) {
- BuildResult gr = new BuildResult ();
- foreach (string s in gen.Messages)
- gr.AddError (DesignInfo.GuiBuilderProject.File, 0, 0, null, s);
- return gr;
- }
-
- BuildResult res = await base.OnBuild (monitor, configuration, operationContext);
-
- if (gen.Messages != null) {
- foreach (string s in gen.Messages)
- res.AddWarning (DesignInfo.GuiBuilderProject.File, 0, 0, null, s);
-
- if (gen.Messages.Length > 0)
- DesignInfo.ForceCodeGenerationOnBuild ();
- }
-
- if (res.Failed && !Platform.IsWindows && !Platform.IsMac) {
- // Some gtk# packages don't include the .pc file unless you install gtk-sharp-devel
- if (Project.AssemblyContext.GetPackage ("gtk-sharp-2.0") == null) {
- string msg = GettextCatalog.GetString (
- "ERROR: MonoDevelop could not find the Gtk# 2.0 development package. " +
- "Compilation of projects depending on Gtk# libraries will fail. " +
- "You may need to install development packages for gtk-sharp-2.0.");
- monitor.Log.WriteLine ();
- monitor.Log.WriteLine (BrandingService.BrandApplicationName (msg));
- }
- }
-
- return res;
- }
- }
-
- class Generator
- {
- public async Task Run (ProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
- {
- try {
- Stetic.CodeGenerationResult res = await GuiBuilderService.GenerateSteticCode (monitor, project, configuration);
- if (res != null)
- Messages = res.Warnings;
- return true;
- } catch (Exception ex) {
- Error = ex;
- LoggingService.LogError (ex.ToString ());
- Messages = new [] { Error.Message };
- return false;
- }
- }
- public string[] Messages;
- public Exception Error;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
deleted file mode 100644
index 1a4ff83c4ca..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// GuiBuilderDisplayBinding.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System.Linq;
-using Microsoft.CodeAnalysis.CSharp;
-using System;
-using ICSharpCode.NRefactory6.CSharp;
-
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class GuiBuilderDisplayBinding : IViewDisplayBinding
- {
- bool excludeThis = false;
-
- public string Name {
- get { return MonoDevelop.Core.GettextCatalog.GetString ("Window Designer"); }
- }
-
- public bool CanUseAsDefault {
- get { return true; }
- }
-
- public bool CanHandle (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject)
- {
- if (excludeThis)
- return false;
-
- if (fileName.IsNullOrEmpty)
- return false;
-
- if (GetWindow (fileName, ownerProject) == null)
- return false;
-
- excludeThis = true;
- var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
- excludeThis = false;
- return db != null;
- }
-
- public ViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject)
- {
- excludeThis = true;
- var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
- var content = db.CreateContent (fileName, mimeType, ownerProject);
- content.Binding = db;
- var window = GetWindow (fileName, ownerProject);
- if (window == null)
- throw new InvalidOperationException ("GetWindow == null");
- GuiBuilderView view = new GuiBuilderView (content, window);
- excludeThis = false;
- return view;
- }
-
- internal static GuiBuilderWindow GetWindow (string file, Project project)
- {
- if (!IdeApp.Workspace.IsOpen)
- return null;
- if (!GtkDesignInfo.HasDesignedObjects (project))
- return null;
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
- if (file.StartsWith (info.GtkGuiFolder))
- return null;
- var docId = TypeSystemService.GetDocumentId (project, file);
- if (docId == null)
- return null;
- var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
- if (doc == null)
- return null;
- Microsoft.CodeAnalysis.SemanticModel semanticModel;
- try {
- semanticModel = doc.GetSemanticModelAsync ().Result;
- } catch {
- return null;
- }
- if (semanticModel == null)
- return null;
- var root = semanticModel.SyntaxTree.GetRoot ();
- foreach (var classDeclaration in root.DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType ()) {
- var c = semanticModel.GetDeclaredSymbol (classDeclaration);
- GuiBuilderWindow win = info.GuiBuilderProject.GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat));
- if (win != null)
- return win;
- }
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs
deleted file mode 100644
index 8cbf2677bb7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// GuiBuilderProjectPad.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using Gtk;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.DesignerSupport;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- internal class GuiBuilderDocumentOutline: Alignment, ICustomPropertyPadProvider
- {
- static GuiBuilderDocumentOutline instance;
-
- GuiBuilderDocumentOutline () : base (0, 0, 1, 1)
- {
- BorderWidth = 0;
- GuiBuilderService.SteticApp.WidgetTreeWidget.BorderWidth = 0;
- Add (GuiBuilderService.SteticApp.WidgetTreeWidget);
- ShowAll ();
- }
-
- internal static GuiBuilderDocumentOutline Instance {
- get {
- if (instance == null)
- instance = new GuiBuilderDocumentOutline ();
- return instance;
- }
- }
-
- Gtk.Widget ICustomPropertyPadProvider.GetCustomPropertyWidget ()
- {
- return PropertiesWidget.Instance;
- }
-
- void ICustomPropertyPadProvider.DisposeCustomPropertyWidget ()
- {
- }
-
- [CommandHandler (EditCommands.Undo)]
- protected void OnUndo ()
- {
-// GuiBuilderService.App.CommandUndo ();
- }
-
- [CommandHandler (EditCommands.Redo)]
- protected void OnRedo ()
- {
-// GuiBuilderService.App.CommandRedo ();
- }
-
- [CommandHandler (EditCommands.Copy)]
- protected void OnCopy ()
- {
-// GuiBuilderService.App.CommandCopy ();
- }
-
- [CommandHandler (EditCommands.Cut)]
- protected void OnCut ()
- {
-// GuiBuilderService.App.CommandCut ();
- }
-
- [CommandHandler (EditCommands.Paste)]
- protected void OnPaste ()
- {
-// GuiBuilderService.App.CommandPaste ();
- }
-
- [CommandHandler (EditCommands.Delete)]
- protected void OnDelete ()
- {
-// GuiBuilderService.App.CommandDelete ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
deleted file mode 100644
index a5be678483d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ /dev/null
@@ -1,690 +0,0 @@
-//
-// GuiBuilderProject.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class GuiBuilderProject
- {
- internal object MemoryProbe = Counters.GuiProjectsInMemory.CreateMemoryProbe ();
-
- List formInfos;
- Stetic.Project gproject;
- DotNetProject project;
- string fileName;
- bool hasError;
- bool needsUpdate = true;
-
- FileSystemWatcher watcher;
- DateTime lastSaveTime;
- object fileSaveLock = new object ();
- bool disposed;
- bool librariesUpdated;
-
- public event WindowEventHandler WindowAdded;
- public event WindowEventHandler WindowRemoved;
- public event EventHandler Reloaded;
- public event EventHandler Unloaded;
- public event EventHandler Changed;
-
- public GuiBuilderProject (DotNetProject project, string fileName)
- {
- this.fileName = fileName;
- this.project = project;
- Counters.GuiProjectsLoaded++;
- GuiBuilderService.NotifyGuiProjectLoaded ();
- }
-
- void Load ()
- {
- if (gproject != null || disposed || fileName == null)
- return;
-
- gproject = GuiBuilderService.SteticApp.CreateProject ();
- formInfos = new List ();
-
- if (!System.IO.File.Exists (fileName)) {
- // Regenerate the gtk-gui folder if the stetic project
- // doesn't exist.
- GtkDesignInfo.FromProject (project).UpdateGtkFolder ();
- }
-
- try {
- gproject.Load (fileName);
- } catch (Exception ex) {
- MessageService.ShowError (GettextCatalog.GetString ("The GUI designer project file '{0}' could not be loaded.", fileName), ex);
- hasError = true;
- }
-
- Counters.SteticProjectsLoaded++;
- gproject.ResourceProvider = GtkDesignInfo.FromProject (project).ResourceProvider;
- gproject.WidgetAdded += OnAddWidget;
- gproject.WidgetRemoved += OnRemoveWidget;
- gproject.ActionGroupsChanged += OnGroupsChanged;
- project.FileAddedToProject += OnFileAdded;
- project.FileRemovedFromProject += OnFileRemoved;
- project.ReferenceAddedToProject += OnReferenceAdded;
- project.ReferenceRemovedFromProject += OnReferenceRemoved;
-
- foreach (Stetic.WidgetInfo ob in gproject.Widgets)
- RegisterWindow (ob, false);
-
- // Monitor changes in the file
- lastSaveTime = System.IO.File.GetLastWriteTime (fileName);
- watcher = new FileSystemWatcher ();
- if (System.IO.File.Exists (fileName)) {
- watcher.Path = Path.GetDirectoryName (fileName);
- watcher.Filter = Path.GetFileName (fileName);
- watcher.Changed += OnSteticFileChanged;
- watcher.EnableRaisingEvents = true;
- }
- }
-
- void Unload ()
- {
- if (gproject == null)
- return;
-
- Counters.SteticProjectsLoaded--;
-
- if (Unloaded != null)
- Unloaded (this, EventArgs.Empty);
- if (formInfos != null) {
- foreach (GuiBuilderWindow win in formInfos)
- win.Dispose ();
- formInfos = null;
- }
- if (gproject != null) {
- gproject.WidgetAdded -= OnAddWidget;
- gproject.WidgetRemoved -= OnRemoveWidget;
- gproject.ActionGroupsChanged -= OnGroupsChanged;
- gproject.Dispose ();
- gproject = null;
- }
- if (project != null) {
- project.FileAddedToProject -= OnFileAdded;
- project.FileRemovedFromProject -= OnFileRemoved;
- project.ReferenceAddedToProject -= OnReferenceAdded;
- project.ReferenceRemovedFromProject -= OnReferenceRemoved;
- }
- needsUpdate = true;
- hasError = false;
- librariesUpdated = false;
- if (watcher != null) {
- watcher.Dispose ();
- watcher = null;
- }
- NotifyChanged ();
- }
-
- void OnSteticFileChanged (object s, FileSystemEventArgs args)
- {
- Runtime.RunInMainThread (() => {
- lock (fileSaveLock) {
- if (lastSaveTime == System.IO.File.GetLastWriteTime (fileName))
- return;
- }
-
- if (GuiBuilderService.HasOpenDesigners (project, true)) {
- if (MessageService.AskQuestion (GettextCatalog.GetString ("The project '{0}' has been modified by an external application. Do you want to reload it?", project.Name), GettextCatalog.GetString ("Unsaved changes in the open GTK designers will be lost."), AlertButton.Cancel, AlertButton.Reload) != AlertButton.Reload)
- return;
- }
- if (!disposed)
- Reload ();
- });
- }
-
- public void Reload ()
- {
- if (disposed)
- return;
- Unload ();
- if (Reloaded != null)
- Reloaded (this, EventArgs.Empty);
- NotifyChanged ();
- }
-
- public bool HasError {
- get { return hasError; }
- }
-
- public bool IsEmpty {
- get {
- // If the project is not loaded, assume not empty
- return gproject != null && Windows != null && Windows.Count == 0;
- }
- }
-
- public void SaveAll (bool saveMdProject)
- {
- if (gproject != null)
- gproject.SetAllWidgetsModified ();
- SaveProject (saveMdProject);
- }
-
- public void SaveWindow (bool saveMdProject, string modifiedWindow)
- {
- if (gproject != null)
- gproject.SetWidgetModified (modifiedWindow);
- SaveProject (saveMdProject);
- }
-
- public void SaveProject (bool saveMdProject)
- {
- if (disposed)
- return;
-
- if (gproject != null && !hasError) {
- lock (fileSaveLock) {
- gproject.Save (fileName);
- lastSaveTime = System.IO.File.GetLastWriteTime (fileName);
- }
- }
-
- if (GtkDesignInfo.FromProject (project).UpdateGtkFolder () && saveMdProject)
- IdeApp.ProjectOperations.SaveAsync (project);
- }
-
- public string File {
- get { return fileName; }
- }
-
- public Stetic.Project SteticProject {
- get {
- Load ();
- return gproject;
- }
- }
-
- public ICollection Windows {
- get {
- Load ();
- return formInfos;
- }
- }
-
- public DotNetProject Project {
- get { return project; }
- }
-
- public void Dispose ()
- {
- if (disposed)
- return;
- GuiBuilderService.NotifyGuiProjectUnloaded ();
- Counters.GuiProjectsLoaded--;
- disposed = true;
- if (watcher != null)
- watcher.Dispose ();
- Unload ();
- }
-
- public Stetic.WidgetInfo AddNewComponent (Stetic.ComponentType type, string name)
- {
- Stetic.WidgetInfo c = SteticProject.AddNewComponent (type, name);
- RegisterWindow (c, true);
- return c;
- }
-
- public Stetic.WidgetInfo AddNewComponent (XmlElement element)
- {
- Stetic.WidgetInfo c = SteticProject.AddNewComponent (element);
- // Register the window now, don't wait for the WidgetAdded event since
- // it may take some time, and the GuiBuilderWindow object is needed
- // just after this call
- RegisterWindow (c, true);
- return c;
- }
-
- void RegisterWindow (Stetic.WidgetInfo widget, bool notify)
- {
- if (formInfos != null) {
- foreach (GuiBuilderWindow w in formInfos)
- if (w.RootWidget == widget)
- return;
-
- GuiBuilderWindow win = new GuiBuilderWindow (this, gproject, widget);
- formInfos.Add (win);
-
- if (notify) {
- if (WindowAdded != null)
- WindowAdded (this, new WindowEventArgs (win));
- NotifyChanged ();
- }
- }
- }
-
- void UnregisterWindow (GuiBuilderWindow win)
- {
- if (!formInfos.Contains (win))
- return;
-
- formInfos.Remove (win);
-
- if (WindowRemoved != null)
- WindowRemoved (this, new WindowEventArgs (win));
-
- win.Dispose ();
- NotifyChanged ();
- }
-
- public void Remove (GuiBuilderWindow win)
- {
- gproject.RemoveComponent (win.RootWidget);
- UnregisterWindow (win);
- }
-
- public void RemoveActionGroup (Stetic.ActionGroupInfo group)
- {
- gproject.RemoveActionGroup (group);
- }
-
- void OnAddWidget (object s, Stetic.WidgetInfoEventArgs args)
- {
- if (!disposed)
- RegisterWindow (args.WidgetInfo, true);
- }
-
- void OnRemoveWidget (object s, Stetic.WidgetInfoEventArgs args)
- {
- if (disposed || Windows == null)
- return;
- foreach (GuiBuilderWindow form in Windows) {
- if (form.RootWidget.Name == args.WidgetInfo.Name) {
- UnregisterWindow (form);
- break;
- }
- }
- }
-
- void OnFileAdded (object sender, ProjectFileEventArgs e)
- {
- foreach (ProjectFileEventInfo args in e) {
- var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
- if (docId == null)
- continue;
- var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
- if (doc == null)
- continue;
-
- string dir = Path.Combine (Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "stetic"), "deleted-designs");
- if (!Directory.Exists (dir) || !Directory.EnumerateFiles (dir).Any ())
- continue;
- var semanticModel = doc.GetSemanticModelAsync ().Result;
- if (semanticModel == null)
- continue;
-
- foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType ()) {
- var c = semanticModel.GetDeclaredSymbol (classDeclaration);
- string path = Path.Combine (dir, c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat) + ".xml");
- if (!System.IO.File.Exists (path))
- continue;
- XmlDocument xmldoc = new XmlDocument ();
- xmldoc.Load (path);
- AddNewComponent (xmldoc.DocumentElement);
- System.IO.File.Delete (path);
- }
- }
- }
-
- void OnFileRemoved (object sender, ProjectFileEventArgs e)
- {
- ArrayList toDelete = new ArrayList ();
-
- foreach (ProjectFileEventInfo args in e) {
-
- var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
- if (docId == null)
- continue;
- var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
- if (doc == null)
- continue;
- var semanticModel = doc.GetSemanticModelAsync ().Result;
- if (semanticModel == null)
- continue;
-
-
- foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType ()) {
- var c = semanticModel.GetDeclaredSymbol (classDeclaration);
- GuiBuilderWindow win = GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.MinimallyQualifiedFormat));
- if (win != null)
- toDelete.Add (win);
- }
- }
-
- foreach (GuiBuilderWindow win in toDelete)
- Remove (win);
- }
-
- void OnGroupsChanged (object s, EventArgs a)
- {
- if (!disposed)
- NotifyChanged ();
- }
-
- void OnReferenceAdded (object ob, ProjectReferenceEventArgs args)
- {
- if (disposed || !librariesUpdated)
- return;
- string pref = GetReferenceLibraryPath (args.ProjectReference);
- if (pref != null) {
- gproject.AddWidgetLibrary (pref);
- SaveProject (false);
- }
- }
-
- void OnReferenceRemoved (object ob, ProjectReferenceEventArgs args)
- {
- if (disposed || !librariesUpdated)
- return;
- string pref = GetReferenceLibraryPath (args.ProjectReference);
- if (pref != null) {
- gproject.RemoveWidgetLibrary (pref);
- SaveProject (false);
- }
- }
-
- string GetReferenceLibraryPath (MonoDevelop.Projects.ProjectReference pref)
- {
- string path = null;
-
- if (pref.ReferenceType == ReferenceType.Project) {
- DotNetProject p = pref.ResolveProject (project.ParentSolution) as DotNetProject;
- if (p != null)
- path = p.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
- } else if (pref.ReferenceType == ReferenceType.Assembly) {
- path = pref.HintPath;
- } else if (pref.ReferenceType == ReferenceType.Package) {
- path = pref.Reference;
- }
- if (path != null && GuiBuilderService.SteticApp.IsWidgetLibrary (path))
- return path;
- else
- return null;
- }
-
- public void ImportGladeFile ()
- {
- var dlg = new MonoDevelop.Components.SelectFileDialog (GettextCatalog.GetString ("Open Glade File"));
- dlg.AddFilter (GettextCatalog.GetString ("Glade files"), "*.glade");
- dlg.AddAllFilesFilter ();
- if (dlg.Run ()) {
- SteticProject.ImportGlade (dlg.SelectedFile);
- SaveAll (true);
- }
- }
-
- public GuiBuilderWindow GetWindowForClass (string className)
- {
- if (Windows != null) {
- foreach (GuiBuilderWindow form in Windows) {
- if (CodeBinder.GetObjectName (form.RootWidget) == className)
- return form;
- }
- }
- return null;
- }
-
- public GuiBuilderWindow GetWindowForFile (FilePath fileName)
- {
- if (Windows != null) {
- foreach (GuiBuilderWindow win in Windows) {
- if (fileName == win.SourceCodeFile)
- return win;
- }
- }
- return null;
- }
-
- public GuiBuilderWindow GetWindow (string name)
- {
- if (Windows != null) {
- foreach (GuiBuilderWindow win in Windows) {
- if (name == win.Name)
- return win;
- }
- }
- return null;
- }
-
- public Stetic.ActionGroupInfo GetActionGroupForFile (FilePath fileName)
- {
- foreach (Stetic.ActionGroupInfo group in SteticProject.ActionGroups) {
- if (fileName == GetSourceCodeFile (group, true))
- return group;
- }
- return null;
- }
-
- public Stetic.ActionGroupInfo GetActionGroup (string name)
- {
- return SteticProject.GetActionGroup (name);
- }
-
- public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj)
- {
- return GetSourceCodeFile (obj, true);
- }
-
- public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj, bool getUserClass)
- {
- var cls = GetClass (obj, getUserClass);
- if (cls != null)
- return cls.Locations.First ().SourceTree.FilePath;
- return null;
- }
-
- INamedTypeSymbol GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
- {
- string name = CodeBinder.GetClassName (obj);
- return FindClass (name, getUserClass);
- }
-
- public INamedTypeSymbol FindClass (string className)
- {
- return FindClass (className, true);
- }
-
- public INamedTypeSymbol FindClass (string className, bool getUserClass)
- {
- FilePath gui_folder = GtkDesignInfo.FromProject (project).GtkGuiFolder;
- var ctx = GetParserContext ();
- if (ctx == null)
- return null;
- foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
- if (cls.GetFullName() == className) {
- if (getUserClass) {
- // Return this class only if it is declared outside the gtk-gui
- // folder. Generated partial classes will be ignored.
- foreach (var part in cls.Locations) {
- var filePath = part.SourceTree.FilePath;
- if (!string.IsNullOrEmpty (filePath) && !((FilePath)filePath).IsChildPathOf (gui_folder)) {
- return cls;
- }
- }
- continue;
- }
- return cls;
- }
- }
- return null;
- }
-
- public Compilation GetParserContext ()
- {
- System.Threading.Tasks.Task task;
- do {
- task = TypeSystemService.GetCompilationAsync (Project);
- task.Wait (500);
- } while (!task.IsCompleted);
-
- var dom = task.Result;
- if (dom != null && needsUpdate) {
- needsUpdate = false;
- }
- return dom;
- }
-
- public WidgetParser WidgetParser {
- get {
- return new WidgetParser (GetParserContext ());
- }
- }
-
- public void UpdateLibraries ()
- {
- if (hasError || disposed || gproject == null)
- return;
-
- bool needsSave = false;
- librariesUpdated = true;
-
- string[] oldLibs = gproject.WidgetLibraries;
-
- ArrayList libs = new ArrayList ();
- string[] internalLibs;
-
- foreach (var pref in project.References) {
- string wref = GetReferenceLibraryPath (pref);
- if (wref != null)
- libs.Add (wref);
- }
-
- ReferenceManager refmgr = new ReferenceManager (project);
- string target_version = refmgr.TargetGtkVersion;
- refmgr.Dispose ();
-
- // Make sure the target gtk version is properly set
- if (gproject.TargetGtkVersion != target_version) {
- gproject.TargetGtkVersion = target_version;
- needsSave = true;
- }
-
- string outLib = project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
- if (!string.IsNullOrEmpty (outLib))
- internalLibs = new string [] { outLib };
- else
- internalLibs = new string [0];
-
- string[] newLibs = (string[]) libs.ToArray (typeof(string));
-
- // See if something has changed
- if (LibrariesChanged (oldLibs, internalLibs, newLibs)) {
- gproject.SetWidgetLibraries (newLibs, internalLibs);
- needsSave = true;
- } else {
- GuiBuilderService.SteticApp.UpdateWidgetLibraries (false);
- }
-
- if (needsSave)
- SaveAll (true);
- }
-
- bool LibrariesChanged (string[] oldLibs, string[] internalLibs, string[] newLibs)
- {
- if (oldLibs.Length == newLibs.Length + internalLibs.Length) {
- foreach (string s in newLibs) {
- if (!((IList)oldLibs).Contains (s))
- return true;
- }
- foreach (string s in internalLibs) {
- if (!((IList)oldLibs).Contains (s))
- return true;
- }
- return false;
- } else
- return true;
- }
-
- void NotifyChanged ()
- {
- if (Changed != null && !disposed)
- Changed (this, EventArgs.Empty);
- }
-
- public StringCollection GenerateFiles (string guiFolder)
- {
- StringCollection files = new StringCollection ();
-
- if (hasError)
- return files;
-
- var binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName);
- string path = Path.Combine (guiFolder, binding.GetFileName ("generated"));
- if (!System.IO.File.Exists (path)) {
- // Generate an empty build class
- CodeDomProvider provider = binding.GetCodeDomProvider ();
- if (provider == null)
- throw new UserException ("Code generation not supported for language: " + project.LanguageName);
- GuiBuilderService.SteticApp.GenerateProjectCode (path, "Stetic", provider, null);
- }
- files.Add (path);
-
- if (Windows != null) {
- foreach (GuiBuilderWindow win in Windows)
- files.Add (GuiBuilderService.GenerateSteticCodeStructure (project, win.RootWidget, true, false));
- }
-
- foreach (Stetic.ActionGroupInfo ag in SteticProject.ActionGroups)
- files.Add (GuiBuilderService.GenerateSteticCodeStructure (project, ag, true, false));
-
- return files;
- }
- }
-
- public delegate void WindowEventHandler (object s, WindowEventArgs args);
-
- public class WindowEventArgs: EventArgs
- {
- GuiBuilderWindow win;
-
- public WindowEventArgs (GuiBuilderWindow win)
- {
- this.win = win;
- }
-
- public GuiBuilderWindow Window {
- get { return win; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
deleted file mode 100644
index bb545fe25db..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
+++ /dev/null
@@ -1,660 +0,0 @@
-//
-// GuiBuilderService.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Deployment;
-using MonoDevelop.Projects.Policies;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading.Tasks;
-using MonoDevelop.Ide.Editor;
-
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- class GuiBuilderService
- {
- static string GuiBuilderLayout = "Visual Design";
- static int loadedGuiProjects;
-
-#if DUMMY_STRINGS_FOR_TRANSLATION_DO_NOT_COMPILE
- private void DoNotCompile ()
- {
- //The default GUI Builder layout, translated indirectly because it's used as an ID
- GettextCatalog.GetString ("GUI Builder");
- }
-#endif
-
- static string defaultLayout;
-
- static Stetic.Application steticApp;
-
- static bool generating;
-
- static Stetic.IsolationMode IsolationMode = Stetic.IsolationMode.None;
-// static Stetic.IsolationMode IsolationMode = Stetic.IsolationMode.ProcessUnix;
-
- static GuiBuilderService ()
- {
- if (IdeApp.Workbench == null)
- return;
-// IdeApp.Workspace.ParserDatabase.AssemblyInformationChanged += (AssemblyInformationEventHandler) DispatchService.GuiDispatch (new AssemblyInformationEventHandler (OnAssemblyInfoChanged));
-
- IdeApp.Exited += delegate {
- if (steticApp != null) {
- StoreConfiguration ();
- steticApp.Dispose ();
- }
- };
- }
-
- static void InitializeService ()
- {
- if (IdeApp.IsInitialized) {
- IdeApp.ProjectOperations.EndBuild += OnProjectCompiled;
- IdeApp.Workbench.ActiveDocumentChanged += OnActiveDocumentChanged;
- }
- }
-
- static void ShutdownService ()
- {
- if (IdeApp.IsInitialized) {
- IdeApp.ProjectOperations.EndBuild -= OnProjectCompiled;
- IdeApp.Workbench.ActiveDocumentChanged -= OnActiveDocumentChanged;
- }
- if (steticApp != null) {
- StoreConfiguration ();
- steticApp.Dispose ();
- steticApp = null;
- }
- }
-
- public static GuiBuilderProject CreateBuilderProject (DotNetProject project, string fileName)
- {
- return new GuiBuilderProject (project, fileName);
- }
-
- public static Stetic.Application SteticApp {
- get {
- // Stetic is not thread safe, so all has to be done in the gui thread
- Runtime.AssertMainThread ();
- if (steticApp == null) {
- steticApp = Stetic.ApplicationFactory.CreateApplication (Stetic.IsolationMode.None);
- steticApp.AllowInProcLibraries = false;
- steticApp.ShowNonContainerWarning = PropertyService.Get ("MonoDevelop.GtkCore.ShowNonContainerWarning", true);
- steticApp.MimeResolver = OnMimeResolve;
- steticApp.ShowUrl = OnShowUrl;
- steticApp.WidgetLibraryResolver = OnAssemblyResolve;
- }
- return steticApp;
- }
- }
-
- internal static void NotifyGuiProjectLoaded ()
- {
- if (++loadedGuiProjects == 1)
- InitializeService ();
- }
-
- internal static void NotifyGuiProjectUnloaded ()
- {
- if (--loadedGuiProjects == 0)
- ShutdownService ();
- }
-
- static string OnAssemblyResolve (string assemblyName)
- {
- return Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assemblyName, null);
- }
-
- static string OnMimeResolve (string url)
- {
- return DesktopService.GetMimeTypeForUri (url);
- }
-
- static void OnShowUrl (string url)
- {
- DesktopService.ShowUrl (url);
- }
-
- internal static void StoreConfiguration ()
- {
- PropertyService.Set ("MonoDevelop.GtkCore.ShowNonContainerWarning", steticApp.ShowNonContainerWarning);
- PropertyService.SaveProperties ();
- }
-
- public static bool AutoSwitchGuiLayout {
- get {
- return PropertyService.Get ("MonoDevelop.GtkCore.AutoSwitchGuiLayout", false);
- }
- set {
- PropertyService.Set ("MonoDevelop.GtkCore.AutoSwitchGuiLayout", value);
- }
- }
-
- public static async Task OpenActionGroup (Project project, Stetic.ActionGroupInfo group)
- {
- GuiBuilderProject p = GtkDesignInfo.FromProject (project).GuiBuilderProject ;
- string file = p != null ? p.GetSourceCodeFile (group) : null;
- if (file == null) {
- file = ActionGroupDisplayBinding.BindToClass (project, group);
- }
-
- Document doc = await IdeApp.Workbench.OpenDocument (file, null, true);
- if (doc != null) {
- ActionGroupView view = doc.GetContent ();
- if (view != null) {
- view.ShowDesignerView ();
- return view;
- }
- }
- return null;
- }
-
- static void OnActiveDocumentChanged (object s, EventArgs args)
- {
- if (IdeApp.Workbench.ActiveDocument == null) {
- if (SteticApp.ActiveDesigner != null) {
- SteticApp.ActiveDesigner = null;
- RestoreLayout ();
- }
- return;
- }
-
- CombinedDesignView view = IdeApp.Workbench.ActiveDocument.GetContent ();
- if (view != null) {
- SteticApp.ActiveDesigner = view.Designer;
- SetDesignerLayout ();
- return;
- }
- else if (SteticApp.ActiveDesigner != null) {
- SteticApp.ActiveDesigner = null;
- RestoreLayout ();
- }
- }
-
- static void SetDesignerLayout ()
- {
- if (AutoSwitchGuiLayout && IdeApp.Workbench.CurrentLayout != GuiBuilderLayout) {
- bool exists = IdeApp.Workbench.Layouts.Contains (GuiBuilderLayout);
- defaultLayout = IdeApp.Workbench.CurrentLayout;
- IdeApp.Workbench.CurrentLayout = GuiBuilderLayout;
- if (!exists) {
- Pad p = IdeApp.Workbench.GetPad ();
- if (p != null) p.Visible = true;
- p = IdeApp.Workbench.GetPad ();
- if (p != null) p.Visible = true;
- }
- }
- }
-
- static void RestoreLayout ()
- {
- if (AutoSwitchGuiLayout && defaultLayout != null) {
- IdeApp.Workbench.CurrentLayout = defaultLayout;
- defaultLayout = null;
- }
- }
-
- static void OnProjectCompiled (object s, BuildEventArgs args)
- {
- if (args.Success) {
- // Unload stetic projects which are not currently
- // being used by the IDE. This will avoid unnecessary updates.
- if (IdeApp.Workspace.IsOpen) {
- foreach (Project prj in IdeApp.Workspace.GetAllProjects ()) {
- if (!HasOpenDesigners (prj, false) && GtkDesignInfo.HasDesignedObjects (prj)) {
- GtkDesignInfo info = GtkDesignInfo.FromProject (prj);
- info.ReloadGuiBuilderProject ();
- }
- }
- }
-
- SteticApp.UpdateWidgetLibraries (false);
- }
- }
-
- internal static bool HasOpenDesigners (Project project, bool modifiedOnly)
- {
- foreach (Document doc in IdeApp.Workbench.Documents) {
- if ((doc.GetContent() != null || doc.GetContent() != null) && doc.Project == project && (!modifiedOnly || doc.IsDirty))
- return true;
- }
- return false;
- }
-
- //static void OnAssemblyInfoChanged (object s, AssemblyInformationEventArgs args)
-// {
- //SteticApp.UpdateWidgetLibraries (false);
-// }
-
- internal static void AddCurrentWidgetToClass ()
- {
- if (IdeApp.Workbench.ActiveDocument != null) {
- GuiBuilderView view = IdeApp.Workbench.ActiveDocument.GetContent ();
- if (view != null)
- view.AddCurrentWidgetToClass ();
- }
- }
-
- internal static void JumpToSignalHandler (Stetic.Signal signal)
- {
- if (IdeApp.Workbench.ActiveDocument != null) {
- CombinedDesignView view = IdeApp.Workbench.ActiveDocument.GetContent ();
- if (view != null)
- view.JumpToSignalHandler (signal);
- }
- }
-
- public static void ImportGladeFile (Project project)
- {
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
- info.GuiBuilderProject.ImportGladeFile ();
- }
-
- public static string GetBuildCodeFileName (Project project, string componentName)
- {
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
- return Path.Combine (info.GtkGuiFolder, componentName + Path.GetExtension (info.SteticGeneratedFile));
- }
-
- public static string GenerateSteticCodeStructure (DotNetProject project, Stetic.ProjectItemInfo item, bool saveToFile, bool overwrite)
- {
- return GenerateSteticCodeStructure (project, item, null, null, saveToFile, overwrite);
- }
-
- public static string GenerateSteticCodeStructure (DotNetProject project, Stetic.Component component, Stetic.ComponentNameEventArgs args, bool saveToFile, bool overwrite)
- {
- return GenerateSteticCodeStructure (project, null, component, args, saveToFile, overwrite);
- }
-
- static string GenerateSteticCodeStructure (DotNetProject project, Stetic.ProjectItemInfo item, Stetic.Component component, Stetic.ComponentNameEventArgs args, bool saveToFile, bool overwrite)
- {
- // Generate a class which contains fields for all bound widgets of the component
-
- string name = item != null ? item.Name : component.Name;
- string fileName = GetBuildCodeFileName (project, name);
-
- string ns = "";
- int i = name.LastIndexOf ('.');
- if (i != -1) {
- ns = name.Substring (0, i);
- name = name.Substring (i + 1);
- }
-
- if (saveToFile && !overwrite && File.Exists (fileName))
- return fileName;
-
- if (item != null)
- component = item.Component;
-
- CodeCompileUnit cu = new CodeCompileUnit ();
- if (project.UsePartialTypes) {
- CodeNamespace cns = new CodeNamespace (ns);
- cu.Namespaces.Add (cns);
-
- CodeTypeDeclaration type = new CodeTypeDeclaration (name);
- type.IsPartial = true;
- type.Attributes = MemberAttributes.Public;
- type.TypeAttributes = System.Reflection.TypeAttributes.Public;
- cns.Types.Add (type);
- type.Members.Add (
- new CodeMemberMethod () {
- Name = "Build"
- }
- );
-
- foreach (Stetic.ObjectBindInfo binfo in component.GetObjectBindInfo ()) {
- // When a component is being renamed, we have to generate the
- // corresponding field using the old name, since it will be renamed
- // later using refactory
- string nname = args != null && args.NewName == binfo.Name ? args.OldName : binfo.Name;
- type.Members.Add (
- new CodeMemberField (
- binfo.TypeName,
- nname
- )
- );
- }
- } else {
- if (!saveToFile)
- return fileName;
- CodeNamespace cns = new CodeNamespace ();
- cns.Comments.Add (new CodeCommentStatement ("Generated code for component " + component.Name));
- cu.Namespaces.Add (cns);
- }
-
- CodeDomProvider provider = project.LanguageBinding.GetCodeDomProvider ();
- if (provider == null)
- throw new UserException ("Code generation not supported for language: " + project.LanguageName);
-
- string text;
- var pol = project.Policies.Get ();
- using (var fileStream = new StringWriter ()) {
- var options = new CodeGeneratorOptions () {
- IndentString = pol.TabsToSpaces? new string (' ', pol.TabWidth) : "\t",
- BlankLinesBetweenMembers = true,
- };
- provider.GenerateCodeFromCompileUnit (cu, fileStream, options);
- text = fileStream.ToString ();
- text = FormatGeneratedFile (fileName, text, project, provider);
- }
- if (saveToFile)
- File.WriteAllText (fileName, text);
- TypeSystemService.NotifyFileChange (fileName, text);
-
- return fileName;
- }
-
-
- public async static Task GenerateSteticCode (ProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
- {
- if (generating || !GtkDesignInfo.HasDesignedObjects (project))
- return null;
-
- using (var timer = Counters.SteticFileGeneratedTimer.BeginTiming ()) {
-
- timer.Trace ("Checking references");
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
-
- DateTime last_gen_time = File.Exists (info.SteticGeneratedFile) ? File.GetLastWriteTime (info.SteticGeneratedFile) : DateTime.MinValue;
-
- bool ref_changed = false;
-
- // Disabled check for changes in referenced assemblies, since it cause too much
- // regeneration of code. If a component has changed in a referenced project, this
- // project may not build, but this can be solved by editing some file in the
- // designer and saving.
-
-/* foreach (ProjectReference pref in project.References) {
- if (!pref.IsValid)
- continue;
- foreach (string filename in pref.GetReferencedFileNames (configuration)) {
- if (File.GetLastWriteTime (filename) > last_gen_time) {
- ref_changed = true;
- break;
- }
- }
- if (ref_changed)
- break;
- }*/
-
- // Check if generated code is already up to date.
- if (!ref_changed && last_gen_time >= File.GetLastWriteTime (info.SteticFile))
- return null;
-
- if (info.GuiBuilderProject.HasError) {
- var error = GettextCatalog.GetString ("GUI code generation failed for project '{0}'. The file '{1}' could not be loaded.", project.Name, info.SteticFile);
- monitor.ReportError (error, null);
- throw new UserException (error);
- }
-
- if (info.GuiBuilderProject.IsEmpty)
- return null;
-
- monitor.Log.WriteLine (GettextCatalog.GetString ("Generating GUI code for project '{0}'...", project.Name));
-
- timer.Trace ("Update libraries");
-
- info.GuiBuilderProject.UpdateLibraries ();
-
- ArrayList projects = new ArrayList ();
- projects.Add (info.GuiBuilderProject.File);
-
- generating = true;
- Stetic.CodeGenerationResult generationResult = null;
- Exception generatedException = null;
-
- bool canGenerateInProcess = IsolationMode != Stetic.IsolationMode.None || info.GuiBuilderProject.SteticProject.CanGenerateCode;
-
- if (!canGenerateInProcess) {
- timer.Trace ("Generating out of process");
-
- await Task.Run (delegate {
- try {
- // Generate the code in another process if stetic is not isolated
- CodeGeneratorProcess cob = (CodeGeneratorProcess)Runtime.ProcessService.CreateExternalProcessObject (typeof(CodeGeneratorProcess), false);
- using (cob) {
- generationResult = cob.GenerateCode (projects, info.GenerateGettext, info.GettextClass, info.ImageResourceLoaderClass, project.UsePartialTypes);
- }
- } catch (Exception ex) {
- generatedException = ex;
- } finally {
- generating = false;
- }
- });
-
- } else {
- timer.Trace ("Generating in-process");
- // No need to create another process, since stetic has its own backend process
- // or the widget libraries have no custom wrappers
- try {
- Stetic.GenerationOptions options = new Stetic.GenerationOptions ();
- options.UseGettext = info.GenerateGettext;
- options.GettextClass = info.GettextClass;
- options.ImageResourceLoaderClass = info.ImageResourceLoaderClass;
- options.UsePartialClasses = project.UsePartialTypes;
- options.GenerateSingleFile = false;
- options.GenerateModifiedOnly = true;
- generationResult = SteticApp.GenerateProjectCode (options, info.GuiBuilderProject.SteticProject);
- info.GuiBuilderProject.SteticProject.ResetModifiedWidgetFlags ();
- } catch (Exception ex) {
- generatedException = ex;
- }
- generating = false;
- }
- timer.Trace ("Writing code units");
-
- if (generatedException != null) {
- LoggingService.LogError ("GUI code generation failed", generatedException);
- throw new UserException ("GUI code generation failed: " + generatedException.Message);
- }
-
- if (generationResult == null)
- return null;
-
- CodeDomProvider provider = project.LanguageBinding.GetCodeDomProvider ();
- if (provider == null)
- throw new UserException ("Code generation not supported for language: " + project.LanguageName);
-
- string basePath = Path.GetDirectoryName (info.SteticGeneratedFile);
- string ext = Path.GetExtension (info.SteticGeneratedFile);
-
- var pol = project.Policies.Get ();
- var codeGeneratorOptions = new CodeGeneratorOptions () {
- IndentString = pol.TabsToSpaces? new string (' ', pol.TabWidth) : "\t",
- BlankLinesBetweenMembers = true
- };
-
- foreach (Stetic.SteticCompilationUnit unit in generationResult.Units) {
- string fname;
- if (unit.Name.Length == 0)
- fname = info.SteticGeneratedFile;
- else
- fname = Path.Combine (basePath, unit.Name) + ext;
- StringWriter sw = new StringWriter ();
- try {
- foreach (CodeNamespace ns in unit.Namespaces)
- ns.Comments.Add (new CodeCommentStatement ("This file has been generated by the GUI designer. Do not modify."));
- timer.Trace ("Generating code for " + unit.Name);
- provider.GenerateCodeFromCompileUnit (unit, sw, codeGeneratorOptions);
- string content = sw.ToString ();
-
- timer.Trace ("Formatting code");
- content = FormatGeneratedFile (fname, content, project, provider);
- timer.Trace ("Writing code");
- File.WriteAllText (fname, content);
- } finally {
- timer.Trace ("Code written to file");
- }
- }
-
- timer.Trace ("Updating GTK folder");
-
- // Make sure the generated files are added to the project
- if (info.UpdateGtkFolder ()) {
- Gtk.Application.Invoke ((o, args) => {
- IdeApp.ProjectOperations.SaveAsync (project);
- });
- }
-
- return generationResult;
- }
- }
-
- internal static string ImportFile (Project prj, string file)
- {
- ProjectFile pfile = prj.Files.GetFile (file);
- if (pfile == null) {
- var files = IdeApp.ProjectOperations.AddFilesToProject (prj, new string[] { file }, prj.BaseDirectory);
- if (files.Count == 0 || files[0] == null)
- return null;
- pfile = files [0];
- }
- if (pfile.BuildAction == BuildAction.EmbeddedResource) {
- AlertButton embedButton = new AlertButton (GettextCatalog.GetString ("_Use as Source"));
- if (MessageService.AskQuestion (GettextCatalog.GetString ("You are requesting the file '{0}' to be used as source for an image. However, this file is already added to the project as a resource. Are you sure you want to continue (the file will have to be removed from the resource list)?"), AlertButton.Cancel, embedButton) == embedButton)
- return null;
- }
- pfile.BuildAction = BuildAction.Content;
- DeployProperties props = DeployService.GetDeployProperties (pfile);
- props.UseProjectRelativePath = true;
- return pfile.FilePath;
- }
-
- static string FormatGeneratedFile (string file, string content, Project project, CodeDomProvider provider)
- {
- content = StripHeaderAndBlankLines (content, provider);
-
- string mt = DesktopService.GetMimeTypeForUri (file);
- var formatter = MonoDevelop.Ide.CodeFormatting.CodeFormatterService.GetFormatter (mt);
- if (formatter != null)
- content = formatter.FormatText (PolicyService.InvariantPolicies, content) ?? content;
-
- // The project policies should be taken for generated files (windows git eol problem)
- var pol = project.Policies.Get (DesktopService.GetMimeTypeForUri (file));
- string eol = pol.GetEolMarker ();
- if (Environment.NewLine != eol)
- content = content.Replace (Environment.NewLine, eol);
-
- return content;
- }
-
- static string StripHeaderAndBlankLines (string text, CodeDomProvider provider)
- {
- var doc = TextEditorFactory.CreateNewDocument ();
- doc.Text = text;
- int realStartLine = 0;
- for (int i = 1; i <= doc.LineCount; i++) {
- string lineText = doc.GetTextAt (doc.GetLine (i));
- // Microsoft.NET generates "auto-generated" tags where Mono generates "autogenerated" tags.
- if (lineText.Contains ("") || lineText.Contains ("")) {
- realStartLine = i + 2;
- break;
- }
- }
-
- // The Mono provider inserts additional blank lines, so strip them out
- // But blank lines might actually be significant in other languages.
- // We reformat the C# generated output to the user's coding style anyway, but the reformatter preserves blank lines
- if (provider is Microsoft.CSharp.CSharpCodeProvider) {
- bool previousWasBlank = false;
- for (int i = 1; i <= doc.LineCount; i++) {
- var line = doc.GetLine (i);
- bool isBlank, isBracket;
- CheckLine (doc, line, out isBlank, out isBracket);
- if (isBlank && previousWasBlank && line.LengthIncludingDelimiter > 0) {
- doc.RemoveText (line.Offset, line.LengthIncludingDelimiter);
- i--;
- }
- previousWasBlank = isBlank || isBracket;
- }
- }
-
- int offset = doc.GetLine (realStartLine).Offset;
- return doc.GetTextAt (offset, doc.Length - offset);
- }
-
- static void CheckLine (IReadonlyTextDocument doc, IDocumentLine line, out bool isBlank, out bool isBracket)
- {
- isBlank = true;
- isBracket = false;
- for (int i = 0; i < line.LengthIncludingDelimiter; i++) {
- char c = doc.GetCharAt (line.Offset + i);
- if (c == '{') {
- isBracket = true;
- isBlank = false;
- }
- else if (!Char.IsWhiteSpace (c)) {
- isBlank = false;
- if (isBracket) {
- isBracket = false;
- break;
- }
- }
- }
- }
- }
-
-
- public class CodeGeneratorProcess: RemoteProcessObject
- {
- public Stetic.CodeGenerationResult GenerateCode (ArrayList projectFiles, bool useGettext, string gettextClass, string resourceLoaderClass, bool usePartialClasses)
- {
- Gtk.Application.Init ();
-
- Stetic.Application app = Stetic.ApplicationFactory.CreateApplication (Stetic.IsolationMode.None);
-
- Stetic.Project[] projects = new Stetic.Project [projectFiles.Count];
- for (int n=0; n < projectFiles.Count; n++) {
- projects [n] = app.CreateProject ();
- projects [n].Load ((string) projectFiles [n]);
- }
-
- Stetic.GenerationOptions options = new Stetic.GenerationOptions ();
- options.UseGettext = useGettext;
- options.GettextClass = gettextClass;
- options.ImageResourceLoaderClass = resourceLoaderClass;
- options.UsePartialClasses = usePartialClasses;
- options.GenerateSingleFile = false;
-
- return app.GenerateProjectCode (options, projects);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
deleted file mode 100644
index f1b4ded7ea7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
+++ /dev/null
@@ -1,622 +0,0 @@
-//
-// GuiBuilderView.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.DesignerSupport.Toolbox;
-using MonoDevelop.DesignerSupport;
-
-using Gtk;
-using Gdk;
-using MonoDevelop.Ide;
-using Microsoft.CodeAnalysis;
-using System.Threading.Tasks;
-using MonoDevelop.Refactoring;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class GuiBuilderView : CombinedDesignView
- {
- Stetic.WidgetDesigner designer;
- Stetic.ActionGroupDesigner actionsBox;
- GuiBuilderWindow window;
-
- DesignerPage designerPage;
- ActionGroupPage actionsPage;
-
-
- CodeBinder codeBinder;
- GuiBuilderProject gproject;
- string rootName;
- object designerStatus;
-
- public GuiBuilderView (ViewContent content, GuiBuilderWindow window): base (content)
- {
- rootName = window.Name;
-
- designerPage = new DesignerPage (window.Project);
- designerPage.Show ();
- AddButton (GettextCatalog.GetString ("Designer"), designerPage);
-
- actionsPage = new ActionGroupPage ();
- actionsPage.Show ();
-
- AttachWindow (window);
- }
-
- void AttachWindow (GuiBuilderWindow window)
- {
- gproject = window.Project;
- GtkDesignInfo info = GtkDesignInfo.FromProject (gproject.Project);
- gproject.SteticProject.ImagesRootPath = FileService.AbsoluteToRelativePath (info.GtkGuiFolder, gproject.Project.BaseDirectory);
- gproject.UpdateLibraries ();
- LoadDesigner ();
- }
-
- public override ProjectReloadCapability ProjectReloadCapability {
- get {
- return ProjectReloadCapability.Full;
- }
- }
-
- protected override void OnSetProject (Projects.Project project)
- {
- base.OnSetProject (project);
-
- if (gproject != null && gproject.Project == project)
- return;
-
- if (designer != null)
- designerStatus = designer.SaveStatus ();
-
- CloseDesigner ();
- CloseProject ();
- if (project != null) {
- GuiBuilderWindow w = GuiBuilderDisplayBinding.GetWindow (this.ContentName, project);
- if (w != null) {
- AttachWindow (w);
- if (designerStatus != null)
- designer.LoadStatus (designerStatus);
- designerStatus = null;
- }
- }
- }
-
- void LoadDesigner ()
- {
- this.window = gproject.GetWindow (rootName);
- if (window == null) {
- // The window doesn't exist anymore
- return;
- }
-
- gproject.Unloaded += OnDisposeProject;
-
- designer = gproject.SteticProject.CreateWidgetDesigner (window.RootWidget, false);
-
- // Designer page
- designerPage.ClearChild ();
- designerPage.Add (designer);
-
- if (designer.RootComponent == null) {
- // Something went wrong while creating the designer. Show it, but don't do aything else.
- designer.ShowAll ();
- return;
- }
-
- designer.AllowWidgetBinding = !gproject.Project.UsePartialTypes;
-
- codeBinder = new CodeBinder (gproject.Project, new OpenDocumentFileProvider (), designer.RootComponent);
-
- designer.BindField += OnBindWidgetField;
- designer.ModifiedChanged += OnWindowModifiedChanged;
- designer.SignalAdded += OnSignalAdded;
- designer.SignalRemoved += OnSignalRemoved;
- designer.SignalChanged += OnSignalChanged;
- designer.ComponentNameChanged += OnComponentNameChanged;
- designer.RootComponentChanged += OnRootComponentChanged;
- designer.ComponentTypesChanged += OnComponentTypesChanged;
- designer.ImportFileCallback = ImportFile;
-
- // Actions designer
- actionsBox = designer.CreateActionGroupDesigner ();
- actionsBox.AllowActionBinding = !gproject.Project.UsePartialTypes;
- actionsBox.BindField += new EventHandler (OnBindActionField);
- actionsBox.ModifiedChanged += new EventHandler (OnActionshanged);
-
- actionsPage.ClearChild ();
- actionsPage.PackStart (actionsBox, true, true, 0);
- actionsPage.ShowAll ();
-
- if (actionsBox.HasData) {
- if (!HasPage (actionsPage))
- AddButton (GettextCatalog.GetString ("Actions"), actionsPage);
- } else {
- RemoveButton (actionsPage);
- }
-
- designer.ShowAll ();
- GuiBuilderService.SteticApp.ActiveDesigner = designer;
- }
-
- public override Stetic.Designer Designer {
- get { return designer; }
- }
-
- void OnDisposeProject (object s, EventArgs args)
- {
- CloseDesigner ();
- }
-
- void OnReloadProject (object s, EventArgs args)
- {
- if (designer == null)
- LoadDesigner ();
- }
-
- public GuiBuilderWindow Window {
- get { return window; }
- }
-
- void CloseDesigner ()
- {
- if (designer == null)
- return;
-
- gproject.Unloaded -= OnDisposeProject;
- designer.BindField -= OnBindWidgetField;
- designer.ModifiedChanged -= OnWindowModifiedChanged;
- designer.SignalAdded -= OnSignalAdded;
- designer.SignalRemoved -= OnSignalRemoved;
- designer.SignalChanged -= OnSignalChanged;
- designer.ComponentNameChanged -= OnComponentNameChanged;
- designer.RootComponentChanged -= OnRootComponentChanged;
- designer.ComponentTypesChanged -= OnComponentTypesChanged;
-
- if (actionsBox != null) {
- actionsBox.BindField -= OnBindActionField;
- actionsBox.ModifiedChanged -= OnActionshanged;
- actionsBox = null;
- }
-
- actionsPage.ClearChild ();
- designerPage.ClearChild ();
-
- designerPage.Add (CreateDesignerNotAvailableWidget ());
- actionsPage.Add (CreateDesignerNotAvailableWidget ());
-
- designer = null;
-
- gproject.Reloaded += OnReloadProject;
- }
-
- void CloseProject ()
- {
- gproject.Reloaded -= OnReloadProject;
- }
-
- public override void Dispose ()
- {
- CloseDesigner ();
- CloseProject ();
- codeBinder = null;
- base.Dispose ();
- }
-
- Gtk.Widget CreateDesignerNotAvailableWidget ()
- {
- Gtk.Label label = new Gtk.Label (GettextCatalog.GetString ("Designer not available"));
- label.Show ();
- return label;
- }
-
- protected override void OnPageShown (int npage)
- {
- if (npage == 0 && designer != null && window != null && !ErrorMode) {
- // At every page switch update the generated code, to make sure code completion works
- // for the generated fields. The call to GenerateSteticCodeStructure will generate
- // the code for the window (only the fields in fact) and update the parser database, it
- // will not save the code to disk.
- if (gproject.Project.UsePartialTypes)
- GuiBuilderService.GenerateSteticCodeStructure ((DotNetProject)gproject.Project, designer.RootComponent, null, false, false);
- }
- base.OnPageShown (npage);
- }
-
- string ImportFile (string file)
- {
- return GuiBuilderService.ImportFile (gproject.Project, file);
- }
-
- void OnRootComponentChanged (object s, EventArgs args)
- {
- codeBinder.TargetObject = designer.RootComponent;
- }
-
- async void OnComponentNameChanged (object s, Stetic.ComponentNameEventArgs args)
- {
- try {
- // Make sure the fields in the partial class are up to date.
- // Provide the args parameter to GenerateSteticCodeStructure, in this
- // way the component that has been renamed will be generated with the
- // old name, and UpdateField will be able to find it (to rename the
- // references to the field, it needs to have the old name).
- if (gproject.Project.UsePartialTypes)
- GuiBuilderService.GenerateSteticCodeStructure ((DotNetProject)gproject.Project, designer.RootComponent, args, false, false);
-
- await codeBinder.UpdateField (args.Component, args.OldName);
- }
- catch (Exception ex) {
- LoggingService.LogInternalError (ex);
- }
- }
-
- void OnComponentTypesChanged (object s, EventArgs a)
- {
- if (ToolboxProvider.Instance != null)
- ToolboxProvider.Instance.NotifyItemsChanged ();
- }
-
- void OnActionshanged (object s, EventArgs args)
- {
- if (designer != null && !HasPage (actionsPage) && !ErrorMode)
- AddButton (GettextCatalog.GetString ("Actions"), actionsPage);
- }
-
- void OnWindowModifiedChanged (object s, EventArgs args)
- {
- OnDirtyChanged ();
- }
-
- async void OnBindWidgetField (object o, EventArgs a)
- {
- if (designer.Selection != null)
- await codeBinder.BindToField (designer.Selection);
- }
-
- async void OnBindActionField (object o, EventArgs a)
- {
- if (actionsBox.SelectedAction != null)
- await codeBinder.BindToField (actionsBox.SelectedAction);
- }
-
- void OnSignalAdded (object sender, Stetic.ComponentSignalEventArgs args)
- {
- codeBinder.BindSignal (args.Signal);
- }
-
- void OnSignalRemoved (object sender, Stetic.ComponentSignalEventArgs args)
- {
- }
-
- async void OnSignalChanged (object sender, Stetic.ComponentSignalEventArgs args)
- {
- await codeBinder.UpdateSignal (args.OldSignal, args.Signal);
- }
-
- public override async Task Save (FileSaveInformation fileSaveInformation)
- {
- await base.Save (fileSaveInformation);
-
- if (designer == null)
- return;
-
- string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (gproject.Project, window.RootWidget.Name);
-
- codeBinder.UpdateBindings (fileSaveInformation.FileName);
- if (!ErrorMode) {
- if (designer != null)
- designer.Save ();
- if (actionsBox != null)
- actionsBox.Save ();
- }
-
- string newBuildFile = GuiBuilderService.GetBuildCodeFileName (gproject.Project, window.RootWidget.Name);
-
- if (oldBuildFile != newBuildFile) {
- if (System.IO.File.Exists (newBuildFile))
- FileService.DeleteFile (newBuildFile);
- FileService.MoveFile (oldBuildFile, newBuildFile);
- }
-
- gproject.SaveWindow (true, window.RootWidget.Name);
- }
-
- public override bool IsDirty {
- get {
- // There is no need to check if the action group designer is modified
- // since changes in the action group are as well changes in the designed widget
- return base.IsDirty || (designer != null && designer.Modified);
- }
- set {
- base.IsDirty = value;
- }
- }
-
- public override void JumpToSignalHandler (Stetic.Signal signal)
- {
- var cls = codeBinder.GetClass ();
- if (cls == null)
- return;
- var met = cls
- .GetMembers (signal.Handler)
- .OfType ()
- .FirstOrDefault ();
- if (met != null) {
- ShowPage (0);
- RefactoringService.RoslynJumpToDeclaration (met);
- }
- }
-
- public void ShowDesignerView ()
- {
- if (designer != null)
- ShowPage (1);
- }
-
- public void ShowActionDesignerView (string name)
- {
- if (designer != null) {
- ShowPage (2);
- if (!ErrorMode)
- actionsBox.ActiveGroup = name;
- }
- }
-
- bool ErrorMode {
- get { return designer.RootComponent == null; }
- }
- }
-
- class DesignerPage: Gtk.EventBox, ICustomPropertyPadProvider, IToolboxConsumer, MonoDevelop.DesignerSupport.IOutlinedDocument
- {
- GuiBuilderProject gproject;
-
- public DesignerPage (GuiBuilderProject gproject)
- {
- this.gproject = gproject;
- }
-
- public Stetic.ComponentType[] GetComponentTypes ()
- {
- if (Designer != null)
- return Designer.GetComponentTypes ();
- else
- return null;
- }
-
- public DotNetProject Project {
- get { return gproject.Project; }
- }
-
- Gtk.Widget ICustomPropertyPadProvider.GetCustomPropertyWidget ()
- {
- return PropertiesWidget.Instance;
- }
-
- void ICustomPropertyPadProvider.DisposeCustomPropertyWidget ()
- {
- }
-
- Stetic.WidgetDesigner Designer {
- get {
- return Child as Stetic.WidgetDesigner;
- }
- }
-
- public void ClearChild ()
- {
- if (Child != null) {
- Gtk.Widget w = Child;
- Remove (w);
- w.Destroy ();
- }
- }
-
- void IToolboxConsumer.ConsumeItem (ItemToolboxNode item)
- {
- }
-
- //Toolbox service uses this to filter toolbox items.
- ToolboxItemFilterAttribute[] IToolboxConsumer.ToolboxFilterAttributes {
- get {
- return new ToolboxItemFilterAttribute [] {
- new ToolboxItemFilterAttribute ("gtk-sharp", ToolboxItemFilterType.Custom)
- };
- }
- }
-
- //Used if ToolboxItemFilterAttribute demands ToolboxItemFilterType.Custom
- //If not expecting it, should just return false
- bool IToolboxConsumer.CustomFilterSupports (ItemToolboxNode item)
- {
- ComponentToolboxNode cnode = item as ComponentToolboxNode;
- if (cnode != null && gproject.SteticProject != null) {
- if (cnode.GtkVersion == null || Mono.Addins.Addin.CompareVersions (gproject.SteticProject.TargetGtkVersion, cnode.GtkVersion) <= 0)
- return true;
- }
- return false;
- }
-
- string IToolboxConsumer.DefaultItemDomain {
- get { return ComponentToolboxNode.GtkWidgetDomain; }
- }
-
- void IToolboxConsumer.DragItem (ItemToolboxNode item, Gtk.Widget source, Gdk.DragContext ctx)
- {
- if (Designer != null) {
- ComponentToolboxNode node = item as ComponentToolboxNode;
- if (node != null) {
- if (node.Reference == null)
- Designer.BeginComponentDrag (node.ComponentType, source, ctx);
- else
- Designer.BeginComponentDrag (node.Name, node.ClassName, source, ctx, delegate { CheckReference (node); });
- }
- }
- }
-
- void CheckReference (ComponentToolboxNode node)
- {
- if (node.Reference == null)
- return;
-
- MonoDevelop.Projects.ProjectReference pref;
-
- // If the class name includes an assembly name it means that the
- // widget is implemented in another assembly, not in the one that
- // has the objects.xml file.
- int i = node.ClassName.IndexOf (',');
- if (i != -1) {
- string asm = node.ClassName.Substring (i+1).Trim ();
- if (asm == "gtk-sharp")
- // If we are adding a widget to a window, the project must already have a gtk# reference
- return;
-
- asm = gproject.Project.AssemblyContext.GetAssemblyFullName (asm, gproject.Project.TargetFramework);
- if (asm == null)
- return;
- if (gproject.Project.AssemblyContext.GetPackagesFromFullName (asm).Length > 0) {
- pref = MonoDevelop.Projects.ProjectReference.CreateAssemblyReference (asm);
- } else {
- asm = gproject.Project.AssemblyContext.GetAssemblyLocation (asm, gproject.Project.TargetFramework);
- pref = MonoDevelop.Projects.ProjectReference.CreateAssemblyFileReference (asm);
- }
- }
- else
- pref = MonoDevelop.Projects.ProjectReference.CreateCustomReference (node.ReferenceType, node.Reference);
-
- foreach (var pr in gproject.Project.References) {
- if (pr.Reference == pref.Reference)
- return;
- }
- gproject.Project.References.Add (pref);
- }
-
- TargetEntry[] IToolboxConsumer.DragTargets {
- get { return Stetic.DND.Targets; }
- }
-
- [CommandHandler (EditCommands.Delete)]
- protected void OnDelete ()
- {
- Designer.DeleteSelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Delete)]
- protected void OnUpdateDelete (CommandInfo cinfo)
- {
- cinfo.Bypass = Designer != null && !Designer.CanDeleteSelection;
- }
-
- [CommandHandler (EditCommands.Copy)]
- protected void OnCopy ()
- {
- Designer.CopySelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Copy)]
- protected void OnUpdateCopy (CommandInfo cinfo)
- {
- cinfo.Enabled = Designer != null && Designer.CanCopySelection;
- }
-
- [CommandHandler (EditCommands.Cut)]
- protected void OnCut ()
- {
- Designer.CutSelection ();
- }
-
- [CommandUpdateHandler (EditCommands.Cut)]
- protected void OnUpdateCut (CommandInfo cinfo)
- {
- cinfo.Enabled = Designer != null && Designer.CanCutSelection;
- }
-
- [CommandHandler (EditCommands.Paste)]
- protected void OnPaste ()
- {
- Designer.PasteToSelection ();
- }
-
- [CommandHandler (EditCommands.Undo)]
- protected void OnUndo ()
- {
- Designer.UndoQueue.Undo ();
- }
-
- [CommandHandler (EditCommands.Redo)]
- protected void OnRedo ()
- {
- Designer.UndoQueue.Redo ();
- }
-
- [CommandUpdateHandler (EditCommands.Paste)]
- protected void OnUpdatePaste (CommandInfo cinfo)
- {
- cinfo.Enabled = Designer != null && Designer.CanPasteToSelection;
- }
-
- [CommandUpdateHandler (EditCommands.Undo)]
- protected void OnUpdateUndo (CommandInfo cinfo)
- {
- cinfo.Enabled = Designer != null && Designer.UndoQueue.CanUndo;
- }
-
- [CommandUpdateHandler (EditCommands.Redo)]
- protected void OnUpdateRedo (CommandInfo cinfo)
- {
- cinfo.Enabled = Designer != null && Designer.UndoQueue.CanRedo;
- }
-
- Widget MonoDevelop.DesignerSupport.IOutlinedDocument.GetOutlineWidget ()
- {
- return GuiBuilderDocumentOutline.Instance;
- }
-
- IEnumerable MonoDevelop.DesignerSupport.IOutlinedDocument.GetToolbarWidgets ()
- {
- return null;
- }
-
- void MonoDevelop.DesignerSupport.IOutlinedDocument.ReleaseOutlineWidget ()
- {
- //Do nothing. We keep the instance to avoid creation cost when switching documents.
- }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
deleted file mode 100644
index 972852bb565..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-//
-// GuiBuilderWindow.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using System.CodeDom;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.GtkCore.Dialogs;
-using MonoDevelop.Ide;
-using Microsoft.CodeAnalysis;
-using ICSharpCode.NRefactory6.CSharp;
-using MonoDevelop.Ide.Editor;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class GuiBuilderWindow: IDisposable
- {
- Stetic.WidgetInfo rootWidget;
- GuiBuilderProject fproject;
- Stetic.Project gproject;
- string name;
-
- public event WindowEventHandler Changed;
-
- internal GuiBuilderWindow (GuiBuilderProject fproject, Stetic.Project gproject, Stetic.WidgetInfo rootWidget)
- {
- this.fproject = fproject;
- this.rootWidget = rootWidget;
- this.gproject = gproject;
- name = rootWidget.Name;
- gproject.ProjectReloaded += OnProjectReloaded;
- rootWidget.Changed += OnChanged;
- }
-
- public Stetic.WidgetInfo RootWidget {
- get { return rootWidget; }
- }
-
- public GuiBuilderProject Project {
- get { return fproject; }
- }
-
- public string Name {
- get { return rootWidget.Name; }
- }
-
- public FilePath SourceCodeFile {
- get { return fproject.GetSourceCodeFile (rootWidget); }
- }
-
- public void Dispose ()
- {
- gproject.ProjectReloaded -= OnProjectReloaded;
- rootWidget.Changed -= OnChanged;
- }
-
- void OnProjectReloaded (object s, EventArgs args)
- {
- rootWidget.Changed -= OnChanged;
- rootWidget = gproject.GetWidget (name);
- if (rootWidget != null)
- rootWidget.Changed += OnChanged;
- }
-
- void OnChanged (object o, EventArgs args)
- {
- // Update the name, it may have changed
- name = rootWidget.Name;
-
- if (Changed != null)
- Changed (this, new WindowEventArgs (this));
- }
-
- public bool BindToClass ()
- {
- if (SourceCodeFile != FilePath.Null)
- return true;
-
- // Find the classes that could be bound to this design
- var ctx = fproject.GetParserContext ();
- ArrayList list = new ArrayList ();
- foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
- if (IsValidClass (cls))
- list.Add (cls.GetFullName ());
- }
-
- // Ask what to do
-
- try {
- using (BindDesignDialog dialog = new BindDesignDialog (Name, list, Project.Project.BaseDirectory)) {
- if (!dialog.Run ())
- return false;
-
- if (dialog.CreateNew)
- CreateClass (dialog.ClassName, dialog.Namespace, dialog.Folder);
-
- string fullName = dialog.Namespace.Length > 0 ? dialog.Namespace + "." + dialog.ClassName : dialog.ClassName;
- rootWidget.Name = fullName;
- fproject.SaveWindow (true, fullName);
- }
- return true;
- } catch (Exception ex) {
- LoggingService.LogInternalError (ex);
- return false;
- }
- }
-
- void CreateClass (string name, string namspace, string folder)
- {
- // TODO: Type system conversion.
-
-// string fullName = namspace.Length > 0 ? namspace + "." + name : name;
-//
-// var gen = new CodeRefactorer (fproject.Project.ParentSolution);
-// bool partialSupport = fproject.Project.UsePartialTypes;
-// Stetic.WidgetComponent component = (Stetic.WidgetComponent) rootWidget.Component;
-//
-// CodeTypeDeclaration type = new CodeTypeDeclaration ();
-// type.Name = name;
-// type.IsClass = true;
-// type.IsPartial = partialSupport;
-// type.BaseTypes.Add (new CodeTypeReference (component.Type.ClassName));
-//
-// // Generate the constructor. It contains the call that builds the widget.
-//
-// CodeConstructor ctor = new CodeConstructor ();
-// ctor.Attributes = MemberAttributes.Public | MemberAttributes.Final;
-//
-// foreach (object val in component.Type.InitializationValues) {
-// if (val is Enum) {
-// ctor.BaseConstructorArgs.Add (
-// new CodeFieldReferenceExpression (
-// new CodeTypeReferenceExpression (val.GetType ()),
-// val.ToString ()
-// )
-// );
-// }
-// else
-// ctor.BaseConstructorArgs.Add (new CodePrimitiveExpression (val));
-// }
-//
-// if (partialSupport) {
-// CodeMethodInvokeExpression call = new CodeMethodInvokeExpression (
-// new CodeMethodReferenceExpression (
-// new CodeThisReferenceExpression (),
-// "Build"
-// )
-// );
-// ctor.Statements.Add (call);
-// } else {
-// CodeMethodInvokeExpression call = new CodeMethodInvokeExpression (
-// new CodeMethodReferenceExpression (
-// new CodeTypeReferenceExpression ("Stetic.Gui"),
-// "Build"
-// ),
-// new CodeThisReferenceExpression (),
-// new CodeTypeOfExpression (fullName)
-// );
-// ctor.Statements.Add (call);
-// }
-// type.Members.Add (ctor);
-//
-// // Add signal handlers
-//
-// AddSignalsRec (type, component);
-// foreach (Stetic.Component ag in component.GetActionGroups ())
-// AddSignalsRec (type, ag);
-//
-// // Create the class
-// IType cls = gen.CreateClass (Project.Project, ((DotNetProject)Project.Project).LanguageName, folder, namspace, type);
-// if (cls == null)
-// throw new UserException ("Could not create class " + fullName);
-//
-// Project.Project.AddFile (cls.CompilationUnit.FileName, BuildAction.Compile);
-// IdeApp.ProjectOperations.Save (Project.Project);
-//
-// // Make sure the database is up-to-date
-// ProjectDomService.Parse (Project.Project, cls.CompilationUnit.FileName);
- }
-
- void AddSignalsRec (CodeTypeDeclaration type, Stetic.Component comp)
- {
- foreach (Stetic.Signal signal in comp.GetSignals ()) {
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = signal.Handler;
- met.Attributes = MemberAttributes.Family;
- met.ReturnType = new CodeTypeReference (signal.SignalDescriptor.HandlerReturnTypeName);
-
- foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
- met.Parameters.Add (new CodeParameterDeclarationExpression (pinfo.TypeName, pinfo.Name));
-
- type.Members.Add (met);
- }
- foreach (Stetic.Component cc in comp.GetChildren ()) {
- AddSignalsRec (type, cc);
- }
- }
-
- internal bool IsValidClass (ITypeSymbol cls)
- {
- if (cls.SpecialType == Microsoft.CodeAnalysis.SpecialType.System_Object)
- return false;
- if (cls.BaseType.GetFullName () == rootWidget.Component.Type.ClassName)
- return true;
- return IsValidClass (cls.BaseType);
- }
- }
-
- class OpenDocumentFileProvider: ITextFileProvider
- {
- public ITextDocument GetEditableTextFile (FilePath filePath)
- {
- foreach (var doc in IdeApp.Workbench.Documents) {
- if (doc.FileName == filePath) {
- var ef = doc.Editor;
- if (ef != null) return ef;
- }
- }
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs
deleted file mode 100644
index 6cedb0f4b2b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// GuiBuilderPropertiesPad.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using Gtk;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Commands;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- class PropertiesWidget: Gtk.VBox
- {
- public static PropertiesWidget Instance;
-
- Stetic.SignalsEditor signalsEditor;
-
- static PropertiesWidget ()
- {
- Instance = new PropertiesWidget ();
- }
-
- public PropertiesWidget ()
- {
- Stetic.WidgetPropertyTree grid = GuiBuilderService.SteticApp.PropertiesWidget;
-
- Notebook tabs = new Notebook ();
-
- tabs.AppendPage (grid, new Label (GettextCatalog.GetString ("Properties")));
-
- signalsEditor = GuiBuilderService.SteticApp.SignalsWidget;
- signalsEditor.SignalActivated += new EventHandler (OnSignalActivated);
- tabs.AppendPage (signalsEditor, new Label (GettextCatalog.GetString ("Signals")));
-
- Gtk.EventBox infoBox = new Gtk.EventBox ();
- tabs.AppendPage (infoBox, new Gtk.Label (""));
-
- PackStart (tabs, true, true, 0);
-
- ShowAll ();
- infoBox.Hide ();
-
- tabs.Page = 0;
- }
-
- void OnSignalActivated (object s, EventArgs a)
- {
- GuiBuilderService.JumpToSignalHandler (signalsEditor.SelectedSignal);
- }
- }
-
-/* public class GuiBuilderPropertiesPad: AbstractPadContent
- {
- Stetic.WidGetTree grid;
- Stetic.SignalsEditor signalsEditor;
- Gtk.EventBox infoBox;
- Gtk.Widget widget;
- Stetic.Wrapper.Action currentAction;
- Notebook tabs;
-
- public GuiBuilderPropertiesPad (): base ("")
- {
- grid = GuiBuilderService.SteticApp.PropertiesWidget;
-
- DefaultPlacement = "MonoDevelop.GtkCore.GuiBuilder.GuiBuilderPalettePad/bottom; right";
-
- tabs = new Notebook ();
-
- tabs.AppendPage (grid, new Label (GettextCatalog.GetString ("Properties")));
-
- signalsEditor = GuiBuilderService.SteticApp.SignalsWidget;
- signalsEditor.SignalActivated += new EventHandler (OnSignalActivated);
- tabs.AppendPage (signalsEditor, new Label (GettextCatalog.GetString ("Signals")));
-
- infoBox = new Gtk.EventBox ();
- tabs.AppendPage (infoBox, new Gtk.Label (""));
-
- widget = tabs;
-
- widget.ShowAll ();
- infoBox.Hide ();
-
- tabs.Page = 0;
- }
-
- public override Gtk.Widget Control {
- get { return widget; }
- }
-
- void OnSignalActivated (object s, EventArgs a)
- {
- GuiBuilderService.JumpToSignalHandler (signalsEditor.SelectedSignal);
- }
-
- public object TargetObject {
- get {
- return grid.TargetObject;
- }
- set {
- Stetic.Wrapper.Action action = Stetic.ObjectWrapper.Lookup (value) as Stetic.Wrapper.Action;
- if (action != null) {
- // Don't allow editing of global actions
- if (grid.Project != null && grid.Project.ActionGroups.IndexOf (action.ActionGroup) != -1) {
- if (infoBox.Child != null)
- infoBox.Remove (infoBox.Child);
- infoBox.Add (CreateGlobalActionInfo (action));
- infoBox.ShowAll ();
- tabs.Page = 2;
- tabs.ShowTabs = false;
- grid.Hide ();
- signalsEditor.Hide ();
- return;
- }
- }
-
- if (!grid.Visible) {
- tabs.ShowTabs = true;
- grid.Show ();
- signalsEditor.Show ();
- tabs.Page = 0;
- infoBox.Hide ();
- }
-
- grid.TargetObject = value;
- signalsEditor.TargetObject = value;
- }
- }
-
- Gtk.Widget CreateGlobalActionInfo (Stetic.Wrapper.Action action)
- {
- currentAction = action;
-
- Gtk.HBox hbox = new Gtk.HBox ();
- hbox.BorderWidth = 12;
- Gtk.Image img = new Gtk.Image (Gtk.Stock.DialogInfo, Gtk.IconSize.Menu);
- img.Yalign = 0;
- hbox.PackStart (img, false, false, 0);
-
- Gtk.VBox box = new Gtk.VBox ();
- Gtk.Label info = new Gtk.Label (GettextCatalog.GetString ("The action '{0}' belongs to the global action group '{1}'. To modify it, open the action group file.", action.MenuLabel, action.ActionGroup.Name));
- info.Xalign = 0;
- info.WidthRequest = 200;
- info.LineWrap = true;
- box.PackStart (info, false, false, 0);
-
- HBox bb = new HBox ();
- Gtk.Button but = new Gtk.Button (GettextCatalog.GetString ("Open Action Group"));
- but.Clicked += new EventHandler (OnOpenGroup);
- bb.PackStart (but, false, false, 0);
- box.PackStart (bb, false, false, 12);
-
- hbox.PackStart (box, true, true, 12);
- hbox.ShowAll ();
- return hbox;
- }
-
- void OnOpenGroup (object s, EventArgs args)
- {
- Project prj = GetProjectFromDesign (currentAction.ActionGroup);
- if (prj != null) {
- ActionGroupView view = GuiBuilderService.OpenActionGroup (prj, currentAction.ActionGroup);
- if (view != null)
- view.SelectAction (currentAction);
- }
- }
-
-
- public static Project GetProjectFromDesign (Stetic.Wrapper.ActionGroup group)
- {
- if (IdeApp.ProjectOperations.CurrentOpenCombine == null)
- return null;
-
- foreach (Project prj in IdeApp.ProjectOperations.CurrentOpenCombine.GetAllProjects ()) {
- GtkDesignInfo info = GtkCoreService.GetGtkInfo (prj);
- if (info != null && info.GuiBuilderProject != null && info.GuiBuilderProject.SteticProject.ActionGroups.IndexOf (group) != -1)
- return prj;
- }
- return null;
- }
-
- }
-*/
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
deleted file mode 100644
index c477c66e8ce..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// ToolboxLoader.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.DesignerSupport.Toolbox;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Assemblies;
-using Stetic;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class ToolboxLoader: IToolboxLoader
- {
- public virtual string[] FileTypes {
- get { return new string [] { "dll", "exe" }; }
- }
-
- public virtual IList Load (LoaderContext ctx, string filename)
- {
- SystemPackage sp = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetPackageFromPath (filename);
- ReferenceType rt;
- string rname;
-
- if (sp != null) {
- rt = ReferenceType.Package;
- rname = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (filename, null);
- } else {
- rt = ReferenceType.Assembly;
- rname = filename;
- }
-
- List list = new List ();
-
- if (ctx.CancellationToken.IsCancellationRequested)
- return list;
-
- var types = Runtime.RunInMainThread (delegate {
- // Stetic is not thread safe, it has to be used from the gui thread
- return GuiBuilderService.SteticApp.GetComponentTypes (filename);
- }).WaitAndGetResult (ctx.CancellationToken);
-
- foreach (ComponentType ct in types) {
- if (ct.Category == "window")
- continue;
- ComponentToolboxNode cn = new ComponentToolboxNode (ct);
- cn.ReferenceType = rt;
- cn.Reference = rname;
- list.Add (cn);
- }
- return list;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
deleted file mode 100644
index 1616424340a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-
-using System;
-using System.ComponentModel;
-using System.Collections;
-using System.Collections.Generic;
-
-using MonoDevelop.DesignerSupport.Toolbox;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using Stetic;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Components;
-
-namespace MonoDevelop.GtkCore.GuiBuilder
-{
- public class ToolboxProvider: IToolboxDynamicProvider, IToolboxDefaultProvider
- {
- internal static ToolboxProvider Instance;
-
- public ToolboxProvider ()
- {
- Instance = this;
- }
-
- public IEnumerable GetDynamicItems (IToolboxConsumer consumer)
- {
- DesignerPage view = consumer as DesignerPage;
- if (view == null)
- return null;
-
- ComponentType[] types = view.GetComponentTypes ();
- if (types == null)
- return null;
-
- Hashtable refs = new Hashtable ();
- Hashtable projects = new Hashtable ();
- string of = FileService.GetFullPath (view.Project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration));
- projects [of] = view.Project.Name;
- foreach (ProjectReference pr in ((DotNetProject)view.Project).References)
- foreach (string f in pr.GetReferencedFileNames (IdeApp.Workspace.ActiveConfiguration)) {
- if (pr.ReferenceType == ReferenceType.Project)
- projects[FileService.GetFullPath (f)] = pr.Reference;
- else
- refs[FileService.GetFullPath (f)] = f;
- }
-
- List list = new List ();
- foreach (ComponentType type in types) {
- if (type.Category == "window")
- continue;
-
- string fullName = null;
- if (!String.IsNullOrEmpty (type.Library))
- fullName = FileService.GetFullPath (type.Library);
-
- if (type.ClassName == "Gtk.Action" || (fullName != null && refs.Contains (fullName))) {
- ComponentToolboxNode node = new ComponentToolboxNode (type);
- list.Add (node);
- } else if (fullName != null && projects.Contains (fullName)) {
- ComponentToolboxNode node = new ComponentToolboxNode (type);
- node.Category = (string) projects [fullName];
- list.Add (node);
- }
- }
- list.Sort ();
- return list;
- }
-
- public void NotifyItemsChanged ()
- {
- if (ItemsChanged != null)
- ItemsChanged (this, EventArgs.Empty);
- }
-
- public virtual IEnumerable GetDefaultItems ()
- {
- return null;
- }
-
- public virtual IEnumerable GetDefaultFiles ()
- {
- yield return typeof(Stetic.Wrapper.Widget).Assembly.Location;
- }
-
- public event EventHandler ItemsChanged;
- }
-
- class ComponentToolboxNode: ItemToolboxNode
- {
- public ComponentType componentType;
-
- [ItemProperty]
- ReferenceType refType;
- [ItemProperty]
- string reference;
- [ItemProperty]
- string className;
- [ItemProperty]
- string gtkVersion;
-
- static ToolboxItemFilterAttribute[] attributes = new ToolboxItemFilterAttribute[] {
- new ToolboxItemFilterAttribute ("gtk-sharp", ToolboxItemFilterType.Require)
- };
-
- internal static readonly string GtkWidgetDomain = GettextCatalog.GetString ("GTK# Widgets");
-
- public ComponentToolboxNode ()
- {
- }
-
- public ComponentToolboxNode (ComponentType type)
- {
- if (type.Description.Length > 0)
- Name = type.Description;
- else {
- int i = type.Name.LastIndexOf ('.');
- if (i == -1)
- Name = type.Name;
- else
- Name = type.Name.Substring (i+1);
- }
-
- componentType = type;
- className = type.ClassName;
- Category = GetCategoryName (type.Category);
- Icon = type.Icon.ToXwtImage ();
- gtkVersion = type.TargetGtkVersion;
- }
-
- [Browsable (false)]
- public override IList ItemFilters {
- get { return attributes; }
- }
-
- [Browsable (false)]
- public Stetic.ComponentType ComponentType {
- get {
- return componentType;
- }
- }
-
- [ReadOnly (true)]
- [LocalizedCategory ("Misc")]
- [LocalizedDisplayName ("Reference Type")]
- [LocalizedDescription ("The type of the project or assembly from which this component originates.")]
- public ReferenceType ReferenceType {
- get {
- return refType;
- }
- set {
- refType = value;
- }
- }
-
- [ReadOnly (true)]
- [LocalizedCategory ("Misc")]
- [LocalizedDisplayName ("Reference Path")]
- [LocalizedDescription ("The project or assembly from which this component originates.")]
- public string Reference {
- get {
- return reference;
- }
- set {
- reference = value;
- }
- }
-
- [LocalizedCategory ("Misc")]
- [LocalizedDisplayName ("Class Name")]
- [LocalizedDescription ("The name of the component class.")]
- public string ClassName {
- get {
- return className;
- }
- }
-
- [LocalizedCategory ("Misc")]
- [LocalizedDisplayName ("GTK# Version")]
- [LocalizedDescription ("The minimum GTK# version required to use this component.")]
- public string GtkVersion {
- get {
- return gtkVersion;
- }
- }
-
- string GetCategoryName (string cat)
- {
- if (cat == "container")
- return GettextCatalog.GetString ("Containers");
- else if (cat == "widget")
- return GettextCatalog.GetString ("Widgets");
- else
- return cat;
- }
-
- [Browsable (false)]
- public override string ItemDomain {
- get { return GtkWidgetDomain; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
deleted file mode 100644
index 931f55efd7e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// ActionGroupNodeBuilder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.GtkCore.Dialogs;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- public class ActionGroupNodeBuilder: TypeNodeBuilder
- {
- public override Type CommandHandlerType {
- get { return typeof(ActionGroupCommandHandler); }
- }
-
- public override string ContextMenuAddinPath {
- get { return "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup"; }
- }
-
- public override Type NodeDataType {
- get { return typeof(Stetic.ActionGroupInfo); }
- }
-
- public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
- {
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) dataObject;
- return group.Name;
- }
-
- public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
- {
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) dataObject;
- nodeInfo.Label = group.Name;
- nodeInfo.Icon = Context.GetIcon ("md-gtkcore-actiongroup");
- }
-
- public override void OnNodeAdded (object dataObject)
- {
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) dataObject;
- group.Changed += new EventHandler (OnChanged);
- }
-
- public override void OnNodeRemoved (object dataObject)
- {
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) dataObject;
- group.Changed -= new EventHandler (OnChanged);
- }
-
- void OnChanged (object s, EventArgs a)
- {
- ITreeBuilder tb = Context.GetTreeBuilder (s);
- if (tb != null)
- tb.Update ();
- }
- }
-
- class ActionGroupCommandHandler: NodeCommandHandler
- {
- public override async void ActivateItem ()
- {
- GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false);
- if (w != null) {
- if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ())
- return;
-
- Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, null, true);
- if (doc != null) {
- GuiBuilderView view = doc.GetContent ();
- if (view != null)
- view.ShowActionDesignerView (((Stetic.ActionGroupInfo) CurrentNode.DataItem).Name);
- }
- }
- else {
- Project project = (Project) CurrentNode.GetParentDataItem (typeof(Project), false);
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) CurrentNode.DataItem;
- await GuiBuilderService.OpenActionGroup (project, group);
- }
- }
-
- public override bool CanDeleteItem ()
- {
- // Don't allow deleting action groups local to a window
- GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false);
- return (w == null);
- }
-
- public override void DeleteItem ()
- {
- // Don't allow deleting action groups local to a window
- GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false);
- if (w != null)
- return;
-
- Project project = (Project) CurrentNode.GetParentDataItem (typeof(Project), false);
- Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) CurrentNode.DataItem;
- GuiBuilderProject gproject = GtkDesignInfo.FromProject (project).GuiBuilderProject;
- string sfile = gproject.GetSourceCodeFile (group);
-
- if (sfile != null) {
- using (ConfirmWindowDeleteDialog dialog = new ConfirmWindowDeleteDialog (group.Name, sfile, group)) {
- if (dialog.Run () == (int) Gtk.ResponseType.Yes) {
- if (dialog.DeleteFile) {
- ProjectFile file = project.GetProjectFile (sfile);
- if (file != null)
- project.Files.Remove (file);
- }
- gproject.RemoveActionGroup (group);
- gproject.SaveProject (false);
- IdeApp.ProjectOperations.SaveAsync (project);
- }
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
deleted file mode 100644
index 42cfbd603d8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// ProjectFolderNodeBuilderExtension.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Pads.ProjectPad;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- class ProjectFolderNodeBuilderExtension: NodeBuilderExtension
- {
- public override bool CanBuildNode (Type dataType)
- {
- return typeof(ProjectFolder).IsAssignableFrom (dataType) ||
- typeof(DotNetProject).IsAssignableFrom (dataType);
- }
-
- public override Type CommandHandlerType {
- get { return typeof(UserInterfaceCommandHandler); }
- }
-
- public override void GetNodeAttributes (ITreeNavigator treeNavigator, object dataObject, ref NodeAttributes attributes)
- {
- if (treeNavigator.Options ["ShowAllFiles"])
- return;
-
- ProjectFolder folder = dataObject as ProjectFolder;
- if (folder != null && folder.Project is DotNetProject) {
- GtkDesignInfo info = GtkDesignInfo.FromProject (folder.Project);
- if (info.GtkGuiFolder == folder.Path)
- attributes |= NodeAttributes.Hidden;
- }
- }
- }
-
- class UserInterfaceCommandHandler: NodeCommandHandler
- {
- [CommandHandler (MonoDevelop.GtkCore.GtkCommands.AddNewDialog)]
- public void AddNewDialogToProject()
- {
- AddNewWindow ("DialogFileTemplate");
- }
-
- [CommandUpdateHandler (MonoDevelop.GtkCore.GtkCommands.AddNewDialog)]
- public void UpdateAddNewDialogToProject (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (MonoDevelop.GtkCore.GtkCommands.AddNewWindow)]
- public void AddNewWindowToProject()
- {
- AddNewWindow ("WindowFileTemplate");
- }
-
- [CommandUpdateHandler (MonoDevelop.GtkCore.GtkCommands.AddNewWindow)]
- public void UpdateAddNewWindowToProject (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (MonoDevelop.GtkCore.GtkCommands.AddNewWidget)]
- public void AddNewWidgetToProject()
- {
- AddNewWindow ("WidgetFileTemplate");
- }
-
- [CommandUpdateHandler (MonoDevelop.GtkCore.GtkCommands.AddNewWidget)]
- public void UpdateAddNewWidgetToProject (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup)]
- public void AddNewActionGroupToProject()
- {
- AddNewWindow ("ActionGroupFileTemplate");
- }
-
- [CommandUpdateHandler (MonoDevelop.GtkCore.GtkCommands.AddNewActionGroup)]
- public void UpdateAddNewActionGroupToProject(CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (GtkCommands.ImportGladeFile)]
- protected void OnImportGladeFile ()
- {
- Project project = CurrentNode.GetParentDataItem (typeof(Project), true) as Project;
- GuiBuilderService.ImportGladeFile (project);
- }
-
- [CommandUpdateHandler (GtkCommands.ImportGladeFile)]
- protected void UpdateImportGladeFile (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (GtkCommands.EditIcons)]
- protected void OnEditIcons ()
- {
- Project project = CurrentNode.GetParentDataItem (typeof(Project), true) as Project;
- GuiBuilderProject gp = GtkDesignInfo.FromProject (project).GuiBuilderProject;
- Stetic.Project sp = gp.SteticProject;
- sp.EditIcons ();
- gp.SaveProject (true);
- }
-
- [CommandUpdateHandler (GtkCommands.EditIcons)]
- protected void UpdateEditIcons (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- [CommandHandler (GtkCommands.GtkSettings)]
- protected void OnGtkSettings ()
- {
- Project project = CurrentNode.GetParentDataItem (typeof(Project), true) as Project;
- IdeApp.ProjectOperations.ShowOptions (project, "SteticOptionsPanel");
- }
-
- [CommandUpdateHandler (GtkCommands.EditIcons)]
- protected void UpdateGtkSettings (CommandInfo cinfo)
- {
- cinfo.Visible = CanAddWindow ();
- }
-
- bool CanAddWindow ()
- {
- DotNetProject project = CurrentNode.GetParentDataItem (typeof(Project), true) as DotNetProject;
- return GtkDesignInfo.SupportsDesigner (project);
- }
-
- public void AddNewWindow (string id)
- {
- DotNetProject project = CurrentNode.GetParentDataItem (typeof(Project), true) as DotNetProject;
- if (project == null)
- return;
-
- object dataItem = CurrentNode.DataItem;
-
- ProjectFolder folder = CurrentNode.GetParentDataItem (typeof(ProjectFolder), true) as ProjectFolder;
-
- if (project.UsePartialTypes)
- id = "Partial" + id;
-
- string path;
- if (folder != null)
- path = folder.Path;
- else
- path = project.BaseDirectory;
-
- IdeApp.ProjectOperations.CreateProjectFile (project, path, id);
-
- IdeApp.ProjectOperations.SaveAsync (project);
-
- ITreeNavigator nav = Tree.GetNodeAtObject (dataItem);
- if (nav != null)
- nav.Expanded = true;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs
deleted file mode 100644
index 28b187f62b1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// ProjectNodeBuilder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-
-using MonoDevelop.GtkCore.GuiBuilder;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- public class ProjectNodeBuilder: NodeBuilderExtension
- {
- static ProjectNodeBuilder instance;
-
- public override bool CanBuildNode (Type dataType)
- {
- return typeof(DotNetProject).IsAssignableFrom (dataType);
- }
-
- protected override void Initialize ()
- {
- base.Initialize ();
-
- lock (typeof (ProjectNodeBuilder))
- instance = this;
- }
-
- public override void Dispose ()
- {
- lock (typeof (ProjectNodeBuilder))
- instance = null;
-
- base.Dispose ();
- }
-
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
- {
- if (GtkDesignInfo.HasDesignedObjects ((Project)dataObject))
- builder.AddChild (new WindowsFolder ((Project)dataObject));
- }
-
- public static void OnSupportChanged (Project p)
- {
- if (instance == null)
- return;
-
- ITreeBuilder tb = instance.Context.GetTreeBuilder (p);
- if (tb != null)
- tb.UpdateAll ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs
deleted file mode 100644
index a8088a2ad60..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-
-using System;
-using Gdk;
-
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- class StockIconsNode
- {
- public StockIconsNode (Project project)
- {
- this.Project = project;
- }
-
- public Project Project;
- }
-
- public class StockIconsNodeBuilder: TypeNodeBuilder
- {
- Xwt.Drawing.Image iconsIcon;
-
- public override Type NodeDataType {
- get { return typeof(StockIconsNode); }
- }
-
- public override Type CommandHandlerType {
- get { return typeof(StockIconsNodeCommandHandler); }
- }
-
- public override string ContextMenuAddinPath {
- get { return "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.StockIcons"; }
- }
- public StockIconsNodeBuilder ()
- {
- try {
- iconsIcon = Xwt.Drawing.Image.FromResource ("image-x-generic.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf 'image-x-generic.png': " + e);
- }
- }
- public override int GetSortIndex (ITreeNavigator node)
- {
- return -100;
- }
-
- public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
- {
- return "StockIcons";
- }
-
- public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
- {
- nodeInfo.Label = GettextCatalog.GetString ("Stock Icons");
- nodeInfo.Icon = iconsIcon;
- }
- }
-
- public class StockIconsNodeCommandHandler: NodeCommandHandler
- {
- public override void ActivateItem ()
- {
- StockIconsNode node = (StockIconsNode) CurrentNode.DataItem;
- GtkDesignInfo info = GtkDesignInfo.FromProject (node.Project);
- GuiBuilderProject gp = info.GuiBuilderProject;
- Stetic.Project sp = gp.SteticProject;
- sp.ImagesRootPath = FileService.AbsoluteToRelativePath (info.GtkGuiFolder, gp.Project.BaseDirectory);
- sp.ImportFileCallback = delegate (string file) {
- return GuiBuilderService.ImportFile (gp.Project, file);
- };
- sp.EditIcons ();
- gp.SaveProject (true);
- }
-
- [CommandHandler (GtkCommands.EditIcons)]
- protected void OnEditIcons ()
- {
- ActivateItem ();
- }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
deleted file mode 100644
index 21bf56999c6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// WidgetNodeBuilder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.GtkCore.Dialogs;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- public class WidgetNodeBuilder: TypeNodeBuilder
- {
- WindowEventHandler onChanged;
-
- public WidgetNodeBuilder ()
- {
- onChanged = new WindowEventHandler (OnChanged);
- }
-
- public override Type CommandHandlerType {
- get { return typeof(GladeWindowCommandHandler); }
- }
-
- public override string ContextMenuAddinPath {
- get { return "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.Component"; }
- }
-
- public override Type NodeDataType {
- get { return typeof(GuiBuilderWindow); }
- }
-
- public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- return win.Name;
- }
-
- public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- nodeInfo.Label = win.Name;
-
-// if (win.RootWidget.IsWindow)
-// icon = ImageService.GetPixbuf ("md-gtkcore-window");
- if (win.RootWidget.IsWindow)
- nodeInfo.Icon = Context.GetIcon ("md-gtkcore-dialog");
- else
- nodeInfo.Icon = Context.GetIcon ("md-gtkcore-widget");
- }
-
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- builder.AddChildren (win.RootWidget.ActionGroups);
- }
-
- public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- return win.RootWidget.ActionGroups.GetEnumerator().MoveNext ();
- }
-
- public override void OnNodeAdded (object dataObject)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- win.Changed += onChanged;
- }
-
- public override void OnNodeRemoved (object dataObject)
- {
- GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
- win.Changed -= onChanged;
- }
-
- void OnChanged (object s, WindowEventArgs a)
- {
- ITreeBuilder tb = Context.GetTreeBuilder (a.Window);
- if (tb != null)
- tb.UpdateAll ();
- }
- }
-
- class GladeWindowCommandHandler: NodeCommandHandler
- {
- public override async void ActivateItem ()
- {
- GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.DataItem;
- if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ())
- return;
-
- Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, null, true);
- if (doc != null) {
- GuiBuilderView view = doc.GetContent ();
- if (view != null)
- view.ShowDesignerView ();
- }
- }
-
- public override void DeleteItem ()
- {
- GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.DataItem;
- string fn = FileService.AbsoluteToRelativePath (w.Project.Project.BaseDirectory, w.SourceCodeFile);
- using (ConfirmWindowDeleteDialog dialog = new ConfirmWindowDeleteDialog (w.Name, fn, w.RootWidget)) {
- if (dialog.Run () == (int) Gtk.ResponseType.Yes) {
- if (dialog.DeleteFile) {
- ProjectFile file = w.Project.Project.GetProjectFile (w.SourceCodeFile);
- if (file != null)
- w.Project.Project.Files.Remove (file);
- }
- w.Project.Remove (w);
- w.Project.SaveProject (false);
- IdeApp.ProjectOperations.SaveAsync (w.Project.Project);
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
deleted file mode 100644
index 796e5e14b0f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// WindowsFolder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Projects;
-using MonoDevelop.GtkCore.GuiBuilder;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- class WindowsFolder
- {
- Project project;
- GuiBuilderProject gproject;
-
- public event EventHandler Changed;
-
- public WindowsFolder (Project project)
- {
- this.project = project;
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
-
- gproject = info.GuiBuilderProject;
- gproject.Changed += OnUpdateFiles;
- }
-
- public void Dispose ()
- {
- gproject.Changed -= OnUpdateFiles;
- }
-
- void OnUpdateFiles (object s, EventArgs args)
- {
- if (Changed != null) Changed (this, EventArgs.Empty);
- }
-
- public Project Project {
- get { return project; }
- }
-
- public override bool Equals (object obj)
- {
- WindowsFolder wf = obj as WindowsFolder;
- return wf != null && wf.project == project;
- }
-
- public override int GetHashCode ( )
- {
- unchecked {
- return project.GetHashCode () * 234;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
deleted file mode 100644
index 2e1b0f44ea8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// WindowsFolderNodeBuilder.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore.NodeBuilders
-{
- public class WindowsFolderNodeBuilder: TypeNodeBuilder
- {
- public override Type NodeDataType {
- get { return typeof(WindowsFolder); }
- }
-
- public override Type CommandHandlerType {
- get { return typeof(UserInterfaceCommandHandler); }
- }
-
- public override string ContextMenuAddinPath {
- get { return "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.UserInterfaceFolder"; }
- }
-
- public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
- {
- return "UserInterface";
- }
-
- public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
- {
- Project p = ((WindowsFolder)dataObject).Project;
- GtkDesignInfo info = GtkDesignInfo.FromProject (p);
- if (info.GuiBuilderProject.HasError) {
- nodeInfo.Label = GettextCatalog.GetString ("User Interface (GUI project load failed)");
- } else {
- nodeInfo.Label = GettextCatalog.GetString ("User Interface");
- }
- nodeInfo.Icon = Context.GetIcon (Stock.OpenResourceFolder);
- nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedResourceFolder);
- }
-
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
- {
- Project p = ((WindowsFolder)dataObject).Project;
- GtkDesignInfo info = GtkDesignInfo.FromProject (p);
- if (!info.GuiBuilderProject.HasError) {
- builder.AddChild (new StockIconsNode (p));
- builder.AddChildren (info.GuiBuilderProject.Windows);
- builder.AddChildren (info.GuiBuilderProject.SteticProject.ActionGroups);
- }
- }
-
- public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
- {
- return true;
- }
-
- public override int GetSortIndex (ITreeNavigator node)
- {
- return -200;
- }
-
- public override void OnNodeAdded (object dataObject)
- {
- WindowsFolder w = (WindowsFolder) dataObject;
- w.Changed += OnUpdateFiles;
- }
-
- public override void OnNodeRemoved (object dataObject)
- {
- WindowsFolder w = (WindowsFolder)dataObject;
- w.Changed -= OnUpdateFiles;
- w.Dispose ();
- }
-
- void OnUpdateFiles (object s, EventArgs args)
- {
- ITreeBuilder tb = Context.GetTreeBuilder (s);
- if (tb != null) {
- tb.UpdateAll ();
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
deleted file mode 100644
index 4c42bffbb91..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
deleted file mode 100644
index d80594fc0a8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {7FCDB0D9-AA7D-44E4-BE74-55312B432389}
- $(MDFrameworkVersion)
- ..\..\..\build\AddIns\MonoDevelop.GtkCore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\build\bin\System.Reflection.Metadata.dll
- False
-
-
- ..\..\..\build\bin\System.Collections.Immutable.dll
- False
-
-
- ..\..\..\build\bin\Microsoft.CodeAnalysis.dll
- False
-
-
- ..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll
- False
-
-
- ..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll
- False
-
-
- ..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll
- False
-
-
- ..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Mdb.dll
- False
-
-
- ..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Pdb.dll
- False
-
-
- ..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll
- False
-
-
-
-
- {7525BB88-6142-4A26-93B9-A30C6983390A}
- MonoDevelop.Core
- False
-
-
- {27096E7F-C91C-4AC6-B289-6897A701DF21}
- MonoDevelop.Ide
- False
-
-
- {2C24D515-4A2C-445C-8419-C09231913CFA}
- MonoDevelop.DesignerSupport
- False
-
-
- {9BC670A8-1851-40EC-9685-279F4C98433D}
- MonoDevelop.Deployment
- False
-
-
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}
- libstetic
- False
-
-
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}
- libsteticui
- False
-
-
- {100568FC-F4E8-439B-94AD-41D11724E45B}
- MonoDevelop.Refactoring
- False
-
-
- {91DD5A2D-9FE3-4C3C-9253-876141874DAD}
- Mono.Addins
- False
-
-
- {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}
- Xwt
- False
-
-
- {07CC7654-27D6-421D-A64C-0FFA40456FA2}
- CSharpBinding
- False
-
-
- {53DCA265-3C3C-42F9-B647-F72BA678122B}
- ICSharpCode.NRefactory.CSharp
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/Counters.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/Counters.cs
deleted file mode 100644
index 8b428d82833..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/Counters.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Counters.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core.Instrumentation;
-
-namespace MonoDevelop.GtkCore
-{
- internal static class Counters
- {
- public static Counter GuiProjectsInMemory = InstrumentationService.CreateCounter ("GUI Projects in Memory", "GTK# Designer");
- public static Counter GuiProjectsLoaded = InstrumentationService.CreateCounter ("GUI Projects Loaded", "GTK# Designer");
- public static Counter SteticProjectsLoaded = InstrumentationService.CreateCounter ("Stetic Projects Loaded", "GTK# Designer");
- public static TimerCounter SteticFileGeneratedTimer = InstrumentationService.CreateTimerCounter ("Stetic File Generated", "GTK# Designer");
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
deleted file mode 100644
index ce3bf3268a5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkCoreService.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// GtkCoreService.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-
-namespace MonoDevelop.GtkCore
-{
- class GtkCoreStartupCommand: CommandHandler
- {
- protected override void Run()
- {
- ReferenceManager.Initialize ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
deleted file mode 100644
index 628ae3560a6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-//
-// GtkDesignInfo.cs
-//
-// Authors:
-// Lluis Sanchez Gual
-// Mike Kestner
-//
-// Copyright (C) 2006-2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections.Specialized;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.GtkCore.NodeBuilders;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.GtkCore
-{
- public class GtkDesignInfo: IDisposable
- {
- DotNetProject project;
- GuiBuilderProject builderProject;
- LanguageBinding binding;
- ProjectResourceProvider resourceProvider;
- ReferenceManager referenceManager;
-
- [ItemProperty (DefaultValue=true)]
- bool generateGettext = true;
-
- [ItemProperty (DefaultValue="Mono.Unix.Catalog")]
- string gettextClass = "Mono.Unix.Catalog";
-
- [ItemProperty (DefaultValue="Gdk.Pixbuf")]
- string imageResourceLoaderClass = "Gdk.Pixbuf";
-
- internal GtkDesignInfo ()
- {
- }
-
- internal GtkDesignInfo (DotNetProject project)
- {
- Project = project;
- }
-
- internal DotNetProject Project {
- get { return project; }
- set {
- if (project == value)
- return;
-
- if (project != null) {
- project.FileAddedToProject -= OnFileEvent;
- project.FileChangedInProject -= OnFileEvent;
- project.FileRemovedFromProject -= OnFileEvent;
- binding = null;
- if (referenceManager != null)
- referenceManager.Dispose ();
- referenceManager = null;
- }
- project = value;
- if (project != null) {
- binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName);
- project.FileAddedToProject += OnFileEvent;
- project.FileChangedInProject += OnFileEvent;
- project.FileRemovedFromProject += OnFileEvent;
- }
- }
- }
-
- void OnFileEvent (object o, ProjectFileEventArgs args)
- {
- if (!IdeApp.IsInitialized || !IdeApp.Workspace.IsOpen || !File.Exists (ObjectsFile))
- return;
-
- UpdateObjectsFile ();
- }
-
- public void Dispose ()
- {
- if (resourceProvider != null)
- System.Runtime.Remoting.RemotingServices.Disconnect (resourceProvider);
- resourceProvider = null;
- if (builderProject != null)
- builderProject.Dispose ();
- builderProject = null;
- if (referenceManager != null)
- referenceManager.Dispose ();
- referenceManager = null;
- Project = null;
- }
-
- public GuiBuilderProject GuiBuilderProject {
- get {
- if (builderProject == null) {
- if (SupportsDesigner (project)) {
- if (!File.Exists (SteticFile)) {
- UpdateGtkFolder ();
- ProjectNodeBuilder.OnSupportChanged (project);
- }
- builderProject = GuiBuilderService.CreateBuilderProject (project, SteticFile);
- } else
- builderProject = GuiBuilderService.CreateBuilderProject (project, null);
- }
- return builderProject;
- }
- }
-
- public ReferenceManager ReferenceManager {
- get {
- if (referenceManager == null)
- referenceManager = new ReferenceManager (project);
- return referenceManager;
- }
- }
-
- public void ReloadGuiBuilderProject ()
- {
- if (builderProject != null)
- builderProject.Reload ();
- }
-
- public ProjectResourceProvider ResourceProvider {
- get {
- if (resourceProvider == null) {
- resourceProvider = new ProjectResourceProvider (project);
- System.Runtime.Remoting.RemotingServices.Marshal (resourceProvider, null, typeof(Stetic.IResourceProvider));
- }
- return resourceProvider;
- }
- }
-
- FilePath ObjectsFile {
- get { return GtkGuiFolder.Combine ("objects.xml"); }
- }
-
- public FilePath SteticGeneratedFile {
- get { return GtkGuiFolder.Combine (binding.GetFileName ("generated")); }
- }
-
- public FilePath SteticFile {
- get { return GtkGuiFolder.Combine ("gui.stetic"); }
- }
-
- public FilePath GtkGuiFolder {
- get { return project.BaseDirectory.Combine ("gtk-gui"); }
- }
-
- public bool GenerateGettext {
- get { return generateGettext; }
- set {
- generateGettext = value;
- // Set to default value if gettext is not enabled
- if (!generateGettext)
- gettextClass = "Mono.Unix.Catalog";
- }
- }
-
- public string GettextClass {
- get { return gettextClass; }
- set { gettextClass = value; }
- }
-
- public string ImageResourceLoaderClass {
- get { return imageResourceLoaderClass; }
- set { imageResourceLoaderClass = value; }
- }
-
- public static bool HasDesignedObjects (Project project)
- {
- if (project == null || !SupportsDesigner (project))
- return false;
-
- return File.Exists (Path.Combine (project.BaseDirectory, "gtk-gui", "gui.stetic"));
- }
-
- static bool steticDisabled = !string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("DISABLE_STETIC"));
- public static bool SupportsDesigner (Project project)
- {
- if (steticDisabled) {
- return false;
- }
- DotNetProject dnp = project as DotNetProject;
- return dnp != null && HasGtkReference (dnp) && SupportsRefactoring (dnp);
- }
-
- public static bool SupportsRefactoring (DotNetProject project)
- {
- if (project == null || project.LanguageBinding == null || project.LanguageBinding.GetCodeDomProvider () == null)
- return false;
- if (project.ExtendedProperties.Contains ("GtkRefactoringSupported"))
- return (bool)project.ExtendedProperties ["GtkRefactoringSupported"];
-
- var testFileName = project.LanguageBinding.GetFileName ("test");
- bool hasSupport = CodeGenerator.HasGenerator (DesktopService.GetMimeTypeForUri (testFileName));
- project.ExtendedProperties ["GtkRefactoringSupported"] = hasSupport;
- return hasSupport;
- }
-
- static bool IsGtkReference (ProjectReference pref)
- {
- if (pref.ReferenceType != ReferenceType.Package)
- return false;
-
- return pref.StoredReference.StartsWith ("gtk-sharp,", StringComparison.Ordinal);
- }
-
- static bool HasGtkReference (DotNetProject project)
- {
- if (project.ExtendedProperties.Contains ("GtkReferenceExists"))
- return (bool)project.ExtendedProperties ["GtkReferenceExists"];
-
- bool found = false;
- foreach (ProjectReference pref in project.References)
- if (IsGtkReference (pref)) {
- found = true;
- break;
- }
- project.ExtendedProperties ["GtkReferenceExists"] = found;
- return found;
- }
-
- public void ForceCodeGenerationOnBuild ()
- {
- if (!SupportsDesigner (project))
- return;
- try {
- FileInfo fi = new FileInfo (SteticFile);
- fi.LastWriteTime = DateTime.Now;
- } catch {
- // Ignore errors here
- }
- }
-
- bool CleanGtkFolder (StringCollection remaining_files)
- {
- bool projectModified = false;
-
- // Remove all project files which are not in the generated list
- foreach (ProjectFile pf in project.Files.GetFilesInPath (GtkGuiFolder)) {
- if (remaining_files.Contains (pf.FilePath))
- continue;
-
- project.Files.Remove (pf);
- FileService.DeleteFile (pf.FilePath);
- projectModified = true;
- }
-
- if (remaining_files.Count == 0)
- FileService.DeleteDirectory (GtkGuiFolder);
-
- return projectModified;
- }
-
- public bool UpdateGtkFolder ()
- {
- if (!SupportsDesigner (project))
- return false;
-
- // This method synchronizes the current gtk project configuration info
- // with the needed support files in the gtk-gui folder.
-
- FileService.CreateDirectory (GtkGuiFolder);
- bool projectModified = false;
- bool initialGeneration = false;
-
- if (!File.Exists (SteticFile)) {
- initialGeneration = true;
- StreamWriter sw = new StreamWriter (SteticFile);
- sw.WriteLine ("");
- sw.Close ();
- }
-
- if (!project.IsFileInProject (SteticFile)) {
- ProjectFile pf = project.AddFile (SteticFile, BuildAction.EmbeddedResource);
- pf.ResourceId = "gui.stetic";
- projectModified = true;
- }
-
- StringCollection files = GuiBuilderProject.GenerateFiles (GtkGuiFolder);
- DateTime generatedTime = File.GetLastWriteTime (SteticFile).Subtract (TimeSpan.FromSeconds (2));
-
- foreach (string filename in files) {
- if (initialGeneration) {
- // Ensure that the generation date of this file is < the date of the .stetic file
- // In this way the code will be properly regenerated when building the project.
- File.SetLastWriteTime (filename, generatedTime);
- }
- if (!project.IsFileInProject (filename)) {
- project.AddFile (filename, BuildAction.Compile);
- projectModified = true;
- }
- }
-
- UpdateObjectsFile ();
- files.Add (ObjectsFile);
- files.Add (SteticFile);
-
- if (CleanGtkFolder (files))
- projectModified = true;
-
- return ReferenceManager.Update () || projectModified;
- }
-
- void UpdateObjectsFile ()
- {
- if (!File.Exists (ObjectsFile))
- return;
-
- ObjectsDocument doc = new ObjectsDocument (ObjectsFile);
- doc.Update (GuiBuilderProject.WidgetParser, GuiBuilderProject.SteticProject);
- }
-
- public static void DisableProject (Project project)
- {
- if (HasDesignedObjects (project))
- return;
-
- GtkDesignInfo info = FromProject (project);
- StringCollection saveFiles = new StringCollection ();
- saveFiles.AddRange (new string[] {info.ObjectsFile, info.SteticFile});
- info.CleanGtkFolder (saveFiles);
- project.Files.Remove (info.ObjectsFile);
- project.Files.Remove (info.SteticFile);
-
- var ext = project.GetService ();
- if (ext != null)
- ext.DesignInfo = null;
- info.Dispose ();
-
- ProjectNodeBuilder.OnSupportChanged (project);
- }
-
- public static GtkDesignInfo FromProject (Project project)
- {
- var ext = project.GetService ();
- if (ext != null)
- return ext.DesignInfo;
- return new GtkDesignInfo ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
deleted file mode 100644
index 9595cfed2c3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// ObjectsDocument.cs
-//
-// Authors:
-// Lluis Sanchez Gual
-// Mike Kestner
-//
-// Copyright (C) 2006-2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.CodeDom;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using MonoDevelop.Ide.TypeSystem;
-using Microsoft.CodeAnalysis;
-using ICSharpCode.NRefactory6.CSharp;
-using MonoDevelop.CSharp.Refactoring;
-using MonoDevelop.Refactoring;
-
-namespace MonoDevelop.GtkCore
-{
-
-
- public class ObjectsDocument : XmlDocument
- {
- string path;
-
- public ObjectsDocument (string path) : base ()
- {
- this.path = path;
- Load (path);
- }
-
- public StringCollection ObjectNames {
- get {
- StringCollection names = new StringCollection ();
- foreach (XmlNode node in DocumentElement) {
- if (node.Name != "object")
- continue;
- XmlElement elem = node as XmlElement;
- names.Add (elem.GetAttribute ("type"));
- }
- return names;
- }
- }
-
- enum SyncState
- {
- Unspecified,
- Off,
- On,
- }
-
- SyncState AttrSyncState {
- get {
- if (DocumentElement.HasAttribute ("attr-sync")) {
- if (string.Equals (DocumentElement.GetAttribute ("attr-sync"), "off", StringComparison.OrdinalIgnoreCase))
- return SyncState.Off;
- else
- return SyncState.On;
- } else
- return SyncState.Unspecified;
- }
- set {
- switch (value) {
- case SyncState.Unspecified:
- DocumentElement.RemoveAttribute ("attr-sync");
- break;
- case SyncState.Off:
- DocumentElement.SetAttribute ("attr-sync", "off");
- break;
- case SyncState.On:
- DocumentElement.SetAttribute ("attr-sync", "on");
- break;
- default:
- throw new ArgumentOutOfRangeException ("value");
- }
- Save ();
- }
- }
-
- public void Save ()
- {
- //Always write line endings as \n to be consistent with other stetic files
- //and explicitly write with no BOM or XML declaration in order to be consistent with existing format.
- var settings = new XmlWriterSettings () {
- Encoding = Stetic.EncodingUtility.UTF8NoBom,
- NewLineChars = "\n",
- Indent = true,
- OmitXmlDeclaration = true,
- };
- using (var writer = XmlTextWriter.Create (path, settings)) {
- Save (writer);
- }
- }
- void InsertToolboxItemAttributes (WidgetParser parser)
- {
- var tb_items = parser.GetToolboxItems ();
- foreach (string clsname in ObjectNames) {
- if (tb_items.ContainsKey (clsname))
- continue;
-
- var cls = parser.GetClass (clsname);
- if (cls == null)
- continue;
- CodeGenerationService.AddAttribute (cls, "System.ComponentModel.ToolboxItem", true);
- XmlElement elem = DocumentElement.SelectSingleNode ("object[@type='" + clsname + "']") as XmlElement;
- if (elem != null && elem.HasAttribute ("palette-category")) {
- CodeGenerationService.AddAttribute (cls, "System.ComponentModel.Category", elem.GetAttribute ("palette-category"));
- }
- }
- }
-
- public void Update (WidgetParser parser, Stetic.Project stetic)
- {
- if (AttrSyncState == SyncState.Unspecified) {
- InsertToolboxItemAttributes (parser);
- AttrSyncState = SyncState.On;
- return;
- } else if (AttrSyncState == SyncState.Off)
- return;
-
- StringCollection tb_names = new StringCollection ();
- foreach (var cls in parser.GetToolboxItems().Values) {
- UpdateClass (parser, stetic, cls, null);
- tb_names.Add (cls.GetFullName ());
- }
-
- List toDelete = new List ();
-
- foreach (XmlElement elem in SelectNodes ("objects/object")) {
- string name = elem.GetAttribute ("type");
- if (!tb_names.Contains (name))
- toDelete.Add (elem);
- }
-
- foreach (XmlElement elem in toDelete)
- elem.ParentNode.RemoveChild (elem);
-
- Save ();
- }
-
- void UpdateClass (WidgetParser parser, Stetic.Project stetic, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
- {
- string typeName = widgetClass.GetFullName();
- string basetypeName = GetBaseType (parser, widgetClass, stetic);
- XmlElement objectElem = (XmlElement) SelectSingleNode ("objects/object[@type='" + typeName + "']");
-
- if (objectElem == null) {
-
- // The widget class is not yet in the XML file. Create an element for it.
- objectElem = CreateElement ("object");
- objectElem.SetAttribute ("type", typeName);
- string category = widgetClass.GetComponentCategory();
- if (category == String.Empty)
- objectElem.SetAttribute ("palette-category", "General");
- else
- objectElem.SetAttribute ("palette-category", category);
- objectElem.SetAttribute ("allow-children", "false");
- if (wrapperClass != null)
- objectElem.SetAttribute ("wrapper", wrapperClass.GetFullName());
-
- // By default add a reference to Gtk.Widget properties and events
- XmlElement itemGroups = objectElem.OwnerDocument.CreateElement ("itemgroups");
- objectElem.AppendChild (itemGroups);
-
- itemGroups = objectElem.OwnerDocument.CreateElement ("signals");
- objectElem.AppendChild (itemGroups);
-
- objectElem.SetAttribute ("base-type", basetypeName);
- DocumentElement.AppendChild (objectElem);
- }
-
- UpdateObject (parser, basetypeName, objectElem, widgetClass, wrapperClass);
- }
-
- string GetBaseType (WidgetParser parser, ITypeSymbol widgetClass, Stetic.Project stetic)
- {
- string[] types = stetic.GetWidgetTypes ();
- Hashtable typesHash = new Hashtable ();
- foreach (string t in types)
- typesHash [t] = t;
-
- string ret = parser.GetBaseType (widgetClass, typesHash);
- return ret ?? "Gtk.Widget";
- }
-
- void UpdateObject (WidgetParser parser, string topType, XmlElement objectElem, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
- {
- if (widgetClass.DeclaredAccessibility == Accessibility.Public)
- objectElem.RemoveAttribute ("internal");
- else
- objectElem.SetAttribute ("internal", "true");
-
- ListDictionary properties = new ListDictionary ();
- ListDictionary events = new ListDictionary ();
-
- parser.CollectMembers (widgetClass, true, topType, properties, events);
- if (wrapperClass != null)
- parser.CollectMembers (wrapperClass, false, null, properties, events);
-
- foreach (IPropertySymbol prop in properties.Values)
- MergeProperty (parser, objectElem, prop);
-
- foreach (IEventSymbol ev in events.Values)
- MergeEvent (parser, objectElem, ev);
-
- // Remove old properties
- ArrayList toDelete = new ArrayList ();
- foreach (XmlElement xprop in objectElem.SelectNodes ("itemgroups/itemgroup/property")) {
- if (!properties.Contains (xprop.GetAttribute ("name")))
- toDelete.Add (xprop);
- }
-
- // Remove old signals
- foreach (XmlElement xevent in objectElem.SelectNodes ("signals/itemgroup/signal")) {
- if (!events.Contains (xevent.GetAttribute ("name")))
- toDelete.Add (xevent);
- }
-
- foreach (XmlElement el in toDelete) {
- XmlElement pe = (XmlElement) el.ParentNode;
- pe.RemoveChild (el);
- if (pe.ChildNodes.Count == 0)
- pe.ParentNode.RemoveChild (pe);
- }
- }
-
- void MergeProperty (WidgetParser parser, XmlElement objectElem, IPropertySymbol prop)
- {
- XmlElement itemGroups = objectElem ["itemgroups"];
- if (itemGroups == null) {
- itemGroups = objectElem.OwnerDocument.CreateElement ("itemgroups");
- objectElem.AppendChild (itemGroups);
- }
-
- string cat = prop.GetComponentCategory ();
- XmlElement itemGroup = GetItemGroup (prop.ContainingType, itemGroups, cat, "Properties");
-
- XmlElement propElem = (XmlElement) itemGroup.SelectSingleNode ("property[@name='" + prop.Name + "']");
- if (propElem == null) {
- propElem = itemGroup.OwnerDocument.CreateElement ("property");
- propElem.SetAttribute ("name", prop.Name);
- itemGroup.AppendChild (propElem);
- }
- }
-
- void MergeEvent (WidgetParser parser, XmlElement objectElem, IEventSymbol evnt)
- {
- XmlElement itemGroups = objectElem ["signals"];
- if (itemGroups == null) {
- itemGroups = objectElem.OwnerDocument.CreateElement ("signals");
- objectElem.AppendChild (itemGroups);
- }
-
- string cat = evnt.GetComponentCategory ();
- XmlElement itemGroup = GetItemGroup (evnt.ContainingType, itemGroups, cat, "Signals");
-
- XmlElement signalElem = (XmlElement) itemGroup.SelectSingleNode ("signal[@name='" + evnt.Name + "']");
- if (signalElem == null) {
- signalElem = itemGroup.OwnerDocument.CreateElement ("signal");
- signalElem.SetAttribute ("name", evnt.Name);
- itemGroup.AppendChild (signalElem);
- }
- }
-
- XmlElement GetItemGroup (ITypeSymbol cls, XmlElement itemGroups, string cat, string groupName)
- {
- XmlElement itemGroup;
-
- if (cat != "")
- itemGroup = (XmlElement) itemGroups.SelectSingleNode ("itemgroup[@name='" + cat + "']");
- else
- itemGroup = (XmlElement) itemGroups.SelectSingleNode ("itemgroup[(not(@name) or @name='') and not(@ref)]");
-
- if (itemGroup == null) {
- itemGroup = itemGroups.OwnerDocument.CreateElement ("itemgroup");
- if (cat != null && cat != "") {
- itemGroup.SetAttribute ("name", cat);
- itemGroup.SetAttribute ("label", cat);
- } else
- itemGroup.SetAttribute ("label", cls.Name + " " + groupName);
- itemGroups.AppendChild (itemGroup);
- }
- return itemGroup;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
deleted file mode 100644
index 6128a6a9bfa..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// ProjectResourceProvider.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.IO;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore
-{
- public class ProjectResourceProvider: MarshalByRefObject, Stetic.IResourceProvider
- {
- Project project;
-
- public ProjectResourceProvider (Project project)
- {
- this.project = project;
- }
-
- public Stetic.ResourceInfo[] GetResources ()
- {
- ArrayList list = new ArrayList ();
- foreach (ProjectFile file in project.Files) {
- if (file.BuildAction == BuildAction.EmbeddedResource)
- list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, DesktopService.GetMimeTypeForUri (file.Name)));
- }
- return (Stetic.ResourceInfo[]) list.ToArray (typeof(Stetic.ResourceInfo));
- }
-
- public Stream GetResourceStream (string resourceName)
- {
- foreach (ProjectFile file in project.Files) {
- if (resourceName == file.ResourceId)
- return File.OpenRead (file.Name);
- }
- return null;
- }
-
- public Stetic.ResourceInfo AddResource (string fileName)
- {
- ProjectFile file = project.AddFile (fileName, BuildAction.EmbeddedResource);
- IdeApp.ProjectOperations.SaveAsync (project);
- return new Stetic.ResourceInfo (file.ResourceId, fileName);
- }
-
- public void RemoveResource (string resourceName)
- {
- foreach (ProjectFile file in project.Files) {
- if (resourceName == file.ResourceId) {
- project.Files.Remove (file);
- IdeApp.ProjectOperations.SaveAsync (project);
- return;
- }
- }
- }
-
- public override object InitializeLifetimeService ()
- {
- return null;
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
deleted file mode 100644
index 4f6ead6eabc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-// ReferenceManager.cs
-//
-// Author: Mike Kestner
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.GtkCore {
-
- public class ReferenceManager : IDisposable {
-
- DotNetProject project;
-
- public ReferenceManager (DotNetProject project)
- {
- this.project = project;
- project.AssemblyContext.Changed += ResetSupportedVersions;
- }
-
- public void Dispose ()
- {
- project.AssemblyContext.Changed -= ResetSupportedVersions;
- project = null;
- }
-
- void ResetSupportedVersions (object o, EventArgs a)
- {
- supported_versions = null;
- }
-
- string CurrentAssemblyVersion {
- get {
- foreach (ProjectReference pref in project.References) {
- if (!IsGtkReference (pref))
- continue;
- string val = pref.StoredReference;
- int idx = val.IndexOf (",") + 1;
- return val.Substring (idx).Trim ();
- }
- return String.Empty;
- }
- }
-
- public string GtkPackageVersion {
- get { return GetGtkPackageVersion (CurrentAssemblyVersion); }
- set {
- if (String.IsNullOrEmpty (value))
- throw new ArgumentException ("value");
-
- Update (GetGtkAssemblyVersion (value));
- }
- }
-
- public string TargetGtkVersion {
- get {
- string assm_version = CurrentAssemblyVersion;
- if (String.IsNullOrEmpty (assm_version))
- return String.Empty;
- int idx = assm_version.IndexOf (",");
- if (idx > 0)
- assm_version = assm_version.Substring (0, idx);
- idx = assm_version.IndexOf ("=");
- if (idx > 0)
- assm_version = assm_version.Substring (idx + 1);
- string[] toks = assm_version.Split ('.');
- if (toks.Length > 1)
- return toks[0] + "." + toks[1];
- return String.Empty;
- }
- }
-
- string GetGtkAssemblyVersion (string pkg_version)
- {
- if (String.IsNullOrEmpty (pkg_version))
- return String.Empty;
-
- pkg_version = pkg_version + ".";
- foreach (SystemAssembly asm in project.AssemblyContext.GetAssemblies ()) {
- if (asm.Name == "gtk-sharp" && asm.Version.StartsWith (pkg_version)) {
- int i = asm.FullName.IndexOf (',');
- return asm.FullName.Substring (i+1).Trim ();
- }
- }
- return string.Empty;
- }
-
- string GetGtkPackageVersion (string assembly_version)
- {
- if (String.IsNullOrEmpty (assembly_version))
- return String.Empty;
-
- int i = assembly_version.IndexOf ('=');
- assembly_version = assembly_version.Substring (i+1);
- return GetVersionPrefix (assembly_version);
- }
-
- public bool Update ()
- {
- return Update (CurrentAssemblyVersion);
- }
-
- bool Update (string assm_version)
- {
- if (assm_version == null)
- throw new ArgumentException (assm_version);
-
- bool changed = false;
- updating = true;
-
- bool gdk = false, gtk = false, posix = false;
-
- foreach (ProjectReference r in new List (project.References)) {
- if (r.ReferenceType != ReferenceType.Package)
- continue;
- string name = GetReferenceName (r);
- if (name == "gdk-sharp")
- gdk = true;
- if (name == "gtk-sharp")
- gtk = true;
- else if (name == "Mono.Posix")
- posix = true;
-
- // Is a gtk-sharp-2.0 assembly?
- if (Array.IndexOf (gnome_assemblies, name) == -1)
- continue;
-
- string sr = r.StoredReference;
- string version = sr.Substring (sr.IndexOf (",") + 1).Trim ();
- if (version != assm_version) {
- project.References.Remove (r);
- if (name == "gnome-sharp" && assm_version == "Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f") {
- project.References.Add (ProjectReference.CreateAssemblyReference (name + ", Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"));
- } else {
- project.References.Add (ProjectReference.CreateAssemblyReference (name + ", " + assm_version));
- }
- changed = true;
- }
- }
-
- if (!gtk) {
- project.References.Add (ProjectReference.CreateAssemblyReference ("gtk-sharp" + ", " + assm_version));
- project.ExtendedProperties ["GtkReferenceExists"] = true;
- changed = true;
- }
-
- if (!GtkDesignInfo.HasDesignedObjects (project))
- return changed;
-
- GtkDesignInfo info = GtkDesignInfo.FromProject (project);
- if (!gdk) {
- project.References.Add (ProjectReference.CreateAssemblyReference ("gdk-sharp" + ", " + assm_version));
- changed = true;
- }
-
- if (!posix && info.GenerateGettext && info.GettextClass == "Mono.Unix.Catalog") {
- // Add a reference to Mono.Posix. Use the version for the selected project's runtime version.
- string aname = project.AssemblyContext.FindInstalledAssembly ("Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756", null, project.TargetFramework);
- if (aname != null) {
- aname = project.AssemblyContext.GetAssemblyNameForVersion (aname, project.TargetFramework);
- if (aname != null) {
- project.References.Add (ProjectReference.CreateAssemblyReference (aname));
- changed = true;
- }
- }
- }
- updating = false;
- return changed;
- }
-
- static bool updating;
- static string[] gnome_assemblies = new string [] {
- "art-sharp", "atk-sharp", "gconf-sharp", "gdk-sharp",
- "glade-sharp","glib-sharp", "gnome-sharp",
- "gnome-vfs-sharp", "gtk-dotnet", "gtkhtml-sharp",
- "gtk-sharp", "pango-sharp", "rsvg-sharp"
- };
-
- public static void Initialize ()
- {
- IdeApp.Workspace.ReferenceAddedToProject += OnReferenceAdded;
- IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceRemoved;
- }
-
- static void OnReferenceAdded (object o, ProjectReferenceEventArgs args)
- {
- if (updating || !IsGtkReference (args.ProjectReference))
- return;
-
- args.Project.ExtendedProperties ["GtkReferenceExists"] = true;
- string sr = args.ProjectReference.StoredReference;
- string version = sr.Substring (sr.IndexOf (",") + 1).Trim ();
- ReferenceManager rm = new ReferenceManager (args.Project as DotNetProject);
- rm.Update (version);
- }
-
- static void OnReferenceRemoved (object o, ProjectReferenceEventArgs args)
- {
- if (updating || !IsGtkReference (args.ProjectReference))
- return;
-
- DotNetProject dnp = args.Project as DotNetProject;
-
- if (MessageService.Confirm (GettextCatalog.GetString ("The Gtk# User Interface designer will be disabled by removing the gtk-sharp reference."), new AlertButton (GettextCatalog.GetString ("Disable Designer")))) {
- dnp.ExtendedProperties ["GtkReferenceExists"] = false;
- GtkDesignInfo.DisableProject (dnp);
- } else
- dnp.References.Add (ProjectReference.CreateAssemblyReference (args.ProjectReference.StoredReference));
- }
-
- static string GetReferenceName (ProjectReference pref)
- {
- string stored = pref.StoredReference;
- int idx = stored.IndexOf (",");
- if (idx == -1)
- return stored.Trim ();
-
- return stored.Substring (0, idx).Trim ();
- }
-
- static bool IsGtkReference (ProjectReference pref)
- {
- if (pref.ReferenceType != ReferenceType.Package)
- return false;
-
- return pref.StoredReference.StartsWith ("gtk-sharp,", StringComparison.Ordinal);
- }
-
- public static bool HasGtkReference (DotNetProject project)
- {
- foreach (ProjectReference pref in project.References)
- if (IsGtkReference (pref))
- return true;
- return false;
- }
-
- List supported_versions;
- string default_version;
-
- public string DefaultGtkVersion {
- get {
- if (SupportedGtkVersions.Count > 0 && default_version == null)
- default_version = SupportedGtkVersions [0];
- return default_version;
- }
- }
-
- public List SupportedGtkVersions {
- get {
- if (supported_versions == null) {
- supported_versions = new List ();
- foreach (SystemAssembly asm in project.AssemblyContext.GetAssemblies ()) {
- if (asm.Name == "gtk-sharp") {
- string v = GetVersionPrefix (asm.Version);
- if (!supported_versions.Contains (v))
- supported_versions.Add (v);
- if (v == "2.8")
- default_version = v;
- }
- }
- supported_versions.Sort ();
- }
- return supported_versions;
- }
- }
-
- string GetVersionPrefix (string version)
- {
- int i = version.IndexOf ('.');
- i = version.IndexOf ('.', i + 1);
- return version.Substring (0, i);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
deleted file mode 100644
index dd0685c8b2d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// WidgetFileDescriptionTemplate.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using System.Xml;
-
-using MonoDevelop.Core;
-using MonoDevelop.GtkCore.GuiBuilder;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Templates;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.GtkCore
-{
- public class WidgetFileDescriptionTemplate: FileDescriptionTemplate
- {
- SingleFileDescriptionTemplate fileTemplate;
- XmlElement steticTemplate;
-
- public override string Name {
- get { return "Widget"; }
- }
-
- public override void Load (XmlElement filenode, FilePath baseDirectory)
- {
- foreach (XmlNode node in filenode.ChildNodes) {
- XmlElement elem = node as XmlElement;
- if (elem == null) continue;
-
- if (elem.Name == "SteticTemplate") {
- if (steticTemplate != null)
- throw new InvalidOperationException ("Widget templates can't contain more than one SteticTemplate element");
- steticTemplate = elem;
- } else if (fileTemplate == null) {
- fileTemplate = FileDescriptionTemplate.CreateTemplate (elem, baseDirectory) as SingleFileDescriptionTemplate;
- if (fileTemplate == null)
- throw new InvalidOperationException ("Widget templates can only contain single-file and stetic templates.");
- }
- }
- if (fileTemplate == null)
- throw new InvalidOperationException ("File template not found in widget template.");
- if (steticTemplate == null)
- throw new InvalidOperationException ("Stetic template not found in widget template.");
- }
-
- public override bool SupportsProject (Project project, string projectPath)
- {
- return (project is DotNetProject) && GtkDesignInfo.SupportsRefactoring (project as DotNetProject);
- }
-
- public override async Task AddToProjectAsync (SolutionFolderItem policyParent, Project project, string language, string directory, string name)
- {
- if (!GtkDesignInfo.SupportsDesigner (project)) {
- ReferenceManager mgr = new ReferenceManager (project as DotNetProject);
- mgr.GtkPackageVersion = mgr.DefaultGtkVersion;
- mgr.Dispose ();
- }
-
- GtkDesignInfo info = GtkDesignInfo.FromProject ((DotNetProject) project);
-
- GuiBuilderProject gproject = info.GuiBuilderProject;
-
- string fileName = fileTemplate.GetFileName (policyParent, project, language, directory, name);
- await fileTemplate.AddToProjectAsync (policyParent, project, language, directory, name);
-
- DotNetProject netProject = project as DotNetProject;
- string ns = netProject != null ? netProject.GetDefaultNamespace (fileName) : "";
- string cname = Path.GetFileNameWithoutExtension (fileName);
- string fullName = ns.Length > 0 ? ns + "." + cname : cname;
- string[,] tags = {
- {"Name", cname},
- {"Namespace", ns},
- {"FullName", fullName}
- };
-
- XmlElement widgetElem = steticTemplate ["widget"];
- if (widgetElem != null) {
- string content = widgetElem.OuterXml;
- content = StringParserService.Parse (content, tags);
-
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml (content);
-
- gproject.AddNewComponent (doc.DocumentElement);
- gproject.SaveAll (false);
- IdeApp.ProjectOperations.SaveAsync (project).Ignore ();
- return true;
- }
-
- widgetElem = steticTemplate ["action-group"];
- if (widgetElem != null) {
- string content = widgetElem.OuterXml;
- content = StringParserService.Parse (content, tags);
-
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml (content);
-
- gproject.SteticProject.AddNewActionGroup (doc.DocumentElement);
- gproject.SaveAll (false);
- IdeApp.ProjectOperations.SaveAsync (project).Ignore ();
- return true;
- }
-
- throw new InvalidOperationException (" or element not found in widget template.");
- }
-
- public override void Show ()
- {
- fileTemplate.Show ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
deleted file mode 100644
index 5b6b642216d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// ObjectsDocument.cs
-//
-// Authors:
-// Lluis Sanchez Gual
-// Mike Kestner
-//
-// Copyright (C) 2006-2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Xml;
-using System.CodeDom;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using MonoDevelop.Ide.TypeSystem;
-using Microsoft.CodeAnalysis;
-using System.Linq;
-using ICSharpCode.NRefactory6.CSharp;
-
-namespace MonoDevelop.GtkCore
-{
-
- public class WidgetParser
- {
- Compilation ctx;
-
- public Compilation Ctx {
- get {
- return ctx;
- }
- }
-
- public WidgetParser (Compilation ctx)
- {
- this.ctx = ctx;
- }
-
- static bool IsWidget(INamedTypeSymbol type)
- {
- if (type.SpecialType == SpecialType.System_Object)
- return false;
- if (type.GetFullName () == "Gtk.Widget")
- return true;
-
- return IsWidget (type.BaseType);
- }
-
- public Dictionary GetToolboxItems ()
- {
- var tb_items = new Dictionary ();
-
- foreach (var t in ctx.GetAllTypesInMainAssembly ()) {
- if (t.IsToolboxItem() && IsWidget(t))
- tb_items [t.GetFullName ()] = t;
- }
-
- return tb_items;
- }
-
- public void CollectMembers (ITypeSymbol cls, bool inherited, string topType, ListDictionary properties, ListDictionary events)
- {
- if (cls.GetFullName () == topType)
- return;
-
- foreach (var prop in cls.GetMembers ().OfType ())
- if (IsBrowsable (prop))
- properties [prop.Name] = prop;
-
- foreach (var ev in cls.GetMembers ().OfType ())
- if (IsBrowsable (ev))
- events [ev.Name] = ev;
-
- if (inherited) {
- CollectMembers (cls.BaseType, true, topType, properties, events);
- }
- }
-
- public string GetBaseType (ITypeSymbol cls, Hashtable knownTypes)
- {
- if (cls.SpecialType == SpecialType.System_Object)
- return null;
- if (knownTypes.Contains (cls.BaseType.GetFullName ()))
- return cls.BaseType.GetFullName ();
- return GetBaseType (cls.BaseType, knownTypes);
- }
-
-
- public INamedTypeSymbol GetClass (string classname)
- {
- return ctx.GetTypeByMetadataName (classname);
- }
-
- public bool IsBrowsable (ISymbol member)
- {
- if (member.DeclaredAccessibility != Accessibility.Public)
- return false;
-
- var prop = member as IPropertySymbol;
- if (prop != null) {
- if (prop.GetMethod == null || prop.SetMethod == null)
- return false;
- if (Array.IndexOf (supported_types, prop.Type.GetFullName ()) == -1)
- return false;
- }
-
- return member.IsDesignerBrowsable ();
- }
-
- static string[] supported_types = new string[] {
- "System.Boolean",
- "System.Char",
- "System.SByte",
- "System.Byte",
- "System.Int16",
- "System.UInt16",
- "System.Int32",
- "System.UInt32",
- "System.Int64",
- "System.UInt64",
- "System.Decimal",
- "System.Single",
- "System.Double",
- "System.DateTime",
- "System.String",
- "System.TimeSpan",
- "Gtk.Adjustment",
- };
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/gui.glade b/main/src/addins/MonoDevelop.GtkCore/gui.glade
deleted file mode 100644
index 92f5740b919..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/gui.glade
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-
-
-
-
-
- True
- GUI Designer
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- 549
- True
- The class that was bound to the design currently edited could not be found. Please select the class you want to bind to the design:
- False
- False
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK_POLICY_ALWAYS
- GTK_POLICY_ALWAYS
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- False
- True
- False
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Bind Widget Design
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- The widget design {0} is not currently bound to a class.
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- Bind the design to an existing class
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- 24
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- Select a class:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- True
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- Create a new class
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
- radioSelect
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- 3
- 3
- False
- 6
- 6
-
-
-
- True
- Name:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 0
- 1
- fill
-
-
-
-
-
-
- True
- Namespace:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 1
- 2
- fill
-
-
-
-
-
-
- True
- Location:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 1
- 2
- 2
- 3
- fill
-
-
-
-
-
-
- 24
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 2
- 3
- 0
- 1
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 2
- 3
- 1
- 2
-
-
-
-
-
-
- True
- True
- False
-
-
-
-
-
-
- 2
- 3
- 2
- 3
- fill
- fill
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- MonoDevelop
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-no
- True
- GTK_RELIEF_NORMAL
- True
- -9
-
-
-
-
-
- True
- True
- True
- gtk-yes
- True
- GTK_RELIEF_NORMAL
- True
- -8
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 12
- True
- False
- 12
-
-
-
- True
- gtk-dialog-question
- 6
- 0.5
- 0
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- Are you sure you want to delete the window '{0}'?
- False
- False
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- Also remove the file '{0}'
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/icons/actiongroup.png b/main/src/addins/MonoDevelop.GtkCore/icons/actiongroup.png
deleted file mode 100644
index de43e0a5c44..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/icons/actiongroup.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/icons/dialog.png b/main/src/addins/MonoDevelop.GtkCore/icons/dialog.png
deleted file mode 100644
index 6e81b2fd601..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/icons/dialog.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/icons/image-x-generic.png b/main/src/addins/MonoDevelop.GtkCore/icons/image-x-generic.png
deleted file mode 100644
index 68da5027cf1..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/icons/image-x-generic.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/icons/widget.png b/main/src/addins/MonoDevelop.GtkCore/icons/widget.png
deleted file mode 100644
index 7f5844bbfc1..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/icons/widget.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/icons/window.png b/main/src/addins/MonoDevelop.GtkCore/icons/window.png
deleted file mode 100644
index 8f82250f04f..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/icons/window.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ClassDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ClassDescriptor.cs
deleted file mode 100644
index 29a1f9a5939..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ClassDescriptor.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Xml;
-
-namespace Stetic {
-
-
- public abstract class ClassDescriptor
- {
- protected string label, category, cname;
- protected bool deprecated, hexpandable, vexpandable, allowChildren = true;
-
- protected ItemGroupCollection groups = new ItemGroupCollection ();
- protected ItemGroupCollection signals = new ItemGroupCollection ();
-
- protected int importantGroups;
- protected ItemGroup contextMenu;
- protected ItemGroup internalChildren;
- protected string baseType;
- protected bool isInternal;
- protected string targetGtkVersion;
-
- WidgetLibrary library;
- PropertyDescriptor[] initializationProperties;
- static PropertyDescriptor[] emptyPropArray = new PropertyDescriptor[0];
-
- int counter;
-
- protected void Load (XmlElement elem)
- {
- if (elem.HasAttribute ("cname"))
- cname = elem.GetAttribute ("cname");
- else if (cname == null)
- cname = elem.GetAttribute ("type");
-
- label = elem.GetAttribute ("label");
- if (label == "") {
- label = WrappedTypeName;
- int i = label.LastIndexOf ('.');
- if (i != -1)
- label = label.Substring (i+1);
- }
-
- if (elem.HasAttribute ("allow-children"))
- allowChildren = elem.GetAttribute ("allow-children") == "yes" || elem.GetAttribute ("allow-children") == "true";
-
- category = elem.GetAttribute ("palette-category");
-
- if (elem.HasAttribute ("deprecated"))
- deprecated = true;
- if (elem.HasAttribute ("hexpandable"))
- hexpandable = true;
- if (elem.HasAttribute ("vexpandable"))
- vexpandable = true;
- if (elem.GetAttribute ("internal") == "true")
- isInternal = true;
-
- contextMenu = ItemGroup.Empty;
-
- baseType = elem.GetAttribute ("base-type");
- if (baseType.Length > 0) {
- ClassDescriptor basec = Registry.LookupClassByName (baseType);
- if (basec == null)
- throw new InvalidOperationException ("Base type '" + baseType + "' not found.");
- foreach (ItemGroup group in basec.ItemGroups)
- groups.Add (group);
- foreach (ItemGroup group in basec.SignalGroups)
- signals.Add (group);
- contextMenu = basec.ContextMenu;
- } else
- baseType = null;
-
- XmlElement groupsElem = elem["itemgroups"];
- if (groupsElem != null) {
- foreach (XmlElement groupElem in groupsElem.SelectNodes ("itemgroup")) {
- ItemGroup itemgroup;
-
- if (groupElem.HasAttribute ("ref")) {
- string refname = groupElem.GetAttribute ("ref");
- itemgroup = Registry.LookupItemGroup (refname);
- } else
- itemgroup = new ItemGroup (groupElem, this);
- groups.Add (itemgroup);
-
- if (groupElem.HasAttribute ("important")) {
- if (groupElem.GetAttribute ("important") == "true")
- importantGroups++;
- } else if (groups.Count == 1)
- importantGroups++;
- }
- }
-
- XmlElement signalsElem = elem["signals"];
- if (signalsElem != null) {
- foreach (XmlElement groupElem in signalsElem.SelectNodes ("itemgroup")) {
- ItemGroup itemgroup;
- if (groupElem.HasAttribute ("ref")) {
- string refname = groupElem.GetAttribute ("ref");
- itemgroup = Registry.LookupSignalGroup (refname);
- } else
- itemgroup = new ItemGroup (groupElem, this);
- signals.Add (itemgroup);
- }
- }
-
- XmlElement contextElem = elem["contextmenu"];
- if (contextElem != null) {
- if (contextElem.HasAttribute ("ref")) {
- string refname = contextElem.GetAttribute ("ref");
- contextMenu = Registry.LookupContextMenu (refname);
- } else
- contextMenu = new ItemGroup (contextElem, this);
- }
-
- XmlElement ichildElem = elem["internal-children"];
- if (ichildElem != null)
- internalChildren = new ItemGroup (ichildElem, this);
- else
- internalChildren = ItemGroup.Empty;
-
- string initProps = elem.GetAttribute ("init-properties");
- if (initProps.Length > 0) {
- string[] props = initProps.Split (' ');
- ArrayList list = new ArrayList ();
- foreach (string prop in props) {
- PropertyDescriptor idesc = this [prop] as PropertyDescriptor;
- if (idesc == null)
- throw new InvalidOperationException ("Initialization property not found: " + prop);
- list.Add (idesc);
- }
- initializationProperties = (PropertyDescriptor[]) list.ToArray (typeof(PropertyDescriptor));
- } else
- initializationProperties = emptyPropArray;
-
- targetGtkVersion = elem.GetAttribute ("gtk-version");
- if (targetGtkVersion.Length == 0)
- targetGtkVersion = null;
- }
-
- public virtual string Name {
- get {
- return WrappedTypeName;
- }
- }
-
- public virtual bool IsInternal {
- get { return isInternal; }
- }
-
- public abstract string WrappedTypeName {
- get;
- }
-
- public string CName {
- get {
- return cname;
- }
- }
-
- public bool Deprecated {
- get {
- return deprecated;
- }
- }
-
- public bool HExpandable {
- get {
- return hexpandable;
- }
- }
-
- public bool VExpandable {
- get {
- return vexpandable;
- }
- }
-
- public string Label {
- get {
- return label;
- }
- }
-
- public abstract Gdk.Pixbuf Icon {
- get;
- }
-
- public string Category {
- get {
- return category;
- }
- }
-
- public virtual string TargetGtkVersion {
- get {
- if (targetGtkVersion == null)
- return library.TargetGtkVersion;
- else
- return targetGtkVersion;
- }
- }
-
- public bool SupportsGtkVersion (string targetVersion)
- {
- return WidgetUtils.CompareVersions (TargetGtkVersion, targetVersion) >= 0;
- }
-
- public PropertyDescriptor[] InitializationProperties {
- get { return initializationProperties; }
- }
-
- public object NewInstance (IProject proj)
- {
- return NewInstance (proj, true);
- }
-
- public object NewInstance (IProject proj, bool initialize)
- {
- object ob = CreateInstance (proj);
-
- string name = WrappedTypeName.ToLower () + (++counter).ToString ();
- int i = name.LastIndexOf ('.');
- if (i != -1) {
- if (i < name.Length)
- name = name.Substring (i+1);
- else
- name = name.Replace (".", "");
- }
-
- ObjectWrapper ow = CreateWrapper ();
- try {
- ow.Loading = true;
- ObjectWrapper.Bind (proj, this, ow, ob, !initialize);
-
- // Initialize the properties after creating the wrapper, since some properties
- // may be implemented in the wrapper
-
- foreach (ItemGroup group in groups) {
- foreach (ItemDescriptor item in group) {
- PropertyDescriptor prop = item as PropertyDescriptor;
- if (prop != null && prop.InitWithName) {
- prop.SetValue (ob, name);
- }
- }
- }
- }
- finally {
- ow.Loading = false;
- }
-
- return ob;
- }
-
- // Sets the default values for an instance
- public virtual void ResetInstance (object obj)
- {
- foreach (ItemGroup group in groups) {
- foreach (ItemDescriptor item in group) {
- PropertyDescriptor prop = item as PropertyDescriptor;
- if (prop != null) {
- try {
- prop.ResetValue (obj);
- } catch (Exception ex) {
- // Ignore. ResetInstance should never crash since it can
- // leave a widget half initialized
- Console.WriteLine (ex);
- }
- }
- }
- }
- }
-
- public abstract object CreateInstance (IProject proj);
-
- public abstract ObjectWrapper CreateWrapper ();
-
- public ItemDescriptor this[string name] {
- get {
- if (groups != null) {
- foreach (ItemGroup group in groups) {
- ItemDescriptor item = group[name];
- if (item != null)
- return item;
- }
- }
-
- return null;
- }
- }
-
- public ItemGroupCollection ItemGroups {
- get {
- return groups;
- }
- }
-
- public ItemGroupCollection SignalGroups {
- get {
- return signals;
- }
- }
-
- public int ImportantGroups {
- get {
- return importantGroups;
- }
- }
-
- public ItemGroup ContextMenu {
- get {
- return contextMenu;
- }
- }
-
- public ItemGroup InternalChildren {
- get {
- return internalChildren;
- }
- }
-
- public WidgetLibrary Library {
- get { return library; }
- }
-
- public virtual bool AllowChildren {
- get { return allowChildren; }
- }
-
- internal protected virtual ItemDescriptor CreateItemDescriptor (XmlElement elem, ItemGroup group)
- {
- if (elem.Name == "command")
- return new CommandDescriptor (elem, group, this);
- else
- throw new ApplicationException ("Bad item name " + elem.Name + " in " + WrappedTypeName);
- }
-
- internal void SetLibrary (WidgetLibrary library)
- {
- this.library = library;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/Clipboard.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/Clipboard.cs
deleted file mode 100644
index 9c27ceec405..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/Clipboard.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Gtk;
-using System;
-using System.Xml;
-
-namespace Stetic {
-
- internal static class Clipboard {
-
- const int SteticType = 0;
- const int TextType = 1;
-
- static Gtk.TargetEntry[] targets;
- static Gtk.TargetEntry[] Targets {
- get {
- if (targets == null) {
-#if GTK_SHARP_2_6
- Gtk.TargetList list = new Gtk.TargetList ();
- list.Add ((string)WidgetUtils.ApplicationXSteticAtom, 0, SteticType);
- list.AddTextTargets (TextType);
- targets = (Gtk.TargetEntry[])list;
-#else
- targets = new Gtk.TargetEntry[] {
- new Gtk.TargetEntry ((string)WidgetUtils.ApplicationXSteticAtom, 0, SteticType)
- };
-#endif
- }
- return targets;
- }
- }
-
- static Gtk.Clipboard MainClipboard {
- get {
- return Gtk.Clipboard.Get (Gdk.Selection.Clipboard);
- }
- }
-
- static XmlElement selection;
-
- static void ClipboardGet (Gtk.Clipboard clipboard, Gtk.SelectionData seldata, uint info)
- {
- if (selection == null)
- return;
-
- if (info == TextType)
- seldata.Text = selection.OuterXml;
- else
- seldata.Set (WidgetUtils.ApplicationXSteticAtom, 8, System.Text.Encoding.UTF8.GetBytes (selection.OuterXml));
- }
-
- static void ClipboardClear (Gtk.Clipboard clipboard)
- {
- selection = null;
- }
-
- public static void Copy (Gtk.Widget widget)
- {
- MainClipboard.SetWithData (Targets, ClipboardGet, ClipboardClear);
- selection = widget != null ? WidgetUtils.ExportWidget (widget) : null;
- }
-
- public static void Cut (Gtk.Widget widget)
- {
- Copy (widget);
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (widget);
- if (wrapper != null)
- wrapper.Delete ();
- }
-
- static Placeholder target;
-
- static void ClipboardPaste (Gtk.Clipboard clipboard, Gtk.SelectionData seldata)
- {
- Stetic.Wrapper.Container parent = Stetic.Wrapper.Container.LookupParent (target);
- if (parent == null)
- return;
-
- Stetic.Wrapper.Widget wrapper = WidgetUtils.Paste (parent.Project, seldata);
- if (wrapper == null)
- return;
-
- parent.PasteChild (target, wrapper.Wrapped);
- target = null;
- }
-
- public static void Paste (Placeholder target)
- {
- Clipboard.target = target;
- MainClipboard.RequestContents (WidgetUtils.ApplicationXSteticAtom, ClipboardPaste);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/CommandDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/CommandDescriptor.cs
deleted file mode 100644
index eadd8b39700..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/CommandDescriptor.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-
-namespace Stetic {
-
- public class CommandDescriptor : ItemDescriptor {
-
- string name, checkName, label, description, icon;
-
- const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
- public CommandDescriptor (XmlElement elem, ItemGroup group, ClassDescriptor klass) : base (elem, group, klass)
- {
- name = elem.GetAttribute ("name");
- label = elem.GetAttribute ("label");
- description = elem.GetAttribute ("description");
- checkName = elem.GetAttribute ("check");
- icon = elem.GetAttribute ("icon");
- }
-
- public override string Name {
- get {
- return name;
- }
- }
-
- public string Label {
- get {
- return label;
- }
- }
-
- public string Description {
- get {
- return description;
- }
- }
-
- public bool IsToggleCommand (object obj)
- {
- object target;
- return (FindBoolProperty (obj, out target) != null);
- }
-
- public bool IsToogled (object obj)
- {
- object target;
- PropertyInfo prop = FindBoolProperty (obj, out target);
- return prop != null && (bool) prop.GetValue (target, null);
- }
-
- PropertyInfo FindBoolProperty (object obj, out object target)
- {
- PropertyInfo prop = obj.GetType().GetProperty (name, flags);
- if (prop != null && prop.PropertyType == typeof(bool)) {
- target = obj;
- return prop;
- }
-
- ObjectWrapper wrap = ObjectWrapper.Lookup (obj);
- if (wrap != null) {
- prop = wrap.GetType().GetProperty (name, flags);
- if (prop != null && prop.PropertyType == typeof(bool)) {
- target = wrap;
- return prop;
- }
- }
- target = null;
- return null;
- }
-
- public Gtk.Image GetImage ()
- {
- if (icon == null || icon.Length == 0)
- return null;
- if (icon.StartsWith ("res:")) {
- System.IO.Stream s = this.ClassDescriptor.Library.GetResource (icon.Substring (4));
- if (s == null)
- return null;
- using (s) {
- Gdk.Pixbuf pixbuf;
- try {
- pixbuf = new Gdk.Pixbuf (s);
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf '" + icon.Substring (4) + "': " + e);
- return null;
- }
- return new Gtk.Image (pixbuf);
- }
- } else {
- return new Gtk.Image (icon, Gtk.IconSize.Menu);
- }
- }
-
- public bool Enabled (object obj)
- {
- if (checkName == "")
- return EnabledFor (obj);
- else
- return (bool) InvokeMethod (ObjectWrapper.Lookup (obj), checkName, null, false);
- }
-
- public bool Enabled (object obj, Gtk.Widget context)
- {
- if (checkName == "")
- return EnabledFor (obj);
-
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- return (bool) InvokeMethod (wrapper, checkName, context, true);
- }
-
- public void Run (object obj)
- {
- ObjectWrapper ww = ObjectWrapper.Lookup (obj);
- using (ww.UndoManager.AtomicChange) {
- InvokeMethod (ww, name, null, false);
- }
- }
-
- public void Run (object obj, Gtk.Widget context)
- {
- ObjectWrapper ww = ObjectWrapper.Lookup (obj);
- using (ww.UndoManager.AtomicChange) {
- InvokeMethod (ww, name, context, true);
- }
- }
-
- object InvokeMethod (object target, string name, object context, bool withContext)
- {
- object ptarget;
- PropertyInfo prop = FindBoolProperty (target, out ptarget);
- if (prop != null) {
- prop.SetValue (ptarget, !(bool)prop.GetValue (ptarget, null), null);
- return null;
- }
-
- if (withContext) {
- MethodInfo metc = target.GetType().GetMethod (name, flags, null, new Type[] {typeof(Gtk.Widget)}, null);
- if (metc != null)
- return metc.Invoke (target, new object[] { context });
- }
-
- MethodInfo met = target.GetType().GetMethod (name, flags, null, Type.EmptyTypes, null);
- if (met != null)
- return met.Invoke (target, new object[0]);
-
- throw new ArgumentException ("Invalid command or checker name. Method '" + name +"' not found in class '" + target.GetType() + "'");
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/CustomWidget.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/CustomWidget.cs
deleted file mode 100644
index f9f39343432..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/CustomWidget.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- // This widget is used at design-time to represent a Gtk.Bin container.
- // Gtk.Bin is the base class for custom widgets.
-
- public class CustomWidget: Gtk.EventBox
- {
- public CustomWidget (IntPtr ptr): base (ptr)
- {
- }
-
- public CustomWidget ()
- {
- this.VisibleWindow = false;
- this.Events |= Gdk.EventMask.ButtonPressMask;
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- // Avoid forwarding event to parent widget
- return true;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/DND.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/DND.cs
deleted file mode 100644
index e9f98e5a343..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/DND.cs
+++ /dev/null
@@ -1,636 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic {
-
- public static class DND {
- static Gtk.TargetEntry[] targets;
- static Gtk.TargetList targetList;
- static Gdk.Atom steticWidgetType;
- static Gdk.Pixbuf widgetIcon;
-
- const int SteticType = 0;
- const int GladeType = 1;
-
- static DND ()
- {
- try {
- widgetIcon = Gdk.Pixbuf.LoadFromResource ("widget.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf 'widget.png': " + e);
- }
-
- steticWidgetType = Gdk.Atom.Intern ("application/x-stetic-widget", false);
-
- targets = new Gtk.TargetEntry[2];
- targets[0] = new Gtk.TargetEntry (steticWidgetType, 0, SteticType);
- targets[1] = new Gtk.TargetEntry ((string) GladeUtils.ApplicationXGladeAtom, 0, GladeType);
-
- targetList = new Gtk.TargetList (targets);
- targets = (Gtk.TargetEntry[]) targetList;
- }
-
- public static Gtk.TargetEntry[] Targets {
- get { return targets; }
- }
-
- public static void SourceSet (Gtk.Widget source)
- {
- Gtk.Drag.SourceSet (source, Gdk.ModifierType.Button1Mask,
- targets, Gdk.DragAction.Move);
- }
-
- public static void SourceUnset (Gtk.Widget source)
- {
- Gtk.Drag.SourceUnset (source);
- }
-
- public static void DestSet (Gtk.Widget dest, bool automatic)
- {
- Gtk.Drag.DestSet (dest, automatic ? Gtk.DestDefaults.All : 0,
- targets, Gdk.DragAction.Move | Gdk.DragAction.Copy);
- }
-
- public static void DestUnset (Gtk.Widget dest)
- {
- Gtk.Drag.DestUnset (dest);
- }
-
- static Gtk.Widget dragWidget;
- static WidgetDropCallback dropCallback;
- static int dragHotX;
- static int dragHotY;
-
- // Drag function for non-automatic sources, called from MotionNotifyEvent
- public static void Drag (Gtk.Widget source, Gdk.Event evt, Gtk.Widget dragWidget)
- {
- Gdk.DragContext ctx;
-
- ctx = Gtk.Drag.Begin (source, targetList, Gdk.DragAction.Move,
- 1 /* button */, evt);
- Drag (source, ctx, dragWidget);
- }
-
- // Drag function for automatic sources, called from DragBegin
- public static void Drag (Gtk.Widget source, Gdk.DragContext ctx, WidgetDropCallback dropCallback, string label)
- {
- Gtk.Frame fr = new Gtk.Frame ();
- fr.ShadowType = Gtk.ShadowType.Out;
- Gtk.HBox box = new Gtk.HBox ();
- box.Spacing = 3;
- box.BorderWidth = 3;
- box.PackStart (new Gtk.Image (widgetIcon), false, false, 0);
- Gtk.Label lab = new Gtk.Label (label);
- lab.Xalign = 0;
- box.PackStart (lab, true, true, 0);
- fr.Add (box);
- fr.ShowAll ();
- Drag (source, ctx, dropCallback, fr);
- }
-
- // Drag function for automatic sources, called from DragBegin
- public static void Drag (Gtk.Widget source, Gdk.DragContext ctx, Gtk.Widget dragWidget)
- {
- Drag (source, ctx, null, dragWidget);
- }
-
- // Drag function for automatic sources, called from DragBegin
- static void Drag (Gtk.Widget source, Gdk.DragContext ctx, WidgetDropCallback dropCallback, Gtk.Widget dragWidget)
- {
- if (ctx == null)
- return;
-
- Gtk.Window dragWin;
- Gtk.Requisition req;
-
- ShowFaults ();
- DND.dragWidget = dragWidget;
- DND.dropCallback = dropCallback;
-
- dragWin = new Gtk.Window (Gtk.WindowType.Popup);
- dragWin.Add (dragWidget);
-
- req = dragWidget.SizeRequest ();
- if (req.Width < 20 && req.Height < 20)
- dragWin.SetSizeRequest (20, 20);
- else if (req.Width < 20)
- dragWin.SetSizeRequest (20, -1);
- else if (req.Height < 20)
- dragWin.SetSizeRequest (-1, 20);
-
- req = dragWin.SizeRequest ();
- if (ctx.SourceWindow != null) {
- int px, py, rx, ry;
- Gdk.ModifierType pmask;
- ctx.SourceWindow.GetPointer (out px, out py, out pmask);
- ctx.SourceWindow.GetRootOrigin (out rx, out ry);
-
- dragWin.Move (rx + px, ry + py);
- dragWin.Show ();
-
- dragHotX = req.Width / 2;
- dragHotY = -3;
-
- Gtk.Drag.SetIconWidget (ctx, dragWin, dragHotX, dragHotY);
- }
-
- if (source != null) {
- source.DragDataGet += DragDataGet;
- source.DragEnd += DragEnded;
- }
- }
-
- public static Gtk.Widget DragWidget {
- get {
- return dragWidget;
- }
- }
-
- public static int DragHotX {
- get {
- return dragHotX;
- }
- }
-
- public static int DragHotY {
- get {
- return dragHotY;
- }
- }
-
- // Call this from a DragDrop event to receive the dragged widget
- public static void Drop (Gdk.DragContext ctx, uint time, ObjectWrapper targetWrapper, string dropData)
- {
- if (dropCallback == null) {
- Gtk.Widget w = Drop (ctx, (Gtk.Widget) targetWrapper.Wrapped, time);
- targetWrapper.DropObject (dropData, w);
- return;
- }
-
- Cancel ();
- Gtk.Drag.Finish (ctx, true, true, time);
-
- Gtk.Application.Invoke ((args, e) => {
- IProject project = targetWrapper.Project;
- string uid = targetWrapper.UndoId;
- string tname = ((Wrapper.Widget)targetWrapper).GetTopLevel ().Wrapped.Name;
-
- // This call may cause the project to be reloaded
- dragWidget = dropCallback ();
- if (dragWidget == null)
- return;
-
- if (targetWrapper.IsDisposed) {
- // The project has been reloaded. Find the wrapper again.
- Gtk.Widget twidget = project.GetTopLevel (tname);
- ObjectWrapper ow = ObjectWrapper.Lookup (twidget);
- if (ow != null)
- targetWrapper = ow.FindObjectByUndoId (uid);
- else
- targetWrapper = null;
-
- if (targetWrapper == null) {
- // Target wrapper not found. Just ignore the drop.
- return;
- }
- }
-
- targetWrapper.DropObject (dropData, dragWidget);
- });
- }
-
- public static Gtk.Widget Drop (Gdk.DragContext ctx, Gtk.Widget target, uint time)
- {
- if (dropCallback != null) {
- dragWidget = dropCallback ();
- }
-
- if (dragWidget == null) {
- Gtk.Drag.GetData (target, ctx, GladeUtils.ApplicationXGladeAtom, time);
- return null;
- }
-
- Gtk.Widget w = Cancel ();
- Gtk.Drag.Finish (ctx, true, true, time);
- return w;
- }
-
- // Call this from a DragEnd event to check if the widget wasn't dropped
- public static Gtk.Widget Cancel ()
- {
- if (dragWidget == null)
- return null;
-
- Gtk.Widget w = dragWidget;
- dragWidget = null;
-
- // Remove the widget from its dragWindow
- Gtk.Container parent = w.Parent as Gtk.Container;
- if (parent != null) {
- parent.Remove (w);
- parent.Destroy ();
- }
- return w;
- }
-
- static void DragEnded (object obj, Gtk.DragEndArgs args)
- {
- dragWidget = null;
- HideFaults ();
-
- ((Gtk.Widget)obj).DragEnd -= DragEnded;
- ((Gtk.Widget)obj).DragDataGet -= DragDataGet;
- }
-
- static void DragDataGet (object obj, Gtk.DragDataGetArgs args)
- {
- if (args.Info == GladeType) {
- Gtk.Widget w = Cancel ();
- if (w != null)
- WidgetUtils.Copy (w, args.SelectionData, false);
- }
- }
-
- class Fault {
- public Stetic.Wrapper.Widget Owner;
- public object Id;
- public Gtk.Orientation Orientation;
- public Gdk.Window Window;
-
- public Fault (Stetic.Wrapper.Widget owner, object id,
- Gtk.Orientation orientation, Gdk.Window window)
- {
- Owner = owner;
- Id = id;
- Orientation = orientation;
- Window = window;
- }
- }
-
- static Hashtable faultGroups = new Hashtable ();
- const int FaultOverlap = 3;
-
- public static void AddFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.Orientation orientation, Gdk.Rectangle fault)
- {
- AddFault (owner, faultId, orientation,
- fault.X, fault.Y, fault.Width, fault.Height);
- }
-
- public static void AddFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.Orientation orientation,
- int x, int y, int width, int height)
- {
- Gtk.Widget widget = owner.Wrapped;
- if (!widget.IsRealized)
- return;
-
- Gdk.Window win = NewWindow (widget, Gdk.WindowClass.InputOnly);
- win.MoveResize (x, y, width, height);
-
- Hashtable widgetFaults = faultGroups[widget] as Hashtable;
- if (widgetFaults == null) {
- faultGroups[widget] = widgetFaults = new Hashtable ();
- widget.Destroyed += FaultWidgetDestroyed;
- widget.DragMotion += FaultDragMotion;
- widget.DragLeave += FaultDragLeave;
- widget.DragDrop += FaultDragDrop;
- widget.DragDataReceived += FaultDragDataReceived;
- DND.DestSet (widget, false);
- }
- widgetFaults[win] = new Fault (owner, faultId, orientation, win);
- }
-
- public static void AddFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.Orientation orientation,
- Gtk.Widget before, Gtk.Widget after)
- {
- if (orientation == Gtk.Orientation.Horizontal)
- AddHFault (owner, faultId, before, after);
- else
- AddVFault (owner, faultId, before, after);
- }
-
- public static void AddHFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.Widget above, Gtk.Widget below)
- {
- Gtk.Widget widget = owner.Wrapped;
- if (!widget.IsRealized)
- return;
-
- Gdk.Rectangle aboveAlloc, belowAlloc;
- int x1, y1, x2, y2;
-
- if (above != null && below != null) {
- aboveAlloc = above.Allocation;
- belowAlloc = below.Allocation;
-
- x1 = Math.Min (aboveAlloc.X, belowAlloc.X);
- x2 = Math.Max (aboveAlloc.X + aboveAlloc.Width, belowAlloc.X + belowAlloc.Width);
- y1 = aboveAlloc.Y + aboveAlloc.Height;
- y2 = belowAlloc.Y;
-
- while (y2 - y1 < FaultOverlap * 2) {
- y1--;
- y2++;
- }
- } else if (above == null) {
- belowAlloc = below.Allocation;
-
- x1 = belowAlloc.X;
- x2 = belowAlloc.X + belowAlloc.Width;
- y1 = 0;
- y2 = Math.Max (belowAlloc.Y, FaultOverlap);
- } else {
- aboveAlloc = above.Allocation;
-
- x1 = aboveAlloc.X;
- x2 = aboveAlloc.X + aboveAlloc.Width;
- y1 = Math.Min (aboveAlloc.Y + aboveAlloc.Height, widget.Allocation.Height - FaultOverlap);
- y2 = widget.Allocation.Height;
- }
-
- AddFault (owner, faultId, Gtk.Orientation.Horizontal,
- x1, y1, x2 - x1, y2 - y1);
- }
-
- public static void AddVFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.Widget left, Gtk.Widget right)
- {
- Gtk.Widget widget = owner.Wrapped;
- if (!widget.IsRealized)
- return;
-
- Gdk.Rectangle leftAlloc, rightAlloc;
- int x1, y1, x2, y2;
-
- if (left != null && right != null) {
- leftAlloc = left.Allocation;
- rightAlloc = right.Allocation;
-
- x1 = leftAlloc.X + leftAlloc.Width;
- x2 = rightAlloc.X;
-
- y1 = Math.Min (leftAlloc.Y, rightAlloc.Y);
- y2 = Math.Max (leftAlloc.Y + leftAlloc.Height, rightAlloc.Y + rightAlloc.Height);
-
- while (x2 - x1 < FaultOverlap * 2) {
- x1--;
- x2++;
- }
- } else if (left == null) {
- rightAlloc = right.Allocation;
-
- x1 = 0;
- x2 = Math.Max (rightAlloc.X, FaultOverlap);
-
- y1 = rightAlloc.Y;
- y2 = rightAlloc.Y + rightAlloc.Height;
- } else {
- leftAlloc = left.Allocation;
-
- x1 = Math.Min (leftAlloc.X + leftAlloc.Width, widget.Allocation.Width - FaultOverlap);
- x2 = widget.Allocation.Width;
-
- y1 = leftAlloc.Y;
- y2 = leftAlloc.Y + leftAlloc.Height;
- }
-
- AddFault (owner, faultId, Gtk.Orientation.Vertical,
- x1, y1, x2 - x1, y2 - y1);
- }
-
- public static void AddFault (Stetic.Wrapper.Widget owner, object faultId,
- Gtk.SideType side, Gtk.Widget widget)
- {
- Gdk.Rectangle fault;
- Gtk.Orientation orientation;
-
- if (widget == null) {
- fault = owner.Wrapped.Allocation;
- int border = (int)((Gtk.Container)owner.Wrapped).BorderWidth;
- fault.Inflate (-border, -border);
- } else
- fault = widget.Allocation;
-
- switch (side) {
- case Gtk.SideType.Top:
- fault.Y -= FaultOverlap;
- fault.Height = 2 * FaultOverlap;
- orientation = Gtk.Orientation.Horizontal;
- break;
- case Gtk.SideType.Bottom:
- fault.Y += fault.Height - FaultOverlap;
- fault.Height = 2 * FaultOverlap;
- orientation = Gtk.Orientation.Horizontal;
- break;
- case Gtk.SideType.Left:
- fault.X -= FaultOverlap;
- fault.Width = 2 * FaultOverlap;
- orientation = Gtk.Orientation.Vertical;
- break;
- case Gtk.SideType.Right:
- fault.X += fault.Width - FaultOverlap;
- fault.Width = 2 *FaultOverlap;
- orientation = Gtk.Orientation.Vertical;
- break;
- default:
- throw new Exception ("not reached");
- }
-
- AddFault (owner, faultId, orientation, fault);
- }
-
- static void FaultWidgetDestroyed (object widget, EventArgs args)
- {
- ClearFaults ((Gtk.Widget)widget);
- }
-
- public static void ClearFaults (Stetic.Wrapper.Widget owner)
- {
- ClearFaults (owner.Wrapped);
- }
-
- static void ClearFaults (Gtk.Widget widget)
- {
- Hashtable widgetFaults = faultGroups[widget] as Hashtable;
- if (widgetFaults == null)
- return;
- faultGroups.Remove (widget);
- widget.Destroyed -= FaultWidgetDestroyed;
- widget.DragMotion -= FaultDragMotion;
- widget.DragLeave -= FaultDragLeave;
- widget.DragDrop -= FaultDragDrop;
- widget.DragDataReceived -= FaultDragDataReceived;
-
- foreach (Gdk.Window win in widgetFaults.Keys)
- win.Destroy ();
- widgetFaults.Clear ();
- DND.DestUnset (widget);
- }
-
- static void ShowFaults ()
- {
- foreach (Hashtable widgetFaults in faultGroups.Values) {
- foreach (Gdk.Window win in widgetFaults.Keys)
- win.Show ();
- }
- }
-
- static void HideFaults ()
- {
- foreach (Hashtable widgetFaults in faultGroups.Values) {
- foreach (Gdk.Window win in widgetFaults.Keys)
- win.Hide ();
- }
- DestroySplitter ();
- dragFault = null;
- }
-
- static Fault dragFault;
- static Gdk.Window splitter;
-
- static void DestroySplitter ()
- {
- if (splitter != null) {
- splitter.Hide ();
- splitter.Destroy ();
- splitter = null;
- }
- }
-
- static Fault FindFault (int x, int y, Gtk.Widget w)
- {
- int wx, wy, width, height, depth;
-
- Hashtable widgetFaults = (Hashtable) faultGroups [w];
- if (widgetFaults == null)
- return null;
-
- foreach (Fault f in widgetFaults.Values) {
- f.Window.GetGeometry (out wx, out wy, out width, out height, out depth);
- if (x >= wx && y >= wy && x <= wx + width && y <= wy + height) {
- return f;
- }
- }
- return null;
- }
-
- static void FaultDragMotion (object obj, Gtk.DragMotionArgs args)
- {
- int wx, wy, width, height, depth;
-
- Gtk.Widget widget = (Gtk.Widget) obj;
- int px = args.X + widget.Allocation.X;
- int py = args.Y + widget.Allocation.Y;
-
- Fault fault = FindFault (px, py, widget);
-
- // If there's a splitter visible, and we're not currently dragging
- // in the fault that owns that splitter, hide it
- if (splitter != null && dragFault != fault)
- DestroySplitter ();
-
- if (dragFault != fault) {
- dragFault = fault;
- if (dragFault == null)
- return;
-
- splitter = NewWindow (fault.Owner.Wrapped, Gdk.WindowClass.InputOutput);
- fault.Window.GetGeometry (out wx, out wy, out width, out height, out depth);
- if (fault.Orientation == Gtk.Orientation.Horizontal) {
- splitter.MoveResize (wx, wy + height / 2 - FaultOverlap,
- width, 2 * FaultOverlap);
- } else {
- splitter.MoveResize (wx + width / 2 - FaultOverlap, wy,
- 2 * FaultOverlap, height);
- }
- splitter.ShowUnraised ();
- fault.Window.Lower ();
- } else if (dragFault == null)
- return;
-
- Gdk.Drag.Status (args.Context, Gdk.DragAction.Move, args.Time);
- args.RetVal = true;
- }
-
- static void FaultDragLeave (object obj, Gtk.DragLeaveArgs args)
- {
- DestroySplitter ();
- dragFault = null;
- }
-
- static void FaultDrop (Stetic.Wrapper.Widget wrapper, int x, int y, Gtk.Widget targetWidget)
- {
- Fault fault = FindFault (x, y, targetWidget);
- if (fault != null) {
- fault.Owner.Drop (wrapper.Wrapped, fault.Id);
- wrapper.Select ();
- }
- }
-
- static void FaultDragDrop (object obj, Gtk.DragDropArgs args)
- {
- Gtk.Widget w = DND.Drop (args.Context, (Gtk.Widget)obj, args.Time);
- Stetic.Wrapper.Widget dropped = Stetic.Wrapper.Widget.Lookup (w);
- if (dropped != null) {
- Gtk.Widget targetWidget = (Gtk.Widget) obj;
- int px = args.X + targetWidget.Allocation.X;
- int py = args.Y + targetWidget.Allocation.Y;
-
- FaultDrop (dropped, px, py, targetWidget);
- args.RetVal = true;
- }
- }
-
- static void FaultDragDataReceived (object obj, Gtk.DragDataReceivedArgs args)
- {
- Stetic.Wrapper.Widget dropped = null;
-
- Stetic.Wrapper.Widget faultOwner = Stetic.Wrapper.Widget.Lookup ((Gtk.Widget)obj);
- if (faultOwner != null)
- dropped = WidgetUtils.Paste (faultOwner.Project, args.SelectionData);
- Gtk.Drag.Finish (args.Context, dropped != null,
- dropped != null, args.Time);
- if (dropped != null) {
- Gtk.Widget targetWidget = (Gtk.Widget) obj;
- int px = args.X + targetWidget.Allocation.X;
- int py = args.Y + targetWidget.Allocation.Y;
- FaultDrop (dropped, px, py, targetWidget);
- }
- }
-
- static Gdk.Window NewWindow (Gtk.Widget parent, Gdk.WindowClass wclass)
- {
- Gdk.WindowAttr attributes;
- Gdk.WindowAttributesType attributesMask;
- Gdk.Window win;
-
- attributes = new Gdk.WindowAttr ();
- attributes.WindowType = Gdk.WindowType.Child;
- attributes.Wclass = wclass ;
- attributes.Visual = parent.Visual;
- attributes.Colormap = parent.Colormap;
- attributes.Mask = (Gdk.EventMask.ButtonPressMask |
- Gdk.EventMask.ButtonMotionMask |
- Gdk.EventMask.ButtonReleaseMask |
- Gdk.EventMask.ExposureMask |
- Gdk.EventMask.EnterNotifyMask |
- Gdk.EventMask.LeaveNotifyMask);
-
- attributesMask =
- Gdk.WindowAttributesType.Visual |
- Gdk.WindowAttributesType.Colormap;
-
- win = new Gdk.Window (parent.GdkWindow, attributes, attributesMask);
- win.UserData = parent.Handle;
-
- if (wclass == Gdk.WindowClass.InputOutput)
- parent.Style.Attach (win);
-
- return win;
- }
- }
-
- public delegate Gtk.Widget WidgetDropCallback ();
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/EnumDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/EnumDescriptor.cs
deleted file mode 100644
index 79ee48b3c97..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/EnumDescriptor.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-
-namespace Stetic {
- public class EnumValue {
- public Enum Value;
- public string Label;
- public string Description;
-
- internal EnumValue (Enum value, string label, string description)
- {
- Value = value;
- Label = label;
- Description = description;
- }
- }
-
- public class EnumDescriptor {
-
- Type enumType;
- Hashtable values;
- Enum[] values_array;
- string name;
-
- public EnumDescriptor (XmlElement elem)
- {
- string cls = elem.GetAttribute ("type");
- enumType = Registry.GetType (cls, true);
- this.name = enumType.FullName;
-
- values = new Hashtable ();
-
- // This gets the list of enum names and gets the value of each of them.
- // This is not done the other way (get the values, and then the names from them)
- // because it won't work if two different enum members have the same value
- ArrayList list = new ArrayList ();
- Hashtable evalues = new Hashtable ();
- foreach (string name in Enum.GetNames (enumType)) {
- object value = Enum.Parse (enumType, name);
- list.Add (value);
- evalues[name] = value;
- }
-
- foreach (XmlElement valueElem in elem.SelectNodes ("value")) {
- string name = valueElem.GetAttribute ("name");
- if (!evalues.Contains (name))
- throw new ArgumentException (" node for " + enumType.FullName + " contains extra element " + name);
- Enum value = (Enum)evalues[name];
- values[value] = new EnumValue (value,
- valueElem.GetAttribute ("label"),
- valueElem.GetAttribute ("description"));
- evalues.Remove (name);
- }
-
- // Remove from the array the values not declared in the xml file
- foreach (object val in evalues.Values)
- list.Remove (val);
-
- values_array = (Enum[]) list.ToArray (typeof(Enum));
- }
-
- public string Name {
- get { return name; }
- }
-
- public Type EnumType {
- get {
- return enumType;
- }
- }
-
- public Enum[] Values {
- get {
- return values_array;
- }
- }
-
- public EnumValue this[Enum value] {
- get {
- return (EnumValue)values[value];
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ErrorWidget.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ErrorWidget.cs
deleted file mode 100644
index 38915196d65..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ErrorWidget.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Xml;
-using System.CodeDom;
-using Mono.Unix;
-
-namespace Stetic
-{
- // This widget is shown in place of widgets with unknown classes.
-
- public class ErrorWidget: Gtk.Frame
- {
- readonly string className;
- readonly Exception exc;
-
- public ErrorWidget (Exception ex, string id)
- {
- exc = ex;
- Init (Catalog.GetString ("Load Error:") + " " + ex.Message, id);
- }
-
- public ErrorWidget (string className, string id)
- {
- this.className = className;
- Init (Catalog.GetString ("Unknown widget:") + " " + className, id);
- }
-
- public ErrorWidget (string className, string minGtkVersion, string foundGtkVersion, string id)
- {
- this.className = className;
- Init (string.Format (Catalog.GetString ("Widget '{0}' not available in GTK# {1}"), className, foundGtkVersion), id);
- }
-
- void Init (string message, string id)
- {
- Gtk.Label lab = new Gtk.Label ();
- lab.Markup = "" + message + "";
- this.CanFocus = false;
- Add (lab);
- this.ShadowType = Gtk.ShadowType.In;
- ShowAll ();
- if (id != null && id.Length > 0)
- Name = id;
- }
-
- public string ClassName {
- get { return className; }
- }
-
- public Exception Exception {
- get { return exc; }
- }
- }
-
- internal class ErrorWidgetWrapper: Wrapper.Widget
- {
- XmlElement elementData;
- FileFormat format;
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- elementData = elem;
- this.format = reader.Format;
- }
-
- public override XmlElement Write (ObjectWriter writer)
- {
- if (writer.Format != this.format) {
- ErrorWidget ew = (ErrorWidget) Wrapped;
- XmlElement elem = writer.XmlDocument.CreateElement ("widget");
- elem.SetAttribute ("class", "Gtk.Label");
- elem.SetAttribute ("id", Wrapped.Name);
- XmlElement ce = writer.XmlDocument.CreateElement ("property");
- string msg;
- if (ew.Exception != null)
- msg = "Invalid widget";
- else
- msg = "Unknown widget: " + ew.ClassName;
- ce.SetAttribute ("name", "LabelProp");
- ce.InnerText = msg;
- elem.AppendChild (ce);
- return elem;
- }
- else
- return (XmlElement) writer.XmlDocument.ImportNode (elementData, true);
- }
-
- public override string WrappedTypeName {
- get {
- ErrorWidget ew = (ErrorWidget) Wrapped;
- return ew.ClassName;
- }
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- ErrorWidget ew = (ErrorWidget) Wrapped;
- string msg;
- if (ew.Exception != null)
- msg = Project.FileName + ": Could not generate code for an invalid widget. The widget failed to load: " + ew.Exception.Message + ". The generated code may be invalid.";
- else
- msg = Project.FileName + ": Could not generate code for widgets of type: " + ew.ClassName + ". The widget could not be found in any referenced library. The generated code may be invalid.";
-
- if (ctx.Options.FailForUnknownWidgets) {
- throw new InvalidOperationException (msg);
- } else {
- ctx.ReportWarning (msg);
- return new CodePrimitiveExpression (null);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/GeneratorContext.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/GeneratorContext.cs
deleted file mode 100644
index 42559124218..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/GeneratorContext.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-
-namespace Stetic
-{
- public class GeneratorContext
- {
- CodeNamespace cns;
- int n;
- string idPrefix;
- Hashtable vars = new Hashtable ();
- ArrayList generatedWrappers = new ArrayList ();
- WidgetMap map;
- CodeStatementCollection statements;
- GenerationOptions options;
- ArrayList warnings = new ArrayList ();
- CodeExpression rootObject;
-
- public GeneratorContext (CodeNamespace cns, string idPrefix, CodeStatementCollection statements, GenerationOptions options)
- {
- this.cns = cns;
- this.idPrefix = idPrefix;
- this.statements = statements;
- this.options = options;
- map = new WidgetMap (vars);
- }
-
- public CodeNamespace GlobalCodeNamespace {
- get { return cns; }
- }
-
- public CodeStatementCollection Statements {
- get { return statements; }
- }
-
- public GenerationOptions Options {
- get { return options; }
- }
-
- public string[] Warnings {
- get { return (string[]) warnings.ToArray (typeof(string)); }
- }
-
- public void ReportWarning (string s)
- {
- warnings.Add (s);
- }
-
- public string NewId ()
- {
- return idPrefix + (++n);
- }
-
- public CodeExpression GenerateNewInstanceCode (Wrapper.Widget widget)
- {
- CodeExpression exp = widget.GenerateObjectCreation (this);
- CodeExpression var = GenerateInstanceExpression (widget, exp);
- GenerateBuildCode (widget, var);
- return var;
- }
-
- public virtual CodeExpression GenerateInstanceExpression (ObjectWrapper wrapper, CodeExpression newObject)
- {
- string varName = NewId ();
- CodeVariableDeclarationStatement varDec = new CodeVariableDeclarationStatement (wrapper.WrappedTypeName.ToGlobalTypeRef (), varName);
- varDec.InitExpression = newObject;
- statements.Add (varDec);
- return new CodeVariableReferenceExpression (varName);
- }
-
- public virtual void GenerateCreationCode (ObjectWrapper wrapper, CodeExpression varExp)
- {
- rootObject = varExp;
- wrapper.GenerateInitCode (this, varExp);
- GenerateBuildCode (wrapper, varExp);
- }
-
- public virtual void GenerateBuildCode (ObjectWrapper wrapper, CodeExpression var)
- {
- vars [wrapper] = var;
- wrapper.GenerateBuildCode (this, var);
- generatedWrappers.Add (wrapper);
- }
-
- public virtual void GenerateCreationCode (Wrapper.ActionGroup agroup, CodeExpression var)
- {
- rootObject = var;
- vars [agroup] = var;
- agroup.GenerateBuildCode (this, var);
- }
-
- public CodeExpression GenerateValue (object value, Type type)
- {
- return GenerateValue (value, type, false);
- }
-
- public CodeExpression GenerateValue (object value, Type type, bool translatable)
- {
- if (value == null)
- return new CodePrimitiveExpression (value);
-
- if (value.GetType ().IsEnum) {
- if (!type.IsEnum) {
- object ival = Convert.ChangeType (value, type);
- return new CodePrimitiveExpression (ival);
- } else {
- long ival = (long) Convert.ChangeType (value, typeof(long));
- return new CodeCastExpression (
- value.GetType ().ToGlobalTypeRef (),
- new CodePrimitiveExpression (ival)
- );
- }
- }
-
- if (value is Gtk.Adjustment) {
- Gtk.Adjustment adj = value as Gtk.Adjustment;
- return new CodeObjectCreateExpression (
- typeof(Gtk.Adjustment).ToGlobalTypeRef (),
- new CodePrimitiveExpression (adj.Value),
- new CodePrimitiveExpression (adj.Lower),
- new CodePrimitiveExpression (adj.Upper),
- new CodePrimitiveExpression (adj.StepIncrement),
- new CodePrimitiveExpression (adj.PageIncrement),
- new CodePrimitiveExpression (adj.PageSize));
- }
- if (value is ushort || value is uint) {
- return new CodeCastExpression (
- value.GetType ().ToGlobalTypeRef (),
- new CodePrimitiveExpression (Convert.ChangeType (value, typeof(long))));
- }
- if (value is ulong) {
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (value.GetType ()),
- "Parse",
- new CodePrimitiveExpression (value.ToString ()));
- }
-
- if (value is ImageInfo && typeof(Gdk.Pixbuf).IsAssignableFrom (type))
- return ((ImageInfo)value).ToCodeExpression (this);
-
- if (value is Wrapper.ActionGroup) {
- return new CodeMethodInvokeExpression (
- new CodeMethodReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (GlobalCodeNamespace.Name + ".ActionGroups", CodeTypeReferenceOptions.GlobalReference)),
- "GetActionGroup"
- ),
- new CodePrimitiveExpression (((Wrapper.ActionGroup)value).Name)
- );
- }
-
- if (value is Array) {
- ArrayList list = new ArrayList ();
- foreach (object val in (Array)value)
- list.Add (GenerateValue (val, val != null ? val.GetType() : null, translatable));
- return new CodeArrayCreateExpression (value.GetType().GetElementType(), (CodeExpression[]) list.ToArray(typeof(CodeExpression)));
- }
-
- if (value is DateTime) {
- return new CodeObjectCreateExpression (
- typeof(DateTime).ToGlobalTypeRef (),
- new CodePrimitiveExpression (((DateTime)value).Ticks)
- );
- }
-
- if (value is TimeSpan) {
- return new CodeObjectCreateExpression (
- typeof(TimeSpan).ToGlobalTypeRef (),
- new CodePrimitiveExpression (((TimeSpan)value).Ticks)
- );
- }
-
- string str = value as string;
- if (translatable && str != null && str.Length > 0 && options.UseGettext) {
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (options.GettextClass, CodeTypeReferenceOptions.GlobalReference)),
- "GetString",
- new CodePrimitiveExpression (str)
- );
- }
-
- return new CodePrimitiveExpression (value);
- }
-
- public WidgetMap WidgetMap {
- get { return map; }
- }
-
- public System.CodeDom.CodeExpression RootObject {
- get {
- return rootObject;
- }
- set {
- rootObject = value;
- }
- }
-
- public void EndGeneration ()
- {
- foreach (ObjectWrapper w in generatedWrappers) {
- CodeExpression var = (CodeExpression) vars [w];
- w.GeneratePostBuildCode (this, var);
- }
- }
-
- public void Reset ()
- {
- vars.Clear ();
- generatedWrappers.Clear ();
- map = new WidgetMap (vars);
- n = 0;
- }
-
- public CodeExpression GenerateLoadPixbuf (string name, Gtk.IconSize size)
- {
- bool found = false;
- foreach (CodeTypeDeclaration t in cns.Types) {
- if (t.Name == "IconLoader") {
- found = true;
- break;
- }
- }
-
- if (!found)
- {
- CodeTypeDeclaration cls = new CodeTypeDeclaration ("IconLoader");
- cls.Attributes = MemberAttributes.Private;
- cls.TypeAttributes = System.Reflection.TypeAttributes.NestedAssembly;
- cns.Types.Add (cls);
-
- CodeMemberMethod met = new CodeMemberMethod ();
- cls.Members.Add (met);
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
- met.Name = "LoadIcon";
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Gtk.Widget), "widget"));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "name"));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Gtk.IconSize), "size"));
- met.ReturnType = new CodeTypeReference (typeof(Gdk.Pixbuf));
-
- CodeExpression widgetExp = new CodeVariableReferenceExpression ("widget");
- CodeExpression nameExp = new CodeVariableReferenceExpression ("name");
- CodeExpression sizeExp = new CodeVariableReferenceExpression ("size");
- CodeExpression szExp = new CodeVariableReferenceExpression ("sz");
- CodeExpression mgExp = new CodeBinaryOperatorExpression (szExp, CodeBinaryOperatorType.Divide, new CodePrimitiveExpression (4));
- CodeExpression pmapExp = new CodeVariableReferenceExpression ("pmap");
- CodeExpression gcExp = new CodeVariableReferenceExpression ("gc");
- CodeExpression szM1Exp = new CodeBinaryOperatorExpression (szExp, CodeBinaryOperatorType.Subtract, new CodePrimitiveExpression (1));
- CodeExpression zeroExp = new CodePrimitiveExpression (0);
- CodeExpression resExp = new CodeVariableReferenceExpression ("res");
-
- met.Statements.Add (
- new CodeVariableDeclarationStatement (typeof(Gdk.Pixbuf), "res",
- new CodeMethodInvokeExpression (
- widgetExp,
- "RenderIcon",
- nameExp,
- sizeExp,
- new CodePrimitiveExpression (null)
- )
- )
- );
-
- CodeConditionStatement nullcheck = new CodeConditionStatement ();
- met.Statements.Add (nullcheck);
- nullcheck.Condition = new CodeBinaryOperatorExpression (
- resExp,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- );
- nullcheck.TrueStatements.Add (new CodeMethodReturnStatement (resExp));
-
- // int sz, h;
- // Gtk.Icon.SizeLookup (size, out sz, out h);
-
- nullcheck.FalseStatements.Add (new CodeVariableDeclarationStatement (typeof(int), "sz"));
- nullcheck.FalseStatements.Add (new CodeVariableDeclarationStatement (typeof(int), "sy"));
- nullcheck.FalseStatements.Add (new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (typeof(Gtk.Icon).ToGlobalTypeRef ()),
- "SizeLookup",
- sizeExp,
- new CodeDirectionExpression (FieldDirection.Out, szExp),
- new CodeDirectionExpression (FieldDirection.Out, new CodeVariableReferenceExpression ("sy"))
- ));
-
- CodeTryCatchFinallyStatement trycatch = new CodeTryCatchFinallyStatement ();
- nullcheck.FalseStatements.Add (trycatch);
- trycatch.TryStatements.Add (
- new CodeMethodReturnStatement (
- new CodeMethodInvokeExpression (
- new CodePropertyReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(Gtk.IconTheme))),
- "Default"
- ),
- "LoadIcon",
- nameExp,
- szExp,
- zeroExp
- )
- )
- );
-
- CodeCatchClause ccatch = new CodeCatchClause ();
- trycatch.CatchClauses.Add (ccatch);
-
- CodeConditionStatement cond = new CodeConditionStatement ();
- ccatch.Statements.Add (cond);
-
- cond.Condition = new CodeBinaryOperatorExpression (
- nameExp,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression ("gtk-missing-image")
- );
-
- cond.TrueStatements.Add (
- new CodeMethodReturnStatement (
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (cns.Name + "." + cls.Name),
- "LoadIcon",
- widgetExp,
- new CodePrimitiveExpression ("gtk-missing-image"),
- sizeExp
- )
- )
- );
-
- CodeStatementCollection stms = cond.FalseStatements;
-
- stms.Add (
- new CodeVariableDeclarationStatement (typeof(Gdk.Pixmap), "pmap",
- new CodeObjectCreateExpression (
- typeof(Gdk.Pixmap),
- new CodePropertyReferenceExpression (
- new CodePropertyReferenceExpression (
- new CodeTypeReferenceExpression (typeof(Gdk.Screen)),
- "Default"
- ),
- "RootWindow"
- ),
- szExp,
- szExp
- )
- )
- );
- stms.Add (
- new CodeVariableDeclarationStatement (typeof(Gdk.GC), "gc",
- new CodeObjectCreateExpression (typeof(Gdk.GC), pmapExp)
- )
- );
- stms.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- gcExp,
- "RgbFgColor"
- ),
- new CodeObjectCreateExpression (
- typeof(Gdk.Color),
- new CodePrimitiveExpression (255),
- new CodePrimitiveExpression (255),
- new CodePrimitiveExpression (255)
- )
- )
- );
- stms.Add (
- new CodeMethodInvokeExpression (
- pmapExp,
- "DrawRectangle",
- gcExp,
- new CodePrimitiveExpression (true),
- zeroExp,
- zeroExp,
- szExp,
- szExp
- )
- );
- stms.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- gcExp,
- "RgbFgColor"
- ),
- new CodeObjectCreateExpression (
- typeof(Gdk.Color),
- zeroExp, zeroExp, zeroExp
- )
- )
- );
- stms.Add (
- new CodeMethodInvokeExpression (
- pmapExp,
- "DrawRectangle",
- gcExp,
- new CodePrimitiveExpression (false),
- zeroExp,
- zeroExp,
- szM1Exp,
- szM1Exp
- )
- );
- stms.Add (
- new CodeMethodInvokeExpression (
- gcExp,
- "SetLineAttributes",
- new CodePrimitiveExpression (3),
- new CodeFieldReferenceExpression (new CodeTypeReferenceExpression (typeof(Gdk.LineStyle)), "Solid"),
- new CodeFieldReferenceExpression (new CodeTypeReferenceExpression (typeof(Gdk.CapStyle)), "Round"),
- new CodeFieldReferenceExpression (new CodeTypeReferenceExpression (typeof(Gdk.JoinStyle)), "Round")
- )
- );
- stms.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- gcExp,
- "RgbFgColor"
- ),
- new CodeObjectCreateExpression (
- typeof(Gdk.Color),
- new CodePrimitiveExpression (255),
- zeroExp,
- zeroExp
- )
- )
- );
- stms.Add (
- new CodeMethodInvokeExpression (
- pmapExp,
- "DrawLine",
- gcExp,
- mgExp,
- mgExp,
- new CodeBinaryOperatorExpression (szM1Exp, CodeBinaryOperatorType.Subtract, mgExp),
- new CodeBinaryOperatorExpression (szM1Exp, CodeBinaryOperatorType.Subtract, mgExp)
- )
- );
- stms.Add (
- new CodeMethodInvokeExpression (
- pmapExp,
- "DrawLine",
- gcExp,
- new CodeBinaryOperatorExpression (szM1Exp, CodeBinaryOperatorType.Subtract, mgExp),
- mgExp,
- mgExp,
- new CodeBinaryOperatorExpression (szM1Exp, CodeBinaryOperatorType.Subtract, mgExp)
- )
- );
- stms.Add (
- new CodeMethodReturnStatement (
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (typeof(Gdk.Pixbuf)),
- "FromDrawable",
- pmapExp,
- new CodePropertyReferenceExpression (pmapExp, "Colormap"),
- zeroExp, zeroExp, zeroExp, zeroExp, szExp, szExp
- )
- )
- );
- }
-
- int sz, h;
- Gtk.Icon.SizeLookup (size, out sz, out h);
-
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (cns.Name + ".IconLoader", CodeTypeReferenceOptions.GlobalReference)),
- "LoadIcon",
- rootObject,
- new CodePrimitiveExpression (name),
- new CodeFieldReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(Gtk.IconSize), CodeTypeReferenceOptions.GlobalReference)),
- size.ToString ()
- )
- );
- }
- }
-
- public class WidgetMap
- {
- Hashtable vars;
-
- internal WidgetMap (Hashtable vars)
- {
- this.vars = vars;
- }
-
- public CodeExpression GetWidgetExp (ObjectWrapper wrapper)
- {
- return (CodeExpression) vars [wrapper];
- }
-
- public CodeExpression GetWidgetExp (object wrapped)
- {
- ObjectWrapper w = ObjectWrapper.Lookup (wrapped);
- if (w != null)
- return GetWidgetExp (w);
- else
- return null;
- }
- }
-
- [Serializable]
- public class GenerationOptions
- {
- bool useGettext;
- bool partialClasses;
- bool generateEmptyBuildMethod;
- bool generateSingleFile = true;
- bool failForUnknownWidgets = false;
- string path;
- string globalNamespace = "Stetic";
- string gettextClass;
- string resourceLoader;
-
- public bool UseGettext {
- get { return useGettext; }
- set { useGettext = value; }
- }
-
- public string GettextClass {
- get {
- if (string.IsNullOrEmpty (gettextClass))
- return "Mono.Unix.Catalog";
- else
- return gettextClass;
- }
- set { gettextClass = value; }
- }
-
- public string ImageResourceLoaderClass {
- get {
- if (string.IsNullOrEmpty (resourceLoader))
- return "Gdk.Pixbuf";
- else
- return resourceLoader;
- }
- set { resourceLoader = value; }
- }
-
- public bool UsePartialClasses {
- get { return partialClasses; }
- set { partialClasses = value; }
- }
-
- public string Path {
- get { return path; }
- set { path = value; }
- }
-
- public bool GenerateEmptyBuildMethod {
- get { return generateEmptyBuildMethod; }
- set { generateEmptyBuildMethod = value; }
- }
-
- public bool GenerateSingleFile {
- get { return generateSingleFile; }
- set { generateSingleFile = value; }
- }
-
- public string GlobalNamespace {
- get { return globalNamespace; }
- set { globalNamespace = value; }
- }
-
- public bool FailForUnknownWidgets {
- get { return failForUnknownWidgets; }
- set { failForUnknownWidgets = value; }
- }
-
- public bool GenerateModifiedOnly { get; set; }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeException.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeException.cs
deleted file mode 100644
index 504dab9823e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeException.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-
-namespace Stetic {
-
- public class GladeException : ApplicationException {
-
- public GladeException (string message) : base (message) { }
-
- public GladeException (string message, string className) :
- this (message + " (class " + className + ")")
- {
- this.className = className;
- }
-
- public GladeException (string message, string className,
- bool childprop, string propName) :
- this (message + " (class " + className + ", " + (childprop ? "child " : "") + "property " + propName + ")")
- {
- this.childprop = childprop;
- this.propName = propName;
- }
-
- public GladeException (string message, string className,
- bool childprop, string propName, string propVal) :
- this (message + " (class " + className + ", " + (childprop ? "child " : "") + "property " + propName + ", value " + propVal + ")")
- {
- this.childprop = childprop;
- this.propName = propName;
- this.propVal = propVal;
- }
-
- string className, propName, propVal;
- bool childprop;
-
- public string ClassName {
- get {
- return className;
- }
- }
-
- public bool ChildProp {
- get {
- return childprop;
- }
- }
-
- public string PropName {
- get {
- return propName;
- }
- }
-
- public string PropVal {
- get {
- return propVal;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
deleted file mode 100644
index 54ddf19983b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
+++ /dev/null
@@ -1,791 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System.Xml;
-using Stetic.Wrapper;
-
-namespace Stetic {
-
- public static class GladeUtils {
-
- public const string Glade20SystemId = "http://glade.gnome.org/glade-2.0.dtd";
- const string LIBGOBJ = "libgobject-2.0-0.dll";
- const string LIBGLIBGLUE = "glibsharpglue-2";
- const string LIBGTK = "libgtk-win32-2.0-0.dll";
-
- static Gdk.Atom gladeAtom;
- public static Gdk.Atom ApplicationXGladeAtom {
- get {
- if (gladeAtom == null)
- gladeAtom = Gdk.Atom.Intern ("application/x-glade", false);
- return gladeAtom;
- }
- }
-
- public static XmlDocument XslImportTransform (XmlDocument doc)
- {
-/* XmlDocumentType doctype = doc.DocumentType;
- if (doctype == null ||
- doctype.Name != "glade-interface" ||
- doctype.SystemId != Glade20SystemId)
- throw new GladeException ("Not a glade file according to doctype");
-*/
-
- StringWriter sw = new StringWriter ();
- XmlWriter xw = XmlWriter.Create (sw);
- Registry.GladeImportXsl.Transform (doc, xw);
- XmlReader reader = XmlReader.Create (sw.ToString ());
- doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- doc.Load (reader);
-
- return doc;
- }
-
- public static XmlDocument XslExportTransform (XmlDocument doc)
- {
- StringWriter sw = new StringWriter ();
- XmlWriter xw = XmlWriter.Create (sw);
- Registry.GladeExportXsl.Transform (doc, xw);
- XmlReader reader = XmlReader.Create (sw.ToString ());
- doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- doc.Load (reader);
-
- XmlDocumentType doctype = doc.CreateDocumentType ("glade-interface", null, Glade20SystemId, null);
- doc.PrependChild (doctype);
-
- return doc;
- }
-
- public static XmlDocument Export (Gtk.Widget widget)
- {
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (widget);
- if (wrapper == null)
- return null;
-
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
-
- XmlElement toplevel = doc.CreateElement ("glade-interface");
- doc.AppendChild (toplevel);
-
- // For toplevel widgets, glade just saves it as-is. For
- // non-toplevels, it puts the widget into a dummy GtkWindow,
- // but using the packing attributes of the widget's real
- // container (so as to preserve expand/fill settings and the
- // like).
-
- XmlElement elem;
- Stetic.Wrapper.Container parent = wrapper.ParentWrapper;
- ObjectWriter writer = new ObjectWriter (doc, FileFormat.Glade);
-
- if (parent == null) {
- elem = wrapper.Write (writer);
- if (elem == null)
- return null;
- if (!(widget is Gtk.Window)) {
- XmlElement window = doc.CreateElement ("widget");
- window.SetAttribute ("class", "GtkWindow");
- window.SetAttribute ("id", "glade-dummy-container");
- XmlElement child = doc.CreateElement ("child");
- window.AppendChild (child);
- child.AppendChild (elem);
- elem = window;
- }
- } else {
- elem = doc.CreateElement ("widget");
- // Set the class correctly (temporarily) so the XSL
- // transforms will work correctly.
- ClassDescriptor klass = parent.ClassDescriptor;
- elem.SetAttribute ("class", klass.CName);
- elem.AppendChild (parent.WriteContainerChild (writer, wrapper));
- }
- toplevel.AppendChild (elem);
-
- doc = XslExportTransform (doc);
-
- if (parent != null) {
- elem = (XmlElement)doc.SelectSingleNode ("glade-interface/widget");
- elem.SetAttribute ("class", "GtkWindow");
- elem.SetAttribute ("id", "glade-dummy-container");
- }
- return doc;
- }
-
- public static Stetic.Wrapper.Widget Import (IProject project, XmlDocument doc)
- {
- try {
- doc = XslImportTransform (doc);
- } catch {
- return null;
- }
-
- ObjectReader reader = new ObjectReader (project, FileFormat.Glade);
-
- XmlElement elem = (XmlElement)doc.SelectSingleNode ("glade-interface/widget");
- if (elem.GetAttribute ("class") != "GtkWindow" ||
- elem.GetAttribute ("id") != "glade-dummy-container") {
- // Creating a new toplevel
- Stetic.Wrapper.Widget toplevel = (Stetic.Wrapper.Widget)
- Stetic.ObjectWrapper.ReadObject (reader, elem);
- if (toplevel != null) {
- project.AddWindow ((Gtk.Window)toplevel.Wrapped);
- }
- return toplevel;
- }
-
- return (Stetic.Wrapper.Widget)
- Stetic.ObjectWrapper.ReadObject (reader, (XmlElement)elem.SelectSingleNode ("child/widget"));
- }
-
- public static void Copy (Gtk.Widget widget, Gtk.SelectionData seldata, bool copyAsText)
- {
- XmlDocument doc = Export (widget);
- if (doc == null)
- return;
-
- if (copyAsText)
- seldata.Text = doc.OuterXml;
- else
- seldata.Set (ApplicationXGladeAtom, 8, System.Text.Encoding.UTF8.GetBytes (doc.OuterXml));
- }
-
- public static Stetic.Wrapper.Widget Paste (IProject project, Gtk.SelectionData seldata)
- {
- if (seldata.Type != ApplicationXGladeAtom)
- return null;
- string data = System.Text.Encoding.UTF8.GetString (seldata.Data);
-
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- try {
- doc.LoadXml (data);
- } catch {
- return null;
- }
-
- return Import (project, doc);
- }
-
- static object GetProperty (XmlElement elem, string selector, object defaultValue, bool extract)
- {
- XmlElement prop = (XmlElement)elem.SelectSingleNode (selector);
- if (prop == null)
- return defaultValue;
- if (extract)
- prop.ParentNode.RemoveChild (prop);
- return ParseProperty (null, defaultValue.GetType (), prop.InnerText).Val;
- }
-
- public static object GetProperty (XmlElement elem, string name, object defaultValue)
- {
- return GetProperty (elem, "./property[@name='" + name + "']", defaultValue, false);
- }
-
- public static object ExtractProperty (XmlElement elem, string name, object defaultValue)
- {
- return GetProperty (elem, "./property[@name='" + name + "']", defaultValue, true);
- }
-
- public static object GetChildProperty (XmlElement elem, string name, object defaultValue)
- {
- return GetProperty (elem, "./packing/property[@name='" + name + "']", defaultValue, false);
- }
-
- public static object ExtractChildProperty (XmlElement elem, string name, object defaultValue)
- {
- return GetProperty (elem, "./packing/property[@name='" + name + "']", defaultValue, true);
- }
-
- public static void RenameProperty (XmlElement elem, string name, string newName)
- {
- XmlElement prop = (XmlElement)elem.SelectSingleNode ("./property[@name='" + name + "']");
- if (prop != null)
- prop.SetAttribute ("name", newName);
- }
-
- public static void SetProperty (XmlElement elem, string name, string value)
- {
- XmlElement prop_elem = elem.OwnerDocument.CreateElement ("property");
- prop_elem.SetAttribute ("name", name);
- prop_elem.InnerText = value;
- elem.AppendChild (prop_elem);
- }
-
- public static void SetChildProperty (XmlElement elem, string name, string value)
- {
- XmlElement packing_elem = elem["packing"];
- if (packing_elem == null) {
- packing_elem = elem.OwnerDocument.CreateElement ("packing");
- elem.AppendChild (packing_elem);
- }
- SetProperty (packing_elem, name, value);
- }
-
- static GLib.Value ParseBasicType (GLib.TypeFundamentals type, string strval)
- {
- switch (type) {
- case GLib.TypeFundamentals.TypeChar:
- return new GLib.Value (SByte.Parse (strval));
- case GLib.TypeFundamentals.TypeUChar:
- return new GLib.Value (Byte.Parse (strval));
- case GLib.TypeFundamentals.TypeBoolean:
- return new GLib.Value (strval == "True");
- case GLib.TypeFundamentals.TypeInt:
- return new GLib.Value (Int32.Parse (strval));
- case GLib.TypeFundamentals.TypeUInt:
- return new GLib.Value (UInt32.Parse (strval));
- case GLib.TypeFundamentals.TypeInt64:
- return new GLib.Value (Int64.Parse (strval));
- case GLib.TypeFundamentals.TypeUInt64:
- return new GLib.Value (UInt64.Parse (strval));
- case GLib.TypeFundamentals.TypeFloat:
- return new GLib.Value (Single.Parse (strval, System.Globalization.CultureInfo.InvariantCulture));
- case GLib.TypeFundamentals.TypeDouble:
- return new GLib.Value (Double.Parse (strval, System.Globalization.CultureInfo.InvariantCulture));
- case GLib.TypeFundamentals.TypeString:
- return new GLib.Value (strval);
- default:
- throw new GladeException ("Could not parse");
- }
- }
-
- static GLib.Value ParseEnum (IntPtr gtype, string strval)
- {
- IntPtr enum_class = g_type_class_ref (gtype);
- try {
- IntPtr enum_value = g_enum_get_value_by_name (enum_class, strval);
- if (enum_value == IntPtr.Zero)
- throw new GladeException ("Could not parse");
-
- int eval = Marshal.ReadInt32 (enum_value);
- return new GLib.Value (Enum.ToObject (GLib.GType.LookupType (gtype), eval));
- } finally {
- g_type_class_unref (enum_class);
- }
- }
-
- static GLib.Value ParseFlags (IntPtr gtype, string strval)
- {
- IntPtr flags_class = g_type_class_ref (gtype);
- uint fval = 0;
-
- try {
- foreach (string flag in strval.Split ('|')) {
- if (flag == "")
- continue;
- IntPtr flags_value = g_flags_get_value_by_name (flags_class, flag);
- if (flags_value == IntPtr.Zero)
- throw new GladeException ("Could not parse");
-
- int bits = Marshal.ReadInt32 (flags_value);
- fval |= (uint)bits;
- }
-
- return new GLib.Value (Enum.ToObject (GLib.GType.LookupType (gtype), fval));
- } finally {
- g_type_class_unref (flags_class);
- }
- }
-
- static GLib.Value ParseAdjustment (string strval)
- {
- string[] vals = strval.Split (' ');
- double deflt, min, max, step, page_inc, page_size;
-
- deflt = Double.Parse (vals[0], System.Globalization.CultureInfo.InvariantCulture);
- min = Double.Parse (vals[1], System.Globalization.CultureInfo.InvariantCulture);
- max = Double.Parse (vals[2], System.Globalization.CultureInfo.InvariantCulture);
- step = Double.Parse (vals[3], System.Globalization.CultureInfo.InvariantCulture);
- page_inc = Double.Parse (vals[4], System.Globalization.CultureInfo.InvariantCulture);
- page_size = Double.Parse (vals[5], System.Globalization.CultureInfo.InvariantCulture);
- return new GLib.Value (new Gtk.Adjustment (deflt, min, max, step, page_inc, page_size));
- }
-
- /* static GLib.Value ParseUnichar (string strval)
- {
- return new GLib.Value (strval.Length == 1 ? (uint)strval[0] : 0U);
- }*/
-
- static GLib.Value ParseProperty (ParamSpec pspec, Type propType, string strval)
- {
- IntPtr gtype;
- if (propType != null)
- gtype = ((GLib.GType)propType).Val;
-/*
- FIXME: ValueType is not supported right now
-
- else if (pspec != null)
- gtype = pspec.ValueType;
-*/
- else
- throw new GladeException ("Bad type");
-
- GLib.TypeFundamentals typef = (GLib.TypeFundamentals)(int)g_type_fundamental (gtype);
-
- if (gtype == Gtk.Adjustment.GType.Val)
- return ParseAdjustment (strval);
- else if (typef == GLib.TypeFundamentals.TypeEnum)
- return ParseEnum (gtype, strval);
- else if (typef == GLib.TypeFundamentals.TypeFlags)
- return ParseFlags (gtype, strval);
-// FIXME: Enable when ParamSpec.IsUnichar is implemented.
-// else if (pspec != null && pspec.IsUnichar)
-// return ParseUnichar (strval);
- else
- return ParseBasicType (typef, strval);
- }
-
- static PropertyInfo FindClrProperty (Type type, string name, bool childprop)
- {
- if (childprop) {
- Type[] types = type.GetNestedTypes ();
- foreach (Type t in types) {
- if (typeof(Gtk.Container.ContainerChild).IsAssignableFrom (t)) {
- type = t;
- break;
- }
- }
- foreach (PropertyInfo pi in type.GetProperties ()) {
- Gtk.ChildPropertyAttribute at = (Gtk.ChildPropertyAttribute) Attribute.GetCustomAttribute (pi, typeof(Gtk.ChildPropertyAttribute), false);
- if (at != null && at.Name == name)
- return pi;
- }
- if (typeof(GLib.Object).IsAssignableFrom (type.BaseType))
- return FindClrProperty (type.BaseType, name, true);
- }
-
- foreach (PropertyInfo pi in type.GetProperties ()) {
- GLib.PropertyAttribute at = (GLib.PropertyAttribute) Attribute.GetCustomAttribute (pi, typeof(GLib.PropertyAttribute), false);
- if (at != null && at.Name == name)
- return pi;
- }
- return null;
- }
-
- static GLib.Value ParseProperty (Type type, bool childprop, string name, string strval)
- {
- ParamSpec pspec;
-
- // FIXME: this can be removed when GParamSpec supports ValueType.
- PropertyInfo pi = FindClrProperty (type, name, childprop);
- if (pi == null)
- throw new GladeException ("Unknown property", type.ToString (), childprop, name, strval);
-
- if (childprop)
- pspec = ParamSpec.LookupChildProperty (type, name);
- else
- pspec = ParamSpec.LookupObjectProperty (type, name);
- if (pspec == null)
- throw new GladeException ("Unknown property", type.ToString (), childprop, name, strval);
-
- try {
- return ParseProperty (pspec, pi.PropertyType, strval);
- } catch {
- throw new GladeException ("Could not parse property", type.ToString (), childprop, name, strval);
- }
- }
-
- static void ParseProperties (Type type, bool childprops, IEnumerable props,
- out string[] propNames, out GLib.Value[] propVals)
- {
- ArrayList names = new ArrayList ();
- ArrayList values = new ArrayList ();
-
- foreach (XmlElement prop in props) {
- string name = prop.GetAttribute ("name").Replace ("_","-");
- string strval = prop.InnerText;
-
- // Skip translation context
- if (prop.GetAttribute ("context") == "yes" &&
- strval.IndexOf ('|') != -1)
- strval = strval.Substring (strval.IndexOf ('|') + 1);
-
- GLib.Value value;
- try {
- value = ParseProperty (type, childprops, name, strval);
- names.Add (name);
- values.Add (value);
- } catch (GladeException ge) {
- Console.Error.WriteLine (ge.Message);
- }
- }
-
- propNames = (string[])names.ToArray (typeof (string));
- propVals = (GLib.Value[])values.ToArray (typeof (GLib.Value));
- }
-
- static void ExtractProperties (TypedClassDescriptor klass, XmlElement elem,
- out Hashtable rawProps, out Hashtable overrideProps)
- {
- rawProps = new Hashtable ();
- overrideProps = new Hashtable ();
- foreach (ItemGroup group in klass.ItemGroups) {
- foreach (ItemDescriptor item in group) {
- TypedPropertyDescriptor prop = item as TypedPropertyDescriptor;
- if (prop == null)
- continue;
- prop = prop.GladeProperty;
- if (prop.GladeName == null)
- continue;
-
- XmlNode prop_node = elem.SelectSingleNode ("property[@name='" + prop.GladeName + "']");
- if (prop_node == null)
- continue;
-
- if (prop.GladeOverride)
- overrideProps[prop] = prop_node;
- else
- rawProps[prop] = prop_node;
- }
- }
- }
-
- static void ReadSignals (TypedClassDescriptor klass, ObjectWrapper wrapper, XmlElement elem)
- {
- Stetic.Wrapper.Widget ob = wrapper as Stetic.Wrapper.Widget;
- if (ob == null) return;
-
- foreach (ItemGroup group in klass.SignalGroups) {
- foreach (TypedSignalDescriptor signal in group) {
- if (signal.GladeName == null)
- continue;
-
- XmlElement signal_elem = elem.SelectSingleNode ("signal[@name='" + signal.GladeName + "']") as XmlElement;
- if (signal_elem == null)
- continue;
-
- string handler = signal_elem.GetAttribute ("handler");
- bool after = signal_elem.GetAttribute ("after") == "yes";
- ob.Signals.Add (new Signal (signal, handler, after));
- }
- }
- }
-
- static public void ImportWidget (ObjectWrapper wrapper, XmlElement elem)
- {
- string className = elem.GetAttribute ("class");
- if (className == null)
- throw new GladeException (" node with no class name");
-
- ClassDescriptor klassBase = Registry.LookupClassByCName (className);
- if (klassBase == null)
- throw new GladeException ("No stetic ClassDescriptor for " + className);
-
- TypedClassDescriptor klass = klassBase as TypedClassDescriptor;
- if (klass == null)
- throw new GladeException ("The widget class " + className + " is not supported by Glade");
-
- ReadSignals (klass, wrapper, elem);
-
- Hashtable rawProps, overrideProps;
- ExtractProperties (klass, elem, out rawProps, out overrideProps);
-
- string[] propNames;
- GLib.Value[] propVals;
- ParseProperties (klass.WrappedType, false, rawProps.Values,
- out propNames, out propVals);
-
- Gtk.Widget widget;
-
- if (wrapper.Wrapped == null) {
- if (className == "GtkWindow" || className == "GtkDialog") {
- widget = (Gtk.Widget) klass.CreateInstance (wrapper.Project);
- ObjectWrapper.Bind (wrapper.Project, klass, wrapper, widget, true);
- SetProperties (klass, widget, propNames, propVals);
- } else {
- IntPtr raw = gtksharp_object_newv (klass.GType.Val, propNames.Length, propNames, propVals);
- if (raw == IntPtr.Zero)
- throw new GladeException ("Could not create widget", className);
- widget = (Gtk.Widget)GLib.Object.GetObject (raw, true);
- if (widget == null) {
- gtk_object_sink (raw);
- throw new GladeException ("Could not create gtk# wrapper", className);
- }
- ObjectWrapper.Bind (wrapper.Project, klass, wrapper, widget, true);
- }
- } else {
- widget = (Gtk.Widget)wrapper.Wrapped;
- for (int i = 0; i < propNames.Length; i++)
- g_object_set_property (widget.Handle, propNames[i], ref propVals[i]);
- }
- MarkTranslatables (widget, rawProps);
-
- widget.Name = elem.GetAttribute ("id");
-
- SetOverrideProperties (wrapper, overrideProps);
- MarkTranslatables (widget, overrideProps);
- }
-
- static void SetProperties (TypedClassDescriptor klass, Gtk.Widget widget, string[] propNames, GLib.Value[] propVals)
- {
- for (int n=0; n 0)
- prop_elem.InnerText = val;
-
- if (prop.Translatable && prop.IsTranslated (wrapper.Wrapped)) {
- prop_elem.SetAttribute ("translatable", "yes");
- if (prop.TranslationContext (wrapper.Wrapped) != null) {
- prop_elem.SetAttribute ("context", "yes");
- prop_elem.InnerText = prop.TranslationContext (wrapper.Wrapped) + "|" + prop_elem.InnerText;
- }
- if (prop.TranslationComment (wrapper.Wrapped) != null)
- prop_elem.SetAttribute ("comments", prop.TranslationComment (wrapper.Wrapped));
- }
-
- parent_elem.AppendChild (prop_elem);
- }
- }
- }
-
- static public void GetSignals (ObjectWrapper wrapper, XmlElement parent_elem)
- {
- Stetic.Wrapper.Widget ob = wrapper as Stetic.Wrapper.Widget;
- if (ob == null) return;
-
- foreach (Signal signal in ob.Signals) {
- if (((TypedSignalDescriptor)signal.SignalDescriptor).GladeName == null)
- continue;
- if (!signal.SignalDescriptor.VisibleFor (wrapper.Wrapped))
- continue;
-
- XmlElement signal_elem = parent_elem.OwnerDocument.CreateElement ("signal");
- signal_elem.SetAttribute ("name", ((TypedSignalDescriptor)signal.SignalDescriptor).GladeName);
- signal_elem.SetAttribute ("handler", signal.Handler);
- if (signal.After)
- signal_elem.SetAttribute ("after", "yes");
- parent_elem.AppendChild (signal_elem);
- }
- }
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_type_fundamental (IntPtr gtype);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_type_class_ref (IntPtr gtype);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_type_class_unref (IntPtr klass);
-
- [DllImport (LIBGLIBGLUE, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
-
- [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
- static extern void gtk_object_sink (IntPtr raw);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern void g_object_get_property (IntPtr obj, string name, ref GLib.Value val);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern void g_object_set_property (IntPtr obj, string name, ref GLib.Value val);
-
- [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
- static extern void gtk_container_child_get_property (IntPtr parent, IntPtr child, string name, ref GLib.Value val);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_enum_get_value_by_name (IntPtr enum_class, string name);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_enum_get_value (IntPtr enum_class, int val);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_flags_get_value_by_name (IntPtr flags_class, string nick);
-
- [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_flags_get_first_value (IntPtr flags_class, uint val);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IDesignArea.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IDesignArea.cs
deleted file mode 100644
index 7fb86f1bebf..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IDesignArea.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public interface IDesignArea
- {
- IObjectSelection SetSelection (Gtk.Widget widget, object selectedInstance);
- IObjectSelection SetSelection (Gtk.Widget widget, object selectedInstance, bool allowDrag);
- void ResetSelection (Gtk.Widget widget);
- bool IsSelected (Gtk.Widget widget);
- IObjectSelection GetSelection ();
- IObjectSelection GetSelection (Gtk.Widget widget);
-
- void AddWidget (Gtk.Widget w, int x, int y);
- void RemoveWidget (Gtk.Widget w);
- void MoveWidget (Gtk.Widget w, int x, int y);
- Gdk.Rectangle GetCoordinates (Gtk.Widget w);
-
- event EventHandler SelectionChanged;
- }
-
- public delegate void DragDelegate (Gdk.EventMotion evt, int dx, int dy);
-
- public interface IObjectViewer
- {
- object TargetObject { get; set; }
- }
-
- public interface IObjectSelection: IDisposable
- {
- Gtk.Widget Widget { get; }
- object DataObject { get; }
- bool AllowDrag {get; set; }
-
- event DragDelegate Drag;
- event EventHandler Disposed;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IEditableObject.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IEditableObject.cs
deleted file mode 100644
index dd2e54c5dfb..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IEditableObject.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public interface IEditableObject
- {
- bool CanCopy { get; }
- bool CanCut { get; }
- bool CanPaste { get; }
- bool CanDelete { get; }
-
- void Copy ();
- void Cut ();
- void Paste ();
- void Delete ();
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IProject.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IProject.cs
deleted file mode 100644
index 2f01c90c155..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IProject.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace Stetic
-{
- public interface IProject
- {
- string FileName { get; }
- Gtk.Widget[] Toplevels { get; }
- Gtk.Widget GetTopLevel (string name);
- Gtk.Widget Selection { get; set; }
- Wrapper.ActionGroupCollection ActionGroups { get; }
- ProjectIconFactory IconFactory { get; }
- string ImagesRootPath { get; }
- string TargetGtkVersion { get; }
- bool Modified { get; set; }
- IResourceProvider ResourceProvider { get; set; }
-
- void PopupContextMenu (Stetic.Wrapper.Widget wrapper);
- void PopupContextMenu (Placeholder ph);
- void AddWindow (Gtk.Window window);
- string ImportFile (string filePath);
-
- event Wrapper.WidgetEventHandler SelectionChanged;
-
- void NotifyObjectChanged (ObjectWrapperEventArgs args);
- void NotifyNameChanged (Stetic.Wrapper.WidgetNameChangedArgs args);
- void NotifySignalAdded (SignalEventArgs args);
- void NotifySignalRemoved (SignalEventArgs args);
- void NotifySignalChanged (SignalChangedEventArgs args);
- void NotifyWidgetContentsChanged (Wrapper.Widget w);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IPropertyEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IPropertyEditor.cs
deleted file mode 100644
index f0cb14a48b5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IPropertyEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-
-namespace Stetic
-{
- // Property editors must be Gtk Widgets and implement this interface
-
- public interface IPropertyEditor: IDisposable
- {
- // Called once to initialize the editor.
- void Initialize (PropertyDescriptor descriptor);
-
- // Called when the object to be edited changes.
- void AttachObject (object obj);
-
- // Gets/Sets the value of the editor. If the editor supports
- // several value types, it is the responsibility of the editor
- // to return values with the expected type.
- object Value { get; set; }
-
- // To be fired when the edited value changes.
- event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IRadioGroupManager.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IRadioGroupManager.cs
deleted file mode 100644
index fe0cdec704b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IRadioGroupManager.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-using System;
-using System.Collections;
-
-namespace Stetic
-{
- public delegate void GroupsChangedDelegate ();
-
- public interface IRadioGroupManagerProvider
- {
- IRadioGroupManager GetGroupManager ();
- }
-
- public interface IRadioGroupManager
- {
- event GroupsChangedDelegate GroupsChanged;
- IEnumerable GroupNames { get; }
- void Rename (string oldName, string newName);
- void Add (string group);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/IResourceProvider.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/IResourceProvider.cs
deleted file mode 100644
index 3394cf77a62..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/IResourceProvider.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-
-using System;
-using System.IO;
-
-namespace Stetic
-{
- public interface IResourceProvider
- {
- ResourceInfo[] GetResources ();
- Stream GetResourceStream (string resourceName);
- ResourceInfo AddResource (string fileName);
- void RemoveResource (string resourceName);
- }
-
- public delegate string MimeResolverDelegate (string url);
-
- [Serializable]
- public class ResourceInfo
- {
- public static MimeResolverDelegate MimeResolver;
-
- string name;
- string fileName;
- string mimeType;
-
- public ResourceInfo (string name, string fileName): this (name, fileName, null)
- {
- }
-
- public ResourceInfo (string name, string fileName, string mimeType)
- {
- this.name = name;
- this.fileName = fileName;
- this.mimeType = mimeType;
- }
-
- public string Name {
- get { return name; }
- }
-
- public string FileName {
- get { return fileName; }
- }
-
- public string MimeType {
- get {
- if (mimeType == null) {
- if (MimeResolver == null)
- return null;
-
- if (File.Exists (fileName)) {
- mimeType = MimeResolver (fileName);
- } else {
- // Guess the mime type creating a temp file with the same extension
- string fn = Path.GetTempFileName ();
- string ext = Path.GetExtension (fileName);
- int n=0;
- while (File.Exists (fn + n + ext))
- n++;
- string tname = fn + n + ext;
- File.Move (fn, tname);
- mimeType = MimeResolver (tname);
- File.Delete (tname);
- }
- if (mimeType == null || mimeType == "")
- mimeType = "text";
- }
- return mimeType;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ImageInfo.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ImageInfo.cs
deleted file mode 100644
index 0a766731d3e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ImageInfo.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-
-using System;
-using System.IO;
-using System.CodeDom;
-
-namespace Stetic
-{
- public enum ImageSource
- {
- Theme,
- Resource,
- File
- }
-
- public class ImageInfo
- {
- ImageSource source;
- string name;
- Gtk.IconSize size;
- Gdk.Pixbuf image;
-
- private ImageInfo ()
- {
- }
-
- public string Label {
- get {
- if (source == ImageSource.File)
- return Path.GetFileName (name);
- else
- return name;
- }
- }
-
- public string Name {
- get { return name; }
- }
-
- public Gtk.IconSize ThemeIconSize {
- get { return size; }
- }
-
- public ImageSource Source {
- get { return source; }
- }
-
- public override string ToString ()
- {
- if (source == ImageSource.Theme)
- return "stock:" + name + " " + size;
- else if (source == ImageSource.Resource)
- return "resource:" + name;
- else
- return "file:" + name;
- }
-
- public static ImageInfo FromResource (string resourceName)
- {
- ImageInfo info = new ImageInfo ();
- info.name = resourceName;
- info.source = ImageSource.Resource;
- return info;
- }
-
- public static ImageInfo FromTheme (string iconId, Gtk.IconSize size)
- {
- ImageInfo info = new ImageInfo ();
- info.name = iconId;
- info.size = size;
- info.source = ImageSource.Theme;
- return info;
- }
-
- public static ImageInfo FromFile (string file)
- {
- ImageInfo info = new ImageInfo ();
- info.name = file;
- info.source = ImageSource.File;
- return info;
- }
-
- public static ImageInfo FromString (string str)
- {
- ImageInfo info = new ImageInfo ();
- if (str.StartsWith ("resource:")) {
- info.source = ImageSource.Resource;
- info.name = str.Substring (9);
- } else if (str.StartsWith ("stock:")) {
- info.source = ImageSource.Theme;
- string[] s = str.Substring (6).Split (' ');
- if (s.Length != 2)
- return null;
- info.name = s[0];
- info.size = (Gtk.IconSize) Enum.Parse (typeof(Gtk.IconSize), s[1]);
- } else if (str.StartsWith ("file:")) {
- info.source = ImageSource.File;
- info.name = str.Substring (5);
- } else
- return null;
- return info;
- }
-
- public Gdk.Pixbuf GetImage (IProject project)
- {
- if (image != null)
- return image;
-
- switch (source) {
- case ImageSource.Resource:
- if (project.ResourceProvider == null)
- return null;
- System.IO.Stream s = project.ResourceProvider.GetResourceStream (name);
- if (s == null)
- return null;
- try {
- return image = new Gdk.Pixbuf (s);
- } catch {
- // Not a valid image
- return WidgetUtils.MissingIcon;
- } finally {
- s.Dispose ();
- }
-
- case ImageSource.Theme:
- return image = WidgetUtils.LoadIcon (name, size);
-
- case ImageSource.File:
- try {
- string file = Path.Combine (project.ImagesRootPath, name);
- return image = new Gdk.Pixbuf (file);
- } catch {
- return WidgetUtils.MissingIcon;
- }
- }
- return null;
- }
-
- public Gdk.Pixbuf GetThumbnail (IProject project, int thumbnailSize)
- {
- Gdk.Pixbuf pix = GetImage (project);
- if (pix == null)
- return null;
-
- if (pix.Width >= pix.Height && pix.Width > thumbnailSize) {
- return ScaleImage (pix, thumbnailSize, thumbnailSize);
- } else if (pix.Height > pix.Width && pix.Height > thumbnailSize) {
- return ScaleImage (pix, thumbnailSize, thumbnailSize);
- }
- return pix;
- }
-
- public Gdk.Pixbuf GetScaledImage (IProject project, Gtk.IconSize size)
- {
- int w, h;
- Gtk.Icon.SizeLookup (size, out w, out h);
- return GetScaledImage (project, w, h);
- }
-
- public Gdk.Pixbuf GetScaledImage (IProject project, int width, int height)
- {
- Gdk.Pixbuf pix = GetImage (project);
- if (pix == null)
- return null;
- else
- return ScaleImage (pix, width, height);
- }
-
- Gdk.Pixbuf ScaleImage (Gdk.Pixbuf pix, int width, int height)
- {
- if ((pix.Width - width) > (pix.Height - height)) {
- if (pix.Width != width) {
- float prop = (float) pix.Height / (float) pix.Width;
- return pix.ScaleSimple (width, (int)(width * prop), Gdk.InterpType.Bilinear);
- }
- } else {
- if (pix.Height != height) {
- float prop = (float) pix.Width / (float) pix.Height;
- return pix.ScaleSimple ((int)(height * prop), height, Gdk.InterpType.Bilinear);
- }
- }
- return pix;
- }
-
- public CodeExpression ToCodeExpression (GeneratorContext ctx)
- {
- switch (source) {
- case ImageSource.Resource:
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (ctx.Options.ImageResourceLoaderClass, CodeTypeReferenceOptions.GlobalReference)),
- "LoadFromResource",
- new CodePrimitiveExpression (name)
- );
-
- case ImageSource.Theme:
- return ctx.GenerateLoadPixbuf (name, size);
-
- case ImageSource.File:
- return new CodeObjectCreateExpression (
- typeof(Gdk.Pixbuf).ToGlobalTypeRef (),
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(System.IO.Path), CodeTypeReferenceOptions.GlobalReference)),
- "Combine",
- new CodePropertyReferenceExpression (
- new CodePropertyReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(AppDomain), CodeTypeReferenceOptions.GlobalReference)),
- "CurrentDomain"
- ),
- "BaseDirectory"
- ),
- new CodePrimitiveExpression (name)
- )
- );
- }
- return new CodePrimitiveExpression (null);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemDescriptor.cs
deleted file mode 100644
index a64644eb068..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemDescriptor.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.Reflection;
-
-namespace Stetic
-{
- [Serializable]
- public abstract class ItemDescriptor
- {
- [NonSerialized]
- ArrayList deps;
-
- [NonSerialized]
- ArrayList visdeps;
-
- [NonSerialized]
- bool isInternal;
-
- [NonSerialized]
- ClassDescriptor klass;
-
- protected string targetGtkVersion;
-
- protected ItemDescriptor () {}
-
- protected ItemDescriptor (XmlElement elem, ItemGroup group, ClassDescriptor klass)
- {
- this.klass = klass;
- isInternal = elem.HasAttribute ("internal");
- deps = AddSubprops (elem.SelectNodes ("./disabled-if"), group, klass);
- visdeps = AddSubprops (elem.SelectNodes ("./invisible-if"), group, klass);
- targetGtkVersion = elem.GetAttribute ("gtk-version");
- if (targetGtkVersion.Length == 0)
- targetGtkVersion = null;
- }
-
- ArrayList AddSubprops (XmlNodeList nodes, ItemGroup group, ClassDescriptor klass)
- {
- ArrayList list = null;
-
- // Sub-properties can have a name+value (which checks for the value of a
- // property) or a method name, which should return true if the item has
- // to be disabled/hidden.
-
- foreach (XmlElement elem in nodes) {
- string name = elem.GetAttribute ("name");
- if (name.Length > 0) {
- string value = elem.GetAttribute ("value");
-
- PropertyDescriptor prop = (PropertyDescriptor)group[name];
- if (prop == null)
- prop = (PropertyDescriptor)klass[name];
- if (prop == null)
- throw new ArgumentException ("Bad sub-prop " + name);
- if (list == null)
- list = new ArrayList ();
-
- DepInfo info = new DepInfo ();
- info.Property = prop;
- info.Value = prop.StringToValue (value);
- list.Add (info);
- } else if ((name = elem.GetAttribute ("check")).Length > 0) {
- DepInfo info = new DepInfo ();
- info.CheckName = name;
- if (list == null)
- list = new ArrayList ();
- list.Add (info);
- } else {
- throw new ArgumentException ("Bad sub-prop");
- }
- }
- return list;
- }
-
- // The property's display name
- public abstract string Name { get; }
-
- public virtual string TargetGtkVersion {
- get {
- if (targetGtkVersion == null)
- return klass.TargetGtkVersion;
- else
- return targetGtkVersion;
- }
- }
-
- public bool SupportsGtkVersion (string targetVersion)
- {
- return WidgetUtils.CompareVersions (TargetGtkVersion, targetVersion) >= 0;
- }
-
- public bool HasDependencies {
- get {
- return deps != null || visdeps != null;
- }
- }
-
- public bool EnabledFor (object obj)
- {
- if (deps == null)
- return true;
-
- foreach (DepInfo dep in deps) {
- if (dep.Check (obj))
- return false;
- }
- return true;
- }
-
- public bool HasVisibility {
- get {
- return visdeps != null;
- }
- }
-
- public bool VisibleFor (object obj)
- {
- if (visdeps == null)
- return true;
-
- foreach (DepInfo dep in visdeps) {
- if (dep.Check (obj))
- return false;
- }
- return true;
- }
-
- public bool IsInternal {
- get {
- return isInternal;
- }
- }
-
- public ClassDescriptor ClassDescriptor {
- get { return klass; }
- }
-
- class DepInfo
- {
- public string CheckName;
- public PropertyDescriptor Property;
- public object Value;
-
- public bool Check (object obj)
- {
- if (Property != null) {
- object depValue = Property.GetValue (obj);
- return Value.Equals (depValue);
- } else {
- object wrapper = ObjectWrapper.Lookup (obj);
- object res = wrapper.GetType ().InvokeMember (CheckName, BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null, wrapper, null);
- return !(bool) res;
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroup.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroup.cs
deleted file mode 100644
index b5083c53d34..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroup.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-
-namespace Stetic {
- public class ItemGroup : IEnumerable
- {
- public static ItemGroup Empty;
-
- string label, name;
- ListDictionary items = new ListDictionary ();
- ClassDescriptor declaringType;
-
- static ItemGroup ()
- {
- Empty = new ItemGroup ();
- }
-
- private ItemGroup ()
- {
- }
-
- public ItemGroup (XmlElement elem, ClassDescriptor klass)
- {
- declaringType = klass;
- label = elem.GetAttribute ("label");
- name = elem.GetAttribute ("name");
-
- XmlNodeList nodes = elem.SelectNodes ("property | command | signal");
- for (int i = 0; i < nodes.Count; i++) {
- XmlElement item = (XmlElement)nodes[i];
- string refname = item.GetAttribute ("ref");
- if (refname != "") {
- if (refname.IndexOf ('.') != -1) {
- ItemDescriptor desc = (ItemDescriptor) Registry.LookupItem (refname);
- items [desc.Name] = desc;
- } else {
- ItemDescriptor desc = (ItemDescriptor) klass[refname];
- items [desc.Name] = desc;
- }
- continue;
- }
-
- ItemDescriptor idesc = klass.CreateItemDescriptor ((XmlElement)item, this);
- if (idesc != null)
- items [idesc.Name] = idesc;
- }
- }
-
- public string Label {
- get {
- return label;
- }
- }
-
- public string Name {
- get {
- return name;
- }
- }
-
- public IEnumerator GetEnumerator ()
- {
- return items.Values.GetEnumerator ();
- }
-
- public ItemDescriptor this [string name] {
- get {
- return (ItemDescriptor) items [name];
- }
- }
-
- public ClassDescriptor DeclaringType {
- get { return declaringType; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroupCollection.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroupCollection.cs
deleted file mode 100644
index 9fb9296315c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ItemGroupCollection.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-
-using System;
-using System.Collections;
-
-namespace Stetic
-{
- public class ItemGroupCollection: CollectionBase
- {
- public void Add (ItemGroup group)
- {
- List.Add (group);
- }
-
- public ItemGroup this [int n]
- {
- get {
- return (ItemGroup) List [n];
- }
- }
-
- public ItemGroup this [string name]
- {
- get {
- for (int n=0; n 0) {
- Type type = Registry.GetType (convTypeName, true);
- typeConverter = (TypeConverter) Activator.CreateInstance (type);
- }
- }
-
- // The property's user-visible name
- public virtual string Label {
- get {
- return label;
- }
- }
-
- // The property's type
- public abstract Type PropertyType {
- get ;
- }
-
- // The property's user-visible description
- public virtual string Description {
- get {
- return description;
- }
- }
-
- // The property's GUI editor type, if overridden
- public virtual Type EditorType {
- get {
- return editorType;
- }
- }
-
- // The property's minimum value, if declared
- public virtual object Minimum {
- get {
- return minimum;
- }
- }
-
- // The property's maximum value, if declared
- public virtual object Maximum {
- get {
- return maximum;
- }
- }
-
- public virtual string InternalChildId {
- get { return null; }
- }
-
- // Whether or not the property has a default value
- public virtual bool HasDefault {
- get {
- return hasDefault;
- }
- set {
- hasDefault = value;
- }
- }
-
- public virtual bool IsDefaultValue (object value)
- {
- if (value == null)
- return true;
- if (defaultValue != null)
- return value.Equals (defaultValue);
- return false;
- }
-
- public virtual void ResetValue (object instance)
- {
- if (HasDefault)
- SetValue (instance, defaultValue);
- }
-
- // The property's type at run time
- public virtual Type RuntimePropertyType {
- get { return PropertyType; }
- }
-
- // Gets the value of the property on @obj
- public abstract object GetValue (object obj);
-
- // Gets the value of the property on @obj, bypassing the wrapper.
- public virtual object GetRuntimeValue (object obj)
- {
- return GetValue (obj);
- }
-
- // Whether or not the property is writable
- public virtual bool CanWrite {
- get { return true; }
- }
-
- // Sets the value of the property on @obj
- public abstract void SetValue (object obj, object value);
-
- // Sets the value of the property on @obj, bypassing the wrapper.
- public virtual void SetRuntimeValue (object obj, object value)
- {
- SetValue (obj, value);
- }
-
- // Parses a string an returns a value valid for this property
- public virtual object StringToValue (string value)
- {
- if (typeConverter != null && typeConverter.CanConvertFrom (typeof(string)))
- return typeConverter.ConvertFromString (value);
- else if (PropertyType.IsEnum)
- return Enum.Parse (PropertyType, value);
- else if (PropertyType == typeof(ImageInfo))
- return ImageInfo.FromString (value);
- else if (PropertyType == typeof(string[]))
- return string.IsNullOrEmpty (value) ? null : value.Split ('\n');
- else if (PropertyType == typeof(DateTime))
- return new DateTime (long.Parse (value));
- else if (PropertyType == typeof(TimeSpan))
- return new TimeSpan (long.Parse (value));
- else if (PropertyType == typeof(double)) {
- int i = value.IndexOf (System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator);
- if (i != -1)
- return Convert.ChangeType (value, PropertyType, System.Globalization.CultureInfo.CurrentCulture);
- else
- return Convert.ChangeType (value, PropertyType, System.Globalization.CultureInfo.InvariantCulture);
- } else
- return Convert.ChangeType (value, PropertyType, System.Globalization.CultureInfo.InvariantCulture.NumberFormat);
- }
-
- // Returns a string representation of the provided property value
- public virtual string ValueToString (object value)
- {
- if (typeConverter != null && typeConverter.CanConvertTo (typeof(string)))
- return typeConverter.ConvertToString (value);
- else if (PropertyType == typeof(string[]))
- return value == null ? string.Empty : string.Join ("\n", (string[])value);
- else if (PropertyType == typeof(DateTime))
- return ((DateTime)value).Ticks.ToString ();
- else if (PropertyType == typeof(TimeSpan))
- return ((TimeSpan)value).Ticks.ToString ();
- else if (PropertyType == typeof(double))
- return ((double)value).ToString (System.Globalization.CultureInfo.InvariantCulture);
- else
- return value.ToString ();
- }
-
- public virtual bool InitWithName {
- get {
- return initWithName;
- }
- }
-
- public virtual bool IsRuntimeProperty {
- get { return isRuntimeProperty; }
- }
-
- public virtual bool Translatable {
- get {
- return translatable;
- }
- }
-
- public virtual bool IsTranslated (object obj)
- {
- if (!translatable)
- return false;
-
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null)
- return false;
-
- // Since translatable properties are assumed to be translated
- // by default, we return true if there is no TranslationInfo
- // for the object
-
- if (wrapper.translationInfo == null)
- return true;
-
- TranslationInfo info = (TranslationInfo)wrapper.translationInfo[obj];
- return (info == null || info.Translated == true);
- }
-
- public virtual void SetTranslated (object obj, bool translated)
- {
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null) return;
-
- if (wrapper.translationInfo == null)
- wrapper.translationInfo = new Hashtable ();
-
- TranslationInfo info = (TranslationInfo)wrapper.translationInfo[obj];
- if (info == null) {
- info = new TranslationInfo ();
- wrapper.translationInfo[obj] = info;
- }
-
- if (translated)
- info.Translated = true;
- else
- info.Translated = false;
- // We leave the old Context and Comment around, so that if
- // you toggle Translated off and then back on, the old info
- // is still there.
- }
-
- public virtual string TranslationContext (object obj)
- {
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null || wrapper.translationInfo == null) return null;
-
- TranslationInfo info = (TranslationInfo)wrapper.translationInfo[obj];
- return info != null ? info.Context : null;
- }
-
- public virtual void SetTranslationContext (object obj, string context)
- {
- SetTranslated (obj, true);
-
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null) return;
- ((TranslationInfo)wrapper.translationInfo[obj]).Context = context;
- }
-
- public virtual string TranslationComment (object obj)
- {
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null || wrapper.translationInfo == null) return null;
-
- TranslationInfo info = (TranslationInfo)wrapper.translationInfo[obj];
- return info != null ? info.Comment : null;
- }
-
- public virtual void SetTranslationComment (object obj, string comment)
- {
- SetTranslated (obj, true);
-
- ObjectWrapper wrapper = ObjectWrapper.Lookup (obj);
- if (wrapper == null) return;
- ((TranslationInfo)wrapper.translationInfo[obj]).Comment = comment;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorAttribute.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorAttribute.cs
deleted file mode 100644
index 05c2bb720bc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorAttribute.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-namespace Stetic {
-
- [AttributeUsage (AttributeTargets.Class)]
- public sealed class PropertyEditorAttribute : Attribute {
-
- public PropertyEditorAttribute (string property, string evt)
- {
- this.property = property;
- this.evt = evt;
- }
-
- public PropertyEditorAttribute (string property) : this (property, property + "Changed") {}
-
- string property;
- public string Property {
- get {
- return property;
- }
- set {
- property = value;
- }
- }
-
- string evt;
- public string Event {
- get {
- return evt;
- }
- set {
- evt = value;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
deleted file mode 100644
index aab3a1968f6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-
-namespace Stetic
-{
- public class PropertyEditorCell
- {
- Pango.Layout layout;
- PropertyDescriptor property;
- object obj;
- Gtk.Widget container;
-
- static Hashtable editors;
- static PropertyEditorCell Default = new PropertyEditorCell ();
- static Hashtable cellCache = new Hashtable ();
-
- static PropertyEditorCell ()
- {
- editors = new Hashtable ();
-
- editors[typeof (bool)] = typeof (Stetic.Editor.Boolean);
- editors[typeof (byte)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (sbyte)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (short)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (ushort)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (int)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (uint)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (long)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (ulong)] = typeof (Stetic.Editor.IntRange);
- editors[typeof (float)] = typeof (Stetic.Editor.FloatRange);
- editors[typeof (double)] = typeof (Stetic.Editor.FloatRange);
- editors[typeof (char)] = typeof (Stetic.Editor.Char);
- editors[typeof (string)] = typeof (Stetic.Editor.PropertyTextEditor);
- editors[typeof (DateTime)] = typeof (Stetic.Editor.DateTimeEditorCell);
- editors[typeof (TimeSpan)] = typeof (Stetic.Editor.TimeSpanEditorCell);
- editors[typeof (string[])] = typeof (Stetic.Editor.StringArray);
- editors[typeof (Gdk.Color)] = typeof (Stetic.Editor.Color);
- editors[typeof (Stetic.ImageInfo)] = typeof (Stetic.Editor.ImageSelector);
- }
-
- public object Instance {
- get { return obj; }
- }
-
- public PropertyDescriptor Property {
- get { return property; }
- }
-
- public Gtk.Widget Container {
- get { return container; }
- }
-
- public void Initialize (Widget container, PropertyDescriptor property, object obj)
- {
- this.container = container;
- if (layout != null) {
- layout.Dispose ();
- }
- layout = new Pango.Layout (container.PangoContext);
- layout.Width = -1;
-
- Pango.FontDescription des = container.Style.FontDescription.Copy();
- des.Size = 10 * (int) Pango.Scale.PangoScale;
- layout.FontDescription = des;
-
- this.property = property;
- this.obj = obj;
- Initialize ();
- }
-
- public EditSession StartEditing (Gdk.Rectangle cell_area, StateType state)
- {
- IPropertyEditor ed = CreateEditor (cell_area, state);
- if (ed == null)
- return null;
- ed.Initialize (property);
- if (obj != null) {
- ed.AttachObject (obj);
- ed.Value = property.GetValue (obj);
- }
- return new EditSession (container, obj, property, ed);
- }
-
- protected virtual string GetValueText ()
- {
- if (obj == null) return "";
- object val = property.GetValue (obj);
- if (val == null) return "";
- else return property.ValueToString (val);
- }
-
- string GetNormalizedText ()
- {
- string s = GetValueText ();
- if (s == null)
- return "";
-
- int i = s.IndexOf ('\n');
- if (i == -1)
- return s;
-
- s = s.TrimStart ('\n',' ','\t');
- i = s.IndexOf ('\n');
- if (i != -1)
- return s.Substring (0, i) + "...";
- else
- return s;
- }
-
- public object Value {
- get { return obj != null ? property.GetValue (obj) : null; }
- }
-
- protected virtual void Initialize ()
- {
- layout.SetText (GetNormalizedText ());
- }
-
- public virtual void GetSize (int availableWidth, out int width, out int height)
- {
- layout.GetPixelSize (out width, out height);
- }
-
- public virtual void Render (Drawable window, Gdk.Rectangle bounds, StateType state)
- {
- int w, h;
- layout.GetPixelSize (out w, out h);
- int dy = (bounds.Height - h) / 2;
- window.DrawLayout (container.Style.TextGC (state), bounds.X, dy + bounds.Y, layout);
- }
-
- protected virtual IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, StateType state)
- {
- Type editorType = property.EditorType;
-
- if (editorType == null) {
- editorType = GetEditorForType (property.PropertyType);
- if (editorType == null)
- return null;
- }
-
- IPropertyEditor editor = Activator.CreateInstance (editorType) as IPropertyEditor;
- if (editor == null)
- throw new Exception ("The property editor '" + editorType + "' must implement the interface IPropertyEditor");
- return editor;
- }
-
- public static Type GetEditorForType (Type propertyType)
- {
- if (propertyType.IsEnum) {
- if (propertyType.IsDefined (typeof (FlagsAttribute), true))
- return typeof (Stetic.Editor.Flags);
- else
- return typeof (Stetic.Editor.Enumeration);
- } else {
- return editors [propertyType] as Type;
- }
- }
-
- public static PropertyEditorCell GetPropertyCell (PropertyDescriptor property)
- {
- Type editorType = property.EditorType;
-
- if (editorType == null)
- editorType = GetEditorForType (property.PropertyType);
-
- if (editorType == null)
- return Default;
-
- if (typeof(IPropertyEditor).IsAssignableFrom (editorType)) {
- if (!typeof(Gtk.Widget).IsAssignableFrom (editorType))
- throw new Exception ("The property editor '" + editorType + "' must be a Gtk Widget");
- return Default;
- }
-
- PropertyEditorCell cell = (PropertyEditorCell) cellCache [editorType];
- if (cell != null)
- return cell;
-
- if (!typeof(PropertyEditorCell).IsAssignableFrom (editorType))
- throw new Exception ("The property editor '" + editorType + "' must be a subclass of Stetic.PropertyEditorCell or implement Stetic.IPropertyEditor");
-
- cell = (PropertyEditorCell) Activator.CreateInstance (editorType);
- cellCache [editorType] = cell;
- return cell;
- }
- }
-
-
- class DefaultPropertyEditor: Gtk.Entry, IPropertyEditor
- {
- PropertyDescriptor property;
-
- public void Initialize (PropertyDescriptor property)
- {
- this.property = property;
- }
-
- public void AttachObject (object obj)
- {
- }
-
- public object Value {
- get {
- return Convert.ChangeType (Text, property.PropertyType);
- }
- set {
- if (value == null)
- Text = "";
- else
- Text = Convert.ToString (value);
- }
- }
-
- protected override void OnChanged ()
- {
- base.OnChanged ();
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- public event EventHandler ValueChanged;
- }
-
- public class EditSession
- {
- PropertyDescriptor property;
- object obj;
- Gtk.Widget container;
- IPropertyEditor currentEditor;
- bool syncing;
- object initialVal;
-
- public EditSession (Gtk.Widget container, object instance, PropertyDescriptor property, IPropertyEditor currentEditor)
- {
- this.property = property;
- this.obj = instance;
- this.container = container;
- this.currentEditor = currentEditor;
- currentEditor.ValueChanged += OnValueChanged;
- initialVal = currentEditor.Value;
- }
-
- public object Instance {
- get { return obj; }
- }
-
- public PropertyDescriptor Property {
- get { return property; }
- }
-
- public Gtk.Widget Container {
- get { return container; }
- }
-
- public IPropertyEditor Editor {
- get { return currentEditor; }
- }
-
- void OnValueChanged (object s, EventArgs a)
- {
- if (!syncing) {
- syncing = true;
- property.SetValue (obj, currentEditor.Value);
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (obj) as Stetic.Wrapper.Widget;
- if (wrapper != null)
- wrapper.NotifyChanged ();
- syncing = false;
- }
- }
-
- public void AttachObject (object ob)
- {
- if (ob == null)
- throw new ArgumentNullException ("ob");
-
- syncing = true;
- this.obj = ob;
- currentEditor.AttachObject (obj);
-
- // It is the responsibility of the editor to convert value types
- object initial = property.GetValue (obj);
- currentEditor.Value = initial;
-
- syncing = false;
- }
-
- public void UpdateEditor ()
- {
- if (!syncing) {
- syncing = true;
- currentEditor.Value = property.GetValue (obj);
- syncing = false;
- }
- }
-
- public void Dispose ()
- {
- if (!object.Equals (initialVal, currentEditor.Value))
- OnValueChanged (null, null);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/RadioGroupManager.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/RadioGroupManager.cs
deleted file mode 100644
index 73c8fb8f699..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/RadioGroupManager.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.CodeDom;
-
-// The stetic representation of "radio widget" (Gtk.RadioButton,
-// Gtk.RadioToolButton, and Gtk.RadioMenuItem) groups is that the
-// groups have names, and each widget's "Group" property stores the
-// name of its group. The glade representation is similar, except that
-// the group names aren't arbitrary; they have to be the name of the
-// first widget in the group. (On disk, the "group leader" has no
-// "group" property, and the other widgets have the leader's name as
-// their group property.)
-//
-// The internal gtk representation of groups is that each radio widget
-// has a GLib.SList "Group" property. The content of the list is
-// essentially opaque. (For Gtk.RadioButton, the list contains all of
-// the RadioButtons in the group. But for Gtk.ToolRadioButton it
-// contains pointers to internal widgets, not the ToolRadioButtons
-// themselves.) The only thing we can do with them then is to read one
-// widget's group and then immediately assign it to another widget. We
-// can't look into the list, or assume that a widget's Group property
-// will keep the same value if any other widget's Group changes.
-//
-// Each radio widget type wrapper class keeps a static
-// RadioGroupManager to handle this string<->GLib.SList translation
-// for it.
-
-namespace Stetic {
-
- public class RadioGroup {
- public string Name;
- public ArrayList Widgets;
-
- public RadioGroup (string name)
- {
- Name = name;
- Widgets = new ArrayList ();
- }
- }
-
- public class RadioGroupManager: IRadioGroupManager
- {
- PropertyInfo groupProperty;
- ArrayList groups;
- Hashtable widgets;
-
- public RadioGroupManager (Type widgetType)
- {
- groupProperty = widgetType.GetProperty ("Group");
- if (groupProperty == null || groupProperty.PropertyType != typeof (GLib.SList))
- throw new ArgumentException ("No 'public GLib.SList Group' property on '" + widgetType.FullName + "'");
-
- groups = new ArrayList ();
- widgets = new Hashtable ();
- }
-
- public event GroupsChangedDelegate GroupsChanged;
-
- void EmitGroupsChanged ()
- {
- if (GroupsChanged != null)
- GroupsChanged ();
- }
-
- public IEnumerable GroupNames {
- get {
- string[] names = new string[groups.Count];
- for (int i = 0; i < groups.Count; i++)
- names[i] = ((RadioGroup)groups[i]).Name;
- return names;
- }
- }
-
- public string LastGroup {
- get {
- if (groups.Count == 0)
- Add ("group1");
- RadioGroup group = groups[groups.Count - 1] as RadioGroup;
- return group.Name;
- }
- }
-
- public RadioGroup FindGroup (string name)
- {
- for (int i = 0; i < groups.Count; i++) {
- RadioGroup group = groups[i] as RadioGroup;
- if (group.Name == name)
- return group;
- }
- return null;
- }
-
- void IRadioGroupManager.Add (string name)
- {
- Add (name);
- }
-
- public RadioGroup Add (string name)
- {
- RadioGroup group = new RadioGroup (name);
- groups.Add (group);
- EmitGroupsChanged ();
- return group;
- }
-
- public void Rename (string oldName, string newName)
- {
- RadioGroup group = FindGroup (oldName);
- if (group != null) {
- group.Name = newName;
- EmitGroupsChanged ();
- }
- }
-
- void RadioDestroyed (object obj, EventArgs args)
- {
- Gtk.Widget radio = obj as Gtk.Widget;
- this[radio] = null;
- }
-
- public string this[Gtk.Widget radio] {
- get {
- RadioGroup group = widgets[radio] as RadioGroup;
- if (group != null)
- return group.Name;
- else
- return null;
- }
- set {
- GLib.SList group_value;
-
- RadioGroup oldGroup = widgets[radio] as RadioGroup;
- if (oldGroup == null) {
- radio.Destroyed += RadioDestroyed;
- } else {
- if (oldGroup.Name == value)
- return;
- oldGroup.Widgets.Remove (radio);
- if (oldGroup.Widgets.Count == 0) {
- groups.Remove (oldGroup);
- EmitGroupsChanged ();
- }
- }
-
- if (value == null) {
- radio.Destroyed -= RadioDestroyed;
- groupProperty.SetValue (radio, new GLib.SList (IntPtr.Zero), null);
- widgets.Remove (radio);
- return;
- }
-
- RadioGroup newGroup = FindGroup (value);
- if (newGroup == null)
- newGroup = Add (value);
-
- if (newGroup.Widgets.Count == 0)
- group_value = new GLib.SList (IntPtr.Zero);
- else
- group_value = (GLib.SList)groupProperty.GetValue (newGroup.Widgets[0], null);
-
- groupProperty.SetValue (radio, group_value, null);
- newGroup.Widgets.Add (radio);
- widgets[radio] = newGroup;
- }
- }
-
- public string GladeGroupName (Gtk.Widget radio)
- {
- RadioGroup group = widgets[radio] as RadioGroup;
- if (group == null || group.Widgets.Count == 0)
- return null;
-
- Gtk.Widget leader = (Gtk.Widget)group.Widgets[0];
- return leader.Name;
- }
-
- public CodeExpression GenerateGroupExpression (GeneratorContext ctx, Gtk.Widget widget)
- {
- // Returns and expression that represents the group to which the radio belongs.
- // This expression can be an empty SList, if this is the first radio of the
- // group that has been generated, or an SList taken from previously generated
- // radios from the same group.
-
- RadioGroup group = widgets[widget] as RadioGroup;
- CodeExpression var = null;
-
- foreach (Gtk.Widget radio in group.Widgets) {
- if (radio == widget)
- continue;
- var = ctx.WidgetMap.GetWidgetExp (radio);
- if (var != null)
- break;
- }
-
- if (var == null) {
- return new CodeObjectCreateExpression (
- "GLib.SList".ToGlobalTypeRef (),
- new CodePropertyReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(IntPtr), CodeTypeReferenceOptions.GlobalReference)),
- "Zero"
- )
- );
- } else {
- return new CodePropertyReferenceExpression (
- var,
- "Group"
- );
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/Registry.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/Registry.cs
deleted file mode 100644
index d6c5c653e1a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/Registry.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-using System.Xml.Xsl;
-
-namespace Stetic {
- public static class Registry {
-
- static ArrayList libraries = new ArrayList ();
- static ArrayList classes = new ArrayList ();
-
- static XslCompiledTransform gladeImport, gladeExport;
- static WidgetLibrary coreLib;
-
- public static event EventHandler RegistryChanging;
- public static event EventHandler RegistryChanged;
-
- static int changing;
- static bool changed;
-
- public static void Initialize (WidgetLibrary coreLibrary)
- {
- RegisterWidgetLibrary (coreLibrary);
- coreLib = coreLibrary;
- }
-
- public static WidgetLibrary CoreWidgetLibrary {
- get { return coreLib; }
- }
-
- public static void BeginChangeSet ()
- {
- if (changing == 0)
- changed = false;
- changing++;
- }
-
- public static void EndChangeSet ()
- {
- if (--changing == 0) {
- if (changed) {
- foreach (WidgetLibrary lib in libraries)
- lib.Flush ();
- NotifyChanged ();
- }
- changed = false;
- }
- }
-
- public static void RegisterWidgetLibrary (WidgetLibrary library)
- {
- NotifyChanging ();
-
- try {
- if (coreLib != null && library.Name == coreLib.Name) {
- libraries.Remove (coreLib);
- InternalUpdate ();
- coreLib = library;
- }
- libraries.Add (library);
- library.Load ();
- classes.AddRange (library.AllClasses);
- UpdateGladeTransform ();
- } catch (Exception ex) {
- Console.WriteLine (ex);
- throw;
- } finally {
- NotifyChanged ();
- }
- }
-
- public static void UnregisterWidgetLibrary (WidgetLibrary library)
- {
- if (library == coreLib)
- return;
-
- NotifyChanging ();
-
- libraries.Remove (library);
- library.Dispose ();
- InternalUpdate ();
-
- NotifyChanged ();
- }
-
-
- // Returns true if all libraries that need reloading
- // could be reloaded
-
- public static bool ReloadWidgetLibraries ()
- {
- bool needsReload = false;
-
- // If there is a lib which can't be reloaded,
- // there is no need to start the reloading process
-
- foreach (WidgetLibrary lib in libraries) {
- if (lib != coreLib && lib.NeedsReload) {
- if (!lib.CanReload)
- return false;
- needsReload = true;
- }
- }
-
- if (!needsReload)
- return true;
-
- try {
- NotifyChanging ();
-
- foreach (WidgetLibrary lib in libraries)
- if (lib != coreLib && lib.NeedsReload)
- lib.Reload ();
-
- InternalUpdate ();
- } finally {
- NotifyChanged ();
- }
-
- return true;
- }
-
- public static bool IsRegistered (WidgetLibrary library)
- {
- return libraries.Contains (library);
- }
-
- public static WidgetLibrary GetWidgetLibrary (string name)
- {
- foreach (WidgetLibrary lib in libraries)
- if (lib.Name == name)
- return lib;
- return null;
- }
-
- public static bool IsRegistered (string name)
- {
- foreach (WidgetLibrary lib in libraries)
- if (lib.Name == name)
- return true;
- return false;
- }
-
- public static WidgetLibrary[] RegisteredWidgetLibraries {
- get { return (WidgetLibrary[]) libraries.ToArray (typeof(WidgetLibrary)); }
- }
-
- static void NotifyChanging ()
- {
- if (changing > 0) {
- if (changed)
- return;
- else
- changed = true;
- }
- if (RegistryChanging != null)
- RegistryChanging (null, EventArgs.Empty);
- }
-
- static void NotifyChanged ()
- {
- if (changing == 0 && RegistryChanged != null)
- RegistryChanged (null, EventArgs.Empty);
- }
-
- static void InternalUpdate ()
- {
- classes.Clear ();
- foreach (WidgetLibrary lib in libraries)
- classes.AddRange (lib.AllClasses);
- UpdateGladeTransform ();
- }
-
- static void UpdateGladeTransform ()
- {
- XmlDocument doc = CreateGladeTransformBase ();
- XmlNamespaceManager nsm = new XmlNamespaceManager (doc.NameTable);
- nsm.AddNamespace ("xsl", "http://www.w3.org/1999/XSL/Transform");
-
- foreach (WidgetLibrary lib in libraries) {
- foreach (XmlElement elem in lib.GetGladeImportTransformElements ())
- doc.FirstChild.PrependChild (doc.ImportNode (elem, true));
- }
-
- gladeImport = new XslCompiledTransform ();
- gladeImport.Load (doc);
-
- doc = CreateGladeTransformBase ();
-
- foreach (WidgetLibrary lib in libraries) {
- foreach (XmlElement elem in lib.GetGladeExportTransformElements ())
- doc.FirstChild.PrependChild (doc.ImportNode (elem, true));
- }
-
- gladeExport = new XslCompiledTransform ();
- gladeExport.Load (doc);
- }
-
- static XmlDocument CreateGladeTransformBase ()
- {
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml (
- "" +
- " " +
- " " +
- " " +
- " " +
- " " +
- ""
- );
- return doc;
- }
-
- public static IEnumerable AllClasses {
- get {
- return classes;
- }
- }
-
- public static XslCompiledTransform GladeImportXsl {
- get {
- return gladeImport;
- }
- }
-
- public static XslCompiledTransform GladeExportXsl {
- get {
- return gladeExport;
- }
- }
-
- public static EnumDescriptor LookupEnum (string typeName)
- {
- foreach (WidgetLibrary lib in libraries) {
- EnumDescriptor desc = lib.LookupEnum (typeName);
- if (desc != null)
- return desc;
- }
- return null;
- }
-
- public static ClassDescriptor LookupClassByCName (string cname)
- {
- foreach (WidgetLibrary lib in libraries) {
- ClassDescriptor desc = lib.LookupClassByCName (cname);
- if (desc != null)
- return desc;
- }
- return null;
- }
-
- public static ClassDescriptor LookupClassByName (string cname)
- {
- foreach (WidgetLibrary lib in libraries) {
- ClassDescriptor desc = lib.LookupClassByName (cname);
- if (desc != null)
- return desc;
- }
- return null;
- }
-
- static ClassDescriptor FindGroupClass (string name, out string groupname)
- {
- int sep = name.LastIndexOf ('.');
- string classname = name.Substring (0, sep);
- groupname = name.Substring (sep + 1);
- ClassDescriptor klass = LookupClassByName (classname);
- if (klass == null) {
- klass = LookupClassByName (name);
- if (klass == null)
- throw new ArgumentException ("No class for itemgroup " + name);
- classname = name;
- groupname = "";
- }
- return klass;
- }
-
- public static ItemGroup LookupItemGroup (string name)
- {
- string groupname;
- ClassDescriptor klass = FindGroupClass (name, out groupname);
-
- foreach (ItemGroup grp in klass.ItemGroups)
- if (grp.Name == groupname && grp.DeclaringType == klass)
- return grp;
-
- throw new ArgumentException ("No itemgroup '" + groupname + "' in class " + klass.WrappedTypeName);
- }
-
- public static ItemGroup LookupSignalGroup (string name)
- {
- string groupname;
- ClassDescriptor klass = FindGroupClass (name, out groupname);
-
- foreach (ItemGroup grp in klass.SignalGroups)
- if (grp.Name == groupname && grp.DeclaringType == klass)
- return grp;
- throw new ArgumentException ("No itemgroup '" + groupname + "' in class " + klass.WrappedTypeName);
- }
-
- public static ItemDescriptor LookupItem (string name)
- {
- int sep = name.LastIndexOf ('.');
- string classname = name.Substring (0, sep);
- string propname = name.Substring (sep + 1);
- ClassDescriptor klass = LookupClassByName (classname);
- if (klass == null)
- throw new ArgumentException ("No class " + classname + " for property " + propname);
- ItemDescriptor idesc = klass[propname];
- if (idesc == null)
- throw new ArgumentException ("Property '" + propname + "' not found in class '" + classname + "'");
- return idesc;
- }
-
- public static ItemGroup LookupContextMenu (string classname)
- {
- ClassDescriptor klass = LookupClassByName (classname);
- if (klass == null)
- throw new ArgumentException ("No class for contextmenu " + classname);
- return klass.ContextMenu;
- }
-
- public static object NewInstance (string typeName, IProject proj)
- {
- return LookupClassByName (typeName).NewInstance (proj);
- }
-
- public static Type GetType (string typeName, bool throwOnError)
- {
- Type t = Type.GetType (typeName, false);
- if (t != null) return t;
-
- foreach (WidgetLibrary lib in libraries) {
- t = lib.GetType (typeName);
- if (t != null) return t;
- }
-
- string tname, aname;
- int i = typeName.IndexOf (',');
- if (i != -1) {
- tname = typeName.Substring (0, i).Trim ();
- aname = typeName.Substring (i + 1).Trim ();
- }
- else {
- tname = typeName;
- aname = null;
- }
- foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies ()) {
- if (aname == null || asm.GetName ().Name == aname) {
- t = asm.GetType (tname);
- if (t != null)
- return t;
- }
- }
-
- if (throwOnError)
- throw new TypeLoadException ("Could not load type '" + typeName + "'");
-
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/Set.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/Set.cs
deleted file mode 100644
index 58f0b26b0b5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/Set.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic {
-
- public class Set : IEnumerable, IEnumerator {
-
- Hashtable hash = new Hashtable ();
-
- public bool this [object obj] {
- get {
- return hash[obj] != null;
- }
- set {
- if (value)
- hash[obj] = obj;
- else
- hash.Remove (obj);
- }
- }
-
- public void Clear ()
- {
- hash.Clear ();
- }
-
- public IEnumerator GetEnumerator ()
- {
- return this;
- }
-
- IDictionaryEnumerator hashEnum;
-
- public void Reset ()
- {
- hashEnum = hash.GetEnumerator ();
- hashEnum.Reset ();
- }
-
- public bool MoveNext ()
- {
- return hashEnum.MoveNext ();
- }
-
- public object Current {
- get {
- return hashEnum.Key;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/SignalDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/SignalDescriptor.cs
deleted file mode 100644
index 871364d67bb..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/SignalDescriptor.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Reflection;
-using System.Xml;
-
-namespace Stetic
-{
- [Serializable]
- public abstract class SignalDescriptor: ItemDescriptor
- {
- protected string name, label, description;
- protected string handlerTypeName;
- protected string handlerReturnTypeName;
- protected ParameterDescriptor[] handlerParameters;
-
- public SignalDescriptor (XmlElement elem, ItemGroup group, ClassDescriptor klass) : base (elem, group, klass)
- {
- }
-
- protected virtual void Load (XmlElement elem)
- {
- name = elem.GetAttribute ("name");
- label = elem.GetAttribute ("label");
- description = elem.GetAttribute ("description");
- }
-
- public override string Name {
- get { return name; }
- }
-
- public string Label {
- get { return label; }
- }
-
- public string Description {
- get { return description; }
- }
-
- public string HandlerTypeName {
- get { return handlerTypeName; }
- }
-
- public string HandlerReturnTypeName {
- get { return handlerReturnTypeName; }
- }
-
- public ParameterDescriptor[] HandlerParameters {
- get { return handlerParameters; }
- }
- }
-
- [Serializable]
- public class ParameterDescriptor
- {
- string name, type;
-
- public ParameterDescriptor (string name, string type)
- {
- this.name = name;
- this.type = type;
- }
-
- public string Name {
- get { return name; }
- }
-
- public string TypeName {
- get { return type; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelDialog.cs
deleted file mode 100644
index 04f066e5077..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelDialog.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Gtk;
-
-namespace Stetic
-{
- public class TopLevelDialog: TopLevelWindow
- {
- HButtonBox buttonBox;
- VBox vbox;
- HSeparator separator;
-
- public TopLevelDialog ( )
- {
- vbox = new VBox ();
- separator = new HSeparator ();
- buttonBox = new HButtonBox ();
- vbox.PackEnd (buttonBox, false, false, 0);
- vbox.PackEnd (separator, false, false, 0);
- vbox.ShowAll ();
- Add (vbox);
- }
-
- public HButtonBox ActionArea {
- get { return buttonBox; }
- }
-
- public VBox VBox {
- get { return vbox; }
- }
-
- public bool HasSeparator
- {
- get { return separator.Visible; }
- set { separator.Visible = value; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelWindow.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelWindow.cs
deleted file mode 100644
index 3e3cdc694a0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TopLevelWindow.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Stetic
-{
- public class TopLevelWindow: Gtk.EventBox
- {
- string title;
- Gdk.WindowTypeHint typeHint;
- bool modal;
- bool resizable = true;
-
- public event EventHandler PropertyChanged;
-
- public string Title {
- get { return title; }
- set {
- title = value;
- NotifyChange ();
- }
- }
-
- public Gdk.WindowTypeHint TypeHint {
- get { return typeHint; }
- set {
- typeHint = value;
- NotifyChange ();
- }
- }
-
- public bool Modal {
- get { return modal; }
- set
- {
- modal = value;
- NotifyChange ();
- }
- }
-
- public bool Resizable
- {
- get { return resizable; }
- set
- {
- resizable = value;
- NotifyChange ();
- }
- }
-
- void NotifyChange ( )
- {
- if (PropertyChanged != null)
- PropertyChanged (this, EventArgs.Empty);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TranslatableAttribute.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TranslatableAttribute.cs
deleted file mode 100644
index 2b938420e6c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TranslatableAttribute.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Stetic {
-
- [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field)]
- public sealed class TranslatableAttribute : Attribute {
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedClassDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedClassDescriptor.cs
deleted file mode 100644
index 2f3425c31d5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedClassDescriptor.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Xml;
-
-namespace Stetic
-{
- public class TypedClassDescriptor: ClassDescriptor
- {
- Type wrapped, wrapper;
- GLib.GType gtype;
-
- MethodInfo ctorMethodInfo;
- MethodInfo ctorMethodInfoWithClass;
- ConstructorInfo cinfo;
- bool useGTypeCtor;
- Gdk.Pixbuf icon;
- bool defaultValuesLoaded;
-
- const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
- static Gdk.Pixbuf missingIcon;
-
- public TypedClassDescriptor (Assembly assembly, XmlElement elem)
- {
- bool inheritedWrapper = false;
-
- wrapped = Registry.GetType (elem.GetAttribute ("type"), true);
- if (elem.HasAttribute ("wrapper"))
- wrapper = Registry.GetType (elem.GetAttribute ("wrapper"), true);
- else {
- inheritedWrapper = true;
- string baseClass = elem.GetAttribute ("base-type");
- if (baseClass.Length > 0) {
- // If a base type is specified, use the wrapper of that base type
- TypedClassDescriptor parent = Registry.LookupClassByName (baseClass) as TypedClassDescriptor;
- if (parent != null)
- wrapper = parent.WrapperType;
- }
- else {
- for (Type type = wrapped.BaseType; type != null; type = type.BaseType) {
- TypedClassDescriptor parent = Registry.LookupClassByName (type.FullName) as TypedClassDescriptor;
- if (parent != null) {
- wrapper = parent.WrapperType;
- break;
- }
- }
- }
- if (wrapper == null)
- throw new ArgumentException (string.Format ("No wrapper type for class {0}", wrapped.FullName));
- }
-
- gtype = (GLib.GType)wrapped;
- cname = gtype.ToString ();
-
- string iconname = elem.GetAttribute ("icon");
- if (iconname.Length > 0) {
- try {
- // Using the pixbuf resource constructor generates a gdk warning.
- Gdk.PixbufLoader loader = new Gdk.PixbufLoader (assembly, iconname);
- icon = loader.Pixbuf;
- } catch {
- Console.WriteLine ("Could not load icon: " + iconname);
- icon = GetDefaultIcon ();
- }
- } else
- icon = GetDefaultIcon ();
-
- BindingFlags flags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
-
- // If the wrapper is inherited from a base class, ignore the CreateInstance method
- // since it is going to create an instance of the base class.
- if (!inheritedWrapper) {
- ctorMethodInfoWithClass = wrapper.GetMethod ("CreateInstance", flags, null, new Type[] { typeof(ClassDescriptor)}, null);
- if (ctorMethodInfoWithClass == null) {
- ctorMethodInfo = wrapper.GetMethod ("CreateInstance", flags, null, Type.EmptyTypes, null);
- }
- }
-
- // Look for a constructor even if a CreateInstance method was
- // found, since it may return null.
- cinfo = wrapped.GetConstructor (Type.EmptyTypes);
- if (cinfo == null) {
- useGTypeCtor = true;
- cinfo = wrapped.GetConstructor (new Type[] { typeof (IntPtr) });
- }
-
- Load (elem);
- }
-
- public override Gdk.Pixbuf Icon {
- get {
- return icon;
- }
- }
-
- public override string WrappedTypeName {
- get { return WrappedType.FullName; }
- }
-
- public Type WrapperType {
- get {
- return wrapper;
- }
- }
-
- public Type WrappedType {
- get {
- return wrapped;
- }
- }
-
- public GLib.GType GType {
- get {
- return gtype;
- }
- }
-
- public override ObjectWrapper CreateWrapper ()
- {
- return (ObjectWrapper) Activator.CreateInstance (WrapperType);
- }
-
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr g_object_new (IntPtr gtype, IntPtr dummy);
-
- public override object CreateInstance (IProject proj)
- {
- object inst;
-
- if (ctorMethodInfoWithClass != null) {
- inst = ctorMethodInfoWithClass.Invoke (null, new object[] { this });
- if (inst != null) return inst;
- }
- if (ctorMethodInfo != null) {
- inst = ctorMethodInfo.Invoke (null, new object[0]);
- if (inst != null) return inst;
- }
-
- if (cinfo == null)
- throw new InvalidOperationException ("The class '" + wrapped + "' does not have a default constructor.");
-
- if (!useGTypeCtor)
- inst = cinfo.Invoke (new object[0]);
- else {
- IntPtr raw = g_object_new (gtype.Val, IntPtr.Zero);
- inst = cinfo.Invoke (new object[] { raw });
- }
-
- return inst;
- }
-
- internal protected override ItemDescriptor CreateItemDescriptor (XmlElement elem, ItemGroup group)
- {
- if (elem.Name == "property")
- return new TypedPropertyDescriptor (elem, group, this);
- else if (elem.Name == "signal")
- return new TypedSignalDescriptor (elem, group, this);
- else
- return base.CreateItemDescriptor (elem, group);
- }
-
- Gdk.Pixbuf GetDefaultIcon ()
- {
- if (missingIcon == null)
- missingIcon = WidgetUtils.MissingIcon;
- return missingIcon;
- }
-
- internal void LoadDefaultValues ()
- {
- // This is a hack because there is no managed way of getting
- // the default value of a GObject property.
- // This method creates an dummy instance of this class and
- // gets the values for their properties. Those values are
- // considered the default
-
- if (defaultValuesLoaded)
- return;
- defaultValuesLoaded = true;
-
- object ob = NewInstance (null, false);
-
- foreach (ItemGroup group in ItemGroups) {
- foreach (ItemDescriptor item in group) {
- TypedPropertyDescriptor prop = item as TypedPropertyDescriptor;
- if (prop == null)
- continue;
-
- if (!prop.HasDefault) {
- prop.SetDefault (null);
- } else {
- object val = prop.GetValue (ob);
- prop.SetDefault (val);
- }
- }
- }
- ObjectWrapper ww = ObjectWrapper.Lookup (ob);
- ww.Dispose ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedPropertyDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedPropertyDescriptor.cs
deleted file mode 100644
index 5be86a0ad64..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedPropertyDescriptor.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-
-namespace Stetic
-{
- public class TypedPropertyDescriptor : PropertyDescriptor {
-
- PropertyInfo memberInfo, propertyInfo, runtimePropertyInfo, runtimeMemberInfo;
- ParamSpec pspec;
- TypedPropertyDescriptor gladeProperty;
- bool isWrapperProperty;
- TypedClassDescriptor klass;
- bool defaultSet;
-
- const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
- public TypedPropertyDescriptor (XmlElement elem, ItemGroup group, TypedClassDescriptor klass) : base (elem, group, klass)
- {
- this.klass = klass;
- string propertyName = elem.GetAttribute ("name");
- int dot = propertyName.IndexOf ('.');
-
- if (dot != -1) {
- // Sub-property (eg, "Alignment.Value")
- memberInfo = FindProperty (klass.WrapperType, klass.WrappedType, propertyName.Substring (0, dot));
- isWrapperProperty = memberInfo.DeclaringType.IsSubclassOf (typeof (ObjectWrapper));
- gladeProperty = new TypedPropertyDescriptor (isWrapperProperty ? klass.WrapperType : klass.WrappedType, memberInfo.Name);
- propertyInfo = FindProperty (memberInfo.PropertyType, propertyName.Substring (dot + 1));
- } else {
- // Basic simple property
- propertyInfo = FindProperty (klass.WrapperType, klass.WrappedType, propertyName);
- isWrapperProperty = propertyInfo.DeclaringType.IsSubclassOf (typeof (ObjectWrapper));
- }
-
- // Wrapper properties that override widgets properties (using the same name)
- // must be considered runtime properties (will be available at run-time).
- if (!isWrapperProperty || klass.WrappedType.GetProperty (propertyName) != null)
- isRuntimeProperty = true;
-
- if (!IsInternal && propertyInfo.PropertyType.IsEnum &&
- Registry.LookupEnum (propertyInfo.PropertyType.FullName) == null)
- throw new ArgumentException ("No EnumDescriptor for " + propertyInfo.PropertyType.FullName + "(" + klass.WrappedType.FullName + "." + propertyName + ")");
-
- pspec = FindPSpec (propertyInfo);
-
- if (isWrapperProperty && pspec == null) {
- PropertyInfo pinfo = klass.WrappedType.GetProperty (propertyInfo.Name, flags);
- if (pinfo != null)
- pspec = FindPSpec (pinfo);
- }
-
- if (pspec != null) {
- // This information will be overridden by what's specified in the xml file
- description = pspec.Blurb;
- minimum = pspec.Minimum;
- maximum = pspec.Maximum;
- label = propertyName;
- if (!elem.HasAttribute ("ignore-default"))
- hasDefault = Type.GetTypeCode (PropertyType) != TypeCode.Object || PropertyType.IsEnum;
- } else {
- label = propertyInfo.Name;
- gladeOverride = true;
- }
-
- string typeName = elem.GetAttribute ("editor");
- if (typeName.Length > 0)
- editorType = Registry.GetType (typeName, false);
-
- // Look for a default value attribute
-
- object[] ats = propertyInfo.GetCustomAttributes (typeof(DefaultValueAttribute), true);
- if (ats.Length > 0) {
- DefaultValueAttribute at = (DefaultValueAttribute) ats [0];
- defaultValue = at.Value;
- }
-
- // Load default data
- Load (elem);
- }
-
- TypedPropertyDescriptor (Type objectType, string propertyName)
- {
- propertyInfo = FindProperty (objectType, propertyName);
- isWrapperProperty = false;
-
- pspec = FindPSpec (propertyInfo);
- if (pspec != null) {
- label = propertyName;
- description = pspec.Blurb;
- minimum = pspec.Minimum;
- maximum = pspec.Maximum;
- hasDefault = Type.GetTypeCode (PropertyType) != TypeCode.Object || PropertyType.IsEnum;
- } else
- label = propertyInfo.Name;
- }
-
- static PropertyInfo FindProperty (Type type, string propertyName) {
- return FindProperty (null, type, propertyName);
- }
-
- static PropertyInfo FindProperty (Type wrapperType, Type objectType, string propertyName)
- {
- PropertyInfo info = null;
-
- if (wrapperType != null) {
- info = wrapperType.GetProperty (propertyName, flags);
- if (info != null)
- return info;
- }
-
- try {
- info = objectType.GetProperty (propertyName, flags);
- }
- catch (AmbiguousMatchException) {
- foreach (PropertyInfo pi in objectType.GetProperties ()) {
- if (pi.Name == propertyName) {
- info = pi;
- break;
- }
- }
- }
-
- if (info != null)
- return info;
-
- throw new ArgumentException ("Invalid property name " + objectType.Name + "." + propertyName);
- }
-
- ParamSpec FindPSpec (PropertyInfo pinfo)
- {
- foreach (object attr in pinfo.GetCustomAttributes (false)) {
- if (attr is GLib.PropertyAttribute) {
- GLib.PropertyAttribute pattr = (GLib.PropertyAttribute)attr;
- return ParamSpec.LookupObjectProperty (pinfo.DeclaringType, pattr.Name);
- }
-
- if (attr is Gtk.ChildPropertyAttribute) {
- Gtk.ChildPropertyAttribute cpattr = (Gtk.ChildPropertyAttribute)attr;
- return ParamSpec.LookupChildProperty (pinfo.DeclaringType.DeclaringType, cpattr.Name);
- }
- }
- return null;
- }
-
- // The property's internal name
- public override string Name {
- get {
- return propertyInfo.Name;
- }
- }
-
- // The property's type
- public override Type PropertyType {
- get {
- return propertyInfo.PropertyType;
- }
- }
-
- // The property's PropertyInfo
- public PropertyInfo PropertyInfo {
- get {
- return propertyInfo;
- }
- }
-
- // The property's ParamSpec
- public virtual ParamSpec ParamSpec {
- get {
- return pspec;
- }
- }
-
- public override bool IsDefaultValue (object value)
- {
- if (defaultValue != null)
- return base.IsDefaultValue (value);
- if (ParamSpec != null && value != null)
- return ParamSpec.IsDefaultValue (value);
- else
- return false;
- }
-
- public override void ResetValue (object instance)
- {
- // This is a hack because there is no managed way of getting
- // the default value of a GObject property. The call to LoadDefaultValues
- // will guess the default values from a dummy instance
- if (!defaultSet) {
- ObjectWrapper ww = ObjectWrapper.Lookup (instance);
- TypedClassDescriptor td = ww.ClassDescriptor as TypedClassDescriptor;
- if (td != null)
- td.LoadDefaultValues ();
- defaultSet = true;
- }
- base.ResetValue (instance);
- }
-
- internal void SetDefault (object val)
- {
- defaultValue = val;
- defaultSet = true;
- }
-
- // Gets the value of the property on @obj
- public override object GetValue (object obj)
- {
- try {
- if (isWrapperProperty)
- obj = ObjectWrapper.Lookup (obj);
- if (memberInfo != null)
- obj = memberInfo.GetValue (obj, null);
- return propertyInfo.GetValue (obj, null);
- } catch (Exception ex) {
- throw new InvalidOperationException ("Could not get value for property " + klass.Name + "." + Name + " from object '" + obj + "'", ex);
- }
- }
-
- // Whether or not the property is writable
- public override bool CanWrite {
- get {
- return propertyInfo.CanWrite;
- }
- }
-
- // Sets the value of the property on @obj
- public override void SetValue (object obj, object value)
- {
- ObjectWrapper ww = ObjectWrapper.Lookup (obj);
- IDisposable t = ww != null && !ww.Loading? ww.UndoManager.AtomicChange : null;
- try {
- if (isWrapperProperty)
- obj = ww;
- if (memberInfo != null)
- obj = memberInfo.GetValue (obj, null);
- propertyInfo.SetValue (obj, value, null);
- } catch (Exception ex) {
- throw new InvalidOperationException ("Could not set value for property " + klass.Name + "." + Name + " to object '" + obj + "'", ex);
- } finally {
- if (t != null)
- t.Dispose ();
- }
- }
-
- // The property's type at run time
- public override Type RuntimePropertyType {
- get {
- if (runtimePropertyInfo == null)
- SetupRuntimeProperties ();
- return runtimePropertyInfo.PropertyType;
- }
- }
-
- public override void SetRuntimeValue (object obj, object value)
- {
- if (runtimePropertyInfo == null)
- SetupRuntimeProperties ();
- if (runtimeMemberInfo != null)
- obj = runtimeMemberInfo.GetValue (obj, null);
-
- if (runtimePropertyInfo.PropertyType.IsInstanceOfType (value))
- runtimePropertyInfo.SetValue (obj, value, null);
- }
-
- public override object GetRuntimeValue (object obj)
- {
- if (runtimePropertyInfo == null)
- SetupRuntimeProperties ();
- if (runtimeMemberInfo != null)
- obj = runtimeMemberInfo.GetValue (obj, null);
- return runtimePropertyInfo.GetValue (obj, null);
- }
-
- void SetupRuntimeProperties ()
- {
- if (isWrapperProperty) {
- Type t = klass.WrappedType;
- if (memberInfo != null) {
- runtimeMemberInfo = t.GetProperty (memberInfo.Name, flags);
- t = runtimeMemberInfo.PropertyType;
- }
- runtimePropertyInfo = t.GetProperty (propertyInfo.Name, flags);
- } else {
- runtimeMemberInfo = memberInfo;
- runtimePropertyInfo = propertyInfo;
- }
- }
-
- public virtual bool GladeOverride {
- get {
- return gladeOverride;
- }
- }
-
- public TypedPropertyDescriptor GladeProperty {
- get {
- if (gladeProperty != null)
- return gladeProperty;
- else
- return this;
- }
- }
-
- public virtual string GladeName {
- get {
- if (gladeName != null)
- return gladeName;
- else if (pspec != null && pspec.Name != null)
- return pspec.Name.Replace ('-', '_');
- else
- return null;
- }
- }
-
- public override string InternalChildId {
- get { return GladeName; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedSignalDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedSignalDescriptor.cs
deleted file mode 100644
index 5c87947dee6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/TypedSignalDescriptor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Reflection;
-using System.Xml;
-
-namespace Stetic
-{
- [Serializable]
- public class TypedSignalDescriptor: SignalDescriptor
- {
- string gladeName;
-
- const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
- public TypedSignalDescriptor (XmlElement elem, ItemGroup group, TypedClassDescriptor klass) : base (elem, group, klass)
- {
- Load (elem);
-
- EventInfo eventInfo = FindEvent (klass.WrapperType, klass.WrappedType, name);
- MethodInfo handler = eventInfo.EventHandlerType.GetMethod ("Invoke");
-
- if (elem.HasAttribute ("glade-name"))
- gladeName = elem.GetAttribute ("glade-name");
- else {
- object[] att = eventInfo.GetCustomAttributes (typeof(GLib.SignalAttribute), true);
- if (att.Length > 0)
- gladeName = ((GLib.SignalAttribute)att[0]).CName;
- }
-
- handlerTypeName = eventInfo.EventHandlerType.FullName;
- handlerReturnTypeName = handler.ReturnType.FullName;
-
- ParameterInfo[] pars = handler.GetParameters ();
- handlerParameters = new ParameterDescriptor [pars.Length];
- for (int n=0; n 0 ? targetGtkVersion : "2.4"; }
- }
-
- public bool SupportsGtkVersion (string targetVersion)
- {
- return WidgetUtils.CompareVersions (TargetGtkVersion, targetVersion) >= 0;
- }
-
- public virtual void Reload ()
- {
- Load ();
- }
-
- public virtual void Load ()
- {
- }
-
- protected virtual void Load (XmlDocument objects)
- {
- classes_by_cname.Clear ();
- classes_by_csname.Clear ();
- enums.Clear ();
-
- if (objects == null || objects.DocumentElement == null)
- return;
-
- targetGtkVersion = objects.DocumentElement.GetAttribute ("gtk-version");
- if (targetGtkVersion.Length == 0)
- targetGtkVersion = "2.4";
-
- foreach (XmlElement element in objects.SelectNodes ("/objects/enum")) {
- EnumDescriptor enm = new EnumDescriptor (element);
- enums[enm.Name] = enm;
- }
-
- foreach (XmlElement element in objects.SelectNodes ("/objects/object"))
- AddClass (LoadClassDescriptor (element));
-
- XmlNamespaceManager nsm = new XmlNamespaceManager (objects.NameTable);
- nsm.AddNamespace ("xsl", "http://www.w3.org/1999/XSL/Transform");
-
- XmlNodeList nodes = objects.SelectNodes ("/objects/object/glade-transform/import/xsl:*", nsm);
- importElems = new XmlElement [nodes.Count];
- for (int n=0; n 0)
- prop_elem.InnerText = val;
-
- if (prop.Translatable && prop.IsTranslated (wrapper.Wrapped)) {
- prop_elem.SetAttribute ("translatable", "yes");
- string tcx = prop.TranslationContext (wrapper.Wrapped);
- if (tcx != null && tcx.Length > 0) {
- prop_elem.SetAttribute ("context", "yes");
- prop_elem.InnerText = tcx + "|" + prop_elem.InnerText;
- }
- string tcm = prop.TranslationComment (wrapper.Wrapped);
- if (tcm != null && tcm.Length > 0)
- prop_elem.SetAttribute ("comments", prop.TranslationComment (wrapper.Wrapped));
- }
-
- parent_elem.AppendChild (prop_elem);
- }
- }
- }
-
- public static void GetSignals (ObjectWrapper ob, XmlElement parent_elem)
- {
- foreach (Signal signal in ob.Signals) {
- if (!signal.SignalDescriptor.VisibleFor (ob.Wrapped))
- continue;
-
- XmlElement signal_elem = parent_elem.OwnerDocument.CreateElement ("signal");
- signal_elem.SetAttribute ("name", signal.SignalDescriptor.Name);
- signal_elem.SetAttribute ("handler", signal.Handler);
- if (signal.After)
- signal_elem.SetAttribute ("after", "yes");
- parent_elem.AppendChild (signal_elem);
- }
- }
-
- static public void Read (ObjectWrapper wrapper, XmlElement elem)
- {
- string className = elem.GetAttribute ("class");
- if (className == null)
- throw new GladeException (" node with no class name");
-
- ClassDescriptor klass = Registry.LookupClassByName (className);
- if (klass == null)
- throw new GladeException ("No stetic ClassDescriptor for " + className);
-
- Gtk.Widget widget = (Gtk.Widget) wrapper.Wrapped;
- if (widget == null) {
- widget = (Gtk.Widget) klass.CreateInstance (wrapper.Project);
- ObjectWrapper.Bind (wrapper.Project, klass, wrapper, widget, true);
- }
-
- widget.Name = elem.GetAttribute ("id");
-
- ReadMembers (klass, wrapper, widget, elem);
-
- if (!(widget is Gtk.Window))
- widget.ShowAll ();
- }
-
- public static void ReadMembers (ClassDescriptor klass, ObjectWrapper wrapper, object wrapped, XmlElement elem)
- {
- foreach (XmlNode node in elem.ChildNodes) {
- XmlElement child = node as XmlElement;
- if (child == null)
- continue;
-
- if (child.LocalName == "signal")
- ReadSignal (klass, wrapper, child);
- else if (child.LocalName == "property")
- ReadProperty (klass, wrapper, wrapped, child);
- }
- }
-
- public static void ReadSignal (ClassDescriptor klass, ObjectWrapper ob, XmlElement elem)
- {
- string name = elem.GetAttribute ("name");
- SignalDescriptor signal = klass.SignalGroups.GetItem (name) as SignalDescriptor;
- if (signal != null) {
- string handler = elem.GetAttribute ("handler");
- bool after = elem.GetAttribute ("after") == "yes";
- ob.Signals.Add (new Signal (signal, handler, after));
- }
- }
-
- public static void ReadProperty (ClassDescriptor klass, ObjectWrapper wrapper, object wrapped, XmlElement prop_node)
- {
- string name = prop_node.GetAttribute ("name");
- PropertyDescriptor prop = klass [name] as PropertyDescriptor;
- if (prop == null || !prop.CanWrite)
- return;
-
- string strval = prop_node.InnerText;
-
- // Skip translation context
- if (prop_node.GetAttribute ("context") == "yes" && strval.IndexOf ('|') != -1)
- strval = strval.Substring (strval.IndexOf ('|') + 1);
-
- object value = prop.StringToValue (strval);
- prop.SetValue (wrapped, value);
-
- if (prop.Translatable) {
- if (prop_node.GetAttribute ("translatable") != "yes") {
- prop.SetTranslated (wrapped, false);
- }
- else {
- prop.SetTranslated (wrapped, true);
- if (prop_node.GetAttribute ("context") == "yes") {
- strval = prop_node.InnerText;
- int bar = strval.IndexOf ('|');
- if (bar != -1)
- prop.SetTranslationContext (wrapped, strval.Substring (0, bar));
- }
-
- if (prop_node.HasAttribute ("comments"))
- prop.SetTranslationComment (wrapped, prop_node.GetAttribute ("comments"));
- }
- }
- }
-
- static public void SetPacking (Stetic.Wrapper.Container.ContainerChild wrapper, XmlElement child_elem)
- {
- XmlElement packing = child_elem["packing"];
- if (packing == null)
- return;
-
- Gtk.Container.ContainerChild cc = wrapper.Wrapped as Gtk.Container.ContainerChild;
- ClassDescriptor klass = wrapper.ClassDescriptor;
- ReadMembers (klass, wrapper, cc, packing);
- }
-
- internal static XmlElement CreatePacking (XmlDocument doc, Stetic.Wrapper.Container.ContainerChild childwrapper)
- {
- XmlElement packing_elem = doc.CreateElement ("packing");
- WidgetUtils.GetProps (childwrapper, packing_elem);
- return packing_elem;
- }
-
- public static void Copy (Gtk.Widget widget, Gtk.SelectionData seldata, bool copyAsText)
- {
- XmlElement elem = ExportWidget (widget);
- if (elem == null)
- return;
-
- if (copyAsText)
- seldata.Text = elem.OuterXml;
- else
- seldata.Set (ApplicationXSteticAtom, 8, System.Text.Encoding.UTF8.GetBytes (elem.OuterXml));
- }
-
- public static Stetic.Wrapper.Widget Paste (IProject project, Gtk.SelectionData seldata)
- {
- if (seldata == null || seldata.Type == null || seldata.Type.Name != ApplicationXSteticAtom.Name)
- return null;
-
- string data = System.Text.Encoding.UTF8.GetString (seldata.Data);
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- try {
- doc.LoadXml (data);
- } catch {
- return null;
- }
-
- Gtk.Widget w = ImportWidget (project, doc.DocumentElement);
- return Wrapper.Widget.Lookup (w);
- }
-
- public static IDesignArea GetDesignArea (Gtk.Widget w)
- {
- while (w != null && !(w is IDesignArea))
- w = w.Parent;
- return w as IDesignArea;
- }
-
- internal static void ParseWidgetName (string name, out string baseName, out int idx)
- {
- // Extract a numerical suffix from the name
- // If suffix has more than 4 digits, only the last 4 digits are considered
- // a numerical suffix.
-
- int n;
- for (n = name.Length - 1; n >= name.Length-4 && n >= 0 && char.IsDigit (name [n]); n--)
- ;
-
- if (n < name.Length - 1) {
- baseName = name.Substring (0, n + 1);
- idx = int.Parse (name.Substring (n + 1));
- } else {
- baseName = name;
- idx = 0;
- }
- }
-
- internal static string GetUndoId ()
- {
- return (undoIdCount++).ToString ();
- }
-
- public static Gdk.Pixbuf MissingIcon {
- get {
- if (missingIcon == null) {
- try {
- if (Gtk.IconTheme.Default.HasIcon (Gtk.Stock.MissingImage))
- missingIcon = Gtk.IconTheme.Default.LoadIcon (Gtk.Stock.MissingImage, 16, 0);
- } catch {}
- if (missingIcon == null) {
- try {
- missingIcon = Gdk.Pixbuf.LoadFromResource ("missing.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf 'missing.png': " + e);
- }
- }
- }
- return missingIcon;
- }
- }
-
- public static string AbsoluteToRelativePath (string baseDirectoryPath, string absPath)
- {
- if (! Path.IsPathRooted (absPath))
- return absPath;
-
- absPath = Path.GetFullPath (absPath);
- baseDirectoryPath = Path.GetFullPath (baseDirectoryPath);
-
- char[] separators = { Path.DirectorySeparatorChar, Path.VolumeSeparatorChar, Path.AltDirectorySeparatorChar };
- baseDirectoryPath = baseDirectoryPath.TrimEnd (separators);
- string[] bPath = baseDirectoryPath.Split (separators);
- string[] aPath = absPath.Split (separators);
- int indx = 0;
- for(; indx < Math.Min(bPath.Length, aPath.Length); ++indx){
- if(!bPath[indx].Equals(aPath[indx]))
- break;
- }
-
- if (indx == 0) {
- return absPath;
- }
-
- string erg = "";
-
- if(indx == bPath.Length) {
- erg += "." + Path.DirectorySeparatorChar;
- } else {
- for (int i = indx; i < bPath.Length; ++i) {
- erg += ".." + Path.DirectorySeparatorChar;
- }
- }
- erg += String.Join(Path.DirectorySeparatorChar.ToString(), aPath, indx, aPath.Length-indx);
-
- return erg;
- }
-
- public static int CompareVersions (string v1, string v2)
- {
- string[] a1 = v1.Split ('.');
- string[] a2 = v2.Split ('.');
-
- for (int n=0; n= a2.Length)
- return -1;
- if (a1[n].Length == 0) {
- if (a2[n].Length != 0)
- return 1;
- continue;
- }
- try {
- int n1 = int.Parse (a1[n]);
- int n2 = int.Parse (a2[n]);
- if (n1 < n2)
- return 1;
- else if (n1 > n2)
- return -1;
- } catch {
- return 1;
- }
- }
- if (a2.Length > a1.Length)
- return 1;
- return 0;
- }
-
- public static Gdk.Pixbuf LoadIcon (string name, Gtk.IconSize size)
- {
- if (renderer == null)
- renderer = new Gtk.HBox ();
- Gdk.Pixbuf image = renderer.RenderIcon (name, size, null);
- if (image != null)
- return image;
-
- int w, h;
- Gtk.Icon.SizeLookup (size, out w, out h);
- try {
- return Gtk.IconTheme.Default.LoadIcon (name, w, 0);
- } catch {
- // Icon not in theme
- return MissingIcon;
- }
- }
-
- public static System.CodeDom.CodeTypeReference ToGlobalTypeRef (this Type type)
- {
- return new System.CodeDom.CodeTypeReference (type, System.CodeDom.CodeTypeReferenceOptions.GlobalReference);
- }
-
- public static System.CodeDom.CodeTypeReference ToGlobalTypeRef (this string type)
- {
- return new System.CodeDom.CodeTypeReference (type, System.CodeDom.CodeTypeReferenceOptions.GlobalReference);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Accelerator.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Accelerator.cs
deleted file mode 100644
index f6f884848df..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Accelerator.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("Accel", "AccelChanged")]
- public class Accelerator : Gtk.HBox, IPropertyEditor {
-
- uint keyval;
- Gdk.ModifierType mask;
- bool editing;
-
- Gtk.Button clearButton;
- Gtk.Entry entry;
-
- public const Gdk.ModifierType AcceleratorModifierMask = ~(
- Gdk.ModifierType.Button1Mask |
- Gdk.ModifierType.Button2Mask |
- Gdk.ModifierType.Button3Mask |
- Gdk.ModifierType.Button4Mask |
- Gdk.ModifierType.Button5Mask);
-
- public Accelerator ()
- {
- entry = new Gtk.Entry ();
- clearButton = new Gtk.Button (new Gtk.Image (Gtk.Stock.Clear, Gtk.IconSize.Menu));
- PackStart (entry, true, true, 0);
- PackStart (clearButton, false, false, 3);
- clearButton.Clicked += delegate (object s, EventArgs args) {
- Value = null;
- };
- entry.IsEditable = false;
- entry.ButtonPressEvent += OnButtonPressEvent;
- entry.KeyPressEvent += OnKeyPressEvent;
- ShowAll ();
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(string))
- throw new ApplicationException ("Accelerator editor does not support editing values of type " + descriptor.PropertyType);
- }
-
- public void AttachObject (object obj)
- {
- Value = null;
- }
-
- [GLib.ConnectBefore]
- void OnButtonPressEvent (object s, Gtk.ButtonPressEventArgs args)
- {
- if (editing)
- Ungrab (args.Event.Time);
- else
- Grab (args.Event.Window, args.Event.Time);
- args.RetVal = true;
- }
-
- GrabDialog grabWindow;
-
- void Ungrab (uint time)
- {
- if (!editing)
- return;
- editing = false;
-
- if (Value != null)
- entry.Text = (string) Value;
- else
- entry.Text = "";
-
- grabWindow.Destroy ();
- }
-
- void Grab (Gdk.Window window, uint time)
- {
- if (editing)
- return;
-
- grabWindow = new GrabDialog ();
- editing = true;
- entry.Text = Catalog.GetString ("Press a key...");
- grabWindow.TransientFor = this.Toplevel as Gtk.Window;
- grabWindow.Run ();
- this.keyval = grabWindow.Keyval;
- this.mask = grabWindow.Mask;
- Ungrab (time);
- EmitAccelChanged ();
- }
-
- [GLib.ConnectBefore]
- void OnKeyPressEvent (object s, Gtk.KeyPressEventArgs args)
- {
- Gdk.EventKey evt = args.Event;
-
- if (!editing || !Gtk.Accelerator.Valid (evt.KeyValue, evt.State))
- return;
-
- uint keyval;
- int effectiveGroup, level;
- Gdk.ModifierType consumedMods, mask;
-
- // We know this will succeed, since we're already here...
- Gdk.Keymap.Default.TranslateKeyboardState (evt.HardwareKeycode, evt.State, evt.Group, out keyval, out effectiveGroup, out level, out consumedMods);
- mask = evt.State & AcceleratorModifierMask & ~consumedMods;
-
- if (evt.Key != Gdk.Key.Escape || mask != 0) {
- this.keyval = keyval;
- this.mask = mask;
- }
-
- clearButton.Sensitive = true;
-
- Ungrab (evt.Time);
- EmitAccelChanged ();
- args.RetVal = true;
- }
-
- public object Value {
- get {
- if (keyval != 0)
- return Gtk.Accelerator.Name (keyval, mask);
- else
- return null;
- }
- set {
- string s = value as string;
- if (s == null) {
- keyval = 0;
- mask = 0;
- clearButton.Sensitive = false;
- } else {
- Gtk.Accelerator.Parse (s, out keyval, out mask);
- clearButton.Sensitive = true;
- }
- if (Value != null)
- entry.Text = (string) Value;
- else
- entry.Text = "";
- EmitAccelChanged ();
- }
- }
-
- public event EventHandler ValueChanged;
-
- void EmitAccelChanged ()
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
-
- class GrabDialog: Gtk.Dialog
- {
- public uint Keyval;
- public Gdk.ModifierType Mask;
-
- public GrabDialog ()
- {
- Decorated = false;
- this.SkipPagerHint = true;
- this.SkipTaskbarHint = true;
- this.WindowPosition = Gtk.WindowPosition.CenterOnParent;
- Gtk.Frame f = new Gtk.Frame ();
- f.Shadow = Gtk.ShadowType.Out;
- this.VBox.PackStart (f, true, true, 0);
- Gtk.Label lab = new Gtk.Label (Catalog.GetString ("Press the key combination you want to assign to the accelerator..."));
- lab.Xpad = 12;
- lab.Ypad = 12;
- f.Add (lab);
- ShowAll ();
- }
-
- protected override bool OnKeyPressEvent (Gdk.EventKey evt)
- {
- uint keyval;
- int effectiveGroup, level;
- Gdk.ModifierType consumedMods, mask;
-
- if (!Gtk.Accelerator.Valid (evt.KeyValue, evt.State))
- return base.OnKeyPressEvent (evt);
-
- // We know this will succeed, since we're already here...
- Gdk.Keymap.Default.TranslateKeyboardState (evt.HardwareKeycode, evt.State, evt.Group, out keyval, out effectiveGroup, out level, out consumedMods);
- mask = evt.State & Accelerator.AcceleratorModifierMask & ~consumedMods;
-
- if (evt.Key != Gdk.Key.Escape || mask != 0) {
- Keyval = keyval;
- Mask = mask;
- this.Respond (0);
- }
- return false;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs
deleted file mode 100644
index dc94b834c6d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionGroupEditor.cs
+++ /dev/null
@@ -1,575 +0,0 @@
-
-using System;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class ActionGroupEditor: Gtk.EventBox, IMenuItemContainer
- {
- ActionGroup actionGroup;
- Gtk.Table table;
- IProject project;
- ArrayList items = new ArrayList ();
- Gtk.EventBox emptyLabel;
- EditableLabel headerLabel;
- uint columns = 2;
- bool modified;
- bool disposed;
- ObjectWrapperEventHandler changedEvent;
- IDesignArea darea;
-
- public EventHandler GroupModified;
- public EventHandler SelectionChanged;
-
- public ActionGroupEditor ()
- {
- changedEvent = new ObjectWrapperEventHandler (OnActionChanged);
-
- Gtk.Fixed fx = new Gtk.Fixed ();
- table = new Gtk.Table (0, 0, false);
- table.RowSpacing = 8;
- table.ColumnSpacing = 8;
- table.BorderWidth = 12;
-
- Gtk.EventBox ebox = new Gtk.EventBox ();
- ebox.ModifyBg (Gtk.StateType.Normal, this.Style.Backgrounds [0]);
- headerLabel = new EditableLabel ();
- headerLabel.MarkupTemplate = "$TEXT";
- headerLabel.Changed += OnGroupNameChanged;
- Gtk.VBox vbox = new Gtk.VBox ();
- Gtk.Label grpLabel = new Gtk.Label ();
- grpLabel.Xalign = 0;
- grpLabel.Markup = "Action Group";
-// vbox.PackStart (grpLabel, false, false, 0);
- vbox.PackStart (headerLabel, false, false, 3);
- vbox.BorderWidth = 12;
- ebox.Add (vbox);
-
- Gtk.VBox box = new Gtk.VBox ();
- box.Spacing = 6;
- box.PackStart (ebox, false, false, 0);
- box.PackStart (table, false, false, 0);
-
- fx.Put (box, 0, 0);
- Add (fx);
- ShowAll ();
- }
-
- public override void Dispose ()
- {
- if (disposed)
- return;
- disposed = true;
- headerLabel.Changed -= OnGroupNameChanged;
- if (emptyLabel != null)
- emptyLabel.ButtonPressEvent -= OnAddClicked;
-
- foreach (ActionMenuItem aitem in items) {
- aitem.KeyPressEvent -= OnItemKeyPress;
- aitem.Node.Dispose ();
- aitem.Detach ();
- aitem.Destroy ();
- }
- items.Clear ();
- ActionGroup = null;
- project = null;
- headerLabel = null;
-
- if (darea != null) {
- darea.SelectionChanged -= OnSelectionChanged;
- darea = null;
- }
-
- base.Dispose ();
- }
-
- public ActionGroup ActionGroup {
- get { return actionGroup; }
- set {
- if (actionGroup != null) {
- actionGroup.ObjectChanged -= OnGroupChanged;
- actionGroup.ActionAdded -= OnActionAdded;
- actionGroup.ActionRemoved -= OnActionRemoved;
- foreach (Wrapper.Action a in actionGroup.Actions)
- a.ObjectChanged -= changedEvent;
- }
- actionGroup = value;
- if (actionGroup != null) {
- headerLabel.Text = actionGroup.Name;
- actionGroup.ObjectChanged += OnGroupChanged;
- actionGroup.ActionAdded += OnActionAdded;
- actionGroup.ActionRemoved += OnActionRemoved;
- foreach (Wrapper.Action a in actionGroup.Actions)
- a.ObjectChanged += changedEvent;
- }
- if (!disposed)
- Fill ();
- }
- }
-
- public IProject Project {
- get { return project; }
- set { project = value; }
- }
-
- public bool Modified {
- get { return modified; }
- set { modified = value; }
- }
-
- public Wrapper.Action SelectedAction {
- get {
- IDesignArea designArea = GetDesignArea ();
- IObjectSelection sel = designArea.GetSelection ();
- if (sel != null)
- return ObjectWrapper.Lookup (sel.DataObject) as Wrapper.Action;
- else
- return null;
- }
- set {
- foreach (ActionMenuItem item in items) {
- if (item.Node.Action == value)
- item.Select ();
- }
- }
- }
-
- ActionMenuItem SelectedActionMenuItem {
- get {
- IDesignArea designArea = GetDesignArea ();
- IObjectSelection sel = designArea.GetSelection ();
- if (sel != null)
- return sel.Widget as ActionMenuItem;
- else
- return null;
- }
- }
-
- public void StartEditing ()
- {
- IDesignArea designArea = GetDesignArea ();
- designArea.SetSelection (headerLabel, null);
- headerLabel.StartEditing ();
- }
-
- void Fill ()
- {
- IDesignArea designArea = GetDesignArea ();
- if (designArea == null)
- return;
-
- Wrapper.Action selAction = null;
-
- foreach (ActionMenuItem item in items) {
- if (designArea.IsSelected (item))
- selAction = item.Node.Action;
- item.Node.Dispose ();
- item.Detach ();
- item.Destroy ();
- }
- items.Clear ();
-
- if (actionGroup != null) {
- Wrapper.Action[] sortedActions = new Wrapper.Action [actionGroup.Actions.Count];
- actionGroup.Actions.CopyTo (sortedActions, 0);
- Array.Sort (sortedActions, new ActionComparer ());
- for (int n = 0; n < sortedActions.Length; n++) {
- Wrapper.Action action = (Wrapper.Action) sortedActions [n];
- ActionMenuItem item = InsertAction (action, n);
- if (selAction == action)
- item.Select ();
- }
-
- if (selAction == null)
- designArea.SetSelection (null, null);
-
- headerLabel.Sensitive = true;
- PlaceAddLabel (actionGroup.Actions.Count);
- } else {
- HideAddLabel ();
- headerLabel.Text = Catalog.GetString ("No selection");
- headerLabel.Sensitive = false;
- }
- ShowAll ();
- }
-
- ActionMenuItem InsertAction (Wrapper.Action action, int n)
- {
- uint row = (uint) n / columns;
- uint col = (uint) (n % columns) * 3;
-
- IDesignArea designArea = GetDesignArea ();
- ActionTreeNode node = new ActionTreeNode (Gtk.UIManagerItemType.Menuitem, "", action);
- ActionMenuItem aitem = new ActionMenuItem (designArea, project, this, node);
- aitem.KeyPressEvent += OnItemKeyPress;
- aitem.MinWidth = 150;
- aitem.Attach (table, row, col);
-
- Gtk.Frame fr = new Gtk.Frame ();
- fr.Shadow = Gtk.ShadowType.Out;
- aitem.Add (fr);
-
- items.Add (aitem);
- return aitem;
- }
-
- void PlaceAddLabel (int n)
- {
- HideAddLabel ();
-
- uint r = (uint) n / columns;
- uint c = (uint) (n % columns) * 3;
-
- emptyLabel = new Gtk.EventBox ();
- emptyLabel.VisibleWindow = false;
- Gtk.Label label = new Gtk.Label ();
- label.Xalign = 0;
- label.Markup = "" + Catalog.GetString ("Click to create action") + "";
- emptyLabel.Add (label);
- emptyLabel.ButtonPressEvent += OnAddClicked;
- table.Attach (emptyLabel, c, c+3, r, r+1);
- }
-
- void HideAddLabel ()
- {
- if (emptyLabel != null) {
- table.Remove (emptyLabel);
- emptyLabel.ButtonPressEvent -= OnAddClicked;
- }
- emptyLabel = null;
- }
-
- void OnGroupChanged (object s, ObjectWrapperEventArgs args)
- {
- headerLabel.Text = actionGroup.Name;
- NotifyModified ();
- }
-
- void OnActionAdded (object s, ActionEventArgs args)
- {
- args.Action.ObjectChanged += changedEvent;
- Fill ();
- NotifyModified ();
- }
-
- void OnActionRemoved (object s, ActionEventArgs args)
- {
- args.Action.ObjectChanged -= changedEvent;
- Fill ();
- NotifyModified ();
- }
-
- void OnActionChanged (object s, ObjectWrapperEventArgs args)
- {
- NotifyModified ();
- }
-
- void NotifyModified ()
- {
- modified = true;
- if (GroupModified != null)
- GroupModified (this, EventArgs.Empty);
- }
-
- void OnAddClicked (object s, Gtk.ButtonPressEventArgs args)
- {
- Wrapper.Action ac = (Wrapper.Action) ObjectWrapper.Create (project, new Gtk.Action ("", "", null, null));
- ActionMenuItem item = InsertAction (ac, actionGroup.Actions.Count);
- item.EditingDone += OnEditDone;
- item.Select ();
- item.StartEditing ();
- HideAddLabel ();
- ShowAll ();
- }
-
- void OnEditDone (object sender, EventArgs args)
- {
- ActionMenuItem item = (ActionMenuItem) sender;
- item.EditingDone -= OnEditDone;
- if (item.Node.Action.GtkAction.Label.Length > 0 || item.Node.Action.GtkAction.StockId != null) {
- actionGroup.Actions.Add (item.Node.Action);
- } else {
- IDesignArea designArea = GetDesignArea ();
- designArea.ResetSelection (item);
- item.Detach ();
- item.Node.Dispose ();
- items.Remove (item);
- item.Destroy ();
- PlaceAddLabel (actionGroup.Actions.Count);
- ShowAll ();
- }
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- IDesignArea designArea = GetDesignArea ();
- designArea.SetSelection (null, null);
- return true;
- }
-
- void OnItemKeyPress (object s, Gtk.KeyPressEventArgs args)
- {
- int pos = items.IndexOf (s);
-
- switch (args.Event.Key) {
- case Gdk.Key.Up:
- pos -= (int) columns;
- break;
- case Gdk.Key.Down:
- pos += (int) columns;
- break;
- case Gdk.Key.Right:
- pos ++;
- break;
- case Gdk.Key.Left:
- pos --;
- break;
- }
- if (pos >= 0 && pos < items.Count) {
- ((ActionMenuItem)items[pos]).Select ();
- args.RetVal = true;
- }
- else if (pos == items.Count) {
- OnAddClicked (null, null);
- args.RetVal = true;
- }
- }
-
- void OnGroupNameChanged (object s, EventArgs args)
- {
- if (actionGroup != null)
- actionGroup.Name = headerLabel.Text;
- }
-
- void OnSelectionChanged (object s, EventArgs args)
- {
- if (SelectionChanged != null)
- SelectionChanged (this, args);
- }
-
- public void Cut ()
- {
- ActionMenuItem menuItem = SelectedActionMenuItem;
- if (menuItem != null)
- Cut (SelectedActionMenuItem);
- }
-
- public void Copy ()
- {
- ActionMenuItem menuItem = SelectedActionMenuItem;
- if (menuItem != null)
- Copy (SelectedActionMenuItem);
- }
-
- public void Paste ()
- {
- }
-
- public void Delete ()
- {
- ActionMenuItem menuItem = SelectedActionMenuItem;
- if (menuItem != null)
- Delete (SelectedActionMenuItem);
- }
-
- void Cut (ActionMenuItem menuItem)
- {
- }
-
- void Copy (ActionMenuItem menuItem)
- {
- }
-
- void Paste (ActionMenuItem menuItem)
- {
- }
-
- void Delete (ActionMenuItem menuItem)
- {
- string msg = string.Format (Catalog.GetString ("Are you sure you want to delete the action '{0}'? It will be removed from all menus and toolbars."), menuItem.Node.Action.Name);
- Gtk.MessageDialog md = new Gtk.MessageDialog (null, Gtk.DialogFlags.Modal, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, msg);
- md.TransientFor = this.Toplevel as Gtk.Window;
- if (md.Run () == (int) Gtk.ResponseType.Yes) {
- menuItem.Node.Action.Delete ();
- darea.SetSelection (null, null);
- }
- md.Destroy ();
- }
-
- void IMenuItemContainer.ShowContextMenu (ActionItem aitem)
- {
- ActionMenuItem menuItem = aitem as ActionMenuItem;
-
- Gtk.Menu m = new Gtk.Menu ();
- Gtk.MenuItem item = new Gtk.ImageMenuItem (Gtk.Stock.Cut, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Cut (menuItem);
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Copy, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Copy (menuItem);
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Paste, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Paste (menuItem);
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Delete, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Delete (menuItem);
- };
- m.ShowAll ();
- m.Popup ();
- }
-
- IDesignArea GetDesignArea ()
- {
- if (darea != null)
- return darea;
-
- darea = WidgetUtils.GetDesignArea (this);
- darea.SelectionChanged += OnSelectionChanged;
- return darea;
- }
-
- ActionMenu IMenuItemContainer.OpenSubmenu {
- get { return null; }
- set { }
- }
-
- bool IMenuItemContainer.IsTopMenu {
- get { return false; }
- }
-
- Gtk.Widget IMenuItemContainer.Widget {
- get { return this; }
- }
-
- class ActionComparer: IComparer
- {
- public int Compare (object x, object y)
- {
- return string.Compare (((Wrapper.Action)x).GtkAction.Label, ((Wrapper.Action)y).GtkAction.Label);
- }
- }
- }
-
- public class EditableLabel: Gtk.EventBox
- {
- string text;
- string markup;
-
- public EditableLabel (): this ("")
- {
- }
-
- public EditableLabel (string txt)
- {
- VisibleWindow = false;
- text = txt;
- Add (CreateLabel ());
- }
-
- public string Text {
- get { return text; }
- set {
- text = value;
- if (Child is Gtk.Entry)
- ((Gtk.Entry)Child).Text = text;
- else
- ((Gtk.Label)Child).Markup = Markup;
- }
- }
-
- public string MarkupTemplate {
- get { return markup; }
- set {
- markup = value;
- if (Child is Gtk.Label)
- ((Gtk.Label)Child).Markup = Markup;
- }
- }
-
- public string Markup {
- get { return markup != null ? markup.Replace ("$TEXT",text) : text; }
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- IDesignArea d = WidgetUtils.GetDesignArea (this);
- if (d.IsSelected (this)) {
- if (Child is Gtk.Label) {
- StartEditing ();
- return true;
- }
- } else {
- d.SetSelection (this, null);
- return true;
- }
- return false;
- }
-
- void SelectionDisposed (object s, EventArgs args)
- {
- EndEditing ();
- }
-
- public void StartEditing ()
- {
- if (Child is Gtk.Label) {
- IDesignArea d = WidgetUtils.GetDesignArea (this);
- IObjectSelection sel = d.GetSelection (this);
- if (sel == null)
- sel = d.SetSelection (this, null);
-
- sel.Disposed += SelectionDisposed;
-
- Remove (Child);
- Add (CreateEntry ());
- ShowAll ();
- Child.GrabFocus ();
- }
- }
-
- public void EndEditing ()
- {
- if (Child is Gtk.Entry) {
- Remove (Child);
- Add (CreateLabel ());
- ShowAll ();
- }
- }
-
- Gtk.Label CreateLabel ()
- {
- Gtk.Label label = new Gtk.Label ();
- label.Markup = Markup;
- label.Xalign = 0;
- return label;
- }
-
- Gtk.Entry CreateEntry ()
- {
- Gtk.Entry e = new Gtk.Entry (text);
- e.Changed += delegate (object s, EventArgs a) {
- text = e.Text;
- if (Changed != null)
- Changed (this, a);
- };
- e.Activated += delegate (object s, EventArgs a) {
- EndEditing ();
- };
- return e;
- }
-
- public event EventHandler Changed;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionItem.cs
deleted file mode 100644
index 755ce1392c7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionItem.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-
-using System;
-using Stetic.Wrapper;
-
-namespace Stetic.Editor
-{
- abstract class ActionItem: Gtk.EventBox, IEditableObject
- {
- protected IMenuItemContainer parentMenu;
- protected ActionTreeNode node;
- protected Widget wrapper;
- protected bool localUpdate;
- protected bool editOnRelease;
- protected bool editing;
- protected uint itemSpacing;
- protected int minWidth;
-
- // To use in the action editor
- protected IDesignArea designArea;
- protected IProject project;
- bool disposed;
-
- public ActionItem (ActionTreeNode node, IMenuItemContainer parent, uint itemSpacing)
- {
- DND.SourceSet (this);
- this.parentMenu = parent;
- this.node = node;
- this.VisibleWindow = false;
- this.CanFocus = true;
- this.Events |= Gdk.EventMask.KeyPressMask;
- this.itemSpacing = itemSpacing;
- if (node.Action != null)
- node.Action.ObjectChanged += OnActionChanged;
- }
-
- public ActionTreeNode Node {
- get { return node; }
- }
-
- public uint ItemSpacing {
- get { return itemSpacing; }
- set { itemSpacing = value; }
- }
-
- public int MinWidth {
- get { return minWidth; }
- set { minWidth = value; }
- }
-
- public bool IsSelected {
- get {
- IDesignArea area = GetDesignArea ();
- return area.IsSelected (this);
- }
- }
-
- protected void UpdateSelectionStatus ()
- {
- IDesignArea area = GetDesignArea ();
- IObjectSelection sel = area.GetSelection ();
- sel.Disposed -= OnSelectionDisposed;
- sel.Drag -= HandleItemDrag;
-
- area.ResetSelection (this);
-
- sel = area.SetSelection (this, this);
- sel.Drag += HandleItemDrag;
- sel.Disposed += OnSelectionDisposed;
- }
-
- public virtual void Select ()
- {
- IDesignArea area = GetDesignArea ();
- if (area.IsSelected (this))
- return;
- IObjectSelection sel = area.SetSelection (this, node.Action != null ? node.Action.GtkAction : null);
- sel.Drag += HandleItemDrag;
- sel.Disposed += OnSelectionDisposed;
- GrabFocus ();
- }
-
- void OnSelectionDisposed (object ob, EventArgs a)
- {
- if (!disposed)
- EndEditing (Gdk.Key.Return);
- }
-
- protected virtual void EndEditing (Gdk.Key exitKey)
- {
- }
-
- public override void Dispose ()
- {
- disposed = true;
- base.Dispose ();
- }
-
-
- void HandleItemDrag (Gdk.EventMotion evt, int dx, int dy)
- {
- ProcessDragBegin (null, evt);
- }
-
- protected IDesignArea GetDesignArea ()
- {
- if (wrapper != null)
- return wrapper.GetDesignArea ();
- else
- return designArea;
- }
-
- protected IProject GetProject ()
- {
- if (wrapper != null)
- return wrapper.Project;
- else
- return project;
- }
-
- void OnActionChanged (object ob, ObjectWrapperEventArgs a)
- {
- if (!localUpdate)
- Refresh ();
- }
-
- public abstract void Refresh ();
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- return ProcessButtonPress (ev);
- }
-
- public bool ProcessButtonPress (Gdk.EventButton ev)
- {
- if (GtkWorkarounds.TriggersContextMenu (ev)) {
- parentMenu.ShowContextMenu (this);
- } else if (ev.Button == 1) {
- IDesignArea area = GetDesignArea ();
- if (area == null)
- return true;
-
- // Clicking a selected item starts the edit mode
- if (area.IsSelected (this)) {
- editOnRelease = true;
- return true;
- }
- }
-
- Select ();
- return true;
- }
-
- protected override void OnDragBegin (Gdk.DragContext ctx)
- {
- ProcessDragBegin (ctx, null);
- }
-
- public virtual void ProcessDragBegin (Gdk.DragContext ctx, Gdk.EventMotion evt)
- {
- editOnRelease = false;
- ActionPaletteItem item = new ActionPaletteItem (node);
- if (ctx != null)
- DND.Drag (parentMenu.Widget, ctx, item);
- else
- DND.Drag (parentMenu.Widget, evt, item);
- }
-
- public bool CanCopy {
- get { return !editing; }
- }
-
- public bool CanCut {
- get { return false; }
- }
-
- public bool CanPaste {
- get { return false; }
- }
-
- public bool CanDelete {
- get { return !editing; }
- }
-
- public void Copy ()
- {
- }
-
- public void Cut ()
- {
- }
-
- public void Paste ()
- {
- }
-
- public void Delete ()
- {
- if (node.ParentNode != null)
- node.ParentNode.Children.Remove (node);
- Destroy ();
- }
-
- void IEditableObject.Delete ()
- {
- if (!editing)
- Delete ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenu.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenu.cs
deleted file mode 100644
index 5c45ed9bcd0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenu.cs
+++ /dev/null
@@ -1,648 +0,0 @@
-
-using System;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class ActionMenu: Gtk.EventBox, IMenuItemContainer
- {
- ActionTreeNode parentNode;
- ActionTreeNodeCollection nodes;
- ArrayList menuItems = new ArrayList ();
- Gtk.Table table;
- ActionMenu openSubmenu;
- Widget wrapper;
- int dropPosition = -1;
- int dropIndex;
- Gtk.EventBox emptyLabel;
- IMenuItemContainer parentMenu;
-
- public ActionMenu (IntPtr p): base (p)
- {}
-
- internal ActionMenu (Widget wrapper, IMenuItemContainer parentMenu, ActionTreeNode node)
- {
- DND.DestSet (this, true);
- parentNode = node;
- this.parentMenu = parentMenu;
- this.wrapper = wrapper;
- this.nodes = node.Children;
- table = new Gtk.Table (0, 0, false);
- table.ColumnSpacing = 5;
- table.RowSpacing = 5;
- table.BorderWidth = 5;
- this.AppPaintable = true;
-
- Add (table);
-
- Fill ();
-
- parentNode.ChildNodeAdded += OnChildAdded;
- parentNode.ChildNodeRemoved += OnChildRemoved;
- }
-
- protected override void OnDestroyed ()
- {
- parentNode.ChildNodeAdded -= OnChildAdded;
- parentNode.ChildNodeRemoved -= OnChildRemoved;
- parentNode = null;
-
- base.OnDestroyed ();
- }
-
- public void Select (ActionTreeNode node)
- {
- if (node != null) {
- ActionMenuItem item = FindMenuItem (node);
- if (item != null)
- item.Select ();
- } else {
- if (menuItems.Count > 0)
- ((ActionMenuItem)menuItems [0]).Select ();
- else
- InsertAction (0);
- }
- }
-
- public ActionTreeNode ParentNode {
- get { return parentNode; }
- }
-
- bool IMenuItemContainer.IsTopMenu {
- get { return false; }
- }
-
- Gtk.Widget IMenuItemContainer.Widget {
- get { return this; }
- }
-
- public void TrackWidgetPosition (Gtk.Widget refWidget, bool topMenu)
- {
- IDesignArea area = wrapper.GetDesignArea ();
- Gdk.Rectangle rect = area.GetCoordinates (refWidget);
- if (topMenu)
- area.MoveWidget (this, rect.X, rect.Bottom);
- else
- area.MoveWidget (this, rect.Right, rect.Top);
-
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (RepositionSubmenu));
- }
-
- public bool RepositionSubmenu ()
- {
- if (openSubmenu == null)
- return false;
-
- ActionMenuItem item = FindMenuItem (openSubmenu.parentNode);
- if (item != null)
- openSubmenu.TrackWidgetPosition (item, false);
- return false;
- }
-
- void Fill ()
- {
- menuItems.Clear ();
-
- uint n = 0;
- ActionMenuItem editItem = null;
-
- if (nodes.Count > 0) {
- foreach (ActionTreeNode node in nodes) {
- ActionMenuItem item = new ActionMenuItem (wrapper, this, node);
- item.KeyPressEvent += OnItemKeyPress;
- item.Attach (table, n++, 0);
- menuItems.Add (item);
- // If adding an action with an empty name, select and start editing it
-// if (node.Action != null && node.Action.Name.Length == 0)
-// editItem = item;
- }
- }
-
- emptyLabel = new Gtk.EventBox ();
- emptyLabel.VisibleWindow = false;
- Gtk.Label label = new Gtk.Label ();
- label.Xalign = 0;
- label.Markup = "" + Catalog.GetString ("Click to create action") + "";
- emptyLabel.Add (label);
- emptyLabel.ButtonPressEvent += OnAddClicked;
- table.Attach (emptyLabel, 1, 2, n, n + 1);
-
- ShowAll ();
-
- if (editItem != null) {
- // If there is an item with an empty action, it means that it was an item that was
- // being edited. Restart the editing now.
- GLib.Timeout.Add (200, delegate {
- editItem.Select ();
- editItem.EditingDone += OnEditingDone;
- editItem.StartEditing ();
- return false;
- });
- }
- }
-
- void Refresh ()
- {
- IDesignArea area = wrapper.GetDesignArea ();
- ActionTreeNode selNode = null;
-
- foreach (Gtk.Widget w in table.Children) {
- ActionMenuItem ami = w as ActionMenuItem;
- if (area.IsSelected (w) && ami != null) {
- selNode = ami.Node;
- area.ResetSelection (w);
- }
- table.Remove (w);
- }
-
- Fill ();
-
- ActionMenuItem mi = FindMenuItem (selNode);
- if (mi != null)
- mi.Select ();
-
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (RepositionSubmenu));
- }
-
- public ActionMenu OpenSubmenu {
- get { return openSubmenu; }
- set {
- if (openSubmenu != null) {
- openSubmenu.OpenSubmenu = null;
- IDesignArea area = wrapper.GetDesignArea ();
- area.RemoveWidget (openSubmenu);
- openSubmenu.Destroy ();
- }
- openSubmenu = value;
- }
- }
-
- internal void ResetSelection ()
- {
- if (OpenSubmenu != null)
- OpenSubmenu.ResetSelection ();
- IDesignArea area = wrapper.GetDesignArea ();
- if (area != null) {
- foreach (Gtk.Widget w in table.Children) {
- ActionMenuItem ami = w as ActionMenuItem;
- if (ami != null)
- area.ResetSelection (w);
- }
- }
- }
-
- ActionTreeNode InsertAction (int pos)
- {
- using (wrapper.UndoManager.AtomicChange) {
- Wrapper.Action ac = (Wrapper.Action) ObjectWrapper.Create (wrapper.Project, new Gtk.Action ("", "", null, null));
- ActionTreeNode newNode = new ActionTreeNode (Gtk.UIManagerItemType.Menuitem, null, ac);
- nodes.Insert (pos, newNode);
- ActionMenuItem item = FindMenuItem (newNode);
- item.EditingDone += OnEditingDone;
- item.Select ();
- item.StartEditing ();
- emptyLabel.Hide ();
-
- if (wrapper.LocalActionGroups.Count == 0)
- wrapper.LocalActionGroups.Add (new ActionGroup ("Default"));
- wrapper.LocalActionGroups [0].Actions.Add (ac);
- return newNode;
- }
- }
-
- void DeleteAction (ActionMenuItem item)
- {
- int pos = menuItems.IndexOf (item);
- item.Delete ();
- if (pos >= menuItems.Count)
- SelectLastItem ();
- else
- ((ActionMenuItem)menuItems [pos]).Select ();
- }
-
- void OnEditingDone (object ob, MenuItemEditEventArgs args)
- {
- ActionMenuItem item = (ActionMenuItem) ob;
- item.EditingDone -= OnEditingDone;
- if (item.Node.Action.GtkAction.Label.Length == 0 && item.Node.Action.GtkAction.StockId == null) {
- IDesignArea area = wrapper.GetDesignArea ();
- area.ResetSelection (item);
- using (wrapper.UndoManager.AtomicChange) {
- nodes.Remove (item.Node);
- wrapper.LocalActionGroups [0].Actions.Remove (item.Node.Action);
- }
- SelectLastItem ();
- }
- else {
- if (args.ExitKey == Gdk.Key.Up || args.ExitKey == Gdk.Key.Down)
- ProcessKey (item, args.ExitKey, Gdk.ModifierType.None);
- }
- }
-
- void SelectLastItem ()
- {
- if (menuItems.Count > 0)
- ((ActionMenuItem)menuItems [menuItems.Count - 1]).Select ();
- else if (parentMenu.Widget is ActionMenuBar) {
- ActionMenuBar bar = (ActionMenuBar) parentMenu.Widget;
- bar.Select (parentNode);
- }
- else if (parentMenu.Widget is ActionMenu) {
- ActionMenu parentAM = (ActionMenu) parentMenu.Widget;
- parentAM.Select (parentNode);
- }
- }
-
- void OnChildAdded (object ob, ActionTreeNodeArgs args)
- {
- Refresh ();
- }
-
- void OnChildRemoved (object ob, ActionTreeNodeArgs args)
- {
- IDesignArea area = wrapper.GetDesignArea ();
- IObjectSelection asel = area.GetSelection ();
- ActionMenuItem curSel = asel != null ? asel.DataObject as ActionMenuItem : null;
- int pos = menuItems.IndexOf (curSel);
-
- ActionMenuItem mi = FindMenuItem (args.Node);
- if (mi != null) {
- // Remove the table row that contains the menu item
- Gtk.Table.TableChild tc = (Gtk.Table.TableChild) table [mi];
- uint row = tc.TopAttach;
- mi.Detach ();
- menuItems.Remove (mi);
- foreach (Gtk.Widget w in table.Children) {
- tc = (Gtk.Table.TableChild) table [w];
- if (tc.TopAttach >= row)
- tc.TopAttach--;
- if (tc.BottomAttach > row)
- tc.BottomAttach--;
- }
- if (pos != -1 && pos < menuItems.Count)
- ((ActionMenuItem)menuItems[pos]).Select ();
- else
- SelectLastItem ();
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (RepositionSubmenu));
- }
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- int w, h;
- this.GdkWindow.GetSize (out w, out h);
- Gdk.Rectangle clip = new Gdk.Rectangle (0,0,w,h);
- Gtk.Style.PaintBox (this.Style, this.GdkWindow, Gtk.StateType.Normal, Gtk.ShadowType.Out, clip, this, "menu", 0, 0, w, h);
-
- bool r = base.OnExposeEvent (ev);
-
- if (dropPosition != -1) {
- GdkWindow.DrawRectangle (this.Style.BlackGC, true, 0, dropPosition - 1, w - 2, 3);
- }
-
- return r;
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- return true;
- }
-
- void OnAddClicked (object s, Gtk.ButtonPressEventArgs args)
- {
- InsertAction (menuItems.Count);
- args.RetVal = true;
- }
-
- protected override bool OnDragMotion (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dragItem = DND.DragWidget as ActionPaletteItem;
- if (dragItem == null)
- return false;
-
- if (nodes.Count > 0) {
- ActionMenuItem item = LocateWidget (x, y);
- if (item != null) {
-
- // Show the submenu to allow droping to it, but avoid
- // droping a submenu inside itself
- if (item.HasSubmenu && item.Node != dragItem.Node)
- item.ShowSubmenu (wrapper.GetDesignArea(), item);
-
- // Look for the index where to insert the new item
- dropIndex = nodes.IndexOf (item.Node);
- int mpos = item.Allocation.Y + item.Allocation.Height / 2;
- if (y > mpos)
- dropIndex++;
-
- // Calculate the drop position, used to show the drop bar
- if (dropIndex == 0)
- dropPosition = item.Allocation.Y;
- else if (dropIndex == menuItems.Count)
- dropPosition = item.Allocation.Bottom;
- else {
- item = (ActionMenuItem) menuItems [dropIndex];
- ActionMenuItem prevItem = (ActionMenuItem) menuItems [dropIndex - 1];
- dropPosition = prevItem.Allocation.Bottom + (item.Allocation.Y - prevItem.Allocation.Bottom)/2;
- }
- }
- } else
- dropIndex = 0;
-
- QueueDraw ();
- return base.OnDragMotion (context, x, y, time);
- }
-
- protected override void OnDragLeave (Gdk.DragContext context, uint time)
- {
- dropPosition = -1;
- QueueDraw ();
- base.OnDragLeave (context, time);
- }
-
- protected override void OnDragDataReceived (Gdk.DragContext context, int x, int y, Gtk.SelectionData data, uint info, uint time)
- {
- }
-
- protected override bool OnDragDrop (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dropped = DND.Drop (context, null, time) as ActionPaletteItem;
- if (dropped == null)
- return false;
-
- if (dropped.Node.Type != Gtk.UIManagerItemType.Menuitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Menu &&
- dropped.Node.Type != Gtk.UIManagerItemType.Toolitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Separator)
- return false;
-
- ActionTreeNode newNode = null;
-
- // Toolitems are copied, not moved
-
- using (wrapper.UndoManager.AtomicChange) {
- if (dropped.Node.ParentNode != null && dropped.Node.Type != Gtk.UIManagerItemType.Toolitem) {
- if (dropIndex < nodes.Count) {
- // Do nothing if trying to drop the node over the same node
- ActionTreeNode dropNode = nodes [dropIndex];
- if (dropNode == dropped.Node)
- return false;
-
- dropped.Node.ParentNode.Children.Remove (dropped.Node);
-
- // The drop position may have changed after removing the dropped node,
- // so get it again.
- dropIndex = nodes.IndexOf (dropNode);
- nodes.Insert (dropIndex, dropped.Node);
- } else {
- dropped.Node.ParentNode.Children.Remove (dropped.Node);
- nodes.Add (dropped.Node);
- dropIndex = nodes.Count - 1;
- }
- } else {
- newNode = new ActionTreeNode (Gtk.UIManagerItemType.Menuitem, null, dropped.Node.Action);
- nodes.Insert (dropIndex, newNode);
- }
- // Select the dropped node
- ActionMenuItem mi = (ActionMenuItem) menuItems [dropIndex];
- mi.Select ();
- }
-
- return base.OnDragDrop (context, x, y, time);
- }
-
- [GLib.ConnectBefore]
- void OnItemKeyPress (object s, Gtk.KeyPressEventArgs args)
- {
- ActionMenuItem item = (ActionMenuItem) s;
- ProcessKey (item, args.Event.Key, args.Event.State);
- args.RetVal = true;
- }
-
- void ProcessKey (ActionMenuItem item, Gdk.Key key, Gdk.ModifierType modifier)
- {
- int pos = menuItems.IndexOf (item);
-
- switch (key) {
- case Gdk.Key.Up:
- if (pos > 0)
- ((ActionMenuItem)menuItems[pos - 1]).Select ();
- else if (parentMenu.Widget is ActionMenuBar) {
- ActionMenuBar bar = (ActionMenuBar) parentMenu.Widget;
- bar.Select (parentNode);
- }
- break;
- case Gdk.Key.Down:
- if (pos < menuItems.Count - 1)
- ((ActionMenuItem)menuItems[pos + 1]).Select ();
- else if (pos == menuItems.Count - 1) {
- InsertAction (menuItems.Count);
- }
- break;
- case Gdk.Key.Right:
- if ((modifier & Gdk.ModifierType.ControlMask) != 0 && item.Node.Type == Gtk.UIManagerItemType.Menuitem) {
- // Create a submenu
- using (item.Node.Action.UndoManager.AtomicChange) {
- item.Node.Type = Gtk.UIManagerItemType.Menu;
- }
- item.Node.Action.NotifyChanged ();
- }
- if (item.HasSubmenu) {
- item.ShowSubmenu ();
- if (openSubmenu != null)
- openSubmenu.Select (null);
- } else if (parentNode != null) {
- ActionMenuBar parentMB = parentMenu.Widget as ActionMenuBar;
- if (parentMB != null) {
- int i = parentNode.ParentNode.Children.IndexOf (parentNode);
- if (i < parentNode.ParentNode.Children.Count - 1)
- parentMB.DropMenu (parentNode.ParentNode.Children [i + 1]);
- }
- }
- break;
- case Gdk.Key.Left:
- if ((modifier & Gdk.ModifierType.ControlMask) != 0 && item.Node.Type == Gtk.UIManagerItemType.Menu) {
- // Remove the submenu
- OpenSubmenu = null;
- using (item.Node.Action.UndoManager.AtomicChange) {
- item.Node.Type = Gtk.UIManagerItemType.Menuitem;
- item.Node.Children.Clear ();
- }
- item.Node.Action.NotifyChanged ();
- break;
- }
- if (parentNode != null) {
- ActionMenu parentAM = parentMenu.Widget as ActionMenu;
- if (parentAM != null) {
- parentAM.Select (parentNode);
- }
- ActionMenuBar parentMB = parentMenu.Widget as ActionMenuBar;
- if (parentMB != null) {
- int i = parentNode.ParentNode.Children.IndexOf (parentNode);
- if (i > 0)
- parentMB.DropMenu (parentNode.ParentNode.Children [i - 1]);
- }
- }
- break;
- case Gdk.Key.Return:
- item.EditingDone += OnEditingDone;
- item.StartEditing ();
- break;
- case Gdk.Key.Insert:
- if ((modifier & Gdk.ModifierType.ControlMask) != 0)
- InsertActionAt (item, true, true);
- else
- InsertActionAt (item, false, false);
- break;
- case Gdk.Key.Delete:
- DeleteAction (item);
- break;
- }
- }
-
- void InsertActionAt (ActionMenuItem item, bool after, bool separator)
- {
- int pos = menuItems.IndexOf (item);
- if (pos == -1)
- return;
-
- if (after)
- pos++;
-
- if (separator) {
- ActionTreeNode newNode = new ActionTreeNode (Gtk.UIManagerItemType.Separator, null, null);
- nodes.Insert (pos, newNode);
- Select (newNode);
- } else
- InsertAction (pos);
- }
-
- void Paste (ActionMenuItem item)
- {
- }
-
- void IMenuItemContainer.ShowContextMenu (ActionItem aitem)
- {
- ActionMenuItem menuItem = aitem as ActionMenuItem;
- Gtk.Menu m = new Gtk.Menu ();
- Gtk.MenuItem item = new Gtk.MenuItem (Catalog.GetString ("Insert Before"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, false, false);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert After"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, true, false);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert Separator Before"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, false, true);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert Separator After"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, true, true);
- };
-
- m.Add (new Gtk.SeparatorMenuItem ());
-
- item = new Gtk.ImageMenuItem (Gtk.Stock.Cut, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Cut ();
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Copy, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Copy ();
- };
- item.Visible = false;
- item = new Gtk.ImageMenuItem (Gtk.Stock.Paste, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Paste (menuItem);
- };
- item.Visible = false;
-
- item = new Gtk.ImageMenuItem (Gtk.Stock.Delete, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- DeleteAction (menuItem);
- };
- m.ShowAll ();
- m.Popup ();
- }
-
- internal void SaveStatus (ArrayList status)
- {
- for (int n=0; n= menuItems.Count)
- return;
-
- ActionMenuItem item = (ActionMenuItem)menuItems [pos];
- if (index == status.Count - 1) {
- // The last position in the status is the selected item
- item.Select ();
- if (item.Node.Action != null && item.Node.Action.Name.Length == 0) {
- // Then only case when there can have an action when an empty name
- // is when the user clicked on the "add action" link. In this case,
- // start editing the item again
- item.EditingDone += OnEditingDone;
- item.StartEditing ();
- }
- }
- else {
- item.ShowSubmenu ();
- if (OpenSubmenu != null)
- OpenSubmenu.RestoreStatus (status, index + 1);
- }
- }
-
- ActionMenuItem LocateWidget (int x, int y)
- {
- foreach (ActionMenuItem mi in menuItems) {
- if (mi.Allocation.Contains (x, y))
- return mi;
- }
- return null;
- }
-
- ActionMenuItem FindMenuItem (ActionTreeNode node)
- {
- foreach (ActionMenuItem mi in menuItems) {
- if (mi.Node == node)
- return mi;
- }
- return null;
- }
- }
-
- interface IMenuItemContainer
- {
- ActionMenu OpenSubmenu { get; set; }
- bool IsTopMenu { get; }
- Gtk.Widget Widget { get; }
- void ShowContextMenu (ActionItem item);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuBar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuBar.cs
deleted file mode 100644
index e1db3bb2864..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuBar.cs
+++ /dev/null
@@ -1,553 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- class ActionMenuBar: Gtk.MenuBar, IMenuItemContainer
- {
- ActionMenu openSubmenu;
- ActionTree actionTree;
- int dropPosition = -1;
- int dropIndex;
- ArrayList menuItems = new ArrayList ();
- bool showPlaceholder;
- Gtk.Widget addLabel;
- Gtk.Widget spacerItem;
-
- public ActionMenuBar ()
- {
- DND.DestSet (this, true);
- }
-
- public void FillMenu (ActionTree actionTree)
- {
- addLabel = null;
-
- if (this.actionTree != null) {
- this.actionTree.ChildNodeAdded -= OnChildAdded;
- this.actionTree.ChildNodeRemoved -= OnChildRemoved;
- }
-
- this.actionTree = actionTree;
- if (actionTree == null) {
- AddSpacerItem ();
- return;
- }
-
- actionTree.ChildNodeAdded += OnChildAdded;
- actionTree.ChildNodeRemoved += OnChildRemoved;
-
- HideSpacerItem ();
- menuItems.Clear ();
- Widget wrapper = Widget.Lookup (this);
-
- foreach (Gtk.Widget w in Children) {
- Remove (w);
- w.Destroy ();
- }
-
- foreach (ActionTreeNode node in actionTree.Children) {
- ActionMenuItem aitem = new ActionMenuItem (wrapper, this, node);
- AddItem (aitem, -1);
- menuItems.Add (aitem);
- }
-
- if (showPlaceholder) {
- AddCreateItemLabel ();
- } else if (actionTree.Children.Count == 0) {
- // Give some height to the toolbar
- AddSpacerItem ();
- }
- }
-
- public object SaveStatus ()
- {
- ArrayList status = new ArrayList ();
-
- for (int n=0; n= menuItems.Count)
- return;
-
- ActionMenuItem item = (ActionMenuItem) menuItems [pos];
- if (status.Count == 1) {
- // The last position in the status is the selected item
- item.Select ();
- if (item.Node.Action != null && item.Node.Action.Name.Length == 0) {
- // Then only case when there can have an action when an empty name
- // is when the user clicked on the "add action" link. In this case,
- // start editing the item again
- item.EditingDone += OnEditingDone;
- item.StartEditing ();
- }
- } else {
- item.ShowSubmenu ();
- if (OpenSubmenu != null)
- OpenSubmenu.RestoreStatus (status, 1);
- }
- }
-
- void AddCreateItemLabel ()
- {
- HideSpacerItem ();
- Gtk.Label emptyLabel = new Gtk.Label ();
- emptyLabel.Xalign = 0;
- emptyLabel.Markup = "" + Catalog.GetString ("Click to create menu") + "";
- Gtk.MenuItem mit = new Gtk.MenuItem ();
- mit.Child = emptyLabel;
- mit.ButtonPressEvent += OnNewItemPress;
- Insert (mit, -1);
- mit.ShowAll ();
- addLabel = mit;
- }
-
- void AddSpacerItem ()
- {
- if (spacerItem == null) {
- Gtk.Label emptyLabel = new Gtk.Label ();
- emptyLabel.Xalign = 0;
- emptyLabel.Markup = "" + Catalog.GetString ("Empty menu bar") + "";
- Gtk.MenuItem mit = new Gtk.MenuItem ();
- mit.Child = emptyLabel;
- Insert (mit, -1);
- spacerItem = mit;
- ShowAll ();
- }
- }
-
- void HideSpacerItem ()
- {
- if (spacerItem != null) {
- Remove (spacerItem);
- spacerItem = null;
- }
- }
-
- void AddItem (ActionMenuItem aitem, int pos)
- {
- Gtk.Table t = new Gtk.Table (1, 3, false);
- aitem.Attach (t, 0, 0);
- aitem.KeyPressEvent += OnItemKeyPress;
- t.ShowAll ();
-
- CustomMenuBarItem it = new CustomMenuBarItem ();
- it.ActionMenuItem = aitem;
- aitem.Bind (it);
- it.Child = t;
- it.ShowAll ();
- Insert (it, pos);
- }
-
- public bool ShowInsertPlaceholder {
- get { return showPlaceholder; }
- set {
- showPlaceholder = value;
- if (value && addLabel == null) {
- AddCreateItemLabel ();
- } else if (!value && addLabel != null) {
- Remove (addLabel);
- addLabel = null;
- if (menuItems.Count == 0)
- AddSpacerItem ();
- }
- }
- }
-
- public void Unselect ()
- {
- // Unselects any selected item and hides any open submenu menu
- Widget wrapper = Widget.Lookup (this);
- if (OpenSubmenu != null)
- OpenSubmenu.ResetSelection ();
- IDesignArea area = wrapper.GetDesignArea ();
- if (area != null) {
- foreach (Gtk.Widget w in Children) {
- CustomMenuBarItem it = w as CustomMenuBarItem;
- if (it != null)
- area.ResetSelection (it.ActionMenuItem);
- }
- }
- OpenSubmenu = null;
- }
-
- void OnChildAdded (object ob, ActionTreeNodeArgs args)
- {
- Refresh ();
- }
-
- void OnChildRemoved (object ob, ActionTreeNodeArgs args)
- {
- OpenSubmenu = null;
-
- Widget wrapper = Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- IObjectSelection asel = area.GetSelection ();
- ActionMenuItem curSel = asel != null ? asel.DataObject as ActionMenuItem : null;
- int pos = menuItems.IndexOf (curSel);
-
- foreach (Gtk.Widget w in Children) {
- if (w is CustomMenuBarItem && ((CustomMenuBarItem)w).ActionMenuItem.Node == args.Node) {
- Remove (w);
- menuItems.Remove (((CustomMenuBarItem)w).ActionMenuItem);
- if (menuItems.Count == 0 && !showPlaceholder)
- AddSpacerItem ();
- break;
- }
- }
- if (pos != -1 && pos < menuItems.Count)
- ((ActionMenuItem)menuItems[pos]).Select ();
- else if (menuItems.Count > 0)
- ((ActionMenuItem)menuItems[menuItems.Count-1]).Select ();
- }
-
- void Refresh ()
- {
- Widget wrapper = Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- if (area == null)
- return;
-
- ActionTreeNode selNode = null;
-
- foreach (Gtk.Widget w in Children) {
- CustomMenuBarItem it = w as CustomMenuBarItem;
- if (it != null && area.IsSelected (it.ActionMenuItem)) {
- selNode = it.ActionMenuItem.Node;
- area.ResetSelection (it.ActionMenuItem);
- }
- Remove (w);
- }
-
- FillMenu (actionTree);
-
- if (selNode != null) {
- ActionMenuItem mi = FindMenuItem (selNode);
- if (mi != null)
- mi.Select ();
- }
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnNewItemPress (object ob, Gtk.ButtonPressEventArgs args)
- {
- InsertAction (menuItems.Count);
- args.RetVal = true;
- }
-
- void InsertAction (int pos)
- {
- Widget wrapper = Widget.Lookup (this);
- using (wrapper.UndoManager.AtomicChange) {
- Wrapper.Action ac = (Wrapper.Action) ObjectWrapper.Create (wrapper.Project, new Gtk.Action ("", "", null, null));
- ActionTreeNode node = new ActionTreeNode (Gtk.UIManagerItemType.Menu, "", ac);
- actionTree.Children.Insert (pos, node);
-
- ActionMenuItem aitem = FindMenuItem (node);
- aitem.EditingDone += OnEditingDone;
- aitem.Select ();
- aitem.StartEditing ();
-
- if (wrapper.LocalActionGroups.Count == 0)
- wrapper.LocalActionGroups.Add (new ActionGroup ("Default"));
- wrapper.LocalActionGroups[0].Actions.Add (ac);
- }
- }
-
- void OnEditingDone (object ob, EventArgs args)
- {
- ActionMenuItem item = (ActionMenuItem) ob;
- item.EditingDone -= OnEditingDone;
- Widget wrapper = Widget.Lookup (this);
-
- if (item.Node.Action.GtkAction.Label.Length == 0 && item.Node.Action.GtkAction.StockId == null) {
- IDesignArea area = wrapper.GetDesignArea ();
- area.ResetSelection (item);
- using (wrapper.UndoManager.AtomicChange) {
- actionTree.Children.Remove (item.Node);
- wrapper.LocalActionGroups [0].Actions.Remove (item.Node.Action);
- }
- }
- }
-
- public void Select (ActionTreeNode node)
- {
- ActionMenuItem item = FindMenuItem (node);
- if (item != null)
- item.Select ();
- }
-
- public void DropMenu (ActionTreeNode node)
- {
- ActionMenuItem item = FindMenuItem (node);
- if (item != null) {
- if (item.HasSubmenu) {
- item.ShowSubmenu ();
- if (openSubmenu != null)
- openSubmenu.Select (null);
- }
- else
- item.Select ();
- }
- }
-
- public ActionMenu OpenSubmenu {
- get { return openSubmenu; }
- set {
- if (openSubmenu != null) {
- openSubmenu.OpenSubmenu = null;
- Widget wrapper = Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- if (area != null)
- area.RemoveWidget (openSubmenu);
- openSubmenu.Destroy ();
- }
- openSubmenu = value;
- }
- }
-
- bool IMenuItemContainer.IsTopMenu {
- get { return true; }
- }
-
- Gtk.Widget IMenuItemContainer.Widget {
- get { return this; }
- }
-
- protected override bool OnDragMotion (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dragItem = DND.DragWidget as ActionPaletteItem;
- if (dragItem == null)
- return false;
-
- if (actionTree.Children.Count > 0) {
- ActionMenuItem item = LocateWidget (x, y);
- if (item != null) {
- Widget wrapper = Widget.Lookup (this);
-
- // Show the submenu to allow droping to it, but avoid
- // droping a submenu inside itself
- if (item.HasSubmenu && item.Node != dragItem.Node)
- item.ShowSubmenu (wrapper.GetDesignArea(), item);
-
- // Look for the index where to insert the new item
- dropIndex = actionTree.Children.IndexOf (item.Node);
- int mpos = item.Allocation.X + item.Allocation.Width / 2;
- if (x > mpos)
- dropIndex++;
-
- // Calculate the drop position, used to show the drop bar
- if (dropIndex == 0)
- dropPosition = item.Allocation.X;
- else if (dropIndex == menuItems.Count)
- dropPosition = item.Allocation.Right;
- else {
- item = (ActionMenuItem) menuItems [dropIndex];
- ActionMenuItem prevItem = (ActionMenuItem) menuItems [dropIndex - 1];
- dropPosition = prevItem.Allocation.Right + (item.Allocation.X - prevItem.Allocation.Right)/2;
- }
- }
- } else
- dropIndex = 0;
-
- QueueDraw ();
- return base.OnDragMotion (context, x, y, time);
- }
-
- protected override void OnDragLeave (Gdk.DragContext context, uint time)
- {
- dropPosition = -1;
- QueueDraw ();
- base.OnDragLeave (context, time);
- }
-
- protected override bool OnDragDrop (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dropped = DND.Drop (context, null, time) as ActionPaletteItem;
- if (dropped == null)
- return false;
-
- if (dropped.Node.Type != Gtk.UIManagerItemType.Menuitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Menu &&
- dropped.Node.Type != Gtk.UIManagerItemType.Toolitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Separator)
- return false;
-
- ActionTreeNode newNode = dropped.Node;
- if (dropped.Node.Type == Gtk.UIManagerItemType.Toolitem) {
- newNode = newNode.Clone ();
- newNode.Type = Gtk.UIManagerItemType.Menuitem;
- }
-
- Widget wrapper = Widget.Lookup (this);
- using (wrapper.UndoManager.AtomicChange) {
- if (dropIndex < actionTree.Children.Count) {
- // Do nothing if trying to drop the node over the same node
- ActionTreeNode dropNode = actionTree.Children [dropIndex];
- if (dropNode == dropped.Node)
- return false;
-
- if (newNode.ParentNode != null)
- newNode.ParentNode.Children.Remove (newNode);
-
- // The drop position may have changed after removing the dropped node,
- // so get it again.
- dropIndex = actionTree.Children.IndexOf (dropNode);
- actionTree.Children.Insert (dropIndex, newNode);
- } else {
- if (newNode.ParentNode != null)
- newNode.ParentNode.Children.Remove (newNode);
- actionTree.Children.Add (newNode);
- dropIndex = actionTree.Children.Count - 1;
- }
-
- // Select the dropped node
- ActionMenuItem mi = (ActionMenuItem) menuItems [dropIndex];
- mi.Select ();
- }
-
- return base.OnDragDrop (context, x, y, time);
- }
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- bool r = base.OnExposeEvent (ev);
- int w, h;
- this.GdkWindow.GetSize (out w, out h);
- if (dropPosition != -1)
- GdkWindow.DrawRectangle (this.Style.BlackGC, true, dropPosition, 0, 3, h);
- return r;
- }
-
- void OnItemKeyPress (object s, Gtk.KeyPressEventArgs args)
- {
- int pos = menuItems.IndexOf (s);
- ActionMenuItem item = (ActionMenuItem) s;
-
- switch (args.Event.Key) {
- case Gdk.Key.Left:
- if (pos > 0)
- ((ActionMenuItem)menuItems[pos - 1]).Select ();
- break;
- case Gdk.Key.Right:
- if (pos < menuItems.Count - 1)
- ((ActionMenuItem)menuItems[pos + 1]).Select ();
- else if (pos == menuItems.Count - 1)
- InsertAction (menuItems.Count);
- break;
- case Gdk.Key.Down:
- if (item.HasSubmenu) {
- item.ShowSubmenu ();
- if (openSubmenu != null)
- openSubmenu.Select (null);
- }
- break;
- case Gdk.Key.Up:
- OpenSubmenu = null;
- break;
- }
- args.RetVal = true;
- }
-
- void InsertActionAt (ActionMenuItem item, bool after, bool separator)
- {
- int pos = menuItems.IndexOf (item);
- if (pos == -1)
- return;
-
- if (after)
- pos++;
-
- if (separator) {
- ActionTreeNode newNode = new ActionTreeNode (Gtk.UIManagerItemType.Separator, null, null);
- actionTree.Children.Insert (pos, newNode);
- } else
- InsertAction (pos);
- }
-
- void Paste (ActionMenuItem item)
- {
- }
-
- public void ShowContextMenu (ActionItem aitem)
- {
- ActionMenuItem menuItem = (ActionMenuItem) aitem;
-
- Gtk.Menu m = new Gtk.Menu ();
- Gtk.MenuItem item = new Gtk.MenuItem (Catalog.GetString ("Insert Before"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, false, false);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert After"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, true, false);
- };
-
- m.Add (new Gtk.SeparatorMenuItem ());
-
- item = new Gtk.ImageMenuItem (Gtk.Stock.Cut, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Cut ();
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Copy, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Copy ();
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Paste, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Paste (menuItem);
- };
- item.Visible = false; // No copy & paste for now
- item = new Gtk.ImageMenuItem (Gtk.Stock.Delete, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Delete ();
- };
- m.ShowAll ();
- m.Popup ();
- }
-
- ActionMenuItem LocateWidget (int x, int y)
- {
- foreach (ActionMenuItem mi in menuItems) {
- if (mi.Allocation.Contains (x, y))
- return mi;
- }
- return null;
- }
-
- ActionMenuItem FindMenuItem (ActionTreeNode node)
- {
- foreach (ActionMenuItem mi in menuItems) {
- if (mi.Node == node)
- return mi;
- }
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuItem.cs
deleted file mode 100644
index 9ac08166b0f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionMenuItem.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-
-using System;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- class ActionMenuItem: ActionItem
- {
- Gtk.Widget icon;
- Gtk.Widget label;
- Gtk.Widget accel;
- bool motionDrag;
- CustomMenuBarItem menuBarItem;
-
- static Gdk.Pixbuf addMenuImage;
- static Gdk.Pixbuf removeMenuImage;
-
- public event MenuItemEditEventHandler EditingDone;
-
- static ActionMenuItem ()
- {
- try {
- addMenuImage = Gdk.Pixbuf.LoadFromResource ("add-menu.png");
- removeMenuImage = Gdk.Pixbuf.LoadFromResource ("remove-menu.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf: " + e);
- }
- }
-
- internal ActionMenuItem (Widget wrapper, IMenuItemContainer parent, ActionTreeNode node)
- : this (wrapper, parent, node, 0)
- {
- }
-
- internal ActionMenuItem (IDesignArea designArea, IProject project, IMenuItemContainer parent, ActionTreeNode node)
- : this (null, parent, node, 6)
- {
- this.project = project;
- this.designArea = designArea;
- }
-
- internal ActionMenuItem (Widget wrapper, IMenuItemContainer parent, ActionTreeNode node, uint itemSpacing): base (node, parent, itemSpacing)
- {
- this.wrapper = wrapper;
- CreateControls ();
- }
-
- bool disposed;
-
- public override void Dispose ()
- {
- if (disposed)
- return;
- disposed = true;
- if (menuBarItem != null) {
- menuBarItem.ButtonPressEvent -= OnMenuItemPress;
- menuBarItem.ButtonReleaseEvent -= OnMemuItemRelease;
- menuBarItem.MotionNotifyEvent -= OnMotionNotify;
- }
- if (node.Action != null)
- node.Action.ObjectChanged -= OnActionChanged;
- base.Dispose ();
- }
-
- public bool HasSubmenu {
- get { return node.Type == Gtk.UIManagerItemType.Menu; }
- }
-
- public void StartEditing ()
- {
- if (!editing) {
- editing = true;
-
- Refresh ();
- if (node.Type == Gtk.UIManagerItemType.Menu)
- HideSubmenu ();
-
- UpdateSelectionStatus ();
- }
- }
-
-
- protected override void EndEditing (Gdk.Key exitKey)
- {
- if (editing) {
- Gtk.Entry entry = label as Gtk.Entry;
- if (entry != null && exitKey != Gdk.Key.Escape) {
- localUpdate = true;
- if (entry.Text.Trim().Length > 0 || node.Action.GtkAction.StockId != null) {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Label = entry.Text;
- node.Action.NotifyChanged ();
- }
- }
- localUpdate = false;
- }
-
- editing = false;
- Refresh ();
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- if (node.Type == Gtk.UIManagerItemType.Menu) {
- if (wrapper != null) {
- IDesignArea area = wrapper.GetDesignArea ();
- if (area != null)
- ShowSubmenu (area, this);
- }
- }
- GrabFocus ();
- UpdateSelectionStatus ();
-
- if (EditingDone != null) {
- MenuItemEditEventArgs args = new MenuItemEditEventArgs ();
- args.ExitKey = exitKey;
- EditingDone (this, args);
- }
- }
- }
-
- public override void Select ()
- {
- base.Select ();
-
- if (!IsSubmenuVisible) {
- parentMenu.OpenSubmenu = null;
- if (HasSubmenu)
- ShowSubmenu (GetDesignArea (), this);
- }
- GrabFocus ();
- }
-
- public void Attach (Gtk.Table table, uint row, uint col)
- {
- table.Attach (this, col, col + 3, row, row + 1);
- Show ();
- AttachChildren (table, row, col);
- }
-
- void AttachChildren (Gtk.Table table, uint row, uint col)
- {
- if (icon != null) {
- table.Attach (icon, col, col + 1, row, row + 1);
- Gtk.Table.TableChild tc = (Gtk.Table.TableChild) table [icon];
- if (!editing)
- tc.YPadding = itemSpacing;
- }
- if (label != null) {
- table.Attach (label, col + 1, col + 2, row, row + 1);
- Gtk.Table.TableChild tc = (Gtk.Table.TableChild) table [label];
- if (!editing)
- tc.YPadding = itemSpacing;
- label.GrabFocus ();
- }
- if (accel != null)
- table.Attach (accel, col + 2, col + 3, row, row + 1);
-
- if (minWidth > 0 && label != null) {
- if (label.SizeRequest().Width < minWidth)
- label.WidthRequest = minWidth;
- }
-
- bool sens = editing || node.Action == null || node.Action.GtkAction.Sensitive;
- if (icon != null)
- icon.Sensitive = sens;
- if (label != null)
- label.Sensitive = sens;
- if (accel != null)
- accel.Sensitive = sens;
- }
-
- void CreateControls ()
- {
- if (node.Type == Gtk.UIManagerItemType.Separator) {
- Gtk.Widget sep;
- if (parentMenu.IsTopMenu) {
- sep = new Gtk.VSeparator ();
- sep.WidthRequest = 6;
- } else {
- sep = new Gtk.HSeparator ();
- sep.HeightRequest = 6;
- }
- Add (sep);
- ShowAll ();
- return;
- } else {
- if (Child != null && Child is Gtk.Separator)
- Remove (Child);
- }
-
- if (node.Action == null)
- return;
-
- bool isGlobal = wrapper != null && wrapper.Project.ActionGroups.IndexOf (node.Action.ActionGroup) != -1;
-
- Gtk.Action gaction = node.Action.GtkAction;
- bool barItem = parentMenu.IsTopMenu;
-
- string text = gaction.Label;
- string stock = gaction.StockId;
-
- if (barItem) {
- icon = null;
- } else if (node.Action.Type == Stetic.Wrapper.Action.ActionType.Radio) {
- icon = new CheckActionIcon (true, node.Action.Active);
- } else if (node.Action.Type == Stetic.Wrapper.Action.ActionType.Toggle) {
- icon = new CheckActionIcon (node.Action.DrawAsRadio, node.Action.Active);
- }
-
- if (stock != null) {
- Gtk.StockItem item = Gtk.Stock.Lookup (stock);
- if (text == null || text.Length == 0)
- text = item.Label;
-
- if (item.Keyval != 0 && !editing && !barItem) {
- Gtk.Label lac = new Gtk.Label ();
- string accelName = Gtk.Accelerator.Name (item.Keyval, item.Modifier).ToUpper ();
- accelName = accelName.Replace ("", "Ctrl+");
- accelName = accelName.Replace ("", "Shift+");
- accelName = accelName.Replace ("", "Alt+");
- lac.Text = accelName;
- accel = lac;
- }
-
- if (icon == null && !barItem)
- icon = node.Action.CreateIcon (Gtk.IconSize.Menu);
- }
-
- if (editing && !isGlobal) {
- if (!barItem) {
- Gtk.HBox bbox = new Gtk.HBox ();
- if (icon != null) {
- bbox.PackStart (icon, false, false, 0);
- }
- bbox.PackStart (new Gtk.Arrow (Gtk.ArrowType.Down, Gtk.ShadowType.In), false, false, 0);
- Gtk.Button b = new Gtk.Button (bbox);
- b.TooltipText = Catalog.GetString ("Select action type");
- b.Relief = Gtk.ReliefStyle.None;
- b.ButtonPressEvent += OnSelectIcon;
- icon = b;
- } else
- icon = null;
-
- Gtk.Entry entry = new Gtk.Entry ();
- entry.Text = text;
- entry.Activated += OnLabelActivated;
- entry.KeyPressEvent += OnEntryKeyPress;
- entry.HasFrame = false;
- this.label = entry;
- entry.TooltipText = Catalog.GetString ("Action label");
- } else {
- Gtk.Label label = new Gtk.Label (text);
- label.Xalign = 0;
- this.label = label;
- }
-
- if (editing && wrapper != null) {
- // Add a button for creating / deleting a submenu
- Gdk.Pixbuf img;
- string tip;
- if (node.Type != Gtk.UIManagerItemType.Menu) {
- img = addMenuImage;
- tip = Catalog.GetString ("Add submenu (Ctrl+Right)");
- } else {
- img = removeMenuImage;
- tip = Catalog.GetString ("Remove submenu (Ctrl+Left)");
- }
-
- Gtk.Button sb = new Gtk.Button (new Gtk.Image (img));
- sb.TooltipText = tip;
- sb.Relief = Gtk.ReliefStyle.None;
- sb.Clicked += OnCreateDeleteSubmenu;
-
- // Make sure the button is alligned to the right of the column
- Gtk.HBox bbox = new Gtk.HBox ();
- bbox.PackEnd (sb, false, false, 0);
- accel = bbox;
- }
-
-
- if (node.Type == Gtk.UIManagerItemType.Menu && !editing && !barItem) {
- Gtk.Arrow arrow = new Gtk.Arrow (Gtk.ArrowType.Right, Gtk.ShadowType.None);
- arrow.Xalign = 1;
- this.accel = arrow;
- }
-
- if (itemSpacing > 0 && icon != null) {
- // Add some padding to the left of the icon
- Gtk.Alignment a = new Gtk.Alignment (0, 0.5f, 0, 0);
- a.LeftPadding = itemSpacing;
- a.Add (icon);
- icon = a;
- }
- }
-
- public void Detach ()
- {
- if (disposed)
- return;
-
- Gtk.Table table = (Gtk.Table)Parent;
- if (table == null)
- return;
- if (icon != null)
- table.Remove (icon);
- if (label != null)
- table.Remove (label);
- if (accel != null)
- table.Remove (accel);
- table.Remove (this);
- }
-
- void OnCreateDeleteSubmenu (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- if (node.Type == Gtk.UIManagerItemType.Menu) {
- node.Type = Gtk.UIManagerItemType.Menuitem;
- node.Children.Clear ();
- } else {
- node.Type = Gtk.UIManagerItemType.Menu;
- }
-
- EndEditing (Gdk.Key.Return);
- node.Action.NotifyChanged ();
- }
- }
-
- void OnLabelActivated (object ob, EventArgs args)
- {
- EndEditing (Gdk.Key.Return);
- }
-
- [GLib.ConnectBefore]
- void OnEntryKeyPress (object ob, Gtk.KeyPressEventArgs args)
- {
- switch (args.Event.Key) {
- case Gdk.Key.Down:
- case Gdk.Key.Escape:
- case Gdk.Key.Up:
- EndEditing (args.Event.Key);
- args.RetVal = true;
- break;
- }
- args.RetVal = false;
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnSelectIcon (object sender, Gtk.ButtonPressEventArgs e)
- {
- Gtk.Menu menu = new Gtk.Menu ();
-
- Gtk.CheckMenuItem item = new Gtk.CheckMenuItem (Catalog.GetString ("Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Action);
- item.Activated += OnSetActionType;
- menu.Insert (item, -1);
-
- item = new Gtk.CheckMenuItem (Catalog.GetString ("Radio Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Radio);
- item.Activated += OnSetRadioType;
- menu.Insert (item, -1);
-
- item = new Gtk.CheckMenuItem (Catalog.GetString ("Toggle Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Toggle);
- item.Activated += OnSetToggleType;
- menu.Insert (item, -1);
-
- menu.Insert (new Gtk.SeparatorMenuItem (), -1);
-
- Gtk.MenuItem itIcons = new Gtk.MenuItem (Catalog.GetString ("Select Icon"));
- menu.Insert (itIcons, -1);
- IconSelectorMenu menuIcons = new IconSelectorMenu (GetProject ());
- menuIcons.IconSelected += OnStockSelected;
- itIcons.Submenu = menuIcons;
-
- Gtk.MenuItem it = new Gtk.MenuItem (Catalog.GetString ("Clear Icon"));
- it.Sensitive = (node.Action.GtkAction.StockId != null);
- it.Activated += OnClearIcon;
- menu.Insert (it, -1);
-
- menu.ShowAll ();
- menu.Popup (null, null, new Gtk.MenuPositionFunc (OnDropMenuPosition), 3, Gtk.Global.CurrentEventTime);
- e.RetVal = false;
- }
-
- void OnDropMenuPosition (Gtk.Menu menu, out int x, out int y, out bool pushIn)
- {
- this.ParentWindow.GetOrigin (out x, out y);
- x += this.Allocation.X;
- y += this.Allocation.Y + this.Allocation.Height;
- pushIn = true;
- }
-
- void OnStockSelected (object s, IconEventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.StockId = args.IconId;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnSetToggleType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Toggle;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnSetRadioType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Radio;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnSetActionType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Action;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnClearIcon (object on, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.StockId = null;
- node.Action.NotifyChanged ();
- }
- }
-
- public override void Refresh ()
- {
- Gtk.Table table = (Gtk.Table)Parent;
- if (table == null)
- return;
-
- if (icon != null && icon.Parent != null)
- table.Remove (icon);
- if (label != null && label.Parent != null)
- table.Remove (label);
- if (accel != null && accel.Parent != null)
- table.Remove (accel);
-
- icon = label = accel = null;
- CreateControls ();
- Gtk.Table.TableChild tc = (Gtk.Table.TableChild)table[this];
- AttachChildren (table, tc.TopAttach, tc.LeftAttach);
-
- table.ShowAll ();
- }
-
- internal void Bind (CustomMenuBarItem item)
- {
- // When embedding the action menu in a MenuBar,
- // the parent menu item intercepts the mouse events,
- // so those events must be manually bound here
- menuBarItem = item;
- item.ButtonPressEvent += OnMenuItemPress;
- item.ButtonReleaseEvent += OnMemuItemRelease;
- item.MotionNotifyEvent += OnMotionNotify;
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnMenuItemPress (object ob, Gtk.ButtonPressEventArgs args)
- {
- Gtk.Widget mit = (Gtk.Widget) ob;
- if (wrapper != null && wrapper.Project.Selection != mit.Parent) {
- wrapper.Select ();
- args.RetVal = true;
- return;
- }
- motionDrag = true;
- args.RetVal = ProcessButtonPress (args.Event);
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnMemuItemRelease (object ob, Gtk.ButtonReleaseEventArgs args)
- {
- args.RetVal = ProcessButtonRelease (args.Event);
- motionDrag = false;
- }
-
- void OnMotionNotify (object ob, Gtk.MotionNotifyEventArgs args)
- {
- if (motionDrag) {
- // Looks like drag begin can be intercepted, so the motion notify
- // has to be used.
- ProcessDragBegin (null, args.Event);
- motionDrag = false;
- }
- }
-
- protected override bool OnButtonReleaseEvent (Gdk.EventButton ev)
- {
- return ProcessButtonRelease (ev);
- }
-
- public bool ProcessButtonRelease (Gdk.EventButton ev)
- {
- // Clicking a selected item starts the edit mode
- if (editOnRelease)
- StartEditing ();
-
- editOnRelease = false;
- return true;
- }
-
- public override void ProcessDragBegin (Gdk.DragContext ctx, Gdk.EventMotion evt)
- {
- if (HasSubmenu)
- HideSubmenu ();
- base.ProcessDragBegin (ctx, evt);
- }
-
- void OnActionChanged (object ob, ObjectWrapperEventArgs a)
- {
- if (!localUpdate)
- Refresh ();
- }
-
- public bool IsSubmenuVisible {
- get {
- ActionMenu menu = parentMenu.OpenSubmenu;
- return (menu != null && menu.ParentNode == node);
- }
- }
-
- public void ShowSubmenu ()
- {
- ShowSubmenu (wrapper.GetDesignArea (), this);
- }
-
- public void ShowSubmenu (IDesignArea area, Gtk.Widget refWidget)
- {
- HideSubmenu ();
- Gdk.Rectangle rect = area.GetCoordinates (refWidget);
- ActionMenu menu = new ActionMenu (wrapper, parentMenu, node);
- menu.ShowAll ();
- area.AddWidget (menu, rect.Right, rect.Top);
- menu.TrackWidgetPosition (refWidget, parentMenu.IsTopMenu);
-
- parentMenu.OpenSubmenu = menu;
- }
-
- void HideSubmenu ()
- {
- parentMenu.OpenSubmenu = null;
- }
- }
-
- class CheckActionIcon: Gtk.EventBox
- {
- readonly bool isRadio;
- readonly bool active;
-
- public CheckActionIcon (bool isRadio, bool active)
- {
- this.isRadio = isRadio;
- this.active = active;
- WidthRequest = HeightRequest = 16;
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- Gdk.Rectangle rect = Allocation;
- rect.X = rect.Y = 0;
-
- Gtk.ShadowType sh = active ? Gtk.ShadowType.In : Gtk.ShadowType.Out;
- if (isRadio)
- Gtk.Style.PaintOption (this.Style, this.GdkWindow, this.State, sh, rect, this, "", rect.X, rect.Y, rect.Width, rect.Height);
- else
- Gtk.Style.PaintCheck (this.Style, this.GdkWindow, this.State, sh, rect, this, "", rect.X, rect.Y, rect.Width, rect.Height);
- return true;
- }
- }
-
- delegate void MenuItemEditEventHandler (object s, MenuItemEditEventArgs args);
-
- class MenuItemEditEventArgs: EventArgs
- {
- public Gdk.Key ExitKey;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolItem.cs
deleted file mode 100644
index b0372cda879..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolItem.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-
-using System;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- class ActionToolItem: ActionItem
- {
- ActionToolbar parentToolbar;
-
- bool motionDrag;
- bool showingText;
- Gtk.Widget dropButton;
-
- public event EventHandler EditingDone;
-
- internal ActionToolItem (Widget wrapper, ActionToolbar parent, ActionTreeNode node)
- : this (wrapper, parent, node, 0)
- {
- }
-
- internal ActionToolItem (Widget wrapper, ActionToolbar parent, ActionTreeNode node, uint itemSpacing): base (node, parent, itemSpacing)
- {
- this.parentToolbar = parent;
- this.wrapper = wrapper;
- CreateControls ();
- }
-
- public void StartEditing (bool doClick)
- {
- if (!editing && node.Action != null) {
- // Don't allow efiting global actions
- if (wrapper != null && wrapper.Project.ActionGroups.IndexOf (node.Action.ActionGroup) != -1)
- return;
- editing = true;
- Refresh ();
-
- if (doClick && dropButton != null) {
- // Make sure the dropButton is properly shown
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- OnSelectIcon (null, null);
- }
- }
- }
-
- protected override void EndEditing (Gdk.Key exitKey)
- {
- if (editing) {
- editing = false;
- Refresh ();
- while (Gtk.Application.EventsPending ())
- Gtk.Application.RunIteration ();
- GrabFocus ();
- if (EditingDone != null)
- EditingDone (this, EventArgs.Empty);
- }
- }
-
- void CreateControls ()
- {
- Gtk.Widget icon = null;
- Gtk.Widget label = null;
- dropButton = null;
-
- if (Child != null) {
- Gtk.Widget w = Child;
- Remove (w);
- w.Destroy ();
- }
-
- if (node.Type == Gtk.UIManagerItemType.Separator) {
- Gtk.Widget sep;
- if (parentToolbar.Orientation == Gtk.Orientation.Horizontal) {
- sep = new Gtk.VSeparator ();
- } else {
- sep = new Gtk.HSeparator ();
- }
- Gtk.HBox box = new Gtk.HBox ();
- box.BorderWidth = 6;
- box.PackStart (sep, true, true, 0);
- Add (box);
- return;
- }
-
- if (node.Action == null)
- return;
-
- Gtk.Action gaction = node.Action.GtkAction;
-
- bool showText = parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.Text;
- bool showIcon = parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.Icons;
- if (parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.Both) {
- showText = showIcon = true;
- }
- else if (parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.BothHoriz) {
- showText = parentToolbar.Orientation == Gtk.Orientation.Vertical || gaction.IsImportant;
- showIcon = true;
- }
-
- string text = node.Action.ToolLabel;
- showingText = showText;
-
- if (showIcon)
- {
- if (gaction.StockId != null) {
- icon = node.Action.CreateIcon (parentToolbar.IconSize);
- } else if (!gaction.IsImportant) {
- icon = CreateFakeItem ();
- }
- }
-
- if (editing) {
- Gtk.HBox bbox = new Gtk.HBox ();
- bbox.Spacing = 3;
- if (icon != null) {
- bbox.PackStart (icon, false, false, 0);
- }
- bbox.PackStart (new Gtk.Arrow (Gtk.ArrowType.Down, Gtk.ShadowType.In), false, false, 0);
- Gtk.Button b = new Gtk.Button (bbox);
- b.TooltipText = Catalog.GetString ("Select action type");
- b.Relief = Gtk.ReliefStyle.None;
- b.ButtonPressEvent += OnSelectIcon;
- dropButton = b;
- icon = b;
-
- if (showText) {
- Gtk.Entry entry = new Gtk.Entry ();
- entry.Text = text;
- entry.Changed += OnLabelChanged;
- entry.Activated += OnLabelActivated;
- entry.HasFrame = false;
- label = entry;
- entry.TooltipText = Catalog.GetString ("Action label");
- }
- } else if (showText && text != null && text.Length > 0) {
- label = new Gtk.Label (text);
- label.Sensitive = editing || node.Action == null || node.Action.GtkAction.Sensitive;
- }
-
- if (icon != null && label != null) {
- if (parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.BothHoriz) {
- Gtk.HBox box = new Gtk.HBox ();
- box.PackStart (icon, false, false, 0);
- box.PackStart (label, true, true, 0);
- icon = box;
- } else if (parentToolbar.ToolbarStyle == Gtk.ToolbarStyle.Both) {
- Gtk.VBox box = new Gtk.VBox ();
- Gtk.Alignment al = new Gtk.Alignment (0.5f, 0f, 0f, 0f);
- al.Add (icon);
- box.PackStart (al, false, false, 0);
- box.PackStart (label, true, true, 0);
- icon = box;
- }
- } else if (label != null) {
- icon = label;
- }
-
- if (icon == null) {
- icon = CreateFakeItem ();
- }
-
- icon.Sensitive = editing || node.Action == null || node.Action.GtkAction.Sensitive;
-
- if (!editing) {
- Gtk.Button but = new Gtk.Button (icon);
- but.Relief = Gtk.ReliefStyle.None;
- but.ButtonPressEvent += OnToolItemPress;
- but.ButtonReleaseEvent += OnMemuItemRelease;
- but.MotionNotifyEvent += OnMotionNotify;
- but.Events |= Gdk.EventMask.PointerMotionMask;
- icon = but;
- }
-
- Add (icon);
-
- ShowAll ();
- }
-
- Gtk.Widget CreateFakeItem ()
- {
- Gtk.Frame frm = new Gtk.Frame ();
- frm.ShadowType = Gtk.ShadowType.Out;
- int w, h;
- Gtk.Icon.SizeLookup (parentToolbar.IconSize, out w, out h);
- frm.WidthRequest = w;
- frm.HeightRequest = h;
- return frm;
- }
-
- void OnLabelChanged (object ob, EventArgs args)
- {
- localUpdate = true;
-
- Gtk.Entry entry = ob as Gtk.Entry;
- if (entry.Text.Length > 0 || node.Action.GtkAction.StockId != null) {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Label = entry.Text;
- node.Action.NotifyChanged ();
- }
- }
- localUpdate = false;
- }
-
- void OnLabelActivated (object ob, EventArgs args)
- {
- EndEditing (Gdk.Key.Return);
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnSelectIcon (object s, Gtk.ButtonPressEventArgs args)
- {
- Gtk.Menu menu = new Gtk.Menu ();
-
- Gtk.CheckMenuItem item = new Gtk.CheckMenuItem (Catalog.GetString ("Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Action);
- item.Activated += OnSetActionType;
- menu.Insert (item, -1);
-
- item = new Gtk.CheckMenuItem (Catalog.GetString ("Radio Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Radio);
- item.Activated += OnSetRadioType;
- menu.Insert (item, -1);
-
- item = new Gtk.CheckMenuItem (Catalog.GetString ("Toggle Action"));
- item.DrawAsRadio = true;
- item.Active = (node.Action.Type == Stetic.Wrapper.Action.ActionType.Toggle);
- item.Activated += OnSetToggleType;
- menu.Insert (item, -1);
-
- menu.Insert (new Gtk.SeparatorMenuItem (), -1);
-
- Gtk.MenuItem itIcons = new Gtk.MenuItem (Catalog.GetString ("Select Icon"));
- menu.Insert (itIcons, -1);
- IconSelectorMenu menuIcons = new IconSelectorMenu (GetProject ());
- menuIcons.IconSelected += OnStockSelected;
- itIcons.Submenu = menuIcons;
-
- Gtk.MenuItem it = new Gtk.MenuItem (Catalog.GetString ("Clear Icon"));
- it.Sensitive = (node.Action.GtkAction.StockId != null);
- it.Activated += OnClearIcon;
- menu.Insert (it, -1);
-
- menu.ShowAll ();
-
- uint but = args != null ? args.Event.Button : 1;
- menu.Popup (null, null, new Gtk.MenuPositionFunc (OnDropMenuPosition), but, Gtk.Global.CurrentEventTime);
-
- // Make sure we get the focus after closing the menu, so we can keep browsing buttons
- // using the keyboard.
- menu.Hidden += delegate (object sender, EventArgs a) {
- GrabFocus ();
- };
-
- if (args != null)
- args.RetVal = false;
- }
-
- void OnDropMenuPosition (Gtk.Menu menu, out int x, out int y, out bool pushIn)
- {
- dropButton.ParentWindow.GetOrigin (out x, out y);
- x += dropButton.Allocation.X;
- y += dropButton.Allocation.Y + dropButton.Allocation.Height;
- pushIn = true;
- }
-
- void OnSetToggleType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Toggle;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnSetRadioType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Radio;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnSetActionType (object ob, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.Type = Stetic.Wrapper.Action.ActionType.Action;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnStockSelected (object s, IconEventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.StockId = args.IconId;
- node.Action.NotifyChanged ();
- }
- }
-
- void OnClearIcon (object on, EventArgs args)
- {
- using (node.Action.UndoManager.AtomicChange) {
- node.Action.StockId = null;
- node.Action.NotifyChanged ();
- }
- }
-
- public override void Refresh ()
- {
- CreateControls ();
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnToolItemPress (object ob, Gtk.ButtonPressEventArgs args)
- {
- if (wrapper != null && wrapper.Project.Selection != wrapper.Wrapped) {
- wrapper.Select ();
- args.RetVal = true;
- return;
- }
- if (args.Event.Button == 1 && !GtkWorkarounds.TriggersContextMenu (args.Event))
- motionDrag = true;
- args.RetVal = ProcessButtonPress (args.Event);
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnMemuItemRelease (object ob, Gtk.ButtonReleaseEventArgs args)
- {
- args.RetVal = ProcessButtonRelease (args.Event);
- motionDrag = false;
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnMotionNotify (object ob, Gtk.MotionNotifyEventArgs args)
- {
- if (motionDrag) {
- // Looks like drag begin can be intercepted, so the motion notify
- // has to be used.
- ProcessDragBegin (null, args.Event);
- motionDrag = false;
- }
- }
-
- protected override bool OnButtonReleaseEvent (Gdk.EventButton ev)
- {
- return ProcessButtonRelease (ev);
- }
-
- public bool ProcessButtonRelease (Gdk.EventButton ev)
- {
- // Clicking a selected item starts the edit mode
- if (editOnRelease) {
- StartEditing (!showingText);
- }
-
- editOnRelease = false;
- return true;
- }
-
- protected override bool OnKeyPressEvent (Gdk.EventKey e)
- {
- if (e.Key == Gdk.Key.Return)
- EndEditing (Gdk.Key.Return);
- else if (e.Key == Gdk.Key.Escape)
- EndEditing (Gdk.Key.Escape);
- return base.OnKeyPressEvent (e);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolbar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolbar.cs
deleted file mode 100644
index ee497b40a89..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ActionToolbar.cs
+++ /dev/null
@@ -1,540 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- class ActionToolbar: Gtk.Toolbar, IMenuItemContainer
- {
- ActionTree actionTree;
- int dropPosition = -1;
- int dropIndex;
- ArrayList toolItems = new ArrayList ();
- bool showPlaceholder = true;
- Gtk.Widget addLabel;
- Gtk.Widget spacerItem;
-
- public ActionToolbar ()
- {
- DND.DestSet (this, true);
- this.ShowArrow = false;
- }
-
- public void FillMenu (ActionTree actionTree)
- {
- addLabel = null;
-
- if (this.actionTree != null) {
- this.actionTree.ChildNodeAdded -= OnChildAdded;
- this.actionTree.ChildNodeRemoved -= OnChildRemoved;
- }
-
- this.actionTree = actionTree;
- if (actionTree == null) {
- AddSpacerItem ();
- return;
- }
-
- actionTree.ChildNodeAdded += OnChildAdded;
- actionTree.ChildNodeRemoved += OnChildRemoved;
-
- HideSpacerItem ();
- toolItems.Clear ();
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
-
- foreach (Gtk.Widget w in Children) {
- Remove (w);
- w.Destroy ();
- }
-
- foreach (ActionTreeNode node in actionTree.Children) {
- ActionToolItem aitem = new ActionToolItem (wrapper, this, node);
- AddItem (aitem, -1);
- toolItems.Add (aitem);
- }
-
- if (actionTree.Children.Count == 0) {
- // If there are no buttons in the toolbar, give it some height so it is selectable.
- AddSpacerItem ();
- }
-
- if (showPlaceholder) {
- AddCreateItemLabel ();
- }
- }
-
- void AddCreateItemLabel ()
- {
- HideSpacerItem ();
- Gtk.EventBox ebox = new Gtk.EventBox ();
- ebox.VisibleWindow = false;
- Gtk.Label emptyLabel = new Gtk.Label ();
- emptyLabel.Xalign = 0;
- if (this.Orientation == Gtk.Orientation.Vertical)
- emptyLabel.Markup = "" + Catalog.GetString ("New\nbutton") + "";
- else
- emptyLabel.Markup = "" + Catalog.GetString ("New button") + "";
- ebox.BorderWidth = 3;
- ebox.Add (emptyLabel);
- Gtk.ToolItem mit = new Gtk.ToolItem ();
- mit.Child = ebox;
- ebox.ButtonPressEvent += OnNewItemPress;
- Insert (mit, -1);
- mit.ShowAll ();
- addLabel = mit;
- }
-
- void AddSpacerItem ()
- {
- if (spacerItem == null) {
- Gtk.ToolItem tb = new Gtk.ToolItem ();
- Gtk.Label emptyLabel = new Gtk.Label ();
- emptyLabel.Xalign = 0;
- emptyLabel.Xpad = 3;
- emptyLabel.Ypad = 3;
- if (this.Orientation == Gtk.Orientation.Vertical)
- emptyLabel.Markup = "" + Catalog.GetString ("Empty\ntoolbar") + "";
- else
- emptyLabel.Markup = "" + Catalog.GetString ("Empty toolbar") + "";
- tb.Child = emptyLabel;
- Insert (tb, -1);
- ShowAll ();
- spacerItem = tb;
- }
- }
-
- void HideSpacerItem ()
- {
- if (spacerItem != null) {
- Remove (spacerItem);
- spacerItem = null;
- }
- }
-
- void AddItem (ActionToolItem aitem, int pos)
- {
- aitem.KeyPressEvent += OnItemKeyPress;
-
- CustomToolbarItem it = new CustomToolbarItem ();
- it.ActionToolItem = aitem;
- it.Child = aitem;
- it.ShowAll ();
- Insert (it, pos);
- }
-
- public bool ShowInsertPlaceholder {
- get { return showPlaceholder; }
- set {
- showPlaceholder = value;
- if (value && addLabel == null) {
- AddCreateItemLabel ();
- } else if (!value && addLabel != null) {
- Remove (addLabel);
- addLabel.Destroy ();
- addLabel = null;
- if (actionTree.Children.Count == 0)
- AddSpacerItem ();
- }
- }
- }
-
- public Stetic.Editor.ActionMenu OpenSubmenu {
- get { return null; }
- set { }
- }
-
- public bool IsTopMenu {
- get { return true; }
- }
-
- public Gtk.Widget Widget {
- get { return this; }
- }
-
- public void Unselect ()
- {
- // Unselects any selected item
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- if (area != null) {
- foreach (Gtk.Widget w in Children) {
- CustomToolbarItem it = w as CustomToolbarItem;
- if (it != null)
- area.ResetSelection (it.ActionToolItem);
- }
- }
- }
-
- void OnChildAdded (object ob, ActionTreeNodeArgs args)
- {
- Refresh ();
- }
-
- void OnChildRemoved (object ob, ActionTreeNodeArgs args)
- {
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- IObjectSelection asel = area.GetSelection ();
- ActionToolItem curSel = asel != null ? asel.DataObject as ActionToolItem : null;
- int pos = toolItems.IndexOf (curSel);
-
- foreach (Gtk.Widget w in Children) {
- if (w is CustomToolbarItem && ((CustomToolbarItem)w).ActionToolItem.Node == args.Node) {
- Remove (w);
- toolItems.Remove (((CustomToolbarItem)w).ActionToolItem);
- w.Destroy ();
- if (!showPlaceholder && toolItems.Count == 0)
- AddSpacerItem ();
- break;
- }
- }
-
- if (pos != -1 && pos < toolItems.Count)
- ((ActionToolItem)toolItems[pos]).Select ();
- else if (toolItems.Count > 0)
- ((ActionToolItem)toolItems[toolItems.Count-1]).Select ();
- }
-
- void Refresh ()
- {
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- IDesignArea area = wrapper.GetDesignArea ();
- if (area == null)
- return;
-
- ActionTreeNode selNode = null;
-
- foreach (Gtk.Widget w in Children) {
- CustomToolbarItem it = w as CustomToolbarItem;
- if (it != null && area.IsSelected (it.ActionToolItem)) {
- selNode = it.ActionToolItem.Node;
- area.ResetSelection (it.ActionToolItem);
- }
- Remove (w);
- w.Destroy ();
- }
-
- FillMenu (actionTree);
-
- if (selNode != null) {
- ActionToolItem mi = FindMenuItem (selNode);
- if (mi != null)
- mi.Select ();
- }
- }
-
- [GLib.ConnectBeforeAttribute]
- void OnNewItemPress (object ob, Gtk.ButtonPressEventArgs args)
- {
- InsertAction (toolItems.Count);
- args.RetVal = true;
- }
-
- void InsertAction (int pos)
- {
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- using (wrapper.UndoManager.AtomicChange) {
- Wrapper.Action ac = (Wrapper.Action) ObjectWrapper.Create (wrapper.Project, new Gtk.Action ("", "", null, null));
- ActionTreeNode node = new ActionTreeNode (Gtk.UIManagerItemType.Toolitem, "", ac);
- actionTree.Children.Insert (pos, node);
-
- ActionToolItem aitem = FindMenuItem (node);
- aitem.EditingDone += OnEditingDone;
- aitem.Select ();
- aitem.StartEditing (false);
- //ShowInsertPlaceholder = false;
-
- if (wrapper.LocalActionGroups.Count == 0)
- wrapper.LocalActionGroups.Add (new ActionGroup ("Default"));
- wrapper.LocalActionGroups[0].Actions.Add (ac);
- }
- }
-
- void OnEditingDone (object ob, EventArgs args)
- {
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- if (wrapper == null)
- return;
-
- IDesignArea area = wrapper.GetDesignArea ();
- if (area == null) // The toolbar may be disposed before ending editing
- return;
-
- ActionToolItem item = (ActionToolItem) ob;
- item.EditingDone -= OnEditingDone;
-
- if (item.Node.Action.GtkAction.Label.Length == 0 && item.Node.Action.GtkAction.StockId == null) {
- area.ResetSelection (item);
- using (wrapper.UndoManager.AtomicChange) {
- actionTree.Children.Remove (item.Node);
- wrapper.LocalActionGroups [0].Actions.Remove (item.Node.Action);
- }
- }
- }
-
- public void Select (ActionTreeNode node)
- {
- ActionToolItem item = FindMenuItem (node);
- if (item != null)
- item.Select ();
- }
-
- protected override bool OnDragMotion (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dragItem = DND.DragWidget as ActionPaletteItem;
- if (dragItem == null)
- return false;
-
- x += Allocation.X;
- y += Allocation.Y;
-
- if (actionTree.Children.Count > 0) {
- ActionToolItem item = LocateWidget (x, y);
- if (item != null) {
- // Look for the index where to insert the new item
- dropIndex = actionTree.Children.IndexOf (item.Node);
- int spos = (Orientation == Gtk.Orientation.Horizontal) ? x : y;
- int mpos = GetButtonPos (item) + GetButtonSize (item) / 2;
- if (spos > mpos)
- dropIndex++;
-
- // Calculate the drop position, used to show the drop bar
- if (dropIndex == 0)
- dropPosition = GetButtonPos (item);
- else if (dropIndex == toolItems.Count)
- dropPosition = GetButtonEndPos (item);
- else {
- item = (ActionToolItem) toolItems [dropIndex];
- ActionToolItem prevItem = (ActionToolItem) toolItems [dropIndex - 1];
- dropPosition = GetButtonEndPos (prevItem) + (GetButtonPos (item) - GetButtonEndPos (prevItem))/2;
- }
- }
- } else
- dropIndex = 0;
-
- QueueDraw ();
- return base.OnDragMotion (context, x, y, time);
- }
-
- int GetButtonPos (Gtk.Widget w)
- {
- return (Orientation == Gtk.Orientation.Horizontal) ? w.Allocation.X : w.Allocation.Y;
- }
-
- int GetButtonEndPos (Gtk.Widget w)
- {
- return (Orientation == Gtk.Orientation.Horizontal) ? w.Allocation.Right : w.Allocation.Bottom;
- }
-
- int GetButtonSize (Gtk.Widget w)
- {
- return (Orientation == Gtk.Orientation.Horizontal) ? w.Allocation.Width : w.Allocation.Height;
- }
-
- protected override void OnDragLeave (Gdk.DragContext context, uint time)
- {
- dropPosition = -1;
- QueueDraw ();
- base.OnDragLeave (context, time);
- }
-
- protected override bool OnDragDrop (Gdk.DragContext context, int x, int y, uint time)
- {
- ActionPaletteItem dropped = DND.Drop (context, null, time) as ActionPaletteItem;
- if (dropped == null)
- return false;
-
- if (dropped.Node.Type != Gtk.UIManagerItemType.Menuitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Toolitem &&
- dropped.Node.Type != Gtk.UIManagerItemType.Separator)
- return false;
-
- ActionTreeNode newNode = dropped.Node;
- if (dropped.Node.Type == Gtk.UIManagerItemType.Menuitem) {
- newNode = newNode.Clone ();
- newNode.Type = Gtk.UIManagerItemType.Toolitem;
- }
-
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (this);
- using (wrapper.UndoManager.AtomicChange) {
- if (dropIndex < actionTree.Children.Count) {
- // Do nothing if trying to drop the node over the same node
- ActionTreeNode dropNode = actionTree.Children [dropIndex];
- if (dropNode == newNode)
- return false;
-
- if (newNode.ParentNode != null)
- newNode.ParentNode.Children.Remove (newNode);
-
- // The drop position may have changed after removing the dropped node,
- // so get it again.
- dropIndex = actionTree.Children.IndexOf (dropNode);
- actionTree.Children.Insert (dropIndex, newNode);
- } else {
- if (newNode.ParentNode != null)
- newNode.ParentNode.Children.Remove (newNode);
- actionTree.Children.Add (newNode);
- dropIndex = actionTree.Children.Count - 1;
- }
- }
- // Select the dropped node
- ActionToolItem mi = (ActionToolItem) toolItems [dropIndex];
- mi.Select ();
-
- return base.OnDragDrop (context, x, y, time);
- }
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- bool r = base.OnExposeEvent (ev);
- if (dropPosition != -1) {
- if (this.Orientation == Gtk.Orientation.Horizontal)
- GdkWindow.DrawRectangle (this.Style.BlackGC, true, dropPosition, Allocation.Y, 3, Allocation.Height);
- else
- GdkWindow.DrawRectangle (this.Style.BlackGC, true, Allocation.X, dropPosition, Allocation.Width, 3);
- }
- return r;
- }
-
- void OnItemKeyPress (object s, Gtk.KeyPressEventArgs args)
- {
- int pos = toolItems.IndexOf (s);
- args.RetVal = false;
-
- switch (args.Event.Key) {
- case Gdk.Key.Left:
- args.RetVal = true;
- if (pos > 0)
- ((ActionToolItem)toolItems[pos - 1]).Select ();
- break;
- case Gdk.Key.Right:
- args.RetVal = true;
- if (pos < toolItems.Count - 1)
- ((ActionToolItem)toolItems[pos + 1]).Select ();
- else if (pos == toolItems.Count - 1)
- InsertAction (toolItems.Count);
- break;
- }
- }
-
- void InsertActionAt (ActionToolItem item, bool after, bool separator)
- {
- int pos = toolItems.IndexOf (item);
- if (pos == -1)
- return;
-
- if (after)
- pos++;
-
- if (separator) {
- ActionTreeNode newNode = new ActionTreeNode (Gtk.UIManagerItemType.Separator, null, null);
- actionTree.Children.Insert (pos, newNode);
- } else
- InsertAction (pos);
- }
-
- void Paste (ActionToolItem item)
- {
- }
-
- public void ShowContextMenu (ActionItem aitem)
- {
- ActionToolItem menuItem = aitem as ActionToolItem;
-
- Gtk.Menu m = new Gtk.Menu ();
- Gtk.MenuItem item = new Gtk.MenuItem (Catalog.GetString ("Insert Before"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, false, false);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert After"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, true, false);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert Separator Before"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, false, true);
- };
- item = new Gtk.MenuItem (Catalog.GetString ("Insert Separator After"));
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- InsertActionAt (menuItem, true, true);
- };
-
- m.Add (new Gtk.SeparatorMenuItem ());
-
- item = new Gtk.ImageMenuItem (Gtk.Stock.Cut, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Cut ();
- };
- item = new Gtk.ImageMenuItem (Gtk.Stock.Copy, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Copy ();
- };
- item = new Gtk.ImageMenuItem (Gtk.Stock.Paste, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- Paste (menuItem);
- };
- item = new Gtk.ImageMenuItem (Gtk.Stock.Delete, null);
- m.Add (item);
- item.Activated += delegate (object s, EventArgs a) {
- menuItem.Delete ();
- };
- m.ShowAll ();
- m.Popup ();
- }
-
- public object SaveStatus ()
- {
- for (int n=0; n bounds.Height)
- s = bounds.Height;
- if (s > bounds.Width)
- s = bounds.Width;
- Gtk.Style.PaintCheck (Container.Style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + (bounds.Height - s)/2, s, s);
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new BooleanEditor ();
- }
- }
-
- [PropertyEditor ("Active", "Toggled")]
- public class BooleanEditor : Gtk.CheckButton, IPropertyEditor
- {
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(bool))
- throw new ApplicationException ("Boolean editor does not support editing values of type " + descriptor.PropertyType);
- }
-
- public void AttachObject (object obj)
- {
- }
-
- public object Value {
- get { return Active; }
- set { Active = (bool) value; }
- }
-
- protected override void OnToggled ()
- {
- base.OnToggled ();
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/CellRendererComboBox.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/CellRendererComboBox.cs
deleted file mode 100644
index 186f446729a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/CellRendererComboBox.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// CellRendererComboBox.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
- public class CellRendererComboBox: CellRendererText
- {
- string[] values;
- string path;
- int rowHeight;
-
- public CellRendererComboBox ()
- {
- Mode |= Gtk.CellRendererMode.Editable;
- Entry dummyEntry = new Gtk.Entry ();
- rowHeight = dummyEntry.SizeRequest ().Height;
- }
-
- public string[] Values {
- get { return values; }
- set { values = value; }
- }
-
- public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- if (height < rowHeight)
- height = rowHeight;
- }
-
- public override CellEditable StartEditing (Gdk.Event ev, Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
- {
- this.path = path;
-
- Gtk.ComboBox combo = Gtk.ComboBox.NewText ();
- foreach (string s in values)
- combo.AppendText (s);
-
- combo.Active = Array.IndexOf (values, Text);
- combo.Changed += new EventHandler (SelectionChanged);
- return new TreeViewCellContainer (combo);
- }
-
- void SelectionChanged (object s, EventArgs a)
- {
- Gtk.ComboBox combo = (Gtk.ComboBox) s;
- if (Changed != null)
- Changed (this, new ComboSelectionChangedArgs (path, combo.Active, (combo.Active != -1 ? values [combo.Active] : null)));
- }
-
- // Fired when the selection changes
- public event ComboSelectionChangedHandler Changed;
- }
-
- public delegate void ComboSelectionChangedHandler (object sender, ComboSelectionChangedArgs args);
-
- public class ComboSelectionChangedArgs: EventArgs
- {
- string path;
- int active;
- string activeText;
-
- internal ComboSelectionChangedArgs (string path, int active, string activeText)
- {
- this.path = path;
- this.active = active;
- this.activeText = activeText;
- }
-
- public string Path {
- get { return path; }
- }
-
- public int Active {
- get { return active; }
- }
-
- public string ActiveText {
- get { return activeText; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Char.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Char.cs
deleted file mode 100644
index e27b1b7662e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Char.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class Char : Gtk.Entry, IPropertyEditor {
-
- public Char ()
- {
- MaxLength = 1;
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(char))
- throw new ApplicationException ("Char editor does not support editing values of type " + descriptor.PropertyType);
- }
-
- public void AttachObject (object obj)
- {
- }
-
- char last;
-
- public object Value {
- get {
- if (Text.Length == 0)
- return last;
- else
- return Text[0];
- }
- set {
- Text = value.ToString ();
- last = (char) value;
- }
- }
-
- protected override void OnChanged ()
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Color.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Color.cs
deleted file mode 100644
index e36b8eff729..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Color.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class Color: PropertyEditorCell
- {
- public override void GetSize (int availableWidth, out int width, out int height)
- {
- width = 16;
- height = 16;
- }
-
- public override void Render (Gdk.Drawable window, Gdk.Rectangle bounds, Gtk.StateType state)
- {
- using (Gdk.GC gc = new Gdk.GC (window)) {
- gc.RgbFgColor = (Gdk.Color)Value;
- window.DrawRectangle (gc, true, bounds.X, bounds.Y, bounds.Width - 1, bounds.Height - 1);
- window.DrawRectangle (Container.Style.BlackGC, false, bounds.X, bounds.Y, bounds.Width - 1, bounds.Height - 1);
- }
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new ColorEditor ();
- }
- }
-
- [PropertyEditor ("Color", "ColorSet")]
- public class ColorEditor : Gtk.ColorButton, IPropertyEditor
- {
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(Gdk.Color))
- throw new ApplicationException ("Color editor does not support editing values of type " + descriptor.PropertyType);
- }
-
- public void AttachObject (object obj)
- {
- }
-
- public object Value {
- get { return Color; }
- set { Color = (Gdk.Color) value; }
- }
-
- protected override void OnColorSet ()
- {
- base.OnColorSet ();
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/DateTimeEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/DateTimeEditor.cs
deleted file mode 100644
index f338b8c54e6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/DateTimeEditor.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-
-using System;
-using Gtk;
-using Gdk;
-using System.Text;
-
-namespace Stetic.Editor
-{
- public class DateTimeEditorCell: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- return ((DateTime)Value).ToLongDateString ();
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new DateTimeEditor ();
- }
- }
-
- public class DateTimeEditor: Gtk.HBox, IPropertyEditor
- {
- Gtk.Entry entry;
- DateTime time;
-
- public DateTimeEditor()
- {
- entry = new Gtk.Entry ();
- entry.Changed += OnChanged;
- PackStart (entry, true, true, 0);
- ShowAll ();
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public object Value {
- get { return time; }
- set {
- time = (DateTime) value;
- entry.Changed -= OnChanged;
- entry.Text = time.ToString ("G");
- entry.Changed += OnChanged;
- }
- }
-
- void OnChanged (object o, EventArgs a)
- {
- string s = entry.Text;
-
- foreach (string form in formats) {
- try {
- time = DateTime.ParseExact (s, form, null);
- if (ValueChanged != null)
- ValueChanged (this, a);
- break;
- } catch {
- }
- }
- }
-
- public event EventHandler ValueChanged;
-
- static string[] formats = {"u", "G", "g", "d", "T", "t"};
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconDialog.cs
deleted file mode 100644
index 8910359bf68..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconDialog.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-
-using System;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class EditIconDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.Entry nameEntry;
- [Glade.Widget] Gtk.TreeView sourceList;
- [Glade.Widget] Gtk.RadioButton radioSingle;
- [Glade.Widget] Gtk.RadioButton radioMultiple;
- [Glade.Widget] Gtk.Label imageLabel;
- [Glade.Widget] Gtk.Image imageImage;
- [Glade.Widget] Gtk.Button okButton;
- [Glade.Widget] Gtk.HBox hboxSingle;
- [Glade.Widget] Gtk.HBox hboxMultiple;
- [Glade.Widget ("EditIconDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- Gtk.ListStore sourceListStore;
-
- ProjectIconSet iconSet;
- IProject project;
-
- ImageInfo singleIcon;
-
- string[] sizes = { Catalog.GetString ("All Sizes"), "Menu", "SmallToolbar", "LargeToolbar", "Button", "Dnd", "Dialog" };
- string[] states = { Catalog.GetString ("All States"), "Normal", "Active", "Prelight", "Selected", "Insensitive" };
- string[] directions = { Catalog.GetString ("All Directions"), "Ltr", "Rtl" };
-
- public EditIconDialog (IProject project, ProjectIconSet iconSet)
- {
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "EditIconDialog", null);
- xml.Autoconnect (this);
- dialog.Response += OnResponse;
-
- this.project = project;
- this.iconSet = iconSet;
-
- nameEntry.Text = iconSet.Name;
-
- if (iconSet.Sources.Count == 0) {
- radioSingle.Active = true;
- imageLabel.Text = "";
- }
- else if (iconSet.Sources.Count == 1 && iconSet.Sources[0].AllWildcarded) {
- radioSingle.Active = true;
- singleIcon = iconSet.Sources[0].Image;
- if (singleIcon != null) {
- imageLabel.Text = singleIcon.Label;
- imageImage.Pixbuf = singleIcon.GetThumbnail (project, 16);
- } else
- imageLabel.Text = "";
- } else {
- radioMultiple.Active = true;
- }
-
- hboxSingle.Sensitive = radioSingle.Active;
- hboxMultiple.Sensitive = !radioSingle.Active;
-
- // Build the tree
-
- sourceListStore = new Gtk.ListStore (typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string), typeof(string), typeof(object));
- sourceList.Model = sourceListStore;
-
- Gtk.TreeViewColumn col = new Gtk.TreeViewColumn ();
-
- Gtk.CellRendererPixbuf pr = new Gtk.CellRendererPixbuf ();
- col.Title = Catalog.GetString ("Image");
- col.PackStart (pr, false);
- col.AddAttribute (pr, "pixbuf", 0);
-
- Gtk.CellRendererText crt = new Gtk.CellRendererText ();
- col.PackStart (crt, true);
- col.AddAttribute (crt, "text", 1);
- sourceList.AppendColumn (col);
-
- col = new Gtk.TreeViewColumn ();
- col.Expand = true;
- col.Title = Catalog.GetString ("Size");
- CellRendererComboBox crtb = new CellRendererComboBox ();
- crtb.Changed += new ComboSelectionChangedHandler (OnSizeComboChanged);
- crtb.Values = sizes;
- col.PackStart (crtb, true);
- col.AddAttribute (crtb, "text", 2);
- sourceList.AppendColumn (col);
-
- col = new Gtk.TreeViewColumn ();
- col.Expand = true;
- col.Title = Catalog.GetString ("State");
- crtb = new CellRendererComboBox ();
- crtb.Changed += new ComboSelectionChangedHandler (OnStateComboChanged);
- crtb.Values = states;
- col.PackStart (crtb, true);
- col.AddAttribute (crtb, "text", 3);
- sourceList.AppendColumn (col);
-
- col = new Gtk.TreeViewColumn ();
- col.Expand = true;
- col.Title = Catalog.GetString ("Direction");
- crtb = new CellRendererComboBox ();
- crtb.Changed += new ComboSelectionChangedHandler (OnDirComboChanged);
- crtb.Values = directions;
- col.PackStart (crtb, true);
- col.AddAttribute (crtb, "text", 4);
- sourceList.AppendColumn (col);
-
- foreach (ProjectIconSource source in iconSet.Sources)
- AddSource (source);
-
- UpdateButtons ();
- }
-
- public Gtk.Window TransientFor {
- set { dialog.TransientFor = value; }
- }
-
- public int Run ()
- {
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
-
- void AddSource (ProjectIconSource source)
- {
- string size = source.SizeWildcarded ? sizes[0] : source.Size.ToString ();
- string state = source.StateWildcarded ? states[0] : source.State.ToString ();
- string dir = source.DirectionWildcarded ? directions[0] : source.Direction.ToString ();
- sourceListStore.AppendValues (source.Image.GetThumbnail (project, 16), source.Image.Label, size, state, dir, source.Image);
- }
-
- ProjectIconSource GetSource (Gtk.TreeIter iter)
- {
- ProjectIconSource src = new ProjectIconSource ();
- src.Image = (ImageInfo) sourceListStore.GetValue (iter, 5);
- string s = (string) sourceListStore.GetValue (iter, 2);
- if (s == sizes[0])
- src.SizeWildcarded = true;
- else {
- src.SizeWildcarded = false;
- src.Size = (Gtk.IconSize) Enum.Parse (typeof(Gtk.IconSize), s);
- }
-
- s = (string) sourceListStore.GetValue (iter, 3);
- if (s == states[0])
- src.StateWildcarded = true;
- else {
- src.StateWildcarded = false;
- src.State = (Gtk.StateType) Enum.Parse (typeof(Gtk.StateType), s);
- }
-
- s = (string) sourceListStore.GetValue (iter, 4);
- if (s == directions[0])
- src.DirectionWildcarded = true;
- else {
- src.DirectionWildcarded = false;
- src.Direction = (Gtk.TextDirection) Enum.Parse (typeof(Gtk.TextDirection), s);
- }
-
- return src;
- }
-
- void Save ()
- {
- iconSet.Name = nameEntry.Text;
- iconSet.Sources.Clear ();
-
- if (radioSingle.Active) {
- ProjectIconSource src = new ProjectIconSource ();
- src.AllWildcarded = true;
- src.Image = singleIcon;
- iconSet.Sources.Add (src);
- } else {
- Gtk.TreeIter iter;
- if (sourceListStore.GetIterFirst (out iter)) {
- do {
- iconSet.Sources.Add (GetSource (iter));
- }
- while (sourceListStore.IterNext (ref iter));
- }
- }
- }
-
- void OnResponse (object o, Gtk.ResponseArgs args)
- {
- if (args.ResponseId == Gtk.ResponseType.Ok)
- Save ();
- }
-
- protected void OnSelectImage (object s, EventArgs args)
- {
- using (SelectImageDialog dlg = new SelectImageDialog (dialog, project)) {
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- singleIcon = dlg.Icon;
- imageLabel.Text = singleIcon.Label;
- imageImage.Pixbuf = singleIcon.GetThumbnail (project, 16);
- UpdateButtons ();
- }
- }
- }
-
- protected void OnAddSource (object s, EventArgs args)
- {
- using (SelectImageDialog dlg = new SelectImageDialog (dialog, project)) {
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- ProjectIconSource src = new ProjectIconSource ();
- src.Image = dlg.Icon;
- src.AllWildcarded = true;
- AddSource (src);
- UpdateButtons ();
- }
- }
- }
-
- protected void OnRemoveSource (object s, EventArgs args)
- {
- Gtk.TreeIter iter;
- Gtk.TreeModel model;
- if (sourceList.Selection.GetSelected (out model, out iter)) {
- sourceListStore.Remove (ref iter);
- UpdateButtons ();
- }
- }
-
- protected void OnSingleClicked (object s, EventArgs args)
- {
- hboxSingle.Sensitive = true;
- hboxMultiple.Sensitive = false;
- UpdateButtons ();
- }
-
- protected void OnMultipleClicked (object s, EventArgs args)
- {
- hboxSingle.Sensitive = false;
- hboxMultiple.Sensitive = true;
- UpdateButtons ();
- }
-
- protected void OnNameChanged (object s, EventArgs args)
- {
- UpdateButtons ();
- }
-
- void OnSizeComboChanged (object s, ComboSelectionChangedArgs args)
- {
- UpdateComboValue (args.Path, 2, args.ActiveText);
- }
-
- void OnStateComboChanged (object s, ComboSelectionChangedArgs args)
- {
- UpdateComboValue (args.Path, 3, args.ActiveText);
- }
-
- void OnDirComboChanged (object s, ComboSelectionChangedArgs args)
- {
- UpdateComboValue (args.Path, 4, args.ActiveText);
- }
-
- void UpdateComboValue (string path, int col, string activeText)
- {
- Gtk.TreeIter iter;
- if (sourceListStore.GetIter (out iter, new Gtk.TreePath (path))) {
- sourceListStore.SetValue (iter, col, activeText);
- }
- }
-
- void UpdateButtons ()
- {
- if (nameEntry.Text.Length == 0) {
- okButton.Sensitive = false;
- } else if (radioSingle.Active) {
- okButton.Sensitive = singleIcon != null;
- } else {
- Gtk.TreeIter iter;
- okButton.Sensitive = sourceListStore != null && sourceListStore.GetIterFirst (out iter);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconFactoryDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconFactoryDialog.cs
deleted file mode 100644
index bc803b84aa6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/EditIconFactoryDialog.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-
-using System;
-using System.Collections;
-using System.IO;
-using Gtk;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class EditIconFactoryDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.ScrolledWindow iconListScrolledwindow;
- [Glade.Widget ("EditIconFactoryDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- ProjectIconList customIconList;
-
- Gtk.Window parent;
- Stetic.IProject project;
- ProjectIconFactory iconFactory;
-
- public EditIconFactoryDialog (Gtk.Window parent, Stetic.IProject project, ProjectIconFactory iconFactory)
- {
- this.iconFactory = iconFactory;
- this.parent = parent;
- this.project = project;
-
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "EditIconFactoryDialog", null);
- xml.Autoconnect (this);
-
- customIconList = new ProjectIconList (project, iconFactory);
- iconListScrolledwindow.AddWithViewport (customIconList);
- }
-
- public int Run ()
- {
- dialog.ShowAll ();
- dialog.TransientFor = parent;
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
-
- protected void OnAddIcon (object ob, EventArgs args)
- {
- ProjectIconSet icon = new ProjectIconSet ();
- using (EditIconDialog dlg = new EditIconDialog (project, icon)) {
- if (parent != null)
- dlg.TransientFor = parent.Toplevel as Gtk.Window;
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- iconFactory.Icons.Add (icon);
- customIconList.Refresh ();
- customIconList.Selection = icon.Name;
- project.Modified = true;
- }
- }
- }
-
- protected void OnRemoveIcon (object ob, EventArgs args)
- {
- string name = customIconList.Selection;
- ProjectIconSet icon = iconFactory.GetIcon (name);
- if (icon != null) {
- Gtk.MessageDialog md = new Gtk.MessageDialog (dialog, Gtk.DialogFlags.Modal, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, string.Format (Catalog.GetString ("Are you sure you want to delete the icon '{0}'"), icon.Name));
- if (parent != null)
- md.TransientFor = parent.Toplevel as Gtk.Window;
- if (md.Run () == (int) Gtk.ResponseType.Yes) {
- iconFactory.Icons.Remove (icon);
- customIconList.Refresh ();
- project.Modified = true;
- }
- md.Destroy ();
- }
- }
-
- protected void OnEditIcon (object ob, EventArgs args)
- {
- string name = customIconList.Selection;
- ProjectIconSet icon = iconFactory.GetIcon (name);
- if (icon != null) {
- using (EditIconDialog dlg = new EditIconDialog (project, icon)) {
- if (parent != null)
- dlg.TransientFor = parent.Toplevel as Gtk.Window;
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- customIconList.Refresh ();
- customIconList.Selection = icon.Name;
- project.Modified = true;
- }
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Enumeration.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Enumeration.cs
deleted file mode 100644
index fd2237d02a3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Enumeration.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic.Editor {
-
- public class Enumeration: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- if (Value == null)
- return "";
-
- EnumDescriptor enm = Registry.LookupEnum (Property.PropertyType.FullName);
- EnumValue ev = enm [(Enum)Value];
- if (ev != null)
- return ev.Label;
- else
- return "";
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new EnumerationEditor ();
- }
- }
-
- public class EnumerationEditor : Gtk.HBox, IPropertyEditor {
-
- Gtk.EventBox ebox;
- Gtk.ComboBoxEntry combo;
- EnumDescriptor enm;
-
- public EnumerationEditor () : base (false, 0)
- {
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (!prop.PropertyType.IsEnum)
- throw new ApplicationException ("Enumeration editor does not support editing values of type " + prop.PropertyType);
-
- ebox = new Gtk.EventBox ();
- ebox.Show ();
- PackStart (ebox, true, true, 0);
-
- combo = Gtk.ComboBoxEntry.NewText ();
- combo.Changed += combo_Changed;
- combo.Entry.IsEditable = false;
- combo.Entry.HasFrame = false;
- combo.Entry.HeightRequest = combo.SizeRequest ().Height; // The combo does not set the entry to the correct size when it does not have a frame
- combo.Show ();
- ebox.Add (combo);
-
- enm = Registry.LookupEnum (prop.PropertyType.FullName);
- foreach (Enum value in enm.Values)
- combo.AppendText (enm[value].Label);
- }
-
- public void AttachObject (object obj)
- {
- }
-
- public object Value {
- get {
- return enm.Values[combo.Active];
- }
- set {
- int i = Array.IndexOf (enm.Values, (Enum)value);
- if (i != -1)
- combo.Active = i;
- }
- }
-
- public event EventHandler ValueChanged;
-
- void combo_Changed (object o, EventArgs args)
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- EnumValue value = enm[(Enum)Value];
- if (value != null)
- ebox.TooltipText = value.Description;
- else
- ebox.TooltipText = string.Empty;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Flags.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Flags.cs
deleted file mode 100644
index 031d7a1319e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Flags.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using Gtk;
-using System;
-using System.Collections;
-
-namespace Stetic.Editor {
-
- public class Flags: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- if (Value == null)
- return "";
-
- uint value = (uint)(int)Value;
- EnumDescriptor enm = Registry.LookupEnum (Property.PropertyType.FullName);
- string txt = "";
- foreach (Enum val in enm.Values) {
- EnumValue eval = enm[val];
- if (eval.Label == "")
- continue;
-
- if ((value & (uint) Convert.ToInt32 (eval.Value)) != 0) {
- if (txt.Length > 0) txt += ", ";
- txt += eval.Label;
- }
- }
- return txt;
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new FlagsEditor ();
- }
- }
-
- public class FlagsEditor : Gtk.HBox, IPropertyEditor {
-
- EnumDescriptor enm;
- Hashtable flags;
- Gtk.Entry flagsLabel;
- string property;
-
- public FlagsEditor ()
- {
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (!prop.PropertyType.IsEnum)
- throw new ApplicationException ("Flags editor does not support editing values of type " + prop.PropertyType);
-
- property = prop.Label;
- Spacing = 3;
-
- // For small enums, the editor is a list of checkboxes inside a frame
- // For large enums (>5), use a selector dialog.
-
- enm = Registry.LookupEnum (prop.PropertyType.FullName);
-
- if (enm.Values.Length < 6)
- {
- Gtk.VBox vbox = new Gtk.VBox (true, 3);
-
- flags = new Hashtable ();
-
- foreach (Enum value in enm.Values) {
- EnumValue eval = enm[value];
- if (eval.Label == "")
- continue;
-
- Gtk.CheckButton check = new Gtk.CheckButton (eval.Label);
- check.TooltipText = eval.Description;
- uint uintVal = (uint) Convert.ToInt32 (eval.Value);
- flags[check] = uintVal;
- flags[uintVal] = check;
-
- check.Toggled += FlagToggled;
- vbox.PackStart (check, false, false, 0);
- }
-
- Gtk.Frame frame = new Gtk.Frame ();
- frame.Add (vbox);
- frame.ShowAll ();
- PackStart (frame, true, true, 0);
- }
- else
- {
- flagsLabel = new Gtk.Entry ();
- flagsLabel.IsEditable = false;
- flagsLabel.HasFrame = false;
- flagsLabel.ShowAll ();
- PackStart (flagsLabel, true, true, 0);
-
- Gtk.Button but = new Gtk.Button ("...");
- but.Clicked += OnSelectFlags;
- but.ShowAll ();
- PackStart (but, false, false, 0);
- }
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public object Value {
- get {
- return Enum.ToObject (enm.EnumType, UIntValue);
- }
- set {
- uint newVal = (uint)(int)value;
- if (flagsLabel != null) {
- string txt = "";
- foreach (Enum val in enm.Values) {
- EnumValue eval = enm[val];
- if (eval.Label == "")
- continue;
-
- if ((newVal & (uint) Convert.ToInt32 (eval.Value)) != 0) {
- if (txt.Length > 0) txt += ", ";
- txt += eval.Label;
- }
- }
- flagsLabel.Text = txt;
- UIntValue = newVal;
- }
- else {
- for (uint i = 1; i <= uintValue || i <= newVal; i = i << 1) {
- if ((uintValue & i) != (newVal & i)) {
- Gtk.CheckButton check = (Gtk.CheckButton)flags[i];
- if (check != null)
- check.Active = !check.Active;
- }
- }
- }
- }
- }
-
- public event EventHandler ValueChanged;
-
- uint uintValue;
- uint UIntValue {
- get {
- return uintValue;
- }
- set {
- if (uintValue != value) {
- uintValue = value;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
- }
-
- void FlagToggled (object o, EventArgs args)
- {
- Gtk.CheckButton check = (Gtk.CheckButton)o;
- uint val = (uint)flags[o];
-
- if (check.Active)
- UIntValue |= val;
- else
- UIntValue &= ~val;
- }
-
- void OnSelectFlags (object o, EventArgs args)
- {
- using (FlagsSelectorDialog dialog = new FlagsSelectorDialog (null, enm, UIntValue, property)) {
- if (dialog.Run () == (int) ResponseType.Ok) {
- Value = Enum.ToObject (enm.EnumType, dialog.Value);
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FlagsSelectorDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FlagsSelectorDialog.cs
deleted file mode 100644
index b3b6a8d5cd7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FlagsSelectorDialog.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-
-using System;
-
-namespace Stetic.Editor
-{
- public class FlagsSelectorDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.TreeView treeView;
- [Glade.Widget ("FlagsSelectorDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- Gtk.ListStore store;
- Gtk.Window parent;
- uint flags;
-
- public FlagsSelectorDialog (Gtk.Window parent, EnumDescriptor enumDesc, uint flags, string title)
- {
- this.flags = flags;
- this.parent = parent;
-
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "FlagsSelectorDialog", null);
- xml.Autoconnect (this);
-
- store = new Gtk.ListStore (typeof(bool), typeof(string), typeof(uint));
- treeView.Model = store;
-
- Gtk.TreeViewColumn col = new Gtk.TreeViewColumn ();
-
- Gtk.CellRendererToggle tog = new Gtk.CellRendererToggle ();
- tog.Toggled += new Gtk.ToggledHandler (OnToggled);
- col.PackStart (tog, false);
- col.AddAttribute (tog, "active", 0);
-
- Gtk.CellRendererText crt = new Gtk.CellRendererText ();
- col.PackStart (crt, true);
- col.AddAttribute (crt, "text", 1);
-
- treeView.AppendColumn (col);
-
- foreach (Enum value in enumDesc.Values) {
- EnumValue eval = enumDesc[value];
- if (eval.Label == "")
- continue;
- uint val = (uint) Convert.ToInt32 (eval.Value);
- store.AppendValues (((flags & val) != 0), eval.Label, val);
- }
- }
-
- public int Run ()
- {
- dialog.ShowAll ();
- dialog.TransientFor = parent;
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
-
- void OnToggled (object s, Gtk.ToggledArgs args)
- {
- Gtk.TreeIter iter;
- if (!store.GetIterFromString (out iter, args.Path))
- return;
-
- bool oldValue = (bool) store.GetValue (iter, 0);
- uint flag = (uint) store.GetValue (iter, 2);
- store.SetValue (iter, 0, !oldValue);
-
- if (oldValue)
- flags &= ~flag;
- else
- flags |= flag;
- }
-
- public uint Value {
- get { return flags; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FloatRange.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FloatRange.cs
deleted file mode 100644
index 2b8894dbf34..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/FloatRange.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class FloatRange : Gtk.SpinButton, IPropertyEditor
- {
- Type propType;
-
- public FloatRange (): base (0, 0, 0.01)
- {
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- propType = prop.PropertyType;
-
- double min, max;
-
- if (propType == typeof(double)) {
- min = Double.MinValue;
- max = Double.MaxValue;
- } else if (propType == typeof(float)) {
- min = float.MinValue;
- max = float.MaxValue;
- } else
- throw new ApplicationException ("FloatRange editor does not support editing values of type " + propType);
-
- if (prop.Minimum != null)
- min = (double) Convert.ChangeType (prop.Minimum, typeof(double));
- if (prop.Maximum != null)
- max = (double) Convert.ChangeType (prop.Maximum, typeof(double));
-
- SetRange (min, max);
-
- Digits = 2;
- }
-
- public void AttachObject (object ob)
- {
- }
-
- object IPropertyEditor.Value {
- get { return Convert.ChangeType (base.Value, propType); }
- set { base.Value = (double) Convert.ChangeType (value, typeof(double)); }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GroupPicker.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GroupPicker.cs
deleted file mode 100644
index fd9d4b24cc1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GroupPicker.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using Gtk;
-using Gdk;
-using GLib;
-using System;
-using System.Collections;
-using System.Reflection;
-using Mono.Unix;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("Group", "Changed")]
- class GroupPicker : Gtk.HBox, IPropertyEditor {
-
- Gtk.ComboBox combo;
- IRadioGroupManager manager;
- ArrayList values;
- string group;
-
- const BindingFlags flags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
-
- public GroupPicker () : base (false, 0)
- {
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- }
-
- public void AttachObject (object ob)
- {
- ob = ObjectWrapper.Lookup (ob);
-
- IRadioGroupManagerProvider provider = ob as IRadioGroupManagerProvider;
-
- if (provider == null)
- throw new ArgumentException ("The class " + ob.GetType() + " does not implement IRadioGroupManagerProvider");
-
- manager = provider.GetGroupManager ();
- manager.GroupsChanged += GroupsChanged;
- GroupsChanged ();
- }
-
- public override void Dispose ()
- {
- manager.GroupsChanged -= GroupsChanged;
- base.Dispose ();
- }
-
- void GroupsChanged ()
- {
- if (combo != null) {
- combo.Changed -= combo_Changed;
- Remove (combo);
- }
-
- combo = Gtk.ComboBox.NewText ();
- combo.Changed += combo_Changed;
-#if GTK_SHARP_2_6
- combo.RowSeparatorFunc = RowSeparatorFunc;
-#endif
- combo.Show ();
- PackStart (combo, true, true, 0);
-
- values = new ArrayList ();
- int i = 0;
- foreach (string name in manager.GroupNames) {
- values.Add (name);
- combo.AppendText (name);
- if (name == group)
- combo.Active = i;
- i++;
- }
-
-#if GTK_SHARP_2_6
- combo.AppendText ("");
-#endif
-
- combo.AppendText (Catalog.GetString ("Rename Group..."));
- combo.AppendText (Catalog.GetString ("New Group..."));
- }
-
-#if GTK_SHARP_2_6
- bool RowSeparatorFunc (Gtk.TreeModel model, Gtk.TreeIter iter)
- {
- GLib.Value val = new GLib.Value ();
- model.GetValue (iter, 0, ref val);
- bool sep = ((string)val) == "";
- val.Dispose ();
- return sep;
- }
-#endif
-
- public object Value {
- get {
- return group;
- }
- set {
- int index = values.IndexOf ((string) value);
- if (index != -1) {
- combo.Active = index;
- group = values[index] as string;
- }
- }
- }
-
- public event EventHandler ValueChanged;
-
- void combo_Changed (object o, EventArgs args)
- {
- if (combo.Active >= values.Count) {
- doDialog ();
- return;
- }
-
- group = values[combo.Active] as string;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- void doDialog ()
- {
-#if GTK_SHARP_2_6
- bool rename = combo.Active == values.Count + 1;
-#else
- bool rename = combo.Active == values.Count;
-#endif
- Gtk.Dialog dialog = new Gtk.Dialog (
- rename ? Catalog.GetString ("Rename Group") : Catalog.GetString ("New Group"),
- combo.Toplevel as Gtk.Window,
- Gtk.DialogFlags.Modal | Gtk.DialogFlags.NoSeparator,
- Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
- Gtk.Stock.Ok, Gtk.ResponseType.Ok);
- dialog.DefaultResponse = Gtk.ResponseType.Ok;
- dialog.HasSeparator = false;
- dialog.BorderWidth = 12;
- dialog.VBox.Spacing = 18;
- dialog.VBox.BorderWidth = 0;
-
- Gtk.HBox hbox = new Gtk.HBox (false, 12);
- Gtk.Label label = new Gtk.Label (rename ? Catalog.GetString ("_New name:") : Catalog.GetString ("_Name:"));
- Gtk.Entry entry = new Gtk.Entry ();
- label.MnemonicWidget = entry;
- hbox.PackStart (label, false, false, 0);
- entry.ActivatesDefault = true;
- if (rename)
- entry.Text = group;
- hbox.PackStart (entry, true, true, 0);
- dialog.VBox.PackStart (hbox, false, false, 0);
-
- dialog.ShowAll ();
- // Have to set this *after* ShowAll
- dialog.ActionArea.BorderWidth = 0;
- dialog.TransientFor = this.Toplevel as Gtk.Window;
- Gtk.ResponseType response = (Gtk.ResponseType)dialog.Run ();
- if (response == Gtk.ResponseType.Cancel || entry.Text.Length == 0) {
- dialog.Destroy ();
- Value = group; // reset combo.Active
- return;
- }
-
- string oldname = group;
- group = entry.Text;
- dialog.Destroy ();
-
- // FIXME: check that the new name doesn't already exist
-
- // This will trigger a GroupsChanged, which will eventually
- // update combo.Active
- if (rename)
- manager.Rename (oldname, group);
- else
- manager.Add (group);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GtkWorkarounds.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GtkWorkarounds.cs
deleted file mode 100644
index ec408a7f3c8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/GtkWorkarounds.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-//
-// GtkWorkarounds.cs
-//
-// Author:
-// Michael Hutchinson
-//
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace Stetic.Editor
-{
- //from Mono.TextEditor/GtkWorkarounds.cs
- public static class GtkWorkarounds
- {
- public static bool TriggersContextMenu (Gdk.EventButton evt)
- {
- return evt.Type == Gdk.EventType.ButtonPress && IsContextMenuButton (evt);
- }
-
- public static bool IsContextMenuButton (Gdk.EventButton evt)
- {
- if (evt.Button == 3 &&
- (evt.State & (Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button2Mask)) == 0)
- return true;
-
- if (Platform.IsMac) {
- if (evt.Button == 1 &&
- (evt.State & Gdk.ModifierType.ControlMask) != 0 &&
- (evt.State & (Gdk.ModifierType.Button2Mask | Gdk.ModifierType.Button3Mask)) == 0)
- return true;
- }
-
- return false;
- }
-
-
- [DllImport ("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
- static extern void gtksharp_container_leak_fixed_marker ();
-
- static HashSet fixedContainerTypes;
- static Dictionary forallCallbacks;
- static bool containerLeakFixed;
-
- // Works around BXC #3801 - Managed Container subclasses are incorrectly resurrected, then leak.
- // It does this by registering an alternative callback for gtksharp_container_override_forall, which
- // ignores callbacks if the wrapper no longer exists. This means that the objects no longer enter a
- // finalized->release->dispose->re-wrap resurrection cycle.
- // We use a dynamic method to access internal/private GTK# API in a performant way without having to track
- // per-instance delegates.
- public static void FixContainerLeak (Gtk.Container c)
- {
- if (containerLeakFixed) {
- return;
- }
- FixContainerLeak (c.GetType ());
- }
-
- static void FixContainerLeak (Type t)
- {
- if (containerLeakFixed) {
- return;
- }
-
- if (fixedContainerTypes == null) {
- try {
- gtksharp_container_leak_fixed_marker ();
- containerLeakFixed = true;
- return;
- } catch (EntryPointNotFoundException) {
- }
- fixedContainerTypes = new HashSet();
- forallCallbacks = new Dictionary ();
- }
-
- if (!fixedContainerTypes.Add (t)) {
- return;
- }
-
- //need to fix the callback for the type and all the managed supertypes
- var lookupGType = typeof (GLib.Object).GetMethod ("LookupGType", BindingFlags.Static | BindingFlags.NonPublic);
- do {
- var gt = (GLib.GType) lookupGType.Invoke (null, new[] { t });
- var cb = CreateForallCallback (gt.Val);
- forallCallbacks[gt.Val] = cb;
- gtksharp_container_override_forall (gt.Val, cb);
- t = t.BaseType;
- } while (fixedContainerTypes.Add (t) && t.Assembly != typeof (Gtk.Container).Assembly);
- }
-
- static ForallDelegate CreateForallCallback (IntPtr gtype)
- {
- var dm = new DynamicMethod (
- "ContainerForallCallback",
- typeof(void),
- new Type[] { typeof(IntPtr), typeof(bool), typeof(IntPtr), typeof(IntPtr) },
- typeof(GtkWorkarounds).Module,
- true);
-
- var invokerType = typeof(Gtk.Container.CallbackInvoker);
-
- //this was based on compiling a similar method and disassembling it
- ILGenerator il = dm.GetILGenerator ();
- var IL_002b = il.DefineLabel ();
- var IL_003f = il.DefineLabel ();
- var IL_0060 = il.DefineLabel ();
- var label_return = il.DefineLabel ();
-
- var loc_container = il.DeclareLocal (typeof(Gtk.Container));
- var loc_obj = il.DeclareLocal (typeof(object));
- var loc_invoker = il.DeclareLocal (invokerType);
- var loc_ex = il.DeclareLocal (typeof(Exception));
-
- //check that the type is an exact match
- // prevent stack overflow, because the callback on a more derived type will handle everything
- il.Emit (OpCodes.Ldarg_0);
- il.Emit (OpCodes.Call, typeof(GLib.ObjectManager).GetMethod ("gtksharp_get_type_id", BindingFlags.Static | BindingFlags.NonPublic));
-
- il.Emit (OpCodes.Ldc_I8, gtype.ToInt64 ());
- il.Emit (OpCodes.Newobj, typeof (IntPtr).GetConstructor (new Type[] { typeof (Int64) }));
- il.Emit (OpCodes.Call, typeof (IntPtr).GetMethod ("op_Equality", BindingFlags.Static | BindingFlags.Public));
- il.Emit (OpCodes.Brfalse, label_return);
-
- il.BeginExceptionBlock ();
- il.Emit (OpCodes.Ldnull);
- il.Emit (OpCodes.Stloc, loc_container);
- il.Emit (OpCodes.Ldsfld, typeof (GLib.Object).GetField ("Objects", BindingFlags.Static | BindingFlags.NonPublic));
- il.Emit (OpCodes.Ldarg_0);
- il.Emit (OpCodes.Box, typeof (IntPtr));
- il.Emit (OpCodes.Callvirt, typeof (System.Collections.Hashtable).GetProperty ("Item").GetGetMethod ());
- il.Emit (OpCodes.Stloc, loc_obj);
- il.Emit (OpCodes.Ldloc, loc_obj);
- il.Emit (OpCodes.Brfalse, IL_002b);
-
- var tref = typeof (GLib.Object).Assembly.GetType ("GLib.ToggleRef");
- il.Emit (OpCodes.Ldloc, loc_obj);
- il.Emit (OpCodes.Castclass, tref);
- il.Emit (OpCodes.Callvirt, tref.GetProperty ("Target").GetGetMethod ());
- il.Emit (OpCodes.Isinst, typeof (Gtk.Container));
- il.Emit (OpCodes.Stloc, loc_container);
-
- il.MarkLabel (IL_002b);
- il.Emit (OpCodes.Ldloc, loc_container);
- il.Emit (OpCodes.Brtrue, IL_003f);
-
- il.Emit (OpCodes.Ldarg_0);
- il.Emit (OpCodes.Ldarg_1);
- il.Emit (OpCodes.Ldarg_2);
- il.Emit (OpCodes.Ldarg_3);
- il.Emit (OpCodes.Call, typeof (Gtk.Container).GetMethod ("gtksharp_container_base_forall", BindingFlags.Static | BindingFlags.NonPublic));
- il.Emit (OpCodes.Br, IL_0060);
-
- il.MarkLabel (IL_003f);
- il.Emit (OpCodes.Ldloca_S, 2);
- il.Emit (OpCodes.Ldarg_2);
- il.Emit (OpCodes.Ldarg_3);
- il.Emit (OpCodes.Call, invokerType.GetConstructor (
- BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof (IntPtr), typeof (IntPtr) }, null));
- il.Emit (OpCodes.Ldloc, loc_container);
- il.Emit (OpCodes.Ldarg_1);
- il.Emit (OpCodes.Ldloc, loc_invoker);
- il.Emit (OpCodes.Box, invokerType);
- il.Emit (OpCodes.Ldftn, invokerType.GetMethod ("Invoke"));
- il.Emit (OpCodes.Newobj, typeof (Gtk.Callback).GetConstructor (
- BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof (object), typeof (IntPtr) }, null));
- var forallMeth = typeof (Gtk.Container).GetMethod ("ForAll",
- BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof (bool), typeof (Gtk.Callback) }, null);
- il.Emit (OpCodes.Callvirt, forallMeth);
-
- il.MarkLabel (IL_0060);
-
- il.BeginCatchBlock (typeof (Exception));
- il.Emit (OpCodes.Stloc, loc_ex);
- il.Emit (OpCodes.Ldloc, loc_ex);
- il.Emit (OpCodes.Ldc_I4_0);
- il.Emit (OpCodes.Call, typeof (GLib.ExceptionManager).GetMethod ("RaiseUnhandledException"));
- il.Emit (OpCodes.Leave, label_return);
- il.EndExceptionBlock ();
-
- il.MarkLabel (label_return);
- il.Emit (OpCodes.Ret);
-
- return (ForallDelegate) dm.CreateDelegate (typeof (ForallDelegate));
- }
-
- [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
- delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
-
- [DllImport("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
- static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
- }
-
- //from Mono.TextEditor/Platform.cs
- public static class Platform
- {
- static Platform ()
- {
- IsWindows = System.IO.Path.DirectorySeparatorChar == '\\';
- IsMac = !IsWindows && IsRunningOnMac();
- IsX11 = !IsMac && System.Environment.OSVersion.Platform == PlatformID.Unix;
- }
-
- static Gdk.Keymap keymap = Gdk.Keymap.Default;
-
- public static bool IsMac { get; private set; }
- public static bool IsX11 { get; private set; }
- public static bool IsWindows { get; private set; }
-
- //From Managed.Windows.Forms/XplatUI
- static bool IsRunningOnMac ()
- {
- IntPtr buf = IntPtr.Zero;
- try {
- buf = Marshal.AllocHGlobal (8192);
- // This is a hacktastic way of getting sysname from uname ()
- if (uname (buf) == 0) {
- string os = Marshal.PtrToStringAnsi (buf);
- if (os == "Darwin")
- return true;
- }
- } catch {
- } finally {
- if (buf != IntPtr.Zero)
- Marshal.FreeHGlobal (buf);
- }
-
- return false;
- }
-
- [DllImport ("libc")]
- static extern int uname (IntPtr buf);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconList.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconList.cs
deleted file mode 100644
index 0803726b234..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconList.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-
-namespace Stetic.Editor
-{
- // This is the internal class the represents the actual two-column
- // icon list. This can't just be handled as an HBox inside the main
- // window, because we need to override SetScrollAdjustments.
- class IconList : Gtk.HBox
- {
- ThemedIconColumn left, right;
- ArrayList IconNames = new ArrayList ();
-
- public event EventHandler Activated;
-
- protected IconList ()
- {
- left = new ThemedIconColumn ();
- PackStart (left);
- right = new ThemedIconColumn ();
- PackStart (right);
-
- left.Selection.Changed += LeftSelectionChanged;
- right.Selection.Changed += RightSelectionChanged;
- left.RowActivated += RowActivated;
- right.RowActivated += RowActivated;
- left.KeyPressEvent += ColumnKeyPressEvent;
- right.KeyPressEvent += ColumnKeyPressEvent;
- }
-
- protected void AddIcon (string name, Gdk.Pixbuf pixbuf, string label)
- {
- int i = IconNames.Count;
- IconNames.Add (name);
-
- if (i % 2 == 0)
- left.Append (pixbuf, name);
- else
- right.Append (pixbuf, name);
- }
-
- protected void Clear ()
- {
- IconNames.Clear ();
- left.Clear ();
- right.Clear ();
- }
-
- void RowActivated (object obj, RowActivatedArgs args)
- {
- if (Activated != null)
- Activated (this, EventArgs.Empty);
- }
-
- public int SelectionIndex {
- get {
- Gtk.TreePath[] selection;
- selection = left.Selection.GetSelectedRows ();
- if (selection.Length > 0)
- return selection[0].Indices[0] * 2;
- selection = right.Selection.GetSelectedRows ();
- if (selection.Length > 0)
- return selection[0].Indices[0] * 2 + 1;
- return -1;
- }
- set {
- if (value != -1) {
- if (value % 2 == 0)
- left.SelectRow (value / 2);
- else
- right.SelectRow (value / 2);
- } else {
- left.Selection.UnselectAll ();
- right.Selection.UnselectAll ();
- }
- }
- }
-
- public string Selection {
- get {
- int i = SelectionIndex;
- if (i != -1)
- return (string) IconNames [i];
- else
- return null;
- }
- set {
- if (value != null)
- SelectionIndex = IconNames.IndexOf (value);
- else
- SelectionIndex = -1;
- }
- }
-
- public event EventHandler SelectionChanged;
-
- public void Find (string text)
- {
- int selection = SelectionIndex;
- for (int i = (selection + 1) % IconNames.Count; i != selection; i = (i + 1) % IconNames.Count) {
- if (((string)IconNames[i]).IndexOf (text) != -1) {
- SelectionIndex = i;
- return;
- }
- }
- SelectionIndex = -1;
- }
-
- void LeftSelectionChanged (object obj, EventArgs args)
- {
- if (left.Selection.GetSelectedRows().Length != 0)
- right.Selection.UnselectAll ();
- if (SelectionChanged != null)
- SelectionChanged (this, EventArgs.Empty);
- }
-
- void RightSelectionChanged (object obj, EventArgs args)
- {
- if (right.Selection.GetSelectedRows().Length != 0)
- left.Selection.UnselectAll ();
- if (SelectionChanged != null)
- SelectionChanged (this, EventArgs.Empty);
- }
-
- [GLib.ConnectBefore]
- void ColumnKeyPressEvent (object obj, KeyPressEventArgs args)
- {
- if (args.Event.Key == Gdk.Key.Right) {
- if (obj == (object)left) {
- SelectionIndex++;
- right.GrabFocus ();
- }
- args.RetVal = true;
- } else if (args.Event.Key == Gdk.Key.Left) {
- if (obj == (object)right) {
- SelectionIndex--;
- left.GrabFocus ();
- }
- args.RetVal = true;
- }
- }
-
- protected override void OnSetScrollAdjustments (Gtk.Adjustment hadj, Gtk.Adjustment vadj)
- {
- left.SetScrollAdjustments (null, vadj);
- right.SetScrollAdjustments (null, vadj);
- }
- }
-
- // Another internal class. This is a single column of the ThemedIconList
- class ThemedIconColumn : Gtk.TreeView
- {
- public ThemedIconColumn ()
- {
- Model = store = new Gtk.ListStore (typeof (Gdk.Pixbuf),
- typeof (string));
- HeadersVisible = false;
- EnableSearch = false;
-
- TreeViewColumn col;
- CellRenderer renderer;
-
- col = new TreeViewColumn ();
- renderer = new CellRendererPixbuf ();
- col.PackStart (renderer, false);
- col.AddAttribute (renderer, "pixbuf", 0);
- renderer = new CellRendererText ();
- col.PackStart (renderer, false);
- col.AddAttribute (renderer, "text", 1);
- AppendColumn (col);
- }
-
- Gtk.ListStore store;
-
- public void Append (Gdk.Pixbuf pixbuf, string name)
- {
- if (name.Length > 30)
- name = name.Substring (0, 30) + "...";
- store.AppendValues (pixbuf, name);
- }
-
- public void SelectRow (int row)
- {
- Gtk.TreeIter iter;
- if (store.IterNthChild (out iter, row)) {
- Gtk.TreePath path = store.GetPath (iter);
-
- SetCursor (path, null, false);
-
- // We want the initial selection to be centered
- if (!IsRealized)
- ScrollToCell (path, null, true, 0.5f, 0.0f);
- }
- }
-
- public void Clear ()
- {
- store.Clear ();
- }
- }
-}
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs
deleted file mode 100644
index 5846ecadb93..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-
-using System;
-using System.Reflection;
-using System.Collections;
-
-namespace Stetic.Editor
-{
- public class IconSelectorItem: Gtk.EventBox
- {
- ArrayList icons = new ArrayList ();
- ArrayList labels = new ArrayList ();
- ArrayList names = new ArrayList ();
- int columns = 12;
- int iconSize = 16;
- int spacing = 3;
- int selIndex = -1;
- int sectionGap = 10;
- int lastSel = -1;
- int xmax;
- int ymax;
- string title;
- Gtk.Window tipWindow;
- bool inited;
-
- public IconSelectorItem (IntPtr ptr): base (ptr)
- {
- }
-
- public IconSelectorItem (string title)
- {
- this.title = title;
-
- int w, h;
- Gtk.Icon.SizeLookup (Gtk.IconSize.Menu, out w, out h);
- iconSize = w;
-
- this.Events |= Gdk.EventMask.PointerMotionMask;
- }
-
- protected override void OnSizeRequested (ref Gtk.Requisition req)
- {
- if (!inited) {
- CreateIcons ();
- inited = true;
- }
-
- base.OnSizeRequested (ref req);
- CalcSize ();
-
- Gtk.Requisition nr = new Gtk.Requisition ();
- nr.Width = xmax;
- nr.Height = ymax;
- req = nr;
- }
-
- protected virtual void CreateIcons ()
- {
- }
-
- public int SelectedIndex {
- get { return selIndex; }
- }
-
- public string SelectedIcon {
- get {
- if (selIndex != -1)
- return (string) names [selIndex];
- else
- return null;
- }
- }
-
- protected void AddIcon (string name, Gdk.Pixbuf pix, string label)
- {
- icons.Add (pix);
- labels.Add (label);
- names.Add (name);
- }
-
- protected void AddSeparator (string separator)
- {
- icons.Add (null);
- labels.Add (null);
- names.Add (separator);
- }
-
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion ev)
- {
- ProcessMotionEvent ((int) ev.X, (int) ev.Y);
- return true;
- }
-
- internal void ProcessMotionEvent (int x, int y)
- {
- int ix, iy;
- GetIconIndex (x, y, out selIndex, out ix, out iy);
- if (selIndex != -1) {
- string name = labels [selIndex] as string;
- if (name == null || name.Length == 0)
- name = names [selIndex] as string;
- if (selIndex != lastSel) {
- HideTip ();
- ShowTip (ix, iy + iconSize + spacing*2, name);
- }
- } else
- HideTip ();
-
- lastSel = selIndex;
-
- QueueDraw ();
- }
-
- void ShowTip (int x, int y, string text)
- {
- if (GdkWindow == null)
- return;
- if (tipWindow == null) {
- tipWindow = new TipWindow ();
- Gtk.Label lab = new Gtk.Label (text);
- lab.Xalign = 0;
- lab.Xpad = 3;
- lab.Ypad = 3;
- tipWindow.Add (lab);
- }
- ((Gtk.Label)tipWindow.Child).Text = text;
- int w = tipWindow.Child.SizeRequest().Width;
- int ox, oy;
- GdkWindow.GetOrigin (out ox, out oy);
- tipWindow.Move (ox + x - (w/2) + (iconSize/2), oy + y);
- tipWindow.ShowAll ();
- }
-
- void HideTip ()
- {
- if (tipWindow != null) {
- tipWindow.Destroy ();
- tipWindow = null;
- }
- }
-
- public override void Dispose ()
- {
- HideTip ();
- base.Dispose ();
- }
-
- protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing ev)
- {
- HideTip ();
- return base.OnLeaveNotifyEvent (ev);
- }
-
- internal void ProcessLeaveNotifyEvent (Gdk.EventCrossing ev)
- {
- HideTip ();
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- Draw ();
- return true;
- }
-
- void Draw ()
- {
- int a,b;
- Expose (true, -1, -1, out a, out b);
- }
-
- void CalcSize ()
- {
- int a,b;
- Expose (false, -1, -1, out a, out b);
- }
-
- void GetIconIndex (int x, int y, out int index, out int ix, out int iy)
- {
- index = Expose (false, x, y, out ix, out iy);
- }
-
- int Expose (bool draw, int testx, int testy, out int ix, out int iy)
- {
- int x = spacing;
- int y = spacing;
- int sx = spacing;
- int maxx = columns * (iconSize + spacing) + spacing;
- bool calcSize = (testx == -1);
-
int w, h, tborder = 1;
- using (var layout = new Pango.Layout (this.PangoContext)) {
- Pango.FontDescription des = this.Style.FontDescription.Copy ();
- des.Size = 10 * (int)Pango.Scale.PangoScale;
- layout.FontDescription = des;
- layout.SetMarkup (title);
- layout.Width = -1;
- layout.GetPixelSize (out w, out h);
- if (draw) {
- GdkWindow.DrawRectangle (this.Style.DarkGC (Gtk.StateType.Normal), true, x, y, Allocation.Width + tborder * 2, h + tborder * 2);
- GdkWindow.DrawLayout (this.Style.ForegroundGC (Gtk.StateType.Normal), x + tborder + 2, y + tborder, layout);
- }
- }
-
- if (calcSize)
- xmax = 0;
-
- y += h + spacing*2 + tborder*2;
-
- for (int n=0; n sx) {
- y += iconSize + spacing;
- }
- x = sx;
- y -= spacing;
- if (draw) {
- Gdk.Rectangle rect = new Gdk.Rectangle (0, y+(sectionGap/2), Allocation.Width - x, 1);
- Gtk.Style.PaintHline (this.Style, this.GdkWindow, Gtk.StateType.Normal, rect, this, "", rect.X, rect.Right, rect.Y);
- }
- y += sectionGap;
- continue;
- }
-
- if (cmd == "|") {
- if (x == sx)
- continue;
- x += spacing;
- if (draw) {
- Gdk.Rectangle rect = new Gdk.Rectangle (x, y, 1, iconSize);
- Gtk.Style.PaintVline (this.Style, this.GdkWindow, Gtk.StateType.Normal, rect, this, "", rect.Y, rect.Bottom, rect.X);
- }
- x += spacing*2;
- continue;
- }
-
- if (testx != -1 && testx >= (x - spacing/2) && testx < (x + iconSize + spacing) && testy >= (y - spacing/2) && testy < (y + iconSize + spacing)) {
- ix = x;
- iy = y;
- return n;
- }
-
- if (draw) {
- Gtk.StateType state = (n == selIndex) ? Gtk.StateType.Selected : Gtk.StateType.Normal;
- if (n == selIndex)
- GdkWindow.DrawRectangle (this.Style.BackgroundGC (state), true, x-spacing, y-spacing, iconSize + spacing*2, iconSize + spacing*2);
- GdkWindow.DrawPixbuf (this.Style.ForegroundGC (state), pix, 0, 0, x, y, pix.Width, pix.Height, Gdk.RgbDither.None, 0, 0);
- }
-
- x += (iconSize + spacing);
- if (calcSize && x > xmax)
- xmax = x;
-
- if (x >= maxx) {
- x = sx;
- y += iconSize + spacing;
- }
- }
- if (calcSize) {
- if (x > sx)
- y += iconSize + spacing;
- ymax = y;
- }
-
- ix = iy = 0;
- return -1;
- }
- }
-
- class TipWindow: Gtk.Window
- {
- public TipWindow (): base (Gtk.WindowType.Popup)
- {
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- base.OnExposeEvent (ev);
- Gtk.Requisition req = SizeRequest ();
- Gtk.Style.PaintFlatBox (this.Style, this.GdkWindow, Gtk.StateType.Normal, Gtk.ShadowType.Out, Gdk.Rectangle.Zero, this, "tooltip", 0, 0, req.Width, req.Height);
- return true;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenu.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenu.cs
deleted file mode 100644
index ab6af38d281..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenu.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-
-using System;
-using System.Reflection;
-using System.Collections;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class IconSelectorMenu: Gtk.Menu
- {
- IProject project;
-
- public event IconEventHandler IconSelected;
-
- public IconSelectorMenu (IProject project)
- {
- this.project = project;
-
- // Stock icon selector
- IconSelectorMenuItem selStock = new IconSelectorMenuItem (new StockIconSelectorItem ());
- selStock.IconSelected += OnStockSelected;
- Insert (selStock, -1);
-
- // Project icon selector
- if (project != null && project.IconFactory.Icons.Count > 0) {
- IconSelectorMenuItem selProject = new IconSelectorMenuItem (new ProjectIconSelectorItem (project));
- selProject.IconSelected += OnStockSelected;
- Insert (selProject, -1);
- }
-
- Insert (new Gtk.SeparatorMenuItem (), -1);
-
- Gtk.MenuItem it = new Gtk.MenuItem (Catalog.GetString ("More..."));
- it.Activated += OnSetStockActionType;
- Insert (it, -1);
- }
-
- void OnStockSelected (object s, IconEventArgs args)
- {
- if (IconSelected != null)
- IconSelected (this, args);
- }
-
- void OnSetStockActionType (object ob, EventArgs args)
- {
- Stetic.Editor.SelectIconDialog dialog = new Stetic.Editor.SelectIconDialog (this.Toplevel as Gtk.Window, project);
- using (dialog)
- {
- if (dialog.Run () != (int) Gtk.ResponseType.Ok)
- return;
- if (IconSelected != null)
- IconSelected (this, new IconEventArgs (dialog.Icon));
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenuItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenuItem.cs
deleted file mode 100644
index 5ac94883eb3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorMenuItem.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-
-using System;
-
-namespace Stetic.Editor
-{
- public class IconSelectorMenuItem: Gtk.MenuItem
- {
- IconSelectorItem selector;
-
- public event IconEventHandler IconSelected;
-
- public IconSelectorMenuItem (IconSelectorItem item)
- {
- selector = item;
- Add (selector);
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- if (IconSelected != null)
- IconSelected (this, new IconEventArgs (selector.SelectedIcon));
- selector.Destroy ();
- return base.OnButtonPressEvent (ev);
- }
-
- protected override bool OnEnterNotifyEvent (Gdk.EventCrossing ev)
- {
- return true;
- }
-
- protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing ev)
- {
- selector.ProcessLeaveNotifyEvent (ev);
- return true;
- }
-
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion ev)
- {
- selector.ProcessMotionEvent ((int)ev.X - selector.Allocation.X + Allocation.X, (int)ev.Y - selector.Allocation.Y + Allocation.Y);
- return true;
- }
- }
-
- public delegate void IconEventHandler (object s, IconEventArgs args);
-
- public class IconEventArgs: EventArgs
- {
- string iconId;
-
- public IconEventArgs (string iconId)
- {
- this.iconId = iconId;
- }
-
- public string IconId {
- get { return iconId; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Identifier.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Identifier.cs
deleted file mode 100644
index 6b7c42101ee..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Identifier.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-
-using System;
-using System.Text;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
- public class Identifier: Gtk.Entry, IPropertyEditor
- {
- string id;
- int min = -1;
- int max = -1;
-
- public Identifier()
- {
- ShowAll ();
- HasFrame = false;
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(string))
- throw new InvalidOperationException ("TextEditor only can edit string properties");
-
- try {
- if (descriptor.Minimum != null)
- min = Convert.ToInt32 (descriptor.Minimum);
- } catch {}
-
- try {
- if (descriptor.Maximum != null)
- max = Convert.ToInt32 (descriptor.Maximum);
- } catch {}
- }
-
- public void AttachObject (object obj)
- {
- }
-
- protected override bool OnFocusOutEvent (Gdk.EventFocus e)
- {
- DoChanged ();
- return base.OnFocusOutEvent (e);
- }
-
- void DoChanged ()
- {
- StringBuilder sb = new StringBuilder ();
- foreach (char c in Text) {
- if (char.IsLetterOrDigit (c) || c == '_')
- sb.Append (c);
- }
-
- string s = sb.ToString ();
- if (min != -1 && s.Length < min)
- return;
- if (max != -1 && s.Length > max)
- return;
-
- if (s == Text) {
- id = Text;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- } else {
- Text = s;
- }
- }
-
- public object Value {
- get { return id; }
- set { id = Text = (value != null ? (string) value : ""); }
- }
-
- // To be fired when the edited value changes.
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Image.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Image.cs
deleted file mode 100644
index 0dbd5ed7e02..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Image.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using Mono.Unix;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("Value", "Changed")]
- public class Image : Gtk.HBox, IPropertyEditor {
- Gtk.Image image;
- Gtk.ComboBoxEntry combo;
- Gtk.Entry entry;
- Gtk.Button button;
- Gtk.ListStore store;
-
- const int IconColumn = 0;
- const int LabelColumn = 1;
-
- static string[] stockIds, stockLabels;
- static int imgWidth, imgHeight;
-
- static Image ()
- {
- ArrayList tmpIds = new ArrayList ();
-
- // We can't use Gtk.Stock.ListIds, because that returns different
- // values depending on what version of libgtk you have installed...
- foreach (PropertyInfo info in typeof (Gtk.Stock).GetProperties (BindingFlags.Public | BindingFlags.Static)) {
- if (info.CanRead && info.PropertyType == typeof (string))
- tmpIds.Add (info.GetValue (null, null));
- }
- foreach (PropertyInfo info in GnomeStock.Properties) {
- if (info.CanRead && info.PropertyType == typeof (string))
- tmpIds.Add (info.GetValue (null, null));
- }
-
- ArrayList items = new ArrayList (), nonItems = new ArrayList ();
- foreach (string id in tmpIds) {
- Gtk.StockItem item = Gtk.Stock.Lookup (id);
- if (item.StockId == null)
- nonItems.Add (id);
- else {
- item.Label = item.Label.Replace ("_", "");
- items.Add (item);
- }
- }
- items.Sort (new StockItemSorter ());
- nonItems.Sort ();
-
- stockIds = new string[items.Count + nonItems.Count];
- stockLabels = new string[items.Count + nonItems.Count];
- for (int i = 0; i < items.Count; i++) {
- stockIds[i] = ((Gtk.StockItem)items[i]).StockId;
- stockLabels[i] = ((Gtk.StockItem)items[i]).Label;
- }
- for (int i = 0; i < nonItems.Count; i++) {
- stockIds[i + items.Count] = nonItems[i] as string;
- stockLabels[i + items.Count] = nonItems[i] as string;
- }
-
- Gtk.Icon.SizeLookup (Gtk.IconSize.Button, out imgWidth, out imgHeight);
- }
-
- class StockItemSorter : IComparer {
- public int Compare (object itemx, object itemy)
- {
- Gtk.StockItem x = (Gtk.StockItem)itemx;
- Gtk.StockItem y = (Gtk.StockItem)itemy;
-
- return string.Compare (x.Label, y.Label);
- }
- }
-
- public Image () : this (true, true) {}
-
- public Image (bool allowStock, bool allowFile) : base (false, 6)
- {
- image = new Gtk.Image (GnomeStock.Blank, Gtk.IconSize.Button);
- PackStart (image, false, false, 0);
-
- if (allowStock) {
- store = new Gtk.ListStore (typeof (string), typeof (string));
- store.AppendValues (GnomeStock.Blank, Catalog.GetString ("(None)"));
- for (int i = 0; i < stockIds.Length; i++)
- store.AppendValues (stockIds[i], stockLabels[i]);
-
- combo = new Gtk.ComboBoxEntry (store, LabelColumn);
- Gtk.CellRendererPixbuf iconRenderer = new Gtk.CellRendererPixbuf ();
- iconRenderer.StockSize = (uint)Gtk.IconSize.Menu;
- combo.PackStart (iconRenderer, false);
- combo.Reorder (iconRenderer, 0);
- combo.AddAttribute (iconRenderer, "stock-id", IconColumn);
- combo.Changed += combo_Changed;
-
- // Pack the combo non-expandily into a VBox so it doesn't
- // get stretched to the file button's height
- Gtk.VBox vbox = new Gtk.VBox (false, 0);
- vbox.PackStart (combo, true, false, 0);
- PackStart (vbox, true, true, 0);
-
- entry = (Gtk.Entry)combo.Child;
- entry.Changed += entry_Changed;
-
- useStock = true;
- }
-
- if (allowFile) {
- if (!allowStock) {
- entry = new Gtk.Entry ();
- PackStart (entry, true, true, 0);
- entry.Changed += entry_Changed;
- }
-
- button = new Gtk.Button ();
- Gtk.Image icon = new Gtk.Image (Gtk.Stock.Open, Gtk.IconSize.Button);
- button.Add (icon);
- PackStart (button, false, false, 0);
- button.Clicked += button_Clicked;
- }
- ShowAll ();
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(string))
- throw new ApplicationException ("Image editor does not support editing values of type " + prop.PropertyType);
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public event EventHandler ValueChanged;
-
- bool syncing;
-
- void combo_Changed (object obj, EventArgs args)
- {
- if (syncing)
- return;
-
- useStock = true;
- syncing = true;
- if (combo.Active > 0)
- StockId = stockIds[combo.Active - 1];
- else
- StockId = null;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- syncing = false;
- }
-
- void entry_Changed (object obj, EventArgs args)
- {
- if (syncing)
- return;
-
- useStock = true;
- syncing = true;
- StockId = entry.Text;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- syncing = false;
- }
-
- void button_Clicked (object obj, EventArgs args)
- {
- Gtk.FileChooserDialog dialog =
- new Gtk.FileChooserDialog (Catalog.GetString ("Image"), null, Gtk.FileChooserAction.Open,
- Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
- Gtk.Stock.Open, Gtk.ResponseType.Ok);
- dialog.TransientFor = this.Toplevel as Gtk.Window;
- int response = dialog.Run ();
- string file = dialog.Filename;
- dialog.Destroy ();
-
- if (response == (int)Gtk.ResponseType.Ok) {
- syncing = true;
- useStock = false;
- entry.Text = file;
- File = file;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- syncing = false;
- }
- }
-
- bool useStock;
-
- string stockId;
- public string StockId {
- get {
- return stockId;
- }
- set {
- useStock = true;
- stockId = value;
- file = null;
-
- image.SetFromStock (stockId, Gtk.IconSize.Button);
-
- if (!syncing) {
- int id = Array.IndexOf (stockIds, value);
- if (id != -1) {
- syncing = true;
- combo.Active = id + 1;
- syncing = false;
- }
- }
- }
- }
-
- string file;
- public string File {
- get {
- return file;
- }
- set {
- useStock = false;
- stockId = null;
- file = value;
-
- if (value == null)
- value = "";
-
- try {
- image.Pixbuf = new Gdk.Pixbuf (value, imgWidth, imgHeight);
- } catch {
- image.SetFromStock (GnomeStock.Blank, Gtk.IconSize.Button);
- }
-
- if (!syncing) {
- syncing = true;
- entry.Text = value;
- syncing = false;
- }
- }
- }
-
- public virtual object Value {
- get {
- if (useStock) {
- if (StockId != null)
- return "stock:" + StockId;
- else
- return null;
- } else {
- if (File != null)
- return "file:" + File;
- else
- return null;
- }
- }
- set {
- string val = value as string;
- if (val == null)
- File = null;
- else if (val.StartsWith ("stock:"))
- StockId = val.Substring (6);
- else if (val.StartsWith ("file:"))
- File = val.Substring (5);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageFile.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageFile.cs
deleted file mode 100644
index 4d9ad3211a2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageFile.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("File", "Changed")]
- public class ImageFile : Image {
-
- public ImageFile () : base (false, true) { }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageSelector.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageSelector.cs
deleted file mode 100644
index d983c521ec5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ImageSelector.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-
-using System;
-
-namespace Stetic.Editor
-{
- public class BaseImageCell: PropertyEditorCell
- {
- const int imgSize = 24;
- const int imgPad = 2;
- const int spacing = 5;
- Gdk.Pixbuf image;
-
- protected Gdk.Pixbuf Image {
- get { return image; }
- set { image = value; }
- }
-
- protected int ImageSize {
- get { return 16; }//imgSize - imgPad*2; }
- }
-
- public override void GetSize (int availableWidth, out int width, out int height)
- {
- base.GetSize (availableWidth, out width, out height);
- width += imgSize + spacing;
- height = Math.Max (imgSize, height);
- }
-
- public override void Render (Gdk.Drawable window, Gdk.Rectangle bounds, Gtk.StateType state)
- {
- int iy = bounds.Y + (bounds.Height - imgSize) / 2;
-
- if (image != null) {
- int dy = (imgSize - image.Height) / 2;
- int dx = (imgSize - image.Width) / 2;
- window.DrawPixbuf (Container.Style.BackgroundGC (state), image, 0, 0, bounds.X + dx, iy + dy, -1, -1, Gdk.RgbDither.None, 0, 0);
- }
-
- window.DrawRectangle (Container.Style.DarkGC (state), false, bounds.X, iy, imgSize - 1, imgSize - 1);
-
- bounds.X += imgSize + spacing;
- base.Render (window, bounds, state);
- }
- }
-
- public class ImageSelector: BaseImageCell
- {
- IProject project;
- ImageInfo imageInfo;
-
- protected override void Initialize ()
- {
- base.Initialize ();
-
- if (Property.PropertyType != typeof(ImageInfo))
- throw new ApplicationException ("ImageSelector editor does not support editing values of type " + Property.PropertyType);
-
- if (Instance == null)
- return;
-
- Stetic.ObjectWrapper w = Stetic.ObjectWrapper.Lookup (Instance);
- project = w.Project;
- imageInfo = (ImageInfo)Value;
- if (imageInfo != null)
- Image = imageInfo.GetThumbnail (project, ImageSize);
- else
- Image = null;
- }
-
- protected override string GetValueText ()
- {
- if (imageInfo == null)
- return "";
- return imageInfo.Label;
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new ImageSelectorEditor ();
- }
- }
-
- public class ImageSelectorEditor: Gtk.HBox, IPropertyEditor
- {
- Gtk.Image image;
- Gtk.Label entry;
- Gtk.Button button;
- Gtk.Button clearButton;
- ImageInfo icon;
- IProject project;
- Gtk.Frame imageFrame;
-
- public ImageSelectorEditor()
- {
- Spacing = 3;
- imageFrame = new Gtk.Frame ();
- imageFrame.Shadow = Gtk.ShadowType.In;
- imageFrame.BorderWidth = 2;
- PackStart (imageFrame, false, false, 0);
-
- image = new Gtk.Image (GnomeStock.Blank, Gtk.IconSize.Button);
- imageFrame.Add (image);
-
- Gtk.Frame frame = new Gtk.Frame ();
- entry = new Gtk.Label ();
- entry.Xalign = 0;
- frame.Shadow = Gtk.ShadowType.In;
- frame.BorderWidth = 2;
- frame.Add (entry);
- PackStart (frame, true, true, 0);
-
- clearButton = new Gtk.Button (new Gtk.Image (Gtk.Stock.Clear, Gtk.IconSize.Menu));
- clearButton.Clicked += OnClearImage;
- PackStart (clearButton, false, false, 0);
-
- button = new Gtk.Button ("...");
- PackStart (button, false, false, 0);
- button.Clicked += button_Clicked;
- ShowAll ();
- }
-
- void button_Clicked (object obj, EventArgs args)
- {
- Gtk.Window parent = (Gtk.Window)GetAncestor (Gtk.Window.GType);
- using (SelectImageDialog dlg = new SelectImageDialog (parent, project)) {
- dlg.Icon = (ImageInfo) Value;
- if (dlg.Run () == (int) Gtk.ResponseType.Ok)
- Value = dlg.Icon;
- }
- }
-
- void OnClearImage (object obj, EventArgs args)
- {
- Value = null;
- }
-
- // Called once to initialize the editor.
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(ImageInfo))
- throw new ApplicationException ("ImageSelector editor does not support editing values of type " + prop.PropertyType);
- }
-
- // Called when the object to be edited changes.
- public void AttachObject (object obj)
- {
- Stetic.ObjectWrapper w = Stetic.ObjectWrapper.Lookup (obj);
- project = w.Project;
- }
-
- // Gets/Sets the value of the editor. If the editor supports
- // several value types, it is the responsibility of the editor
- // to return values with the expected type.
- public object Value {
- get { return icon; }
- set {
- icon = (ImageInfo) value;
- if (icon != null) {
- entry.Text = icon.Label;
- image.Pixbuf = icon.GetThumbnail (project, 16);
- imageFrame.Show ();
- clearButton.Show ();
- } else {
- imageFrame.Hide ();
- clearButton.Hide ();
- entry.Text = "";
- }
-
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
-
- // To be fired when the edited value changes.
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IntRange.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IntRange.cs
deleted file mode 100644
index 415becc0dcc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IntRange.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class IntRange : PropertyEditorCell
- {
- bool optInteger;
-
- bool HasValue {
- get {
- if (!optInteger) return true;
- int val = (int) Convert.ChangeType (Value, typeof(int));
- return (val != -1);
- }
- }
-
- protected override void Initialize ()
- {
- base.Initialize ();
-
- if (Property.Minimum != null && Property.PropertyType == typeof(int)) {
- int min = (int) Convert.ChangeType (Property.Minimum, typeof(int));
- optInteger = (min == -1);
- } else
- optInteger = false;
- }
-
- public override void GetSize (int availableWidth, out int width, out int height)
- {
- if (HasValue)
- base.GetSize (availableWidth, out width, out height);
- else
- width = height = 0;
- }
-
- public override void Render (Gdk.Drawable window, Gdk.Rectangle bounds, Gtk.StateType state)
- {
- if (HasValue)
- base.Render (window, bounds, state);
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- if (optInteger)
- return new OptIntRange (0, null);
- else
- return new IntRangeEditor ();
- }
- }
-
- public class IntRangeEditor : Gtk.SpinButton, IPropertyEditor {
-
- Type propType;
-
- public IntRangeEditor () : base (0, 0, 1.0)
- {
- this.HasFrame = false;
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- propType = prop.PropertyType;
-
- double min, max;
-
- switch (Type.GetTypeCode (propType)) {
- case TypeCode.Int16:
- min = (double) Int16.MinValue;
- max = (double) Int16.MaxValue;
- break;
- case TypeCode.UInt16:
- min = (double) UInt16.MinValue;
- max = (double) UInt16.MaxValue;
- break;
- case TypeCode.Int32:
- min = (double) Int32.MinValue;
- max = (double) Int32.MaxValue;
- break;
- case TypeCode.UInt32:
- min = (double) UInt32.MinValue;
- max = (double) UInt32.MaxValue;
- break;
- case TypeCode.Int64:
- min = (double) Int64.MinValue;
- max = (double) Int64.MaxValue;
- break;
- case TypeCode.UInt64:
- min = (double) UInt64.MinValue;
- max = (double) UInt64.MaxValue;
- break;
- case TypeCode.Byte:
- min = (double) Byte.MinValue;
- max = (double) Byte.MaxValue;
- break;
- case TypeCode.SByte:
- min = (double) SByte.MinValue;
- max = (double) SByte.MaxValue;
- break;
- default:
- throw new ApplicationException ("IntRange editor does not support editing values of type " + prop.PropertyType);
- }
-
- if (prop.Minimum != null)
- min = (double) Convert.ChangeType (prop.Minimum, typeof(double));
- if (prop.Maximum != null)
- max = (double) Convert.ChangeType (prop.Maximum, typeof(double));
-
- SetRange (min, max);
- }
-
- public void AttachObject (object ob)
- {
- }
-
- object IPropertyEditor.Value {
- get { return Convert.ChangeType (base.Value, propType); }
- set { base.Value = (double) Convert.ChangeType (value, typeof(double)); }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/NonContainerWarningDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/NonContainerWarningDialog.cs
deleted file mode 100644
index bca392b89c1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/NonContainerWarningDialog.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-
-using System;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public delegate void ShowUrlDelegate (string url);
-
- public class NonContainerWarningDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.CheckButton showCheck;
- [Glade.Widget] Gtk.Button linkButton;
- [Glade.Widget] Gtk.Button okbutton;
- [Glade.Widget ("AddNonContainerDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- public static ShowUrlDelegate ShowUrl;
-
- public NonContainerWarningDialog()
- {
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "AddNonContainerDialog", null);
- xml.Autoconnect (this);
-
- ((Gtk.Label)linkButton.Child).Markup = "" + Catalog.GetString ("GTK# Widget Layout and Packing") + "";
-
- linkButton.Clicked += delegate {
- if (ShowUrl != null)
- ShowUrl ("http://www.mono-project.com/GtkSharp:_Widget_Layout_and_Packing");
- };
- okbutton.HasFocus = true;
- }
-
- public bool ShowAgain {
- get { return !showCheck.Active; }
- set { showCheck.Active = !value; }
- }
-
- public Gtk.Window TransientFor {
- set { dialog.TransientFor = value; }
- }
-
- public int Run ()
- {
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/OptIntRange.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/OptIntRange.cs
deleted file mode 100644
index 784c41f33b8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/OptIntRange.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class OptIntRange : Gtk.HBox, IPropertyEditor {
-
- Gtk.CheckButton check;
- Gtk.SpinButton spin;
- object omin, omax;
-
- public OptIntRange () : base (false, 6)
- {
- }
-
- public OptIntRange (object omin, object omax) : base (false, 6)
- {
- this.omin = omin;
- this.omax = omax;
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(int))
- throw new ApplicationException ("OptIntRange editor does not support editing values of type " + prop.PropertyType);
-
- double min = (double) Int32.MinValue;
- double max = (double) Int32.MaxValue;
-
- if (omin == null)
- omin = prop.Minimum;
- if (omax == null)
- omax = prop.Maximum;
-
- if (omin != null)
- min = (double) Convert.ChangeType (omin, typeof(double));
- if (omax != null)
- max = (double) Convert.ChangeType (omax, typeof(double));
-
- check = new Gtk.CheckButton ();
- check.Show ();
- check.Toggled += check_Toggled;
- PackStart (check, false, false, 0);
-
- spin = new Gtk.SpinButton (min, max, 1.0);
- spin.Show ();
- spin.HasFrame = false;
- spin.ValueChanged += spin_ValueChanged;
- PackStart (spin, true, true, 0);
- }
-
- public void AttachObject (object ob)
- {
- }
-
- void check_Toggled (object o, EventArgs args)
- {
- spin.Sensitive = check.Active;
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- void spin_ValueChanged (object o, EventArgs args)
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- public object Value {
- get {
- if (check.Active)
- return (int)spin.Value;
- else
- return -1;
- }
- set {
- int val = (int) value;
- if (val == -1) {
- check.Active = false;
- spin.Sensitive = false;
- } else {
- check.Active = true;
- spin.Sensitive = true;
- spin.Value = (double)val;
- }
- }
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconList.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconList.cs
deleted file mode 100644
index ff6a2fcce9a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconList.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-
-namespace Stetic.Editor
-{
- class ProjectIconList : IconList
- {
- IProject project;
- ProjectIconFactory icons;
-
- public ProjectIconList (IProject project, ProjectIconFactory icons)
- {
- this.project = project;
- this.icons = icons;
- Refresh ();
- }
-
- public void Refresh ()
- {
- Clear ();
- foreach (ProjectIconSet icon in icons.Icons)
- AddIcon (icon.Name, icon.Sources [0].Image.GetThumbnail (project, 16), icon.Name);
- }
- }
-}
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconSelectorItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconSelectorItem.cs
deleted file mode 100644
index fe5683918c2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ProjectIconSelectorItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-using System;
-
-namespace Stetic.Editor
-{
- public class ProjectIconSelectorItem: IconSelectorItem
- {
- IProject project;
-
- public ProjectIconSelectorItem (IProject project): base ("Project Icons")
- {
- this.project = project;
- }
-
- protected override void CreateIcons ()
- {
- foreach (ProjectIconSet icon in project.IconFactory.Icons)
- AddIcon (icon.Name, icon.Sources [0].Image.GetScaledImage (project, Gtk.IconSize.Menu), icon.Name);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
deleted file mode 100644
index 6f8c996c110..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-
-using System;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
- public class PropertyTextEditor: Gtk.HBox, IPropertyEditor
- {
- protected Gtk.Entry entry;
- protected Gtk.Button button;
- PropertyDescriptor prop;
- object obj;
-
- public PropertyTextEditor()
- {
- Spacing = 3;
- entry = new Entry ();
- entry.HasFrame = false;
- PackStart (entry, true, true, 0);
- button = new Button ("...");
- button.Relief = ReliefStyle.Half;
- PackStart (button, false, false, 0);
- button.Clicked += ButtonClicked;
- entry.Activated += TextChanged;
- ShowAll ();
- }
-
- void ButtonClicked (object s, EventArgs a)
- {
- using (TextEditorDialog dlg = new TextEditorDialog ()) {
- dlg.Text = entry.Text;
- dlg.SetTranslatable (prop.Translatable);
- dlg.TransientFor = this.Toplevel as Gtk.Window;
- if (prop.Translatable) {
- dlg.Translated = prop.IsTranslated (obj);
- dlg.ContextHint = prop.TranslationContext (obj);
- dlg.Comment = prop.TranslationComment (obj);
- }
- if (dlg.Run () == (int) ResponseType.Ok) {
- if (prop.Translatable) {
- prop.SetTranslated (obj, dlg.Translated);
- if (dlg.Translated) {
- prop.SetTranslationComment (obj, dlg.Comment);
- prop.SetTranslationContext (obj, dlg.ContextHint);
- }
- }
- entry.Text = dlg.Text;
- TextChanged (null, null);
- }
- }
- }
-
- void TextChanged (object s, EventArgs a)
- {
- if (ValueChanged != null)
- ValueChanged (this, a);
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(string))
- throw new InvalidOperationException ("TextEditor only can edit string properties");
- prop = descriptor;
- }
-
- public void AttachObject (object obj)
- {
- this.obj = obj;
- }
-
- // Gets/Sets the value of the editor. If the editor supports
- // several value types, it is the responsibility of the editor
- // to return values with the expected type.
- public object Value {
- get { return entry.Text; }
- set { entry.Text = value != null ? (string) value : ""; }
- }
-
- // To be fired when the edited value changes.
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ResponseId.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ResponseId.cs
deleted file mode 100644
index bc7ef54bab9..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ResponseId.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Stetic.Editor
-{
- public class ResponseId: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- if (Value == null)
- return "";
-
- int val = (int) Value;
- EnumDescriptor enm = Registry.LookupEnum ("Gtk.ResponseType");
- foreach (Enum value in enm.Values) {
- if (Convert.ToInt32 (enm[value].Value) == val) {
- return enm[value].Label;
- }
- }
- return val.ToString ();
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new ResponseIdEditor ();
- }
- }
-
- public class ResponseIdEditor : Gtk.HBox, IPropertyEditor {
-
- Gtk.ComboBoxEntry combo;
- Gtk.Entry entry;
- EnumDescriptor enm;
- ArrayList values;
-
- public ResponseIdEditor ()
- {
- combo = Gtk.ComboBoxEntry.NewText ();
- combo.Changed += combo_Changed;
- combo.Show ();
- PackStart (combo, true, true, 0);
-
- entry = combo.Child as Gtk.Entry;
- entry.Changed += entry_Changed;
-
- enm = Registry.LookupEnum ("Gtk.ResponseType");
- values = new ArrayList ();
- foreach (Enum value in enm.Values) {
- if (enm[value].Label != "") {
- combo.AppendText (enm[value].Label);
- values.Add (Convert.ToInt32 (enm[value].Value));
- }
- }
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(int))
- throw new ApplicationException ("ResponseId editor does not support editing values of type " + prop.PropertyType);
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public object Value {
- get {
- if (combo.Active != -1)
- return (int)values[combo.Active];
- else {
- try {
- return Int32.Parse (entry.Text);
- } catch {
- return 0;
- }
- }
- }
- set {
- combo.Active = values.IndexOf ((int)value);
- if (combo.Active == -1)
- entry.Text = value.ToString ();
- }
- }
-
- public event EventHandler ValueChanged;
-
- void combo_Changed (object o, EventArgs args)
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- void entry_Changed (object o, EventArgs args)
- {
- if (combo.Active == -1 && ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectIconDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectIconDialog.cs
deleted file mode 100644
index 75499beb269..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectIconDialog.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-
-using System;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class SelectIconDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.Entry stockIconEntry;
- [Glade.Widget] Gtk.Notebook notebook;
- [Glade.Widget] Gtk.ScrolledWindow iconScrolledwindow;
- [Glade.Widget] Gtk.ScrolledWindow customIconScrolledwindow;
- [Glade.Widget] Gtk.Image previewIcon;
- [Glade.Widget] Gtk.Button okButton;
- [Glade.Widget] Gtk.Widget labelWarningIcon;
- [Glade.Widget ("SelectIconDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- StockIconList iconList;
- ProjectIconList customIconList;
-
- Gtk.Window parent;
- Stetic.IProject project;
-
- public SelectIconDialog (Gtk.Window parent, Stetic.IProject project)
- {
- this.parent = parent;
- this.project = project;
-
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "SelectIconDialog", null);
- xml.Autoconnect (this);
-
- // Stock icon list
-
- iconList = new StockIconList ();
- iconList.SelectionChanged += new EventHandler (OnIconSelectionChanged);
- iconScrolledwindow.AddWithViewport (iconList);
-
- // Custom icon list
-
- customIconList = new ProjectIconList (project, project.IconFactory);
- customIconList.SelectionChanged += new EventHandler (OnCustomIconSelectionChanged);
- customIconScrolledwindow.AddWithViewport (customIconList);
- dialog.ShowAll ();
-
- UpdateIconSelection ();
- UpdateButtons ();
- }
-
- public int Run ()
- {
- dialog.Show ();
- dialog.TransientFor = parent;
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
-
- public string Icon {
- get {
- if (notebook.Page == 0) {
- if (stockIconEntry.Text.Length == 0)
- return null;
- return stockIconEntry.Text;
- } else {
- return customIconList.Selection;
- }
- }
- set {
- if (value == null)
- return;
-
- if (project.IconFactory.GetIcon (value) != null) {
- notebook.Page = 1;
- customIconList.Selection = value;
- } else {
- stockIconEntry.Text = value;
- iconList.Selection = value;
- notebook.Page = 0;
- }
- }
- }
-
- void UpdateButtons ()
- {
- okButton.Sensitive = Icon != null;
- }
-
- protected void OnCurrentPageChanged (object s, Gtk.SwitchPageArgs args)
- {
- UpdateButtons ();
- }
-
- void OnIconSelectionChanged (object s, EventArgs args)
- {
- if (iconList.Selection != null) {
- stockIconEntry.Text = iconList.Selection;
- }
- }
-
- void OnCustomIconSelectionChanged (object s, EventArgs args)
- {
- UpdateButtons ();
- }
-
- void UpdateIconSelection ()
- {
- labelWarningIcon.Visible = stockIconEntry.Text.Length > 0 && (!stockIconEntry.Text.StartsWith ("gtk-"));
-
- Gdk.Pixbuf icon = null;
- if (stockIconEntry.Text.Length > 0) {
- icon = WidgetUtils.LoadIcon (stockIconEntry.Text, Gtk.IconSize.Menu);
- }
- if (icon == null)
- icon = WidgetUtils.MissingIcon;
- previewIcon.Pixbuf = icon;
- }
-
- protected void OnIconNameChanged (object ob, EventArgs args)
- {
- UpdateIconSelection ();
- UpdateButtons ();
- }
-
- protected void OnAddIcon (object ob, EventArgs args)
- {
- ProjectIconSet icon = new ProjectIconSet ();
- using (EditIconDialog dlg = new EditIconDialog (project, icon)) {
- if (parent != null)
- dlg.TransientFor = parent.Toplevel as Gtk.Window;
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- project.IconFactory.Icons.Add (icon);
- customIconList.Refresh ();
- customIconList.Selection = icon.Name;
- project.Modified = true;
- }
- }
- }
-
- protected void OnRemoveIcon (object ob, EventArgs args)
- {
- string name = customIconList.Selection;
- ProjectIconSet icon = project.IconFactory.GetIcon (name);
- if (icon != null) {
- Gtk.MessageDialog md = new Gtk.MessageDialog (dialog, Gtk.DialogFlags.Modal, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, string.Format (Catalog.GetString ("Are you sure you want to delete the icon '{0}'"), icon.Name));
- if (parent != null)
- md.TransientFor = parent.Toplevel as Gtk.Window;
- if (md.Run () == (int) Gtk.ResponseType.Yes) {
- project.IconFactory.Icons.Remove (icon);
- customIconList.Refresh ();
- project.Modified = true;
- }
- md.Destroy ();
- }
- }
-
- protected void OnEditIcon (object ob, EventArgs args)
- {
- string name = customIconList.Selection;
- ProjectIconSet icon = project.IconFactory.GetIcon (name);
- if (icon != null) {
- using (EditIconDialog dlg = new EditIconDialog (project, icon)) {
- if (parent != null)
- dlg.TransientFor = parent.Toplevel as Gtk.Window;
- if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
- customIconList.Refresh ();
- customIconList.Selection = icon.Name;
- project.Modified = true;
- }
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectImageDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectImageDialog.cs
deleted file mode 100644
index c8d7db902cb..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/SelectImageDialog.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-
-using System;
-using System.Collections;
-using System.IO;
-using Gtk;
-
-namespace Stetic.Editor
-{
- public class SelectImageDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.TreeView resourceList;
- [Glade.Widget] Gtk.FileChooserWidget fileChooser;
- [Glade.Widget] Gtk.Entry iconNameEntry;
- [Glade.Widget] Gtk.Notebook notebook;
- [Glade.Widget] Gtk.ScrolledWindow iconScrolledwindow;
- [Glade.Widget] Gtk.Image previewIcon;
- [Glade.Widget] Gtk.Image previewResource;
- [Glade.Widget] Gtk.ComboBox iconSizeCombo;
- [Glade.Widget] Gtk.Entry resourceNameEntry;
- [Glade.Widget] Gtk.Button okButton;
- [Glade.Widget] Gtk.Button buttonAdd;
- [Glade.Widget] Gtk.Button buttonRemove;
- [Glade.Widget ("SelectImageDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- ThemedIconList iconList;
-
- Gtk.ListStore resourceListStore;
- Gtk.Window parent;
-
- int thumbnailSize = 30;
- Hashtable resources = new Hashtable (); // Stores resourceName -> thumbnail pixbuf
- Gdk.Pixbuf missingThumbnail;
- IResourceProvider resourceProvider;
- string importedImageFile;
- Stetic.IProject project;
-
- public SelectImageDialog (Gtk.Window parent, Stetic.IProject project)
- {
- this.parent = parent;
- this.project = project;
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "SelectImageDialog", null);
- xml.Autoconnect (this);
-
- // Stock icon list
-
- iconList = new ThemedIconList ();
- iconList.SelectionChanged += new EventHandler (OnIconSelectionChanged);
- iconScrolledwindow.AddWithViewport (iconList);
-
- // Icon Sizes
-
- foreach (IconSize s in Enum.GetValues (typeof(Gtk.IconSize))) {
- if (s != IconSize.Invalid)
- iconSizeCombo.AppendText (s.ToString ());
- }
- iconSizeCombo.Active = 0;
-
- // Resource list
-
- resourceListStore = new Gtk.ListStore (typeof(Gdk.Pixbuf), typeof(string), typeof(string));
- resourceList.Model = resourceListStore;
-
- Gtk.TreeViewColumn col = new Gtk.TreeViewColumn ();
-
- Gtk.CellRendererPixbuf pr = new Gtk.CellRendererPixbuf ();
- pr.Xpad = 3;
- col.PackStart (pr, false);
- col.AddAttribute (pr, "pixbuf", 0);
-
- Gtk.CellRendererText crt = new Gtk.CellRendererText ();
- col.PackStart (crt, true);
- col.AddAttribute (crt, "markup", 1);
-
- resourceList.AppendColumn (col);
- resourceProvider = project.ResourceProvider;
- if (resourceProvider == null) {
- buttonAdd.Sensitive = false;
- buttonRemove.Sensitive = false;
- }
- FillResources ();
- resourceList.Selection.Changed += OnResourceSelectionChanged;
-
- if (project.FileName != null)
- fileChooser.SetCurrentFolder (project.ImagesRootPath);
-
- fileChooser.SelectionChanged += delegate (object s, EventArgs a) {
- UpdateButtons ();
- };
-
- fileChooser.FileActivated += delegate (object s, EventArgs a) {
- if (Icon != null) {
- if (Validate ())
- dialog.Respond (Gtk.ResponseType.Ok);
- }
- };
-
- okButton.Clicked += OnOkClicked;
-
- UpdateButtons ();
- }
-
- public int Run ()
- {
- dialog.ShowAll ();
- dialog.TransientFor = parent;
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
-
- public ImageInfo Icon {
- get {
- if (notebook.Page == 0) {
- if (iconNameEntry.Text.Length == 0)
- return null;
- return ImageInfo.FromTheme (iconNameEntry.Text, SelectedIconSize);
- } else if (notebook.Page == 1) {
- if (resourceNameEntry.Text.Length == 0)
- return null;
- return ImageInfo.FromResource (resourceNameEntry.Text);
- } else {
- if (importedImageFile != null)
- return ImageInfo.FromFile (importedImageFile);
- if (fileChooser.Filename == null || fileChooser.Filename.Length == 0 || !File.Exists (fileChooser.Filename))
- return null;
- return ImageInfo.FromFile (fileChooser.Filename);
- }
- }
- set {
- if (value == null)
- return;
- if (value.Source == ImageSource.Theme) {
- iconNameEntry.Text = value.Name;
- SelectedIconSize = value.ThemeIconSize;
- notebook.Page = 0;
- } else if (value.Source == ImageSource.Resource) {
- notebook.Page = 1;
- resourceNameEntry.Text = value.Name;
- } else {
- fileChooser.SetFilename (value.Name);
- notebook.Page = 2;
- }
- }
- }
-
- Gtk.IconSize SelectedIconSize {
- get { return (IconSize) iconSizeCombo.Active + 1; }
- set { iconSizeCombo.Active = ((int) value) - 1; }
- }
-
- void UpdateButtons ()
- {
- okButton.Sensitive = Icon != null;
- }
-
- protected void OnCurrentPageChanged (object s, Gtk.SwitchPageArgs args)
- {
- UpdateButtons ();
- }
-
- void OnIconSelectionChanged (object s, EventArgs args)
- {
- if (iconList.Selection != null) {
- iconNameEntry.Text = iconList.Selection;
- }
- }
-
- void UpdateIconSelection ()
- {
- Gdk.Pixbuf icon = null;
- if (iconNameEntry.Text.Length > 0) {
- icon = WidgetUtils.LoadIcon (iconNameEntry.Text, SelectedIconSize);
- }
- if (icon == null)
- icon = WidgetUtils.MissingIcon;
- previewIcon.Pixbuf = icon;
- }
-
- protected void OnIconSizeChanged (object ob, EventArgs args)
- {
- UpdateIconSelection ();
- }
-
- protected void OnIconNameChanged (object ob, EventArgs args)
- {
- UpdateIconSelection ();
- UpdateButtons ();
- }
-
- void FillResources ()
- {
- resourceListStore.Clear ();
- resources.Clear ();
- if (resourceProvider != null) {
- foreach (ResourceInfo res in resourceProvider.GetResources ()) {
- if (res.MimeType.StartsWith ("image/")) {
- AppendResource (resourceProvider.GetResourceStream (res.Name), res.Name);
- }
- }
- }
- }
-
- void AppendResource (Stream stream, string name)
- {
- try {
- Gdk.Pixbuf pix = new Gdk.Pixbuf (stream);
- string txt = name + "\n" + pix.Width + " x " + pix.Height + "";
- pix = GetThumbnail (pix);
- resourceListStore.AppendValues (pix, txt, name);
- resources [name] = pix;
- } catch {
- // Doesn't look like a valid image. Just ignore it.
- } finally {
- stream.Dispose ();
- }
- }
-
- Gdk.Pixbuf GetThumbnail (Gdk.Pixbuf pix)
- {
- if (pix.Width > pix.Height) {
- if (pix.Width > thumbnailSize) {
- float prop = (float) pix.Height / (float) pix.Width;
- return pix.ScaleSimple (thumbnailSize, (int)(thumbnailSize * prop), Gdk.InterpType.Bilinear);
- }
- } else {
- if (pix.Height > thumbnailSize) {
- float prop = (float) pix.Width / (float) pix.Height;
- return pix.ScaleSimple ((int)(thumbnailSize * prop), thumbnailSize, Gdk.InterpType.Bilinear);
- }
- }
- return pix;
- }
-
- void OnResourceSelectionChanged (object obj, EventArgs args)
- {
- Gtk.TreeIter iter;
- Gtk.TreeModel model;
- if (!resourceList.Selection.GetSelected (out model, out iter)) {
- resourceNameEntry.Text = "";
- } else {
- resourceNameEntry.Text = (string) resourceListStore.GetValue (iter, 2);
- }
- }
-
- protected void OnResourceNameChanged (object ob, EventArgs args)
- {
- Gdk.Pixbuf pix = (Gdk.Pixbuf) resources [resourceNameEntry.Text];
- if (pix != null)
- previewResource.Pixbuf = pix;
- else {
- if (missingThumbnail == null)
- missingThumbnail = WidgetUtils.MissingIcon;
- previewResource.Pixbuf = missingThumbnail;
- }
- UpdateButtons ();
- }
-
- protected void OnAddResource (object ob, EventArgs args)
- {
- FileChooserDialog dialog =
- new FileChooserDialog ("Open File", null, FileChooserAction.Open,
- Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
- Gtk.Stock.Open, Gtk.ResponseType.Ok);
- if (parent != null)
- dialog.TransientFor = parent.Toplevel as Gtk.Window;
- int response = dialog.Run ();
- if (response == (int)Gtk.ResponseType.Ok) {
- ResourceInfo rinfo = resourceProvider.AddResource (dialog.Filename);
- AppendResource (resourceProvider.GetResourceStream (rinfo.Name), rinfo.Name);
- resourceNameEntry.Text = rinfo.Name;
- }
- dialog.Destroy ();
- }
-
- protected void OnRemoveResource (object ob, EventArgs args)
- {
- Gtk.TreeIter iter;
- Gtk.TreeModel model;
- if (resourceList.Selection.GetSelected (out model, out iter)) {
- string res = (string) resourceListStore.GetValue (iter, 2);
- Gtk.MessageDialog msg = new Gtk.MessageDialog (dialog, DialogFlags.Modal, MessageType.Question, ButtonsType.YesNo, "Are you sure you want to delete the resource '{0}'?", res);
- if (parent != null)
- msg.TransientFor = parent.Toplevel as Gtk.Window;
- if (msg.Run () == (int) ResponseType.Yes) {
- resourceProvider.RemoveResource (res);
- resourceListStore.Remove (ref iter);
- }
- msg.Destroy ();
- }
- }
-
- bool Validate ()
- {
- if (notebook.Page == 2) {
- if (fileChooser.Filename == null || fileChooser.Filename.Length == 0 || !File.Exists (fileChooser.Filename))
- return true;
-
- importedImageFile = project.ImportFile (fileChooser.Filename);
- if (importedImageFile != null)
- importedImageFile = WidgetUtils.AbsoluteToRelativePath (project.ImagesRootPath, importedImageFile);
- return importedImageFile != null;
- }
- return true;
- }
-
- void OnOkClicked (object s, EventArgs args)
- {
- if (Validate ())
- dialog.Respond (Gtk.ResponseType.Ok);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconList.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconList.cs
deleted file mode 100644
index b8c56769909..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconList.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-using System;
-using System.Reflection;
-using System.Collections;
-using Gtk;
-
-namespace Stetic.Editor
-{
- class StockIconList : IconList
- {
- public StockIconList ()
- {
- foreach (PropertyInfo info in typeof (Gtk.Stock).GetProperties (BindingFlags.Public | BindingFlags.Static)) {
- if (info.CanRead && info.PropertyType == typeof (string)) {
- string name = (string) info.GetValue (null, null);
- AddIcon (name, WidgetUtils.LoadIcon (name, Gtk.IconSize.Menu), name);
- }
- }
- foreach (PropertyInfo info in GnomeStock.Properties) {
- if (info.CanRead && info.PropertyType == typeof (string)) {
- string name = (string) info.GetValue (null, null);
- AddIcon (name, WidgetUtils.LoadIcon (name, Gtk.IconSize.Menu), name);
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconSelectorItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconSelectorItem.cs
deleted file mode 100644
index bf18e604f44..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockIconSelectorItem.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-
-using System;
-using Mono.Unix;
-
-namespace Stetic.Editor
-{
- public class StockIconSelectorItem: IconSelectorItem
- {
- public StockIconSelectorItem (IntPtr ptr): base (ptr)
- {
- }
-
- public StockIconSelectorItem (): base (Catalog.GetString ("Stock Icons"))
- {
- }
-
- protected override void CreateIcons ()
- {
- foreach (string s in StockIconHelper.StockIcons) {
- if (s != "-" && s != "|") {
- Gdk.Pixbuf pix = WidgetUtils.LoadIcon (s, Gtk.IconSize.Menu);
- if (pix != null) AddIcon (s, pix, s);
- }
- else
- AddSeparator (s);
- }
- }
- }
-
- class StockIconHelper
- {
- public static string[] StockIcons = {
- // Commands
- "gtk-new",
- "gtk-open",
- "gtk-save",
- "gtk-save-as",
- "gtk-revert-to-saved",
- "gtk-quit",
- "gtk-print",
- "gtk-print-preview",
- "gtk-properties",
- "|",
- "gtk-cut",
- "gtk-copy",
- "gtk-paste",
- "gtk-delete",
- "gtk-undelete",
- "gtk-undo",
- "gtk-redo",
- "gtk-preferences",
- "|",
- "gtk-execute",
- "gtk-stop",
- "gtk-refresh",
- "gtk-find",
- "gtk-find-and-replace",
- "|",
- "gtk-spell-check",
- "gtk-convert",
- "gtk-help",
- "|",
- "gtk-add",
- "gtk-remove",
- "gtk-clear",
- "-",
-
- // Formatting
- "gtk-bold",
- "gtk-italic",
- "gtk-underline",
- "gtk-strikethrough",
- "gtk-select-color",
- "gtk-select-font",
- "|",
- "gtk-indent",
- "gtk-unindent",
- "gtk-justify-center",
- "gtk-justify-fill",
- "gtk-justify-left",
- "gtk-justify-right",
- "|",
- "gtk-sort-ascending",
- "gtk-sort-descending",
- "|",
- "gtk-zoom-100",
- "gtk-zoom-fit",
- "gtk-zoom-in",
- "gtk-zoom-out",
- "-",
-
-
- // Dialog
- "gtk-yes",
- "gtk-no",
- "gtk-cancel",
- "gtk-ok",
- "gtk-apply",
- "gtk-close",
- "|",
- "gtk-dialog-error",
- "gtk-dialog-info",
- "gtk-dialog-question",
- "gtk-dialog-warning",
- "-",
-
- // Navigation
- "gtk-goto-bottom",
- "gtk-goto-first",
- "gtk-goto-last",
- "gtk-goto-top",
- "|",
- "gtk-go-back",
- "gtk-go-down",
- "gtk-go-forward",
- "gtk-go-up",
- "|",
- "gtk-home",
- "gtk-jump-to",
- "-",
-
- // Misc
- "gtk-cdrom",
- "gtk-floppy",
- "gtk-harddisk",
- "gtk-network",
- "gtk-color-picker",
- "gtk-dnd",
- "gtk-dnd-multiple",
- "gtk-missing-image",
- "gtk-index"
- };
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockItem.cs
deleted file mode 100644
index 5d9ed308da6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StockItem.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Stetic.Editor {
-
- internal static class GnomeStock {
-
- static string blank;
- static List props = new List ();
-
- static GnomeStock ()
- {
- try {
- Assembly assm = Assembly.Load ("gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f");
- if (assm == null)
- return;
-
- Type type = assm.GetType ("Gnome.Stock");
- if (type == null)
- return;
-
- foreach (PropertyInfo info in type.GetProperties (BindingFlags.Static | BindingFlags.Public)) {
- if (info.Name == "Blank")
- blank = (string) info.GetValue (null, null);
- props.Add (info);
- }
- } catch {
- }
- }
-
- public static string Blank {
- get { return blank == null ? Gtk.Stock.New : blank; }
- }
-
- public static List Properties {
- get { return props; }
- }
- }
-
- public class StockItem: BaseImageCell
- {
- string label;
-
- protected override void Initialize ()
- {
- base.Initialize ();
- string name = (string)Value;
- if (name != null) {
- Stetic.ObjectWrapper w = Stetic.ObjectWrapper.Lookup (Instance);
- Stetic.IProject project = w.Project;
- Gdk.Pixbuf px = project.IconFactory.RenderIcon (project, name, ImageSize);
- if (px != null) {
- Image = px;
- label = name;
- return;
- }
-
- Gtk.StockItem item = Gtk.Stock.Lookup (name);
- label = item.Label != null && item.Label.Length > 0 ? item.Label : name;
- label = label.Replace ("_", "");
-
- Gtk.IconSet iset = Gtk.IconFactory.LookupDefault (name);
- if (iset == null)
- Image = WidgetUtils.MissingIcon;
- else
- Image = iset.RenderIcon (new Gtk.Style (), Gtk.TextDirection.Ltr, Gtk.StateType.Normal, Gtk.IconSize.Menu, null, "");
- } else {
- Image = null;
- label = "";
- }
- }
-
- protected override string GetValueText ()
- {
- return label;
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new StockItemEditor ();
- }
- }
-
-/* [PropertyEditor ("StockId", "Changed")]
- public class StockItemEditor : Image {
-
- public StockItemEditor () : base (true, false) { }
-
- public override object Value {
- get { return StockId; }
- set { StockId = (string) value; }
- }
- }
- */
-
- public class StockItemEditor: Gtk.HBox, IPropertyEditor
- {
- Gtk.Image image;
- Gtk.Entry entry;
- Gtk.Button button;
- string icon;
- IProject project;
- Gtk.Frame imageFrame;
-
- public StockItemEditor()
- {
- Spacing = 3;
- imageFrame = new Gtk.Frame ();
- imageFrame.Shadow = Gtk.ShadowType.In;
- imageFrame.BorderWidth = 2;
- PackStart (imageFrame, false, false, 0);
-
- image = new Gtk.Image (GnomeStock.Blank, Gtk.IconSize.Button);
- imageFrame.Add (image);
-
- entry = new Gtk.Entry ();
- entry.Changed += OnTextChanged;
- entry.HasFrame = false;
- PackStart (entry, true, true, 0);
-
- button = new Gtk.Button ();
- button.Add (new Gtk.Arrow (Gtk.ArrowType.Down, Gtk.ShadowType.Out));
- PackStart (button, false, false, 0);
- button.Clicked += button_Clicked;
- ShowAll ();
- }
-
- void button_Clicked (object obj, EventArgs args)
- {
- IconSelectorMenu menu = new IconSelectorMenu (project);
- menu.IconSelected += OnStockSelected;
- menu.ShowAll ();
- menu.Popup (null, null, new Gtk.MenuPositionFunc (OnDropMenuPosition), 3, Gtk.Global.CurrentEventTime);
- }
-
- void OnDropMenuPosition (Gtk.Menu menu, out int x, out int y, out bool pushIn)
- {
- button.ParentWindow.GetOrigin (out x, out y);
- x += button.Allocation.X;
- y += button.Allocation.Y + button.Allocation.Height;
- pushIn = true;
- }
-
- void OnStockSelected (object s, IconEventArgs args)
- {
- Value = args.IconId;
- }
-
- void OnTextChanged (object s, EventArgs a)
- {
- if (entry.Text.Length == 0)
- Value = null;
- else
- Value = entry.Text;
- }
-
- // Called once to initialize the editor.
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(string))
- throw new ApplicationException ("StockItem editor does not support editing values of type " + prop.PropertyType);
- }
-
- // Called when the object to be edited changes.
- public void AttachObject (object obj)
- {
- Stetic.ObjectWrapper w = Stetic.ObjectWrapper.Lookup (obj);
- project = w.Project;
- }
-
- // Gets/Sets the value of the editor. If the editor supports
- // several value types, it is the responsibility of the editor
- // to return values with the expected type.
- public object Value {
- get { return icon; }
- set {
- icon = (string) value;
- if (icon != null && icon.Length > 0) {
- entry.Text = icon;
- Gdk.Pixbuf px = project.IconFactory.RenderIcon (project, icon, Gtk.IconSize.Menu);
- if (px == null)
- px = WidgetUtils.LoadIcon (icon, Gtk.IconSize.Menu);
- image.Pixbuf = px;
- imageFrame.Show ();
- } else {
- imageFrame.Hide ();
- entry.Text = "";
- }
-
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
-
- // To be fired when the edited value changes.
- public event EventHandler ValueChanged;
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/String.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/String.cs
deleted file mode 100644
index dafbb3922a5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/String.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("Text", "Changed")]
- public class String : Translatable {
-
- Gtk.Entry entry;
-
- public override void Initialize (PropertyDescriptor prop)
- {
- base.Initialize (prop);
-
- entry = new Gtk.Entry ();
- entry.HasFrame = false;
- entry.Show ();
- entry.Changed += EntryChanged;
- Add (entry);
- }
-
- protected override void CheckType (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(string))
- throw new ApplicationException ("String editor does not support editing values of type " + prop.PropertyType);
- }
-
- public override object Value {
- get {
- return entry.Text;
- }
- set {
- if (value == null)
- entry.Text = "";
- else
- entry.Text = (string) value;
- }
- }
-
- void EntryChanged (object obj, EventArgs args)
- {
- OnValueChanged ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StringArray.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StringArray.cs
deleted file mode 100644
index ca8d5bd0641..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/StringArray.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-
-using System;
-using Gtk;
-using Gdk;
-using System.Text;
-
-namespace Stetic.Editor
-{
- public class StringArray: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- string[] val = (string[]) Value;
- return val == null ? string.Empty : "(Collection)";
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new StringArrayEditor ();
- }
- }
-
- public class StringArrayEditor: Gtk.HBox, IPropertyEditor
- {
- Gtk.Entry label;
- Gtk.Button button;
- PropertyDescriptor prop;
- object obj;
- string[] strings;
-
- public StringArrayEditor()
- {
- label = new Gtk.Entry ();
- label.IsEditable = false;
- PackStart (label, true, true, 0);
- button = new Button ("...");
- PackStart (button, false, false, 3);
- button.Clicked += ButtonClicked;
- ShowAll ();
- }
-
- void ButtonClicked (object s, EventArgs a)
- {
- using (TextEditorDialog dlg = new TextEditorDialog ()) {
- dlg.Text = strings != null ? string.Join ("\n", strings) : "";
- dlg.SetTranslatable (prop.Translatable);
- dlg.TransientFor = this.Toplevel as Gtk.Window;
- if (prop.Translatable) {
- dlg.Translated = prop.IsTranslated (obj);
- dlg.ContextHint = prop.TranslationContext (obj);
- dlg.Comment = prop.TranslationComment (obj);
- }
- if (dlg.Run () == (int) ResponseType.Ok) {
- if (prop.Translatable) {
- prop.SetTranslated (obj, dlg.Translated);
- if (dlg.Translated) {
- prop.SetTranslationComment (obj, dlg.Comment);
- prop.SetTranslationContext (obj, dlg.ContextHint);
- }
- }
- if (dlg.Text.Length == 0)
- strings = null;
- else
- strings = dlg.Text.Split ('\n');
- UpdateLabel ();
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- if (descriptor.PropertyType != typeof(string[]))
- throw new InvalidOperationException ("StringArrayEditor can only edit string[] properties");
- prop = descriptor;
- }
-
- public void AttachObject (object obj)
- {
- this.obj = obj;
- }
-
- public object Value {
- get { return strings; }
- set {
- strings = (string[]) value;
- UpdateLabel ();
- }
- }
-
- void UpdateLabel ()
- {
- label.Text = strings != null ? "(Collection)" : System.String.Empty;
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
deleted file mode 100644
index 4bb92de6289..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace Stetic.Editor
-{
- public class Text : PropertyTextEditor
- {
- public Text ()
- {
- // Don't allow editing the text in the editor
- // since there is no room for multiline edit in the grid.
- entry.Sensitive = false;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextBox.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextBox.cs
deleted file mode 100644
index 6dd84a878ca..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextBox.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public class TextBox : Gtk.ScrolledWindow {
-
- Gtk.TextView textview;
-
- public TextBox (int nlines)
- {
- ShadowType = Gtk.ShadowType.In;
- SetPolicy (Gtk.PolicyType.Never, Gtk.PolicyType.Automatic);
-
- textview = new Gtk.TextView ();
- textview.WrapMode = Gtk.WrapMode.Word;
- textview.Show ();
- Add (textview);
-
- Pango.Context ctx = textview.PangoContext;
- Pango.FontMetrics metrics = ctx.GetMetrics (textview.Style.FontDescription,
- ctx.Language);
- int lineHeight = (metrics.Ascent + metrics.Descent) / (int)Pango.Scale.PangoScale;
- SetSizeRequest (-1, lineHeight * nlines);
-
- textview.Buffer.Changed += Buffer_Changed;
- }
-
- public Gtk.TextView TextView {
- get {
- return textview;
- }
- }
-
- public string Text {
- get {
- return textview.Buffer.Text;
- }
- set {
- textview.Buffer.Text = value;
- }
- }
-
- void Buffer_Changed (object obj, EventArgs args)
- {
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
-
- public event EventHandler Changed;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditorDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditorDialog.cs
deleted file mode 100644
index e0c05c9283a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditorDialog.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-
-using System;
-
-namespace Stetic.Editor
-{
- public class TextEditorDialog: IDisposable
- {
- #pragma warning disable 649 // never assigned
- [Glade.Widget] Gtk.TextView textview;
- [Glade.Widget] Gtk.CheckButton checkTranslatable;
- [Glade.Widget] Gtk.Entry entryContext;
- [Glade.Widget] Gtk.Entry entryComment;
- [Glade.Widget] Gtk.Table translationTable;
- [Glade.Widget ("TextEditorDialog")] Gtk.Dialog dialog;
- #pragma warning restore 649
-
- public TextEditorDialog ()
- {
- Glade.XML xml = new Glade.XML (null, "stetic.glade", "TextEditorDialog", null);
- xml.Autoconnect (this);
- entryContext.Sensitive = entryComment.Sensitive = false;
- }
-
- public string Text {
- get { return textview.Buffer.Text; }
- set { textview.Buffer.Text = value; }
- }
-
- public string ContextHint {
- get { return entryContext.Text; }
- set { entryContext.Text = value != null ? value : ""; }
- }
-
- public string Comment {
- get { return entryComment.Text; }
- set { entryComment.Text = value != null ? value : ""; }
- }
-
- public bool Translated {
- get { return checkTranslatable.Active; }
- set { checkTranslatable.Active = value; }
- }
-
- public Gtk.Window TransientFor {
- set { dialog.TransientFor = value; }
- }
-
- public void SetTranslatable (bool translatable)
- {
- if (!translatable) {
- translationTable.Visible = false;
- checkTranslatable.Visible = false;
- }
- }
-
- protected void OnTranslatableToggled (object s, EventArgs a)
- {
- entryContext.Sensitive = checkTranslatable.Active;
- entryComment.Sensitive = checkTranslatable.Active;
- }
-
- public int Run ()
- {
- return dialog.Run ();
- }
-
- public void Dispose ()
- {
- dialog.Destroy ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIcon.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIcon.cs
deleted file mode 100644
index 3da369f94c1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIcon.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using Gtk;
-using System;
-
-namespace Stetic.Editor {
-
- [PropertyEditor ("Value", "Changed")]
- public class ThemedIcon : Gtk.HBox, IPropertyEditor {
- Gtk.Image image;
- Gtk.Entry entry;
- Gtk.Button button;
-
- public ThemedIcon () : base (false, 6)
- {
- image = new Gtk.Image (GnomeStock.Blank, Gtk.IconSize.Button);
- PackStart (image, false, false, 0);
-
- entry = new Gtk.Entry ();
- PackStart (entry, true, true, 0);
- entry.Changed += entry_Changed;
-
- button = new Gtk.Button ("...");
- PackStart (button, false, false, 0);
- button.Clicked += button_Clicked;
- }
-
- public void Initialize (PropertyDescriptor prop)
- {
- if (prop.PropertyType != typeof(string))
- throw new ApplicationException ("ThemedIcon editor does not support editing values of type " + prop.PropertyType);
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public event EventHandler ValueChanged;
-
- bool syncing;
-
- void entry_Changed (object obj, EventArgs args)
- {
- if (!syncing)
- Value = entry.Text;
- }
-
- void button_Clicked (object obj, EventArgs args)
- {
- Gtk.Window parent = (Gtk.Window)GetAncestor (Gtk.Window.GType);
- Value = ThemedIconBrowser.Browse (parent, (string) Value);
- }
-
- string icon;
- public object Value {
- get {
- return icon;
- }
- set {
- string val = (string) value;
- if (icon == val)
- return;
-
- icon = val;
- Gdk.Pixbuf pix = WidgetUtils.LoadIcon (icon, Gtk.IconSize.Menu);
- if (pix != null) {
- image.Pixbuf = pix;
- } else {
- image.Stock = GnomeStock.Blank;
- }
-
- syncing = true;
- entry.Text = icon;
- syncing = false;
-
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
- }
- }
-
- public class ThemedIconBrowser : Gtk.Dialog {
-
- public ThemedIconBrowser (Gtk.Window parent) :
- base ("Select a Themed Icon", parent, Gtk.DialogFlags.Modal,
- Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
- Gtk.Stock.Ok, Gtk.ResponseType.Ok)
- {
- HasSeparator = false;
- BorderWidth = 12;
- VBox.Spacing = 18;
- VBox.BorderWidth = 0;
-
- DefaultResponse = Gtk.ResponseType.Ok;
-
- Gtk.HBox hbox = new Gtk.HBox (false, 12);
- VBox.PackStart (hbox, false, false, 0);
-
- entry = new Gtk.Entry ();
- entry.Activated += DoFind;
- hbox.PackStart (entry);
-
- Gtk.Button button = new Gtk.Button (Gtk.Stock.Find);
- button.Clicked += DoFind;
- hbox.PackStart (button, false, false, 0);
-
- ScrolledWindow scwin = new Gtk.ScrolledWindow ();
- scwin.SizeRequested += ScrolledWindowSizeRequested;
- VBox.PackStart (scwin, true, true, 0);
- scwin.SetPolicy (Gtk.PolicyType.Never, Gtk.PolicyType.Automatic);
- scwin.ShadowType = Gtk.ShadowType.In;
-
- list = new ThemedIconList ();
- scwin.Add (list);
- list.SelectionChanged += ListSelectionChanged;
- list.Activated += ListActivated;
- SetResponseSensitive (Gtk.ResponseType.Ok, false);
-
- VBox.ShowAll ();
- }
-
- public static string Browse (Gtk.Window parent, string selection)
- {
- ThemedIconBrowser browser = new ThemedIconBrowser (parent);
- browser.list.Selection = selection;
- int response = browser.Run ();
- if (response == (int)Gtk.ResponseType.Ok)
- selection = browser.list.Selection;
- browser.Destroy ();
- return selection;
- }
-
- Gtk.Entry entry;
- ThemedIconList list;
-
- void ScrolledWindowSizeRequested (object obj, SizeRequestedArgs args)
- {
- Gtk.Requisition req = list.SizeRequest ();
- if (req.Width <= 0)
- return;
-
- Gtk.ScrolledWindow scwin = ((Gtk.ScrolledWindow)obj);
- scwin.SizeRequested -= ScrolledWindowSizeRequested;
- scwin.SetSizeRequest (req.Width, req.Width * 2 / 3);
- ActionArea.BorderWidth = 0; // has to happen post-realize
- }
-
- void ListSelectionChanged (object obj, EventArgs args)
- {
- SetResponseSensitive (Gtk.ResponseType.Ok, list.Selection != null);
- }
-
- void ListActivated (object obj, EventArgs args)
- {
- Respond (Gtk.ResponseType.Ok);
- }
-
- void DoFind (object obj, EventArgs args)
- {
- list.Find (entry.Text);
- }
-
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIconList.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIconList.cs
deleted file mode 100644
index dd1dc1a12b5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/ThemedIconList.cs
+++ /dev/null
@@ -1,1018 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-
-namespace Stetic.Editor
-{
- class ThemedIconList : IconList
- {
- public ThemedIconList ()
- {
- Gtk.IconTheme theme = Gtk.IconTheme.Default;
- foreach (string icon in ThemeIconNames)
- AddIcon (icon, GetPixbuf (theme, icon), icon);
- }
-
- Gdk.Pixbuf GetPixbuf (Gtk.IconTheme theme, string name)
- {
- try {
- return theme.LoadIcon (name, 16, 0);
- } catch {
- return RenderIcon (name, Gtk.IconSize.Menu, null);
- }
- }
-
- public static string[] ThemeIconNames = new string[] {
- // Gtk 2.6 stock icons
- "gtk-about",
- "gtk-add",
- "gtk-apply",
- "gtk-bold",
- "gtk-cancel",
- "gtk-cdrom",
- "gtk-clear",
- "gtk-close",
- "gtk-color-picker",
- "gtk-connect",
- "gtk-convert",
- "gtk-copy",
- "gtk-cut",
- "gtk-delete",
- "gtk-dialog-authentication",
- "gtk-dialog-error",
- "gtk-dialog-info",
- "gtk-dialog-question",
- "gtk-dialog-warning",
- "gtk-directory",
- "gtk-disconnect",
- "gtk-dnd",
- "gtk-dnd-multiple",
- "gtk-edit",
- "gtk-execute",
- "gtk-file",
- "gtk-find",
- "gtk-find-and-replace",
- "gtk-floppy",
- "gtk-go-back",
- "gtk-go-down",
- "gtk-go-forward",
- "gtk-go-up",
- "gtk-goto-bottom",
- "gtk-goto-first",
- "gtk-goto-last",
- "gtk-goto-top",
- "gtk-harddisk",
- "gtk-help",
- "gtk-home",
- "gtk-indent",
- "gtk-index",
- "gtk-italic",
- "gtk-jump-to",
- "gtk-justify-center",
- "gtk-justify-fill",
- "gtk-justify-left",
- "gtk-justify-right",
- "gtk-media-forward",
- "gtk-media-next",
- "gtk-media-pause",
- "gtk-media-play",
- "gtk-media-previous",
- "gtk-media-record",
- "gtk-media-rewind",
- "gtk-media-stop",
- "gtk-missing-image",
- "gtk-network",
- "gtk-new",
- "gtk-no",
- "gtk-ok",
- "gtk-open",
- "gtk-paste",
- "gtk-preferences",
- "gtk-print",
- "gtk-print-preview",
- "gtk-properties",
- "gtk-quit",
- "gtk-redo",
- "gtk-refresh",
- "gtk-remove",
- "gtk-revert-to-saved",
- "gtk-save",
- "gtk-save-as",
- "gtk-select-color",
- "gtk-select-font",
- "gtk-sort-ascending",
- "gtk-sort-descending",
- "gtk-spell-check",
- "gtk-stop",
- "gtk-strikethrough",
- "gtk-undelete",
- "gtk-underline",
- "gtk-undo",
- "gtk-unindent",
- "gtk-yes",
- "gtk-zoom-100",
- "gtk-zoom-fit",
- "gtk-zoom-in",
- "gtk-zoom-out",
-
- // Themable stock icons
- "stock_about",
- "stock_active",
- "stock_add-bookmark",
- "stock_add-decimal-place",
- "stock_addressbook",
- "stock_advanced-filter",
- "stock_alarm",
- "stock_alignment",
- "stock_alignment-bottom",
- "stock_alignment-centered",
- "stock_alignment-centered-vertically",
- "stock_alignment-left",
- "stock_alignment-right",
- "stock_alignment-top",
- "stock_allow-effects",
- "stock_anchor",
- "stock_animation",
- "stock_appointment-reminder",
- "stock_appointment-reminder-excl",
- "stock_arrowstyle",
- "stock_attach",
- "stock_auto-contour",
- "stock_autocompletion",
- "stock_autofilter",
- "stock_autoformat",
- "stock_autopilot",
- "stock_autopilot-24",
- "stock_autospellcheck",
- "stock_autotext",
- "stock_bell",
- "stock_bluetooth",
- "stock_book_blue",
- "stock_book_green",
- "stock_book_open",
- "stock_book_red",
- "stock_book_yellow",
- "stock_bookmark",
- "stock_bottom",
- "stock_briefcase",
- "stock_brightness",
- "stock_bring-backward",
- "stock_bring-forward",
- "stock_bucketfill",
- "stock_calc-accept",
- "stock_calc-cancel",
- "stock_calendar",
- "stock_calendar-and-tasks",
- "stock_calendar-view-day",
- "stock_calendar-view-list",
- "stock_calendar-view-month",
- "stock_calendar-view-week",
- "stock_calendar-view-work-week",
- "stock_calendar-view-year",
- "stock_cell-align-bottom",
- "stock_cell-align-center",
- "stock_cell-align-top",
- "stock_cell-phone",
- "stock_certificate",
- "stock_channel",
- "stock_channel-blue",
- "stock_channel-green",
- "stock_channel-red",
- "stock_chart",
- "stock_chart-autoformat",
- "stock_chart-data-in-columns",
- "stock_chart-data-in-rows",
- "stock_chart-edit-type",
- "stock_chart-reorganize",
- "stock_chart-scale-text",
- "stock_chart-toggle-axes",
- "stock_chart-toggle-axes-title",
- "stock_chart-toggle-hgrid",
- "stock_chart-toggle-legend",
- "stock_chart-toggle-title",
- "stock_chart-toggle-vgrid",
- "stock_check-filled",
- "stock_choose-themes",
- "stock_close",
- "stock_color",
- "stock_compile",
- "stock_connect",
- "stock_connect-to-url",
- "stock_contact",
- "stock_contact-list",
- "stock_contrast",
- "stock_copy",
- "stock_create-with-attributes",
- "stock_creditcard",
- "stock_crop",
- "stock_cut",
- "stock_data-delete-link",
- "stock_data-delete-query",
- "stock_data-delete-record",
- "stock_data-delete-sql-query",
- "stock_data-delete-table",
- "stock_data-edit-link",
- "stock_data-edit-query",
- "stock_data-edit-sql-query",
- "stock_data-edit-table",
- "stock_data-explorer",
- "stock_data-first",
- "stock_data-last",
- "stock_data-link",
- "stock_data-linked-table",
- "stock_data-links",
- "stock_data-new-link",
- "stock_data-new-query",
- "stock_data-new-record",
- "stock_data-new-sql-query",
- "stock_data-new-table",
- "stock_data-next",
- "stock_data-previous",
- "stock_data-queries",
- "stock_data-query",
- "stock_data-query-rename",
- "stock_data-save",
- "stock_data-sources",
- "stock_data-sources-delete",
- "stock_data-sources-hand",
- "stock_data-sources-modified",
- "stock_data-sources-new",
- "stock_data-table",
- "stock_data-tables",
- "stock_data-undo",
- "stock_datapilot",
- "stock_decrease-font",
- "stock_default-folder",
- "stock_delete",
- "stock_delete-autofilter",
- "stock_delete-bookmark",
- "stock_delete-column",
- "stock_delete-decimal-place",
- "stock_delete-row",
- "stock_dialog-error",
- "stock_dialog-info",
- "stock_dialog-question",
- "stock_dialog-warning",
- "stock_directcursor",
- "stock_directory-server",
- "stock_disconnect",
- "stock_display-grid",
- "stock_display-guides",
- "stock_distort",
- "stock_down",
- "stock_down-with-subpoints",
- "stock_drag-mode",
- "stock_draw-arc",
- "stock_draw-callouts",
- "stock_draw-circle",
- "stock_draw-circle-arc",
- "stock_draw-circle-pie",
- "stock_draw-circle-pie-unfilled",
- "stock_draw-circle-segment",
- "stock_draw-circle-segment-unfilled",
- "stock_draw-circle-unfilled",
- "stock_draw-cone",
- "stock_draw-connector",
- "stock_draw-connector-ends-with-arrow",
- "stock_draw-connector-ends-with-circle",
- "stock_draw-connector-starts-with-arrow",
- "stock_draw-connector-starts-with-circle",
- "stock_draw-connector-with-arrows",
- "stock_draw-connector-with-circles",
- "stock_draw-cube",
- "stock_draw-curve",
- "stock_draw-curve-filled",
- "stock_draw-curved-connector",
- "stock_draw-curved-connector-ends-with-arrow",
- "stock_draw-curved-connector-ends-with-circle",
- "stock_draw-curved-connector-starts-with-arrow",
- "stock_draw-curved-connector-starts-with-circle",
- "stock_draw-curved-connector-with-arrows",
- "stock_draw-curved-connector-with-circles",
- "stock_draw-cylinder",
- "stock_draw-dimension-line",
- "stock_draw-ellipse",
- "stock_draw-ellipse-pie",
- "stock_draw-ellipse-pie-unfilled",
- "stock_draw-ellipse-segment",
- "stock_draw-ellipse-segment-unfilled",
- "stock_draw-ellipse-unfilled",
- "stock_draw-freeform-line",
- "stock_draw-freeform-line-filled",
- "stock_draw-half-sphere",
- "stock_draw-line",
- "stock_draw-line-45",
- "stock_draw-line-connector",
- "stock_draw-line-connector-ends-with-arrow",
- "stock_draw-line-connector-ends-with-circle",
- "stock_draw-line-connector-starts-with-arrow",
- "stock_draw-line-connector-starts-with-circle",
- "stock_draw-line-connector-with-arrows",
- "stock_draw-line-connector-with-circles",
- "stock_draw-line-ends-with-arrow",
- "stock_draw-line-starts-with-arrow",
- "stock_draw-line-with-arrow-circle",
- "stock_draw-line-with-arrow-square",
- "stock_draw-line-with-arrows",
- "stock_draw-line-with-circle-arrow",
- "stock_draw-line-with-square-arrow",
- "stock_draw-polygon",
- "stock_draw-polygon-45",
- "stock_draw-polygon-45-filled",
- "stock_draw-polygon-filled",
- "stock_draw-pyramid",
- "stock_draw-rectangle",
- "stock_draw-rectangle-unfilled",
- "stock_draw-rounded-rectangle",
- "stock_draw-rounded-rectangle-unfilled",
- "stock_draw-rounded-square",
- "stock_draw-rounded-square-unfilled",
- "stock_draw-selection",
- "stock_draw-shell",
- "stock_draw-sphere",
- "stock_draw-square",
- "stock_draw-square-unfilled",
- "stock_draw-straight-connector",
- "stock_draw-straight-connector-ends-with-arrow",
- "stock_draw-straight-connector-ends-with-circle",
- "stock_draw-straight-connector-starts-with-arrow",
- "stock_draw-straight-connector-starts-with-circle",
- "stock_draw-straight-connector-with-arrows",
- "stock_draw-straight-connector-with-circles",
- "stock_draw-text",
- "stock_draw-text-animation",
- "stock_draw-text-frame",
- "stock_draw-torus",
- "stock_draw-vertical-callouts",
- "stock_draw-vertical-text",
- "stock_draw-vertical-text-frame",
- "stock_edit",
- "stock_edit-bookmark",
- "stock_edit-contour",
- "stock_edit-headers-and-footers",
- "stock_edit-points",
- "stock_effects",
- "stock_effects-more-options",
- "stock_effects-object",
- "stock_effects-object-colorize",
- "stock_effects-object-hide",
- "stock_effects-play-in-full",
- "stock_effects-preview",
- "stock_effects-sound",
- "stock_effects-text",
- "stock_enter-group",
- "stock_equals",
- "stock_error-next",
- "stock_error-next-16",
- "stock_error-previous",
- "stock_error-previous-16",
- "stock_euro",
- "stock_example",
- "stock_exchange-columns",
- "stock_exchange-connector",
- "stock_exchange-rows",
- "stock_exit",
- "stock_exit-group",
- "stock_export",
- "stock_extended-help",
- "stock_file-properties",
- "stock_file-with-objects",
- "stock_filter-data-by-criteria",
- "stock_filter-navigator",
- "stock_filters",
- "stock_filters-aging",
- "stock_filters-charcoal",
- "stock_filters-invert",
- "stock_filters-pixelize",
- "stock_filters-pop-art",
- "stock_filters-posterize",
- "stock_filters-relief",
- "stock_filters-remove-noise",
- "stock_filters-sharpen",
- "stock_filters-smooth",
- "stock_filters-solarize",
- "stock_first",
- "stock_first-page",
- "stock_flip",
- "stock_flip-horizontally",
- "stock_flip-vertically",
- "stock_folder",
- "stock_folder-copy",
- "stock_folder-move",
- "stock_folder-properties",
- "stock_font",
- "stock_font-formatting-toggle",
- "stock_font-size",
- "stock_fontwork",
- "stock_fontwork-2dshadow",
- "stock_fontwork-3dshadow",
- "stock_fontwork-adaptation-off",
- "stock_fontwork-adaptation-rotate",
- "stock_fontwork-adaptation-slant-h",
- "stock_fontwork-adaptation-slant-v",
- "stock_fontwork-adaptation-straight",
- "stock_fontwork-align-fill",
- "stock_fontwork-noshadow",
- "stock_fontwork-preview-spline",
- "stock_fontwork-reverse-text-flow",
- "stock_fontwork-shadow-angle",
- "stock_fontwork-shadow-length",
- "stock_fontwork-shadow-x-offset",
- "stock_fontwork-shadow-y-offset",
- "stock_fontwork-spline-distance",
- "stock_fontwork-spline-indent",
- "stock_fontwork-text-border",
- "stock_form-activation-order",
- "stock_form-add-field",
- "stock_form-automatic-control-focus",
- "stock_form-autopilots",
- "stock_form-button",
- "stock_form-checkbox",
- "stock_form-combobox",
- "stock_form-control-properties",
- "stock_form-currency-field",
- "stock_form-date-field",
- "stock_form-design-mode",
- "stock_form-file-selection",
- "stock_form-formatted-field",
- "stock_form-frame",
- "stock_form-image-button",
- "stock_form-image-control",
- "stock_form-label",
- "stock_form-letter-dialog",
- "stock_form-line-horizontal",
- "stock_form-line-vertical",
- "stock_form-listbox",
- "stock_form-navigator",
- "stock_form-numerical-field",
- "stock_form-open-in-design-mode",
- "stock_form-pattern-field",
- "stock_form-progressbar",
- "stock_form-properties",
- "stock_form-radio",
- "stock_form-table-control",
- "stock_form-text-box",
- "stock_form-time-field",
- "stock_format-character",
- "stock_format-default",
- "stock_format-numbering-bullets",
- "stock_format-object",
- "stock_format-page",
- "stock_format-paragraph",
- "stock_format-percent",
- "stock_format-scientific",
- "stock_formula-cursor",
- "stock_frame",
- "stock_fullscreen",
- "stock_function-autopilot",
- "stock_gamma",
- "stock_glue",
- "stock_gluepoint-down",
- "stock_gluepoint-horizontal-center",
- "stock_gluepoint-horizontal-left",
- "stock_gluepoint-horizontal-right",
- "stock_gluepoint-left",
- "stock_gluepoint-relative",
- "stock_gluepoint-right",
- "stock_gluepoint-up",
- "stock_gluepoint-vertical-bottom",
- "stock_gluepoint-vertical-center",
- "stock_gluepoint-vertical-top",
- "stock_goal-seek",
- "stock_gradient",
- "stock_graphic-styles",
- "stock_graphics-align-bottom",
- "stock_graphics-align-center",
- "stock_graphics-align-centered",
- "stock_graphics-align-left",
- "stock_graphics-align-right",
- "stock_graphics-align-top",
- "stock_group",
- "stock_group-cells",
- "stock_groupwise-connector",
- "stock_guides",
- "stock_hand-signed",
- "stock_handles-big",
- "stock_handles-simple",
- "stock_headphones",
- "stock_help",
- "stock_help-add-bookmark",
- "stock_help-agent",
- "stock_help-book",
- "stock_help-book-open",
- "stock_help-chat",
- "stock_help-document",
- "stock_help-pane-off",
- "stock_help-pane-on",
- "stock_home",
- "stock_hyperlink",
- "stock_hyperlink-internet-search",
- "stock_hyperlink-target",
- "stock_hyperlink-toolbar",
- "stock_id",
- "stock_imagemap-editor",
- "stock_inbox",
- "stock_increase-font",
- "stock_init",
- "stock_insert-applet",
- "stock_insert-caption",
- "stock_insert-cells",
- "stock_insert-cells-down",
- "stock_insert-cells-right",
- "stock_insert-chart",
- "stock_insert-columns",
- "stock_insert-cross-reference",
- "stock_insert-fields",
- "stock_insert-fields-author",
- "stock_insert-fields-subject",
- "stock_insert-fields-title",
- "stock_insert-file",
- "stock_insert-floating-frame",
- "stock_insert-footer",
- "stock_insert-form",
- "stock_insert-gluepoint",
- "stock_insert-header",
- "stock_insert-math-object",
- "stock_insert-names-define",
- "stock_insert-note",
- "stock_insert-ole-object",
- "stock_insert-plugin",
- "stock_insert-rows",
- "stock_insert-rule",
- "stock_insert-single-column-text-frame",
- "stock_insert-slide",
- "stock_insert-sound-plugin",
- "stock_insert-table",
- "stock_insert-text-frame",
- "stock_insert-url",
- "stock_insert-video-plugin",
- "stock_insert_endnote",
- "stock_insert_footnote",
- "stock_insert_graphic",
- "stock_insert_image",
- "stock_insert_index_marker",
- "stock_insert_section",
- "stock_insert_special_character",
- "stock_interaction",
- "stock_internet",
- "stock_keyring",
- "stock_landline-phone",
- "stock_last",
- "stock_last-page",
- "stock_left",
- "stock_left-with-subpoints",
- "stock_line-spacing-1",
- "stock_line-spacing-1.5",
- "stock_line-spacing-2",
- "stock_line_in",
- "stock_linepen",
- "stock_link",
- "stock_list-insert-unnumbered",
- "stock_list_bullet",
- "stock_list_enum",
- "stock_list_enum-off",
- "stock_list_enum-restart",
- "stock_live-mode",
- "stock_lock",
- "stock_lock-broken",
- "stock_lock-ok",
- "stock_lock-open",
- "stock_macro-check-brackets",
- "stock_macro-controls",
- "stock_macro-insert",
- "stock_macro-insert-breakpoint",
- "stock_macro-jump-back",
- "stock_macro-objects",
- "stock_macro-organizer",
- "stock_macro-stop-after-command",
- "stock_macro-stop-after-procedure",
- "stock_macro-stop-watching",
- "stock_macro-watch-variable",
- "stock_mail",
- "stock_mail-accounts",
- "stock_mail-compose",
- "stock_mail-copy",
- "stock_mail-druid",
- "stock_mail-druid-account",
- "stock_mail-filters-apply",
- "stock_mail-flag-for-followup",
- "stock_mail-flag-for-followup-done",
- "stock_mail-forward",
- "stock_mail-handling",
- "stock_mail-hide-deleted",
- "stock_mail-hide-read",
- "stock_mail-hide-selected",
- "stock_mail-import",
- "stock_mail-merge",
- "stock_mail-move",
- "stock_mail-open",
- "stock_mail-open-multiple",
- "stock_mail-priority-high",
- "stock_mail-receive",
- "stock_mail-replied",
- "stock_mail-reply",
- "stock_mail-reply-to-all",
- "stock_mail-send",
- "stock_mail-send-receive",
- "stock_mail-unread",
- "stock_mail-unread-multiple",
- "stock_mark",
- "stock_media-fwd",
- "stock_media-next",
- "stock_media-pause",
- "stock_media-play",
- "stock_media-prev",
- "stock_media-rec",
- "stock_media-rew",
- "stock_media-shuffle",
- "stock_media-stop",
- "stock_message-display",
- "stock_mic",
- "stock_midi",
- "stock_modify-layout",
- "stock_music-library",
- "stock_my-documents",
- "stock_navigate-next",
- "stock_navigate-prev",
- "stock_navigator",
- "stock_navigator-all-or-sel-toggle",
- "stock_navigator-database-ranges",
- "stock_navigator-drag-mode",
- "stock_navigator-edit-entry",
- "stock_navigator-foonote-body-toggle",
- "stock_navigator-footer-body-toggle",
- "stock_navigator-header-body-toggle",
- "stock_navigator-headings",
- "stock_navigator-indexes",
- "stock_navigator-insert-as-copy",
- "stock_navigator-insert-as-link",
- "stock_navigator-insert-index",
- "stock_navigator-insert-linked",
- "stock_navigator-levels",
- "stock_navigator-list-box-toggle",
- "stock_navigator-master-toggle",
- "stock_navigator-next-object",
- "stock_navigator-open-toolbar",
- "stock_navigator-previous-object",
- "stock_navigator-range-names",
- "stock_navigator-references",
- "stock_navigator-reminder",
- "stock_navigator-scenarios",
- "stock_navigator-sections",
- "stock_navigator-shift-down",
- "stock_navigator-shift-left",
- "stock_navigator-shift-right",
- "stock_navigator-shift-up",
- "stock_navigator-table-formula",
- "stock_navigator-text",
- "stock_navigator-update-entry",
- "stock_navigator-wrong-table-formula",
- "stock_network-printer",
- "stock_new",
- "stock_new",
- "stock_new-24h-appointment",
- "stock_new-appointment",
- "stock_new-bcard",
- "stock_new-dir",
- "stock_new-drawing",
- "stock_new-formula",
- "stock_new-html",
- "stock_new-labels",
- "stock_new-master-document",
- "stock_new-meeting",
- "stock_new-presentation",
- "stock_new-spreadsheet",
- "stock_new-tab",
- "stock_new-template",
- "stock_new-text",
- "stock_new-window",
- "stock_news",
- "stock_next",
- "stock_next-page",
- "stock_node-add",
- "stock_node-close-path",
- "stock_node-convert",
- "stock_node-corner",
- "stock_node-corner-to-smooth",
- "stock_node-curve-split",
- "stock_node-delete",
- "stock_node-mark-for-deletion",
- "stock_node-move",
- "stock_node-smooth-to-symmetrical",
- "stock_nonprinting-chars",
- "stock_not",
- "stock_not-spam",
- "stock_notebook",
- "stock_notes",
- "stock_object-behind",
- "stock_object-infront",
- "stock_online-layout",
- "stock_open",
- "stock_open-read-only",
- "stock_openoffice",
- "stock_opensave",
- "stock_outbox",
- "stock_page-number",
- "stock_page-total-number",
- "stock_paragraph-spacing-decrease",
- "stock_paragraph-spacing-increase",
- "stock_paste",
- "stock_people",
- "stock_person",
- "stock_pin",
- "stock_placeholder-graphic",
- "stock_placeholder-line-contour",
- "stock_placeholder-picture",
- "stock_placeholder-text",
- "stock_playlist",
- "stock_position-size",
- "stock_post-message",
- "stock_presentation-box",
- "stock_presentation-styles",
- "stock_preview-four-pages",
- "stock_preview-two-pages",
- "stock_previous",
- "stock_previous-page",
- "stock_print",
- "stock_print-driver",
- "stock_print-duplex",
- "stock_print-duplex-no-tumble",
- "stock_print-duplex-tumble",
- "stock_print-layout",
- "stock_print-non-duplex",
- "stock_print-options",
- "stock_print-preview",
- "stock_print-preview-print",
- "stock_print-resolution",
- "stock_print-setup",
- "stock_printers",
- "stock_properties",
- "stock_proxy",
- "stock_quickmask",
- "stock_record-macro",
- "stock_record-number",
- "stock_redo",
- "stock_refresh",
- "stock_reload",
- "stock_repeat",
- "stock_reverse-order",
- "stock_right",
- "stock_right-with-subpoints",
- "stock_rotate",
- "stock_rotate-3d",
- "stock_rotation-mode",
- "stock_run-macro",
- "stock_samples",
- "stock_save",
- "stock_save-as",
- "stock_save-pdf",
- "stock_save-template",
- "stock_save_as",
- "stock_score-high",
- "stock_score-higher",
- "stock_score-highest",
- "stock_score-low",
- "stock_score-lower",
- "stock_score-lowest",
- "stock_score-normal",
- "stock_scores",
- "stock_script",
- "stock_script",
- "stock_scripts",
- "stock_search",
- "stock_search-and-replace",
- "stock_select-all",
- "stock_select-cell",
- "stock_select-column",
- "stock_select-row",
- "stock_select-table",
- "stock_send-fax",
- "stock_sent-mail",
- "stock_shadow",
- "stock_show-all",
- "stock_show-draw-functions",
- "stock_show-form-dialog",
- "stock_show-hidden-controls",
- "stock_shuffle",
- "stock_signature",
- "stock_signature-bad",
- "stock_signature-ok",
- "stock_slide-design",
- "stock_slide-duplicate",
- "stock_slide-expand",
- "stock_slide-reherse-timings",
- "stock_slide-show",
- "stock_slide-showhide",
- "stock_smart-playlist",
- "stock_smiley-1",
- "stock_smiley-2",
- "stock_smiley-3",
- "stock_smiley-4",
- "stock_smiley-5",
- "stock_smiley-6",
- "stock_smiley-7",
- "stock_smiley-8",
- "stock_smiley-9",
- "stock_smiley-10",
- "stock_smiley-11",
- "stock_smiley-12",
- "stock_smiley-13",
- "stock_smiley-14",
- "stock_smiley-15",
- "stock_smiley-16",
- "stock_smiley-17",
- "stock_smiley-18",
- "stock_smiley-19",
- "stock_smiley-20",
- "stock_smiley-21",
- "stock_smiley-22",
- "stock_smiley-23",
- "stock_smiley-24",
- "stock_smiley-25",
- "stock_smiley-26",
- "stock_snap-grid",
- "stock_snap-guides",
- "stock_snap-margins",
- "stock_snap-object",
- "stock_snap-object-points",
- "stock_sort-ascending",
- "stock_sort-column-ascending",
- "stock_sort-criteria",
- "stock_sort-descending",
- "stock_sort-row-ascending",
- "stock_sort-table-column-ascending",
- "stock_sort-table-row-ascending",
- "stock_sound",
- "stock_spam",
- "stock_spellcheck",
- "stock_standard-filter",
- "stock_stop",
- "stock_styles",
- "stock_styles-character-styles",
- "stock_styles-fill-format-mode",
- "stock_styles-frame-styles",
- "stock_styles-new-style-from-selection",
- "stock_styles-numbering-styles",
- "stock_styles-page-styles",
- "stock_styles-paragraph-styles",
- "stock_styles-update-style",
- "stock_subscript",
- "stock_sum",
- "stock_summary",
- "stock_superscript",
- "stock_symbol-selection",
- "stock_table-align-bottom",
- "stock_table-align-center",
- "stock_table-align-top",
- "stock_table-borders",
- "stock_table-combine",
- "stock_table-fit-height",
- "stock_table-fit-width",
- "stock_table-fixed",
- "stock_table-fixed-proportional",
- "stock_table-line-color",
- "stock_table-line-style",
- "stock_table-optimize",
- "stock_table-same-height",
- "stock_table-same-width",
- "stock_table-split",
- "stock_table-variable",
- "stock_table_borders",
- "stock_table_fill",
- "stock_task",
- "stock_task-assigned",
- "stock_task-assigned-to",
- "stock_task-recurring",
- "stock_test-mode",
- "stock_text-direction-ltr",
- "stock_text-direction-ttb",
- "stock_text-double-click-to-edit",
- "stock_text-monospaced",
- "stock_text-outline",
- "stock_text-quickedit",
- "stock_text-select-text-only",
- "stock_text-shadow",
- "stock_text-spacing",
- "stock_text-strikethrough",
- "stock_text_bold",
- "stock_text_center",
- "stock_text_color_background",
- "stock_text_color_foreground",
- "stock_text_color_hilight",
- "stock_text_indent",
- "stock_text_italic",
- "stock_text_justify",
- "stock_text_left",
- "stock_text_right",
- "stock_text_underlined",
- "stock_text_underlined-double",
- "stock_text_unindent",
- "stock_thesaurus",
- "stock_3d-3d-attributes-only",
- "stock_3d-all-attributes",
- "stock_3d-color-picker",
- "stock_3d-colors",
- "stock_3d-custom-color",
- "stock_3d-effects",
- "stock_3d-favourites",
- "stock_3d-geometry",
- "stock_3d-light",
- "stock_3d-off",
- "stock_3d-on",
- "stock_3d-material",
- "stock_3d-normals-double-sided",
- "stock_3d-normals-double-sided-closed-body",
- "stock_3d-normals-flat",
- "stock_3d-normals-flip-illumination",
- "stock_3d-normals-object-specific",
- "stock_3d-normals-spherical",
- "stock_3d-perspective",
- "stock_3d-shading",
- "stock_3d-texture",
- "stock_3d-texture-and-shading",
- "stock_3d-texture-object-specific",
- "stock_3d-texture-only",
- "stock_3d-texture-parallel",
- "stock_3d-texture-spherical",
- "stock_3dsound",
- "stock_timer",
- "stock_timer_stopped",
- "stock_timezone",
- "stock_to-3d",
- "stock_to-3d-rotation-object",
- "stock_to-background",
- "stock_to-bottom",
- "stock_to-curve",
- "stock_to-foreground",
- "stock_to-polygon",
- "stock_to-top",
- "stock_todo",
- "stock_toggle-graphics",
- "stock_toggle-info",
- "stock_toggle-preview",
- "stock_toilet-paper",
- "stock_tools-hyphenation",
- "stock_tools-macro",
- "stock_top",
- "stock_transform-circle-perspective",
- "stock_transform-circle-slant",
- "stock_transparency",
- "stock_trash_full",
- "stock_undelete",
- "stock_undo",
- "stock_undo-history",
- "stock_ungroup",
- "stock_ungroup-cells",
- "stock_unknown",
- "stock_unlink",
- "stock_up",
- "stock_up-one-dir",
- "stock_up-with-subpoints",
- "stock_update-data",
- "stock_update-fields",
- "stock_video-conferencing",
- "stock_view-details",
- "stock_view-field-shadings",
- "stock_view-fields",
- "stock_view-function-selection",
- "stock_view-html-source",
- "stock_volume",
- "stock_wallpaper-center",
- "stock_wallpaper-fill",
- "stock_wallpaper-scale",
- "stock_wallpaper-tile",
- "stock_weather-cloudy",
- "stock_weather-few-clouds",
- "stock_weather-fog",
- "stock_weather-night-clear",
- "stock_weather-night-few-clouds",
- "stock_weather-showers",
- "stock_weather-snow",
- "stock_weather-storm",
- "stock_weather-sunny",
- "stock_web-calendar",
- "stock_web-support",
- "stock_wrap-around",
- "stock_wrap-behind",
- "stock_wrap-contour",
- "stock_wrap-interrupt",
- "stock_wrap-left",
- "stock_wrap-optimal",
- "stock_wrap-right",
- "stock_zoom",
- "stock_zoom-1",
- "stock_zoom-in",
- "stock_zoom-next",
- "stock_zoom-object",
- "stock_zoom-optimal",
- "stock_zoom-out",
- "stock_zoom-page",
- "stock_zoom-page-width",
- "stock_zoom-previous",
- "stock_zoom-shift",
- };
- }
-}
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TimeSpanEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TimeSpanEditor.cs
deleted file mode 100644
index fb40194da33..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TimeSpanEditor.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-
-using System;
-using Gtk;
-using Gdk;
-using System.Text;
-
-namespace Stetic.Editor
-{
- public class TimeSpanEditorCell: PropertyEditorCell
- {
- protected override string GetValueText ()
- {
- return ((TimeSpan)Value).ToString ();
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- return new TimeSpanEditor ();
- }
- }
-
- public class TimeSpanEditor: Gtk.HBox, IPropertyEditor
- {
- Gtk.Entry entry;
- TimeSpan time;
-
- public TimeSpanEditor()
- {
- entry = new Gtk.Entry ();
- entry.Changed += OnChanged;
- PackStart (entry, true, true, 0);
- ShowAll ();
- }
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- }
-
- public void AttachObject (object ob)
- {
- }
-
- public object Value {
- get { return time; }
- set {
- time = (TimeSpan) value;
- entry.Changed -= OnChanged;
- entry.Text = time.ToString ();
- entry.Changed += OnChanged;
- }
- }
-
- void OnChanged (object o, EventArgs a)
- {
- string s = entry.Text;
-
- try {
- time = TimeSpan.Parse (s);
- if (ValueChanged != null)
- ValueChanged (this, a);
- } catch {
- }
- }
-
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs
deleted file mode 100644
index c04192620ff..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Translatable.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using System;
-
-namespace Stetic.Editor {
-
- public abstract class Translatable : Gtk.VBox, IPropertyEditor {
-
- PropertyDescriptor prop;
- object obj;
-
- Gtk.Box mainHBox, contextBox, commentBox;
- Gtk.Button button;
- Gdk.Pixbuf globe, globe_not;
- Gtk.Image image;
- Gtk.Menu menu;
- Gtk.CheckMenuItem markItem;
- Gtk.MenuItem addContextItem, remContextItem, addCommentItem, remCommentItem;
- Gtk.Entry contextEntry;
- TextBox commentText;
- bool initializing;
-
- public virtual void Initialize (PropertyDescriptor prop)
- {
- CheckType (prop);
-
- this.prop = prop;
-
- mainHBox = new Gtk.HBox (false, 6);
- PackStart (mainHBox, false, false, 0);
-
- if (!prop.Translatable)
- return;
-
- button = new Gtk.Button ();
- try {
- globe = Gdk.Pixbuf.LoadFromResource ("globe.png");
- globe_not = Gdk.Pixbuf.LoadFromResource ("globe-not.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf: " + e);
- }
- image = new Gtk.Image (globe);
- button.Add (image);
- button.ButtonPressEvent += ButtonPressed;
- mainHBox.PackEnd (button, false, false, 0);
- mainHBox.ShowAll ();
-
- menu = new Gtk.Menu ();
-
- markItem = new Gtk.CheckMenuItem ("Mark for Translation");
- markItem.Toggled += ToggleMark;
- markItem.Show ();
- menu.Add (markItem);
-
- addContextItem = new Gtk.MenuItem ("Add Translation Context Hint");
- addContextItem.Activated += AddContext;
- menu.Add (addContextItem);
- remContextItem = new Gtk.MenuItem ("Remove Translation Context Hint");
- remContextItem.Activated += RemoveContext;
- menu.Add (remContextItem);
-
- addCommentItem = new Gtk.MenuItem ("Add Comment for Translators");
- addCommentItem.Activated += AddComment;
- menu.Add (addCommentItem);
- remCommentItem = new Gtk.MenuItem ("Remove Comment for Translators");
- remCommentItem.Activated += RemoveComment;
- menu.Add (remCommentItem);
-
- contextBox = new Gtk.HBox (false, 6);
- Gtk.Label contextLabel = new Gtk.Label ("Translation context");
- contextLabel.Xalign = 0.0f;
- contextBox.PackStart (contextLabel, false, false, 0);
- contextEntry = new Gtk.Entry ();
- contextEntry.WidthChars = 8;
- contextBox.PackStart (contextEntry, true, true, 0);
- contextBox.ShowAll ();
- contextEntry.Changed += ContextChanged;
-
- commentBox = new Gtk.VBox (false, 3);
- Gtk.Label commentLabel = new Gtk.Label ("Comment for Translators:");
- commentLabel.Xalign = 0.0f;
- commentBox.PackStart (commentLabel, false, false, 0);
- commentText = new TextBox (3);
- commentBox.PackStart (commentText, false, false, 0);
- commentBox.ShowAll ();
- commentText.Changed += CommentChanged;
- }
-
- protected virtual void CheckType (PropertyDescriptor prop)
- {
- }
-
- public virtual void AttachObject (object ob)
- {
- this.obj = ob;
-
- if (!prop.Translatable)
- return;
-
- initializing = true;
-
- if (contextBox.Parent != null)
- Remove (contextBox);
- if (commentBox.Parent != null)
- Remove (commentBox);
-
- markItem.Active = prop.IsTranslated (obj);
- image.Pixbuf = markItem.Active ? globe : globe_not;
-
- if (prop.IsTranslated (obj)) {
- if (prop.TranslationContext (obj) != null) {
- remContextItem.Show ();
- PackStart (contextBox, false, false, 0);
- contextEntry.Text = prop.TranslationContext (obj);
- } else
- addContextItem.Show ();
- } else {
- addContextItem.Show ();
- addContextItem.Sensitive = false;
- }
-
- if (prop.IsTranslated (obj)) {
- if (prop.TranslationComment (obj) != null) {
- remCommentItem.Show ();
- PackEnd (commentBox, false, false, 0);
- commentText.Text = prop.TranslationComment (obj);
- } else
- addCommentItem.Show ();
- } else {
- addCommentItem.Show ();
- addCommentItem.Sensitive = false;
- }
-
- initializing = false;
- }
-
-
- public abstract object Value { get; set; }
-
- public event EventHandler ValueChanged;
-
- protected virtual void OnValueChanged ()
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- protected override void OnAdded (Gtk.Widget child)
- {
- mainHBox.PackStart (child, true, true, 0);
- }
-
- void MenuPosition (Gtk.Menu menu, out int x, out int y, out bool push_in)
- {
- button.GdkWindow.GetOrigin (out x, out y);
- Gdk.Rectangle alloc = button.Allocation;
- x += alloc.X;
- y += alloc.Y + alloc.Height;
- push_in = true;
- }
-
- [GLib.ConnectBefore]
- void ButtonPressed (object o, Gtk.ButtonPressEventArgs args)
- {
- menu.Popup (null, null, MenuPosition, 1, args.Event.Time);
- args.RetVal = true;
- }
-
- void ToggleMark (object o, EventArgs args)
- {
- if (initializing) return;
- if (!markItem.Active) {
- // Make sure we're showing the "Add" menu items
- // rather than the "Remove" ones
- if (prop.TranslationContext (obj) != null)
- RemoveContext (remContextItem, EventArgs.Empty);
- if (prop.TranslationComment (obj) != null)
- RemoveComment (remCommentItem, EventArgs.Empty);
- }
-
- prop.SetTranslated (obj, markItem.Active);
- image.Pixbuf = markItem.Active ? globe : globe_not;
- addContextItem.Sensitive = markItem.Active;
- addCommentItem.Sensitive = markItem.Active;
- }
-
- void AddContext (object o, EventArgs args)
- {
- prop.SetTranslationContext (obj, contextEntry.Text);
- PackStart (contextBox, false, false, 0);
-
- addContextItem.Hide ();
- remContextItem.Show ();
- }
-
- void RemoveContext (object o, EventArgs args)
- {
- prop.SetTranslationContext (obj, null);
- Remove (contextBox);
-
- remContextItem.Hide ();
- addContextItem.Show ();
- }
-
- void ContextChanged (object o, EventArgs args)
- {
- if (initializing) return;
- prop.SetTranslationContext (obj, contextEntry.Text);
- }
-
- void AddComment (object o, EventArgs args)
- {
- prop.SetTranslationComment (obj, commentText.Text);
- PackEnd (commentBox, false, false, 0);
-
- addCommentItem.Hide ();
- remCommentItem.Show ();
- }
-
- void RemoveComment (object o, EventArgs args)
- {
- prop.SetTranslationComment (obj, null);
- Remove (commentBox);
-
- remCommentItem.Hide ();
- addCommentItem.Show ();
- }
-
- void CommentChanged (object o, EventArgs args)
- {
- if (initializing) return;
- prop.SetTranslationComment (obj, commentText.Text);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TreeViewCellContainer.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TreeViewCellContainer.cs
deleted file mode 100644
index c027a029865..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TreeViewCellContainer.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// TreeViewCellContainer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
- class TreeViewCellContainer: Entry
- {
- EventBox box;
-
- public TreeViewCellContainer (Gtk.Widget child)
- {
- box = new EventBox ();
- box.ButtonPressEvent += new ButtonPressEventHandler (OnClickBox);
- box.ModifyBg (StateType.Normal, Style.White);
- box.Add (child);
- child.Show ();
- Show ();
- }
-
- [GLib.ConnectBefore]
- void OnClickBox (object s, ButtonPressEventArgs args)
- {
- // Avoid forwarding the button press event to the
- // tree, since it would hide the cell editor.
- args.RetVal = true;
- }
-
- protected override void OnParentSet (Gtk.Widget parent)
- {
- base.OnParentSet (parent);
-
- if (Parent != null) {
- if (ParentWindow != null)
- box.ParentWindow = ParentWindow;
- box.Parent = Parent;
- box.Show ();
- }
- else
- box.Unparent ();
- }
-
- protected override void OnShown ()
- {
- // Do nothing.
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
- box.SizeRequest ();
- box.Allocation = allocation;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/WidgetSelector.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/WidgetSelector.cs
deleted file mode 100644
index 68991a32e6e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/WidgetSelector.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
- public class WidgetSelector: ComboBox, IPropertyEditor
- {
- Gtk.Widget obj;
- ListStore store;
- Hashtable widgets = new Hashtable ();
-
- public void Initialize (PropertyDescriptor descriptor)
- {
- store = new ListStore (typeof(Pixbuf), typeof(string));
- Model = store;
- store.SetSortColumnId (1, SortType.Ascending);
- CellRendererPixbuf crp = new CellRendererPixbuf ();
- CellRendererText crt = new CellRendererText ();
- PackStart (crp, false);
- PackStart (crt, true);
- SetAttributes (crp, "pixbuf", 0);
- SetAttributes (crt, "text", 1);
- }
-
- public void AttachObject (object obj)
- {
- this.obj = obj as Gtk.Widget;
- FillWidgets ();
- }
-
- void FillWidgets ()
- {
- store.Clear ();
- widgets.Clear ();
-
- Stetic.Wrapper.Widget widget = Stetic.Wrapper.Widget.Lookup (obj);
- if (widget == null)
- return;
-
- while (!widget.IsTopLevel)
- widget = widget.ParentWrapper;
-
- store.AppendValues (null, "(None)");
- FillWidgets (widget, 0);
- }
-
- void FillWidgets (Stetic.Wrapper.Widget widget, int level)
- {
- if (!widget.Unselectable) {
- TreeIter iter = store.AppendValues (widget.ClassDescriptor.Icon, widget.Wrapped.Name);
- widgets [widget.Wrapped.Name] = iter;
- }
- Gtk.Container cont = widget.Wrapped as Gtk.Container;
- if (cont != null && widget.ClassDescriptor.AllowChildren) {
- foreach (Gtk.Widget child in cont.AllChildren) {
- Stetic.Wrapper.Widget cwidget = Stetic.Wrapper.Widget.Lookup (child);
- if (cwidget != null)
- FillWidgets (cwidget, level+1);
- }
- }
- }
-
-
- public object Value {
- get {
- if (Active <= 0)
- return null;
- else {
- TreeIter iter;
- if (!GetActiveIter (out iter))
- return null;
- return (string) store.GetValue (iter, 1);
- }
- }
- set {
- if (value == null)
- Active = 0;
- else if (widgets.Contains ((string) value)) {
- TreeIter iter = (TreeIter) widgets [value];
- SetActiveIter (iter);
- }
- }
- }
-
- protected override void OnChanged ()
- {
- base.OnChanged ();
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
-
- // To be fired when the edited value changes.
- public event EventHandler ValueChanged;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
deleted file mode 100644
index 95bf4e5964c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}
- Stetic
- $(MDFrameworkVersion)
- ..\..\..\..\build\AddIns\MonoDevelop.GtkCore
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.dll.config b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.dll.config
deleted file mode 100644
index 8c4c6ab9a9d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.dll.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/stetic.glade b/main/src/addins/MonoDevelop.GtkCore/libstetic/stetic.glade
deleted file mode 100644
index 9f58816ce17..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/stetic.glade
+++ /dev/null
@@ -1,2107 +0,0 @@
-
-
-
-
-
-
- True
- Select Image
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 650
- 450
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- 0
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- True
- True
- True
- GTK_POS_TOP
- False
- False
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- 4
- gtk-missing-image
- 0.5
- 0.5
- 3
- 3
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 6
-
-
-
- True
- _Icon Name:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- iconNameEntry
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
-
- False
- True
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
- False
- True
-
-
-
-
-
- True
- Themed Icons
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- False
- True
- False
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_START
- 6
-
-
-
- True
- True
- True
- gtk-add
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 6
-
-
-
- 30
- 30
- True
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- Resource Name:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
- False
- True
-
-
-
-
-
- True
- Resources
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
-
- 12
- True
- GTK_FILE_CHOOSER_ACTION_OPEN
- True
- False
- False
-
-
- False
- True
-
-
-
-
-
- True
- Files
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Flags
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 500
- 450
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- True
- GTK_POLICY_ALWAYS
- GTK_POLICY_ALWAYS
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- False
- True
- False
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Text
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 600
- 350
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_CHAR
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- Translatable
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- 2
- 2
- False
- 6
- 6
-
-
-
- True
- Translation Context Hint:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- Comment for Translators
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
- 1
- 2
- 0
- 1
-
-
-
-
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Select Image
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 650
- 450
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- True
- True
- True
- GTK_POS_TOP
- False
- False
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- 4
- gtk-missing-image
- 0.5
- 0
- 3
- 3
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 6
-
-
-
- True
- _Icon Name:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- stockIconEntry
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
-
-
- 0
- True
- True
-
-
-
-
-
- 3
- True
- False
- 3
-
-
-
- True
- gtk-dialog-warning
- 1
- 0.5
- 0
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- 513
- True
- The selected icon may not show at run time if the required icon factory is not properly initialized.
- False
- False
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
-
-
-
-
- False
- True
-
-
-
-
-
- True
- Stock Icons
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_NONE
- GTK_CORNER_TOP_LEFT
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_START
- 6
-
-
-
- True
- True
- True
- gtk-add
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-edit
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- False
- True
-
-
-
-
-
- True
- Project Icons
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Edit Icon
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 650
- 400
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- 6
-
-
-
- True
- Icon name:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
- 20
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- Single source icon
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 6
-
-
-
- 12
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- Image:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- 0
- 0.5
- GTK_SHADOW_ETCHED_IN
-
-
-
- True
- False
- 6
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
-
-
- 6
- False
- False
-
-
-
-
-
- True
- image name
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- Select Image...
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- Multiple source icon
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
- radioSingle
-
-
-
- 3
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- 12
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- False
- True
- False
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_START
- 3
-
-
-
- True
- True
- True
- gtk-add
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Edit Icon Factory
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 450
- 460
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
- -7
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 12
- True
- False
- 6
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_NONE
- GTK_CORNER_TOP_LEFT
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_START
- 6
-
-
-
- True
- True
- True
- gtk-add
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-edit
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- Widget Designer
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- True
- False
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- gtk-dialog-warning
- 6
- 0
- 0
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- 449
- True
- You are trying to add a non-container widget into the main window. In <b>GTK#</b>, widget positioning is controlled by a special type of widgets called <b>Container</b> widgets. If you don't place the widget into a container, it will fill the all the available space in the window. Are you sure you want to continue?
- False
- True
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- To know more about this topic see the article:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK# Widget Layout and Packing
- True
- GTK_RELIEF_NONE
- True
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- Don't show this message again
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/ActionDiffAdaptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/ActionDiffAdaptor.cs
deleted file mode 100644
index 880aaea21a6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/ActionDiffAdaptor.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-using Stetic.Wrapper;
-
-namespace Stetic.Undo
-{
- class ActionDiffAdaptor: IDiffAdaptor
- {
- IProject project;
-
- public ActionDiffAdaptor (IProject project)
- {
- this.project = project;
- }
-
- public IEnumerable GetChildren (object parent)
- {
- if (parent is Wrapper.Action)
- yield break;
- else if (parent is ActionGroup) {
- foreach (Wrapper.Action ac in ((ActionGroup)parent).Actions)
- if (ac.Name.Length > 0)
- yield return ac;
- }
- else if (parent is ActionGroupCollection) {
- foreach (ActionGroup ag in (ActionGroupCollection) parent)
- yield return ag;
- }
- else
- throw new NotImplementedException ();
- }
-
- public string GetUndoId (object childObject)
- {
- if (childObject is ActionGroup)
- return ((ActionGroup)childObject).UndoId;
- if (childObject is Wrapper.Action)
- return ((Wrapper.Action)childObject).UndoId;
-
- throw new NotImplementedException ();
- }
-
- public object FindChild (object parent, string undoId)
- {
- foreach (object ob in GetChildren (parent))
- if (GetUndoId (ob) == undoId) {
- if ((ob is Wrapper.Action) && ((Wrapper.Action)ob).Name.Length == 0)
- continue;
- return ob;
- }
- return null;
- }
-
- public void RemoveChild (object parent, string undoId)
- {
- object child = FindChild (parent, undoId);
- if (child == null)
- return;
- if (parent is ActionGroup) {
- ((ActionGroup)parent).Actions.Remove ((Wrapper.Action)child);
- } else if (parent is ActionGroupCollection) {
- ((ActionGroupCollection)parent).Remove ((ActionGroup)child);
- } else
- throw new NotImplementedException ();
- }
-
- public void AddChild (object parent, XmlElement node, string insertAfter)
- {
- object data = DeserializeChild (node);
- if (parent is ActionGroup) {
- ActionGroup group = (ActionGroup) parent;
- if (insertAfter == null)
- group.Actions.Insert (0, (Wrapper.Action) data);
- else {
- for (int n=0; n 0) {
- object newChild = newStatusAdaptor.FindChild (newStatus, cid);
- if (newChild != null) {
- // ChildCreate will work even if the packing element is null
- ObjectDiff odiff = GetChildDiff (oldChild, newChild);
- if (odiff != null) {
- ChildDiff cdiff = new ChildDiff ();
- cdiff.Id = cid;
- cdiff.Operation = DiffOperation.Update;
- cdiff.Diff = odiff;
- changes.Add (cdiff);
- }
- foundChildren [cid] = cid;
- } else {
- ChildDiff cdiff = new ChildDiff ();
- cdiff.Id = cid;
- cdiff.Operation = DiffOperation.Remove;
- changes.Add (cdiff);
- }
- } else {
- throw new InvalidOperationException ("Found an element of type '" + oldChild.GetType () + "' without ID");
- }
- }
-
- // Register new elements
-
- string lastWidgetId = null;
- foreach (object newChildElem in newStatusAdaptor.GetChildren (newStatus)) {
- string cid = newStatusAdaptor.GetUndoId (newChildElem);
- if (cid.Length > 0) {
- if (!foundChildren.ContainsKey (cid)) {
- ChildDiff cdiff = new ChildDiff ();
- cdiff.Id = cid;
- cdiff.Operation = DiffOperation.Add;
- cdiff.AddContent = newStatusAdaptor.SerializeChild (newChildElem);
- cdiff.InsertAfter = lastWidgetId;
- changes.Add (cdiff);
- }
- } else
- throw new InvalidOperationException ("Found an element of type '" + newChildElem.GetType () + "' without ID");
-
- lastWidgetId = cid;
- }
-
- ChildDiff[] childChanges = null;
- if (changes.Count > 0)
- childChanges = (ChildDiff[]) changes.ToArray (typeof(ChildDiff));
-
- if (childChanges != null || propChanges != null || signalChanges != null) {
- ObjectDiff dif = new ObjectDiff ();
- dif.PropertyChanges = propChanges;
- dif.SignalChanges = signalChanges;
- dif.ChildChanges = childChanges;
- return dif;
- }
- else
- return null;
- }
-
- public void ApplyDiff (object status, ObjectDiff diff)
- {
- if (diff.PropertyChanges != null)
- ApplyPropertyChanges (diff.PropertyChanges, currentStatusAdaptor, status);
-
- if (diff.SignalChanges != null)
- ApplySignalChanges (diff.SignalChanges, currentStatusAdaptor, status);
-
- if (diff.ChildChanges != null) {
- foreach (ChildDiff cdiff in diff.ChildChanges) {
- if (cdiff.Operation == DiffOperation.Update) {
- object statusChild = currentStatusAdaptor.FindChild (status, cdiff.Id);
- ApplyChildDiff (statusChild, cdiff.Diff);
- } else if (cdiff.Operation == DiffOperation.Remove) {
- // Remove the child
- currentStatusAdaptor.RemoveChild (status, cdiff.Id);
- } else {
- // Add the child at the correct position
- currentStatusAdaptor.AddChild (status, cdiff.AddContent, cdiff.InsertAfter);
- }
- }
- }
- }
-
- protected virtual ObjectDiff GetChildDiff (object oldChild, object newChild)
- {
- DiffGenerator childGenerator = new DiffGenerator ();
- childGenerator.CurrentStatusAdaptor = currentStatusAdaptor.GetChildAdaptor (oldChild);
- childGenerator.NewStatusAdaptor = newStatusAdaptor.GetChildAdaptor (newChild);
-
- return childGenerator.GetDiff (oldChild, newChild);
- }
-
- protected virtual void ApplyChildDiff (object child, ObjectDiff cdiff)
- {
- DiffGenerator childGenerator = new DiffGenerator ();
- childGenerator.CurrentStatusAdaptor = currentStatusAdaptor.GetChildAdaptor (child);
- childGenerator.ApplyDiff (child, cdiff);
- }
-
- protected virtual PropertyDiff[] GetPropertyDiff (IDiffAdaptor currentAdaptor, object currentObject, IDiffAdaptor newAdaptor, object newObject)
- {
- ArrayList changes = new ArrayList ();
- Hashtable found = new Hashtable ();
-
- // Look for modified and deleted elements
- if (currentObject != null) {
- foreach (object oldProp in currentAdaptor.GetProperties (currentObject)) {
- string name = currentAdaptor.GetPropertyName (oldProp);
- object newProp = newObject != null ? newAdaptor.GetPropertyByName (newObject, name) : null;
- if (newProp == null)
- changes.Add (new PropertyDiff (DiffOperation.Remove, name, null));
- else {
- found [name] = found;
- string newValue = newAdaptor.GetPropertyValue (newObject, newProp);
- if (newValue != currentAdaptor.GetPropertyValue (currentObject, oldProp))
- changes.Add (new PropertyDiff (DiffOperation.Update, name, newValue));
- }
- }
- }
-
- // Look for new elements
- if (newObject != null) {
- foreach (object newProp in newAdaptor.GetProperties (newObject)) {
- string name = newAdaptor.GetPropertyName (newProp);
- if (!found.ContainsKey (name))
- changes.Add (new PropertyDiff (DiffOperation.Add, name, newAdaptor.GetPropertyValue (newObject, newProp)));
- }
- }
-
- if (changes.Count == 0)
- return null;
- return (PropertyDiff[]) changes.ToArray (typeof(PropertyDiff));
- }
-
- protected virtual PropertyDiff[] GetSignalDiff (IDiffAdaptor currentAdaptor, object currentObject, IDiffAdaptor newAdaptor, object newObject)
- {
- ArrayList changes = new ArrayList ();
- Hashtable found = new Hashtable ();
-
- // Look for modified and deleted elements
- if (currentObject != null) {
- foreach (object oldProp in currentAdaptor.GetSignals (currentObject)) {
- string name;
- string handler;
- currentAdaptor.GetSignalInfo (oldProp, out name, out handler);
- object newProp = newObject != null ? newAdaptor.GetSignal (newObject, name, handler) : null;
- if (newProp == null)
- changes.Add (new PropertyDiff (DiffOperation.Remove, name, handler));
- found [name + " " + handler] = found;
- }
- }
-
- // Look for new elements
- if (newObject != null) {
- foreach (object newProp in newAdaptor.GetSignals (newObject)) {
- string name;
- string handler;
- newAdaptor.GetSignalInfo (newProp, out name, out handler);
- if (!found.ContainsKey (name + " " + handler))
- changes.Add (new PropertyDiff (DiffOperation.Add, name, handler));
- }
- }
-
- if (changes.Count == 0)
- return null;
- return (PropertyDiff[]) changes.ToArray (typeof(PropertyDiff));
- }
-
- public virtual void ApplyPropertyChanges (PropertyDiff[] changes, IDiffAdaptor adaptor, object obj)
- {
- foreach (PropertyDiff pdif in changes) {
- if (pdif.Operation == DiffOperation.Add || pdif.Operation == DiffOperation.Update)
- adaptor.SetPropertyValue (obj, pdif.Name, pdif.Text);
- else
- adaptor.ResetPropertyValue (obj, pdif.Name);
- }
- }
-
- public virtual void ApplySignalChanges (PropertyDiff[] changes, IDiffAdaptor adaptor, object obj)
- {
- foreach (PropertyDiff pdif in changes) {
- if (pdif.Operation == DiffOperation.Add)
- adaptor.AddSignal (obj, pdif.Name, pdif.Text);
- else
- adaptor.RemoveSignal (obj, pdif.Name, pdif.Text);
- }
- }
- }
-
-
- class PropertyDiff
- {
- public PropertyDiff (DiffOperation Operation, string Name, string Text)
- {
- this.Operation = Operation;
- this.Name = Name;
- this.Text = Text;
- }
-
- public DiffOperation Operation;
- public string Name;
- public string Text;
- }
-
- enum DiffOperation
- {
- Add,
- Remove,
- Update
- }
-
- class ChildDiff
- {
- public string Id;
- public DiffOperation Operation;
- public XmlElement AddContent;
- public string InsertAfter;
- public ObjectDiff Diff;
-
- public string ToString (int indent)
- {
- string ind = new string (' ', indent);
- string s = ind + Operation + " id:" + Id + "\n";
- if (Operation == DiffOperation.Update)
- s += Diff.ToString (indent + 2) + "\n";
- if (Operation == DiffOperation.Add) {
- s += ind + " InsertAfter: " + InsertAfter + "\n";
- s += ind + " Content: " + AddContent.OuterXml + "\n";
- }
- return s;
- }
- }
-
- class ObjectDiff
- {
- public PropertyDiff[] PropertyChanges;
- public PropertyDiff[] SignalChanges;
- public ChildDiff[] ChildChanges;
-
- public override string ToString ()
- {
- return ToString (0);
- }
-
- internal string ToString (int indent)
- {
- string ind = new string (' ', indent);
- string s = ind + "ObjectDiff:\n";
-
- if (PropertyChanges != null) {
- s += ind + " Properties:\n";
- foreach (PropertyDiff d in PropertyChanges) {
- s += ind + " " + d.Operation + ": " + d.Name;
- if (d.Operation != DiffOperation.Remove)
- s += " = " + d.Text;
- s += "\n";
- }
- }
-
- if (SignalChanges != null) {
- s += ind + " Signals:\n";
- foreach (PropertyDiff d in SignalChanges)
- s += ind + " " + d.Operation + ": " + d.Name + " - " + d.Text + "\n";
- }
-
- if (ChildChanges != null) {
- s += ind + " Children:\n";
- foreach (ChildDiff cd in ChildChanges)
- s += cd.ToString (indent + 4);
- }
-
- return s;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/IDiffAdaptor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/IDiffAdaptor.cs
deleted file mode 100644
index aab6567c810..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/IDiffAdaptor.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-
-using System;
-using System.Collections;
-using System.Xml;
-
-namespace Stetic.Undo
-{
- interface IDiffAdaptor
- {
- IEnumerable GetChildren (object parent);
- string GetUndoId (object childObject);
- object FindChild (object parent, string undoId);
- void RemoveChild (object parent, string undoId);
- void AddChild (object parent, XmlElement data, string insertAfter);
- XmlElement SerializeChild (object child);
- IDiffAdaptor GetChildAdaptor (object child);
-
- IEnumerable GetProperties (object obj);
- object GetPropertyByName (object obj, string name);
- string GetPropertyName (object property);
- string GetPropertyValue (object obj, object property);
- void SetPropertyValue (object obj, string name, string value);
- void ResetPropertyValue (object obj, string name);
-
- IEnumerable GetSignals (object obj);
- object GetSignal (object obj, string name, string handler);
- void GetSignalInfo (object signal, out string name, out string handler);
- void AddSignal (object obj, string name, string handler);
- void RemoveSignal (object obj, string name, string handler);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/UndoManager.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/UndoManager.cs
deleted file mode 100644
index 8bd5d12183e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/undo/UndoManager.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-using Stetic.Wrapper;
-
-namespace Stetic
-{
- // This class holds an xml tree which describes the whole widget structure being designed.
- // It is used by the Undo/Redo infrastructure to keep track of changes in widgets.
- public class UndoManager
- {
- Hashtable elements = new Hashtable ();
- XmlDocument doc;
- ObjectWrapper root;
- AtomicChangeTracker atomicChangeTracker;
- bool isDefaultManager;
-
- public event UndoCheckpointHandler UndoCheckpoint;
-
- public UndoManager ()
- {
- atomicChangeTracker = new AtomicChangeTracker ();
- atomicChangeTracker.undoManager = this;
- }
-
- internal UndoManager (bool isDefaultManager): this ()
- {
- this.isDefaultManager = isDefaultManager;
- }
-
- public void SetRoot (ObjectWrapper wrapper)
- {
- root = wrapper;
- wrapper.UndoManager = this;
- elements.Clear ();
-
- doc = new XmlDocument ();
- UndoWriter writer = new UndoWriter (doc, this);
- writer.WriteObject (wrapper);
- }
-
- internal bool CanNotifyChanged (ObjectWrapper wrapper)
- {
- if (!InAtomicChange) {
- if (IsRegistered (wrapper) && UndoCheckpoint != null)
- UndoCheckpoint (this, new UndoCheckpointEventArgs (new ObjectWrapper[] { wrapper }));
- return true;
- } else
- return atomicChangeTracker.ProcessChange (wrapper);
- }
-
- public IAtomicChange AtomicChange {
- get {
- atomicChangeTracker.Count++;
- return atomicChangeTracker;
- }
- }
-
- public bool InAtomicChange {
- get { return atomicChangeTracker.InAtomicChange; }
- }
-
- // This method can be called by containers to register new objects in the tree.
- // Unless an object is registered in this way, no status will be tracked for it.
- // The provided status element must be a direct or indirect child of the parent status.
- internal void RegisterObject (ObjectWrapper w, XmlElement status)
- {
- VerifyManager ();
-
- if (IsRegistered (w))
- throw new InvalidOperationException ("Object already registered: " + w.GetType ());
-
- elements [w] = GetLocalElement (status);
-
- w.Disposed += OnObjectDisposed;
- }
-
- void OnObjectDisposed (object s, EventArgs a)
- {
- ObjectWrapper w = (ObjectWrapper) s;
- UnregisterObject (w);
- w.Disposed -= OnObjectDisposed;
- }
-
- // This method can be called to update the xml tree, for example when a change in the
- // object is detected.
- internal void UpdateObjectStatus (ObjectWrapper w, XmlElement status)
- {
- VerifyManager ();
-
- XmlElement oldElem = (XmlElement) elements [w];
- if (oldElem == null)
- throw new InvalidOperationException ("Could not update unregistered object of type " + w.GetType ());
-
- if (oldElem != status) {
- XmlElement newElem = GetLocalElement (status);
- if (oldElem.ParentNode != null) {
- oldElem.ParentNode.ReplaceChild (newElem, oldElem);
- elements [w] = newElem;
- } else {
- if (w != root)
- throw new InvalidOperationException ("Root element does not match the root widget: " + w.GetType ());
- elements [w] = newElem;
- }
- }
- }
-
- // Returns the xml that describes the specified widget (including information for all
- // children of the widget).
- internal XmlElement GetObjectStatus (ObjectWrapper w)
- {
- VerifyManager ();
-
- XmlElement elem = (XmlElement) elements [w];
- if (elem == null)
- throw new InvalidOperationException ("No status found for object of type " + w.GetType ());
- return elem;
- }
-
- internal bool IsRegistered (ObjectWrapper w)
- {
- return elements.ContainsKey (w);
- }
-
- internal void UnregisterObject (ObjectWrapper w)
- {
- VerifyManager ();
- elements.Remove (w);
- }
-
- void VerifyManager ()
- {
- if (isDefaultManager)
- throw new InvalidOperationException ("The default UndoManager can't track changes in objects.");
- }
-
- XmlElement GetLocalElement (XmlElement elem)
- {
- if (elem.OwnerDocument != doc)
- throw new InvalidOperationException ("Invalid document owner.");
- return elem;
- }
-
- internal void NotifyUndoCheckpoint (ObjectWrapper[] obs)
- {
- if (UndoCheckpoint != null)
- UndoCheckpoint (this, new UndoCheckpointEventArgs (obs));
- }
-
- internal void Dump ()
- {
- Console.WriteLine ("--------------------------------------");
- Console.WriteLine ("UNDO STATUS:");
- Console.WriteLine (GetObjectStatus (root).OuterXml);
- Console.WriteLine ("--------------------------------------");
- }
- }
-
- public delegate void UndoCheckpointHandler (object sender, UndoCheckpointEventArgs args);
-
- public class UndoCheckpointEventArgs: EventArgs
- {
- ObjectWrapper[] objects;
-
- internal UndoCheckpointEventArgs (ObjectWrapper[] objects)
- {
- this.objects = objects;
- }
-
- public ObjectWrapper[] ModifiedObjects {
- get { return objects; }
- }
- }
-
- // This is a special writer use to generate status info from widgets.
- // This writer won't recurse through objects which are already registered
- // in the provided UndoManager.
- class UndoWriter: ObjectWriter
- {
- UndoManager undoManager;
- bool allowMarkers = true;
-
- public UndoWriter (XmlDocument doc, UndoManager undoManager): base (doc, FileFormat.Native)
- {
- this.undoManager = undoManager;
- CreateUndoInfo = true;
- }
-
- public override XmlElement WriteObject (ObjectWrapper wrapper)
- {
- Wrapper.Widget ww = wrapper as Wrapper.Widget;
-
- // If the object is already registered, skip it (just create a dummy object)
- if (allowMarkers && ww != null && undoManager.IsRegistered (ww) && !ww.RequiresUndoStatusUpdate) {
- XmlElement marker = XmlDocument.CreateElement ("widget");
- marker.SetAttribute ("unchanged_marker","yes");
- return marker;
- }
-
- // Don't allow markers in indirect children, since those are not checked
- // when creating the diff
- bool oldAllow = allowMarkers;
- allowMarkers = false;
- XmlElement elem = base.WriteObject (wrapper);
- allowMarkers = oldAllow;
-
- if (ww != null) {
- ww.RequiresUndoStatusUpdate = false;
- }
-
- // Register the object, so it is correctly bound to this xml element
- if (undoManager.IsRegistered (wrapper))
- undoManager.UnregisterObject (wrapper);
- undoManager.RegisterObject (wrapper, elem);
-
- return elem;
- }
- }
-
- class UndoReader: ObjectReader
- {
- UndoManager undoManager;
-
- public UndoReader (IProject proj, FileFormat format, UndoManager undoManager): base (proj, format)
- {
- this.undoManager = undoManager;
- }
-
- public override ObjectWrapper ReadObject (XmlElement elem)
- {
- ObjectWrapper ww = base.ReadObject (elem);
- if (ww is Widget)
- undoManager.RegisterObject ((Widget)ww, elem);
- return ww;
- }
-
- public override void ReadObject (ObjectWrapper wrapper, XmlElement elem)
- {
- base.ReadObject (wrapper, elem);
- if (wrapper is Widget)
- undoManager.RegisterObject ((Widget)wrapper, elem);
- }
- }
-
- public interface IAtomicChange: IDisposable
- {
- void Delay ();
- }
-
- class AtomicChangeTracker: IAtomicChange
- {
- public int Count;
- public ArrayList ChangeEventPending = new ArrayList ();
- public UndoManager undoManager;
- bool delayed;
-
- public bool InAtomicChange {
- get { return Count > 0; }
- }
-
- public bool ProcessChange (ObjectWrapper wrapper)
- {
- if (!ChangeEventPending.Contains (wrapper)) {
- ChangeEventPending.Add (wrapper);
- delayed = false;
- }
- return false;
- }
-
- public void Delay ()
- {
- delayed = true;
- }
-
- public void Dispose ()
- {
- if (Count == 0)
- return;
-
- if (Count == 1) {
- // The change events fired here may generate changes in other
- // objects. Those changes will also be included in the transaction.
- // So, the ChangeEventPending array may grow while calling NotifyChanged,
- // and that's ok.
-
- for (int n=0; n < ChangeEventPending.Count; n++) {
- ((ObjectWrapper)ChangeEventPending[n]).FireObjectChangedEvent ();
- }
-
- // Remove from the list the widgets that have been disposed. It means that
- // they have been deleted. That change will be recorded by their parents.
- // Remove as well wrappers that are not registered, since there won't be
- // status information for them.
- for (int n=0; n 0)
- return GtkAction.Label;
-
- if (GtkAction.StockId == null)
- return "";
-
- Gtk.StockItem item = Gtk.Stock.Lookup (GtkAction.StockId);
- if (item.Label != null)
- return item.Label;
-
- return "";
- }
- }
-
- public string ToolLabel {
- get {
- if (GtkAction.ShortLabel != null && GtkAction.ShortLabel.Length > 0)
- return GtkAction.ShortLabel;
- else
- return MenuLabel;
- }
- }
-
- public ActionGroup ActionGroup {
- get { return group; }
- }
-
- public string Group {
- get {
- return GroupManager.GetGroup (this);
- }
- set {
- if (value != null && value.Length > 0)
- Type = ActionType.Radio;
- GroupManager.SetGroup (this, value);
- EmitNotify ("Group");
- }
- }
-
- public void Delete ()
- {
- if (group != null)
- group.Actions.Remove (this);
- if (Deleted != null)
- Deleted (this, EventArgs.Empty);
- Dispose ();
- }
-
- protected override void EmitNotify (string propertyName)
- {
- if (propertyName == "Label" || propertyName == "StockId") {
- // If the current name is a name generated from label or stockid,
- // we update here the name again
- if (nameRoot == oldDefaultName)
- Name = GetDefaultName ();
- oldDefaultName = GetDefaultName ();
- }
- base.EmitNotify (propertyName);
- }
-
- public override XmlElement Write (ObjectWriter writer)
- {
- XmlElement elem = writer.XmlDocument.CreateElement ("action");
- elem.SetAttribute ("id", Name);
- WidgetUtils.GetProps (this, elem);
- WidgetUtils.GetSignals (this, elem);
- if (writer.CreateUndoInfo)
- elem.SetAttribute ("undoId", UndoId);
- return elem;
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- Gtk.Action ac = new Gtk.Action ("", "");
-
- ClassDescriptor klass = Registry.LookupClassByName ("Gtk.Action");
- ObjectWrapper.Bind (reader.Project, klass, this, ac, true);
-
- WidgetUtils.ReadMembers (klass, this, ac, elem);
- name = nameRoot = oldDefaultName = elem.GetAttribute ("id");
-
- string uid = elem.GetAttribute ("undoId");
- if (uid.Length > 0)
- UndoId = uid;
- }
-
- public Action Clone ()
- {
- Action a = (Action) ObjectWrapper.Create (Project, new Gtk.Action ("", ""));
- a.CopyFrom (this);
- return a;
- }
-
- public void CopyFrom (Action action)
- {
- type = action.type;
- drawAsRadio = action.drawAsRadio;
- radioValue = action.radioValue;
- active = action.active;
- name = action.name;
- GtkAction.HideIfEmpty = action.GtkAction.HideIfEmpty;
- GtkAction.IsImportant = action.GtkAction.IsImportant;
- GtkAction.Label = action.GtkAction.Label;
- GtkAction.Sensitive = action.GtkAction.Sensitive;
- GtkAction.ShortLabel = action.GtkAction.ShortLabel;
- GtkAction.StockId = action.GtkAction.StockId;
- GtkAction.Tooltip = action.GtkAction.Tooltip;
- GtkAction.Visible = action.GtkAction.Visible;
- GtkAction.VisibleHorizontal = action.GtkAction.VisibleHorizontal;
- GtkAction.VisibleVertical = action.GtkAction.VisibleVertical;
-
- Signals.Clear ();
- foreach (Signal s in action.Signals)
- Signals.Add (new Signal (s.SignalDescriptor, s.Handler, s.After));
-
- NotifyChanged ();
- }
-
- public Gtk.Widget CreateIcon (Gtk.IconSize size)
- {
- if (GtkAction.StockId == null)
- return null;
-
- Gdk.Pixbuf px = Project.IconFactory.RenderIcon (Project, GtkAction.StockId, size);
- if (px != null)
- return new Gtk.Image (px);
- else
- return GtkAction.CreateIcon (size);
- }
-
- public Gdk.Pixbuf RenderIcon (Gtk.IconSize size)
- {
- if (GtkAction.StockId == null)
- return null;
-
- Gdk.Pixbuf px = Project.IconFactory.RenderIcon (Project, GtkAction.StockId, size);
- if (px != null)
- return px;
-
- Gtk.IconSet iset = Gtk.IconFactory.LookupDefault (GtkAction.StockId);
- if (iset == null)
- return WidgetUtils.MissingIcon;
- else
- return iset.RenderIcon (new Gtk.Style (), Gtk.TextDirection.Ltr, Gtk.StateType.Normal, size, null, "");
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- CodeObjectCreateExpression exp = new CodeObjectCreateExpression ();
-
- PropertyDescriptor prop = (PropertyDescriptor) ClassDescriptor ["Name"];
- exp.Parameters.Add (ctx.GenerateValue (prop.GetValue (Wrapped), prop.RuntimePropertyType));
-
- prop = (PropertyDescriptor) ClassDescriptor ["Label"];
- string lab = (string) prop.GetValue (Wrapped);
- if (lab == "") lab = null;
- exp.Parameters.Add (ctx.GenerateValue (lab, prop.RuntimePropertyType, prop.Translatable));
-
- prop = (PropertyDescriptor) ClassDescriptor ["Tooltip"];
- exp.Parameters.Add (ctx.GenerateValue (prop.GetValue (Wrapped), prop.RuntimePropertyType, prop.Translatable));
-
- prop = (PropertyDescriptor) ClassDescriptor ["StockId"];
- exp.Parameters.Add (ctx.GenerateValue (prop.GetValue (Wrapped), prop.RuntimePropertyType, prop.Translatable));
-
- if (type == ActionType.Action)
- exp.CreateType = new CodeTypeReference ("Gtk.Action", CodeTypeReferenceOptions.GlobalReference);
- else if (type == ActionType.Toggle)
- exp.CreateType = new CodeTypeReference ("Gtk.ToggleAction", CodeTypeReferenceOptions.GlobalReference);
- else {
- exp.CreateType = new CodeTypeReference ("Gtk.RadioAction", CodeTypeReferenceOptions.GlobalReference);
- prop = (PropertyDescriptor) ClassDescriptor ["Value"];
- exp.Parameters.Add (ctx.GenerateValue (prop.GetValue (Wrapped), typeof(int)));
- }
- return exp;
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (Type == ActionType.Radio) {
- CodeExpression groupExp = GroupManager.GenerateGroupExpression (ctx, this);
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "Group"),
- groupExp)
- );
- }
- else if (type == ActionType.Toggle) {
- if (Active) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "Active"),
- new CodePrimitiveExpression (true))
- );
- }
- if (DrawAsRadio) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "DrawAsRadio"),
- new CodePrimitiveExpression (true))
- );
- }
- }
- base.GenerateBuildCode (ctx, var);
- }
-
- internal void SetActionGroup (ActionGroup g)
- {
- group = g;
- }
-
- string GetIdentifier (string name)
- {
- StringBuilder sb = new StringBuilder ();
-
- bool wstart = false;
- foreach (char c in name) {
- if (c == '_' || (int)c > 127) // No underline, no unicode
- continue;
- if (c == '-' || c == ' ' || !char.IsLetterOrDigit (c)) {
- wstart = true;
- continue;
- }
- if (wstart) {
- sb.Append (char.ToUpper (c));
- wstart = false;
- } else
- sb.Append (c);
- }
- return sb.ToString () + "Action";
- }
-
- internal override UndoManager GetUndoManagerInternal ()
- {
- if (group != null)
- return group.GetUndoManagerInternal ();
- else
- return base.GetUndoManagerInternal ();
- }
-
- DiffGenerator GetDiffGenerator ()
- {
- DiffGenerator gen = new DiffGenerator ();
- gen.CurrentStatusAdaptor = new ActionDiffAdaptor (Project);
- gen.NewStatusAdaptor = new XmlDiffAdaptor ();
- return gen;
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = UndoManager.GetObjectStatus (this);
- UndoWriter writer = new UndoWriter (oldElem.OwnerDocument, UndoManager);
- XmlElement newElem = Write (writer);
- ObjectDiff actionsDiff = GetDiffGenerator().GetDiff (this, oldElem);
- UndoManager.UpdateObjectStatus (this, newElem);
- return actionsDiff;
- }
-
- public override object ApplyUndoRedoDiff (object diff)
- {
- ObjectDiff actionsDiff = (ObjectDiff) diff;
-
- XmlElement status = UndoManager.GetObjectStatus (this);
-
- DiffGenerator differ = GetDiffGenerator();
- differ.ApplyDiff (this, actionsDiff);
- actionsDiff = differ.GetDiff (this, status);
-
- UndoWriter writer = new UndoWriter (status.OwnerDocument, UndoManager);
- XmlElement newElem = Write (writer);
- UndoManager.UpdateObjectStatus (this, newElem);
-
- return actionsDiff;
- }
- }
-
- [Serializable]
- public class ActionCollection: CollectionBase
- {
- [NonSerialized]
- ActionGroup group;
-
- public ActionCollection ()
- {
- }
-
- internal ActionCollection (ActionGroup group)
- {
- this.group = group;
- }
-
- public void Add (Action action)
- {
- List.Add (action);
- }
-
- public void Insert (int i, Action action)
- {
- List.Insert (i, action);
- }
-
- public Action this [int n] {
- get { return (Action) List [n]; }
- }
-
- public void Remove (Action action)
- {
- List.Remove (action);
- }
-
- public bool Contains (Action action)
- {
- return List.Contains (action);
- }
-
- public void CopyTo (Action[] array, int index)
- {
- List.CopyTo (array, index);
- }
-
- protected override void OnInsertComplete (int index, object val)
- {
- if (group != null)
- group.NotifyActionAdded ((Action) val);
- }
-
- protected override void OnRemoveComplete (int index, object val)
- {
- if (group != null)
- group.NotifyActionRemoved ((Action)val);
- }
-
- protected override void OnSetComplete (int index, object oldv, object newv)
- {
- if (group != null) {
- group.NotifyActionRemoved ((Action) oldv);
- group.NotifyActionAdded ((Action) newv);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionGroup.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionGroup.cs
deleted file mode 100644
index 42ac4832073..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionGroup.cs
+++ /dev/null
@@ -1,425 +0,0 @@
-
-using System;
-using System.CodeDom;
-using System.Xml;
-using System.Collections;
-using Stetic.Undo;
-
-namespace Stetic.Wrapper
-{
- public sealed class ActionGroup: ObjectWrapper
- {
- string name;
- ActionCollection actions;
- ObjectWrapper owner;
- bool generatePublic = true;
-
- public event ActionEventHandler ActionAdded;
- public event ActionEventHandler ActionRemoved;
- public event ActionEventHandler ActionChanged;
-
- public ActionGroup ()
- {
- actions = new ActionCollection (this);
- }
-
- public ActionGroup (string name): this ()
- {
- this.name = name;
- }
-
- public override void Dispose ()
- {
- foreach (Action a in actions)
- a.Dispose ();
- base.Dispose ();
- }
-
- public ActionCollection Actions {
- get { return actions; }
- }
-
- public string Name {
- get { return name; }
- set {
- name = value;
- NotifyChanged ();
- }
- }
-
- public bool GeneratePublic {
- get { return generatePublic; }
- set { generatePublic = value; }
- }
-
- public Action GetAction (string name)
- {
- foreach (Action ac in actions)
- if (ac.Name == name)
- return ac;
- return null;
- }
-
- internal string GetValidName (Action reqAction, string name)
- {
- int max = 0;
- bool found = false;
- foreach (Action ac in Actions) {
- if (ac == reqAction)
- continue;
-
- string bname;
- int index;
- WidgetUtils.ParseWidgetName (ac.Name, out bname, out index);
-
- if (name == ac.Name)
- found = true;
- if (name == bname && index > max)
- max = index;
- }
- if (found)
- return name + (max+1);
- else
- return name;
- }
-
- public override XmlElement Write (ObjectWriter writer)
- {
- XmlElement group = writer.XmlDocument.CreateElement ("action-group");
- group.SetAttribute ("name", name);
- if (writer.CreateUndoInfo)
- group.SetAttribute ("undoId", UndoId);
- foreach (Action ac in actions) {
- if (ac.Name.Length > 0)
- group.AppendChild (writer.WriteObject (ac));
- }
- return group;
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- name = elem.GetAttribute ("name");
- string uid = elem.GetAttribute ("undoId");
- if (uid.Length > 0)
- UndoId = uid;
- foreach (XmlElement child in elem.SelectNodes ("action")) {
- Action ac = new Action ();
- ac.Read (reader, child);
- actions.Add (ac);
- }
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (
- typeof(Gtk.ActionGroup).ToGlobalTypeRef (),
- new CodePrimitiveExpression (Name)
- );
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- foreach (Action action in Actions) {
- // Create the action
- CodeExpression acVarExp = ctx.GenerateInstanceExpression (action, action.GenerateObjectCreation (ctx));
- ctx.GenerateBuildCode (action, acVarExp);
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- var,
- "Add",
- acVarExp,
- new CodePrimitiveExpression (action.Accelerator)
- )
- );
- }
- }
-
- internal void SetOwner (ObjectWrapper owner)
- {
- this.owner = owner;
- }
-
- internal override UndoManager GetUndoManagerInternal ()
- {
- if (owner != null)
- return owner.UndoManager;
- else
- return base.GetUndoManagerInternal ();
- }
-
- public override ObjectWrapper FindObjectByUndoId (string id)
- {
- ObjectWrapper ow = base.FindObjectByUndoId (id);
- if (ow != null) return ow;
-
- foreach (Action ac in Actions) {
- ow = ac.FindObjectByUndoId (id);
- if (ow != null)
- return ow;
- }
- return null;
- }
-
- DiffGenerator GetDiffGenerator ()
- {
- DiffGenerator gen = new DiffGenerator ();
- gen.CurrentStatusAdaptor = new ActionDiffAdaptor (Project);
- XmlDiffAdaptor xad = new XmlDiffAdaptor ();
- xad.ChildElementName = "action";
- gen.NewStatusAdaptor = xad;
- return gen;
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = UndoManager.GetObjectStatus (this);
- UndoWriter writer = new UndoWriter (oldElem.OwnerDocument, UndoManager);
-
- XmlElement newElem = Write (writer);
- ObjectDiff actionsDiff = GetDiffGenerator().GetDiff (this, oldElem);
- UndoManager.UpdateObjectStatus (this, newElem);
- return actionsDiff;
- }
-
- public override object ApplyUndoRedoDiff (object diff)
- {
- ObjectDiff actionsDiff = (ObjectDiff) diff;
-
- XmlElement status = UndoManager.GetObjectStatus (this);
-
- DiffGenerator differ = GetDiffGenerator();
- differ.ApplyDiff (this, actionsDiff);
- actionsDiff = differ.GetDiff (this, status);
-
- UndoWriter writer = new UndoWriter (status.OwnerDocument, UndoManager);
- XmlElement newElem = Write (writer);
- UndoManager.UpdateObjectStatus (this, newElem);
-
- return actionsDiff;
- }
-
- internal void NotifyActionAdded (Action ac)
- {
- ac.SetActionGroup (this);
- ac.ObjectChanged += OnActionChanged;
- ac.SignalAdded += OnSignalAdded;
- ac.SignalRemoved += OnSignalRemoved;
- ac.SignalChanged += OnSignalChanged;
-
- ac.UpdateNameIndex ();
-
- NotifyChanged ();
-
- if (ActionAdded != null)
- ActionAdded (this, new ActionEventArgs (ac));
- }
-
- internal void NotifyActionRemoved (Action ac)
- {
- ac.SetActionGroup (null);
- ac.ObjectChanged -= OnActionChanged;
- ac.SignalAdded -= OnSignalAdded;
- ac.SignalRemoved -= OnSignalRemoved;
- ac.SignalChanged -= OnSignalChanged;
-
- NotifyChanged ();
-
- if (ActionRemoved != null)
- ActionRemoved (this, new ActionEventArgs (ac));
- }
-
- void OnActionChanged (object s, ObjectWrapperEventArgs args)
- {
- NotifyChanged ();
- if (ActionChanged != null)
- ActionChanged (this, new ActionEventArgs ((Action) args.Wrapper));
- }
-
- void OnSignalAdded (object s, SignalEventArgs args)
- {
- OnSignalAdded (args);
- }
-
- void OnSignalRemoved (object s, SignalEventArgs args)
- {
- OnSignalRemoved (args);
- }
-
- void OnSignalChanged (object s, SignalChangedEventArgs args)
- {
- OnSignalChanged (args);
- }
- }
-
- public class ActionGroupCollection: CollectionBase
- {
- ActionGroup[] toClear;
- ObjectWrapper owner;
-
- internal void SetOwner (ObjectWrapper owner)
- {
- this.owner = owner;
- }
-
- public void Add (ActionGroup group)
- {
- List.Add (group);
- }
-
- public void Insert (int n, ActionGroup group)
- {
- List.Insert (n, group);
- }
-
- public ActionGroup this [int n] {
- get { return (ActionGroup) List [n]; }
- }
-
- public ActionGroup this [string name] {
- get {
- foreach (ActionGroup grp in List)
- if (grp.Name == name)
- return grp;
- return null;
- }
- }
-
- internal ObjectWrapper FindObjectByUndoId (string id)
- {
- foreach (ActionGroup ag in List) {
- ObjectWrapper ow = ag.FindObjectByUndoId (id);
- if (ow != null)
- return ow;
- }
- return null;
- }
-
- DiffGenerator GetDiffGenerator (IProject prj)
- {
- DiffGenerator gen = new DiffGenerator ();
- gen.CurrentStatusAdaptor = new ActionDiffAdaptor (prj);
- XmlDiffAdaptor xad = new XmlDiffAdaptor ();
- xad.ChildElementName = "action-group";
- xad.ProcessProperties = false;
- xad.ChildAdaptor = new XmlDiffAdaptor ();
- xad.ChildAdaptor.ChildElementName = "action";
- gen.NewStatusAdaptor = xad;
- return gen;
- }
-
- internal ObjectDiff GetDiff (IProject prj, XmlElement elem)
- {
- return GetDiffGenerator (prj).GetDiff (this, elem);
- }
-
- internal void ApplyDiff (IProject prj, ObjectDiff diff)
- {
- GetDiffGenerator (prj).ApplyDiff (this, diff);
- }
-
- public int IndexOf (ActionGroup group)
- {
- return List.IndexOf (group);
- }
-
- public void Remove (ActionGroup group)
- {
- List.Remove (group);
- }
-
- protected override void OnInsertComplete (int index, object val)
- {
- NotifyGroupAdded ((ActionGroup) val);
- }
-
- protected override void OnRemoveComplete (int index, object val)
- {
- NotifyGroupRemoved ((ActionGroup)val);
- }
-
- protected override void OnSetComplete (int index, object oldv, object newv)
- {
- NotifyGroupRemoved ((ActionGroup) oldv);
- NotifyGroupAdded ((ActionGroup) newv);
- }
-
- protected override void OnClear ()
- {
- toClear = new ActionGroup [Count];
- List.CopyTo (toClear, 0);
- }
-
- protected override void OnClearComplete ()
- {
- foreach (ActionGroup a in toClear)
- NotifyGroupRemoved (a);
- toClear = null;
- }
-
- void NotifyGroupAdded (ActionGroup grp)
- {
- grp.SetOwner (owner);
- grp.ObjectChanged += OnGroupChanged;
- if (ActionGroupAdded != null)
- ActionGroupAdded (this, new ActionGroupEventArgs (grp));
- }
-
- void NotifyGroupRemoved (ActionGroup grp)
- {
- grp.SetOwner (null);
- grp.ObjectChanged -= OnGroupChanged;
- if (ActionGroupRemoved != null)
- ActionGroupRemoved (this, new ActionGroupEventArgs (grp));
- }
-
- void OnGroupChanged (object s, ObjectWrapperEventArgs a)
- {
- if (ActionGroupChanged != null)
- ActionGroupChanged (this, new ActionGroupEventArgs ((ActionGroup)s));
- }
-
- public ActionGroup[] ToArray ()
- {
- ActionGroup[] groups = new ActionGroup [Count];
- List.CopyTo (groups, 0);
- return groups;
- }
-
- public event ActionGroupEventHandler ActionGroupAdded;
- public event ActionGroupEventHandler ActionGroupRemoved;
- public event ActionGroupEventHandler ActionGroupChanged;
- }
-
-
- public delegate void ActionEventHandler (object sender, ActionEventArgs args);
-
- public class ActionEventArgs: EventArgs
- {
- readonly Action action;
-
- public ActionEventArgs (Action ac)
- {
- action = ac;
- }
-
- public Action Action {
- get { return action; }
- }
- }
-
- public delegate void ActionGroupEventHandler (object sender, ActionGroupEventArgs args);
-
- public class ActionGroupEventArgs: EventArgs
- {
- readonly ActionGroup action;
-
- public ActionGroupEventArgs (ActionGroup ac)
- {
- action = ac;
- }
-
- public ActionGroup ActionGroup {
- get { return action; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionToolbarWrapper.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionToolbarWrapper.cs
deleted file mode 100644
index 9b65f1432ce..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionToolbarWrapper.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-
-using System;
-using System.CodeDom;
-using System.Xml;
-using System.Collections;
-using Stetic.Editor;
-
-namespace Stetic.Wrapper
-{
- public class ActionToolbarWrapper: Container
- {
- ActionTree actionTree;
- XmlElement toolbarInfo;
- ToolbarStyle toolbarStyle = ToolbarStyle.Default;
- ToolbarIconSize iconSize = ToolbarIconSize.Default;
- bool treeChanged;
-
- static Gtk.ToolbarStyle defaultStyle;
- static Gtk.IconSize defaultSize;
- static bool gotDefault;
-
- public enum ToolbarStyle {
- Icons,
- Text,
- Both,
- BothHoriz,
- Default
- }
-
- public enum ToolbarIconSize {
- Menu = Gtk.IconSize.Menu,
- SmallToolbar = Gtk.IconSize.SmallToolbar,
- LargeToolbar = Gtk.IconSize.LargeToolbar,
- Button = Gtk.IconSize.Button,
- Dnd = Gtk.IconSize.Dnd,
- Dialog = Gtk.IconSize.Dialog,
- Default = -1
- }
-
- public ActionToolbarWrapper()
- {
- }
-
- public override void Dispose ()
- {
- DisposeTree ();
- base.Dispose ();
- }
-
- public static Gtk.Toolbar CreateInstance ()
- {
- ActionToolbar t = new ActionToolbar ();
- // Looks like the default size and style are set when adding the toolbar to the window,
- // so we have to explicitly get the defaults to make sure the toolbar is properly initialized
- GetDefaults ();
- t.IconSize = defaultSize;
- t.ToolbarStyle = defaultStyle;
- return t;
- }
-
- ActionToolbar toolbar {
- get { return (ActionToolbar) Wrapped; }
- }
-
- protected override bool AllowPlaceholders {
- get { return false; }
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- CreateTree ();
- toolbar.FillMenu (actionTree);
- }
-
- public override bool HExpandable {
- get {
- return toolbar.Orientation == Gtk.Orientation.Horizontal;
- }
- }
-
- public override bool VExpandable {
- get {
- return toolbar.Orientation == Gtk.Orientation.Vertical;
- }
- }
-
- public Gtk.Orientation Orientation {
- get {
- return toolbar.Orientation;
- }
- set {
- toolbar.Orientation = value;
- EmitContentsChanged ();
- }
- }
-
- public ToolbarIconSize ButtonIconSize {
- get { return iconSize; }
- set {
- iconSize = value;
- if (value == ToolbarIconSize.Default) {
- GetDefaults ();
- toolbar.IconSize = defaultSize;
- } else {
- toolbar.IconSize = (Gtk.IconSize) ((int)value);
- }
- EmitNotify ("ButtonIconSize");
- }
- }
-
- public ToolbarStyle ButtonStyle {
- get { return toolbarStyle; }
- set {
- toolbarStyle = value;
- if (value == ToolbarStyle.Default) {
- GetDefaults ();
- toolbar.ToolbarStyle = defaultStyle;
- } else {
- toolbar.ToolbarStyle = (Gtk.ToolbarStyle) ((int)value);
- }
- EmitNotify ("ButtonStyle");
- }
- }
-
- static void GetDefaults ()
- {
- if (!gotDefault) {
- // Is there a better way of getting the default?
- Gtk.Window d = new Gtk.Window ("");
- Gtk.Toolbar t = new Gtk.Toolbar ();
- d.Add (t);
- defaultStyle = t.ToolbarStyle;
- defaultSize = t.IconSize;
- d.Destroy ();
- gotDefault = true;
- }
- }
-
- internal protected override void OnSelected ()
- {
- Loading = true;
- toolbar.ShowInsertPlaceholder = true;
- Loading = false;
- }
-
- internal protected override void OnUnselected ()
- {
- base.OnUnselected ();
- Loading = true;
- toolbar.ShowInsertPlaceholder = false;
- toolbar.Unselect ();
- Loading = false;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (writer.Format == FileFormat.Native) {
- // The style and icon size is already stored in ButtonStyle and ButtonIconSize
- GladeUtils.ExtractProperty (elem, "ToolbarStyle", "");
- GladeUtils.ExtractProperty (elem, "IconSize", "");
-
- // Store ButtonIconSize as IconSize, for backwards compat
- GladeUtils.RenameProperty (elem, "ButtonIconSize", "IconSize");
-
- if (toolbarInfo != null)
- elem.AppendChild (writer.XmlDocument.ImportNode (toolbarInfo, true));
- else
- elem.AppendChild (actionTree.Write (writer.XmlDocument, writer.Format));
- }
- return elem;
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- // ButtonIconSize is stored as IconSize
- GladeUtils.RenameProperty (elem, "IconSize", "ButtonIconSize");
-
- base.ReadProperties (reader, elem);
- toolbarInfo = elem ["node"];
- }
-
- protected override void OnNameChanged (WidgetNameChangedArgs args)
- {
- base.OnNameChanged (args);
- if (actionTree != null)
- actionTree.Name = Name;
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- BuildTree ();
- actionTree.Type = Gtk.UIManagerItemType.Toolbar;
- actionTree.Name = Name;
-
- CodeExpression exp = GenerateUiManagerElement (ctx, actionTree);
- if (exp != null)
- return new CodeCastExpression (typeof(Gtk.Toolbar).ToGlobalTypeRef (), exp);
- else
- return base.GenerateObjectCreation (ctx);
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (toolbarStyle == ToolbarStyle.Default && prop.Name == "ToolbarStyle")
- return;
- else if (iconSize == ToolbarIconSize.Default && prop.Name == "IconSize")
- return;
- else
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- internal protected override void OnDesignerAttach (IDesignArea designer)
- {
- base.OnDesignerAttach (designer);
- BuildTree ();
-
- Loading = true;
- toolbar.FillMenu (actionTree);
- Loading = false;
-
- if (LocalActionGroups.Count == 0)
- LocalActionGroups.Add (new ActionGroup ("Default"));
- }
-
- protected override void EmitNotify (string propertyName)
- {
- base.EmitNotify (propertyName);
- toolbar.FillMenu (actionTree);
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = treeChanged ? UndoManager.GetObjectStatus (this) ["node"] : null;
- if (oldElem != null)
- oldElem = (XmlElement) oldElem.CloneNode (true);
-
- treeChanged = false;
- object baseDiff = base.GetUndoDiff ();
-
- if (oldElem != null) {
- XmlElement newElem = UndoManager.GetObjectStatus (this) ["node"];
- if (newElem != null && oldElem.OuterXml == newElem.OuterXml)
- oldElem = null;
- }
-
- if (baseDiff == null && oldElem == null)
- return null;
- else {
- object stat = toolbar.SaveStatus ();
- return new object[] { baseDiff, oldElem, stat };
- }
- }
-
- public override object ApplyUndoRedoDiff (object diff)
- {
- object[] data = (object[]) diff;
- object retBaseDiff;
- XmlElement oldNode = null;
-
- if (actionTree != null) {
- XmlElement status = UndoManager.GetObjectStatus (this);
- oldNode = status ["node"];
- if (oldNode != null)
- oldNode = (XmlElement) oldNode.CloneNode (true);
- }
- object oldStat = toolbar.SaveStatus ();
-
- if (data [0] != null)
- retBaseDiff = base.ApplyUndoRedoDiff (data [0]);
- else
- retBaseDiff = null;
-
- XmlElement xdiff = (XmlElement) data [1];
-
- if (xdiff != null) {
- XmlElement status = UndoManager.GetObjectStatus (this);
- XmlElement prevNode = status ["node"];
- if (prevNode != null)
- status.RemoveChild (prevNode);
- status.AppendChild (xdiff);
-
- if (actionTree != null) {
- Loading = true;
- DisposeTree ();
- CreateTree ();
- actionTree.Read (this, xdiff);
- toolbar.FillMenu (actionTree);
- Loading = false;
- }
- }
-
- // Restore the status after all menu structure has been properly built
- GLib.Timeout.Add (50, delegate {
- toolbar.RestoreStatus (data[2]);
- return false;
- });
-
- return new object [] { retBaseDiff, oldNode, oldStat };
- }
-
-
- void BuildTree ()
- {
- if (toolbarInfo != null) {
- DisposeTree ();
- CreateTree ();
- actionTree.Read (this, toolbarInfo);
- toolbarInfo = null;
- }
- }
-
- void CreateTree ()
- {
- actionTree = new ActionTree ();
- actionTree.Name = Name;
- actionTree.Type = Gtk.UIManagerItemType.Toolbar;
- actionTree.Changed += OnTreeChanged;
- }
-
- void DisposeTree ()
- {
- if (actionTree != null) {
- actionTree.Dispose ();
- actionTree.Changed -= OnTreeChanged;
- actionTree = null;
- }
- }
-
- void OnTreeChanged (object s, EventArgs a)
- {
- treeChanged = true;
- NotifyChanged ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionTree.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionTree.cs
deleted file mode 100644
index 3caceadeb16..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ActionTree.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-
-using System;
-using System.Text;
-using System.Xml;
-using System.CodeDom;
-using System.Collections;
-
-namespace Stetic.Wrapper
-{
-
- public class ActionTree: ActionTreeNode
- {
- public event EventHandler Changed;
-
- public ActionTree()
- {
- }
-
- public void GenerateBuildCode (GeneratorContext ctx, CodeFieldReferenceExpression uiManager)
- {
- StringBuilder sb = new StringBuilder ();
- sb.Append ("");
- GenerateUiString (sb);
- sb.Append ("");
-
- CodeMethodInvokeExpression exp = new CodeMethodInvokeExpression (
- uiManager,
- "AddUiFromString",
- new CodePrimitiveExpression (sb.ToString ())
- );
- ctx.Statements.Add (exp);
- }
-
- public ActionGroup[] GetRequiredGroups ()
- {
- ArrayList list = new ArrayList ();
- GetRequiredGroups (list);
- return (ActionGroup[]) list.ToArray (typeof(ActionGroup));
- }
-
- internal override void NotifyChanged ()
- {
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
- }
-
- public class ActionTreeNode: IDisposable
- {
- Gtk.UIManagerItemType type;
- string name;
- Action action;
- ActionTreeNodeCollection children;
- ActionTreeNode parentNode;
- bool loading;
- string lastActionName;
-
- public ActionTreeNode ()
- {
- }
-
- public ActionTreeNode Clone ()
- {
- return new ActionTreeNode (type, name, action);
- }
-
- public ActionTreeNode (Gtk.UIManagerItemType type, string name, Action action)
- {
- this.type = type;
- this.name = name;
- this.action = action;
- if (this.action != null) {
- lastActionName = this.action.Name;
- this.action.Deleted += OnActionDeleted;
- this.action.ObjectChanged += OnActionChanged;
- }
- }
-
- public virtual void Dispose ()
- {
- if (action != null) {
- action.Deleted -= OnActionDeleted;
- action.ObjectChanged -= OnActionChanged;
- }
- if (children != null)
- foreach (ActionTreeNode node in children)
- node.Dispose ();
- }
-
- void OnActionDeleted (object s, EventArgs args)
- {
- if (parentNode != null)
- parentNode.Children.Remove (this);
- }
-
- void OnActionChanged (object s, ObjectWrapperEventArgs args)
- {
- // If the name of the action changes, consider it a change in
- // the node, since the generated xml will be different
-
- Action ac = (Action) args.Wrapper;
- if (ac.Name != lastActionName) {
- lastActionName = ac.Name;
- NotifyChanged ();
- }
- }
-
- internal virtual void NotifyChanged ()
- {
- if (parentNode != null)
- parentNode.NotifyChanged ();
- }
-
- public XmlElement Write (XmlDocument doc, FileFormat format)
- {
- XmlElement elem = doc.CreateElement ("node");
- if (name != null && name.Length > 0)
- elem.SetAttribute ("name", name);
- elem.SetAttribute ("type", type.ToString ());
- if (action != null)
- elem.SetAttribute ("action", action.Name);
-
- if (children != null) {
- foreach (ActionTreeNode child in children) {
- if (child.Action != null && child.Action.Name.Length == 0)
- continue;
- elem.AppendChild (child.Write (doc, format));
- }
- }
- return elem;
- }
-
- public void Read (Wrapper.Widget baseWidget, XmlElement elem)
- {
- name = elem.GetAttribute ("name");
- if (elem.HasAttribute ("type"))
- type = (Gtk.UIManagerItemType) Enum.Parse (typeof(Gtk.UIManagerItemType), elem.GetAttribute ("type"));
-
- // The name of an action may be empty in some situations (e.g. when adding a new action but before entering the name)
- XmlAttribute actionAt = elem.Attributes ["action"];
- if (actionAt != null) {
- string aname = actionAt.Value;
- foreach (ActionGroup grp in baseWidget.LocalActionGroups) {
- action = grp.GetAction (aname);
- if (action != null)
- break;
- }
- if (action == null) {
- foreach (ActionGroup group in baseWidget.Project.ActionGroups) {
- action = group.GetAction (aname);
- if (action != null)
- break;
- }
- }
- if (action != null) {
- lastActionName = action.Name;
- action.Deleted += OnActionDeleted;
- action.ObjectChanged += OnActionChanged;
- }
- }
-
- try {
- loading = true;
- foreach (XmlElement child in elem.SelectNodes ("node")) {
- ActionTreeNode node = new ActionTreeNode ();
- node.Read (baseWidget, child);
- Children.Add (node);
- }
- } finally {
- loading = false;
- }
- }
-
- public virtual void GenerateBuildCode (GeneratorContext ctx, CodeVariableReferenceExpression uiManager, string path)
- {
- CodeMethodInvokeExpression exp = new CodeMethodInvokeExpression (
- uiManager,
- "AddUi",
- new CodePrimitiveExpression (0),
- new CodePrimitiveExpression (path),
- new CodePrimitiveExpression (name),
- new CodePrimitiveExpression (action != null ? action.Name : null),
- new CodeFieldReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(Gtk.UIManagerItemType), CodeTypeReferenceOptions.GlobalReference)),
- type.ToString()
- ),
- new CodePrimitiveExpression (false)
- );
- ctx.Statements.Add (exp);
-
- string localName = (name != null && name.Length > 0 ? name : (action != null ? action.Name : null));
- if (localName != null) {
- if (path != "/")
- path = path + "/" + localName;
- else
- path += localName;
- }
-
- foreach (ActionTreeNode node in Children)
- node.GenerateBuildCode (ctx, uiManager, path);
- }
-
- public void GenerateUiString (StringBuilder sb)
- {
- sb.Append ('<').Append (type.ToString().ToLower());
-
- string name = this.name;
- if (String.IsNullOrEmpty (name) && action != null)
- name = action.Name;
-
- if (!String.IsNullOrEmpty (name))
- sb.Append (" name='").Append (name).Append ("'");
- if (action != null)
- sb.Append (" action='").Append (action.Name).Append ("'");
-
- if (Children.Count > 0) {
- sb.Append ('>');
- foreach (ActionTreeNode node in Children)
- node.GenerateUiString (sb);
- sb.Append ("');
- } else
- sb.Append ("/>");
- }
-
- protected void GetRequiredGroups (ArrayList list)
- {
- if (action != null && action.ActionGroup != null && !list.Contains (action.ActionGroup))
- list.Add (action.ActionGroup);
- foreach (ActionTreeNode node in Children)
- node.GetRequiredGroups (list);
- }
-
- public Gtk.UIManagerItemType Type {
- get { return type; }
- set { type = value; NotifyChanged (); }
- }
-
- public string Name {
- get { return name; }
- set { name = value; NotifyChanged (); }
- }
-
- public Action Action {
- get { return action; }
- }
-
- public ActionTreeNode ParentNode {
- get { return parentNode; }
- }
-
- public ActionTreeNodeCollection Children {
- get {
- if (children == null)
- children = new ActionTreeNodeCollection (this);
- return children;
- }
- }
-
- internal void NotifyChildAdded (ActionTreeNode node)
- {
- node.parentNode = this;
- if (!loading) {
- NotifyChanged ();
- if (ChildNodeAdded != null)
- ChildNodeAdded (this, new ActionTreeNodeArgs (node));
- }
- }
-
- internal void NotifyChildRemoved (ActionTreeNode node)
- {
- node.parentNode = null;
- if (!loading) {
- NotifyChanged ();
- if (ChildNodeRemoved != null)
- ChildNodeRemoved (this, new ActionTreeNodeArgs (node));
- }
- }
-
- public event ActionTreeNodeHanlder ChildNodeAdded;
- public event ActionTreeNodeHanlder ChildNodeRemoved;
- }
-
- public class ActionTreeNodeCollection: CollectionBase
- {
- ActionTreeNode parent;
-
- public ActionTreeNodeCollection (ActionTreeNode parent)
- {
- this.parent = parent;
- }
-
- public void Add (ActionTreeNode node)
- {
- List.Add (node);
- }
-
- public void Insert (int index, ActionTreeNode node)
- {
- List.Insert (index, node);
- }
-
- public int IndexOf (ActionTreeNode node)
- {
- return List.IndexOf (node);
- }
-
- public void Remove (ActionTreeNode node)
- {
- if (List.Contains (node))
- List.Remove (node);
- }
-
- public ActionTreeNode this [int n] {
- get { return (ActionTreeNode) List [n]; }
- set { List [n] = value; }
- }
-
- protected override void OnInsertComplete (int index, object val)
- {
- parent.NotifyChildAdded ((ActionTreeNode) val);
- }
-
- protected override void OnRemoveComplete (int index, object val)
- {
- parent.NotifyChildRemoved ((ActionTreeNode)val);
- }
-
- protected override void OnSetComplete (int index, object oldv, object newv)
- {
- parent.NotifyChildRemoved ((ActionTreeNode) oldv);
- parent.NotifyChildAdded ((ActionTreeNode) newv);
- }
- }
-
- public delegate void ActionTreeNodeHanlder (object ob, ActionTreeNodeArgs args);
-
- public class ActionTreeNodeArgs: EventArgs
- {
- readonly ActionTreeNode node;
-
- public ActionTreeNodeArgs (ActionTreeNode node)
- {
- this.node = node;
- }
-
- public ActionTreeNode Node {
- get { return node; }
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Bin.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Bin.cs
deleted file mode 100644
index d40169e9eda..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Bin.cs
+++ /dev/null
@@ -1,378 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Reflection;
-
-namespace Stetic.Wrapper
-{
- public class Bin: Container
- {
- public static Gtk.Bin CreateInstance (ClassDescriptor klass)
- {
- if (klass.Name == "Gtk.Bin")
- return new CustomWidget ();
- else
- return null;
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (ClassDescriptor.WrappedTypeName == "Gtk.Bin") {
-
- // Gtk.Bin needs a helper class which handles child allocation.
- // This class needs to be generated since Stetic won't be linked with
- // the app.
-
- bool found = false;
- foreach (CodeTypeDeclaration dec in ctx.GlobalCodeNamespace.Types) {
- if (dec.Name == "BinContainer") {
- found = true;
- break;
- }
- }
-
- if (!found)
- GenerateHelperClass (ctx);
-
- CodeMethodInvokeExpression attachExp = new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (ctx.GlobalCodeNamespace.Name + ".BinContainer", CodeTypeReferenceOptions.GlobalReference)),
- "Attach",
- var
- );
-
- // If the Bin has its own action groups, we need to register
- // the resulting UIManager in the BinContainer, but it needs to be done
- // after generating it. Right now, we only keep a reference to
- // the BinContainer.
-
- string binContainerVar = null;
-
- if (IsTopLevel && LocalActionGroups.Count > 0) {
- binContainerVar = ctx.NewId ();
- ctx.Statements.Add (
- new CodeVariableDeclarationStatement (
- (ctx.GlobalCodeNamespace.Name + ".BinContainer"),
- binContainerVar,
- attachExp
- )
- );
- } else {
- ctx.Statements.Add (attachExp);
- }
-
- base.GenerateBuildCode (ctx, var);
-
- // Register the UIManager, if the Bin has one
-
- if (binContainerVar != null && UIManagerName != null) {
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- new CodeVariableReferenceExpression (binContainerVar),
- "SetUiManager",
- new CodeVariableReferenceExpression (UIManagerName)
- )
- );
- }
-
- } else
- base.GenerateBuildCode (ctx, var);
- }
-
- void GenerateHelperClass (GeneratorContext ctx)
- {
- CodeTypeDeclaration type = new CodeTypeDeclaration ("BinContainer");
- type.Attributes = MemberAttributes.Private;
- type.TypeAttributes = TypeAttributes.NestedAssembly;
- ctx.GlobalCodeNamespace.Types.Add (type);
-
- CodeMemberField field = new CodeMemberField ("Gtk.Widget", "child");
- field.Attributes = MemberAttributes.Private;
- type.Members.Add (field);
-
- field = new CodeMemberField ("Gtk.UIManager", "uimanager");
- field.Attributes = MemberAttributes.Private;
- type.Members.Add (field);
-
- CodeExpression child = new CodeFieldReferenceExpression (
- new CodeThisReferenceExpression (),
- "child"
- );
-
- CodeExpression uimanager = new CodeFieldReferenceExpression (
- new CodeThisReferenceExpression (),
- "uimanager"
- );
-
- // Attach method
-
- CodeMemberMethod met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "Attach";
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
- met.ReturnType = new CodeTypeReference ("BinContainer");
- met.Parameters.Add (new CodeParameterDeclarationExpression ("Gtk.Bin", "bin"));
-
- CodeVariableDeclarationStatement bcDec = new CodeVariableDeclarationStatement ("BinContainer", "bc");
- bcDec.InitExpression = new CodeObjectCreateExpression ("BinContainer");
- met.Statements.Add (bcDec);
- CodeVariableReferenceExpression bc = new CodeVariableReferenceExpression ("bc");
- CodeArgumentReferenceExpression bin = new CodeArgumentReferenceExpression ("bin");
-
- met.Statements.Add (
- new CodeAttachEventStatement (
- bin,
- "SizeRequested",
- new CodeDelegateCreateExpression (
- new CodeTypeReference ("Gtk.SizeRequestedHandler"), bc, "OnSizeRequested"
- )
- )
- );
-
- met.Statements.Add (
- new CodeAttachEventStatement (
- bin,
- "SizeAllocated",
- new CodeDelegateCreateExpression (
- new CodeTypeReference ("Gtk.SizeAllocatedHandler"), bc, "OnSizeAllocated"
- )
- )
- );
-
- met.Statements.Add (
- new CodeAttachEventStatement (
- bin,
- "Added",
- new CodeDelegateCreateExpression (
- new CodeTypeReference ("Gtk.AddedHandler"), bc, "OnAdded"
- )
- )
- );
- met.Statements.Add (new CodeMethodReturnStatement (bc));
-
- // OnSizeRequested override
-
- met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "OnSizeRequested";
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "sender"));
- met.Parameters.Add (new CodeParameterDeclarationExpression ("Gtk.SizeRequestedArgs", "args"));
-
- CodeConditionStatement cond = new CodeConditionStatement ();
- cond.Condition = new CodeBinaryOperatorExpression (
- child,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- );
- cond.TrueStatements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- new CodeArgumentReferenceExpression ("args"),
- "Requisition"
- ),
- new CodeMethodInvokeExpression (
- child,
- "SizeRequest"
- )
- )
- );
- met.Statements.Add (cond);
-
- // OnSizeAllocated method
-
- met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "OnSizeAllocated";
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "sender"));
- met.Parameters.Add (new CodeParameterDeclarationExpression ("Gtk.SizeAllocatedArgs", "args"));
-
- cond = new CodeConditionStatement ();
- cond.Condition = new CodeBinaryOperatorExpression (
- child,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- );
- cond.TrueStatements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- child,
- "Allocation"
- ),
- new CodePropertyReferenceExpression (
- new CodeArgumentReferenceExpression ("args"),
- "Allocation"
- )
- )
- );
- met.Statements.Add (cond);
-
- // OnAdded method
-
- met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "OnAdded";
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "sender"));
- met.Parameters.Add (new CodeParameterDeclarationExpression ("Gtk.AddedArgs", "args"));
-
- met.Statements.Add (
- new CodeAssignStatement (
- child,
- new CodePropertyReferenceExpression (
- new CodeArgumentReferenceExpression ("args"),
- "Widget"
- )
- )
- );
-
- // SetUiManager method
-
- met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "SetUiManager";
- met.Attributes = MemberAttributes.Public | MemberAttributes.Final;
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Gtk.UIManager), "uim"));
-
- met.Statements.Add (
- new CodeAssignStatement (
- uimanager,
- new CodeArgumentReferenceExpression ("uim")
- )
- );
- met.Statements.Add (
- new CodeAttachEventStatement (
- child,
- "Realized",
- new CodeDelegateCreateExpression (
- new CodeTypeReference ("System.EventHandler"), new CodeThisReferenceExpression(), "OnRealized"
- )
- )
- );
-
- // OnRealized method
-
- met = new CodeMemberMethod ();
- type.Members.Add (met);
- met.Name = "OnRealized";
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "sender"));
- met.Parameters.Add (new CodeParameterDeclarationExpression ("System.EventArgs", "args"));
-
- cond = new CodeConditionStatement ();
- cond.Condition = new CodeBinaryOperatorExpression (
- uimanager,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- );
-
- cond.TrueStatements.Add (
- new CodeVariableDeclarationStatement (
- typeof(Gtk.Widget),
- "w"
- )
- );
-
- CodeExpression wexp = new CodeVariableReferenceExpression ("w");
-
- cond.TrueStatements.Add (
- new CodeAssignStatement (
- wexp,
- new CodePropertyReferenceExpression (
- child,
- "Toplevel"
- )
- )
- );
-
- CodeConditionStatement cond2 = new CodeConditionStatement ();
- cond2.Condition = new CodeBinaryOperatorExpression (
- new CodeBinaryOperatorExpression (
- wexp,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- ),
- CodeBinaryOperatorType.BooleanAnd,
- new CodeMethodInvokeExpression (
- new CodeTypeOfExpression ("Gtk.Window"),
- "IsInstanceOfType",
- wexp
- )
- );
-
- cond2.TrueStatements.Add (
- new CodeMethodInvokeExpression (
- new CodeCastExpression ("Gtk.Window", wexp),
- "AddAccelGroup",
- new CodePropertyReferenceExpression (
- uimanager,
- "AccelGroup"
- )
- )
- );
- cond2.TrueStatements.Add (
- new CodeAssignStatement (
- uimanager,
- new CodePrimitiveExpression (null)
- )
- );
- cond.TrueStatements.Add (cond2);
-
- met.Statements.Add (cond);
- }
- }
-
-/*
- This is a model of what GenerateHelperClass generates:
-
- class BinContainer
- {
- Gtk.Widget child;
- UIManager uimanager;
-
- 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.Added += new Gtk.AddedHandler (bc.OnAdded);
- return bin;
- }
-
- void OnSizeRequested (object s, Gtk.SizeRequestedArgs args)
- {
- if (child != null)
- args.Requisition = child.SizeRequest ();
- }
-
- void OnSizeAllocated (object s, Gtk.SizeAllocatedArgs args)
- {
- if (child != null)
- child.Allocation = args.Allocation;
- }
-
- void OnAdded (object s, Gtk.AddedArgs args)
- {
- child = args.Widget;
- }
-
- public void SetUiManager (UIManager manager)
- {
- uimanager = manager;
- child.Realized += new System.EventHandler (OnRealized);
- }
-
- void OnRealized ()
- {
- if (uimanager != null) {
- Gtk.Widget w = child.Toplevel;
- if (w != null && w is Gtk.Window) {
- ((Gtk.Window)w).AddAccelGroup (uimanager.AccelGroup);
- uimanager = null;
- }
- }
- }
- }
-*/
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Box.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Box.cs
deleted file mode 100644
index 8e57f4b80f6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Box.cs
+++ /dev/null
@@ -1,276 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Box : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized && AllowPlaceholders) {
- Placeholder ph = CreatePlaceholder ();
- box.PackStart (ph);
- NotifyChildAdded (ph);
- ph = CreatePlaceholder ();
- box.PackStart (ph);
- NotifyChildAdded (ph);
- box.Spacing = 6;
- }
- box.SizeAllocated += box_SizeAllocated;
- ContainerOrientation = obj is Gtk.HBox ? Gtk.Orientation.Horizontal : Gtk.Orientation.Vertical;
- DND.ClearFaults (this);
- }
-
- public override void Dispose ()
- {
- box.SizeAllocated -= box_SizeAllocated;
- base.Dispose ();
- }
-
- protected Gtk.Box box {
- get {
- return (Gtk.Box)Wrapped;
- }
- }
-
-/*
- FIXME: why was this needed?
- protected override bool AllowPlaceholders {
- get {
- return InternalChildProperty != null;
- }
- }
-*/
- // DoSync() does two things: first, it makes sure that all of the
- // PackStart widgets have Position numbers less than all of the
- // PackEnd widgets. Second, it creates faults anywhere two widgets
- // could be split apart. The fault IDs correspond to the Position
- // a widget would have to be assigned to end up in that slot
- // (negated for PackEnd slots).
- //
- // Position/PackType: 0S 1S 2S 4E 3E
- // +----------------------+
- // | AA BB CC DD EE |
- // +----------------------+
- // Fault Id: 0 1 2 3 -5 -4 -3
-
- protected override void DoSync ()
- {
- if (!box.IsRealized)
- return;
-
- DND.ClearFaults (this);
-
- Gtk.Widget[] children = box.Children;
- if (children.Length == 0)
- return;
-
- Gtk.Widget[] sorted = new Gtk.Widget[children.Length];
- int last_start = -1;
- bool hbox = ContainerOrientation == Gtk.Orientation.Horizontal;
-
- foreach (Gtk.Widget child in children) {
- Gtk.Box.BoxChild bc = box[child] as Gtk.Box.BoxChild;
- if (AutoSize[child]) {
- bool exp = hbox ? ChildHExpandable (child) : ChildVExpandable (child);
- if (bc.Expand != exp)
- bc.Expand = exp;
- if (bc.Fill != exp)
- bc.Fill = exp;
- }
-
- // Make sure all of the PackStart widgets are before
- // any PackEnd widgets in the list.
- if (bc.PackType == Gtk.PackType.Start) {
- if (bc.Position != ++last_start) {
- Array.Copy (sorted, last_start, sorted, last_start + 1, bc.Position - last_start);
- box.ReorderChild (child, last_start);
- }
- }
-
- if (!(child is Placeholder))
- sorted[bc.Position] = child;
- }
-
- // The orientation of the faults is the opposite of the
- // orientation of the box
- Gtk.Orientation orientation = hbox ? Gtk.Orientation.Vertical : Gtk.Orientation.Horizontal;
- Gtk.SideType before = hbox ? Gtk.SideType.Left : Gtk.SideType.Top;
- Gtk.SideType after = hbox ? Gtk.SideType.Right : Gtk.SideType.Bottom;
-
- if (!Unselectable) {
- // If there are no PackStart widgets, we need a fault at the leading
- // edge. Otherwise if there's a widget at the leading edge, we need a
- // fault before it.
- if (last_start == -1)
- DND.AddFault (this, 0, before, null);
- else if (sorted[0] != null)
- DND.AddFault (this, 0, before, sorted[0]);
-
- // Add a fault between each pair of (non-placeholder) start widgets
- for (int i = 1; i <= last_start; i++) {
- if (sorted[i - 1] != null && sorted[i] != null)
- DND.AddFault (this, i, orientation, sorted[i - 1], sorted[i]);
- }
-
- // If there's a non-placeholder at the end of the PackStart
- // range, add a fault after it
- if (last_start > -1 && sorted[last_start] != null)
- DND.AddFault (this, last_start + 1, after, sorted[last_start]);
-
- // Now the PackEnd widgets
- if (last_start == sorted.Length - 1)
- DND.AddFault (this, -(last_start + 1), after, null);
- else if (sorted[last_start + 1] != null)
- DND.AddFault (this, -(last_start + 1), after, sorted[last_start + 1]);
-
- for (int i = last_start + 2; i < sorted.Length; i++) {
- if (sorted[i - 1] != null && sorted[i] != null)
- DND.AddFault (this, -i, orientation, sorted[i - 1], sorted[i]);
- }
-
- if (sorted.Length > last_start + 1 && sorted[sorted.Length - 1] != null)
- DND.AddFault (this, -sorted.Length, before, sorted[sorted.Length - 1]);
- }
- }
-
- internal void InsertBefore (Gtk.Widget context)
- {
- int position;
- Gtk.PackType type;
-
- if (context == box) {
- position = 0;
- type = Gtk.PackType.Start;
- } else {
- Gtk.Box.BoxChild bc = (Gtk.Box.BoxChild)ContextChildProps (context);
- position = bc.Position;
- type = bc.PackType;
- }
-
- Placeholder ph = CreatePlaceholder ();
- if (type == Gtk.PackType.Start) {
- box.PackStart (ph);
- box.ReorderChild (ph, position);
- } else {
- box.PackEnd (ph);
- box.ReorderChild (ph, position + 1);
- }
- NotifyChildAdded (ph);
- }
-
- internal void InsertAfter (Gtk.Widget context)
- {
- int position;
- Gtk.PackType type;
-
- if (context == box) {
- position = 0;
- type = Gtk.PackType.End;
- } else {
- Gtk.Box.BoxChild bc = (Gtk.Box.BoxChild)ContextChildProps (context);
- position = bc.Position;
- type = bc.PackType;
- }
-
- Placeholder ph = CreatePlaceholder ();
- if (type == Gtk.PackType.Start) {
- box.PackStart (ph);
- box.ReorderChild (ph, position + 1);
- } else {
- box.PackEnd (ph);
- box.ReorderChild (ph, position);
- }
- NotifyChildAdded (ph);
- }
-
- protected override void ChildContentsChanged (Container child) {
- Gtk.Widget widget = child.Wrapped;
-
- if (widget != null && AutoSize[widget]) {
- Gtk.Box.BoxChild bc = box[widget] as Gtk.Box.BoxChild;
- bool newExp = (ContainerOrientation == Gtk.Orientation.Horizontal) ? ChildHExpandable (widget) : ChildVExpandable (widget);
- if (newExp != bc.Expand)
- bc.Expand = newExp;
- if (newExp != bc.Fill)
- bc.Fill = newExp;
- }
- base.ChildContentsChanged (child);
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- base.ReplaceChild (oldChild, newChild);
-
- Container container = Stetic.Wrapper.Container.Lookup (newChild);
- if (container != null)
- ChildContentsChanged (container);
- }
-
- void box_SizeAllocated (object obj, Gtk.SizeAllocatedArgs args)
- {
- Sync ();
- }
-
- public override IEnumerable GladeChildren {
- get {
- // Return childs using the position order.
- // This is needed to make sure children are
- // added in the right order to the box while loading
- // or building the box.
- object[] obs = new object [box.Children.Length];
- foreach (Gtk.Widget child in box.Children) {
- Gtk.Box.BoxChild bc = (Gtk.Box.BoxChild) box [child];
- obs [bc.Position] = child;
- }
- return obs;
- }
- }
-
- public override void Drop (Gtk.Widget w, object faultId)
- {
- AutoSize[w] = true;
- int pos = (int)faultId;
-
- Freeze ();
- if (pos >= 0) {
- box.Add (w);
- box.ReorderChild (w, pos);
- } else {
- box.Add (w);
- box.ReorderChild (w, -pos);
- }
- EmitContentsChanged ();
- Thaw ();
- }
-
- public class BoxChild : Container.ContainerChild {
-
- public bool BoxExpand {
- get { return ((Gtk.Box.BoxChild)Wrapped).Expand; }
- set {
- AutoSize = false;
- ((Gtk.Box.BoxChild)Wrapped).Expand = value;
- }
- }
-
- public bool BoxFill {
- get { return ((Gtk.Box.BoxChild)Wrapped).Fill; }
- set {
- AutoSize = false;
- ((Gtk.Box.BoxChild)Wrapped).Fill = value;
- }
- }
-
- protected override void EmitNotify (string propertyName)
- {
- if (propertyName == "AutoSize") {
- base.EmitNotify ("Expand");
- base.EmitNotify ("Fill");
- }
- base.EmitNotify (propertyName);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Button.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Button.cs
deleted file mode 100644
index 1bfbb0bd3a8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Button.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class Button : Container {
-
- ImageInfo imageInfo;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- if (!initialized)
- UseUnderline = true;
-
- if (button.UseStock) {
- type = ButtonType.StockItem;
- StockId = button.Label;
- } else if (!initialized) {
- type = ButtonType.TextOnly;
- Label = button.Name;
- } else if (button.Child is Gtk.Label) {
- type = ButtonType.TextOnly;
- label = button.Label;
- useUnderline = button.UseUnderline;
- } else {
- type = ButtonType.Custom;
- FixupGladeChildren ();
- }
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- base.Read (reader, elem);
- if (reader.Format == FileFormat.Glade)
- UseUnderline = true;
- }
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- ObjectWrapper ret = null;
- if (Type == ButtonType.Custom || reader.Format == FileFormat.Glade) {
- if (button.Child != null)
- button.Remove (button.Child);
- ret = base.ReadChild (reader, child_elem);
- FixupGladeChildren ();
- } else if (Type == ButtonType.TextAndIcon) {
- UpdateImage ();
- }
- return ret;
- }
-
- protected override XmlElement WriteChild (ObjectWriter writer, Widget wrapper)
- {
- if (writer.Format == FileFormat.Glade || Type == ButtonType.Custom)
- return base.WriteChild (writer, wrapper);
- else
- return null;
- }
-
- void FixupGladeChildren ()
- {
- Gtk.Alignment alignment = button.Child as Gtk.Alignment;
- if (alignment == null)
- return;
- Gtk.HBox box = alignment.Child as Gtk.HBox;
- if (box == null)
- return;
-
- Gtk.Widget[] children = box.Children;
- if (children == null || children.Length != 2)
- return;
-
- Gtk.Image image = children[0] as Gtk.Image;
- Gtk.Label label = children[1] as Gtk.Label;
- if (image == null || label == null)
- return;
- Stetic.Wrapper.Image iwrap = Stetic.ObjectWrapper.Lookup (image) as Stetic.Wrapper.Image;
- if (iwrap == null)
- return;
-
- this.label = label.LabelProp;
- button.UseUnderline = label.UseUnderline;
-
- imageInfo = iwrap.Pixbuf;
- Type = ButtonType.TextAndIcon;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (Type == ButtonType.StockItem)
- GladeUtils.SetProperty (elem, "label", stockId);
- return elem;
- }
-
- public override IEnumerable RealChildren {
- get {
- if (type == ButtonType.Custom)
- return base.RealChildren;
- else
- return new Gtk.Widget[0];
- }
- }
-
- public override IEnumerable GladeChildren {
- get {
- if (type == ButtonType.StockItem || type == ButtonType.TextOnly)
- return new Gtk.Widget[0];
- else
- return base.GladeChildren;
- }
- }
-
- private Gtk.Button button {
- get {
- return (Gtk.Button)Wrapped;
- }
- }
-
- public enum ButtonType {
- StockItem,
- TextOnly,
- TextAndIcon,
- Custom
- };
-
- ButtonType type;
- public ButtonType Type {
- get {
- return type;
- }
- set {
- type = value;
- EmitNotify ("Type");
- switch (type) {
- case ButtonType.StockItem:
- button.UseStock = true;
- StockId = stockId;
- break;
- case ButtonType.TextOnly:
- button.UseStock = false;
- Label = label;
- UseUnderline = useUnderline;
- break;
- case ButtonType.TextAndIcon:
- button.UseStock = false;
- Label = label;
- UseUnderline = useUnderline;
- break;
- case ButtonType.Custom:
- button.UseStock = false;
- if (button.Child != null)
- ReplaceChild (button.Child, CreatePlaceholder (), true);
- break;
- }
- if (!Loading) {
- UpdateImage ();
- }
- }
- }
-
- public ImageInfo Icon {
- get { return imageInfo; }
- set {
- imageInfo = value;
- if (!Loading) {
- UpdateImage ();
- EmitNotify ("Image");
- }
- }
- }
-
- protected override void OnEndRead (FileFormat format)
- {
- base.OnEndRead (format);
- if (format == FileFormat.Native && Type == ButtonType.TextAndIcon) {
- Loading = true;
- UpdateImage ();
- Loading = false;
- }
- }
-
- void UpdateImage ()
- {
- if (type != ButtonType.TextAndIcon) {
- button.Image = null;
- return;
- }
- var imageWidget = button.Image as Gtk.Image;
- if (imageWidget == null) {
- button.Image = imageWidget = (Gtk.Image)Registry.NewInstance ("Gtk.Image", proj);
- // force them to display even if hidden by the theme
- button.Image.Show ();
- }
- Image imageWrapper = (Image)Widget.Lookup (imageWidget);
- imageWrapper.Unselectable = true;
- imageWrapper.Pixbuf = imageInfo;
- }
-
- string stockId = Gtk.Stock.Ok;
- public string StockId {
- get {
- return stockId;
- }
- set {
- if (responseId == ResponseIdForStockId (stockId))
- responseId = 0;
-
- if (value != null) {
- string sid = value;
- if (sid.StartsWith ("stock:"))
- sid = sid.Substring (6);
- button.Label = stockId = sid;
- button.UseStock = true;
- Gtk.StockItem item = Gtk.Stock.Lookup (sid);
- if (item.StockId == sid) {
- label = item.Label;
- useUnderline = true;
- }
- } else {
- stockId = value;
- }
-
- EmitNotify ("StockId");
-
- if (responseId == 0)
- ResponseId = ResponseIdForStockId (stockId);
- }
- }
-
- string label;
- public string Label {
- get {
- return label;
- }
- set {
- label = value;
- button.Label = value;
- }
- }
-
- bool useUnderline;
- public bool UseUnderline {
- get {
- return useUnderline;
- }
- set {
- useUnderline = value;
- button.UseUnderline = value;
- }
- }
-
- public bool IsDialogButton {
- get {
- ButtonBox box = this.ParentWrapper as ButtonBox;
- return (box != null && box.InternalChildProperty != null && box.InternalChildProperty.Name == "ActionArea");
- }
- }
-
- int responseId;
- public int ResponseId {
- get {
- return responseId;
- }
- set {
- responseId = value;
- EmitNotify ("ResponseId");
- }
- }
-
- int ResponseIdForStockId (string stockId)
- {
- if (stockId == Gtk.Stock.Ok)
- return (int)Gtk.ResponseType.Ok;
- else if (stockId == Gtk.Stock.Cancel)
- return (int)Gtk.ResponseType.Cancel;
- else if (stockId == Gtk.Stock.Close)
- return (int)Gtk.ResponseType.Close;
- else if (stockId == Gtk.Stock.Yes)
- return (int)Gtk.ResponseType.Yes;
- else if (stockId == Gtk.Stock.No)
- return (int)Gtk.ResponseType.No;
- else if (stockId == Gtk.Stock.Apply)
- return (int)Gtk.ResponseType.Apply;
- else if (stockId == Gtk.Stock.Help)
- return (int)Gtk.ResponseType.Help;
- else
- return 0;
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- base.GenerateBuildCode (ctx, var);
-
- string text = button.Label;
- if (!string.IsNullOrEmpty (text)) {
- CodePropertyReferenceExpression cprop = new CodePropertyReferenceExpression (var, "Label");
- PropertyDescriptor prop = (PropertyDescriptor)this.ClassDescriptor ["Label"];
- bool trans = Type != ButtonType.StockItem && prop.IsTranslated (Wrapped);
- CodeExpression val = ctx.GenerateValue (text, typeof(string), trans);
- ctx.Statements.Add (new CodeAssignStatement (cprop, val));
- }
-
- if (Type == ButtonType.TextAndIcon) {
- var imageWidget = (Gtk.Image) button.Image;
- if (imageWidget != null) {
- Image imageWrapper = (Image)Widget.Lookup (imageWidget);
- var imgVar = ctx.GenerateNewInstanceCode (imageWrapper);
- var imgProp = new CodePropertyReferenceExpression (var, "Image");
- ctx.Statements.Add (new CodeAssignStatement (imgProp, imgVar));
- }
- }
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name != "Label")
- base.GeneratePropertySet (ctx, var, prop);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ButtonBox.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ButtonBox.cs
deleted file mode 100644
index 37b8b60e7f6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ButtonBox.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Xml;
-using System.Collections;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class ButtonBox : Box {
-
- Dialog actionDialog;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- foreach (Gtk.Widget child in buttonbox.Children) {
- if (child is Placeholder)
- ReplaceChild (child, NewButton (), true);
- }
- }
-
- public void SetActionDialog (Dialog dialog)
- {
- actionDialog = dialog;
- }
-
- Gtk.Button NewButton ()
- {
- Gtk.Button button = (Gtk.Button)Registry.NewInstance ("Gtk.Button", proj);
- button.CanDefault = true;
- return button;
- }
-
- protected Gtk.ButtonBox buttonbox {
- get {
- return (Gtk.ButtonBox)Wrapped;
- }
- }
-
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
- internal new void InsertBefore (Gtk.Widget context)
- {
- int position;
- bool secondary;
-
- if (context == buttonbox) {
- position = 0;
- secondary = false;
- } else {
- Gtk.ButtonBox.ButtonBoxChild bbc = (Gtk.ButtonBox.ButtonBoxChild)ContextChildProps (context);
- position = bbc.Position;
- secondary = bbc.Secondary;
- }
-
- Gtk.Button button = NewButton ();
- buttonbox.PackStart (button, false, false, 0);
- buttonbox.ReorderChild (button, position);
- buttonbox.SetChildSecondary (button, secondary);
- EmitContentsChanged ();
- }
-
- internal new void InsertAfter (Gtk.Widget context)
- {
- int position;
- bool secondary;
-
- if (context == buttonbox) {
- position = buttonbox.Children.Length - 1;
- secondary = false;
- } else {
- Gtk.ButtonBox.ButtonBoxChild bbc = (Gtk.ButtonBox.ButtonBoxChild)ContextChildProps (context);
- position = bbc.Position;
- secondary = bbc.Secondary;
- }
-
- Gtk.Button button = NewButton ();
- buttonbox.PackStart (button, false, false, 0);
- buttonbox.ReorderChild (button, position + 1);
- buttonbox.SetChildSecondary (button, secondary);
- EmitContentsChanged ();
- }
-
- public int Size {
- get {
- return buttonbox.Children.Length;
- }
- set {
- Gtk.Widget[] children = buttonbox.Children;
- int cursize = children.Length;
-
- while (cursize > value) {
- Gtk.Widget w = children[--cursize];
- buttonbox.Remove (w);
- w.Destroy ();
- }
- while (cursize < value) {
- buttonbox.PackStart (NewButton (), false, false, 0);
- cursize++;
- }
- }
- }
-
- protected override void ReadChildren (ObjectReader reader, XmlElement elem)
- {
- // Reset the button count
- Size = 0;
- base.ReadChildren (reader, elem);
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- if (actionDialog != null && wrapper is Button) {
-
- // If this is the action area of a dialog, buttons must be added using AddActionWidget,
- // so they are properly registered.
-
- ObjectWrapper childwrapper = ChildWrapper (wrapper);
- Button button = wrapper as Button;
-
- if (childwrapper != null) {
- CodeExpression dialogVar = ctx.WidgetMap.GetWidgetExp (actionDialog);
- ctx.Statements.Add (new CodeCommentStatement ("Container child " + Wrapped.Name + "." + childwrapper.Wrapped.GetType ()));
- CodeExpression var = ctx.GenerateNewInstanceCode (wrapper);
- if (button.ResponseId != (int) Gtk.ResponseType.None) {
- CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (
- dialogVar,
- "AddActionWidget",
- var,
- new CodePrimitiveExpression (button.ResponseId)
- );
- ctx.Statements.Add (invoke);
- }
- else {
- CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (
- parentVar,
- "Add",
- var
- );
- ctx.Statements.Add (invoke);
- }
- GenerateSetPacking (ctx, parentVar, var, childwrapper);
- }
- } else
- base.GenerateChildBuildCode (ctx, parentVar, wrapper);
- }
-
- public class ButtonBoxChild : Box.BoxChild {
-
- public bool InDialog {
- get {
- if (ParentWrapper == null)
- return false;
- return ParentWrapper.InternalChildProperty != null && ParentWrapper.InternalChildProperty.Name == "ActionArea";
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/CheckButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/CheckButton.cs
deleted file mode 100644
index cd2fd6e88b2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/CheckButton.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class CheckButton : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized)
- checkbutton.UseUnderline = true;
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- base.Read (reader, elem);
- if (reader.Format == FileFormat.Glade)
- checkbutton.UseUnderline = true;
- }
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- hasLabel = false;
- if (checkbutton.Child != null)
- checkbutton.Remove (checkbutton.Child);
- return base.ReadChild (reader, child_elem);
- }
-
- public Gtk.CheckButton checkbutton {
- get {
- return (Gtk.CheckButton)Wrapped;
- }
- }
-
- bool hasLabel = true;
- public bool HasLabel {
- get {
- return hasLabel;
- }
- set {
- hasLabel = value;
- EmitNotify ("HasLabel");
- }
- }
-
- internal void RemoveLabel ()
- {
- AddPlaceholder ();
- HasLabel = false;
- }
-
- public override Placeholder AddPlaceholder ()
- {
- if (checkbutton.Child != null)
- checkbutton.Remove (checkbutton.Child);
- return base.AddPlaceholder ();
- }
-
- internal void RestoreLabel ()
- {
- checkbutton.Label = checkbutton.Name;
- HasLabel = true;
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- base.ReplaceChild (oldChild, newChild);
- EmitNotify ("HasContents");
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- if (!HasLabel) {
- // CheckButton generates a label by default. Remove it if it is not required.
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- parentVar,
- "Remove",
- new CodePropertyReferenceExpression (
- parentVar,
- "Child"
- )
- )
- );
- }
- base.GenerateChildBuildCode (ctx, parentVar, wrapper);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ColorButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ColorButton.cs
deleted file mode 100644
index 1cf71351aa6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ColorButton.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class ColorButton : Container {
-
- public int Alpha {
- get {
- Gtk.ColorButton cb = (Gtk.ColorButton)Wrapped;
-
- if (cb.UseAlpha)
- return cb.Alpha;
- else
- return -1;
- }
- set {
- Gtk.ColorButton cb = (Gtk.ColorButton)Wrapped;
-
- if (value == -1)
- cb.UseAlpha = false;
- else {
- cb.UseAlpha = true;
- cb.Alpha = (ushort)value;
- }
- }
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name == "Alpha" && Alpha == -1)
- return;
- else
- base.GeneratePropertySet (ctx, var, prop);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBox.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBox.cs
deleted file mode 100644
index d878014ba86..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBox.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Xml;
-using System.CodeDom;
-using System.Runtime.InteropServices;
-
-namespace Stetic.Wrapper {
-
- public class ComboBox : Container {
-
- public static Gtk.ComboBox CreateInstance ()
- {
- Gtk.ComboBox c = Gtk.ComboBox.NewText ();
- // Make sure all children are created, so the mouse events can be
- // bound and the widget can be selected.
- c.EnsureStyle ();
- try {
- FixSensitivity (c);
- } catch {
- }
- return c;
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized)
- textCombo = true;
- }
-
-
- string[] items = new string[0];
- bool textCombo;
-
- public string[] Items {
- get { return items; }
- set {
- Gtk.ComboBox combobox = (Gtk.ComboBox)Wrapped;
- int active = combobox.Active;
-
- int row = 0, oi = 0, ni = 0;
- while (value != null && oi < items.Length && ni < value.Length) {
- if (items [oi] == value [ni]) {
- oi++;
- ni++;
- row++;
- } else if (ni < value.Length - 1 &&
- items [oi] == value [ni + 1]) {
- combobox.InsertText (row++, value [ni++]);
- if (active > row)
- active++;
- } else {
- combobox.RemoveText (row);
- if (active > row)
- active--;
- oi++;
- }
- }
-
- while (oi < items.Length) {
- combobox.RemoveText (row);
- oi++;
- }
-
- while (value != null && ni < value.Length)
- combobox.InsertText (row++, value [ni++]);
-
- items = value == null ? new string [0] : value;
- combobox.Active = active;
-
- EmitNotify ("Items");
- }
- }
-
- public bool IsTextCombo {
- get { return textCombo; }
- set { textCombo = value; EmitNotify ("IsTextCombo"); }
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- if (textCombo) {
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference ("Gtk.ComboBox", CodeTypeReferenceOptions.GlobalReference)),
- "NewText"
- );
- } else
- return base.GenerateObjectCreation (ctx);
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (textCombo && Items != null && Items.Length > 0) {
- foreach (string str in Items) {
- ctx.Statements.Add (new CodeMethodInvokeExpression (
- var,
- "AppendText",
- ctx.GenerateValue (str, typeof(string), true)
- ));
- }
- }
-
- base.GenerateBuildCode (ctx, var);
- }
-
- public override void Read (ObjectReader reader, XmlElement element)
- {
- base.Read (reader, element);
- if (reader.Format == FileFormat.Glade && items.Length > 0)
- IsTextCombo = true;
- }
-
- internal static void FixSensitivity (Gtk.ComboBox c)
- {
- // Since gtk+ 2.14, empty combos are disabled by default
- // This method disables this behavior
- gtk_combo_box_set_button_sensitivity (c.Handle, 1);
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- extern static void gtk_combo_box_set_button_sensitivity (IntPtr combo, int mode);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBoxEntry.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBoxEntry.cs
deleted file mode 100644
index 9461b7422f6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ComboBoxEntry.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class ComboBoxEntry : ComboBox {
-
- public static new Gtk.ComboBoxEntry CreateInstance ()
- {
- Gtk.ComboBoxEntry c = Gtk.ComboBoxEntry.NewText ();
- // Make sure all children are created, so the mouse events can be
- // bound and the widget can be selected.
- c.EnsureStyle ();
- try {
- FixSensitivity (c);
- } catch {
- }
- return c;
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- if (IsTextCombo) {
- return new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference ("Gtk.ComboBoxEntry", CodeTypeReferenceOptions.GlobalReference)),
- "NewText"
- );
- } else
- return base.GenerateObjectCreation (ctx);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Container.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Container.cs
deleted file mode 100644
index a2c101ccd36..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Container.cs
+++ /dev/null
@@ -1,1454 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Xml;
-using Stetic.Undo;
-using Stetic.Editor;
-
-namespace Stetic.Wrapper
-{
- public class Container : Widget
- {
- int designWidth;
- int designHeight;
- IDesignArea designer;
- CodeExpression generatedTooltips;
- bool internalAdd;
-
- static DiffGenerator containerDiffGenerator;
- static bool showNonContainerWarning = true;
-
- static Container ()
- {
- XmlDiffAdaptor adaptor = new XmlDiffAdaptor ();
- adaptor.ChildElementName = "child";
- adaptor.ChildAdaptor = new XmlDiffAdaptor ();
- adaptor.ChildAdaptor.PropsElementName = "packing";
-
- containerDiffGenerator = new DiffGenerator ();
- containerDiffGenerator.CurrentStatusAdaptor = adaptor;
- containerDiffGenerator.NewStatusAdaptor = adaptor;
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- ClassDescriptor klass = this.ClassDescriptor;
- foreach (PropertyDescriptor prop in klass.InternalChildren) {
- Gtk.Widget child = prop.GetValue (container) as Gtk.Widget;
- if (child == null)
- continue;
- Widget wrapper = ObjectWrapper.Create (proj, child) as Stetic.Wrapper.Widget;
- wrapper.InternalChildProperty = prop;
- if (child.Name == ((GLib.GType)child.GetType ()).ToString ())
- child.Name = container.Name + "_" + prop.Name;
- }
-
- container.Removed += ChildRemoved;
- container.Added += OnChildAdded;
-
- if (!initialized && container.Children.Length == 0 && AllowPlaceholders)
- AddPlaceholder ();
-
- if (Wrapped.GetType ().ToString ()[0] == 'H')
- ContainerOrientation = Gtk.Orientation.Horizontal;
- else
- ContainerOrientation = Gtk.Orientation.Vertical;
-
- if (!Loading)
- ValidateChildNames (Wrapped);
- }
-
- public override void Dispose ()
- {
- container.Removed -= ChildRemoved;
- container.Added -= OnChildAdded;
- AutoSize.Clear ();
- base.Dispose ();
- }
-
- void OnChildAdded (object o, Gtk.AddedArgs args)
- {
- if (!internalAdd)
- HandleNewChild (args.Widget);
- }
-
- protected void NotifyChildAdded (Gtk.Widget child)
- {
- HandleNewChild (child);
- EmitContentsChanged ();
- }
-
- void HandleNewChild (Gtk.Widget child)
- {
- // Make sure children's IDs don't conflict with other widgets
- // in the parent container.
- if (!Loading)
- ValidateChildNames (child);
-
- Widget w = Widget.Lookup (child);
- if (w != null) {
- w.RequiresUndoStatusUpdate = true;
- if (designer != null)
- w.OnDesignerAttach (designer);
-
- // If the ShowScrollbars flag is set, make sure the scrolled window is created.
- if (w.ShowScrollbars)
- w.UpdateScrolledWindow ();
- }
-
- Placeholder ph = child as Placeholder;
- if (ph != null) {
- ph.DragDrop += PlaceholderDragDrop;
- ph.DragDataReceived += PlaceholderDragDataReceived;
- ph.ButtonPressEvent += PlaceholderButtonPress;
- AutoSize[ph] = true;
- }
- }
-
- Gtk.Container container {
- get {
- return (Gtk.Container)Wrapped;
- }
- }
-
- protected virtual bool AllowPlaceholders {
- get {
- return true && this.ClassDescriptor.AllowChildren;
- }
- }
-
- public int DesignWidth {
- get { return designWidth; }
- set { designWidth = value; NotifyChanged (); }
- }
-
- public int DesignHeight {
- get { return designHeight; }
- set { designHeight = value; NotifyChanged (); }
- }
-
- public void IncreaseBorderWidth ()
- {
- container.BorderWidth += 3;
- }
-
- public void DecreaseBorderWidth ()
- {
- if (container.BorderWidth >= 3)
- container.BorderWidth -= 3;
- else
- container.BorderWidth = 0;
- }
-
- internal bool ChildrenAllowed ()
- {
- return this.ClassDescriptor.AllowChildren;
- }
-
- int freeze;
- protected void Freeze ()
- {
- freeze++;
- }
-
- protected void Thaw ()
- {
- if (--freeze == 0)
- Sync ();
- }
-
- protected virtual void DoSync ()
- {
- ;
- }
-
- protected void Sync ()
- {
- if (freeze > 0 || Loading)
- return;
- freeze = 1;
- DoSync ();
- freeze = 0;
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = UndoManager.GetObjectStatus (this);
-
-// Console.WriteLine ("UNDO status: ");
-// Console.WriteLine (oldElem.OuterXml);
-
- // Write the new status of the object. This is going to replace the old status in undoManager.
- // In the process, register new objects found.
-
- UndoWriter writer = new UndoWriter (oldElem.OwnerDocument, UndoManager);
- XmlElement newElem = Write (writer);
-
-// Console.WriteLine ("CURRENT status: ");
-// Console.WriteLine (newElem.OuterXml);
-
- // Get the changes since the last undo checkpoint
-
- ObjectDiff actionsDiff = null;
- ObjectDiff objectDiff = containerDiffGenerator.GetDiff (newElem, oldElem);
-
- // If there are child changes there is no need to look for changes in the
- // actions, since the whole widget will be read again
-
- if (IsTopLevel && (objectDiff == null || objectDiff.ChildChanges == null))
- actionsDiff = LocalActionGroups.GetDiff (Project, oldElem);
-
- // The undo writer skips children which are already registered in the undo manager
- // to avoid writing information we already have. Now it's the moment to fill the gaps
-
- foreach (XmlElement newChild in newElem.SelectNodes ("child[widget/@unchanged_marker='yes']")) {
- string cid = newChild.GetAttribute ("undoId");
- XmlElement oldChild = (XmlElement) oldElem.SelectSingleNode ("child[@undoId='" + cid + "']");
- if (oldChild == null)
- throw new InvalidOperationException ("Child not found when filling widget info gaps.");
-
- XmlElement oldWidgetChild = oldChild ["widget"];
- XmlElement newWidgetChild = newChild ["widget"];
-
- oldChild.RemoveChild (oldWidgetChild);
- if (newWidgetChild != null)
- newChild.ReplaceChild (oldWidgetChild, newWidgetChild);
- }
-
- // Update the status tree
-
- UndoManager.UpdateObjectStatus (this, newElem);
-
-// UndoManager.Dump ();
-
- if (objectDiff != null || actionsDiff != null)
- return new ObjectDiff[] { objectDiff, actionsDiff };
- else
- return null;
- }
-
- public override object ApplyUndoRedoDiff (object data)
- {
- ObjectDiff diff = ((ObjectDiff[]) data)[0];
- ObjectDiff actionsDiff = ((ObjectDiff[]) data)[1];
-
- ObjectDiff reverseDiff = null;
- ObjectDiff reverseActionsDiff = null;
-
- XmlElement status = UndoManager.GetObjectStatus (this);
- XmlElement oldStatus = (XmlElement) status.CloneNode (true);
- UndoReader reader = new UndoReader (Project, FileFormat.Native, UndoManager);
-
- // Only apply the actions diff if the widget has not been completely reloaded
- if (actionsDiff != null && !(diff != null && diff.ChildChanges != null)) {
- // Apply the patch
- LocalActionGroups.ApplyDiff (Project, actionsDiff);
-
- // Get the redo patch
- reverseActionsDiff = LocalActionGroups.GetDiff (Project, oldStatus);
-
- // Update the status of the action group list in the undo status tree.
- // It has to remove all action groups and then write them again
- foreach (XmlElement group in status.SelectNodes ("action-group"))
- status.RemoveChild (group);
-
- UndoWriter writer = new UndoWriter (status.OwnerDocument, UndoManager);
- foreach (ActionGroup actionGroup in LocalActionGroups)
- status.InsertBefore (actionGroup.Write (writer), status.FirstChild);
- }
-
- if (diff != null) {
- containerDiffGenerator.ApplyDiff (status, diff);
- reverseDiff = containerDiffGenerator.GetDiff (status, oldStatus);
-
- // Avoid reading the whole widget tree if only the properties have changed.
- if (diff.ChildChanges == null) {
- ReadProperties (reader, status);
- } else {
-// Console.WriteLine ("BEFORE PATCH: " + status.OuterXml);
- Read (reader, status);
-// Console.WriteLine ("\nAFTER PATCH:");
-// UndoManager.Dump ();
- EmitContentsChanged ();
- }
- }
-
- if (reverseDiff != null || reverseActionsDiff != null)
- return new ObjectDiff[] { reverseDiff, reverseActionsDiff };
- else
- return null;
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- // Remove all existing children
- if (ClassDescriptor.AllowChildren && Wrapped != null) {
- foreach (Gtk.Widget child in GladeChildren) {
- Widget wrapper = Widget.Lookup (child);
-
- if (wrapper != null) {
- if (wrapper.InternalChildProperty != null)
- continue;
- container.Remove (child);
- child.Destroy ();
- } else if (child is Stetic.Placeholder) {
- container.Remove (child);
- child.Destroy ();
- }
- }
- }
-
- try {
- Loading = true;
- ReadActionGroups (reader, elem);
- ReadProperties (reader, elem);
- ReadChildren (reader, elem);
- DoSync ();
- } finally {
- Loading = false;
- }
- }
-
- protected virtual void ReadChildren (ObjectReader reader, XmlElement elem)
- {
- int gladeChildStackPos = reader.GladeChildStack.Count;
-
- foreach (XmlElement child_elem in elem.SelectNodes ("./child")) {
- try {
- if (child_elem.HasAttribute ("internal-child"))
- ReadInternalChild (reader, child_elem);
- else if (child_elem["widget"] == null)
- ReadPlaceholder (reader, child_elem);
- else {
- ObjectWrapper cw = ReadChild (reader, child_elem);
-
- // Set a temporary id used for the undo/redo operations
- ObjectWrapper ccw = ChildWrapper ((Widget)cw);
- if (ccw != null) {
- string cid = child_elem.GetAttribute ("undoId");
- if (cid.Length > 0)
- ChildWrapper ((Widget)cw).UndoId = cid;
- else
- child_elem.SetAttribute ("undoId", ChildWrapper ((Widget)cw).UndoId);
- }
- }
- } catch (GladeException ge) {
- Console.Error.WriteLine (ge.Message);
- }
- }
-
- if (reader.Format == FileFormat.Glade) {
- for (int n = reader.GladeChildStack.Count - 1; n >= gladeChildStackPos; n--) {
- ObjectWrapper ob = ReadInternalChild (reader, (XmlElement) reader.GladeChildStack [n]);
- if (ob != null)
- reader.GladeChildStack.RemoveAt (n);
- }
- }
-
- string ds = elem.GetAttribute ("design-size");
- if (ds.Length > 0) {
- int i = ds.IndexOf (' ');
- DesignWidth = int.Parse (ds.Substring (0, i));
- DesignHeight = int.Parse (ds.Substring (i+1));
- }
-
- Sync ();
- }
-
- protected virtual ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- ObjectWrapper wrapper = reader.ReadObject (child_elem["widget"]);
- Container.ContainerChild childwrapper = null;
-
- try {
- wrapper.Loading = true;
-
- Gtk.Widget child = (Gtk.Widget)wrapper.Wrapped;
-
- AutoSize[child] = false;
- container.Add (child);
-
- childwrapper = ChildWrapper ((Widget)wrapper);
- if (childwrapper != null)
- childwrapper.Loading = true;
-
- if (reader.Format == FileFormat.Glade)
- GladeUtils.SetPacking (childwrapper, child_elem);
- else
- WidgetUtils.SetPacking (childwrapper, child_elem);
- return wrapper;
- } finally {
- wrapper.Loading = false;
- if (childwrapper != null)
- childwrapper.Loading = false;
- }
- }
-
- void ReadPlaceholder (ObjectReader reader, XmlElement child_elem)
- {
- Placeholder ph = AddPlaceholder ();
- if (ph != null) {
- string cid = child_elem.GetAttribute ("undoId");
- if (cid.Length > 0)
- ph.UndoId = cid;
- else
- child_elem.SetAttribute ("undoId", ph.UndoId);
- }
- }
-
- protected virtual ObjectWrapper ReadInternalChild (ObjectReader reader, XmlElement child_elem)
- {
- ClassDescriptor klass = base.ClassDescriptor;
- string childId = child_elem.GetAttribute ("internal-child");
-
- foreach (PropertyDescriptor prop in klass.InternalChildren) {
- if (reader.Format == FileFormat.Glade && ((TypedPropertyDescriptor)prop).GladeName != childId)
- continue;
- else if (reader.Format == FileFormat.Native && prop.Name != childId)
- continue;
-
- Gtk.Widget child = prop.GetValue (container) as Gtk.Widget;
- Widget wrapper = Widget.Lookup (child);
- if (wrapper != null) {
- reader.ReadObject (wrapper, child_elem["widget"]);
- if (reader.Format == FileFormat.Glade)
- GladeUtils.SetPacking (ChildWrapper (wrapper), child_elem);
- else
- WidgetUtils.SetPacking (ChildWrapper (wrapper), child_elem);
- return wrapper;
- }
- }
-
- // In Glade, internal children may not be direct children of the root container. This is handled in a special way.
- if (reader.Format == FileFormat.Glade) {
- if (!reader.GladeChildStack.Contains (child_elem))
- reader.GladeChildStack.Add (child_elem);
- return null;
- }
- else
- throw new GladeException ("Unrecognized internal child name", Wrapped.GetType ().FullName, false, "internal-child", childId);
- }
-
- public override XmlElement Write (ObjectWriter writer)
- {
- XmlElement elem = WriteProperties (writer);
- WriteActionGroups (writer, elem);
- XmlElement child_elem;
-
- if (ClassDescriptor.AllowChildren) {
- foreach (Gtk.Widget child in GladeChildren) {
- Widget wrapper = Widget.Lookup (child);
-
- if (wrapper != null) {
- // Iternal children are written later
- if (wrapper.InternalChildProperty != null)
- continue;
- child_elem = WriteChild (writer, wrapper);
- if (child_elem != null)
- elem.AppendChild (child_elem);
- } else if (child is Stetic.Placeholder) {
- child_elem = writer.XmlDocument.CreateElement ("child");
- if (writer.CreateUndoInfo)
- child_elem.SetAttribute ("undoId", ((Stetic.Placeholder)child).UndoId);
- child_elem.AppendChild (writer.XmlDocument.CreateElement ("placeholder"));
- elem.AppendChild (child_elem);
- }
- }
- }
-
- foreach (PropertyDescriptor prop in this.ClassDescriptor.InternalChildren) {
- Gtk.Widget child = prop.GetValue (Wrapped) as Gtk.Widget;
- if (child == null)
- continue;
-
- child_elem = writer.XmlDocument.CreateElement ("child");
- Widget wrapper = Widget.Lookup (child);
- if (wrapper == null) {
- child_elem.AppendChild (writer.XmlDocument.CreateElement ("placeholder"));
- elem.AppendChild (child_elem);
- continue;
- }
-
- string cid = writer.Format == FileFormat.Glade ? prop.InternalChildId : prop.Name;
-
- XmlElement widget_elem = writer.WriteObject (wrapper);
- child_elem.SetAttribute ("internal-child", cid);
- // Sets the child Id to be used in undo/redo operations
- if (writer.CreateUndoInfo)
- child_elem.SetAttribute ("undoId", cid);
-
- child_elem.AppendChild (widget_elem);
- elem.AppendChild (child_elem);
- }
-
- if (DesignWidth != 0 || DesignHeight != 0)
- elem.SetAttribute ("design-size", DesignWidth + " " + DesignHeight);
-
- return elem;
- }
-
- protected virtual XmlElement WriteChild (ObjectWriter writer, Widget wrapper)
- {
- XmlElement child_elem = writer.XmlDocument.CreateElement ("child");
- XmlElement widget_elem = writer.WriteObject (wrapper);
- child_elem.AppendChild (widget_elem);
-
- Container.ContainerChild childwrapper = ChildWrapper (wrapper);
- if (childwrapper != null) {
- XmlElement packing_elem;
-
- if (writer.Format == FileFormat.Glade)
- packing_elem = GladeUtils.CreatePacking (writer.XmlDocument, childwrapper);
- else
- packing_elem = WidgetUtils.CreatePacking (writer.XmlDocument, childwrapper);
-
- // Sets the child Id to be used in undo/redo operations
- if (writer.CreateUndoInfo)
- child_elem.SetAttribute ("undoId", childwrapper.UndoId);
-
- if (packing_elem.HasChildNodes)
- child_elem.AppendChild (packing_elem);
- } else {
- // There is no container child, so make up an id.
- if (writer.CreateUndoInfo)
- child_elem.SetAttribute ("undoId", "0");
- }
-
- return child_elem;
- }
-
- public XmlElement WriteContainerChild (ObjectWriter writer, Widget wrapper)
- {
- return WriteChild (writer, wrapper);
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- generatedTooltips = null;
-
- base.GenerateBuildCode (ctx, var);
-
- if (ClassDescriptor.AllowChildren) {
- foreach (Gtk.Widget child in GladeChildren) {
- Widget wrapper = Widget.Lookup (child);
-
- if (wrapper != null && wrapper.InternalChildProperty == null)
- // Iternal children are written later
- GenerateChildBuildCode (ctx, var, wrapper);
- }
- }
-
- foreach (TypedPropertyDescriptor prop in this.ClassDescriptor.InternalChildren) {
- GenerateSetInternalChild (ctx, var, prop);
- }
-
-
- if (IsTopLevel && Wrapped is Gtk.Bin) {
- CodeExpression childExp = new CodePropertyReferenceExpression (var, "Child");
- CodeConditionStatement cond = new CodeConditionStatement ();
- cond.Condition =
- new CodeBinaryOperatorExpression (
- childExp,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- );
- cond.TrueStatements.Add (
- new CodeMethodInvokeExpression (
- childExp,
- "ShowAll"
- )
- );
- ctx.Statements.Add (cond);
- }
- }
-
- protected virtual void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- ObjectWrapper childwrapper = ChildWrapper (wrapper);
- if (childwrapper != null) {
- ctx.Statements.Add (new CodeCommentStatement ("Container child " + Wrapped.Name + "." + childwrapper.Wrapped.GetType ()));
- CodeExpression var = ctx.GenerateNewInstanceCode (wrapper);
- CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (
- parentVar,
- "Add",
- var
- );
- ctx.Statements.Add (invoke);
-
- GenerateSetPacking (ctx, parentVar, var, childwrapper);
- }
- }
-
- void GenerateSetInternalChild (GeneratorContext ctx, CodeExpression parentVar, TypedPropertyDescriptor prop)
- {
- Gtk.Widget child = prop.GetValue (container) as Gtk.Widget;
- Widget cwrapper = Widget.Lookup (child);
- if (cwrapper != null) {
- ctx.Statements.Add (new CodeCommentStatement ("Internal child " + Wrapped.Name + "." + prop.Name));
- string childVar = ctx.NewId ();
- CodeVariableDeclarationStatement varDec = new CodeVariableDeclarationStatement (child.GetType().ToGlobalTypeRef (), childVar);
- ctx.Statements.Add (varDec);
- varDec.InitExpression = new CodePropertyReferenceExpression (parentVar, prop.Name);
-
- ctx.GenerateBuildCode (cwrapper, new CodeVariableReferenceExpression (childVar));
- return;
- }
- }
-
- protected void GenerateSetPacking (GeneratorContext ctx, CodeExpression parentVar, CodeExpression childVar, ObjectWrapper containerChildWrapper)
- {
- Gtk.Container.ContainerChild cc = containerChildWrapper.Wrapped as Gtk.Container.ContainerChild;
- ClassDescriptor klass = containerChildWrapper.ClassDescriptor;
-
- // Generate a variable that holds the container child
-
- string contChildVar = ctx.NewId ();
- CodeVariableDeclarationStatement varDec = new CodeVariableDeclarationStatement (cc.GetType().ToGlobalTypeRef (), contChildVar);
- varDec.InitExpression = new CodeCastExpression (
- cc.GetType ().ToGlobalTypeRef (),
- new CodeIndexerExpression (parentVar, childVar)
- );
-
- CodeVariableReferenceExpression var = new CodeVariableReferenceExpression (contChildVar);
-
- // Set the container child properties
-
- ctx.Statements.Add (varDec);
- int count = ctx.Statements.Count;
-
- foreach (ItemGroup group in klass.ItemGroups) {
- foreach (ItemDescriptor item in group) {
- PropertyDescriptor prop = item as PropertyDescriptor;
- if (prop == null || !prop.IsRuntimeProperty)
- continue;
- GenerateChildPropertySet (ctx, var, klass, prop, cc);
- }
- }
-
- if (ctx.Statements.Count == count) {
- ctx.Statements.Remove (varDec);
- }
- }
-
- protected virtual void GenerateChildPropertySet (GeneratorContext ctx, CodeVariableReferenceExpression var, ClassDescriptor containerChildClass, PropertyDescriptor prop, object child)
- {
- if (containerChildClass.InitializationProperties != null && Array.IndexOf (containerChildClass.InitializationProperties, prop) != -1)
- return;
-
- // Design time
- if (prop.Name == "AutoSize")
- return;
-
- object oval = prop.GetValue (child);
- if (oval == null || (prop.HasDefault && prop.IsDefaultValue (oval)))
- return;
-
- CodePropertyReferenceExpression cprop = new CodePropertyReferenceExpression (var, prop.Name);
- CodeExpression val = ctx.GenerateValue (oval, prop.RuntimePropertyType, prop.Translatable);
- ctx.Statements.Add (new CodeAssignStatement (cprop, val));
- }
-
- internal protected override void GeneratePostBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- base.GeneratePostBuildCode (ctx, var);
-
- if (IsTopLevel && (Wrapped is Gtk.Bin) && Visible) {
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- var,
- "Show"
- )
- );
- }
- }
-
- internal void GenerateTooltip (GeneratorContext ctx, Widget widget)
- {
- if (WidgetUtils.CompareVersions (Project.TargetGtkVersion, "2.12") <= 0) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (ctx.WidgetMap.GetWidgetExp (widget), "TooltipMarkup"),
- new CodePrimitiveExpression (widget.Tooltip)
- )
- );
- return;
- }
-
- if (generatedTooltips == null) {
- string tid = ctx.NewId ();
- Type t = typeof(Gtk.Widget).Assembly.GetType ("Gtk.Tooltips");
- CodeVariableDeclarationStatement vardec = new CodeVariableDeclarationStatement (
- t.ToGlobalTypeRef (), tid, new CodeObjectCreateExpression (t)
- );
- ctx.Statements.Add (vardec);
- generatedTooltips = new CodeVariableReferenceExpression (tid);
- }
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- generatedTooltips,
- "SetTip",
- ctx.WidgetMap.GetWidgetExp (widget),
- new CodePrimitiveExpression (widget.Tooltip),
- new CodePrimitiveExpression (widget.Tooltip)
- )
- );
- }
-
- internal protected override void OnDesignerAttach (IDesignArea designer)
- {
- base.OnDesignerAttach (designer);
- this.designer = designer;
- foreach (Gtk.Widget w in RealChildren) {
- ObjectWrapper wr = ObjectWrapper.Lookup (w);
- if (wr != null)
- wr.OnDesignerAttach (designer);
- }
- }
-
- internal protected override void OnDesignerDetach (IDesignArea designer)
- {
- base.OnDesignerDetach (designer);
- foreach (Gtk.Widget w in RealChildren) {
- ObjectWrapper wr = ObjectWrapper.Lookup (w);
- if (wr != null)
- wr.OnDesignerDetach (designer);
- }
- this.designer = null;
- }
-
- public virtual Placeholder AddPlaceholder ()
- {
- Placeholder ph = CreatePlaceholder ();
- container.Add (ph);
- return ph;
- }
-
- public virtual void Add (Gtk.Widget child)
- {
- container.Add (child);
- }
-
- public static new Container Lookup (GLib.Object obj)
- {
- return Stetic.ObjectWrapper.Lookup (obj) as Stetic.Wrapper.Container;
- }
-
- public static Container LookupParent (Gtk.Widget widget)
- {
- if (widget == null)
- return null;
- Gtk.Widget parent = widget.Parent;
- Container wrapper = null;
- while ((wrapper == null || wrapper.Unselectable) && parent != null) {
- wrapper = Lookup (parent);
- parent = parent.Parent;
- }
- return wrapper;
- }
-
- public static Stetic.Wrapper.Container.ContainerChild ChildWrapper (Stetic.Wrapper.Widget wrapper) {
- Stetic.Wrapper.Container parentWrapper = wrapper.ParentWrapper;
- if (parentWrapper == null)
- return null;
-
- Gtk.Container parent = parentWrapper.Wrapped as Gtk.Container;
- if (parent == null)
- return null;
-
- Gtk.Widget child = (Gtk.Widget)wrapper.Wrapped;
- while (child != null && child.Parent != parent)
- child = child.Parent;
- if (child == null)
- return null;
-
- Gtk.Container.ContainerChild cc = parent[child];
- Container.ContainerChild cwrap = ObjectWrapper.Lookup (cc) as Container.ContainerChild;
- if (cwrap != null)
- return cwrap;
- else
- return Stetic.ObjectWrapper.Create (parentWrapper.proj, cc) as ContainerChild;
- }
-
- protected Gtk.Container.ContainerChild ContextChildProps (Gtk.Widget context)
- {
- if (context == container)
- return null;
-
- do {
- if (context.Parent == container)
- return container[context];
- context = context.Parent;
- } while (context != null);
-
- return null;
- }
-
- public delegate void ContentsChangedHandler (Container container);
- public event ContentsChangedHandler ContentsChanged;
-
- protected void EmitContentsChanged ()
- {
- if (Loading)
- return;
- if (ContentsChanged != null)
- ContentsChanged (this);
- if (ParentWrapper != null)
- ParentWrapper.ChildContentsChanged (this);
- if (Project != null)
- Project.NotifyWidgetContentsChanged (this);
- NotifyChanged ();
- }
-
- protected Set AutoSize = new Set ();
-
- protected virtual Placeholder CreatePlaceholder ()
- {
- Placeholder ph = new Placeholder ();
- ph.Show ();
- return ph;
- }
-
- void PlaceholderButtonPress (object obj, Gtk.ButtonPressEventArgs args)
- {
- if (args.Event.Type != Gdk.EventType.ButtonPress)
- return;
-
- Placeholder ph = obj as Placeholder;
-
- if (GtkWorkarounds.TriggersContextMenu (args.Event)) {
- proj.PopupContextMenu (ph);
- args.RetVal = true;
- } else if (args.Event.Button == 1) {
- proj.Selection = ph;
- args.RetVal = true;
- }
- }
-
- public static bool ShowNonContainerWarning {
- get { return showNonContainerWarning; }
- set { showNonContainerWarning = value; }
- }
-
- static IList nonContainers = new string[] {
- "Gtk.Button", "Gtk.Entry", "Gtk.Label", "Gtk.Arrow", "Gtk.Calendar", "Gtk.CheckButton",
- "Gtk.ColorButton", "Gtk.ComboBox", "Gtk.ComboBoxEntry", "Gtk.Entry", "Gtk.FontButton",
- "Gtk.HScale", "Gtk.VScale", "Gtk.Image", "Gtk.MenuBar", "Gtk.Toolbar", "Gtk.RadioButton",
- "Gtk.ProgressBar", "Stetic.Editor.ActionToolbar", "Stetic.Editor.ActionMenuBar",
- "Gtk.ToggleButton", "Gtk.TextView", "Gtk.VScrollbar", "Gtk.HScrollbar", "Gtk.SpinButton",
- "Gtk.Statusbar", "Gtk.HSeparator", "Gtk.VSeparator"
- };
-
- void PlaceholderDrop (Placeholder ph, Stetic.Wrapper.Widget wrapper)
- {
- Gtk.Dialog parentDialog = Wrapped.Parent as Gtk.Dialog;
- if (showNonContainerWarning && (IsTopLevel || (parentDialog != null && parentDialog.VBox == Wrapped))) {
- if (nonContainers.Contains (wrapper.Wrapped.GetType ().ToString ())) {
- using (NonContainerWarningDialog dlg = new NonContainerWarningDialog ()) {
- int res = dlg.Run ();
- showNonContainerWarning = dlg.ShowAgain;
- if (res != (int) Gtk.ResponseType.Ok)
- return;
- }
- }
- }
- using (UndoManager.AtomicChange) {
- ReplaceChild (ph, wrapper.Wrapped, true);
- wrapper.Select ();
- }
- }
-
- void PlaceholderDragDrop (object obj, Gtk.DragDropArgs args)
- {
- Placeholder ph = (Placeholder)obj;
- // This Drop call will end calling DropObject()
- DND.Drop (args.Context, args.Time, this, ph.UndoId);
- args.RetVal = true;
- }
-
- internal protected override void DropObject (string data, Gtk.Widget w)
- {
- Placeholder ph = FindPlaceholder (container, data);
- if (ph != null) {
- Widget dropped = Stetic.Wrapper.Widget.Lookup (w);
- if (dropped != null)
- PlaceholderDrop (ph, dropped);
- }
- }
-
- Placeholder FindPlaceholder (Gtk.Container c, string pid)
- {
- foreach (Gtk.Widget cw in c.AllChildren) {
- Placeholder ph = cw as Placeholder;
- if (ph != null && ph.UndoId == pid)
- return ph;
- Gtk.Container cc = cw as Gtk.Container;
- if (cc != null) {
- ph = FindPlaceholder (cc, pid);
- if (ph != null)
- return ph;
- }
- }
- return null;
- }
-
- void PlaceholderDragDataReceived (object obj, Gtk.DragDataReceivedArgs args)
- {
- Widget dropped = WidgetUtils.Paste (proj, args.SelectionData);
- Gtk.Drag.Finish (args.Context, dropped != null,
- dropped != null, args.Time);
- if (dropped != null) {
- dropped.RequiresUndoStatusUpdate = true;
- PlaceholderDrop ((Placeholder)obj, dropped);
- }
- }
-
- protected virtual void ChildContentsChanged (Container child)
- {
- }
-
- void ChildRemoved (object obj, Gtk.RemovedArgs args)
- {
- NotifyChildRemoved (args.Widget);
- }
-
- protected void NotifyChildRemoved (Gtk.Widget child)
- {
- if (Loading)
- return;
-
- ObjectWrapper w = ObjectWrapper.Lookup (child);
- if (w != null) {
- if (w.Loading)
- return;
- if (designer != null)
- w.OnDesignerDetach (designer);
- }
- ChildRemoved (child);
- }
-
- protected virtual void ChildRemoved (Gtk.Widget w)
- {
- AutoSize[w] = false;
- EmitContentsChanged ();
- }
-
- public virtual IEnumerable RealChildren {
- get {
- ArrayList children = new ArrayList ();
- foreach (Gtk.Widget widget in container.AllChildren) {
- if (!(widget is Placeholder))
- children.Add (widget);
- }
- return children;
- }
- }
-
- public virtual IEnumerable GladeChildren {
- get {
- return container.AllChildren;
- }
- }
-
- public void PasteChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- using (UndoManager.AtomicChange) {
- Widget w = Widget.Lookup (newChild);
- w.RequiresUndoStatusUpdate = true;
- ReplaceChild (oldChild, newChild, true);
- }
- }
-
- internal protected void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild, bool destroyOld)
- {
- ReplaceChild (oldChild, newChild);
- if (destroyOld)
- oldChild.Destroy ();
- }
-
- protected virtual void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- using (UndoManager.AtomicChange)
- {
- Gtk.Container.ContainerChild cc;
- Hashtable props = new Hashtable ();
-
- cc = container[oldChild];
- foreach (PropertyInfo pinfo in cc.GetType ().GetProperties ()) {
- if (!pinfo.IsDefined (typeof (Gtk.ChildPropertyAttribute), true))
- continue;
- props[pinfo] = pinfo.GetValue (cc, null);
- }
-
- container.Remove (oldChild);
- AutoSize[oldChild] = false;
- AutoSize[newChild] = true;
-
- try {
- // Don't fire the child added event until the packing info is set
- internalAdd = true;
- container.Add (newChild);
- } finally {
- internalAdd = false;
- }
-
- cc = container[newChild];
- foreach (PropertyInfo pinfo in props.Keys)
- pinfo.SetValue (cc, props[pinfo], null);
-
- Sync ();
- NotifyChildAdded (newChild);
- if (Project != null)
- Project.Selection = newChild;
- }
- }
-
- Gtk.Widget selection;
-
- public virtual void Select (Gtk.Widget widget)
- {
- if (widget == null) {
- Select (null, false);
- } else {
- Widget wrapper = Widget.Lookup (widget);
- bool allowDrag = wrapper != null && wrapper.InternalChildProperty == null && !wrapper.IsTopLevel;
- Select (widget, allowDrag);
- }
- }
-
- public virtual void UnSelect (Gtk.Widget widget)
- {
- if (selection == widget)
- Select (null, false);
- }
-
- void Select (Gtk.Widget widget, bool dragHandles)
- {
- if (widget == selection)
- return;
-
- Gtk.Window win = GetParentWindow ();
-
- if (selection != null) {
- selection.Destroyed -= SelectionDestroyed;
- HideSelectionBox (selection);
- Widget wr = Widget.Lookup (selection);
- if (wr != null)
- wr.OnUnselected ();
- }
-
- selection = widget;
- if (win != null) {
- if (widget != null) {
- if (widget.CanFocus)
- win.Focus = widget;
- else {
- // Look for a focusable parent container
- Widget wr = GetTopLevel ();
- Gtk.Widget w = wr.Wrapped;
- while (w != null && !w.CanFocus)
- w = w.Parent;
-
- // If the widget is not focusable,
- // remove the focus from the window. In this way we ensure
- // that the current selected widget will lose the focus,
- // even if the new selection is not focusable.
- win.Focus = w;
- }
- } else {
- if (designer != null)
- designer.ResetSelection (null);
- }
- }
-
- if (selection != null) {
- selection.Destroyed += SelectionDestroyed;
-
- // FIXME: if the selection isn't mapped, we should try to force it
- // to be. (Eg, if you select a widget in a hidden window, the window
- // should map. If you select a widget on a non-current notebook
- // page, the notebook should switch pages, etc.)
- if (selection.IsDrawable && selection.Visible) {
- ShowSelectionBox (selection, dragHandles);
- }
-
- Widget wr = Widget.Lookup (selection);
- if (wr != null)
- wr.OnSelected ();
- }
- }
-
- void ShowSelectionBox (Gtk.Widget widget, bool dragHandles)
- {
- HideSelectionBox (selection);
-
- IDesignArea designArea = GetDesignArea (widget);
- if (designArea != null) {
- IObjectSelection sel = designArea.SetSelection (widget, widget, dragHandles);
- sel.Drag += HandleWindowDrag;
- return;
- }
- }
-
- void HideSelectionBox (Gtk.Widget widget)
- {
- if (widget != null) {
- IDesignArea designArea = GetDesignArea (widget);
- if (designArea != null)
- designArea.ResetSelection (widget);
- }
- }
-
- Gtk.Window GetParentWindow ()
- {
- Gtk.Container cc = Wrapped as Gtk.Container;
- while (cc.Parent != null)
- cc = cc.Parent as Gtk.Container;
- return cc as Gtk.Window;
- }
-
- void SelectionDestroyed (object obj, EventArgs args)
- {
- if (!IsDisposed)
- UnSelect (selection);
- }
-
- Gtk.Widget dragSource;
-
- void HandleWindowDrag (Gdk.EventMotion evt, int dx, int dy)
- {
- Gtk.Widget dragWidget = selection;
-
- Project.Selection = null;
-
- using (UndoManager.AtomicChange) {
- dragSource = CreateDragSource (dragWidget);
- }
-
- DND.Drag (dragSource, evt, dragWidget);
- }
-
- protected virtual Gtk.Widget CreateDragSource (Gtk.Widget dragWidget)
- {
- Placeholder ph = CreatePlaceholder ();
- Gdk.Rectangle alloc = dragWidget.Allocation;
- ph.SetSizeRequest (alloc.Width, alloc.Height);
- ph.DragEnd += DragEnd;
- ReplaceChild (dragWidget, ph, false);
- return ph;
- }
-
- void DragEnd (object obj, Gtk.DragEndArgs args)
- {
- using (UndoManager.AtomicChange) {
- Placeholder ph = obj as Placeholder;
- ph.DragEnd -= DragEnd;
-
- dragSource = null;
- if (DND.DragWidget == null) {
- if (AllowPlaceholders)
- ph.SetSizeRequest (-1, -1);
- else
- container.Remove (ph);
- Sync ();
- } else
- ReplaceChild (ph, DND.Cancel (), true);
- }
- }
-
- public virtual void Delete (Stetic.Wrapper.Widget wrapper)
- {
- using (UndoManager.AtomicChange) {
- if (AllowPlaceholders)
- ReplaceChild (wrapper.Wrapped, CreatePlaceholder (), true);
- else {
- container.Remove (wrapper.Wrapped);
- wrapper.Wrapped.Destroy ();
- }
- }
- }
-
- public virtual void Delete (Stetic.Placeholder ph)
- {
- if (AllowPlaceholders) {
- // Don't allow deleting the only placeholder of a top level container
- if (IsTopLevel && container.Children.Length == 1)
- return;
- using (UndoManager.AtomicChange) {
- container.Remove (ph);
- ph.Destroy ();
- // If there aren't more placeholders in this container, just delete the container
- if (container.Children.Length == 0)
- Delete ();
- }
- }
- }
-
- protected bool ChildHExpandable (Gtk.Widget child)
- {
- if (child == dragSource)
- child = DND.DragWidget;
- else if (child is Placeholder)
- return true;
-
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (child);
- if (wrapper != null)
- return wrapper.HExpandable;
- else
- return false;
- }
-
- protected bool ChildVExpandable (Gtk.Widget child)
- {
- if (child == dragSource)
- child = DND.DragWidget;
- else if (child is Placeholder)
- return true;
-
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (child);
- if (wrapper != null)
- return wrapper.VExpandable;
- else
- return false;
- }
-
- // Note that this will be invalid/random for non-H/V-paired classes
- protected Gtk.Orientation ContainerOrientation;
-
- public override bool HExpandable {
- get {
- if (base.HExpandable)
- return true;
-
- // A horizontally-oriented container is HExpandable if any
- // child is. A vertically-oriented container is HExpandable
- // if *every* child is.
-
- foreach (Gtk.Widget w in container) {
- if (ChildHExpandable (w)) {
- if (ContainerOrientation == Gtk.Orientation.Horizontal)
- return true;
- } else if (ContainerOrientation == Gtk.Orientation.Vertical)
- return false;
- }
- return (ContainerOrientation == Gtk.Orientation.Vertical);
- }
- }
-
- public override bool VExpandable {
- get {
- if (base.VExpandable)
- return true;
-
- // Opposite of above
-
- foreach (Gtk.Widget w in container) {
- if (ChildVExpandable (w)) {
- if (ContainerOrientation == Gtk.Orientation.Vertical)
- return true;
- } else if (ContainerOrientation == Gtk.Orientation.Horizontal)
- return false;
- }
- return (ContainerOrientation == Gtk.Orientation.Horizontal);
- }
- }
-
- void ValidateChildNames (Gtk.Widget newWidget)
- {
- // newWidget is the widget which triggered the name check.
- // It will be the last widget to check, so if there are
- // name conflicts, the name to change to avoid the conflict
- // will be the name of that widget.
-
- if (!IsTopLevel) {
- ParentWrapper.ValidateChildNames (newWidget);
- return;
- }
-
- Hashtable names = new Hashtable ();
-
- // Validate all names excluding the new widget
- ValidateChildName (names, container, newWidget);
-
- if (newWidget != null) {
- // Now validate names in the new widget.
- ValidateChildName (names, newWidget, null);
- }
- }
-
- void ValidateChildName (Hashtable names, Gtk.Widget w, Gtk.Widget newWidget)
- {
- if (w == newWidget)
- return;
-
- if (names.Contains (w.Name)) {
- // There is a widget with the same name. If the widget
- // has a numeric suffix, just increase it.
- string name; int idx;
- WidgetUtils.ParseWidgetName (w.Name, out name, out idx);
-
- string compName = idx != 0 ? name + idx : name;
- while (names.Contains (compName)) {
- idx++;
- compName = name + idx;
- }
- w.Name = compName;
- Widget ww = Widget.Lookup (w);
- if (ww != null)
- ww.InitializeName (compName);
- else
- w.Name = compName;
-
- }
-
- names [w.Name] = w;
-
- if (w is Gtk.Container) {
- foreach (Gtk.Widget cw in ((Gtk.Container)w).AllChildren)
- ValidateChildName (names, cw, newWidget);
- }
- }
-
- internal string GetValidWidgetName (Gtk.Widget widget)
- {
- // Get a valid name for a widget (a name that doesn't
- // exist in the parent container.
-
- if (!IsTopLevel)
- return ParentWrapper.GetValidWidgetName (widget);
-
- string name;
- int idx;
-
- WidgetUtils.ParseWidgetName (widget.Name, out name, out idx);
-
- string compName = idx != 0 ? name + idx : name;
-
- Gtk.Widget fw = FindWidget (compName, widget);
- while (fw != null) {
- idx++;
- compName = name + idx;
- fw = FindWidget (compName, widget);
- }
-
- return compName;
- }
-
- public Widget FindChild (string name)
- {
- Gtk.Widget w = FindWidget (name, null);
- return Widget.Lookup (w);
- }
-
- Gtk.Widget FindWidget (string name, Gtk.Widget skipwidget)
- {
- if (Wrapped != skipwidget && Wrapped.Name == name)
- return Wrapped;
- else
- return FindWidget ((Gtk.Container)Wrapped, name, skipwidget);
- }
-
- Gtk.Widget FindWidget (Gtk.Container parent, string name, Gtk.Widget skipwidget)
- {
- foreach (Gtk.Widget w in parent.AllChildren) {
- if (w.Name == name && w != skipwidget)
- return w;
- if (w is Gtk.Container) {
- Gtk.Widget res = FindWidget ((Gtk.Container)w, name, skipwidget);
- if (res != null)
- return res;
- }
- }
- return null;
- }
-
- public override ObjectWrapper FindObjectByUndoId (string id)
- {
- ObjectWrapper c = base.FindObjectByUndoId (id);
- if (c != null)
- return c;
-
- foreach (Gtk.Widget w in container.AllChildren) {
- Widget ww = Widget.Lookup (w);
- if (ww == null)
- continue;
- ObjectWrapper ow = ww.FindObjectByUndoId (id);
- if (ow != null)
- return ow;
- }
- return null;
- }
-
-
-
- public class ContainerChild : Stetic.ObjectWrapper
- {
- internal static void Register ()
- {
- // FIXME?
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- cc.Child.ChildNotified += ChildNotifyHandler;
- cc.Child.ParentSet += OnParentSet;
- }
-
- [GLib.ConnectBefore]
- void OnParentSet (object ob, Gtk.ParentSetArgs args)
- {
- // Dispose the wrapper if the child is removed from the parent
- Gtk.Widget w = (Gtk.Widget)ob;
- if (w.Parent == null) {
- Dispose ();
- w.ParentSet -= OnParentSet;
- }
- }
-
- public override void Dispose ()
- {
- cc.Child.ChildNotified -= ChildNotifyHandler;
- base.Dispose ();
- }
-
- protected virtual void ChildNotifyHandler (object obj, Gtk.ChildNotifiedArgs args)
- {
- ParamSpec pspec = new ParamSpec (args.Pspec);
- EmitNotify (pspec.Name);
- }
-
- protected override void EmitNotify (string propertyName)
- {
- base.EmitNotify (propertyName);
- ParentWrapper.Sync ();
- ParentWrapper.NotifyChanged ();
- }
-
- Gtk.Container.ContainerChild cc {
- get {
- return (Gtk.Container.ContainerChild)Wrapped;
- }
- }
-
- protected Stetic.Wrapper.Container ParentWrapper {
- get {
- return Stetic.Wrapper.Container.Lookup (cc.Parent);
- }
- }
-
- public bool AutoSize {
- get {
- return ParentWrapper.AutoSize[cc.Child];
- }
- set {
- ParentWrapper.AutoSize[cc.Child] = value;
- EmitNotify ("AutoSize");
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Custom.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Custom.cs
deleted file mode 100644
index 5f73164b8ea..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Custom.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using Gtk;
-
-namespace Stetic
-{
- public class Custom : Gtk.DrawingArea
- {
- public Custom () {}
-
- public Custom (IntPtr raw) : base (raw) {}
-
- // from glade
- static private string[] custom_bg_xpm = {
- "8 8 4 1",
- " c None",
- ". c #BBBBBB",
- "+ c #D6D6D6",
- "@ c #6B5EFF",
- ".+..+...",
- "+..@@@..",
- "..@...++",
- "..@...++",
- "+.@..+..",
- ".++@@@..",
- "..++....",
- "..++...."
- };
-
- Gdk.Pixmap pixmap;
-
- protected override void OnRealized ()
- {
- base.OnRealized ();
-
- Gdk.Pixmap mask;
- pixmap = Gdk.Pixmap.CreateFromXpmD (GdkWindow, out mask, new Gdk.Color (99, 99, 99), custom_bg_xpm);
- }
-
- string creationFunction, string1, string2;
- int int1, int2;
-
- public string CreationFunction {
- get {
- return creationFunction;
- }
- set {
- creationFunction = value;
- }
- }
-
- public string LastModificationTime {
- get {
- return null;
- }
- set {
- ;
- }
- }
-
- public string String1 {
- get {
- return string1;
- }
- set {
- string1 = value;
- }
- }
-
- public string String2 {
- get {
- return string2;
- }
- set {
- string2 = value;
- }
- }
-
- public int Int1 {
- get {
- return int1;
- }
- set {
- int1 = value;
- }
- }
-
- public int Int2 {
- get {
- return int2;
- }
- set {
- int2 = value;
- }
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose evt)
- {
- if (!IsDrawable)
- return false;
-
- int width, height;
- GdkWindow.GetSize (out width, out height);
-
- Gdk.GC light, dark;
- light = Style.LightGC (StateType.Normal);
- dark = Style.DarkGC (StateType.Normal);
-
- // Looks like GdkWindow.SetBackPixmap doesn't work very well,
- // so draw the pixmap manually.
- light.Fill = Gdk.Fill.Tiled;
- light.Tile = pixmap;
- GdkWindow.DrawRectangle (light, true, 0, 0, width, height);
- light.Fill = Gdk.Fill.Solid;
-
- GdkWindow.DrawLine (light, 0, 0, width - 1, 0);
- GdkWindow.DrawLine (light, 0, 0, 0, height - 1);
- GdkWindow.DrawLine (dark, 0, height - 1, width - 1, height - 1);
- GdkWindow.DrawLine (dark, width - 1, 0, width - 1, height - 1);
-
- return base.OnExposeEvent (evt);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Dialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Dialog.cs
deleted file mode 100644
index 82312cfd4dc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Dialog.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Xml;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Dialog : Window {
-
- Stetic.Wrapper.ButtonBox actionArea;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- actionArea = (ButtonBox)Container.Lookup (dialog.ActionArea);
- actionArea.SetActionDialog (this);
-
- if (!initialized) {
- dialog.HasSeparator = false;
- if (!initialized && dialog.VBox.Children.Length == 1) {
- Container vbox = Container.Lookup (dialog.VBox);
- Placeholder ph = vbox.AddPlaceholder ();
- ph.SetSizeRequest (200, 200);
- Buttons = 1;
- }
- } else
- ButtonsChanged (actionArea);
-
- actionArea.ContentsChanged += ButtonsChanged;
- }
-
- internal static new TopLevelDialog CreateInstance ( )
- {
- return new TopLevelDialog ();
- }
-
- public override void Dispose ( )
- {
- actionArea.ContentsChanged -= ButtonsChanged;
- actionArea.SetActionDialog (null);
- base.Dispose ();
- }
-
- protected override void ReadChildren (ObjectReader reader, XmlElement elem)
- {
- // Ignore changes in the buttons while loading
- actionArea.ContentsChanged -= ButtonsChanged;
- base.ReadChildren (reader, elem);
- actionArea.ContentsChanged += ButtonsChanged;
- actionArea.SetActionDialog (this);
- }
-
- TopLevelDialog dialog {
- get {
- return (TopLevelDialog) Wrapped;
- }
- }
-
- public Gtk.HButtonBox ActionArea {
- get { return dialog.ActionArea; }
- }
-
- public Gtk.VBox VBox
- {
- get { return dialog.VBox; }
- }
-
- public bool HasSeparator {
- get { return dialog.HasSeparator; }
- set { dialog.HasSeparator = value; EmitNotify ("HasSeparator"); }
- }
-
- public int Buttons
- {
- get {
- return actionArea.Size - ExtraButtons;
- }
- set {
- actionArea.Size = value + ExtraButtons;
- EmitNotify ("Buttons");
- }
- }
-
- int ExtraButtons {
- get {
- return helpButton == null ? 0 : 1;
- }
- }
-
- Gtk.Button helpButton;
-
- public bool HelpButton {
- get {
- return helpButton != null;
- }
- set {
- if (HelpButton == value)
- return;
-
- if (value) {
- helpButton = AddButton (Gtk.Stock.Help, Gtk.ResponseType.Help, false);
- // Make it the first child, so that decreasing
- // Buttons won't delete it
- dialog.ActionArea.ReorderChild (helpButton, 0);
- } else {
- helpButton.Destroy ();
- helpButton = null;
- }
-
- EmitNotify ("HelpButton");
- }
- }
-
- // Check that a button is the Help button
- bool ButtonIsHelp (Gtk.Button button)
- {
- return (button.UseStock &&
- button.Label == Gtk.Stock.Help &&
- dialog.ActionArea.GetChildSecondary (button));
- }
-
- Gtk.Button AddButton (string stockId, Gtk.ResponseType response, bool hasDefault)
- {
- Stetic.Wrapper.Button wrapper;
- Gtk.Button button;
-
- button = (Gtk.Button)Registry.NewInstance ("Gtk.Button", proj);
- wrapper = (Stetic.Wrapper.Button) ObjectWrapper.Lookup (button);
- if (stockId != null) {
- wrapper.Type = Button.ButtonType.StockItem;
- wrapper.StockId = stockId;
- } else {
- wrapper.Type = Button.ButtonType.TextOnly;
- wrapper.Label = button.Name;
- }
- wrapper.ResponseId = (int)response;
-
- Stetic.Wrapper.Container actionArea = Stetic.Wrapper.Container.Lookup (dialog.ActionArea);
- actionArea.Add (button);
-
- button.CanDefault = true;
- wrapper.HasDefault = hasDefault;
-
- if (stockId == Gtk.Stock.Help)
- ((Gtk.ButtonBox)actionArea.Wrapped).SetChildSecondary (button, true);
-
- return button;
- }
-
- void ButtonsChanged (Container container)
- {
- Gtk.Widget[] children = dialog.ActionArea.Children;
-
- // If the user manually removes (or breaks) the Help button,
- // uncheck the corresponding property
- if (helpButton != null) {
- if (Array.IndexOf (children, helpButton) == -1 ||
- !ButtonIsHelp (helpButton)) {
- helpButton = null;
- EmitNotify ("HelpButton");
- }
- }
-
- // If the user manually creates a Help button, set the property
- if (helpButton == null) {
- foreach (Gtk.Widget w in children) {
- Gtk.Button button = w as Gtk.Button;
- if (button != null && ButtonIsHelp (button)) {
- helpButton = button;
- dialog.ActionArea.ReorderChild (helpButton, 0);
- EmitNotify ("HelpButton");
- break;
- }
- }
- }
-
- // If the user removed all (non-Secondary) buttons, add back a
- // single custom button
- if (Buttons == 0)
- Buttons = 1;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Entry.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Entry.cs
deleted file mode 100644
index 64a9b068b21..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Entry.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Stetic.Wrapper
-{
- public class Entry: Widget
- {
- [DefaultValue ('*')]
- public char InvisibleChar {
- get { return ((Gtk.Entry)Wrapped).InvisibleChar; }
- set { ((Gtk.Entry)Wrapped).InvisibleChar = value; }
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Expander.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Expander.cs
deleted file mode 100644
index fcf22505d78..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Expander.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class Expander : Container {
-
- public static Gtk.Expander CreateInstance ()
- {
- return new Gtk.Expander ("");
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized) {
- expander.Label = expander.Name;
- if (AllowPlaceholders)
- AddPlaceholder ();
- }
- if (expander.LabelWidget != null)
- ObjectWrapper.Create (proj, expander.LabelWidget);
- }
-
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- if ((string)GladeUtils.GetChildProperty (child_elem, "type", "") == "label_item") {
- ObjectWrapper wrapper = reader.ReadObject (child_elem["widget"]);
- expander.LabelWidget = (Gtk.Widget)wrapper.Wrapped;
- return wrapper;
- } else
- return base.ReadChild (reader, child_elem);
- }
-
- protected override XmlElement WriteChild (ObjectWriter writer, Widget wrapper)
- {
- XmlElement child_elem = base.WriteChild (writer, wrapper);
- if (wrapper.Wrapped == expander.LabelWidget)
- GladeUtils.SetChildProperty (child_elem, "type", "label_item");
- return child_elem;
- }
-
- Gtk.Expander expander {
- get {
- return (Gtk.Expander)Wrapped;
- }
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- if (oldChild == expander.LabelWidget)
- expander.LabelWidget = newChild;
- else
- base.ReplaceChild (oldChild, newChild);
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (), new CodePrimitiveExpression (null));
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- if (wrapper.Wrapped == expander.LabelWidget) {
- CodeExpression var = ctx.GenerateNewInstanceCode (wrapper);
- CodeAssignStatement assign = new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- parentVar,
- "LabelWidget"
- ),
- var
- );
- ctx.Statements.Add (assign);
- } else
- base.GenerateChildBuildCode (ctx, parentVar, wrapper);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Fixed.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Fixed.cs
deleted file mode 100644
index 840c050dcce..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Fixed.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-
-using System;
-
-namespace Stetic.Wrapper
-{
- public class Fixed: Container
- {
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- DND.DestSet (gtkfixed, true);
- gtkfixed.DragDrop += FixedDragDrop;
- gtkfixed.DragDataReceived += FixedDragDataReceived;
- }
-
- public override void Dispose ()
- {
- gtkfixed.DragDrop -= FixedDragDrop;
- gtkfixed.DragDataReceived -= FixedDragDataReceived;
- }
-
- Gtk.Fixed gtkfixed {
- get {
- return (Gtk.Fixed)Wrapped;
- }
- }
-
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
-
- void FixedDragDrop (object obj, Gtk.DragDropArgs args)
- {
- Gtk.Widget w = DND.Drop (args.Context, gtkfixed, args.Time);
- Widget ww = Widget.Lookup (w);
- if (ww != null) {
- gtkfixed.Put (w, args.X - DND.DragHotX, args.Y - DND.DragHotY);
- NotifyChildAdded (w);
- args.RetVal = true;
- ww.Select ();
- }
- }
-
- void FixedDragDataReceived (object obj, Gtk.DragDataReceivedArgs args)
- {
- Widget dropped = WidgetUtils.Paste (proj, args.SelectionData);
- Gtk.Drag.Finish (args.Context, dropped != null, dropped != null, args.Time);
- if (dropped != null) {
- gtkfixed.Put (dropped.Wrapped, 0, 0);
- NotifyChildAdded (dropped.Wrapped);
- dropped.Select ();
- }
- }
-
- int dragX, dragY;
-
- protected override Gtk.Widget CreateDragSource (Gtk.Widget dragWidget)
- {
- Gtk.Fixed.FixedChild fc = (Gtk.Fixed.FixedChild) gtkfixed [dragWidget];
- if (fc == null)
- return null;
-
- dragX = fc.X;
- dragY = fc.Y;
-
- gtkfixed.Remove (dragWidget);
- gtkfixed.DragEnd += DragEnd;
- return gtkfixed;
- }
-
- void DragEnd (object obj, Gtk.DragEndArgs args)
- {
- using (UndoManager.AtomicChange) {
- gtkfixed.DragEnd -= DragEnd;
- if (DND.DragWidget != null) {
- DND.DragWidget.Unparent ();
- gtkfixed.Put (DND.DragWidget, dragX, dragY);
- NotifyChildAdded (DND.DragWidget);
- Widget ww = Widget.Lookup (DND.DragWidget);
- ww.Select ();
- }
- }
- }
-
- public class FixedChild : Container.ContainerChild {
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontButton.cs
deleted file mode 100644
index c005e23e4e1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontButton.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public class FontButton : Widget {
-
- public bool UseFont {
- get {
- return ((Gtk.FontButton)Wrapped).UseFont;
- }
- set {
- Gtk.FontButton fb = (Gtk.FontButton)Wrapped;
-
- fb.UseFont = value;
-
- // Force it to update
- fb.ShowSize = !fb.ShowSize;
- fb.ShowSize = !fb.ShowSize;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontSelectionDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontSelectionDialog.cs
deleted file mode 100644
index f0b1cf000e1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/FontSelectionDialog.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public class FontSelectionDialog : Dialog {
-
- public Gtk.FontSelection FontSelection {
- get {
- Gtk.Dialog dialog = (Gtk.Dialog)Wrapped;
-
- foreach (Gtk.Widget w in dialog.VBox) {
- if (w is Gtk.FontSelection)
- return (Gtk.FontSelection)w;
- }
- return null;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Frame.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Frame.cs
deleted file mode 100644
index a0bc0850f5c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Frame.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class Frame : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized) {
- frame.Label = "" + frame.Name + "";
- ((Gtk.Label)frame.LabelWidget).UseMarkup = true;
- frame.Shadow = Gtk.ShadowType.None;
- if (AllowPlaceholders) {
- Gtk.Alignment align = new Gtk.Alignment (0, 0, 1, 1);
- align.LeftPadding = 12;
- Container align_wrapper = (Container)ObjectWrapper.Create (proj, align);
- align_wrapper.AddPlaceholder ();
- ReplaceChild (frame.Child, (Gtk.Widget)align_wrapper.Wrapped, true);
- }
- }
-
- if (frame.LabelWidget != null)
- ObjectWrapper.Create (proj, frame.LabelWidget);
- NotifyWorkaround.AddNotification (frame, "label-widget", LabelWidgetChanged);
- }
-
- void LabelWidgetChanged (object obj, GLib.NotifyArgs args)
- {
- if (!IsDisposed && frame.LabelWidget != null && !(frame.LabelWidget is Stetic.Placeholder))
- ObjectWrapper.Create (proj, frame.LabelWidget);
- }
-
- Gtk.Frame frame {
- get {
- return (Gtk.Frame)Wrapped;
- }
- }
-
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- if ((string)GladeUtils.GetChildProperty (child_elem, "type", "") == "label_item") {
- ObjectWrapper wrapper = reader.ReadObject (child_elem["widget"]);
- frame.LabelWidget = (Gtk.Widget)wrapper.Wrapped;
- return wrapper;
- } else
- return base.ReadChild (reader, child_elem);
- }
-
- protected override XmlElement WriteChild (ObjectWriter writer, Widget wrapper)
- {
- XmlElement child_elem = base.WriteChild (writer, wrapper);
- if (wrapper.Wrapped == frame.LabelWidget)
- GladeUtils.SetChildProperty (child_elem, "type", "label_item");
- return child_elem;
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- if (wrapper.Wrapped == frame.LabelWidget) {
- CodeExpression var = ctx.GenerateNewInstanceCode (wrapper);
- CodeAssignStatement assign = new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- parentVar,
- "LabelWidget"
- ),
- var
- );
- ctx.Statements.Add (assign);
- } else
- base.GenerateChildBuildCode (ctx, parentVar, wrapper);
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- if (oldChild == frame.LabelWidget)
- frame.LabelWidget = newChild;
- else
- base.ReplaceChild (oldChild, newChild);
- }
-
- public override void Delete (Stetic.Placeholder ph)
- {
- using (UndoManager.AtomicChange) {
- Delete ();
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScale.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScale.cs
deleted file mode 100644
index 0af92c7a5fe..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScale.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class HScale : Scale {
-
- public static Gtk.HScale CreateInstance ()
- {
- return new Gtk.HScale (0.0, 100.0, 1.0);
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (), new CodePrimitiveExpression (null));
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScrollbar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScrollbar.cs
deleted file mode 100644
index 696ccee6b88..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/HScrollbar.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class HScrollbar : Range {
-
- public static Gtk.HScrollbar CreateInstance ()
- {
- return new Gtk.HScrollbar (new Gtk.Adjustment (0.0, 0.0, 100.0, 1.0, 10.0, 10.0));
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (), new CodePrimitiveExpression (null));
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/IconView.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/IconView.cs
deleted file mode 100644
index 592b005e540..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/IconView.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// IconView.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-namespace Stetic.Wrapper
-{
- public class IconView: Container
- {
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Image.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Image.cs
deleted file mode 100644
index 786de64f6e7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Image.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Xml;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Image : Misc {
-
- ImageInfo imageInfo;
-
- public static new Gtk.Image CreateInstance ()
- {
- return new Gtk.Image (Gtk.Stock.Execute, Gtk.IconSize.Dialog);
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- if (reader.Format == FileFormat.Glade) {
- string file = (string)GladeUtils.ExtractProperty (elem, "pixbuf", "");
- string stock = (string)GladeUtils.ExtractProperty (elem, "stock", "");
- string iconSize = (string)GladeUtils.ExtractProperty (elem, "icon_size", "");
- base.ReadProperties (reader, elem);
-
- if (stock != null && stock.Length > 0) {
- Pixbuf = ImageInfo.FromTheme (stock, (Gtk.IconSize) int.Parse (iconSize));
- } else if (file != null && file != "") {
- Pixbuf = ImageInfo.FromFile (file);
- }
- } else
- base.ReadProperties (reader, elem);
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (imageInfo != null) {
- if (writer.Format == FileFormat.Glade) {
- // The generated pixbuf property doesn't have a valid value, it needs to be replaced.
- GladeUtils.ExtractProperty (elem, "pixbuf", "");
- switch (imageInfo.Source) {
- case ImageSource.File:
- GladeUtils.SetProperty (elem, "pixbuf", imageInfo.Name);
- break;
- case ImageSource.Theme:
- GladeUtils.SetProperty (elem, "stock", imageInfo.Name);
- GladeUtils.SetProperty (elem, "icon_size", ((int)imageInfo.ThemeIconSize).ToString ());
- break;
- default:
- throw new System.NotSupportedException ("Image source not supported by Glade.");
- }
- }
- }
- return elem;
- }
-
- Gtk.Image image {
- get {
- return (Gtk.Image)Wrapped;
- }
- }
-
- void BreakImage ()
- {
- image.IconSize = (int)Gtk.IconSize.Button;
- image.Stock = Gtk.Stock.MissingImage;
- }
-
- public ImageInfo Pixbuf {
- get { return imageInfo; }
- set {
- imageInfo = value;
- if (imageInfo == null)
- BreakImage ();
- else
- image.Pixbuf = imageInfo.GetImage (Project);
- EmitNotify ("Pixbuf");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ImageMenuItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ImageMenuItem.cs
deleted file mode 100644
index 24cfd01465e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ImageMenuItem.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class ImageMenuItem : MenuItem {
-
- public static new Gtk.ImageMenuItem CreateInstance ()
- {
- // Use the ctor that will create an AccelLabel
- return new Gtk.ImageMenuItem ("");
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- Gtk.StockItem stockItem = Gtk.StockItem.Zero;
- bool use_stock = (bool)GladeUtils.ExtractProperty (elem, "use_stock", false);
- if (use_stock) {
- string label = (string)GladeUtils.GetProperty (elem, "label", "");
- stockItem = Gtk.Stock.Lookup (label);
- if (stockItem.Label != null)
- GladeUtils.ExtractProperty (elem, "label", "");
- }
- base.ReadProperties (reader, elem);
-
- if (stockItem.StockId != null)
- Image = "stock:" + stockItem.StockId;
- if (stockItem.Keyval != 0)
- Accelerator = Gtk.Accelerator.Name (stockItem.Keyval, stockItem.Modifier);
- }
-
- string image;
-
- public string Image {
- get {
- return image;
- }
- set {
- image = value;
-
- Gtk.Widget icon;
- Gtk.StockItem stockItem = Gtk.StockItem.Zero;
-
- if (image.StartsWith ("stock:"))
- stockItem = Gtk.Stock.Lookup (image.Substring (6));
-
- if (stockItem.StockId != null) {
- icon = new Gtk.Image (stockItem.StockId, Gtk.IconSize.Menu);
- Label = stockItem.Label;
- UseUnderline = true;
- } else if (image.StartsWith ("file:"))
- icon = new Gtk.Image (image.Substring (5));
- else
- icon = new Gtk.Image (WidgetUtils.MissingIcon);
-
- ((Gtk.ImageMenuItem)Wrapped).Image = icon;
-
- EmitNotify ("Image");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Label.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Label.cs
deleted file mode 100644
index e12944c6f15..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Label.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Label : Misc {
-
- public Label () {}
-
- string mnem;
- public string MnemonicWidget {
- get {
- return mnem;
- }
- set {
- mnem = value;
- }
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name != "MnemonicWidget")
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- internal protected override void GeneratePostBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (mnem != null) {
- Widget targetWidget = GetTopLevel ().FindChild (mnem);
- if (targetWidget != null) {
- CodeExpression memVar = ctx.WidgetMap.GetWidgetExp (targetWidget);
- if (memVar != null) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- var,
- "MnemonicWidget"
- ),
- memVar
- )
- );
- }
- }
- }
- base.GeneratePostBuildCode (ctx, var);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs
deleted file mode 100644
index fec2f295099..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuBar.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-
-using System;
-using System.CodeDom;
-using System.Xml;
-using System.Collections;
-using Stetic.Editor;
-
-namespace Stetic.Wrapper
-{
- public class MenuBar: Container
- {
- ActionTree actionTree;
- XmlElement menuInfo;
- bool treeChanged;
-
- public MenuBar()
- {
- }
-
- public override void Dispose ()
- {
- DisposeTree ();
- base.Dispose ();
- }
-
- public static Gtk.MenuBar CreateInstance ()
- {
- return new ActionMenuBar ();
- }
-
- protected override bool AllowPlaceholders {
- get { return false; }
- }
-
- ActionMenuBar menu {
- get { return (ActionMenuBar) Wrapped; }
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- CreateTree ();
- }
-
- internal protected override void OnSelected ()
- {
- Loading = true;
- menu.ShowInsertPlaceholder = true;
- Loading = false;
- }
-
- internal protected override void OnUnselected ()
- {
- base.OnUnselected ();
- Loading = true;
- menu.ShowInsertPlaceholder = false;
- menu.Unselect ();
- Loading = false;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (menuInfo != null)
- elem.AppendChild (writer.XmlDocument.ImportNode (menuInfo, true));
- else
- elem.AppendChild (actionTree.Write (writer.XmlDocument, writer.Format));
- return elem;
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- base.ReadProperties (reader, elem);
- menuInfo = elem ["node"];
- treeChanged = false;
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = treeChanged ? UndoManager.GetObjectStatus (this) ["node"] : null;
- if (oldElem != null)
- oldElem = (XmlElement) oldElem.CloneNode (true);
-
- treeChanged = false;
- object baseDiff = base.GetUndoDiff ();
-
- if (oldElem != null) {
- XmlElement newElem = UndoManager.GetObjectStatus (this) ["node"];
- if (newElem != null && oldElem.OuterXml == newElem.OuterXml)
- oldElem = null;
- }
-
- if (baseDiff == null && oldElem == null)
- return null;
- else {
- object stat = menu.SaveStatus ();
- return new object[] { baseDiff, oldElem, stat };
- }
- }
-
- public override object ApplyUndoRedoDiff (object diff)
- {
- object[] data = (object[]) diff;
- object retBaseDiff;
- XmlElement oldNode = null;
-
- if (actionTree != null) {
- XmlElement status = UndoManager.GetObjectStatus (this);
- oldNode = status ["node"];
- if (oldNode != null)
- oldNode = (XmlElement) oldNode.CloneNode (true);
- }
- object oldStat = menu.SaveStatus ();
-
- if (data [0] != null)
- retBaseDiff = base.ApplyUndoRedoDiff (data [0]);
- else
- retBaseDiff = null;
-
- XmlElement xdiff = (XmlElement) data [1];
-
- if (xdiff != null) {
- XmlElement status = UndoManager.GetObjectStatus (this);
- XmlElement prevNode = status ["node"];
- if (prevNode != null)
- status.RemoveChild (prevNode);
- status.AppendChild (xdiff);
-
- if (actionTree != null) {
- Loading = true;
- menu.OpenSubmenu = null;
- DisposeTree ();
- CreateTree ();
- actionTree.Read (this, xdiff);
- menu.FillMenu (actionTree);
- Loading = false;
- } else
- menuInfo = xdiff;
- }
-
- // Restore the status after all menu structure has been properly built
- GLib.Timeout.Add (50, delegate {
- menu.RestoreStatus (data[2]);
- return false;
- });
-
- return new object [] { retBaseDiff, oldNode, oldStat };
- }
-
- protected override void OnNameChanged (WidgetNameChangedArgs args)
- {
- base.OnNameChanged (args);
- if (actionTree != null)
- actionTree.Name = Name;
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- BuildTree ();
- actionTree.Name = Name;
- CodeExpression exp = GenerateUiManagerElement (ctx, actionTree);
- if (exp != null)
- return new CodeCastExpression (typeof(Gtk.MenuBar).ToGlobalTypeRef (), exp);
- else
- return base.GenerateObjectCreation (ctx);
- }
-
- internal protected override void OnDesignerAttach (IDesignArea designer)
- {
- base.OnDesignerAttach (designer);
- BuildTree ();
- Loading = true;
- menu.FillMenu (actionTree);
- Loading = false;
-
- if (LocalActionGroups.Count == 0)
- LocalActionGroups.Add (new ActionGroup ("Default"));
- }
-
- void BuildTree ()
- {
- if (menuInfo != null) {
- DisposeTree ();
- CreateTree ();
- actionTree.Read (this, menuInfo);
- menuInfo = null;
- }
- }
-
- void CreateTree ()
- {
- actionTree = new ActionTree ();
- actionTree.Name = Name;
- actionTree.Type = Gtk.UIManagerItemType.Menubar;
- actionTree.Changed += OnTreeChanged;
- }
-
- void DisposeTree ()
- {
- if (actionTree != null) {
- actionTree.Dispose ();
- actionTree.Changed -= OnTreeChanged;
- actionTree = null;
- }
- }
-
- void OnTreeChanged (object s, EventArgs a)
- {
- treeChanged = true;
- NotifyChanged ();
- }
- }
-
- class CustomMenuBarItem: Gtk.MenuItem
- {
- public ActionMenuItem ActionMenuItem;
-// public ActionTreeNode Node;
- }
-
- public class ActionPaletteItem: Gtk.HBox
- {
- ActionTreeNode node;
- bool disposeNode;
-
- public ActionPaletteItem (Gtk.UIManagerItemType type, string name, Action action)
- : this (new ActionTreeNode (type, name, action))
- {
- disposeNode = true;
- }
-
- public ActionPaletteItem (ActionTreeNode node)
- {
- this.node = node;
- Spacing = 3;
- if (node.Type == Gtk.UIManagerItemType.Menu) {
- PackStart (new Gtk.Label ("Menu"), true, true, 0);
- } else if (node.Action != null && node.Action.GtkAction != null) {
- if (node.Action.GtkAction.StockId != null)
- PackStart (node.Action.CreateIcon (Gtk.IconSize.Menu), true, true, 0);
- PackStart (new Gtk.Label (node.Action.GtkAction.Label), true, true, 0);
- } else if (node.Type == Gtk.UIManagerItemType.Separator) {
- PackStart (new Gtk.Label ("Separator"), true, true, 0);
- } else {
- PackStart (new Gtk.Label ("Empty Action"), true, true, 0);
- }
- ShowAll ();
- }
-
- public ActionTreeNode Node {
- get { return node; }
- }
-
- public override void Dispose ()
- {
- if (disposeNode)
- node.Dispose ();
- base.Dispose ();
- }
-
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuItem.cs
deleted file mode 100644
index 7ebbc545c30..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MenuItem.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class MenuItem : Container {
-
- public static Gtk.MenuItem CreateInstance ()
- {
- // Use the ctor that will create an AccelLabel
- return new Gtk.MenuItem ("");
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- }
-
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- ObjectWrapper wrapper = reader.ReadObject (child_elem["widget"]);
- menuitem.Submenu = (Gtk.Menu)wrapper.Wrapped;
- return wrapper;
- }
-
- Gtk.MenuItem menuitem {
- get {
- return (Gtk.MenuItem)Wrapped;
- }
- }
-
- Gtk.Label label {
- get {
- Gtk.AccelLabel label = menuitem.Child as Gtk.AccelLabel;
- if (label != null)
- return label;
-
- if (menuitem.Child != null)
- menuitem.Child.Destroy ();
-
- label = new Gtk.AccelLabel ("");
- label.MnemonicWidget = menuitem;
- label.AccelWidget = menuitem;
- label.Xalign = 0.0f;
- label.Show ();
- menuitem.Add (label);
-
- return label;
- }
- }
-
- public bool HasSubmenu {
- get {
- return menuitem.Submenu != null;
- }
- }
-
- string labelText;
-
- public string Label {
- get {
- return labelText;
- }
- set {
- label.LabelProp = labelText = value;
- EmitNotify ("Label");
- }
- }
-
- public bool UseUnderline {
- get {
- return label.UseUnderline;
- }
- set {
- label.UseUnderline = value;
- EmitNotify ("UseUnderline");
- }
- }
-
- Gtk.AccelGroup accelGroup;
- string accelerator;
- public string Accelerator {
- get {
- return accelerator;
- }
- set {
- uint key;
- Gdk.ModifierType mods;
-
- if (accelGroup != null && accelerator != null) {
- Gtk.Accelerator.Parse (accelerator, out key, out mods);
- menuitem.RemoveAccelerator (accelGroup, key, mods);
- }
-
- accelerator = value;
-
- if (accelerator != null) {
- if (accelGroup == null)
- accelGroup = new Gtk.AccelGroup ();
-
- Gtk.Accelerator.Parse (accelerator, out key, out mods);
- menuitem.AddAccelerator ("activate", accelGroup, key, mods,
- Gtk.AccelFlags.Visible);
- }
-
- EmitNotify ("Accelerator");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MessageDialog.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MessageDialog.cs
deleted file mode 100644
index 805b02932ce..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/MessageDialog.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-
-namespace Stetic {
-
- public class MessageDialog : Gtk.Dialog {
-
- public MessageDialog ()
- {
- Resizable = false;
- HasSeparator = false;
- BorderWidth = 12;
-
- label = new Gtk.Label ();
- label.LineWrap = true;
- label.Selectable = true;
- label.UseMarkup = true;
- label.SetAlignment (0.0f, 0.0f);
-
- secondaryLabel = new Gtk.Label ();
- secondaryLabel.LineWrap = true;
- secondaryLabel.Selectable = true;
- secondaryLabel.UseMarkup = true;
- secondaryLabel.SetAlignment (0.0f, 0.0f);
-
- icon = new Gtk.Image (Gtk.Stock.DialogInfo, Gtk.IconSize.Dialog);
- icon.SetAlignment (0.5f, 0.0f);
-
- Gtk.StockItem item = Gtk.Stock.Lookup (icon.Stock);
- Title = item.Label;
-
- Gtk.HBox hbox = new Gtk.HBox (false, 12);
- Gtk.VBox vbox = new Gtk.VBox (false, 12);
-
- vbox.PackStart (label, false, false, 0);
- vbox.PackStart (secondaryLabel, true, true, 0);
-
- hbox.PackStart (icon, false, false, 0);
- hbox.PackStart (vbox, true, true, 0);
-
- VBox.PackStart (hbox, false, false, 0);
- hbox.ShowAll ();
-
- Buttons = Gtk.ButtonsType.OkCancel;
- }
-
- Gtk.Label label, secondaryLabel;
- Gtk.Image icon;
-
- public Gtk.MessageType MessageType {
- get {
- if (icon.Stock == Gtk.Stock.DialogInfo)
- return Gtk.MessageType.Info;
- else if (icon.Stock == Gtk.Stock.DialogQuestion)
- return Gtk.MessageType.Question;
- else if (icon.Stock == Gtk.Stock.DialogWarning)
- return Gtk.MessageType.Warning;
- else
- return Gtk.MessageType.Error;
- }
- set {
- Gtk.StockItem item = Gtk.Stock.Lookup (icon.Stock);
- bool setTitle = (Title == "") || (Title == item.Label);
-
- if (value == Gtk.MessageType.Info)
- icon.Stock = Gtk.Stock.DialogInfo;
- else if (value == Gtk.MessageType.Question)
- icon.Stock = Gtk.Stock.DialogQuestion;
- else if (value == Gtk.MessageType.Warning)
- icon.Stock = Gtk.Stock.DialogWarning;
- else
- icon.Stock = Gtk.Stock.DialogError;
-
- if (setTitle) {
- item = Gtk.Stock.Lookup (icon.Stock);
- Title = item.Label;
- }
- }
- }
-
- public string primaryText;
- public string PrimaryText {
- get {
- return primaryText;
- }
- set {
- primaryText = value;
- label.Markup = "" + value + "";
- }
- }
-
- public string SecondaryText {
- get {
- return secondaryLabel.Text;
- }
- set {
- secondaryLabel.Markup = value;
- }
- }
-
- Gtk.ButtonsType buttons;
- public Gtk.ButtonsType Buttons {
- get {
- return buttons;
- }
- set {
- Gtk.Widget[] oldButtons = ActionArea.Children;
- foreach (Gtk.Widget w in oldButtons)
- ActionArea.Remove (w);
-
- buttons = value;
- switch (buttons) {
- case Gtk.ButtonsType.None:
- // nothing
- break;
-
- case Gtk.ButtonsType.Ok:
- AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok);
- break;
-
- case Gtk.ButtonsType.Close:
- AddButton (Gtk.Stock.Close, Gtk.ResponseType.Close);
- break;
-
- case Gtk.ButtonsType.Cancel:
- AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
- break;
-
- case Gtk.ButtonsType.YesNo:
- AddButton (Gtk.Stock.No, Gtk.ResponseType.No);
- AddButton (Gtk.Stock.Yes, Gtk.ResponseType.Yes);
- break;
-
- case Gtk.ButtonsType.OkCancel:
- AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
- AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok);
- break;
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Misc.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Misc.cs
deleted file mode 100644
index 757ab62afd9..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Misc.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-
-using System;
-
-namespace Stetic.Wrapper
-{
- public class Misc: Widget
- {
- public bool AlignLeft {
- get {
- return ((Gtk.Misc)Wrapped).Xalign == 0;
- }
- set {
- ((Gtk.Misc)Wrapped).Xalign = 0;
- }
- }
-
- public bool AlignRight {
- get {
- return ((Gtk.Misc)Wrapped).Xalign == 1;
- }
- set {
- ((Gtk.Misc)Wrapped).Xalign = 1;
- }
- }
-
- public bool AlignCenter {
- get {
- return ((Gtk.Misc)Wrapped).Xalign == 0.5f;
- }
- set {
- ((Gtk.Misc)Wrapped).Xalign = 0.5f;
- }
- }
-
- public static Gtk.Image CreateInstance ()
- {
- return new Gtk.Image (Gtk.Stock.MissingImage, Gtk.IconSize.Menu);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Notebook.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Notebook.cs
deleted file mode 100644
index 3627734022c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Notebook.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class Notebook : Container {
-
- ArrayList tabs = new ArrayList ();
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized && AllowPlaceholders) {
- if (notebook.Children.Length != 0) {
- // Remove the dummy page Container.Wrap added
- notebook.Remove (notebook.Children[0]);
- }
- InsertPage (0);
- }
- notebook.SwitchPage += OnPageChanged;
- }
-
- public override void Dispose ()
- {
- notebook.SwitchPage -= OnPageChanged;
- base.Dispose ();
- }
-
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- if ((string)GladeUtils.GetChildProperty (child_elem, "type", "") == "tab") {
- ObjectWrapper wrapper = reader.ReadObject (child_elem["widget"]);
- Gtk.Widget widget = (Gtk.Widget)wrapper.Wrapped;
- notebook.SetTabLabel (notebook.GetNthPage (notebook.NPages - 1), widget);
- tabs.Add (widget);
- return wrapper;
- } else
- return base.ReadChild (reader, child_elem);
- }
-
- protected override XmlElement WriteChild (ObjectWriter writer, Widget wrapper)
- {
- XmlElement child_elem = base.WriteChild (writer, wrapper);
- if (tabs.Contains (wrapper.Wrapped))
- GladeUtils.SetChildProperty (child_elem, "type", "tab");
- return child_elem;
- }
- public override void Read (ObjectReader reader, XmlElement element)
- {
- object cp = GladeUtils.ExtractProperty (element, "CurrentPage", 0);
- base.Read (reader, element);
- notebook.CurrentPage = (int) cp;
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentExp, Widget wrapper)
- {
- Gtk.Widget child = (Gtk.Widget) wrapper.Wrapped;
-
- if (notebook.PageNum (child) == -1) {
- // It's a tab
-
- ctx.Statements.Add (new CodeCommentStatement ("Notebook tab"));
- Gtk.Widget page = null;
- CodeExpression pageVar;
-
- // Look for the page widget contained in this tab
- for (int n=0; n < notebook.NPages; n++) {
- if (notebook.GetTabLabel (notebook.GetNthPage (n)) == child) {
- page = notebook.GetNthPage (n);
- break;
- }
- }
-
- // If the page contains a placeholder, generate a dummy page
- if (page is Stetic.Placeholder) {
- CodeVariableDeclarationStatement dvar = new CodeVariableDeclarationStatement (
- "Gtk.Label".ToGlobalTypeRef (),
- ctx.NewId (),
- new CodeObjectCreateExpression ("Gtk.Label".ToGlobalTypeRef ())
- );
- ctx.Statements.Add (dvar);
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- new CodeVariableReferenceExpression (dvar.Name),
- "Visible"
- ),
- new CodePrimitiveExpression (true)
- )
- );
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- parentExp,
- "Add",
- new CodeVariableReferenceExpression (dvar.Name)
- )
- );
- pageVar = new CodeVariableReferenceExpression (dvar.Name);
- } else
- pageVar = ctx.WidgetMap.GetWidgetExp (page);
-
- // Generate code for the tab
- CodeExpression var = ctx.GenerateNewInstanceCode (wrapper);
-
- // Assign the tab to the page
- CodeMethodInvokeExpression invoke = new CodeMethodInvokeExpression (
- parentExp,
- "SetTabLabel",
- pageVar,
- var
- );
- ctx.Statements.Add (invoke);
-
- // Workaround for GTK bug. ShowAll is not propagated to tab labels.
- invoke = new CodeMethodInvokeExpression (
- var,
- "ShowAll"
- );
- ctx.Statements.Add (invoke);
- } else
- base.GenerateChildBuildCode (ctx, parentExp, wrapper);
- }
-
-
- private Gtk.Notebook notebook {
- get {
- return (Gtk.Notebook)Wrapped;
- }
- }
-
- public override void Select (Gtk.Widget widget)
- {
- if (widget != null) {
- int index = tabs.IndexOf (widget);
- if (index != -1 && index != notebook.CurrentPage)
- notebook.CurrentPage = index;
- }
- base.Select (widget);
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- int index = tabs.IndexOf (oldChild);
- if (index != -1) {
- tabs[index] = newChild;
- Gtk.Widget page = notebook.GetNthPage (index);
- notebook.SetTabLabel (page, newChild);
- } else {
- Gtk.Widget tab = notebook.GetTabLabel (oldChild);
- int current = notebook.CurrentPage;
- int oldPageNum = ((Gtk.Notebook.NotebookChild)notebook [oldChild]).Position;
- base.ReplaceChild (oldChild, newChild);
- // Get the widget again because it may have changed (for example, if it is a text view
- // and has the ShowScrollbars option set.
- newChild = notebook.GetNthPage (oldPageNum);
- notebook.CurrentPage = current;
- notebook.SetTabLabel (newChild, tab);
- Widget ww = Widget.Lookup (tab);
- if (ww != null)
- ww.RequiresUndoStatusUpdate = true;
- }
- }
-
- int InsertPage (int position)
- {
- Gtk.Label label = (Gtk.Label)Registry.NewInstance ("Gtk.Label", proj);
- label.LabelProp = "page" + (notebook.NPages + 1).ToString ();
- tabs.Insert (position, label);
-
- Placeholder ph = CreatePlaceholder ();
- int i = notebook.InsertPage (ph, label, position);
- NotifyChildAdded (ph);
- return i;
- }
-
- internal void PreviousPage ()
- {
- notebook.PrevPage ();
- }
-
- internal bool CheckPreviousPage ()
- {
- return notebook.CurrentPage > 0;
- }
-
- internal void NextPage ()
- {
- notebook.NextPage ();
- }
-
- internal bool CheckNextPage ()
- {
- return notebook.CurrentPage < notebook.NPages - 1;
- }
-
- internal void DeletePage ()
- {
- tabs.RemoveAt (notebook.CurrentPage);
- notebook.RemovePage (notebook.CurrentPage);
- }
-
- internal bool CheckDeletePage ()
- {
- return notebook.NPages > 0;
- }
-
- internal void SwapPrevious ()
- {
- object ob = tabs [notebook.CurrentPage];
- tabs [notebook.CurrentPage] = tabs [notebook.CurrentPage - 1];
- tabs [notebook.CurrentPage - 1] = ob;
-
- Gtk.Widget cp = notebook.GetNthPage (notebook.CurrentPage);
- notebook.ReorderChild (cp, notebook.CurrentPage - 1);
- }
-
- internal void SwapNext ()
- {
- object ob = tabs [notebook.CurrentPage];
- tabs [notebook.CurrentPage] = tabs [notebook.CurrentPage + 1];
- tabs [notebook.CurrentPage + 1] = ob;
-
- Gtk.Widget cp = notebook.GetNthPage (notebook.CurrentPage);
- notebook.ReorderChild (cp, notebook.CurrentPage + 1);
- }
-
- internal void InsertBefore ()
- {
- notebook.CurrentPage = InsertPage (notebook.CurrentPage);
- }
-
- internal bool CheckInsertBefore ()
- {
- return notebook.NPages > 0;
- }
-
- internal void InsertAfter ()
- {
- notebook.CurrentPage = InsertPage (notebook.CurrentPage + 1);
- }
-
- public override bool HExpandable {
- get {
- foreach (Gtk.Widget w in notebook) {
- if (ChildHExpandable (w))
- return true;
- }
- return false;
- }
- }
-
- public override bool VExpandable {
- get {
- foreach (Gtk.Widget w in notebook) {
- if (ChildVExpandable (w))
- return true;
- }
- return false;
- }
- }
-
- void OnPageChanged (object s, Gtk.SwitchPageArgs args)
- {
- EmitNotify ("CurrentPage");
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/NotifyWorkaround.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/NotifyWorkaround.cs
deleted file mode 100644
index 05a5c078c39..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/NotifyWorkaround.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// NotifyWorkaround.cs
-//
-// Author:
-// Mike Krüger
-//
-// Copyright (c) 2011 Xamarin
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using GLib;
-using System;
-using System.Runtime.InteropServices;
-
-
-namespace Stetic.Wrapper
-{
- ///
- /// This class contains a notification work around for a gtk 3 bug where notifications could yield a
- /// System.NullReferenceException: Object reference not set to an instance of an object at GLib.Object.NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch)
- ///
- static class NotifyWorkaround
- {
- [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
- delegate void NotifyDelegate (IntPtr handle, IntPtr pspec, IntPtr gch);
-
- static NotifyDelegate delegateInstance = new NotifyDelegate (NotifyCallback);
-
- static void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch)
- {
- try {
- var sig = ((GCHandle) gch).Target as GLib.Signal;
- if (sig == null)
- throw new Exception("Unknown signal GC handle received " + gch);
-
- var handler = sig.Handler as NotifyHandler;
- if (handler != null) {
- handler (GLib.Object.GetObject (handle), new NotifyArgs () {
- Args = new object[] { pspec }
- });
- }
- } catch (Exception e) {
- ExceptionManager.RaiseUnhandledException (e, false);
- }
- }
-
- static void ConnectNotification (GLib.Object w, string signal, NotifyHandler handler)
- {
- var sig = GLib.Signal.Lookup (w, signal, delegateInstance);
- sig.AddDelegate (handler);
- }
-
- public static void AddNotification (GLib.Object w, NotifyHandler handler)
- {
- ConnectNotification (w, "notify", handler);
- }
-
- public static void AddNotification (GLib.Object w, string property, NotifyHandler handler)
- {
- ConnectNotification (w, "notify::" + property, handler);
- }
-
- static void DisconnectNotification (GLib.Object w, string signal, NotifyHandler handler)
- {
- var sig = GLib.Signal.Lookup (w, signal, delegateInstance);
- sig.RemoveDelegate (handler);
- }
-
- public static void RemoveNotification (GLib.Object w, NotifyHandler handler)
- {
- DisconnectNotification (w, "notify", handler);
- }
-
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
deleted file mode 100644
index 54972fed3d0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic.Wrapper {
- public abstract class Object : Stetic.ObjectWrapper {
-
- public override void Dispose ()
- {
- if (Wrapped == null)
- return;
- NotifyWorkaround.RemoveNotification (( GLib.Object)Wrapped, NotifyHandler);
- base.Dispose ();
- }
-
- internal protected override void OnDesignerAttach (IDesignArea designer)
- {
- base.OnDesignerAttach (designer);
- NotifyWorkaround.AddNotification ((GLib.Object)Wrapped, NotifyHandler);
- }
-
- internal protected override void OnDesignerDetach (IDesignArea designer)
- {
- base.OnDesignerDetach (designer);
- NotifyWorkaround.RemoveNotification ((GLib.Object)Wrapped, NotifyHandler);
- }
-
- public static Object Lookup (GLib.Object obj)
- {
- return Stetic.ObjectWrapper.Lookup (obj) as Stetic.Wrapper.Object;
- }
-
- void NotifyHandler (object obj, GLib.NotifyArgs args)
- {
- if (Loading)
- return;
-
- // Translate gtk names into descriptor names.
- foreach (ItemGroup group in ClassDescriptor.ItemGroups) {
- foreach (ItemDescriptor item in group) {
- TypedPropertyDescriptor prop = item as TypedPropertyDescriptor;
- if (prop != null && prop.GladeName == args.Property) {
- EmitNotify (prop.Name);
- return;
- }
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/OptionMenu.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/OptionMenu.cs
deleted file mode 100644
index f376554ecea..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/OptionMenu.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-
-// Don't warn that OptionMenu is deprecated. We know that.
-#pragma warning disable 612
-
-namespace Stetic.Wrapper {
-
- public class OptionMenu : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- Gtk.OptionMenu omenu = (Gtk.OptionMenu)obj;
- if (omenu.Menu == null) {
- Gtk.Menu menu = new Gtk.Menu ();
- menu.Show ();
- omenu.Menu = menu;
- }
-
- base.Wrap (obj, initialized);
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- int history = (int)GladeUtils.ExtractProperty (elem, "history", -1);
- base.ReadProperties (reader, elem);
-
- // Fiddle with things to make the optionmenu resize itself correctly
- Gtk.Widget menu = optionmenu.Menu;
- optionmenu.Menu = new Gtk.Menu ();
- optionmenu.Menu = menu;
-
- if (history != -1)
- Active = history;
- else
- Active = 0;
- }
-
- // Some versions of glade call the menu an internal child, some don't
-
- protected override ObjectWrapper ReadInternalChild (ObjectReader reader, XmlElement child_elem)
- {
- if (child_elem.GetAttribute ("internal-child") == "menu")
- return ReadChild (reader, child_elem);
- else
- return base.ReadInternalChild (reader, child_elem);
- }
-
- protected override ObjectWrapper ReadChild (ObjectReader reader, XmlElement child_elem)
- {
- Widget wrapper = Stetic.Wrapper.Widget.Lookup (optionmenu.Menu);
- reader.ReadObject (wrapper, child_elem["widget"]);
- return wrapper;
- }
-
- public override IEnumerable GladeChildren {
- get {
- return new Gtk.Widget[] { optionmenu.Menu };
- }
- }
-
- Gtk.OptionMenu optionmenu {
- get {
- return (Gtk.OptionMenu)Wrapped;
- }
- }
-
- public int Active {
- get {
- return optionmenu.History;
- }
- set {
- optionmenu.SetHistory ((uint)value);
- EmitNotify ("Active");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Paned.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Paned.cs
deleted file mode 100644
index 477923a27c2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Paned.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public class Paned : Container {
-
- int position;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized && AllowPlaceholders) {
- Placeholder ph = CreatePlaceholder ();
- paned.Pack1 (ph, true, false);
- NotifyChildAdded (ph);
- ph = CreatePlaceholder ();
- paned.Pack2 (ph, true, false);
- NotifyChildAdded (ph);
- }
- position = paned.Position;
- paned.Realized += PanedRealized;
- }
-
- void PanedRealized (object sender, EventArgs e)
- {
- // The position may be reset while realizing the object, so
- // we set it now here. See bug #542227. This seems to be Windows only.
- bool old = Loading;
- Loading = true;
- paned.Position = position;
- Loading = old;
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- paned.Realized -= PanedRealized;
- }
-
- protected Gtk.Paned paned {
- get {
- return (Gtk.Paned)Wrapped;
- }
- }
-
- public int Position {
- get {
- return paned.Position;
- }
- set {
- position = value;
- paned.Position = value;
- }
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- if (oldChild == paned.Child1) {
- paned.Remove (oldChild);
- paned.Add1 (newChild);
- } else if (oldChild == paned.Child2) {
- paned.Remove (oldChild);
- paned.Add2 (newChild);
- }
- NotifyChildAdded (newChild);
- }
-
- public override void Delete (Stetic.Placeholder ph)
- {
- // Don't allow deleting placeholders
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioActionGroupManager.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioActionGroupManager.cs
deleted file mode 100644
index 0f67944ce4a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioActionGroupManager.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-
-using System;
-using System.Collections;
-using System.CodeDom;
-
-namespace Stetic.Wrapper
-{
- public class RadioActionGroupManager: IRadioGroupManager
- {
- public event GroupsChangedDelegate GroupsChanged;
- Hashtable actions = new Hashtable ();
- ArrayList groups = new ArrayList ();
-
- public IEnumerable GroupNames {
- get {
- foreach (string grp in groups)
- yield return grp;
- }
- }
-
- public void Rename (string oldName, string newName)
- {
- int i = groups.IndexOf (oldName);
- if (i == -1)
- return;
-
- groups [i] = newName;
-
- ArrayList list = new ArrayList ();
- foreach (Action a in FindActionsInGroup (oldName))
- list.Add (a);
-
- foreach (Action a in list)
- actions [a] = newName;
-
- EmitGroupsChanged ();
- }
-
- public void Add (string name)
- {
- groups.Add (name);
- EmitGroupsChanged ();
- }
-
- public RadioGroup FindGroup (string name)
- {
- for (int i = 0; i < groups.Count; i++) {
- RadioGroup group = groups[i] as RadioGroup;
- if (group.Name == name)
- return group;
- }
- return null;
- }
-
- public string GetGroup (Action action)
- {
- return actions [action] as string;
- }
-
- public void SetGroup (Action action, string group)
- {
- if (group == null) {
- if (actions.Contains (action)) {
- actions.Remove (action);
- action.Disposed -= OnActionDisposed;
- }
- return;
- }
-
- if (!actions.Contains (action))
- action.Disposed += OnActionDisposed;
- actions [action] = group;
- if (!groups.Contains (group))
- groups.Add (group);
- }
-
- void OnActionDisposed (object s, EventArgs a)
- {
- Action ac = (Action) s;
- if (ac != null) {
- ac.Disposed -= OnActionDisposed;
- actions.Remove (ac);
- }
- }
-
- public string LastGroup {
- get {
- if (groups.Count == 0)
- Add ("group1");
- return groups [groups.Count - 1] as string;
- }
- }
-
- void EmitGroupsChanged ()
- {
- if (GroupsChanged != null)
- GroupsChanged ();
- }
-
- IEnumerable FindActionsInGroup (string grp)
- {
- foreach (DictionaryEntry e in actions)
- if (((string)e.Value) == grp)
- yield return e.Key;
- }
-
- public CodeExpression GenerateGroupExpression (GeneratorContext ctx, Action action)
- {
- // Returns and expression that represents the group to which the radio belongs.
- // This expression can be an empty SList, if this is the first radio of the
- // group that has been generated, or an SList taken from previously generated
- // radios from the same group.
-
- string group = actions [action] as string;
- if (group == null)
- return new CodePrimitiveExpression (null);
-
- CodeExpression var = null;
-
- foreach (Action a in FindActionsInGroup (group)) {
- if (a == action)
- continue;
- var = ctx.WidgetMap.GetWidgetExp (a);
- if (var != null)
- break;
- }
-
- if (var == null) {
- return new CodeObjectCreateExpression (
- "GLib.SList".ToGlobalTypeRef (),
- new CodePropertyReferenceExpression (
- new CodeTypeReferenceExpression (typeof(IntPtr).ToGlobalTypeRef ()),
- "Zero"
- )
- );
- } else {
- return new CodePropertyReferenceExpression (
- var,
- "Group"
- );
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioButton.cs
deleted file mode 100644
index a58d70f31ca..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioButton.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class RadioButton : CheckButton, IRadioGroupManagerProvider {
-
- static RadioGroupManager GroupManager = new RadioGroupManager (typeof (Gtk.RadioButton));
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- Gtk.RadioButton radiobutton = (Gtk.RadioButton)Wrapped;
- if (!initialized)
- Group = GroupManager.LastGroup;
- else if (radiobutton.Group == null)
- Group = radiobutton.Name;
- }
-
- IRadioGroupManager IRadioGroupManagerProvider.GetGroupManager ()
- {
- return GroupManager;
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- bool active = (bool)GladeUtils.ExtractProperty (elem, "active", false);
- string group = (string)GladeUtils.ExtractProperty (elem, "group", "");
- base.ReadProperties (reader, elem);
-
- if (reader.Format == FileFormat.Glade) {
- if (group != "")
- Group = group;
- else
- Group = Wrapped.Name;
- }
-
- if (active)
- ((Gtk.RadioButton)Wrapped).Active = true;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (writer.Format == FileFormat.Glade) {
- string group = GroupManager.GladeGroupName (Wrapped);
- if (group != Wrapped.Name)
- GladeUtils.SetProperty (elem, "group", group);
- }
- return elem;
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name == "Group") {
- CodeExpression groupExp = GroupManager.GenerateGroupExpression (ctx, (Gtk.Widget) Wrapped);
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "Group"),
- groupExp)
- );
- }
- else
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- public string Group {
- get {
- return GroupManager[Wrapped];
- }
- set {
- GroupManager[Wrapped] = value;
- EmitNotify ("Group");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioMenuItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioMenuItem.cs
deleted file mode 100644
index d8a232584b3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioMenuItem.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class RadioMenuItem : MenuItem, IRadioGroupManagerProvider {
-
- static RadioGroupManager GroupManager = new RadioGroupManager (typeof (Gtk.RadioMenuItem));
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- Gtk.RadioMenuItem radio = (Gtk.RadioMenuItem)Wrapped;
- if (!initialized)
- Group = GroupManager.LastGroup;
- else if (radio.Group == null)
- Group = radio.Name;
- }
-
- IRadioGroupManager IRadioGroupManagerProvider.GetGroupManager ()
- {
- return GroupManager;
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- string group = (string)GladeUtils.ExtractProperty (elem, "group", "");
- bool active = (bool)GladeUtils.ExtractProperty (elem, "active", false);
- base.ReadProperties (reader, elem);
-
- if (group != "")
- Group = group;
- else
- Group = Wrapped.Name;
- if (active)
- ((Gtk.RadioMenuItem)Wrapped).Active = true;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- string group = GroupManager.GladeGroupName (Wrapped);
- if (group != Wrapped.Name)
- GladeUtils.SetProperty (elem, "group", group);
- return elem;
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name == "Group") {
- CodeExpression groupExp = GroupManager.GenerateGroupExpression (ctx, (Gtk.Widget) Wrapped);
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "Group"),
- groupExp)
- );
- }
- else
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- public string Group {
- get {
- return GroupManager[Wrapped];
- }
- set {
- GroupManager[Wrapped] = value;
- EmitNotify ("Group");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioToolButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioToolButton.cs
deleted file mode 100644
index 986d2476cce..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/RadioToolButton.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class RadioToolButton : ToggleToolButton, IRadioGroupManagerProvider {
-
- public static new Gtk.ToolButton CreateInstance ()
- {
- return new Gtk.RadioToolButton (new GLib.SList (IntPtr.Zero), Gtk.Stock.SortAscending);
- }
-
- static RadioGroupManager GroupManager = new RadioGroupManager (typeof (Gtk.RadioToolButton));
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- Gtk.RadioToolButton radio = (Gtk.RadioToolButton)Wrapped;
- if (!initialized)
- Group = GroupManager.LastGroup;
- else if (radio.Group == null)
- Group = radio.Name;
- }
-
- IRadioGroupManager IRadioGroupManagerProvider.GetGroupManager ()
- {
- return GroupManager;
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- string group = (string)GladeUtils.ExtractProperty (elem, "group", "");
- bool active = (bool)GladeUtils.ExtractProperty (elem, "active", false);
- base.ReadProperties (reader, elem);
-
- if (group != "")
- Group = group;
- else
- Group = Wrapped.Name;
- if (active)
- ((Gtk.RadioToolButton)Wrapped).Active = true;
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- string group = GroupManager.GladeGroupName (Wrapped);
- if (group != Wrapped.Name)
- GladeUtils.SetProperty (elem, "group", group);
- return elem;
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name == "Group") {
- CodeExpression groupExp = GroupManager.GenerateGroupExpression (ctx, (Gtk.Widget) Wrapped);
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (var, "Group"),
- groupExp)
- );
- }
- else
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- public string Group {
- get {
- return GroupManager[Wrapped];
- }
- set {
- GroupManager[Wrapped] = value;
- EmitNotify ("Group");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Range.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Range.cs
deleted file mode 100644
index c93d606d3ba..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Range.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public abstract class Range : Widget {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- NotifyWorkaround.AddNotification (((Gtk.Range)Wrapped).Adjustment, AdjustmentNotifyHandler);
- }
-
- public override void Dispose ()
- {
- NotifyWorkaround.RemoveNotification (((Gtk.Range)Wrapped).Adjustment, AdjustmentNotifyHandler);
- base.Dispose ();
- }
-
- void AdjustmentNotifyHandler (object obj, GLib.NotifyArgs args)
- {
- EmitNotify (args.Property);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Scale.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Scale.cs
deleted file mode 100644
index fa37ae0dbb3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Scale.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public abstract class Scale : Widget {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- NotifyWorkaround.AddNotification (((Gtk.Scale)Wrapped).Adjustment, AdjustmentNotifyHandler);
- }
-
- public override void Dispose ()
- {
- NotifyWorkaround.RemoveNotification (((Gtk.Scale)Wrapped).Adjustment, AdjustmentNotifyHandler);
- base.Dispose ();
- }
-
- void AdjustmentNotifyHandler (object obj, GLib.NotifyArgs args)
- {
- EmitNotify (args.Property);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ScrolledWindow.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ScrolledWindow.cs
deleted file mode 100644
index 5cc8bd3b943..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ScrolledWindow.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class ScrolledWindow : Container {
-
- Gtk.PolicyType hpolicy = Gtk.PolicyType.Automatic;
- Gtk.PolicyType vpolicy = Gtk.PolicyType.Automatic;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized) {
- if (scrolled.Child == null && AllowPlaceholders)
- AddPlaceholder ();
- HscrollbarPolicy = VscrollbarPolicy = Gtk.PolicyType.Automatic;
- scrolled.ShadowType = Gtk.ShadowType.In;
- }
- scrolled.SetPolicy (Gtk.PolicyType.Always, Gtk.PolicyType.Always);
- }
-
- public Gtk.ScrolledWindow scrolled {
- get {
- return (Gtk.ScrolledWindow)Wrapped;
- }
- }
-
- public Gtk.PolicyType HscrollbarPolicy {
- get { return hpolicy; }
- set {
- hpolicy = value;
- EmitNotify ("HscrollbarPolicy");
- }
- }
-
- public Gtk.PolicyType VscrollbarPolicy {
- get { return vpolicy; }
- set {
- vpolicy = value;
- EmitNotify ("VscrollbarPolicy");
- }
- }
-
- public override IEnumerable RealChildren {
- get {
- if (scrolled.Child is Gtk.Viewport)
- return ((Gtk.Viewport)scrolled.Child).Children;
- else
- return base.RealChildren;
- }
- }
-
- internal void AddWithViewport (Gtk.Widget child)
- {
- Gtk.Viewport viewport = new Gtk.Viewport (scrolled.Hadjustment, scrolled.Vadjustment);
- ObjectWrapper.Create (proj, viewport);
- viewport.ShadowType = Gtk.ShadowType.None;
- viewport.Add (child);
- viewport.Show ();
- scrolled.Add (viewport);
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- Widget ww = Widget.Lookup (oldChild);
- if (ww != null && ww.ShowScrollbars && ParentWrapper != null) {
- // The viewport is bound to the child widget. Remove it together with the child
- ParentWrapper.ReplaceChild (Wrapped, newChild, false);
- return;
- }
-
- if (scrolled.Child is Gtk.Viewport && oldChild != scrolled.Child) {
- Gtk.Viewport vp = (Gtk.Viewport)scrolled.Child;
- vp.Remove (oldChild);
- scrolled.Remove (vp);
- vp.Destroy ();
- }
- else
- scrolled.Remove (scrolled.Child);
-
- if (newChild.SetScrollAdjustments (null, null))
- scrolled.Add (newChild);
- else
- AddWithViewport (newChild);
-
- NotifyChildAdded (scrolled.Child);
- }
-
- public override Placeholder AddPlaceholder ()
- {
- Placeholder ph = CreatePlaceholder ();
- AddWithViewport (ph);
- return ph;
- }
-
- protected override void GenerateChildBuildCode (GeneratorContext ctx, CodeExpression parentVar, Widget wrapper)
- {
- Gtk.Viewport vp = wrapper.Wrapped as Gtk.Viewport;
- if (vp == null || (vp.Child != null && !(vp.Child is Placeholder)))
- base.GenerateChildBuildCode (ctx, parentVar, wrapper);
- }
-
- public override void Delete (Stetic.Placeholder ph)
- {
- using (UndoManager.AtomicChange) {
- Delete ();
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Signal.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Signal.cs
deleted file mode 100644
index 3c1700e8058..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Signal.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- [Serializable]
- public class Signal
- {
- SignalDescriptor descriptor;
- string handlerName;
- bool after;
-
- [NonSerialized]
- internal ObjectWrapper Owner;
-
- public Signal (SignalDescriptor descriptor): this (descriptor, null, false)
- {
- }
-
- public Signal (SignalDescriptor descriptor, string handlerName, bool after)
- {
- this.descriptor = descriptor;
- this.handlerName = handlerName;
- this.after = after;
- }
-
- void NotifyChanged (Signal oldData)
- {
- if (Owner != null)
- Owner.OnSignalChanged (new SignalChangedEventArgs (Owner, oldData, this));
- }
-
- Signal Clone ()
- {
- return new Signal (descriptor, handlerName, after);
- }
-
- public SignalDescriptor SignalDescriptor {
- get { return descriptor; }
- }
-
- public string Handler {
- get { return handlerName; }
- set {
- Signal data = Clone ();
- handlerName = value;
- NotifyChanged (data);
- }
- }
-
- public bool After {
- get { return after; }
- set {
- Signal data = Clone ();
- after = value;
- NotifyChanged (data);
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalChangedEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalChangedEventHandler.cs
deleted file mode 100644
index 1c2d1382608..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalChangedEventHandler.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-namespace Stetic
-{
- public delegate void SignalChangedEventHandler (object sender, SignalChangedEventArgs args);
-
- public class SignalChangedEventArgs: SignalEventArgs
- {
- Signal oldSignal;
-
- public SignalChangedEventArgs (ObjectWrapper wrapper, Signal oldSignal, Signal signal): base (wrapper, signal)
- {
- this.oldSignal = oldSignal;
- }
-
- public Signal OldSignal {
- get { return oldSignal; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalCollection.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalCollection.cs
deleted file mode 100644
index c8b04ab33cd..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalCollection.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic
-{
- [Serializable]
- public class SignalCollection: CollectionBase
- {
- [NonSerialized]
- ObjectWrapper owner;
-
- [NonSerialized]
- Signal[] clearedData;
-
- public SignalCollection ()
- {
- }
-
- internal SignalCollection (ObjectWrapper owner)
- {
- this.owner = owner;
- }
-
- public int Add (Signal signal)
- {
- return List.Add (signal);
- }
-
- public Signal this [int n] {
- get { return (Signal) List [n]; }
- }
-
- public void Remove (Signal signal)
- {
- List.Remove (signal);
- }
-
- public void CopyTo (Signal[] signals, int index)
- {
- List.CopyTo (signals, index);
- }
-
- protected override void OnClear ()
- {
- if (owner != null) {
- clearedData = new Signal [Count];
- List.CopyTo (clearedData, 0);
- }
- }
-
- protected override void OnClearComplete ()
- {
- if (owner != null) {
- Signal[] data = clearedData;
- clearedData = null;
- foreach (Signal s in data) {
- s.Owner = null;
- owner.OnSignalRemoved (new SignalEventArgs (owner, s));
- }
- }
- }
-
- protected override void OnInsertComplete (int index, object value)
- {
- if (owner != null) {
- ((Signal)value).Owner = owner;
- owner.OnSignalAdded (new SignalEventArgs (owner, (Signal) value));
- }
- }
-
- protected override void OnRemoveComplete (int index, object value)
- {
- if (owner != null) {
- ((Signal)value).Owner = null;
- owner.OnSignalRemoved (new SignalEventArgs (owner, (Signal) value));
- }
- }
-
- protected override void OnSetComplete (int index, object oldValue, object newValue)
- {
- if (owner != null) {
- ((Signal)oldValue).Owner = null;
- owner.OnSignalRemoved (new SignalEventArgs (owner, (Signal) oldValue));
- ((Signal)newValue).Owner = owner;
- owner.OnSignalAdded (new SignalEventArgs (owner, (Signal) newValue));
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalEventHandler.cs
deleted file mode 100644
index da56c35156d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SignalEventHandler.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-namespace Stetic
-{
- public delegate void SignalEventHandler (object sender, SignalEventArgs args);
-
- public class SignalEventArgs: ObjectWrapperEventArgs
- {
- Signal signal;
-
- public SignalEventArgs (ObjectWrapper wrapper, Signal signal): base (wrapper)
- {
- this.signal = signal;
- }
-
- public Signal Signal {
- get { return signal; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SpinButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SpinButton.cs
deleted file mode 100644
index fa9e200f7ba..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/SpinButton.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public class SpinButton : Widget {
-
- public static Gtk.SpinButton CreateInstance ()
- {
- return new Gtk.SpinButton (0.0, 100.0, 1.0);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Table.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Table.cs
deleted file mode 100644
index f765aa847d2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Table.cs
+++ /dev/null
@@ -1,520 +0,0 @@
-using System;
-using System.Collections;
-using System.Text.RegularExpressions;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class Table : Container {
-
- const Gtk.AttachOptions expandOpts = Gtk.AttachOptions.Expand | Gtk.AttachOptions.Fill;
- const Gtk.AttachOptions fillOpts = Gtk.AttachOptions.Fill;
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized) {
- table.NRows = 3;
- table.NColumns = 3;
- table.RowSpacing = 6;
- table.ColumnSpacing = 6;
- }
- DoSync ();
- }
-
- private Gtk.Table table {
- get {
- return (Gtk.Table)Wrapped;
- }
- }
-
- public override void Delete (Stetic.Placeholder ph)
- {
- // Placeholders are deleted using commands.
- }
-
- protected override void DoSync ()
- {
- if (!AllowPlaceholders)
- return;
- using (UndoManager.AtomicChange) {
- uint left, right, top, bottom;
- uint row, col;
- Gtk.Widget w;
- Gtk.Widget[,] grid;
- Gtk.Table.TableChild tc;
- Gtk.Widget[] children;
- bool addedPlaceholders = false;
-
- children = table.Children;
- grid = new Gtk.Widget[NRows,NColumns];
-
- // First fill in the placeholders in the grid. If we find any
- // placeholders covering more than one grid square, remove them.
- // (New ones will be created below.)
- foreach (Gtk.Widget child in children) {
- if (!(child is Placeholder))
- continue;
-
- tc = table[child] as Gtk.Table.TableChild;
- left = tc.LeftAttach;
- right = tc.RightAttach;
- top = tc.TopAttach;
- bottom = tc.BottomAttach;
-
- if (right == left + 1 && bottom == top + 1)
- grid[top,left] = child;
- else {
- table.Remove (child);
- child.Destroy ();
- }
- }
-
- // Now fill in the real widgets, knocking out any placeholders
- // they overlap. (If there are real widgets that overlap
- // placeholders, neither will be knocked out, and the layout
- // will probably end up wrong as well. But this situation
- // happens at least temporarily during glade import.)
- foreach (Gtk.Widget child in children) {
- if (child is Placeholder)
- continue;
-
- tc = table[child] as Gtk.Table.TableChild;
- left = tc.LeftAttach;
- right = tc.RightAttach;
- top = tc.TopAttach;
- bottom = tc.BottomAttach;
-
- for (row = top; row < bottom; row++) {
- for (col = left; col < right; col++) {
- w = grid[row,col];
- if (w is Placeholder) {
- table.Remove (w);
- w.Destroy ();
- }
- grid[row,col] = child;
- }
- }
- }
-
- // Scan each row; if there are any empty cells, fill them in
- // with placeholders. If a row contains only placeholders, then
- // set them all to expand vertically so the row won't collapse.
- // OTOH, if the row contains any real widget, set any placeholders
- // in that row to not expand vertically, so they don't force the
- // real widgets to expand further than they should. If any row
- // is vertically expandable, then the table as a whole is.
- vexpandable = false;
- for (row = 0; row < NRows; row++) {
- bool allPlaceholders = true;
-
- for (col = 0; col < NColumns; col++) {
- w = grid[row,col];
- if (w == null) {
- w = CreatePlaceholder ();
- table.Attach (w, col, col + 1, row, row + 1);
- NotifyChildAdded (w);
- grid[row,col] = w;
- addedPlaceholders = true;
- } else if (!ChildVExpandable (w) || !AutoSize[w])
- allPlaceholders = false;
- }
-
- for (col = 0; col < NColumns; col++) {
- w = grid[row,col];
- if (!AutoSize[w])
- continue;
- tc = table[w] as Gtk.Table.TableChild;
- // We can't play with the vertical expansion property of
- // widgets which span more than one row
- if (tc.BottomAttach != tc.TopAttach + 1)
- continue;
- Gtk.AttachOptions opts = allPlaceholders ? expandOpts : fillOpts;
- if (tc.YOptions != opts)
- tc.YOptions = opts;
- }
-
- if (allPlaceholders)
- vexpandable = true;
- }
-
- // Now do the same for columns and horizontal expansion (but we
- // don't have to worry about empty cells this time).
- hexpandable = false;
- for (col = 0; col < NColumns; col++) {
- bool allPlaceholders = true;
-
- for (row = 0; row < NRows; row++) {
- w = grid[row,col];
- if (!ChildHExpandable (w) || !AutoSize[w]) {
- allPlaceholders = false;
- break;
- }
- }
-
- for (row = 0; row < NRows; row++) {
- w = grid[row,col];
- if (!AutoSize[w])
- continue;
- tc = table[w] as Gtk.Table.TableChild;
- // We can't play with the horizontal expansion property of
- // widgets which span more than one column
- if (tc.RightAttach != tc.LeftAttach + 1)
- continue;
- Gtk.AttachOptions opts = allPlaceholders ? expandOpts : fillOpts;
- if (tc.XOptions != opts)
- tc.XOptions = opts;
- }
-
- if (allPlaceholders)
- hexpandable = true;
- }
-
- if (addedPlaceholders)
- EmitContentsChanged ();
- }
- }
-
- public override Placeholder AddPlaceholder ()
- {
- // Placeholders are added by Sync ()
- return null;
- }
-
- public uint NRows {
- get {
- return table.NRows;
- }
- set {
- using (UndoManager.AtomicChange) {
- Freeze ();
- while (value < table.NRows)
- DeleteRow (table.NRows - 1);
- table.NRows = value;
- Thaw ();
- }
- }
- }
-
- public uint NColumns {
- get {
- return table.NColumns;
- }
- set {
- using (UndoManager.AtomicChange) {
- Freeze ();
- while (value < table.NColumns)
- DeleteColumn (table.NColumns - 1);
- table.NColumns = value;
- Thaw ();
- }
- }
- }
-
- void AddRow (uint row)
- {
- using (UndoManager.AtomicChange) {
- Freeze ();
- table.NRows++;
- foreach (Gtk.Widget w in table.Children) {
- Gtk.Table.TableChild tc = table[w] as Gtk.Table.TableChild;
-
- if (tc.BottomAttach > row)
- tc.BottomAttach++;
- if (tc.TopAttach >= row)
- tc.TopAttach++;
- }
- Thaw ();
- }
- }
-
- void DeleteRow (uint row)
- {
- Gtk.Widget[] children = table.Children;
- Gtk.Table.TableChild tc;
-
- using (UndoManager.AtomicChange) {
- Freeze ();
- foreach (Gtk.Widget child in children) {
- tc = table[child] as Gtk.Table.TableChild;
-
- if (tc.TopAttach == row) {
- if (tc.BottomAttach == tc.TopAttach + 1) {
- table.Remove (child);
- child.Destroy ();
- }
- else
- tc.BottomAttach--;
- } else {
- if (tc.TopAttach > row)
- tc.TopAttach--;
- if (tc.BottomAttach > row)
- tc.BottomAttach--;
- }
- }
- table.NRows--;
- Thaw ();
- }
- }
-
- void AddColumn (uint col)
- {
- using (UndoManager.AtomicChange) {
- Freeze ();
- table.NColumns++;
- foreach (Gtk.Widget w in table.Children) {
- Gtk.Table.TableChild tc = table[w] as Gtk.Table.TableChild;
-
- if (tc.RightAttach > col)
- tc.RightAttach++;
- if (tc.LeftAttach >= col)
- tc.LeftAttach++;
- }
- Thaw ();
- }
- }
-
- void DeleteColumn (uint col)
- {
- using (UndoManager.AtomicChange) {
- Gtk.Widget[] children = table.Children;
- Gtk.Table.TableChild tc;
-
- Freeze ();
- foreach (Gtk.Widget child in children) {
- tc = table[child] as Gtk.Table.TableChild;
-
- if (tc.LeftAttach == col) {
- if (tc.RightAttach == tc.LeftAttach + 1) {
- table.Remove (child);
- child.Destroy ();
- }
- else
- tc.RightAttach--;
- } else {
- if (tc.LeftAttach > col)
- tc.LeftAttach--;
- if (tc.RightAttach > col)
- tc.RightAttach--;
- }
- }
- table.NColumns--;
- Thaw ();
- }
- }
-
- public override IEnumerable GladeChildren {
- get {
- ArrayList list = new ArrayList ();
- foreach (object ob in base.GladeChildren)
- list.Add (ob);
- list.Sort (new NameComparer ());
- return list;
- }
- }
-
- class NameComparer: IComparer
- {
- public int Compare (object x, object y)
- {
- return string.Compare (((Gtk.Widget)x).Name, ((Gtk.Widget)y).Name);
- }
- }
-
- internal void InsertRowBefore (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- AddRow (tc.TopAttach);
- }
-
- internal void InsertRowAfter (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- AddRow (tc.BottomAttach);
- }
-
- internal void InsertColumnBefore (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- AddColumn (tc.LeftAttach);
- }
-
- internal void InsertColumnAfter (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- AddColumn (tc.RightAttach);
- }
-
- internal void DeleteRow (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- DeleteRow (tc.TopAttach);
- }
-
- internal void DeleteColumn (Gtk.Widget context)
- {
- Gtk.Table.TableChild tc = table[context] as Gtk.Table.TableChild;
- DeleteColumn (tc.LeftAttach);
- }
-
- private bool hexpandable, vexpandable;
- public override bool HExpandable { get { return hexpandable; } }
- public override bool VExpandable { get { return vexpandable; } }
-
- protected override void ChildContentsChanged (Container child)
- {
- using (UndoManager.AtomicChange) {
- Gtk.Widget widget = child.Wrapped;
- Freeze ();
- if (AutoSize[widget]) {
- Gtk.Table.TableChild tc = table[widget] as Gtk.Table.TableChild;
- tc.XOptions = 0;
- tc.YOptions = 0;
- }
- Thaw ();
- }
-
- base.ChildContentsChanged (child);
- }
-
- public class TableChild : Container.ContainerChild {
-
- bool freeze;
-
- Gtk.Table.TableChild tc {
- get {
- return (Gtk.Table.TableChild)Wrapped;
- }
- }
-
- public bool XExpand {
- get {
- return (tc.XOptions & Gtk.AttachOptions.Expand) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.XOptions |= Gtk.AttachOptions.Expand;
- else
- tc.XOptions &= ~Gtk.AttachOptions.Expand;
- freeze = false;
- EmitNotify ("XExpand");
- }
- }
-
- public bool XFill {
- get {
- return (tc.XOptions & Gtk.AttachOptions.Fill) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.XOptions |= Gtk.AttachOptions.Fill;
- else
- tc.XOptions &= ~Gtk.AttachOptions.Fill;
- freeze = false;
- EmitNotify ("XFill");
- }
- }
-
- public bool XShrink {
- get {
- return (tc.XOptions & Gtk.AttachOptions.Shrink) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.XOptions |= Gtk.AttachOptions.Shrink;
- else
- tc.XOptions &= ~Gtk.AttachOptions.Shrink;
- freeze = false;
- EmitNotify ("XShrink");
- }
- }
-
- public bool YExpand {
- get {
- return (tc.YOptions & Gtk.AttachOptions.Expand) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.YOptions |= Gtk.AttachOptions.Expand;
- else
- tc.YOptions &= ~Gtk.AttachOptions.Expand;
- freeze = false;
- EmitNotify ("YExpand");
- }
- }
-
- public bool YFill {
- get {
- return (tc.YOptions & Gtk.AttachOptions.Fill) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.YOptions |= Gtk.AttachOptions.Fill;
- else
- tc.YOptions &= ~Gtk.AttachOptions.Fill;
- freeze = false;
- EmitNotify ("YFill");
- }
- }
-
- public bool YShrink {
- get {
- return (tc.YOptions & Gtk.AttachOptions.Shrink) != 0;
- }
- set {
- freeze = true;
- if (value)
- tc.YOptions |= Gtk.AttachOptions.Shrink;
- else
- tc.YOptions &= ~Gtk.AttachOptions.Shrink;
- freeze = false;
- EmitNotify ("YShrink");
- }
- }
-
- protected override void EmitNotify (string propertyName)
- {
- if (freeze || Loading) return;
-
- if (propertyName == "x-options" || propertyName == "AutoSize") {
- base.EmitNotify ("XExpand");
- base.EmitNotify ("XFill");
- base.EmitNotify ("XShrink");
- }
- if (propertyName == "y-options" || propertyName == "AutoSize") {
- base.EmitNotify ("YExpand");
- base.EmitNotify ("YFill");
- base.EmitNotify ("YShrink");
- }
- base.EmitNotify (propertyName);
- }
-
- // Properties to be used by the wrapper commands
-
- public bool CellXExpand {
- get { return XExpand; }
- set { AutoSize = false; XExpand = value; }
- }
-
- public bool CellXFill{
- get { return XFill; }
- set { AutoSize = false; XFill = value; }
- }
-
- public bool CellYExpand {
- get { return YExpand; }
- set { AutoSize = false; YExpand = value; }
- }
-
- public bool CellYFill{
- get { return YFill; }
- set { AutoSize = false; YFill = value; }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TextView.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TextView.cs
deleted file mode 100644
index f5440de8d29..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TextView.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class TextView : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- ((Gtk.TextView)Wrapped).Buffer.Changed += Buffer_Changed;
- if (!initialized)
- ShowScrollbars = true;
- }
-
- public override void Dispose ()
- {
- ((Gtk.TextView)Wrapped).Buffer.Changed -= Buffer_Changed;
- base.Dispose ();
- }
-
- public string Text {
- get {
- return ((Gtk.TextView)Wrapped).Buffer.Text;
- }
- set {
- ((Gtk.TextView)Wrapped).Buffer.Text = value;
- }
- }
-
- public void Buffer_Changed (object obj, EventArgs args)
- {
- EmitNotify ("Text");
- }
-
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (Text.Length > 0) {
- PropertyDescriptor prop = (PropertyDescriptor)this.ClassDescriptor ["Text"];
- bool trans = prop.IsTranslated (Wrapped);
-
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- new CodePropertyReferenceExpression (
- var,
- "Buffer"
- ),
- "Text"
- ),
- ctx.GenerateValue (Text, typeof(string), trans)
- )
- );
- }
- base.GenerateBuildCode (ctx, var);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToggleToolButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToggleToolButton.cs
deleted file mode 100644
index a8a0654f1fc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToggleToolButton.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper {
-
- public class ToggleToolButton : ToolButton {
-
- public static new Gtk.ToolButton CreateInstance ()
- {
- return new Gtk.ToggleToolButton (Gtk.Stock.Bold);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToolButton.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToolButton.cs
deleted file mode 100644
index 76bb51faf7c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/ToolButton.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.CodeDom;
-using System.Xml;
-
-namespace Stetic.Wrapper {
-
- public class ToolButton : Widget {
-
- ButtonType type;
- string stockId;
- string label;
- ImageInfo imageInfo;
-
- public enum ButtonType {
- StockItem,
- TextAndIcon
- };
-
- public static Gtk.ToolButton CreateInstance ()
- {
- return new Gtk.ToolButton (Gtk.Stock.New);
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- Gtk.ToolButton toolbutton = (Gtk.ToolButton)Wrapped;
-
- if (toolbutton.StockId != null) {
- stockId = toolbutton.StockId;
- type = ButtonType.StockItem;
- } else {
- type = ButtonType.TextAndIcon;
- }
- }
-
- protected override void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- if (reader.Format == FileFormat.Glade) {
- string icon = (string)GladeUtils.ExtractProperty (elem, "icon", "");
- stockId = (string)GladeUtils.ExtractProperty (elem, "stock_id", "");
- label = (string)GladeUtils.ExtractProperty (elem, "label", "");
- base.ReadProperties (reader, elem);
-
- if (stockId != null && stockId.Length > 0) {
- Type = ButtonType.StockItem;
- } else if (icon != null && icon != "") {
- imageInfo = ImageInfo.FromFile (icon);
- Type = ButtonType.TextAndIcon;
- }
- } else
- base.ReadProperties (reader, elem);
- }
-
- protected override XmlElement WriteProperties (ObjectWriter writer)
- {
- XmlElement elem = base.WriteProperties (writer);
- if (type != ButtonType.StockItem && imageInfo != null) {
- if (writer.Format == FileFormat.Glade) {
- switch (imageInfo.Source) {
- case ImageSource.File:
- GladeUtils.SetProperty (elem, "icon", imageInfo.Name);
- break;
- case ImageSource.Theme:
- GladeUtils.SetProperty (elem, "stock_id", imageInfo.Name);
- break;
- default:
- throw new System.NotSupportedException ("Image source not supported by Glade.");
- }
- }
- }
- return elem;
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (
- ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (),
- new CodePrimitiveExpression (null),
- new CodePrimitiveExpression (null)
- );
- }
-
- Gtk.ToolButton button {
- get { return (Gtk.ToolButton) Wrapped; }
- }
-
- public ButtonType Type {
- get {
- return type;
- }
- set {
- type = value;
- switch (type) {
- case ButtonType.StockItem:
- button.IconWidget = null;
- StockId = stockId;
- Label = label;
- break;
- case ButtonType.TextAndIcon:
- button.StockId = null;
- Icon = imageInfo;
- Label = label;
- break;
- }
- EmitNotify ("Type");
- }
- }
-
- public string Label {
- get { return label; }
- set {
- if (type == ButtonType.StockItem && value != null) {
- label = value.Length == 0 ? null : value;
- } else
- label = value;
-
- button.Label = label;
- }
- }
-
- public string StockId {
- get { return stockId; }
- set {
- stockId = value;
- if (stockId != null && stockId.StartsWith ("stock:"))
- stockId = stockId.Substring (6);
- button.StockId = stockId;
- button.ShowAll ();
- }
- }
-
- public ImageInfo Icon {
- get { return imageInfo; }
- set {
- imageInfo = value;
- if (imageInfo != null) {
- button.IconWidget = new Gtk.Image (imageInfo.GetImage (Project));
- button.ShowAll ();
- }
- else
- button.IconWidget = null;
- EmitNotify ("Icon");
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Toolbar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Toolbar.cs
deleted file mode 100644
index cc155438888..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Toolbar.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Toolbar : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- toolbar.SizeAllocated += toolbar_SizeAllocated;
- }
-
- public override void Dispose ()
- {
- toolbar.SizeAllocated -= toolbar_SizeAllocated;
- base.Dispose ();
- }
-
- public override IEnumerable RealChildren {
- get {
- // Don't return Gtk.ToolItems that are only being used
- // to hold other non-ToolItem widgets. Just return the
- // contained widgets themselves.
-
- Gtk.Widget[] children = toolbar.Children;
- for (int i = 0; i < children.Length; i++) {
- if (children[i].GetType () == typeof (Gtk.ToolItem))
- children[i] = ((Gtk.ToolItem)children[i]).Child;
- }
- return children;
- }
- }
-
- Gtk.Toolbar toolbar {
- get {
- return (Gtk.Toolbar)Wrapped;
- }
- }
-
- public override bool HExpandable {
- get {
- return toolbar.Orientation == Gtk.Orientation.Horizontal;
- }
- }
-
- public override bool VExpandable {
- get {
- return toolbar.Orientation == Gtk.Orientation.Vertical;
- }
- }
-
- public Gtk.Orientation Orientation {
- get {
- return toolbar.Orientation;
- }
- set {
- toolbar.Orientation = value;
- EmitContentsChanged ();
- }
- }
-
- protected override void DoSync ()
- {
- DND.ClearFaults (this);
- Gtk.Orientation faultOrientation =
- Orientation == Gtk.Orientation.Horizontal ? Gtk.Orientation.Vertical : Gtk.Orientation.Horizontal;
- Gdk.Rectangle tbAlloc = toolbar.Allocation;
-
- Gtk.Widget[] children = toolbar.Children;
- if (children.Length == 0) {
- DND.AddFault (this, 0, faultOrientation, tbAlloc);
- return;
- }
-
- if (faultOrientation == Gtk.Orientation.Horizontal) {
- DND.AddHFault (this, 0, null, children[0]);
- DND.AddHFault (this, children.Length, children[children.Length - 1], null);
- } else {
- DND.AddVFault (this, 0, null, children[0]);
- DND.AddVFault (this, children.Length, children[children.Length - 1], null);
- }
-
- for (int i = 1; i < children.Length; i++) {
- if (faultOrientation == Gtk.Orientation.Horizontal)
- DND.AddHFault (this, i, children[i - 1], children[i]);
- else
- DND.AddVFault (this, i, children[i - 1], children[i]);
- }
- }
-
- void toolbar_SizeAllocated (object obj, Gtk.SizeAllocatedArgs args)
- {
- Sync ();
- }
-
- // Insert widget at index, wrapping a ToolItem around it if needed
- void ToolItemize (Gtk.Widget widget, int index)
- {
- Gtk.ToolItem toolItem = widget as Gtk.ToolItem;
- if (toolItem == null) {
- toolItem = new Gtk.ToolItem ();
- toolItem.Show ();
- toolItem.Add (widget);
- }
- toolbar.Insert (toolItem, index);
- }
-
- // Remove widget (or its ToolItem parent), returning its position
- int ToolDeItemize (Gtk.Widget widget)
- {
- Gtk.ToolItem toolItem = widget as Gtk.ToolItem;
- if (toolItem == null) {
- toolItem = (Gtk.ToolItem)widget.Parent;
- toolItem.Remove (widget);
- }
-
- int index = toolbar.GetItemIndex (toolItem);
-
- toolbar.Remove (toolItem);
- if (toolItem != (widget as Gtk.ToolItem))
- toolItem.Destroy ();
-
- return index;
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- ToolItemize (newChild, ToolDeItemize (oldChild));
- }
-
- public override Placeholder AddPlaceholder ()
- {
- Placeholder ph = CreatePlaceholder ();
- ToolItemize (ph, 0);
- return ph;
- }
-
- int dragIndex;
-
- protected override Gtk.Widget CreateDragSource (Gtk.Widget dragWidget)
- {
- Gtk.Invisible invis = new Gtk.Invisible ();
- invis.Show ();
- invis.DragEnd += DragEnd;
-
- dragIndex = ToolDeItemize (dragWidget);
- return invis;
- }
-
- void DragEnd (object obj, Gtk.DragEndArgs args)
- {
- Gtk.Invisible invis = obj as Gtk.Invisible;
- invis.DragEnd -= DragEnd;
- invis.Destroy ();
-
- if (DND.DragWidget != null)
- ToolItemize (DND.Cancel (), dragIndex);
- dragIndex = -1;
- }
-
- public override void Drop (Gtk.Widget w, object faultId)
- {
- ToolItemize (w, (int)faultId);
- EmitContentsChanged ();
- Sync ();
- }
-
- public class ToolbarChild : Container.ContainerChild {
- public Gtk.ToolItem ToolItem {
- get {
- Gtk.Container.ContainerChild cc = (Gtk.Container.ContainerChild)Wrapped;
- return (Gtk.ToolItem)cc.Child;
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TreeView.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TreeView.cs
deleted file mode 100644
index 0444f4f4b13..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/TreeView.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-using System;
-
-namespace Stetic.Wrapper
-{
- public class TreeView: Container
- {
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- if (!initialized)
- ShowScrollbars = true;
- }
-
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScale.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScale.cs
deleted file mode 100644
index e0fb10677cc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScale.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class VScale : Scale {
-
- public static Gtk.VScale CreateInstance ()
- {
- return new Gtk.VScale (0.0, 100.0, 1.0);
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (), new CodePrimitiveExpression (null));
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScrollbar.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScrollbar.cs
deleted file mode 100644
index 8270c97a4e5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/VScrollbar.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.CodeDom;
-
-namespace Stetic.Wrapper {
-
- public class VScrollbar : Range {
-
- public static Gtk.VScrollbar CreateInstance ()
- {
- return new Gtk.VScrollbar (new Gtk.Adjustment (0.0, 0.0, 100.0, 1.0, 10.0, 10.0));
- }
-
- internal protected override CodeExpression GenerateObjectCreation (GeneratorContext ctx)
- {
- return new CodeObjectCreateExpression (ClassDescriptor.WrappedTypeName.ToGlobalTypeRef (), new CodePrimitiveExpression (null));
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Viewport.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Viewport.cs
deleted file mode 100644
index 41dbacc1611..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Viewport.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Viewport : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
- Unselectable = true;
- }
-
- protected override void ReplaceChild (Gtk.Widget oldChild, Gtk.Widget newChild)
- {
- Widget ww = Widget.Lookup (oldChild);
- if ((oldChild is Placeholder) && (ParentWrapper is ScrolledWindow) && newChild.SetScrollAdjustments (null, null)) {
- Widget wrapper = Widget.Lookup (newChild);
- wrapper.ShowScrollbars = false;
- ParentWrapper.ReplaceChild (Wrapped, newChild, false);
- } else if (ww != null && ww.ShowScrollbars && (ParentWrapper is ScrolledWindow) && ParentWrapper.ParentWrapper != null) {
- // The viewport is bound to the child widget. Remove it together with the child
- ParentWrapper.ParentWrapper.ReplaceChild (ParentWrapper.Wrapped, newChild, false);
- } else
- base.ReplaceChild (oldChild, newChild);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Widget.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Widget.cs
deleted file mode 100644
index 76c1b581cf8..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Widget.cs
+++ /dev/null
@@ -1,1098 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.CodeDom;
-using Stetic.Undo;
-
-namespace Stetic.Wrapper {
-
- public class Widget : Object, IEditableObject
- {
- static DiffGenerator propDiffGenerator;
-
- string oldName;
- string oldMemberName;
- bool hexpandable, vexpandable;
- bool generatePublic = true;
-
- bool window_visible = true;
- bool hasDefault;
- bool canDefault;
- Gdk.EventMask events;
- bool canFocus;
-
- ActionGroupCollection actionGroups;
- string member;
- string tooltip;
-
- bool requiresUndoStatusUpdate;
-
- // List of groups added to the UIManager
- ArrayList includedActionGroups;
-
- bool unselectable;
- bool boundToScrollWindow;
-
- public event EventHandler Destroyed;
-
- // Fired when the name of the widget changes.
- public event WidgetNameChangedHandler NameChanged;
- // Fired when the member name of the widget changes.
- public event WidgetNameChangedHandler MemberNameChanged;
-
- static Widget ()
- {
- propDiffGenerator = new DiffGenerator ();
- propDiffGenerator.CurrentStatusAdaptor = new XmlDiffAdaptor ();
- propDiffGenerator.NewStatusAdaptor = propDiffGenerator.CurrentStatusAdaptor;
- }
-
- public override void Wrap (object obj, bool initialized)
- {
- base.Wrap (obj, initialized);
-
- oldName = ((Gtk.Widget)obj).Name;
-
- if (!initialized) {
- events = Wrapped.Events;
- canFocus = Wrapped.CanFocus;
- }
-
- if (!(Wrapped is Gtk.Window))
- Wrapped.ShowAll ();
-
- Wrapped.PopupMenu += PopupMenu;
- Wrapped.FocusInEvent += OnFocusIn;
- InterceptClicks (Wrapped);
-
- hexpandable = this.ClassDescriptor.HExpandable;
- vexpandable = this.ClassDescriptor.VExpandable;
-
- if (ParentWrapper != null) {
- // Make sure the widget's name is not already being used.
- string nn = ParentWrapper.GetValidWidgetName (Wrapped);
- if (nn != Wrapped.Name)
- Wrapped.Name = nn;
- }
-
- Wrapped.Destroyed += OnDestroyed;
-
- if (Wrapped.Parent != null) {
- // The object was added to the parent before creating the wrapper.
- // Since it's now a wrapped object, the parent don't need to
- // intercept clicks for it anymore
- Widget w = GetInterceptorParent ();
- if (w != null)
- w.UninterceptClicks (Wrapped);
- }
- }
-
- void OnDestroyed (object on, EventArgs a)
- {
- if (Destroyed != null)
- Destroyed (this, a);
- Dispose ();
- }
-
- public override void Dispose ()
- {
- if (Wrapped == null)
- return;
-
- if (Project != null && Project.Selection == Wrapped)
- Project.Selection = null;
-
- Wrapped.Destroyed -= OnDestroyed;
- Wrapped.PopupMenu -= PopupMenu;
- Wrapped.FocusInEvent -= OnFocusIn;
- UninterceptClicks (Wrapped);
-
- if (actionGroups != null) {
- foreach (ActionGroup ag in actionGroups)
- ag.Dispose ();
- actionGroups = null;
- }
- base.Dispose ();
- }
-
- void OnFocusIn (object s, Gtk.FocusInEventArgs a)
- {
- if (!Unselectable)
- Select ();
- else if (ParentWrapper != null)
- ParentWrapper.Select ();
- }
-
- internal override UndoManager GetUndoManagerInternal ()
- {
- if (ParentWrapper != null)
- return ParentWrapper.UndoManager;
- else
- return base.GetUndoManagerInternal ();
- }
-
- public bool GeneratePublic {
- get { return generatePublic; }
- set { generatePublic = value; }
- }
-
- public bool Unselectable {
- get {
- return unselectable;
- }
- set {
- if (value == unselectable)
- return;
- unselectable = value;
- Widget w = GetInterceptorParent ();
- if (w != null) {
- // If a widget becomes unselectable, then the parent must intercept
- // their clicks.
- if (unselectable)
- w.InterceptClicks (Wrapped);
- else
- w.UninterceptClicks (Wrapped);
- }
- }
- }
-
- Widget GetInterceptorParent ()
- {
- Gtk.Widget wp = Wrapped.Parent;
- while (wp != null && Lookup (wp) == null)
- wp = wp.Parent;
- return Lookup (wp);
- }
-
- void InterceptClicks (Gtk.Widget widget)
- {
- if (widget is Stetic.Placeholder)
- return;
-
- if (!widget.IsRealized)
- widget.Events |= Gdk.EventMask.ButtonPressMask;
- widget.WidgetEvent += WidgetEvent;
-
- Gtk.Container container = widget as Gtk.Container;
- if (container != null) {
- container.Added += OnInterceptedChildAdded;
- container.Removed += OnInterceptedChildRemoved;
- foreach (Gtk.Widget child in container.AllChildren) {
- Widget w = Lookup (child);
- if (w == null || w.Unselectable)
- InterceptClicks (child);
- }
- }
- }
-
- [GLib.ConnectBefore]
- void OnInterceptedChildAdded (object o, Gtk.AddedArgs args)
- {
- Widget w = Lookup (args.Widget);
- if (w == null || w.Unselectable)
- InterceptClicks (args.Widget);
- }
-
- void OnInterceptedChildRemoved (object o, Gtk.RemovedArgs args)
- {
- UninterceptClicks (args.Widget);
- }
-
- void UninterceptClicks (Gtk.Widget widget)
- {
- widget.WidgetEvent -= WidgetEvent;
-
- Gtk.Container container = widget as Gtk.Container;
- if (container != null) {
- container.Added -= OnInterceptedChildAdded;
- container.Removed -= OnInterceptedChildRemoved;
- foreach (Gtk.Widget child in container.AllChildren) {
- if (Lookup (child) == null)
- UninterceptClicks (child);
- }
- }
- }
-
- public new Gtk.Widget Wrapped {
- get {
- return base.Wrapped as Gtk.Widget;
- }
- }
-
- public Stetic.Wrapper.Container ParentWrapper {
- get {
- return Container.LookupParent (Wrapped);
- }
- }
-
- public bool IsTopLevel {
- get { return Wrapped.Parent == null || Widget.Lookup (Wrapped.Parent) == null; }
- }
-
- public string UIManagerName {
- get {
- return actionGroups != null && actionGroups.Count > 0 ? "UIManager" : String.Empty;
- }
- }
-
- internal void InitializeName (string name)
- {
- oldName = name;
- Wrapped.Name = name;
- }
-
- public string Name {
- get { return Wrapped.Name; }
- set { Wrapped.Name = value; EmitNotify ("Name"); }
- }
-
- public string MemberName {
- get { return member != null ? member : ""; }
- set { member = value; EmitNotify ("MemberName"); }
- }
-
- public Container GetTopLevel ()
- {
- Widget c = this;
- while (!c.IsTopLevel)
- c = c.ParentWrapper;
- return c as Container;
- }
-
- public ActionGroupCollection LocalActionGroups {
- get {
- if (IsTopLevel) {
- if (actionGroups == null) {
- actionGroups = new ActionGroupCollection ();
- actionGroups.SetOwner (this);
- actionGroups.ActionGroupAdded += OnGroupAdded;
- actionGroups.ActionGroupRemoved += OnGroupRemoved;
- actionGroups.ActionGroupChanged += OnGroupChanged;
- }
- return actionGroups;
- } else {
- return ParentWrapper.LocalActionGroups;
- }
- }
- }
-
- void OnGroupAdded (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- args.ActionGroup.SignalAdded += OnSignalAdded;
- args.ActionGroup.SignalRemoved += OnSignalRemoved;
- args.ActionGroup.SignalChanged += OnSignalChanged;
- NotifyChanged ();
- }
-
- void OnGroupRemoved (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- args.ActionGroup.SignalAdded -= OnSignalAdded;
- args.ActionGroup.SignalRemoved -= OnSignalRemoved;
- args.ActionGroup.SignalChanged -= OnSignalChanged;
- NotifyChanged ();
- }
-
- void OnGroupChanged (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- NotifyChanged ();
- }
-
- void OnSignalAdded (object sender, SignalEventArgs args)
- {
- OnSignalAdded (args);
- }
-
- void OnSignalRemoved (object sender, SignalEventArgs args)
- {
- OnSignalRemoved (args);
- }
-
- void OnSignalChanged (object sender, SignalChangedEventArgs args)
- {
- OnSignalChanged (args);
- }
-
- [GLib.ConnectBefore]
- void WidgetEvent (object obj, Gtk.WidgetEventArgs args)
- {
- if (args.Event.Type == Gdk.EventType.ButtonPress)
- args.RetVal = HandleClick ((Gdk.EventButton)args.Event);
- }
-
- internal bool HandleClick (Gdk.EventButton evb)
- {
- int x = (int)evb.X, y = (int)evb.Y;
- int erx, ery, wrx, wry;
-
- // Translate from event window to widget window coords
- evb.Window.GetOrigin (out erx, out ery);
- Wrapped.GdkWindow.GetOrigin (out wrx, out wry);
- x += erx - wrx;
- y += ery - wry;
-
- Widget wrapper = FindWrapper (Wrapped, x, y);
- if (wrapper == null)
- return false;
-
- bool handled = false;
- if (wrapper.Wrapped != proj.Selection) {
- wrapper.Select ();
- handled = true;
- }
-
- if (Stetic.Editor.GtkWorkarounds.TriggersContextMenu (evb)) {
- proj.PopupContextMenu (wrapper);
- return true;
- }
-
- return handled;
- }
-
- Widget FindWrapper (Gtk.Widget top, int x, int y)
- {
- Widget wrapper;
-
- Gtk.Container container = top as Gtk.Container;
- if (container != null) {
- foreach (Gtk.Widget child in container.AllChildren) {
- if (!child.IsDrawable)
- continue;
-
- Gdk.Rectangle alloc = child.Allocation;
- if (alloc.Contains (x, y)) {
- if (child.GdkWindow == top.GdkWindow)
- wrapper = FindWrapper (child, x, y);
- else
- wrapper = FindWrapper (child, x - alloc.X, y - alloc.Y);
- if (wrapper != null)
- return wrapper;
- }
- }
- }
-
- wrapper = Lookup (top);
- if (wrapper == null || wrapper.Unselectable)
- return null;
- return wrapper;
- }
-
- void PopupMenu (object obj, EventArgs args)
- {
- proj.PopupContextMenu (this);
- }
-
- public void Select ()
- {
- proj.Selection = Wrapped;
- }
-
- public void Unselect ()
- {
- if (proj.Selection == Wrapped)
- proj.Selection = null;
- }
-
- internal protected virtual void OnSelected ()
- {
- }
-
- internal protected virtual void OnUnselected ()
- {
- }
-
- public void Delete ()
- {
- if (Project.Selection == Wrapped)
- Project.Selection = null;
-
- if (ParentWrapper != null)
- ParentWrapper.Delete (this);
- else
- Wrapped.Destroy ();
- }
-
- internal bool RequiresUndoStatusUpdate {
- get { return requiresUndoStatusUpdate; }
- set { requiresUndoStatusUpdate = value; }
- }
-
- public override ObjectWrapper FindObjectByUndoId (string id)
- {
- ObjectWrapper c = base.FindObjectByUndoId (id);
- if (c != null)
- return c;
-
- if (actionGroups != null)
- return actionGroups.FindObjectByUndoId (id);
- else
- return null;
- }
-
- public override object GetUndoDiff ()
- {
- XmlElement oldElem = UndoManager.GetObjectStatus (this);
- XmlElement newElem = WriteProperties (new ObjectWriter (oldElem.OwnerDocument, FileFormat.Native));
-
- ObjectDiff propsDiff = propDiffGenerator.GetDiff (newElem, oldElem);
- ObjectDiff actionsDiff = LocalActionGroups.GetDiff (Project, oldElem);
-
- UndoManager.UpdateObjectStatus (this, newElem);
-
- if (propsDiff == null && actionsDiff == null)
- return null;
- else
- return new ObjectDiff[] { propsDiff, actionsDiff };
- }
-
- public override object ApplyUndoRedoDiff (object diff)
- {
- ObjectDiff[] data = (ObjectDiff[]) diff;
-
- XmlElement status = UndoManager.GetObjectStatus (this);
- XmlElement oldElem = (XmlElement) status.CloneNode (true);
-
- ObjectDiff propsDiff = data [0];
-
- if (propsDiff != null) {
- propDiffGenerator.ApplyDiff (status, propsDiff);
- ReadProperties (new ObjectReader (Project, FileFormat.Native), status);
- data [0] = propDiffGenerator.GetDiff (status, oldElem);
- }
-
- ObjectDiff actionsDiff = data [1];
- if (actionsDiff != null) {
- LocalActionGroups.ApplyDiff (Project, actionsDiff);
- data [1] = LocalActionGroups.GetDiff (Project, oldElem);
- }
-
- return data;
- }
-
- public override void Read (ObjectReader reader, XmlElement elem)
- {
- ReadActionGroups (reader, elem);
- ReadProperties (reader, elem);
- }
-
- protected void ReadActionGroups (ObjectReader reader, XmlElement elem)
- {
- if (reader.Format == FileFormat.Native) {
- if (actionGroups == null) {
- actionGroups = new ActionGroupCollection ();
- actionGroups.SetOwner (this);
- actionGroups.ActionGroupAdded += OnGroupAdded;
- actionGroups.ActionGroupRemoved += OnGroupRemoved;
- actionGroups.ActionGroupChanged += OnGroupChanged;
- } else
- actionGroups.Clear ();
- foreach (XmlElement groupElem in elem.SelectNodes ("action-group")) {
- ActionGroup actionGroup = new ActionGroup ();
- actionGroup.Read (reader, groupElem);
- actionGroups.Add (actionGroup);
- }
- }
- }
-
- protected virtual void ReadProperties (ObjectReader reader, XmlElement elem)
- {
- if (Wrapped != null) {
- // There is already an instance. Load the default values.
- this.ClassDescriptor.ResetInstance (Wrapped);
- Signals.Clear ();
- }
-
- if (reader.Format == FileFormat.Native)
- WidgetUtils.Read (this, elem);
- else
- GladeUtils.ImportWidget (this, elem);
-
- string uid = elem.GetAttribute ("undoId");
- if (uid.Length > 0)
- UndoId = uid;
- oldName = Wrapped.Name;
- }
-
- public override XmlElement Write (ObjectWriter writer)
- {
- XmlElement elem = WriteProperties (writer);
- WriteActionGroups (writer, elem);
- return elem;
- }
-
- protected virtual XmlElement WriteProperties (ObjectWriter writer)
- {
- if (writer.Format == FileFormat.Native) {
- XmlElement elem = WidgetUtils.Write (this, writer.XmlDocument);
- if (writer.CreateUndoInfo)
- elem.SetAttribute ("undoId", UndoId);
- return elem;
- }
- else {
- XmlElement elem = GladeUtils.ExportWidget (this, writer.XmlDocument);
- GladeUtils.ExtractProperty (elem, "name", "");
- return elem;
- }
- }
-
- protected void WriteActionGroups (ObjectWriter writer, XmlElement elem)
- {
- if (writer.Format == FileFormat.Native) {
- if (actionGroups != null) {
- foreach (ActionGroup actionGroup in actionGroups)
- elem.InsertBefore (actionGroup.Write (writer), elem.FirstChild);
- }
- }
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- if (!String.IsNullOrEmpty (UIManagerName)) {
- // Create an UI manager
- CodeFieldReferenceExpression uixp = new CodeFieldReferenceExpression (new CodeThisReferenceExpression (), UIManagerName);
- CodeAssignStatement uim_init = new CodeAssignStatement (uixp, new CodeObjectCreateExpression (typeof (Gtk.UIManager).ToGlobalTypeRef ()));
- ctx.Statements.Add (uim_init);
-
- includedActionGroups = new ArrayList ();
-
- // Generate action group creation
- foreach (ActionGroup actionGroup in actionGroups) {
-
- // Create the action group
- string grpVar = ctx.NewId ();
- CodeVariableDeclarationStatement uidec = new CodeVariableDeclarationStatement (
- typeof (Gtk.ActionGroup).ToGlobalTypeRef (),
- grpVar,
- actionGroup.GenerateObjectCreation (ctx)
- );
- ctx.Statements.Add (uidec);
- actionGroup.GenerateBuildCode (ctx, new CodeVariableReferenceExpression (grpVar));
-
- // Insert the action group in the UIManager
- CodeMethodInvokeExpression mi = new CodeMethodInvokeExpression (
- uixp,
- "InsertActionGroup",
- new CodeVariableReferenceExpression (grpVar),
- new CodePrimitiveExpression (includedActionGroups.Count)
- );
- ctx.Statements.Add (mi);
-
- includedActionGroups.Add (actionGroup);
- }
-
- // Adds the accel group to the window
- Window w = GetTopLevel () as Window;
- if (w != null) {
- CodeMethodInvokeExpression ami = new CodeMethodInvokeExpression (
- ctx.WidgetMap.GetWidgetExp (w),
- "AddAccelGroup",
- new CodePropertyReferenceExpression (
- uixp,
- "AccelGroup"
- )
- );
- ctx.Statements.Add (ami);
- } else {
- // There is no top level window, this must be a custom widget.
- // The only option is to register the accel group when
- // the widget is realized. This is done by the Bin wrapper.
- }
- }
-
- if (tooltip != null && tooltip.Length > 0)
- GetTopLevel().GenerateTooltip (ctx, this);
-
- base.GenerateBuildCode (ctx, var);
- }
-
- internal protected override void GeneratePostBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- base.GeneratePostBuildCode (ctx, var);
-
- // The visible property is generated here to ensure that widgets are made visible
- // after they have been fully built
-
- PropertyDescriptor prop = ClassDescriptor ["Visible"] as PropertyDescriptor;
- if (prop != null && prop.PropertyType == typeof(bool) && !(bool) prop.GetValue (Wrapped)) {
- ctx.Statements.Add (
- new CodeMethodInvokeExpression (
- var,
- "Hide"
- )
- );
- }
-
- // The HasDefault property can only be assigned when the widget is added to the window
- prop = ClassDescriptor ["HasDefault"] as PropertyDescriptor;
- if (prop != null && (bool) prop.GetValue (Wrapped)) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- var,
- "HasDefault"
- ),
- new CodePrimitiveExpression (true)
- )
- );
- }
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- // Those properties are handled in GeneratePostBuildCode
- if (prop.Name == "Visible" || prop.Name == "HasDefault")
- return;
-
- // Don't generate a name for unselectable widgets
- if (prop.Name == "Name" && Unselectable)
- return;
-
- base.GeneratePropertySet (ctx, var, prop);
- }
-
- protected CodeExpression GenerateUiManagerElement (GeneratorContext ctx, ActionTree tree)
- {
- Widget topLevel = GetTopLevel ();
- string uiName = topLevel.UIManagerName;
- if (uiName != null) {
- CodeFieldReferenceExpression uiManager = new CodeFieldReferenceExpression (new CodeThisReferenceExpression (), uiName);
- if (topLevel.includedActionGroups == null)
- topLevel.includedActionGroups = new ArrayList ();
-
- // Add to the uimanager all action groups required by the
- // actions of the tree
-
- foreach (ActionGroup grp in tree.GetRequiredGroups ()) {
- if (!topLevel.includedActionGroups.Contains (grp)) {
- // Insert the action group in the UIManager
- CodeMethodInvokeExpression mi = new CodeMethodInvokeExpression (
- uiManager,
- "InsertActionGroup",
- ctx.GenerateValue (grp, typeof(ActionGroup)),
- new CodePrimitiveExpression (topLevel.includedActionGroups.Count)
- );
- ctx.Statements.Add (mi);
- topLevel.includedActionGroups.Add (grp);
- }
- }
-
- tree.GenerateBuildCode (ctx, uiManager);
- return new CodeMethodInvokeExpression (
- uiManager,
- "GetWidget",
- new CodePrimitiveExpression ("/" + Wrapped.Name)
- );
- }
- return null;
- }
-
- public static new Widget Lookup (GLib.Object obj)
- {
- return Stetic.ObjectWrapper.Lookup (obj) as Stetic.Wrapper.Widget;
- }
-
- PropertyDescriptor internalChildProperty;
- public PropertyDescriptor InternalChildProperty {
- get {
- return internalChildProperty;
- }
- set {
- internalChildProperty = value;
- }
- }
-
- public virtual void Drop (Gtk.Widget widget, object faultId)
- {
- widget.Destroy ();
- }
-
- public virtual bool HExpandable { get { return hexpandable; } }
- public virtual bool VExpandable { get { return vexpandable; } }
-
- public bool Visible {
- get {
- return window_visible;
- }
- set {
- window_visible = value;
- EmitNotify ("Visible");
- }
- }
-
- public bool HasDefault {
- get {
- return hasDefault;
- }
- set {
- hasDefault = value;
- EmitNotify ("HasDefault");
- if (hasDefault && !CanDefault)
- CanDefault = true;
- }
- }
-
- public bool CanDefault {
- get {
- return canDefault;
- }
- set {
- canDefault = value;
- EmitNotify ("CanDefault");
- if (!canDefault && HasDefault)
- HasDefault = false;
- }
- }
-
- public bool Sensitive {
- get {
- return Wrapped.Sensitive;
- }
- set {
- if (Wrapped.Sensitive == value)
- return;
-
- Wrapped.Sensitive = value;
- if (Wrapped.Sensitive)
- InsensitiveManager.Remove (this);
- else
- InsensitiveManager.Add (this);
- EmitNotify ("Sensitive");
- }
- }
-
- public Gdk.EventMask Events {
- get {
- return events;
- }
- set {
- events = value;
- EmitNotify ("Events");
- }
- }
-
- public bool CanFocus {
- get {
- return canFocus;
- }
- set {
- canFocus = value;
- EmitNotify ("CanFocus");
- }
- }
-
- public string Tooltip {
- get {
- return tooltip;
- }
- set {
- tooltip = value;
- }
- }
-
- public bool ShowScrollbars {
- get {
- return boundToScrollWindow;
- }
- set {
- if (boundToScrollWindow != value) {
- boundToScrollWindow = value;
- UpdateScrolledWindow ();
- EmitNotify ("ShowScrollbars");
- }
- }
- }
-
- internal void UpdateScrolledWindow ()
- {
- if (ParentWrapper == null)
- return;
- if (boundToScrollWindow) {
- if (!(Wrapped.Parent is Gtk.Viewport) && !(Wrapped.Parent is Gtk.ScrolledWindow)) {
- Gtk.ScrolledWindow scw = new Gtk.ScrolledWindow ();
- scw.HscrollbarPolicy = scw.VscrollbarPolicy = Gtk.PolicyType.Automatic;
- scw.ShadowType = Gtk.ShadowType.In;
- ScrolledWindow wrapper = (ScrolledWindow) ObjectWrapper.Create (Project, scw);
- ParentWrapper.ReplaceChild (Wrapped, scw, false);
- if (Wrapped.SetScrollAdjustments (null, null))
- scw.Add (Wrapped);
- else
- wrapper.AddWithViewport (Wrapped);
- Select ();
- }
- }
- else if (((Wrapped.Parent is Gtk.Viewport) || (Wrapped.Parent is Gtk.ScrolledWindow)) && ParentWrapper.ParentWrapper != null) {
- Gtk.Container parent = (Gtk.Container) Wrapped.Parent;
- parent.Remove (Wrapped);
- Container grandParent;
- if (parent is Gtk.Viewport) {
- parent = (Gtk.Container) parent.Parent;
- grandParent = Container.LookupParent (parent);
- }
- else
- grandParent = Container.LookupParent (parent);
- grandParent.ReplaceChild (parent, Wrapped, true);
- }
- }
-
- public bool InWindow {
- get {
- return this.GetTopLevel ().Wrapped is TopLevelWindow;
- }
- }
-
- public bool IsScrollable {
- get {
- return !IsTopLevel && !(Wrapped is Gtk.ScrolledWindow);
- }
- }
-
- public override string ToString ()
- {
- if (Wrapped == null)
- return base.ToString ();
- else if (Wrapped.Name != null)
- return "[" + Wrapped.GetType ().Name + " '" + Wrapped.Name + "' " + Wrapped.GetHashCode ().ToString () + "]";
- else
- return "[" + Wrapped.GetType ().Name + " " + Wrapped.GetHashCode ().ToString () + "]";
- }
-
- public IDesignArea GetDesignArea ()
- {
- return GetDesignArea (Wrapped);
- }
-
- protected IDesignArea GetDesignArea (Gtk.Widget w)
- {
- while (w != null && !(w is IDesignArea))
- w = w.Parent;
- return w as IDesignArea;
- }
-
- protected override void EmitNotify (string propertyName)
- {
- // Don't notify parent change for top level widgets.
- if (propertyName == "parent" || propertyName == "has-focus" ||
- propertyName == "has-toplevel-focus" || propertyName == "is-active" ||
- propertyName == "is-focus" || propertyName == "style" ||
- propertyName == "Visible" || propertyName == "scroll-offset")
- return;
-
- if (propertyName == "Name") {
- if (Wrapped.Name != oldName) {
- if (ParentWrapper != null) {
- string nn = ParentWrapper.GetValidWidgetName (Wrapped);
- if (nn != Wrapped.Name) {
- // The name was not valid, so it has to be changed again.
- // Don't fire the changed event now, will be fired after the following change
- Wrapped.Name = nn;
- return;
- }
- }
-
- // This fires the changed event
- base.EmitNotify (propertyName);
-
- string on = oldName;
- oldName = Wrapped.Name;
- if (!Loading)
- OnNameChanged (new WidgetNameChangedArgs (this, on, Wrapped.Name));
-
- // Keep the member name in sync with the widget name
- if (on == MemberName)
- MemberName = Wrapped.Name;
- }
- }
- else if (propertyName == "MemberName") {
- if (MemberName != oldMemberName) {
- base.EmitNotify (propertyName);
- string on = oldMemberName;
- oldMemberName = MemberName;
- if (!Loading)
- OnMemberNameChanged (new WidgetNameChangedArgs (this, on, MemberName));
- }
- }
- else {
-// Console.WriteLine ("PROP: " + propertyName);
- base.EmitNotify (propertyName);
- }
- }
-
- protected virtual void OnNameChanged (WidgetNameChangedArgs args)
- {
- if (Project != null)
- Project.NotifyNameChanged (args);
- if (NameChanged != null)
- NameChanged (this, args);
- }
-
- protected virtual void OnMemberNameChanged (WidgetNameChangedArgs args)
- {
- if (MemberNameChanged != null)
- MemberNameChanged (this, args);
- }
-
- bool IEditableObject.CanCopy {
- get { return ClipboardCanCopy; }
- }
-
- bool IEditableObject.CanCut {
- get { return ClipboardCanCut; }
- }
-
- bool IEditableObject.CanPaste {
- get { return ClipboardCanPaste; }
- }
-
- bool IEditableObject.CanDelete {
- get { return CanDelete; }
- }
-
- void IEditableObject.Copy ()
- {
- ClipboardCopy ();
- }
-
- void IEditableObject.Cut ()
- {
- ClipboardCut ();
- }
-
- void IEditableObject.Paste ()
- {
- ClipboardPaste ();
- }
-
- void IEditableObject.Delete ()
- {
- Delete ();
- }
-
- protected virtual bool ClipboardCanCopy {
- get { return !IsTopLevel; }
- }
-
- protected virtual bool ClipboardCanCut {
- get { return InternalChildProperty == null && !IsTopLevel; }
- }
-
- protected virtual bool ClipboardCanPaste {
- get { return false; }
- }
-
- protected virtual bool CanDelete {
- get { return ClipboardCanCut; }
- }
-
- protected virtual void ClipboardCopy ()
- {
- Clipboard.Copy (Wrapped);
- }
-
- protected virtual void ClipboardCut ()
- {
- Clipboard.Cut (Wrapped);
- }
-
- protected virtual void ClipboardPaste ()
- {
- }
- }
-
- internal static class InsensitiveManager {
-
- static Gtk.Invisible invis;
- static Hashtable map;
-
- static InsensitiveManager ()
- {
- map = new Hashtable ();
- invis = new Gtk.Invisible ();
- invis.ButtonPressEvent += ButtonPress;
- }
-
- static void ButtonPress (object obj, Gtk.ButtonPressEventArgs args)
- {
- Gtk.Widget widget = (Gtk.Widget)map[args.Event.Window];
- if (widget == null)
- return;
-
- Widget wrapper = Widget.Lookup (widget);
- args.RetVal = wrapper.HandleClick (args.Event);
- }
-
- public static void Add (Widget wrapper)
- {
- Gtk.Widget widget = wrapper.Wrapped;
-
- widget.SizeAllocated += Insensitive_SizeAllocate;
- widget.Realized += Insensitive_Realized;
- widget.Unrealized += Insensitive_Unrealized;
- widget.Mapped += Insensitive_Mapped;
- widget.Unmapped += Insensitive_Unmapped;
-
- if (widget.IsRealized)
- Insensitive_Realized (widget, EventArgs.Empty);
- if (widget.IsMapped)
- Insensitive_Mapped (widget, EventArgs.Empty);
- }
-
- public static void Remove (Widget wrapper)
- {
- Gtk.Widget widget = wrapper.Wrapped;
- Gdk.Window win = (Gdk.Window)map[widget];
- if (win != null) {
- map.Remove (widget);
- map.Remove (win);
- win.Destroy ();
- }
- widget.SizeAllocated -= Insensitive_SizeAllocate;
- widget.Realized -= Insensitive_Realized;
- widget.Unrealized -= Insensitive_Unrealized;
- widget.Mapped -= Insensitive_Mapped;
- widget.Unmapped -= Insensitive_Unmapped;
- }
-
- static void Insensitive_SizeAllocate (object obj, Gtk.SizeAllocatedArgs args)
- {
- Gdk.Window win = (Gdk.Window)map[obj];
- if (win != null)
- win.MoveResize (args.Allocation);
- }
-
- static void Insensitive_Realized (object obj, EventArgs args)
- {
- Gtk.Widget widget = (Gtk.Widget)obj;
-
- Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
- attributes.WindowType = Gdk.WindowType.Child;
- attributes.Wclass = Gdk.WindowClass.InputOnly;
- attributes.Mask = Gdk.EventMask.ButtonPressMask;
-
- Gdk.Window win = new Gdk.Window (widget.GdkWindow, attributes, 0);
- win.UserData = invis.Handle;
- win.MoveResize (widget.Allocation);
-
- map[widget] = win;
- map[win] = widget;
- }
-
- static void Insensitive_Mapped (object obj, EventArgs args)
- {
- Gdk.Window win = (Gdk.Window)map[obj];
- win.Show ();
- }
-
- static void Insensitive_Unmapped (object obj, EventArgs args)
- {
- Gdk.Window win = (Gdk.Window)map[obj];
- win.Hide ();
- }
-
- static void Insensitive_Unrealized (object obj, EventArgs args)
- {
- Gdk.Window win = (Gdk.Window)map[obj];
- win.Destroy ();
- map.Remove (obj);
- map.Remove (win);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetEventHandler.cs
deleted file mode 100644
index e6af45e1f64..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetEventHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace Stetic.Wrapper
-{
- public delegate void WidgetEventHandler (object sender, WidgetEventArgs args);
-
- public class WidgetEventArgs: EventArgs
- {
- Stetic.Wrapper.Widget wrapper;
- Gtk.Widget widget;
-
- public WidgetEventArgs (Gtk.Widget widget)
- {
- this.widget = widget;
- wrapper = Stetic.Wrapper.Widget.Lookup (widget);
- }
-
- public WidgetEventArgs (Stetic.Wrapper.Widget wrapper)
- {
- this.wrapper = wrapper;
- if (wrapper != null)
- this.widget = wrapper.Wrapped;
- }
-
- public Gtk.Widget Widget {
- get { return widget; }
- }
-
- public Widget WidgetWrapper {
- get { return wrapper; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetNameChangedHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetNameChangedHandler.cs
deleted file mode 100644
index 0d2df191149..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/WidgetNameChangedHandler.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-
-namespace Stetic.Wrapper
-{
- public delegate void WidgetNameChangedHandler (object sender, WidgetNameChangedArgs args);
-
- public class WidgetNameChangedArgs: WidgetEventArgs
- {
- string oldName;
- string newName;
-
- public WidgetNameChangedArgs (Stetic.Wrapper.Widget widget, string oldName, string newName): base (widget)
- {
- this.oldName = oldName;
- this.newName = newName;
- }
-
- public string OldName {
- get { return oldName; }
- }
-
- public string NewName {
- get { return newName; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Window.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Window.cs
deleted file mode 100644
index db3baddac2f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Window.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using GLib;
-using System;
-using System.CodeDom;
-using System.Collections;
-
-namespace Stetic.Wrapper {
-
- public class Window : Container {
-
- public override void Wrap (object obj, bool initialized)
- {
- TopLevelWindow window = (TopLevelWindow) obj;
-
- base.Wrap (obj, initialized);
-
- if (!initialized) {
- if (window.Child is Placeholder)
- window.Child.SetSizeRequest (200, 200);
- }
-
- window.DeleteEvent += DeleteEvent;
- }
-
- public static TopLevelWindow CreateInstance ( )
- {
- TopLevelWindow t = new TopLevelWindow ();
- return t;
- }
-
- public override void Dispose ( )
- {
- Wrapped.DeleteEvent -= DeleteEvent;
- base.Dispose ();
- }
-
- [ConnectBefore]
- void DeleteEvent (object obj, Gtk.DeleteEventArgs args)
- {
- Wrapped.Hide ();
- args.RetVal = true;
- }
-
- public override bool HExpandable { get { return true; } }
- public override bool VExpandable { get { return true; } }
-
- public bool Modal {
- get {
- return window.Modal;
- }
- set {
- window.Modal = value;
- EmitNotify ("Modal");
- }
- }
-
- public Gdk.WindowTypeHint TypeHint {
- get {
- return window.TypeHint;
- }
- set {
- window.TypeHint = value;
- EmitNotify ("TypeHint");
- }
- }
-
- Gtk.WindowType type;
- public Gtk.WindowType Type {
- get {
- return type;
- }
- set {
- type = value;
- EmitNotify ("Type");
- }
- }
-
- Gtk.WindowPosition windowPosition;
- public Gtk.WindowPosition WindowPosition {
- get {
- return windowPosition;
- }
- set {
- windowPosition = value;
- EmitNotify ("WindowPosition");
- }
- }
-
- ImageInfo icon;
- public ImageInfo Icon {
- get {
- return icon;
- }
- set {
- icon = value;
- EmitNotify ("Icon");
- }
- }
-
- TopLevelWindow window {
- get { return (TopLevelWindow) Wrapped; }
- }
-
- public string Title {
- get { return window.Title; }
- set { window.Title = value; EmitNotify ("Title"); }
- }
-
- public bool Resizable
- {
- get { return window.Resizable; }
- set { window.Resizable = value; EmitNotify ("Resizable"); }
- }
-
- bool allowGrow = true;
- public bool AllowGrow {
- get { return allowGrow; }
- set { allowGrow = value; EmitNotify ("AllowGrow"); }
- }
-
- bool allowShrink = false;
- public bool AllowShrink {
- get { return allowShrink; }
- set { allowShrink = value; EmitNotify ("AllowShrink"); }
- }
-
- int defaultWidth = -1;
- public int DefaultWidth {
- get { return defaultWidth; }
- set { defaultWidth = value; EmitNotify ("DefaultWidth"); }
- }
-
- int defaultHeight = -1;
- public int DefaultHeight {
- get { return defaultHeight; }
- set { defaultHeight = value; EmitNotify ("DefaultHeight"); }
- }
-
- bool acceptFocus = true;
- public bool AcceptFocus {
- get { return acceptFocus; }
- set { acceptFocus = value; EmitNotify ("AcceptFocus"); }
- }
-
- bool decorated = true;
- public bool Decorated {
- get { return decorated; }
- set { decorated = value; EmitNotify ("Decorated"); }
- }
-
- bool destroyWithParent;
- public bool DestroyWithParent {
- get { return destroyWithParent; }
- set { destroyWithParent = value; EmitNotify ("DestroyWithParent"); }
- }
-
- Gdk.Gravity gravity = Gdk.Gravity.NorthWest;
- public Gdk.Gravity Gravity {
- get { return gravity; }
- set { gravity = value; EmitNotify ("Gravity"); }
- }
-
- string role;
- public string Role {
- get { return role; }
- set { role = value; EmitNotify ("Role"); }
- }
-
- bool skipPagerHint;
- public bool SkipPagerHint {
- get { return skipPagerHint; }
- set { skipPagerHint = value; EmitNotify ("SkipPagerHint"); }
- }
-
- bool skipTaskbarHint;
- public bool SkipTaskbarHint {
- get { return skipTaskbarHint; }
- set { skipTaskbarHint = value; EmitNotify ("SkipTaskbarHint"); }
- }
-
- bool focusOnMap = true;
- public bool FocusOnMap {
- get { return focusOnMap; }
- set { focusOnMap = value; EmitNotify ("FocusOnMap"); }
- }
-
- internal protected override void GenerateBuildCode (GeneratorContext ctx, CodeExpression var)
- {
- base.GenerateBuildCode (ctx, var);
-
- if (DefaultWidth == -1) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- var,
- "DefaultWidth"
- ),
- new CodePrimitiveExpression (DesignWidth)
- )
- );
- }
-
- if (DefaultHeight == -1) {
- ctx.Statements.Add (
- new CodeAssignStatement (
- new CodePropertyReferenceExpression (
- var,
- "DefaultHeight"
- ),
- new CodePrimitiveExpression (DesignHeight)
- )
- );
- }
- }
-
- protected override void GeneratePropertySet (GeneratorContext ctx, CodeExpression var, PropertyDescriptor prop)
- {
- if (prop.Name != "Type")
- base.GeneratePropertySet (ctx, var, prop);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/objects.xml b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/objects.xml
deleted file mode 100644
index ea3407f81d9..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/objects.xml
+++ /dev/null
@@ -1,2292 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/COPIED b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/COPIED
deleted file mode 100644
index d693b81e9a5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/COPIED
+++ /dev/null
@@ -1 +0,0 @@
-These were stolen from glade3 and are GPLed.
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/accellabel.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/accellabel.png
deleted file mode 100644
index 6ba42ba2202..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/accellabel.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/actiongroup.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/actiongroup.png
deleted file mode 100644
index de43e0a5c44..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/actiongroup.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-check-label.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-check-label.png
deleted file mode 100644
index cf3ad0c7d9f..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-check-label.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-menu.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-menu.png
deleted file mode 100644
index 19a98613c22..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/add-menu.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/alignment.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/alignment.png
deleted file mode 100644
index 5d7d311d960..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/alignment.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/arrow.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/arrow.png
deleted file mode 100644
index c9153b6f678..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/arrow.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-expand.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-expand.png
deleted file mode 100644
index 956903992b2..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-expand.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-fill.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-fill.png
deleted file mode 100644
index b0d67b54d7a..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/box-fill.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/button.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/button.png
deleted file mode 100644
index db816c21dca..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/button.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/calendar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/calendar.png
deleted file mode 100644
index c3cdf73ce89..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/calendar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-h.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-h.png
deleted file mode 100644
index 539a6f71b5c..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-h.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-v.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-v.png
deleted file mode 100644
index 658e63d82c8..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-expand-v.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-h.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-h.png
deleted file mode 100644
index 30162bf7ea4..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-h.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-v.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-v.png
deleted file mode 100644
index 95a9c1ab320..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/cell-fill-v.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/checkbutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/checkbutton.png
deleted file mode 100644
index 71565b0b1f7..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/checkbutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorbutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorbutton.png
deleted file mode 100644
index 281288d7cc5..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorbutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselection.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselection.png
deleted file mode 100644
index 281288d7cc5..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselection.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselectiondialog.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselectiondialog.png
deleted file mode 100644
index 281288d7cc5..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/colorselectiondialog.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/combo.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/combo.png
deleted file mode 100644
index dab25d3c025..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/combo.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/comboentry.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/comboentry.png
deleted file mode 100644
index 13e02c820ba..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/comboentry.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/custom.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/custom.png
deleted file mode 100644
index df619249819..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/custom.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dec-border.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dec-border.png
deleted file mode 100644
index c5e5ae5b9e9..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dec-border.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dialog.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dialog.png
deleted file mode 100644
index 6e81b2fd601..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/dialog.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/drawingarea.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/drawingarea.png
deleted file mode 100644
index ee65bba5983..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/drawingarea.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/entry.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/entry.png
deleted file mode 100644
index d97bb9f3789..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/entry.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/eventbox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/eventbox.png
deleted file mode 100644
index c89d4903751..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/eventbox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/expander.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/expander.png
deleted file mode 100644
index 35d1c41d8b6..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/expander.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fileselection.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fileselection.png
deleted file mode 100644
index 03bda09484c..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fileselection.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fixed.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fixed.png
deleted file mode 100644
index e6d5ece810e..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fixed.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontbutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontbutton.png
deleted file mode 100644
index fe7a790ad49..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontbutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselection.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselection.png
deleted file mode 100644
index fe7a790ad49..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselection.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselectiondialog.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselectiondialog.png
deleted file mode 100644
index 6936c47c05f..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/fontselectiondialog.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/frame.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/frame.png
deleted file mode 100644
index 8a4c1f3a0e6..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/frame.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe-not.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe-not.png
deleted file mode 100644
index 3b1e292737e..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe-not.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe.png
deleted file mode 100644
index 2f25501e496..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/globe.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/handlebox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/handlebox.png
deleted file mode 100644
index be064c6f519..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/handlebox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbox.png
deleted file mode 100644
index 6971a3322b4..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbuttonbox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbuttonbox.png
deleted file mode 100644
index e38a4c5eed1..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hbuttonbox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hpaned.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hpaned.png
deleted file mode 100644
index e2847abd096..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hpaned.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscale.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscale.png
deleted file mode 100644
index 310e01cde24..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscale.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscrollbar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscrollbar.png
deleted file mode 100644
index 717b656220a..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hscrollbar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hseparator.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hseparator.png
deleted file mode 100644
index b32843abecf..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/hseparator.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/iconview.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/iconview.png
deleted file mode 100644
index b875d3741b9..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/iconview.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/image.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/image.png
deleted file mode 100644
index 7f790e56b37..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/image.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/inc-border.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/inc-border.png
deleted file mode 100644
index 7f457c3f038..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/inc-border.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/label.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/label.png
deleted file mode 100644
index 9299f0fe243..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/label.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menu.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menu.png
deleted file mode 100644
index bcfdc9dd507..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menu.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menubar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menubar.png
deleted file mode 100644
index 14298a1b228..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/menubar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/messagedialog.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/messagedialog.png
deleted file mode 100644
index a5330e29182..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/messagedialog.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/missing.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/missing.png
deleted file mode 100644
index 589da692bbe..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/missing.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/notebook.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/notebook.png
deleted file mode 100644
index 7d8f7067f4a..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/notebook.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/optionmenu.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/optionmenu.png
deleted file mode 100644
index d682108ad8d..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/optionmenu.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/progressbar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/progressbar.png
deleted file mode 100644
index f48b47c4855..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/progressbar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/radiobutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/radiobutton.png
deleted file mode 100644
index c85d9492ad8..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/radiobutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-check-label.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-check-label.png
deleted file mode 100644
index 25136e6df97..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-check-label.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-menu.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-menu.png
deleted file mode 100644
index 4777667d681..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/remove-menu.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/scrolledwindow.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/scrolledwindow.png
deleted file mode 100644
index 10323740f93..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/scrolledwindow.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/spinbutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/spinbutton.png
deleted file mode 100644
index 9e98bb0ca3c..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/spinbutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/statusbar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/statusbar.png
deleted file mode 100644
index 26d8c2f7f83..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/statusbar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/table.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/table.png
deleted file mode 100644
index dc5886c9eac..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/table.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/textview.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/textview.png
deleted file mode 100644
index 642be08441f..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/textview.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/togglebutton.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/togglebutton.png
deleted file mode 100644
index 62c13fad6ed..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/togglebutton.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/toolbar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/toolbar.png
deleted file mode 100644
index 27b486a0fa4..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/toolbar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/treeview.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/treeview.png
deleted file mode 100644
index f6fd7d9d4ea..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/treeview.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbox.png
deleted file mode 100644
index fce6eb11e15..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbuttonbox.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbuttonbox.png
deleted file mode 100644
index 68defd767e9..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vbuttonbox.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/viewport.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/viewport.png
deleted file mode 100644
index deccf531cb6..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/viewport.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vpaned.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vpaned.png
deleted file mode 100644
index 60628f46ef0..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vpaned.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscale.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscale.png
deleted file mode 100644
index dbdc71e8ab3..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscale.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscrollbar.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscrollbar.png
deleted file mode 100644
index 09f8008ab13..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vscrollbar.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vseparator.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vseparator.png
deleted file mode 100644
index 6904fc22203..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/vseparator.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/widget.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/widget.png
deleted file mode 100644
index 7f5844bbfc1..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/widget.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/window.png b/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/window.png
deleted file mode 100644
index 8f82250f04f..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/pixmaps/window.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionComponent.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionComponent.cs
deleted file mode 100644
index d5db89c4af7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionComponent.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public class ActionComponent: Component
- {
- Gdk.Pixbuf icon;
- string label;
-
- internal static Gdk.Pixbuf DefaultActionIcon;
-
- static ActionComponent ()
- {
- try {
- DefaultActionIcon = Gdk.Pixbuf.LoadFromResource ("action.png");
- } catch (Exception e) {
- Console.WriteLine ("Error while loading pixbuf 'action.png': " + e);
- }
- }
-
- public ActionComponent (Application owner, object backend, string name): base (owner, backend, name, owner.GetComponentType ("Gtk.Action"))
- {
- }
-
- public override string Name {
- get {
- if (name == null)
- name = ((Wrapper.Action)backend).Name;
- return name;
- }
- set {
- name = value;
- ((Wrapper.Action)backend).Name = value;
- }
- }
-
- public string Label {
- get {
- if (label == null)
- label = ((Wrapper.Action)backend).Label;
- return label;
- }
- set {
- label = value;
- ((Wrapper.Action)backend).Label = value;
- }
- }
-
- protected override void OnChanged ()
- {
- name = null;
- icon = null;
- label = null;
- base.OnChanged ();
- }
-
- public Gdk.Pixbuf Icon {
- get {
- if (icon == null) {
- byte[] data = app.Backend.GetActionIcon ((Wrapper.Action)backend);
- if (data == null)
- return DefaultActionIcon;
- else
- icon = new Gdk.Pixbuf (data);
- }
- return icon;
- }
- }
-
- public ActionGroupComponent ActionGroup {
- get { return (ActionGroupComponent) app.GetComponent (((Wrapper.Action)backend).ActionGroup, null, null); }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupComponent.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupComponent.cs
deleted file mode 100644
index 1b2a871d268..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupComponent.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-
-namespace Stetic
-{
- [Serializable]
- public class ActionGroupComponent: Component
- {
- public ActionGroupComponent (Application app, object backend, string name): base (app, backend, name, app.GetComponentType ("Gtk.ActionGroup"))
- {
- }
-
- public override string Name {
- get {
- if (name == null)
- name = ((Wrapper.ActionGroup)backend).Name;
- return name;
- }
- set {
- name = value;
- ((Wrapper.ActionGroup)backend).Name = value;
- }
- }
-
- public override bool GeneratePublic {
- get { return ((Wrapper.ActionGroup)backend).GeneratePublic; }
- set { ((Wrapper.ActionGroup)backend).GeneratePublic = value; }
- }
-
- protected override void OnChanged ()
- {
- name = null;
- base.OnChanged ();
- }
-
- public ActionComponent[] GetActions ()
- {
- Wrapper.ActionCollection acts = ((Wrapper.ActionGroup)backend).Actions;
-
- ArrayList comps = new ArrayList (acts.Count);
-
- for (int n=0; n { if (!disposed) designer.NotifyBindField (); }
- );
- }
-
- public void NotifyModified ()
- {
- Gtk.Application.Invoke (
- (o, args) => { if (!disposed) designer.NotifyModified (); }
- );
- }
-
- public void NotifySignalAdded (Wrapper.Action action, string name, Signal signal)
- {
- Gtk.Application.Invoke (
- (o, args) => { if (!disposed) designer.NotifySignalAdded (action, name, signal); }
- );
- }
-
- public void NotifySignalChanged (Wrapper.Action action, string name, Signal oldSignal, Signal signal)
- {
- Gtk.Application.Invoke (
- (o, args) => { if (!disposed) designer.NotifySignalChanged (action, name, oldSignal, signal); }
- );
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupDesignerBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupDesignerBackend.cs
deleted file mode 100644
index f5e562e12ab..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupDesignerBackend.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- internal class ActionGroupDesignerBackend: Gtk.VBox
- {
- Editor.ActionGroupEditor editor;
- ActionGroupToolbar toolbar;
- WidgetDesignerBackend groupDesign;
-
- internal ActionGroupDesignerBackend (WidgetDesignerBackend groupDesign, Editor.ActionGroupEditor editor, ActionGroupToolbar toolbar)
- {
- this.editor = editor;
- this.toolbar = toolbar;
- this.groupDesign = groupDesign;
-
- BorderWidth = 3;
- PackStart (toolbar, false, false, 0);
- PackStart (groupDesign, true, true, 3);
- }
-
- public Editor.ActionGroupEditor Editor {
- get { return editor; }
- }
-
- public ActionGroupToolbar Toolbar {
- get { return toolbar; }
- }
-
- public void UpdateObjectViewers ()
- {
- groupDesign.UpdateObjectViewers ();
- }
-
- public override void Dispose ()
- {
- this.editor = null;
- this.toolbar = null;
- this.groupDesign = null;
- base.Dispose ();
- }
-
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupEditSession.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupEditSession.cs
deleted file mode 100644
index a3339120100..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupEditSession.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-
-namespace Stetic
-{
- internal class ActionGroupEditSession: MarshalByRefObject, IDisposable
- {
- ActionGroupDesignerBackend designer;
- Gtk.Plug plug;
- ActionGroupDesignerFrontend frontend;
- bool autoCommitChanges;
- string groupToEdit;
- string containerName;
- ProjectBackend project;
- bool modified;
- bool allowActionBinding;
- bool designerRequested;
- ActionGroupToolbar groupToolbar;
-
- Stetic.Wrapper.ActionGroup groupCopy;
- Stetic.Wrapper.ActionGroup group;
- Hashtable actionCopyMap = new Hashtable ();
-
- UndoRedoManager undoManager;
- UndoQueue undoQueue;
-
- public ActionGroupEditSession (ActionGroupDesignerFrontend frontend, ProjectBackend project, string containerName, string groupToEdit, bool autoCommitChanges)
- {
- this.groupToEdit = groupToEdit;
- this.containerName = containerName;
- this.frontend = frontend;
- this.project = project;
- this.autoCommitChanges = autoCommitChanges;
-
- if (groupToEdit != null) {
- group = project.ActionGroups [groupToEdit];
- if (group == null)
- throw new InvalidOperationException ("Unknown action group: " + groupToEdit);
- Load (group);
- undoManager = new UndoRedoManager ();
- undoQueue = new UndoQueue ();
- undoManager.UndoQueue = undoQueue;
- undoManager.RootObject = groupCopy;
-
- groupToolbar = new ActionGroupToolbar (frontend, groupCopy);
- }
- else {
- if (!autoCommitChanges)
- throw new System.NotSupportedException ();
-
- Stetic.Wrapper.Container container = project.GetTopLevelWrapper (containerName, true);
- groupToolbar = new ActionGroupToolbar (frontend, container.LocalActionGroups);
- }
-
- // Don't delay the creation of the designer because when used in combination with the
- // widget designer, change events are subscribed since the begining
-
- designer = UserInterface.CreateActionGroupDesigner (project, groupToolbar);
- designer.Editor.GroupModified += OnModified;
- designer.Toolbar.AllowActionBinding = allowActionBinding;
- designer.Destroyed += delegate { designer = null; Dispose (); };
- }
-
- public Wrapper.ActionGroup EditedActionGroup {
- get { return groupCopy; }
- }
-
- void Load (Stetic.Wrapper.ActionGroup group)
- {
- if (autoCommitChanges) {
- groupCopy = group;
- }
- else {
- actionCopyMap.Clear ();
-
- groupCopy = new Stetic.Wrapper.ActionGroup ();
- groupCopy.Name = group.Name;
-
- foreach (Stetic.Wrapper.Action action in group.Actions) {
- Stetic.Wrapper.Action dupaction = action.Clone ();
- groupCopy.Actions.Add (dupaction);
- actionCopyMap [dupaction] = action;
- }
- groupCopy.SignalAdded += new Stetic.SignalEventHandler (OnSignalAdded);
- groupCopy.SignalChanged += new Stetic.SignalChangedEventHandler (OnSignalChanged);
- }
- }
-
- public void Save ()
- {
- if (autoCommitChanges)
- return;
-
- if (group.Name != groupCopy.Name)
- group.Name = groupCopy.Name;
-
- foreach (Stetic.Wrapper.Action actionCopy in groupCopy.Actions) {
- Stetic.Wrapper.Action action = (Stetic.Wrapper.Action) actionCopyMap [actionCopy];
- if (action != null)
- action.CopyFrom (actionCopy);
- else {
- action = actionCopy.Clone ();
- actionCopyMap [actionCopy] = action;
- group.Actions.Add (action);
- }
- }
-
- ArrayList todelete = new ArrayList ();
- foreach (Stetic.Wrapper.Action actionCopy in actionCopyMap.Keys) {
- if (!groupCopy.Actions.Contains (actionCopy))
- todelete.Add (actionCopy);
- }
-
- foreach (Stetic.Wrapper.Action actionCopy in todelete) {
- Stetic.Wrapper.Action action = (Stetic.Wrapper.Action) actionCopyMap [actionCopy];
- group.Actions.Remove (action);
- actionCopyMap.Remove (actionCopy);
- }
- Modified = false;
- }
-
- public UndoQueue UndoQueue {
- get {
- if (undoQueue != null)
- return undoQueue;
- else
- return UndoQueue.Empty;
- }
- }
-
- public void CopySelection ()
- {
- if (designer != null)
- designer.Editor.Copy ();
- }
-
- public void CutSelection ()
- {
- if (designer != null)
- designer.Editor.Cut ();
- }
-
- public void PasteToSelection ()
- {
- if (designer != null)
- designer.Editor.Paste ();
- }
-
- public void DeleteSelection ()
- {
- if (designer != null)
- designer.Editor.Delete ();
- }
-
- void OnProjectReloaded (object s, EventArgs a)
- {
- // Called when the underlying project has changed. Object references need to be updated.
- if (autoCommitChanges) {
- if (designer != null) {
- if (groupToEdit != null) {
- groupToolbar.ActiveGroup = project.ActionGroups [groupToEdit];
- } else {
- Stetic.Wrapper.Container container = project.GetTopLevelWrapper (containerName, true);
- groupToolbar.ActionGroups = container.LocalActionGroups;
- }
- }
- } else {
- // We only need to remap the actions
- group = project.ActionGroups [groupToEdit];
- actionCopyMap.Clear ();
- foreach (Wrapper.Action dupac in groupCopy.Actions) {
- Wrapper.Action ac = group.GetAction (dupac.Name);
- if (ac != null)
- actionCopyMap [dupac] = ac;
- }
- }
- }
-
- void OnModified (object ob, EventArgs args)
- {
- modified = true;
- frontend.NotifyModified ();
- }
-
- public bool HasData {
- get {
- if (groupToEdit != null)
- return true;
- Stetic.Wrapper.Container container = project.GetTopLevelWrapper (containerName, true);
- return container.LocalActionGroups.Count > 0;
- }
- }
-
- public bool Modified {
- get { return modified; }
- set { modified = value; frontend.NotifyModified (); }
- }
-
- public string ActiveGroup {
- get {
- if (designer != null) {
- Wrapper.ActionGroup grp = designer.Toolbar.ActiveGroup;
- if (grp != null)
- return grp.Name;
- }
- return null;
- }
- set {
- if (value != null || designer != null) {
- // No need to create the designer if the active group is being set to null.
- Wrapper.ActionGroup grp = Backend.Toolbar.ActionGroups [value];
- Backend.Toolbar.ActiveGroup = grp;
- }
- }
- }
-
- public void SetSelectedAction (Wrapper.Action action)
- {
- // No need to create the designer if the active action is being set to null.
- if (action != null || designer != null)
- Backend.Editor.SelectedAction = action;
- }
-
- public void GetSelectedAction (out Wrapper.Action action, out string name)
- {
- if (designer != null) {
- action = designer.Editor.SelectedAction;
- if (action != null)
- name = action.Name;
- else
- name = null;
- } else {
- action = null;
- name = null;
- }
- }
-
- public ActionGroupDesignerBackend Backend {
- get {
- designerRequested = true;
- return designer;
- }
- }
-
- [NoGuiDispatch]
- public void CreateBackendWidgetPlug (uint socketId)
- {
- Gdk.Threads.Enter ();
- plug = new Gtk.Plug (socketId);
- plug.Add (Backend);
- plug.Decorated = false;
- plug.ShowAll ();
- Gdk.Threads.Leave ();
- }
-
- public void DestroyBackendWidgetPlug ()
- {
- if (designer != null) {
- Gtk.Plug plug = (Gtk.Plug) designer.Parent;
- plug.Remove (designer);
- plug.Destroy ();
- }
- }
-
- public bool AllowActionBinding {
- get {
- return allowActionBinding;
- }
- set {
- allowActionBinding = value;
- if (designer != null)
- designer.Toolbar.AllowActionBinding = value;
- }
- }
-
- public void Dispose ()
- {
- if (designer != null) {
- designer.Editor.GroupModified -= OnModified;
- if (!designerRequested)
- designer.Destroy ();
- }
-
- project.ProjectReloaded -= OnProjectReloaded;
-
- if (plug != null) {
- plug.Destroy ();
- plug = null;
- }
-
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
-
- public object[] SaveState ()
- {
- if (autoCommitChanges)
- return null;
-
- XmlDocument doc = new XmlDocument ();
- doc.AppendChild (groupCopy.Write (new ObjectWriter (doc, FileFormat.Native)));
-
- Hashtable nameMap = new Hashtable ();
- foreach (DictionaryEntry e in actionCopyMap)
- nameMap [((Wrapper.Action)e.Key).Name] = ((Wrapper.Action)e.Value).Name;
-
- return new object[] { groupCopy.Name, nameMap, doc.OuterXml };
- }
-
- public void RestoreState (object[] data)
- {
- if (data == null)
- return;
-
- groupCopy = new Stetic.Wrapper.ActionGroup ();
- groupCopy.Name = (string) data [0];
-
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml ((string) data [2]);
-
- // Create the map which links edited action with source actions
- actionCopyMap.Clear ();
- foreach (DictionaryEntry e in (Hashtable) data [1]) {
- Wrapper.Action dupaction = groupCopy.GetAction ((string)e.Key);
- Wrapper.Action action = group.GetAction ((string)e.Value);
- actionCopyMap [dupaction] = action;
- }
-
- groupCopy.SignalAdded += new Stetic.SignalEventHandler (OnSignalAdded);
- groupCopy.SignalChanged += new Stetic.SignalChangedEventHandler (OnSignalChanged);
- }
-
- void OnSignalAdded (object s, Stetic.SignalEventArgs a)
- {
- Wrapper.Action action = (Wrapper.Action) a.Wrapper;
- frontend.NotifySignalAdded (action, action.Name, a.Signal);
- }
-
- void OnSignalChanged (object s, Stetic.SignalChangedEventArgs a)
- {
- Wrapper.Action action = (Wrapper.Action) a.Wrapper;
- frontend.NotifySignalChanged (action, action.Name, a.OldSignal, a.Signal);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupToolbar.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupToolbar.cs
deleted file mode 100644
index c41601509ca..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ActionGroupToolbar.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-
-using System;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic
-{
- internal class ActionGroupToolbar: Gtk.Toolbar
- {
- Wrapper.ActionGroupCollection actionGroups;
- Gtk.ComboBox combo;
- bool updating;
- ActionGroup currentGroup;
- ArrayList internalButtons = new ArrayList ();
- bool singleGroupMode;
- bool allowBinding;
- ActionGroupDesignerFrontend frontend;
- Editor.ActionGroupEditor agroupEditor;
- Gtk.ToolButton addButton;
- Gtk.ToolButton removeButton;
-
- public event ActionGroupEventHandler ActiveGroupChanged;
- public event ActionGroupEventHandler ActiveGroupCreated;
-
- public ActionGroupToolbar (ActionGroupDesignerFrontend frontend, bool singleGroupMode)
- {
- Initialize (frontend, null, singleGroupMode);
- }
-
- public ActionGroupToolbar (ActionGroupDesignerFrontend frontend, Wrapper.ActionGroup actionGroup)
- {
- currentGroup = actionGroup;
- Initialize (frontend, null, true);
- }
-
- public ActionGroupToolbar (ActionGroupDesignerFrontend frontend, Wrapper.ActionGroupCollection actionGroups)
- {
- Initialize (frontend, actionGroups, false);
- }
-
- public bool AllowActionBinding {
- get { return allowBinding; }
- set { allowBinding = value; }
- }
-
- void Initialize (ActionGroupDesignerFrontend frontend, Wrapper.ActionGroupCollection actionGroups, bool singleGroupMode)
- {
- this.frontend = frontend;
- this.singleGroupMode = singleGroupMode;
- IconSize = Gtk.IconSize.SmallToolbar;
- Orientation = Gtk.Orientation.Horizontal;
- ToolbarStyle = Gtk.ToolbarStyle.BothHoriz;
-
- combo = Gtk.ComboBox.NewText ();
-
- if (!singleGroupMode) {
- combo.Changed += OnActiveChanged;
-
- Gtk.ToolItem comboItem = new Gtk.ToolItem ();
- Gtk.HBox cbox = new Gtk.HBox ();
- cbox.PackStart (new Gtk.Label (Catalog.GetString ("Action Group:") + " "), false, false, 3);
- cbox.PackStart (combo, true, true, 3);
- comboItem.Add (cbox);
- comboItem.ShowAll ();
- Insert (comboItem, -1);
- internalButtons.Add (comboItem);
-
- addButton = new Gtk.ToolButton (Gtk.Stock.Add);
- addButton.Clicked += OnAddGroup;
- Insert (addButton, -1);
- internalButtons.Add (addButton);
-
- removeButton = new Gtk.ToolButton (Gtk.Stock.Remove);
- removeButton.Clicked += OnRemoveGroup;
- Insert (removeButton, -1);
- internalButtons.Add (removeButton);
-
- ActionGroups = actionGroups;
-
- if (actionGroups != null && actionGroups.Count > 0)
- combo.Active = 0;
- } else {
- UpdateActionCommands (null);
- }
-
- ShowAll ();
- }
-
- public override void Dispose ()
- {
- if (combo == null)
- return;
-
- combo.Changed -= OnActiveChanged;
- combo = null;
- if (addButton != null) {
- addButton.Clicked -= OnAddGroup;
- removeButton.Clicked -= OnRemoveGroup;
- }
-
- if (agroupEditor != null) {
- agroupEditor.SelectionChanged -= OnEditorSelectionChanged;
- agroupEditor = null;
- }
-
- if (!singleGroupMode)
- ActionGroups = null;
- base.Dispose ();
- }
-
- public Wrapper.ActionGroupCollection ActionGroups {
- get { return actionGroups; }
- set {
- if (singleGroupMode)
- throw new InvalidOperationException ("ActionGroups can't be set in single group mode");
-
- if (actionGroups != null) {
- actionGroups.ActionGroupAdded -= OnCollectionChanged;
- actionGroups.ActionGroupRemoved -= OnCollectionChanged;
- actionGroups.ActionGroupChanged -= OnCollectionChanged;
- }
-
- this.actionGroups = value;
-
- if (actionGroups != null) {
- actionGroups.ActionGroupAdded += OnCollectionChanged;
- actionGroups.ActionGroupRemoved += OnCollectionChanged;
- actionGroups.ActionGroupChanged += OnCollectionChanged;
- }
- Refresh ();
- }
- }
-
- public void Bind (Editor.ActionGroupEditor agroupEditor)
- {
- this.agroupEditor = agroupEditor;
- agroupEditor.SelectionChanged += OnEditorSelectionChanged;
- agroupEditor.ActionGroup = ActiveGroup;
- }
-
- public void OnEditorSelectionChanged (object s, EventArgs a)
- {
- UpdateActionCommands (agroupEditor.SelectedAction);
- }
-
- public ActionGroup ActiveGroup {
- get {
- return currentGroup;
- }
- set {
- if (singleGroupMode) {
- currentGroup = value;
- UpdateActionCommands (null);
- NotifyActiveGroupChanged ();
- } else {
- int i = actionGroups.IndexOf (value);
- if (i != -1)
- combo.Active = i;
- }
- }
- }
-
- void Refresh ()
- {
- if (singleGroupMode || combo == null)
- return;
-
- while (combo.Model.IterNChildren () > 0)
- combo.RemoveText (0);
- if (actionGroups != null) {
- foreach (ActionGroup group in actionGroups)
- combo.AppendText (group.Name);
- }
- }
-
- void OnCollectionChanged (object s, ActionGroupEventArgs args)
- {
- // Avoid firing the selection change event if the selected
- // group is the same after the refresh
- ActionGroup oldGroup = currentGroup;
- updating = true;
-
- int i = combo.Active;
- Refresh ();
- if (actionGroups.Count == 0) {
- combo.Sensitive = false;
- currentGroup = null;
- }
- else {
- combo.Sensitive = true;
- if (i == -1)
- i = 0;
- if (i < actionGroups.Count)
- combo.Active = i;
- else
- combo.Active = actionGroups.Count - 1;
- currentGroup = (ActionGroup) actionGroups [combo.Active];
- }
- updating = false;
- if (currentGroup != oldGroup)
- OnActiveChanged (null, null);
- frontend.NotifyModified ();
- }
-
- void OnAddGroup (object s, EventArgs args)
- {
- ActionGroup group = new ActionGroup ();
- group.Name = Catalog.GetString ("New Action Group");
- actionGroups.Add (group);
- combo.Active = actionGroups.Count - 1;
- if (ActiveGroupCreated != null)
- ActiveGroupCreated (this, new ActionGroupEventArgs (ActiveGroup));
-
- if (agroupEditor != null)
- agroupEditor.StartEditing ();
- }
-
- void OnRemoveGroup (object s, EventArgs args)
- {
- if (combo.Active != -1)
- actionGroups.RemoveAt (combo.Active);
- }
-
- void OnActiveChanged (object s, EventArgs args)
- {
- if (!updating) {
- UpdateActionCommands (null);
- if (combo.Active != -1)
- currentGroup = (ActionGroup) actionGroups [combo.Active];
- else
- currentGroup = null;
- NotifyActiveGroupChanged ();
- }
- }
-
- void NotifyActiveGroupChanged ()
- {
- if (agroupEditor != null)
- agroupEditor.ActionGroup = ActiveGroup;
- if (ActiveGroupChanged != null)
- ActiveGroupChanged (this, new ActionGroupEventArgs (ActiveGroup));
- }
-
- void UpdateActionCommands (Wrapper.Action action)
- {
- foreach (Gtk.Widget w in Children) {
- if (!internalButtons.Contains (w)) {
- Remove (w);
- w.Destroy ();
- }
- }
- AddActionCommands (action);
-
- if (internalButtons.Count > 0 && internalButtons.Count != Children.Length) {
- Insert (new Gtk.SeparatorToolItem (), internalButtons.Count);
- }
- ShowAll ();
- }
-
- protected virtual void AddActionCommands (Wrapper.Action action)
- {
- if (allowBinding) {
- Gtk.ToolButton bindButton = new Gtk.ToolButton (null, Catalog.GetString ("Bind to Field"));
- bindButton.IsImportant = true;
- bindButton.Show ();
- Insert (bindButton, -1);
- if (action == null)
- bindButton.Sensitive = false;
-
- bindButton.Clicked += delegate { frontend.NotifyBindField (); };
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Application.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Application.cs
deleted file mode 100644
index b8ee8d274a6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Application.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-
-using System;
-using System.Threading;
-using System.Collections;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.IO;
-using System.Xml;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
-using System.Diagnostics;
-using Mono.Remoting.Channels.Unix;
-using Mono.Cecil;
-
-namespace Stetic
-{
- public enum IsolationMode
- {
- None,
- ProcessTcp,
- ProcessUnix
- }
-
- public delegate string AssemblyResolverCallback (string assemblyName);
-
- public static class ApplicationFactory {
-
- public static Application CreateApplication (IsolationMode mode)
- {
- switch (mode) {
- case IsolationMode.None:
- return new LocalApplication ();
- case IsolationMode.ProcessTcp:
- case IsolationMode.ProcessUnix:
- return new IsolatedApplication (mode);
- default:
- throw new ArgumentException ("mode");
- }
- }
- }
-
- internal class IsolatedApplication : Application {
-
- string channelId;
- ApplicationBackendController backendController;
-
- string RegisterRemotingChannel (IsolationMode mode)
- {
- string remotingChannel;
- if (mode == IsolationMode.ProcessTcp) {
- remotingChannel = "tcp";
- IChannel ch = ChannelServices.GetChannel ("tcp");
- if (ch == null) {
- ChannelServices.RegisterChannel (new TcpChannel (0), false);
- }
- } else {
- remotingChannel = "unix";
- IChannel ch = ChannelServices.GetChannel ("unix");
- if (ch == null) {
- string unixRemotingFile = Path.GetTempFileName ();
- ChannelServices.RegisterChannel (new UnixChannel (unixRemotingFile), false);
- }
- }
- return remotingChannel;
- }
-
- public IsolatedApplication (IsolationMode mode)
- {
- if (mode == IsolationMode.None)
- throw new ArgumentException ("mode");
- channelId = RegisterRemotingChannel (mode);
- backendController = new ApplicationBackendController (this, channelId);
- backendController.StartBackend ();
- OnBackendChanged (false);
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- backendController.StopBackend (true);
- }
-
- public event BackendChangingHandler BackendChanging;
- public event BackendChangedHandler BackendChanged;
-
- void OnNewBackendStarted (object ob, EventArgs args)
- {
- OnBackendChanging ();
- ApplicationBackendController oldBackend = backendController;
- backendController = (ApplicationBackendController) ob;
- OnBackendChanged (true);
- oldBackend.StopBackend (false);
- }
-
- void OnBackendStopped (object ob, EventArgs args)
- {
- // The backend process crashed, try to restart it
- Backend = null;
- backendController = new ApplicationBackendController (this, channelId);
- backendController.StartBackend ();
- OnBackendChanged (true);
- }
-
- void OnBackendChanged (bool notify)
- {
- ApplicationBackend oldBackend = Backend;
-
- Backend = backendController.Backend;
- backendController.Stopped += OnBackendStopped;
- UpdateWidgetLibraries (false, false);
- ClearCollections ();
- if (notify && BackendChanged != null)
- BackendChanged (oldBackend);
-
- Backend.ActiveProject = ActiveProject != null ? ActiveProject.ProjectBackend : null;
- }
-
- void OnBackendChanging ()
- {
- Backend.GlobalWidgetLibraries = widgetLibraries;
- if (BackendChanging != null)
- BackendChanging ();
- }
-
- internal override void RestartBackend ()
- {
- // The backend process needs to be restarted.
- // This is done in background.
-
- ThreadPool.QueueUserWorkItem (delegate {
- try {
- // Start the new backend
- ApplicationBackendController newController = new ApplicationBackendController (this, channelId);
- newController.StartBackend ();
- Gtk.Application.Invoke (newController, EventArgs.Empty, OnNewBackendStarted);
- } catch {
- // FIXME: show an error message
- }
- });
- }
-
- internal override ComponentType CreateComponentType (string typeName)
- {
- string desc = null, className = null, category = null, targetGtkVersion = null, library = null;
- Gdk.Pixbuf px = null;
-
- byte[] icon;
-
- if (Backend.GetClassDescriptorInfo (typeName, out desc, out className, out category, out targetGtkVersion, out library, out icon) && icon != null)
- px = new Gdk.Pixbuf (icon);
-
- if (px == null)
- px = ComponentType.Unknown.Icon;
-
- if (desc == null)
- desc = typeName;
-
- return new ComponentType (this, typeName, desc, className, category, targetGtkVersion, library, px);
- }
- }
-
- internal class LocalApplication : Application {
-
- public LocalApplication ()
- {
- Backend = new ApplicationBackend (this);
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- Backend.Dispose ();
- }
-
- internal override ComponentType CreateComponentType (string typeName)
- {
- ClassDescriptor cls = Registry.LookupClassByName (typeName);
- if (cls == null)
- return null;
-
- return new ComponentType (this, typeName, cls.Label, cls.WrappedTypeName, cls.Category, cls.TargetGtkVersion, cls.Library.Name, cls.Icon);
- }
- }
-
- public abstract class Application : MarshalByRefObject, IDisposable {
-
- ApplicationBackend backend;
-
- Hashtable components = new Hashtable ();
- Hashtable types = new Hashtable ();
- internal ArrayList widgetLibraries = new ArrayList ();
- ArrayList projects = new ArrayList ();
- Project activeProject;
- Designer activeDesigner;
-
- WidgetPropertyTree propertiesWidget;
- Palette paletteWidget;
- WidgetTree projectWidget;
- SignalsEditor signalsWidget;
- bool allowInProcLibraries = true;
- bool disposed;
-
- public AssemblyResolverCallback WidgetLibraryResolver {
- get { return Backend.WidgetLibraryResolver; }
- set { Backend.WidgetLibraryResolver = value; }
- }
-
- public MimeResolverDelegate MimeResolver {
- set { Backend.MimeResolver = value; }
- }
-
- public Editor.ShowUrlDelegate ShowUrl {
- set { Backend.ShowUrl = value; }
- }
-
- public bool ShowNonContainerWarning {
- get { return Backend.ShowNonContainerWarning; }
- set { Backend.ShowNonContainerWarning = value; }
- }
-
- // Loads the libraries registered in the projects or in the application.
- // It will reload the libraries if they have changed. Libraries won't be
- // unloaded unless forceUnload is set to true
- public void UpdateWidgetLibraries (bool forceUnload)
- {
- UpdateWidgetLibraries (true, forceUnload);
- }
-
- internal virtual void RestartBackend ()
- {
- }
-
- protected void ClearCollections ()
- {
- lock (types) {
- types.Clear ();
- }
-
- Component[] comps;
- lock (components) {
- // All components should have been cleared by the backend,
- // just make sure it did
- comps = new Component [components.Count];
- components.Values.CopyTo (comps, 0);
- components.Clear ();
- }
-
- foreach (Component c in comps) {
- c.Dispose ();
- }
- }
-
- internal void UpdateWidgetLibraries (bool allowBackendRestart, bool forceUnload)
- {
- // Collect libraries from the project and from the application
-
- ArrayList assemblies = new ArrayList ();
- assemblies.AddRange (widgetLibraries);
-
- ArrayList projectBackends = new ArrayList ();
- foreach (Project p in projects)
- if (p.IsBackendLoaded)
- projectBackends.Add (p.ProjectBackend);
-
- if (!Backend.UpdateLibraries (assemblies, projectBackends, allowBackendRestart, forceUnload))
- RestartBackend ();
- }
-
- public virtual void Dispose ()
- {
- if (disposed)
- return;
-
- disposed = true;
- ClearCollections ();
- ArrayList copy = (ArrayList) projects.Clone ();
- foreach (Project p in copy)
- p.Dispose ();
- if (propertiesWidget != null)
- propertiesWidget.Destroy ();
- if (paletteWidget != null)
- paletteWidget.Destroy ();
- if (projectWidget != null)
- projectWidget.Destroy ();
- if (signalsWidget != null)
- signalsWidget.Destroy ();
- widgetLibraries.Clear ();
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
-
- internal ApplicationBackend Backend {
- get { return backend; }
- set { backend = value; }
- }
-
- void ProjectDisposed (object sender, EventArgs args)
- {
- projects.Remove (sender as Project);
- if (!disposed)
- UpdateWidgetLibraries (false, false);
- }
-
- public Project LoadProject (string path)
- {
- Project p = new Project (this);
- p.Load (path);
- projects.Add (p);
- p.Disposed += ProjectDisposed;
- return p;
- }
-
- public Project CreateProject ()
- {
- Project p = new Project (this);
- projects.Add (p);
- p.Disposed += ProjectDisposed;
- return p;
- }
-
- public ComponentType[] GetComponentTypes (string fileName)
- {
- if (IsWidgetLibrary (fileName))
- return CecilWidgetLibrary.GetComponentTypes (this, fileName).ToArray ();
- else
- return new ComponentType [0];
- }
-
- public void AddWidgetLibrary (string assemblyPath)
- {
- if (!widgetLibraries.Contains (assemblyPath)) {
- widgetLibraries.Add (assemblyPath);
- Backend.GlobalWidgetLibraries = widgetLibraries;
- UpdateWidgetLibraries (false, false);
- }
- }
-
- public void RemoveWidgetLibrary (string assemblyPath)
- {
- widgetLibraries.Remove (assemblyPath);
- Backend.GlobalWidgetLibraries = widgetLibraries;
- UpdateWidgetLibraries (false, false);
- }
-
- public string[] GetWidgetLibraries ()
- {
- return (string[]) widgetLibraries.ToArray (typeof(string));
- }
-
- public bool IsWidgetLibrary (string assemblyRef)
- {
- AssemblyResolver resolver = new AssemblyResolver (Backend);
- return InternalIsWidgetLibrary (resolver, assemblyRef);
- }
-
- internal static bool InternalIsWidgetLibrary (AssemblyResolver resolver, string assemblyRef)
- {
- string path;
-
- if (assemblyRef.EndsWith (".dll") || assemblyRef.EndsWith (".exe")) {
- if (!File.Exists (assemblyRef))
- return false;
- path = assemblyRef;
- }
- else {
- path = resolver.Resolve (assemblyRef, null);
- if (path == null)
- return false;
- }
-
- return CecilWidgetLibrary.IsWidgetLibrary (path);
- }
-
- public CodeGenerationResult GenerateProjectCode (string file, string namespaceName, CodeDomProvider provider, GenerationOptions options, params Project[] projects)
- {
- ArrayList files = new ArrayList ();
- CodeGenerationResult res = GenerateProjectCode (options, projects);
-
- string basePath = Path.GetDirectoryName (file);
- string ext = Path.GetExtension (file);
-
- foreach (SteticCompilationUnit unit in res.Units) {
- string fname;
- if (unit.Name.Length == 0) {
- if (provider is Microsoft.CSharp.CSharpCodeProvider && unit.Namespaces.Count > 0) {
- var types = unit.Namespaces [0].Types;
- if (types.Count > 0) {
- types [0].Members.Insert (0, new CodeSnippetTypeMember ("#pragma warning disable 436"));
- }
- }
- fname = file;
- } else
- fname = Path.Combine (basePath, unit.Name) + ext;
- files.Add (fname);
- unit.Name = fname;
- StreamWriter fileStream = new StreamWriter (fname);
- try {
- provider.GenerateCodeFromCompileUnit (unit, fileStream, new CodeGeneratorOptions ());
- } finally {
- fileStream.Close ();
- }
- }
- return res;
- }
-
- public CodeGenerationResult GenerateProjectCode (GenerationOptions options, params Project[] projects)
- {
- ProjectBackend[] pbs = new ProjectBackend [projects.Length];
- for (int n=0; n 0) ? desc : className
- );
- }
- else {
- ClassDescriptor cls = Registry.LookupClassByName (className);
- DND.Drag (source, ctx, cls.NewInstance (project) as Gtk.Widget);
- }
- }
-
- public string ResolveAssembly (string assemblyName)
- {
- if (widgetLibraryResolver != null)
- return widgetLibraryResolver (assemblyName);
- else
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ApplicationBackendController.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ApplicationBackendController.cs
deleted file mode 100644
index 5fdbbea4d56..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ApplicationBackendController.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Threading;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
-
-namespace Stetic
-{
- internal class ApplicationBackendController: MarshalByRefObject
- {
- bool stopping;
- ApplicationBackend backend;
- string channelId;
- IsolatedApplication app;
-
- ManualResetEvent runningEvent = new ManualResetEvent (false);
-
- public event EventHandler Stopped;
-
- public ApplicationBackendController (IsolatedApplication app, string channelId)
- {
- this.app = app;
- this.channelId = channelId;
- }
-
- public ApplicationBackend Backend {
- get { return backend; }
- }
-
- public Application Application {
- get { return app; }
- }
-
- public void StartBackend ()
- {
- runningEvent.Reset ();
-
- string asm = GetType().Assembly.Location;
-
- BinaryFormatter bf = new BinaryFormatter ();
- ObjRef oref = RemotingServices.Marshal (this);
- MemoryStream ms = new MemoryStream ();
- bf.Serialize (ms, oref);
- string sref = Convert.ToBase64String (ms.ToArray ());
-
- Process process = new Process ();
- process.StartInfo = new ProcessStartInfo ("sh", "-c \"mono --debug " + asm + "\"");
- process.StartInfo.WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory;
- process.StartInfo.UseShellExecute = false;
- process.StartInfo.RedirectStandardInput = true;
- process.EnableRaisingEvents = true;
- process.Start ();
- process.StandardInput.WriteLine (channelId);
- process.StandardInput.WriteLine (sref);
- process.StandardInput.Flush ();
- process.Exited += OnExited;
-
- if (!runningEvent.WaitOne (10000, false))
- throw new ApplicationException ("Couldn't create a remote process.");
- }
-
- public void StopBackend (bool waitUntilDone)
- {
- stopping = true;
- runningEvent.Reset ();
- backend.Dispose ();
- if (waitUntilDone)
- runningEvent.WaitOne (9000, false);
- }
-
- void OnExited (object o, EventArgs args)
- {
- Gtk.Application.Invoke (OnExitedInGui);
- }
-
- void OnExitedInGui (object o, EventArgs args)
- {
- if (!stopping && Stopped != null)
- Stopped (this, EventArgs.Empty);
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- internal void Connect (ApplicationBackend backend)
- {
- this.backend = backend;
- runningEvent.Set ();
- }
-
- internal void Disconnect (ApplicationBackend backend)
- {
- this.backend = null;
- runningEvent.Set ();
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyResolver.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyResolver.cs
deleted file mode 100644
index d2bfbdbcc86..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyResolver.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-// BaseAssemblyResolver.cs
-//
-// Author:
-// Jb Evain (jbevain@gmail.com)
-//
-// (C) 2007 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-// This code is a modified version of the assembly resolver implemented in Cecil.
-// Keep in synch as much as possible.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text;
-using Mono.Cecil;
-
-namespace Stetic {
-
- internal class AssemblyResolver : BaseAssemblyResolver {
-
- Dictionary _assemblies;
- ApplicationBackend app;
-
- public IDictionary AssemblyCache {
- get { return _assemblies; }
- }
-
- public AssemblyResolver (ApplicationBackend app)
- {
- this.app = app;
- _assemblies = new Dictionary ();
- }
-
- public StringCollection Directories = new StringCollection ();
-
- public override AssemblyDefinition Resolve (AssemblyNameReference name)
- {
- return Resolve (name, (string)null);
- }
-
- public AssemblyDefinition Resolve (AssemblyNameReference name, string basePath)
- {
- if (!_assemblies.TryGetValue (name.FullName, out var asm)) {
- if (app != null) {
- string ares = app.ResolveAssembly (name.Name);
- if (ares != null) {
- asm = AssemblyDefinition.ReadAssembly (ares, new ReaderParameters { AssemblyResolver = this });
- _assemblies [name.FullName] = asm;
- return asm;
- }
- }
- string file = Resolve (name.FullName, basePath);
- if (file != null)
- asm = AssemblyDefinition.ReadAssembly (file, new ReaderParameters { AssemblyResolver = this });
- else
- asm = base.Resolve (name);
- _assemblies [name.FullName] = asm;
- }
-
- return asm;
- }
-
- public void ClearCache ()
- {
- foreach (AssemblyDefinition asm in _assemblies.Values) {
- asm.Dispose ();
- }
- _assemblies.Clear ();
- }
-
- public TypeDefinition Resolve (TypeReference type)
- {
- if (type is TypeDefinition)
- return (TypeDefinition) type;
-
- AssemblyNameReference reference = type.Scope as AssemblyNameReference;
- if (reference != null) {
- AssemblyDefinition assembly = Resolve (reference);
- return assembly.MainModule.GetType (type.FullName);
- }
-
- ModuleDefinition module = type.Scope as ModuleDefinition;
- if (module != null)
- return module.GetType (type.FullName);
-
- throw new NotImplementedException ();
- }
-
- public string Resolve (string assemblyName, string basePath)
- {
- if (Path.IsPathRooted (assemblyName) && (assemblyName.EndsWith (".dll") || assemblyName.EndsWith (".exe")))
- return Path.GetFullPath (assemblyName);
-
- if (app != null) {
- string ares = app.ResolveAssembly (assemblyName);
- if (ares != null)
- return Path.GetFullPath (ares);
- }
-
- StringCollection col = new StringCollection ();
- col.Add (basePath);
- foreach (string s in Directories)
- col.Add (s);
-
- try {
- return Resolve (AssemblyNameReference.Parse (assemblyName), col);
- } catch {
- }
- return null;
- }
-
- public string Resolve (AssemblyNameReference name, StringCollection basePaths)
- {
- string [] exts = new string [] { ".dll", ".exe" };
-
- if (basePaths != null) {
- foreach (string dir in basePaths) {
- foreach (string ext in exts) {
- string file = Path.Combine (dir, name.Name + ext);
- if (File.Exists (file))
- return file;
- }
- }
- }
-
- if (name.Name == "mscorlib")
- return GetCorlib (name);
-
- string asm = GetAssemblyInGac (name);
- if (asm != null)
- return Path.GetFullPath (asm);
-
- throw new FileNotFoundException ("Could not resolve: " + name);
- }
-
- string GetCorlib (AssemblyNameReference reference)
- {
- if (typeof (object).Assembly.GetName ().Version == reference.Version)
- return typeof (object).Assembly.Location;
-
- string path = Directory.GetParent (
- Directory.GetParent (
- typeof (object).Module.FullyQualifiedName).FullName
- ).FullName;
-
- if (OnMono ()) {
- if (reference.Version.Major == 1)
- path = Path.Combine (path, "1.0");
- else if (reference.Version.Major == 2)
- path = Path.Combine (path, "2.0");
- else
- throw new NotSupportedException ("Version not supported: " + reference.Version);
- } else {
- if (reference.Version.ToString () == "1.0.3300.0")
- path = Path.Combine (path, "v1.0.3705");
- else if (reference.Version.ToString () == "1.0.5000.0")
- path = Path.Combine (path, "v1.1.4322");
- else if (reference.Version.ToString () == "2.0.0.0")
- path = Path.Combine (path, "v2.0.50727");
- else
- throw new NotSupportedException ("Version not supported: " + reference.Version);
- }
-
- return Path.GetFullPath (Path.Combine (path, "mscorlib.dll"));
- }
-
- static string GetAssemblyInGac (AssemblyNameReference reference)
- {
- if (reference.PublicKeyToken == null || reference.PublicKeyToken.Length == 0)
- return null;
-
- string currentGac = GetCurrentGacPath ();
- if (OnMono ()) {
- string s = GetAssemblyFile (reference, currentGac);
- if (File.Exists (s))
- return s;
- } else {
- string [] gacs = new string [] {"GAC_MSIL", "GAC_32", "GAC"};
- for (int i = 0; i < gacs.Length; i++) {
- string gac = Path.Combine (Directory.GetParent (currentGac).FullName, gacs [i]);
- string asm = GetAssemblyFile (reference, gac);
- if (Directory.Exists (gac) && File.Exists (asm))
- return asm;
- }
- }
-
- return null;
- }
-
- static string GetAssemblyFile (AssemblyNameReference reference, string gac)
- {
- StringBuilder sb = new StringBuilder ();
- sb.Append (reference.Version);
- sb.Append ("__");
- for (int i = 0; i < reference.PublicKeyToken.Length; i++)
- sb.Append (reference.PublicKeyToken [i].ToString ("x2"));
-
- return Path.Combine (
- Path.Combine (
- Path.Combine (gac, reference.Name), sb.ToString ()),
- string.Concat (reference.Name, ".dll"));
- }
-
- static string GetCurrentGacPath ()
- {
- return Directory.GetParent (
- Directory.GetParent (
- Path.GetDirectoryName (
- typeof (Uri).Module.FullyQualifiedName)
- ).FullName
- ).FullName;
- }
-
- static bool OnMono ()
- {
- return Type.GetType ("Mono.Runtime") != null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyWidgetLibrary.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyWidgetLibrary.cs
deleted file mode 100644
index 642e48c1e06..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/AssemblyWidgetLibrary.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Xml;
-using System.IO;
-
-namespace Stetic
-{
- internal class AssemblyWidgetLibrary: WidgetLibrary
- {
- static LibraryCache Cache = LibraryCache.Cache;
-
- Assembly assembly;
- string name;
- AssemblyResolver resolver;
- LibraryCache.LibraryInfo cache_info;
-
- public AssemblyWidgetLibrary (string name, Assembly assembly)
- {
- this.name = name;
- this.assembly = assembly;
- UpdateCache ();
- }
-
- public AssemblyWidgetLibrary (AssemblyResolver resolver, string assemblyPath)
- {
- this.name = assemblyPath;
-
- string ares = resolver.Resolve (assemblyPath, null);
- if (ares != null)
- assemblyPath = ares;
-
- this.resolver = resolver;
- if (assemblyPath.EndsWith (".dll") || assemblyPath.EndsWith (".exe")) {
- if (File.Exists (assemblyPath))
- assembly = Assembly.LoadFrom (assemblyPath);
- } else
- assembly = Assembly.Load (assemblyPath);
-
- if (assembly == null)
- throw new InvalidOperationException ("Couldn't load assembly at " + assemblyPath);
-
- UpdateCache ();
- }
-
- void UpdateCache ()
- {
- Cache.Refresh (resolver, assembly.Location);
- cache_info = Cache [assembly.Location];
- }
-
- public override string Name {
- get { return name; }
- }
-
- public override bool NeedsReload {
- get {
- return File.Exists (assembly.Location) && !Cache.IsCurrent (assembly.Location);
- }
- }
-
- public override bool CanReload {
- get { return false; }
- }
-
- public override void Load ()
- {
- Load (cache_info.ObjectsDocument);
- }
-
- protected override ClassDescriptor LoadClassDescriptor (XmlElement element)
- {
- return new TypedClassDescriptor (assembly, element);
- }
-
- public override Type GetType (string typeName)
- {
- Type t = assembly.GetType (typeName, false);
- if (t != null) return t;
-
- // Look in referenced assemblies
-/*
- Disabled. The problem is that Assembly.Load tries to load the exact version
- of the assembly, and loaded references may not have the same exact version.
-
- foreach (AssemblyName an in assembly.GetReferencedAssemblies ()) {
- Assembly a = Assembly.Load (an);
- t = a.GetType (typeName);
- if (t != null) return t;
- }
-*/
- return null;
- }
-
- public override System.IO.Stream GetResource (string name)
- {
- return assembly.GetManifestResourceStream (name);
- }
-
- public override string[] GetLibraryDependencies ()
- {
- if (!cache_info.HasWidgets)
- return new string [0];
-
- ArrayList list = new ArrayList ();
- ScanLibraries (list, assembly);
- return (string[]) list.ToArray (typeof(string));
- }
-
- void ScanLibraries (ArrayList list, Assembly asm)
- {
- foreach (AssemblyName aname in asm.GetReferencedAssemblies ()) {
- Assembly depasm = null;
- try {
- depasm = Assembly.Load (aname);
- } catch {
- }
-
- if (depasm == null) {
- string file = resolver != null ? resolver.Resolve (aname.FullName, Path.GetDirectoryName (asm.Location)) : null;
- if (file != null)
- depasm = Assembly.LoadFrom (file);
- else
- throw new InvalidOperationException ("Assembly not found: " + aname.FullName);
- }
-
- ManifestResourceInfo res = depasm.GetManifestResourceInfo ("objects.xml");
- if (res != null)
- list.Add (depasm.Location);
- }
- }
-
- public override void Flush ()
- {
- base.Flush ();
- if (resolver != null)
- resolver.ClearCache ();
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilClassDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilClassDescriptor.cs
deleted file mode 100644
index 28359999832..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilClassDescriptor.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Xml;
-using System.Reflection;
-using Mono.Cecil;
-
-namespace Stetic
-{
- internal class CecilClassDescriptor: Stetic.ClassDescriptor
- {
- string wrappedTypeName;
- ClassDescriptor typeClassDescriptor;
- ClassDescriptor wrapperClassDescriptor;
- Gdk.Pixbuf icon;
- TypeDefinition type;
- XmlElement steticDefinition;
- CecilWidgetLibrary cecilLib;
- bool useCustomWidgetBox;
- string widgetId;
- bool canGenerateCode;
-
- public CecilClassDescriptor (CecilWidgetLibrary lib, XmlElement element, ClassDescriptor typeClassDescriptor, XmlElement steticDefinition, TypeDefinition cls)
- {
- this.cecilLib = lib;
- this.steticDefinition = steticDefinition;
- this.typeClassDescriptor = typeClassDescriptor;
- wrappedTypeName = element.GetAttribute ("type");
- type = cls;
- Load (element);
- type = null;
- canGenerateCode = true;
-
- string baseType = element.GetAttribute ("base-type");
- if (baseType.Length > 0) {
- wrapperClassDescriptor = Registry.LookupClassByName (baseType);
- if (wrapperClassDescriptor == null)
- throw new InvalidOperationException ("Unknown base type: " + baseType);
- } else {
- wrapperClassDescriptor = typeClassDescriptor;
- }
-
- if (steticDefinition == null && !AllowChildren && NeedsBlackBox (typeClassDescriptor.Name)) {
- // It is not possible to create instances of that widget, instead we'll have
- // to create the typical custom widget black box.
-
- if (!CanCreateWidgetInstance (wrapperClassDescriptor.Name))
- throw new InvalidOperationException ("Can't load widget type '" + Name + "'. Instances of that type can't be created because the type can't be loaded into the process.");
-
- useCustomWidgetBox = true;
- }
-
- widgetId = Name.ToLower ();
- int i = widgetId.LastIndexOf ('.');
- if (i != -1) {
- if (i != widgetId.Length - 1)
- widgetId = widgetId.Substring (i+1);
- else
- widgetId = widgetId.Replace (".", "");
- }
-
- string iconName = element.GetAttribute ("icon");
- icon = lib.GetEmbeddedIcon (iconName);
-
- // If the class is a custom widget created using stetic, it means that it has
- // simple property and there is no custom logic, so it is safe to generate code
- // for this class.
- if (steticDefinition != null)
- canGenerateCode = true;
-
- // If it has a custom wrapper, then it definitely has custom logic, so it can't generate code
- if (element.HasAttribute ("wrapper"))
- canGenerateCode = false;
- }
-
- public override string WrappedTypeName {
- get { return wrappedTypeName; }
- }
-
- public override Gdk.Pixbuf Icon {
- get { return icon; }
- }
-
- public bool CanGenerateCode {
- get { return canGenerateCode; }
- }
-
- public override object CreateInstance (Stetic.IProject proj)
- {
- Gtk.Widget res;
-
- if (useCustomWidgetBox) {
- res = CreateFakeWidget (wrapperClassDescriptor.Name);
- res.ShowAll ();
- }
- else if (steticDefinition != null) {
- Gtk.Container w = Stetic.WidgetUtils.ImportWidget (proj, steticDefinition) as Gtk.Container;
- MakeChildrenUnselectable (w);
- res = w;
- }
- else {
- res = (Gtk.Widget) typeClassDescriptor.CreateInstance (proj);
-
- // If it is a custom widget and there is no stetic project for it, just
- // show it as a regular custom widget.
- Stetic.CustomWidget custom = res as Stetic.CustomWidget;
- if (custom != null) {
- Stetic.Custom c = new Stetic.Custom ();
- // Give it some default size
- c.WidthRequest = 20;
- c.HeightRequest = 20;
- custom.Add (c);
- custom.ShowAll ();
- res = custom;
- }
- }
-
- res.Name = widgetId;
- return res;
- }
-
- public override Stetic.ObjectWrapper CreateWrapper ()
- {
- return wrapperClassDescriptor.CreateWrapper ();
- }
-
- protected override Stetic.ItemDescriptor CreateItemDescriptor (XmlElement elem, Stetic.ItemGroup group)
- {
- string mname = elem.GetAttribute ("name");
- if (elem.Name == "property") {
- if (type != null) {
- PropertyDefinition propInfo = FindProperty (type, mname);
- if (propInfo != null)
- return new CecilPropertyDescriptor (cecilLib, elem, group, this, propInfo);
- }
- else
- return new CecilPropertyDescriptor (cecilLib, elem, group, this, null);
- }
- else if (elem.Name == "signal") {
- if (type != null) {
- EventDefinition signalInfo = FindEvent (type, mname);
- if (signalInfo != null)
- return new CecilSignalDescriptor (cecilLib, elem, group, this, signalInfo);
- }
- else
- return new CecilSignalDescriptor (cecilLib, elem, group, this, null);
- }
- else
- return base.CreateItemDescriptor (elem, group);
-
- return null;
- }
-
- PropertyDefinition FindProperty (TypeDefinition cls, string name)
- {
- foreach (PropertyDefinition propInfo in cls.Properties)
- if (propInfo.Name == name)
- return propInfo;
-
- if (cls.BaseType == null)
- return null;
-
- string baseType = cls.BaseType.FullName;
- Type t = Registry.GetType (baseType, false);
- if (t != null) {
- PropertyInfo prop = t.GetProperty (name);
- if (prop != null) {
- TypeReference tref = new TypeReference (prop.PropertyType.Namespace, prop.PropertyType.Name, cls.Module, cls.Module, prop.PropertyType.IsValueType);
- PropertyDefinition pdef = new PropertyDefinition (name, Mono.Cecil.PropertyAttributes.None, tref);
- CreateGetMethod (pdef);
- CreateSetMethod (pdef);
- return pdef;
- }
- }
-
- TypeDefinition bcls = cecilLib.FindTypeDefinition (baseType);
- if (bcls != null)
- return FindProperty (bcls, name);
- else
- return null;
- }
-
- static MethodDefinition CreateGetMethod (PropertyDefinition prop)
- {
- MethodDefinition get = new MethodDefinition (
- string.Concat ("get_", prop.Name), (Mono.Cecil.MethodAttributes) 0, prop.PropertyType);
- prop.GetMethod = get;
- return get;
- }
-
- static MethodDefinition CreateSetMethod (PropertyDefinition prop)
- {
- MethodDefinition set = new MethodDefinition (
- string.Concat ("set_", prop.Name), (Mono.Cecil.MethodAttributes) 0, prop.PropertyType);
- prop.SetMethod = set;
- return set;
- }
-
- EventDefinition FindEvent (TypeDefinition cls, string name)
- {
- foreach (EventDefinition eventInfo in cls.Events)
- if (eventInfo.Name == name)
- return eventInfo;
-
- if (cls.BaseType == null)
- return null;
-
- string baseType = cls.BaseType.FullName;
- Type t = Registry.GetType (baseType, false);
- if (t != null) {
- EventInfo ev = t.GetEvent (name);
- if (ev != null) {
- TypeReference tref = new TypeReference (ev.EventHandlerType.Namespace, ev.EventHandlerType.Name, cls.Module, cls.Module, ev.EventHandlerType.IsValueType);
- return new EventDefinition (name, Mono.Cecil.EventAttributes.None, tref);
- }
- }
-
- TypeDefinition bcls = cecilLib.FindTypeDefinition (baseType);
- if (bcls != null)
- return FindEvent (bcls, name);
- else
- return null;
- }
-
- void MakeChildrenUnselectable (Gtk.Widget w)
- {
- // Remove the registered signals, since those signals are bound
- // to the custom widget class, not the widget container class.
- Stetic.Wrapper.Widget ww = Stetic.Wrapper.Widget.Lookup (w);
- if (ww == null)
- return;
- ww.Signals.Clear ();
-
- foreach (Gtk.Widget child in (Gtk.Container)w) {
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (child);
- if (wrapper != null) {
- wrapper.Signals.Clear ();
- wrapper.Unselectable = true;
- }
- if (child is Gtk.Container)
- MakeChildrenUnselectable (child);
- }
- }
-
- bool CanCreateWidgetInstance (string typeName)
- {
- switch (typeName) {
- case "Gtk.Fixed":
- return false;
- }
- return true;
- }
-
- bool NeedsBlackBox (string typeName)
- {
- switch (typeName) {
- case "Gtk.Widget":
- case "Gtk.Container":
- case "Gtk.Alignment":
- case "Gtk.Fixed":
- case "Gtk.Frame":
- case "Gtk.HBox":
- case "Gtk.VBox":
- case "Gtk.Box":
- case "Gtk.ButtonBox":
- case "Gtk.Paned":
- case "Gtk.VPaned":
- case "Gtk.HPaned":
- case "Gtk.Notebook":
- case "Gtk.ScrolledWindow":
- case "Gtk.Table":
- case "Gtk.Bin":
- return true;
- }
- return false;
- }
-
- Gtk.Widget CreateFakeWidget (string typeName)
- {
- Stetic.Custom c = new Stetic.Custom ();
- // Give it some default size
- c.WidthRequest = 20;
- c.HeightRequest = 20;
-
- Gtk.Container box = null;
-
- switch (typeClassDescriptor.Name) {
- case "Gtk.Alignment":
- box = new Gtk.Alignment (0.5f, 0.5f, 1f, 1f);
- break;
- case "Gtk.Fixed":
- box = new Gtk.Alignment (0.5f, 0.5f, 1f, 1f);
- break;
- case "Gtk.Frame":
- box = new Gtk.Frame ();
- break;
- case "Gtk.Box":
- case "Gtk.HBox": {
- Gtk.HBox cc = new Gtk.HBox ();
- cc.PackStart (c, true, true, 0);
- return cc;
- }
- case "Gtk.VBox": {
- Gtk.VBox cc = new Gtk.VBox ();
- cc.PackStart (c, true, true, 0);
- return cc;
- }
- case "Gtk.Paned":
- case "Gtk.VPaned": {
- Gtk.VPaned cc = new Gtk.VPaned ();
- cc.Add1 (c);
- return cc;
- }
- case "Gtk.HPaned": {
- Gtk.HPaned cc = new Gtk.HPaned ();
- cc.Add1 (c);
- return cc;
- }
- case "Gtk.Notebook": {
- Gtk.Notebook nb = new Gtk.Notebook ();
- nb.ShowTabs = false;
- nb.AppendPage (c, null);
- return nb;
- }
- case "Gtk.ScrolledWindow": {
- Gtk.ScrolledWindow cc = new Gtk.ScrolledWindow ();
- cc.VscrollbarPolicy = Gtk.PolicyType.Never;
- cc.HscrollbarPolicy = Gtk.PolicyType.Never;
- cc.AddWithViewport (c);
- return cc;
- }
- case "Gtk.Table": {
- Gtk.Table t = new Gtk.Table (1, 1, false);
- t.Attach (c, 0, 1, 0, 1);
- return t;
- }
- case "Gtk.ButtonBox":
- return new Gtk.HButtonBox ();
- }
- if (box != null) {
- box.Add (c);
- return box;
- } else {
- Stetic.CustomWidget custom = new Stetic.CustomWidget ();
- if (custom.Child != null)
- custom.Remove (custom.Child);
- custom.Add (c);
- return custom;
- }
- }
- }
-
- class CustomControlWrapper: Stetic.Wrapper.Container
- {
- protected override bool AllowPlaceholders {
- get {
- return false;
- }
- }
- }
-
- class ClassDescriptorWrapper: Stetic.ClassDescriptor
- {
- ClassDescriptor wrapped;
-
- public ClassDescriptorWrapper (ClassDescriptor wrapped)
- {
- this.wrapped = wrapped;
- label = wrapped.Label;
-
- }
-
- public override string WrappedTypeName {
- get { return wrapped.WrappedTypeName; }
- }
-
- public override Gdk.Pixbuf Icon {
- get { return wrapped.Icon; }
- }
-
- public override object CreateInstance (Stetic.IProject proj)
- {
- CustomWidget custom = new CustomWidget ();
- Stetic.Custom c = new Stetic.Custom ();
- // Give it some default size
- c.WidthRequest = 20;
- c.HeightRequest = 20;
- custom.Add (c);
- return c;
- }
-
- public override Stetic.ObjectWrapper CreateWrapper ()
- {
- return new Wrapper.Container ();
- }
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilPropertyDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilPropertyDescriptor.cs
deleted file mode 100644
index 292a99b7405..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilPropertyDescriptor.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using Mono.Cecil;
-
-namespace Stetic
-{
- class CecilPropertyDescriptor: Stetic.PropertyDescriptor
- {
- string name;
- Type type;
- object initialValue;
- bool canWrite;
-
- public CecilPropertyDescriptor (CecilWidgetLibrary lib, XmlElement elem, Stetic.ItemGroup group, Stetic.ClassDescriptor klass, PropertyDefinition pinfo): base (elem, group, klass)
- {
- string tname;
-
- if (pinfo != null) {
- name = pinfo.Name;
- tname = pinfo.PropertyType.FullName;
- canWrite = pinfo.SetMethod != null;
- }
- else {
- name = elem.GetAttribute ("name");
- tname = elem.GetAttribute ("type");
- canWrite = elem.Attributes ["canWrite"] == null;
- }
-
- Load (elem);
-
- type = Stetic.Registry.GetType (tname, false);
-
- if (type == null) {
- Console.WriteLine ("Could not find type: " + tname);
- type = typeof(string);
- }
- if (type.IsValueType)
- initialValue = Activator.CreateInstance (type);
-
- // Consider all properties runtime-properties, since they have been created
- // from class properties.
- isRuntimeProperty = true;
-
- if (pinfo != null)
- SaveCecilXml (elem);
- }
-
- public CecilPropertyDescriptor (XmlElement elem, Stetic.ItemGroup group, Stetic.ClassDescriptor klass, PropertyDescriptor prop): base (elem, group, klass)
- {
- this.name = prop.Name;
- this.type = prop.PropertyType;
- this.canWrite = prop.CanWrite;
- if (type.IsValueType)
- initialValue = Activator.CreateInstance (type);
- this.label = prop.Label;
- this.description = prop.Description;
- this.maximum = prop.Maximum;
- this.minimum = prop.Minimum;
- this.initWithName = prop.InitWithName;
- this.translatable = prop.Translatable;
- }
-
- internal void SaveCecilXml (XmlElement elem)
- {
- elem.SetAttribute ("name", name);
- elem.SetAttribute ("type", type.FullName);
- if (!canWrite)
- elem.SetAttribute ("canWrite", "false");
- }
-
- public override string Name {
- get { return name; }
- }
-
- // The property's type
- public override Type PropertyType {
- get { return type; }
- }
-
- public override bool IsDefaultValue (object value)
- {
- return false;
- }
-
- // Gets the value of the property on @obj
- public override object GetValue (object obj)
- {
- Stetic.ObjectWrapper wrapper = (Stetic.ObjectWrapper) Stetic.ObjectWrapper.Lookup (obj);
- Hashtable props = (Hashtable) wrapper.ExtendedData [typeof(CecilPropertyDescriptor)];
- object val = props != null ? props [name] : null;
- if (val == null && initialValue != null)
- return initialValue;
- else
- return val;
- }
-
- // Whether or not the property is writable
- public override bool CanWrite {
- get { return canWrite; }
- }
-
- // Sets the value of the property on @obj
- public override void SetValue (object obj, object value)
- {
- Stetic.ObjectWrapper wrapper = (Stetic.ObjectWrapper) Stetic.ObjectWrapper.Lookup (obj);
- Hashtable props = (Hashtable) wrapper.ExtendedData [typeof(CecilPropertyDescriptor)];
- if (props == null) {
- props = new Hashtable ();
- wrapper.ExtendedData [typeof(CecilPropertyDescriptor)] = props;
- }
-
- props [name] = value;
- }
-
- public override object GetRuntimeValue (object obj)
- {
- return null;
- }
-
- public override void SetRuntimeValue (object obj, object value)
- {
- }
-
- }
-}
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilSignalDescriptor.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilSignalDescriptor.cs
deleted file mode 100644
index 3b002eabb13..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CecilSignalDescriptor.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections;
-using System.Xml;
-using System.Reflection;
-using Mono.Cecil;
-
-namespace Stetic
-{
- class CecilSignalDescriptor: Stetic.SignalDescriptor
- {
- public CecilSignalDescriptor (CecilWidgetLibrary lib, XmlElement elem, Stetic.ItemGroup group, Stetic.ClassDescriptor klass, EventDefinition sinfo) : base (elem, group, klass)
- {
- if (sinfo != null) {
- string handler = sinfo.EventType.FullName;
- handlerTypeName = handler.Replace ('/','+');
- Type t = Registry.GetType (handler, false);
- if (t != null) {
- MethodInfo mi = t.GetMethod ("Invoke");
- handlerReturnTypeName = mi.ReturnType.FullName;
- ParameterInfo[] pars = mi.GetParameters ();
- handlerParameters = new ParameterDescriptor [pars.Length];
- for (int n=0; n', ']');
- }
- TypeDefinition td = lib.FindTypeDefinition (tn);
- if (td != null) {
- MethodDefinition mi = null;
- foreach (MethodDefinition md in td.Methods) {
- if (md.Name == "Invoke") {
- mi = md;
- break;
- }
- }
- if (mi != null) {
- handlerReturnTypeName = CecilWidgetLibrary.GetInstanceType (td, sinfo.EventType, mi.ReturnType);
- handlerParameters = new ParameterDescriptor [mi.Parameters.Count];
- for (int n=0; n
-// Mike Kestner
-//
-// Copyright (c) 2008 Novell, Inc
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Xml;
-using Mono.Cecil;
-
-namespace Stetic
-{
- internal class CecilWidgetLibrary: WidgetLibrary
- {
- static LibraryCache cache = LibraryCache.Cache;
-
- string name;
- string filename;
- string[] dependencies;
- AssemblyResolver resolver;
- bool canGenerateCode;
- bool info_changed;
- bool objects_dirty;
- AssemblyDefinition assembly;
- LibraryCache.LibraryInfo cache_info;
-
- public CecilWidgetLibrary (AssemblyResolver resolver, string path)
- {
- name = path;
- this.resolver = resolver;
-
- if (System.IO.File.Exists (path))
- filename = path;
- else if (resolver != null)
- filename = resolver.Resolve (path, null);
-
- if (filename == null)
- filename = path;
- else
- filename = System.IO.Path.GetFullPath (filename);
-
- RefreshFromCache ();
- }
-
- public override string Name {
- get { return name; }
- }
-
- public override bool NeedsReload {
- get {
- cache.Refresh (resolver, filename);
- return info_changed;
- }
- }
-
- public override bool CanReload {
- get { return true; }
- }
-
- public override bool CanGenerateCode {
- get { return canGenerateCode; }
- }
-
- public override void Load ()
- {
- canGenerateCode = true;
-
- RefreshFromCache ();
- if (cache_info == null || !File.Exists (filename))
- return;
-
- using (assembly = AssemblyDefinition.ReadAssembly (filename)) {
- objects_dirty = false;
- Load (cache_info.ObjectsDocument);
- if (objects_dirty)
- cache_info.WriteObjectsFile ();
-
- foreach (string dep in GetLibraryDependencies ()) {
- WidgetLibrary lib = Registry.GetWidgetLibrary (dep);
- if (lib != null && !lib.CanGenerateCode)
- canGenerateCode = false;
- }
- }
- assembly = null;
- info_changed = false;
- }
-
- void RefreshFromCache ()
- {
- LibraryCache.LibraryInfo newInfo = cache.Refresh (resolver, filename);
- if (newInfo != cache_info) {
- if (cache_info != null)
- cache_info.Changed -= OnCacheInfoChanged;
- cache_info = newInfo;
- cache_info.Changed += OnCacheInfoChanged;
- }
- }
-
- void OnCacheInfoChanged (object o, EventArgs a)
- {
- info_changed = true;
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- if (cache_info != null) {
- cache_info.Changed -= OnCacheInfoChanged;
- cache_info = null;
- }
- }
-
-
- protected override ClassDescriptor LoadClassDescriptor (XmlElement element)
- {
- string name = element.GetAttribute ("type");
-
- TypeDefinition cls = null;
- Stetic.ClassDescriptor typeClassDescriptor = null;
- string tname;
-
- if (element.HasAttribute ("baseClassType")) {
- tname = element.GetAttribute ("baseClassType");
- typeClassDescriptor = Stetic.Registry.LookupClassByName (tname);
- } else {
- cls = assembly.MainModule.GetType (name);
- if (cls != null) {
- // Find the nearest type that can be loaded
- typeClassDescriptor = FindType (cls);
- tname = cls.Name;
- if (typeClassDescriptor != null) {
- element.SetAttribute ("baseClassType", typeClassDescriptor.Name);
- objects_dirty = true;
- }
- }
- }
-
- if (typeClassDescriptor == null) {
- Console.WriteLine ("Descriptor not found: " + name);
- return null;
- }
-
- XmlElement steticDefinition = null;
-
- XmlDocument gui = cache [filename].GuiDocument;
- if (gui != null) {
- string wrappedTypeName = element.GetAttribute ("type");
- steticDefinition = (XmlElement) gui.DocumentElement.SelectSingleNode ("widget[@id='" + wrappedTypeName + "']");
- }
-
- CecilClassDescriptor cd = new CecilClassDescriptor (this, element, typeClassDescriptor, steticDefinition, cls);
-
- if (canGenerateCode && !cd.CanGenerateCode)
- canGenerateCode = false;
- return cd;
- }
-
- Stetic.ClassDescriptor FindType (TypeDefinition cls)
- {
- if (cls.BaseType == null)
- return null;
- Stetic.ClassDescriptor klass = Stetic.Registry.LookupClassByName (cls.BaseType.FullName);
- if (klass != null) return klass;
-
- TypeDefinition bcls = FindTypeDefinition (cls.BaseType.FullName);
- if (bcls == null)
- return null;
-
- return FindType (bcls);
- }
-
- AssemblyDefinition ResolveAssembly (AssemblyNameReference aref)
- {
- return resolver.Resolve (aref, Path.GetDirectoryName (filename));
- }
-
- internal TypeDefinition FindTypeDefinition (string fullName)
- {
- return FindTypeDefinition (assembly, fullName);
- }
-
- TypeDefinition FindTypeDefinition (AssemblyDefinition asm, string fullName)
- {
- TypeDefinition cls = asm.MainModule.GetType (fullName);
- if (cls != null)
- return cls;
-
- foreach (AssemblyNameReference aref in asm.MainModule.AssemblyReferences) {
- AssemblyDefinition basm = ResolveAssembly (aref);
- if (basm != null) {
- cls = basm.MainModule.GetType (fullName);
- if (cls != null)
- return cls;
- }
- }
- return null;
- }
-
- public override string[] GetLibraryDependencies ()
- {
- if (NeedsReload || dependencies == null)
- LoadDependencies ();
- return dependencies;
- }
-
- void LoadDependencies ()
- {
- RefreshFromCache ();
- if (cache_info == null || cache_info.ObjectsDocument == null) {
- dependencies = new string[0];
- return;
- }
- XmlElement elem = cache_info.ObjectsDocument.DocumentElement ["dependencies"];
- if (elem != null) {
- ArrayList list = new ArrayList ();
- foreach (XmlElement dep in elem.SelectNodes ("dependency"))
- list.Add (dep.InnerText);
- dependencies = (string[]) list.ToArray (typeof(string));
- } else
- dependencies = new string[0];
- }
-
- public static bool IsWidgetLibrary (string path)
- {
- // Info can be null if the library could not be scanned for some reason
- var info = cache [path];
- return info != null && info.HasWidgets;
- }
-
- public static string GetInstanceType (TypeDefinition td, TypeReference sourceType, TypeReference tref)
- {
- string tn = null;
- if (sourceType is GenericInstanceType) {
- GenericInstanceType it = (GenericInstanceType) sourceType;
- foreach (GenericParameter gc in td.GenericParameters) {
- if (gc.Name == tref.FullName) {
- tn = it.GenericArguments [gc.Position].FullName;
- break;
- }
- }
- }
- if (tn == null)
- tn = tref.FullName;
- tn = tn.Replace ('<', '[');
- tn = tn.Replace ('>', ']');
- return tn;
- }
-
- public static List GetComponentTypes (Application app, string filename)
- {
- List list = new List ();
-
- LibraryCache.LibraryInfo info = cache.Refresh (new AssemblyResolver (app.Backend), filename);
- if (info.ObjectsDocument == null)
- return list;
-
- string defTargetGtkVersion = info.ObjectsDocument.DocumentElement.GetAttribute ("gtk-version");
- if (defTargetGtkVersion.Length == 0)
- defTargetGtkVersion = "2.4";
-
- using (AssemblyDefinition adef = AssemblyDefinition.ReadAssembly (filename)) {
- foreach (XmlElement elem in info.ObjectsDocument.SelectNodes ("objects/object")) {
- if (elem.GetAttribute ("internal") == "true" || elem.HasAttribute ("deprecated") || !elem.HasAttribute ("palette-category"))
- continue;
-
- string iconname = elem.GetAttribute ("icon");
- Gdk.Pixbuf icon = GetEmbeddedIcon (adef, iconname);
-
- string targetGtkVersion = elem.GetAttribute ("gtk-version");
- if (targetGtkVersion.Length == 0)
- targetGtkVersion = defTargetGtkVersion;
-
- ComponentType ct = new ComponentType (app,
- elem.GetAttribute ("type"),
- elem.GetAttribute ("label"),
- elem.GetAttribute ("type"),
- elem.GetAttribute ("palette-category"),
- targetGtkVersion,
- filename,
- icon);
-
- list.Add (ct);
- }
- }
-
- return list;
- }
-
- public Gdk.Pixbuf GetEmbeddedIcon (string iconname)
- {
- return GetEmbeddedIcon (assembly, iconname);
- }
-
- static Gdk.Pixbuf GetEmbeddedIcon (AssemblyDefinition asm, string iconname)
- {
- Gdk.Pixbuf icon = null;
- if (iconname != null && iconname.Length > 0) {
- try {
- // Using the pixbuf resource constructor generates a gdk warning.
- EmbeddedResource res = GetResource (asm, iconname);
- Gdk.PixbufLoader loader = new Gdk.PixbufLoader (res.GetResourceData ());
- icon = loader.Pixbuf;
- } catch {
- // Ignore
- }
- }
-
- if (icon == null) {
- ClassDescriptor cc = Registry.LookupClassByName ("Gtk.Bin");
- icon = cc.Icon;
- }
- return icon;
- }
-
- static EmbeddedResource GetResource (AssemblyDefinition asm, string name)
- {
- foreach (Resource res in asm.MainModule.Resources) {
- EmbeddedResource eres = res as EmbeddedResource;
- if (eres != null && eres.Name == name)
- return eres;
- }
- return null;
- }
-
- public override void Flush ()
- {
- base.Flush ();
- if (resolver != null)
- resolver.ClearCache ();
- }
-
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerationResult.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerationResult.cs
deleted file mode 100644
index 3e2dedcd845..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerationResult.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- [Serializable]
- public class CodeGenerationResult
- {
- SteticCompilationUnit[] units;
- string[] warnings;
-
- internal CodeGenerationResult (SteticCompilationUnit[] units, string[] warnings)
- {
- this.units = units;
- this.warnings = warnings;
- }
-
- public SteticCompilationUnit[] Units {
- get { return units; }
- }
-
- public string[] Warnings {
- get { return warnings; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerator.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerator.cs
deleted file mode 100644
index fe65c5d8687..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGenerator.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-
-namespace Stetic
-{
- internal static class CodeGenerator
- {
- public static void GenerateProjectCode (string file, CodeDomProvider provider, GenerationOptions options, ProjectBackend[] projects)
- {
- CodeGenerationResult res = GenerateProjectCode (options, projects);
-
- string basePath = Path.GetDirectoryName (file);
-
- foreach (SteticCompilationUnit unit in res.Units) {
- string fname;
- if (unit.Name.Length == 0)
- fname = file;
- else
- fname = Path.Combine (basePath, unit.Name);
- StreamWriter fileStream = new StreamWriter (fname);
- try {
- provider.GenerateCodeFromCompileUnit (unit, fileStream, new CodeGeneratorOptions ());
- } finally {
- fileStream.Close ();
- }
- }
- }
-
- public static CodeGenerationResult GenerateProjectCode (GenerationOptions options, ProjectBackend[] projects)
- {
- ArrayList warningList = new ArrayList ();
-
- List units = new List ();
- SteticCompilationUnit globalUnit = new SteticCompilationUnit ("");
- units.Add (globalUnit);
-
- if (options == null)
- options = new GenerationOptions ();
- CodeNamespace globalNs = new CodeNamespace (options.GlobalNamespace);
- globalUnit.Namespaces.Add (globalNs);
-
- // Global class
-
- CodeTypeDeclaration globalType = new CodeTypeDeclaration ("Gui");
- globalType.Attributes = MemberAttributes.Private;
- globalType.TypeAttributes = TypeAttributes.NestedAssembly;
- globalNs.Types.Add (globalType);
-
- // Create the project initialization method
- // This method will only be added at the end if there
- // is actually something to initialize
-
- CodeMemberMethod initMethod = new CodeMemberMethod ();
- initMethod.Name = "Initialize";
- initMethod.ReturnType = new CodeTypeReference (typeof(void));
- initMethod.Attributes = MemberAttributes.Assembly | MemberAttributes.Static;
- initMethod.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Gtk.Widget), "iconRenderer"));
-
- GeneratorContext initContext = new ProjectGeneratorContext (globalNs, globalType, initMethod.Statements, options);
- initContext.RootObject = new CodeArgumentReferenceExpression ("iconRenderer");
-
- // Generate icon factory creation
-
- foreach (ProjectBackend gp in projects) {
- if (gp.IconFactory.Icons.Count > 0)
- gp.IconFactory.GenerateBuildCode (initContext);
- }
- warningList.AddRange (initContext.Warnings);
-
- // Generate the code
-
- if (options.UsePartialClasses)
- CodeGeneratorPartialClass.GenerateProjectGuiCode (globalUnit, globalNs, globalType, options, units, projects, warningList);
- else
- CodeGeneratorInternalClass.GenerateProjectGuiCode (globalUnit, globalNs, globalType, options, units, projects, warningList);
-
- GenerateProjectActionsCode (globalNs, options, projects);
-
- // Final step. If there is some initialization code, add all needed infrastructure
-
- globalType.Members.Add (initMethod);
-
- CodeMemberField initField = new CodeMemberField (typeof(bool), "initialized");
- initField.Attributes = MemberAttributes.Private | MemberAttributes.Static;
- globalType.Members.Add (initField);
-
- CodeFieldReferenceExpression initVar = new CodeFieldReferenceExpression (
- new CodeTypeReferenceExpression (globalNs.Name + ".Gui"),
- "initialized"
- );
-
- CodeConditionStatement initCondition = new CodeConditionStatement ();
- initCondition.Condition = new CodeBinaryOperatorExpression (
- initVar,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (false)
- );
- initCondition.TrueStatements.Add (new CodeAssignStatement (
- initVar,
- new CodePrimitiveExpression (true)
- ));
- initCondition.TrueStatements.AddRange (initMethod.Statements);
- initMethod.Statements.Clear ();
- initMethod.Statements.Add (initCondition);
-
- return new CodeGenerationResult (units.ToArray (), (string[]) warningList.ToArray (typeof(string)));
- }
-
- internal static void BindSignalHandlers (CodeExpression targetObjectVar, ObjectWrapper wrapper, Stetic.WidgetMap map, CodeStatementCollection statements, GenerationOptions options)
- {
- foreach (Signal signal in wrapper.Signals) {
- SignalDescriptor descriptor = signal.SignalDescriptor;
-
- CodeExpression createDelegate;
-
- if (options.UsePartialClasses) {
- var rgx = new Regex (@"`\d+");
- createDelegate =
- new CodeDelegateCreateExpression (
- new CodeTypeReference (rgx.Replace (descriptor.HandlerTypeName, ""), CodeTypeReferenceOptions.GlobalReference),
- new CodeThisReferenceExpression (),
- signal.Handler);
- } else {
- createDelegate =
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (typeof(Delegate), CodeTypeReferenceOptions.GlobalReference)),
- "CreateDelegate",
- new CodeTypeOfExpression (descriptor.HandlerTypeName),
- targetObjectVar,
- new CodePrimitiveExpression (signal.Handler));
-
- createDelegate = new CodeCastExpression (descriptor.HandlerTypeName.ToGlobalTypeRef (), createDelegate);
- }
-
- CodeAttachEventStatement cevent = new CodeAttachEventStatement (
- new CodeEventReferenceExpression (
- map.GetWidgetExp (wrapper),
- descriptor.Name),
- createDelegate);
-
- statements.Add (cevent);
- }
-
- Wrapper.Widget widget = wrapper as Wrapper.Widget;
- if (widget != null && widget.IsTopLevel) {
- // Bind local action signals
- foreach (Wrapper.ActionGroup grp in widget.LocalActionGroups) {
- foreach (Wrapper.Action ac in grp.Actions)
- BindSignalHandlers (targetObjectVar, ac, map, statements, options);
- }
- }
-
- Gtk.Container cont = wrapper.Wrapped as Gtk.Container;
- if (cont != null) {
- foreach (Gtk.Widget child in cont.AllChildren) {
- Stetic.Wrapper.Widget ww = Stetic.Wrapper.Widget.Lookup (child);
- if (ww != null)
- BindSignalHandlers (targetObjectVar, ww, map, statements, options);
- }
- }
-
- }
-
- static void GenerateProjectActionsCode (CodeNamespace cns, GenerationOptions options, params ProjectBackend[] projects)
- {
- bool multiProject = projects.Length > 1;
-
- CodeTypeDeclaration type = new CodeTypeDeclaration ("ActionGroups");
- type.Attributes = MemberAttributes.Private;
- type.TypeAttributes = TypeAttributes.NestedAssembly;
- cns.Types.Add (type);
-
- // Generate the global action group getter
-
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = "GetActionGroup";
- type.Members.Add (met);
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Type), "type"));
- if (multiProject)
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "file"));
- met.ReturnType = new CodeTypeReference (typeof(Gtk.ActionGroup));
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-
- CodeMethodInvokeExpression call = new CodeMethodInvokeExpression (
- new CodeMethodReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (cns.Name + ".ActionGroups")),
- "GetActionGroup"
- ),
- new CodePropertyReferenceExpression (
- new CodeArgumentReferenceExpression ("type"),
- "FullName"
- )
- );
- if (multiProject)
- call.Parameters.Add (new CodeArgumentReferenceExpression ("file"));
-
- met.Statements.Add (new CodeMethodReturnStatement (call));
-
- // Generate the global action group getter (overload)
-
- met = new CodeMemberMethod ();
- met.Name = "GetActionGroup";
- type.Members.Add (met);
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "name"));
- if (multiProject)
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "file"));
- met.ReturnType = new CodeTypeReference (typeof(Gtk.ActionGroup));
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-
- CodeArgumentReferenceExpression cfile = new CodeArgumentReferenceExpression ("file");
- CodeArgumentReferenceExpression cid = new CodeArgumentReferenceExpression ("name");
-
- CodeStatementCollection projectCol = met.Statements;
- int n=1;
-
- foreach (ProjectBackend gp in projects) {
-
- CodeStatementCollection widgetCol;
-
- if (multiProject) {
- CodeConditionStatement pcond = new CodeConditionStatement ();
- pcond.Condition = new CodeBinaryOperatorExpression (
- cfile,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (gp.Id)
- );
- projectCol.Add (pcond);
-
- widgetCol = pcond.TrueStatements;
- projectCol = pcond.FalseStatements;
- } else {
- widgetCol = projectCol;
- }
-
- foreach (Wrapper.ActionGroup grp in gp.ActionGroups) {
- string fname = "group" + (n++);
- CodeMemberField grpField = new CodeMemberField (new CodeTypeReference (typeof(Gtk.ActionGroup), CodeTypeReferenceOptions.GlobalReference), fname);
- grpField.Attributes |= MemberAttributes.Static;
- type.Members.Add (grpField);
- CodeFieldReferenceExpression grpVar = new CodeFieldReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (cns.Name + ".ActionGroups", CodeTypeReferenceOptions.GlobalReference)),
- fname
- );
-
- CodeConditionStatement pcond = new CodeConditionStatement ();
- pcond.Condition = new CodeBinaryOperatorExpression (
- cid,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (grp.Name)
- );
- widgetCol.Add (pcond);
-
- // If the group has not yet been created, create it
- CodeConditionStatement pcondGrp = new CodeConditionStatement ();
- pcondGrp.Condition = new CodeBinaryOperatorExpression (
- grpVar,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (null)
- );
-
- pcondGrp.TrueStatements.Add (
- new CodeAssignStatement (
- grpVar,
- new CodeObjectCreateExpression (grp.Name)
- )
- );
-
- pcond.TrueStatements.Add (pcondGrp);
- pcond.TrueStatements.Add (new CodeMethodReturnStatement (grpVar));
-
- widgetCol = pcond.FalseStatements;
- }
- widgetCol.Add (new CodeMethodReturnStatement (new CodePrimitiveExpression (null)));
- }
- if (met.Statements.Count == 0)
- met.Statements.Add (new CodeMethodReturnStatement (new CodePrimitiveExpression (null)));
- }
-
- internal static List GetFieldsToBind (ObjectWrapper wrapper)
- {
- List tobind = new List ();
- GetFieldsToBind (tobind, wrapper);
- return tobind;
- }
-
- static void GetFieldsToBind (List tobind, ObjectWrapper wrapper)
- {
- string memberName = null;
-
- if (wrapper is Wrapper.Widget) {
- Wrapper.Widget ww = wrapper as Wrapper.Widget;
- if (!String.IsNullOrEmpty (ww.UIManagerName))
- tobind.Add (new ObjectBindInfo ("Gtk.UIManager", ww.UIManagerName));
-
- if (!ww.IsTopLevel && ww.InternalChildProperty == null && !ww.Unselectable)
- memberName = ((Wrapper.Widget) wrapper).Wrapped.Name;
- }
- else if (wrapper is Wrapper.Action)
- memberName = ((Wrapper.Action) wrapper).Name;
-
- if (memberName != null) {
- ObjectBindInfo binfo = new ObjectBindInfo (wrapper.WrappedTypeName, memberName);
- tobind.Add (binfo);
- }
-
- Wrapper.ActionGroup agroup = wrapper as Wrapper.ActionGroup;
- if (agroup != null) {
- foreach (Wrapper.Action ac in agroup.Actions)
- GetFieldsToBind (tobind, ac);
- }
-
- Wrapper.Widget widget = wrapper as Wrapper.Widget;
- if (widget != null && widget.IsTopLevel) {
- // Generate fields for local actions
- foreach (Wrapper.ActionGroup grp in widget.LocalActionGroups) {
- GetFieldsToBind (tobind, grp);
- }
- }
-
- Gtk.Container cont = wrapper.Wrapped as Gtk.Container;
- if (cont != null) {
- foreach (Gtk.Widget child in cont.AllChildren) {
- Stetic.Wrapper.Widget ww = Stetic.Wrapper.Widget.Lookup (child);
- if (ww != null)
- GetFieldsToBind (tobind, ww);
- }
- }
- }
-
- public static WidgetMap GenerateCreationCode (CodeNamespace cns, CodeTypeDeclaration type, Gtk.Widget w, CodeExpression widgetVarExp, CodeStatementCollection statements, GenerationOptions options, ArrayList warnings)
- {
- statements.Add (new CodeCommentStatement ("Widget " + w.Name));
- GeneratorContext ctx = new ProjectGeneratorContext (cns, type, statements, options);
- Stetic.Wrapper.Widget ww = Stetic.Wrapper.Widget.Lookup (w);
- ctx.GenerateCreationCode (ww, widgetVarExp);
- ctx.EndGeneration ();
- warnings.AddRange (ctx.Warnings);
- return ctx.WidgetMap;
- }
-
- public static WidgetMap GenerateCreationCode (CodeNamespace cns, CodeTypeDeclaration type, Wrapper.ActionGroup grp, CodeExpression groupVarExp, CodeStatementCollection statements, GenerationOptions options, ArrayList warnings)
- {
- statements.Add (new CodeCommentStatement ("Action group " + grp.Name));
- GeneratorContext ctx = new ProjectGeneratorContext (cns, type, statements, options);
- ctx.GenerateCreationCode (grp, groupVarExp);
- ctx.EndGeneration ();
- warnings.AddRange (ctx.Warnings);
- return ctx.WidgetMap;
- }
- }
-
- class ProjectGeneratorContext: GeneratorContext
- {
- CodeTypeDeclaration type;
-
- public ProjectGeneratorContext (CodeNamespace cns, CodeTypeDeclaration type, CodeStatementCollection statements, GenerationOptions options): base (cns, "w", statements, options)
- {
- this.type = type;
- }
-
- public override CodeExpression GenerateInstanceExpression (ObjectWrapper wrapper, CodeExpression newObject)
- {
- string typeName = wrapper.WrappedTypeName;
- string memberName = null;
- if (wrapper is Wrapper.Widget)
- memberName = ((Wrapper.Widget) wrapper).Wrapped.Name;
- else if (wrapper is Wrapper.Action)
- memberName = ((Wrapper.Action) wrapper).Name;
-
- if (memberName == null)
- return base.GenerateInstanceExpression (wrapper, newObject);
-
- if (Options.UsePartialClasses) {
- // Don't generate fields for top level widgets and for widgets accessible
- // through other widget's properties
- Wrapper.Widget ww = wrapper as Wrapper.Widget;
- if (ww == null || (!ww.IsTopLevel && ww.InternalChildProperty == null && !ww.Unselectable)) {
- type.Members.Add (
- new CodeMemberField (
- new CodeTypeReference (typeName, CodeTypeReferenceOptions.GlobalReference),
- memberName
- )
- );
- CodeExpression var = new CodeFieldReferenceExpression (
- new CodeThisReferenceExpression (),
- memberName
- );
-
- Statements.Add (
- new CodeAssignStatement (
- var,
- newObject
- )
- );
- return var;
- } else
- return base.GenerateInstanceExpression (wrapper, newObject);
- } else {
- CodeExpression var = base.GenerateInstanceExpression (wrapper, newObject);
- Statements.Add (
- new CodeAssignStatement (
- new CodeIndexerExpression (
- new CodeVariableReferenceExpression ("bindings"),
- new CodePrimitiveExpression (memberName)
- ),
- var
- )
- );
- return var;
- }
- }
- }
-
- [Serializable]
- public class SteticCompilationUnit: CodeCompileUnit
- {
- string name;
-
- public SteticCompilationUnit (string name)
- {
- this.name = name;
- }
-
- public string Name {
- get { return name; }
- internal set { name = value; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorInternalClass.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorInternalClass.cs
deleted file mode 100644
index acc7436d20f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorInternalClass.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-
-using System;
-using System.Reflection;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using System.Collections;
-
-namespace Stetic
-{
- internal static class CodeGeneratorInternalClass
- {
- static CodeExpression bindingFlags;
-
- static CodeGeneratorInternalClass ()
- {
- CodeTypeReferenceExpression flagsType = new CodeTypeReferenceExpression (new CodeTypeReference ("System.Reflection.BindingFlags", CodeTypeReferenceOptions.GlobalReference));
- bindingFlags = new CodeBinaryOperatorExpression (
- new CodeFieldReferenceExpression (flagsType, "Public"),
- CodeBinaryOperatorType.BitwiseOr,
- new CodeFieldReferenceExpression (flagsType, "NonPublic")
- );
-
- bindingFlags = new CodeBinaryOperatorExpression (
- bindingFlags,
- CodeBinaryOperatorType.BitwiseOr,
- new CodeFieldReferenceExpression (flagsType, "Instance")
- );
- }
-
- public static void GenerateProjectGuiCode (SteticCompilationUnit globalUnit, CodeNamespace globalNs, CodeTypeDeclaration globalType, GenerationOptions options, List units, ProjectBackend[] projects, ArrayList warnings)
- {
- bool multiProject = projects.Length > 1;
-
- // Build method overload that takes a type as parameter.
-
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = "Build";
- globalType.Members.Add (met);
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "cobj"));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(Type), "type"));
- if (multiProject)
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "file"));
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-
- CodeMethodInvokeExpression call = new CodeMethodInvokeExpression (
- new CodeMethodReferenceExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (globalNs.Name + ".Gui", CodeTypeReferenceOptions.GlobalReference)),
- "Build"
- ),
- new CodeArgumentReferenceExpression ("cobj"),
- new CodePropertyReferenceExpression (
- new CodeArgumentReferenceExpression ("type"),
- "FullName"
- )
- );
- if (multiProject)
- call.Parameters.Add (new CodeArgumentReferenceExpression ("file"));
-
- met.Statements.Add (call);
-
- // Generate the build method
-
- met = new CodeMemberMethod ();
- met.Name = "Build";
- globalType.Members.Add (met);
-
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(object), "cobj"));
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "id"));
- if (multiProject)
- met.Parameters.Add (new CodeParameterDeclarationExpression (typeof(string), "file"));
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-
- if (options.GenerateEmptyBuildMethod)
- return;
-
- CodeArgumentReferenceExpression cobj = new CodeArgumentReferenceExpression ("cobj");
- CodeArgumentReferenceExpression cfile = new CodeArgumentReferenceExpression ("file");
- CodeArgumentReferenceExpression cid = new CodeArgumentReferenceExpression ("id");
-
- CodeStatementCollection projectCol = met.Statements;
-
- CodeConditionStatement tcond = new CodeConditionStatement ();
- tcond.Condition = new CodeMethodInvokeExpression (new CodeTypeOfExpression (typeof(Gtk.Widget)), "IsAssignableFrom", cobj);
-
- tcond.TrueStatements.Add (
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (globalNs.Name + ".Gui", CodeTypeReferenceOptions.GlobalReference)),
- "Initialize",
- cobj
- )
- );
-
- // Generate code for each project
-
- foreach (ProjectBackend gp in projects) {
-
- CodeStatementCollection widgetCol;
-
- if (multiProject) {
- CodeConditionStatement pcond = new CodeConditionStatement ();
- pcond.Condition = new CodeBinaryOperatorExpression (
- cfile,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (gp.Id)
- );
- projectCol.Add (pcond);
-
- widgetCol = pcond.TrueStatements;
- projectCol = pcond.FalseStatements;
- } else {
- widgetCol = projectCol;
- }
-
- // Generate top levels
-
- CodeIdentifiers ids = new CodeIdentifiers ();
-
- foreach (Gtk.Widget w in gp.Toplevels) {
- CodeConditionStatement cond = new CodeConditionStatement ();
- cond.Condition = new CodeBinaryOperatorExpression (
- cid,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (w.Name)
- );
- widgetCol.Add (cond);
-
- GenerateComponentCode (w, globalUnit, globalNs, cobj, cond.TrueStatements, globalType, options, units, ids, warnings);
-
- widgetCol = cond.FalseStatements;
- }
-
- // Generate action groups
-
- foreach (Wrapper.ActionGroup agroup in gp.ActionGroups) {
- CodeConditionStatement cond = new CodeConditionStatement ();
- cond.Condition = new CodeBinaryOperatorExpression (
- cid,
- CodeBinaryOperatorType.IdentityEquality,
- new CodePrimitiveExpression (agroup.Name)
- );
- widgetCol.Add (cond);
-
- GenerateComponentCode (agroup, globalUnit, globalNs, cobj, cond.TrueStatements, globalType, options, units, ids, warnings);
-
- widgetCol = cond.FalseStatements;
- }
- }
- }
-
- static CodeMemberMethod GetBuildMethod (string name, string internalClassName, string typeName, SteticCompilationUnit globalUnit, GenerationOptions options, List units)
- {
- SteticCompilationUnit unit;
-
- if (options.GenerateSingleFile)
- unit = globalUnit;
- else {
- unit = new SteticCompilationUnit (name);
- units.Add (unit);
- }
-
- CodeTypeDeclaration type = new CodeTypeDeclaration (internalClassName);
- type.Attributes = MemberAttributes.Private;
- type.TypeAttributes = TypeAttributes.NestedAssembly;
-
- CodeNamespace cns = new CodeNamespace (options.GlobalNamespace + ".SteticGenerated");
- cns.Types.Add (type);
- unit.Namespaces.Add (cns);
-
- // Create the build method for the component
-
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = "Build";
- type.Members.Add (met);
-
- met.Parameters.Add (new CodeParameterDeclarationExpression (new CodeTypeReference (typeName), "cobj"));
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-
- return met;
- }
-
- static void GenerateComponentCode (object component, SteticCompilationUnit globalUnit, CodeNamespace globalNs, CodeExpression cobj, CodeStatementCollection statements, CodeTypeDeclaration globalType, GenerationOptions options, List units, CodeIdentifiers ids, ArrayList warnings)
- {
- Gtk.Widget widget = component as Gtk.Widget;
- Wrapper.Widget wwidget = Stetic.Wrapper.Widget.Lookup (widget);
- Wrapper.ActionGroup agroup = component as Wrapper.ActionGroup;
-
- string name = widget != null ? widget.Name : agroup.Name;
- string internalClassName = ids.MakeUnique (CodeIdentifier.MakeValid (name));
-
- string typeName = widget != null ? wwidget.WrappedTypeName : "Gtk.ActionGroup";
- // Create the build method for the top level
-
- CodeMemberMethod met;
- met = GetBuildMethod (name, internalClassName, typeName, globalUnit, options, units);
-
- // Generate the build code
-
- CodeVariableDeclarationStatement varDecHash = new CodeVariableDeclarationStatement (typeof(System.Collections.Hashtable).ToGlobalTypeRef (), "bindings");
- met.Statements.Add (varDecHash);
- varDecHash.InitExpression = new CodeObjectCreateExpression (
- typeof(System.Collections.Hashtable),
- new CodeExpression [0]
- );
-
- CodeVariableReferenceExpression targetObjectVar = new CodeVariableReferenceExpression ("cobj");
- Stetic.WidgetMap map;
-
- if (widget != null) {
- map = Stetic.CodeGenerator.GenerateCreationCode (globalNs, globalType, widget, targetObjectVar, met.Statements, options, warnings);
- CodeGenerator.BindSignalHandlers (targetObjectVar, wwidget, map, met.Statements, options);
- } else {
- map = Stetic.CodeGenerator.GenerateCreationCode (globalNs, globalType, agroup, targetObjectVar, met.Statements, options, warnings);
- foreach (Wrapper.Action ac in agroup.Actions)
- CodeGenerator.BindSignalHandlers (targetObjectVar, ac, map, met.Statements, options);
- }
-
- GenerateBindFieldCode (met.Statements, cobj);
-
- // Add a method call to the build method
-
- statements.Add (
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (options.GlobalNamespace + ".SteticGenerated." + internalClassName, CodeTypeReferenceOptions.GlobalReference)),
- "Build",
- new CodeCastExpression (typeName.ToGlobalTypeRef (), cobj)
- )
- );
- }
-
- static void GenerateBindFieldCode (CodeStatementCollection statements, CodeExpression cobj)
- {
- // Bind the fields
-
- CodeVariableDeclarationStatement varDecIndex = new CodeVariableDeclarationStatement (typeof(int), "n");
- varDecIndex.InitExpression = new CodePrimitiveExpression (0);
- CodeExpression varIndex = new CodeVariableReferenceExpression ("n");
-
- CodeVariableDeclarationStatement varDecArray = new CodeVariableDeclarationStatement (typeof(FieldInfo[]).ToGlobalTypeRef (), "fields");
- varDecArray.InitExpression = new CodeMethodInvokeExpression (
- new CodeMethodInvokeExpression (
- cobj,
- "GetType",
- new CodeExpression [0]
- ),
- "GetFields",
- bindingFlags
- );
- statements.Add (varDecArray);
- CodeVariableReferenceExpression varArray = new CodeVariableReferenceExpression ("fields");
-
- CodeIterationStatement iteration = new CodeIterationStatement ();
- statements.Add (iteration);
-
- iteration.InitStatement = varDecIndex;
-
- iteration.TestExpression = new CodeBinaryOperatorExpression (
- varIndex,
- CodeBinaryOperatorType.LessThan,
- new CodePropertyReferenceExpression (varArray, "Length")
- );
- iteration.IncrementStatement = new CodeAssignStatement (
- varIndex,
- new CodeBinaryOperatorExpression (
- varIndex,
- CodeBinaryOperatorType.Add,
- new CodePrimitiveExpression (1)
- )
- );
-
- CodeVariableDeclarationStatement varDecField = new CodeVariableDeclarationStatement (typeof(FieldInfo).ToGlobalTypeRef (), "field");
- varDecField.InitExpression = new CodeArrayIndexerExpression (varArray, new CodeExpression [] {varIndex});
- CodeVariableReferenceExpression varField = new CodeVariableReferenceExpression ("field");
- iteration.Statements.Add (varDecField);
-
- CodeVariableDeclarationStatement varDecWidget = new CodeVariableDeclarationStatement (typeof(object), "widget");
- iteration.Statements.Add (varDecWidget);
- varDecWidget.InitExpression = new CodeIndexerExpression (
- new CodeVariableReferenceExpression ("bindings"),
- new CodePropertyReferenceExpression (varField, "Name")
- );
- CodeVariableReferenceExpression varWidget = new CodeVariableReferenceExpression ("widget");
-
- // Make sure the type of the field matches the type of the widget
-
- CodeConditionStatement fcond = new CodeConditionStatement ();
- iteration.Statements.Add (fcond);
- fcond.Condition = new CodeBinaryOperatorExpression (
- new CodeBinaryOperatorExpression (
- varWidget,
- CodeBinaryOperatorType.IdentityInequality,
- new CodePrimitiveExpression (null)
- ),
- CodeBinaryOperatorType.BooleanAnd,
- new CodeMethodInvokeExpression (
- new CodePropertyReferenceExpression (varField, "FieldType"),
- "IsInstanceOfType",
- varWidget
- )
- );
-
- // Set the variable value
-
- fcond.TrueStatements.Add (
- new CodeMethodInvokeExpression (
- varField,
- "SetValue",
- cobj,
- varWidget
- )
- );
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorPartialClass.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorPartialClass.cs
deleted file mode 100644
index 42394285f21..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/CodeGeneratorPartialClass.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-
-using System;
-using System.Reflection;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.Collections;
-using System.IO;
-
-namespace Stetic
-{
- internal static class CodeGeneratorPartialClass
- {
- public static void GenerateProjectGuiCode (SteticCompilationUnit globalUnit, CodeNamespace globalNs, CodeTypeDeclaration globalType, GenerationOptions options, List units, ProjectBackend[] projects, ArrayList warnings)
- {
- // Generate code for each project
- foreach (ProjectBackend gp in projects) {
-
- // Generate top levels
- foreach (Gtk.Widget w in gp.Toplevels)
- GenerateWidgetCode (globalUnit, globalNs, options, units, w, warnings, !options.GenerateModifiedOnly || gp.IsWidgetModified (w.Name));
-
- // Generate global action groups
- foreach (Wrapper.ActionGroup agroup in gp.ActionGroups)
- GenerateGlobalActionGroupCode (globalUnit, globalNs, options, units, agroup, warnings);
- }
- }
-
- static CodeTypeDeclaration CreatePartialClass (SteticCompilationUnit globalUnit, List units, GenerationOptions options, string name)
- {
- SteticCompilationUnit unit;
-
- if (options.GenerateSingleFile)
- unit = globalUnit;
- else {
- unit = new SteticCompilationUnit (name);
- if (units != null)
- units.Add (unit);
- }
-
- string ns = "";
- int i = name.LastIndexOf ('.');
- if (i != -1) {
- ns = name.Substring (0, i);
- name = name.Substring (i+1);
- }
-
- CodeTypeDeclaration type = new CodeTypeDeclaration (name);
- type.IsPartial = true;
- type.Attributes = MemberAttributes.Public;
- type.TypeAttributes = TypeAttributes.Public;
-
- CodeNamespace cns = new CodeNamespace (ns);
- cns.Types.Add (type);
- unit.Namespaces.Add (cns);
- return type;
- }
-
-
- static void GenerateWidgetCode (SteticCompilationUnit globalUnit, CodeNamespace globalNs, GenerationOptions options, List units, Gtk.Widget w, ArrayList warnings, bool regenerateWidgetClass)
- {
- if (options.GenerateSingleFile)
- regenerateWidgetClass = true;
-
- // Don't register this unit if the class doesn't need to be regenerated
- if (!regenerateWidgetClass)
- units = null;
-
- CodeTypeDeclaration type = CreatePartialClass (globalUnit, units, options, w.Name);
-
- // Generate the build method
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = "Build";
- type.Members.Add (met);
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Attributes = MemberAttributes.Family;
-
- Stetic.Wrapper.Widget wwidget = Stetic.Wrapper.Widget.Lookup (w);
-
- if (regenerateWidgetClass) {
-
- if (options.GenerateEmptyBuildMethod) {
- GenerateWrapperFields (type, wwidget);
- return;
- }
-
- met.Statements.Add (
- new CodeMethodInvokeExpression (
- new CodeTypeReferenceExpression (new CodeTypeReference (globalNs.Name + ".Gui", CodeTypeReferenceOptions.GlobalReference)),
- "Initialize",
- new CodeThisReferenceExpression ()
- )
- );
-
- if (wwidget.GeneratePublic)
- type.TypeAttributes = TypeAttributes.Public;
- else
- type.TypeAttributes = TypeAttributes.NotPublic;
-
- if (!String.IsNullOrEmpty (wwidget.UIManagerName))
- type.Members.Add (new CodeMemberField (new CodeTypeReference ("Gtk.UIManager", CodeTypeReferenceOptions.GlobalReference), wwidget.UIManagerName));
- }
-
- // We need to generate the creation code even if regenerateWidgetClass is false because GenerateCreationCode
- // may inject support classes or methods into the global namespace, which is always generated
-
- Stetic.WidgetMap map = Stetic.CodeGenerator.GenerateCreationCode (globalNs, type, w, new CodeThisReferenceExpression (), met.Statements, options, warnings);
-
- if (regenerateWidgetClass)
- CodeGenerator.BindSignalHandlers (new CodeThisReferenceExpression (), wwidget, map, met.Statements, options);
- }
-
- static void GenerateWrapperFields (CodeTypeDeclaration type, ObjectWrapper wrapper)
- {
- foreach (ObjectBindInfo binfo in CodeGenerator.GetFieldsToBind (wrapper)) {
- type.Members.Add (
- new CodeMemberField (
- new CodeTypeReference (binfo.TypeName, CodeTypeReferenceOptions.GlobalReference),
- binfo.Name
- )
- );
- }
- }
-
-
- static void GenerateGlobalActionGroupCode (SteticCompilationUnit globalUnit, CodeNamespace globalNs, GenerationOptions options, List units, Wrapper.ActionGroup agroup, ArrayList warnings)
- {
- CodeTypeDeclaration type = CreatePartialClass (globalUnit, units, options, agroup.Name);
-
- // Generate the build method
-
- CodeMemberMethod met = new CodeMemberMethod ();
- met.Name = "Build";
- type.Members.Add (met);
- met.ReturnType = new CodeTypeReference (typeof(void));
- met.Attributes = MemberAttributes.Public;
-
- Stetic.WidgetMap map = Stetic.CodeGenerator.GenerateCreationCode (globalNs, type, agroup, new CodeThisReferenceExpression (), met.Statements, options, warnings);
-
- foreach (Wrapper.Action ac in agroup.Actions)
- CodeGenerator.BindSignalHandlers (new CodeThisReferenceExpression (), ac, map, met.Statements, options);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Component.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Component.cs
deleted file mode 100644
index 1a1d495ccf7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Component.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-
-using System;
-using System.Collections;
-
-namespace Stetic
-{
- public class Component: MarshalByRefObject, IObjectFrontend
- {
- protected string name;
- protected ComponentType type;
- protected string typeName;
- protected object backend;
- protected Application app;
-
- public event EventHandler Changed;
-
- internal Component (Application app, object backend, string name, ComponentType type)
- {
- this.app = app;
- this.backend = backend;
- this.name = name;
- this.type = type;
- }
-
- public virtual void Dispose ()
- {
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- if (app != null)
- app.DisposeComponent (this);
- }
-
- public SignalCollection GetSignals ()
- {
- if (backend is ObjectWrapper)
- return ((ObjectWrapper)backend).Signals;
- else
- return new SignalCollection ();
- }
-
- public void RemoveSignal (Signal signal)
- {
- if (backend is ObjectWrapper && app != null)
- app.Backend.RemoveWidgetSignal ((ObjectWrapper) backend, signal);
- }
-
- public virtual Component[] GetChildren ()
- {
- return new Component [0];
- }
-
- void IObjectFrontend.NotifyChanged ()
- {
- OnChanged ();
- }
-
- protected virtual void OnChanged ()
- {
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
-
- public virtual string Name {
- get { return name; }
- set { name = value; }
- }
-
- public virtual ComponentType Type {
- get {
- return type;
- }
- }
-
- public virtual bool GeneratePublic {
- get { return true; }
- set {}
- }
-
- internal object Backend {
- get { return backend; }
- }
-
- internal static MarshalByRefObject GetSafeReference (MarshalByRefObject ob)
- {
- // Make sure we don't leak the wrapper type to the frontend process
-
- if (ob is Wrapper.Window) {
- System.Runtime.Remoting.RemotingServices.Marshal (ob, null, typeof(Wrapper.Window));
- } else if (ob is Wrapper.Container) {
- System.Runtime.Remoting.RemotingServices.Marshal (ob, null, typeof(Wrapper.Container));
- } else if (ob is Wrapper.Widget) {
- System.Runtime.Remoting.RemotingServices.Marshal (ob, null, typeof(Wrapper.Widget));
- } else if (ob is ObjectWrapper) {
- System.Runtime.Remoting.RemotingServices.Marshal (ob, null, typeof(ObjectWrapper));
- }
- return ob;
- }
-
- public override string ToString ()
- {
- return base.ToString() + " " + backend;
- }
-
- public ObjectBindInfo[] GetObjectBindInfo ()
- {
- ObjectWrapper ww = backend as ObjectWrapper;
- if (ww != null)
- return app.Backend.GetBoundComponents (ww);
- else
- return new ObjectBindInfo [0];
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentEventHandler.cs
deleted file mode 100644
index d4226f0da72..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentEventHandler.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public delegate void ComponentEventHandler (object sender, ComponentEventArgs args);
- public delegate void ComponentNameEventHandler (object sender, ComponentNameEventArgs args);
- public delegate void ComponentRemovedEventHandler (object sender, ComponentRemovedEventArgs args);
-
- public class ComponentEventArgs: EventArgs
- {
- Project project;
- Component component;
-
- internal ComponentEventArgs (Project p, Component c)
- {
- project = p;
- component = c;
- }
-
- public Project Project {
- get { return project; }
- }
-
- public Component Component {
- get { return component; }
- }
- }
-
- public class ComponentNameEventArgs: ComponentEventArgs
- {
- string oldName;
-
- internal ComponentNameEventArgs (Project p, Component c, string oldName): base (p, c)
- {
- this.oldName = oldName;
- }
-
- public string OldName {
- get { return oldName; }
- }
-
- public string NewName {
- get { return Component.Name; }
- }
- }
-
- public class ComponentRemovedEventArgs: EventArgs
- {
- Project project;
- string componentName;
-
- internal ComponentRemovedEventArgs (Project p, string name)
- {
- project = p;
- componentName = name;
- }
-
- public Project Project {
- get { return project; }
- }
-
- public string ComponentName {
- get { return componentName; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentSignalEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentSignalEventHandler.cs
deleted file mode 100644
index 07c6263a71e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentSignalEventHandler.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public delegate void ComponentSignalEventHandler (object sender, ComponentSignalEventArgs args);
-
- public class ComponentSignalEventArgs: ComponentEventArgs
- {
- public Signal oldSignal;
- public Signal signal;
-
- public ComponentSignalEventArgs (Project p, Component c, Signal oldSignal, Signal signal): base (p, c)
- {
- this.oldSignal = oldSignal;
- this.signal = signal;
- }
-
- public Signal Signal {
- get { return signal; }
- }
-
- public Signal OldSignal {
- get { return oldSignal; }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentType.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentType.cs
deleted file mode 100644
index 47ed725282c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ComponentType.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public class ComponentType
- {
- Application app;
- string name;
- string description;
- string className;
- string category;
- Gdk.Pixbuf icon;
- ActionComponent action;
- string targetGtkVersion;
- string library;
- static ComponentType unknown;
-
- internal ComponentType (Application app, string name, string desc, string className, string category, string targetGtkVersion, string library, Gdk.Pixbuf icon)
- {
- this.app = app;
- this.name = name;
- this.description = desc;
- this.icon = icon;
- this.className = className;
- this.category = category;
- this.targetGtkVersion = targetGtkVersion;
- this.library = library;
- }
-
- internal ComponentType (Application app, ActionComponent action)
- {
- this.action = action;
- this.app = app;
- this.name = action.Name;
- this.description = action.Label != null ? action.Label.Replace ("_", "") : action.Name;
- this.icon = action.Icon;
- this.className = "Gtk.Action";
- this.category = "Actions / " + action.ActionGroup.Name;
- this.targetGtkVersion = "2.4"; // Not version-specific
- }
-
- public string Name {
- get { return name; }
- }
-
- public string ClassName {
- get { return className; }
- }
-
- public string Category {
- get { return category; }
- }
-
- public string Description {
- get { return description; }
- }
-
- public string Library {
- get { return library; }
- }
-
- public Gdk.Pixbuf Icon {
- get { return icon; }
- }
-
- internal ActionComponent Action {
- get { return action; }
- }
-
- internal static ComponentType Unknown {
- get {
- if (unknown == null) {
- unknown = new ComponentType (null, "Unknown", "Unknown", "", "", "2.4", null, WidgetUtils.MissingIcon);
- }
- return unknown;
- }
- }
-
- public object[] InitializationValues {
- get {
- if (app == null)
- return new object [0];
- return app.Backend.GetClassDescriptorInitializationValues (name);
- }
- }
-
- public string TargetGtkVersion {
- get {
- return targetGtkVersion;
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContainerUndoRedoManager.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContainerUndoRedoManager.cs
deleted file mode 100644
index ddfe62d2e74..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContainerUndoRedoManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-
-namespace Stetic
-{
- class ContainerUndoRedoManager: UndoRedoManager
- {
- protected override object GetDiff (ObjectWrapper w)
- {
- // Only track changes in widgets.
- Wrapper.Widget widget = w as Wrapper.Widget;
- if (widget != null) return w.GetUndoDiff ();
- else return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContextMenu.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContextMenu.cs
deleted file mode 100644
index 3b64a286f56..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ContextMenu.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using Gtk;
-using System;
-using System.Collections;
-using System.Reflection;
-using Mono.Unix;
-
-namespace Stetic {
-
- class ContextMenu : Gtk.Menu {
-
- Gtk.Widget widget;
- IEditableObject editable;
-
- public ContextMenu (Placeholder ph)
- {
- MenuItem item;
-
- editable = ph;
- this.widget = ph;
-
- item = LabelItem (ph);
- item.Sensitive = false;
- Add (item);
-
- item = new MenuItem (Catalog.GetString ("_Select"));
- item.Sensitive = false;
- Add (item);
-
- BuildContextMenu (Stetic.Wrapper.Container.LookupParent (ph), true, ph);
- }
-
- public ContextMenu (Stetic.Wrapper.Widget wrapper) : this (wrapper, wrapper.Wrapped) {}
-
- public ContextMenu (Stetic.Wrapper.Widget wrapper, Gtk.Widget context)
- {
- MenuItem item;
-
- editable = wrapper;
- widget = wrapper.Wrapped;
-
- if (widget == context) {
- item = LabelItem (widget);
- item.Sensitive = false;
- Add (item);
- }
-
- item = new MenuItem (Catalog.GetString ("_Select"));
- item.Activated += DoSelect;
- Add (item);
-
- ClassDescriptor klass = wrapper.ClassDescriptor;
- if (klass != null) {
- foreach (ItemDescriptor id in klass.ContextMenu) {
- CommandDescriptor cmd = (CommandDescriptor)id;
- if (!cmd.VisibleFor (widget))
- continue;
- item = new MenuItem (cmd.Label);
- if (cmd.Enabled (widget, context)) {
- Gtk.Widget wdup = widget, cdup = context; // FIXME bxc 75689
- item.Activated += delegate (object o, EventArgs args) {
- cmd.Run (wdup, cdup);
- };
- } else
- item.Sensitive = false;
- Add (item);
- }
- }
-
- BuildContextMenu (wrapper.ParentWrapper, widget == context, context);
- }
-
- void BuildContextMenu (Stetic.Wrapper.Widget parentWrapper, bool top, Widget context)
- {
- MenuItem item;
-
- item = new ImageMenuItem (Gtk.Stock.Cut, null);
- if (editable.CanCut)
- item.Activated += DoCut;
- else
- item.Sensitive = false;
- Add (item);
-
- item = new ImageMenuItem (Gtk.Stock.Copy, null);
- if (editable.CanCopy)
- item.Activated += DoCopy;
- else
- item.Sensitive = false;
- Add (item);
-
- item = new ImageMenuItem (Gtk.Stock.Paste, null);
- if (editable.CanPaste)
- item.Activated += DoPaste;
- else
- item.Sensitive = false;
- Add (item);
-
- if (editable.CanDelete) {
- item = new ImageMenuItem (Gtk.Stock.Delete, null);
- item.Activated += DoDelete;
- Add (item);
- }
-
- if (top) {
- for (; parentWrapper != null; parentWrapper = parentWrapper.ParentWrapper) {
- Add (new SeparatorMenuItem ());
-
- item = LabelItem (parentWrapper.Wrapped);
- item.Submenu = new ContextMenu (parentWrapper, context);
- Add (item);
- }
- }
-
- ShowAll ();
- }
-
- protected override void OnSelectionDone ()
- {
- Destroy ();
- }
-
- void DoSelect (object obj, EventArgs args)
- {
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (widget);
- if (wrapper != null)
- wrapper.Select ();
- }
-
- void DoCut (object obj, EventArgs args)
- {
- editable.Cut ();
- }
-
- void DoCopy (object obj, EventArgs args)
- {
- editable.Copy ();
- }
-
- void DoPaste (object obj, EventArgs args)
- {
- editable.Paste ();
- }
-
- void DoDelete (object obj, EventArgs args)
- {
- editable.Delete ();
- }
-
- static MenuItem LabelItem (Gtk.Widget widget)
- {
- ImageMenuItem item;
- Label label;
-
- label = new Label (widget is Placeholder ? Catalog.GetString ("Placeholder") : widget.Name);
- label.UseUnderline = false;
- label.SetAlignment (0.0f, 0.5f);
- item = new ImageMenuItem ();
- item.Add (label);
-
- Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (widget);
-
- if (wrapper != null) {
- ClassDescriptor klass = wrapper.ClassDescriptor;
- if (klass != null) {
- Gdk.Pixbuf pixbuf = klass.Icon;
- int width, height;
- Gtk.Icon.SizeLookup (Gtk.IconSize.Menu, out width, out height);
- item.Image = new Gtk.Image (pixbuf.ScaleSimple (width, height, Gdk.InterpType.Bilinear));
- }
- }
-
- return item;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Designer.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Designer.cs
deleted file mode 100644
index 21aaf500c73..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Designer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Designer.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-
-namespace Stetic
-{
- public abstract class Designer: PluggableWidget
- {
- protected Designer (Application app): base (app)
- {
- }
-
- internal virtual void SetActive ()
- {
- }
-
- public abstract ProjectItemInfo ProjectItem { get; }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Glade.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Glade.cs
deleted file mode 100644
index da4bd13d3f0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Glade.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Xml;
-using System.Collections;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-
-using Gtk;
-
-namespace Stetic {
-
- internal static class GladeFiles {
-
- public static void Import (ProjectBackend project, string filename)
- {
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- doc.XmlResolver = null;
- doc.Load (filename);
- project.SetFileName (filename);
- project.Id = System.IO.Path.GetFileName (filename);
- doc = GladeUtils.XslImportTransform (doc);
-
- XmlNode node = doc.SelectSingleNode ("/glade-interface");
- if (node == null)
- throw new ApplicationException (Catalog.GetString ("Not a glade file according to node name."));
-
- ObjectReader reader = new ObjectReader (project, FileFormat.Glade);
- foreach (XmlElement toplevel in node.SelectNodes ("widget")) {
- Wrapper.Container wrapper = Stetic.ObjectWrapper.ReadObject (reader, toplevel) as Wrapper.Container;
- if (wrapper != null)
- project.AddWidget ((Gtk.Widget)wrapper.Wrapped);
- }
- }
-
- public static void Export (ProjectBackend project, string filename)
- {
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
-
- XmlElement toplevel = doc.CreateElement ("glade-interface");
- doc.AppendChild (toplevel);
-
- ObjectWriter owriter = new ObjectWriter (doc, FileFormat.Glade);
- foreach (Widget w in project.Toplevels) {
- Stetic.Wrapper.Container wrapper = Stetic.Wrapper.Container.Lookup (w);
- if (wrapper == null)
- continue;
-
- XmlElement elem = wrapper.Write (owriter);
- if (elem != null)
- toplevel.AppendChild (elem);
- }
-
- doc = GladeUtils.XslExportTransform (doc);
-
- XmlTextWriter writer = new XmlTextWriter (filename, EncodingUtility.UTF8NoBom);
- writer.Formatting = Formatting.Indented;
- doc.Save (writer);
- writer.Close ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Grid.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Grid.cs
deleted file mode 100644
index bb81cfb8d1e..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Grid.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-using Gtk;
-using System;
-using System.Collections;
-
-namespace Stetic {
-
- internal class Grid : Gtk.Container {
-
- public Grid () : base ()
- {
- Stetic.Editor.GtkWorkarounds.FixContainerLeak (this);
-
- BorderWidth = 2;
- WidgetFlags |= WidgetFlags.NoWindow;
- lines = new ArrayList ();
- group = null;
- }
-
- // Padding constants
- const int groupPad = 6;
- const int hPad = 6;
- const int linePad = 3;
-
- // Theme-based sizes; computed at first SizeRequest
- static int indent = -1;
- static int lineHeight = -1;
-
- Grid[] group;
- public static void Connect (params Grid[] grids)
- {
- for (int i = 0; i < grids.Length; i++) {
- grids[i].group = new Grid[grids.Length - 1];
- Array.Copy (grids, 0, grids[i].group, 0, i);
- Array.Copy (grids, i + 1, grids[i].group, i, grids.Length - i - 1);
- }
- }
-
- class Pair {
- Gtk.Widget label;
- Gtk.Widget editor;
-
- public Pair (Grid grid, string name, Widget editor) : this (grid, name, editor, null) {}
-
- public Pair (Grid grid, string name, Widget editor, string description)
- {
- Gtk.Label l = new Label (name);
- l.UseMarkup = true;
- l.Justify = Justification.Left;
- l.Xalign = 0;
- l.Show ();
-
- if (description == null)
- label = l;
- else {
- Gtk.EventBox ebox = new Gtk.EventBox ();
- ebox.Add (l);
- ebox.Show ();
- ebox.TooltipText = description;
- label = ebox;
- }
- label.Parent = grid;
-
- this.editor = editor;
- editor.Parent = grid;
- editor.Show ();
- }
-
- public Widget Label {
- get {
- return label;
- }
- }
-
- public Widget Editor {
- get {
- return editor;
- }
- }
- }
-
- // list of widgets and Stetic.Grid.Pairs
- ArrayList lines;
-
- public void Append (Widget w)
- {
- w.Parent = this;
- w.Show ();
-
- lines.Add (w);
- QueueDraw ();
- }
-
- public void Append (Widget w, string description)
- {
- if ((w.WidgetFlags & WidgetFlags.NoWindow) != 0) {
- Gtk.EventBox ebox = new Gtk.EventBox ();
- ebox.Add (w);
- ebox.Show ();
- w = ebox;
- }
- w.Parent = this;
- w.Show ();
- w.TooltipText = description;
- lines.Add (w);
- QueueDraw ();
- }
-
- public void AppendLabel (string text)
- {
- Gtk.Label label = new Label (text);
- label.UseMarkup = true;
- label.Justify = Justification.Left;
- label.Xalign = 0;
- Append (label);
- }
-
- public void AppendGroup (string name, bool expanded)
- {
- Gtk.Expander exp = new Expander ("" + name + "");
- exp.UseMarkup = true;
- exp.Expanded = expanded;
- exp.AddNotification ("expanded", ExpansionChanged);
- Append (exp);
- }
-
- public void AppendPair (string label, Widget editor, string description)
- {
- Stetic.Grid.Pair pair = new Pair (this, label, editor, description);
- lines.Add (pair);
- QueueDraw ();
- }
-
- protected override void OnRemoved (Widget w)
- {
- w.Unparent ();
- }
-
- void ExpansionChanged (object obj, GLib.NotifyArgs args)
- {
- Gtk.Expander exp = obj as Gtk.Expander;
-
- int ind = lines.IndexOf (exp);
- if (ind == -1)
- return;
-
- ind++;
- while (ind < lines.Count && !(lines[ind] is Gtk.Expander)) {
- if (lines[ind] is Widget) {
- Widget w = (Widget)lines[ind];
- if (exp.Expanded)
- w.Show ();
- else
- w.Hide ();
- } else if (lines[ind] is Pair) {
- Pair p = (Pair)lines[ind];
- if (exp.Expanded) {
- p.Label.Show ();
- p.Editor.Show ();
- } else {
- p.Label.Hide ();
- p.Editor.Hide ();
- }
- }
- ind++;
- }
-
- QueueDraw ();
- }
-
- protected void Clear ()
- {
- foreach (object obj in lines) {
- if (obj is Widget)
- ((Widget)obj).Destroy ();
- else if (obj is Pair) {
- Pair p = (Pair)obj;
- p.Label.Destroy ();
- p.Editor.Destroy ();
- }
- }
-
- lines.Clear ();
- }
-
- protected override void ForAll (bool include_internals, Gtk.Callback callback)
- {
- if (!include_internals)
- return;
-
- foreach (object obj in lines) {
- if (obj is Widget)
- callback ((Widget)obj);
- else if (obj is Pair) {
- Pair p = (Pair)obj;
- callback (p.Label);
- callback (p.Editor);
- }
- }
- }
-
- // These are figured out at requisition time and used again at
- // allocation time.
- int lwidth, ewidth;
-
- void SizeRequestGrid (Grid grid, ref Gtk.Requisition req)
- {
- bool visible = true;
-
- req.Width = req.Height = 0;
- foreach (object obj in grid.lines) {
- if (obj is Expander) {
- Gtk.Widget w = (Gtk.Widget)obj;
- Gtk.Requisition childreq;
-
- childreq = w.SizeRequest ();
- if (req.Width < childreq.Width)
- req.Width = childreq.Width;
- req.Height += groupPad + childreq.Height;
-
- visible = ((Gtk.Expander)obj).Expanded;
-
- if (indent == -1) {
- // Seems like there should be an easier way...
- int focusWidth = (int)w.StyleGetProperty ("focus-line-width");
- int focusPad = (int)w.StyleGetProperty ("focus-padding");
- int expanderSize = (int)w.StyleGetProperty ("expander-size");
- int expanderSpacing = (int)w.StyleGetProperty ("expander-spacing");
- indent = focusWidth + focusPad + expanderSize + 2 * expanderSpacing;
- }
- } else if (obj is Widget) {
- Gtk.Widget w = (Gtk.Widget)obj;
- Gtk.Requisition childreq;
-
- childreq = w.SizeRequest ();
- if (lwidth < childreq.Width)
- lwidth = childreq.Width;
- if (visible)
- req.Height += linePad + childreq.Height;
- } else if (obj is Pair) {
- Pair p = (Pair)obj;
- Gtk.Requisition lreq, ereq;
-
- lreq = p.Label.SizeRequest ();
- ereq = p.Editor.SizeRequest ();
-
- if (lineHeight == -1)
- lineHeight = (int)(1.5 * lreq.Height);
-
- if (lreq.Width > lwidth)
- lwidth = lreq.Width;
- if (ereq.Width > ewidth)
- ewidth = ereq.Width;
-
- if (visible)
- req.Height += Math.Max (lineHeight, ereq.Height) + linePad;
- }
- }
-
- req.Width = Math.Max (req.Width, indent + lwidth + hPad + ewidth);
- req.Height += 2 * (int)BorderWidth;
- req.Width += 2 * (int)BorderWidth;
- }
-
- protected override void OnSizeRequested (ref Gtk.Requisition req)
- {
- lwidth = ewidth = 0;
-
- if (group != null) {
- foreach (Grid grid in group)
- SizeRequestGrid (grid, ref req);
- }
-
- SizeRequestGrid (this, ref req);
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle alloc)
- {
- int xbase = alloc.X + (int)BorderWidth;
- int ybase = alloc.Y + (int)BorderWidth;
-
- base.OnSizeAllocated (alloc);
-
- int y = ybase;
- bool visible = true;
-
- foreach (object obj in lines) {
- if (!visible && !(obj is Expander))
- continue;
-
- if (obj is Widget) {
- Gtk.Widget w = (Gtk.Widget)obj;
- if (!w.Visible)
- continue;
-
- Gdk.Rectangle childalloc;
- Gtk.Requisition childreq;
-
- childreq = w.ChildRequisition;
-
- if (obj is Expander) {
- childalloc.X = xbase;
- childalloc.Width = alloc.Width - 2 * (int)BorderWidth;
- visible = ((Gtk.Expander)obj).Expanded;
- y += groupPad;
- } else {
- childalloc.X = xbase + indent;
- childalloc.Width = lwidth;
- y += linePad;
- }
- childalloc.Y = y;
- childalloc.Height = childreq.Height;
- w.SizeAllocate (childalloc);
-
- y += childalloc.Height;
- } else if (obj is Pair) {
- Pair p = (Pair)obj;
- if (!p.Editor.Visible) {
- p.Label.Hide ();
- continue;
- } else if (!p.Label.Visible)
- p.Label.Show ();
-
- Gtk.Requisition lreq, ereq;
- Gdk.Rectangle lalloc, ealloc;
-
- lreq = p.Label.ChildRequisition;
- ereq = p.Editor.ChildRequisition;
-
- lalloc.X = xbase + indent;
- if (ereq.Height < lineHeight * 2)
- lalloc.Y = y + (ereq.Height - lreq.Height) / 2;
- else
- lalloc.Y = y + (lineHeight - lreq.Height) / 2;
- lalloc.Width = lwidth;
- lalloc.Height = lreq.Height;
- p.Label.SizeAllocate (lalloc);
-
- ealloc.X = lalloc.X + lwidth + hPad;
- ealloc.Y = y + Math.Max (0, (lineHeight - ereq.Height) / 2);
- ealloc.Width = Math.Max (ewidth, alloc.Width - 2 * (int)BorderWidth - ealloc.X);
- ealloc.Height = ereq.Height;
- p.Editor.SizeAllocate (ealloc);
-
- y += Math.Max (ereq.Height, lineHeight) + linePad;
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSink.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSink.cs
deleted file mode 100644
index 9bf683e2337..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSink.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-
-using System;
-using System.Threading;
-using System.IO;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Messaging;
-using System.Collections;
-
-namespace Stetic
-{
- public class GuiDispatchServerSink: IServerChannelSink, IChannelSinkBase
- {
- IServerChannelSink nextSink;
-
- public GuiDispatchServerSink (IServerChannelSink nextSink, IChannelReceiver receiver)
- {
- this.nextSink = nextSink;
- }
-
- public IServerChannelSink NextChannelSink {
- get { return nextSink; }
- }
-
- public IDictionary Properties {
- get { return null; }
- }
-
- public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
- IMessage msg, ITransportHeaders headers, Stream stream)
-
- {
- sinkStack.AsyncProcessResponse (msg, headers, stream);
- }
-
- public Stream GetResponseStream (IServerResponseChannelSinkStack sinkStack, object state,
- IMessage msg, ITransportHeaders headers)
- {
- // this method shouldn't be called
- throw new NotSupportedException ();
- }
-
- public ServerProcessing ProcessMessage (IServerChannelSinkStack sinkStack,
- IMessage requestMsg, ITransportHeaders requestHeaders, Stream requestStream,
- out IMessage responseMsg, out ITransportHeaders responseHeaders, out Stream responseStream)
- {
- IMethodCallMessage msg = (IMethodCallMessage) requestMsg;
-// Console.WriteLine ("MESSAGE: " + msg.TypeName + " - " + msg.MethodName);
-
- sinkStack.Push (this, null);
-
- if (Attribute.IsDefined (msg.MethodBase, typeof(NoGuiDispatchAttribute))) {
- ServerProcessing ret;
- try {
- ret = nextSink.ProcessMessage (sinkStack,
- requestMsg,
- requestHeaders,
- requestStream,
- out responseMsg,
- out responseHeaders,
- out responseStream);
- } finally {
- sinkStack.Pop (this);
- }
- return ret;
- }
- else
- {
- Dispatcher d = new Dispatcher ();
- d.nextSink = nextSink;
- d.sinkStack = sinkStack;
- d.requestMsg = requestMsg;
- d.requestHeaders = requestHeaders;
- d.requestStream = requestStream;
-
- Gtk.Application.Invoke (d.Dispatch);
- responseMsg = null;
- responseHeaders = null;
- responseStream = null;
-
- return ServerProcessing.Async;
- }
- }
-
- class Dispatcher
- {
- public IServerChannelSink nextSink;
-
- public IServerChannelSinkStack sinkStack;
- public IMessage requestMsg;
- public ITransportHeaders requestHeaders;
- public Stream requestStream;
-
- public void Dispatch (object o, EventArgs a)
- {
- IMessage responseMsg;
- ITransportHeaders responseHeaders = null;
- Stream responseStream = null;
-
- try {
- nextSink.ProcessMessage (sinkStack,
- requestMsg,
- requestHeaders,
- requestStream,
- out responseMsg,
- out responseHeaders,
- out responseStream);
- }
- catch (Exception ex) {
- responseMsg = new ReturnMessage (ex, (IMethodCallMessage)requestMsg);
- }
-
- sinkStack.AsyncProcessResponse (responseMsg, responseHeaders, responseStream);
- }
- }
- }
-
- class GuiDispatch
- {
- public static void InvokeSync (EventHandler h)
- {
- if (GLib.MainContext.Depth > 0)
- h (null, null);
- else {
- object wo = new object ();
- lock (wo) {
- Gtk.Application.Invoke ((o, args) => {
- try {
- h (null, null);
- } finally {
- lock (wo) {
- System.Threading.Monitor.PulseAll (wo);
- }
- }
- });
- System.Threading.Monitor.Wait (wo);
- }
- }
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSinkProvider.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSinkProvider.cs
deleted file mode 100644
index d35c2b39503..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/GuiDispatchServerSinkProvider.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-using System;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-
-namespace Stetic
-{
- public class GuiDispatchServerSinkProvider: IServerFormatterSinkProvider, IServerChannelSinkProvider
- {
- private IServerChannelSinkProvider next;
-
- public IServerChannelSinkProvider Next {
- get { return next; }
- set { next = value; }
- }
-
- public IServerChannelSink CreateSink (IChannelReceiver channel)
- {
- IServerChannelSink chain = next.CreateSink (channel);
- GuiDispatchServerSink sink = new GuiDispatchServerSink (chain, channel);
- return sink;
- }
-
- public void GetChannelData (IChannelDataStore channelData)
- {
- if(next != null)
- next.GetChannelData(channelData);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/LibraryCache.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/LibraryCache.cs
deleted file mode 100644
index 4185b16ae27..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/LibraryCache.cs
+++ /dev/null
@@ -1,798 +0,0 @@
-// LibraryCache.cs : Assembly file caching class
-//
-// Author: Mike Kestner
-//
-// Copyright (c) 2008 Novell, Inc
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using ENV = System.Environment;
-using Mono.Cecil;
-
-namespace Stetic {
-
- public class LibraryCache {
-
- public class LibraryInfo {
-
- public LibraryInfo () {}
-
- string file;
- Guid guid;
- DateTime timestamp;
- XmlDocument gui;
- XmlDocument objects;
-
- string CacheDirectory {
- get { return Path.Combine (dir, Guid.ToString ()); }
- }
-
- [XmlAttribute]
- public string File {
- get { return file; }
- set { file = value; }
- }
-
- [XmlAttribute]
- public Guid Guid {
- get { return guid; }
- set {
- string path = Path.Combine (dir, guid.ToString ());
- if (Directory.Exists (path))
- Directory.Delete (path, true);
- guid = value;
- }
- }
-
- public bool IsCurrent {
- get {
- return Timestamp == System.IO.File.GetLastWriteTime (file).ToUniversalTime ();
- }
- }
-
- [XmlIgnore]
- public XmlDocument GuiDocument {
- get {
- if (gui == null) {
- if (System.IO.File.Exists (GuiPath)) {
- try {
- gui = new XmlDocument ();
- using (Stream stream = System.IO.File.Open (GuiPath, FileMode.Open))
- gui.Load (stream);
- } catch (Exception) {
- gui = null;
- }
- }
- }
- return gui;
- }
- set {
- gui = value;
- WriteGuiFile ();
- }
- }
-
- string GuiPath {
- get { return Path.Combine (CacheDirectory, "steticGui"); }
- }
-
- public bool HasWidgets {
- get { return System.IO.File.Exists (ObjectsPath); }
- }
-
- [XmlIgnore]
- public XmlDocument ObjectsDocument {
- get {
- if (objects == null) {
- if (System.IO.File.Exists (ObjectsPath)) {
- try {
- objects = new XmlDocument ();
- using (Stream stream = System.IO.File.Open (ObjectsPath, FileMode.Open))
- objects.Load (stream);
- } catch (Exception) {
- objects = null;
- }
- }
- }
- return objects;
- }
- set {
- objects = value;
- WriteObjectsFile ();
- if (objects == null && gui != null)
- GuiDocument = null;
- }
- }
-
- internal ToolboxItemInfo GetToolboxItem (string name, string asmName)
- {
- XmlDocument doc = ObjectsDocument;
- if (doc != null) {
- XmlElement elem = (XmlElement) doc.SelectSingleNode ("/objects/object[@type='" + name + "']");
- if (elem == null)
- elem = (XmlElement) doc.SelectSingleNode ("/objects/object[@type='" + name + "," + asmName + "']");
- if (elem != null) {
- ToolboxItemInfo info = new ToolboxItemInfo (elem.GetAttribute ("base-type"));
- info.PaletteCategory = elem.GetAttribute ("palette-category");
- return info;
- }
-
- }
- return null;
- }
-
- string ObjectsPath {
- get { return Path.Combine (CacheDirectory, "objects"); }
- }
-
- [XmlAttribute]
- public DateTime Timestamp {
- get { return timestamp; }
- set { timestamp = value; }
- }
-
- void WriteGuiFile ()
- {
- if (gui == null) {
- if (System.IO.File.Exists (GuiPath))
- System.IO.File.Delete (GuiPath);
- return;
- }
- if (!Directory.Exists (CacheDirectory))
- Directory.CreateDirectory (CacheDirectory);
-
- using (Stream stream = System.IO.File.Create (GuiPath))
- gui.Save (stream);
- }
-
- public void WriteObjectsFile ()
- {
- if (objects == null) {
- if (System.IO.File.Exists (ObjectsPath))
- System.IO.File.Delete (ObjectsPath);
- return;
- }
-
- if (!Directory.Exists (CacheDirectory))
- Directory.CreateDirectory (CacheDirectory);
-
- using (Stream stream = System.IO.File.Create (ObjectsPath))
- objects.Save (stream);
- }
-
- public event EventHandler Changed;
-
- public void OnChanged ()
- {
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
- }
-
- static string dir = Path.Combine (Path.Combine (ENV.GetFolderPath (ENV.SpecialFolder.ApplicationData), "stetic"), "library-cache");
-
- public class LibraryInfoCollection : IEnumerable {
-
- Dictionary libs = new Dictionary ();
-
- public LibraryInfo this [string path] {
- get {
- path = Path.GetFullPath (path);
- if (libs.ContainsKey (path))
- return libs [path];
- return null;
- }
- }
-
- public void Add (object obj)
- {
- Add (obj as LibraryInfo);
- }
-
- public void Add (LibraryInfo info)
- {
- libs [info.File] = info;
- }
-
- public IEnumerator GetEnumerator ()
- {
- return libs.Values.GetEnumerator ();
- }
-
- public void Remove (string file)
- {
- file = Path.GetFullPath (file);
- libs.Remove (file);
- }
- }
-
- public static LibraryCache Cache = Load ();
-
- [XmlArray]
- [XmlArrayItem (ElementName="LibraryInfo", Type=typeof(LibraryInfo))]
- public LibraryInfoCollection Members = new LibraryInfoCollection ();
-
- public LibraryCache () {}
-
- public LibraryInfo this [string file] {
- get {
- file = Path.GetFullPath (file);
- if (IsCurrent (file))
- return Members [file];
-
- Refresh (null, file);
- return Members [file];
- }
- }
-
- public bool IsCurrent (string file)
- {
- file = Path.GetFullPath (file);
- LibraryInfo info = Members [file];
- return info != null && info.Timestamp == File.GetLastWriteTime (file).ToUniversalTime ();
- }
-
- EmbeddedResource GetResource (AssemblyDefinition asm, string name)
- {
- foreach (Resource res in asm.MainModule.Resources) {
- EmbeddedResource eres = res as EmbeddedResource;
- if (eres != null && eres.Name == name)
- return eres;
- }
- return null;
- }
-
- void AddDependencies (XmlElement elem, AssemblyResolver resolver, string filename, AssemblyDefinition asm)
- {
- string dir = Path.GetDirectoryName (filename);
- foreach (AssemblyNameReference aref in asm.MainModule.AssemblyReferences) {
- LibraryInfo info = GetInfo (resolver, aref.FullName, dir);
- if (info != null && info.HasWidgets) {
- XmlElement edep = elem.OwnerDocument.CreateElement ("dependency");
- edep.InnerText = info.File;
- elem.AppendChild (edep);
- }
- }
- }
-
- XmlDocument GetGuiDoc (AssemblyDefinition adef)
- {
- XmlDocument doc = null;
- try {
- EmbeddedResource res = GetResource (adef, "gui.stetic");
- if (res != null) {
- MemoryStream stream = new MemoryStream (res.GetResourceData ());
- doc = new XmlDocument ();
- using (stream)
- doc.Load (stream);
- }
- } catch {
- doc = null;
- }
-
- return doc;
- }
-
- bool ReferenceChainContainsGtk (AssemblyResolver resolver, AssemblyNameReference aref, Hashtable visited)
- {
- if (aref.Name == "gtk-sharp")
- return true;
- else if (visited.Contains (aref.Name))
- return false;
-
- visited [aref.Name] = aref;
-
- AssemblyDefinition adef = resolver.Resolve (aref);
- if (adef == null)
- return false;
-
- foreach (AssemblyNameReference child in adef.MainModule.AssemblyReferences)
- if (ReferenceChainContainsGtk (resolver, child, visited))
- return true;
-
- return false;
- }
-
- internal class ToolboxItemInfo {
-
- public ToolboxItemInfo (string base_type)
- {
- BaseType = base_type;
- }
-
- public string BaseType;
- public string PaletteCategory;
- }
-
- ToolboxItemInfo GetToolboxItemInfo (AssemblyResolver resolver, string baseDirectory, AssemblyDefinition asm, TypeDefinition tdef, bool checkBaseType)
- {
- if (tdef == null)
- return null;
-
- ToolboxItemInfo info = null;
- string category = "General";
-
- foreach (CustomAttribute attr in tdef.CustomAttributes) {
- switch (attr.AttributeType.FullName) {
- case "System.ComponentModel.ToolboxItemAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param == null)
- return null;
- else if (param.GetType () == typeof (bool)) {
- if ((bool) param)
- info = new ToolboxItemInfo ("Gtk.Widget");
- else
- return null;
- } else if (param.GetType () == typeof (TypeReference))
- info = new ToolboxItemInfo ("Gtk.Widget");
- else
- return null;
- }
- break;
- case "System.ComponentModel.CategoryAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (string))
- category = (string) param;
- }
- break;
- default:
- continue;
- }
- }
-
- if (info == null && checkBaseType && tdef.BaseType != null) {
- string baseName = tdef.BaseType.FullName;
-
- foreach (AssemblyNameReference aref in asm.MainModule.AssemblyReferences) {
- LibraryInfo libInfo = GetInfo (resolver, aref.FullName, baseDirectory);
- if (libInfo != null && libInfo.HasWidgets) {
- ToolboxItemInfo binfo = libInfo.GetToolboxItem (baseName, aref.Name);
- if (binfo != null) {
- info = new ToolboxItemInfo (baseName);
- category = binfo.PaletteCategory;
- break;
- }
- }
- }
- }
-
- if (info != null)
- info.PaletteCategory = category;
-
- return info;
- }
-
- XmlElement GetItemGroup (XmlElement groups, string cat, string default_label)
- {
- XmlElement group;
-
- if (String.IsNullOrEmpty (cat))
- group = (XmlElement) groups.SelectSingleNode ("itemgroup[(not(@name) or @name='') and not(@ref)]");
- else
- group = (XmlElement) groups.SelectSingleNode ("itemgroup[@name='" + cat + "']");
-
- if (group == null) {
- group = groups.OwnerDocument.CreateElement ("itemgroup");
- if (String.IsNullOrEmpty (cat))
- group.SetAttribute ("label", default_label);
- else {
- group.SetAttribute ("name", cat);
- group.SetAttribute ("label", cat);
- }
- groups.AppendChild (group);
- }
- return group;
- }
-
- void AddProperty (PropertyDefinition prop, string cat, bool translatable, XmlElement obj)
- {
- XmlElement groups = obj ["itemgroups"];
- if (groups == null) {
- groups = obj.OwnerDocument.CreateElement ("itemgroups");
- obj.AppendChild (groups);
- }
-
- XmlElement group = GetItemGroup (groups, cat, prop.DeclaringType.Name + " Properties");
- XmlElement elem = group.OwnerDocument.CreateElement ("property");
- if (translatable)
- elem.SetAttribute ("translatable", "yes");
- elem.SetAttribute ("name", prop.Name);
- group.AppendChild (elem);
- }
-
- static string[] supported_types = new string[] {
- "System.Boolean",
- "System.Char",
- "System.SByte",
- "System.Byte",
- "System.Int16",
- "System.UInt16",
- "System.Int32",
- "System.UInt32",
- "System.Int64",
- "System.UInt64",
- "System.Decimal",
- "System.Single",
- "System.Double",
- "System.DateTime",
- "System.String",
- "System.String[]",
- "System.TimeSpan",
- "Gtk.Adjustment",
- };
-
- void AddProperties (TypeDefinition tdef, XmlElement obj)
- {
- foreach (PropertyDefinition prop in tdef.Properties) {
- if (prop.GetMethod == null || !prop.GetMethod.IsPublic || prop.SetMethod == null || !prop.SetMethod.IsPublic)
- continue;
-
- else if (Array.IndexOf (supported_types, prop.PropertyType.FullName) < 0)
- continue;
-
- bool browsable = true;
- bool translatable = false;
- string category = String.Empty;
- foreach (CustomAttribute attr in prop.CustomAttributes) {
- switch (attr.Constructor.DeclaringType.FullName) {
- case "System.ComponentModel.BrowsableAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (bool))
- browsable = (bool) param;
- }
- break;
- case "System.ComponentModel.CategoryAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (string))
- category = (string) param;
- }
- break;
- case "System.ComponentModel.LocalizableAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (bool))
- translatable = (bool) param;
- }
- break;
- default:
- continue;
- }
- if (!browsable)
- break;
- }
- if (browsable)
- AddProperty (prop, category, translatable, obj);
- }
- }
-
- void AddEvent (EventDefinition ev, string cat, XmlElement obj)
- {
- XmlElement groups = obj ["signals"];
- if (groups == null) {
- groups = obj.OwnerDocument.CreateElement ("signals");
- obj.AppendChild (groups);
- }
-
- XmlElement group = GetItemGroup (groups, cat, ev.DeclaringType.Name + " Signals");
- XmlElement elem = group.OwnerDocument.CreateElement ("signal");
- elem.SetAttribute ("name", ev.Name);
- group.AppendChild (elem);
- }
-
- void AddEvents (TypeDefinition tdef, XmlElement obj)
- {
- foreach (EventDefinition ev in tdef.Events) {
- if (ev.AddMethod == null || !ev.AddMethod.IsPublic)
- continue;
- bool browsable = true;
- string category = String.Empty;
- foreach (CustomAttribute attr in ev.CustomAttributes) {
- switch (attr.Constructor.DeclaringType.FullName) {
- case "System.ComponentModel.BrowsableAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (bool))
- browsable = (bool) param;
- }
- break;
- case "System.ComponentModel.CategoryAttribute":
- if (attr.ConstructorArguments.Count > 0) {
- object param = attr.ConstructorArguments [0].Value;
- if (param.GetType () == typeof (string))
- category = (string) param;
- }
- break;
- default:
- continue;
- }
- if (!browsable)
- break;
- }
- if (browsable)
- AddEvent (ev, category, obj);
- }
- }
-
- void AddObject (TypeDefinition tdef, Dictionary localObjects, AssemblyResolver resolver, string basePath, AssemblyDefinition adef)
- {
- if (tdef.IsAbstract || !tdef.IsClass)
- return;
-
- ToolboxItemInfo tbinfo = GetToolboxItemInfo (resolver, basePath, adef, tdef, true);
- if (tbinfo == null)
- return;
-
- localObjects [tdef] = tbinfo;
-
- foreach (var nestedType in tdef.NestedTypes)
- AddObject (nestedType, localObjects, resolver, basePath, adef);
- }
-
- void AddObjects (XmlDocument doc, AssemblyResolver resolver, string basePath, AssemblyDefinition adef)
- {
- Dictionary localObjects = new Dictionary ();
-
- foreach (TypeDefinition tdef in adef.MainModule.Types) {
- AddObject (tdef, localObjects, resolver, basePath, adef);
- }
-
- foreach (KeyValuePair item in localObjects) {
- TypeDefinition tdef = item.Key;
- ToolboxItemInfo tbinfo = item.Value;
- XmlElement elem = doc.CreateElement ("object");
- elem.SetAttribute ("type", tdef.FullName);
- elem.SetAttribute ("allow-children", "false");
- elem.SetAttribute ("palette-category", tbinfo.PaletteCategory);
- if (tdef.IsNotPublic)
- elem.SetAttribute ("internal", "true");
- doc.DocumentElement.AppendChild (elem);
-
- TypeDefinition curDef = tdef;
- while (curDef != null && curDef.FullName != tbinfo.BaseType) {
- if (curDef != tdef && localObjects.ContainsKey (curDef)) {
- tbinfo.BaseType = curDef.FullName;
- break;
- }
- else if (curDef.Module.Assembly.Name.Name == "gtk-sharp") {
- tbinfo.BaseType = curDef.FullName;
- break;
- }
- else if (curDef != tdef && GetToolboxItemInfo (resolver, basePath, curDef.Module.Assembly, curDef, false) != null) {
- tbinfo.BaseType = curDef.FullName;
- break;
- }
- if (curDef.Module.Assembly != adef) {
-
- LibraryInfo li = Refresh (resolver, curDef.Module.FileName, basePath);
- if (li.HasWidgets && li.GetToolboxItem (curDef.FullName, curDef.Module.Assembly.Name.Name) != null) {
- tbinfo.BaseType = curDef.FullName;
- break;
- }
- }
- AddProperties (curDef, elem);
- AddEvents (curDef, elem);
- if (curDef.BaseType != null && curDef.BaseType.FullName != tbinfo.BaseType)
- curDef = FindTypeDefinition (resolver, adef, basePath, curDef.BaseType.FullName);
- else
- curDef = null;
- }
-
- elem.SetAttribute ("base-type", tbinfo.BaseType);
- }
- }
-
- XmlDocument GetObjectsDoc (AssemblyResolver resolver, AssemblyDefinition adef, string path, string baseDirectory)
- {
- XmlDocument doc = null;
- bool isMainLib = Path.GetFileName (path) == "libstetic.dll";
-
- try {
- EmbeddedResource res = GetResource (adef, "objects.xml");
- if (res != null) {
- MemoryStream stream = new MemoryStream (res.GetResourceData ());
- doc = new XmlDocument ();
- using (stream)
- doc.Load (stream);
- }
-
- if (resolver == null)
- resolver = new AssemblyResolver (null);
-
- baseDirectory = baseDirectory ?? Path.GetDirectoryName (path);
-
- if (!isMainLib) {
- // Make sure all referenced assemblies are up to date.
- foreach (AssemblyNameReference aref in adef.MainModule.AssemblyReferences) {
- Refresh (resolver, aref.FullName, baseDirectory);
- }
- }
-
- if (doc == null) {
-// Hashtable visited = new Hashtable ();
- foreach (AssemblyNameReference aref in adef.MainModule.AssemblyReferences) {
- if (aref.Name != "gtk-sharp") {
- LibraryInfo info = GetInfo (resolver, aref.FullName, baseDirectory);
- if (info == null || !info.HasWidgets)
- continue;
- }
-
- if (doc == null) {
- doc = new XmlDocument ();
- doc.AppendChild (doc.CreateElement ("objects"));
- }
- AddObjects (doc, resolver, baseDirectory, adef);
- break;
- }
- }
-
- if (doc != null && !isMainLib) {
- XmlElement elem = doc.CreateElement ("dependencies");
- doc.DocumentElement.AppendChild (elem);
- AddDependencies (elem, resolver, path, adef);
- }
- } catch (Exception e) {
- Console.WriteLine ("Got exception loading objects: " + e);
- doc = null;
- }
-
- return doc;
- }
-
- LibraryInfo GetInfo (AssemblyResolver resolver, string assembly, string baseDirectory)
- {
- string file = assembly;
- if (File.Exists (assembly))
- file = assembly;
- else {
- if (resolver == null)
- resolver = new AssemblyResolver (null);
- try {
- string path = resolver.Resolve (assembly, baseDirectory);
- if (path != null)
- file = path;
- else
- return null;
- } catch (Exception) {
- return null;
- }
- }
-
- file = Path.GetFullPath (file);
-
- LibraryInfo info = Members [file];
- if (info == null) {
- info = new LibraryInfo ();
- info.File = file ?? assembly;
- Members.Add (info);
- }
- return info;
- }
-
- internal LibraryInfo Refresh (AssemblyResolver resolver, string assembly)
- {
- return Refresh (resolver, assembly, null);
- }
-
- LibraryInfo Refresh (AssemblyResolver resolver, string assembly, string baseDirectory)
- {
- LibraryInfo info = GetInfo (resolver, assembly, baseDirectory);
-
- if (info == null || info.IsCurrent || !File.Exists (info.File))
- return info;
-
- info.Timestamp = File.GetLastWriteTime (info.File).ToUniversalTime ();
- info.Guid = Guid.NewGuid ();
- Save ();
- using (AssemblyDefinition adef = AssemblyDefinition.ReadAssembly (info.File)) {
- XmlDocument objects = GetObjectsDoc (resolver, adef, info.File, baseDirectory);
- if (objects != null) {
- info.ObjectsDocument = objects;
- XmlDocument gui = GetGuiDoc (adef);
- if (gui != null)
- info.GuiDocument = gui;
- }
- }
- info.OnChanged ();
- return info;
- }
-
- void Save ()
- {
- if (!Directory.Exists (dir))
- Directory.CreateDirectory (dir);
-
- // remove any dead assemblies from the cache
- StringCollection zombies = new StringCollection ();
- foreach (LibraryInfo info in Members) {
- if (File.Exists (info.File))
- continue;
- zombies.Add (info.File);
- string zombie_dir = Path.Combine (dir, info.Guid.ToString ());
- if (Directory.Exists (zombie_dir))
- Directory.Delete (Path.Combine (dir, info.Guid.ToString ()), true);
- }
-
- foreach (string file in zombies)
- Members.Remove (file);
-
- XmlSerializer serializer = new XmlSerializer (typeof (LibraryCache));
- using (FileStream fs = File.Create (Path.Combine (dir, "index.xml")))
- serializer.Serialize (fs, this);
- }
-
- static LibraryCache Load ()
- {
- string index_path = Path.Combine (dir, "index.xml");
- if (File.Exists (index_path)) {
- try {
- LibraryCache result;
- XmlSerializer serializer = new XmlSerializer (typeof (LibraryCache));
- using (XmlTextReader rdr = new XmlTextReader (index_path))
- result = (LibraryCache) serializer.Deserialize (rdr);
- return result;
- } catch (Exception e) {
- Console.WriteLine ("Cache index serialization failed " + e);
- }
- }
-
- return new LibraryCache ();
- }
-
- internal TypeDefinition FindTypeDefinition (AssemblyResolver resolver, AssemblyDefinition assembly, string basePath, string fullName)
- {
- TypeDefinition t = FindTypeDefinition (new Hashtable (), resolver, basePath, assembly, fullName);
- return t;
- }
-
- TypeDefinition FindTypeDefinition (Hashtable visited, AssemblyResolver resolver, string basePath, AssemblyDefinition asm, string fullName)
- {
- if (visited.Contains (asm))
- return null;
-
- visited [asm] = asm;
-
- TypeDefinition cls = asm.MainModule.GetType (fullName);
- if (cls != null)
- return cls;
-
- foreach (AssemblyNameReference aref in asm.MainModule.AssemblyReferences) {
- AssemblyDefinition basm = resolver.Resolve (aref, basePath);
- if (basm != null) {
- cls = basm.MainModule.GetType (fullName);
- if (cls != null)
- return cls;
- }
- }
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.am b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.am
deleted file mode 100644
index c9cc87438f7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Palette.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Palette.cs
deleted file mode 100644
index 3f747df6cfb..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Palette.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-
-using System;
-using Gtk;
-
-namespace Stetic
-{
- public class Palette: PluggableWidget
- {
- bool showWindowCategory = true;
-
- internal Palette (Application app): base (app)
- {
- }
-
- protected override void OnCreatePlug (uint socketId)
- {
- app.Backend.CreatePaletteWidgetPlug (socketId);
- Update ();
- }
-
- protected override void OnDestroyPlug (uint socketId)
- {
- app.Backend.DestroyPaletteWidgetPlug ();
- }
-
- protected override Gtk.Widget OnCreateWidget ()
- {
- Update ();
- return app.Backend.GetPaletteWidget ();
- }
-
- public bool ShowWindowCategory {
- get { return showWindowCategory; }
- set {
- showWindowCategory = value;
- Update ();
- }
- }
-
- void Update ()
- {
- if (!showWindowCategory)
- app.Backend.HidePaletteGroup ("window");
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PaletteBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PaletteBackend.cs
deleted file mode 100644
index 40d6e8050dd..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PaletteBackend.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-using Gtk;
-using Gdk;
-using System;
-using System.Collections;
-using System.Reflection;
-using Mono.Unix;
-
-namespace Stetic {
-
- internal class PaletteBackend : Gtk.ScrolledWindow, IComparer {
-
- Hashtable groups;
- ProjectBackend project;
- WidgetLibrary[] libraries;
- ArrayList visibleGroups = new ArrayList ();
- Wrapper.Widget selection;
- ActionGroupBox localActionsBox;
- ActionGroupBox globalActionsBox;
- Gtk.VBox box;
- ApplicationBackend app;
-
- public PaletteBackend (ApplicationBackend app)
- {
- this.app = app;
- box = new Gtk.VBox (false, 0);
- AddWithViewport (box);
- groups = new Hashtable ();
- Registry.RegistryChanged += OnRegistryChanged;
-
- ShowGroup ("window", Catalog.GetString ("Windows"));
- ShowGroup ("widget", Catalog.GetString ("Widgets"));
- ShowGroup ("container", Catalog.GetString ("Containers"));
-// ShowGroup ("toolbaritem", "Toolbar Items");
- ShowGroup ("actions", Catalog.GetString ("Actions"));
- }
-
- public override void Dispose ()
- {
- Registry.RegistryChanged -= OnRegistryChanged;
-
- foreach (PaletteGroup grp in groups.Values)
- grp.Destroy ();
-
- if (localActionsBox != null) {
- localActionsBox.Destroy ();
- localActionsBox = null;
- }
- if (globalActionsBox != null) {
- globalActionsBox.Destroy ();
- globalActionsBox = null;
- }
-
- project = null;
- selection = null;
- base.Dispose ();
- }
-
- public PaletteBackend (ApplicationBackend app, ProjectBackend project): this (app)
- {
- this.ProjectBackend = project;
- }
-
- public ProjectBackend ProjectBackend {
- get { return project; }
- set {
- if (project != null) {
- project.SelectionChanged -= OnSelectionChanged;
- project.ProjectReloaded -= OnProjectReloaded;
- }
- project = value;
- if (project != null) {
- UpdateSelection (Wrapper.Widget.Lookup (project.Selection));
- project.SelectionChanged += OnSelectionChanged;
- project.ProjectReloaded += OnProjectReloaded;
- } else
- UpdateSelection (null);
- LoadWidgets (project);
- }
- }
-
- public WidgetLibrary[] WidgetLibraries {
- get { return libraries; }
- set {
- libraries = value;
- LoadWidgets (project);
- }
- }
-
- void OnProjectReloaded (object s, EventArgs args)
- {
- LoadWidgets (project);
- }
-
- void OnSelectionChanged (object ob, Stetic.Wrapper.WidgetEventArgs args)
- {
- UpdateSelection (args.WidgetWrapper);
- }
-
- void UpdateSelection (Wrapper.Widget sel)
- {
- selection = sel;
- if (localActionsBox != null)
- localActionsBox.SetActionGroups (selection != null ? selection.LocalActionGroups : null);
- ShowAll ();
- }
-
- public void ShowGroup (string name, string label)
- {
- visibleGroups.Add (new string[] { name, label });
- if (project != null)
- LoadWidgets (project);
- }
-
- public void HideGroup (string name)
- {
- for (int n=0; n < visibleGroups.Count; n++) {
- if (((string[])visibleGroups[n])[0] == name) {
- visibleGroups.RemoveAt (n);
- if (project != null)
- LoadWidgets (project);
- return;
- }
- }
- }
-
- void OnRegistryChanged (object o, EventArgs args)
- {
- WidgetLibraries = app.GetActiveLibraries ();
- }
-
- public void LoadWidgets (ProjectBackend project)
- {
- if (project == null) {
- box.Hide ();
- return;
- }
-
- box.Show ();
-
- foreach (PaletteGroup g in groups.Values) {
- box.Remove (g);
- g.Destroy ();
- }
-
- groups.Clear ();
-
- foreach (string[] grp in visibleGroups)
- AddOrGetGroup (grp[0], grp[1]);
-
- ArrayList classes = new ArrayList ();
- if (libraries == null) {
- foreach (ClassDescriptor klass in Registry.AllClasses)
- if (klass.SupportsGtkVersion (project.TargetGtkVersion))
- classes.Add (klass);
- } else if (project != null) {
- foreach (WidgetLibrary lib in libraries) {
- bool isInternalLib = project.IsInternalLibrary (lib.Name);
- foreach (ClassDescriptor cd in lib.AllClasses) {
- if (!cd.Deprecated && cd.Category.Length > 0 && (isInternalLib || !cd.IsInternal) && cd.SupportsGtkVersion (project.TargetGtkVersion))
- classes.Add (cd);
- }
- }
- }
-
- classes.Sort (this);
-
- foreach (ClassDescriptor klass in classes) {
-
- if (!groups.Contains (klass.Category))
- continue;
-
- WidgetFactory factory;
- if (klass.Category == "window")
- factory = new WindowFactory (project, klass);
- else
- factory = new WidgetFactory (project, klass);
-
- AddOrGetGroup(klass.Category).Append (factory);
- }
-
- if (localActionsBox != null)
- localActionsBox.Destroy ();
- if (globalActionsBox != null)
- globalActionsBox.Destroy ();
-
- PaletteGroup widgetGroup = AddOrGetGroup ("actions", Catalog.GetString ("Actions"));
- localActionsBox = new ActionGroupBox ();
- globalActionsBox = new ActionGroupBox ();
- widgetGroup.Append (localActionsBox);
- widgetGroup.Append (globalActionsBox);
-
- if (project != null) {
- widgetGroup.Sensitive = true;
- localActionsBox.SetActionGroups (selection != null ? selection.LocalActionGroups : null);
- globalActionsBox.SetActionGroups (project.ActionGroups);
- } else {
- widgetGroup.Sensitive = false;
- localActionsBox.SetActionGroups (null);
- globalActionsBox.SetActionGroups (null);
- }
-
- // This is a workaround. In looks like the palette is not correctly
- // redrawn if it is rebuilt while it is not visible (the dock is hidden in MD).
- GLib.Idle.Add (delegate {
- ShowAll ();
- return false;
- });
- }
-
- int IComparer.Compare (object x, object y)
- {
- return string.Compare (((ClassDescriptor)x).Label,
- ((ClassDescriptor)y).Label);
- }
-
- private PaletteGroup AddOrGetGroup (string id, string name)
- {
- PaletteGroup group = (PaletteGroup) groups[id];
-
- if (group == null) {
- group = new PaletteGroup (name);
- box.PackStart (group, false, false, 0);
- groups.Add (id, group);
- }
-
- return group;
- }
-
- private PaletteGroup AddOrGetGroup (string name)
- {
- return AddOrGetGroup (name, name);
- }
- }
-
- class PaletteGroup : Gtk.Expander
- {
- private Gtk.Alignment align;
- private Gtk.VBox vbox;
- Gtk.Label emptyLabel;
- bool isEmpty = true;
-
- public PaletteGroup (string name) : base ("" + name + "")
- {
- vbox = new VBox (false, 0);
- emptyLabel = new Gtk.Label ();
- emptyLabel.Markup = " " + Catalog.GetString ("Empty") + "";
- vbox.PackStart (emptyLabel, false, false, 0);
-
- align = new Gtk.Alignment (0, 0, 0, 0);
- align.SetPadding (0, 0, 20, 0);
- align.Child = vbox;
-
- UseMarkup = true;
- Expanded = true;
- Child = align;
- }
-
- public void SetName (string name)
- {
- Label = "" + name + "";
- }
-
- public void Append (Widget w)
- {
- if (isEmpty) {
- vbox.Remove (emptyLabel);
- isEmpty = false;
- }
- vbox.PackStart (w, false, false, 0);
- }
-
- public void Clear ()
- {
- foreach (Gtk.Widget w in vbox.Children) {
- vbox.Remove (w);
- w.Destroy ();
- }
-
- isEmpty = true;
- vbox.PackStart (emptyLabel, false, false, 0);
- }
- }
-
- class ActionPaletteGroup : PaletteGroup
- {
- Wrapper.ActionGroup group;
-
- public ActionPaletteGroup (string name, Wrapper.ActionGroup group): base (name)
- {
- DND.DestSet (this, true);
- this.group = group;
- group.ActionAdded += OnActionGroupChanged;
- group.ActionRemoved += OnActionGroupChanged;
- group.ActionChanged += OnActionGroupChanged;
- group.ObjectChanged += OnActionGroupChanged;
- Fill ();
- }
-
- public Wrapper.ActionGroup Group {
- get { return group; }
- }
-
- public override void Dispose ()
- {
- group.ActionAdded -= OnActionGroupChanged;
- group.ActionRemoved -= OnActionGroupChanged;
- group.ActionChanged -= OnActionGroupChanged;
- group.ObjectChanged -= OnActionGroupChanged;
- base.Dispose ();
- }
-
- public void Fill ()
- {
- foreach (Stetic.Wrapper.Action action in group.Actions) {
- Gdk.Pixbuf icon = action.RenderIcon (Gtk.IconSize.Menu);
- if (icon == null) icon = ActionComponent.DefaultActionIcon;
- Stetic.Wrapper.ActionPaletteItem it = new Stetic.Wrapper.ActionPaletteItem (Gtk.UIManagerItemType.Menuitem, null, action);
- Append (new InstanceWidgetFactory (action.MenuLabel, icon, it));
- }
- }
-
- void OnActionGroupChanged (object s, EventArgs args)
- {
- SetName (((Stetic.Wrapper.ActionGroup)s).Name);
- }
-
- void OnActionGroupChanged (object s, Stetic.Wrapper.ActionEventArgs args)
- {
- Clear ();
- Fill ();
- ShowAll ();
- }
-
- protected override bool OnDragDrop (Gdk.DragContext context, int x, int y, uint time)
- {
- Wrapper.ActionPaletteItem dropped = DND.Drop (context, null, time) as Wrapper.ActionPaletteItem;
- if (dropped == null)
- return false;
-
- if (dropped.Node.Action.ActionGroup != group) {
- using (dropped.Node.Action.UndoManager.AtomicChange) {
- dropped.Node.Action.ActionGroup.Actions.Remove (dropped.Node.Action);
- group.Actions.Add (dropped.Node.Action);
- }
- }
-
- return base.OnDragDrop (context, x, y, time);
- }
- }
-
- class ActionGroupBox: Gtk.VBox
- {
- Stetic.Wrapper.ActionGroupCollection groups;
-
- public void SetActionGroups (Stetic.Wrapper.ActionGroupCollection groups)
- {
- if (this.groups != null) {
- this.groups.ActionGroupAdded -= OnGroupAdded;
- this.groups.ActionGroupRemoved -= OnGroupRemoved;
- }
- this.groups = groups;
- if (this.groups != null) {
- this.groups.ActionGroupAdded += OnGroupAdded;
- this.groups.ActionGroupRemoved += OnGroupRemoved;
- }
- Update ();
- }
-
- public override void Dispose ()
- {
- foreach (ActionPaletteGroup grp in Children)
- grp.Destroy ();
- base.Dispose ();
- }
-
- public void Update ()
- {
- foreach (ActionPaletteGroup grp in Children) {
- Remove (grp);
- grp.Destroy ();
- }
-
- if (groups != null) {
- foreach (Stetic.Wrapper.ActionGroup group in groups) {
- ActionPaletteGroup pg = new ActionPaletteGroup (group.Name, group);
- PackStart (pg, false, false, 0);
- }
- }
- ShowAll ();
- }
-
- void OnGroupAdded (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- ActionPaletteGroup pg = new ActionPaletteGroup (args.ActionGroup.Name, args.ActionGroup);
- pg.ShowAll ();
- PackStart (pg, false, false, 0);
- }
-
- void OnGroupRemoved (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- foreach (ActionPaletteGroup grp in Children) {
- if (grp.Group == args.ActionGroup) {
- Remove (grp);
- grp.Destroy ();
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PluggableWidget.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PluggableWidget.cs
deleted file mode 100644
index 4db2da15d2a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PluggableWidget.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public abstract class PluggableWidget: Gtk.EventBox
- {
- internal Application app;
- bool initialized;
- Gtk.Socket socket;
- Gtk.Notebook book;
-
- public PluggableWidget (Application app)
- {
- book = new Gtk.Notebook ();
- book.ShowTabs = false;
- book.ShowBorder = false;
- book.Show ();
- Add (book);
-
- this.app = app;
- if (app is IsolatedApplication) {
- (app as IsolatedApplication).BackendChanged += OnBackendChanged;
- (app as IsolatedApplication).BackendChanging += OnBackendChanging;
- }
- }
-
- protected void AddCustomWidget (Gtk.Widget w)
- {
- w.ShowAll ();
- book.AppendPage (w, null);
- book.Page = book.NPages - 1;
-
- if (initialized) {
- Gtk.Widget cw = book.GetNthPage (0);
- book.RemovePage (0);
- cw.Destroy ();
- }
- else
- initialized = true;
- }
-
- protected void ResetCustomWidget ()
- {
- }
-
- protected override void OnRealized ()
- {
- base.OnRealized ();
- if (!initialized) {
- initialized = true;
- if (app is IsolatedApplication)
- ConnectPlug ();
- else {
- Gtk.Widget w = OnCreateWidget ();
- w.Show ();
- book.AppendPage (w, null);
- }
- }
- }
-
- protected override void OnUnrealized ()
- {
- if (app is IsolatedApplication && initialized) {
- OnDestroyPlug (socket.Id);
- initialized = false;
- }
- base.OnUnrealized ();
- }
-
- protected void PrepareUpdateWidget ()
- {
- // This method is called when the child widget is going to be changed.
- // It takes a 'screenshot' of the widget. This image will be shown until
- // UpdateWidget is called.
-
- if (book.NPages == 1) {
- Gtk.Widget w = book.GetNthPage (0);
- Gdk.Window win = w.GdkWindow;
- if (win != null && win.IsViewable) {
- Gdk.Pixbuf img = Gdk.Pixbuf.FromDrawable (win, win.Colormap, w.Allocation.X, w.Allocation.Y, 0, 0, w.Allocation.Width, w.Allocation.Height);
- Gtk.Image oldImage = new Gtk.Image (img);
- oldImage.Show ();
- book.AppendPage (oldImage, null);
- book.Page = 1;
- book.RemovePage (0);
- }
- }
- }
-
- protected void UpdateWidget ()
- {
- if (!initialized)
- return;
-
- if (app is LocalApplication) {
- Gtk.Widget w = OnCreateWidget ();
- if (w.Parent != book) {
- book.AppendPage (w, null);
- w.Show ();
- }
- book.Page = book.NPages - 1;
- if (book.NPages > 1) {
- Gtk.Widget cw = book.GetNthPage (0);
- book.Remove (cw);
- OnDestroyWidget (cw);
- }
- }
- }
-
- protected abstract void OnCreatePlug (uint socketId);
- protected abstract void OnDestroyPlug (uint socketId);
-
- protected abstract Gtk.Widget OnCreateWidget ();
- protected virtual void OnDestroyWidget (Gtk.Widget w) { w.Destroy (); }
-
- public override void Dispose ()
- {
- if (app is IsolatedApplication) {
- IsolatedApplication iapp = app as IsolatedApplication;
- iapp.BackendChanged -= OnBackendChanged;
- iapp.BackendChanging -= OnBackendChanging;
- }
- base.Dispose ();
- }
-
- internal virtual void OnBackendChanged (ApplicationBackend oldBackend)
- {
- if (!initialized)
- return;
-
- Gtk.Widget w = book.GetNthPage (0);
- book.RemovePage (0);
- w.Destroy ();
- socket.Dispose ();
- ConnectPlug ();
- }
-
- internal virtual void OnBackendChanging ()
- {
- }
-
- void ConnectPlug ()
- {
- socket = new Gtk.Socket ();
- socket.Show ();
- book.AppendPage (socket, null);
- OnCreatePlug (socket.Id);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Project.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Project.cs
deleted file mode 100644
index a0f594b5b47..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Project.cs
+++ /dev/null
@@ -1,838 +0,0 @@
-
-using System;
-using System.Xml;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-
-namespace Stetic
-{
- public class Project: MarshalByRefObject
- {
- Application app;
- ProjectBackend backend;
- string fileName;
- IResourceProvider resourceProvider;
- Component selection;
- string tmpProjectFile;
- bool reloadRequested;
- List widgets = new List ();
- List groups = new List ();
- bool modified;
- ImportFileDelegate importFileDelegate;
-
- public event WidgetInfoEventHandler WidgetAdded;
- public event WidgetInfoEventHandler WidgetRemoved;
- public event ComponentNameEventHandler ComponentNameChanged;
- public event EventHandler ComponentTypesChanged;
-
- public event EventHandler ActionGroupsChanged;
- public event EventHandler ModifiedChanged;
- public event EventHandler Changed;
-
-
- // Internal events
- internal event BackendChangingHandler BackendChanging;
- internal event BackendChangedHandler BackendChanged;
- internal event ComponentSignalEventHandler SignalAdded;
- internal event ComponentSignalEventHandler SignalRemoved;
- internal event ComponentSignalEventHandler SignalChanged;
-
- public event EventHandler ProjectReloading;
- public event EventHandler ProjectReloaded;
-
- internal Project (Application app): this (app, null)
- {
- }
-
- internal Project (Application app, ProjectBackend backend)
- {
- this.app = app;
- if (backend != null) {
- this.backend = backend;
- backend.SetFrontend (this);
- }
-
- if (app is IsolatedApplication) {
- IsolatedApplication iapp = app as IsolatedApplication;
- iapp.BackendChanging += OnBackendChanging;
- iapp.BackendChanged += OnBackendChanged;
- }
- }
-
- internal ProjectBackend ProjectBackend {
- get {
- if (backend == null) {
- backend = app.Backend.CreateProject ();
- backend.SetFrontend (this);
- if (resourceProvider != null)
- backend.ResourceProvider = resourceProvider;
- if (fileName != null)
- backend.Load (fileName);
- }
- return backend;
- }
- }
-
- internal bool IsBackendLoaded {
- get { return backend != null; }
- }
-
- internal Application App {
- get { return app; }
- }
-
- internal event EventHandler Disposed;
-
- public void Dispose ()
- {
- if (app is IsolatedApplication) {
- IsolatedApplication iapp = app as IsolatedApplication;
- iapp.BackendChanging -= OnBackendChanging;
- iapp.BackendChanged -= OnBackendChanged;
- }
-
- if (tmpProjectFile != null && File.Exists (tmpProjectFile)) {
- File.Delete (tmpProjectFile);
- tmpProjectFile = null;
- }
- if (backend != null)
- backend.Dispose ();
- if (Disposed != null)
- Disposed (this, EventArgs.Empty);
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
-
- public string FileName {
- get { return fileName; }
- }
-
- public IResourceProvider ResourceProvider {
- get { return resourceProvider; }
- set {
- resourceProvider = value;
- if (backend != null)
- backend.ResourceProvider = value;
- }
- }
-
- public Stetic.ProjectIconFactory IconFactory {
- get { return ProjectBackend.IconFactory; }
- set { backend.IconFactory = value; }
- }
-
- public ImportFileDelegate ImportFileCallback {
- get { return importFileDelegate; }
- set { importFileDelegate = value; }
- }
-
- public bool CanGenerateCode {
- get { return ProjectBackend.CanGenerateCode; }
- }
-
- public Component Selection {
- get { return selection; }
- }
-
- public string ImagesRootPath {
- get { return ProjectBackend.ImagesRootPath; }
- set { ProjectBackend.ImagesRootPath = value; }
- }
-
- public string TargetGtkVersion {
- get { return ProjectBackend.TargetGtkVersion; }
- set { ProjectBackend.TargetGtkVersion = value; }
- }
-
- public void Close ()
- {
- if (backend != null)
- backend.Close ();
- }
-
- public void Load (string fileName)
- {
- this.fileName = fileName;
- if (backend != null)
- backend.Load (fileName);
-
- using (StreamReader sr = new StreamReader (fileName)) {
- XmlTextReader reader = new XmlTextReader (sr);
-
- reader.MoveToContent ();
- if (reader.IsEmptyElement)
- return;
-
- reader.ReadStartElement ("stetic-interface");
- if (reader.IsEmptyElement)
- return;
- while (reader.NodeType != XmlNodeType.EndElement) {
- if (reader.NodeType == XmlNodeType.Element) {
- if (reader.LocalName == "widget")
- ReadWidget (reader);
- else if (reader.LocalName == "action-group")
- ReadActionGroup (reader);
- else
- reader.Skip ();
- }
- else {
- reader.Skip ();
- }
- reader.MoveToContent ();
- }
- }
- }
-
- void ReadWidget (XmlTextReader reader)
- {
- WidgetInfo w = new WidgetInfo (this, reader.GetAttribute ("id"), reader.GetAttribute ("class"));
- widgets.Add (w);
- if (reader.IsEmptyElement) {
- reader.Skip ();
- return;
- }
- reader.ReadStartElement ();
- reader.MoveToContent ();
- while (reader.NodeType != XmlNodeType.EndElement) {
- if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "action-group") {
- w.AddGroup (reader.GetAttribute ("name"));
- }
- reader.Skip ();
- reader.MoveToContent ();
- }
- reader.ReadEndElement ();
- }
-
- void ReadActionGroup (XmlTextReader reader)
- {
- groups.Add (new ActionGroupInfo (this, reader.GetAttribute ("name")));
- reader.Skip ();
- }
-
- public void Save (string fileName)
- {
- this.fileName = fileName;
- if (backend != null)
- backend.Save (fileName);
- }
-
- public void ImportGlade (string fileName)
- {
- ProjectBackend.ImportGlade (fileName);
- }
-
- public void ExportGlade (string fileName)
- {
- ProjectBackend.ExportGlade (fileName);
- }
-
- public object SaveStatus ()
- {
- return ProjectBackend.SaveStatus ();
- }
-
- public void LoadStatus (object status)
- {
- ProjectBackend.LoadStatus (status);
- }
-
- public bool Modified {
- get {
- if (backend != null)
- return backend.Modified;
- else
- return modified;
- }
- set {
- if (backend != null)
- backend.Modified = value;
- else
- modified = true;
- }
- }
-
- public IEnumerable Widgets {
- get { return widgets; }
- }
-
- public IEnumerable ActionGroups {
- get { return groups; }
- }
-
- public WidgetInfo GetWidget (string name)
- {
- foreach (WidgetInfo w in widgets)
- if (w.Name == name)
- return w;
- return null;
- }
-
- public ActionGroupInfo GetActionGroup (string name)
- {
- foreach (ActionGroupInfo w in groups)
- if (w.Name == name)
- return w;
- return null;
- }
-
- public WidgetDesigner CreateWidgetDesigner (WidgetInfo widgetInfo, bool autoCommitChanges)
- {
- return new WidgetDesigner (this, widgetInfo.Name, autoCommitChanges);
- }
-
- public ActionGroupDesigner CreateActionGroupDesigner (ActionGroupInfo actionGroup, bool autoCommitChanges)
- {
- return new ActionGroupDesigner (this, null, actionGroup.Name, null, autoCommitChanges);
- }
-
- public void SetWidgetModified (string widgetName)
- {
- ProjectBackend.SetWidgetModified (widgetName);
- }
-
- public void SetAllWidgetsModified ()
- {
- ProjectBackend.SetAllWidgetsModified ();
- }
-
- public void ResetModifiedWidgetFlags ()
- {
- ProjectBackend.ResetModifiedWidgetFlags ();
- }
-
- public WidgetInfo AddNewComponent (ComponentType type, string name)
- {
- object ob = ProjectBackend.AddNewWidget (type.Name, name);
- WidgetComponent wc = (WidgetComponent) App.GetComponent (ob, null, null);
- WidgetInfo wi = GetWidget (wc.Name);
- if (wi == null) {
- wi = new WidgetInfo (this, wc);
- widgets.Add (wi);
- }
- return wi;
- }
-
- public WidgetInfo AddNewComponent (XmlElement template)
- {
- object ob = ProjectBackend.AddNewWidgetFromTemplate (template.OuterXml);
- WidgetComponent wc = (WidgetComponent) App.GetComponent (ob, null, null);
- WidgetInfo wi = GetWidget (wc.Name);
- if (wi == null) {
- wi = new WidgetInfo (this, wc);
- widgets.Add (wi);
- }
- return wi;
- }
-
- public ComponentType[] GetComponentTypes ()
- {
- ArrayList types = new ArrayList ();
-
- ArrayList typeNames = ProjectBackend.GetComponentTypes ();
- for (int n=0; n groups;
-
- internal WidgetInfo (Project project, string name, string type): base (project, name)
- {
- this.type = type;
- }
-
- internal WidgetInfo (Project project, Component c): base (project, c.Name)
- {
- type = c.Type.Name;
- }
-
- public IEnumerable ActionGroups {
- get {
- if (groups != null)
- return groups;
- else
- return new ActionGroupInfo [0];
- }
- }
-
- public string Type {
- get { return type; }
- }
-
- public bool IsWindow {
- get { return type == "Gtk.Dialog" || type == "Gtk.Window"; }
- }
-
- public override Component Component {
- get { return project.GetComponent (Name); }
- }
-
- internal void AddGroup (string group)
- {
- if (groups == null)
- groups = new List ();
- groups.Add (new ActionGroupInfo (project, group, Name));
- }
- }
-
- public class ActionGroupInfo: ProjectItemInfo
- {
- string widgetName;
-
- internal ActionGroupInfo (Project project, string name): base (project, name)
- {
- }
-
- internal ActionGroupInfo (Project project, string name, string widgetName): base (project, name)
- {
- this.widgetName = widgetName;
- }
-
- public override Component Component {
- get {
- ActionGroupComponent[] ags;
- if (widgetName != null) {
- WidgetComponent c = project.GetComponent (widgetName) as WidgetComponent;
- if (c == null)
- return null;
- ags = c.GetActionGroups ();
- }
- else {
- ags = project.GetActionGroups ();
- }
- foreach (ActionGroupComponent ag in ags)
- if (ag.Name == Name)
- return ag;
- return null;
- }
- }
- }
-
- public delegate string ImportFileDelegate (string fileName);
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectBackend.cs
deleted file mode 100644
index 6aba97c0dc0..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectBackend.cs
+++ /dev/null
@@ -1,1146 +0,0 @@
-using Gtk;
-using System;
-using System.IO;
-using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.CodeDom;
-using Mono.Unix;
-
-namespace Stetic {
-
- internal class ProjectBackend : MarshalByRefObject, IProject, IDisposable
- {
- List topLevels;
- bool modified;
- Gtk.Widget selection;
- string id;
- string fileName;
- XmlDocument tempDoc;
- bool loading;
- IResourceProvider resourceProvider;
-
- // Global action groups of the project
- Stetic.Wrapper.ActionGroupCollection actionGroups;
- bool ownedGlobalActionGroups = true; // It may be false when reusing groups from another project
-
- Stetic.ProjectIconFactory iconFactory;
- Project frontend;
- ArrayList widgetLibraries;
- ArrayList internalLibs;
- ApplicationBackend app;
- AssemblyResolver resolver;
- string imagesRootPath;
- string targetGtkVersion;
-
- // The action collection of the last selected widget
- Stetic.Wrapper.ActionGroupCollection oldTopActionCollection;
-
- public event Wrapper.WidgetNameChangedHandler WidgetNameChanged;
- public event Wrapper.WidgetEventHandler WidgetAdded;
- public event Wrapper.WidgetEventHandler WidgetContentsChanged;
- public event ObjectWrapperEventHandler ObjectChanged;
- public event EventHandler ComponentTypesChanged;
-
- public event SignalEventHandler SignalAdded;
- public event SignalEventHandler SignalRemoved;
- public event SignalChangedEventHandler SignalChanged;
-
- public event Wrapper.WidgetEventHandler SelectionChanged;
- public event EventHandler ModifiedChanged;
- public event EventHandler Changed;
-
- // Fired when the project has been reloaded, due for example to
- // a change in the registry
- public event EventHandler ProjectReloading;
- public event EventHandler ProjectReloaded;
-
- public ProjectBackend (ApplicationBackend app)
- {
- this.app = app;
- topLevels = new List ();
-
- ActionGroups = new Stetic.Wrapper.ActionGroupCollection ();
-
- Registry.RegistryChanging += OnRegistryChanging;
- Registry.RegistryChanged += OnRegistryChanged;
-
- iconFactory = new ProjectIconFactory ();
- widgetLibraries = new ArrayList ();
- internalLibs = new ArrayList ();
- }
-
- public void Dispose ()
- {
- // First of all, disconnect from the frontend,
- // to avoid sending notifications while disposing
- frontend = null;
-
- if (oldTopActionCollection != null)
- oldTopActionCollection.ActionGroupChanged -= OnComponentTypesChanged;
-
- Registry.RegistryChanging -= OnRegistryChanging;
- Registry.RegistryChanged -= OnRegistryChanged;
- Close ();
- iconFactory = null;
- ActionGroups = null;
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
-
- public string FileName {
- get { return fileName; }
- set {
- this.fileName = value;
- if (fileName != null)
- Id = System.IO.Path.GetFileName (fileName);
- else
- Id = null;
- }
- }
-
- internal ArrayList WidgetLibraries {
- get { return widgetLibraries; }
- set { widgetLibraries = value; }
- }
-
- internal ArrayList InternalWidgetLibraries {
- get { return internalLibs; }
- set { internalLibs = value; }
- }
-
- public bool IsInternalLibrary (string lib)
- {
- return internalLibs.Contains (lib);
- }
-
- public bool CanGenerateCode {
- get {
- // It can generate code if all libraries on which depend can generate code
- foreach (string s in widgetLibraries) {
- WidgetLibrary lib = Registry.GetWidgetLibrary (s);
- if (lib != null && !lib.CanGenerateCode)
- return false;
- }
- return true;
- }
- }
-
- public string TargetGtkVersion {
- get { return targetGtkVersion != null ? targetGtkVersion : "2.4"; }
- set {
- if (TargetGtkVersion == value)
- return;
- targetGtkVersion = value;
-
- // Update the project
- OnRegistryChanging (null, null);
- OnRegistryChanged (null, null);
- }
- }
-
- public string ImagesRootPath {
- get {
- if (string.IsNullOrEmpty (imagesRootPath)) {
- if (string.IsNullOrEmpty (fileName))
- return ".";
- else
- return Path.GetDirectoryName (fileName);
- }
- else {
- if (Path.IsPathRooted (imagesRootPath))
- return imagesRootPath;
- else if (!string.IsNullOrEmpty (fileName))
- return Path.GetFullPath (Path.Combine (Path.GetDirectoryName (fileName), imagesRootPath));
- else
- return imagesRootPath;
- }
- }
- set { imagesRootPath = value; }
- }
-
-
- public void AddWidgetLibrary (string lib)
- {
- AddWidgetLibrary (lib, false);
- }
-
- public void AddWidgetLibrary (string lib, bool isInternal)
- {
- if (!widgetLibraries.Contains (lib))
- widgetLibraries.Add (lib);
- if (isInternal) {
- if (!internalLibs.Contains (lib))
- internalLibs.Add (lib);
- }
- else {
- internalLibs.Remove (lib);
- }
- }
-
- public void RemoveWidgetLibrary (string lib)
- {
- widgetLibraries.Remove (lib);
- internalLibs.Remove (lib);
- }
-
- public ArrayList GetComponentTypes ()
- {
- ArrayList list = new ArrayList ();
- foreach (WidgetLibrary lib in app.GetProjectLibraries (this)) {
- // Don't include in the list widgets which are internal (when the library is
- // not internal to the project), widgets not assigned to any category, and deprecated ones.
- bool isInternalLib = IsInternalLibrary (lib.Name);
- if (lib.NeedsReload)
- lib.Reload ();
- foreach (ClassDescriptor cd in lib.AllClasses) {
- if (!cd.Deprecated && cd.Category.Length > 0 && (isInternalLib || !cd.IsInternal) && cd.SupportsGtkVersion (TargetGtkVersion))
- list.Add (cd.Name);
- }
- }
- return list;
- }
-
- public string[] GetWidgetTypes ()
- {
- List list = new List ();
- foreach (WidgetLibrary lib in app.GetProjectLibraries (this)) {
- // Don't include in the list widgets which are internal (when the library is
- // not internal to the project) and deprecated ones.
- bool isInternalLib = IsInternalLibrary (lib.Name);
- foreach (ClassDescriptor cd in lib.AllClasses) {
- if (!cd.Deprecated && (isInternalLib || !cd.IsInternal))
- list.Add (cd.Name);
- }
- }
- return list.ToArray ();
- }
-
- public IResourceProvider ResourceProvider {
- get { return resourceProvider; }
- set { resourceProvider = value; }
- }
-
- public Stetic.Wrapper.ActionGroupCollection ActionGroups {
- get { return actionGroups; }
- set {
- if (actionGroups != null) {
- actionGroups.ActionGroupAdded -= OnGroupAdded;
- actionGroups.ActionGroupRemoved -= OnGroupRemoved;
- actionGroups.ActionGroupChanged -= OnComponentTypesChanged;
- }
- actionGroups = value;
- if (actionGroups != null) {
- actionGroups.ActionGroupAdded += OnGroupAdded;
- actionGroups.ActionGroupRemoved += OnGroupRemoved;
- actionGroups.ActionGroupChanged += OnComponentTypesChanged;
- }
- ownedGlobalActionGroups = true;
- }
- }
-
- public void AttachActionGroups (Stetic.Wrapper.ActionGroupCollection groups)
- {
- ActionGroups = groups;
- ownedGlobalActionGroups = false;
- }
-
- public Stetic.ProjectIconFactory IconFactory {
- get { return iconFactory; }
- set { iconFactory = value; }
- }
-
- internal void SetFileName (string fileName)
- {
- this.fileName = fileName;
- }
-
- internal void SetFrontend (Project project)
- {
- frontend = project;
- }
-
- public void Close ()
- {
- fileName = null;
-
- if (actionGroups != null && ownedGlobalActionGroups) {
- foreach (Stetic.Wrapper.ActionGroup ag in actionGroups)
- ag.Dispose ();
- actionGroups.Clear ();
- }
-
- foreach (WidgetData wd in topLevels) {
- if (wd.Widget != null) {
- try {
- wd.Widget.Destroy ();
- } catch (Exception e) { Console.WriteLine (e); }
- }
- }
-
- selection = null;
- topLevels.Clear ();
- widgetLibraries.Clear ();
-
- iconFactory = new ProjectIconFactory ();
- }
-
- public void Load (string fileName)
- {
- Load (fileName, fileName);
- }
-
- public void Load (string xmlFile, string fileName)
- {
- this.fileName = fileName;
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
- doc.Load (xmlFile);
- Read (doc);
-
- Id = System.IO.Path.GetFileName (fileName);
- }
-
- void Read (XmlDocument doc)
- {
- loading = true;
- string basePath = fileName != null ? Path.GetDirectoryName (fileName) : null;
-
- try {
- string fn = fileName;
- Close ();
- fileName = fn;
-
- XmlNode node = doc.SelectSingleNode ("/stetic-interface");
- if (node == null)
- throw new ApplicationException (Catalog.GetString ("Not a Stetic file according to node name."));
-
- // Load configuration options
- foreach (XmlNode configNode in node.SelectNodes ("configuration/*")) {
- XmlElement config = configNode as XmlElement;
- if (config == null) continue;
-
- if (config.LocalName == "images-root-path")
- imagesRootPath = config.InnerText;
- else if (config.LocalName == "target-gtk-version")
- targetGtkVersion = config.InnerText;
- }
-
- // Load the assembly directories
- resolver = new AssemblyResolver (app);
- foreach (XmlElement libElem in node.SelectNodes ("import/assembly-directory")) {
- string dir = libElem.GetAttribute ("path");
- if (dir.Length > 0) {
- if (basePath != null && !Path.IsPathRooted (dir)) {
- dir = FromOSAgnosticRelPath (Path.Combine (basePath, dir));
- if (Directory.Exists (dir))
- dir = Path.GetFullPath (dir);
- }
- resolver.Directories.Add (dir);
- }
- }
-
- // Import the referenced libraries
- foreach (XmlElement libElem in node.SelectNodes ("import/widget-library")) {
- string libname = libElem.GetAttribute ("name");
- if (libname.EndsWith (".dll") || libname.EndsWith (".exe")) {
- if (basePath != null && !Path.IsPathRooted (libname)) {
- libname = FromOSAgnosticRelPath (Path.Combine (basePath, libname));
- if (File.Exists (libname))
- libname = Path.GetFullPath (libname);
- }
- }
- widgetLibraries.Add (libname);
- if (libElem.GetAttribute ("internal") == "true")
- internalLibs.Add (libname);
- }
-
- app.LoadLibraries (resolver, widgetLibraries);
-
- ObjectReader reader = new ObjectReader (this, FileFormat.Native);
-
- if (ownedGlobalActionGroups) {
- foreach (XmlElement groupElem in node.SelectNodes ("action-group")) {
- Wrapper.ActionGroup actionGroup = new Wrapper.ActionGroup ();
- actionGroup.Read (reader, groupElem);
- actionGroups.Add (actionGroup);
- }
- }
-
- XmlElement iconsElem = node.SelectSingleNode ("icon-factory") as XmlElement;
- if (iconsElem != null)
- iconFactory.Read (this, iconsElem);
-
- foreach (XmlElement toplevel in node.SelectNodes ("widget")) {
- topLevels.Add (new WidgetData (toplevel.GetAttribute ("id"), toplevel, null));
- }
- } finally {
- loading = false;
- }
- }
-
- public Gtk.Widget GetWidget (WidgetData data)
- {
- if (data.Widget == null) {
- try {
- loading = true;
- ObjectReader reader = new ObjectReader (this, FileFormat.Native);
- Wrapper.Container wrapper = Stetic.ObjectWrapper.ReadObject (reader, data.XmlData) as Wrapper.Container;
- data.Widget = wrapper.Wrapped;
- } finally {
- loading = false;
- }
- }
-
- return data.Widget;
- }
-
- public void Save (string fileName)
- {
- this.fileName = fileName;
- XmlDocument doc = Write (false);
-
- XmlWriter writer = null;
- try {
- //Always normalize line endings to \n so that they remain consistent.
- //Else, because of the way subdocument are persisted unmodified, we could
- //end up with mixed line endings.
- //Also, string arrays are stored in plain text data with \n separators,
- //and break badly if we have \r\n.
- var settings = new XmlWriterSettings () {
- NewLineHandling = NewLineHandling.Replace,
- Encoding = System.Text.Encoding.UTF8,
- NewLineChars = "\n",
- Indent = true,
- };
-
- // Write to a temporary file first, just in case something fails
- writer = XmlTextWriter.Create (fileName + "~", settings);
- doc.Save (writer);
- writer.Close ();
-
- File.Copy (fileName + "~", fileName, true);
- File.Delete (fileName + "~");
- } finally {
- if (writer != null)
- writer.Close ();
- }
- }
-
- //in the cases where a path is relative, we store it using / as a path separator
- //so the .stetic file doesn't unnecessarily differ between Windows & Linux/Mac
- string ToOSAgnosticRelPath (string s)
- {
- return s.Replace ('\\', '/');
- }
-
- string FromOSAgnosticRelPath (string s)
- {
- return s.Replace ('/', Path.DirectorySeparatorChar);
- }
-
- XmlDocument Write (bool includeUndoInfo)
- {
- XmlDocument doc = new XmlDocument ();
- doc.PreserveWhitespace = true;
-
- XmlElement toplevel = doc.CreateElement ("stetic-interface");
- doc.AppendChild (toplevel);
-
- XmlElement config = doc.CreateElement ("configuration");
- if (!string.IsNullOrEmpty (imagesRootPath)) {
- XmlElement iroot = doc.CreateElement ("images-root-path");
- iroot.InnerText = imagesRootPath;
- config.AppendChild (iroot);
- }
- if (!string.IsNullOrEmpty (targetGtkVersion)) {
- XmlElement iroot = doc.CreateElement ("target-gtk-version");
- iroot.InnerText = targetGtkVersion;
- config.AppendChild (iroot);
- }
-
- if (config.ChildNodes.Count > 0)
- toplevel.AppendChild (config);
-
- if (widgetLibraries.Count > 0 || (resolver != null && resolver.Directories.Count > 0)) {
- XmlElement importElem = doc.CreateElement ("import");
- toplevel.AppendChild (importElem);
- string basePath = Path.GetDirectoryName (fileName);
-
- if (resolver != null && resolver.Directories.Count > 0) {
- foreach (string dir in resolver.Directories) {
- XmlElement dirElem = doc.CreateElement ("assembly-directory");
- if (basePath != null)
- dirElem.SetAttribute ("path", ToOSAgnosticRelPath (AbsoluteToRelativePath (basePath, dir)));
- else
- dirElem.SetAttribute ("path", dir);
- toplevel.AppendChild (dirElem);
- }
- }
-
- foreach (string wlib in widgetLibraries) {
- string libName = wlib;
- XmlElement libElem = doc.CreateElement ("widget-library");
- if (wlib.EndsWith (".dll") || wlib.EndsWith (".exe")) {
- if (basePath != null)
- libName = ToOSAgnosticRelPath (AbsoluteToRelativePath (basePath, wlib));
- }
-
- libElem.SetAttribute ("name", libName);
- if (IsInternalLibrary (wlib))
- libElem.SetAttribute ("internal", "true");
- importElem.AppendChild (libElem);
- }
- }
-
- ObjectWriter writer = new ObjectWriter (doc, FileFormat.Native);
- writer.CreateUndoInfo = includeUndoInfo;
- if (ownedGlobalActionGroups) {
- foreach (Wrapper.ActionGroup agroup in actionGroups) {
- XmlElement elem = agroup.Write (writer);
- toplevel.AppendChild (elem);
- }
- }
-
- if (iconFactory.Icons.Count > 0)
- toplevel.AppendChild (iconFactory.Write (doc));
-
- foreach (WidgetData data in topLevels) {
- if (data.Widget != null) {
- Stetic.Wrapper.Container wrapper = Stetic.Wrapper.Container.Lookup (data.Widget);
- if (wrapper == null)
- continue;
-
- XmlElement elem = wrapper.Write (writer);
- if (elem != null)
- toplevel.AppendChild (elem);
- } else {
- toplevel.AppendChild (doc.ImportNode (data.XmlData, true));
- }
- }
-
- // Remove undo annotations from the xml document
- if (!includeUndoInfo)
- CleanUndoData (doc.DocumentElement);
-
- return doc;
- }
-
- public void ImportGlade (string fileName)
- {
- GladeFiles.Import (this, fileName);
- }
-
- public void ExportGlade (string fileName)
- {
- GladeFiles.Export (this, fileName);
- }
-
- public void EditIcons ()
- {
- using (Stetic.Editor.EditIconFactoryDialog dlg = new Stetic.Editor.EditIconFactoryDialog (null, this, this.IconFactory)) {
- dlg.Run ();
- }
- }
-
- internal WidgetEditSession CreateWidgetDesignerSession (WidgetDesignerFrontend frontend, string windowName, Stetic.ProjectBackend editingBackend, bool autoCommitChanges)
- {
- return new WidgetEditSession (this, frontend, windowName, editingBackend, autoCommitChanges);
- }
-
- internal ActionGroupEditSession CreateGlobalActionGroupDesignerSession (ActionGroupDesignerFrontend frontend, string groupName, bool autoCommitChanges)
- {
- return new ActionGroupEditSession (frontend, this, null, groupName, autoCommitChanges);
- }
-
- internal ActionGroupEditSession CreateLocalActionGroupDesignerSession (ActionGroupDesignerFrontend frontend, string windowName, bool autoCommitChanges)
- {
- return new ActionGroupEditSession (frontend, this, windowName, null, autoCommitChanges);
- }
-
- public Wrapper.Container GetTopLevelWrapper (string name, bool throwIfNotFound)
- {
- Gtk.Widget w = GetTopLevel (name);
- if (w != null) {
- Wrapper.Container ww = Wrapper.Container.Lookup (w);
- if (ww != null)
- return (Wrapper.Container) Component.GetSafeReference (ww);
- }
- if (throwIfNotFound)
- throw new InvalidOperationException ("Component not found: " + name);
- return null;
- }
-
- HashSet modifiedWidgets = new HashSet ();
- bool allModified;
-
- public void SetWidgetModified (string widgetName)
- {
- modifiedWidgets.Add (widgetName);
- }
-
- public void SetAllWidgetsModified ()
- {
- allModified = true;
- }
-
- public void ResetModifiedWidgetFlags ()
- {
- allModified = false;
- modifiedWidgets.Clear ();
- }
-
- internal bool IsWidgetModified (string name)
- {
- return allModified || modifiedWidgets.Contains (name);
- }
-
- public object AddNewWidget (string type, string name)
- {
- ClassDescriptor cls = Registry.LookupClassByName (type);
- Gtk.Widget w = (Gtk.Widget) cls.NewInstance (this);
- w.Name = name;
- this.AddWidget (w);
- return Component.GetSafeReference (ObjectWrapper.Lookup (w));
- }
-
- public object AddNewWidgetFromTemplate (string template)
- {
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml (template);
- Gtk.Widget widget = Stetic.WidgetUtils.ImportWidget (this, doc.DocumentElement);
- AddWidget (widget);
- return Component.GetSafeReference (ObjectWrapper.Lookup (widget));
- }
-
- public void RemoveWidget (string name)
- {
- WidgetData data = GetWidgetData (name);
- if (data == null)
- return;
-
- if (frontend != null)
- frontend.NotifyWidgetRemoved (data.Name);
-
- XmlElement elem;
- if (data.Widget != null)
- elem = Stetic.WidgetUtils.ExportWidget (data.Widget);
- else
- elem = (XmlElement) data.XmlData.Clone ();
- XmlDocument doc = new XmlDocument ();
- XmlNode node = doc.ImportNode (elem, true);
- doc.AppendChild (node);
- string dir = Path.Combine (Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "stetic"), "deleted-designs");
- if (!Directory.Exists (dir))
- Directory.CreateDirectory (dir);
- doc.Save (Path.Combine (dir, name + ".xml"));
- topLevels.Remove (data);
- if (data.Widget != null)
- data.Widget.Destroy ();
- }
-
- public Stetic.Wrapper.ActionGroup AddNewActionGroup (string name)
- {
- Stetic.Wrapper.ActionGroup group = new Stetic.Wrapper.ActionGroup ();
- group.Name = name;
- ActionGroups.Add (group);
- return group;
- }
-
- public Stetic.Wrapper.ActionGroup AddNewActionGroupFromTemplate (string template)
- {
- XmlDocument doc = new XmlDocument ();
- doc.LoadXml (template);
- ObjectReader or = new ObjectReader (this, FileFormat.Native);
- Stetic.Wrapper.ActionGroup group = new Stetic.Wrapper.ActionGroup ();
- group.Read (or, doc.DocumentElement);
- ActionGroups.Add (group);
- return group;
- }
-
- public void RemoveActionGroup (Stetic.Wrapper.ActionGroup group)
- {
- ActionGroups.Remove (group);
- }
-
- public Wrapper.ActionGroup[] GetActionGroups ()
- {
- // Needed since ActionGroupCollection can't be made serializable
- return ActionGroups.ToArray ();
- }
-
- public void CopyWidgetToProject (string name, ProjectBackend other, string replacedName)
- {
- WidgetData wdata = GetWidgetData (name);
- if (name == null)
- throw new InvalidOperationException ("Component not found: " + name);
-
- XmlElement data;
- if (wdata.Widget != null)
- data = Stetic.WidgetUtils.ExportWidget (wdata.Widget);
- else
- data = (XmlElement) wdata.XmlData.Clone ();
-
- // If widget already exist, replace it
- wdata = other.GetWidgetData (replacedName);
- if (wdata == null) {
- wdata = new WidgetData (name, data, null);
- other.topLevels.Add (wdata);
- } else {
- if (wdata.Widget != null) {
- // If a widget instance already exist, load the new data on it
- Wrapper.Widget sw = Wrapper.Widget.Lookup (wdata.Widget);
- sw.Read (new ObjectReader (other, FileFormat.Native), data);
- sw.NotifyChanged ();
- if (name != replacedName)
- other.OnWidgetNameChanged (new Wrapper.WidgetNameChangedArgs (sw, replacedName, name), true);
- } else {
- wdata.SetXmlData (name, data);
- if (name != replacedName)
- other.OnWidgetNameChanged (new Wrapper.WidgetNameChangedArgs (null, replacedName, name), true);
- }
- }
- }
-
- void CleanUndoData (XmlElement elem)
- {
- elem.RemoveAttribute ("undoId");
- foreach (XmlNode cn in elem.ChildNodes) {
- XmlElement ce = cn as XmlElement;
- if (ce != null)
- CleanUndoData (ce);
- }
- }
-
- void OnRegistryChanging (object o, EventArgs args)
- {
- if (loading) return;
-
- // Store a copy of the current tree. The tree will
- // be recreated once the registry change is completed.
-
- tempDoc = Write (true);
- Selection = null;
- }
-
- void OnRegistryChanged (object o, EventArgs args)
- {
- if (loading) return;
-
- if (tempDoc != null)
- LoadStatus (tempDoc);
- }
-
- public object SaveStatus ()
- {
- return Write (true);
- }
-
- public void LoadStatus (object ob)
- {
- if (frontend != null)
- frontend.NotifyProjectReloading ();
- if (ProjectReloading != null)
- ProjectReloading (this, EventArgs.Empty);
-
- ProjectIconFactory icf = iconFactory;
-
- Read ((XmlDocument)ob);
-
- // Reuse the same icon factory, since a registry change has no effect to it
- // and it may be inherited from another project
- iconFactory = icf;
-
- if (frontend != null)
- frontend.NotifyProjectReloaded ();
- if (ProjectReloaded != null)
- ProjectReloaded (this, EventArgs.Empty);
- NotifyComponentTypesChanged ();
- }
-
- public void Reload ()
- {
- OnRegistryChanging (null, null);
- OnRegistryChanged (null, null);
- }
-
- public string Id {
- get { return id; }
- set { id = value; }
- }
-
- public bool Modified {
- get { return modified; }
- set {
- if (modified != value) {
- modified = value;
- if (frontend != null)
- frontend.NotifyModifiedChanged ();
- OnModifiedChanged (EventArgs.Empty);
- }
- }
- }
-
- public AssemblyResolver Resolver {
- get { return resolver; }
- }
-
- public string ImportFile (string filePath)
- {
- return frontend.ImportFile (filePath);
- }
-
- public void AddWindow (Gtk.Window window)
- {
- AddWindow (window, false);
- }
-
- public void AddWindow (Gtk.Window window, bool select)
- {
- AddWidget (window);
- if (select)
- Selection = window;
- }
-
- public void AddWidget (Gtk.Widget widget)
- {
- modifiedWidgets.Add (widget.Name);
- if (!typeof(Gtk.Container).IsInstanceOfType (widget))
- throw new System.ArgumentException ("widget", "Only containers can be top level widgets");
- topLevels.Add (new WidgetData (null, null, widget));
-
- if (!loading) {
- Stetic.Wrapper.Widget ww = Stetic.Wrapper.Widget.Lookup (widget);
- if (ww == null)
- throw new InvalidOperationException ("Widget not wrapped");
- if (frontend != null)
- frontend.NotifyWidgetAdded (Component.GetSafeReference (ww), widget.Name, ww.ClassDescriptor.Name);
- OnWidgetAdded (new Stetic.Wrapper.WidgetEventArgs (ww));
- }
- }
-
- void IProject.NotifyObjectChanged (ObjectWrapperEventArgs args)
- {
- if (loading)
- return;
- NotifyChanged ();
- if (ObjectChanged != null)
- ObjectChanged (this, args);
- }
-
- void IProject.NotifyNameChanged (Stetic.Wrapper.WidgetNameChangedArgs args)
- {
- if (loading)
- return;
- NotifyChanged ();
- OnWidgetNameChanged (args, args.WidgetWrapper.IsTopLevel);
- }
-
- void IProject.NotifySignalAdded (SignalEventArgs args)
- {
- if (loading)
- return;
- if (frontend != null)
- frontend.NotifySignalAdded (Component.GetSafeReference (args.Wrapper), null, args.Signal);
- OnSignalAdded (args);
- }
-
- void IProject.NotifySignalRemoved (SignalEventArgs args)
- {
- if (loading)
- return;
- if (frontend != null)
- frontend.NotifySignalRemoved (Component.GetSafeReference (args.Wrapper), null, args.Signal);
- OnSignalRemoved (args);
- }
-
- void IProject.NotifySignalChanged (SignalChangedEventArgs args)
- {
- if (loading)
- return;
- OnSignalChanged (args);
- }
-
- void IProject.NotifyWidgetContentsChanged (Wrapper.Widget w)
- {
- if (loading)
- return;
- if (WidgetContentsChanged != null)
- WidgetContentsChanged (this, new Wrapper.WidgetEventArgs (w));
- }
-
- void OnWidgetNameChanged (Stetic.Wrapper.WidgetNameChangedArgs args, bool isTopLevel)
- {
- if (frontend != null)
- frontend.NotifyWidgetNameChanged (Component.GetSafeReference (args.WidgetWrapper), args.OldName, args.NewName, isTopLevel);
- if (args.WidgetWrapper != null && WidgetNameChanged != null)
- WidgetNameChanged (this, args);
- }
-
- void OnSignalAdded (object sender, SignalEventArgs args)
- {
- if (frontend != null)
- frontend.NotifySignalAdded (Component.GetSafeReference (args.Wrapper), null, args.Signal);
- OnSignalAdded (args);
- }
-
- protected virtual void OnSignalAdded (SignalEventArgs args)
- {
- if (SignalAdded != null)
- SignalAdded (this, args);
- }
-
- void OnSignalRemoved (object sender, SignalEventArgs args)
- {
- if (frontend != null)
- frontend.NotifySignalRemoved (Component.GetSafeReference (args.Wrapper), null, args.Signal);
- OnSignalRemoved (args);
- }
-
- protected virtual void OnSignalRemoved (SignalEventArgs args)
- {
- if (SignalRemoved != null)
- SignalRemoved (this, args);
- }
-
- void OnSignalChanged (object sender, SignalChangedEventArgs args)
- {
- OnSignalChanged (args);
- }
-
- protected virtual void OnSignalChanged (SignalChangedEventArgs args)
- {
- if (frontend != null)
- frontend.NotifySignalChanged (Component.GetSafeReference (args.Wrapper), null, args.OldSignal, args.Signal);
- if (SignalChanged != null)
- SignalChanged (this, args);
- }
-
- public Gtk.Widget[] Toplevels {
- get {
- List list = new List ();
- foreach (WidgetData w in topLevels)
- list.Add (GetWidget (w));
- return list.ToArray ();
- }
- }
-
- public Gtk.Widget GetTopLevel (string name)
- {
- WidgetData w = GetWidgetData (name);
- if (w != null)
- return GetWidget (w);
- else
- return null;
- }
-
- public WidgetData GetWidgetData (string name)
- {
- foreach (WidgetData w in topLevels) {
- if (w.Name == name)
- return w;
- }
- return null;
- }
-
- // IProject
-
- public Gtk.Widget Selection {
- get {
- return selection;
- }
- set {
- if (selection == value)
- return;
-
- Wrapper.ActionGroupCollection newCollection = null;
-
- // FIXME: should there be an IsDestroyed property?
- if (selection != null && selection.Handle != IntPtr.Zero) {
- Stetic.Wrapper.Container parent = Stetic.Wrapper.Container.LookupParent (selection);
- if (parent == null)
- parent = Stetic.Wrapper.Container.Lookup (selection);
- if (parent != null)
- parent.UnSelect (selection);
- }
-
- selection = value;
-
- if (selection != null && selection.Handle != IntPtr.Zero) {
- Stetic.Wrapper.Container parent = Stetic.Wrapper.Container.LookupParent (selection);
- if (parent == null)
- parent = Stetic.Wrapper.Container.Lookup (selection);
- if (parent != null)
- parent.Select (selection);
- Wrapper.Widget w = Wrapper.Widget.Lookup (selection);
- if (w != null)
- newCollection = w.LocalActionGroups;
- }
-
- if (SelectionChanged != null)
- SelectionChanged (this, new Wrapper.WidgetEventArgs (Wrapper.Widget.Lookup (selection)));
-
- if (oldTopActionCollection != newCollection) {
- if (oldTopActionCollection != null)
- oldTopActionCollection.ActionGroupChanged -= OnComponentTypesChanged;
- if (newCollection != null)
- newCollection.ActionGroupChanged += OnComponentTypesChanged;
- oldTopActionCollection = newCollection;
- OnComponentTypesChanged (null, null);
- }
- }
- }
-
- public void PopupContextMenu (Stetic.Wrapper.Widget wrapper)
- {
- Gtk.Menu m = new ContextMenu (wrapper);
- m.Popup ();
- }
-
- public void PopupContextMenu (Placeholder ph)
- {
- Gtk.Menu m = new ContextMenu (ph);
- m.Popup ();
- }
-
- static string AbsoluteToRelativePath (string baseDirectoryPath, string absPath)
- {
- if (!Path.IsPathRooted (absPath))
- return absPath;
-
- absPath = Path.GetFullPath (absPath);
- baseDirectoryPath = Path.GetFullPath (baseDirectoryPath);
- char[] separators = { Path.DirectorySeparatorChar, Path.VolumeSeparatorChar, Path.AltDirectorySeparatorChar };
-
- string[] bPath = baseDirectoryPath.Split (separators);
- string[] aPath = absPath.Split (separators);
- int indx = 0;
- for(; indx < Math.Min(bPath.Length, aPath.Length); ++indx) {
- if(!bPath[indx].Equals(aPath[indx]))
- break;
- }
-
- if (indx == 0) {
- return absPath;
- }
-
- string erg = "";
-
- if(indx == bPath.Length) {
- erg += "." + Path.DirectorySeparatorChar;
- } else {
- for (int i = indx; i < bPath.Length; ++i) {
- erg += ".." + Path.DirectorySeparatorChar;
- }
- }
- erg += String.Join(Path.DirectorySeparatorChar.ToString(), aPath, indx, aPath.Length-indx);
-
- return erg;
- }
-
- void OnComponentTypesChanged (object s, EventArgs a)
- {
- if (!loading)
- NotifyComponentTypesChanged ();
- }
-
- public void NotifyComponentTypesChanged ()
- {
- if (frontend != null)
- frontend.NotifyComponentTypesChanged ();
- if (ComponentTypesChanged != null)
- ComponentTypesChanged (this, EventArgs.Empty);
- }
-
- void OnGroupAdded (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- args.ActionGroup.SignalAdded += OnSignalAdded;
- args.ActionGroup.SignalRemoved += OnSignalRemoved;
- args.ActionGroup.SignalChanged += OnSignalChanged;
- if (frontend != null)
- frontend.NotifyActionGroupAdded (args.ActionGroup.Name);
- OnComponentTypesChanged (null, null);
- }
-
- void OnGroupRemoved (object s, Stetic.Wrapper.ActionGroupEventArgs args)
- {
- args.ActionGroup.SignalAdded -= OnSignalAdded;
- args.ActionGroup.SignalRemoved -= OnSignalRemoved;
- args.ActionGroup.SignalChanged -= OnSignalChanged;
- if (frontend != null)
- frontend.NotifyActionGroupRemoved (args.ActionGroup.Name);
- OnComponentTypesChanged (null, null);
- }
-
- void NotifyChanged ()
- {
- Modified = true;
- if (frontend != null)
- frontend.NotifyChanged ();
- if (Changed != null)
- Changed (this, EventArgs.Empty);
- }
-
- protected virtual void OnModifiedChanged (EventArgs args)
- {
- if (ModifiedChanged != null)
- ModifiedChanged (this, args);
- }
-
- protected virtual void OnWidgetAdded (Stetic.Wrapper.WidgetEventArgs args)
- {
- NotifyChanged ();
- if (WidgetAdded != null)
- WidgetAdded (this, args);
- }
- }
-
- class WidgetData
- {
- string name;
-
- public WidgetData (string name, XmlElement data, Gtk.Widget widget)
- {
- SetXmlData (name, data);
- Widget = widget;
- }
-
- public void SetXmlData (string name, XmlElement data)
- {
- this.name = name;
- XmlData = data;
- Widget = null;
- }
-
- public XmlElement XmlData;
- public Gtk.Widget Widget;
-
- public string Name {
- get {
- if (Widget != null)
- return Widget.Name;
- else
- return name;
- }
- }
- }
-
- public static class EncodingUtility
- {
- static System.Text.UTF8Encoding utf8NoBom;
-
- /// This is so we can write XML files on .NET in a compatible way with Mono,
- /// since .NET's XmlWriter writes the BOM but Mono's does not.
- public static System.Text.UTF8Encoding UTF8NoBom {
- get {
- return utf8NoBom ?? (utf8NoBom = new System.Text.UTF8Encoding (false));
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectViewBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectViewBackend.cs
deleted file mode 100644
index e6cd0876dd9..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ProjectViewBackend.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-using Gtk;
-using System;
-using Mono.Unix;
-using System.Collections.Generic;
-
-namespace Stetic {
-
- internal class ProjectViewBackend : ScrolledWindow
- {
- ProjectViewBackendNodeView nodeView;
-
- public ProjectViewBackend (ProjectViewFrontend frontend)
- {
- ShadowType = Gtk.ShadowType.In;
- nodeView = new ProjectViewBackendNodeView (frontend);
- Add (nodeView);
- ShowAll ();
- }
-
- public event Wrapper.WidgetEventHandler WidgetActivated {
- add { nodeView.WidgetActivated += value; }
- remove { nodeView.WidgetActivated -= value; }
- }
-
- public void Bind (WidgetEditSession newSession)
- {
- nodeView.Bind (newSession);
- }
- }
-
- internal class ProjectViewBackendNodeView : TreeView
- {
- ProjectViewFrontend frontend;
- TreeStore store;
- WidgetEditSession editSession;
-
- const int ColIcon = 0;
- const int ColName = 1;
- const int ColWrapper = 2;
- const int ColFilled = 3;
-
- public event Wrapper.WidgetEventHandler WidgetActivated;
-
- public ProjectViewBackendNodeView (ProjectViewFrontend frontend)
- {
- this.frontend = frontend;
- HeadersVisible = false;
-
- store = new TreeStore (typeof(Gdk.Pixbuf), typeof(string), typeof(ObjectWrapper), typeof(bool));
- Model = store;
-
- TreeViewColumn col;
- CellRenderer renderer;
-
- col = new TreeViewColumn ();
-
- renderer = new CellRendererPixbuf ();
- col.PackStart (renderer, false);
- col.AddAttribute (renderer, "pixbuf", 0);
-
- renderer = new CellRendererText ();
- col.PackStart (renderer, true);
- col.AddAttribute (renderer, "text", 1);
-
- AppendColumn (col);
-
- Selection.Mode = SelectionMode.Single;
- Selection.Changed += RowSelected;
- TestExpandRow += OnTestExpandRow;
- ShowAll ();
- }
-
- public void Bind (WidgetEditSession newSession)
- {
- if (editSession != null) {
- editSession.SelectionChanged -= WidgetSelected;
- editSession.EditingBackend.ProjectReloaded -= OnProjectReloaded;
- editSession.EditingBackend.WidgetNameChanged -= OnWidgetNameChanged;
- editSession.EditingBackend.WidgetContentsChanged -= OnContentsChanged;
- }
- editSession = newSession;
- if (editSession != null) {
- editSession.SelectionChanged += WidgetSelected;
- editSession.EditingBackend.ProjectReloaded += OnProjectReloaded;
- editSession.EditingBackend.WidgetNameChanged += OnWidgetNameChanged;
- editSession.EditingBackend.WidgetContentsChanged += OnContentsChanged;
- }
- LoadProject ();
- }
-
- public override void Dispose ()
- {
- if (editSession != null) {
- editSession.SelectionChanged -= WidgetSelected;
- editSession.EditingBackend.ProjectReloaded -= OnProjectReloaded;
- editSession.EditingBackend.WidgetNameChanged -= OnWidgetNameChanged;
- editSession.EditingBackend.WidgetContentsChanged -= OnContentsChanged;
- }
- base.Dispose ();
- }
-
- public void LoadProject ()
- {
- Clear ();
- if (editSession == null || editSession.RootWidget == null)
- return;
-
- AddNode (TreeIter.Zero, editSession.RootWidget.Wrapped);
- }
-
- public void AddNode (TreeIter iter, Gtk.Widget widget)
- {
- Stetic.Wrapper.Widget wrapper = GetVisibleWrapper (widget);
- if (wrapper == null)
- return;
-
- Gdk.Pixbuf icon = wrapper.ClassDescriptor.Icon.ScaleSimple (16, 16, Gdk.InterpType.Bilinear);
- string txt = widget.Name;
-
- if (!iter.Equals (TreeIter.Zero))
- iter = store.AppendValues (iter, icon, txt, wrapper, true);
- else
- iter = store.AppendValues (icon, txt, wrapper, true);
-
- FillChildren (iter, wrapper);
- }
-
- void FillChildren (TreeIter it, Wrapper.Widget wrapper)
- {
- Stetic.Wrapper.Container container = wrapper as Wrapper.Container;
- if (container != null) {
- foreach (Gtk.Widget w in container.RealChildren) {
- Stetic.Wrapper.Widget ww = GetVisibleWrapper (w);
- if (ww != null) {
- // Add a dummy node to allow lazy loading
- store.SetValue (it, ColFilled, false);
- store.AppendValues (it, null, "", null, false);
- return;
- }
- }
- }
- store.SetValue (it, ColFilled, true);
- }
-
- Wrapper.Widget GetVisibleWrapper (Gtk.Widget w)
- {
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (w);
- if (wrapper == null || wrapper.Unselectable)
- return null;
- else
- return wrapper;
- }
-
- void EnsureFilled (TreeIter it)
- {
- bool filled = (bool) store.GetValue (it, ColFilled);
- if (filled)
- return;
-
- // Remove the dummy node
- TreeIter cit;
- store.IterChildren (out cit, it);
- store.Remove (ref cit);
-
- // Add the real children
- Stetic.Wrapper.Container container = store.GetValue (it, ColWrapper) as Wrapper.Container;
- if (container != null) {
- foreach (Gtk.Widget w in container.RealChildren)
- AddNode (it, w);
- }
-
- store.SetValue (it, ColFilled, true);
- }
-
- void OnTestExpandRow (object s, Gtk.TestExpandRowArgs args)
- {
- EnsureFilled (args.Iter);
- args.RetVal = false;
- }
-
- public void Clear ()
- {
- TreeIter it;
- while (store.GetIterFirst (out it)) {
- store.Remove (ref it);
- }
- }
-
- void RefreshNode (TreeIter it)
- {
- Wrapper.Widget wrapper = (Wrapper.Widget) store.GetValue (it, ColWrapper);
- store.SetValue (it, ColName, wrapper.Wrapped.Name);
- TreeIter cit;
- while (store.IterChildren (out cit, it)) {
- store.Remove (ref cit);
- }
- FillChildren (it, wrapper);
- }
-
- void OnWidgetNameChanged (object s, Wrapper.WidgetNameChangedArgs args)
- {
- TreeIter? node = FindNode (args.WidgetWrapper, false);
- if (node == null)
- return;
- store.SetValue (node.Value, ColName, args.NewName);
- }
-
- void OnContentsChanged (object s, Wrapper.WidgetEventArgs args)
- {
- TreeIter? node = FindNode (args.WidgetWrapper, false);
- if (node != null)
- RefreshNode (node.Value);
- }
-
- void OnProjectReloaded (object o, EventArgs a)
- {
- LoadProject ();
- }
-
- Stetic.Wrapper.Widget SelectedWrapper {
- get {
- TreeIter iter;
- if (!Selection.GetSelected (out iter))
- return null;
- Wrapper.Widget w = (Wrapper.Widget) store.GetValue (iter, ColWrapper);
- return w;
- }
- }
-
- bool syncing = false;
-
- void RowSelected (object obj, EventArgs args)
- {
- if (!syncing) {
- syncing = true;
- Stetic.Wrapper.Widget selection = SelectedWrapper;
- if (selection != null)
- selection.Select ();
- syncing = false;
- NotifySelectionChanged (selection);
- }
- }
-
- void WidgetSelected (object s, Wrapper.WidgetEventArgs args)
- {
- if (!syncing) {
- syncing = true;
- if (args.Widget != null) {
- Wrapper.Widget w = Wrapper.Widget.Lookup (args.Widget);
- if (w != null) {
- TreeIter? it = FindNode (w, true);
- if (it != null) {
- ExpandToPath (store.GetPath (it.Value));
- Selection.SelectIter (it.Value);
- ScrollToCell (store.GetPath (it.Value), Columns[0], false, 0, 0);
- NotifySelectionChanged (w);
- }
- }
- }
- else {
- Selection.UnselectAll ();
- NotifySelectionChanged (null);
- }
- syncing = false;
- }
- }
-
- TreeIter? FindNode (Wrapper.Widget w, bool loadBranches)
- {
- Wrapper.Widget parent = w.ParentWrapper;
- TreeIter it;
-
- if (parent == null) {
- if (!store.GetIterFirst (out it))
- return null;
- } else {
- TreeIter? pi = FindNode (parent, loadBranches);
- if (pi == null)
- return null;
- if (loadBranches)
- EnsureFilled (pi.Value);
- if (!store.IterChildren (out it, pi.Value))
- return null;
- }
-
- do {
- Wrapper.Widget cw = (Wrapper.Widget) store.GetValue (it, ColWrapper);
- if (cw == w)
- return it;
- } while (store.IterNext (ref it));
-
- return null;
- }
-
- void NotifySelectionChanged (Stetic.Wrapper.Widget w)
- {
- if (frontend == null)
- return;
- if (w != null)
- frontend.NotifySelectionChanged (Component.GetSafeReference (w), w.Wrapped.Name, w.ClassDescriptor.Name);
- else
- frontend.NotifySelectionChanged (null, null, null);
- }
-
- //HACK: show context menu in release event instead of show event to work around gtk bug
- protected override bool OnButtonReleaseEvent (Gdk.EventButton evt)
- {
- if (Stetic.Editor.GtkWorkarounds.IsContextMenuButton (evt))
- return OnPopupMenu ();
- return base.OnButtonReleaseEvent (evt);
- }
-
- protected override bool OnPopupMenu ()
- {
- Stetic.Wrapper.Widget selection = SelectedWrapper;
-
- if (selection != null) {
- Menu m = new ContextMenu (selection);
- if (selection.IsTopLevel) {
- // Allow deleting top levels from the project view
- ImageMenuItem item = new ImageMenuItem (Gtk.Stock.Delete, null);
- item.Activated += delegate (object obj, EventArgs args) {
- selection.Delete ();
- };
- item.Show ();
- m.Add (item);
- }
- m.Popup ();
- return true;
- } else
- return base.OnPopupMenu ();
- }
-
- protected override void OnRowActivated (TreePath path, TreeViewColumn col)
- {
- base.OnRowActivated (path, col);
- Stetic.Wrapper.Widget w = SelectedWrapper;
- if (w != null) {
- if (frontend != null)
- frontend.NotifyWidgetActivated (Component.GetSafeReference (w), w.Wrapped.Name, w.ClassDescriptor.Name);
- if (WidgetActivated != null)
- WidgetActivated (this, new Wrapper.WidgetEventArgs (w));
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyEditor.cs
deleted file mode 100644
index 27656da7183..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyEditor.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Gtk;
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Stetic {
-
- class PropertyEditor : VBox
- {
- IPropertyEditor propEditor;
- EditSession session;
-
- public PropertyEditor (PropertyDescriptor prop) : base (false, 0)
- {
- propEditor = CreateEditor (prop);
- Add ((Gtk.Widget) propEditor);
- }
-
- public void AttachObject (object ob)
- {
- if (session != null)
- session.AttachObject (ob);
- }
-
- public IPropertyEditor CreateEditor (PropertyDescriptor prop)
- {
- PropertyEditorCell cell = PropertyEditorCell.GetPropertyCell (prop);
- cell.Initialize (this, prop, null);
-
- session = cell.StartEditing (new Gdk.Rectangle (), StateType.Normal);
- if (session == null)
- return new DummyEditor ();
-
- Gtk.Widget w = (Gtk.Widget) session.Editor as Gtk.Widget;
- w.ShowAll ();
- return session.Editor;
- }
-
- public void Update ()
- {
- if (session != null)
- session.UpdateEditor ();
- }
- }
-
- class DummyEditor: Gtk.Label, IPropertyEditor
- {
- public void Initialize (PropertyDescriptor prop)
- {
- Text = "(" + prop.PropertyType.Name + ")";
- }
-
- public void AttachObject (object obj)
- {
- }
-
- public object Value {
- get { return null; }
- set { }
- }
-
- public event EventHandler ValueChanged { add {} remove {} }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs
deleted file mode 100644
index fe8ca717bd6..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyGrid.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-using Gtk;
-using GLib;
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Stetic {
-
- internal class PropertyGrid : Gtk.VBox {
-
- Hashtable cachedGroups = new Hashtable ();
-
- Stetic.Wrapper.Widget selection;
- Stetic.Wrapper.Widget newSelection;
- Stetic.Wrapper.Container.ContainerChild packingSelection;
-
- PropertyGridHeader header;
- Gtk.Widget noSelection;
-
- ProjectBackend project;
-
- public PropertyGrid ()
- {
- header = new PropertyGridHeader ();
- header.Show ();
- PackStart (header, false, false, 0);
-
- Label lab = new Label ();
- lab.Markup = "No selection";
- PackStart (lab, false, false, 0);
- noSelection = lab;
-
- Stetic.Registry.RegistryChanging += new EventHandler (OnRegistryChanging);
- }
-
- public PropertyGrid (ProjectBackend project): this ()
- {
- this.ProjectBackend = project;
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- }
-
- void OnRegistryChanging (object o, EventArgs args)
- {
- cachedGroups.Clear ();
- Clear ();
- foreach (Gtk.Widget w in Children)
- if (! (w is PropertyGridHeader))
- Remove (w);
- }
-
- public ProjectBackend ProjectBackend {
- get { return project; }
- set {
- if (project != null)
- project.SelectionChanged -= Selected;
-
- project = value;
- project.SelectionChanged += Selected;
- Selected (null, null);
- }
- }
-
- void Clear ()
- {
- if (selection != null) {
- selection.Notify -= Notified;
- selection = null;
- }
- foreach (Gtk.Widget w in Children)
- w.Hide ();
- }
-
- void Notified (object wrapper, string propertyName)
- {
- foreach (object ob in Children) {
- PropertyGridGroup grid = ob as PropertyGridGroup;
- if (grid != null)
- grid.Notified (propertyName);
- }
- }
-
- void Selected (object s, Wrapper.WidgetEventArgs args)
- {
- newSelection = args != null ? args.WidgetWrapper : null;
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (SelectedHandler));
- }
-
- bool SelectedHandler ()
- {
- ClassDescriptor klass;
-
- Clear ();
-
- selection = newSelection;
-
- if (selection == null || selection.Wrapped is ErrorWidget) {
- noSelection.Show ();
- return false;
- }
-
- header.Show ();
-
- selection.Notify += Notified;
-
- klass = selection.ClassDescriptor;
-
- header.AttachObject (selection.Wrapped);
- AppendItemGroups (klass, selection.Wrapped);
-
- packingSelection = Stetic.Wrapper.Container.ChildWrapper (selection);
- if (packingSelection != null) {
- klass = packingSelection.ClassDescriptor;
- if (klass.ItemGroups.Count > 0) {
- AppendItemGroups (klass, packingSelection.Wrapped);
- packingSelection.Notify += Notified;
- }
- }
- return false;
- }
-
- void AppendItemGroups (ClassDescriptor klass, object obj)
- {
- int n = 1;
- foreach (ItemGroup igroup in klass.ItemGroups) {
- PropertyGridGroup grid = (PropertyGridGroup) cachedGroups [igroup];
- if (grid == null) {
- grid = new PropertyGridGroup ();
- grid.AddGroup (igroup);
- cachedGroups [igroup] = grid;
- PackStart (grid, false, false, 0);
- }
- ReorderChild (grid, n++);
- grid.ShowAll ();
- grid.AttachObject (obj);
- }
- }
- }
-
- class PropertyGridGroup: Stetic.Grid
- {
- Hashtable editors;
- Hashtable sensitives, invisibles;
- object obj;
-
- public PropertyGridGroup ()
- {
- editors = new Hashtable ();
- sensitives = new Hashtable ();
- invisibles = new Hashtable ();
- }
-
- public void AddGroup (ItemGroup igroup)
- {
- AppendGroup (igroup.Label, true);
- foreach (ItemDescriptor item in igroup) {
- if (item.IsInternal)
- continue;
- if (item is PropertyDescriptor)
- AppendProperty ((PropertyDescriptor)item);
- else if (item is CommandDescriptor)
- AppendCommand ((CommandDescriptor)item);
- }
- }
-
- public virtual void AttachObject (object ob)
- {
- this.obj = ob;
-
- foreach (object ed in editors.Values) {
- PropertyEditor pe = ed as PropertyEditor;
- if (pe != null)
- pe.AttachObject (ob);
- }
- UpdateSensitivity ();
- }
-
- protected void AppendProperty (PropertyDescriptor prop)
- {
- PropertyEditor rep = new PropertyEditor (prop);
-
- // FIXME: Make sure all notify events are based on prop names, not propspec
- editors[prop.Name] = rep;
-
- AppendPair (prop.Label, rep, prop.Description);
- rep.ShowAll ();
-
- if (prop.HasDependencies)
- sensitives[prop] = prop;
- if (prop.HasVisibility)
- invisibles[prop] = prop;
- }
-
- void AppendCommand (CommandDescriptor cmd)
- {
- Gtk.Button button = new Gtk.Button (cmd.Label);
- button.Clicked += delegate (object o, EventArgs args) {
- cmd.Run (this.obj);
- };
- button.Show ();
- Append (button, cmd.Description);
-
- if (cmd.HasDependencies) {
- editors[cmd.Name] = button;
- sensitives[cmd] = cmd;
- }
- if (cmd.HasVisibility) {
- editors[cmd.Name] = button;
- invisibles[cmd] = cmd;
- }
- }
-
- void UpdateSensitivity ()
- {
- foreach (ItemDescriptor item in sensitives.Keys) {
- Widget w = editors[item.Name] as Widget;
- if (w != null) {
- object ob = sensitives.Contains (item) ? obj : null;
- w.Sensitive = item.EnabledFor (ob);
- }
- }
- foreach (ItemDescriptor item in invisibles.Keys) {
- Widget w = editors[item.Name] as Widget;
- if (w != null) {
- object ob = invisibles.Contains (item) ? obj : null;
- if (!item.VisibleFor (ob))
- w.Hide ();
- else
- w.Show ();
- }
- }
- }
-
- public void Notified (string propertyName)
- {
- PropertyEditor ed = editors [propertyName] as PropertyEditor;
- if (ed != null)
- ed.Update ();
- UpdateSensitivity ();
- }
- }
-
- class PropertyGridHeader: PropertyGridGroup
- {
- PropertyDescriptor name;
- Gtk.Image image;
- Gtk.Label label;
-
- public PropertyGridHeader ()
- {
- name = (PropertyDescriptor)Registry.LookupClassByName ("Gtk.Widget") ["Name"];
- AppendProperty (name);
-
- Gtk.HBox box = new Gtk.HBox (false, 6);
- image = new Gtk.Image ();
- box.PackStart (image, false, false, 0);
- label = new Gtk.Label ();
- box.PackStart (label, false, false, 0);
- box.ShowAll ();
- AppendPair ("Widget Class", box, null);
- }
-
- public override void AttachObject (object ob)
- {
- base.AttachObject (ob);
- Gtk.Widget w = (Gtk.Widget) ob;
- ObjectWrapper wrapper = ObjectWrapper.Lookup (w);
- image.Pixbuf = wrapper.ClassDescriptor.Icon;
- label.Text = wrapper.WrappedTypeName;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs
deleted file mode 100644
index f297ad70a3f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs
+++ /dev/null
@@ -1,582 +0,0 @@
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-using Mono.Unix;
-
-namespace Stetic
-{
- public class PropertyTree: Gtk.ScrolledWindow
- {
- Gtk.TreeStore store;
- InternalTree tree;
- TreeViewColumn editorColumn;
- Hashtable propertyRows;
- Hashtable sensitives, invisibles;
- ArrayList expandStatus = new ArrayList ();
-
- public PropertyTree ()
- {
- propertyRows = new Hashtable ();
- sensitives = new Hashtable ();
- invisibles = new Hashtable ();
-
- store = new TreeStore (typeof (string), typeof(PropertyDescriptor), typeof(bool), typeof(InstanceData));
-
- tree = new InternalTree (this, store);
-
- CellRendererText crt;
-
- TreeViewColumn col;
-
- col = new TreeViewColumn ();
- col.Title = Catalog.GetString ("Property");
- crt = new CellRendererPropertyGroup (tree);
- col.PackStart (crt, true);
- col.SetCellDataFunc (crt, new TreeCellDataFunc (GroupData));
- col.Resizable = true;
- col.Expand = false;
- col.Sizing = TreeViewColumnSizing.Fixed;
- col.FixedWidth = 150;
- tree.AppendColumn (col);
-
- editorColumn = new TreeViewColumn ();
- editorColumn.Title = Catalog.GetString ("Value");
-
- CellRendererProperty crp = new CellRendererProperty (tree);
-
- editorColumn.PackStart (crp, true);
- editorColumn.SetCellDataFunc (crp, new TreeCellDataFunc (PropertyData));
- editorColumn.Sizing = TreeViewColumnSizing.Fixed;
- editorColumn.Resizable = false;
- editorColumn.Expand = true;
- tree.AppendColumn (editorColumn);
-
- tree.HeadersVisible = false;
- this.ShadowType = Gtk.ShadowType.In;
- this.HscrollbarPolicy = Gtk.PolicyType.Never;
-
- Add (tree);
- ShowAll ();
-
- tree.Selection.Changed += OnSelectionChanged;
- }
-
- public void AddProperties (ItemGroupCollection itemGroups, object instance, string targetGtkVersion)
- {
- foreach (ItemGroup igroup in itemGroups)
- AddGroup (igroup, instance, targetGtkVersion);
- }
-
- public void SaveStatus ()
- {
- expandStatus.Clear ();
-
- TreeIter iter;
- if (!tree.Model.GetIterFirst (out iter))
- return;
-
- do {
- if (tree.GetRowExpanded (tree.Model.GetPath (iter))) {
- expandStatus.Add (tree.Model.GetValue (iter, 0));
- }
- } while (tree.Model.IterNext (ref iter));
- }
-
- public void RestoreStatus ()
- {
- TreeIter iter;
- if (!tree.Model.GetIterFirst (out iter))
- return;
-
- // If the tree only has one group, show it always expanded
- TreeIter iter2 = iter;
- if (!tree.Model.IterNext (ref iter2)) {
- tree.ExpandRow (tree.Model.GetPath (iter), true);
- return;
- }
-
- do {
- object grp = tree.Model.GetValue (iter, 0);
- if (expandStatus.Contains (grp))
- tree.ExpandRow (tree.Model.GetPath (iter), true);
- } while (tree.Model.IterNext (ref iter));
- }
-
- public virtual void Clear ()
- {
- store.Clear ();
- propertyRows.Clear ();
- sensitives.Clear ();
- invisibles.Clear ();
- }
-
- public virtual void Update ()
- {
- // Just repaint the cells
- QueueDraw ();
- }
-
- public void AddGroup (ItemGroup igroup, object instance, string targetGtkVersion)
- {
- ArrayList props = new ArrayList ();
- foreach (ItemDescriptor item in igroup) {
- if (item.IsInternal)
- continue;
- if (item is PropertyDescriptor && item.SupportsGtkVersion (targetGtkVersion))
- props.Add (item);
- }
-
- if (props.Count == 0)
- return;
-
- InstanceData idata = new InstanceData (instance);
- TreeIter iter = store.AppendValues (igroup.Label, null, true, idata);
- foreach (PropertyDescriptor item in props)
- AppendProperty (iter, (PropertyDescriptor)item, idata);
- }
-
- protected void AppendProperty (PropertyDescriptor prop, object instance)
- {
- AppendProperty (TreeIter.Zero, prop, new InstanceData (instance));
- }
-
- protected void AppendProperty (TreeIter piter, PropertyDescriptor prop, object instance)
- {
- AppendProperty (piter, prop, new InstanceData (instance));
- }
-
- void AppendProperty (TreeIter piter, PropertyDescriptor prop, InstanceData idata)
- {
- TreeIter iter;
- if (piter.Equals (TreeIter.Zero))
- iter = store.AppendValues (prop.Label, prop, false, idata);
- else
- iter = store.AppendValues (piter, prop.Label, prop, false, idata);
- if (prop.HasDependencies)
- sensitives[prop] = prop;
- if (prop.HasVisibility)
- invisibles[prop] = prop;
- propertyRows [prop] = store.GetStringFromIter (iter);
- }
-
- protected virtual void OnObjectChanged ()
- {
- }
-
- void OnSelectionChanged (object s, EventArgs a)
- {
- TreePath[] rows = tree.Selection.GetSelectedRows ();
- if (!tree.dragging && rows != null && rows.Length > 0) {
- tree.SetCursor (rows[0], editorColumn, true);
- }
- }
-
- internal void NotifyChanged ()
- {
- OnObjectChanged ();
- }
-
- void PropertyData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
- {
- CellRendererProperty rc = (CellRendererProperty) cell;
- bool group = (bool) model.GetValue (iter, 2);
- if (group) {
- rc.SetData (null, null, null);
- } else {
- PropertyDescriptor prop = (PropertyDescriptor) model.GetValue (iter, 1);
- PropertyEditorCell propCell = PropertyEditorCell.GetPropertyCell (prop);
- InstanceData idata = (InstanceData) model.GetValue (iter, 3);
- propCell.Initialize (tree, prop, idata.Instance);
- rc.SetData (idata.Instance, prop, propCell);
- }
- }
-
- void GroupData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
- {
- CellRendererPropertyGroup rc = (CellRendererPropertyGroup) cell;
- rc.IsGroup = (bool) model.GetValue (iter, 2);
- rc.Text = (string) model.GetValue (iter, 0);
-
- PropertyDescriptor prop = (PropertyDescriptor) model.GetValue (iter, 1);
- if (prop != null) {
- InstanceData idata = (InstanceData) model.GetValue (iter, 3);
- rc.SensitiveProperty = prop.EnabledFor (idata.Instance) && prop.VisibleFor (idata.Instance);
- } else
- rc.SensitiveProperty = true;
- }
- }
-
- class InternalTree: TreeView
- {
- internal ArrayList Groups = new ArrayList ();
- Pango.Layout layout;
- bool editing;
- PropertyTree tree;
- internal bool dragging;
- int dragPos;
- Gdk.Cursor resizeCursor = new Gdk.Cursor (CursorType.SbHDoubleArrow);
-
- public InternalTree (PropertyTree tree, TreeModel model): base (model)
- {
- this.tree = tree;
- layout = new Pango.Layout (this.PangoContext);
- layout.Wrap = Pango.WrapMode.Char;
- Pango.FontDescription des = this.Style.FontDescription.Copy();
- des.Size = 10 * (int) Pango.Scale.PangoScale;
- layout.FontDescription = des;
- }
-
- public bool Editing {
- get { return editing; }
- set { editing = value; Update (); tree.NotifyChanged (); }
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose e)
- {
- Groups.Clear ();
-
- bool res = base.OnExposeEvent (e);
-
- foreach (TreeGroup grp in Groups) {
- layout.SetMarkup ("" + GLib.Markup.EscapeText (grp.Group) + "");
- e.Window.DrawLayout (this.Style.TextGC (grp.State), grp.X, grp.Y, layout);
- }
-
- return res;
- }
-
- protected override bool OnMotionNotifyEvent (EventMotion evnt)
- {
- if (dragging) {
- int nw = (int)(evnt.X) + dragPos;
- if (nw <= 40) nw = 40;
- GLib.Idle.Add (delegate {
- Columns[0].FixedWidth = nw;
- return false;
- });
- } else {
- int w = Columns[0].Width;
- if (Math.Abs (w - evnt.X) < 5)
- this.GdkWindow.Cursor = resizeCursor;
- else
- this.GdkWindow.Cursor = null;
- }
- return base.OnMotionNotifyEvent (evnt);
- }
-
- protected override bool OnButtonPressEvent (EventButton evnt)
- {
- int w = Columns[0].Width;
- if (Math.Abs (w - evnt.X) < 5) {
- TreePath[] rows = Selection.GetSelectedRows ();
- if (rows != null && rows.Length > 0)
- SetCursor (rows[0], Columns[0], false);
- dragging = true;
- dragPos = w - (int) evnt.X;
- this.GdkWindow.Cursor = resizeCursor;
- }
- return base.OnButtonPressEvent (evnt);
- }
-
- protected override bool OnButtonReleaseEvent (EventButton evnt)
- {
- if (dragging) {
- this.GdkWindow.Cursor = null;
- dragging = false;
- }
- return base.OnButtonReleaseEvent (evnt);
- }
-
- public virtual void Update ()
- {
- }
-
- protected override void OnDestroyed ()
- {
- base.OnDestroyed ();
- if (layout != null) {
- layout.Dispose ();
- layout = null;
- }
- if (resizeCursor != null) {
- resizeCursor.Dispose ();
- resizeCursor = null;
- }
- }
-
- }
-
- class TreeGroup
- {
- public string Group;
- public int X;
- public int Y;
- public StateType State;
- }
-
- class CellRendererProperty: CellRenderer
- {
- PropertyDescriptor property;
- object instance;
- int rowHeight;
- PropertyEditorCell editorCell;
- bool sensitive;
- bool visible;
- TreeView tree;
-
- public CellRendererProperty (TreeView tree)
- {
- this.tree = tree;
- Xalign = 0;
- Xpad = 3;
-
- Mode |= Gtk.CellRendererMode.Editable;
- Entry dummyEntry = new Gtk.Entry ();
- dummyEntry.HasFrame = false;
- rowHeight = dummyEntry.SizeRequest ().Height;
- }
-
- public void SetData (object instance, PropertyDescriptor property, PropertyEditorCell editor)
- {
- this.instance = instance;
- this.property = property;
- if (property == null)
- this.CellBackgroundGdk = tree.Style.MidColors [(int)Gtk.StateType.Normal];
- else
- this.CellBackground = null;
-
- visible = property != null ? property.VisibleFor (instance): true;
- sensitive = property != null ? property.EnabledFor (instance) && property.VisibleFor (instance): true;
- editorCell = editor;
- }
-
- public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- if (editorCell != null)
- editorCell.GetSize ((int)(cell_area.Width - this.Xpad * 2), out width, out height);
- else {
- width = height = 0;
- }
-
- width += (int) this.Xpad * 2;
- height += (int) this.Ypad * 2;
-
- x_offset = 0;
- y_offset = 0;
-
- if (height < rowHeight)
- height = rowHeight;
- }
-
- protected override void Render (Drawable window, Widget widget, Rectangle background_area, Rectangle cell_area, Rectangle expose_area, CellRendererState flags)
- {
- if (instance == null || !visible)
- return;
- int width = 0, height = 0;
- int iwidth = cell_area.Width - (int) this.Xpad * 2;
-
- if (editorCell != null)
- editorCell.GetSize ((int)(cell_area.Width - this.Xpad * 2), out width, out height);
-
- Rectangle bounds = new Rectangle ();
- bounds.Width = width > iwidth ? iwidth : width;
- bounds.Height = height;
- bounds.X = (int) (cell_area.X + this.Xpad);
- bounds.Y = cell_area.Y + (cell_area.Height - height) / 2;
-
- StateType state = GetState (flags);
-
- if (editorCell != null)
- editorCell.Render (window, bounds, state);
- }
-
- public override CellEditable StartEditing (Gdk.Event ev, Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
- {
- if (property == null || editorCell == null || !sensitive)
- return null;
-
- StateType state = GetState (flags);
- EditSession session = editorCell.StartEditing (cell_area, state);
- if (session == null)
- return null;
- Gtk.Widget propEditor = (Gtk.Widget) session.Editor;
- propEditor.Show ();
- HackEntry e = new HackEntry (propEditor, session);
- e.Show ();
- return e;
- }
-
- StateType GetState (CellRendererState flags)
- {
- if (!sensitive)
- return StateType.Insensitive;
- else if ((flags & CellRendererState.Selected) != 0)
- return StateType.Selected;
- else
- return StateType.Normal;
- }
- }
-
- class CellRendererPropertyGroup: CellRendererText
- {
- TreeView tree;
- Pango.Layout layout;
- bool isGroup;
- bool sensitive;
-
- public bool IsGroup {
- get { return isGroup; }
- set {
- isGroup = value;
- if (value)
- this.CellBackgroundGdk = tree.Style.MidColors [(int)Gtk.StateType.Normal];
- else
- this.CellBackground = null;
- }
- }
-
- public bool SensitiveProperty {
- get { return sensitive; }
- set { sensitive = value; }
- }
-
- public CellRendererPropertyGroup (TreeView tree)
- {
- this.tree = tree;
- layout = new Pango.Layout (tree.PangoContext);
- layout.Wrap = Pango.WrapMode.Char;
-
- Pango.FontDescription des = tree.Style.FontDescription.Copy();
- des.Size = 10 * (int) Pango.Scale.PangoScale;
- layout.FontDescription = des;
- }
-
- protected void GetCellSize (Widget widget, int availableWidth, out int width, out int height)
- {
- layout.SetMarkup (Text);
- layout.Width = -1;
- layout.GetPixelSize (out width, out height);
- }
-
- public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- GetCellSize (widget, (int)(cell_area.Width - this.Xpad * 2), out width, out height);
- width += (int) this.Xpad * 2;
- height += (int) this.Ypad * 2;
-
- x_offset = y_offset = 0;
-
- if (IsGroup)
- width = 0;
- }
-
- protected override void Render (Drawable window, Widget widget, Rectangle background_area, Rectangle cell_area, Rectangle expose_area, CellRendererState flags)
- {
- int width, height;
- GetCellSize (widget, (int)(cell_area.Width - this.Xpad * 2), out width, out height);
-
- int x = (int) (cell_area.X + this.Xpad);
- int y = cell_area.Y + (cell_area.Height - height) / 2;
-
- StateType state;
- if (!sensitive)
- state = StateType.Insensitive;
- else if ((flags & CellRendererState.Selected) != 0)
- state = StateType.Selected;
- else
- state = StateType.Normal;
-
- if (IsGroup) {
- TreeGroup grp = new TreeGroup ();
- grp.X = x;
- grp.Y = y;
- grp.Group = Text;
- grp.State = state;
- InternalTree tree = (InternalTree) widget;
- tree.Groups.Add (grp);
- } else {
- window.DrawLayout (widget.Style.TextGC (state), x, y, layout);
- int bx = background_area.X + background_area.Width - 1;
- using (Gdk.GC gc = new Gdk.GC (window)) {
- gc.RgbFgColor = tree.Style.MidColors [(int)Gtk.StateType.Normal];
- window.DrawLine (gc, bx, background_area.Y, bx, background_area.Y + background_area.Height);
- }
- }
- }
-
- protected override void OnDestroyed ()
- {
- if (layout != null) {
- layout.Dispose ();
- layout = null;
- }
- base.OnDestroyed ();
- }
- }
-
- class HackEntry: Entry
- {
- EventBox box;
- EditSession session;
-
- public HackEntry (Gtk.Widget child, EditSession session)
- {
- this.session = session;
- box = new EventBox ();
- box.ButtonPressEvent += new ButtonPressEventHandler (OnClickBox);
- box.ModifyBg (StateType.Normal, Style.White);
- box.Add (child);
- }
-
- [GLib.ConnectBefore]
- void OnClickBox (object s, ButtonPressEventArgs args)
- {
- // Avoid forwarding the button press event to the
- // tree, since it would hide the cell editor.
- args.RetVal = true;
- }
-
- protected override void OnParentSet (Gtk.Widget previous_parent)
- {
- base.OnParentSet (previous_parent);
-
- if (Parent != null) {
- if (this.ParentWindow != null)
- box.ParentWindow = this.ParentWindow;
- box.Parent = Parent;
- box.Show ();
- ((InternalTree)Parent).Editing = true;
- }
- else {
- session.Dispose ();
- ((InternalTree)previous_parent).Editing = false;
- if (box.Parent != null)
- box.Unparent ();
- }
- }
-
- protected override void OnShown ()
- {
- // Do nothing.
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
- box.SizeRequest ();
- box.Allocation = allocation;
- }
- }
-
- class InstanceData
- {
- public InstanceData (object instance)
- {
- Instance = instance;
- }
-
- public object Instance;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Shadow.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Shadow.cs
deleted file mode 100644
index 45d2a623572..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Shadow.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Shadow code from anders */
-
-using System;
-using Gdk;
-
-class ConvFilter
-{
- public int size;
- public double[] data;
-}
-
-class Shadow
-{
- public const int BLUR_RADIUS = 5;
- public const int SHADOW_OFFSET = (BLUR_RADIUS * 4 / 5);
- public const double SHADOW_OPACITY = 0.5;
-
- static ConvFilter filter;
-
- static double Gaussian (double x, double y, double r)
- {
- return ((1 / (2 * System.Math.PI * r)) *
- System.Math.Exp ((- (x * x + y * y)) / (2 * r * r)));
- }
-
- static ConvFilter CreateBlurFilter (int radius)
- {
- ConvFilter filter;
- int x, y;
- double sum;
-
- filter = new ConvFilter ();
- filter.size = radius * 2 + 1;
- filter.data = new double [filter.size * filter.size];
-
- sum = 0.0;
-
- for (y = 0 ; y < filter.size; y++) {
- for (x = 0 ; x < filter.size; x++) {
- sum += filter.data [y * filter.size + x] = Gaussian (x - (filter.size >> 1),
- y - (filter.size >> 1),
- radius);
- }
- }
-
- for (y = 0; y < filter.size; y++) {
- for (x = 0; x < filter.size; x++)
- filter.data [y * filter.size + x] /= sum;
- }
- return filter;
- }
-
- unsafe static Pixbuf CreateEffect (int src_width, int src_height, ConvFilter filter, int radius, int offset, double opacity)
- {
- Pixbuf dest;
- int x, y, i, j;
- int src_x, src_y;
- int suma;
- int dest_width, dest_height;
- int dest_rowstride;
- byte* dest_pixels;
-
- dest_width = src_width + 2 * radius + offset;
- dest_height = src_height + 2 * radius + offset;
-
- dest = new Pixbuf (Colorspace.Rgb, true, 8, dest_width, dest_height);
- dest.Fill (0);
-
- dest_pixels = (byte*) dest.Pixels;
-
- dest_rowstride = dest.Rowstride;
-
- for (y = 0; y < dest_height; y++)
- {
- for (x = 0; x < dest_width; x++)
- {
- suma = 0;
-
- src_x = x - radius;
- src_y = y - radius;
-
- /* We don't need to compute effect here, since this pixel will be
- * discarded when compositing */
- if (src_x >= 0 && src_x < src_width && src_y >= 0 && src_y < src_height)
- continue;
-
- for (i = 0; i < filter.size; i++)
- {
- for (j = 0; j < filter.size; j++)
- {
- src_y = -(radius + offset) + y - (filter.size >> 1) + i;
- src_x = -(radius + offset) + x - (filter.size >> 1) + j;
-
- if (src_y < 0 || src_y >= src_height ||
- src_x < 0 || src_x >= src_width)
- continue;
-
- suma += (int) (((byte)0xFF) * filter.data [i * filter.size + j]);
- }
- }
-
- byte r = (byte) (suma * opacity);
- dest_pixels [y * dest_rowstride + x * 4 + 3] = r;
- }
- }
- return dest;
- }
-
- public static Pixbuf AddShadow (int width, int height)
- {
- if (filter == null)
- filter = CreateBlurFilter (BLUR_RADIUS);
-
- return CreateEffect (width, height, filter, BLUR_RADIUS, SHADOW_OFFSET, SHADOW_OPACITY);
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditor.cs
deleted file mode 100644
index 023a52c1cf3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditor.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public class SignalsEditor: PluggableWidget
- {
- SignalsEditorFrontend frontend;
- SignalsEditorEditSession session;
-
- public event EventHandler SignalActivated;
-
- internal SignalsEditor (Application app): base (app)
- {
- frontend = new SignalsEditorFrontend (this);
- }
-
- public Signal SelectedSignal {
- get {
- if (session != null)
- return session.SelectedSignal;
- else
- return null;
- }
- }
-
- protected override void OnCreatePlug (uint socketId)
- {
- session = app.Backend.CreateSignalsWidgetPlug (frontend, socketId);
- }
-
- protected override void OnDestroyPlug (uint socketId)
- {
- app.Backend.DestroySignalsWidgetPlug ();
- }
-
- protected override Gtk.Widget OnCreateWidget ()
- {
- session = app.Backend.GetSignalsWidget (frontend);
- return session.Editor;
- }
-
- bool disposed = false;
-
- public override void Dispose ()
- {
- if (disposed)
- return;
- disposed = true;
-
- if (session != null)
- session.Dispose ();
- frontend.disposed = true;
- System.Runtime.Remoting.RemotingServices.Disconnect (frontend);
- base.Dispose ();
- }
-
- internal void NotifySignalActivated ()
- {
- if (SignalActivated != null)
- SignalActivated (this, EventArgs.Empty);
- }
- }
-
- internal class SignalsEditorFrontend: MarshalByRefObject
- {
- SignalsEditor editor;
- internal bool disposed;
-
- public SignalsEditorFrontend (SignalsEditor editor)
- {
- this.editor = editor;
- }
-
- public void NotifySignalActivated ()
- {
- Gtk.Application.Invoke (
- (o, args) => {
- if (!disposed) editor.NotifySignalActivated ();
- }
- );
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditorBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditorBackend.cs
deleted file mode 100644
index 5b22a710d7d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/SignalsEditorBackend.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-using System;
-using System.Text;
-using System.Collections;
-using Stetic.Wrapper;
-using Mono.Unix;
-
-namespace Stetic
-{
- internal class SignalsEditorBackend: Gtk.ScrolledWindow, IObjectViewer
- {
- Gtk.TreeView tree;
- Gtk.TreeStore store;
- SignalsEditorFrontend frontend;
-
- ProjectBackend project;
- ObjectWrapper selection;
- bool internalChange;
-
- const int ColSignal = 0;
- const int ColHandler = 1;
- const int ColAfter = 2;
- const int ColHasHandler = 3;
- const int ColIsSignal = 4;
- const int ColSignalTextWeight = 5;
-
- public SignalsEditorBackend (SignalsEditorFrontend frontend)
- {
- this.frontend = frontend;
-
- tree = new Gtk.TreeView ();
- store = new Gtk.TreeStore (typeof(string), typeof(string), typeof(bool), typeof(bool), typeof(bool), typeof(int));
- tree.Model = store;
- tree.RowActivated += new Gtk.RowActivatedHandler (OnRowActivated);
-
- Gtk.CellRendererText crtSignal = new Gtk.CellRendererText ();
-
- Gtk.CellRendererText crtHandler = new Gtk.CellRendererText ();
- crtHandler.Editable = true;
- crtHandler.Edited += new Gtk.EditedHandler (OnHandlerEdited);
-
- Gtk.CellRendererToggle crtogAfter = new Gtk.CellRendererToggle ();
- crtogAfter.Activatable = true;
- crtogAfter.Toggled += new Gtk.ToggledHandler (OnAfterToggled);
-
- tree.AppendColumn (Catalog.GetString ("Signal"), crtSignal, "text", ColSignal, "weight", ColSignalTextWeight);
- tree.AppendColumn (Catalog.GetString ("Handler"), crtHandler, "markup", ColHandler, "visible", ColIsSignal);
- tree.AppendColumn (Catalog.GetString ("After"), crtogAfter, "active", ColAfter, "visible", ColHasHandler);
- tree.Columns[0].Resizable = true;
- tree.Columns[1].Resizable = true;
- tree.Columns[2].Resizable = true;
- Add (tree);
- ShowAll ();
- }
-
- public SignalsEditorBackend (SignalsEditorFrontend frontend, ProjectBackend project): this (frontend)
- {
- ProjectBackend = project;
- }
-
- public ProjectBackend ProjectBackend {
- get { return project; }
- set {
- if (project != null) {
- project.SelectionChanged -= OnWidgetSelected;
- project.SignalAdded -= new SignalEventHandler (OnSignalAddedOrRemoved);
- project.SignalRemoved -= new SignalEventHandler (OnSignalAddedOrRemoved);
- project.SignalChanged -= new SignalChangedEventHandler (OnSignalChanged);
- project.ProjectReloaded -= new EventHandler (OnProjectReloaded);
- }
-
- project = value;
- if (project != null) {
- TargetObject = project.Selection;
- project.SelectionChanged += OnWidgetSelected;
- project.SignalAdded += new SignalEventHandler (OnSignalAddedOrRemoved);
- project.SignalRemoved += new SignalEventHandler (OnSignalAddedOrRemoved);
- project.SignalChanged += new SignalChangedEventHandler (OnSignalChanged);
- project.ProjectReloaded += new EventHandler (OnProjectReloaded);
- } else if (selection != null) {
- selection = null;
- RefreshTree ();
- }
- }
- }
-
- void OnProjectReloaded (object s, EventArgs a)
- {
- OnWidgetSelected (null, null);
- }
-
- public Signal SelectedSignal {
- get {
- Gtk.TreeModel foo;
- Gtk.TreeIter iter;
- if (!tree.Selection.GetSelected (out foo, out iter))
- return null;
- return GetSignal (iter);
- }
- }
-
- public object TargetObject {
- get {
- return selection != null ? selection.Wrapped : null;
- }
- set {
- if (project != null) {
- ObjectWrapper wrapper = ObjectWrapper.Lookup (value);
- if (wrapper == selection)
- return;
- selection = wrapper;
- RefreshTree ();
- }
- }
- }
-
- void OnWidgetSelected (object s, Wrapper.WidgetEventArgs args)
- {
- ObjectWrapper wrapper = args != null ? args.WidgetWrapper : null;
- if (wrapper == selection)
- return;
- selection = wrapper;
- RefreshTree ();
- }
-
- void OnSignalAddedOrRemoved (object sender, SignalEventArgs args)
- {
- if (!internalChange && args.Wrapper == selection)
- RefreshTree ();
- }
-
- void OnSignalChanged (object sender, SignalChangedEventArgs args)
- {
- if (!internalChange && args.Wrapper == selection)
- RefreshTree ();
- }
-
- void RefreshTree ()
- {
- ArrayList status = SaveStatus ();
- store.Clear ();
-
- if (selection == null)
- return;
-
- ClassDescriptor klass = selection.ClassDescriptor;
-
- foreach (ItemGroup group in klass.SignalGroups) {
- Gtk.TreeIter iter = store.AppendValues (group.Label, null, false, false, false, (int) Pango.Weight.Normal);
- if (FillGroup (iter, group))
- store.SetValue (iter, ColSignalTextWeight, (int) Pango.Weight.Bold);
- }
- RestoreStatus (status);
- }
-
- bool FillGroup (Gtk.TreeIter groupIter, ItemGroup group)
- {
- bool hasSignals = false;
- foreach (SignalDescriptor sd in group) {
- if (!sd.SupportsGtkVersion (project.TargetGtkVersion))
- continue;
-
- bool foundSignal = false;
- Gtk.TreeIter parent = groupIter;
-
- foreach (Signal signal in selection.Signals) {
- if (signal.SignalDescriptor != sd) continue;
-
- Gtk.TreeIter iter = store.AppendValues (parent, null, signal.Handler, false, true, true, (int) Pango.Weight.Normal);
- if (!foundSignal) {
- parent = iter;
- store.SetValue (iter, ColSignal, sd.Name);
- store.SetValue (iter, ColSignalTextWeight, (int) Pango.Weight.Bold);
- hasSignals = foundSignal = true;
- }
- }
-
- InsertEmptySignalRow (parent, foundSignal ? null : sd.Name);
- }
- return hasSignals;
- }
-
- void SetSignalData (Gtk.TreeIter iter, Signal signal)
- {
- store.SetValue (iter, ColHandler, signal.Handler);
- store.SetValue (iter, ColAfter, false);
- store.SetValue (iter, ColHasHandler, true);
- store.SetValue (iter, ColIsSignal, true);
- }
-
- void InsertEmptySignalRow (Gtk.TreeIter parent, string name)
- {
- store.AppendValues (parent, name, EmptyHandlerMarkup, false, false, true, (int) Pango.Weight.Normal);
- }
-
- void OnRowActivated (object sender, Gtk.RowActivatedArgs args)
- {
- Gtk.TreeIter iter;
- if (!store.GetIter (out iter, args.Path))
- return;
-
- SignalDescriptor sd = GetSignalDescriptor (iter);
- if (sd != null) {
- if (GetSignal (iter) == null)
- AddHandler (iter, GetHandlerName (sd.Name));
- frontend.NotifySignalActivated ();
- }
- }
-
- string GetHandlerName (string signalName)
- {
- Wrapper.Widget selWidget = selection as Wrapper.Widget;
- if (selWidget != null) {
- if (selWidget.IsTopLevel)
- return "On" + signalName;
- else
- return "On" + GetIdentifier (selWidget.Wrapped.Name) + signalName;
- }
-
- Wrapper.Action action = selection as Wrapper.Action;
- if (action != null) {
- return "On" + GetIdentifier (action.Name) + signalName;
- }
-
- return "On" + signalName;
- }
-
- string GetIdentifier (string name)
- {
- StringBuilder sb = new StringBuilder ();
-
- bool wstart = true;
- foreach (char c in name) {
- if (c == '_' || c == '-' || c == ' ' || !char.IsLetterOrDigit (c)) {
- wstart = true;
- continue;
- }
- if (wstart) {
- sb.Append (char.ToUpper (c));
- wstart = false;
- } else
- sb.Append (c);
- }
- return sb.ToString ();
- }
-
- void OnHandlerEdited (object sender, Gtk.EditedArgs args)
- {
- if (args.NewText == EmptyHandlerText)
- return;
-
- Gtk.TreeIter iter;
- if (!store.GetIterFromString (out iter, args.Path))
- return;
-
- AddHandler (iter, args.NewText);
- }
-
- void AddHandler (Gtk.TreeIter iter, string name)
- {
- internalChange = true;
-
- Gtk.TreeIter piter = iter;
- while (store.IterDepth (piter) != 0)
- store.IterParent (out piter, piter);
-
- Signal signal = GetSignal (iter);
- if (signal == null) {
- if (name != "") {
- SignalDescriptor sd = GetSignalDescriptor (iter);
- signal = new Signal (sd);
- signal.Handler = name;
- selection.Signals.Add (signal);
- SetSignalData (iter, signal);
- store.SetValue (iter, ColSignalTextWeight, (int) Pango.Weight.Bold);
- if (store.IterDepth (iter) != 1)
- store.IterParent (out iter, iter);
- InsertEmptySignalRow (iter, null);
- }
- } else {
- if (name != "") {
- signal.Handler = name;
- store.SetValue (iter, ColHandler, signal.Handler);
- } else {
- selection.Signals.Remove (signal);
- if (store.IterDepth (iter) == 1) {
- if (store.IterNChildren (iter) == 1) {
- Gtk.TreeIter parent;
- store.IterParent (out parent, iter);
- store.Remove (ref iter);
- InsertEmptySignalRow (parent, signal.SignalDescriptor.Name);
- } else {
- Gtk.TreeIter citer;
- store.IterChildren (out citer, iter);
- Signal csignal = GetSignal (citer);
- store.Remove (ref citer);
- SetSignalData (iter, csignal);
- if (store.IterNChildren (iter) == 1)
- tree.CollapseRow (store.GetPath (iter));
- }
- } else
- store.Remove (ref iter);
- }
- }
- UpdateGroupStatus (piter);
- internalChange = false;
- }
-
- void OnAfterToggled (object o, Gtk.ToggledArgs args)
- {
- Gtk.TreeIter it;
- if (store.GetIterFromString (out it, args.Path)) {
- Signal signal = GetSignal (it);
- if (signal != null) {
- internalChange = true;
- signal.After = !signal.After;
- internalChange = false;
- store.SetValue (it, ColAfter, signal.After);
- }
- }
- }
-
- void UpdateGroupStatus (Gtk.TreeIter iter)
- {
- Gtk.TreeIter signalIter;
- if (store.IterChildren (out signalIter, iter)) {
- do {
- if (store.IterNChildren (signalIter) > 0) {
- store.SetValue (iter, ColSignalTextWeight, (int) Pango.Weight.Bold);
- return;
- }
- } while (store.IterNext (ref signalIter));
- }
- store.SetValue (iter, ColSignalTextWeight, (int) Pango.Weight.Normal);
- }
-
- Signal GetSignal (Gtk.TreeIter iter)
- {
- if (! (bool) store.GetValue (iter, ColHasHandler))
- return null;
- string handler = (string) store.GetValue (iter, ColHandler);
- foreach (Signal sig in selection.Signals)
- if (sig.Handler == handler)
- return sig;
- return null;
- }
-
- SignalDescriptor GetSignalDescriptor (Gtk.TreeIter iter)
- {
- Gtk.TreeIter group_iter;
- if (! (bool) store.GetValue (iter, ColIsSignal) || !store.IterParent (out group_iter, iter))
- return null;
- string name = (string) store.GetValue (iter, ColSignal);
- string group_name = (string) store.GetValue (group_iter, ColSignal);
-
- foreach (ItemGroup igroup in selection.ClassDescriptor.SignalGroups) {
- if (igroup.Label != group_name)
- continue;
- SignalDescriptor desc = (SignalDescriptor) igroup [name];
- if (desc != null)
- return desc;
- }
-
- return null;
- }
-
- ArrayList SaveStatus ()
- {
- ArrayList list = new ArrayList ();
-
- Gtk.TreeIter it;
- if (!store.GetIterFirst (out it))
- return list;
-
- do {
- SaveStatus (list, "", it);
- } while (store.IterNext (ref it));
-
- return list;
- }
-
- void SaveStatus (ArrayList list, string path, Gtk.TreeIter iter)
- {
- string basePath = path + "/" + store.GetValue (iter, ColSignal);
-
- if (!tree.GetRowExpanded (store.GetPath (iter)))
- return;
-
- list.Add (basePath);
-
- if (store.IterChildren (out iter, iter)) {
- do {
- SaveStatus (list, basePath, iter);
- } while (store.IterNext (ref iter));
- }
- }
-
- void RestoreStatus (ArrayList list)
- {
- foreach (string namePath in list) {
- string[] names = namePath.Split ('/');
-
- Gtk.TreeIter iter = Gtk.TreeIter.Zero;
-
- bool found = true;
- foreach (string name in names) {
- if (name == "") continue;
- if (!FindChildByName (name, ref iter)) {
- found = false;
- break;
- }
- }
-
- if (found)
- tree.ExpandRow (store.GetPath (iter), false);
- }
- }
-
- bool FindChildByName (string name, ref Gtk.TreeIter iter)
- {
- if (iter.Equals (Gtk.TreeIter.Zero)) {
- if (!store.GetIterFirst (out iter))
- return false;
- } else if (!store.IterChildren (out iter, iter))
- return false;
-
- do {
- if (name == (string) store.GetValue (iter, ColSignal))
- return true;
- }
- while (store.IterNext (ref iter));
-
- return false;
- }
-
- string EmptyHandlerMarkup {
- get { return "" + EmptyHandlerText + ""; }
- }
-
- string EmptyHandlerText {
- get { return Catalog.GetString ("Click here to add a new handler"); }
- }
- }
-
- internal class SignalsEditorEditSession: MarshalByRefObject
- {
- SignalsEditorBackend backend;
-
- public SignalsEditorEditSession (SignalsEditorFrontend frontend)
- {
- backend = new SignalsEditorBackend (frontend);
- }
-
- public SignalsEditorBackend Editor {
- get { return backend; }
- }
-
- public ProjectBackend ProjectBackend {
- get { return backend.ProjectBackend; }
- set { backend.ProjectBackend = value; }
- }
-
- public Signal SelectedSignal {
- get {
- return backend.SelectedSignal;
- }
- }
-
- public void Dispose ()
- {
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/UndoQueue.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/UndoQueue.cs
deleted file mode 100644
index 0ae6a6fc02f..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/UndoQueue.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-
-using System;
-using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Stetic
-{
- public class UndoQueue: MarshalByRefObject
- {
- List changeList = new List ();
- int undoListCount = 0;
- static UndoQueue empty = new UndoQueue ();
-
- public void AddChange (UndoRedoChange change)
- {
- if (undoListCount < changeList.Count) {
- // Destroy all undone changes
- changeList.RemoveRange (undoListCount, changeList.Count - undoListCount);
- }
- changeList.Add (change);
- undoListCount = changeList.Count;
- }
-
- public IEnumerable Changes {
- get { return changeList; }
- }
-
- public static UndoQueue Empty {
- get { return empty; }
- }
-
- public bool CanUndo {
- get { return undoListCount > 0; }
- }
-
- public bool CanRedo {
- get { return undoListCount < changeList.Count; }
- }
-
- public void Undo ()
- {
- if (undoListCount == 0)
- return;
-
- UndoRedoChange change = (UndoRedoChange) changeList [--undoListCount];
- if (change.CheckValid ()) {
- UndoRedoChange res = change.ApplyChange ();
- if (res != null)
- changeList [undoListCount] = res;
- else
- // Undo failed
- changeList.RemoveAt (undoListCount);
- } else {
- changeList.RemoveAt (undoListCount);
- Undo ();
- }
- }
-
- public void Redo ()
- {
- if (undoListCount == changeList.Count)
- return;
-
- UndoRedoChange change = (UndoRedoChange) changeList [undoListCount++];
- if (change.CheckValid ()) {
- UndoRedoChange res = change.ApplyChange ();
- if (res != null)
- changeList [undoListCount - 1] = res;
- else {
- // Redo failed
- undoListCount--;
- changeList.RemoveAt (undoListCount);
- }
- }
- else {
- changeList.RemoveAt (--undoListCount);
- Redo ();
- }
- }
-
- public void Purge ()
- {
- for (int n=0; n 0)
- button.TooltipText = cmd.Label;
- }
- else {
- button.Label = cmd.Label;
- button.IsImportant = true;
- }
- button.Clicked += delegate (object o, EventArgs args) {
- if (!updating)
- cmd.Run (widget.Wrapped);
- };
- button.ShowAll ();
- Insert (button, -1);
-
- if (cmd.HasDependencies) {
- editors[cmd.Name] = button;
- sensitives[cmd] = cmd;
- }
- if (cmd.HasVisibility) {
- editors[cmd.Name] = button;
- invisibles[cmd] = cmd;
- }
- wrappers [cmd] = widget;
- }
-
- void Notified (object s, string propertyName)
- {
- UpdateSensitivity ();
- }
-
- void UpdateSensitivity ()
- {
- foreach (ItemDescriptor item in sensitives.Keys) {
- Widget w = editors[item.Name] as Widget;
- if (w != null) {
- ObjectWrapper wrapper = wrappers [item] as ObjectWrapper;
- object ob = sensitives.Contains (item) ? wrapper.Wrapped : null;
- w.Sensitive = item.EnabledFor (ob);
- }
- }
- foreach (ItemDescriptor item in invisibles.Keys) {
- Widget w = editors[item.Name] as Widget;
- if (w != null) {
- ObjectWrapper wrapper = wrappers [item] as ObjectWrapper;
- object ob = invisibles.Contains (item) ? wrapper.Wrapped : null;
- w.Visible = item.VisibleFor (ob);
- }
- }
- foreach (CommandDescriptor cmd in toggles) {
- ToggleToolButton w = editors[cmd.Name] as ToggleToolButton;
- if (w != null) {
- ObjectWrapper wrapper = wrappers [cmd] as ObjectWrapper;
- updating = true;
- w.Active = cmd.IsToogled (wrapper.Wrapped);
- updating = false;
- }
- }
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetComponent.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetComponent.cs
deleted file mode 100644
index 84f63413ca3..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetComponent.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-
-namespace Stetic
-{
- public class WidgetComponent: Component
- {
- static WidgetComponent placeholder;
-
- public WidgetComponent (Application app, object backend, string name, ComponentType type): base (app, backend, name, type)
- {
- }
-
- public override string Name {
- get {
- if (name == null)
- UpdateComponentInfo ();
- return name;
- }
- set {
- name = value;
- if (app != null)
- app.Backend.RenameWidget ((Wrapper.Widget)backend, value);
- }
- }
-
- public override bool GeneratePublic {
- get { return ((Wrapper.Widget)backend).GeneratePublic; }
- set { ((Wrapper.Widget)backend).GeneratePublic = value; }
- }
-
- internal void UpdateName (string name)
- {
- this.name = name;
- }
-
- public override Component[] GetChildren ()
- {
- if (app == null)
- return new Component [0];
- ArrayList wws = app.Backend.GetWidgetChildren ((Wrapper.Widget)backend);
- if (wws == null)
- return new Component [0];
- ArrayList children = new ArrayList (wws.Count);
- for (int n=0; n nw) nw = a.Requisition.Width;
- if (a.Requisition.Height > nh) nh = a.Requisition.Height;
-
- if (nw != alloc.Width || nh != alloc.Height) {
- int ow = child.WidthRequest;
- int oh = child.HeightRequest;
- child.SetSizeRequest (nw, nh);
- if (ow > nw)
- child.WidthRequest = ow;
- if (oh > nh)
- child.HeightRequest = oh;
- QueueDraw ();
- }
- }
-
- protected override void OnSizeRequested (ref Requisition req)
- {
- // The Toplevel check is done to ensure that this widget is anchored,
- // otherwise the Realize call will fail.
- if (!child.IsRealized && Toplevel is Gtk.Window)
- child.Realize ();
-
- req = child.SizeRequest ();
- // Make some room for the border
- req.Width += padding * 2 + selectionBorder * 2;
- req.Height += padding * 2 + selectionBorder * 2;
- selectionBox.SizeRequest ();
- if (selectionBox.Allocation.Width > req.Width)
- req.Width = selectionBox.Allocation.Width;
- if (selectionBox.Allocation.Height > req.Height)
- req.Height = selectionBox.Allocation.Height;
-
- foreach (TopLevelChild tchild in topLevels) {
- Gtk.Requisition treq = tchild.Child.SizeRequest ();
- if (tchild.X + treq.Width > req.Width)
- req.Width = tchild.X + treq.Width;
- if (tchild.Y + treq.Height > req.Height)
- req.Height = tchild.Y + treq.Height;
- }
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle rect)
- {
- base.OnSizeAllocated (rect);
-
- if (selectionWidget != null)
- PlaceSelectionBoxInternal (selectionWidget);
-
- foreach (TopLevelChild child in topLevels) {
- Gtk.Requisition req = child.Child.SizeRequest ();
- child.Child.SizeAllocate (new Gdk.Rectangle (rect.X + child.X, rect.Y + child.Y, req.Width, req.Height));
- }
- }
-
- protected override void ForAll (bool include_internals, Gtk.Callback callback)
- {
- base.ForAll (include_internals, callback);
- foreach (TopLevelChild child in topLevels)
- callback (child.Child);
- if (include_internals)
- selectionBox.ForAll (include_internals, callback);
- }
-
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion ev)
- {
- if (resizingX || resizingY) {
- if (resizingX) {
- int nw = (int)(ev.X - difX - padding - selectionBorder);
- if (nw < currentSizeRequest.Width) nw = currentSizeRequest.Width;
- child.WidthRequest = nw;
- }
-
- if (resizingY) {
- int nh = (int)(ev.Y - difY - padding - selectionBorder);
- if (nh < currentSizeRequest.Height) nh = currentSizeRequest.Height;
- child.HeightRequest = nh;
- }
- QueueDraw ();
- } else if (AllowResize) {
- if (GetAreaResizeXY ().Contains ((int) ev.X, (int) ev.Y))
- GdkWindow.Cursor = cursorXY;
- else if (GetAreaResizeX ().Contains ((int) ev.X, (int) ev.Y))
- GdkWindow.Cursor = cursorX;
- else if (GetAreaResizeY ().Contains ((int) ev.X, (int) ev.Y))
- GdkWindow.Cursor = cursorY;
- else
- GdkWindow.Cursor = null;
- }
-
- return base.OnMotionNotifyEvent (ev);
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton ev)
- {
- Gdk.Rectangle rectArea = child.Allocation;
- rectArea.Inflate (selectionBorder, selectionBorder);
-
- if (rectArea.Contains ((int) ev.X, (int) ev.Y)) {
- Stetic.Wrapper.Widget gw = Stetic.Wrapper.Widget.Lookup (container);
- if (gw != null)
- gw.Select ();
- else
- ResetSelection (null);
-
- if (AllowResize) {
- Rectangle rect = GetAreaResizeXY ();
- if (rect.Contains ((int) ev.X, (int) ev.Y)) {
- resizingX = resizingY = true;
- difX = (int) (ev.X - rect.X);
- difY = (int) (ev.Y - rect.Y);
- GdkWindow.Cursor = cursorXY;
- }
-
- rect = GetAreaResizeY ();
- if (rect.Contains ((int) ev.X, (int) ev.Y)) {
- resizingY = true;
- difY = (int) (ev.Y - rect.Y);
- GdkWindow.Cursor = cursorY;
- }
-
- rect = GetAreaResizeX ();
- if (rect.Contains ((int) ev.X, (int) ev.Y)) {
- resizingX = true;
- difX = (int) (ev.X - rect.X);
- GdkWindow.Cursor = cursorX;
- }
- }
- } else {
- Stetic.Wrapper.Widget gw = Stetic.Wrapper.Widget.Lookup (container);
- if (gw != null)
- gw.Project.Selection = null;
- }
-
- return base.OnButtonPressEvent (ev);
- }
-
- Rectangle GetAreaResizeY ()
- {
- Gdk.Rectangle rect = child.Allocation;
- return new Gdk.Rectangle (rect.X - selectionBorder, rect.Y + rect.Height, rect.Width + selectionBorder, selectionBorder);
- }
-
- Rectangle GetAreaResizeX ()
- {
- Gdk.Rectangle rect = child.Allocation;
- return new Gdk.Rectangle (rect.X + rect.Width, rect.Y - selectionBorder, selectionBorder, rect.Height + selectionBorder);
- }
-
- Rectangle GetAreaResizeXY ()
- {
- Gdk.Rectangle rect = child.Allocation;
- return new Gdk.Rectangle (rect.X + rect.Width, rect.Y + rect.Height, selectionBorder, selectionBorder);
- }
-
- protected override bool OnButtonReleaseEvent (Gdk.EventButton ev)
- {
- resizingX = resizingY = false;
- GdkWindow.Cursor = null;
- return base.OnButtonReleaseEvent (ev);
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- bool r = base.OnExposeEvent (ev);
- //FIXME Disabled checkerboard background because it's very inefficient and makes the control *very* slow to resize
- // It should take the EventExpose area into account, invalidate more selectively during resizes (GTK viewport
- // code would probably be a good start), and take advantage of the flat block color the parent is rendering.
- /*
- int size = 8;
- bool squareColor = true;
- bool startsquareColor = true;
- int x1 = 0;
- int x2 = Allocation.Width;
- int y1 = 0;
- int y2 = Allocation.Height;
- for (int y = y1; y < y2; y += size) {
- squareColor = startsquareColor;
- startsquareColor = !startsquareColor;
- for (int x = x1; x < x2; x += size) {
- GdkWindow.DrawRectangle (squareColor ? Style.DarkGC (StateType.Normal) : Style.DarkGC (StateType.Active), true, x, y, size, size);
- squareColor = !squareColor;
- }
- }
-
- foreach (Widget cw in Children)
- PropagateExpose (cw, ev);*/
-
- Gdk.Rectangle rect = child.Allocation;
- GdkWindow.DrawRectangle (this.Style.BackgroundGC (StateType.Normal), true, rect.X, rect.Y, rect.Width, rect.Height);
-
- Pixbuf sh = Shadow.AddShadow (rect.Width, rect.Height);
- GdkWindow.DrawPixbuf (this.Style.BackgroundGC (StateType.Normal), sh, 0, 0, rect.X - 5, rect.Y - 5, sh.Width, sh.Height, RgbDither.None, 0, 0);
- return r;
- }
-
- protected override bool OnKeyPressEvent (Gdk.EventKey ev)
- {
- switch (ev.Key) {
- case Gdk.Key.Delete:
- case Gdk.Key.KP_Delete:
- IObjectSelection sel = GetSelection ();
- if (sel != null && sel.DataObject != null) {
- Wrapper.Widget wrapper = Wrapper.Widget.Lookup (sel.DataObject) as Wrapper.Widget;
- if (wrapper != null && !wrapper.IsTopLevel)
- wrapper.Delete ();
- }
- return true;
- default:
- return base.OnKeyPressEvent (ev);
- }
- }
-
- class TopLevelChild
- {
- public int X;
- public int Y;
- public Gtk.Widget Child;
- }
- }
-
- enum BoxPos
- {
- Start,
- Center,
- End,
- }
-
- enum BoxFill
- {
- Box,
- VLine,
- HLine
- }
-
- class SelectionHandleBox
- {
- const int selectionHandleSize = 4;
- const int topSelectionHandleSize = 8;
- public const int selectionLineWidth = 2;
-
- ArrayList selection = new ArrayList ();
- Gdk.Rectangle allocation;
- SelectionHandlePart dragHandlePart;
- public ObjectSelection ObjectSelection;
-
- public SelectionHandleBox (Gtk.Widget parent)
- {
- // Lines
- selection.Add (new SelectionHandlePart (BoxFill.HLine, BoxPos.Start, BoxPos.Start, 0, -selectionLineWidth, BoxPos.End, BoxPos.Start, 0, 0));
- selection.Add (new SelectionHandlePart (BoxFill.HLine, BoxPos.Start, BoxPos.End, 0, 0, BoxPos.End, BoxPos.End, 0, selectionLineWidth));
- selection.Add (new SelectionHandlePart (BoxFill.VLine, BoxPos.Start, BoxPos.Start, -selectionLineWidth, 0, BoxPos.Start, BoxPos.End, 0, 0));
- selection.Add (new SelectionHandlePart (BoxFill.VLine, BoxPos.End, BoxPos.Start, 0, 0, BoxPos.End, BoxPos.End, selectionLineWidth, 0));
-
- // Handles
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.Start, BoxPos.Start, -selectionHandleSize, -selectionHandleSize, BoxPos.Start, BoxPos.Start, 0, 0));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.End, BoxPos.Start, 0, -selectionHandleSize, BoxPos.End, BoxPos.Start, selectionHandleSize, 0));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.Start, BoxPos.End, -selectionHandleSize, 0, BoxPos.Start, BoxPos.End, 0, selectionHandleSize));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.End, BoxPos.End, 0, 0, BoxPos.End, BoxPos.End, selectionHandleSize, selectionHandleSize));
-
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.Center, BoxPos.Start, -selectionHandleSize/2, -selectionHandleSize, BoxPos.Center, BoxPos.Start, selectionHandleSize/2, 0));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.Center, BoxPos.End, -selectionHandleSize/2, 0, BoxPos.Center, BoxPos.End, selectionHandleSize/2, selectionHandleSize));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.Start, BoxPos.Center, -selectionHandleSize, -selectionHandleSize/2, BoxPos.Start, BoxPos.Center, 0, selectionHandleSize/2));
- selection.Add (new SelectionHandlePart (BoxFill.Box, BoxPos.End, BoxPos.Center, 0, -selectionHandleSize/2, BoxPos.End, BoxPos.Center, selectionHandleSize, selectionHandleSize/2));
-
- dragHandlePart = new SelectionHandlePart (BoxFill.Box, BoxPos.Center, BoxPos.Start, -topSelectionHandleSize/2, -topSelectionHandleSize, BoxPos.Center, BoxPos.Start, topSelectionHandleSize/2, 0);
- selection.Add (dragHandlePart);
-
- foreach (SelectionHandlePart s in selection) {
- s.Parent = parent;
- s.ParentBox = this;
- }
- }
-
- public void Show ()
- {
- foreach (Gtk.Widget s in selection)
- s.Show ();
- dragHandlePart.Visible = (ObjectSelection != null && ObjectSelection.AllowDrag);
- }
-
- public void Hide ()
- {
- foreach (Gtk.Widget s in selection)
- s.Hide ();
- }
-
- public void Reposition (Gdk.Rectangle rect)
- {
- bool firstRect = true;
-
- foreach (SelectionHandlePart s in selection) {
- s.Reposition (rect);
- Gdk.Rectangle r = s.Allocation;
- if (firstRect) {
- allocation = r;
- firstRect = false;
- } else
- allocation = allocation.Union (r);
- }
- }
-
- public Gdk.Rectangle Allocation {
- get { return allocation; }
- }
-
- public void ForAll (bool include_internals, Gtk.Callback callback)
- {
- foreach (Gtk.Widget s in selection)
- callback (s);
- }
-
- public void SizeRequest ()
- {
- foreach (Gtk.Widget s in selection)
- s.SizeRequest ();
- }
- }
-
- class SelectionHandlePart: EventBox
- {
- BoxPos hpos, vpos;
- BoxPos hposEnd, vposEnd;
- int x, y;
- int xEnd, yEnd;
- BoxFill fill;
- public SelectionHandleBox ParentBox;
- int clickX, clickY;
- int localClickX, localClickY;
- int ox, oy;
-
- public SelectionHandlePart (BoxFill fill, BoxPos hpos, BoxPos vpos, int x, int y, BoxPos hposEnd, BoxPos vposEnd, int xEnd, int yEnd)
- {
- this.fill = fill;
- this.hpos = hpos;
- this.vpos = vpos;
- this.x = x;
- this.y = y;
-
- this.hposEnd = hposEnd;
- this.vposEnd = vposEnd;
- this.xEnd = xEnd;
- this.yEnd = yEnd;
- }
-
- public void Reposition (Gdk.Rectangle rect)
- {
- int px, py;
- int pxEnd, pyEnd;
-
- CalcPos (rect, hpos, vpos, out px, out py);
- px += x;
- py += y;
-
- CalcPos (rect, hposEnd, vposEnd, out pxEnd, out pyEnd);
- pxEnd += xEnd;
- pyEnd += yEnd;
-
- Allocation = new Gdk.Rectangle (px, py, pxEnd - px, pyEnd - py);
- ox = rect.X;
- oy = rect.Y;
- }
-
- void CalcPos (Gdk.Rectangle rect, BoxPos hp, BoxPos vp, out int px, out int py)
- {
- if (vp == BoxPos.Start)
- py = rect.Y;
- else if (vp == BoxPos.End)
- py = rect.Bottom;
- else
- py = rect.Y + rect.Height / 2;
-
- if (hp == BoxPos.Start)
- px = rect.X;
- else if (hp == BoxPos.End)
- px = rect.Right;
- else
- px = rect.X + rect.Width / 2;
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- int w, h;
- this.GdkWindow.GetSize (out w, out h);
-
- if (fill == BoxFill.Box) {
- this.GdkWindow.DrawRectangle (this.Style.WhiteGC, true, 0, 0, w, h);
- this.GdkWindow.DrawRectangle (this.Style.BlackGC, false, 0, 0, w-1, h-1);
- } else if (fill == BoxFill.HLine) {
- using (Gdk.GC gc = new Gdk.GC (this.GdkWindow)) {
- gc.SetDashes (0, new sbyte [] { 1, 1 }, 2);
- gc.SetLineAttributes (SelectionHandleBox.selectionLineWidth, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
- gc.Foreground = this.Style.Black;
- this.GdkWindow.DrawLine (gc, 0, h / 2, w, h / 2);
- gc.Foreground = this.Style.White;
- this.GdkWindow.DrawLine (gc, 1, h/2, w, h/2);
- }
- } else {
- using (Gdk.GC gc = new Gdk.GC (this.GdkWindow)) {
- gc.SetDashes (0, new sbyte [] { 1, 1 }, 2);
- gc.SetLineAttributes (SelectionHandleBox.selectionLineWidth, Gdk.LineStyle.OnOffDash, Gdk.CapStyle.NotLast, Gdk.JoinStyle.Miter);
- gc.Foreground = this.Style.Black;
- this.GdkWindow.DrawLine (gc, w / 2, 0, w / 2, h);
- gc.Foreground = this.Style.White;
- this.GdkWindow.DrawLine (gc, w / 2, 1, w/2, h);
- }
- }
-
- return true;
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton evb)
- {
- if (evb.Type == Gdk.EventType.ButtonPress && evb.Button == 1 && !GtkWorkarounds.TriggersContextMenu (evb)) {
- clickX = (int)evb.XRoot;
- clickY = (int)evb.YRoot;
- localClickX = (int) evb.X;
- localClickY = (int) evb.Y;
- }
- return true;
- }
-
- protected override bool OnMotionNotifyEvent (Gdk.EventMotion evm)
- {
- if ((evm.State & Gdk.ModifierType.Button1Mask) == 0)
- return false;
-
- if (!Gtk.Drag.CheckThreshold (this, clickX, clickY, (int)evm.XRoot, (int)evm.YRoot))
- return false;
-
- if (ParentBox.ObjectSelection != null && ParentBox.ObjectSelection.AllowDrag) {
- int dx = Allocation.X - ox + localClickX;
- int dy = Allocation.Y - oy + localClickY;
- ParentBox.ObjectSelection.FireDrag (evm, dx, dy);
- }
-
- return true;
- }
- }
-
- class ObjectSelection: IObjectSelection
- {
- ResizableFixed box;
- Gtk.Widget widget;
- object dataObject;
- bool allowDrag = true;
-
- public ObjectSelection (ResizableFixed box, Gtk.Widget widget, object dataObject)
- {
- this.box = box;
- this.widget = widget;
- this.dataObject = dataObject;
- }
-
- public Gtk.Widget Widget {
- get { return widget; }
- }
-
- public object DataObject {
- get { return dataObject; }
- }
-
- public void Dispose ()
- {
- box.ResetSelection (widget);
- }
-
- internal void FireDisposed ()
- {
- if (Disposed != null)
- Disposed (this, EventArgs.Empty);
- }
-
- internal void FireDrag (Gdk.EventMotion evt, int dx, int dy)
- {
- if (Drag != null)
- Drag (evt, dx, dy);
- }
-
- public bool AllowDrag {
- get { return allowDrag; }
- set { allowDrag = value; }
- }
-
- public event DragDelegate Drag;
- public event EventHandler Disposed;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetEditSession.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetEditSession.cs
deleted file mode 100644
index d4085d86479..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetEditSession.cs
+++ /dev/null
@@ -1,431 +0,0 @@
-//
-// WidgetEditSession.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Xml;
-using System.Reflection;
-using System.Collections;
-using System.CodeDom;
-using Mono.Unix;
-
-namespace Stetic {
-
- internal class WidgetEditSession: MarshalByRefObject, IDisposable
- {
- string sourceWidget;
- Stetic.ProjectBackend sourceProject;
-
- Stetic.ProjectBackend gproject;
- Stetic.Wrapper.Container rootWidget;
- Stetic.WidgetDesignerBackend widget;
- Gtk.VBox designer;
- Gtk.Plug plug;
- bool autoCommitChanges;
- WidgetActionBar toolbar;
- WidgetDesignerFrontend frontend;
- bool allowBinding;
- bool disposed;
-
- ContainerUndoRedoManager undoManager;
- UndoQueue undoQueue;
-
- public event EventHandler RootWidgetChanged;
- public event Stetic.Wrapper.WidgetEventHandler SelectionChanged;
-
- public WidgetEditSession (ProjectBackend sourceProject, WidgetDesignerFrontend frontend, string windowName, Stetic.ProjectBackend editingBackend, bool autoCommitChanges)
- {
- this.frontend = frontend;
- this.autoCommitChanges = autoCommitChanges;
- undoManager = new ContainerUndoRedoManager ();
- undoQueue = new UndoQueue ();
- undoManager.UndoQueue = undoQueue;
-
- sourceWidget = windowName;
- this.sourceProject = sourceProject;
-
- if (!autoCommitChanges) {
- // Reuse the action groups and icon factory of the main project
- gproject = editingBackend;
-
- // Attach will prevent the destruction of the action group list by gproject
- gproject.AttachActionGroups (sourceProject.ActionGroups);
-
- gproject.IconFactory = sourceProject.IconFactory;
- gproject.FileName = sourceProject.FileName;
- gproject.ImagesRootPath = sourceProject.ImagesRootPath;
- gproject.ResourceProvider = sourceProject.ResourceProvider;
- gproject.WidgetLibraries = (ArrayList) sourceProject.WidgetLibraries.Clone ();
- gproject.InternalWidgetLibraries = (ArrayList) sourceProject.InternalWidgetLibraries.Clone ();
- gproject.TargetGtkVersion = sourceProject.TargetGtkVersion;
- sourceProject.ComponentTypesChanged += OnSourceProjectLibsChanged;
- sourceProject.ProjectReloaded += OnSourceProjectReloaded;
-
- rootWidget = editingBackend.GetTopLevelWrapper (sourceWidget, false);
- if (rootWidget == null) {
- // Copy the widget to edit from the source project
- // When saving the file, this project will be merged with the main project.
- sourceProject.CopyWidgetToProject (windowName, gproject, windowName);
- rootWidget = gproject.GetTopLevelWrapper (windowName, true);
- }
-
- gproject.Modified = false;
- }
- else {
- rootWidget = sourceProject.GetTopLevelWrapper (windowName, true);
- gproject = sourceProject;
- }
-
- rootWidget.Select ();
- undoManager.RootObject = rootWidget;
-
- gproject.ModifiedChanged += new EventHandler (OnModifiedChanged);
- gproject.Changed += new EventHandler (OnChanged);
- gproject.ProjectReloaded += new EventHandler (OnProjectReloaded);
- gproject.ProjectReloading += new EventHandler (OnProjectReloading);
-// gproject.WidgetMemberNameChanged += new Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
- }
-
- public bool AllowWidgetBinding {
- get { return allowBinding; }
- set {
- allowBinding = value;
- if (toolbar != null)
- toolbar.AllowWidgetBinding = allowBinding;
- }
- }
-
- public Stetic.Wrapper.Widget GladeWidget {
- get { return rootWidget; }
- }
-
- public Stetic.Wrapper.Container RootWidget {
- get { return (Wrapper.Container) Component.GetSafeReference (rootWidget); }
- }
-
- public Gtk.Widget WrapperWidget {
- get {
- if (designer == null) {
- if (rootWidget == null)
- return widget;
- Gtk.Container wc = rootWidget.Wrapped as Gtk.Container;
- if (widget == null)
- widget = Stetic.UserInterface.CreateWidgetDesigner (wc, rootWidget.DesignWidth, rootWidget.DesignHeight);
-
- toolbar = new WidgetActionBar (frontend, rootWidget);
- toolbar.AllowWidgetBinding = allowBinding;
- designer = new Gtk.VBox ();
- designer.BorderWidth = 3;
- designer.PackStart (toolbar, false, false, 0);
- designer.PackStart (widget, true, true, 3);
- widget.DesignArea.SetSelection (gproject.Selection, gproject.Selection, false);
- widget.SelectionChanged += OnSelectionChanged;
-
- }
- return designer;
- }
- }
-
- [NoGuiDispatch]
- public void CreateWrapperWidgetPlug (uint socketId)
- {
- Gdk.Threads.Enter ();
- plug = new Gtk.Plug (socketId);
- plug.Add (WrapperWidget);
- plug.Decorated = false;
- plug.ShowAll ();
- Gdk.Threads.Leave ();
- }
-
- public void DestroyWrapperWidgetPlug ()
- {
- if (designer != null) {
- Gtk.Plug plug = (Gtk.Plug) WrapperWidget.Parent;
- plug.Remove (WrapperWidget);
- plug.Destroy ();
- }
- }
-
- public void Save ()
- {
- if (!autoCommitChanges) {
- gproject.CopyWidgetToProject (rootWidget.Wrapped.Name, sourceProject, sourceWidget);
- sourceWidget = rootWidget.Wrapped.Name;
- gproject.Modified = false;
- }
- }
-
- public ProjectBackend EditingBackend {
- get { return gproject; }
- }
-
- public void Dispose ()
- {
- sourceProject.ComponentTypesChanged -= OnSourceProjectLibsChanged;
- sourceProject.ProjectReloaded -= OnSourceProjectReloaded;
-
- gproject.ModifiedChanged -= new EventHandler (OnModifiedChanged);
- gproject.Changed -= new EventHandler (OnChanged);
- gproject.ProjectReloaded -= OnProjectReloaded;
- gproject.ProjectReloading -= OnProjectReloading;
-// gproject.WidgetMemberNameChanged -= new Stetic.Wrapper.WidgetNameChangedHandler (OnWidgetNameChanged);
-
- if (!autoCommitChanges) {
- // Don't dispose the project here! it will be disposed by the frontend
- if (widget != null) {
- widget.SelectionChanged -= OnSelectionChanged;
- // Don't dispose the widget. It will be disposed when destroyed together
- // with the container
- widget = null;
- }
- }
-
- if (plug != null)
- plug.Destroy ();
- gproject = null;
- rootWidget = null;
- frontend = null;
- System.Runtime.Remoting.RemotingServices.Disconnect (this);
- disposed = true;
- }
-
- public bool Disposed {
- get { return disposed; }
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
-
- public void SetDesignerActive ()
- {
- widget.UpdateObjectViewers ();
- }
-
- public bool Modified {
- get { return gproject.Modified; }
- }
-
- public UndoQueue UndoQueue {
- get {
- if (undoQueue != null)
- return undoQueue;
- else
- return UndoQueue.Empty;
- }
- }
-
- void OnModifiedChanged (object s, EventArgs a)
- {
- if (frontend != null)
- frontend.NotifyModifiedChanged ();
- }
-
- void OnChanged (object s, EventArgs a)
- {
- if (frontend != null)
- frontend.NotifyChanged ();
- }
-
- void OnSourceProjectReloaded (object s, EventArgs a)
- {
- // Propagate gtk version change
- if (sourceProject.TargetGtkVersion != gproject.TargetGtkVersion)
- gproject.TargetGtkVersion = sourceProject.TargetGtkVersion;
- }
-
- void OnSourceProjectLibsChanged (object s, EventArgs a)
- {
- // If component types have changed in the source project, they must also change
- // in this project.
- gproject.WidgetLibraries = (ArrayList) sourceProject.WidgetLibraries.Clone ();
- gproject.InternalWidgetLibraries = (ArrayList) sourceProject.InternalWidgetLibraries.Clone ();
- gproject.NotifyComponentTypesChanged ();
- }
-
- void OnProjectReloading (object s, EventArgs a)
- {
- if (frontend != null)
- frontend.NotifyRootWidgetChanging ();
- }
-
- void OnProjectReloaded (object s, EventArgs a)
- {
- // Update the actions group list
- if (!autoCommitChanges) {
- gproject.AttachActionGroups (sourceProject.ActionGroups);
- gproject.WidgetLibraries = (ArrayList) sourceProject.WidgetLibraries.Clone ();
- gproject.InternalWidgetLibraries = (ArrayList) sourceProject.InternalWidgetLibraries.Clone ();
- }
-
- Gtk.Widget[] tops = gproject.Toplevels;
- if (tops.Length > 0) {
- rootWidget = Stetic.Wrapper.Container.Lookup (tops[0]);
- undoManager.RootObject = rootWidget;
- if (rootWidget != null) {
- Gtk.Widget oldWidget = designer;
- if (widget != null) {
- widget.SelectionChanged -= OnSelectionChanged;
- widget = null;
- }
- OnRootWidgetChanged ();
- if (oldWidget != null) {
- // Delay the destruction of the old widget, so the designer has time to
- // show the new widget. This avoids flickering.
- GLib.Timeout.Add (500, delegate {
- oldWidget.Destroy ();
- return false;
- });
- }
-
- gproject.NotifyComponentTypesChanged ();
- return;
- }
- }
- SetErrorMode ();
- }
-
- void SetErrorMode ()
- {
- Gtk.Label lab = new Gtk.Label ();
- lab.Markup = "" + Catalog.GetString ("The form designer could not be loaded") + "";
- Gtk.EventBox box = new Gtk.EventBox ();
- box.Add (lab);
-
- widget = Stetic.UserInterface.CreateWidgetDesigner (box, 100, 100);
- rootWidget = null;
-
- OnRootWidgetChanged ();
- }
-
- void OnRootWidgetChanged ()
- {
- if (designer != null) {
- if (designer.Parent is Gtk.Plug)
- ((Gtk.Plug)designer.Parent).Remove (designer);
- designer = null;
- }
-
- if (plug != null) {
- Gdk.Threads.Enter ();
- plug.Add (WrapperWidget);
- plug.ShowAll ();
- Gdk.Threads.Leave ();
- }
-
- if (frontend != null)
- frontend.NotifyRootWidgetChanged ();
- if (RootWidgetChanged != null)
- RootWidgetChanged (this, EventArgs.Empty);
- }
-
- void OnSelectionChanged (object ob, EventArgs a)
- {
- if (frontend != null) {
- bool canCut, canCopy, canPaste, canDelete;
- ObjectWrapper obj = ObjectWrapper.Lookup (widget.Selection);
- Stetic.Wrapper.Widget wrapper = obj as Stetic.Wrapper.Widget;
- IEditableObject editable = widget.Selection as IEditableObject;
- if (editable == null)
- editable = obj as IEditableObject;
- if (editable != null) {
- canCut = editable.CanCut;
- canCopy = editable.CanCopy;
- canPaste = editable.CanPaste;
- canDelete = editable.CanDelete;
- }
- else {
- canCut = canCopy = canPaste = canDelete = false;
- }
-
- frontend.NotifySelectionChanged (Component.GetSafeReference (obj), canCut, canCopy, canPaste, canDelete);
- if (SelectionChanged != null)
- SelectionChanged (this, new Stetic.Wrapper.WidgetEventArgs (wrapper));
- }
- }
-
- public object SaveState ()
- {
- return new object[] {
- gproject.SaveStatus (),
- undoQueue
- };
- }
-
- public void RestoreState (object sessionData)
- {
- object[] status = (object[]) sessionData;
- gproject.LoadStatus (status [0]);
- undoQueue = (UndoQueue) status [1];
- foreach (UndoRedoChange ch in undoQueue.Changes) {
- ObjectWrapperUndoRedoChange och = ch as ObjectWrapperUndoRedoChange;
- if (och != null)
- och.Manager = undoManager;
- }
- undoManager.UndoQueue = undoQueue;
- }
-
- internal void ClipboardCopySelection ()
- {
- IEditableObject editable = widget.Selection as IEditableObject;
- if (editable == null)
- editable = ObjectWrapper.Lookup (widget.Selection) as IEditableObject;
- if (editable != null)
- editable.Copy ();
- }
-
- public void ClipboardCutSelection ()
- {
- IEditableObject editable = widget.Selection as IEditableObject;
- if (editable == null)
- editable = ObjectWrapper.Lookup (widget.Selection) as IEditableObject;
- if (editable != null)
- editable.Cut ();
- }
-
- public void ClipboardPaste ()
- {
- IEditableObject editable = widget.Selection as IEditableObject;
- if (editable == null)
- editable = ObjectWrapper.Lookup (widget.Selection) as IEditableObject;
- if (editable != null)
- editable.Paste ();
- }
-
- public void DeleteSelection ()
- {
- IEditableObject editable = widget.Selection as IEditableObject;
- if (editable == null)
- editable = ObjectWrapper.Lookup (widget.Selection) as IEditableObject;
- if (editable != null)
- editable.Delete ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetFactory.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetFactory.cs
deleted file mode 100644
index 780b287e163..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetFactory.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Gtk;
-using Gdk;
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Stetic {
-
- // This is the base class for palette items. Implements the basic
- // functionality for showing the icon and label of the item.
-
- internal class PaletteItemFactory : EventBox
- {
- public PaletteItemFactory ()
- {
- }
-
- public virtual void Initialize (string name, Gdk.Pixbuf icon)
- {
- DND.SourceSet (this);
- AboveChild = true;
-
- Gtk.HBox hbox = new HBox (false, 6);
- hbox.BorderWidth = 3;
-
- if (icon != null) {
- icon = icon.ScaleSimple (16, 16, Gdk.InterpType.Bilinear);
- hbox.PackStart (new Gtk.Image (icon), false, false, 0);
- }
-
- Gtk.Label label = new Gtk.Label ("" + name + "");
- label.UseMarkup = true;
- label.Justify = Justification.Left;
- label.Xalign = 0;
- hbox.PackEnd (label, true, true, 0);
-
- Add (hbox);
- }
-
- protected override void OnDragBegin (Gdk.DragContext ctx)
- {
- Gtk.Widget ob = CreateItemWidget ();
- if (ob != null)
- DND.Drag (this, ctx, ob);
- }
-
- protected virtual Gtk.Widget CreateItemWidget ()
- {
- return null;
- }
-
- protected override bool OnEnterNotifyEvent (Gdk.EventCrossing ev)
- {
- this.State = Gtk.StateType.Prelight;
- return base.OnEnterNotifyEvent (ev);
- }
-
- protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing ev)
- {
- this.State = Gtk.StateType.Normal;
- return base.OnLeaveNotifyEvent (ev);
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose e)
- {
- base.OnExposeEvent (e);
- if (State == Gtk.StateType.Prelight)
- Gtk.Style.PaintShadow (this.Style, this.GdkWindow, State, Gtk.ShadowType.Out, e.Area, this, "", e.Area.X, e.Area.Y, e.Area.Width, e.Area.Height);
- return false;
- }
- }
-
-
- // Palette item factory which creates a widget.
- internal class WidgetFactory : PaletteItemFactory {
-
- protected ProjectBackend project;
- protected ClassDescriptor klass;
-
- public WidgetFactory (ProjectBackend project, ClassDescriptor klass)
- {
- this.project = project;
- this.klass = klass;
- Initialize (klass.Label, klass.Icon);
- if (project == null)
- Sensitive = false;
- }
-
- protected override Gtk.Widget CreateItemWidget ()
- {
- return klass.NewInstance (project) as Widget;
- }
- }
-
- internal class WindowFactory : WidgetFactory
- {
- public WindowFactory (ProjectBackend project, ClassDescriptor klass) : base (project, klass)
- {
- }
-
- protected override bool OnButtonPressEvent (Gdk.EventButton evt)
- {
- Gtk.Window win = klass.NewInstance (project) as Gtk.Window;
- project.AddWindow (win, true);
- return true;
- }
-
- public override void Initialize (string name, Gdk.Pixbuf icon)
- {
- base.Initialize (name, icon);
- DND.SourceUnset (this);
- }
- }
-
- // Palette item factory which allows dragging an already existing object.
- internal class InstanceWidgetFactory : PaletteItemFactory
- {
- Gtk.Widget instance;
-
- public InstanceWidgetFactory (string name, Gdk.Pixbuf icon, Gtk.Widget instance)
- {
- this.instance = instance;
- Initialize (name, icon);
- }
-
- protected override Gtk.Widget CreateItemWidget ()
- {
- return instance;
- }
-
- public override void Dispose ()
- {
- base.Dispose ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetInfoEventHandler.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetInfoEventHandler.cs
deleted file mode 100644
index 1d096dcf2bc..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetInfoEventHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public delegate void WidgetInfoEventHandler (object sender, WidgetInfoEventArgs args);
-
- public class WidgetInfoEventArgs: EventArgs
- {
- Project project;
- WidgetInfo widget;
-
- internal WidgetInfoEventArgs (Project p, WidgetInfo w)
- {
- project = p;
- widget = w;
- }
-
- public Project Project {
- get { return project; }
- }
-
- public WidgetInfo WidgetInfo {
- get { return widget; }
- }
- }
-
-/* public class ComponentNameEventArgs: ComponentEventArgs
- {
- string oldName;
-
- internal ComponentNameEventArgs (Project p, Component c, string oldName): base (p, c)
- {
- this.oldName = oldName;
- }
-
- public string OldName {
- get { return oldName; }
- }
- }
-*/}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTree.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTree.cs
deleted file mode 100644
index 3409681428b..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTree.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-
-using System;
-using Gtk;
-
-namespace Stetic
-{
- public class WidgetPropertyTree: PluggableWidget
- {
- internal WidgetPropertyTree (Application app): base (app)
- {
- }
-
- protected override void OnCreatePlug (uint socketId)
- {
- app.Backend.CreatePropertiesWidgetPlug (socketId);
- }
-
- protected override void OnDestroyPlug (uint socketId)
- {
- app.Backend.DestroyPropertiesWidgetPlug ();
- }
-
- protected override Gtk.Widget OnCreateWidget ()
- {
- return app.Backend.GetPropertiesWidget ();
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTreeBackend.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTreeBackend.cs
deleted file mode 100644
index d4e7d13a5be..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetPropertyTreeBackend.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- internal class WidgetPropertyTreeBackend: PropertyTree, IObjectViewer
- {
- ProjectBackend project;
- Stetic.ObjectWrapper selection;
- Stetic.ObjectWrapper newSelection;
- Stetic.Wrapper.Container.ContainerChild packingSelection;
-
- public WidgetPropertyTreeBackend ()
- {
- Stetic.Registry.RegistryChanging += new EventHandler (OnRegistryChanging);
- }
-
- public ProjectBackend ProjectBackend {
- get { return project; }
- set {
- if (project != null) {
- project.SelectionChanged -= Selected;
- }
-
- project = value;
- if (project != null) {
- TargetObject = project.Selection;
- project.SelectionChanged += Selected;
- } else {
- TargetObject = null;
- }
- }
- }
-
- public override void Clear ()
- {
- base.Clear ();
- Wrapper.Widget selWidget = selection as Wrapper.Widget;
- if (selWidget != null)
- selWidget.Notify -= Notified;
- if (packingSelection != null)
- packingSelection.Notify -= Notified;
- }
-
- protected override void OnObjectChanged ()
- {
- if (selection != null)
- selection.NotifyChanged ();
- }
-
- public object TargetObject {
- get { return selection.Wrapped; }
- set {
- ObjectWrapper wrapper = ObjectWrapper.Lookup (value);
- if (newSelection == wrapper)
- return;
-
- newSelection = wrapper;
- if (newSelection != null)
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (SelectedHandler));
- else
- SelectedHandler ();
- }
- }
-
- void Selected (object s, Wrapper.WidgetEventArgs args)
- {
- TargetObject = args != null && args.Widget != null? args.Widget : null;
- }
-
- bool SelectedHandler ()
- {
- SaveStatus ();
-
- Clear ();
-
- selection = newSelection;
- if (selection == null || selection.Wrapped is ErrorWidget || project == null) {
- return false;
- }
-
- Wrapper.Widget selWidget = selection as Wrapper.Widget;
- if (selWidget != null) {
- selWidget.Notify += Notified;
-
- PropertyDescriptor name = (PropertyDescriptor)Registry.LookupClassByName ("Gtk.Widget") ["Name"];
- AppendProperty (name, selection.Wrapped);
- }
-
- AddProperties (selection.ClassDescriptor.ItemGroups, selection.Wrapped, project.TargetGtkVersion);
-
- if (selWidget != null) {
- packingSelection = Stetic.Wrapper.Container.ChildWrapper (selWidget);
- if (packingSelection != null) {
- ClassDescriptor childklass = packingSelection.ClassDescriptor;
- if (childklass.ItemGroups.Count > 0) {
- AddProperties (childklass.ItemGroups, packingSelection.Wrapped, project.TargetGtkVersion);
- packingSelection.Notify += Notified;
- }
- }
- }
-
- RestoreStatus ();
- return false;
- }
-
- void Notified (object wrapper, string propertyName)
- {
- Update ();
- }
-
- void OnRegistryChanging (object o, EventArgs args)
- {
- Clear ();
- }
- }
-
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTree.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTree.cs
deleted file mode 100644
index 66f423aab37..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTree.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-
-using System;
-
-namespace Stetic
-{
- public class WidgetTree: PluggableWidget
- {
- ProjectViewFrontend frontend;
-
- internal WidgetTree (Application app): base (app)
- {
- frontend = new ProjectViewFrontend (app);
- }
-
- public event ComponentEventHandler ComponentActivated {
- add { frontend.ComponentActivated += value; }
- remove { frontend.ComponentActivated -= value; }
- }
-
- public event ComponentEventHandler SelectionChanged {
- add { frontend.SelectionChanged += value; }
- remove { frontend.SelectionChanged -= value; }
- }
-
- protected override void OnCreatePlug (uint socketId)
- {
- app.Backend.CreateProjectWidgetPlug (frontend, socketId);
- }
-
- protected override void OnDestroyPlug (uint socketId)
- {
- app.Backend.DestroyProjectWidgetPlug ();
- }
-
- protected override Gtk.Widget OnCreateWidget ()
- {
- return app.Backend.GetProjectWidget (frontend);
- }
-
- public override void Dispose ()
- {
- frontend.disposed = true;
- System.Runtime.Remoting.RemotingServices.Disconnect (frontend);
- base.Dispose ();
- }
- }
-
-
- internal class ProjectViewFrontend: MarshalByRefObject
- {
- Application app;
- internal bool disposed;
-
- public event ComponentEventHandler ComponentActivated;
- public event ComponentEventHandler SelectionChanged;
-
- public ProjectViewFrontend (Application app)
- {
- this.app = app;
- }
-
- public void NotifyWidgetActivated (object ob, string widgetName, string widgetType)
- {
- Gtk.Application.Invoke (
- (o, args) => {
- if (disposed) return;
- Component c = app.GetComponent (ob, widgetName, widgetType);
- if (c != null && ComponentActivated != null)
- ComponentActivated (null, new ComponentEventArgs (app.ActiveProject, c));
- }
- );
- }
-
- public void NotifySelectionChanged (object ob, string widgetName, string widgetType)
- {
- Gtk.Application.Invoke (
- (o, args) => {
- if (disposed) return;
- Component c = ob != null ? app.GetComponent (ob, widgetName, widgetType) : null;
- if (SelectionChanged != null)
- SelectionChanged (null, new ComponentEventArgs (app.ActiveProject, c));
- }
- );
- }
-
- public override object InitializeLifetimeService ()
- {
- // Will be disconnected when calling Dispose
- return null;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTreeCombo.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTreeCombo.cs
deleted file mode 100644
index 159f8ec9756..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/WidgetTreeCombo.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-
-using System;
-using Gtk;
-
-namespace Stetic
-{
- internal class WidgetTreeCombo: Button
- {
- Label label;
- Image image;
- Stetic.Wrapper.Widget rootWidget;
- Stetic.IProject project;
- Stetic.Wrapper.Widget selection;
- WidgetTreePopup popup;
-
- public WidgetTreeCombo ()
- {
- label = new Label ();
- image = new Gtk.Image ();
-
- HBox bb = new HBox ();
- bb.PackStart (image, false, false, 3);
- bb.PackStart (label, true, true, 3);
- label.Xalign = 0;
- label.HeightRequest = 18;
- bb.PackStart (new VSeparator (), false, false, 1);
- bb.PackStart (new Arrow (ArrowType.Down, ShadowType.None), false, false, 1);
- Child = bb;
- this.WidthRequest = 300;
- Sensitive = false;
- }
-
- public override void Dispose ()
- {
- if (popup != null)
- popup.Destroy ();
- base.Dispose ();
- }
-
-
- public Stetic.Wrapper.Widget RootWidget {
- get { return rootWidget; }
- set {
- rootWidget = value;
- Sensitive = rootWidget != null;
- if (rootWidget != null)
- project = rootWidget.Project;
- Update ();
- }
- }
-
- public void SetSelection (Stetic.Wrapper.Widget widget)
- {
- selection = widget;
- Update ();
- }
-
- void Update ()
- {
- if (selection != null) {
- label.Text = selection.Wrapped.Name;
- image.Pixbuf = selection.ClassDescriptor.Icon.ScaleSimple (16, 16, Gdk.InterpType.Bilinear);
- image.Show ();
- } else {
- label.Text = " ";
- image.Hide ();
- }
- }
-
- protected override void OnPressed ()
- {
- base.OnPressed ();
- if (popup == null) {
- popup = new WidgetTreePopup (project);
- popup.WidgetActivated += OnPopupActivated;
- popup.SetDefaultSize (Allocation.Width, 500);
- }
- else if (popup.Visible) {
- popup.Hide ();
- return;
- }
-
- int x, y;
- ParentWindow.GetOrigin (out x, out y);
- x += Allocation.X;
- y += Allocation.Y + Allocation.Height;
-
- popup.Fill (RootWidget.Wrapped);
- popup.Move (x, y);
- popup.ShowAll ();
- }
-
- protected override bool OnFocusOutEvent (Gdk.EventFocus evnt)
- {
- if (popup != null)
- popup.Hide ();
- return base.OnFocusOutEvent (evnt);
- }
-
-
- void OnPopupActivated (object s, EventArgs a)
- {
- popup.Hide ();
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (popup.Selection);
- GLib.Timeout.Add (10, delegate {
- wrapper.Select ();
- return false;
- });
- }
- }
-
- class WidgetTreePopup: Window
- {
- TreeView tree;
- TreeStore store;
- Gtk.Widget selection;
- Stetic.IProject project;
-
- public event EventHandler WidgetActivated;
-
- public WidgetTreePopup (Stetic.IProject project): base (WindowType.Popup)
- {
- this.project = project;
- Gtk.Frame frame = new Frame ();
- frame.ShadowType = Gtk.ShadowType.Out;
- Add (frame);
-
- Gtk.ScrolledWindow sc = new ScrolledWindow ();
- sc.VscrollbarPolicy = PolicyType.Automatic;
- sc.HscrollbarPolicy = PolicyType.Automatic;
- frame.Add (sc);
-
- tree = new TreeView ();
- store = new TreeStore (typeof(Gdk.Pixbuf), typeof(string), typeof(Widget));
- tree.Model = store;
- tree.HeadersVisible = false;
-
- TreeViewColumn col = new TreeViewColumn ();
- CellRendererPixbuf cr = new CellRendererPixbuf ();
- col.PackStart (cr, false);
- col.AddAttribute (cr, "pixbuf", 0);
-
- CellRendererText tr = new CellRendererText ();
- col.PackStart (tr, true);
- col.AddAttribute (tr, "markup", 1);
-
- tree.AppendColumn (col);
-
- tree.ButtonReleaseEvent += OnButtonRelease;
- tree.RowActivated += OnButtonRelease;
- sc.Add (tree);
- tree.GrabFocus ();
-
- }
-
- public void Fill (Gtk.Widget widget)
- {
- store.Clear ();
- Fill (TreeIter.Zero, widget);
- }
-
- public void Fill (TreeIter iter, Gtk.Widget widget)
- {
- Stetic.Wrapper.Widget wrapper = Stetic.Wrapper.Widget.Lookup (widget);
- if (wrapper == null) return;
-
- if (!wrapper.Unselectable) {
-
- Gdk.Pixbuf icon = wrapper.ClassDescriptor.Icon.ScaleSimple (16, 16, Gdk.InterpType.Bilinear);
- string txt;
- if (widget == project.Selection)
- txt = "" + GLib.Markup.EscapeText (widget.Name) + "";
- else
- txt = GLib.Markup.EscapeText (widget.Name);
-
- if (!iter.Equals (TreeIter.Zero))
- iter = store.AppendValues (iter, icon, txt, widget);
- else
- iter = store.AppendValues (icon, txt, widget);
- }
-
- Gtk.Container cc = widget as Gtk.Container;
- if (cc != null && wrapper.ClassDescriptor.AllowChildren) {
- foreach (Gtk.Widget child in cc.Children)
- Fill (iter, child);
- }
- if (widget == project.Selection) {
- tree.ExpandToPath (store.GetPath (iter));
- tree.ExpandRow (store.GetPath (iter), false);
- tree.Selection.SelectIter (iter);
- }
- }
-
- public Gtk.Widget Selection {
- get { return selection; }
- }
-
- void OnButtonRelease (object s, EventArgs a)
- {
- NotifyActivated ();
- }
-
- void NotifyActivated ()
- {
- TreeIter iter;
- if (!tree.Selection.GetSelected (out iter))
- return;
- selection = (Gtk.Widget) store.GetValue (iter, 2);
- if (WidgetActivated != null)
- WidgetActivated (this, EventArgs.Empty);
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/Preview.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/Preview.cs
deleted file mode 100644
index aee001e5598..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/Preview.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Windows
-{
- class Preview: Bin
- {
- Gtk.Widget child;
- WindowsTheme wtheme;
- string caption;
-
- public Preview ( )
- {
- DoubleBuffered = false;
- AppPaintable = true;
- }
-
- public static Preview Create (TopLevelWindow window)
- {
- if (System.IO.Path.DirectorySeparatorChar != '\\')
- return null;
- try {
- Preview p = new Preview ();
- p.Add (window);
- return p;
- }
- catch {
- return null;
- }
- }
-
- public string Title {
- get { return caption; }
- set {
- caption = value;
- QueueDraw ();
- }
- }
-
- protected override void OnDestroyed ( )
- {
- if (wtheme != null)
- wtheme.Dipose ();
- base.OnDestroyed ();
- }
-
- protected override void OnAdded (Widget widget)
- {
- base.OnAdded (widget);
- child = widget;
- if (child is TopLevelWindow) {
- ((TopLevelWindow) child).PropertyChanged += Preview_TitleChanged;
- Title = ((TopLevelWindow) child).Title;
- }
- }
-
- void Preview_TitleChanged (object sender, EventArgs e)
- {
- Title = ((TopLevelWindow) child).Title;
- }
-
- protected override void OnRemoved (Widget widget)
- {
- base.OnRemoved (widget);
- if (widget == child) {
- if (child is TopLevelWindow)
- ((TopLevelWindow) child).PropertyChanged -= Preview_TitleChanged;
- child = null;
- }
- }
-
- protected override void OnSizeRequested (ref Requisition requisition)
- {
- if (child != null)
- requisition = child.SizeRequest ();
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
- if (child != null) {
- if (wtheme != null)
- child.Allocation = wtheme.GetWindowClientArea (allocation);
- else
- child.Allocation = allocation;
- }
- }
-
- protected override void OnRealized ( )
- {
- base.OnRealized ();
- wtheme = new WindowsTheme (GdkWindow);
- if (child != null)
- child.Allocation = wtheme.GetWindowClientArea (Allocation);
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
-// Gdk.Rectangle rect = new Gdk.Rectangle (Allocation.X+50, Allocation.Y+50, Allocation.Width - 1, Allocation.Height - 1);
- wtheme.DrawWindowFrame (this, caption, Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
- foreach (Widget child in Children)
- PropagateExpose (child, evnt);
- return false;
- }
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
deleted file mode 100644
index c75e25b80d7..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace Stetic.Windows
-{
- class WindowsTheme
- {
- const string USER32 = "user32.dll";
- const string GDI32 = "gdi32.dll";
- const string LIBGDK = "libgdk-win32-2.0-0.dll";
- const string UXTHEME = "uxtheme";
- const string LIBUXTHEME = "uxtheme.dll";
- IntPtr hWnd;
- IntPtr hTheme;
-
- public WindowsTheme (Gdk.Window win)
- {
- hWnd = gdk_win32_drawable_get_handle (win.Handle);
- hTheme = OpenThemeData (hWnd, "WINDOW");
- }
-
- public void Dipose ( )
- {
- CloseThemeData (hTheme);
- }
-
- public void DrawWindowFrame (Gtk.Widget w, string caption, int x, int y, int width, int height)
- {
- Gdk.Drawable drawable = w.GdkWindow;
- Gdk.Pixmap pix = new Gdk.Pixmap (drawable, width, height, drawable.Depth);
-
- Gdk.GC gcc = new Gdk.GC (pix);
- gcc.Foreground = w.Style.Backgrounds [(int)Gtk.StateType.Normal];
- pix.DrawRectangle (gcc, true, 0, 0, width, height);
-
- IntPtr hdc = gdk_win32_hdc_get (pix.Handle, gcc.Handle, 0);
-
- RECT r = new RECT (0, 0, width, height);
- SIZE size;
- GetThemePartSize (hTheme, hdc, WP_CAPTION, CS_ACTIVE, ref r, 1, out size);
-
- r.Bottom = size.cy;
- DrawThemeBackground (hTheme, hdc, WP_CAPTION, CS_ACTIVE, ref r, ref r);
-
- RECT rf = new RECT (FrameBorder, FrameBorder, width - FrameBorder * 2, size.cy);
- LOGFONT lf = new LOGFONT ();
- GetThemeSysFont (hTheme, TMT_CAPTIONFONT, ref lf);
- IntPtr titleFont = CreateFontIndirect (ref lf);
- IntPtr oldFont = SelectObject (hdc, titleFont);
- SetBkMode (hdc, 1 /*TRANSPARENT*/);
- DrawThemeText (hTheme, hdc, WP_CAPTION, CS_ACTIVE, caption, -1, DT_LEFT | DT_SINGLELINE | DT_WORD_ELLIPSIS, 0, ref rf);
- SelectObject (hdc, oldFont);
- DeleteObject (titleFont);
-
- int ny = r.Bottom;
- r = new RECT (0, ny, width, height);
- DrawThemeBackground (hTheme, hdc, WP_FRAMEBOTTOM, 0, ref r, ref r);
-
- gdk_win32_hdc_release (pix.Handle, gcc.Handle, 0);
-
- Gdk.Pixbuf img = Gdk.Pixbuf.FromDrawable (pix, pix.Colormap, 0, 0, 0, 0, width, height);
- drawable.DrawPixbuf (new Gdk.GC (drawable), img, 0, 0, x, y, width, height, Gdk.RgbDither.None, 0, 0);
- drawable.DrawRectangle (w.Style.BackgroundGC (Gtk.StateType.Normal), true, x + FrameBorder, y + size.cy, width - FrameBorder * 2, height - FrameBorder - size.cy);
- }
-
- public Gdk.Rectangle GetWindowClientArea (Gdk.Rectangle allocation)
- {
- IntPtr hdc = GetDC (hWnd);
- RECT r = new RECT (allocation.X, allocation.Y, allocation.X + allocation.Width, allocation.Y + allocation.Height);
- SIZE size;
- GetThemePartSize (hTheme, hdc, WP_CAPTION, CS_ACTIVE, ref r, 1, out size);
- ReleaseDC (hWnd, hdc);
-
- return new Gdk.Rectangle (allocation.X + FrameBorder, allocation.Y + size.cy, allocation.Width - FrameBorder * 2, allocation.Height - size.cy - FrameBorder);
- }
-
- const int FrameBorder = 8;
-
- const int WP_CAPTION = 1;
- const int WP_FRAMEBOTTOM = 9;
- const int CS_ACTIVE = 1;
- const int TMT_CAPTIONFONT = 801;
-
- const int DT_LEFT = 0x0;
- const int DT_WORD_ELLIPSIS = 0x40000;
- const int DT_SINGLELINE = 0x20;
-
-
- [DllImport (UXTHEME, ExactSpelling = true)]
- extern static Int32 DrawThemeBackground (IntPtr hTheme, IntPtr hdc, int iPartId,
- int iStateId, ref RECT pRect, ref RECT pClipRect);
-
- [DllImport (LIBUXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
- static extern IntPtr OpenThemeData (IntPtr hWnd, String classList);
-
- [DllImport (LIBUXTHEME, ExactSpelling = true)]
- extern static Int32 CloseThemeData (IntPtr hTheme);
-
- [DllImport (UXTHEME, ExactSpelling = true)]
- extern static Int32 GetThemePartSize (IntPtr hTheme, IntPtr hdc, int part, int state, ref RECT pRect, int eSize, out SIZE size);
-
- [DllImport (UXTHEME, ExactSpelling = true)]
- extern static Int32 GetThemeBackgroundExtent (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pBoundingRect, out RECT pContentRect);
-
- [DllImport (UXTHEME, ExactSpelling = true)]
- extern static Int32 GetThemeMargins (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, int iPropId, out MARGINS pMargins);
-
- [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
- extern static Int32 DrawThemeText (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, String text, int textLength, UInt32 textFlags, UInt32 textFlags2, ref RECT pRect);
-
- [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
- extern static Int32 GetThemeSysFont (IntPtr hTheme, int iFontId, ref LOGFONT plf);
-
- [DllImport (GDI32)]
- static extern IntPtr CreateFontIndirect ([In] ref LOGFONT lplf);
-
- [DllImport (GDI32)]
- static extern int SetBkMode (IntPtr hdc, int iBkMode);
-
- [DllImport (GDI32, ExactSpelling = true, PreserveSig = true, SetLastError = true)]
- static extern IntPtr SelectObject (IntPtr hdc, IntPtr hgdiobj);
-
- [DllImport (GDI32)]
- static extern bool DeleteObject (IntPtr hObject);
-
- [DllImport (USER32)]
- static extern IntPtr GetDC (IntPtr hWnd);
-
- [DllImport (USER32)]
- static extern int ReleaseDC (IntPtr hWnd, IntPtr hDC);
-
- [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gdk_win32_drawable_get_handle (IntPtr raw);
-
- [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
-
- [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
- static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
- }
-
-
- [Serializable, StructLayout (LayoutKind.Sequential)]
- public struct RECT
- {
- public int Left;
- public int Top;
- public int Right;
- public int Bottom;
-
- public RECT (int left_, int top_, int right_, int bottom_)
- {
- Left = left_;
- Top = top_;
- Right = right_;
- Bottom = bottom_;
- }
-
- public int Height { get { return Bottom - Top; } }
- public int Width { get { return Right - Left; } }
- }
-
- [StructLayout (LayoutKind.Sequential)]
- public struct SIZE
- {
- public int cx;
- public int cy;
-
- public SIZE (int cx, int cy)
- {
- this.cx = cx;
- this.cy = cy;
- }
- }
-
- [StructLayout (LayoutKind.Sequential)]
- public struct MARGINS
- {
- public int leftWidth;
- public int rightWidth;
- public int topHeight;
- public int bottomHeight;
- }
-
- [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Auto)]
- public struct LOGFONT
- {
- public int lfHeight;
- public int lfWidth;
- public int lfEscapement;
- public int lfOrientation;
- public int lfWeight;
- public byte lfItalic;
- public byte lfUnderline;
- public byte lfStrikeOut;
- public byte lfCharSet;
- public byte lfOutPrecision;
- public byte lfClipPrecision;
- public byte lfQuality;
- public byte lfPitchAndFamily;
- [MarshalAs (UnmanagedType.ByValTStr, SizeConst = 32)]
- public string lfFaceName;
- }
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/action.png b/main/src/addins/MonoDevelop.GtkCore/libsteticui/action.png
deleted file mode 100644
index fa6a6c8a12b..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libsteticui/action.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj
deleted file mode 100644
index ece3d0b3b96..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {7926DB5B-96A7-47A7-9870-DB42FA5C3548}
- $(MDFrameworkVersion)
- ..\..\..\..\build\AddIns\MonoDevelop.GtkCore
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll
- False
-
-
- ..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Mdb.dll
- False
-
-
- ..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Pdb.dll
- False
-
-
- ..\..\..\..\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll
- False
-
-
-
-
- {F870E2E7-FA64-4B2F-968A-90B36AB7AAA9}
- libstetic
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.dll.config b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.dll.config
deleted file mode 100644
index 8c4c6ab9a9d..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.dll.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/missing.png b/main/src/addins/MonoDevelop.GtkCore/libsteticui/missing.png
deleted file mode 100644
index 589da692bbe..00000000000
Binary files a/main/src/addins/MonoDevelop.GtkCore/libsteticui/missing.png and /dev/null differ
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/packages.config b/main/src/addins/MonoDevelop.GtkCore/libsteticui/packages.config
deleted file mode 100644
index 8b1b9ad8d7c..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.GtkCore/packages.config b/main/src/addins/MonoDevelop.GtkCore/packages.config
deleted file mode 100644
index f9194282d29..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml
deleted file mode 100644
index 6e71c2624ef..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroup.xft.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
- <_Name>ActionGroup
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a global Action Group.
- ActionGroup
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroupPartial.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroupPartial.xft.xml
deleted file mode 100644
index d534caa8caf..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/ActionGroupPartial.xft.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
- <_Name>ActionGroup
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a global Action Group.
- ActionGroup
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/Dialog.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/Dialog.xft.xml
deleted file mode 100644
index e41ec9e88a5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/Dialog.xft.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
- <_Name>Dialog
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a Gtk dialog.
- Dialog
-
-
-
-
-
-
-
-
-
-
-
- 0
- dialog1
- CenterOnParent
- 2
- False
- False
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
- 0
- 10
- 5
- 2
- End
-
-
-
- True
- True
- 0
- True
- StockItem
- gtk-cancel
- True
- -6
- gtk-cancel
-
-
- False
- False
-
-
-
-
-
- True
- True
- 0
- True
- StockItem
- gtk-ok
- True
- -5
- gtk-ok
-
-
- 1
- False
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/DialogPartial.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/DialogPartial.xft.xml
deleted file mode 100644
index f6e249dc750..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/DialogPartial.xft.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
- <_Name>Dialog
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a Gtk dialog.
- Dialog
-
-
-
-
-
-
-
-
-
-
-
- 0
- dialog1
- CenterOnParent
- 2
- False
- False
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
- 0
- 10
- 5
- 2
- End
-
-
-
- True
- True
- 0
- True
- StockItem
- gtk-cancel
- True
- -6
- gtk-cancel
-
-
- False
- False
-
-
-
-
-
- True
- True
- 0
- True
- StockItem
- gtk-ok
- True
- -5
- gtk-ok
-
-
- 1
- False
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/DrawingArea.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/DrawingArea.xft.xml
deleted file mode 100644
index 2c8082951b5..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/DrawingArea.xft.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
-
- <_Name>Custom Drawn Widget
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a custom Gtk.DrawingArea subclass.
- DrawingArea
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/Widget.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/Widget.xft.xml
deleted file mode 100644
index 35817aacf3a..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/Widget.xft.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
- <_Name>Widget
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a custom Gtk Widget.
- Widget
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/WidgetPartial.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/WidgetPartial.xft.xml
deleted file mode 100644
index a1d36b26699..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/WidgetPartial.xft.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- <_Name>Widget
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a custom Gtk Widget.
- Widget
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/Window.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/Window.xft.xml
deleted file mode 100644
index 32f7a9c5fe1..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/Window.xft.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
- <_Name>Window
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a Gtk Window
- Window
-
-
-
-
-
-
-
-
-
-
-
- ${Name}
- CenterOnParent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/templates/WindowPartial.xft.xml b/main/src/addins/MonoDevelop.GtkCore/templates/WindowPartial.xft.xml
deleted file mode 100644
index eacabbd45d2..00000000000
--- a/main/src/addins/MonoDevelop.GtkCore/templates/WindowPartial.xft.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
- <_Name>Window
- md-gui-file
- <_Category>Gtk
- *
- DotNetAssembly
- <_Description>Creates a Gtk Window
- Window
-
-
-
-
-
-
-
-
-
-
-
- ${Name}
- CenterOnParent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
index 36f1b72c749..ca1a7b73569 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
@@ -16,10 +16,10 @@
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.HexEditor/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.HexEditor/gtk-gui/gui.stetic
index 9a1b8a37ffb..859ddf5b86c 100644
--- a/main/src/addins/MonoDevelop.HexEditor/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.HexEditor/gtk-gui/gui.stetic
@@ -4,7 +4,6 @@
..
-
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
index e35250bc299..d415d1e320c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
@@ -12,14 +12,14 @@
-
+
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj
index 727c825b47c..744b4763479 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj
@@ -12,10 +12,10 @@
-
-
-
-
+
+
+
+
..\..\..\external\nuget-binary\NuGet.Protocol.dll
@@ -37,7 +37,7 @@
..\..\..\external\nuget-binary\NuGet.Versioning.dll
False
-
+
..\..\..\external\nuget-binary\NuGet.PackageManagement.dll
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
index 5d84535924f..859617a1309 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
@@ -354,7 +354,7 @@ protected override void OnDestroyed()
}
// TODO: Make static.
- void TitleColDataFunc (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter)
+ void TitleColDataFunc (TreeViewColumn treeColumn, CellRenderer cell, ITreeModel model, TreeIter iter)
{
var provider = (Tuple)model.GetValue (iter, 1);
if (provider == null) {
@@ -366,7 +366,7 @@ void TitleColDataFunc (TreeViewColumn treeColumn, CellRenderer cell, TreeModel m
}
// TODO: Make static.
- void ComboDataFunc (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter)
+ void ComboDataFunc (TreeViewColumn treeColumn, CellRenderer cell, ITreeModel model, TreeIter iter)
{
var provider = (Tuple)treeStore.GetValue (iter, 1);
if (provider == null) {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
index 413f7a379f8..9cfeb735588 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
@@ -13,12 +13,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
index bfb8a69ea8a..5a3e762e2ac 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
@@ -97,7 +97,7 @@ public RefactoringPreviewDialog (IList changes)
FillChanges ();
}
- void SetLocationTextData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void SetLocationTextData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CellRendererText cellRendererText = (CellRendererText)cell;
Change change = store.GetValue (iter, objColumn) as Change;
@@ -122,7 +122,7 @@ void SetLocationTextData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell,
}
}
- void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
try {
CellRendererDiff cellRendererDiff = (CellRendererDiff)cell;
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
index ff1d0cc4163..6464eabcb49 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
@@ -16,11 +16,21 @@
-
-
-
-
-
+
+ gdk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll
False
@@ -45,6 +55,9 @@
..\..\..\build\bin\System.Collections.Immutable.dll
False
+
+ gio-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
index 59c8a35c7de..bd3ab39b786 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
@@ -91,7 +91,7 @@ public ElementHelpWidget (IWorkbenchWindow workbenchWindow, RegexToolkitWidget r
Show ();
}
- static void ElementDescriptionFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ static void ElementDescriptionFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
string str = (string)model.GetValue (iter, 2);
if (string.IsNullOrEmpty (str)) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
index e8a1e30986d..c45bc4bc3da 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
@@ -40,7 +40,7 @@ partial class BehaviorPanel
private global::Gtk.Label label1;
- private global::Gtk.ComboBox indentationCombobox;
+ private global::Gtk.ComboBoxText indentationCombobox;
private global::Gtk.CheckButton tabAsReindentCheckbutton;
@@ -56,7 +56,7 @@ partial class BehaviorPanel
private global::Gtk.Label label2;
- private global::Gtk.ComboBox controlLeftRightCombobox;
+ private global::Gtk.ComboBoxText controlLeftRightCombobox;
protected virtual void Build()
{
@@ -228,7 +228,7 @@ protected virtual void Build()
w14.Expand = false;
w14.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.indentationCombobox = global::Gtk.ComboBox.NewText();
+ this.indentationCombobox = new global::Gtk.ComboBoxText();
this.indentationCombobox.Name = "indentationCombobox";
this.hbox1.Add(this.indentationCombobox);
global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.indentationCombobox]));
@@ -304,7 +304,7 @@ protected virtual void Build()
w22.Expand = false;
w22.Fill = false;
// Container child hbox3.Gtk.Box+BoxChild
- this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText();
+ this.controlLeftRightCombobox = new global::Gtk.ComboBoxText();
this.controlLeftRightCombobox.Name = "controlLeftRightCombobox";
this.hbox3.Add(this.controlLeftRightCombobox);
global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.controlLeftRightCombobox]));
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
index 471fa7d3fcb..f593592dc15 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
@@ -205,7 +205,7 @@ protected virtual void Build ()
this.openingRadiobutton.Name = "openingRadiobutton";
this.openingRadiobutton.DrawIndicator = true;
this.openingRadiobutton.UseUnderline = true;
- this.openingRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.openingRadiobutton.Group = new Gtk.RadioButton [0];
this.hbox2.Add (this.openingRadiobutton);
global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.openingRadiobutton]));
w14.Position = 1;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
index 32e5661d417..2aba84da7ce 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
@@ -20,7 +20,7 @@ internal partial class GeneralOptionsPanel
private global::Gtk.Label label1;
- private global::Gtk.ComboBox comboboxLineEndings;
+ private global::Gtk.ComboBoxText comboboxLineEndings;
private global::Gtk.Label GtkLabel14;
@@ -106,7 +106,7 @@ protected virtual void Build()
w4.Expand = false;
w4.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboboxLineEndings = global::Gtk.ComboBox.NewText();
+ this.comboboxLineEndings = new global::Gtk.ComboBoxText();
this.comboboxLineEndings.Name = "comboboxLineEndings";
this.hbox1.Add(this.comboboxLineEndings);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.comboboxLineEndings]));
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
index eda778d4059..af0fd707e18 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
@@ -40,7 +40,7 @@ partial class MarkerPanel
private global::Gtk.Label label1;
- private global::Gtk.ComboBox showWhitespacesCombobox;
+ private global::Gtk.ComboBoxText showWhitespacesCombobox;
protected virtual void Build()
{
@@ -239,7 +239,7 @@ protected virtual void Build()
w14.XOptions = ((global::Gtk.AttachOptions)(4));
w14.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText();
+ this.showWhitespacesCombobox = new global::Gtk.ComboBoxText();
this.showWhitespacesCombobox.Name = "showWhitespacesCombobox";
this.table1.Add(this.showWhitespacesCombobox);
global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.showWhitespacesCombobox]));
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
index 28252a8d01f..338ea74461f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
@@ -6,7 +6,7 @@ partial class NewColorShemeDialog
{
private global::Gtk.Table table1;
- private global::Gtk.ComboBox comboboxBaseStyle;
+ private global::Gtk.ComboBoxText comboboxBaseStyle;
private global::Gtk.Entry entryDescription;
@@ -31,7 +31,7 @@ protected virtual void Build()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -40,7 +40,7 @@ protected virtual void Build()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.comboboxBaseStyle = global::Gtk.ComboBox.NewText();
+ this.comboboxBaseStyle = new global::Gtk.ComboBoxText();
this.comboboxBaseStyle.Name = "comboboxBaseStyle";
this.table1.Add(this.comboboxBaseStyle);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.comboboxBaseStyle]));
@@ -115,7 +115,7 @@ protected virtual void Build()
w8.Expand = false;
w8.Fill = false;
// Internal child MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.ActionArea
- global::Gtk.HButtonBox w9 = this.ActionArea;
+ global::Gtk.HButtonBox w9 = (Gtk.HButtonBox)this.ActionArea;
w9.Name = "dialog1_ActionArea";
w9.Spacing = 10;
w9.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWidget.cs
index c4e0b3afec5..096ed710b01 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWidget.cs
@@ -30,6 +30,7 @@
using System;
using System.Text;
using MonoDevelop.Components;
+using Cairo;
namespace Mono.TextEditor.PopupWindow
{
@@ -150,7 +151,7 @@ protected override bool OnMotionNotifyEvent (EventMotion e)
return base.OnMotionNotifyEvent (e);
int winWidth, winHeight;
- this.GdkWindow.GetSize (out winWidth, out winHeight);
+// this.GdkWindow.GetSize (out winWidth, out winHeight);
/* int ypos = (int) e.Y;
if (ypos < 0) {
@@ -166,14 +167,14 @@ protected override bool OnMotionNotifyEvent (EventMotion e)
Adjustment hadj;
Adjustment vadj;
- protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
- {
- this.hadj = hadj;
- this.vadj = vadj;
- if (this.vadj != null)
- this.vadj.ValueChanged += (sender, e) => QueueDraw ();
- base.OnSetScrollAdjustments (hadj, vadj);
- }
+// protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+// {
+// this.hadj = hadj;
+// this.vadj = vadj;
+// if (this.vadj != null)
+// this.vadj.ValueChanged += (sender, e) => QueueDraw ();
+// base.OnSetScrollAdjustments (hadj, vadj);
+// }
void SetAdjustments (Gdk.Rectangle allocation)
{
@@ -189,12 +190,12 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
base.OnSizeAllocated (allocation);
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- base.OnExposeEvent (args);
- DrawList (args);
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// base.OnExposeEvent (args);
+// DrawList (args);
+// return true;
+// }
public int TextOffset {
get {
@@ -212,10 +213,10 @@ void DrawList (Gdk.EventExpose args)
var window = args.Window;
int winWidth, winHeight;
- window.GetSize (out winWidth, out winHeight);
+// window.GetSize (out winWidth, out winHeight);
int ypos = margin;
- int lineWidth = winWidth - margin*2;
+// int lineWidth = winWidth - margin*2;
int xpos = margin + padding;
using (var cr = this.CreateXwtContext ()) {
@@ -226,67 +227,67 @@ void DrawList (Gdk.EventExpose args)
int n = 0;
n = (int)(vadj.Value / rowHeight);
- while (ypos < winHeight - margin && n < win.DataProvider.Count) {
- bool hasMarkup = false;
- IMarkupListDataProvider markupListDataProvider = win.DataProvider as IMarkupListDataProvider;
- if (markupListDataProvider != null) {
- if (markupListDataProvider.HasMarkup (n)) {
- layout.Markup = (markupListDataProvider.GetMarkup (n) ?? "<null>");
- hasMarkup = true;
- }
- }
-
- if (!hasMarkup)
- layout.Text = (win.DataProvider.GetText (n) ?? "");
-
- Xwt.Drawing.Image icon = win.DataProvider.GetIcon (n);
- int iconHeight, iconWidth;
-
- if (icon != null) {
- iconWidth = (int)icon.Width;
- iconHeight = (int)icon.Height;
- } else if (!Gtk.Icon.SizeLookup (Gtk.IconSize.Menu, out iconWidth, out iconHeight)) {
- iconHeight = iconWidth = 24;
- }
-
- var s = layout.GetSize ();
- int typos, iypos;
- int he = (int)s.Height;
-
- typos = he < rowHeight ? ypos + (rowHeight - he) / 2 : ypos;
- iypos = iconHeight < rowHeight ? ypos + (rowHeight - iconHeight) / 2 : ypos;
-
- if (n == selection) {
- if (!disableSelection) {
- cr.Rectangle (margin, ypos, lineWidth, he + padding);
- cr.SetColor (this.Style.Base (StateType.Selected).ToXwtColor ());
- cr.Fill ();
-
- cr.SetColor (this.Style.Text (StateType.Selected).ToXwtColor ());
- cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
- } else {
- cr.Rectangle (margin, ypos, lineWidth, he + padding);
- cr.SetColor (this.Style.Base (StateType.Selected).ToXwtColor ());
- cr.Stroke ();
-
- cr.SetColor (textColor);
- cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
- }
- } else {
- cr.SetColor (textColor);
- cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
- }
-
- if (icon != null)
- cr.DrawImage (icon, xpos, iypos);
-
- ypos += rowHeight;
- n++;
-
- //reset the markup or it carries over to the next SetText
- if (hasMarkup)
- layout.Markup = string.Empty;
- }
+// while (ypos < winHeight - margin && n < win.DataProvider.Count) {
+// bool hasMarkup = false;
+// IMarkupListDataProvider markupListDataProvider = win.DataProvider as IMarkupListDataProvider;
+// if (markupListDataProvider != null) {
+// if (markupListDataProvider.HasMarkup (n)) {
+// layout.Markup = (markupListDataProvider.GetMarkup (n) ?? "<null>");
+// hasMarkup = true;
+// }
+// }
+//
+// if (!hasMarkup)
+// layout.Text = (win.DataProvider.GetText (n) ?? "");
+//
+// Xwt.Drawing.Image icon = win.DataProvider.GetIcon (n);
+// int iconHeight, iconWidth;
+//
+// if (icon != null) {
+// iconWidth = (int)icon.Width;
+// iconHeight = (int)icon.Height;
+// } else if (!Gtk.Icon.SizeLookup (Gtk.IconSize.Menu, out iconWidth, out iconHeight)) {
+// iconHeight = iconWidth = 24;
+// }
+//
+// var s = layout.GetSize ();
+// int typos, iypos;
+// int he = (int)s.Height;
+//
+// typos = he < rowHeight ? ypos + (rowHeight - he) / 2 : ypos;
+// iypos = iconHeight < rowHeight ? ypos + (rowHeight - iconHeight) / 2 : ypos;
+//
+// if (n == selection) {
+// if (!disableSelection) {
+// cr.Rectangle (margin, ypos, lineWidth, he + padding);
+// cr.SetColor (this.Style.Base (StateType.Selected).ToXwtColor ());
+// cr.Fill ();
+//
+// cr.SetColor (this.Style.Text (StateType.Selected).ToXwtColor ());
+// cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
+// } else {
+// cr.Rectangle (margin, ypos, lineWidth, he + padding);
+// cr.SetColor (this.Style.Base (StateType.Selected).ToXwtColor ());
+// cr.Stroke ();
+//
+// cr.SetColor (textColor);
+// cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
+// }
+// } else {
+// cr.SetColor (textColor);
+// cr.DrawTextLayout (layout, xpos + iconWidth + 2, typos);
+// }
+//
+// if (icon != null)
+// cr.DrawImage (icon, xpos, iypos);
+//
+// ypos += rowHeight;
+// n++;
+//
+// //reset the markup or it carries over to the next SetText
+// if (hasMarkup)
+// layout.Markup = string.Empty;
+// }
}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
index 8ef8f91b91e..d5375bdfdef 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
@@ -368,15 +368,15 @@ protected virtual void OnSelectionChanged ()
{
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- base.OnExposeEvent (args);
-
- int winWidth, winHeight;
- this.GetSize (out winWidth, out winHeight);
- this.GdkWindow.DrawRectangle (this.Style.ForegroundGC (StateType.Insensitive), false, 0, 0, winWidth-1, winHeight-1);
- return false;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// base.OnExposeEvent (args);
+//
+// int winWidth, winHeight;
+// this.GetSize (out winWidth, out winHeight);
+// this.GdkWindow.DrawRectangle (this.Style.ForegroundGC (StateType.Insensitive), false, 0, 0, winWidth-1, winHeight-1);
+// return false;
+// }
public int TextOffset {
get { return list.TextOffset + (int) this.BorderWidth; }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs
index a3e37b92000..bb70872901f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs
@@ -30,6 +30,7 @@
using System.Text.RegularExpressions;
using Mono.Unix;
using MonoDevelop.Components;
+using Cairo;
namespace Mono.TextEditor.PopupWindow
{
@@ -59,11 +60,11 @@ public ModeHelpWindow ()
void CheckScreenColormap ()
{
- Colormap = Screen.RgbaColormap;
- if (Colormap == null) {
- Colormap = Screen.RgbColormap;
- SupportsAlpha = false;
- } else
+// Colormap = Screen.RgbaColormap;
+// if (Colormap == null) {
+// Colormap = Screen.RgbColormap;
+// SupportsAlpha = false;
+// } else
SupportsAlpha = true;
}
@@ -84,16 +85,14 @@ public TableLayoutModeHelpWindow ()
layout = new Pango.Layout (PangoContext);
}
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
int descriptionWidth = 1;
- int totalHeight = yBorder * 2 + 1;
-
+
int width, height;
layout.SetText (TitleText);
layout.GetPixelSize (out width, out height);
- totalHeight += height;
xSpacer = 0;
foreach (var pair in Items) {
int w1, w2;
@@ -104,13 +103,31 @@ protected override void OnSizeRequested (ref Gtk.Requisition requisition)
layout.GetPixelSize (out w2, out height);
descriptionWidth = System.Math.Max (descriptionWidth, w2);
xSpacer = System.Math.Max (xSpacer, w1);
-
- totalHeight += height;
}
xSpacer += xBorder * 2 + 1;
-
- requisition.Width = descriptionWidth + xSpacer + xBorder * 2 + 1;
- requisition.Height = totalHeight;
+
+ minimum_width = natural_width = descriptionWidth + xSpacer + xBorder * 2 + 1;
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ {
+ base.OnGetPreferredHeight (out minimum_height, out natural_height);
+ int totalHeight = yBorder * 2 + 1;
+
+ int width, height;
+ layout.SetText (TitleText);
+ layout.GetPixelSize (out width, out height);
+ totalHeight += height;
+ foreach (var pair in Items) {
+ int w1, w2;
+ layout.SetMarkup (pair.Key);
+ layout.GetPixelSize (out w1, out height);
+
+ layout.SetMarkup (pair.Value);
+ layout.GetPixelSize (out w2, out height);
+ totalHeight += height;
+ }
+ minimum_height = natural_height = totalHeight;
}
int xSpacer = 0;
@@ -127,89 +144,84 @@ protected override void OnDestroyed ()
const int xBorder = 4;
const int yBorder = 2;
-
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- using (var g = Gdk.CairoHelper.Create (args.Window)) {
- g.Translate (Allocation.X, Allocation.Y);
- g.LineWidth = 1;
-
- Gdk.GC gc = new Gdk.GC (args.Window);
- layout.SetMarkup (TitleText);
- int width, height;
+
+ protected override bool OnDrawn (Context g)
+ {
+ g.Translate (Allocation.X, Allocation.Y);
+ g.LineWidth = 1;
+// Gdk.GC gc = new Gdk.GC (args.Window);
+ layout.SetMarkup (TitleText);
+ int width, height;
+ layout.GetPixelSize (out width, out height);
+ width += xBorder * 2;
+ FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, true, false, 0.5, 0.5, height + yBorder * 2 + 1.5, width, height + yBorder * 2);
+ g.SetSourceColor (Styles.TableLayoutModeTitleBackgroundColor.ToCairoColor ());
+ g.FillPreserve ();
+ g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
+ g.Stroke ();
+
+ g.Save ();
+ g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ());
+ g.Translate (xBorder, yBorder);
+ g.ShowLayout (layout);
+ g.Restore ();
+
+ FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, 0.5, height * 2 + yBorder * 2 + 0.5, height, Allocation.Width - 1, Allocation.Height - height * 2 - yBorder * 2 - 1);
+ g.SetSourceColor (Styles.TableLayoutModeBackgroundColor.ToCairoColor ());
+ g.FillPreserve ();
+ g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
+ g.Stroke ();
+
+ g.MoveTo (xSpacer + 0.5, height * 2 + yBorder * 2);
+ g.LineTo (xSpacer + 0.5, Allocation.Height - 1);
+ g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
+ g.Stroke ();
+
+ int y = height + yBorder * 2;
+
+ for (int i = 0; i < Items.Count; i++) {
+ KeyValuePair pair = Items [i];
+
+ layout.SetMarkup (pair.Key);
layout.GetPixelSize (out width, out height);
- width += xBorder * 2;
- FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, true, false, 0.5, 0.5, height + yBorder * 2 + 1.5, width, height + yBorder * 2);
- g.SetSourceColor (Styles.TableLayoutModeTitleBackgroundColor.ToCairoColor ());
- g.FillPreserve ();
- g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
- g.Stroke ();
+ if (i == 0) {
+ FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, false, false, 0, y + 0.5, height + 1.5, Allocation.Width, height);
+ g.SetSourceColor (Styles.TableLayoutModeCategoryBackgroundColor.ToCairoColor ());
+ g.FillPreserve ();
+ g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
+ g.Stroke ();
+
+ g.MoveTo (xSpacer + 0.5, height + yBorder * 2 + 1);
+ g.LineTo (xSpacer + 0.5, height * 2 + yBorder * 2 + 1);
+ g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
+ g.Stroke ();
+ }
+
+// gc.RgbFgColor = (HslColor)(i == 0 ? Styles.TableLayoutModeBackgroundColor : Styles.TableLayoutModeTextColor).ToCairoColor ();
g.Save ();
g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ());
- g.Translate (xBorder, yBorder);
+ g.Translate (xBorder, y);
g.ShowLayout (layout);
g.Restore ();
- FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, 0.5, height * 2 + yBorder * 2 + 0.5, height, Allocation.Width - 1, Allocation.Height - height * 2 - yBorder * 2 - 1);
- g.SetSourceColor (Styles.TableLayoutModeBackgroundColor.ToCairoColor ());
- g.FillPreserve ();
- g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
- g.Stroke ();
-
- g.MoveTo (xSpacer + 0.5, height * 2 + yBorder * 2);
- g.LineTo (xSpacer + 0.5, Allocation.Height - 1);
- g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
- g.Stroke ();
-
- int y = height + yBorder * 2;
-
- for (int i = 0; i < Items.Count; i++) {
- KeyValuePair pair = Items[i];
-
- layout.SetMarkup (pair.Key);
- layout.GetPixelSize (out width, out height);
-
- if (i == 0) {
- FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, false, false, 0, y + 0.5, height + 1.5, Allocation.Width, height);
- g.SetSourceColor (Styles.TableLayoutModeCategoryBackgroundColor.ToCairoColor ());
- g.FillPreserve ();
- g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ());
- g.Stroke ();
-
- g.MoveTo (xSpacer + 0.5, height + yBorder * 2 + 1);
- g.LineTo (xSpacer + 0.5, height * 2 + yBorder * 2 + 1);
- g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
- g.Stroke ();
- }
-
- gc.RgbFgColor = (HslColor)(i == 0 ? Styles.TableLayoutModeBackgroundColor : Styles.TableLayoutModeTextColor).ToCairoColor ();
- g.Save ();
- g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ());
- g.Translate (xBorder, y);
- g.ShowLayout (layout);
- g.Restore ();
-
- g.Save ();
- g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ());
- g.Translate (xSpacer + xBorder, y);
- layout.SetMarkup (pair.Value);
- g.ShowLayout (layout);
- g.Restore ();
-
- // draw top line
- if (i > 0) {
- g.MoveTo (1, y + 0.5);
- g.LineTo (Allocation.Width - 1, y + 0.5);
- g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
- g.Stroke ();
- }
- y += height;
+ g.Save ();
+ g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ());
+ g.Translate (xSpacer + xBorder, y);
+ layout.SetMarkup (pair.Value);
+ g.ShowLayout (layout);
+ g.Restore ();
+
+ // draw top line
+ if (i > 0) {
+ g.MoveTo (1, y + 0.5);
+ g.LineTo (Allocation.Width - 1, y + 0.5);
+ g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ());
+ g.Stroke ();
}
- gc.Dispose ();
+ y += height;
}
-
- return base.OnExposeEvent (args);
+ return base.OnDrawn (g);
}
}
@@ -425,29 +437,40 @@ public InsertionCursorLayoutModeHelpWindow ()
titleLayout.FontDescription = desc;
}
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
int descriptionWidth = 1;
- int totalHeight = yTitleBorder * 2 + yDescriptionBorder * 2 + 1;
-
+
int width, height;
titleLayout.SetText (TitleText);
titleLayout.GetPixelSize (out width, out height);
- totalHeight += height;
xSpacer = 0;
- int h2 = descTexts.Sum (x => x.Height + x.Spacing);
int w2 = descTexts.Max (x => x.Width + x.Spacing * 2);
- totalHeight += h2 + 4;
xSpacer = System.Math.Max (width, w2);
xSpacer += xDescriptionBorder * 2 + 1;
-
- requisition.Width = triangleWidth + descriptionWidth + xSpacer;
- requisition.Height = totalHeight;
+
+ minimum_width = natural_width = triangleWidth + descriptionWidth + xSpacer;
}
-
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ {
+ base.OnGetPreferredHeight (out minimum_height, out natural_height);
+ int totalHeight = yTitleBorder * 2 + yDescriptionBorder * 2 + 1;
+
+ int width, height;
+ titleLayout.SetText (TitleText);
+ titleLayout.GetPixelSize (out width, out height);
+ totalHeight += height;
+
+ int h2 = descTexts.Sum (x => x.Height + x.Spacing);
+ totalHeight += h2 + 4;
+
+ minimum_height = natural_height = totalHeight;
+ }
+
int xSpacer = 0;
protected override void OnDestroyed ()
@@ -474,60 +497,58 @@ protected override void OnDestroyed ()
const int yDescriptionBorder = 8;
const int yTitleBorder = 8;
- protected override bool OnExposeEvent (Gdk.EventExpose args)
+ protected override bool OnDrawn (Context g)
{
- using (var g = Gdk.CairoHelper.Create (args.Window)) {
- g.Translate (Allocation.X, Allocation.Y);
- g.LineWidth = 1;
- titleLayout.SetMarkup (TitleText);
- int width, height;
- titleLayout.GetPixelSize (out width, out height);
- var tw = SupportsAlpha ? triangleWidth : 0;
- var th = SupportsAlpha ? triangleHeight : 0;
- width += xDescriptionBorder * 2;
-
- if (SupportsAlpha) {
- FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, true, true, tw + 0.5, 0.5, 12, Allocation.Width - 1 - tw, Allocation.Height);
- } else {
- g.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- }
+ g.Translate (Allocation.X, Allocation.Y);
+ g.LineWidth = 1;
+ titleLayout.SetMarkup (TitleText);
+ int width, height;
+ titleLayout.GetPixelSize (out width, out height);
+ var tw = SupportsAlpha ? triangleWidth : 0;
+ var th = SupportsAlpha ? triangleHeight : 0;
+ width += xDescriptionBorder * 2;
+
+ if (SupportsAlpha) {
+ FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, true, true, tw + 0.5, 0.5, 12, Allocation.Width - 1 - tw, Allocation.Height);
+ } else {
+ g.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+ }
+ g.SetSourceColor (Styles.InsertionCursorBackgroundColor.ToCairoColor ());
+ g.FillPreserve ();
+ g.SetSourceColor (Styles.InsertionCursorBorderColor.ToCairoColor ());
+ g.Stroke ();
+
+
+ g.MoveTo (tw + xDescriptionBorder, yTitleBorder);
+ g.SetSourceColor (Styles.InsertionCursorTitleTextColor.ToCairoColor ());
+ g.ShowLayout (titleLayout);
+
+ if (SupportsAlpha) {
+ g.MoveTo (tw, Allocation.Height / 2 - th / 2);
+ g.LineTo (0, Allocation.Height / 2);
+ g.LineTo (tw, Allocation.Height / 2 + th / 2);
+ g.LineTo (tw + 5, Allocation.Height / 2 + th / 2);
+ g.LineTo (tw + 5, Allocation.Height / 2 - th / 2);
+ g.ClosePath ();
g.SetSourceColor (Styles.InsertionCursorBackgroundColor.ToCairoColor ());
- g.FillPreserve ();
+ g.Fill ();
+
+ g.MoveTo (tw, Allocation.Height / 2 - th / 2);
+ g.LineTo (0, Allocation.Height / 2);
+ g.LineTo (tw, Allocation.Height / 2 + th / 2);
g.SetSourceColor (Styles.InsertionCursorBorderColor.ToCairoColor ());
g.Stroke ();
-
-
- g.MoveTo (tw + xDescriptionBorder, yTitleBorder);
- g.SetSourceColor (Styles.InsertionCursorTitleTextColor.ToCairoColor ());
- g.ShowLayout (titleLayout);
-
- if (SupportsAlpha) {
- g.MoveTo (tw, Allocation.Height / 2 - th / 2);
- g.LineTo (0, Allocation.Height / 2);
- g.LineTo (tw, Allocation.Height / 2 + th / 2);
- g.LineTo (tw + 5, Allocation.Height / 2 + th / 2);
- g.LineTo (tw + 5, Allocation.Height / 2 - th / 2);
- g.ClosePath ();
- g.SetSourceColor (Styles.InsertionCursorBackgroundColor.ToCairoColor ());
- g.Fill ();
-
- g.MoveTo (tw, Allocation.Height / 2 - th / 2);
- g.LineTo (0, Allocation.Height / 2);
- g.LineTo (tw, Allocation.Height / 2 + th / 2);
- g.SetSourceColor (Styles.InsertionCursorBorderColor.ToCairoColor ());
- g.Stroke ();
- }
+ }
- int y = height + yTitleBorder + yDescriptionBorder;
- int x = tw + xDescriptionBorder;
- g.SetSourceColor (Styles.InsertionCursorTextColor.ToCairoColor ());
+ int y = height + yTitleBorder + yDescriptionBorder;
+ int x = tw + xDescriptionBorder;
+ g.SetSourceColor (Styles.InsertionCursorTextColor.ToCairoColor ());
- foreach (var desc in descTexts) {
- desc.Render (g, x, y + 4);
- y += desc.Height + 8;
- }
+ foreach (var desc in descTexts) {
+ desc.Render (g, x, y + 4);
+ y += desc.Height + 8;
}
- return base.OnExposeEvent (args);
+ return base.OnDrawn (g);
}
}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedBox.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedBox.cs
index 7eed8ddcd40..6beb2f0fd01 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedBox.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedBox.cs
@@ -61,8 +61,8 @@ abstract class AnimatedBox : Container
protected AnimatedBox (bool horizontal)
{
GtkWorkarounds.FixContainerLeak (this);
-
- WidgetFlags |= WidgetFlags.NoWindow;
+
+ this.HasWindow = false;
this.horizontal = horizontal;
stage.ActorStep += OnActorStep;
border_stage.Iteration += OnBorderIteration;
@@ -179,30 +179,44 @@ protected override void OnAdded (Widget widget)
PackStart (widget, duration, easing, blocking);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
int width = 0;
- int height = 0;
-
+
if (horizontal) {
width = start_border + end_border;
- } else {
- height = start_border + end_border;
}
-
+
foreach (AnimatedWidget widget in Widgets) {
Requisition req = widget.SizeRequest ();
if (horizontal) {
width += req.Width;
- height = System.Math.Max (height, req.Height);
} else {
width = System.Math.Max (width, req.Width);
+ }
+ }
+
+ minimum_width = natural_width = width;
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ {
+ int height = 0;
+
+ if (!horizontal) {
+ height = start_border + end_border;
+ }
+
+ foreach (AnimatedWidget widget in Widgets) {
+ Requisition req = widget.SizeRequest ();
+ if (horizontal) {
+ height = System.Math.Max (height, req.Height);
+ } else {
height += req.Height;
}
}
-
- requisition.Width = width;
- requisition.Height = height;
+
+ minimum_height = natural_height = height;
}
protected override void OnSizeAllocated (Rectangle allocation)
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedWidget.cs
index 5b95f77f471..e8e2aa283b7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/AnimatedWidget.cs
@@ -63,7 +63,7 @@ internal class AnimatedWidget : Container
private readonly bool horizontal;
private double percent;
private Rectangle widget_alloc;
- private Pixmap canvas;
+// private Pixmap canvas;
public AnimatedWidget (Widget widget, uint duration, Easing easing, Blocking blocking, bool horizontal)
{
@@ -95,13 +95,13 @@ private void OnWidgetDestroyed (object sender, EventArgs args)
return;
}
- canvas = new Pixmap (GdkWindow, widget_alloc.Width, widget_alloc.Height);
- if (Platform.IsMac) {
- //FIXME: quick hack to make less ugly on Mac, because Mac GTK doesn't yet support offscreen drawing
- canvas.DrawRectangle (Style.BackgroundGC (State), true, 0, 0, widget_alloc.Width, widget_alloc.Height);
- } else {
- canvas.DrawDrawable (Style.BackgroundGC (State), GdkWindow, widget_alloc.X, widget_alloc.Y, 0, 0, widget_alloc.Width, widget_alloc.Height);
- }
+// canvas = new Pixmap (GdkWindow, widget_alloc.Width, widget_alloc.Height);
+// if (Platform.IsMac) {
+// //FIXME: quick hack to make less ugly on Mac, because Mac GTK doesn't yet support offscreen drawing
+// canvas.DrawRectangle (Style.BackgroundGC (State), true, 0, 0, widget_alloc.Width, widget_alloc.Height);
+// } else {
+// canvas.DrawDrawable (Style.BackgroundGC (State), GdkWindow, widget_alloc.X, widget_alloc.Y, 0, 0, widget_alloc.Width, widget_alloc.Height);
+// }
if (AnimationState != AnimationState.Going) {
WidgetDestroyed (this, args);
@@ -120,11 +120,11 @@ protected override void OnRemoved (Widget widget)
protected override void OnRealized ()
{
- WidgetFlags |= WidgetFlags.Realized;
+ this.IsRealized = true;
Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
attributes.WindowType = Gdk.WindowType.Child;
- attributes.Wclass = Gdk.WindowClass.InputOutput;
+// attributes.Wclass = Gdk.WindowClass.InputOutput;
attributes.EventMask = (int)Gdk.EventMask.ExposureMask;
GdkWindow = new Gdk.Window (Parent.GdkWindow, attributes, 0);
GdkWindow.UserData = Handle;
@@ -132,24 +132,34 @@ protected override void OnRealized ()
Style.Attach (GdkWindow);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
if (Widget != null) {
Requisition req = Widget.SizeRequest ();
widget_alloc.Width = req.Width;
- widget_alloc.Height = req.Height;
}
-
+
if (horizontal) {
Width = Choreographer.PixelCompose (percent, widget_alloc.Width + StartPadding + EndPadding, Easing);
- Height = widget_alloc.Height;
} else {
Width = widget_alloc.Width;
+ }
+ minimum_width = natural_width = Width;
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ {
+ if (Widget != null) {
+ Requisition req = Widget.SizeRequest ();
+ widget_alloc.Height = req.Height;
+ }
+
+ if (horizontal) {
+ Height = widget_alloc.Height;
+ } else {
Height = Choreographer.PixelCompose (percent, widget_alloc.Height + StartPadding + EndPadding, Easing);
}
-
- requisition.Width = Width;
- requisition.Height = Height;
+ minimum_height = natural_height = Height;
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -176,15 +186,15 @@ protected override void OnSizeAllocated (Rectangle allocation)
}
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- if (canvas != null) {
- GdkWindow.DrawDrawable (Style.BackgroundGC (State), canvas, 0, 0, widget_alloc.X, widget_alloc.Y, widget_alloc.Width, widget_alloc.Height);
- return true;
- }
-
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// if (canvas != null) {
+// GdkWindow.DrawDrawable (Style.BackgroundGC (State), canvas, 0, 0, widget_alloc.X, widget_alloc.Y, widget_alloc.Width, widget_alloc.Height);
+// return true;
+// }
+//
+// return base.OnExposeEvent (evnt);
+// }
protected override void ForAll (bool include_internals, Callback callback)
{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
index 58f7b9ada62..97547a1f5aa 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/BounceFadePopupWindow.cs
@@ -26,6 +26,7 @@
// THE SOFTWARE.
using System;
+using Cairo;
using Gdk;
using MonoDevelop.Core;
@@ -52,7 +53,7 @@ public BounceFadePopupWindow (MonoTextEditor editor) : base (Gtk.WindowType.Popu
DoubleBuffered = true;
Decorated = false;
BorderWidth = 0;
- HasFrame = true;
+// HasFrame = true;
this.editor = editor;
Events = Gdk.EventMask.ExposureMask;
Duration = 500;
@@ -60,10 +61,10 @@ public BounceFadePopupWindow (MonoTextEditor editor) : base (Gtk.WindowType.Popu
ExpandHeight = 2;
BounceEasing = Easing.Sine;
- var rgbaColormap = Screen.RgbaColormap;
- if (rgbaColormap == null)
+// var rgbaColormap = Screen.RgbaColormap;
+// if (rgbaColormap == null)
return;
- Colormap = rgbaColormap;
+// Colormap = rgbaColormap;
stage.ActorStep += OnAnimationActorStep;
stage.Iteration += OnAnimationIteration;
@@ -87,7 +88,7 @@ public BounceFadePopupWindow (MonoTextEditor editor) : base (Gtk.WindowType.Popu
int x, y;
protected int width, height;
double vValue, hValue;
- protected Rectangle bounds;
+// protected Rectangle bounds;
public virtual void Popup ()
{
@@ -96,13 +97,13 @@ public virtual void Popup ()
return;
}
editor.GdkWindow.GetOrigin (out x, out y);
- bounds = CalculateInitialBounds ();
- x = x + bounds.X - (int)(ExpandWidth / 2);
- y = y + bounds.Y - (int)(ExpandHeight / 2);
+// bounds = CalculateInitialBounds ();
+// x = x + bounds.X - (int)(ExpandWidth / 2);
+// y = y + bounds.Y - (int)(ExpandHeight / 2);
Move (x, y);
- width = System.Math.Max (1, bounds.Width + (int)ExpandWidth);
- height = System.Math.Max (1, bounds.Height + (int)ExpandHeight);
+// width = System.Math.Max (1, bounds.Width + (int)ExpandWidth);
+// height = System.Math.Max (1, bounds.Height + (int)ExpandHeight);
Resize (width, height);
@@ -215,7 +216,7 @@ internal virtual void StopPlaying ()
}
}
- protected abstract Rectangle CalculateInitialBounds ();
+// protected abstract Rectangle CalculateInitialBounds ();
@@ -239,7 +240,7 @@ public BounceFadePopupWidget (MonoTextEditor editor)
throw new InvalidOperationException ("Only works with composited screen. Check Widget.IsComposited.");
if (editor == null)
throw new ArgumentNullException ("Editor");
- WidgetFlags |= Gtk.WidgetFlags.NoWindow;
+ this.HasWindow = false;
this.editor = editor;
Events = EventMask.ExposureMask;
Duration = 500;
@@ -247,10 +248,10 @@ public BounceFadePopupWidget (MonoTextEditor editor)
ExpandHeight = 2;
BounceEasing = Easing.Sine;
- var rgbaColormap = Screen.RgbaColormap;
- if (rgbaColormap == null)
+// var rgbaColormap = Screen.RgbaColormap;
+// if (rgbaColormap == null)
return;
- Colormap = rgbaColormap;
+// Colormap = rgbaColormap;
stage.ActorStep += OnAnimationActorStep;
stage.Iteration += OnAnimationIteration;
@@ -337,18 +338,16 @@ protected virtual bool OnAnimationActorStep (Actor actor)
return true;
}
- protected override bool OnExposeEvent (EventExpose evnt)
+ protected override bool OnDrawn (Context cr)
{
try {
var alloc = Allocation;
- using (var cr = CairoHelper.Create (evnt.Window)) {
- cr.Translate (alloc.X, alloc.Y);
- cr.Translate (xExpandedOffset * (1 - scale), yExpandedOffset * (1 - scale));
- var scaleX = (alloc.Width / userspaceArea.Width - 1) * scale + 1;
- var scaleY = (alloc.Height / userspaceArea.Height - 1) * scale + 1;
- cr.Scale (scaleX, scaleY);
- Draw (cr, userspaceArea);
- }
+ cr.Translate (alloc.X, alloc.Y);
+ cr.Translate (xExpandedOffset * (1 - scale), yExpandedOffset * (1 - scale));
+ var scaleX = (alloc.Width / userspaceArea.Width - 1) * scale + 1;
+ var scaleY = (alloc.Height / userspaceArea.Height - 1) * scale + 1;
+ cr.Scale (scaleX, scaleY);
+ Draw (cr, userspaceArea);
} catch (Exception e) {
LoggingService.LogError ("Exception in animation:", e);
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/SmartScrolledWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/SmartScrolledWindow.cs
index 13d6d059cb8..85a96a8ba62 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/SmartScrolledWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.Theatrics/SmartScrolledWindow.cs
@@ -4,6 +4,7 @@
using Gdk;
using System.Collections.Generic;
using MonoDevelop.Components;
+using Cairo;
namespace Mono.TextEditor.Theatrics
{
@@ -100,12 +101,12 @@ protected override void OnDestroyed ()
Child.Destroy ();
if (vAdjustment != null) {
vAdjustment.Changed -= HandleAdjustmentChanged;
- vAdjustment.Destroy ();
+// vAdjustment.Destroy ();
vAdjustment = null;
}
if (hAdjustment != null) {
hAdjustment.Changed -= HandleAdjustmentChanged;
- hAdjustment.Destroy ();
+// hAdjustment.Destroy ();
hAdjustment = null;
}
if (vScrollBar != null) {
@@ -161,8 +162,8 @@ public void AddChild (Gtk.Widget child, ChildPosition position)
protected override void OnAdded (Widget widget)
{
base.OnAdded (widget);
- if (widget == Child)
- widget.SetScrollAdjustments (hAdjustment, vAdjustment);
+// if (widget == Child)
+// widget.SetScrollAdjustments (hAdjustment, vAdjustment);
}
protected override void OnRemoved (Widget widget)
@@ -184,34 +185,34 @@ protected override void OnRemoved (Widget widget)
}
base.OnRemoved (widget);
}
- protected override void OnSizeAllocated (Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
-
- int margin = BorderVisible ? 1 : 0;
- int vwidth = vScrollBar.Visible ? vScrollBar.Requisition.Width : 0;
- int hheight = hScrollBar.Visible ? hScrollBar.Requisition.Height : 0;
- var childRectangle = new Rectangle (allocation.X + margin, allocation.Y + margin, allocation.Width - vwidth - margin*2, allocation.Height - hheight - margin*2);
-
- if (Child != null)
- Child.SizeAllocate (childRectangle);
- if (vScrollBar.Visible) {
- int vChildTopHeight = -1;
- foreach (var child in children.Where (child => child.ChildPosition == ChildPosition.Top)) {
- child.Child.SizeAllocate (new Rectangle (childRectangle.RightInside (), childRectangle.Y + vChildTopHeight, allocation.Width - vwidth, child.Child.Requisition.Height));
- vChildTopHeight += child.Child.Requisition.Height;
- }
- int v = vScrollBar is Scrollbar && hScrollBar.Visible ? hScrollBar.Requisition.Height : 0;
- vScrollBar.SizeAllocate (new Rectangle (childRectangle.X + childRectangle.Width + margin, childRectangle.Y + vChildTopHeight, vwidth, Allocation.Height - v - vChildTopHeight - margin));
- vAdjustment.Value = System.Math.Max (System.Math.Min (vAdjustment.Upper - vAdjustment.PageSize, vAdjustment.Value), vAdjustment.Lower);
- }
-
- if (hScrollBar.Visible) {
- int v = vScrollBar.Visible ? vScrollBar.Requisition.Width : 0;
- hScrollBar.SizeAllocate (new Rectangle (allocation.X, childRectangle.Y + childRectangle.Height + margin, allocation.Width - v, hheight));
- hScrollBar.Value = System.Math.Max (System.Math.Min (hAdjustment.Upper - hAdjustment.PageSize, hScrollBar.Value), hAdjustment.Lower);
- }
- }
+// protected override void OnSizeAllocated (Rectangle allocation)
+// {
+// base.OnSizeAllocated (allocation);
+//
+// int margin = BorderVisible ? 1 : 0;
+// int vwidth = vScrollBar.Visible ? vScrollBar.Requisition.Width : 0;
+// int hheight = hScrollBar.Visible ? hScrollBar.Requisition.Height : 0;
+// var childRectangle = new Rectangle (allocation.X + margin, allocation.Y + margin, allocation.Width - vwidth - margin*2, allocation.Height - hheight - margin*2);
+//
+// if (Child != null)
+// Child.SizeAllocate (childRectangle);
+// if (vScrollBar.Visible) {
+// int vChildTopHeight = -1;
+// foreach (var child in children.Where (child => child.ChildPosition == ChildPosition.Top)) {
+// child.Child.SizeAllocate (new Rectangle (childRectangle.RightInside (), childRectangle.Y + vChildTopHeight, allocation.Width - vwidth, child.Child.Requisition.Height));
+// vChildTopHeight += child.Child.Requisition.Height;
+// }
+// int v = vScrollBar is Scrollbar && hScrollBar.Visible ? hScrollBar.Requisition.Height : 0;
+// vScrollBar.SizeAllocate (new Rectangle (childRectangle.X + childRectangle.Width + margin, childRectangle.Y + vChildTopHeight, vwidth, Allocation.Height - v - vChildTopHeight - margin));
+// vAdjustment.Value = System.Math.Max (System.Math.Min (vAdjustment.Upper - vAdjustment.PageSize, vAdjustment.Value), vAdjustment.Lower);
+// }
+//
+// if (hScrollBar.Visible) {
+// int v = vScrollBar.Visible ? vScrollBar.Requisition.Width : 0;
+// hScrollBar.SizeAllocate (new Rectangle (allocation.X, childRectangle.Y + childRectangle.Height + margin, allocation.Width - v, hheight));
+// hScrollBar.Value = System.Math.Max (System.Math.Min (hAdjustment.Upper - hAdjustment.PageSize, hScrollBar.Value), hAdjustment.Lower);
+// }
+// }
static double Clamp (double min, double val, double max)
{
@@ -232,40 +233,45 @@ protected override bool OnScrollEvent (EventScroll evnt)
return (dx != 0.0 || dy != 0.0) || base.OnScrollEvent (evnt);
}
-
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
if (Child != null)
Child.SizeRequest ();
- vScrollBar.SizeRequest ();
hScrollBar.SizeRequest ();
+ children.ForEach (Child => Child.Child.SizeRequest ());
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_width)
+ {
+ base.OnGetPreferredHeight (out minimum_height, out natural_width);
+ if (Child != null)
+ Child.SizeRequest ();
+ vScrollBar.SizeRequest ();
children.ForEach (child => child.Child.SizeRequest ());
}
-
- protected override bool OnExposeEvent (EventExpose evnt)
+
+ protected override bool OnDrawn (Context cr)
{
if (BorderVisible) {
- using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
- cr.LineWidth = 1;
-
- var alloc = Allocation;
- int right = alloc.RightInside ();
- int bottom = alloc.BottomInside ();
-
- cr.SharpLineX (alloc.X, alloc.Y, alloc.X, bottom);
- cr.SharpLineX (right, alloc.Y, right, bottom);
-
- cr.SharpLineY (alloc.X, alloc.Y, right, alloc.Y);
- cr.SharpLineY (alloc.X, bottom, right, bottom);
-
- cr.SetSourceColor ((HslColor)Style.Dark (State));
- cr.Stroke ();
- }
+ cr.LineWidth = 1;
+
+ var alloc = Allocation;
+ int right = alloc.RightInside ();
+ int bottom = alloc.BottomInside ();
+
+ cr.SharpLineX (alloc.X, alloc.Y, alloc.X, bottom);
+ cr.SharpLineX (right, alloc.Y, right, bottom);
+
+ cr.SharpLineY (alloc.X, alloc.Y, right, alloc.Y);
+ cr.SharpLineY (alloc.X, bottom, right, bottom);
+
+ cr.SetSourceColor ((HslColor)Style.Dark (State));
+ cr.Stroke ();
}
- return base.OnExposeEvent (evnt);
+ return base.OnDrawn (cr);
}
-
- }
+}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
index 745eff5ecf0..34b54fde9ed 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs
@@ -138,13 +138,13 @@ protected override void OnDestroyed ()
informLayout = informLayout.Kill ();
fontDescription = fontDescription.Kill ();
fontInform = fontInform.Kill ();
- if (textGC != null) {
- textGC.Dispose ();
- textBgGC.Dispose ();
- foldGC.Dispose ();
- foldBgGC.Dispose ();
- textGC = textBgGC = foldGC = foldBgGC = null;
- }
+// if (textGC != null) {
+// textGC.Dispose ();
+// textBgGC.Dispose ();
+// foldGC.Dispose ();
+// foldBgGC.Dispose ();
+// textGC = textBgGC = foldGC = foldBgGC = null;
+// }
editor = null;
base.OnDestroyed ();
}
@@ -155,38 +155,38 @@ protected override bool OnKeyPressEvent (EventKey evnt)
return base.OnKeyPressEvent (evnt);
}
- Gdk.GC textGC, foldGC, textBgGC, foldBgGC;
+// Gdk.GC textGC, foldGC, textBgGC, foldBgGC;
- protected override bool OnExposeEvent (Gdk.EventExpose ev)
- {
- if (textGC == null) {
- var plainText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Foreground);
- textGC = plainText.CreateGC (ev.Window);
-
- plainText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Background);
- textBgGC = plainText.CreateGC (ev.Window);
-
- var collapsedText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.CollapsedText);
- foldGC = collapsedText.CreateGC (ev.Window);
-
- collapsedText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Background);
- foldBgGC = collapsedText.CreateGC (ev.Window);
- }
-
- ev.Window.DrawRectangle (textBgGC, true, ev.Area);
- ev.Window.DrawLayout (textGC, 5, 4, layout);
- ev.Window.DrawRectangle (textBgGC, false, 1, 1, this.Allocation.Width - 3, this.Allocation.Height - 3);
- ev.Window.DrawRectangle (foldGC, false, 0, 0, this.Allocation.Width - 1, this.Allocation.Height - 1);
-
- if (!HideCodeSegmentPreviewInformString) {
- informLayout.SetText (CodeSegmentPreviewInformString);
- int w, h;
- informLayout.GetPixelSize (out w, out h);
- PreviewInformStringHeight = h;
- ev.Window.DrawRectangle (foldBgGC, true, Allocation.Width - w - 3, Allocation.Height - h, w + 2, h - 1);
- ev.Window.DrawLayout (foldGC, Allocation.Width - w - 4, Allocation.Height - h - 3, informLayout);
- }
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose ev)
+// {
+// if (textGC == null) {
+// var plainText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Foreground);
+// textGC = plainText.CreateGC (ev.Window);
+//
+// plainText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Background);
+// textBgGC = plainText.CreateGC (ev.Window);
+//
+// var collapsedText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.CollapsedText);
+// foldGC = collapsedText.CreateGC (ev.Window);
+//
+// collapsedText = SyntaxHighlightingService.GetColor (editor.EditorTheme, EditorThemeColors.Background);
+// foldBgGC = collapsedText.CreateGC (ev.Window);
+// }
+//
+// ev.Window.DrawRectangle (textBgGC, true, ev.Area);
+// ev.Window.DrawLayout (textGC, 5, 4, layout);
+// ev.Window.DrawRectangle (textBgGC, false, 1, 1, this.Allocation.Width - 3, this.Allocation.Height - 3);
+// ev.Window.DrawRectangle (foldGC, false, 0, 0, this.Allocation.Width - 1, this.Allocation.Height - 1);
+//
+// if (!HideCodeSegmentPreviewInformString) {
+// informLayout.SetText (CodeSegmentPreviewInformString);
+// int w, h;
+// informLayout.GetPixelSize (out w, out h);
+// PreviewInformStringHeight = h;
+// ev.Window.DrawRectangle (foldBgGC, true, Allocation.Width - w - 3, Allocation.Height - h, w + 2, h - 1);
+// ev.Window.DrawLayout (foldGC, Allocation.Width - w - 4, Allocation.Height - h - 3, informLayout);
+// }
+// return true;
+// }
}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/MonoTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/MonoTextEditor.cs
index ac69266d8e4..37f1b50a2aa 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/MonoTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/MonoTextEditor.cs
@@ -85,7 +85,7 @@ internal MonoTextEditor (TextDocument doc, ITextEditorOptions options, EditMode
this.Direction = TextDirection.Ltr;
uiThread = Thread.CurrentThread;
GtkWorkarounds.FixContainerLeak (this);
- WidgetFlags |= WidgetFlags.NoWindow;
+ this.HasWindow = false;
LayoutCache = new LayoutCache (this);
this.textArea = new TextArea (doc, options, initialMode);
this.textArea.Initialize (this, doc, options, initialMode);
@@ -146,22 +146,22 @@ void UnregisterAdjustments ()
Adjustment hAdjustement;
Adjustment vAdjustement;
- protected override void OnSetScrollAdjustments (Adjustment hAdjustement, Adjustment vAdjustement)
- {
- UnregisterAdjustments ();
- this.vAdjustement = vAdjustement;
- this.hAdjustement = hAdjustement;
- base.OnSetScrollAdjustments (hAdjustement, vAdjustement);
- textArea.SetTextEditorScrollAdjustments (hAdjustement, vAdjustement);
- if (hAdjustement != null) {
- hAdjustement.ValueChanged += HandleAdjustmentValueChange;
- }
-
- if (vAdjustement != null) {
- vAdjustement.ValueChanged += HandleAdjustmentValueChange;
- }
- OnScrollAdjustmentsSet ();
- }
+// protected override void OnSetScrollAdjustments (Adjustment hAdjustement, Adjustment vAdjustement)
+// {
+// UnregisterAdjustments ();
+// this.vAdjustement = vAdjustement;
+// this.hAdjustement = hAdjustement;
+// base.OnSetScrollAdjustments (hAdjustement, vAdjustement);
+// textArea.SetTextEditorScrollAdjustments (hAdjustement, vAdjustement);
+// if (hAdjustement != null) {
+// hAdjustement.ValueChanged += HandleAdjustmentValueChange;
+// }
+//
+// if (vAdjustement != null) {
+// vAdjustement.ValueChanged += HandleAdjustmentValueChange;
+// }
+// OnScrollAdjustmentsSet ();
+// }
void HandleAdjustmentValueChange (object sender, EventArgs e)
{
@@ -179,9 +179,15 @@ protected override void OnSizeAllocated (Rectangle allocation)
SetChildrenPositions (allocation);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
+ containerChildren.ForEach (c => c.Child.SizeRequest ());
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out minimum_height, out natural_height);
containerChildren.ForEach (c => c.Child.SizeRequest ());
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs
index d24e715ffcb..e147449737a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextArea.cs
@@ -50,6 +50,7 @@
using MonoDevelop.Core.Text;
using MonoDevelop.Ide.Editor;
using MonoDevelop.Ide.Editor.Highlighting;
+using Cairo;
namespace Mono.TextEditor
{
@@ -220,7 +221,7 @@ protected virtual void HAdjustmentValueChanged ()
textViewMargin.HideCodeSegmentPreviewWindow ();
QueueDrawArea ((int)this.textViewMargin.XOffset, 0, this.Allocation.Width - (int)this.textViewMargin.XOffset, this.Allocation.Height);
OnHScroll (EventArgs.Empty);
- SetChildrenPositions (Allocation);
+// SetChildrenPositions (Allocation);
}
void VAdjustmentValueChanged (object sender, EventArgs args)
@@ -228,7 +229,7 @@ void VAdjustmentValueChanged (object sender, EventArgs args)
var alloc = this.Allocation;
alloc.X = alloc.Y = 0;
VAdjustmentValueChanged ();
- SetChildrenPositions (alloc);
+// SetChildrenPositions (alloc);
}
protected virtual void VAdjustmentValueChanged ()
@@ -326,7 +327,7 @@ int TooltipKeySnooper (Gtk.Widget widget, EventKey evnt)
nextTipX = tipX;
nextTipY = tipY;
nextTipOffset = tipOffset;
- nextTipScheduledTime = DateTime.FromBinary (0);
+ nextTipScheduledTime = System.DateTime.FromBinary (0);
tipItem = null;
TooltipTimer ();
}
@@ -438,9 +439,9 @@ internal void Initialize (MonoTextEditor editor, TextDocument doc, ITextEditorOp
args.RetVal = true;
};
- using (Pixmap inv = new Pixmap (null, 1, 1, 1)) {
- invisibleCursor = new Cursor (inv, inv, Gdk.Color.Zero, Gdk.Color.Zero, 0, 0);
- }
+// using (Pixmap inv = new Pixmap (null, 1, 1, 1)) {
+// invisibleCursor = new Cursor (inv, inv, Gdk.Color.Zero, Gdk.Color.Zero, 0, 0);
+// }
InitAnimations ();
this.Document.HeightChanged += HandleDocumentHeightChanged;
@@ -883,27 +884,27 @@ protected override void OnFocusGrabbed()
protected override void OnRealized ()
{
- WidgetFlags |= WidgetFlags.Realized;
+ this.IsRealized = true;
WindowAttr attributes = new WindowAttr () {
WindowType = Gdk.WindowType.Child,
X = Allocation.X,
Y = Allocation.Y,
Width = Allocation.Width,
Height = Allocation.Height,
- Wclass = WindowClass.InputOutput,
+// Wclass = WindowClass.InputOutput,
Visual = this.Visual,
- Colormap = this.Colormap,
+// Colormap = this.Colormap,
EventMask = (int)(this.Events | Gdk.EventMask.ExposureMask),
Mask = this.Events | Gdk.EventMask.ExposureMask,
};
- WindowAttributesType mask = WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Colormap | WindowAttributesType.Visual;
- GdkWindow = new Gdk.Window (ParentWindow, attributes, mask);
- GdkWindow.UserData = Raw;
- GdkWindow.Background = Style.Background (StateType.Normal);
- Style = Style.Attach (GdkWindow);
+// WindowAttributesType mask = WindowAttributesType.X | WindowAttributesType.Y | WindowAttributesType.Colormap | WindowAttributesType.Visual;
+// GdkWindow = new Gdk.Window (ParentWindow, attributes, mask);
+// GdkWindow.UserData = Raw;
+// GdkWindow.Background = Style.Background (StateType.Normal);
+// Style = Style.Attach (GdkWindow);
- imContext.ClientWindow = this.GdkWindow;
+// imContext.ClientWindow = this.GdkWindow;
Caret.PositionChanged += CaretPositionChanged;
SetWidgetBgFromStyle ();
@@ -1117,12 +1118,12 @@ internal void RedrawLine (int logicalLine, bool removeLineCache = true)
public new void QueueDrawArea (int x, int y, int w, int h)
{
- if (GdkWindow != null) {
- GdkWindow.InvalidateRect (new Rectangle (x, y, w, h), false);
+// if (GdkWindow != null) {
+// GdkWindow.InvalidateRect (new Rectangle (x, y, w, h), false);
#if DEBUG_EXPOSE
Console.WriteLine ("invalidated {0},{1} {2}x{3}", x, y, w, h);
#endif
- }
+// }
}
public new void QueueDraw ()
@@ -1326,19 +1327,19 @@ bool HandleMarginKeyCommand (EventKey evnt)
GtkWorkarounds.MapKeys (evnt, out key, out mod, out accels);
- if (key == Gdk.Key.space) {
- cm.HandleItemCommand (Margin.ItemCommand.ActivateCurrentItem);
- } else if (key == Gdk.Key.Up) {
- cm.HandleItemCommand (Margin.ItemCommand.FocusPreviousItem);
- } else if (key == Gdk.Key.Down) {
- cm.HandleItemCommand (Margin.ItemCommand.FocusNextItem);
- } else if (key == Gdk.Key.Tab || key == Gdk.Key.Right) {
- return FocusNextMargin (Gtk.DirectionType.TabForward);
- } else if (key == Gdk.Key.ISO_Left_Tab || key == Gdk.Key.Left) {
- return FocusNextMargin (DirectionType.TabBackward);
- } else {
+// if (key == Gdk.Key.space) {
+// cm.HandleItemCommand (Margin.ItemCommand.ActivateCurrentItem);
+// } else if (key == Gdk.Key.Up) {
+// cm.HandleItemCommand (Margin.ItemCommand.FocusPreviousItem);
+// } else if (key == Gdk.Key.Down) {
+// cm.HandleItemCommand (Margin.ItemCommand.FocusNextItem);
+// } else if (key == Gdk.Key.Tab || key == Gdk.Key.Right) {
+// return FocusNextMargin (Gtk.DirectionType.TabForward);
+// } else if (key == Gdk.Key.ISO_Left_Tab || key == Gdk.Key.Left) {
+// return FocusNextMargin (DirectionType.TabBackward);
+// } else {
return false;
- }
+// }
return true;
}
@@ -1520,18 +1521,18 @@ protected override void OnDragDataReceived (DragContext context, int x, int y, S
{
var undo = OpenUndoGroup ();
int dragOffset = Document.LocationToOffset (dragCaretPos);
- if (context.Action == DragAction.Move) {
- if (CanEdit (Caret.Line) && !selection.IsEmpty) {
- var selectionRange = selection.GetSelectionRange (textEditorData);
- if (selectionRange.Offset < dragOffset)
- dragOffset -= selectionRange.Length;
- Caret.PreserveSelection = true;
- textEditorData.DeleteSelection (selection);
- Caret.PreserveSelection = false;
-
- selection = MonoDevelop.Ide.Editor.Selection.Empty;
- }
- }
+// if (context.Action == DragAction.Move) {
+// if (CanEdit (Caret.Line) && !selection.IsEmpty) {
+// var selectionRange = selection.GetSelectionRange (textEditorData);
+// if (selectionRange.Offset < dragOffset)
+// dragOffset -= selectionRange.Length;
+// Caret.PreserveSelection = true;
+// textEditorData.DeleteSelection (selection);
+// Caret.PreserveSelection = false;
+//
+// selection = MonoDevelop.Ide.Editor.Selection.Empty;
+// }
+// }
if (selection_data.Length > 0 && selection_data.Format == 8) {
Caret.Offset = dragOffset;
if (CanEdit (dragCaretPos.Line)) {
@@ -2046,7 +2047,7 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
sizeHasBeenAllocated = true;
if (Options.WrapLines)
textViewMargin.PurgeLayoutCache ();
- SetChildrenPositions (allocation);
+// SetChildrenPositions (allocation);
UpdateMarginRects (allocation);
}
@@ -2284,27 +2285,27 @@ void UpdateAdjustments ()
#if DEBUG_EXPOSE
DateTime started = DateTime.Now;
#endif
- protected override bool OnExposeEvent (Gdk.EventExpose e)
+ protected override bool OnDrawn (Context cr)
{
if (this.isDisposed)
return false;
- try {
- ExposeEventInternal (e);
- } catch (Exception ex) {
- GLib.ExceptionManager.RaiseUnhandledException (ex, false);
- }
+// try {
+// ExposeEventInternal (e);
+// } catch (Exception ex) {
+// GLib.ExceptionManager.RaiseUnhandledException (ex, false);
+// }
keyPressTimings.EndTimer (true);
- return base.OnExposeEvent (e);
+ return base.OnDrawn (cr);
}
void ExposeEventInternal (Gdk.EventExpose e)
{
UpdateAdjustments ();
- var area = e.Region.Clipbox;
- var cairoArea = new Cairo.Rectangle (area.X, area.Y, area.Width, area.Height);
+// var area = e.Region.Clipbox;
+// var cairoArea = new Cairo.Rectangle (area.X, area.Y, area.Width, area.Height);
using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window))
using (Cairo.Context textViewCr = Gdk.CairoHelper.Create (e.Window)) {
UpdateMarginXOffsets ();
@@ -2312,7 +2313,7 @@ void ExposeEventInternal (Gdk.EventExpose e)
cr.LineWidth = Options.Zoom;
textViewCr.LineWidth = Options.Zoom;
- RenderMargins (cr, textViewCr, cairoArea);
+// RenderMargins (cr, textViewCr, cairoArea);
#if DEBUG_EXPOSE
Console.WriteLine ("{0} expose {1},{2} {3}x{4}", (long)(DateTime.Now - started).TotalMilliseconds,
@@ -2327,11 +2328,11 @@ void ExposeEventInternal (Gdk.EventExpose e)
animation.Drawer.Draw (cr);
}
- OnPainted (new PaintEventArgs (cr, cairoArea));
+// OnPainted (new PaintEventArgs (cr, cairoArea));
}
- if (Caret.IsVisible)
- textViewMargin.DrawCaret (e.Window, Allocation);
+// if (Caret.IsVisible)
+// textViewMargin.DrawCaret (e.Window, Allocation);
}
protected virtual void OnPainted (PaintEventArgs e)
@@ -3134,7 +3135,7 @@ public int ReplaceAll (string withPattern)
int nextTipOffset = 0;
int nextTipX=0; int nextTipY=0;
Gdk.ModifierType nextTipModifierState = ModifierType.None;
- DateTime nextTipScheduledTime; // Time at which we want the tooltip to show
+ System.DateTime nextTipScheduledTime; // Time at which we want the tooltip to show
void ShowTooltip (Gdk.ModifierType modifierState, DocumentLocation location)
{
@@ -3195,7 +3196,7 @@ void ShowTooltip (Gdk.ModifierType modifierState, int offset, int xloc, int yloc
nextTipY = yloc;
nextTipOffset = offset;
nextTipModifierState = modifierState;
- nextTipScheduledTime = DateTime.Now + TimeSpan.FromMilliseconds (TooltipTimeout);
+ nextTipScheduledTime = System.DateTime.Now + TimeSpan.FromMilliseconds (TooltipTimeout);
// If a tooltip is already scheduled, there is no need to create a new timer.
if (tipShowTimeoutId == 0)
tipShowTimeoutId = GLib.Timeout.Add (timeOut, () => { TooltipTimer (); return false; });
@@ -3209,7 +3210,7 @@ async void TooltipTimer ()
if (nextTipOffset == -1)
return;
- int remainingMs = (int) (nextTipScheduledTime - DateTime.Now).TotalMilliseconds;
+ int remainingMs = (int) (nextTipScheduledTime - System.DateTime.Now).TotalMilliseconds;
if (remainingMs > 50) {
// Still some significant time left. Re-schedule the timer
tipShowTimeoutId = GLib.Timeout.Add ((uint) remainingMs, () => { TooltipTimer (); return false; });
@@ -3478,18 +3479,18 @@ void RemoveAnimation (Animation animation)
{
if (animation == null)
return;
- Rectangle bounds = animation.Drawer.AnimationBounds;
+// Rectangle bounds = animation.Drawer.AnimationBounds;
actors.Remove (animation);
if (animation is IDisposable)
((IDisposable)animation).Dispose ();
- QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
+// QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
}
void OnAnimationIteration (object sender, EventArgs args)
{
foreach (Animation actor in actors) {
- Rectangle bounds = actor.Drawer.AnimationBounds;
- QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
+// Rectangle bounds = actor.Drawer.AnimationBounds;
+// QueueDrawArea (bounds.X, bounds.Y, bounds.Width, bounds.Height);
}
}
#endregion
@@ -3622,7 +3623,7 @@ public void AddTopLevelWidget (Gtk.Widget widget, int x, int y)
var newContainerChildren = new List (containerChildren);
newContainerChildren.Add (info);
containerChildren = newContainerChildren;
- ResizeChild (Allocation, info);
+// ResizeChild (Allocation, info);
SetAdjustments ();
}
@@ -3634,8 +3635,8 @@ public void MoveTopLevelWidget (Gtk.Widget widget, int x, int y)
break;
info.X = x;
info.Y = y;
- if (widget.Visible)
- ResizeChild (Allocation, info);
+// if (widget.Visible)
+// ResizeChild (Allocation, info);
break;
}
}
@@ -3694,7 +3695,7 @@ protected override void ForAll (bool include_internals, Gtk.Callback callback)
protected override void OnMapped ()
{
- WidgetFlags |= WidgetFlags.Mapped;
+ this.IsMapped = true;
// Note: SourceEditorWidget.ShowAutoSaveWarning() might have set TextEditor.Visible to false,
// in which case we want to not map it (would cause a gtk+ critical error).
containerChildren.ForEach (child => { if (child.Child.Visible) child.Child.Map (); });
@@ -3703,7 +3704,7 @@ protected override void OnMapped ()
protected override void OnUnmapped ()
{
- WidgetFlags &= ~WidgetFlags.Mapped;
+ this.IsMapped = false;
// We hide the window first so that the user doesn't see widgets disappearing one by one.
GdkWindow.Hide ();
@@ -3711,26 +3712,26 @@ protected override void OnUnmapped ()
containerChildren.ForEach (child => child.Child.Unmap ());
}
- void ResizeChild (Rectangle allocation, MonoTextEditor.EditorContainerChild child)
- {
- Requisition req = child.Child.SizeRequest ();
- var childRectangle = new Gdk.Rectangle (child.X, child.Y, req.Width, req.Height);
- if (!child.FixedPosition) {
+// void ResizeChild (Rectangle allocation, MonoTextEditor.EditorContainerChild child)
+// {
+// Requisition req = child.Child.SizeRequest ();
+// var childRectangle = new Gdk.Rectangle (child.X, child.Y, req.Width, req.Height);
+// if (!child.FixedPosition) {
// double zoom = Options.Zoom;
- childRectangle.X = (int)(child.X /* * zoom */- HAdjustment.Value);
- childRectangle.Y = (int)(child.Y /* * zoom */- VAdjustment.Value);
- }
- // childRectangle.X += allocation.X;
- // childRectangle.Y += allocation.Y;
- child.Child.SizeAllocate (childRectangle);
- }
+// childRectangle.X = (int)(child.X /* * zoom */- HAdjustment.Value);
+// childRectangle.Y = (int)(child.Y /* * zoom */- VAdjustment.Value);
+// }
+// // childRectangle.X += allocation.X;
+// // childRectangle.Y += allocation.Y;
+// child.Child.SizeAllocate (childRectangle);
+// }
- void SetChildrenPositions (Rectangle allocation)
- {
- foreach (var child in containerChildren.ToArray ()) {
- ResizeChild (allocation, child);
- }
- }
+// void SetChildrenPositions (Rectangle allocation)
+// {
+// foreach (var child in containerChildren.ToArray ()) {
+// ResizeChild (allocation, child);
+// }
+// }
#endregion
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
index 5cc890f3d09..6f97e2d16fe 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
@@ -840,81 +840,81 @@ char GetCaretChar ()
return caretChar;
}
- public void DrawCaret (Gdk.Drawable win, Gdk.Rectangle rect)
- {
- if (!this.textEditor.IsInDrag && !(this.caretX >= 0 && (!this.textEditor.IsSomethingSelected || this.textEditor.SelectionRange.Length == 0)))
- return;
- if (win == null || Settings.Default.CursorBlink && !Caret.IsVisible || !caretBlink)
- return;
- using (Cairo.Context cr = Gdk.CairoHelper.Create (win)) {
- cr.Rectangle (XOffset, 0, textEditor.Allocation.Width - XOffset, textEditor.Allocation.Height);
- cr.Clip ();
- cr.LineWidth = System.Math.Max (1, System.Math.Floor (textEditor.Options.Zoom));
- cr.Antialias = Cairo.Antialias.None;
- var curRect = new Gdk.Rectangle ((int)caretX, (int)caretY, (int)this.charWidth, (int)LineHeight - 1);
- if (curRect != caretRectangle) {
- caretRectangle = curRect;
+// public void DrawCaret (Gdk.Drawable win, Gdk.Rectangle rect)
+// {
+// if (!this.textEditor.IsInDrag && !(this.caretX >= 0 && (!this.textEditor.IsSomethingSelected || this.textEditor.SelectionRange.Length == 0)))
+// return;
+// if (win == null || Settings.Default.CursorBlink && !Caret.IsVisible || !caretBlink)
+// return;
+// using (Cairo.Context cr = Gdk.CairoHelper.Create (win)) {
+// cr.Rectangle (XOffset, 0, textEditor.Allocation.Width - XOffset, textEditor.Allocation.Height);
+// cr.Clip ();
+// cr.LineWidth = System.Math.Max (1, System.Math.Floor (textEditor.Options.Zoom));
+// cr.Antialias = Cairo.Antialias.None;
+// var curRect = new Gdk.Rectangle ((int)caretX, (int)caretY, (int)this.charWidth, (int)LineHeight - 1);
+// if (curRect != caretRectangle) {
+// caretRectangle = curRect;
// textEditor.TextArea.QueueDrawArea (caretRectangle.X - (int)textEditor.Options.Zoom,
// (int)(caretRectangle.Y + (-textEditor.VAdjustment.Value + caretVAdjustmentValue)),
// caretRectangle.Width + (int)textEditor.Options.Zoom,
// caretRectangle.Height + 1);
- caretVAdjustmentValue = textEditor.VAdjustment.Value;
- }
-
- var fgColor = SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.Foreground);
+// caretVAdjustmentValue = textEditor.VAdjustment.Value;
+// }
+//
+// var fgColor = SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.Foreground);
// var bgColor = textEditor.ColorStyle.Default.CairoBackgroundColor;
- var line = Document.GetLine (Caret.Line);
- if (line != null) {
- foreach (var marker in Document.GetMarkers (line)) {
- var style = marker as StyleTextLineMarker;
- if (style == null)
- continue;
- // if (style.IncludedStyles.HasFlag (StyleTextLineMarker.StyleFlag.BackgroundColor))
- // bgColor = style.BackgroundColor;
- if (style.IncludedStyles.HasFlag (StyleTextLineMarker.StyleFlag.Color))
- fgColor = style.Color;
- }
- }
- /*
- var foreground = ((HslColor)fgColor).ToPixel ();
- var background = ((HslColor)color).ToPixel ();
- var caretColor = (foreground ^ background) & 0xFFFFFF;
- color = HslColor.FromPixel (caretColor);*/
- var color = fgColor;
-
- switch (Caret.Mode) {
- case CaretMode.Insert:
- cr.DrawLine (color,
- caretRectangle.X + 0.5,
- caretRectangle.Y + 0.5,
- caretRectangle.X + 0.5,
- caretRectangle.Y + caretRectangle.Height);
- break;
- case CaretMode.Block:
- cr.SetSourceColor (color);
- cr.Rectangle (caretRectangle.X + 0.5, caretRectangle.Y + 0.5, caretRectangle.Width, caretRectangle.Height);
- cr.Fill ();
- char caretChar = GetCaretChar ();
- if (!char.IsWhiteSpace (caretChar) && caretChar != '\0') {
- using (var layout = textEditor.LayoutCache.RequestLayout ()) {
- layout.FontDescription = textEditor.Options.Font;
- layout.SetText (caretChar.ToString ());
- cr.MoveTo (caretRectangle.X, caretRectangle.Y);
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.Background));
- cr.ShowLayout (layout);
- }
- }
- break;
- case CaretMode.Underscore:
- cr.DrawLine (color,
- caretRectangle.X + 0.5,
- caretRectangle.Y + caretRectangle.Height + 0.5,
- caretRectangle.X + caretRectangle.Width,
- caretRectangle.Y + caretRectangle.Height + 0.5);
- break;
- }
- }
- }
+// var line = Document.GetLine (Caret.Line);
+// if (line != null) {
+// foreach (var marker in Document.GetMarkers (line)) {
+// var style = marker as StyleTextLineMarker;
+// if (style == null)
+// continue;
+// // if (style.IncludedStyles.HasFlag (StyleTextLineMarker.StyleFlag.BackgroundColor))
+// // bgColor = style.BackgroundColor;
+// if (style.IncludedStyles.HasFlag (StyleTextLineMarker.StyleFlag.Color))
+// fgColor = style.Color;
+// }
+// }
+// /*
+// var foreground = ((HslColor)fgColor).ToPixel ();
+// var background = ((HslColor)color).ToPixel ();
+// var caretColor = (foreground ^ background) & 0xFFFFFF;
+// color = HslColor.FromPixel (caretColor);*/
+// var color = fgColor;
+//
+// switch (Caret.Mode) {
+// case CaretMode.Insert:
+// cr.DrawLine (color,
+// caretRectangle.X + 0.5,
+// caretRectangle.Y + 0.5,
+// caretRectangle.X + 0.5,
+// caretRectangle.Y + caretRectangle.Height);
+// break;
+// case CaretMode.Block:
+// cr.SetSourceColor (color);
+// cr.Rectangle (caretRectangle.X + 0.5, caretRectangle.Y + 0.5, caretRectangle.Width, caretRectangle.Height);
+// cr.Fill ();
+// char caretChar = GetCaretChar ();
+// if (!char.IsWhiteSpace (caretChar) && caretChar != '\0') {
+// using (var layout = textEditor.LayoutCache.RequestLayout ()) {
+// layout.FontDescription = textEditor.Options.Font;
+// layout.SetText (caretChar.ToString ());
+// cr.MoveTo (caretRectangle.X, caretRectangle.Y);
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.Background));
+// cr.ShowLayout (layout);
+// }
+// }
+// break;
+// case CaretMode.Underscore:
+// cr.DrawLine (color,
+// caretRectangle.X + 0.5,
+// caretRectangle.Y + caretRectangle.Height + 0.5,
+// caretRectangle.X + caretRectangle.Width,
+// caretRectangle.Y + caretRectangle.Height + 0.5);
+// break;
+// }
+// }
+// }
void GetSelectionOffsets (DocumentLine line, out int selectionStart, out int selectionEnd)
{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
index 5ab781ecb9d..9fbc542fc4d 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
@@ -62,7 +62,7 @@ public HighlightingPanel ()
MonoDevelop.Ide.Gui.Styles.Changed += HandleThemeChanged;
}
- static void ImageDataFunc (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter)
+ static void ImageDataFunc (TreeViewColumn tree_column, CellRenderer cell, ITreeModel tree_model, TreeIter iter)
{
var isError = (bool)tree_model.GetValue (iter, 2);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
index 75b74ea8f28..f16748d7e71 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
@@ -83,7 +83,7 @@ public Minimpap (QuickTaskStrip parent) : base (parent)
doc.Folded += HandleFolded;
}
- Pixmap backgroundPixbuf, backgroundBuffer;
+// Pixmap backgroundPixbuf, backgroundBuffer;
uint redrawTimeout;
TextDocument doc;
@@ -113,8 +113,8 @@ public void RequestRedraw ()
curUpdate.RemoveHandler ();
curUpdate = null;
}
- if (backgroundPixbuf != null)
- curUpdate = new BgBufferUpdate (this);
+// if (backgroundPixbuf != null)
+// curUpdate = new BgBufferUpdate (this);
redrawTimeout = 0;
return false;
});
@@ -151,22 +151,22 @@ protected override void MovePosition (double y)
vadjustment.Value = position;
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = 150;
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
+ minimum_width = natural_width = 150;
}
void DestroyBgBuffer ()
{
if (curUpdate != null)
curUpdate.RemoveHandler ();
- if (backgroundPixbuf != null) {
- backgroundPixbuf.Dispose ();
- backgroundBuffer.Dispose ();
- backgroundPixbuf = backgroundBuffer = null;
- curWidth = curHeight = -1;
- }
+// if (backgroundPixbuf != null) {
+// backgroundPixbuf.Dispose ();
+// backgroundBuffer.Dispose ();
+// backgroundPixbuf = backgroundBuffer = null;
+// curWidth = curHeight = -1;
+// }
}
protected override void OnDestroyed ()
@@ -187,8 +187,8 @@ protected override void OnSizeAllocated (Rectangle allocation)
protected override void OnMapped ()
{
- if (backgroundPixbuf == null && Allocation.Width > 1)
- CreateBgBuffer ();
+// if (backgroundPixbuf == null && Allocation.Width > 1)
+// CreateBgBuffer ();
base.OnMapped ();
}
@@ -201,9 +201,9 @@ protected override void OnUnmapped ()
BgBufferUpdate curUpdate = null;
void SwapBuffer ()
{
- var tmp = backgroundPixbuf;
- backgroundPixbuf = backgroundBuffer;
- backgroundBuffer = tmp;
+// var tmp = backgroundPixbuf;
+// backgroundPixbuf = backgroundBuffer;
+// backgroundBuffer = tmp;
}
int curWidth = -1, curHeight = -1;
@@ -215,15 +215,15 @@ void CreateBgBuffer ()
if (GdkWindow == null || curWidth < 1 || curHeight < 1)
return;
var displayScale = Platform.IsWindows ? GtkWorkarounds.GetScaleFactor (this) : 1.0;
- backgroundPixbuf = new Pixmap (GdkWindow, (int)(curWidth * displayScale), (int)(curHeight * displayScale));
- backgroundBuffer = new Pixmap (GdkWindow, (int)(curWidth * displayScale), (int)(curHeight * displayScale));
+// backgroundPixbuf = new Pixmap (GdkWindow, (int)(curWidth * displayScale), (int)(curHeight * displayScale));
+// backgroundBuffer = new Pixmap (GdkWindow, (int)(curWidth * displayScale), (int)(curHeight * displayScale));
if (TextEditor.EditorTheme != null) {
- using (var cr = Gdk.CairoHelper.Create (backgroundPixbuf)) {
- cr.Rectangle (0, 0, curWidth * displayScale, curHeight * displayScale);
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.Background));
- cr.Fill ();
- }
+// using (var cr = Gdk.CairoHelper.Create (backgroundPixbuf)) {
+// cr.Rectangle (0, 0, curWidth * displayScale, curHeight * displayScale);
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.Background));
+// cr.Fill ();
+// }
}
curUpdate = new BgBufferUpdate (this);
}
@@ -245,20 +245,20 @@ public BgBufferUpdate (Minimpap mode)
{
this.mode = mode;
- cr = Gdk.CairoHelper.Create (mode.backgroundBuffer);
+// cr = Gdk.CairoHelper.Create (mode.backgroundBuffer);
- cr.LineWidth = 1;
- int w = mode.backgroundBuffer.ClipRegion.Clipbox.Width;
- int h = mode.backgroundBuffer.ClipRegion.Clipbox.Height;
- cr.Rectangle (0, 0, w, h);
- if (mode.TextEditor.EditorTheme != null)
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (mode.TextEditor.EditorTheme, EditorThemeColors.Background));
- cr.Fill ();
+// cr.LineWidth = 1;
+// int w = mode.backgroundBuffer.ClipRegion.Clipbox.Width;
+// int h = mode.backgroundBuffer.ClipRegion.Clipbox.Height;
+// cr.Rectangle (0, 0, w, h);
+// if (mode.TextEditor.EditorTheme != null)
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (mode.TextEditor.EditorTheme, EditorThemeColors.Background));
+// cr.Fill ();
maxLine = mode.TextEditor.GetTextEditorData ().VisibleLineCount;
- sx = w / (double)mode.TextEditor.Allocation.Width;
- sy = Math.Min (1, lineHeight * maxLine / (double)mode.TextEditor.GetTextEditorData ().TotalHeight);
- cr.Scale (sx, sy);
+// sx = w / (double)mode.TextEditor.Allocation.Width;
+// sy = Math.Min (1, lineHeight * maxLine / (double)mode.TextEditor.GetTextEditorData ().TotalHeight);
+// cr.Scale (sx, sy);
handler = GLib.Idle.Add (BgBufferUpdater);
}
@@ -315,54 +315,54 @@ bool BgBufferUpdater ()
int GetBufferYOffset ()
{
var displayScale = Platform.IsWindows ? GtkWorkarounds.GetScaleFactor (this) : 1.0;
- int h = (int)(backgroundPixbuf.ClipRegion.Clipbox.Height / displayScale) - Allocation.Height;
- if (h < 0)
+// int h = (int)(backgroundPixbuf.ClipRegion.Clipbox.Height / displayScale) - Allocation.Height;
+// if (h < 0)
return 0;
- return Math.Max (0, (int)(h * (vadjustment.Value) / (vadjustment.Upper - vadjustment.Lower - vadjustment.PageSize)));
+// return Math.Max (0, (int)(h * (vadjustment.Value) / (vadjustment.Upper - vadjustment.Lower - vadjustment.PageSize)));
}
- protected override bool OnExposeEvent (Gdk.EventExpose e)
- {
- if (TextEditor == null)
- return true;
- using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window)) {
- cr.LineWidth = 1;
- if (backgroundPixbuf != null) {
- e.Window.DrawDrawable (Style.BlackGC, backgroundPixbuf, 0, GetBufferYOffset (), 0, 0, Allocation.Width, Allocation.Height);
- } else {
- cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- if (TextEditor.EditorTheme != null)
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.Background));
- cr.Fill ();
- }
- /*
- cr.Color = (HslColor)Style.Dark (State);
- cr.MoveTo (-0.5, 0.5);
- cr.LineTo (Allocation.Width, 0.5);
- cr.MoveTo (-0.5, Allocation.Height - 0.5);
- cr.LineTo (Allocation.Width, Allocation.Height - 0.5);
- cr.Stroke ();*/
-
- if (backgroundPixbuf != null) {
- int y = GetBufferYOffset ();
-
- int startLine = TextEditor.YToLine (vadjustment.Value);
- double dy = TextEditor.LogicalToVisualLocation (startLine, 1).Line * lineHeight;
-
- cr.Rectangle (0,
- dy - y,
- Allocation.Width,
- lineHeight * vadjustment.PageSize / TextEditor.LineHeight);
- var c = (Cairo.Color)(HslColor)Style.Dark (State);
- c.A = 0.2;
- cr.SetSourceColor (c);
- cr.Fill ();
- }
- DrawLeftBorder (cr);
- }
-
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose e)
+// {
+// if (TextEditor == null)
+// return true;
+// using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window)) {
+// cr.LineWidth = 1;
+// if (backgroundPixbuf != null) {
+// e.Window.DrawDrawable (Style.BlackGC, backgroundPixbuf, 0, GetBufferYOffset (), 0, 0, Allocation.Width, Allocation.Height);
+// } else {
+// cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+// if (TextEditor.EditorTheme != null)
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.Background));
+// cr.Fill ();
+// }
+// /*
+// cr.Color = (HslColor)Style.Dark (State);
+// cr.MoveTo (-0.5, 0.5);
+// cr.LineTo (Allocation.Width, 0.5);
+// cr.MoveTo (-0.5, Allocation.Height - 0.5);
+// cr.LineTo (Allocation.Width, Allocation.Height - 0.5);
+// cr.Stroke ();*/
+//
+// if (backgroundPixbuf != null) {
+// int y = GetBufferYOffset ();
+//
+// int startLine = TextEditor.YToLine (vadjustment.Value);
+// double dy = TextEditor.LogicalToVisualLocation (startLine, 1).Line * lineHeight;
+//
+// cr.Rectangle (0,
+// dy - y,
+// Allocation.Width,
+// lineHeight * vadjustment.PageSize / TextEditor.LineHeight);
+// var c = (Cairo.Color)(HslColor)Style.Dark (State);
+// c.A = 0.2;
+// cr.SetSourceColor (c);
+// cr.Fill ();
+// }
+// DrawLeftBorder (cr);
+// }
+//
+// return true;
+// }
}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
index aba38914eb6..a85d43dde80 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
@@ -432,7 +432,7 @@ QuickTask GetHoverTask (double y)
void UpdateState (StateType state)
{
if (State != state) {
- State = state;
+// State = state;
QueueDraw ();
}
}
@@ -678,10 +678,10 @@ void DrawIndicator (Cairo.Context cr, Xwt.Drawing.Image img)
cr.DrawImage (this, img, Math.Round ((Allocation.Width - img.Width) / 2), -1);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = MonoDevelop.Core.Platform.IsWindows ? win81ScrollbarWidth : 15;
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
+ minimum_width = natural_width = MonoDevelop.Core.Platform.IsWindows ? win81ScrollbarWidth : 15;
}
double LineToY (int logicalLine)
@@ -911,56 +911,52 @@ void DrawSearchResults (Cairo.Context cr, IndicatorDrawingState state, int i)
}
IndicatorDrawingState currentDrawingState = IndicatorDrawingState.Create ();
SurfaceWrapper backgroundSurface, indicatorSurface, swapIndicatorSurface;
- protected override bool OnExposeEvent (Gdk.EventExpose e)
+ protected override bool OnDrawn (Cairo.Context cr)
{
if (TextEditor == null)
return true;
- using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window)) {
-
- cr.Save ();
- var allocation = Allocation;
- var displayScale = Core.Platform.IsMac ? GtkWorkarounds.GetScaleFactor (this) : 1.0;
- cr.Scale (1 / displayScale, 1 / displayScale);
- if (indicatorSurface != null) {
- cr.SetSourceSurface (indicatorSurface.Surface, 0, 0);
- cr.Paint ();
- } else {
- CachedDraw (cr,
- ref backgroundSurface,
- allocation,
- draw: (c, o) => DrawBackground (c, allocation), forceScale: displayScale);
- }
- if (TextEditor == null)
- return true;
+ cr.Save ();
+ var allocation = Allocation;
+ var displayScale = Core.Platform.IsMac ? GtkWorkarounds.GetScaleFactor (this) : 1.0;
+ cr.Scale (1 / displayScale, 1 / displayScale);
+ if (indicatorSurface != null) {
+ cr.SetSourceSurface (indicatorSurface.Surface, 0, 0);
+ cr.Paint ();
+ } else {
+ CachedDraw (cr,
+ ref backgroundSurface,
+ allocation,
+ draw: (c, o) => DrawBackground (c, allocation), forceScale: displayScale);
+ }
+ if (TextEditor == null)
+ return true;
- DrawCaret (cr);
+ DrawCaret (cr);
- if (QuickTaskStrip.MergeScrollBarAndQuickTasks)
- DrawBar (cr);
+ if (QuickTaskStrip.MergeScrollBarAndQuickTasks)
+ DrawBar (cr);
- cr.Restore ();
+ cr.Restore ();
- if (HasFocus) {
- switch (currentFocus) {
- case FocusWidget.Indicator:
- cr.LineWidth = 1.0;
+ if (HasFocus) {
+ switch (currentFocus) {
+ case FocusWidget.Indicator:
+ cr.LineWidth = 1.0;
- cr.SetSourceColor (Styles.FocusColor.ToCairoColor ());
- cr.Rectangle (1, 1, Allocation.Width - 2, Allocation.Width - 2);
- cr.SetDash (new double [] { 1, 1 }, 0.5);
- cr.Stroke ();
- break;
+ cr.SetSourceColor (Styles.FocusColor.ToCairoColor ());
+ cr.Rectangle (1, 1, Allocation.Width - 2, Allocation.Width - 2);
+ cr.SetDash (new double [] { 1, 1 }, 0.5);
+ cr.Stroke ();
+ break;
- case FocusWidget.Tasks:
- break;
+ case FocusWidget.Tasks:
+ break;
- case FocusWidget.Usages:
- break;
- }
+ case FocusWidget.Usages:
+ break;
}
}
-
return false;
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index d5126cc618b..9fbb5067958 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -55,10 +55,15 @@
Mono.Debugging
False
-
+
+
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}
+ Xwt.Gtk3
+ False
@@ -75,13 +80,12 @@
-
-
-
-
-
+
+
+
+
+
-
..\..\..\build\bin\System.Reflection.Metadata.dll
False
@@ -100,6 +104,12 @@
..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
False
+
+ gtk-sharp-3.0
+
+
+ gio-sharp-3.0
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
index 3a992d85675..df0dd7c7b17 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
@@ -78,8 +78,7 @@ static void UpdateTreeStyle (Cairo.Color newBgColor)
public DebugValueWindow (TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch) : base (Gtk.WindowType.Toplevel)
{
this.TypeHint = WindowTypeHint.PopupMenu;
- this.AllowShrink = false;
- this.AllowGrow = false;
+ this.Resizable = false;
this.Decorated = false;
TransientFor = (Gtk.Window) (editor.GetNativeWidget ()).Toplevel;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
index 565c1954fd9..22f261fe250 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
@@ -92,9 +92,9 @@ public GotoLineNumberWidget (MonoTextEditor textEditor, Widget frame)
Gtk.Widget oldWidget = null;
this.FocusChildSet += delegate (object sender, Gtk.FocusChildSetArgs args) {
// only store state when the focus comes from a non child widget
- if (args.Widget != null && oldWidget == null)
- StoreWidgetState ();
- oldWidget = args.Widget;
+// if (args.Widget != null && oldWidget == null)
+// StoreWidgetState ();
+// oldWidget = args.Widget;
};
this.entryLineNumber.Changed += delegate {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
index 74da4193b8c..ae698937395 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
@@ -39,10 +39,10 @@ public HoverCloseButton ()
Events |= EventMask.LeaveNotifyMask | EventMask.EnterNotifyMask | EventMask.ButtonPressMask | EventMask.ButtonReleaseMask;
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = requisition.Height = 16;
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
+ minimum_width = natural_width = 16;
}
protected override bool OnEnterNotifyEvent (Gdk.EventCrossing evnt)
@@ -84,13 +84,13 @@ protected virtual void OnClicked (EventArgs e)
handler (this, e);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var cr = CairoHelper.Create (evnt.Window)) {
- DrawCloseButton (cr, new Gdk.Point (Allocation.X + Allocation.Width / 2, Allocation.Y + Allocation.Height / 2), hovered, 1.0, 0);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var cr = CairoHelper.Create (evnt.Window)) {
+// DrawCloseButton (cr, new Gdk.Point (Allocation.X + Allocation.Width / 2, Allocation.Y + Allocation.Height / 2), hovered, 1.0, 0);
+// }
+// return base.OnExposeEvent (evnt);
+// }
static void DrawCloseButton (Cairo.Context context, Gdk.Point center, bool hovered, double opacity, double animationProgress)
{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
index 38959fc4319..ebd4ebfefe2 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
@@ -110,30 +110,49 @@ public MessageBubblePopoverWindow (MessageBubbleCache cache, MessageBubbleTextMa
readonly int maxTextWidth = (int)(260 * Pango.Scale.PangoScale);
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
- double y = verticalTextBorder * 2 - verticalTextSpace + (MonoDevelop.Core.Platform.IsWindows ? 10 : 2);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
using (var drawingLayout = new Pango.Layout (this.PangoContext)) {
drawingLayout.FontDescription = cache.tooltipFontDescription;
foreach (var msg in marker.Errors) {
- if (marker.Layouts.Count == 1)
+ if (marker.Layouts.Count == 1)
drawingLayout.Width = maxTextWidth;
drawingLayout.SetText (msg.FullErrorMessage);
int w;
int h;
drawingLayout.GetPixelSize (out w, out h);
- if (marker.Layouts.Count > 1)
+ if (marker.Layouts.Count > 1)
w += (int)warningPixbuf.Width + iconTextSpacing;
- requisition.Width = Math.Max (w + textBorder * 2, requisition.Width);
+ minimum_width = natural_width = Math.Max (w + textBorder * 2, minimum_width);
+ }
+ }
+ }
+
+ protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
+ {
+ base.OnGetPreferredHeight (out minimum_height, out natural_height);
+ double y = verticalTextBorder * 2 - verticalTextSpace + (MonoDevelop.Core.Platform.IsWindows ? 10 : 2);
+
+ using (var drawingLayout = new Pango.Layout (this.PangoContext)) {
+ drawingLayout.FontDescription = cache.tooltipFontDescription;
+
+ foreach (var msg in marker.Errors) {
+ if (marker.Layouts.Count == 1)
+ drawingLayout.Width = maxTextWidth;
+ drawingLayout.SetText (msg.FullErrorMessage);
+ int w;
+ int h;
+ drawingLayout.GetPixelSize (out w, out h);
+
y += h + verticalTextSpace - 3;
}
}
- requisition.Height = (int)y;
+ minimum_height = natural_height = (int)y;
}
protected override bool OnEnterNotifyEvent (Gdk.EventCrossing evnt)
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
index 4b75da1e03a..81c20a8f3f0 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
@@ -75,14 +75,13 @@ protected override void OnDestroyed ()
}
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
- if (SizeFunc != null) {
- requisition.Width = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
+ if (sizeFunc != null) {
+ minimum_width = natural_width = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
}
-
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -101,24 +100,24 @@ void AdjustPositionInEditor (Gdk.Rectangle alloc)
textEditor.MoveTopLevelWidget (this, (textEditor.Allocation.Width - alloc.Width) / 2, textEditor.Allocation.Height - alloc.Height - 8);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var cr = CairoHelper.Create (evnt.Window)) {
- cr.LineWidth = 1;
- cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationTextBackground));
- cr.Fill ();
- cr.RoundedRectangle (0, 0, Allocation.Width, Allocation.Height, 3);
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationTextBackground));
- cr.FillPreserve ();
-
- cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationBorder));
- cr.Stroke();
- }
-
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var cr = CairoHelper.Create (evnt.Window)) {
+// cr.LineWidth = 1;
+// cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+//
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationTextBackground));
+// cr.Fill ();
+// cr.RoundedRectangle (0, 0, Allocation.Width, Allocation.Height, 3);
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationTextBackground));
+// cr.FillPreserve ();
+//
+// cr.SetSourceColor (SyntaxHighlightingService.GetColor (textEditor.EditorTheme, EditorThemeColors.NotificationBorder));
+// cr.Stroke();
+// }
+//
+// return base.OnExposeEvent (evnt);
+// }
}
}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
index 5ed17703426..5e984860a41 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
@@ -195,11 +195,11 @@ static bool HasAnyFocusedChild (Widget widget)
class Border : Gtk.DrawingArea
{
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- evnt.Window.DrawRectangle (this.Style.DarkGC (State), true, evnt.Area);
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// evnt.Window.DrawRectangle (this.Style.DarkGC (State), true, evnt.Area);
+// return true;
+// }
}
@@ -273,27 +273,27 @@ void SetSuppressScrollbar (bool value)
return;
suppressScrollbar = value;
- if (suppressScrollbar) {
- scrolledWindow.VScrollbar.SizeRequested += SuppressSize;
- scrolledWindow.VScrollbar.ExposeEvent += SuppressExpose;
- } else {
- scrolledWindow.VScrollbar.SizeRequested -= SuppressSize;
- scrolledWindow.VScrollbar.ExposeEvent -= SuppressExpose;
- }
- }
-
- [GLib.ConnectBefore]
- static void SuppressExpose (object o, ExposeEventArgs args)
- {
- args.RetVal = true;
+// if (suppressScrollbar) {
+// scrolledWindow.VScrollbar.SizeRequested += SuppressSize;
+// scrolledWindow.VScrollbar.ExposeEvent += SuppressExpose;
+// } else {
+// scrolledWindow.VScrollbar.SizeRequested -= SuppressSize;
+// scrolledWindow.VScrollbar.ExposeEvent -= SuppressExpose;
+// }
}
- [GLib.ConnectBefore]
- static void SuppressSize (object o, SizeRequestedArgs args)
- {
- args.Requisition = Requisition.Zero;
- args.RetVal = true;
- }
+// [GLib.ConnectBefore]
+// static void SuppressExpose (object o, ExposeEventArgs args)
+// {
+// args.RetVal = true;
+// }
+
+// [GLib.ConnectBefore]
+// static void SuppressSize (object o, SizeRequestedArgs args)
+// {
+// args.Requisition = Requisition.Zero;
+// args.RetVal = true;
+// }
public void AddQuickTaskProvider (IQuickTaskProvider p)
{
@@ -335,8 +335,8 @@ protected override void OnDestroyed ()
SetSuppressScrollbar (false);
QuickTaskStrip.EnableFancyFeatures.Changed -= FancyFeaturesChanged;
scrolledWindow.ButtonPressEvent -= PrepareEvent;
- scrolledWindow.Vadjustment.Destroy ();
- scrolledWindow.Hadjustment.Destroy ();
+// scrolledWindow.Vadjustment.Destroy ();
+// scrolledWindow.Hadjustment.Destroy ();
scrolledWindow.Destroy ();
scrolledWindow = null;
strip.Destroy ();
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
index c0b11563390..a84737f1423 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
@@ -12,12 +12,11 @@
-
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
index 64a41202be0..c5d0ea60809 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs
@@ -22,7 +22,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Credentials");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -101,7 +101,7 @@ protected virtual void Build ()
w8.Expand = false;
w8.Fill = false;
// Internal child MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.ActionArea
- global::Gtk.HButtonBox w9 = this.ActionArea;
+ global::Gtk.HButtonBox w9 = (Gtk.HButtonBox)this.ActionArea;
w9.Name = "dialog1_ActionArea";
w9.Spacing = 10;
w9.BorderWidth = ((uint)(5));
diff --git a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
index 86913f1a6cc..1de2abdfdb7 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
@@ -8,7 +8,7 @@ public partial class WCFConfigWidget
private global::Gtk.Table wcfOptions;
- private global::Gtk.ComboBox dictionaryCollection;
+ private global::Gtk.ComboBoxText dictionaryCollection;
private global::Gtk.Label label1;
@@ -18,11 +18,11 @@ public partial class WCFConfigWidget
private global::Gtk.Label label4;
- private global::Gtk.ComboBox listAccess;
+ private global::Gtk.ComboBoxText listAccess;
- private global::Gtk.ComboBox listAsync;
+ private global::Gtk.ComboBoxText listAsync;
- private global::Gtk.ComboBox listCollection;
+ private global::Gtk.ComboBoxText listCollection;
protected virtual void Build ()
{
@@ -40,7 +40,7 @@ protected virtual void Build ()
this.wcfOptions.RowSpacing = ((uint)(6));
this.wcfOptions.ColumnSpacing = ((uint)(6));
// Container child wcfOptions.Gtk.Table+TableChild
- this.dictionaryCollection = global::Gtk.ComboBox.NewText ();
+ this.dictionaryCollection = new global::Gtk.ComboBoxText ();
this.dictionaryCollection.Name = "dictionaryCollection";
this.wcfOptions.Add (this.dictionaryCollection);
global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.dictionaryCollection]));
@@ -93,7 +93,7 @@ protected virtual void Build ()
w5.XOptions = ((global::Gtk.AttachOptions)(4));
w5.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child wcfOptions.Gtk.Table+TableChild
- this.listAccess = global::Gtk.ComboBox.NewText ();
+ this.listAccess = new global::Gtk.ComboBoxText ();
this.listAccess.AppendText (global::Mono.Unix.Catalog.GetString ("Public"));
this.listAccess.AppendText (global::Mono.Unix.Catalog.GetString ("Internal"));
this.listAccess.Name = "listAccess";
@@ -107,7 +107,7 @@ protected virtual void Build ()
w6.XOptions = ((global::Gtk.AttachOptions)(7));
w6.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child wcfOptions.Gtk.Table+TableChild
- this.listAsync = global::Gtk.ComboBox.NewText ();
+ this.listAsync = new global::Gtk.ComboBoxText ();
this.listAsync.AppendText (global::Mono.Unix.Catalog.GetString ("No"));
this.listAsync.AppendText (global::Mono.Unix.Catalog.GetString ("Async"));
this.listAsync.Name = "listAsync";
@@ -121,7 +121,7 @@ protected virtual void Build ()
w7.XOptions = ((global::Gtk.AttachOptions)(4));
w7.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child wcfOptions.Gtk.Table+TableChild
- this.listCollection = global::Gtk.ComboBox.NewText ();
+ this.listCollection = new global::Gtk.ComboBoxText ();
this.listCollection.Name = "listCollection";
this.wcfOptions.Add (this.listCollection);
global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.listCollection]));
diff --git a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
index a1d6fde953c..bb094aaaf85 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
@@ -34,7 +34,7 @@ internal partial class WebReferenceDialog
private global::Gtk.HBox hbox1;
- private global::Gtk.ComboBox comboModel;
+ private global::Gtk.ComboBoxText comboModel;
private global::Gtk.Label label1;
@@ -77,7 +77,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Add Web Reference");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.VBox
- global::Gtk.VBox w2 = this.VBox;
+ global::Gtk.VBox w2 = (Gtk.VBox)this.ContentArea;
w2.Events = ((global::Gdk.EventMask)(256));
w2.Name = "dlgWindow";
w2.BorderWidth = ((uint)(2));
@@ -162,7 +162,7 @@ protected virtual void Build ()
this.hbox1.Name = "hbox1";
this.hbox1.Spacing = 6;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboModel = global::Gtk.ComboBox.NewText ();
+ this.comboModel = new global::Gtk.ComboBoxText ();
this.comboModel.AppendText (global::Mono.Unix.Catalog.GetString ("Windows Communication Foundation (WCF)"));
this.comboModel.AppendText (global::Mono.Unix.Catalog.GetString (".NET 2.0 Web Services"));
this.comboModel.Name = "comboModel";
@@ -244,7 +244,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(w2 [this.vbxContainer]));
w17.Position = 0;
// Internal child MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.ActionArea
- global::Gtk.HButtonBox w18 = this.ActionArea;
+ global::Gtk.HButtonBox w18 = (Gtk.HButtonBox)this.ActionArea;
w18.Events = ((global::Gdk.EventMask)(256));
w18.Name = "pnlActionArea";
w18.Spacing = 6;
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
index cfbea294124..a4e1e0bc478 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
@@ -148,7 +148,7 @@ internal static string GetTypeName (Type type)
return pos < 0 ? name : name.Substring (0, pos);
}
- void PopulateBox (ComboBox box, string category, List types)
+ void PopulateBox (ComboBoxText box, string category, List types)
{
var mapping = Options.CollectionMappings.FirstOrDefault (m => m.Category == category);
@@ -167,7 +167,7 @@ void PopulateBox (ComboBox box, string category, List types)
box.Active = types.IndexOf (current);
}
- void UpdateBox (ComboBox box, string category, IList types)
+ void UpdateBox (ComboBoxText box, string category, IList types)
{
var mapping = Options.CollectionMappings.FirstOrDefault (m => m.Category == category);
if (mapping == null) {
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
index 846dfd37db4..0882b96bb80 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
@@ -15,11 +15,12 @@
-
-
-
-
-
+
+
+
+
+
+
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
index 01b4f0315e5..1952c50cd92 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
+++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
@@ -29,10 +29,10 @@
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj
index 33113800771..102b4fc2e87 100644
--- a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj
+++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj
@@ -11,9 +11,9 @@
-
-
-
+
+
+
..\..\..\..\external\Xamarin.Mac.dll
False
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
index e7cc5eb2efc..52387faeb02 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
@@ -30,11 +30,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
index d71c87fa2d1..1f7c00694f7 100644
--- a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
@@ -81,7 +81,7 @@ protected virtual void OnCmdRemoveClicked (object sender, System.EventArgs e)
bool removed = false;
Console.WriteLine ("OnCmdRemoveClicked");
- treeview1.Selection.SelectedForeach (delegate (Gtk.TreeModel model, Gtk.TreePath path, Gtk.TreeIter iter)
+ treeview1.Selection.SelectedForeach (delegate (Gtk.ITreeModel model, Gtk.TreePath path, Gtk.TreeIter iter)
{
string import;
GLib.Value value = new GLib.Value ();
diff --git a/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs
index 3c2ad28d94a..27eef6de2c3 100644
--- a/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs
@@ -9,7 +9,7 @@ public partial class ConfigurationOptionsPanelWidget
private global::Gtk.HBox hbox1;
private global::Gtk.Label label76;
private global::Gtk.Table table1;
- private global::Gtk.ComboBox cmbDebugType;
+ private global::Gtk.ComboBoxText cmbDebugType;
private global::Gtk.ComboBox cmbDefineDEBUG;
private global::Gtk.ComboBox cmbDefineTRACE;
private global::Gtk.ComboBox cmbOptimize;
@@ -80,7 +80,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.cmbDebugType = new global::Gtk.ComboBox ();
+ this.cmbDebugType = new global::Gtk.ComboBoxText ();
this.cmbDebugType.Name = "cmbDebugType";
this.table1.Add (this.cmbDebugType);
global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbDebugType]));
diff --git a/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs
index 5e13948c128..82fa5a6224c 100644
--- a/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs
@@ -6,13 +6,13 @@ public partial class ProjectOptionsPanelWidget
{
private global::Gtk.VBox vbox5;
private global::Gtk.Table table1;
- private global::Gtk.ComboBoxEntry cmbCodePage;
- private global::Gtk.ComboBox cmbOptionCompare;
- private global::Gtk.ComboBox cmbOptionExplicit;
- private global::Gtk.ComboBox cmbOptionInfer;
- private global::Gtk.ComboBox cmbOptionStrict;
+ private global::Gtk.ComboBoxText cmbCodePage;
+ private global::Gtk.ComboBoxText cmbOptionCompare;
+ private global::Gtk.ComboBoxText cmbOptionExplicit;
+ private global::Gtk.ComboBoxText cmbOptionInfer;
+ private global::Gtk.ComboBoxText cmbOptionStrict;
private global::Gtk.ComboBox compileTargetCombo;
- private global::Gtk.ComboBoxEntry entryMainClass;
+ private global::Gtk.ComboBoxText entryMainClass;
private global::MonoDevelop.Components.FileEntry iconEntry;
private global::Gtk.Label label1;
private global::Gtk.Label label3;
@@ -23,7 +23,7 @@ public partial class ProjectOptionsPanelWidget
private global::Gtk.Label label8;
private global::Gtk.Label label86;
private global::Gtk.Label label88;
- private global::Gtk.ComboBoxEntry txtMyType;
+ private global::Gtk.ComboBoxText txtMyType;
protected virtual void Build ()
{
@@ -41,7 +41,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.cmbCodePage = global::Gtk.ComboBoxEntry.NewText ();
+ this.cmbCodePage = new global::Gtk.ComboBoxText ();
this.cmbCodePage.Name = "cmbCodePage";
this.table1.Add (this.cmbCodePage);
global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbCodePage]));
@@ -52,7 +52,7 @@ protected virtual void Build ()
w1.XOptions = ((global::Gtk.AttachOptions)(4));
w1.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.cmbOptionCompare = new global::Gtk.ComboBox ();
+ this.cmbOptionCompare = new global::Gtk.ComboBoxText ();
this.cmbOptionCompare.Name = "cmbOptionCompare";
this.table1.Add (this.cmbOptionCompare);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbOptionCompare]));
@@ -63,7 +63,7 @@ protected virtual void Build ()
w2.XOptions = ((global::Gtk.AttachOptions)(4));
w2.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.cmbOptionExplicit = new global::Gtk.ComboBox ();
+ this.cmbOptionExplicit = new global::Gtk.ComboBoxText ();
this.cmbOptionExplicit.Name = "cmbOptionExplicit";
this.table1.Add (this.cmbOptionExplicit);
global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbOptionExplicit]));
@@ -74,7 +74,7 @@ protected virtual void Build ()
w3.XOptions = ((global::Gtk.AttachOptions)(4));
w3.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.cmbOptionInfer = new global::Gtk.ComboBox ();
+ this.cmbOptionInfer = new global::Gtk.ComboBoxText ();
this.cmbOptionInfer.Name = "cmbOptionInfer";
this.table1.Add (this.cmbOptionInfer);
global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbOptionInfer]));
@@ -85,7 +85,7 @@ protected virtual void Build ()
w4.XOptions = ((global::Gtk.AttachOptions)(4));
w4.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.cmbOptionStrict = new global::Gtk.ComboBox ();
+ this.cmbOptionStrict = new global::Gtk.ComboBoxText ();
this.cmbOptionStrict.Name = "cmbOptionStrict";
this.table1.Add (this.cmbOptionStrict);
global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.cmbOptionStrict]));
@@ -105,7 +105,7 @@ protected virtual void Build ()
w6.XOptions = ((global::Gtk.AttachOptions)(4));
w6.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.entryMainClass = new global::Gtk.ComboBoxEntry ();
+ this.entryMainClass = new global::Gtk.ComboBoxText ();
this.entryMainClass.Name = "entryMainClass";
this.table1.Add (this.entryMainClass);
global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryMainClass]));
@@ -225,7 +225,7 @@ protected virtual void Build ()
w17.XOptions = ((global::Gtk.AttachOptions)(4));
w17.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.txtMyType = new global::Gtk.ComboBoxEntry ();
+ this.txtMyType = new global::Gtk.ComboBoxText ();
this.txtMyType.Name = "txtMyType";
this.table1.Add (this.txtMyType);
global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 [this.txtMyType]));
diff --git a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
index bb130ea23c6..109d79b40f2 100644
--- a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
@@ -68,7 +68,7 @@ public ProjectOptionsPanelWidget (MonoDevelop.Projects.Project project)
store.AppendValues ("Windows");
store.AppendValues ("Console");
txtMyType.Model = store;
- txtMyType.TextColumn = 0;
+// txtMyType.TextColumn = 0;
switch (this.project.MyType) {
case "WindowsForms":
txtMyType.Active = 0;
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj
index a0043f6a8c7..da3b5aefbff 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.csproj
+++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj
@@ -38,11 +38,11 @@
-
-
-
-
-
+
+
+
+
+
..\..\..\build\bin\Microsoft.CodeAnalysis.VisualBasic.dll
diff --git a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
index a103f6c7078..4bdffa46034 100644
--- a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+++ b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
@@ -31,12 +31,11 @@
-
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
index 0b7149aa3bf..cd360d2199c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
index 114e115ec57..9d5713348ce 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
@@ -17,10 +17,10 @@
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj
index 0721707ba8b..25ef448920a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj
@@ -50,11 +50,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index 0df03a9b53b..f922fa4f380 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -143,7 +143,7 @@ public void Clear ()
Update ();
}
- int CompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
+ int CompareNodes (Gtk.ITreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
{
int col, val=0;
SortType type;
@@ -409,7 +409,7 @@ void FillDifs (DiffData ddata)
while (filestore.IterNext (ref it));
}
- void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
if (disposed)
return;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
index 4801dc0450b..93c1f8f74e0 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
@@ -510,7 +510,7 @@ protected override void OnDestroyed ()
base.OnDestroyed ();
}
- static void DateFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void DateFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CellRendererText renderer = (CellRendererText)cell;
var rev = (Revision)model.GetValue (iter, 0);
@@ -529,7 +529,7 @@ static void DateFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk
renderer.Text = string.Format ("{0} {1:HH:mm}", day, rev.Time);
}
- static void GraphFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void GraphFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
var renderer = (RevisionGraphCellRenderer)cell;
Gtk.TreeIter node;
@@ -540,7 +540,7 @@ static void GraphFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gt
renderer.LastNode = node.Equals (iter);
}
- static string GetCurrentFilter (Gtk.TreeModel model)
+ static string GetCurrentFilter (Gtk.ITreeModel model)
{
TreeIter filterIter;
string filter = string.Empty;
@@ -550,7 +550,7 @@ static string GetCurrentFilter (Gtk.TreeModel model)
return filter;
}
- static void MessageFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void MessageFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
string filter = GetCurrentFilter (model);
@@ -570,7 +570,7 @@ static void MessageFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell,
}
}
- static void AuthorFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void AuthorFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
string filter = GetCurrentFilter (model);
@@ -588,7 +588,7 @@ static void AuthorFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, G
renderer.Markup = EscapeWithFilterMarker (author, filter);
}
- static void AuthorIconFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void AuthorIconFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CellRendererImage renderer = (CellRendererImage)cell;
var rev = (Revision)model.GetValue (iter, 0);
@@ -606,7 +606,7 @@ static void AuthorIconFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cel
}
}
- static void RevisionFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void RevisionFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
string filter = GetCurrentFilter (model);
@@ -618,7 +618,7 @@ static void RevisionFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell,
renderer.Markup = EscapeWithFilterMarker (rev, filter);
}
- static void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CellRendererDiff rc = (CellRendererDiff)cell;
string[] lines = (string[])model.GetValue (iter, colDiff);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index 628bc2e0d43..ad887f101a1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -356,7 +356,7 @@ protected override void OnWorkbenchWindowChanged ()
toolbar.ShowAll ();
}
- int CompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
+ int CompareNodes (Gtk.ITreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
{
int col, val=0;
SortType type;
@@ -1119,7 +1119,7 @@ void FillDifs ()
while (filestore.IterNext (ref it));
}
- void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
if (disposed)
return;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
index c6a7a8e22c1..e32d9c101e5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
@@ -61,11 +61,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
index 36e50fd67ab..694dad8f214 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
index 6889969c84f..64bf78e8b70 100644
--- a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
@@ -1158,7 +1158,7 @@ static void BuildTreeChildren (TreeStore store, TreeIter parent, XContainer p)
}
}
- void outlineTreeDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ void outlineTreeDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
var txtRenderer = (CellRendererText) cell;
var n = (XNode) model.GetValue (iter, 0);
diff --git a/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs b/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
index c68f0f423a5..a7f82b7acea 100644
--- a/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
+++ b/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
@@ -62,13 +62,13 @@ public XmlSchemasPanelWidget ()
registeredSchemasView.SearchColumn = -1; // disable the interactive search
registeredSchemasView.AppendColumn (GettextCatalog.GetString ("Namespace"), textRenderer,
- (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) => {
+ (TreeViewColumn col, CellRenderer cell, ITreeModel model, TreeIter iter) => {
((CellRendererText)cell).Text = GetSchema (iter).NamespaceUri;
}
);
registeredSchemasView.AppendColumn (GettextCatalog.GetString ("Type"), textRenderer,
- (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) => {
+ (TreeViewColumn col, CellRenderer cell, ITreeModel model, TreeIter iter) => {
((CellRendererText)cell).Text = GetSchema (iter).ReadOnly?
GettextCatalog.GetString ("Built in")
: GettextCatalog.GetString ("User schema");
@@ -192,13 +192,13 @@ static XmlSchemaCompletionData GetSchema (ListStore registeredSchemasStore, Tree
return (XmlSchemaCompletionData) registeredSchemasStore.GetValue (iter, 0);
}
- IEnumerable
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/LinuxSystemInformation.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/LinuxSystemInformation.cs
index f99a90ee927..baf5bcd52f3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/LinuxSystemInformation.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/LinuxSystemInformation.cs
@@ -25,6 +25,8 @@
// THE SOFTWARE.
using System;
+using System.Collections.Generic;
+using System.IO;
using System.Text;
namespace MonoDevelop.Core
@@ -33,9 +35,37 @@ class LinuxSystemInformation : UnixSystemInformation
{
internal override void AppendOperatingSystem (StringBuilder sb)
{
- sb.AppendLine ("\tLinux");
+ string OSName = "", OSVersion = "";
+ try {
+ foreach (var line in File.ReadAllLines ("/etc/os-release")) {
+ var parsedline = Parse (line);
+ if (parsedline.Key.Equals ("NAME")) {
+ OSName = parsedline.Value;
+ }
+ if (parsedline.Key.Equals ("VERSION")) {
+ OSVersion = parsedline.Value;
+ }
+ }
+ } catch {
+ OSName = "Linux";
+ OSVersion = "Unknown";
+ }
+ if (string.IsNullOrWhiteSpace (OSName) || string.IsNullOrWhiteSpace (OSVersion)) {
+ OSName = "Linux";
+ OSVersion = "Unknown";
+ }
+ sb.AppendLine ("\t" + OSName + " " + OSVersion);
base.AppendOperatingSystem (sb);
}
+
+ KeyValuePair Parse (string inputstring)
+ {
+ string [] parsed = inputstring.Split ('=');
+ if (parsed.Length != 2) {
+ return new KeyValuePair ();
+ }
+ return new KeyValuePair (parsed [0], parsed [1].Trim ('"'));
+ }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs
index 4b96942a6d0..d96647117d3 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.cs
@@ -9,11 +9,11 @@ partial class EditTemplateDialog
private global::Gtk.HBox hbox1;
private global::Gtk.Entry entryDescription;
private global::Gtk.Label label2;
- private global::Gtk.ComboBoxEntry comboboxentryMime;
+ private global::Gtk.ComboBoxText comboboxentryMime;
private global::Gtk.HBox hbox2;
private global::Gtk.Entry entryShortcut1;
private global::Gtk.Label label5;
- private global::Gtk.ComboBoxEntry comboboxentryGroups;
+ private global::Gtk.ComboBoxText comboboxentryGroups;
private global::Gtk.HBox hbox5;
private global::Gtk.CheckButton checkbuttonExpansion;
private global::Gtk.CheckButton checkbuttonSurroundWith;
@@ -43,7 +43,7 @@ protected virtual void Build ()
this.SkipPagerHint = true;
this.SkipTaskbarHint = true;
// Internal child MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -87,7 +87,7 @@ protected virtual void Build ()
w3.Expand = false;
w3.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboboxentryMime = global::Gtk.ComboBoxEntry.NewText ();
+ this.comboboxentryMime = new Gtk.ComboBoxText ();
this.comboboxentryMime.Name = "comboboxentryMime";
this.hbox1.Add (this.comboboxentryMime);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboboxentryMime]));
@@ -127,7 +127,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
- this.comboboxentryGroups = global::Gtk.ComboBoxEntry.NewText ();
+ this.comboboxentryGroups = new Gtk.ComboBoxText ();
this.comboboxentryGroups.Name = "comboboxentryGroups";
this.hbox2.Add (this.comboboxentryGroups);
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboboxentryGroups]));
@@ -259,7 +259,7 @@ protected virtual void Build ()
this.vbox4.Name = "vbox4";
this.vbox4.Spacing = 6;
// Container child vbox4.Gtk.Box+BoxChild
- this.comboboxVariables = global::Gtk.ComboBox.NewText ();
+ this.comboboxVariables = new global::Gtk.ComboBoxText ();
this.comboboxVariables.Name = "comboboxVariables";
this.vbox4.Add (this.comboboxVariables);
global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.comboboxVariables]));
@@ -284,7 +284,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1]));
w27.Position = 0;
// Internal child MonoDevelop.Ide.CodeTemplates.EditTemplateDialog.ActionArea
- global::Gtk.HButtonBox w28 = this.ActionArea;
+ global::Gtk.HButtonBox w28 = (Gtk.HButtonBox)this.ActionArea;
w28.Name = "dialog1_ActionArea";
w28.Spacing = 6;
w28.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeDialog.cs
index 56209bd3dec..69f27fe1f05 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeDialog.cs
@@ -17,7 +17,7 @@ internal partial class CustomExecutionModeDialog
private global::Gtk.Label label4;
private global::Gtk.Entry entryModeName;
private global::Gtk.Label label3;
- private global::Gtk.ComboBox comboStore;
+ private global::Gtk.ComboBoxText comboStore;
private global::Gtk.CheckButton checkPrompt;
private global::Gtk.Button buttonCancel;
private global::Gtk.Button buttonOk;
@@ -31,7 +31,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Modal = true;
// Internal child MonoDevelop.Ide.Execution.CustomExecutionModeDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -145,7 +145,7 @@ protected virtual void Build ()
w12.Expand = false;
w12.Fill = false;
// Container child boxName.Gtk.Box+BoxChild
- this.comboStore = global::Gtk.ComboBox.NewText ();
+ this.comboStore = new global::Gtk.ComboBoxText ();
this.comboStore.AppendText (global::Mono.Unix.Catalog.GetString ("Only this project"));
this.comboStore.AppendText (global::Mono.Unix.Catalog.GetString ("Only this solution"));
this.comboStore.AppendText (global::Mono.Unix.Catalog.GetString ("All solutions"));
@@ -183,7 +183,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(w1 [this.boxEditor]));
w17.Position = 0;
// Internal child MonoDevelop.Ide.Execution.CustomExecutionModeDialog.ActionArea
- global::Gtk.HButtonBox w18 = this.ActionArea;
+ global::Gtk.HButtonBox w18 = (Gtk.HButtonBox)this.ActionArea;
w18.Name = "dialog1_ActionArea";
w18.Spacing = 10;
w18.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.cs
index 13cba24c39b..56fd68bc2cb 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.cs
@@ -21,7 +21,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Custom Execution Modes");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -97,7 +97,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w9.Position = 0;
// Internal child MonoDevelop.Ide.Execution.CustomExecutionModeManagerDialog.ActionArea
- global::Gtk.HButtonBox w10 = this.ActionArea;
+ global::Gtk.HButtonBox w10 = (Gtk.HButtonBox)this.ActionArea;
w10.Name = "dialog1_ActionArea";
w10.Spacing = 10;
w10.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.cs
index d52f1d7500d..3d660a0cfa3 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.cs
@@ -16,7 +16,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Modal = true;
// Internal child MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -42,7 +42,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.GtkScrolledWindow]));
w5.Position = 0;
// Internal child MonoDevelop.Ide.Execution.MonoExecutionParametersPreview.ActionArea
- global::Gtk.HButtonBox w6 = this.ActionArea;
+ global::Gtk.HButtonBox w6 = (Gtk.HButtonBox)this.ActionArea;
w6.Name = "dialog1_ActionArea";
w6.Spacing = 10;
w6.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
index 870e372b05c..e76b7dd100e 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
@@ -17,7 +17,7 @@ public partial class FindInFilesDialog
private global::Gtk.Table tableFindAndReplace;
- private global::Gtk.ComboBoxEntry comboboxentryFind;
+ private global::Gtk.ComboBoxText comboboxentryFind;
private global::Gtk.HBox hbox2;
@@ -53,7 +53,7 @@ protected virtual void Build ()
this.SkipPagerHint = true;
this.SkipTaskbarHint = true;
// Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -75,7 +75,7 @@ protected virtual void Build ()
this.toggleFindInFiles.DrawIndicator = false;
this.toggleFindInFiles.UseUnderline = true;
this.toggleFindInFiles.Relief = ((global::Gtk.ReliefStyle)(2));
- this.toggleFindInFiles.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.toggleFindInFiles.Group = new global::Gtk.RadioButton [0];
this.hbox3.Add (this.toggleFindInFiles);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.toggleFindInFiles]));
w2.Position = 0;
@@ -116,7 +116,7 @@ protected virtual void Build ()
this.tableFindAndReplace.RowSpacing = ((uint)(6));
this.tableFindAndReplace.ColumnSpacing = ((uint)(6));
// Container child tableFindAndReplace.Gtk.Table+TableChild
- this.comboboxentryFind = global::Gtk.ComboBoxEntry.NewText ();
+ this.comboboxentryFind = new global::Gtk.ComboBoxText ();
this.comboboxentryFind.Name = "comboboxentryFind";
this.tableFindAndReplace.Add (this.comboboxentryFind);
global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace [this.comboboxentryFind]));
@@ -128,7 +128,7 @@ protected virtual void Build ()
this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 6;
// Container child hbox2.Gtk.Box+BoxChild
- this.comboboxScope = global::Gtk.ComboBox.NewText ();
+ this.comboboxScope = new global::Gtk.ComboBoxText ();
this.comboboxScope.Name = "comboboxScope";
this.hbox2.Add (this.comboboxScope);
global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboboxScope]));
@@ -223,7 +223,7 @@ protected virtual void Build ()
w17.Expand = false;
w17.Fill = false;
// Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.ActionArea
- global::Gtk.HButtonBox w18 = this.ActionArea;
+ global::Gtk.HButtonBox w18 = (Gtk.HButtonBox)this.ActionArea;
w18.Name = "dialog1_ActionArea";
w18.Spacing = 6;
w18.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox.cs
index 3451a049dfe..60585ee6f5c 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox.cs
@@ -3,7 +3,7 @@ namespace MonoDevelop.Ide.Gui.Components
{
public partial class ExecutionModeComboBox
{
- private global::Gtk.ComboBox comboMode;
+ private global::Gtk.ComboBoxText comboMode;
protected virtual void Build ()
{
@@ -12,7 +12,7 @@ protected virtual void Build ()
MonoDevelop.Components.BinContainer.Attach (this);
this.Name = "MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox";
// Container child MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox.Gtk.Container+ContainerChild
- this.comboMode = global::Gtk.ComboBox.NewText ();
+ this.comboMode = new global::Gtk.ComboBoxText ();
this.comboMode.Name = "comboMode";
this.Add (this.comboMode);
if ((this.Child != null)) {
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs
index 89692fca53e..77c33c85d9f 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs
@@ -33,7 +33,7 @@ protected virtual void Build ()
this.BorderWidth = ((uint)(6));
this.DefaultHeight = 350;
// Internal child MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox1";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -100,7 +100,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
w8.Position = 0;
// Internal child MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.ActionArea
- global::Gtk.HButtonBox w9 = this.ActionArea;
+ global::Gtk.HButtonBox w9 = (Gtk.HButtonBox)this.ActionArea;
w9.Name = "GtkDialog_ActionArea";
w9.Spacing = 6;
w9.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.cs
index 84cc4904e07..ce620106cc5 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.cs
@@ -15,7 +15,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -36,7 +36,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.scrolled]));
w5.Position = 0;
// Internal child MonoDevelop.Ide.Gui.Dialogs.MultiMessageDialog.ActionArea
- global::Gtk.HButtonBox w6 = this.ActionArea;
+ global::Gtk.HButtonBox w6 = (Gtk.HButtonBox)this.ActionArea;
w6.Name = "dialog1_ActionArea";
w6.Spacing = 6;
w6.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.cs
index b42a24cbb27..a78063e9c66 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.cs
@@ -22,7 +22,7 @@ protected virtual void Build ()
this.Modal = true;
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -82,7 +82,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1 [this.detailsScroll]));
w7.Position = 3;
// Internal child MonoDevelop.Ide.Gui.Dialogs.MultiTaskProgressDialog.ActionArea
- global::Gtk.HButtonBox w8 = this.ActionArea;
+ global::Gtk.HButtonBox w8 = (Gtk.HButtonBox)this.ActionArea;
w8.Name = "dialog1_ActionArea";
w8.Spacing = 6;
w8.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
index 58f45aeff51..ac4dfe4e92c 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
@@ -21,9 +21,8 @@ protected virtual void Build ()
this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
this.BorderWidth = ((uint)(6));
this.Resizable = false;
- this.AllowGrow = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox4";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -80,7 +79,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.ActionArea
- global::Gtk.HButtonBox w8 = this.ActionArea;
+ global::Gtk.HButtonBox w8 = (Gtk.HButtonBox)this.ActionArea;
w8.Name = "GtkDialog_ActionArea";
w8.Spacing = 6;
w8.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.cs
index 8a6e876ed96..57611e89c29 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.cs
@@ -24,7 +24,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Modal = true;
// Internal child MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -110,7 +110,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w10.Position = 0;
// Internal child MonoDevelop.Ide.Gui.Dialogs.ProgressDialog.ActionArea
- global::Gtk.HButtonBox w11 = this.ActionArea;
+ global::Gtk.HButtonBox w11 = (Gtk.HButtonBox)this.ActionArea;
w11.Name = "dialog1_ActionArea";
w11.Spacing = 10;
w11.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs
index ba33ff06a57..b7814e7a9df 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs
@@ -27,7 +27,7 @@ partial class SelectFileFormatDialog
private global::Gtk.Label labelCurrentFormat;
- private global::Gtk.ComboBox comboNewFormat;
+ private global::Gtk.ComboBoxText comboNewFormat;
private global::Gtk.Label label3;
@@ -45,7 +45,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Select File Format");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -146,7 +146,7 @@ protected virtual void Build ()
w9.XOptions = ((global::Gtk.AttachOptions)(4));
w9.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.comboNewFormat = global::Gtk.ComboBox.NewText ();
+ this.comboNewFormat = new global::Gtk.ComboBoxText ();
this.comboNewFormat.Name = "comboNewFormat";
this.table1.Add (this.comboNewFormat);
global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboNewFormat]));
@@ -192,7 +192,7 @@ protected virtual void Build ()
w16.Expand = false;
w16.Fill = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.ActionArea
- global::Gtk.HButtonBox w17 = this.ActionArea;
+ global::Gtk.HButtonBox w17 = (Gtk.HButtonBox)this.ActionArea;
w17.Name = "dialog1_ActionArea";
w17.Spacing = 10;
w17.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs
index b6fe94bfe06..96d2c9bf9c2 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.AddInsPanelWidget.cs
@@ -57,7 +57,7 @@ protected virtual void Build ()
this.radioHour.Active = true;
this.radioHour.DrawIndicator = true;
this.radioHour.UseUnderline = true;
- this.radioHour.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioHour.Group = new global::Gtk.RadioButton [0];
this.vbox5.Add (this.radioHour);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.radioHour]));
w2.Position = 0;
@@ -136,7 +136,7 @@ protected virtual void Build ()
this.radioBeta.Active = true;
this.radioBeta.DrawIndicator = true;
this.radioBeta.UseUnderline = true;
- this.radioBeta.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioBeta.Group = new global::Gtk.RadioButton [0];
this.vbox6.Add (this.radioBeta);
global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.radioBeta]));
w9.Position = 0;
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildMessagePanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildMessagePanelWidget.cs
index 25ed4b99cbc..31767988e3c 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildMessagePanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildMessagePanelWidget.cs
@@ -5,9 +5,9 @@ internal partial class BuildMessagePanelWidget
{
private global::Gtk.VBox vbox1;
private global::Gtk.Table table4;
- private global::Gtk.ComboBox comboboxErrorPadAfter;
- private global::Gtk.ComboBox comboboxJumpToFirst;
- private global::Gtk.ComboBox comboboxMessageBubbles;
+ private global::Gtk.ComboBoxText comboboxErrorPadAfter;
+ private global::Gtk.ComboBoxText comboboxJumpToFirst;
+ private global::Gtk.ComboBoxText comboboxMessageBubbles;
private global::Gtk.Label label3;
private global::Gtk.Label label5;
private global::Gtk.Label label6;
@@ -30,7 +30,7 @@ protected virtual void Build ()
this.table4.RowSpacing = ((uint)(6));
this.table4.ColumnSpacing = ((uint)(6));
// Container child table4.Gtk.Table+TableChild
- this.comboboxErrorPadAfter = global::Gtk.ComboBox.NewText ();
+ this.comboboxErrorPadAfter = new global::Gtk.ComboBoxText ();
this.comboboxErrorPadAfter.AppendText (global::Mono.Unix.Catalog.GetString ("Never"));
this.comboboxErrorPadAfter.Name = "comboboxErrorPadAfter";
this.comboboxErrorPadAfter.Active = 0;
@@ -43,7 +43,7 @@ protected virtual void Build ()
w1.XOptions = ((global::Gtk.AttachOptions)(4));
w1.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
- this.comboboxJumpToFirst = global::Gtk.ComboBox.NewText ();
+ this.comboboxJumpToFirst = new global::Gtk.ComboBoxText ();
this.comboboxJumpToFirst.AppendText (global::Mono.Unix.Catalog.GetString ("Never"));
this.comboboxJumpToFirst.Name = "comboboxJumpToFirst";
this.comboboxJumpToFirst.Active = 0;
@@ -54,7 +54,7 @@ protected virtual void Build ()
w2.XOptions = ((global::Gtk.AttachOptions)(4));
w2.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
- this.comboboxMessageBubbles = global::Gtk.ComboBox.NewText ();
+ this.comboboxMessageBubbles = new global::Gtk.ComboBoxText ();
this.comboboxMessageBubbles.AppendText (global::Mono.Unix.Catalog.GetString ("Never"));
this.comboboxMessageBubbles.Name = "comboboxMessageBubbles";
this.comboboxMessageBubbles.Active = 0;
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
index 13f1fa424b0..a2d834445c0 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
@@ -136,7 +136,7 @@ protected virtual void Build()
this.saveChangesRadioButton.Name = "saveChangesRadioButton";
this.saveChangesRadioButton.DrawIndicator = true;
this.saveChangesRadioButton.UseUnderline = true;
- this.saveChangesRadioButton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+ this.saveChangesRadioButton.Group = new global::Gtk.RadioButton[0];
this.vbox67.Add(this.saveChangesRadioButton);
global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox67[this.saveChangesRadioButton]));
w9.Position = 0;
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
index 81c95708bde..e2e55b18754 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
@@ -7,9 +7,9 @@ public partial class IDEStyleOptionsPanelWidget
private global::Gtk.Table table1;
- private global::Gtk.ComboBox comboLanguage;
+ private global::Gtk.ComboBoxText comboLanguage;
- private global::Gtk.ComboBox comboTheme;
+ private global::Gtk.ComboBoxText comboTheme;
private global::Gtk.Label label2;
@@ -41,7 +41,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.comboLanguage = global::Gtk.ComboBox.NewText ();
+ this.comboLanguage = new global::Gtk.ComboBoxText ();
this.comboLanguage.Name = "comboLanguage";
this.table1.Add (this.comboLanguage);
global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboLanguage]));
@@ -50,7 +50,7 @@ protected virtual void Build ()
w1.XOptions = ((global::Gtk.AttachOptions)(4));
w1.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.comboTheme = global::Gtk.ComboBox.NewText ();
+ this.comboTheme = new global::Gtk.ComboBoxText ();
this.comboTheme.Name = "comboTheme";
this.table1.Add (this.comboTheme);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboTheme]));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
index f65d904eb8f..0081ff500c4 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
@@ -9,7 +9,7 @@ public partial class KeyBindingsPanel
private global::Gtk.Label labelScheme;
- private global::Gtk.ComboBox schemeCombo;
+ private global::Gtk.ComboBoxText schemeCombo;
private global::Gtk.HSeparator hseparator2;
@@ -74,7 +74,7 @@ protected virtual void Build ()
w1.Expand = false;
w1.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.schemeCombo = global::Gtk.ComboBox.NewText ();
+ this.schemeCombo = new global::Gtk.ComboBoxText ();
this.schemeCombo.Name = "schemeCombo";
this.hbox1.Add (this.schemeCombo);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.schemeCombo]));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.TextStylePolicyPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.TextStylePolicyPanelWidget.cs
index fcf802adc04..91e9148a6c1 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.TextStylePolicyPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Gui.OptionPanels.TextStylePolicyPanelWidget.cs
@@ -10,7 +10,7 @@ internal partial class TextStylePolicyPanelWidget
private global::Gtk.Label label5;
private global::Gtk.HBox hbox2;
private global::Gtk.Label label6;
- private global::Gtk.ComboBox lineEndingCombo;
+ private global::Gtk.ComboBoxText lineEndingCombo;
private global::Gtk.Alignment alignment2;
private global::Gtk.Label label3;
private global::Gtk.Alignment alignment1;
@@ -90,7 +90,7 @@ protected virtual void Build ()
w5.Expand = false;
w5.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
- this.lineEndingCombo = global::Gtk.ComboBox.NewText ();
+ this.lineEndingCombo = new global::Gtk.ComboBoxText ();
this.lineEndingCombo.Name = "lineEndingCombo";
this.hbox2.Add (this.lineEndingCombo);
global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.lineEndingCombo]));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs
index 76e6194b6f6..55809d5642d 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs
@@ -47,7 +47,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Add File to Folder");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.AddExternalFileDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -106,7 +106,7 @@ protected virtual void Build ()
this.radioKeep.Name = "radioKeep";
this.radioKeep.DrawIndicator = true;
this.radioKeep.UseUnderline = true;
- this.radioKeep.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioKeep.Group = new global::Gtk.RadioButton [0];
this.radioKeep.Remove (this.radioKeep.Child);
// Container child radioKeep.Gtk.Container+ContainerChild
this.labelKeep = new global::Gtk.Label ();
@@ -205,7 +205,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
w17.Position = 0;
// Internal child MonoDevelop.Ide.Projects.AddExternalFileDialog.ActionArea
- global::Gtk.HButtonBox w18 = this.ActionArea;
+ global::Gtk.HButtonBox w18 = (Gtk.HButtonBox)this.ActionArea;
w18.Name = "dialog1_ActionArea";
w18.Spacing = 10;
w18.BorderWidth = ((uint)(11));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs
index 970ac8e79c3..dabb51b7dd9 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs
@@ -27,7 +27,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Add File Type");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.AddMimeTypeDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -88,7 +88,7 @@ protected virtual void Build ()
w7.Expand = false;
w7.Fill = false;
// Internal child MonoDevelop.Ide.Projects.AddMimeTypeDialog.ActionArea
- global::Gtk.HButtonBox w8 = this.ActionArea;
+ global::Gtk.HButtonBox w8 = (Gtk.HButtonBox)this.ActionArea;
w8.Name = "dialog1_ActionArea";
w8.Spacing = 10;
w8.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs
index f51b756ec3e..8087ded224a 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ApplyPolicyDialog.cs
@@ -9,7 +9,7 @@ internal partial class ApplyPolicyDialog
private global::Gtk.Alignment boxCustom;
private global::Gtk.HBox hbox1;
private global::Gtk.Label label2;
- private global::Gtk.ComboBox combPolicies;
+ private global::Gtk.ComboBoxText combPolicies;
private global::Gtk.RadioButton radioFile;
private global::Gtk.Alignment boxFile;
private global::Gtk.HBox hbox2;
@@ -29,7 +29,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Apply Policies");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.ApplyPolicyDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -47,7 +47,7 @@ protected virtual void Build ()
this.radioCustom.Name = "radioCustom";
this.radioCustom.DrawIndicator = true;
this.radioCustom.UseUnderline = true;
- this.radioCustom.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioCustom.Group = new global::Gtk.RadioButton [0];
this.vbox2.Add (this.radioCustom);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radioCustom]));
w2.Position = 0;
@@ -71,7 +71,7 @@ protected virtual void Build ()
w3.Expand = false;
w3.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
- this.combPolicies = global::Gtk.ComboBox.NewText ();
+ this.combPolicies = new Gtk.ComboBoxText ();
this.combPolicies.Name = "combPolicies";
this.hbox1.Add (this.combPolicies);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.combPolicies]));
@@ -160,7 +160,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
w16.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ApplyPolicyDialog.ActionArea
- global::Gtk.HButtonBox w17 = this.ActionArea;
+ global::Gtk.HButtonBox w17 = (Gtk.HButtonBox)this.ActionArea;
w17.Name = "dialog1_ActionArea";
w17.Spacing = 10;
w17.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.cs
index c6f136ed4d0..bd94322976a 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.cs
@@ -34,7 +34,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.Modal = true;
// Internal child MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -58,7 +58,7 @@ protected virtual void Build ()
this.radioDeleteAll.Name = "radioDeleteAll";
this.radioDeleteAll.DrawIndicator = true;
this.radioDeleteAll.UseUnderline = true;
- this.radioDeleteAll.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioDeleteAll.Group = new global::Gtk.RadioButton [0];
this.vbox2.Add (this.radioDeleteAll);
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.radioDeleteAll]));
w3.Position = 1;
@@ -113,7 +113,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w10.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ConfirmProjectDeleteDialog.ActionArea
- global::Gtk.HButtonBox w11 = this.ActionArea;
+ global::Gtk.HButtonBox w11 = (Gtk.HButtonBox)this.ActionArea;
w11.Name = "dialog1_ActionArea";
w11.Spacing = 10;
w11.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs
index 09986d1fedd..bc0e432ffe8 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs
@@ -25,7 +25,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Delete Configuration");
this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
// Internal child MonoDevelop.Ide.Projects.DeleteConfigDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox7";
// Container child dialog-vbox7.Gtk.Box+BoxChild
this.hbox64 = new global::Gtk.HBox ();
@@ -76,7 +76,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox64]));
w6.Position = 0;
// Internal child MonoDevelop.Ide.Projects.DeleteConfigDialog.ActionArea
- global::Gtk.HButtonBox w7 = this.ActionArea;
+ global::Gtk.HButtonBox w7 = (Gtk.HButtonBox)this.ActionArea;
w7.Name = "dialog-action_area7";
w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
// Container child dialog-action_area7.Gtk.ButtonBox+ButtonBoxChild
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs
index 85ac3b3fd8b..eddbc9cf5e4 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.cs
@@ -29,7 +29,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Export Policies");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -47,7 +47,7 @@ protected virtual void Build ()
this.radioCustom.Name = "radioCustom";
this.radioCustom.DrawIndicator = true;
this.radioCustom.UseUnderline = true;
- this.radioCustom.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioCustom.Group = new global::Gtk.RadioButton [0];
this.vbox4.Add (this.radioCustom);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radioCustom]));
w2.Position = 0;
@@ -163,7 +163,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w16.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ExportProjectPolicyDialog.ActionArea
- global::Gtk.HButtonBox w17 = this.ActionArea;
+ global::Gtk.HButtonBox w17 = (Gtk.HButtonBox)this.ActionArea;
w17.Name = "dialog1_ActionArea";
w17.Spacing = 10;
w17.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportSolutionDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportSolutionDialog.cs
index 045f7dae415..a907a78cd7f 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportSolutionDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ExportSolutionDialog.cs
@@ -7,7 +7,7 @@ internal partial class ExportSolutionDialog
private global::Gtk.Table table;
- private global::Gtk.ComboBox comboFormat;
+ private global::Gtk.ComboBoxText comboFormat;
private global::MonoDevelop.Components.FolderEntry folderEntry;
@@ -34,7 +34,7 @@ protected virtual void Build ()
this.BorderWidth = ((uint)(6));
this.Resizable = false;
// Internal child MonoDevelop.Ide.Projects.ExportSolutionDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Events = ((global::Gdk.EventMask)(256));
w1.Name = "dialog_VBox";
w1.Spacing = 6;
@@ -50,7 +50,7 @@ protected virtual void Build ()
this.table.RowSpacing = ((uint)(6));
this.table.ColumnSpacing = ((uint)(6));
// Container child table.Gtk.Table+TableChild
- this.comboFormat = global::Gtk.ComboBox.NewText ();
+ this.comboFormat = new global::Gtk.ComboBoxText ();
this.comboFormat.Name = "comboFormat";
this.table.Add (this.comboFormat);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table [this.comboFormat]));
@@ -123,7 +123,7 @@ protected virtual void Build ()
w9.Expand = false;
w9.Fill = false;
// Internal child MonoDevelop.Ide.Projects.ExportSolutionDialog.ActionArea
- global::Gtk.HButtonBox w10 = this.ActionArea;
+ global::Gtk.HButtonBox w10 = (Gtk.HButtonBox)this.ActionArea;
w10.Name = "MonoDevelop.Ide.ExportProjectDialog_ActionArea";
w10.Spacing = 6;
w10.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.cs
index 50a283a4b19..e54480a0c1a 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.cs
@@ -18,7 +18,7 @@ protected virtual void Build ()
this.Name = "MonoDevelop.Ide.Projects.ImportProjectPolicyDialog";
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -70,7 +70,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
w6.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ImportProjectPolicyDialog.ActionArea
- global::Gtk.HButtonBox w7 = this.ActionArea;
+ global::Gtk.HButtonBox w7 = (Gtk.HButtonBox)this.ActionArea;
w7.Name = "dialog1_ActionArea";
w7.Spacing = 10;
w7.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.IncludeNewFilesDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.IncludeNewFilesDialog.cs
index 3628e3853bf..b993d2cad3b 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.IncludeNewFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.IncludeNewFilesDialog.cs
@@ -21,7 +21,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.Ide.Projects.IncludeNewFilesDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -88,7 +88,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w8.Position = 0;
// Internal child MonoDevelop.Ide.Projects.IncludeNewFilesDialog.ActionArea
- global::Gtk.HButtonBox w9 = this.ActionArea;
+ global::Gtk.HButtonBox w9 = (Gtk.HButtonBox)this.ActionArea;
w9.Name = "dialog1_ActionArea";
w9.Spacing = 6;
w9.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewConfigurationDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewConfigurationDialog.cs
index e72492ec692..28d340cf964 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewConfigurationDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewConfigurationDialog.cs
@@ -5,8 +5,8 @@ internal partial class NewConfigurationDialog
{
private global::Gtk.VBox vbox77;
private global::Gtk.Table table1;
- private global::Gtk.ComboBoxEntry comboName;
- private global::Gtk.ComboBoxEntry comboPlatform;
+ private global::Gtk.ComboBoxText comboName;
+ private global::Gtk.ComboBoxText comboPlatform;
private global::Gtk.Label label1;
private global::Gtk.Label label2;
private global::Gtk.CheckButton createChildrenCheck;
@@ -21,7 +21,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("New Configuration");
this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
// Internal child MonoDevelop.Ide.Projects.NewConfigurationDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox6";
w1.BorderWidth = ((uint)(2));
// Container child dialog-vbox6.Gtk.Box+BoxChild
@@ -35,7 +35,7 @@ protected virtual void Build ()
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.comboName = global::Gtk.ComboBoxEntry.NewText ();
+ this.comboName = new Gtk.ComboBoxText ();
this.comboName.Name = "comboName";
this.table1.Add (this.comboName);
global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboName]));
@@ -44,7 +44,7 @@ protected virtual void Build ()
w2.XOptions = ((global::Gtk.AttachOptions)(4));
w2.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
- this.comboPlatform = global::Gtk.ComboBoxEntry.NewText ();
+ this.comboPlatform = new Gtk.ComboBoxText ();
this.comboPlatform.Name = "comboPlatform";
this.table1.Add (this.comboPlatform);
global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboPlatform]));
@@ -93,7 +93,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox77]));
w8.Position = 0;
// Internal child MonoDevelop.Ide.Projects.NewConfigurationDialog.ActionArea
- global::Gtk.HButtonBox w9 = this.ActionArea;
+ global::Gtk.HButtonBox w9 = (Gtk.HButtonBox)this.ActionArea;
w9.Name = "dialog-action_area6";
w9.Spacing = 6;
w9.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewFileDialog.cs
index ab7583b8238..b152e1bde80 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewFileDialog.cs
@@ -37,7 +37,7 @@ internal partial class NewFileDialog
private global::Gtk.CheckButton projectAddCheckbox;
- private global::Gtk.ComboBox projectAddCombo;
+ private global::Gtk.ComboBoxText projectAddCombo;
private global::Gtk.HBox hbox4;
@@ -58,7 +58,7 @@ protected virtual void Build ()
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
// Internal child MonoDevelop.Ide.Projects.NewFileDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -206,7 +206,7 @@ protected virtual void Build ()
w17.Expand = false;
w17.Fill = false;
// Container child hbox3.Gtk.Box+BoxChild
- this.projectAddCombo = global::Gtk.ComboBox.NewText ();
+ this.projectAddCombo = new global::Gtk.ComboBoxText ();
this.projectAddCombo.Name = "projectAddCombo";
this.hbox3.Add (this.projectAddCombo);
global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.projectAddCombo]));
@@ -250,7 +250,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
w24.Position = 0;
// Internal child MonoDevelop.Ide.Projects.NewFileDialog.ActionArea
- global::Gtk.HButtonBox w25 = this.ActionArea;
+ global::Gtk.HButtonBox w25 = (Gtk.HButtonBox)this.ActionArea;
w25.Name = "dialog1_ActionArea";
w25.Spacing = 6;
w25.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs
index 6de41e9e20b..489097a21f0 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.NewPolicySetDialog.cs
@@ -11,7 +11,7 @@ internal partial class NewPolicySetDialog
private global::Gtk.Label label2;
- private global::Gtk.ComboBox comboSets;
+ private global::Gtk.ComboBoxText comboSets;
private global::Gtk.Button buttonCancel;
@@ -25,7 +25,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("New Policy");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.NewPolicySetDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -65,7 +65,7 @@ protected virtual void Build ()
w4.Expand = false;
w4.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
- this.comboSets = global::Gtk.ComboBox.NewText ();
+ this.comboSets = new global::Gtk.ComboBoxText ();
this.comboSets.Name = "comboSets";
this.vbox2.Add (this.comboSets);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.comboSets]));
@@ -78,7 +78,7 @@ protected virtual void Build ()
w6.Expand = false;
w6.Fill = false;
// Internal child MonoDevelop.Ide.Projects.NewPolicySetDialog.ActionArea
- global::Gtk.HButtonBox w7 = this.ActionArea;
+ global::Gtk.HButtonBox w7 = (Gtk.HButtonBox)this.ActionArea;
w7.Name = "dialog1_ActionArea";
w7.Spacing = 10;
w7.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.CustomCommandWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.CustomCommandWidget.cs
index b7d32046262..2c41e60d8c6 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.CustomCommandWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.CustomCommandWidget.cs
@@ -6,7 +6,7 @@ internal partial class CustomCommandWidget
private global::Gtk.VBox vbox1;
private global::Gtk.HSeparator hseparator2;
private global::Gtk.HBox hbox1;
- private global::Gtk.ComboBox comboType;
+ private global::Gtk.ComboBoxText comboType;
private global::Gtk.Button buttonRemove;
private global::Gtk.Table tableData;
private global::Gtk.Entry entryCommand;
@@ -51,7 +51,7 @@ protected virtual void Build ()
this.hbox1.Name = "hbox1";
this.hbox1.Spacing = 6;
// Container child hbox1.Gtk.Box+BoxChild
- this.comboType = global::Gtk.ComboBox.NewText ();
+ this.comboType = new global::Gtk.ComboBoxText ();
this.comboType.CanFocus = true;
this.comboType.Name = "comboType";
this.hbox1.Add (this.comboType);
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanelWidget.cs
index 75f3a1d763e..1ef4208f271 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanelWidget.cs
@@ -86,7 +86,7 @@ protected virtual void Build ()
this.radioFlat.Name = "radioFlat";
this.radioFlat.DrawIndicator = true;
this.radioFlat.UseUnderline = true;
- this.radioFlat.Group = new global::GLib.SList (global::System.IntPtr.Zero);
+ this.radioFlat.Group = new global::Gtk.RadioButton [0];
this.vbox4.Add (this.radioFlat);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radioFlat]));
w4.Position = 0;
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.RuntimeOptionsPanelWidget.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.RuntimeOptionsPanelWidget.cs
index 383e98d7952..bdcf66db587 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.RuntimeOptionsPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.OptionPanels.RuntimeOptionsPanelWidget.cs
@@ -6,7 +6,7 @@ internal partial class RuntimeOptionsPanelWidget
private global::Gtk.VBox vbox81;
private global::Gtk.HBox hbox68;
private global::Gtk.Label label114;
- private global::Gtk.ComboBox runtimeVersionCombo;
+ private global::Gtk.ComboBoxText runtimeVersionCombo;
protected virtual void Build ()
{
@@ -34,7 +34,7 @@ protected virtual void Build ()
w1.Expand = false;
w1.Fill = false;
// Container child hbox68.Gtk.Box+BoxChild
- this.runtimeVersionCombo = global::Gtk.ComboBox.NewText ();
+ this.runtimeVersionCombo = new global::Gtk.ComboBoxText ();
this.runtimeVersionCombo.Name = "runtimeVersionCombo";
this.hbox68.Add (this.runtimeVersionCombo);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox68 [this.runtimeVersionCombo]));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs
index 7b93e11a6aa..0b71e9ca24d 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs
@@ -27,7 +27,7 @@ public partial class ProjectFileSelectorDialog
private global::Gtk.Label label2;
- private global::Gtk.ComboBox fileTypeCombo;
+ private global::Gtk.ComboBoxText fileTypeCombo;
private global::Gtk.Button buttonCancel;
@@ -41,7 +41,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Select Project File...");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -121,7 +121,7 @@ protected virtual void Build ()
w9.Expand = false;
w9.Fill = false;
// Container child typeBox.Gtk.Box+BoxChild
- this.fileTypeCombo = global::Gtk.ComboBox.NewText ();
+ this.fileTypeCombo = new global::Gtk.ComboBoxText ();
this.fileTypeCombo.Name = "fileTypeCombo";
this.typeBox.Add (this.fileTypeCombo);
global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.typeBox [this.fileTypeCombo]));
@@ -142,7 +142,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1]));
w14.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.ActionArea
- global::Gtk.HButtonBox w15 = this.ActionArea;
+ global::Gtk.HButtonBox w15 = (Gtk.HButtonBox)this.ActionArea;
w15.Name = "dialog1_ActionArea";
w15.Spacing = 6;
w15.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectSelectorDialog.cs
index cb56b2c526e..ac8d2da3b63 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.ProjectSelectorDialog.cs
@@ -16,7 +16,7 @@ protected virtual void Build ()
this.Name = "MonoDevelop.Ide.Projects.ProjectSelectorDialog";
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child MonoDevelop.Ide.Projects.ProjectSelectorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -47,7 +47,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox4]));
w4.Position = 0;
// Internal child MonoDevelop.Ide.Projects.ProjectSelectorDialog.ActionArea
- global::Gtk.HButtonBox w5 = this.ActionArea;
+ global::Gtk.HButtonBox w5 = (Gtk.HButtonBox)this.ActionArea;
w5.Name = "dialog1_ActionArea";
w5.Spacing = 10;
w5.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.RenameConfigDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.RenameConfigDialog.cs
index 6e6caf060b1..3c790af1a87 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.RenameConfigDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.RenameConfigDialog.cs
@@ -19,7 +19,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Rename Configuration");
this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
// Internal child MonoDevelop.Ide.Projects.RenameConfigDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "vbox78";
w1.BorderWidth = ((uint)(2));
// Container child vbox78.Gtk.Box+BoxChild
@@ -69,7 +69,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox79]));
w6.Position = 0;
// Internal child MonoDevelop.Ide.Projects.RenameConfigDialog.ActionArea
- global::Gtk.HButtonBox w7 = this.ActionArea;
+ global::Gtk.HButtonBox w7 = (Gtk.HButtonBox)this.ActionArea;
w7.Name = "hbuttonbox2";
w7.Spacing = 6;
w7.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs
index d480903c029..d7f310d0a15 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs
@@ -45,7 +45,7 @@ protected virtual void Build ()
this.BorderWidth = ((uint)(6));
this.DestroyWithParent = true;
// Internal child MonoDevelop.Ide.Projects.SelectReferenceDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox2";
w1.Spacing = 6;
// Container child dialog-vbox2.Gtk.Box+BoxChild
@@ -145,7 +145,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
w14.Position = 0;
// Internal child MonoDevelop.Ide.Projects.SelectReferenceDialog.ActionArea
- global::Gtk.HButtonBox w15 = this.ActionArea;
+ global::Gtk.HButtonBox w15 = (Gtk.HButtonBox)this.ActionArea;
w15.Name = "dialog-action_area2";
w15.Spacing = 10;
w15.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.SelectEncodingsDialog.cs b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.SelectEncodingsDialog.cs
index 42df7fe27a1..c0a48fa3837 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.SelectEncodingsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/MonoDevelop.Ide.SelectEncodingsDialog.cs
@@ -57,7 +57,7 @@ protected virtual void Build ()
this.DefaultWidth = 700;
this.DefaultHeight = 450;
// Internal child MonoDevelop.Ide.SelectEncodingsDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog-vbox5";
w1.Spacing = 6;
w1.BorderWidth = ((uint)(2));
@@ -215,7 +215,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(w1 [this.table5]));
w20.Position = 0;
// Internal child MonoDevelop.Ide.SelectEncodingsDialog.ActionArea
- global::Gtk.HButtonBox w21 = this.ActionArea;
+ global::Gtk.HButtonBox w21 = (Gtk.HButtonBox)this.ActionArea;
w21.Name = "dialog-action_area5";
w21.Spacing = 6;
w21.BorderWidth = ((uint)(5));
diff --git a/main/src/core/MonoDevelop.Ide/Gui/generated.cs b/main/src/core/MonoDevelop.Ide/Gui/generated.cs
index bc4dc98c212..70568068855 100644
--- a/main/src/core/MonoDevelop.Ide/Gui/generated.cs
+++ b/main/src/core/MonoDevelop.Ide/Gui/generated.cs
@@ -23,25 +23,25 @@ public 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)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AtkCocoaHelper/AtkCocoaHelper.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AtkCocoaHelper/AtkCocoaHelper.cs
index 9275a69e25f..2fd73fd8cf4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AtkCocoaHelper/AtkCocoaHelper.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AtkCocoaHelper/AtkCocoaHelper.cs
@@ -180,31 +180,31 @@ internal Atk.Object Owner {
void HandleSignalAttachment (Atk.Object owner, Action> action)
{
- var signal = GLib.Signal.Lookup (owner, "request-actions", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (RequestActionsHandler));
-
- signal = GLib.Signal.Lookup (owner, "perform-cancel", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformCancelHandler));
- signal = GLib.Signal.Lookup (owner, "perform-confirm", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformConfirmHandler));
- signal = GLib.Signal.Lookup (owner, "perform-decrement", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformDecrementHandler));
- signal = GLib.Signal.Lookup (owner, "perform-delete", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformDeleteHandler));
- signal = GLib.Signal.Lookup (owner, "perform-increment", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformIncrementHandler));
- signal = GLib.Signal.Lookup (owner, "perform-pick", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformPickHandler));
- signal = GLib.Signal.Lookup (owner, "perform-press", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformPressHandler));
- signal = GLib.Signal.Lookup (owner, "perform-raise", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformRaiseHandler));
- signal = GLib.Signal.Lookup (owner, "perform-show-alternate-ui", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformShowAlternateUIHandler));
- signal = GLib.Signal.Lookup (owner, "perform-show-default-ui", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformShowDefaultUIHandler));
- signal = GLib.Signal.Lookup (owner, "perform-show-menu", typeof (GLib.SignalArgs));
- action (signal, new EventHandler (PerformShowMenuHandler));
+// var signal = GLib.Signal.Lookup (owner, "request-actions", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (RequestActionsHandler));
+
+// signal = GLib.Signal.Lookup (owner, "perform-cancel", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformCancelHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-confirm", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformConfirmHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-decrement", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformDecrementHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-delete", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformDeleteHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-increment", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformIncrementHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-pick", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformPickHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-press", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformPressHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-raise", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformRaiseHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-show-alternate-ui", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformShowAlternateUIHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-show-default-ui", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformShowDefaultUIHandler));
+// signal = GLib.Signal.Lookup (owner, "perform-show-menu", typeof (GLib.SignalArgs));
+// action (signal, new EventHandler (PerformShowMenuHandler));
}
public ActionDelegate (Gtk.Widget widget)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkTreeModelResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkTreeModelResult.cs
index 7e3dbbccbdb..623daace66f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkTreeModelResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkTreeModelResult.cs
@@ -34,19 +34,19 @@ namespace MonoDevelop.Components.AutoTest.Results
public class GtkTreeModelResult : GtkWidgetResult
{
Widget ParentWidget;
- TreeModel TModel;
+ ITreeModel TModel;
int Column;
TreeIter? resultIter;
string DesiredText;
- internal GtkTreeModelResult (Widget parent, TreeModel treeModel, int column) : base (parent)
+ internal GtkTreeModelResult (Widget parent, ITreeModel treeModel, int column) : base (parent)
{
ParentWidget = parent;
TModel = treeModel;
Column = column;
}
- internal GtkTreeModelResult (Widget parent, TreeModel treeModel, int column, TreeIter iter) : base (parent)
+ internal GtkTreeModelResult (Widget parent, ITreeModel treeModel, int column, TreeIter iter) : base (parent)
{
ParentWidget = parent;
TModel = treeModel;
@@ -86,7 +86,7 @@ public override AppResult Model (string column)
return this;
}
- bool CheckForText (TreeModel model, TreeIter iter, bool exact)
+ bool CheckForText (ITreeModel model, TreeIter iter, bool exact)
{
string modelText = model.GetValue (iter, Column) as string;
if (modelText == null) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkWidgetResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkWidgetResult.cs
index 6beaa805eb9..8e623b36f9a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkWidgetResult.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest.Results/GtkWidgetResult.cs
@@ -106,7 +106,7 @@ public override AppResult Text (string text, bool exact)
// Check for the combobox first and try to use the active text.
// If the active text fails then
- ComboBox cb = resultWidget as ComboBox;
+ ComboBoxText cb = resultWidget as ComboBoxText;
if (cb != null) {
string activeText = cb.ActiveText;
if (activeText == null) {
@@ -152,7 +152,7 @@ public override AppResult Text (string text, bool exact)
return null;
}
- protected TreeModel ModelFromWidget (Widget widget)
+ protected ITreeModel ModelFromWidget (Widget widget)
{
TreeView tv = widget as TreeView;
if (tv != null) {
@@ -169,7 +169,7 @@ protected TreeModel ModelFromWidget (Widget widget)
public override AppResult Model (string column)
{
- TreeModel model = ModelFromWidget (resultWidget);
+ ITreeModel model = ModelFromWidget (resultWidget);
if (model == null) {
return null;
}
@@ -183,7 +183,7 @@ public override AppResult Model (string column)
return columnNumber == -1 ? null : new GtkTreeModelResult (resultWidget, model, columnNumber) { SourceQuery = this.SourceQuery };
}
- protected int GetColumnNumber (string column, TreeModel model)
+ protected int GetColumnNumber (string column, ITreeModel model)
{
Type modelType = model.GetType ();
SemanticModelAttribute attr = modelType.GetCustomAttribute ();
@@ -490,36 +490,36 @@ public override bool Toggle (bool active)
bool flashState;
- void OnFlashWidget (object o, ExposeEventArgs args)
- {
- flashState = !flashState;
-
- if (flashState) {
- return;
- }
-
- using (var cr = Gdk.CairoHelper.Create (resultWidget.GdkWindow)) {
- cr.SetSourceRGB (1.0, 0.0, 0.0);
-
- Gdk.Rectangle allocation = resultWidget.Allocation;
- Gdk.CairoHelper.Rectangle (cr, allocation);
- cr.Stroke ();
- }
- }
+// void OnFlashWidget (object o, ExposeEventArgs args)
+// {
+// flashState = !flashState;
+//
+// if (flashState) {
+// return;
+// }
+//
+// using (var cr = Gdk.CairoHelper.Create (resultWidget.GdkWindow)) {
+// cr.SetSourceRGB (1.0, 0.0, 0.0);
+//
+// Gdk.Rectangle allocation = resultWidget.Allocation;
+// Gdk.CairoHelper.Rectangle (cr, allocation);
+// cr.Stroke ();
+// }
+// }
public override void Flash ()
{
int flashCount = 10;
flashState = true;
- resultWidget.ExposeEvent += OnFlashWidget;
+// resultWidget.ExposeEvent += OnFlashWidget;
GLib.Timeout.Add (1000, () => {
resultWidget.QueueDraw ();
flashCount--;
if (flashCount == 0) {
- resultWidget.ExposeEvent -= OnFlashWidget;
+// resultWidget.ExposeEvent -= OnFlashWidget;
return false;
}
return true;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
index 30ae5394576..4fa85f73a8c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs
@@ -449,144 +449,144 @@ double GetMinTickStep (AxisDimension ad)
return (((double) minTickStep) * (GetEnd (ad) - GetStart (ad))) / (double) GetAreaSize (ad);
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- Gdk.Window win = GdkWindow;
- int rwidth, rheight;
-
- Cairo.Context ctx = CairoHelper.Create (win);
-
- win.GetSize (out rwidth, out rheight);
-
- if (autoStartY || autoEndY) {
- double nstartY = double.MaxValue;
- double nendY = double.MinValue;
- GetValueRange (AxisDimension.Y, out nstartY, out nendY);
-
- if (!autoStartY) nstartY = startY;
- if (!autoEndY) nendY = endY;
- if (nendY < nstartY) nendY = nstartY;
-
- if (nstartY != startY || nendY != endY) {
- yrangeChanged = true;
- startY = nstartY;
- endY = nendY;
- }
- }
-
- if (autoStartX || autoEndX) {
- double nstartX = double.MaxValue;
- double nendX = double.MinValue;
- GetValueRange (AxisDimension.X, out nstartX, out nendX);
-
- if (!autoStartX) nstartX = startX;
- if (!autoEndX) nendX = endX;
- if (nendX < nstartX) nendX = nstartX;
-
- if (nstartX != startX || nendX != endX) {
- xrangeChanged = true;
- startX = nstartX;
- endX = nendX;
- }
- }
-
- if (yrangeChanged) {
- FixOrigins ();
- int right = rwidth - 2 - AreaBorderWidth;
- left = AreaBorderWidth;
- left += MeasureAxisSize (AxisPosition.Left) + 1;
- right -= MeasureAxisSize (AxisPosition.Right) + 1;
- yrangeChanged = false;
- width = right - left + 1;
- if (width <= 0) width = 1;
- }
-
- if (xrangeChanged) {
- FixOrigins ();
- int bottom = rheight - 2 - AreaBorderWidth;
- top = AreaBorderWidth;
- bottom -= MeasureAxisSize (AxisPosition.Bottom);
- top += MeasureAxisSize (AxisPosition.Top);
-
- // Make room for cursor handles
- foreach (ChartCursor cursor in cursors) {
- if (cursor.Dimension == AxisDimension.X && top - AreaBorderWidth < cursor.HandleSize)
- top = cursor.HandleSize + AreaBorderWidth;
- }
-
- xrangeChanged = false;
- height = bottom - top + 1;
- if (height <= 0) height = 1;
- }
-
- if (AutoScaleMargin != 0 && height > 0) {
- double margin = (double)AutoScaleMargin * (endY - startY) / (double) height;
- if (autoStartY) startY -= margin;
- if (autoEndY) endY += margin;
- }
-
-// Console.WriteLine ("L:" + left + " T:" + top + " W:" + width + " H:" + height);
-
- // Draw the background
-
- if (backgroundDisplay == BackgroundDisplay.Gradient) {
- ctx.Rectangle (left - 1, top - 1, width + 2, height + 2);
-
- // FIXME: VV: Remove gradient features
- using (var pat = new Cairo.LinearGradient (left - 1, top - 1, left - 1, height + 2)) {
- pat.AddColorStop (0, backroundColor);
- Cairo.Color endc = new Cairo.Color (1,1,1);
- pat.AddColorStop (1, endc);
- ctx.SetSource (pat);
- ctx.Fill ();
- }
- } else {
- ctx.Rectangle (left - 1, top - 1, width + 2, height + 2);
- ctx.SetSourceColor (backroundColor);
- ctx.Fill ();
- }
-// win.DrawRectangle (Style.WhiteGC, true, left - 1, top - 1, width + 2, height + 2);
- win.DrawRectangle (Style.BlackGC, false, left - AreaBorderWidth, top - AreaBorderWidth, width + AreaBorderWidth*2, height + AreaBorderWidth*2);
-
- // Draw selected area
-
- if (enableSelection) {
- int sx, sy, ex, ey;
- GetPoint (selectionStart.Value, selectionStart.Value, out sx, out sy);
- GetPoint (selectionEnd.Value, selectionEnd.Value, out ex, out ey);
- if (sx > ex) {
- int tmp = sx; sx = ex; ex = tmp;
- }
- using (Gdk.GC sgc = new Gdk.GC (GdkWindow)) {
- sgc.RgbFgColor = new Color (225, 225, 225);
- win.DrawRectangle (sgc, true, sx, top, ex - sx, height + 1);
- }
- }
-
- // Draw axes
-
- Gdk.GC gc = Style.BlackGC;
-
- foreach (Axis ax in axis)
- DrawAxis (win, gc, ax);
-
- // Draw values
- foreach (Serie serie in series)
- if (serie.Visible)
- DrawSerie (ctx, serie);
-
- // Draw cursors
- foreach (ChartCursor cursor in cursors)
- DrawCursor (cursor);
-
- // Draw cursor labels
- foreach (ChartCursor cursor in cursors)
- if (cursor.ShowValueLabel)
- DrawCursorLabel (cursor);
-
- ((IDisposable)ctx).Dispose ();
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// Gdk.Window win = GdkWindow;
+// int rwidth, rheight;
+//
+// Cairo.Context ctx = CairoHelper.Create (win);
+//
+// win.GetSize (out rwidth, out rheight);
+//
+// if (autoStartY || autoEndY) {
+// double nstartY = double.MaxValue;
+// double nendY = double.MinValue;
+// GetValueRange (AxisDimension.Y, out nstartY, out nendY);
+//
+// if (!autoStartY) nstartY = startY;
+// if (!autoEndY) nendY = endY;
+// if (nendY < nstartY) nendY = nstartY;
+//
+// if (nstartY != startY || nendY != endY) {
+// yrangeChanged = true;
+// startY = nstartY;
+// endY = nendY;
+// }
+// }
+//
+// if (autoStartX || autoEndX) {
+// double nstartX = double.MaxValue;
+// double nendX = double.MinValue;
+// GetValueRange (AxisDimension.X, out nstartX, out nendX);
+//
+// if (!autoStartX) nstartX = startX;
+// if (!autoEndX) nendX = endX;
+// if (nendX < nstartX) nendX = nstartX;
+//
+// if (nstartX != startX || nendX != endX) {
+// xrangeChanged = true;
+// startX = nstartX;
+// endX = nendX;
+// }
+// }
+//
+// if (yrangeChanged) {
+// FixOrigins ();
+// int right = rwidth - 2 - AreaBorderWidth;
+// left = AreaBorderWidth;
+// left += MeasureAxisSize (AxisPosition.Left) + 1;
+// right -= MeasureAxisSize (AxisPosition.Right) + 1;
+// yrangeChanged = false;
+// width = right - left + 1;
+// if (width <= 0) width = 1;
+// }
+//
+// if (xrangeChanged) {
+// FixOrigins ();
+// int bottom = rheight - 2 - AreaBorderWidth;
+// top = AreaBorderWidth;
+// bottom -= MeasureAxisSize (AxisPosition.Bottom);
+// top += MeasureAxisSize (AxisPosition.Top);
+//
+// // Make room for cursor handles
+// foreach (ChartCursor cursor in cursors) {
+// if (cursor.Dimension == AxisDimension.X && top - AreaBorderWidth < cursor.HandleSize)
+// top = cursor.HandleSize + AreaBorderWidth;
+// }
+//
+// xrangeChanged = false;
+// height = bottom - top + 1;
+// if (height <= 0) height = 1;
+// }
+//
+// if (AutoScaleMargin != 0 && height > 0) {
+// double margin = (double)AutoScaleMargin * (endY - startY) / (double) height;
+// if (autoStartY) startY -= margin;
+// if (autoEndY) endY += margin;
+// }
+//
+//// Console.WriteLine ("L:" + left + " T:" + top + " W:" + width + " H:" + height);
+//
+// // Draw the background
+//
+// if (backgroundDisplay == BackgroundDisplay.Gradient) {
+// ctx.Rectangle (left - 1, top - 1, width + 2, height + 2);
+//
+// // FIXME: VV: Remove gradient features
+// using (var pat = new Cairo.LinearGradient (left - 1, top - 1, left - 1, height + 2)) {
+// pat.AddColorStop (0, backroundColor);
+// Cairo.Color endc = new Cairo.Color (1,1,1);
+// pat.AddColorStop (1, endc);
+// ctx.SetSource (pat);
+// ctx.Fill ();
+// }
+// } else {
+// ctx.Rectangle (left - 1, top - 1, width + 2, height + 2);
+// ctx.SetSourceColor (backroundColor);
+// ctx.Fill ();
+// }
+//// win.DrawRectangle (Style.WhiteGC, true, left - 1, top - 1, width + 2, height + 2);
+// win.DrawRectangle (Style.BlackGC, false, left - AreaBorderWidth, top - AreaBorderWidth, width + AreaBorderWidth*2, height + AreaBorderWidth*2);
+//
+// // Draw selected area
+//
+// if (enableSelection) {
+// int sx, sy, ex, ey;
+// GetPoint (selectionStart.Value, selectionStart.Value, out sx, out sy);
+// GetPoint (selectionEnd.Value, selectionEnd.Value, out ex, out ey);
+// if (sx > ex) {
+// int tmp = sx; sx = ex; ex = tmp;
+// }
+// using (Gdk.GC sgc = new Gdk.GC (GdkWindow)) {
+// sgc.RgbFgColor = new Color (225, 225, 225);
+// win.DrawRectangle (sgc, true, sx, top, ex - sx, height + 1);
+// }
+// }
+//
+// // Draw axes
+//
+// Gdk.GC gc = Style.BlackGC;
+//
+// foreach (Axis ax in axis)
+// DrawAxis (win, gc, ax);
+//
+// // Draw values
+// foreach (Serie serie in series)
+// if (serie.Visible)
+// DrawSerie (ctx, serie);
+//
+// // Draw cursors
+// foreach (ChartCursor cursor in cursors)
+// DrawCursor (cursor);
+//
+// // Draw cursor labels
+// foreach (ChartCursor cursor in cursors)
+// if (cursor.ShowValueLabel)
+// DrawCursorLabel (cursor);
+//
+// ((IDisposable)ctx).Dispose ();
+// return true;
+// }
void GetValueRange (AxisDimension ad, out double min, out double max)
{
@@ -604,138 +604,138 @@ void GetValueRange (AxisDimension ad, out double min, out double max)
}
}
- void DrawAxis (Gdk.Window win, Gdk.GC gc, Axis ax)
- {
- double minStep = GetMinTickStep (ax.Dimension);
-
- TickEnumerator enumSmall = ax.GetTickEnumerator (minStep);
- if (enumSmall == null)
- return;
-
- TickEnumerator enumBig = ax.GetTickEnumerator (minStep * 2);
-
- if (enumBig == null) {
- DrawTicks (win, gc, enumSmall, ax.Position, ax.Dimension, ax.TickSize, ax.ShowLabels);
- } else {
- DrawTicks (win, gc, enumSmall, ax.Position, ax.Dimension, ax.TickSize / 2, false);
- DrawTicks (win, gc, enumBig, ax.Position, ax.Dimension, ax.TickSize, ax.ShowLabels);
- }
- }
+// void DrawAxis (Gdk.Window win, Gdk.GC gc, Axis ax)
+// {
+// double minStep = GetMinTickStep (ax.Dimension);
+//
+// TickEnumerator enumSmall = ax.GetTickEnumerator (minStep);
+// if (enumSmall == null)
+// return;
+//
+// TickEnumerator enumBig = ax.GetTickEnumerator (minStep * 2);
+//
+// if (enumBig == null) {
+// DrawTicks (win, gc, enumSmall, ax.Position, ax.Dimension, ax.TickSize, ax.ShowLabels);
+// } else {
+// DrawTicks (win, gc, enumSmall, ax.Position, ax.Dimension, ax.TickSize / 2, false);
+// DrawTicks (win, gc, enumBig, ax.Position, ax.Dimension, ax.TickSize, ax.ShowLabels);
+// }
+// }
- void DrawTicks (Gdk.Window win, Gdk.GC gc, TickEnumerator e, AxisPosition pos, AxisDimension ad, int tickSize, bool showLabels)
- {
- int rwidth, rheight;
- win.GetSize (out rwidth, out rheight);
-
- Pango.Layout layout = null;
-
- if (showLabels) {
- layout = new Pango.Layout (this.PangoContext);
- layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
- }
-
- bool isX = pos == AxisPosition.Top || pos == AxisPosition.Bottom;
- bool isTop = pos == AxisPosition.Top || pos == AxisPosition.Right;
-
- double start = GetStart (ad);
- double end = GetEnd (ad);
-
- e.Init (GetOrigin (ad));
-
- while (e.CurrentValue > start)
- e.MovePrevious ();
-
- int lastPosLabel;
- int lastPos;
- int lastTw = 0;
-
- if (isX) {
- lastPosLabel = reverseXAxis ? left + width + MinLabelGapX : left - MinLabelGapX;
- lastPos = left - minTickStep*2;
- }
- else {
- lastPosLabel = reverseYAxis ? top - MinLabelGapY : rheight + MinLabelGapY;
- lastPos = top + height + minTickStep*2;
- }
-
- for ( ; e.CurrentValue <= end; e.MoveNext ())
- {
- int px, py;
- int tw = 0, th = 0;
- int tick = tickSize;
-
- GetPoint (e.CurrentValue, e.CurrentValue, out px, out py);
-
- if (showLabels) {
- layout.SetMarkup (e.CurrentLabel);
- layout.GetPixelSize (out tw, out th);
- }
-
- if (isX) {
- if (Math.Abs ((long)px - (long)lastPos) < minTickStep || px < left || px > left + width)
- continue;
- lastPos = px;
-
- bool labelFits = false;
- if ((Math.Abs (px - lastPosLabel) - (tw/2) - (lastTw/2)) >= MinLabelGapX) {
- lastPosLabel = px;
- lastTw = tw;
- labelFits = true;
- }
-
- if (isTop) {
- if (showLabels) {
- if (labelFits)
- win.DrawLayout (gc, px - (tw/2), top - AreaBorderWidth - th, layout);
- else
- tick = tick / 2;
- }
- win.DrawLine (gc, px, top, px, top + tick);
- }
- else {
- if (showLabels) {
- if (labelFits)
- win.DrawLayout (gc, px - (tw/2), top + height + AreaBorderWidth, layout);
- else
- tick = tick / 2;
- }
- win.DrawLine (gc, px, top + height, px, top + height - tick);
- }
- }
- else {
- if (Math.Abs ((long)lastPos - (long)py) < minTickStep || py < top || py > top + height)
- continue;
- lastPos = py;
-
- bool labelFits = false;
- if ((Math.Abs (py - lastPosLabel) - (th/2) - (lastTw/2)) >= MinLabelGapY) {
- lastPosLabel = py;
- lastTw = th;
- labelFits = true;
- }
-
- if (isTop) {
- if (showLabels) {
- if (labelFits)
- win.DrawLayout (gc, left + width + AreaBorderWidth + 1, py - (th/2), layout);
- else
- tick = tick / 2;
- }
- win.DrawLine (gc, left + width, py, left + width - tick, py);
- }
- else {
- if (showLabels) {
- if (labelFits)
- win.DrawLayout (gc, left - AreaBorderWidth - tw - 1, py - (th/2), layout);
- else
- tick = tick / 2;
- }
- win.DrawLine (gc, left, py, left + tick, py);
- }
- }
- }
- layout?.Dispose ();
- }
+// void DrawTicks (Gdk.Window win, Gdk.GC gc, TickEnumerator e, AxisPosition pos, AxisDimension ad, int tickSize, bool showLabels)
+// {
+// int rwidth, rheight;
+// win.GetSize (out rwidth, out rheight);
+//
+// Pango.Layout layout = null;
+//
+// if (showLabels) {
+// layout = new Pango.Layout (this.PangoContext);
+// layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+// }
+//
+// bool isX = pos == AxisPosition.Top || pos == AxisPosition.Bottom;
+// bool isTop = pos == AxisPosition.Top || pos == AxisPosition.Right;
+//
+// double start = GetStart (ad);
+// double end = GetEnd (ad);
+//
+// e.Init (GetOrigin (ad));
+//
+// while (e.CurrentValue > start)
+// e.MovePrevious ();
+//
+// int lastPosLabel;
+// int lastPos;
+// int lastTw = 0;
+//
+// if (isX) {
+// lastPosLabel = reverseXAxis ? left + width + MinLabelGapX : left - MinLabelGapX;
+// lastPos = left - minTickStep*2;
+// }
+// else {
+// lastPosLabel = reverseYAxis ? top - MinLabelGapY : rheight + MinLabelGapY;
+// lastPos = top + height + minTickStep*2;
+// }
+//
+// for ( ; e.CurrentValue <= end; e.MoveNext ())
+// {
+// int px, py;
+// int tw = 0, th = 0;
+// int tick = tickSize;
+//
+// GetPoint (e.CurrentValue, e.CurrentValue, out px, out py);
+//
+// if (showLabels) {
+// layout.SetMarkup (e.CurrentLabel);
+// layout.GetPixelSize (out tw, out th);
+// }
+//
+// if (isX) {
+// if (Math.Abs ((long)px - (long)lastPos) < minTickStep || px < left || px > left + width)
+// continue;
+// lastPos = px;
+//
+// bool labelFits = false;
+// if ((Math.Abs (px - lastPosLabel) - (tw/2) - (lastTw/2)) >= MinLabelGapX) {
+// lastPosLabel = px;
+// lastTw = tw;
+// labelFits = true;
+// }
+//
+// if (isTop) {
+// if (showLabels) {
+// if (labelFits)
+// win.DrawLayout (gc, px - (tw/2), top - AreaBorderWidth - th, layout);
+// else
+// tick = tick / 2;
+// }
+// win.DrawLine (gc, px, top, px, top + tick);
+// }
+// else {
+// if (showLabels) {
+// if (labelFits)
+// win.DrawLayout (gc, px - (tw/2), top + height + AreaBorderWidth, layout);
+// else
+// tick = tick / 2;
+// }
+// win.DrawLine (gc, px, top + height, px, top + height - tick);
+// }
+// }
+// else {
+// if (Math.Abs ((long)lastPos - (long)py) < minTickStep || py < top || py > top + height)
+// continue;
+// lastPos = py;
+//
+// bool labelFits = false;
+// if ((Math.Abs (py - lastPosLabel) - (th/2) - (lastTw/2)) >= MinLabelGapY) {
+// lastPosLabel = py;
+// lastTw = th;
+// labelFits = true;
+// }
+//
+// if (isTop) {
+// if (showLabels) {
+// if (labelFits)
+// win.DrawLayout (gc, left + width + AreaBorderWidth + 1, py - (th/2), layout);
+// else
+// tick = tick / 2;
+// }
+// win.DrawLine (gc, left + width, py, left + width - tick, py);
+// }
+// else {
+// if (showLabels) {
+// if (labelFits)
+// win.DrawLayout (gc, left - AreaBorderWidth - tw - 1, py - (th/2), layout);
+// else
+// tick = tick / 2;
+// }
+// win.DrawLine (gc, left, py, left + tick, py);
+// }
+// }
+// }
+// layout?.Dispose ();
+// }
int MeasureAxisSize (AxisPosition pos)
{
@@ -835,70 +835,70 @@ void DrawSerie (Cairo.Context ctx, Serie serie)
void DrawCursor (ChartCursor cursor)
{
- using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
- gc.RgbFgColor = cursor.Color;
-
- int x, y;
- GetPoint (cursor.Value, cursor.Value, out x, out y);
-
- if (cursor.Dimension == AxisDimension.X) {
- int cy = top - AreaBorderWidth - 1;
- Point [] ps = new Point [4];
- ps [0] = new Point (x, cy);
- ps [1] = new Point (x + (cursor.HandleSize / 2), cy - cursor.HandleSize + 1);
- ps [2] = new Point (x - (cursor.HandleSize / 2), cy - cursor.HandleSize + 1);
- ps [3] = ps [0];
- GdkWindow.DrawPolygon (gc, false, ps);
- if (activeCursor == cursor)
- GdkWindow.DrawPolygon (gc, true, ps);
- GdkWindow.DrawLine (gc, x, top, x, top + height);
- } else {
- throw new NotSupportedException ();
- }
- }
+// using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
+// gc.RgbFgColor = cursor.Color;
+//
+// int x, y;
+// GetPoint (cursor.Value, cursor.Value, out x, out y);
+//
+// if (cursor.Dimension == AxisDimension.X) {
+// int cy = top - AreaBorderWidth - 1;
+// Point [] ps = new Point [4];
+// ps [0] = new Point (x, cy);
+// ps [1] = new Point (x + (cursor.HandleSize / 2), cy - cursor.HandleSize + 1);
+// ps [2] = new Point (x - (cursor.HandleSize / 2), cy - cursor.HandleSize + 1);
+// ps [3] = ps [0];
+// GdkWindow.DrawPolygon (gc, false, ps);
+// if (activeCursor == cursor)
+// GdkWindow.DrawPolygon (gc, true, ps);
+// GdkWindow.DrawLine (gc, x, top, x, top + height);
+// } else {
+// throw new NotSupportedException ();
+// }
+// }
}
void DrawCursorLabel (ChartCursor cursor)
{
- using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
- gc.RgbFgColor = cursor.Color;
-
- int x, y;
- GetPoint (cursor.Value, cursor.Value, out x, out y);
-
- if (cursor.Dimension == AxisDimension.X) {
-
- string text;
-
- if (cursor.LabelAxis != null) {
- double minStep = GetMinTickStep (cursor.Dimension);
- TickEnumerator tenum = cursor.LabelAxis.GetTickEnumerator (minStep);
- tenum.Init (cursor.Value);
- text = tenum.CurrentLabel;
- } else {
- text = GetValueLabel (cursor.Dimension, cursor.Value);
- }
-
- if (text != null && text.Length > 0) {
- Pango.Layout layout = new Pango.Layout (this.PangoContext);
- layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
- layout.SetMarkup (text);
-
- int tw, th;
- layout.GetPixelSize (out tw, out th);
- int tl = x - tw / 2;
- int tt = top + 4;
- if (tl + tw + 2 >= left + width) tl = left + width - tw - 1;
- if (tl < left + 1) tl = left + 1;
- GdkWindow.DrawRectangle (Style.WhiteGC, true, tl - 1, tt - 1, tw + 2, th + 2);
- GdkWindow.DrawRectangle (Style.BlackGC, false, tl - 2, tt - 2, tw + 3, th + 3);
- GdkWindow.DrawLayout (gc, tl, tt, layout);
- layout.Dispose ();
- }
- } else {
- throw new NotSupportedException ();
- }
- }
+// using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
+// gc.RgbFgColor = cursor.Color;
+//
+// int x, y;
+// GetPoint (cursor.Value, cursor.Value, out x, out y);
+//
+// if (cursor.Dimension == AxisDimension.X) {
+//
+// string text;
+//
+// if (cursor.LabelAxis != null) {
+// double minStep = GetMinTickStep (cursor.Dimension);
+// TickEnumerator tenum = cursor.LabelAxis.GetTickEnumerator (minStep);
+// tenum.Init (cursor.Value);
+// text = tenum.CurrentLabel;
+// } else {
+// text = GetValueLabel (cursor.Dimension, cursor.Value);
+// }
+//
+// if (text != null && text.Length > 0) {
+// Pango.Layout layout = new Pango.Layout (this.PangoContext);
+// layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+// layout.SetMarkup (text);
+//
+// int tw, th;
+// layout.GetPixelSize (out tw, out th);
+// int tl = x - tw / 2;
+// int tt = top + 4;
+// if (tl + tw + 2 >= left + width) tl = left + width - tw - 1;
+// if (tl < left + 1) tl = left + 1;
+// GdkWindow.DrawRectangle (Style.WhiteGC, true, tl - 1, tt - 1, tw + 2, th + 2);
+// GdkWindow.DrawRectangle (Style.BlackGC, false, tl - 2, tt - 2, tw + 3, th + 3);
+// GdkWindow.DrawLayout (gc, tl, tt, layout);
+// layout.Dispose ();
+// }
+// } else {
+// throw new NotSupportedException ();
+// }
+// }
}
void GetPoint (double wx, double wy, out int x, out int y)
@@ -947,7 +947,7 @@ string GetValueLabel (AxisDimension ad, double value)
return null;
}
- internal void OnLayoutChanged ()
+ /*internal*/public void OnLayoutChanged ()
{
xrangeChanged = true;
yrangeChanged = true;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
index 8333696daa4..9c45d63e5f1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
@@ -141,8 +141,8 @@ void Update (CommandInfo cmdInfo)
label.Xalign = 0.0f;
label.Show ();
- ((Gtk.Box) child).PackStart (label);
- ((Gtk.Box) child).PackStart (accel_label);
+ ((Gtk.Box) child).PackStart (label, false, true, 0);
+ ((Gtk.Box) child).PackStart (accel_label, false, true, 0);
child.Show ();
this.Remove (Child);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
index 22abd3aa5fd..759f515125d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
@@ -101,10 +101,16 @@ protected override void OnRealized ()
EnsurePopulated ();
}
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
EnsurePopulated ();
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ EnsurePopulated ();
+ base.OnGetPreferredWidth (out min_width, out natural_width);
}
internal void Update ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
index 3302f8da77b..d69476fa79b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuBar.cs
@@ -43,16 +43,16 @@ internal CommandManager CommandManager {
get { return manager; }
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- context.SetSourceColor (Style.Light (StateType.Normal).ToCairoColor ());
- context.Paint ();
- }
-
- foreach (Gtk.Widget child in Children)
- (this as Gtk.Container).PropagateExpose (child, evnt);
- return false;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// context.SetSourceColor (Style.Light (StateType.Normal).ToCairoColor ());
+// context.Paint ();
+// }
+//
+// foreach (Gtk.Widget child in Children)
+// (this as Gtk.Container).PropagateExpose (child, evnt);
+// return false;
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
index 896dc4d5737..0bbe56c5f39 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
@@ -209,8 +209,8 @@ void Update (CommandInfo cmdInfo)
label.Xalign = 0.0f;
label.Show ();
- ((Gtk.Box) child).PackStart (label);
- ((Gtk.Box) child).PackStart (accel_label);
+ ((Gtk.Box) child).PackStart (label, false, true, 0);
+ ((Gtk.Box) child).PackStart (accel_label, false, true, 0);
child.Show ();
this.Remove (Child);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
index 41f3709714a..bcd995d8110 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
@@ -246,18 +246,18 @@ protected override void OnRealized ()
base.OnRealized ();
GdkWindow.Opacity = 0.4;
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- int w, h;
- GetSize (out w, out h);
-
- using (var ctx = CairoHelper.Create (evnt.Window)) {
- ctx.SetSourceColor (new Cairo.Color (0.17, 0.55, 0.79));
- ctx.Rectangle (Allocation.ToCairoRect ());
- ctx.Fill ();
- }
- return true;
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// int w, h;
+// GetSize (out w, out h);
+//
+// using (var ctx = CairoHelper.Create (evnt.Window)) {
+// ctx.SetSourceColor (new Cairo.Color (0.17, 0.55, 0.79));
+// ctx.Rectangle (Allocation.ToCairoRect ());
+// ctx.Fill ();
+// }
+// return true;
+// }
public void Relocate (int x, int y, int w, int h, bool animate)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
index 8fbd898711c..85501ec62f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs
@@ -165,7 +165,7 @@ public TabStrip (DockNotebook notebook)
Add (innerBox);
this.notebook = notebook;
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+ this.AppPaintable = true;
Events |= EventMask.PointerMotionMask | EventMask.LeaveNotifyMask | EventMask.ButtonPressMask;
var arr = new Xwt.ImageView (tabbarPrevImage);
@@ -235,7 +235,7 @@ public TabStrip (DockNotebook notebook)
tab.AccessibilityPressCloseButton += OnAccessibilityPressCloseButton;
tab.AccessibilityShowMenu += OnAccessibilityShowMenu;
}
- }
+ }
UpdateAccessibilityTabs ();
notebook.PageAdded += PageAddedHandler;
notebook.PageRemoved += PageRemovedHandler;
@@ -254,14 +254,14 @@ protected override void OnDestroyed ()
void PageAddedHandler (object sender, TabEventArgs args)
{
- var tab = args.Tab;
+ var tab = args.Tab;
- if (tab.Accessible != null) {
+ if (tab.Accessible != null) {
Accessible.AddAccessibleElement (tab.Accessible);
- Accessible.AddAccessibleElement (tab.CloseButtonAccessible);
-
- tab.AccessibilityPressTab += OnAccessibilityPressTab;
- tab.AccessibilityPressCloseButton += OnAccessibilityPressCloseButton;
+ Accessible.AddAccessibleElement (tab.CloseButtonAccessible);
+
+ tab.AccessibilityPressTab += OnAccessibilityPressTab;
+ tab.AccessibilityPressCloseButton += OnAccessibilityPressCloseButton;
tab.AccessibilityShowMenu += OnAccessibilityShowMenu;
}
@@ -272,13 +272,13 @@ void PageAddedHandler (object sender, TabEventArgs args)
void PageRemovedHandler (object sender, TabEventArgs args)
{
- var tab = args.Tab;
+ var tab = args.Tab;
+
+ if (tab.Accessible != null) {
+ tab.AccessibilityPressTab -= OnAccessibilityPressTab;
+ tab.AccessibilityPressCloseButton -= OnAccessibilityPressCloseButton;
+ tab.AccessibilityShowMenu -= OnAccessibilityShowMenu;
- if (tab.Accessible != null) {
- tab.AccessibilityPressTab -= OnAccessibilityPressTab;
- tab.AccessibilityPressCloseButton -= OnAccessibilityPressCloseButton;
- tab.AccessibilityShowMenu -= OnAccessibilityShowMenu;
-
Accessible.RemoveAccessibleElement (tab.Accessible);
Accessible.RemoveAccessibleElement (tab.CloseButtonAccessible);
}
@@ -290,11 +290,11 @@ void PageRemovedHandler (object sender, TabEventArgs args)
UpdateAccessibilityTabs ();
}
- void PageReorderedHandler (DockNotebookTab tab, int oldPlacement, int newPlacement)
+ void PageReorderedHandler (DockNotebookTab tab, int oldPlacement, int newPlacement)
{
QueueResize ();
- UpdateAccessibilityTabs ();
+ UpdateAccessibilityTabs ();
}
void UpdateAccessibilityTabs ()
@@ -356,11 +356,16 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
Update ();
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ min_width = 0;
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
- requisition.Height = TotalHeight;
- requisition.Width = 0;
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ min_height = TotalHeight;
}
internal void InitSize ()
@@ -1120,17 +1125,17 @@ void Draw (Context ctx)
drawActive?.Invoke (ctx);
if (HasFocus) {
- Gtk.Style.PaintFocus (Style, GdkWindow, State, focusRect, this, "tab", focusRect.X, focusRect.Y, focusRect.Width, focusRect.Height);
+ Gtk.Style.PaintFocus (Style, ctx, State, /*focusRect,*/ this, "tab", focusRect.X, focusRect.Y, focusRect.Width, focusRect.Height);
}
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- using (var context = CairoHelper.Create (evnt.Window)) {
- Draw (context);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// using (var context = CairoHelper.Create (evnt.Window)) {
+// Draw (context);
+// }
+// return base.OnExposeEvent (evnt);
+// }
void DrawTab (Context ctx, DockNotebookTab tab, Gdk.Rectangle allocation, Gdk.Rectangle tabBounds, bool highlight, bool active, bool dragging, Pango.Layout la, bool focused)
{
@@ -1199,7 +1204,7 @@ void DrawTab (Context ctx, DockNotebookTab tab, Gdk.Rectangle allocation, Gdk.Re
ctx.SetSource (lg);
Pango.CairoHelper.ShowLayout (ctx, la.GetLine (0).Layout);
}
- }
+ }
la.Dispose ();
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
index 64b1158b837..47502caf7f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
@@ -148,7 +148,7 @@ public AutoHideBox (DockFrame frame, DockItem item, Gtk.PositionType pos, int si
sepBox.ButtonPressEvent += OnSizeButtonPress;
sepBox.ButtonReleaseEvent += OnSizeButtonRelease;
sepBox.MotionNotifyEvent += OnSizeMotion;
- sepBox.ExposeEvent += OnGripExpose;
+// sepBox.ExposeEvent += OnGripExpose;
sepBox.EnterNotifyEvent += delegate { insideGrip = true; sepBox.QueueDraw (); };
sepBox.LeaveNotifyEvent += delegate { insideGrip = false; sepBox.QueueDraw (); };
}
@@ -361,16 +361,16 @@ void OnSizeMotion (object ob, Gtk.MotionNotifyEventArgs args)
}
}
- void OnGripExpose (object sender, Gtk.ExposeEventArgs args)
- {
- var w = (EventBox) sender;
- StateType s = insideGrip ? StateType.Prelight : StateType.Normal;
-
- using (var ctx = CairoHelper.Create (args.Event.Window)) {
- ctx.SetSourceColor (w.Style.Background (s).ToCairoColor ());
- ctx.Paint ();
- }
- }
+// void OnGripExpose (object sender, Gtk.ExposeEventArgs args)
+// {
+// var w = (EventBox) sender;
+// StateType s = insideGrip ? StateType.Prelight : StateType.Normal;
+//
+// using (var ctx = CairoHelper.Create (args.Event.Window)) {
+// ctx.SetSourceColor (w.Style.Background (s).ToCairoColor ());
+// ctx.Paint ();
+// }
+// }
}
class ScrollableContainer: EventBox
@@ -396,15 +396,24 @@ public void SetSize (PositionType expandPosition, int targetSize)
QueueResize ();
}
- protected override void OnSizeRequested (ref Requisition req)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ if (scrollMode || Child == null) {
+ min_height = 0;
+ }
+ else
+ min_height = Child.SizeRequest ().Height;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- base.OnSizeRequested (ref req);
+ base.OnGetPreferredWidth (out min_width, out natural_width);
if (scrollMode || Child == null) {
- req.Width = 0;
- req.Height = 0;
+ min_width = 0;
}
else
- req = Child.SizeRequest ();
+ min_width = Child.SizeRequest ().Width;
}
protected override void OnSizeAllocated (Rectangle alloc)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
index d269d7b6f10..8cb3215ea29 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs
@@ -61,7 +61,7 @@ internal DockBar (DockFrame frame, Gtk.PositionType position)
filler = new Label ();
filler.WidthRequest = 4;
filler.HeightRequest = 4;
- box.PackEnd (filler);
+ box.PackEnd (filler, false, true, 0);
ShowAll ();
UpdateVisibility ();
@@ -125,7 +125,7 @@ internal DockBarItem AddItem (DockItem item, int size)
it.ShowAll ();
UpdateVisibility ();
it.Shown += OnItemVisibilityChanged;
- it.Hidden += OnItemVisibilityChanged;
+ it.Hidden += OnItemVisibilityChanged;
return it;
}
@@ -160,7 +160,7 @@ internal void UpdateVisibility ()
internal void RemoveItem (DockBarItem it)
{
DisableHoverActivation ();
- box.Remove (it);
+ box.Remove (it);
it.Shown -= OnItemVisibilityChanged;
it.Hidden -= OnItemVisibilityChanged;
UpdateVisibility ();
@@ -181,16 +181,25 @@ internal void UpdateStyle (DockItem item)
{
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+
+ if (ShowBorder) {
+ // Add space for the separator
+ if (Orientation == Gtk.Orientation.Horizontal)
+ min_height++;
+ }
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out min_width, out natural_width);
if (ShowBorder) {
// Add space for the separator
if (Orientation == Gtk.Orientation.Vertical)
- requisition.Width++;
- else
- requisition.Height++;
+ min_width++;
}
}
@@ -208,35 +217,35 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
}
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- var alloc = Allocation;
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- ctx.Rectangle (alloc.X, alloc.Y, alloc.X + alloc.Width, alloc.Y + alloc.Height);
- ctx.SetSourceColor (Styles.DockBarBackground.ToCairoColor ());
- ctx.Fill ();
- }
-
- if (Child != null)
- PropagateExpose (Child, evnt);
-
- if (ShowBorder) {
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- ctx.LineWidth = 1;
-
- // Dark separator
- switch (Position) {
- case PositionType.Left:ctx.MoveTo (alloc.X + alloc.Width - 0.5, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break;
- case PositionType.Right: ctx.MoveTo (alloc.X + 0.5, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break;
- case PositionType.Top: ctx.MoveTo (alloc.X, alloc.Y + alloc.Height + 0.5); ctx.RelLineTo (Allocation.Width, 0); break;
- case PositionType.Bottom: ctx.MoveTo (alloc.X, alloc.Y + 0.5); ctx.RelLineTo (Allocation.Width, 0); break;
- }
- ctx.SetSourceColor (Styles.DockSeparatorColor.ToCairoColor ());
- ctx.Stroke ();
- }
- }
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// var alloc = Allocation;
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// ctx.Rectangle (alloc.X, alloc.Y, alloc.X + alloc.Width, alloc.Y + alloc.Height);
+// ctx.SetSourceColor (Styles.DockBarBackground.ToCairoColor ());
+// ctx.Fill ();
+// }
+//
+// if (Child != null)
+// PropagateExpose (Child, evnt);
+//
+// if (ShowBorder) {
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// ctx.LineWidth = 1;
+//
+// // Dark separator
+// switch (Position) {
+// case PositionType.Left:ctx.MoveTo (alloc.X + alloc.Width - 0.5, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break;
+// case PositionType.Right: ctx.MoveTo (alloc.X + 0.5, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break;
+// case PositionType.Top: ctx.MoveTo (alloc.X, alloc.Y + alloc.Height + 0.5); ctx.RelLineTo (Allocation.Width, 0); break;
+// case PositionType.Bottom: ctx.MoveTo (alloc.X, alloc.Y + 0.5); ctx.RelLineTo (Allocation.Width, 0); break;
+// }
+// ctx.SetSourceColor (Styles.DockSeparatorColor.ToCairoColor ());
+// ctx.Stroke ();
+// }
+// }
+// return true;
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
index 28c94b36e51..2bf25a4cb6d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
@@ -87,27 +87,33 @@ protected override void OnDestroyed ()
base.OnDestroyed ();
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out min_height, out natural_height);
- requisition.Width = (int) primary.Width;
- requisition.Height = (int) primary.Height;
+ min_height = (int) primary.Height;
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- using (Cairo.Context context = Gdk.CairoHelper.Create (evnt.Window)) {
- if (secondaryOpacity < 1.0f)
- RenderIcon (context, primary, 1.0f - (float)Math.Pow (secondaryOpacity, 3.0f));
+ base.OnGetPreferredWidth (out min_width, out natural_width);
- if (secondaryOpacity > 0.0f)
- RenderIcon (context, secondary, secondaryOpacity);
- }
-
- return false;
+ min_width = (int) primary.Width;
}
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (Cairo.Context context = Gdk.CairoHelper.Create (evnt.Window)) {
+// if (secondaryOpacity < 1.0f)
+// RenderIcon (context, primary, 1.0f - (float)Math.Pow (secondaryOpacity, 3.0f));
+//
+// if (secondaryOpacity > 0.0f)
+// RenderIcon (context, secondary, secondaryOpacity);
+// }
+//
+// return false;
+// }
+
void RenderIcon (Cairo.Context context, Xwt.Drawing.Image surface, double opacity)
{
context.DrawImage (this, surface.WithAlpha (opacity),
@@ -503,44 +509,44 @@ protected override bool OnButtonReleaseEvent (Gdk.EventButton evnt)
return true;
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- var alloc = Allocation;
-
- // TODO: VV: Remove preflight gradient features and replace with a flat color
-
- Cairo.LinearGradient lg;
-
- if (bar.Orientation == Orientation.Horizontal) {
- lg = new Cairo.LinearGradient (alloc.X, 0, alloc.X + alloc.Width, 0);
- } else {
- lg = new Cairo.LinearGradient (0, alloc.Y, 0, alloc.Y + alloc.Height);
- }
-
- using (lg) {
- Cairo.Color primaryColor = Styles.DockBarPrelightColor.ToCairoColor ();
- primaryColor.A = hoverProgress;
-
- Cairo.Color transparent = primaryColor;
- transparent.A = 0;
-
- lg.AddColorStop (0.0, transparent);
- lg.AddColorStop (0.35, primaryColor);
- lg.AddColorStop (0.65, primaryColor);
- lg.AddColorStop (1.0, transparent);
-
- context.Rectangle (alloc.ToCairoRect ());
- context.SetSource (lg);
- }
- context.Fill ();
- }
-
- if (HasFocus) {
- Gtk.Style.PaintFocus (Style, GdkWindow, State, Allocation, this, "button", Allocation.X + 2, Allocation.Y + 2, Allocation.Width - 4, Allocation.Height - 4);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// var alloc = Allocation;
+//
+// // TODO: VV: Remove preflight gradient features and replace with a flat color
+//
+// Cairo.LinearGradient lg;
+//
+// if (bar.Orientation == Orientation.Horizontal) {
+// lg = new Cairo.LinearGradient (alloc.X, 0, alloc.X + alloc.Width, 0);
+// } else {
+// lg = new Cairo.LinearGradient (0, alloc.Y, 0, alloc.Y + alloc.Height);
+// }
+//
+// using (lg) {
+// Cairo.Color primaryColor = Styles.DockBarPrelightColor.ToCairoColor ();
+// primaryColor.A = hoverProgress;
+//
+// Cairo.Color transparent = primaryColor;
+// transparent.A = 0;
+//
+// lg.AddColorStop (0.0, transparent);
+// lg.AddColorStop (0.35, primaryColor);
+// lg.AddColorStop (0.65, primaryColor);
+// lg.AddColorStop (1.0, transparent);
+//
+// context.Rectangle (alloc.ToCairoRect ());
+// context.SetSource (lg);
+// }
+// context.Fill ();
+// }
+//
+// if (HasFocus) {
+// Gtk.Style.PaintFocus (Style, GdkWindow, State, Allocation, this, "button", Allocation.X + 2, Allocation.Y + 2, Allocation.Width - 4, Allocation.Height - 4);
+// }
+// return base.OnExposeEvent (evnt);
+// }
protected override bool OnFocusInEvent (Gdk.EventFocus evnt)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
index 16b90c98549..7029a4465e0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
@@ -132,12 +132,24 @@ public void StoreAllocation ()
layout.StoreAllocation ();
}
- protected override void OnSizeRequested (ref Requisition req)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
+ min_width = 0;
if (layout != null) {
LayoutWidgets ();
- req = layout.SizeRequest ();
+ min_width = layout.SizeRequest ().Width;
}
+ natural_width = min_width;
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ min_height = 0;
+ if (layout != null) {
+ LayoutWidgets ();
+ min_height = layout.SizeRequest ().Height;
+ }
+ natural_height = min_height;
}
protected override void OnSizeAllocated (Gdk.Rectangle rect)
@@ -193,15 +205,15 @@ protected override void ForAll (bool include_internals, Gtk.Callback callback)
callback (s);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- bool res = base.OnExposeEvent (evnt);
-
- if (layout != null) {
- layout.Draw (evnt.Area, null, 0);
- }
- return res;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// bool res = base.OnExposeEvent (evnt);
+//
+// if (layout != null) {
+// layout.Draw (evnt.Area, null, 0);
+// }
+// return res;
+// }
protected override void OnAdded (Widget widget)
{
@@ -351,17 +363,17 @@ int CountRequiredSplitters (DockGroup grp)
protected override void OnRealized ()
{
- WidgetFlags |= WidgetFlags.Realized;
-
+ this.IsRealized = true;
+
Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
attributes.X = Allocation.X;
attributes.Y = Allocation.Y;
attributes.Height = Allocation.Height;
attributes.Width = Allocation.Width;
attributes.WindowType = Gdk.WindowType.Child;
- attributes.Wclass = Gdk.WindowClass.InputOutput;
+// attributes.Wclass = Gdk.WindowClass.InputOutput;
attributes.Visual = Visual;
- attributes.Colormap = Colormap;
+// attributes.Colormap = Colormap;
attributes.EventMask = (int)(Events |
Gdk.EventMask.ExposureMask |
Gdk.EventMask.Button1MotionMask |
@@ -371,15 +383,15 @@ protected override void OnRealized ()
Gdk.WindowAttributesType attributes_mask =
Gdk.WindowAttributesType.X |
Gdk.WindowAttributesType.Y |
- Gdk.WindowAttributesType.Colormap |
+// Gdk.WindowAttributesType.Colormap |
Gdk.WindowAttributesType.Visual;
GdkWindow = new Gdk.Window (ParentWindow, attributes, (int)attributes_mask);
GdkWindow.UserData = Handle;
Style = Style.Attach (GdkWindow);
Style.SetBackground (GdkWindow, State);
- this.WidgetFlags &= ~WidgetFlags.NoWindow;
-
+ this.HasWindow = true;
+
//GdkWindow.SetBackPixmap (null, true);
ModifyBase (StateType.Normal, Styles.DockFrameBackground.ToGdkColor ());
@@ -390,7 +402,7 @@ protected override void OnUnrealized ()
if (this.GdkWindow != null) {
this.GdkWindow.UserData = IntPtr.Zero;
this.GdkWindow.Destroy ();
- this.WidgetFlags |= WidgetFlags.NoWindow;
+ this.HasWindow = false;
}
base.OnUnrealized ();
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
index 22d2b6dc898..ba7c8804d96 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs
@@ -948,7 +948,7 @@ internal void AddTopLevel (DockFrameTopLevel w, int x, int y, int width, int hei
w.Parent = this;
w.Size = new Size (width, height);
Requisition r = w.SizeRequest ();
- w.Allocation = new Gdk.Rectangle (Allocation.X + x, Allocation.Y + y, r.Width, r.Height);
+// w.Allocation = new Gdk.Rectangle (Allocation.X + x, Allocation.Y + y, r.Width, r.Height);
topLevels.Add (w);
}
}
@@ -1094,15 +1094,22 @@ internal void AutoHide (DockItem item, AutoHideBox widget, bool animate)
RemoveTopLevel (widget);
widget.Disposed = true;
- widget.Destroy ();
+ widget.Destroy ();
}
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
if (overlayWidget != null)
overlayWidget.SizeRequest ();
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ if (overlayWidget != null)
+ overlayWidget.SizeRequest ();
+ base.OnGetPreferredHeight (out min_height, out natural_height);
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -1139,15 +1146,15 @@ internal void MinimizeAllAutohidden ()
if (it.Visible && it.Status == DockItemStatus.AutoHide)
it.Minimize ();
}
- }
-
- static internal bool IsWindows {
- get { return System.IO.Path.DirectorySeparatorChar == '\\'; }
- }
-
- internal static Cairo.Color ToCairoColor (Gdk.Color color)
- {
- return new Cairo.Color (color.Red / (double) ushort.MaxValue, color.Green / (double) ushort.MaxValue, color.Blue / (double) ushort.MaxValue);
+ }
+
+ static internal bool IsWindows {
+ get { return System.IO.Path.DirectorySeparatorChar == '\\'; }
+ }
+
+ internal static Cairo.Color ToCairoColor (Gdk.Color color)
+ {
+ return new Cairo.Color (color.Red / (double) ushort.MaxValue, color.Green / (double) ushort.MaxValue, color.Blue / (double) ushort.MaxValue);
}
protected override bool OnFocused (DirectionType direction)
@@ -1159,7 +1166,7 @@ protected override bool OnFocused (DirectionType direction)
}
return base.OnFocused (direction);
- }
+ }
}
public class DockStyle
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs
index 3733a8b4a46..4727a51f77c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs
@@ -873,11 +873,11 @@ void DrawSeparators (Gdk.Rectangle exposedArea, DockGroup currentHandleGrp, int
int hw = horiz ? Frame.HandleSize : Allocation.Width;
int hh = horiz ? Allocation.Height : Frame.HandleSize;
- Gdk.GC hgc = null;
+// Gdk.GC hgc = null;
if (areasList == null && oper == DrawSeparatorOperation.Draw) {
- hgc = new Gdk.GC (Frame.Container.GdkWindow);
- hgc.RgbFgColor = Styles.DockFrameBackground.ToGdkColor ();
+// hgc = new Gdk.GC (Frame.Container.GdkWindow);
+// hgc.RgbFgColor = Styles.DockFrameBackground.ToGdkColor ();
}
for (int n=0; n leftMargin + rightMargin + leftPadding + rightPadding) {
allocation.X += leftMargin + leftPadding;
@@ -288,76 +298,76 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
allocation.Height -= topMargin + bottomMargin + topPadding + bottomPadding;
}
if (child != null)
- child.SizeAllocate (allocation);
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- Gdk.Rectangle rect = Allocation;
-
- //Gdk.Rectangle.Right and Bottom are inconsistent
- int right = rect.X + rect.Width, bottom = rect.Y + rect.Height;
-
- var bcolor = backgroundColorSet ? BackgroundColor : Style.Background (Gtk.StateType.Normal);
- using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
-
- if (GradientBackround) {
- cr.NewPath ();
- cr.MoveTo (rect.X, rect.Y);
- cr.RelLineTo (rect.Width, 0);
- cr.RelLineTo (0, rect.Height);
- cr.RelLineTo (-rect.Width, 0);
- cr.RelLineTo (0, -rect.Height);
- cr.ClosePath ();
-
- // FIXME: VV: Remove gradient features
- using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, bottom)) {
- pat.AddColorStop (0, bcolor.ToCairoColor ());
- Xwt.Drawing.Color gcol = bcolor.ToXwtColor ();
- gcol.Light -= 0.1;
- if (gcol.Light < 0)
- gcol.Light = 0;
- pat.AddColorStop (1, gcol.ToCairoColor ());
- cr.SetSource (pat);
- cr.Fill ();
- }
- } else {
- if (backgroundColorSet) {
- Gdk.GC gc = new Gdk.GC (GdkWindow);
- gc.RgbFgColor = bcolor;
- evnt.Window.DrawRectangle (gc, true, rect.X, rect.Y, rect.Width, rect.Height);
- gc.Dispose ();
- }
- }
-
- }
- base.OnExposeEvent (evnt);
-
- using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
- cr.SetSourceColor (BorderColor.ToCairoColor ());
-
- double y = rect.Y + topMargin / 2d;
- cr.LineWidth = topMargin;
- cr.Line (rect.X, y, right, y);
- cr.Stroke ();
-
- y = bottom - bottomMargin / 2d;
- cr.LineWidth = bottomMargin;
- cr.Line (rect.X, y, right, y);
- cr.Stroke ();
-
- double x = rect.X + leftMargin / 2d;
- cr.LineWidth = leftMargin;
- cr.Line (x, rect.Y, x, bottom);
- cr.Stroke ();
-
- x = right - rightMargin / 2d;
- cr.LineWidth = rightMargin;
- cr.Line (x, rect.Y, x, bottom);
- cr.Stroke ();
+ child.SizeAllocate (allocation);
+ }
- return false;
- }
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// Gdk.Rectangle rect = Allocation;
+//
+// //Gdk.Rectangle.Right and Bottom are inconsistent
+// int right = rect.X + rect.Width, bottom = rect.Y + rect.Height;
+//
+// var bcolor = backgroundColorSet ? BackgroundColor : Style.Background (Gtk.StateType.Normal);
+// using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
+//
+// if (GradientBackround) {
+// cr.NewPath ();
+// cr.MoveTo (rect.X, rect.Y);
+// cr.RelLineTo (rect.Width, 0);
+// cr.RelLineTo (0, rect.Height);
+// cr.RelLineTo (-rect.Width, 0);
+// cr.RelLineTo (0, -rect.Height);
+// cr.ClosePath ();
+//
+// // FIXME: VV: Remove gradient features
+// using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, bottom)) {
+// pat.AddColorStop (0, bcolor.ToCairoColor ());
+// Xwt.Drawing.Color gcol = bcolor.ToXwtColor ();
+// gcol.Light -= 0.1;
+// if (gcol.Light < 0)
+// gcol.Light = 0;
+// pat.AddColorStop (1, gcol.ToCairoColor ());
+// cr.SetSource (pat);
+// cr.Fill ();
+// }
+// } else {
+// if (backgroundColorSet) {
+// Gdk.GC gc = new Gdk.GC (GdkWindow);
+// gc.RgbFgColor = bcolor;
+// evnt.Window.DrawRectangle (gc, true, rect.X, rect.Y, rect.Width, rect.Height);
+// gc.Dispose ();
+// }
+// }
+//
+// }
+// base.OnExposeEvent (evnt);
+//
+// using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
+// cr.SetSourceColor (BorderColor.ToCairoColor ());
+//
+// double y = rect.Y + topMargin / 2d;
+// cr.LineWidth = topMargin;
+// cr.Line (rect.X, y, right, y);
+// cr.Stroke ();
+//
+// y = bottom - bottomMargin / 2d;
+// cr.LineWidth = bottomMargin;
+// cr.Line (rect.X, y, right, y);
+// cr.Stroke ();
+//
+// double x = rect.X + leftMargin / 2d;
+// cr.LineWidth = leftMargin;
+// cr.Line (x, rect.Y, x, bottom);
+// cr.Stroke ();
+//
+// x = right - rightMargin / 2d;
+// cr.LineWidth = rightMargin;
+// cr.Line (x, rect.Y, x, bottom);
+// cr.Stroke ();
+//
+// return false;
+// }
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
index d4532109acc..baec65b0280 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
@@ -187,10 +187,10 @@ void UpdateVisualStyle ()
if (!(Parent is TabStrip.TabStripBox))
labelWidget.Xalign = 0;
- }
-
- if (tabIcon != null) {
- tabIcon.Image = tabIcon.Image.WithAlpha (active ? 1.0 : inactiveIconAlpha);
+ }
+
+ if (tabIcon != null) {
+ tabIcon.Image = tabIcon.Image.WithAlpha (active ? 1.0 : inactiveIconAlpha);
tabIcon.Visible = visualStyle.ShowPadTitleIcon.Value;
}
@@ -214,82 +214,82 @@ public void SetLabel (Gtk.Widget page, Xwt.Drawing.Image icon, string label)
{
string labelNoSpaces = label != null ? label.Replace (' ', '-') : null;
this.label = label;
- this.page = page;
-
- if (icon == null)
+ this.page = page;
+
+ if (icon == null)
icon = ImageService.GetIcon ("md-empty");
- if (box == null) {
- box = new HBox ();
- box.Accessible.SetShouldIgnore (true);
- box.Spacing = -2;
-
- tabIcon = new ImageView ();
- tabIcon.Accessible.SetShouldIgnore (true);
- tabIcon.Show ();
+ if (box == null) {
+ box = new HBox ();
+ box.Accessible.SetShouldIgnore (true);
+ box.Spacing = -2;
+
+ tabIcon = new ImageView ();
+ tabIcon.Accessible.SetShouldIgnore (true);
+ tabIcon.Show ();
box.PackStart (tabIcon, false, false, 3);
labelWidget = new ExtendedLabel (label);
// Ignore the label because the title tab already contains its name
- labelWidget.Accessible.SetShouldIgnore (true);
- labelWidget.UseMarkup = true;
- var alignLabel = new Alignment (0.0f, 0.5f, 1, 1);
- alignLabel.Accessible.SetShouldIgnore (true);
- alignLabel.BottomPadding = 0;
- alignLabel.RightPadding = 15;
- alignLabel.Add (labelWidget);
- box.PackStart (alignLabel, false, false, 0);
-
- btnDock = new ImageButton ();
- btnDock.Image = pixAutoHide;
- btnDock.TooltipText = GettextCatalog.GetString ("Auto Hide");
+ labelWidget.Accessible.SetShouldIgnore (true);
+ labelWidget.UseMarkup = true;
+ var alignLabel = new Alignment (0.0f, 0.5f, 1, 1);
+ alignLabel.Accessible.SetShouldIgnore (true);
+ alignLabel.BottomPadding = 0;
+ alignLabel.RightPadding = 15;
+ alignLabel.Add (labelWidget);
+ box.PackStart (alignLabel, false, false, 0);
+
+ btnDock = new ImageButton ();
+ btnDock.Image = pixAutoHide;
+ btnDock.TooltipText = GettextCatalog.GetString ("Auto Hide");
btnDock.CanFocus = true;
// btnDock.WidthRequest = btnDock.HeightRequest = 17;
- btnDock.Clicked += OnClickDock;
- btnDock.ButtonPressEvent += (o, args) => args.RetVal = true;
- btnDock.WidthRequest = btnDock.SizeRequest ().Width;
- UpdateDockButtonAccessibilityLabels ();
-
- btnClose = new ImageButton ();
- btnClose.Image = pixClose;
- btnClose.TooltipText = GettextCatalog.GetString ("Close");
+ btnDock.Clicked += OnClickDock;
+ btnDock.ButtonPressEvent += (o, args) => args.RetVal = true;
+ btnDock.WidthRequest = btnDock.SizeRequest ().Width;
+ UpdateDockButtonAccessibilityLabels ();
+
+ btnClose = new ImageButton ();
+ btnClose.Image = pixClose;
+ btnClose.TooltipText = GettextCatalog.GetString ("Close");
btnClose.CanFocus = true;
// btnClose.WidthRequest = btnClose.HeightRequest = 17;
- btnClose.WidthRequest = btnDock.SizeRequest ().Width;
- btnClose.Clicked += delegate {
- item.Visible = false;
- };
- btnClose.ButtonPressEvent += (o, args) => args.RetVal = true;
-
- al = new Alignment (0, 0.5f, 1, 1);
- al.Accessible.SetShouldIgnore (true);
- HBox btnBox = new HBox (false, 0);
- btnBox.Accessible.SetShouldIgnore (true);
- btnBox.PackStart (btnDock, false, false, 3);
- btnBox.PackStart (btnClose, false, false, 1);
- al.Add (btnBox);
- box.PackEnd (al, false, false, 3);
-
+ btnClose.WidthRequest = btnDock.SizeRequest ().Width;
+ btnClose.Clicked += delegate {
+ item.Visible = false;
+ };
+ btnClose.ButtonPressEvent += (o, args) => args.RetVal = true;
+
+ al = new Alignment (0, 0.5f, 1, 1);
+ al.Accessible.SetShouldIgnore (true);
+ HBox btnBox = new HBox (false, 0);
+ btnBox.Accessible.SetShouldIgnore (true);
+ btnBox.PackStart (btnDock, false, false, 3);
+ btnBox.PackStart (btnClose, false, false, 1);
+ al.Add (btnBox);
+ box.PackEnd (al, false, false, 3);
+
Add (box);
- }
-
- tabIcon.Image = icon;
-
- string realLabel, realHelp;
- if (!string.IsNullOrEmpty (label)) {
- labelWidget.Parent.Show ();
- labelWidget.Name = label;
- btnDock.Name = string.Format ("btnDock_{0}", labelNoSpaces ?? string.Empty);
- btnClose.Name = string.Format ("btnClose_{0}", labelNoSpaces ?? string.Empty);
- realLabel = GettextCatalog.GetString ("Close {0}", label);
- realHelp = GettextCatalog.GetString ("Close the {0} pad", label);
- } else {
- labelWidget.Parent.Hide ();
- realLabel = GettextCatalog.GetString ("Close pad");
- realHelp = GettextCatalog.GetString ("Close the pad");
- }
-
- btnClose.Accessible.SetLabel (realLabel);
+ }
+
+ tabIcon.Image = icon;
+
+ string realLabel, realHelp;
+ if (!string.IsNullOrEmpty (label)) {
+ labelWidget.Parent.Show ();
+ labelWidget.Name = label;
+ btnDock.Name = string.Format ("btnDock_{0}", labelNoSpaces ?? string.Empty);
+ btnClose.Name = string.Format ("btnClose_{0}", labelNoSpaces ?? string.Empty);
+ realLabel = GettextCatalog.GetString ("Close {0}", label);
+ realHelp = GettextCatalog.GetString ("Close the {0} pad", label);
+ } else {
+ labelWidget.Parent.Hide ();
+ realLabel = GettextCatalog.GetString ("Close pad");
+ realHelp = GettextCatalog.GetString ("Close the pad");
+ }
+
+ btnClose.Accessible.SetLabel (realLabel);
btnClose.Accessible.Description = realHelp;
if (label != null) {
@@ -692,16 +692,27 @@ protected override void OnRealized ()
UpdateVisualStyle ();
}
- protected override void OnSizeRequested (ref Gtk.Requisition req)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
+ min_height = 0;
if (Child != null) {
- req = Child.SizeRequest ();
- req.Width += (int)(TabPadding.Left + TabPadding.Right);
+ Requisition req = Child.SizeRequest ();
if (active)
- req.Height += (int)(TabActivePadding.Top + TabActivePadding.Bottom);
+ min_height += (int)(TabActivePadding.Top + TabActivePadding.Bottom);
else
- req.Height += (int)(TabPadding.Top + TabPadding.Bottom);
+ min_height += (int)(TabPadding.Top + TabPadding.Bottom);
}
+ natural_height = min_height;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ min_width = 0;
+ if (Child != null) {
+ Requisition req = Child.SizeRequest ();
+ min_width += (int)(TabPadding.Left + TabPadding.Right);
+ }
+ natural_width = min_width;
}
protected override void OnSizeAllocated (Gdk.Rectangle rect)
@@ -728,20 +739,20 @@ protected override void OnSizeAllocated (Gdk.Rectangle rect)
}
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (VisualStyle.TabStyle == DockTabStyle.Normal)
- DrawAsBrowser (evnt);
- else
- DrawNormal (evnt);
-
- if (HasFocus) {
- var alloc = labelWidget.Allocation;
- Gtk.Style.PaintFocus (Style, GdkWindow, State, alloc, this, "label",
- alloc.X, alloc.Y, alloc.Width, alloc.Height);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (VisualStyle.TabStyle == DockTabStyle.Normal)
+// DrawAsBrowser (evnt);
+// else
+// DrawNormal (evnt);
+//
+// if (HasFocus) {
+// var alloc = labelWidget.Allocation;
+// Gtk.Style.PaintFocus (Style, GdkWindow, State, alloc, this, "label",
+// alloc.X, alloc.Y, alloc.Width, alloc.Height);
+// }
+// return base.OnExposeEvent (evnt);
+// }
void DrawAsBrowser (Gdk.EventExpose evnt)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
index 935fa341a9a..a337f672ed7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/PlaceholderWindow.cs
@@ -36,7 +36,7 @@ namespace MonoDevelop.Components.Docking
{
internal class PlaceholderWindow: Gtk.Window
{
- Gdk.GC redgc;
+// Gdk.GC redgc;
uint anim;
int rx, ry, rw, rh;
bool allowDocking;
@@ -60,17 +60,17 @@ public PlaceholderWindow (DockFrame frame): base (Gtk.WindowType.Popup)
// Create the mask for the arrow
Realize ();
- redgc = new Gdk.GC (GdkWindow);
- redgc.RgbFgColor = frame.Style.Background (StateType.Selected);
+// redgc = new Gdk.GC (GdkWindow);
+// redgc.RgbFgColor = frame.Style.Background (StateType.Selected);
}
- protected override void OnDestroyed ()
+ protected override void OnDestroyed ()
{
- if (redgc != null) {
- redgc.Dispose ();
- redgc = null;
- }
- base.OnDestroyed ();
+// if (redgc != null) {
+// redgc.Dispose ();
+// redgc = null;
+// }
+ base.OnDestroyed ();
}
protected override void OnRealized ()
@@ -85,20 +85,20 @@ void CreateShape (int width, int height)
black = new Gdk.Color (0, 0, 0);
black.Pixel = 1;
white = new Gdk.Color (255, 255, 255);
- white.Pixel = 0;
-
- using (Gdk.Pixmap pm = new Pixmap (this.GdkWindow, width, height, 1)) {
- using (Gdk.GC gc = new Gdk.GC (pm)) {
- gc.Background = white;
- gc.Foreground = white;
- pm.DrawRectangle (gc, true, 0, 0, width, height);
-
- gc.Foreground = black;
- pm.DrawRectangle (gc, false, 0, 0, width - 1, height - 1);
- pm.DrawRectangle (gc, false, 1, 1, width - 3, height - 3);
- }
- this.ShapeCombineMask (pm, 0, 0);
- }
+ white.Pixel = 0;
+
+// using (Gdk.Pixmap pm = new Pixmap (this.GdkWindow, width, height, 1)) {
+// using (Gdk.GC gc = new Gdk.GC (pm)) {
+// gc.Background = white;
+// gc.Foreground = white;
+// pm.DrawRectangle (gc, true, 0, 0, width, height);
+//
+// gc.Foreground = black;
+// pm.DrawRectangle (gc, false, 0, 0, width - 1, height - 1);
+// pm.DrawRectangle (gc, false, 1, 1, width - 3, height - 3);
+// }
+// this.ShapeCombineMask (pm, 0, 0);
+// }
}
protected override void OnSizeAllocated (Rectangle allocation)
@@ -108,15 +108,15 @@ protected override void OnSizeAllocated (Rectangle allocation)
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- //base.OnExposeEvent (args);
- int w, h;
- this.GetSize (out w, out h);
- this.GdkWindow.DrawRectangle (redgc, false, 0, 0, w-1, h-1);
- this.GdkWindow.DrawRectangle (redgc, false, 1, 1, w-3, h-3);
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// //base.OnExposeEvent (args);
+// int w, h;
+// this.GetSize (out w, out h);
+// this.GdkWindow.DrawRectangle (redgc, false, 0, 0, w-1, h-1);
+// this.GdkWindow.DrawRectangle (redgc, false, 1, 1, w-3, h-3);
+// return true;
+// }
public void Relocate (int x, int y, int w, int h, bool animate)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs
index 89de00dbc11..0193045a813 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs
@@ -219,15 +219,15 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
base.OnSizeAllocated (allocation);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out minimum_width, out natural_width);
int minWidth = 0;
foreach (var tab in box.Children.Cast ())
minWidth += tab.MinWidth;
- requisition.Width = minWidth;
+ minimum_width = minWidth;
}
void UpdateEllipsize (Gdk.Rectangle allocation)
@@ -320,15 +320,15 @@ internal class TabStripBox: HBox
public TabStrip TabStrip;
static Xwt.Drawing.Image tabbarBackImage = Xwt.Drawing.Image.FromResource ("tabbar-back.9.png");
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (TabStrip.VisualStyle.TabStyle == DockTabStyle.Normal) {
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- ctx.DrawImage (this, tabbarBackImage.WithSize (Allocation.Width, Allocation.Height), 0, 0);
- }
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (TabStrip.VisualStyle.TabStyle == DockTabStyle.Normal) {
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// ctx.DrawImage (this, tabbarBackImage.WithSize (Allocation.Width, Allocation.Height), 0, 0);
+// }
+// }
+// return base.OnExposeEvent (evnt);
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
index f9fe9d90b9d..06895e989a8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/TextQuestionDialog.cs
@@ -68,7 +68,7 @@ protected override bool RunDefault ()
Gtk.Dialog md = null;
try {
md = new Gtk.Dialog (Caption, TransientFor, DialogFlags.Modal | DialogFlags.DestroyWithParent) {
- HasSeparator = false,
+// HasSeparator = false,
BorderWidth = 6,
};
@@ -76,7 +76,7 @@ protected override bool RunDefault ()
UseMarkup = true,
Xalign = 0.0F,
};
- md.VBox.PackStart (questionLabel, true, false, 6);
+ md.ContentArea.PackStart (questionLabel, true, false, 6);
var responseEntry = new Entry (Value ?? "") {
Visibility = !IsPassword,
@@ -84,7 +84,7 @@ protected override bool RunDefault ()
responseEntry.Activated += (sender, e) => {
md.Respond (ResponseType.Ok);
};
- md.VBox.PackStart (responseEntry, false, true, 6);
+ md.ContentArea.PackStart (responseEntry, false, true, 6);
md.AddActionWidget (new Button (Gtk.Stock.Cancel) { CanDefault = true }, ResponseType.Cancel);
md.AddActionWidget (new Button (Gtk.Stock.Ok), ResponseType.Ok);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ButtonBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ButtonBar.cs
index 60ef3400a31..0b4c702ff30 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ButtonBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ButtonBar.cs
@@ -79,7 +79,7 @@ public IEnumerable Groups {
public ButtonBar ()
{
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+ this.AppPaintable = true;
VisibleWindow = false;
Events |= EventMask.ButtonPressMask | EventMask.ButtonReleaseMask;
@@ -125,17 +125,17 @@ IButtonBarButton[] VisibleButtons {
}
}
- StateType leaveState = StateType.Normal;
+ StateFlags leaveState = StateFlags.Normal;
protected override bool OnEnterNotifyEvent (EventCrossing evnt)
{
- State = leaveState;
+ this.SetStateFlags (leaveState, true);
return base.OnEnterNotifyEvent (evnt);
}
protected override bool OnLeaveNotifyEvent (EventCrossing evnt)
{
- leaveState = State;
- State = StateType.Normal;
+ leaveState = this.StateFlags;
+ this.SetStateFlags(StateFlags.Normal, true);
return base.OnLeaveNotifyEvent (evnt);
}
@@ -144,7 +144,7 @@ protected override bool OnButtonPressEvent (EventButton evnt)
if (evnt.Button == 1) {
pushedButton = VisibleButtons.FirstOrDefault (b => allocations [b].Contains (Allocation.X + (int)evnt.X, Allocation.Y + (int)evnt.Y));
if (pushedButton != null && pushedButton.Enabled)
- State = StateType.Selected;
+ this.SetStateFlags(StateFlags.Selected, true);
}
return true;
}
@@ -154,8 +154,8 @@ protected override bool OnButtonReleaseEvent (EventButton evnt)
if (State == StateType.Selected && pushedButton != null) {
pushedButton.NotifyPushed ();
}
- State = StateType.Prelight;
- leaveState = StateType.Normal;
+ this.SetStateFlags( StateFlags.Prelight, true);
+ leaveState = StateFlags.Normal;
pushedButton = null;
return true;
}
@@ -174,44 +174,49 @@ protected override bool OnQueryTooltip (int x, int y, bool keyboard_tooltip, Too
}
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = VisibleButtons.Sum (b => b.Visible ? (!b.IsSeparator ? (int)btnNormalOriginal[0].Width : SeparatorSpacing) : 0);
- requisition.Height = (int)btnNormalOriginal[0].Height;
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ min_height = (int)btnNormalOriginal[0].Height;
}
- protected override bool OnExposeEvent (EventExpose evnt)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- ScaleImages (Allocation.Height);
-
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- double x = Allocation.X, y = Allocation.Y;
- for (int i = 0; i < VisibleButtons.Length; i++) {
- bool nextIsSeparator = (i < VisibleButtons.Length - 1 && VisibleButtons[i + 1].IsSeparator) || i == VisibleButtons.Length - 1;
- bool lastWasSeparator = (i > 0 && VisibleButtons[i - 1].IsSeparator) || i == 0;
- IButtonBarButton button = VisibleButtons [i];
- if (button.IsSeparator) {
- if (!lastWasSeparator)
- x += SeparatorSpacing;
- continue;
- }
- Xwt.Drawing.Image[] images = State == StateType.Selected && pushedButton == button ? btnPressed : btnNormal;
- Xwt.Drawing.Image img = images [lastWasSeparator ? 0 : nextIsSeparator ? 2 : 1];
- context.DrawImage (this, img, x, y);
-
- allocations [button] = new Gdk.Rectangle ((int)x, (int)y, (int)img.Width, (int)img.Height);
-
- var icon = ImageService.GetIcon (button.Image, IconSize.Menu);
- if (!Sensitive || !button.Enabled)
- icon = icon.WithAlpha (0.4);
- context.DrawImage (this, icon, Math.Truncate (x + (img.Width - icon.Width) / 2), Math.Truncate (y + (img.Height - icon.Height) / 2));
- x += img.Width;
- }
- }
- return base.OnExposeEvent (evnt);
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ min_width = VisibleButtons.Sum (b => b.Visible ? (!b.IsSeparator ? (int)btnNormalOriginal[0].Width : SeparatorSpacing) : 0);
}
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// ScaleImages (Allocation.Height);
+//
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// double x = Allocation.X, y = Allocation.Y;
+// for (int i = 0; i < VisibleButtons.Length; i++) {
+// bool nextIsSeparator = (i < VisibleButtons.Length - 1 && VisibleButtons[i + 1].IsSeparator) || i == VisibleButtons.Length - 1;
+// bool lastWasSeparator = (i > 0 && VisibleButtons[i - 1].IsSeparator) || i == 0;
+// IButtonBarButton button = VisibleButtons [i];
+// if (button.IsSeparator) {
+// if (!lastWasSeparator)
+// x += SeparatorSpacing;
+// continue;
+// }
+// Xwt.Drawing.Image[] images = State == StateType.Selected && pushedButton == button ? btnPressed : btnNormal;
+// Xwt.Drawing.Image img = images [lastWasSeparator ? 0 : nextIsSeparator ? 2 : 1];
+// context.DrawImage (this, img, x, y);
+//
+// allocations [button] = new Gdk.Rectangle ((int)x, (int)y, (int)img.Width, (int)img.Height);
+//
+// var icon = ImageService.GetIcon (button.Image, IconSize.Menu);
+// if (!Sensitive || !button.Enabled)
+// icon = icon.WithAlpha (0.4);
+// context.DrawImage (this, icon, Math.Truncate (x + (img.Width - icon.Width) / 2), Math.Truncate (y + (img.Height - icon.Height) / 2));
+// x += img.Width;
+// }
+// }
+// return base.OnExposeEvent (evnt);
+// }
+
Xwt.Drawing.Image ExpandImageVertically (Xwt.Drawing.Image img, int newHeight)
{
if (newHeight <= img.Height)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
index eccc7b93245..165ce4739ec 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
@@ -93,45 +93,45 @@ internal static object LastCommandTarget {
get { return lastCommandTarget != null ? lastCommandTarget.Target : null; }
}
- static bool RuntimeIsSeparator (TreeModel model, TreeIter iter)
+ static bool RuntimeIsSeparator (ITreeModel model, TreeIter iter)
{
var runtime = (IRuntimeModel)model.GetValue (iter, 0);
return runtime == null || runtime.IsSeparator;
}
- void RuntimeRenderCell (CellLayout layout, CellRenderer cell, TreeModel model, TreeIter iter)
- {
- var runtime = (IRuntimeModel)model.GetValue (iter, 0);
- var renderer = (CellRendererText) cell;
-
- if (runtime == null || runtime.IsSeparator) {
- renderer.Xpad = (uint)0;
- return;
- }
-
- using (var mutableModel = runtime.GetMutableModel ()) {
- renderer.Visible = mutableModel.Visible;
- renderer.Sensitive = mutableModel.Enabled;
- renderer.Xpad = (uint)(runtime.IsIndented ? 18 : 3);
-
- if (!runtimeCombo.PopupShown) {
- // no need to ident text when the combo dropdown is not showing
- if (Platform.IsWindows)
- renderer.Xpad = 3;
- renderer.Text = mutableModel.FullDisplayString;
- renderer.Attributes = normalAttributes;
- } else {
- renderer.Text = mutableModel.DisplayString;
- renderer.Attributes = runtime.Notable ? boldAttributes : normalAttributes;
- }
-
- }
- }
+// void RuntimeRenderCell (CellLayout layout, CellRenderer cell, ITreeModel model, TreeIter iter)
+// {
+// var runtime = (IRuntimeModel)model.GetValue (iter, 0);
+// var renderer = (CellRendererText) cell;
+//
+// if (runtime == null || runtime.IsSeparator) {
+// renderer.Xpad = (uint)0;
+// return;
+// }
+//
+// using (var mutableModel = runtime.GetMutableModel ()) {
+// renderer.Visible = mutableModel.Visible;
+// renderer.Sensitive = mutableModel.Enabled;
+// renderer.Xpad = (uint)(runtime.IsIndented ? 18 : 3);
+//
+// if (!runtimeCombo.PopupShown) {
+// // no need to ident text when the combo dropdown is not showing
+// if (Platform.IsWindows)
+// renderer.Xpad = 3;
+// renderer.Text = mutableModel.FullDisplayString;
+// renderer.Attributes = normalAttributes;
+// } else {
+// renderer.Text = mutableModel.DisplayString;
+// renderer.Attributes = runtime.Notable ? boldAttributes : normalAttributes;
+// }
+//
+// }
+// }
TreeIter lastSelection = TreeIter.Zero;
public MainToolbar ()
{
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+// WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
AddWidget (button);
AddSpace (8);
@@ -167,7 +167,7 @@ public MainToolbar ()
if (Platform.IsWindows)
ctx.Ellipsize = Pango.EllipsizeMode.Middle;
runtimeCombo.PackStart (ctx, true);
- runtimeCombo.SetCellDataFunc (ctx, RuntimeRenderCell);
+// runtimeCombo.SetCellDataFunc (ctx, RuntimeRenderCell);
runtimeCombo.RowSeparatorFunc = RuntimeIsSeparator;
var runtimeComboVBox = new VBox ();
@@ -272,7 +272,7 @@ public MainToolbar ()
};
this.ShowAll ();
- this.statusArea.statusIconBox.HideAll ();
+ this.statusArea.statusIconBox.Hide();
}
protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
@@ -343,38 +343,38 @@ public void AddWidget (Gtk.Widget widget)
contentBox.PackStart (widget, false, false, 0);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- context.Rectangle (
- evnt.Area.X,
- evnt.Area.Y,
- evnt.Area.Width,
- evnt.Area.Height
- );
- context.Clip ();
- context.LineWidth = 1;
- if (Background != null && Background.Width > 0) {
- for (int x=0; x < Allocation.Width; x += Background.Width) {
- Background.Show (context, x, -TitleBarHeight);
- }
- } else {
- context.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- using (var lg = new LinearGradient (0, 0, 0, Allocation.Height)) {
- lg.AddColorStop (0, Style.Light (StateType.Normal).ToCairoColor ());
- lg.AddColorStop (1, Style.Mid (StateType.Normal).ToCairoColor ());
- context.SetSource (lg);
- }
- context.Fill ();
-
- }
- context.MoveTo (0, Allocation.Height - 0.5);
- context.RelLineTo (Allocation.Width, 0);
- context.SetSourceColor (Styles.ToolbarBottomBorderColor.ToCairoColor ());
- context.Stroke ();
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// context.Rectangle (
+// evnt.Area.X,
+// evnt.Area.Y,
+// evnt.Area.Width,
+// evnt.Area.Height
+// );
+// context.Clip ();
+// context.LineWidth = 1;
+// if (Background != null && Background.Width > 0) {
+// for (int x=0; x < Allocation.Width; x += Background.Width) {
+// Background.Show (context, x, -TitleBarHeight);
+// }
+// } else {
+// context.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+// using (var lg = new LinearGradient (0, 0, 0, Allocation.Height)) {
+// lg.AddColorStop (0, Style.Light (StateType.Normal).ToCairoColor ());
+// lg.AddColorStop (1, Style.Mid (StateType.Normal).ToCairoColor ());
+// context.SetSource (lg);
+// }
+// context.Fill ();
+//
+// }
+// context.MoveTo (0, Allocation.Height - 0.5);
+// context.RelLineTo (Allocation.Width, 0);
+// context.SetSourceColor (Styles.ToolbarBottomBorderColor.ToCairoColor ());
+// context.Stroke ();
+// }
+// return base.OnExposeEvent (evnt);
+// }
void HandleStartButtonClicked (object sender, EventArgs e)
{
@@ -413,14 +413,14 @@ public bool ConfigurationPlatformSensitivity {
}
static bool FindIter (TreeStore store, Func match, out TreeIter iter)
- {
- if (store.GetIterFirst (out iter)) {
+ {
+ if (store.GetIterFirst (out iter)) {
do {
- if (match((T)store.GetValue (iter, 1)))
- return true;
- } while (store.IterNext (ref iter));
+ if (match((T)store.GetValue (iter, 1)))
+ return true;
+ } while (store.IterNext (ref iter));
}
- return false;
+ return false;
}
public IConfigurationModel ActiveConfiguration {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
index 4d3a4d70bb0..c8711867de2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
@@ -51,7 +51,7 @@ class RoundButton : Gtk.EventBox
public RoundButton ()
{
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+ this.AppPaintable = true;
Events |= EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | EventMask.LeaveNotifyMask | EventMask.PointerMotionMask;
VisibleWindow = false;
SetSizeRequest (height, height);
@@ -71,26 +71,27 @@ public RoundButton ()
iconBuildDisabled = Xwt.Drawing.Image.FromResource (GetType (), "ico-build-disabled-32.png");
}
- StateType hoverState = StateType.Prelight;
+ StateFlags hoverState = StateFlags.Prelight;
protected override bool OnMotionNotifyEvent (EventMotion evnt)
{
- State = IsInside (evnt.X, evnt.Y) ? hoverState : StateType.Normal;;
+ this.SetStateFlags( IsInside (evnt.X, evnt.Y) ? hoverState : StateFlags.Normal, true);;
return base.OnMotionNotifyEvent (evnt);
}
protected override bool OnLeaveNotifyEvent (EventCrossing evnt)
{
- State = StateType.Normal;
+ this.SetStateFlags (StateFlags.Normal, true);
return base.OnLeaveNotifyEvent (evnt);
}
protected override bool OnButtonPressEvent (EventButton evnt)
{
if (evnt.Button == 1 && IsInside (evnt.X, evnt.Y)) {
- hoverState = State = StateType.Selected;
+ hoverState = StateFlags.Selected;
+ this.SetStateFlags (hoverState, true);
}
return true;
}
@@ -99,8 +100,8 @@ protected override bool OnButtonReleaseEvent (EventButton evnt)
{
if (State == StateType.Selected)
OnClicked (EventArgs.Empty);
- State = IsInside (evnt.X, evnt.Y) ? StateType.Prelight : StateType.Normal;;
- hoverState = StateType.Prelight;
+ this.SetStateFlags( IsInside (evnt.X, evnt.Y) ? StateFlags.Prelight : StateFlags.Normal, true);;
+ hoverState = StateFlags.Prelight;
return true;
}
@@ -111,11 +112,16 @@ bool IsInside (double x, double y)
return Math.Sqrt (xr * xr + yr * yr) <= height / 2;
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- requisition.Width = (int) btnNormal.Size.Width;
- requisition.Height = (int) btnNormal.Size.Height + 2;
- base.OnSizeRequested (ref requisition);
+ min_height = (int) btnNormal.Size.Height + 2;
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ min_width = (int) btnNormal.Size.Width;
+ base.OnGetPreferredWidth (out min_width, out natural_width);
}
Xwt.Drawing.Image GetIcon()
@@ -142,15 +148,15 @@ public OperationIcon Icon {
}
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- DrawBackground (context, Allocation, 15, State);
- var icon = GetIcon();
- context.DrawImage (this, icon, Allocation.X + Math.Max (0, (Allocation.Width - icon.Width) / 2), Allocation.Y + Math.Max (0, (Allocation.Height - icon.Height) / 2));
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// DrawBackground (context, Allocation, 15, State);
+// var icon = GetIcon();
+// context.DrawImage (this, icon, Allocation.X + Math.Max (0, (Allocation.Width - icon.Width) / 2), Allocation.Y + Math.Max (0, (Allocation.Height - icon.Height) / 2));
+// }
+// return base.OnExposeEvent (evnt);
+// }
void DrawBackground (Cairo.Context context, Gdk.Rectangle region, int radius, StateType state)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
index 10bbc0f6143..03a6cf6450f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
@@ -171,7 +171,7 @@ public SearchPopupWidget ()
headerColor = Styles.GlobalSearch.HeaderTextColor;
selectionBackgroundColor = Styles.GlobalSearch.SelectionBackgroundColor;
- Toolkit.Load (ToolkitType.Gtk).Invoke (() => declarationviewwindow = new TooltipInformationWindow ());
+ Toolkit.Load (ToolkitType.Gtk3).Invoke (() => declarationviewwindow = new TooltipInformationWindow ());
categories.Add (new RoslynSearchCategory ());
categories.Add (new FileSearchCategory ());
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
index effa7f914f4..0078aa64cc7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs
@@ -144,7 +144,7 @@ public StatusArea ()
ctxHandler = new StatusBarContextHandler (this);
VisibleWindow = false;
NoShowAll = true;
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+ this.AppPaintable = true;
statusIconBox.BorderWidth = 0;
statusIconBox.Spacing = 3;
@@ -390,24 +390,24 @@ protected override void OnRealized ()
ModifyFg (StateType.Normal, Styles.StatusBarTextColor.ToGdkColor ());
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- requisition.Height = 32;
- base.OnSizeRequested (ref requisition);
+ min_height = 32;
+ base.OnGetPreferredHeight (out min_height, out natural_height);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- renderArg.Allocation = Allocation;
- renderArg.ChildAllocation = messageBox.Allocation;
- renderArg.MousePosition = tracker.MousePosition;
- renderArg.Pango = PangoContext;
-
- theme.Render (context, renderArg, this);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// renderArg.Allocation = Allocation;
+// renderArg.ChildAllocation = messageBox.Allocation;
+// renderArg.MousePosition = tracker.MousePosition;
+// renderArg.Pango = PangoContext;
+//
+// theme.Render (context, renderArg, this);
+// }
+// return base.OnExposeEvent (evnt);
+// }
#region StatusBar implementation
@@ -416,7 +416,7 @@ public StatusBarIcon ShowStatusIcon (Xwt.Drawing.Image pixbuf)
{
Runtime.AssertMainThread ();
StatusIcon icon = new StatusIcon (this, pixbuf);
- statusIconBox.PackEnd (icon.box);
+ statusIconBox.PackEnd (icon.box, false, true, 0);
statusIconBox.ShowAll ();
return icon;
}
@@ -891,29 +891,29 @@ public void SetCancellationTokenSource (CancellationTokenSource source)
class StatusAreaSeparator: HBox
{
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var ctx = Gdk.CairoHelper.Create (this.GdkWindow)) {
- var alloc = Allocation;
- //alloc.Inflate (0, -2);
- ctx.Rectangle (alloc.X, alloc.Y, 1, alloc.Height);
-
- // FIXME: VV: Remove gradient features
- using (Cairo.LinearGradient gr = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Y + alloc.Height)) {
- gr.AddColorStop (0, new Cairo.Color (0, 0, 0, 0));
- gr.AddColorStop (0.5, new Cairo.Color (0, 0, 0, 0.2));
- gr.AddColorStop (1, new Cairo.Color (0, 0, 0, 0));
- ctx.SetSource (gr);
- ctx.Fill ();
- }
- }
- return true;
- }
-
- protected override void OnSizeRequested (ref Requisition requisition)
- {
- base.OnSizeRequested (ref requisition);
- requisition.Width = 1;
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var ctx = Gdk.CairoHelper.Create (this.GdkWindow)) {
+// var alloc = Allocation;
+// //alloc.Inflate (0, -2);
+// ctx.Rectangle (alloc.X, alloc.Y, 1, alloc.Height);
+//
+// // FIXME: VV: Remove gradient features
+// using (Cairo.LinearGradient gr = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Y + alloc.Height)) {
+// gr.AddColorStop (0, new Cairo.Color (0, 0, 0, 0));
+// gr.AddColorStop (0.5, new Cairo.Color (0, 0, 0, 0.2));
+// gr.AddColorStop (1, new Cairo.Color (0, 0, 0, 0));
+// ctx.SetSource (gr);
+// ctx.Fill ();
+// }
+// }
+// return true;
+// }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ min_width = 1;
}
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StyledProgressBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StyledProgressBar.cs
index e7cae617163..20af136d6c2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StyledProgressBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StyledProgressBar.cs
@@ -60,24 +60,24 @@ public StyledProgressBar ()
const int height = 14;
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (!showProgress)
- return base.OnExposeEvent (evnt);
- using (var ctx = Gdk.CairoHelper.Create (evnt.Window)) {
- ctx.LineWidth = 1;
- ctx.MoveTo (Allocation.X + 0.5, Allocation.Y + 0.5);
- ctx.RelLineTo (Allocation.Width, 0);
- ctx.SetSourceRGB (0.8, 0.8, 0.8);
- ctx.Stroke ();
-
- ctx.MoveTo (Allocation.X + 0.5, Allocation.Y + 0.5);
- ctx.RelLineTo ((double)Allocation.Width * fraction, 0);
- ctx.SetSourceRGB (0.1, 0.1, 0.1);
- ctx.Stroke ();
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (!showProgress)
+// return base.OnExposeEvent (evnt);
+// using (var ctx = Gdk.CairoHelper.Create (evnt.Window)) {
+// ctx.LineWidth = 1;
+// ctx.MoveTo (Allocation.X + 0.5, Allocation.Y + 0.5);
+// ctx.RelLineTo (Allocation.Width, 0);
+// ctx.SetSourceRGB (0.8, 0.8, 0.8);
+// ctx.Stroke ();
+//
+// ctx.MoveTo (Allocation.X + 0.5, Allocation.Y + 0.5);
+// ctx.RelLineTo ((double)Allocation.Width * fraction, 0);
+// ctx.SetSourceRGB (0.1, 0.1, 0.1);
+// ctx.Stroke ();
+// }
+// return base.OnExposeEvent (evnt);
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs
index c83f4222acb..25c486bee97 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs
@@ -70,25 +70,25 @@ public override void GetSize (int availableWidth, out int width, out int height)
height = indicatorSize;
}
- public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
- {
- if (style == null)
- InitializeStyle (Container);
-
- Gtk.ShadowType sh = (bool) Value ? Gtk.ShadowType.In : Gtk.ShadowType.Out;
-
- int s = indicatorSize - 1;
- if (s > bounds.Height)
- s = bounds.Height;
- if (s > bounds.Width)
- s = bounds.Width;
-
- Gtk.Style.PaintCheck (style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + (bounds.Height - s)/2, s, s);
- }
+// public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
+// {
+// if (style == null)
+// InitializeStyle (Container);
+//
+// Gtk.ShadowType sh = (bool) Value ? Gtk.ShadowType.In : Gtk.ShadowType.Out;
+//
+// int s = indicatorSize - 1;
+// if (s > bounds.Height)
+// s = bounds.Height;
+// if (s > bounds.Width)
+// s = bounds.Width;
+//
+// Gtk.Style.PaintCheck (style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + (bounds.Height - s)/2, s, s);
+// }
protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
{
- return new BooleanEditor { State = state };
+ return new BooleanEditor { };
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
index a4070bdd75a..c9da0e97337 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
@@ -29,11 +29,11 @@
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
+ */
+
using System;
using Gtk;
-using System.ComponentModel;
+using System.ComponentModel;
using System.ComponentModel.Design;
using System.Collections;
@@ -44,11 +44,11 @@ class CollectionEditor : PropertyEditorCell
//TODO: Support for multiple object types
private Type[] types;
- protected override void Initialize ()
- {
- base.Initialize ();
+ protected override void Initialize ()
+ {
+ base.Initialize ();
this.types = new Type[] { EditorManager.GetCollectionItemType (Property.PropertyType) };
- }
+ }
protected virtual Type[] NewItemTypes ()
{
@@ -62,18 +62,18 @@ public override bool DialogueEdit
public override bool EditsReadOnlyObject {
get { return true; }
- }
-
- protected override string GetValueText ()
- {
- return MonoDevelop.Core.GettextCatalog.GetString ("(Collection)");
+ }
+
+ protected override string GetValueText ()
+ {
+ return MonoDevelop.Core.GettextCatalog.GetString ("(Collection)");
}
public override void LaunchDialogue ()
{
//the Type in the collection
- IList collection = (IList) Value;
- string displayName = Property.DisplayName;
+ IList collection = (IList) Value;
+ string displayName = Property.DisplayName;
//populate list with existing items
ListStore itemStore = new ListStore (typeof (object), typeof (int), typeof (string));
@@ -90,8 +90,7 @@ public override void LaunchDialogue ()
var dialog = new Gtk.Dialog () {
Title = displayName + " Editor",
Modal = true,
- AllowGrow = true,
- AllowShrink = true,
+ Resizable = true,
};
IdeTheme.ApplyTheme (dialog);
var toplevel = this.Container.GetNativeWidget ().Toplevel as Gtk.Window;
@@ -103,7 +102,7 @@ public override void LaunchDialogue ()
//three columns for items, sorting, PropGrid
HBox hBox = new HBox ();
- dialog.VBox.PackStart (hBox, true, true, 5);
+ dialog.ContentArea.PackStart (hBox, true, true, 5);
//propGrid at end
grid = new PropertyGrid (base.EditorManager) {
@@ -271,60 +270,60 @@ public override void LaunchDialogue ()
//if 'OK' put items back in collection
using (dialog) {
- if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok) {
- DesignerTransaction tran = CreateTransaction (Instance);
- object old = collection;
-
- try {
+ if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok) {
+ DesignerTransaction tran = CreateTransaction (Instance);
+ object old = collection;
+
+ try {
collection.Clear ();
foreach (object[] o in itemStore)
- collection.Add (o [0]);
- EndTransaction (Instance, tran, old, collection, true);
- } catch {
- EndTransaction (Instance, tran, old, collection, false);
- throw;
+ collection.Add (o [0]);
+ EndTransaction (Instance, tran, old, collection, true);
+ } catch {
+ EndTransaction (Instance, tran, old, collection, false);
+ throw;
}
}
}
- }
-
- //This and EndTransaction are from Mono internal class System.ComponentModel.ReflectionPropertyDescriptor
- // Lluis Sanchez Gual (lluis@ximian.com), (C) Novell, Inc, MIT X11 license
- DesignerTransaction CreateTransaction (object obj)
- {
- IComponent com = obj as IComponent;
- if (com == null || com.Site == null) return null;
-
- IDesignerHost dh = (IDesignerHost) com.Site.GetService (typeof(IDesignerHost));
- if (dh == null) return null;
-
- DesignerTransaction tran = dh.CreateTransaction ();
- IComponentChangeService ccs = (IComponentChangeService) com.Site.GetService (typeof(IComponentChangeService));
- if (ccs != null)
- ccs.OnComponentChanging (com, Property);
- return tran;
- }
-
- void EndTransaction (object obj, DesignerTransaction tran, object oldValue, object newValue, bool commit)
- {
- if (tran == null) return;
-
- if (commit) {
- IComponent com = obj as IComponent;
- IComponentChangeService ccs = (IComponentChangeService) com.Site.GetService (typeof(IComponentChangeService));
- if (ccs != null)
- ccs.OnComponentChanged (com, Property, oldValue, newValue);
- tran.Commit ();
- }
- else
- tran.Cancel ();
+ }
+
+ //This and EndTransaction are from Mono internal class System.ComponentModel.ReflectionPropertyDescriptor
+ // Lluis Sanchez Gual (lluis@ximian.com), (C) Novell, Inc, MIT X11 license
+ DesignerTransaction CreateTransaction (object obj)
+ {
+ IComponent com = obj as IComponent;
+ if (com == null || com.Site == null) return null;
+
+ IDesignerHost dh = (IDesignerHost) com.Site.GetService (typeof(IDesignerHost));
+ if (dh == null) return null;
+
+ DesignerTransaction tran = dh.CreateTransaction ();
+ IComponentChangeService ccs = (IComponentChangeService) com.Site.GetService (typeof(IComponentChangeService));
+ if (ccs != null)
+ ccs.OnComponentChanging (com, Property);
+ return tran;
+ }
+
+ void EndTransaction (object obj, DesignerTransaction tran, object oldValue, object newValue, bool commit)
+ {
+ if (tran == null) return;
+
+ if (commit) {
+ IComponent com = obj as IComponent;
+ IComponentChangeService ccs = (IComponentChangeService) com.Site.GetService (typeof(IComponentChangeService));
+ if (ccs != null)
+ ccs.OnComponentChanged (com, Property, oldValue, newValue);
+ tran.Commit ();
+ }
+ else
+ tran.Cancel ();
}
static void UpdateIndices (ListStore itemStore)
{
TreeIter iter;
int i = 0;
- if (!itemStore.GetIterFirst (out iter))
+ if (!itemStore.GetIterFirst (out iter))
return;
do {
@@ -347,7 +346,7 @@ static void UpdateName (ListStore itemStore, TreeIter iter)
}
//generally useful function... why not in model already?
- static bool IterPrev (TreeModel model, ref TreeIter iter)
+ static bool IterPrev (ITreeModel model, ref TreeIter iter)
{
TreePath tp = model.GetPath (iter);
return tp.Prev() && model.GetIter (out iter, tp);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ColorEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ColorEditorCell.cs
index 49566bd8813..04fbc77b805 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ColorEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ColorEditorCell.cs
@@ -32,7 +32,7 @@
namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
{
- [PropertyEditorType (typeof (System.Drawing.Color))]
+ [PropertyEditorType (typeof (System.Drawing.Color))]
public class ColorEditorCell: PropertyEditorCell
{
const int ColorBoxSize = 16;
@@ -47,36 +47,36 @@ public override void GetSize (int availableWidth, out int width, out int height)
protected override string GetValueText ()
{
- System.Drawing.Color color = (System.Drawing.Color) Value;
- //TODO: dropdown known color selector so this does something
- if (color.IsKnownColor)
- return color.Name;
- else if (color.IsEmpty)
- return "";
- else
- return String.Format("#{0:x2}{1:x2}{2:x2}", color.R, color.G, color.B);
+ System.Drawing.Color color = (System.Drawing.Color) Value;
+ //TODO: dropdown known color selector so this does something
+ if (color.IsKnownColor)
+ return color.Name;
+ else if (color.IsEmpty)
+ return "";
+ else
+ return String.Format("#{0:x2}{1:x2}{2:x2}", color.R, color.G, color.B);
}
- public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
+// public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
+// {
+// using (Gdk.GC gc = new Gdk.GC (window)) {
+// gc.RgbFgColor = GetColor ();
+// int yd = (bounds.Height - ColorBoxSize) / 2;
+// window.DrawRectangle (gc, true, bounds.X, bounds.Y + yd, ColorBoxSize - 1, ColorBoxSize - 1);
+// window.DrawRectangle (Container.GetNativeWidget ().Style.BlackGC, false, bounds.X, bounds.Y + yd, ColorBoxSize - 1, ColorBoxSize - 1);
+// bounds.X += ColorBoxSize + ColorBoxSpacing;
+// bounds.Width -= ColorBoxSize + ColorBoxSpacing;
+// base.Render (window, ctx, bounds, state);
+// }
+// }
+
+ private Gdk.Color GetColor ()
{
- using (Gdk.GC gc = new Gdk.GC (window)) {
- gc.RgbFgColor = GetColor ();
- int yd = (bounds.Height - ColorBoxSize) / 2;
- window.DrawRectangle (gc, true, bounds.X, bounds.Y + yd, ColorBoxSize - 1, ColorBoxSize - 1);
- window.DrawRectangle (Container.GetNativeWidget ().Style.BlackGC, false, bounds.X, bounds.Y + yd, ColorBoxSize - 1, ColorBoxSize - 1);
- bounds.X += ColorBoxSize + ColorBoxSpacing;
- bounds.Width -= ColorBoxSize + ColorBoxSpacing;
- base.Render (window, ctx, bounds, state);
- }
+ System.Drawing.Color color = (System.Drawing.Color) Value;
+ //TODO: Property.Converter.ConvertTo() fails: why?
+ return new Gdk.Color (color.R, color.G, color.B);
}
-
- private Gdk.Color GetColor ()
- {
- System.Drawing.Color color = (System.Drawing.Color) Value;
- //TODO: Property.Converter.ConvertTo() fails: why?
- return new Gdk.Color (color.R, color.G, color.B);
- }
-
+
protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
{
return new ColorEditor ();
@@ -93,13 +93,13 @@ public void Initialize (EditSession session)
public object Value {
get {
- int red = (int) (255 * (float) Color.Red / ushort.MaxValue);
- int green = (int) (255 * (float) Color.Green / ushort.MaxValue);
- int blue = (int) (255 * (float) Color.Blue / ushort.MaxValue);
+ int red = (int) (255 * (float) Color.Red / ushort.MaxValue);
+ int green = (int) (255 * (float) Color.Green / ushort.MaxValue);
+ int blue = (int) (255 * (float) Color.Blue / ushort.MaxValue);
return System.Drawing.Color.FromArgb (red, green, blue);
}
set {
- System.Drawing.Color color = (System.Drawing.Color) value;
+ System.Drawing.Color color = (System.Drawing.Color) value;
Color = new Gdk.Color (color.R, color.G, color.B);
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EnumerationEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EnumerationEditorCell.cs
index f924f87716b..6e725cd20b9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EnumerationEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EnumerationEditorCell.cs
@@ -33,7 +33,7 @@
namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
{
- [PropertyEditorType(typeof(System.Enum))]
+ [PropertyEditorType(typeof(System.Enum))]
public class EnumerationEditorCell: PropertyEditorCell
{
protected override string GetValueText ()
@@ -65,7 +65,7 @@ protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.St
public class EnumerationEditor : Gtk.HBox, IPropertyEditor {
Gtk.EventBox ebox;
- Gtk.ComboBoxEntry combo;
+ Gtk.ComboBoxText combo;
Array values;
public EnumerationEditor () : base (false, 0)
@@ -94,7 +94,7 @@ public void Initialize (EditSession session)
ebox.Show ();
PackStart (ebox, true, true, 0);
- combo = Gtk.ComboBoxEntry.NewText ();
+ combo = new Gtk.ComboBoxText();
combo.Changed += combo_Changed;
combo.Entry.IsEditable = false;
combo.Entry.CanFocus = false;
@@ -106,7 +106,7 @@ public void Initialize (EditSession session)
foreach (object value in values) {
string str = prop.Converter.ConvertToString (value);
if (names.Contains (str))
- str = (string) names [str];
+ str = (string) names [str];
combo.AppendText (str);
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EventEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EventEditor.cs
index a07c47b6ca6..21b57dd553c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EventEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/EventEditor.cs
@@ -5,7 +5,7 @@
* editing of all of an object's public properties
*
* Authors:
- * Michael Hutchinson
+ * Michael Hutchinson
* Lluis Sanchez Gual
*
* Copyright (C) 2005 Michael Hutchinson
@@ -32,8 +32,8 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
using System;
-using System.ComponentModel;
-using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design;
using System.Collections;
using Gtk;
@@ -41,95 +41,95 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
{
[PropertyEditorType (typeof (Delegate), true)]
public class EventEditorCell : PropertyEditorCell
- {
+ {
IEventBindingService evtBind;
- protected override void Initialize ()
- {
- IComponent comp = Instance as IComponent;
- evtBind = (IEventBindingService) comp.Site.GetService (typeof (IEventBindingService));
+ protected override void Initialize ()
+ {
+ IComponent comp = Instance as IComponent;
+ evtBind = (IEventBindingService) comp.Site.GetService (typeof (IEventBindingService));
base.Initialize ();
- }
-
- protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
- {
- //get existing method names
- ICollection IColl = evtBind.GetCompatibleMethods (evtBind.GetEvent (Property)) ;
- string[] methods = new string [IColl.Count + 1];
- IColl.CopyTo (methods, 1);
-
- //add a suggestion
- methods [0] = evtBind.CreateUniqueMethodName ((IComponent) Instance, evtBind.GetEvent (Property));
-
+ }
+
+ protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
+ {
+ //get existing method names
+ ICollection IColl = evtBind.GetCompatibleMethods (evtBind.GetEvent (Property)) ;
+ string[] methods = new string [IColl.Count + 1];
+ IColl.CopyTo (methods, 1);
+
+ //add a suggestion
+ methods [0] = evtBind.CreateUniqueMethodName ((IComponent) Instance, evtBind.GetEvent (Property));
+
EventEditor combo = new EventEditor (evtBind, methods);
if (Value != null)
combo.Entry.Text = (string) Value;
- combo.WidthRequest = 30; //Don't artificially inflate the width. It expands anyway.
+ combo.WidthRequest = 30; //Don't artificially inflate the width. It expands anyway.
return combo;
- }
-
- }
-
- class EventEditor: ComboBoxEntry, IPropertyEditor
- {
- bool isNull;
- PropertyDescriptor prop;
- IEventBindingService evtBind;
- object component;
-
- public EventEditor (IEventBindingService evtBind, string[] ops): base (ops)
- {
- this.evtBind = evtBind;
- }
-
- public void Initialize (EditSession session)
- {
- this.prop = session.Property;
- component = session.Instance;
+ }
+
+ }
+
+ class EventEditor: ComboBox, IPropertyEditor
+ {
+ bool isNull;
+ PropertyDescriptor prop;
+ IEventBindingService evtBind;
+ object component;
+
+ public EventEditor (IEventBindingService evtBind, string[] ops): base (ops)
+ {
+ this.evtBind = evtBind;
+ }
+
+ public void Initialize (EditSession session)
+ {
+ this.prop = session.Property;
+ component = session.Instance;
Entry.Destroyed += new EventHandler (entry_Changed);
- Entry.Activated += new EventHandler (entry_Activated);
- }
-
- public object Value {
- get {
+ Entry.Activated += new EventHandler (entry_Activated);
+ }
+
+ public object Value {
+ get {
//if value was null and new value is empty, leave as null
- if (Entry.Text.Length == 0 && isNull)
- return null;
- else
- return Entry.Text;
- }
- set {
- isNull = value == null;
- if (isNull)
- Entry.Text = "";
- else
- Entry.Text = (string) value;
- }
- }
-
- protected override void OnChanged ()
- {
- if (component == null)
- return;
- entry_Changed (this, null);
- evtBind.ShowCode ((IComponent) component, evtBind.GetEvent (prop));
- }
-
+ if (Entry.Text.Length == 0 && isNull)
+ return null;
+ else
+ return Entry.Text;
+ }
+ set {
+ isNull = value == null;
+ if (isNull)
+ Entry.Text = "";
+ else
+ Entry.Text = (string) value;
+ }
+ }
+
+ protected override void OnChanged ()
+ {
+ if (component == null)
+ return;
+ entry_Changed (this, null);
+ evtBind.ShowCode ((IComponent) component, evtBind.GetEvent (prop));
+ }
+
void entry_Activated (object sender, EventArgs e)
- {
- entry_Changed (sender, e);
- evtBind.ShowCode ((IComponent) component, evtBind.GetEvent (prop));
- }
-
+ {
+ entry_Changed (sender, e);
+ evtBind.ShowCode ((IComponent) component, evtBind.GetEvent (prop));
+ }
+
void entry_Changed (object sender, EventArgs e)
- {
- if (ValueChanged != null)
- ValueChanged (this, EventArgs.Empty);
- }
+ {
+ if (ValueChanged != null)
+ ValueChanged (this, EventArgs.Empty);
+ }
- public event EventHandler ValueChanged;
+ public event EventHandler ValueChanged;
}
-}
\ No newline at end of file
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs
index 272cb84f547..cb2313e516e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsEditorCell.cs
@@ -86,45 +86,45 @@ protected override string GetValueText ()
return txt;
}
- public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
- {
- var values = Enum.GetValues (Property.PropertyType);
- if (values.Length < MaxCheckCount) {
- if (style == null)
- InitializeStyle (Container);
-
- var container = (Widget)Container;
- using (var layout = new Pango.Layout (container.PangoContext)) {
- layout.Width = -1;
- layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
-
- ulong value = Convert.ToUInt64 (Value);
- int dy = 2;
- foreach (var val in values) {
- ulong uintVal = Convert.ToUInt64 (val);
- Gtk.ShadowType sh = (value & uintVal) != 0 ? Gtk.ShadowType.In : Gtk.ShadowType.Out;
- if (value == 0 && uintVal == 0)
- sh = Gtk.ShadowType.In;
- int s = indicatorSize - 1;
- Gtk.Style.PaintCheck (style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + dy, s, s);
-
- layout.SetText (val.ToString ());
- int tw, th;
- layout.GetPixelSize (out tw, out th);
- ctx.Save ();
- ctx.SetSourceColor (container.Style.Text (state).ToCairoColor ());
- ctx.MoveTo (bounds.X + indicatorSize + indicatorSpacing, dy + bounds.Y + ((indicatorSize - th) / 2));
- Pango.CairoHelper.ShowLayout (ctx, layout);
- ctx.Restore ();
-
- dy += indicatorSize + CheckSpacing;
- }
- }
- } else {
- base.Render (window, ctx, bounds, state);
- return;
- }
- }
+// public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state)
+// {
+// var values = Enum.GetValues (Property.PropertyType);
+// if (values.Length < MaxCheckCount) {
+// if (style == null)
+// InitializeStyle (Container);
+//
+// var container = (Widget)Container;
+// using (var layout = new Pango.Layout (container.PangoContext)) {
+// layout.Width = -1;
+// layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+//
+// ulong value = Convert.ToUInt64 (Value);
+// int dy = 2;
+// foreach (var val in values) {
+// ulong uintVal = Convert.ToUInt64 (val);
+// Gtk.ShadowType sh = (value & uintVal) != 0 ? Gtk.ShadowType.In : Gtk.ShadowType.Out;
+// if (value == 0 && uintVal == 0)
+// sh = Gtk.ShadowType.In;
+// int s = indicatorSize - 1;
+// Gtk.Style.PaintCheck (style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + dy, s, s);
+//
+// layout.SetText (val.ToString ());
+// int tw, th;
+// layout.GetPixelSize (out tw, out th);
+// ctx.Save ();
+// ctx.SetSourceColor (container.Style.Text (state).ToCairoColor ());
+// ctx.MoveTo (bounds.X + indicatorSize + indicatorSpacing, dy + bounds.Y + ((indicatorSize - th) / 2));
+// Pango.CairoHelper.ShowLayout (ctx, layout);
+// ctx.Restore ();
+//
+// dy += indicatorSize + CheckSpacing;
+// }
+// }
+// } else {
+// base.Render (window, ctx, bounds, state);
+// return;
+// }
+// }
protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
index 16de80590d8..2cde251c0b2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
@@ -55,7 +55,7 @@ public FlagsSelectorDialog (Gtk.Window parent, Type enumDesc, ulong flags, strin
dialog = new Gtk.Dialog ();
IdeTheme.ApplyTheme (dialog);
- dialog.VBox.Add (sc);
+ dialog.ContentArea.Add (sc);
dialog.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
dialog.AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
index bf9f94b69f0..dd63dc6d61a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
@@ -43,7 +43,7 @@ public class PropertyTextEditor: Gtk.HBox, IPropertyEditor
string initialText;
object currentValue;
Entry entry;
- ComboBox combo;
+ ComboBoxText combo;
ListStore store;
bool changed;
@@ -59,13 +59,13 @@ public void Initialize (EditSession session)
//if converter doesn't allow nonstandard values, or can't convert from strings, don't have an entry
if (session.Property.Converter.GetStandardValuesExclusive (session) || !session.Property.Converter.CanConvertFrom (session, typeof(string))) {
- combo = new ComboBox (store);
+ combo = (ComboBoxText)new ComboBox (store);
var crt = new CellRendererText ();
combo.PackStart (crt, true);
combo.AddAttribute (crt, "text", 0);
} else {
- combo = new ComboBoxEntry (store, 0);
- entry = ((ComboBoxEntry)combo).Entry;
+ combo = (ComboBoxText)new ComboBox (store);
+ entry = ((ComboBox)combo).Entry;
entry.HeightRequest = combo.SizeRequest ().Height;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
index be86d5b5422..846ceb18df0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs
@@ -51,7 +51,7 @@ public TextEditorDialog ()
IdeTheme.ApplyTheme (dialog);
dialog.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel);
dialog.AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok);
- dialog.VBox.Add (sc);
+ dialog.ContentArea.Add (sc);
}
public Gtk.Window TransientFor {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
index 7b173ca7be2..5dc98f26b23 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
@@ -132,18 +132,18 @@ public virtual void GetSize (int availableWidth, out int width, out int height)
layout.GetPixelSize (out width, out height);
}
- public virtual void Render (Drawable window, Cairo.Context ctx, Rectangle bounds, StateType state)
- {
- int w, h;
- layout.GetPixelSize (out w, out h);
- int dy = (bounds.Height - h) / 2;
-
- ctx.Save ();
- ctx.SetSourceColor (container.Style.Text (state).ToCairoColor ());
- ctx.MoveTo (bounds.X, dy + bounds.Y);
- Pango.CairoHelper.ShowLayout (ctx, layout);
- ctx.Restore ();
- }
+// public virtual void Render (Drawable window, Cairo.Context ctx, Rectangle bounds, StateType state)
+// {
+// int w, h;
+// layout.GetPixelSize (out w, out h);
+// int dy = (bounds.Height - h) / 2;
+//
+// ctx.Save ();
+// ctx.SetSourceColor (container.Style.Text (state).ToCairoColor ());
+// ctx.MoveTo (bounds.X, dy + bounds.Y);
+// Pango.CairoHelper.ShowLayout (ctx, layout);
+// ctx.Restore ();
+// }
protected virtual IPropertyEditor CreateEditor (Rectangle cellArea, StateType state)
{
@@ -335,19 +335,19 @@ public CellRendererWidget (PropertyEditorCell cell, ITypeDescriptorContext conte
this.ModifyBg (StateType.Normal, this.Style.White);
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- bool res = base.OnExposeEvent (evnt);
- cell.Initialize (this, em, context);
-
- Rectangle rect = Allocation;
- rect.Inflate (-3, 0);// Add some margin
-
- using (Cairo.Context ctx = CairoHelper.Create (GdkWindow)) {
- cell.Render (GdkWindow, ctx, rect, StateType.Normal);
- }
- return res;
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// bool res = base.OnExposeEvent (evnt);
+// cell.Initialize (this, em, context);
+//
+// Rectangle rect = Allocation;
+// rect.Inflate (-3, 0);// Add some margin
+//
+// using (Cairo.Context ctx = CairoHelper.Create (GdkWindow)) {
+// cell.Render (GdkWindow, ctx, rect, StateType.Normal);
+// }
+// return res;
+// }
}
class PropertyDialogueEditor: HBox, IPropertyEditor
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs
index 2a8477da80a..4b3e333aa9c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs
@@ -140,7 +140,7 @@ internal PropertyGrid (EditorManager editorManager)
AddPropertyTab (new DefaultPropertyTab ());
AddPropertyTab (new EventPropertyTab ());
- base.PackEnd (vpaned);
+ base.PackEnd (vpaned, false, true, 0);
base.FocusChain = new Gtk.Widget [] { vpaned };
Populate (saveEditSession: false);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
index c681a05f976..3658ceda1aa 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs
@@ -159,7 +159,7 @@ public PropertyGridTable (EditorManager editorManager, PropertyGrid parentGrid)
this.parentGrid = parentGrid;
this.editorManager = editorManager;
- WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
+ this.AppPaintable = true;
Events |= Gdk.EventMask.PointerMotionMask;
CanFocus = true;
resizeCursor = new Cursor (CursorType.SbHDoubleArrow);
@@ -448,15 +448,21 @@ protected override void ForAll (bool includeInternals, Gtk.Callback callback)
}
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- requisition.Width = 20;
+ min_width = natural_width = 20;
+ foreach (var c in children)
+ c.Key.SizeRequest ();
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
int dx = (int)((double)Allocation.Width * dividerPosition) - PropertyContentLeftPadding;
if (dx < 0) dx = 0;
int y = 0;
MeasureHeight (rows, ref y);
- requisition.Height = y;
+ min_height = natural_height = y;
foreach (var c in children)
c.Key.SizeRequest ();
@@ -528,24 +534,24 @@ void MeasureHeight (IEnumerable rowList, ref int y)
layout.Dispose ();
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- using (Cairo.Context ctx = CairoHelper.Create (evnt.Window)) {
- int dx = (int)((double)Allocation.Width * dividerPosition);
- ctx.LineWidth = 1;
- ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- ctx.SetSourceColor (Styles.PropertyPadLabelBackgroundColor.ToCairoColor ());
- ctx.Fill ();
- ctx.MoveTo (dx + 0.5, 0);
- ctx.RelLineTo (0, Allocation.Height);
- ctx.SetSourceColor (Styles.PropertyPadDividerColor.ToCairoColor ());
- ctx.Stroke ();
-
- int y = 0;
- Draw (ctx, rows, dx, PropertyLeftPadding, ref y);
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// using (Cairo.Context ctx = CairoHelper.Create (evnt.Window)) {
+// int dx = (int)((double)Allocation.Width * dividerPosition);
+// ctx.LineWidth = 1;
+// ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+// ctx.SetSourceColor (Styles.PropertyPadLabelBackgroundColor.ToCairoColor ());
+// ctx.Fill ();
+// ctx.MoveTo (dx + 0.5, 0);
+// ctx.RelLineTo (0, Allocation.Height);
+// ctx.SetSourceColor (Styles.PropertyPadDividerColor.ToCairoColor ());
+// ctx.Stroke ();
+//
+// int y = 0;
+// Draw (ctx, rows, dx, PropertyLeftPadding, ref y);
+// }
+// return base.OnExposeEvent (evnt);
+// }
void Draw (Cairo.Context ctx, List rowList, int dividerX, int x, ref int y)
{
@@ -609,7 +615,7 @@ void Draw (Cairo.Context ctx, List rowList, int dividerX, int x, ref i
if (r != currentEditorRow) {
var bounds = GetInactiveEditorBounds (r);
- cell.Render (GdkWindow, ctx, bounds, state);
+// cell.Render (GdkWindow, ctx, bounds, state);
if (r.IsExpandable) {
var img = r.Expanded ? discloseUp : discloseDown;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
index a59672a7cc2..12f06cba800 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming/GtkTheme.cs
@@ -52,7 +52,7 @@ public static Gdk.Color GetGdkTextMidColor (Widget widget)
{
Cairo.Color color = GetCairoTextMidColor (widget);
Gdk.Color gdk_color = new Gdk.Color ((byte)(color.R * 255), (byte)(color.G * 255), (byte)(color.B * 255));
- Gdk.Colormap.System.AllocColor (ref gdk_color, true, true);
+// Gdk.Colormap.System.AllocColor (ref gdk_color, true, true);
return gdk_color;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererComboBox.cs
index 860f96ca4ae..d3442f43f37 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererComboBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererComboBox.cs
@@ -41,7 +41,7 @@ public class CellRendererComboBox: CellRendererText
public CellRendererComboBox ()
{
Mode |= Gtk.CellRendererMode.Editable;
- Gtk.ComboBox dummyEntry = Gtk.ComboBox.NewText ();
+ Gtk.ComboBoxText dummyEntry = new Gtk.ComboBoxText ();
rowHeight = dummyEntry.SizeRequest ().Height + (2 * dummyEntry.Style?.YThickness ?? 0);
Ypad = 0;
}
@@ -51,29 +51,29 @@ public string[] Values {
set { values = value; }
}
- public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- if (height < rowHeight)
- height = rowHeight;
- }
+// public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
+// if (height < rowHeight)
+// height = rowHeight;
+// }
- public override CellEditable StartEditing (Gdk.Event ev, Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
- {
- this.path = path;
-
- Gtk.ComboBox combo = Gtk.ComboBox.NewText ();
- foreach (string s in values)
- combo.AppendText (s);
-
- combo.Active = Array.IndexOf (values, Text);
- combo.Changed += new EventHandler (SelectionChanged);
- return new TreeViewCellContainer (combo);
- }
+// public override ICellEditable StartEditing (Gdk.Event ev, Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
+// {
+// this.path = path;
+//
+// Gtk.ComboBox combo = Gtk.ComboBox.NewText ();
+// foreach (string s in values)
+// combo.AppendText (s);
+//
+// combo.Active = Array.IndexOf (values, Text);
+// combo.Changed += new EventHandler (SelectionChanged);
+// return new TreeViewCellContainer (combo);
+// }
void SelectionChanged (object s, EventArgs a)
{
- Gtk.ComboBox combo = (Gtk.ComboBox) s;
+ Gtk.ComboBoxText combo = (Gtk.ComboBoxText) s;
if (Changed != null)
Changed (this, new ComboSelectionChangedArgs (path, combo.Active, combo.ActiveText));
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs
index ec66e799294..9547378a48e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs
@@ -128,23 +128,23 @@ public virtual Image ImageExpanderClosed {
}
}
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- var img = GetImage ();
- if (img == null)
- return;
-
- if ((flags & Gtk.CellRendererState.Selected) != 0)
- img = img.WithStyles ("sel");
- if (!img.HasFixedSize)
- img = img.WithSize (Gtk.IconSize.Menu);
-
- using (var ctx = Gdk.CairoHelper.Create (window)) {
- var x = cell_area.X + cell_area.Width / 2 - (int)(img.Width / 2);
- var y = cell_area.Y + cell_area.Height / 2 - (int)(img.Height / 2);
- ctx.DrawImage (widget, img, x, y);
- }
- }
+// protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
+// {
+// var img = GetImage ();
+// if (img == null)
+// return;
+//
+// if ((flags & Gtk.CellRendererState.Selected) != 0)
+// img = img.WithStyles ("sel");
+// if (!img.HasFixedSize)
+// img = img.WithSize (Gtk.IconSize.Menu);
+//
+// using (var ctx = Gdk.CairoHelper.Create (window)) {
+// var x = cell_area.X + cell_area.Width / 2 - (int)(img.Width / 2);
+// var y = cell_area.Y + cell_area.Height / 2 - (int)(img.Height / 2);
+// ctx.DrawImage (widget, img, x, y);
+// }
+// }
protected void GetImageInfo (Gdk.Rectangle cell_area, out Image img, out int x, out int y)
{
@@ -158,23 +158,23 @@ protected void GetImageInfo (Gdk.Rectangle cell_area, out Image img, out int x,
}
}
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- var img = GetImage ();
- if (img != null) {
- if (img.HasFixedSize) {
- width = (int)img.Width;
- height = (int)img.Height;
- } else
- Gtk.IconSize.Menu.GetSize(out width, out height);
- } else
- width = height = 0;
-
- width += (int)Xpad * 2;
- height += (int)Ypad * 2;
- x_offset = (int)(cell_area.Width / 2 - (width / 2));
- y_offset = (int)(cell_area.Height / 2 - (height / 2));
- }
+// public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
+// {
+// var img = GetImage ();
+// if (img != null) {
+// if (img.HasFixedSize) {
+// width = (int)img.Width;
+// height = (int)img.Height;
+// } else
+// Gtk.IconSize.Menu.GetSize(out width, out height);
+// } else
+// width = height = 0;
+//
+// width += (int)Xpad * 2;
+// height += (int)Ypad * 2;
+// x_offset = (int)(cell_area.Width / 2 - (width / 2));
+// y_offset = (int)(cell_area.Height / 2 - (height / 2));
+// }
Image GetImage ()
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
index e6f0c23f4bb..e4f968d9a6f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CompactScrolledWindow.cs
@@ -61,15 +61,26 @@ public bool ShowBorderLine {
}
}
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out min_height, out natural_height);
//if showing a border line, request a little more space
if (showBorderLine) {
- requisition.Height += HScrollbar.Visible? 1 : 2;
- requisition.Width += VScrollbar.Visible? 1 : 2;
+ min_height += HScrollbar.Visible? 1 : 2;
}
+ natural_height = min_height;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+
+ //if showing a border line, request a little more space
+ if (showBorderLine) {
+ min_width += VScrollbar.Visible? 1 : 2;
+ }
+ natural_width = min_width;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -104,70 +115,70 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
}
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- var ret = base.OnExposeEvent (evnt);
- if (!showBorderLine)
- return ret;
-
- bool hasHScroll = HScrollbar.Visible;
- bool hasVScroll = VScrollbar.Visible;
-
- //this is the rectangle that defines where we will draw the border lines
- //note that Allocation was set by the base, but we altered it during allocation, so take that into account
- var rect = Allocation;
- var borderWidth = (int) BorderWidth;
- rect.X += borderWidth - 1;
- rect.Y += borderWidth - 1;
- rect.Width -= borderWidth + borderWidth - 2;
- rect.Height -= borderWidth + borderWidth - 2;
-
- //if there will be scrollbars, bring the end of the lines to the middle of the scrollbar so it looks nice
- if (hasHScroll) {
- rect.Height -= HScrollbar.Allocation.Height / 2;
- }
-
- if (hasVScroll) {
- rect.Width -= VScrollbar.Allocation.Width / 2;
- }
-
- double lineWidth = 1;
- var halfLineWidth = lineWidth / 2.0;
-
- //draw the border lines
- using (var cr = Gdk.CairoHelper.Create (evnt.Window)) {
- Gdk.CairoHelper.Region (cr, evnt.Region);
- cr.Clip ();
-
- cr.SetSourceColor (Style.Dark (Gtk.StateType.Normal).ToCairoColor ());
- cr.LineWidth = lineWidth;
- cr.Translate (rect.X, rect.Y);
-
- //top
- cr.MoveTo (0, halfLineWidth);
- cr.LineTo (rect.Width, halfLineWidth);
-
- //bottom. redundant if there's a horizontal scrollbar.
- if (!hasHScroll) {
- cr.MoveTo (0, rect.Height - halfLineWidth);
- cr.LineTo (rect.Width, rect.Height - halfLineWidth);
- }
-
- //left
- cr.MoveTo (halfLineWidth, 0);
- cr.LineTo (halfLineWidth, rect.Height);
-
- //right. redundant if there's a vertical scrollbar.
- if (!hasVScroll) {
- cr.MoveTo (rect.Width - halfLineWidth, 0);
- cr.LineTo (rect.Width - halfLineWidth, rect.Height);
- }
-
- cr.Stroke ();
- }
-
- return ret;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// var ret = base.OnExposeEvent (evnt);
+// if (!showBorderLine)
+// return ret;
+//
+// bool hasHScroll = HScrollbar.Visible;
+// bool hasVScroll = VScrollbar.Visible;
+//
+// //this is the rectangle that defines where we will draw the border lines
+// //note that Allocation was set by the base, but we altered it during allocation, so take that into account
+// var rect = Allocation;
+// var borderWidth = (int) BorderWidth;
+// rect.X += borderWidth - 1;
+// rect.Y += borderWidth - 1;
+// rect.Width -= borderWidth + borderWidth - 2;
+// rect.Height -= borderWidth + borderWidth - 2;
+//
+// //if there will be scrollbars, bring the end of the lines to the middle of the scrollbar so it looks nice
+// if (hasHScroll) {
+// rect.Height -= HScrollbar.Allocation.Height / 2;
+// }
+//
+// if (hasVScroll) {
+// rect.Width -= VScrollbar.Allocation.Width / 2;
+// }
+//
+// double lineWidth = 1;
+// var halfLineWidth = lineWidth / 2.0;
+//
+// //draw the border lines
+// using (var cr = Gdk.CairoHelper.Create (evnt.Window)) {
+// Gdk.CairoHelper.Region (cr, evnt.Region);
+// cr.Clip ();
+//
+// cr.SetSourceColor (Style.Dark (Gtk.StateType.Normal).ToCairoColor ());
+// cr.LineWidth = lineWidth;
+// cr.Translate (rect.X, rect.Y);
+//
+// //top
+// cr.MoveTo (0, halfLineWidth);
+// cr.LineTo (rect.Width, halfLineWidth);
+//
+// //bottom. redundant if there's a horizontal scrollbar.
+// if (!hasHScroll) {
+// cr.MoveTo (0, rect.Height - halfLineWidth);
+// cr.LineTo (rect.Width, rect.Height - halfLineWidth);
+// }
+//
+// //left
+// cr.MoveTo (halfLineWidth, 0);
+// cr.LineTo (halfLineWidth, rect.Height);
+//
+// //right. redundant if there's a vertical scrollbar.
+// if (!hasVScroll) {
+// cr.MoveTo (rect.Width - halfLineWidth, 0);
+// cr.LineTo (rect.Width - halfLineWidth, rect.Height);
+// }
+//
+// cr.Stroke ();
+// }
+//
+// return ret;
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
index f7cc0788151..76b522957a7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsGtk.cs
@@ -79,19 +79,19 @@ class PoupHandlerWrapper
public PoupHandlerWrapper (ContextMenu menu, Gtk.Menu gtkMenu)
{
this.menu = menu;
- gtkMenu.ExposeEvent += HandleExposeEvent;
+ //gtkMenu.ExposeEvent += HandleExposeEvent;
}
- void HandleExposeEvent (object o, Gtk.ExposeEventArgs args)
- {
- var gtkMenu = (Gtk.Menu)o;
- gtkMenu.ExposeEvent -= HandleExposeEvent;
- int ox, oy;
- gtkMenu.ParentWindow.GetOrigin (out ox, out oy);
- int rx, ry;
- IdeApp.Workbench.RootWindow.GdkWindow.GetOrigin (out rx, out ry);
- menu.Items [0].FireSelectedEvent (new Xwt.Rectangle (ox - rx, oy - ry, gtkMenu.Allocation.Width, gtkMenu.Allocation.Height));
- }
+// void HandleExposeEvent (object o, Gtk.ExposeEventArgs args)
+// {
+// var gtkMenu = (Gtk.Menu)o;
+// gtkMenu.ExposeEvent -= HandleExposeEvent;
+// int ox, oy;
+// gtkMenu.ParentWindow.GetOrigin (out ox, out oy);
+// int rx, ry;
+// IdeApp.Workbench.RootWindow.GdkWindow.GetOrigin (out rx, out ry);
+// menu.Items [0].FireSelectedEvent (new Xwt.Rectangle (ox - rx, oy - ry, gtkMenu.Allocation.Width, gtkMenu.Allocation.Height));
+// }
}
public static void ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, Gtk.Menu menu)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
index 87b795386a0..92d3a7093c9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuTreeView.cs
@@ -40,7 +40,7 @@ public ContextMenuTreeView ()
ActionHandler.PerformShowMenu += PerformShowMenu;
}
- public ContextMenuTreeView (Gtk.TreeModel model) : base (model)
+ public ContextMenuTreeView (Gtk.ITreeModel model) : base (model)
{
}
@@ -198,4 +198,4 @@ bool MultipleNodesSelected ()
return Selection.GetSelectedRows ().Length > 1;
}
}
-}
\ No newline at end of file
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
index c29810cb611..cb5f82c1e40 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Control.cs
@@ -160,7 +160,7 @@ public static implicit operator Xwt.Widget (Control d)
return ((AbstractXwtControl)d).Widget;
object nativeWidget;
- if (Xwt.Toolkit.CurrentEngine.Type == Xwt.ToolkitType.Gtk && (nativeWidget = d?.GetNativeWidget ()) != null) {
+ if (Xwt.Toolkit.CurrentEngine.Type == Xwt.ToolkitType.Gtk3 && (nativeWidget = d?.GetNativeWidget ()) != null) {
return Xwt.Toolkit.CurrentEngine.WrapWidget (nativeWidget, Xwt.NativeWidgetSizing.DefaultPreferredSize);
}
#if MAC
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
index 9c950c757ae..00dd100af55 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBox.cs
@@ -182,16 +182,13 @@ protected override void OnDestroyed ()
base.OnDestroyed ();
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
int width, height;
layout.GetPixelSize (out width, out height);
if (Pixbuf != null) {
width += (int)Pixbuf.Width + pixbufSpacing * 2;
- height = System.Math.Max (height, (int)Pixbuf.Height);
- } else {
- height = System.Math.Max (height, defaultIconHeight);
}
if (DrawRightBorder)
@@ -199,8 +196,23 @@ protected override void OnSizeRequested (ref Requisition requisition)
int arrowHeight = height / 2;
int arrowWidth = arrowHeight + 1;
- requisition.Width = FixedWidth > 0 ? FixedWidth : width + arrowWidth + leftSpacing;
- requisition.Height = FixedHeight >0 ? FixedHeight : height + ySpacing * 2;
+ min_width = natural_width = FixedWidth > 0 ? FixedWidth : width + arrowWidth + leftSpacing;
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ int width, height;
+ layout.GetPixelSize (out width, out height);
+
+ if (Pixbuf != null) {
+ height = System.Math.Max (height, (int)Pixbuf.Height);
+ } else {
+ height = System.Math.Max (height, defaultIconHeight);
+ }
+
+ int arrowHeight = height / 2;
+
+ min_height = natural_height = FixedHeight >0 ? FixedHeight : height + ySpacing * 2;
}
protected override bool OnFocusOutEvent (Gdk.EventFocus evnt)
@@ -279,71 +291,71 @@ protected override bool OnMotionNotifyEvent (Gdk.EventMotion e)
return base.OnMotionNotifyEvent (e);
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- Gdk.Drawable win = args.Window;
-
- int width, height;
- layout.GetPixelSize (out width, out height);
-
- int arrowHeight = height / 2;
- int arrowWidth = arrowHeight + 1;
- int arrowXPos = this.Allocation.X + this.Allocation.Width - arrowWidth;
- if (DrawButtonShape) {
- arrowXPos -= 4;
- } else if (DrawRightBorder) {
- arrowXPos -= 2;
- }
-
- //HACK: don't ever draw insensitive, only active/prelight/normal, because insensitive generally looks really ugly
- //this *might* cause some theme issues with the state of the text/arrows rendering on top of it
- var state = window != null? StateType.Active
- : State == StateType.Insensitive? StateType.Normal : State;
-
- //HACK: paint the button background as if it were bigger, but it stays clipped to the real area,
- // so we get the content but not the border. This might break with crazy themes.
- //FIXME: we can't use the style's actual internal padding because GTK# hasn't wrapped GtkBorder AFAICT
- // (default-border, inner-border, default-outside-border, etc - see http://git.gnome.org/browse/gtk+/tree/gtk/gtkbutton.c)
- const int padding = 4;
- if (DrawButtonShape){
- Style.PaintBox (Style, args.Window, state, ShadowType.None, args.Area, this, "button",
- Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
-
- } else {
- Style.PaintBox (Style, args.Window, state, ShadowType.None, args.Area, this, "button",
- Allocation.X - padding, Allocation.Y - padding, Allocation.Width + padding * 2, Allocation.Height + padding * 2);
- }
-
- int xPos = Allocation.Left;
- if (Pixbuf != null) {
- using (var ctx = Gdk.CairoHelper.Create (win))
- ctx.DrawImage (this, Pixbuf, xPos + pixbufSpacing, Allocation.Y + (Allocation.Height - Pixbuf.Height) / 2);
- xPos += (int)Pixbuf.Width + pixbufSpacing * 2;
- }
- if (DrawButtonShape)
- xPos += 4;
-
- //constrain the text area so it doesn't get rendered under the arrows
- var textArea = new Gdk.Rectangle (xPos, Allocation.Y + ySpacing, arrowXPos - xPos - 2, Allocation.Height - ySpacing);
-
- if (FixedWidth > 0) {
- layout.Ellipsize = Pango.EllipsizeMode.End;
- layout.Width = Allocation.Width - textArea.X;
- }
-
- Style.PaintLayout (Style, win, state, true, textArea, this, "", textArea.X, textArea.Y + Math.Max (0, (textArea.Height - height) / 2), layout);
-
- state = Sensitive ? StateType.Normal : StateType.Insensitive;
- Gtk.Style.PaintArrow (this.Style, win, state, ShadowType.None, args.Area, this, "", ArrowType.Up, true, arrowXPos, Allocation.Y + (Allocation.Height) / 2 - arrowHeight, arrowWidth, arrowHeight);
- Gtk.Style.PaintArrow (this.Style, win, state, ShadowType.None, args.Area, this, "", ArrowType.Down, true, arrowXPos, Allocation.Y + (Allocation.Height) / 2, arrowWidth, arrowHeight);
- if (!DrawButtonShape) {
- if (DrawRightBorder)
- win.DrawLine (this.Style.DarkGC (StateType.Normal), Allocation.X + Allocation.Width - 1, Allocation.Y, Allocation.X + Allocation.Width - 1, Allocation.Y + Allocation.Height);
- if (DrawLeftBorder)
- win.DrawLine (this.Style.DarkGC (StateType.Normal), Allocation.X, Allocation.Y, Allocation.X, Allocation.Y + Allocation.Height);
- }
- return false;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// Gdk.Drawable win = args.Window;
+//
+// int width, height;
+// layout.GetPixelSize (out width, out height);
+//
+// int arrowHeight = height / 2;
+// int arrowWidth = arrowHeight + 1;
+// int arrowXPos = this.Allocation.X + this.Allocation.Width - arrowWidth;
+// if (DrawButtonShape) {
+// arrowXPos -= 4;
+// } else if (DrawRightBorder) {
+// arrowXPos -= 2;
+// }
+//
+// //HACK: don't ever draw insensitive, only active/prelight/normal, because insensitive generally looks really ugly
+// //this *might* cause some theme issues with the state of the text/arrows rendering on top of it
+// var state = window != null? StateType.Active
+// : State == StateType.Insensitive? StateType.Normal : State;
+//
+// //HACK: paint the button background as if it were bigger, but it stays clipped to the real area,
+// // so we get the content but not the border. This might break with crazy themes.
+// //FIXME: we can't use the style's actual internal padding because GTK# hasn't wrapped GtkBorder AFAICT
+// // (default-border, inner-border, default-outside-border, etc - see http://git.gnome.org/browse/gtk+/tree/gtk/gtkbutton.c)
+// const int padding = 4;
+// if (DrawButtonShape){
+// Style.PaintBox (Style, args.Window, state, ShadowType.None, args.Area, this, "button",
+// Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
+//
+// } else {
+// Style.PaintBox (Style, args.Window, state, ShadowType.None, args.Area, this, "button",
+// Allocation.X - padding, Allocation.Y - padding, Allocation.Width + padding * 2, Allocation.Height + padding * 2);
+// }
+//
+// int xPos = Allocation.Left;
+// if (Pixbuf != null) {
+// using (var ctx = Gdk.CairoHelper.Create (win))
+// ctx.DrawImage (this, Pixbuf, xPos + pixbufSpacing, Allocation.Y + (Allocation.Height - Pixbuf.Height) / 2);
+// xPos += (int)Pixbuf.Width + pixbufSpacing * 2;
+// }
+// if (DrawButtonShape)
+// xPos += 4;
+//
+// //constrain the text area so it doesn't get rendered under the arrows
+// var textArea = new Gdk.Rectangle (xPos, Allocation.Y + ySpacing, arrowXPos - xPos - 2, Allocation.Height - ySpacing);
+//
+// if (FixedWidth > 0) {
+// layout.Ellipsize = Pango.EllipsizeMode.End;
+// layout.Width = Allocation.Width - textArea.X;
+// }
+//
+// Style.PaintLayout (Style, win, state, true, textArea, this, "", textArea.X, textArea.Y + Math.Max (0, (textArea.Height - height) / 2), layout);
+//
+// state = Sensitive ? StateType.Normal : StateType.Insensitive;
+// Gtk.Style.PaintArrow (this.Style, win, state, ShadowType.None, args.Area, this, "", ArrowType.Up, true, arrowXPos, Allocation.Y + (Allocation.Height) / 2 - arrowHeight, arrowWidth, arrowHeight);
+// Gtk.Style.PaintArrow (this.Style, win, state, ShadowType.None, args.Area, this, "", ArrowType.Down, true, arrowXPos, Allocation.Y + (Allocation.Height) / 2, arrowWidth, arrowHeight);
+// if (!DrawButtonShape) {
+// if (DrawRightBorder)
+// win.DrawLine (this.Style.DarkGC (StateType.Normal), Allocation.X + Allocation.Width - 1, Allocation.Y, Allocation.X + Allocation.Width - 1, Allocation.Y + Allocation.Height);
+// if (DrawLeftBorder)
+// win.DrawLine (this.Style.DarkGC (StateType.Normal), Allocation.X, Allocation.Y, Allocation.X, Allocation.Y + Allocation.Height);
+// }
+// return false;
+// }
public EventHandler ItemSet;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs
index 13028e8b00c..29cf3811861 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/DropDownBoxListWindow.cs
@@ -420,7 +420,7 @@ protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
protected override bool OnMotionNotifyEvent (Gdk.EventMotion evnt)
{
int winWidth, winHeight;
- GdkWindow.GetSize (out winWidth, out winHeight);
+// GdkWindow.GetSize (out winWidth, out winHeight);
curMouseY = (int)evnt.Y;
Selection = GetRowByPosition (curMouseY);
@@ -440,17 +440,17 @@ protected override bool OnScrollEvent (Gdk.EventScroll evnt)
return base.OnScrollEvent (evnt);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- base.OnExposeEvent (evnt);
- DrawList ();
- return false;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// base.OnExposeEvent (evnt);
+// DrawList ();
+// return false;
+// }
void DrawList ()
{
- int winWidth, winHeight;
- GdkWindow.GetSize (out winWidth, out winHeight);
+ int winWidth = 0, winHeight = 0;
+// GdkWindow.GetSize (out winWidth, out winHeight);
int lineWidth = winWidth - leftXAlignment * 2;
const int xpos = leftXAlignment + padding;
@@ -475,26 +475,26 @@ void DrawList ()
if (n == selection) {
if (!disableSelection) {
- GdkWindow.DrawRectangle (Style.BaseGC (StateType.Selected),
- true, leftXAlignment, ypos, lineWidth, rowHeight);
- GdkWindow.DrawLayout (Style.TextGC (StateType.Selected),
- xpos + iconWidth + iconTextDistance, typos, layout);
+// GdkWindow.DrawRectangle (Style.BaseGC (StateType.Selected),
+// true, leftXAlignment, ypos, lineWidth, rowHeight);
+// GdkWindow.DrawLayout (Style.TextGC (StateType.Selected),
+// xpos + iconWidth + iconTextDistance, typos, layout);
if (icon != null)
icon = icon.WithStyles ("sel");
- } else {
- GdkWindow.DrawRectangle (Style.BaseGC (StateType.Selected),
- false, leftXAlignment, ypos, lineWidth, rowHeight);
- GdkWindow.DrawLayout (Style.TextGC (StateType.Normal),
- xpos + iconWidth + iconTextDistance, typos, layout);
- }
- } else
- GdkWindow.DrawLayout (Style.TextGC (StateType.Normal),
- xpos + iconWidth + iconTextDistance, typos, layout);
+ } //else {
+// GdkWindow.DrawRectangle (Style.BaseGC (StateType.Selected),
+// false, leftXAlignment, ypos, lineWidth, rowHeight);
+// GdkWindow.DrawLayout (Style.TextGC (StateType.Normal),
+// xpos + iconWidth + iconTextDistance, typos, layout);
+// }
+ } //else
+// GdkWindow.DrawLayout (Style.TextGC (StateType.Normal),
+// xpos + iconWidth + iconTextDistance, typos, layout);
- if (icon != null) {
- using (var ctx = Gdk.CairoHelper.Create (this.GdkWindow))
- ctx.DrawImage (this, icon, xpos, iypos);
- }
+// if (icon != null) {
+// using (var ctx = Gdk.CairoHelper.Create (this.GdkWindow))
+// ctx.DrawImage (this, icon, xpos, iypos);
+// }
ypos += rowHeight;
n++;
@@ -609,18 +609,18 @@ void UpdateStyle ()
Adjustment hAdjustment;
Adjustment vAdjustment;
- protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
- {
- hAdjustment = hadj;
- vAdjustment = vadj;
- if (vAdjustment != null)
- vAdjustment.ValueChanged += delegate {
- if (selection > -1)
- Selection = GetRowByPosition (curMouseY);
- QueueDraw ();
- };
- base.OnSetScrollAdjustments (hadj, vadj);
- }
+// protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+// {
+// hAdjustment = hadj;
+// vAdjustment = vadj;
+// if (vAdjustment != null)
+// vAdjustment.ValueChanged += delegate {
+// if (selection > -1)
+// Selection = GetRowByPosition (curMouseY);
+// QueueDraw ();
+// };
+// base.OnSetScrollAdjustments (hadj, vadj);
+// }
internal virtual void OnSelectItem (EventArgs e)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs
index 222c1a3ab38..82784ccf009 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs
@@ -39,48 +39,48 @@ public ExtendedLabel (string text): base (text)
{
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- Pango.Layout la = new Pango.Layout (PangoContext);
- int w, h;
- if (UseMarkup)
- la.SetMarkup (Text);
- else
- la.SetText (Text);
-
- la.GetPixelSize (out w, out h);
-
- int tx = Allocation.X + (int) Xpad + (int) ((float)(Allocation.Width - (int)(Xpad*2) - w) * Xalign);
- int ty = Allocation.Y + (int) Ypad + (int) ((float)(Allocation.Height - (int)(Ypad*2) - h) * Yalign);
-
- using (var ctx = CairoHelper.Create (evnt.Window)) {
- ctx.SetSourceColor (Style.Text (State).ToCairoColor ());
- ctx.MoveTo (tx, ty);
-
- // In order to get the same result as in MonoDevelop.Components.DockNotebook.TabStrip.DrawTab()
- // (document tabs) we need to draw using a LinearGradient (because of issues below),
- // but we don't want to mask the actual text here, like in the doc tabs.
- // Therefore we use a LinearGradient and mask only the last vertical pixel line
- // of the label with 0.99 alpha, which forces Cairo to render the whole layout
- // in the desired way.
-
- // Semi-transparent gradient disables sub-pixel rendering of the label (reverting to grayscale antialiasing).
- // As Mac sub-pixel font rendering looks stronger than grayscale rendering, the label used in pad tabs
- // looked different. We need to simulate same gradient treatment as we have in document tabs.
-
- using (var lg = new LinearGradient (tx + w - 1, 0, tx + w, 0)) {
- var color = Style.Text (State).ToCairoColor ();
- lg.AddColorStop (0, color);
- color.A = 0.99;
- lg.AddColorStop (1, color);
- ctx.SetSource (lg);
- Pango.CairoHelper.ShowLayout (ctx, la);
- }
- }
-
- la.Dispose ();
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// Pango.Layout la = new Pango.Layout (PangoContext);
+// int w, h;
+// if (UseMarkup)
+// la.SetMarkup (Text);
+// else
+// la.SetText (Text);
+//
+// la.GetPixelSize (out w, out h);
+//
+// int tx = Allocation.X + (int) Xpad + (int) ((float)(Allocation.Width - (int)(Xpad*2) - w) * Xalign);
+// int ty = Allocation.Y + (int) Ypad + (int) ((float)(Allocation.Height - (int)(Ypad*2) - h) * Yalign);
+//
+// using (var ctx = CairoHelper.Create (evnt.Window)) {
+// ctx.SetSourceColor (Style.Text (State).ToCairoColor ());
+// ctx.MoveTo (tx, ty);
+//
+// // In order to get the same result as in MonoDevelop.Components.DockNotebook.TabStrip.DrawTab()
+// // (document tabs) we need to draw using a LinearGradient (because of issues below),
+// // but we don't want to mask the actual text here, like in the doc tabs.
+// // Therefore we use a LinearGradient and mask only the last vertical pixel line
+// // of the label with 0.99 alpha, which forces Cairo to render the whole layout
+// // in the desired way.
+//
+// // Semi-transparent gradient disables sub-pixel rendering of the label (reverting to grayscale antialiasing).
+// // As Mac sub-pixel font rendering looks stronger than grayscale rendering, the label used in pad tabs
+// // looked different. We need to simulate same gradient treatment as we have in document tabs.
+//
+// using (var lg = new LinearGradient (tx + w - 1, 0, tx + w, 0)) {
+// var color = Style.Text (State).ToCairoColor ();
+// lg.AddColorStop (0, color);
+// color.A = 0.99;
+// lg.AddColorStop (1, color);
+// ctx.SetSource (lg);
+// Pango.CairoHelper.ShowLayout (ctx, la);
+// }
+// }
+//
+// la.Dispose ();
+// return true;
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs
index f7c12d91342..52394c79657 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs
@@ -63,7 +63,7 @@ public Pango.FontDescription FontDescription {
}
public FixedWidthWrapLabel ()
{
- WidgetFlags |= WidgetFlags.NoWindow;
+ this.HasWindow = true;
}
public FixedWidthWrapLabel (string text)
@@ -142,14 +142,22 @@ protected override void OnStyleSet (Style previous_style)
base.OnStyleSet (previous_style);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredWidth (out min_width, out natural_width);
UpdateLayout ();
int lw, lh;
layout.GetPixelSize (out lw, out lh);
- requisition.Height = lh;
- requisition.Width = lw;
+ min_width = lw;
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ base.OnGetPreferredHeight (out min_height, out natural_height);
+ UpdateLayout ();
+ int lw, lh;
+ layout.GetPixelSize (out lw, out lh);
+ min_height = lh;
}
// protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -165,18 +173,18 @@ protected override void OnSizeRequested (ref Requisition requisition)
// }
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- UpdateLayout ();
- if (evnt.Window != GdkWindow) {
- return base.OnExposeEvent (evnt);
- }
-
- Gtk.Style.PaintLayout (Style, GdkWindow, State, false, evnt.Area,
- this, null, Allocation.X, Allocation.Y, layout);
-
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// UpdateLayout ();
+// if (evnt.Window != GdkWindow) {
+// return base.OnExposeEvent (evnt);
+// }
+//
+// Gtk.Style.PaintLayout (Style, GdkWindow, State, false, evnt.Area,
+// this, null, Allocation.X, Allocation.Y, layout);
+//
+// return true;
+// }
public string Markup {
get { return text; }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs
index a819fc0f74c..d212647f2b0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkGestures.cs
@@ -57,24 +57,24 @@ public static void AddGestureMagnifyHandler (this Gtk.Widget widget, EventHandle
{
if (!isSupported)
throw new NotSupportedException ();
- var signal = GLib.Signal.Lookup (widget, "gesture-magnify-event", typeof(GestureMagnifyEventArgs));
- signal.AddDelegate (new EventHandler (handler));
+ //var signal = GLib.Signal.Lookup (widget, "gesture-magnify-event", typeof(GestureMagnifyEventArgs));
+ //signal.AddDelegate (new EventHandler (handler));
}
public static void AddGestureRotateHandler (this Gtk.Widget widget, EventHandler handler)
{
if (!isSupported)
throw new NotSupportedException ();
- var signal = GLib.Signal.Lookup (widget, "gesture-rotate-event", typeof(GestureRotateEventArgs));
- signal.AddDelegate (new EventHandler (handler));
+// var signal = GLib.Signal.Lookup (widget, "gesture-rotate-event", typeof(GestureRotateEventArgs));
+// signal.AddDelegate (new EventHandler (handler));
}
public static void AddGestureSwipeHandler (this Gtk.Widget widget, EventHandler handler)
{
if (!isSupported)
throw new NotSupportedException ();
- var signal = GLib.Signal.Lookup (widget, "gesture-swipe-event", typeof(GestureSwipeEventArgs));
- signal.AddDelegate (new EventHandler (handler));
+ //var signal = GLib.Signal.Lookup (widget, "gesture-swipe-event", typeof(GestureSwipeEventArgs));
+ //signal.AddDelegate (new EventHandler (handler));
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
index c3a176f3dbc..d2f73ccc920 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs
@@ -44,7 +44,7 @@ public static class GtkUtil
internal static Xwt.Toolkit GtkToolkit {
get {
if (gtkToolkit == null)
- gtkToolkit = Xwt.Toolkit.LoadedToolkits.FirstOrDefault (t => t.Type == Xwt.ToolkitType.Gtk);
+ gtkToolkit = Xwt.Toolkit.LoadedToolkits.FirstOrDefault (t => t.Type == Xwt.ToolkitType.Gtk3);
return gtkToolkit;
}
}
@@ -971,66 +971,66 @@ public CellTooltipWindow (TreeView tree, TreeViewColumn col, TreePath path)
col.CellSetCellData (tree.Model, iter, false, false);
int x = 0;
int th = 0;
- CellRenderer[] renderers = col.CellRenderers;
- foreach (CellRenderer cr in renderers) {
- int sp, wi, he, xo, yo;
- col.CellGetPosition (cr, out sp, out wi);
- Gdk.Rectangle crect = new Gdk.Rectangle (x, rect.Y, wi, rect.Height);
- cr.GetSize (tree, ref crect, out xo, out yo, out wi, out he);
- if (cr != renderers [renderers.Length - 1])
- x += crect.Width + col.Spacing + 1;
- else
- x += wi + 1;
- if (he > th) th = he;
- }
+// CellRenderer[] renderers = col.CellRenderers;
+// foreach (CellRenderer cr in renderers) {
+// int sp, wi, he, xo, yo;
+// col.CellGetPosition (cr, out sp, out wi);
+// Gdk.Rectangle crect = new Gdk.Rectangle (x, rect.Y, wi, rect.Height);
+// cr.GetSize (tree, ref crect, out xo, out yo, out wi, out he);
+// if (cr != renderers [renderers.Length - 1])
+// x += crect.Width + col.Spacing + 1;
+// else
+// x += wi + 1;
+// if (he > th) th = he;
+// }
SetSizeRequest (x, th + 2);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- base.OnExposeEvent (evnt);
-
- Gdk.Rectangle expose = Allocation;
- Gdk.Color save = Gdk.Color.Zero;
- bool hasFgColor = false;
- int x = 1;
-
- // Make sure that the row has not been removed inbetween.
- // If the model is a TreeStore, it can do the validation for us, otherwise we need to validate the path.
- if ((treeStore != null && treeStore.IterIsValid (iter) == false) || !tree.Model.GetIter (out iter, path)) {
- GtkUtil.HideTooltip (tree);
- return true;
- }
- col.CellSetCellData (tree.Model, iter, false, false);
-
- foreach (CellRenderer cr in col.CellRenderers) {
- if (!cr.Visible)
- continue;
-
- if (cr is CellRendererText) {
- hasFgColor = ((CellRendererText)cr).GetCellForegroundSet ();
- save = ((CellRendererText)cr).ForegroundGdk;
- ((CellRendererText)cr).ForegroundGdk = Style.Foreground (State);
- }
-
- int sp, wi, he, xo, yo;
- col.CellGetPosition (cr, out sp, out wi);
- Gdk.Rectangle bgrect = new Gdk.Rectangle (x, expose.Y, wi, expose.Height - 2);
- cr.GetSize (tree, ref bgrect, out xo, out yo, out wi, out he);
- int leftMargin = (int) ((bgrect.Width - wi) * cr.Xalign);
- int topMargin = (int) ((bgrect.Height - he) * cr.Yalign);
- Gdk.Rectangle cellrect = new Gdk.Rectangle (bgrect.X + leftMargin, bgrect.Y + topMargin + 1, wi, he);
- cr.Render (this.GdkWindow, this, bgrect, cellrect, expose, CellRendererState.Focused);
- x += bgrect.Width + col.Spacing + 1;
-
- if (cr is CellRendererText) {
- ((CellRendererText)cr).ForegroundGdk = save;
- ((CellRendererText)cr).SetCellForegroundSet (hasFgColor);
- }
- }
-
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// base.OnExposeEvent (evnt);
+//
+// Gdk.Rectangle expose = Allocation;
+// Gdk.Color save = Gdk.Color.Zero;
+// bool hasFgColor = false;
+// int x = 1;
+//
+// // Make sure that the row has not been removed inbetween.
+// // If the model is a TreeStore, it can do the validation for us, otherwise we need to validate the path.
+// if ((treeStore != null && treeStore.IterIsValid (iter) == false) || !tree.Model.GetIter (out iter, path)) {
+// GtkUtil.HideTooltip (tree);
+// return true;
+// }
+// col.CellSetCellData (tree.Model, iter, false, false);
+//
+// foreach (CellRenderer cr in col.CellRenderers) {
+// if (!cr.Visible)
+// continue;
+//
+// if (cr is CellRendererText) {
+// hasFgColor = ((CellRendererText)cr).GetCellForegroundSet ();
+// save = ((CellRendererText)cr).ForegroundGdk;
+// ((CellRendererText)cr).ForegroundGdk = Style.Foreground (State);
+// }
+//
+// int sp, wi, he, xo, yo;
+// col.CellGetPosition (cr, out sp, out wi);
+// Gdk.Rectangle bgrect = new Gdk.Rectangle (x, expose.Y, wi, expose.Height - 2);
+// cr.GetSize (tree, ref bgrect, out xo, out yo, out wi, out he);
+// int leftMargin = (int) ((bgrect.Width - wi) * cr.Xalign);
+// int topMargin = (int) ((bgrect.Height - he) * cr.Yalign);
+// Gdk.Rectangle cellrect = new Gdk.Rectangle (bgrect.X + leftMargin, bgrect.Y + topMargin + 1, wi, he);
+// cr.Render (this.GdkWindow, this, bgrect, cellrect, expose, CellRendererState.Focused);
+// x += bgrect.Width + col.Spacing + 1;
+//
+// if (cr is CellRendererText) {
+// ((CellRendererText)cr).ForegroundGdk = save;
+// ((CellRendererText)cr).SetCellForegroundSet (hasFgColor);
+// }
+// }
+//
+// return true;
+// }
protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
index bc4797ec0a1..1e3a01dcf7b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
@@ -148,13 +148,13 @@ static GtkWorkarounds ()
}
//opt into the fixes on GTK+ >= 2.24.8
- if (Platform.IsMac) {
- try {
- gdk_quartz_set_fix_modifiers (true);
- } catch (EntryPointNotFoundException) {
- oldMacKeyHacks = true;
- }
- }
+// if (Platform.IsMac) {
+// try {
+// gdk_quartz_set_fix_modifiers (true);
+// } catch (EntryPointNotFoundException) {
+// oldMacKeyHacks = true;
+// }
+// }
keymap.KeysChanged += delegate {
mappedKeys.Clear ();
@@ -395,17 +395,17 @@ public static bool IsContextMenuButton (this Gdk.EventButton evt)
public static Gdk.ModifierType GetCurrentKeyModifiers ()
{
#if WIN32
- Gdk.ModifierType mtype = Gdk.ModifierType.None;
- ModifierKeys mod = Keyboard.Modifiers;
- if ((mod & ModifierKeys.Shift) > 0)
- mtype |= Gdk.ModifierType.ShiftMask;
- if ((mod & ModifierKeys.Control) > 0)
- mtype |= Gdk.ModifierType.ControlMask;
- if ((mod & ModifierKeys.Alt) > 0)
- mtype |= Gdk.ModifierType.Mod1Mask; // Alt key
- if ((mod & ModifierKeys.Windows) > 0)
- mtype |= Gdk.ModifierType.Mod2Mask; // Command key
- return mtype;
+ Gdk.ModifierType mtype = Gdk.ModifierType.None;
+ ModifierKeys mod = Keyboard.Modifiers;
+ if ((mod & ModifierKeys.Shift) > 0)
+ mtype |= Gdk.ModifierType.ShiftMask;
+ if ((mod & ModifierKeys.Control) > 0)
+ mtype |= Gdk.ModifierType.ControlMask;
+ if ((mod & ModifierKeys.Alt) > 0)
+ mtype |= Gdk.ModifierType.Mod1Mask; // Alt key
+ if ((mod & ModifierKeys.Windows) > 0)
+ mtype |= Gdk.ModifierType.Mod2Mask; // Command key
+ return mtype;
#else
if (Platform.IsMac) {
Gdk.ModifierType mtype = Gdk.ModifierType.None;
@@ -910,6 +910,7 @@ public static void UpdateNativeShadow (Gtk.Window window)
// per-instance delegates.
public static void FixContainerLeak (Gtk.Container c)
{
+return;
if (containerLeakFixed) {
return;
}
@@ -1091,8 +1092,8 @@ void HandleLink (object sender, ActivateLinkEventArgs args)
public void ConnectTo (Gtk.Label label)
{
- var signal = GLib.Signal.Lookup (label, "activate-link", typeof(ActivateLinkEventArgs));
- signal.AddDelegate (new EventHandler (HandleLink));
+// var signal = GLib.Signal.Lookup (label, "activate-link", typeof(ActivateLinkEventArgs));
+// signal.AddDelegate (new EventHandler (HandleLink));
}
class ActivateLinkEventArgs : GLib.SignalArgs
@@ -1150,7 +1151,7 @@ public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.Pol
//the GTK# version of this has 'out' instead of 'ref', preventing passing the x,y values in
public static bool GetTooltipContext (this TreeView tree, ref int x, ref int y, bool keyboardTip,
- out TreeModel model, out TreePath path, out Gtk.TreeIter iter)
+ out ITreeModel model, out TreePath path, out Gtk.TreeIter iter)
{
IntPtr intPtr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof(TreeIter)));
IntPtr handle;
@@ -1305,20 +1306,20 @@ public static Gdk.Pixbuf RenderIcon (this Gtk.IconSet iconset, Gtk.Style style,
[DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_object_set_data (IntPtr raw, IntPtr key, IntPtr data);
- public static void SetData (Gtk.Object gtkobject, string key, T data) where T: struct
- {
- IntPtr pkey = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr pdata = Marshal.AllocHGlobal(Marshal.SizeOf(data));
- Marshal.StructureToPtr(data, pdata, false);
- gtk_object_set_data (gtkobject.Handle, pkey, pdata);
- Marshal.FreeHGlobal(pdata);
- GLib.Marshaller.Free (pkey);
- gtkobject.Data [key] = data;
- }
+// public static void SetData (Gtk.Object gtkobject, string key, T data) where T: struct
+// {
+// IntPtr pkey = GLib.Marshaller.StringToPtrGStrdup (key);
+// IntPtr pdata = Marshal.AllocHGlobal(Marshal.SizeOf(data));
+// Marshal.StructureToPtr(data, pdata, false);
+// gtk_object_set_data (gtkobject.Handle, pkey, pdata);
+// Marshal.FreeHGlobal(pdata);
+// GLib.Marshaller.Free (pkey);
+// gtkobject.Data [key] = data;
+// }
public static void SetTransparentBgHint (this Widget widget, bool enable)
{
- SetData (widget, "transparent-bg-hint", enable);
+ //SetData (widget, "transparent-bg-hint", enable);
}
public static void SetMarkup (this Gtk.TextView view, string pangoMarkup)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
index 6ad66fed98a..c4d5aa4950f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs
@@ -72,20 +72,20 @@ protected override void ForAll (bool include_internals, Gtk.Callback callback)
callback (handle);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- base.OnExposeEvent (evnt);
-
- if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) {
- var gc = new Gdk.GC (evnt.Window);
- gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor ();
- var x = Child1.Allocation.X + Child1.Allocation.Width;
- evnt.Window.DrawLine (gc, x, Allocation.Y, x, Allocation.Y + Allocation.Height);
- gc.Dispose ();
- }
-
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// base.OnExposeEvent (evnt);
+//
+// if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) {
+// var gc = new Gdk.GC (evnt.Window);
+// gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor ();
+// var x = Child1.Allocation.X + Child1.Allocation.Width;
+// evnt.Window.DrawLine (gc, x, Allocation.Y, x, Allocation.Y + Allocation.Height);
+// gc.Dispose ();
+// }
+//
+// return true;
+// }
}
class CustomPanedHandle: Gtk.EventBox
@@ -107,9 +107,9 @@ public CustomPanedHandle (Gtk.Paned parent)
GrabAreaSize = HandleGrabWidth;
Events |= Gdk.EventMask.EnterNotifyMask | Gdk.EventMask.LeaveNotifyMask | Gdk.EventMask.PointerMotionMask | Gdk.EventMask.ButtonPressMask | Gdk.EventMask.ButtonReleaseMask;
- parent.SizeRequested += delegate {
- SizeRequest ();
- };
+// parent.SizeRequested += delegate {
+// SizeRequest ();
+// };
parent.SizeAllocated += HandleSizeAllocated;
HandleWidget = null;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
index ec21b26c1b4..e997c169879 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs
@@ -127,16 +127,26 @@ protected override void OnAdded (Widget widget)
child = widget;
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
if (child != null) {
- requisition = child.SizeRequest ();
- requisition.Width += leftMargin + rightMargin + leftPadding + rightPadding;
- requisition.Height += topMargin + bottomMargin + topPadding + bottomPadding;
+ min_height = child.SizeRequest ().Height;
+ min_height += topMargin + bottomMargin + topPadding + bottomPadding;
} else {
- requisition.Width = 0;
- requisition.Height = 0;
+ min_height = 0;
}
+ natural_height = min_height;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ if (child != null) {
+ min_width = child.SizeRequest ().Width;
+ min_width += leftMargin + rightMargin + leftPadding + rightPadding;
+ } else {
+ min_width = 0;
+ }
+ natural_width = min_width;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -154,82 +164,82 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
child.SizeAllocate (allocation);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- Gdk.Rectangle rect;
-
- if (GradientBackground) {
- rect = new Gdk.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
- var gcol = Style.Background (Gtk.StateType.Normal).ToXwtColor ();
-
- using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
- cr.NewPath ();
- cr.MoveTo (rect.X, rect.Y);
- cr.RelLineTo (rect.Width, 0);
- cr.RelLineTo (0, rect.Height);
- cr.RelLineTo (-rect.Width, 0);
- cr.RelLineTo (0, -rect.Height);
- cr.ClosePath ();
-
- // FIXME: VV: Remove gradient features
- using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, rect.Bottom)) {
- pat.AddColorStop (0, gcol.ToCairoColor ());
- gcol.Light -= 0.1;
- if (gcol.Light < 0)
- gcol.Light = 0;
- pat.AddColorStop (1, gcol.ToCairoColor ());
- cr.SetSource (pat);
- cr.FillPreserve ();
- }
- }
- } else if (BackgroundColor != null) {
- using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
- cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
- cr.SetSourceColor (BackgroundColor.Value.ToCairoColor ());
- cr.Fill ();
- }
- } else if (useChildBackgroundColor && Child != null) {
- using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
- cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
- cr.SetSourceColor (Child.Style.Base (StateType.Normal).ToCairoColor ());
- cr.Fill ();
- }
- }
-
- bool res = base.OnExposeEvent (evnt);
-
- var borderColor = new Gdk.GC (GdkWindow);
- borderColor.RgbFgColor = BorderColor != null ? BorderColor.Value : Style.Dark (Gtk.StateType.Normal);
-
- rect = Allocation;
- for (int n=0; n
/// This doesn't leak Pango layouts, unlike some other ways to create them in GTK# <= 2.12.11
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
index dfcdd9d9fd8..b0605efe52d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
@@ -304,11 +304,15 @@ public void SetActive (int index)
}
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
+ {
+ min_height = natural_height = height + topPadding + bottomPadding;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
EnsureWidths ();
- requisition.Width = Math.Max (WidthRequest, 0);
- requisition.Height = height + topPadding + bottomPadding;
+ min_width = natural_width = Math.Max (WidthRequest, 0);
}
int[] GetCurrentWidths (out bool widthReduced)
@@ -340,161 +344,161 @@ void SetAccessibilityFrame (PathEntry entry, int x, int width)
entry.Accessible.FrameInParent = rect;
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- Gdk.Rectangle focusRect = new Gdk.Rectangle (0, 0, 0, 0);
-
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- int index = 0;
- ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor.ToCairoColor ());
- ctx.Fill ();
-
- if (widths == null)
- return true;
-
- // Calculate the total required with, and the reduction to be applied in case it doesn't fit the available space
-
- bool widthReduced;
- var currentWidths = GetCurrentWidths (out widthReduced);
-
- // Render the paths
-
- int textTopPadding = topPadding + (height - textHeight) / 2;
- int xpos = leftPadding, ypos = topPadding;
-
- for (int i = 0; i < leftPath.Length; i++, index++) {
- bool last = i == leftPath.Length - 1;
-
- // Reduce the item size when required
- int itemWidth = currentWidths [i];
- int x = xpos;
- xpos += itemWidth;
-
- SetAccessibilityFrame (leftPath [i], x, itemWidth);
-
- if (hoverIndex >= 0 && hoverIndex < Path.Length && leftPath [i] == Path [hoverIndex] && (menuVisible || pressed || hovering))
- DrawButtonBorder (ctx, x - padding, itemWidth + padding + padding);
-
- if (index == focusedPathIndex) {
- focusRect = new Gdk.Rectangle (x - padding, 0, itemWidth + (padding * 2) ,0);
- }
- int textOffset = 0;
- if (leftPath [i].DarkIcon != null) {
- int iy = (height - (int)leftPath [i].DarkIcon.Height) / 2 + topPadding;
- ctx.DrawImage (this, leftPath [i].DarkIcon, x, iy);
- textOffset += (int) leftPath [i].DarkIcon.Width + iconSpacing;
- }
-
- layout.Attributes = (i == activeIndex) ? boldAtts : null;
- layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
- layout.SetMarkup (GetFirstLineFromMarkup (leftPath [i].Markup));
-
- ctx.Save ();
-
- // If size is being reduced, ellipsize it
- bool showText = true;
- if (widthReduced) {
- int w = itemWidth - textOffset;
- if (w > 0) {
- ctx.Rectangle (x + textOffset, textTopPadding, w, height);
- ctx.Clip ();
- } else
- showText = false;
- } else
- layout.Width = -1;
-
- if (showText) {
- // Text
- ctx.SetSourceColor (Styles.BreadcrumbTextColor.ToCairoColor ());
- ctx.MoveTo (x + textOffset, textTopPadding);
- Pango.CairoHelper.ShowLayout (ctx, layout);
- }
- ctx.Restore ();
-
- if (!last) {
- xpos += arrowLeftPadding;
- if (leftPath [i].IsPathEnd) {
- Style.PaintVline (Style, GdkWindow, State, evnt.Area, this, "", ypos, ypos + height, xpos - arrowSize / 2);
- } else {
- int arrowH = Math.Min (height, arrowSize);
- int arrowY = ypos + (height - arrowH) / 2;
- DrawPathSeparator (ctx, xpos, arrowY, arrowH);
- }
- xpos += arrowSize + arrowRightPadding;
- }
- }
-
- int xposRight = Allocation.Width - rightPadding;
- for (int i = 0; i < rightPath.Length; i++, index++) {
- // bool last = i == rightPath.Length - 1;
-
- // Reduce the item size when required
- int itemWidth = currentWidths [i + leftPath.Length];
- xposRight -= itemWidth;
- xposRight -= arrowSize;
-
- int x = xposRight;
-
- SetAccessibilityFrame (rightPath [i], x, itemWidth);
-
- if (hoverIndex >= 0 && hoverIndex < Path.Length && rightPath [i] == Path [hoverIndex] && (menuVisible || pressed || hovering))
- DrawButtonBorder (ctx, x - padding, itemWidth + padding + padding);
-
- if (index == focusedPathIndex) {
- focusRect = new Gdk.Rectangle (x - padding, 0, itemWidth + (padding * 2), 0);
- }
-
- int textOffset = 0;
- if (rightPath [i].DarkIcon != null) {
- ctx.DrawImage (this, rightPath [i].DarkIcon, x, ypos);
- textOffset += (int) rightPath [i].DarkIcon.Width + padding;
- }
-
- layout.Attributes = (i == activeIndex) ? boldAtts : null;
- layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
- layout.SetMarkup (GetFirstLineFromMarkup (rightPath [i].Markup));
-
- ctx.Save ();
-
- // If size is being reduced, ellipsize it
- bool showText = true;
- if (widthReduced) {
- int w = itemWidth - textOffset;
- if (w > 0) {
- ctx.Rectangle (x + textOffset, textTopPadding, w, height);
- ctx.Clip ();
- } else
- showText = false;
- } else
- layout.Width = -1;
-
- if (showText) {
- // Text
- ctx.SetSourceColor (Styles.BreadcrumbTextColor.ToCairoColor ());
- ctx.MoveTo (x + textOffset, textTopPadding);
- Pango.CairoHelper.ShowLayout (ctx, layout);
- }
-
- ctx.Restore ();
- }
-
- if (DrawBottomBorder) {
- ctx.MoveTo (0, Allocation.Height - 0.5);
- ctx.RelLineTo (Allocation.Width, 0);
- ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor.ToCairoColor ());
- ctx.LineWidth = 1;
- ctx.Stroke ();
- }
- if (HasFocus) {
- int focusY = topPadding - buttonPadding;
- int focusHeight = Allocation.Height - topPadding - bottomPadding + buttonPadding * 2;
-
- Gtk.Style.PaintFocus (Style, GdkWindow, State, Allocation, this, "label", focusRect.X, focusY, focusRect.Width, focusHeight);
- }
- }
- return true;
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// Gdk.Rectangle focusRect = new Gdk.Rectangle (0, 0, 0, 0);
+//
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// int index = 0;
+// ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+// ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor.ToCairoColor ());
+// ctx.Fill ();
+//
+// if (widths == null)
+// return true;
+//
+// // Calculate the total required with, and the reduction to be applied in case it doesn't fit the available space
+//
+// bool widthReduced;
+// var currentWidths = GetCurrentWidths (out widthReduced);
+//
+// // Render the paths
+//
+// int textTopPadding = topPadding + (height - textHeight) / 2;
+// int xpos = leftPadding, ypos = topPadding;
+//
+// for (int i = 0; i < leftPath.Length; i++, index++) {
+// bool last = i == leftPath.Length - 1;
+//
+// // Reduce the item size when required
+// int itemWidth = currentWidths [i];
+// int x = xpos;
+// xpos += itemWidth;
+//
+// SetAccessibilityFrame (leftPath [i], x, itemWidth);
+//
+// if (hoverIndex >= 0 && hoverIndex < Path.Length && leftPath [i] == Path [hoverIndex] && (menuVisible || pressed || hovering))
+// DrawButtonBorder (ctx, x - padding, itemWidth + padding + padding);
+//
+// if (index == focusedPathIndex) {
+// focusRect = new Gdk.Rectangle (x - padding, 0, itemWidth + (padding * 2) ,0);
+// }
+// int textOffset = 0;
+// if (leftPath [i].DarkIcon != null) {
+// int iy = (height - (int)leftPath [i].DarkIcon.Height) / 2 + topPadding;
+// ctx.DrawImage (this, leftPath [i].DarkIcon, x, iy);
+// textOffset += (int) leftPath [i].DarkIcon.Width + iconSpacing;
+// }
+//
+// layout.Attributes = (i == activeIndex) ? boldAtts : null;
+// layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
+// layout.SetMarkup (GetFirstLineFromMarkup (leftPath [i].Markup));
+//
+// ctx.Save ();
+//
+// // If size is being reduced, ellipsize it
+// bool showText = true;
+// if (widthReduced) {
+// int w = itemWidth - textOffset;
+// if (w > 0) {
+// ctx.Rectangle (x + textOffset, textTopPadding, w, height);
+// ctx.Clip ();
+// } else
+// showText = false;
+// } else
+// layout.Width = -1;
+//
+// if (showText) {
+// // Text
+// ctx.SetSourceColor (Styles.BreadcrumbTextColor.ToCairoColor ());
+// ctx.MoveTo (x + textOffset, textTopPadding);
+// Pango.CairoHelper.ShowLayout (ctx, layout);
+// }
+// ctx.Restore ();
+//
+// if (!last) {
+// xpos += arrowLeftPadding;
+// if (leftPath [i].IsPathEnd) {
+// Style.PaintVline (Style, GdkWindow, State, evnt.Area, this, "", ypos, ypos + height, xpos - arrowSize / 2);
+// } else {
+// int arrowH = Math.Min (height, arrowSize);
+// int arrowY = ypos + (height - arrowH) / 2;
+// DrawPathSeparator (ctx, xpos, arrowY, arrowH);
+// }
+// xpos += arrowSize + arrowRightPadding;
+// }
+// }
+//
+// int xposRight = Allocation.Width - rightPadding;
+// for (int i = 0; i < rightPath.Length; i++, index++) {
+// // bool last = i == rightPath.Length - 1;
+//
+// // Reduce the item size when required
+// int itemWidth = currentWidths [i + leftPath.Length];
+// xposRight -= itemWidth;
+// xposRight -= arrowSize;
+//
+// int x = xposRight;
+//
+// SetAccessibilityFrame (rightPath [i], x, itemWidth);
+//
+// if (hoverIndex >= 0 && hoverIndex < Path.Length && rightPath [i] == Path [hoverIndex] && (menuVisible || pressed || hovering))
+// DrawButtonBorder (ctx, x - padding, itemWidth + padding + padding);
+//
+// if (index == focusedPathIndex) {
+// focusRect = new Gdk.Rectangle (x - padding, 0, itemWidth + (padding * 2), 0);
+// }
+//
+// int textOffset = 0;
+// if (rightPath [i].DarkIcon != null) {
+// ctx.DrawImage (this, rightPath [i].DarkIcon, x, ypos);
+// textOffset += (int) rightPath [i].DarkIcon.Width + padding;
+// }
+//
+// layout.Attributes = (i == activeIndex) ? boldAtts : null;
+// layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
+// layout.SetMarkup (GetFirstLineFromMarkup (rightPath [i].Markup));
+//
+// ctx.Save ();
+//
+// // If size is being reduced, ellipsize it
+// bool showText = true;
+// if (widthReduced) {
+// int w = itemWidth - textOffset;
+// if (w > 0) {
+// ctx.Rectangle (x + textOffset, textTopPadding, w, height);
+// ctx.Clip ();
+// } else
+// showText = false;
+// } else
+// layout.Width = -1;
+//
+// if (showText) {
+// // Text
+// ctx.SetSourceColor (Styles.BreadcrumbTextColor.ToCairoColor ());
+// ctx.MoveTo (x + textOffset, textTopPadding);
+// Pango.CairoHelper.ShowLayout (ctx, layout);
+// }
+//
+// ctx.Restore ();
+// }
+//
+// if (DrawBottomBorder) {
+// ctx.MoveTo (0, Allocation.Height - 0.5);
+// ctx.RelLineTo (Allocation.Width, 0);
+// ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor.ToCairoColor ());
+// ctx.LineWidth = 1;
+// ctx.Stroke ();
+// }
+// if (HasFocus) {
+// int focusY = topPadding - buttonPadding;
+// int focusHeight = Allocation.Height - topPadding - bottomPadding + buttonPadding * 2;
+//
+// Gtk.Style.PaintFocus (Style, GdkWindow, State, Allocation, this, "label", focusRect.X, focusY, focusRect.Width, focusHeight);
+// }
+// }
+// return true;
+// }
void DrawPathSeparator (Cairo.Context ctx, double x, double y, double size)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs
index 12caa853ff7..54d2e19a9cc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs
@@ -55,15 +55,15 @@ public PopoverWidget ()
Add (alignment);
disableSizeCheck = false;
-
- SizeRequested += (object o, SizeRequestedArgs args) => {
- if (this.AnimationIsRunning("Resize") && !disableSizeCheck) {
- Gtk.Requisition result = new Gtk.Requisition ();
- result.Width = Math.Max (args.Requisition.Width, Math.Max (Allocation.Width, targetSize.Width));
- result.Height = Math.Max (args.Requisition.Height, Math.Max (Allocation.Height, targetSize.Height));
- args.Requisition = result;
- }
- };
+
+// SizeRequested += (object o, SizeRequestedArgs args) => {
+// if (this.AnimationIsRunning("Resize") && !disableSizeCheck) {
+// Gtk.Requisition result = new Gtk.Requisition ();
+// result.Width = Math.Max (args.Requisition.Width, Math.Max (Allocation.Width, targetSize.Width));
+// result.Height = Math.Max (args.Requisition.Height, Math.Max (Allocation.Height, targetSize.Height));
+// args.Requisition = result;
+// }
+// };
UpdatePadding ();
}
@@ -118,7 +118,8 @@ public void AnimatedResize ()
disableSizeCheck = true;
Gtk.Requisition sizeReq = Gtk.Requisition.Zero;
// use OnSizeRequested instead of SizeRequest to bypass internal GTK caching
- OnSizeRequested (ref sizeReq);
+ OnGetPreferredWidth (out sizeReq.Width, out sizeReq.Width);
+ OnGetPreferredHeight (out sizeReq.Height, out sizeReq.Height);
disableSizeCheck = false;
Gdk.Size size = new Gdk.Size (sizeReq.Width, sizeReq.Height);
@@ -150,7 +151,8 @@ void MaybeReanimate ()
{
disableSizeCheck = true;
Gtk.Requisition sizeReq = Gtk.Requisition.Zero;
- OnSizeRequested (ref sizeReq);
+ OnGetPreferredHeight (out sizeReq.Height, out sizeReq.Height);
+ OnGetPreferredWidth (out sizeReq.Width, out sizeReq.Width);
disableSizeCheck = false;
if (sizeReq.Width == paintSize.Width && sizeReq.Height == paintSize.Height)
@@ -159,34 +161,34 @@ void MaybeReanimate ()
AnimatedResize (); //Desired size changed mid animation
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if ((position & PopupPosition.Top) != 0 || (position & PopupPosition.Bottom) != 0)
- theme.ArrowOffset = Allocation.Width / 2;
- else
- theme.ArrowOffset = Allocation.Height / 2;
-
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- context.Save ();
- Theme.SetBorderPath (context, BorderAllocation, position);
- context.Clip ();
- OnDrawContent (evnt, context); // Draw content first so we can easily clip it
- context.Restore ();
-
-
- // protect against overriden methods which leave in a bad state
- context.Save ();
- if (Theme.DrawPager) {
- Theme.RenderPager (context,
- PangoContext,
- BorderAllocation);
- }
-
- Theme.RenderShadow (context, BorderAllocation, position);
- context.Restore ();
- }
- return base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if ((position & PopupPosition.Top) != 0 || (position & PopupPosition.Bottom) != 0)
+// theme.ArrowOffset = Allocation.Width / 2;
+// else
+// theme.ArrowOffset = Allocation.Height / 2;
+//
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// context.Save ();
+// Theme.SetBorderPath (context, BorderAllocation, position);
+// context.Clip ();
+// OnDrawContent (evnt, context); // Draw content first so we can easily clip it
+// context.Restore ();
+//
+//
+// // protect against overriden methods which leave in a bad state
+// context.Save ();
+// if (Theme.DrawPager) {
+// Theme.RenderPager (context,
+// PangoContext,
+// BorderAllocation);
+// }
+//
+// Theme.RenderShadow (context, BorderAllocation, position);
+// context.Restore ();
+// }
+// return base.OnExposeEvent (evnt);
+// }
protected virtual void OnDrawContent (Gdk.EventExpose evnt, Cairo.Context context)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
index d2ad2099d53..0d30608ff00 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs
@@ -71,14 +71,14 @@ public PopoverWindow (Gtk.WindowType type) : base(type)
disableSizeCheck = false;
- SizeRequested += (object o, SizeRequestedArgs args) => {
- if (this.AnimationIsRunning("Resize") && !disableSizeCheck) {
- Gtk.Requisition result = new Gtk.Requisition ();
- result.Width = Math.Max (args.Requisition.Width, Math.Max (Allocation.Width, targetSize.Width));
- result.Height = Math.Max (args.Requisition.Height, Math.Max (Allocation.Height, targetSize.Height));
- args.Requisition = result;
- }
- };
+// SizeRequested += (object o, SizeRequestedArgs args) => {
+// if (this.AnimationIsRunning("Resize") && !disableSizeCheck) {
+// Gtk.Requisition result = new Gtk.Requisition ();
+// result.Width = Math.Max (args.Requisition.Width, Math.Max (Allocation.Width, targetSize.Width));
+// result.Height = Math.Max (args.Requisition.Height, Math.Max (Allocation.Height, targetSize.Height));
+// args.Requisition = result;
+// }
+// };
UpdatePadding ();
}
@@ -209,21 +209,22 @@ Gdk.Rectangle GetUsableMonitorGeometry (Gdk.Rectangle caret)
return Gdk.Rectangle.Zero;
}
-
+
void IAnimatable.BatchBegin () { }
void IAnimatable.BatchCommit () { QueueDraw (); }
public void AnimatedResize ()
- {
- if (!GtkUtil.ScreenSupportsARGB ()) {
- QueueResize();
- return;
+ {
+ if (!GtkUtil.ScreenSupportsARGB ()) {
+ QueueResize();
+ return;
}
disableSizeCheck = true;
Gtk.Requisition sizeReq = Gtk.Requisition.Zero;
// use OnSizeRequested instead of SizeRequest to bypass internal GTK caching
- OnSizeRequested (ref sizeReq);
+ OnGetPreferredWidth (out sizeReq.Width, out sizeReq.Width);
+ OnGetPreferredHeight (out sizeReq.Height, out sizeReq.Height);
disableSizeCheck = false;
Gdk.Size size = new Gdk.Size (sizeReq.Width, sizeReq.Height);
@@ -255,7 +256,7 @@ void MaybeReanimate ()
{
disableSizeCheck = true;
Gtk.Requisition sizeReq = Gtk.Requisition.Zero;
- OnSizeRequested (ref sizeReq);
+// OnSizeRequested (ref sizeReq);
disableSizeCheck = false;
if (sizeReq.Width == paintSize.Width && sizeReq.Height == paintSize.Height)
@@ -416,11 +417,11 @@ public bool ShowWindowShadow {
void CheckScreenColormap ()
{
SupportsAlpha = Screen.IsComposited;
- if (SupportsAlpha) {
- Colormap = Screen.RgbaColormap;
- } else {
- Colormap = Screen.RgbColormap;
- }
+// if (SupportsAlpha) {
+// Colormap = Screen.RgbaColormap;
+// } else {
+// Colormap = Screen.RgbColormap;
+// }
}
protected override void OnScreenChanged (Gdk.Screen previous_screen)
@@ -429,48 +430,48 @@ protected override void OnScreenChanged (Gdk.Screen previous_screen)
CheckScreenColormap ();
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- bool retVal;
- bool changed;
- using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
- context.Save ();
- if (SupportsAlpha) {
- context.Operator = Cairo.Operator.Source;
- context.SetSourceRGBA (1, 1, 1, 0);
- } else {
- context.Operator = Cairo.Operator.Over;
- context.SetSourceRGB (1, 1, 1);
- }
- context.Paint ();
- context.Restore ();
-
- OnDrawContent (evnt, context); // Draw content first so we can easily clip it
- retVal = base.OnExposeEvent (evnt);
-
- changed = Theme.SetBorderPath (context, BorderAllocation, position);
- context.Operator = Cairo.Operator.DestIn;
- context.SetSourceRGBA (1, 1, 1, 1);
- context.Fill ();
- context.Operator = Cairo.Operator.Over;
-
- // protect against overriden methods which leave in a bad state
- context.Save ();
- if (Theme.DrawPager) {
- Theme.RenderPager (context,
- PangoContext,
- BorderAllocation);
- }
-
- Theme.RenderShadow (context, BorderAllocation, position);
- context.Restore ();
- }
-
- if (changed)
- GtkWorkarounds.UpdateNativeShadow (this);
-
- return retVal;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// bool retVal;
+// bool changed;
+// using (var context = Gdk.CairoHelper.Create (evnt.Window)) {
+// context.Save ();
+// if (SupportsAlpha) {
+// context.Operator = Cairo.Operator.Source;
+// context.SetSourceRGBA (1, 1, 1, 0);
+// } else {
+// context.Operator = Cairo.Operator.Over;
+// context.SetSourceRGB (1, 1, 1);
+// }
+// context.Paint ();
+// context.Restore ();
+//
+// OnDrawContent (evnt, context); // Draw content first so we can easily clip it
+// retVal = base.OnExposeEvent (evnt);
+//
+// changed = Theme.SetBorderPath (context, BorderAllocation, position);
+// context.Operator = Cairo.Operator.DestIn;
+// context.SetSourceRGBA (1, 1, 1, 1);
+// context.Fill ();
+// context.Operator = Cairo.Operator.Over;
+//
+// // protect against overriden methods which leave in a bad state
+// context.Save ();
+// if (Theme.DrawPager) {
+// Theme.RenderPager (context,
+// PangoContext,
+// BorderAllocation);
+// }
+//
+// Theme.RenderShadow (context, BorderAllocation, position);
+// context.Restore ();
+// }
+//
+// if (changed)
+// GtkWorkarounds.UpdateNativeShadow (this);
+//
+// return retVal;
+// }
protected virtual void OnDrawContent (Gdk.EventExpose evnt, Cairo.Context context)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
index 43b4cb2286f..41b5be2dcbd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
@@ -56,7 +56,7 @@ protected RoundedFrame (IntPtr ptr) : base(ptr)
public RoundedFrame ()
{
this.Events = Gdk.EventMask.AllEventsMask;
- this.WidgetFlags |= WidgetFlags.NoWindow;
+ this.HasWindow = true;
DoubleBuffered = true;
AppPaintable = false;
}
@@ -100,21 +100,34 @@ protected override void OnRealized ()
theme = MonoDevelop.Components.Theming.ThemeEngine.CreateTheme (this);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
if (child != null && child.Visible) {
// Add the child's width/height
Requisition child_requisition = child.SizeRequest ();
- requisition.Width = Math.Max (0, child_requisition.Width);
- requisition.Height = child_requisition.Height;
+ min_height = child_requisition.Height;
} else {
- requisition.Width = 0;
- requisition.Height = 0;
+ min_height = 0;
}
// Add the frame border
- requisition.Width += ((int)BorderWidth + frame_width) * 2;
- requisition.Height += ((int)BorderWidth + frame_width) * 2;
+ min_height += ((int)BorderWidth + frame_width) * 2;
+ natural_height = min_height;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ if (child != null && child.Visible) {
+ // Add the child's width/height
+ Requisition child_requisition = child.SizeRequest ();
+ min_width = Math.Max (0, child_requisition.Width);
+ } else {
+ min_width = 0;
+ }
+
+ // Add the frame border
+ min_width += ((int)BorderWidth + frame_width) * 2;
+ natural_width = min_width;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -134,26 +147,26 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
child.SizeAllocate (child_allocation);
}
- protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
- {
- // This is to satisfy the gtk_widget_set_scroll_adjustments
- // inside of GtkScrolledWindow so it doesn't complain about
- // its child not being scrollable.
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (!IsDrawable) {
- return false;
- }
-
- using (Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
- DrawFrame (cr, evnt.Area);
- if (child != null)
- PropagateExpose (child, evnt);
- return false;
- }
- }
+// protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+// {
+// // This is to satisfy the gtk_widget_set_scroll_adjustments
+// // inside of GtkScrolledWindow so it doesn't complain about
+// // its child not being scrollable.
+// }
+
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (!IsDrawable) {
+// return false;
+// }
+//
+// using (Context cr = Gdk.CairoHelper.Create (evnt.Window)) {
+// DrawFrame (cr, evnt.Area);
+// if (child != null)
+// PropagateExpose (child, evnt);
+// return false;
+// }
+// }
private void DrawFrame (Cairo.Context cr, Gdk.Rectangle clip)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
index e0803887c02..a4b108b93c5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs
@@ -207,13 +207,13 @@ private void BuildWidget ()
ShowHideButtons ();
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
if (HeightRequest != -1 && box.HeightRequest != HeightRequest)
box.HeightRequest = HeightRequest;
if (box.HeightRequest != -1 && HeightRequest == -1)
box.HeightRequest = -1;
- base.OnSizeRequested (ref requisition);
+ base.OnGetPreferredHeight (out min_height, out natural_height);
}
Gtk.EventBox statusLabelEventBox;
@@ -430,50 +430,50 @@ protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
return base.OnKeyPressEvent (evnt);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- var alloc = new Gdk.Rectangle (alignment.Allocation.X, box.Allocation.Y, alignment.Allocation.Width, box.Allocation.Height);
-
- if (hasFrame && (!roundedShape || (roundedShape && !customRoundedShapeDrawing))) {
- if (Platform.IsLinux)
- Style.PaintFlatBox (Style, GdkWindow, entry.State, ShadowType.None,
- evnt.Area, this, "entry_bg", alloc.X + 2, alloc.Y + 2, alloc.Width - 4, alloc.Height - 4);
- Style.PaintShadow (entry.Style, GdkWindow, entry.State, entry.ShadowType,
- evnt.Area, entry, "entry", alloc.X, alloc.Y, alloc.Width, alloc.Height);
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// var alloc = new Gdk.Rectangle (alignment.Allocation.X, box.Allocation.Y, alignment.Allocation.Width, box.Allocation.Height);
+//
+// if (hasFrame && (!roundedShape || (roundedShape && !customRoundedShapeDrawing))) {
+// if (Platform.IsLinux)
+// Style.PaintFlatBox (Style, GdkWindow, entry.State, ShadowType.None,
+// evnt.Area, this, "entry_bg", alloc.X + 2, alloc.Y + 2, alloc.Width - 4, alloc.Height - 4);
+// Style.PaintShadow (entry.Style, GdkWindow, entry.State, entry.ShadowType,
+// evnt.Area, entry, "entry", alloc.X, alloc.Y, alloc.Width, alloc.Height);
/* using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
ctx.LineWidth = 1;
ctx.Rectangle (alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1);
ctx.Color = new Cairo.Color (1,0,0);
ctx.Stroke ();
}*/
- }
- else if (!roundedShape) {
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- CairoExtensions.RoundedRectangle (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1, 4);
- ctx.SetSourceColor (entry.Style.Base (Gtk.StateType.Normal).ToCairoColor ());
- ctx.Fill ();
- }
- }
- else {
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- RoundBorder (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1);
- ctx.SetSourceColor (entry.Style.Base (Gtk.StateType.Normal).ToCairoColor ());
- ctx.Fill ();
- }
- }
-
- PropagateExpose (Child, evnt);
-
- if (hasFrame && roundedShape && customRoundedShapeDrawing) {
- using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
- RoundBorder (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1);
- ctx.SetSourceColor (Styles.WidgetBorderColor.ToCairoColor ());
- ctx.LineWidth = 1;
- ctx.Stroke ();
- }
- }
- return true;
- }
+// }
+// else if (!roundedShape) {
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// CairoExtensions.RoundedRectangle (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1, 4);
+// ctx.SetSourceColor (entry.Style.Base (Gtk.StateType.Normal).ToCairoColor ());
+// ctx.Fill ();
+// }
+// }
+// else {
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// RoundBorder (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1);
+// ctx.SetSourceColor (entry.Style.Base (Gtk.StateType.Normal).ToCairoColor ());
+// ctx.Fill ();
+// }
+// }
+//
+// PropagateExpose (Child, evnt);
+//
+// if (hasFrame && roundedShape && customRoundedShapeDrawing) {
+// using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) {
+// RoundBorder (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1);
+// ctx.SetSourceColor (Styles.WidgetBorderColor.ToCairoColor ());
+// ctx.LineWidth = 1;
+// ctx.Stroke ();
+// }
+// }
+// return true;
+// }
static void RoundBorder (Cairo.Context ctx, double x, double y, double w, double h)
{
@@ -687,7 +687,7 @@ private class FramelessEntry : Entry
{
private SearchEntry parent;
private Pango.Layout layout;
- private Gdk.GC text_gc;
+// private Gdk.GC text_gc;
public FramelessEntry (SearchEntry parent) : base()
{
@@ -708,8 +708,8 @@ private void OnParentStyleSet (object o, EventArgs args)
private void RefreshGC ()
{
- text_gc?.Dispose ();
- text_gc = null;
+// text_gc?.Dispose ();
+// text_gc = null;
}
protected override void OnDestroyed ()
@@ -751,47 +751,47 @@ public static Gdk.Color ColorBlend (Gdk.Color a, Gdk.Color b)
double blB = mB * blendRatio;
Gdk.Color color = new Gdk.Color ((byte)blR, (byte)blG, (byte)blB);
- Gdk.Colormap.System.AllocColor (ref color, true, true);
+// Gdk.Colormap.System.AllocColor (ref color, true, true);
return color;
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- // The Entry's GdkWindow is the top level window onto which
- // the frame is drawn; the actual text entry is drawn into a
- // separate window, so we can ensure that for themes that don't
- // respect HasFrame, we never ever allow the base frame drawing
- // to happen
- if (evnt.Window == GdkWindow) {
- return true;
- }
-
- bool ret = base.OnExposeEvent (evnt);
-
- if (text_gc == null) {
- text_gc = new Gdk.GC (evnt.Window);
- text_gc.Copy (Style.TextGC (StateType.Normal));
- Gdk.Color color_a = parent.Style.Base (StateType.Normal);
- Gdk.Color color_b = parent.Style.Text (StateType.Normal);
- text_gc.RgbFgColor = ColorBlend (color_a, color_b);
- }
-
- if (Text.Length > 0 || HasFocus || parent.EmptyMessage == null) {
- return ret;
- }
-
- if (layout == null) {
- layout = new Pango.Layout (PangoContext);
- layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
- }
-
- int width, height;
- layout.SetMarkup (parent.EmptyMessage);
- layout.GetPixelSize (out width, out height);
- evnt.Window.DrawLayout (text_gc, 2, (SizeRequest ().Height - height) / 2, layout);
-
- return ret;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// // The Entry's GdkWindow is the top level window onto which
+// // the frame is drawn; the actual text entry is drawn into a
+// // separate window, so we can ensure that for themes that don't
+// // respect HasFrame, we never ever allow the base frame drawing
+// // to happen
+// if (evnt.Window == GdkWindow) {
+// return true;
+// }
+//
+// bool ret = base.OnExposeEvent (evnt);
+//
+// if (text_gc == null) {
+// text_gc = new Gdk.GC (evnt.Window);
+// text_gc.Copy (Style.TextGC (StateType.Normal));
+// Gdk.Color color_a = parent.Style.Base (StateType.Normal);
+// Gdk.Color color_b = parent.Style.Text (StateType.Normal);
+// text_gc.RgbFgColor = ColorBlend (color_a, color_b);
+// }
+//
+// if (Text.Length > 0 || HasFocus || parent.EmptyMessage == null) {
+// return ret;
+// }
+//
+// if (layout == null) {
+// layout = new Pango.Layout (PangoContext);
+// layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11);
+// }
+//
+// int width, height;
+// layout.SetMarkup (parent.EmptyMessage);
+// layout.GetPixelSize (out width, out height);
+// evnt.Window.DrawLayout (text_gc, 2, (SizeRequest ().Height - height) / 2, layout);
+//
+// return ret;
+// }
}
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
index a923811a16f..cf0da4b9d4c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SectionList.cs
@@ -91,8 +91,8 @@ void OnActiveSectionChanged ()
public SectionList ()
{
GtkWorkarounds.FixContainerLeak (this);
-
- this.WidgetFlags |= WidgetFlags.NoWindow;
+
+ this.HasWindow = false;
WidthRequest = 100;
EnsureLayout ();
}
@@ -106,7 +106,7 @@ protected override void OnRealized ()
var attributes = new Gdk.WindowAttr () {
WindowType = Gdk.WindowType.Child,
- Wclass = Gdk.WindowClass.InputOnly,
+// Wclass = Gdk.WindowClass.InputOnly,
EventMask = (int) (
EventMask.EnterNotifyMask |
EventMask.LeaveNotifyMask |
@@ -183,10 +183,10 @@ void KillLayout ()
layout = null;
}
- protected override void OnDestroyed ()
+ protected override void OnDestroyed ()
{
- KillLayout ();
- base.OnDestroyed ();
+ KillLayout ();
+ base.OnDestroyed ();
}
protected override void OnAdded (Widget widget)
@@ -214,12 +214,11 @@ protected override void OnShown ()
base.OnShown ();
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- int wr = 0, hr = 0;
+ int hr = 0;
foreach (var section in sections) {
var req = section.Child.SizeRequest ();
- wr = Math.Max (wr, req.Width);
hr = Math.Max (hr, req.Height);
}
@@ -228,13 +227,28 @@ protected override void OnSizeRequested (ref Requisition requisition)
int bw2 = ((int)BorderWidth + borderLineWidth) * 2;
hr += bw2;
- wr += bw2;
hr = Math.Max (hr, HeightRequest);
+
+ min_height = natural_height = hr;
+ }
+
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ int wr = 0;
+ foreach (var section in sections) {
+ var req = section.Child.SizeRequest ();
+ wr = Math.Max (wr, req.Width);
+ }
+
+
+ int bw2 = ((int)BorderWidth + borderLineWidth) * 2;
+
+ wr += bw2;
+
wr = Math.Max (wr, WidthRequest);
- requisition.Height = hr;
- requisition.Width = wr;
+ min_width = natural_width = wr;
}
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -281,91 +295,91 @@ static Cairo.Color Convert (Gdk.Color color)
}
//FIXME: respect damage regions not just the whole areas, and skip more work when possible
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- if (sections.Count == 0)
- return false;
-
- var alloc = Allocation;
-
- int bw = (int) BorderWidth;
- double halfLineWidth = borderLineWidth / 2.0;
- int bw2 = bw * 2;
- int w = alloc.Width - bw2;
- int h = alloc.Height - bw2;
-
- using (var cr = CairoHelper.Create (evnt.Window)) {
- CairoHelper.Region (cr, evnt.Region);
- cr.Clip ();
-
- cr.Translate (alloc.X + bw, alloc.Y + bw);
-
- var borderCol = Convert (Style.Dark (StateType.Normal));
- cr.SetSourceColor (borderCol);
- cr.Rectangle (halfLineWidth, halfLineWidth, w - borderLineWidth, h - borderLineWidth);
- cr.LineWidth = borderLineWidth;
- cr.Stroke ();
-
- cr.Translate (borderLineWidth, borderLineWidth);
- w = w - (2 * borderLineWidth);
-
- using (LinearGradient unselectedGrad = new LinearGradient (0, 0, 0, headerHeight),
- hoverGrad = new LinearGradient (0, 0, 0, headerHeight),
- selectedGrad = new LinearGradient (0, 0, 0, headerHeight)
- )
- {
- var unselectedCol = Convert (Style.Mid (StateType.Normal));
- var unselectedTextCol = Convert (Style.Text (StateType.Normal));
- unselectedCol.A = 0.6;
- unselectedGrad.AddColorStop (0, unselectedCol);
- unselectedCol.A = 1;
- unselectedGrad.AddColorStop (1, unselectedCol);
-
- var hoverCol = Convert (Style.Mid (StateType.Prelight));
- var hoverTextCol = Convert (Style.Text (StateType.Prelight));
- hoverCol.A = 0.6;
- hoverGrad.AddColorStop (0, unselectedCol);
- hoverCol.A = 1;
- hoverGrad.AddColorStop (1, unselectedCol);
-
- var selectedCol = Convert (Style.Mid (StateType.Normal));
- var selectedTextCol = Convert (Style.Text (StateType.Normal));
- selectedCol.A = 0.6;
- selectedGrad.AddColorStop (0, selectedCol);
- selectedCol.A = 1;
- selectedGrad.AddColorStop (1, selectedCol);
-
- for (int i = 0; i < sections.Count; i++) {
- var section = sections[i];
- bool isActive = activeIndex == i;
- bool isHover = hoverIndex == i;
-
- cr.Rectangle (0, 0, w, headerHeight);
- cr.SetSource (isActive? selectedGrad : (isHover? hoverGrad : unselectedGrad));
- cr.Fill ();
-
- cr.SetSourceColor (isActive? selectedTextCol : (isHover? hoverTextCol : unselectedTextCol));
- layout.SetText (section.Title);
- layout.Ellipsize = Pango.EllipsizeMode.End;
- layout.Width = (int) ((w - headerPadding - headerPadding) * Pango.Scale.PangoScale);
- cr.MoveTo (headerPadding, headerPadding);
- Pango.CairoHelper.ShowLayout (cr, layout);
-
- cr.MoveTo (-halfLineWidth, i > activeIndex? -halfLineWidth : headerHeight + halfLineWidth);
- cr.RelLineTo (w + borderLineWidth, 0.0);
- cr.SetSourceColor (borderCol);
- cr.Stroke ();
-
- cr.Translate (0, headerHeight + borderLineWidth);
- if (isActive)
- cr.Translate (0, section.Child.Allocation.Height + borderLineWidth);
- }
- }
- }
-
- PropagateExpose (sections[activeIndex].Child, evnt);
- return true;// base.OnExposeEvent (evnt);
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// if (sections.Count == 0)
+// return false;
+//
+// var alloc = Allocation;
+//
+// int bw = (int) BorderWidth;
+// double halfLineWidth = borderLineWidth / 2.0;
+// int bw2 = bw * 2;
+// int w = alloc.Width - bw2;
+// int h = alloc.Height - bw2;
+//
+// using (var cr = CairoHelper.Create (evnt.Window)) {
+// CairoHelper.Region (cr, evnt.Region);
+// cr.Clip ();
+//
+// cr.Translate (alloc.X + bw, alloc.Y + bw);
+//
+// var borderCol = Convert (Style.Dark (StateType.Normal));
+// cr.SetSourceColor (borderCol);
+// cr.Rectangle (halfLineWidth, halfLineWidth, w - borderLineWidth, h - borderLineWidth);
+// cr.LineWidth = borderLineWidth;
+// cr.Stroke ();
+//
+// cr.Translate (borderLineWidth, borderLineWidth);
+// w = w - (2 * borderLineWidth);
+//
+// using (LinearGradient unselectedGrad = new LinearGradient (0, 0, 0, headerHeight),
+// hoverGrad = new LinearGradient (0, 0, 0, headerHeight),
+// selectedGrad = new LinearGradient (0, 0, 0, headerHeight)
+// )
+// {
+// var unselectedCol = Convert (Style.Mid (StateType.Normal));
+// var unselectedTextCol = Convert (Style.Text (StateType.Normal));
+// unselectedCol.A = 0.6;
+// unselectedGrad.AddColorStop (0, unselectedCol);
+// unselectedCol.A = 1;
+// unselectedGrad.AddColorStop (1, unselectedCol);
+//
+// var hoverCol = Convert (Style.Mid (StateType.Prelight));
+// var hoverTextCol = Convert (Style.Text (StateType.Prelight));
+// hoverCol.A = 0.6;
+// hoverGrad.AddColorStop (0, unselectedCol);
+// hoverCol.A = 1;
+// hoverGrad.AddColorStop (1, unselectedCol);
+//
+// var selectedCol = Convert (Style.Mid (StateType.Normal));
+// var selectedTextCol = Convert (Style.Text (StateType.Normal));
+// selectedCol.A = 0.6;
+// selectedGrad.AddColorStop (0, selectedCol);
+// selectedCol.A = 1;
+// selectedGrad.AddColorStop (1, selectedCol);
+//
+// for (int i = 0; i < sections.Count; i++) {
+// var section = sections[i];
+// bool isActive = activeIndex == i;
+// bool isHover = hoverIndex == i;
+//
+// cr.Rectangle (0, 0, w, headerHeight);
+// cr.SetSource (isActive? selectedGrad : (isHover? hoverGrad : unselectedGrad));
+// cr.Fill ();
+//
+// cr.SetSourceColor (isActive? selectedTextCol : (isHover? hoverTextCol : unselectedTextCol));
+// layout.SetText (section.Title);
+// layout.Ellipsize = Pango.EllipsizeMode.End;
+// layout.Width = (int) ((w - headerPadding - headerPadding) * Pango.Scale.PangoScale);
+// cr.MoveTo (headerPadding, headerPadding);
+// Pango.CairoHelper.ShowLayout (cr, layout);
+//
+// cr.MoveTo (-halfLineWidth, i > activeIndex? -halfLineWidth : headerHeight + halfLineWidth);
+// cr.RelLineTo (w + borderLineWidth, 0.0);
+// cr.SetSourceColor (borderCol);
+// cr.Stroke ();
+//
+// cr.Translate (0, headerHeight + borderLineWidth);
+// if (isActive)
+// cr.Translate (0, section.Child.Allocation.Height + borderLineWidth);
+// }
+// }
+// }
+//
+// PropagateExpose (sections[activeIndex].Child, evnt);
+// return true;// base.OnExposeEvent (evnt);
+// }
protected override void ForAll (bool include_internals, Callback callback)
{
@@ -507,4 +521,4 @@ internal void OnActivated ()
public event EventHandler Activated;
}
}
-}
\ No newline at end of file
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs
index 8e6aeee4e63..e84c83ef23b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs
@@ -59,7 +59,7 @@ public TabLabel (Label label, ImageView icon) : base (false, 0)
button.Clicked += new EventHandler(ButtonClicked);
button.Name = "MonoDevelop.TabLabel.CloseButton";
this.PackStart (button, false, true, 0);
- this.ClearFlag (WidgetFlags.CanFocus);
+ this.CanFocus = false;
this.BorderWidth = 0;
this.ShowAll ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
index a8c9cd2c290..9ec02c437be 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs
@@ -207,37 +207,37 @@ protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing evnt)
return base.OnLeaveNotifyEvent (evnt);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- requisition.Height = (int)Math.Ceiling (tabSizes.Max (p => p.Y));
- }
-
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- using (var cr = Gdk.CairoHelper.Create (evnt.Window)) {
- cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
- cr.SetSourceColor (Styles.SubTabBarBackgroundColor.ToCairoColor ());
- cr.Fill ();
-
- Tab active = null;
- for (int i = tabs.Count; i --> 0;) {
- if (i == ActiveTab) {
- active = tabs [i];
- continue;
- }
- var tab = tabs[i];
- var bounds = GetBounds (tab);
- tab.HoverPosition = tab == hoverTab ? new Cairo.PointD (mx - bounds.X, my) : new Cairo.PointD (-1, -1);
- tab.Draw (cr, bounds);
- }
-
- if (active != null) {
- active.Draw (cr, GetBounds (active));
- }
- }
-
- return base.OnExposeEvent (evnt);
- }
+ min_height = natural_height = (int)Math.Ceiling (tabSizes.Max (p => p.Y));
+ }
+
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// using (var cr = Gdk.CairoHelper.Create (evnt.Window)) {
+// cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+// cr.SetSourceColor (Styles.SubTabBarBackgroundColor.ToCairoColor ());
+// cr.Fill ();
+//
+// Tab active = null;
+// for (int i = tabs.Count; i --> 0;) {
+// if (i == ActiveTab) {
+// active = tabs [i];
+// continue;
+// }
+// var tab = tabs[i];
+// var bounds = GetBounds (tab);
+// tab.HoverPosition = tab == hoverTab ? new Cairo.PointD (mx - bounds.X, my) : new Cairo.PointD (-1, -1);
+// tab.Draw (cr, bounds);
+// }
+//
+// if (active != null) {
+// active.Draw (cr, GetBounds (active));
+// }
+// }
+//
+// return base.OnExposeEvent (evnt);
+// }
int focusedTab = -1;
protected override bool OnFocused (DirectionType direction)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs
index dfa4390f5d1..319af574003 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs
@@ -43,7 +43,7 @@ public class TooltipPopoverWindow: XwtThemedPopup
static TooltipPopoverWindow ()
{
- preferredEngine = Platform.IsWindows? Toolkit.Load (ToolkitType.Gtk) : Toolkit.NativeEngine;
+ preferredEngine = Platform.IsWindows? Toolkit.Load (ToolkitType.Gtk3) : Toolkit.NativeEngine;
}
public static TooltipPopoverWindow Create (bool tryNative = true)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
index f2cfc14f3a5..b54533d48b6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipWindow.cs
@@ -51,8 +51,7 @@ protected TooltipWindow () : base (Gtk.WindowType.Popup)
this.Decorated = false;
this.BorderWidth = 2;
this.TypeHint = WindowTypeHint.Tooltip;
- this.AllowShrink = false;
- this.AllowGrow = false;
+ this.Resizable = true;
this.Title = "tooltip"; // fixes the annoying '** Message: ATK_ROLE_TOOLTIP object found, but doesn't look like a tooltip.** Message: ATK_ROLE_TOOLTIP object found, but doesn't look like a tooltip.'
//fake widget name for stupid theme engines
@@ -77,15 +76,15 @@ public bool EnableTransparencyControl {
}
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- int winWidth, winHeight;
- this.GetSize (out winWidth, out winHeight);
- Gtk.Style.PaintFlatBox (Style, this.GdkWindow, StateType.Normal, ShadowType.Out, evnt.Area, this, "tooltip", 0, 0, winWidth, winHeight);
- foreach (var child in this.Children)
- this.PropagateExpose (child, evnt);
- return false;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// int winWidth, winHeight;
+// this.GetSize (out winWidth, out winHeight);
+// Gtk.Style.PaintFlatBox (Style, this.GdkWindow, StateType.Normal, ShadowType.Out, evnt.Area, this, "tooltip", 0, 0, winWidth, winHeight);
+// foreach (var child in this.Children)
+// this.PropagateExpose (child, evnt);
+// return false;
+// }
protected override void OnDestroyed ()
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TreeViewCellContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TreeViewCellContainer.cs
index 61b4939117e..92e81cf7f60 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TreeViewCellContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TreeViewCellContainer.cs
@@ -76,22 +76,23 @@ protected override void OnShown ()
// Do nothing.
}
- protected override void OnSizeRequested (ref Requisition requisition)
- {
- base.OnSizeRequested (ref requisition);
- if (box.Child != null) {
- requisition = box.Child.SizeRequest ();
- requisition.Height += 2 * box.Child.Style?.YThickness ?? 0;
- }
- else
- requisition = box.SizeRequest ();
- }
+// protected override void OnSizeRequested (ref Requisition requisition)
+// {
+// base.OnSizeRequested (ref requisition);
+// if (box.Child != null) {
+// requisition = box.Child.SizeRequest ();
+// requisition.Height += 2 * box.Child.Style?.YThickness ?? 0;
+// }
+// else
+// requisition = box.SizeRequest ();
+// }
protected override void OnSizeAllocated (Gdk.Rectangle allocation)
{
base.OnSizeAllocated (allocation);
box.SizeRequest ();
- box.Allocation = allocation;
+ box.WidthRequest = allocation.Width;
+ box.HeightRequest = allocation.Height;
}
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
index b2d116950b3..9babf5d8f3d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs
@@ -59,20 +59,20 @@ protected override void ForAll (bool include_internals, Gtk.Callback callback)
callback (handle);
}
- protected override bool OnExposeEvent (Gdk.EventExpose evnt)
- {
- base.OnExposeEvent (evnt);
-
- if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) {
- var gc = new Gdk.GC (evnt.Window);
- gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor ();
- var y = Child1.Allocation.Y + Child1.Allocation.Height;
- evnt.Window.DrawLine (gc, Allocation.X, y, Allocation.X + Allocation.Width, y);
- gc.Dispose ();
- }
-
- return true;
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+// {
+// base.OnExposeEvent (evnt);
+//
+// if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) {
+// var gc = new Gdk.GC (evnt.Window);
+// gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor ();
+// var y = Child1.Allocation.Y + Child1.Allocation.Height;
+// evnt.Window.DrawLine (gc, Allocation.X, y, Allocation.X + Allocation.Width, y);
+// gc.Dispose ();
+// }
+//
+// return true;
+// }
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Window.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Window.cs
index 0f96807a200..a67f602480b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Window.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Window.cs
@@ -110,7 +110,7 @@ public static implicit operator Xwt.WindowFrame (Window d)
return d.GetNativeWidget ();
if (d.nativeWidget is Gtk.Window)
- return Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).WrapWindow ((Gtk.Window)d);
+ return Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).WrapWindow ((Gtk.Window)d);
#if MAC
if (d.nativeWidget is AppKit.NSWindow)
return Xwt.Toolkit.Load (Xwt.ToolkitType.XamMac).WrapWindow ((AppKit.NSWindow)d);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs
index d1d02ab9615..590093cd543 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/WindowTransparencyDecorator.cs
@@ -62,7 +62,7 @@ public static WindowTransparencyDecorator Attach (Gtk.Window window)
public static WindowTransparencyDecorator Attach (Xwt.WindowFrame window)
{
//var gtkWindow = (Xwt.Toolkit.GetBackend (window) as Xwt.Backends.IWindowFrameBackend)?.Window as Gtk.Window;
- var gtkWindow = Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeWindow (window) as Gtk.Window;
+ var gtkWindow = Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).GetNativeWindow (window) as Gtk.Window;
if (gtkWindow != null)
return new WindowTransparencyDecorator (gtkWindow);
throw new NotSupportedException ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Xwt/XwtPopup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Xwt/XwtPopup.cs
index 3df66109024..121257b40a9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Xwt/XwtPopup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Xwt/XwtPopup.cs
@@ -188,7 +188,7 @@ void ShowPopup (Gtk.Widget parent, Gdk.EventButton evt, Gdk.Rectangle targetRect
Gtk.Window parentWindow = parent.Toplevel as Gtk.Window;
if (parentWindow != null)
try {
- TransientFor = Toolkit.Load (ToolkitType.Gtk).WrapWindow (parentWindow);
+ TransientFor = Toolkit.Load (ToolkitType.Gtk3).WrapWindow (parentWindow);
} catch {
if (MessageDialog.RootWindow != null)
TransientFor = MessageDialog.RootWindow;
@@ -243,7 +243,7 @@ static Point TranslateCoordinates (Xwt.Toolkit sourceToolkit, Xwt.Toolkit target
static Toolkit GetToolkitForWidget (object nativeWidget)
{
if (nativeWidget is Gtk.Widget)
- return Toolkit.Load (ToolkitType.Gtk);
+ return Toolkit.Load (ToolkitType.Gtk3);
#if MAC
if (nativeWidget is AppKit.NSView)
return Toolkit.Load (ToolkitType.XamMac);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/XwtWindowControl.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/XwtWindowControl.cs
index 2e8a8416a5f..4741a4f2c2f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/XwtWindowControl.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/XwtWindowControl.cs
@@ -48,7 +48,7 @@ public static implicit operator AppKit.NSWindow (XwtWindowControl d)
public static implicit operator Gtk.Window (XwtWindowControl d)
{
- return Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeWindow (d.Window) as Gtk.Window;
+ return Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).GetNativeWindow (d.Window) as Gtk.Window;
}
}
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputWidget.cs
index 513d2f96b17..dabb06cae68 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputWidget.cs
@@ -140,7 +140,7 @@ void Initialize (DocumentToolbar toolbar)
// FIXME: DocumentToolbar does not support native widgets
// Toolbar items must use Gtk, for now
- Xwt.Toolkit.Load (ToolkitType.Gtk).Invoke (() => {
+ Xwt.Toolkit.Load (ToolkitType.Gtk3).Invoke (() => {
showDiagnosticsButton = new CheckBox (GettextCatalog.GetString ("Diagnostic log verbosity"));
showDiagnosticsButton.HeightRequest = 17;
showDiagnosticsButton.Accessible.Identifier = "BuildOutputWidget.ShowDiagnosticsButton";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
index 25c9b6aac25..3826969cd4a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs
@@ -207,17 +207,17 @@ protected override void OnDestroyed ()
}
}
- protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
- {
- if (this.vadj != null)
- this.vadj.ValueChanged -= HandleValueChanged;
- this.vadj = vadj;
- base.OnSetScrollAdjustments (hadj, vadj);
- if (this.vadj != null) {
- this.vadj.ValueChanged += HandleValueChanged;
- SetAdjustments ();
- }
- }
+// protected override void OnSetScrollAdjustments (Adjustment hadj, Adjustment vadj)
+// {
+// if (this.vadj != null)
+// this.vadj.ValueChanged -= HandleValueChanged;
+// this.vadj = vadj;
+// base.OnSetScrollAdjustments (hadj, vadj);
+// if (this.vadj != null) {
+// this.vadj.ValueChanged += HandleValueChanged;
+// SetAdjustments ();
+// }
+// }
void HandleValueChanged (object sender, EventArgs e)
{
@@ -376,7 +376,7 @@ protected override bool OnMotionNotifyEvent (EventMotion e)
if (!buttonPressed)
return base.OnMotionNotifyEvent (e);
int winWidth, winHeight;
- this.GdkWindow.GetSize (out winWidth, out winHeight);
+// this.GdkWindow.GetSize (out winWidth, out winHeight);
SelectedItemIndex = GetRowByPosition ((int)e.Y);
return true;
}
@@ -389,208 +389,208 @@ string NoSuggestionsMsg {
get { return MonoDevelop.Core.GettextCatalog.GetString ("No suggestions"); }
}
- protected override bool OnExposeEvent (Gdk.EventExpose args)
- {
- using (var context = Gdk.CairoHelper.Create (args.Window)) {
- var scalef = GtkWorkarounds.GetScaleFactor (this);
- context.LineWidth = 1;
- var alloc = Allocation;
- int width = alloc.Width;
- int height = alloc.Height;
- context.Rectangle (args.Area.X, args.Area.Y, args.Area.Width, args.Area.Height);
- var backgroundColor = Styles.CodeCompletion.BackgroundColor.ToCairoColor ();
- var textColor = Styles.CodeCompletion.TextColor.ToCairoColor ();
- var categoryColor = Styles.CodeCompletion.CategoryColor.ToCairoColor ();
- context.SetSourceColor (backgroundColor);
- context.Fill ();
- int xpos = iconTextSpacing;
- int yPos = (int)-vadj.Value;
- //when there are no matches, display a message to indicate that the completion list is still handling input
- if (filteredItems.Count == 0) {
- context.Rectangle (0, yPos, width, height - yPos);
- context.SetSourceColor (backgroundColor);
- context.Stroke ();
- noMatchLayout.SetText (DataProvider.ItemCount == 0 ? NoSuggestionsMsg : NoMatchesMsg);
- int lWidth, lHeight;
- noMatchLayout.GetPixelSize (out lWidth, out lHeight);
- context.SetSourceColor (textColor);
- context.MoveTo ((width - lWidth) / 2, yPos + (height - lHeight - yPos) / 2 - lHeight / 2);
- Pango.CairoHelper.ShowLayout (context, noMatchLayout);
- return false;
- }
-
- Iterate (true, ref yPos, delegate (CategorizedCompletionItems category, int ypos) {
- if (ypos >= height)
- return;
- if (ypos < -rowHeight)
- return;
-
- // window.DrawRectangle (this.Style.BackgroundGC (StateType.Insensitive), true, 0, yPos, width, rowHeight);
- int x = 2;
- if (category.CompletionCategory != null && !string.IsNullOrEmpty (category.CompletionCategory.Icon)) {
- var icon = ImageService.GetIcon (category.CompletionCategory.Icon, IconSize.Menu);
- context.DrawImage (this, icon, 0, ypos);
- x = (int)icon.Width + 4;
- }
- context.Rectangle (0, ypos, Allocation.Width, rowHeight);
- context.SetSourceColor (backgroundColor);
- context.Fill ();
-
-
- // layout.SetMarkup ("" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "");
- // window.DrawLayout (textGCInsensitive, x - 1, ypos + 1 + (rowHeight - py) / 2, layout);
- // layout.SetMarkup ("" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "");
- categoryLayout.SetMarkup ((category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized"));
- int px, py;
- categoryLayout.GetPixelSize (out px, out py);
- context.MoveTo (x, ypos + (rowHeight - py) / 2);
- context.SetSourceColor (categoryColor);
- Pango.CairoHelper.ShowLayout (context, categoryLayout);
- }, delegate (CategorizedCompletionItems curCategory, int item, int itemidx, int ypos) {
- if (ypos >= height)
- return false;
- if (ypos < -rowHeight)
- return true;
- const int categoryModeItemIndenting = 0;
- if (InCategoryMode && curCategory != null && curCategory.CompletionCategory != null) {
- xpos = iconTextSpacing + categoryModeItemIndenting;
- } else {
- xpos = iconTextSpacing;
- }
- bool drawIconAsSelected = SelectionEnabled && item == SelectedItemIndex;
- string markup = DataProvider.HasMarkup (item) ? (DataProvider.GetMarkup (item) ?? "<null>") : GLib.Markup.EscapeText (DataProvider.GetText (item) ?? "");
- string description = DataProvider.GetDescription (item, drawIconAsSelected);
-
- if (string.IsNullOrEmpty (description)) {
- layout.SetMarkup (markup);
- } else {
- layout.SetMarkup (markup + " " + description);
- }
-
- string text = DataProvider.GetText (item);
-
- if (!string.IsNullOrEmpty (text)) {
- int [] matchIndices = DataProvider.GetHighlightedTextIndices(item);
- if (matchIndices != null) {
- Pango.AttrList attrList = layout.Attributes ?? new Pango.AttrList ();
- for (int newSelection = 0; newSelection < matchIndices.Length; newSelection++) {
- int idx = matchIndices [newSelection];
- var bold = new AttrWeight (Weight.Bold);
-
- bold.StartIndex = (uint)idx;
- bold.EndIndex = (uint)(idx + 1);
- attrList.Insert (bold);
-
- if (item != SelectedItemIndex) {
- var highlightColor = (item == SelectedItemIndex) ? Styles.CodeCompletion.SelectionHighlightColor : Styles.CodeCompletion.HighlightColor;
- var fg = new AttrForeground ((ushort)(highlightColor.Red * ushort.MaxValue), (ushort)(highlightColor.Green * ushort.MaxValue), (ushort)(highlightColor.Blue * ushort.MaxValue));
- fg.StartIndex = (uint)idx;
- fg.EndIndex = (uint)(idx + 1);
- attrList.Insert (fg);
- }
- }
- layout.Attributes = attrList;
- }
- }
-
- Xwt.Drawing.Image icon = DataProvider.GetIcon (item);
- int iconHeight, iconWidth;
- if (icon != null) {
- if (drawIconAsSelected)
- icon = icon.WithStyles ("sel");
- iconWidth = (int)icon.Width;
- iconHeight = (int)icon.Height;
- } else if (!Gtk.Icon.SizeLookup (IconSize.Menu, out iconWidth, out iconHeight)) {
- iconHeight = iconWidth = 24;
- }
-
- int wi, he, typos, iypos;
- layout.GetPixelSize (out wi, out he);
-
-
- typos = he < rowHeight ? ypos + (int)Math.Ceiling ((rowHeight - he) / 2.0) : ypos;
- if (scalef <= 1.0)
- typos -= 1; // 1px up on non HiDPI
- iypos = iconHeight < rowHeight ? ypos + (rowHeight - iconHeight) / 2 : ypos;
- if (item == SelectedItemIndex) {
- var barStyle = SelectionEnabled ? Styles.CodeCompletion.SelectionBackgroundColor : Styles.CodeCompletion.SelectionBackgroundInactiveColor;
- context.SetSourceColor (barStyle.ToCairoColor ());
-
- if (SelectionEnabled) {
- context.Rectangle (0, ypos, Allocation.Width, rowHeight);
- context.Fill ();
- } else {
- context.LineWidth++;
- context.Rectangle (0.5, ypos + 0.5, Allocation.Width - 1, rowHeight - 1);
- context.Stroke ();
- context.LineWidth--;
- }
- }
-
- if (icon != null) {
- context.DrawImage (this, icon, xpos, iypos);
- xpos += iconTextSpacing;
- }
- context.SetSourceColor ((drawIconAsSelected ? Styles.CodeCompletion.SelectionTextColor : Styles.CodeCompletion.TextColor).ToCairoColor ());
- var textXPos = xpos + iconWidth + 2;
- context.MoveTo (textXPos, typos);
- layout.Width = (int)((Allocation.Width - textXPos) * Pango.Scale.PangoScale);
- layout.Ellipsize = EllipsizeMode.End;
- Pango.CairoHelper.ShowLayout (context, layout);
- int textW, textH;
- layout.GetPixelSize (out textW, out textH);
- layout.Width = -1;
- layout.Ellipsize = EllipsizeMode.None;
-
- layout.SetMarkup ("");
- if (layout.Attributes != null) {
- layout.Attributes.Dispose ();
- layout.Attributes = null;
- }
-
- string rightText = DataProvider.GetRightSideDescription (item, drawIconAsSelected);
- if (!string.IsNullOrEmpty (rightText)) {
- layout.SetMarkup (rightText);
-
- int w, h;
- layout.GetPixelSize (out w, out h);
- const int leftpadding = 8;
- const int rightpadding = 3;
- w += rightpadding;
- w = Math.Min (w, Allocation.Width - textXPos - textW - leftpadding);
- wi += w;
- typos = h < rowHeight ? ypos + (rowHeight - h) / 2 : ypos;
- if (scalef <= 1.0)
- typos -= 1; // 1px up on non HiDPI
- context.MoveTo (Allocation.Width - w, typos);
- layout.Width = (int)(w * Pango.Scale.PangoScale);
- layout.Ellipsize = EllipsizeMode.End;
-
- Pango.CairoHelper.ShowLayout (context, layout);
- layout.Width = -1;
- layout.Ellipsize = EllipsizeMode.None;
-
- }
-
- if (Math.Min (maxListWidth, wi + xpos + iconWidth + 2) > listWidth) {
- WidthRequest = listWidth = Math.Min (maxListWidth, wi + xpos + iconWidth + 2 + iconTextSpacing);
- win.ResetSizes ();
- } else {
- //workaround for the vscrollbar display - the calculated width needs to be the width ofthe render region.
- if (Allocation.Width < listWidth) {
- if (listWidth - Allocation.Width < 30) {
- WidthRequest = listWidth + listWidth - Allocation.Width;
- win.ResetSizes ();
- }
- }
- }
-
- return true;
- });
-
- return false;
- }
- }
+// protected override bool OnExposeEvent (Gdk.EventExpose args)
+// {
+// using (var context = Gdk.CairoHelper.Create (args.Window)) {
+// var scalef = GtkWorkarounds.GetScaleFactor (this);
+// context.LineWidth = 1;
+// var alloc = Allocation;
+// int width = alloc.Width;
+// int height = alloc.Height;
+// context.Rectangle (args.Area.X, args.Area.Y, args.Area.Width, args.Area.Height);
+// var backgroundColor = Styles.CodeCompletion.BackgroundColor.ToCairoColor ();
+// var textColor = Styles.CodeCompletion.TextColor.ToCairoColor ();
+// var categoryColor = Styles.CodeCompletion.CategoryColor.ToCairoColor ();
+// context.SetSourceColor (backgroundColor);
+// context.Fill ();
+// int xpos = iconTextSpacing;
+// int yPos = (int)-vadj.Value;
+// //when there are no matches, display a message to indicate that the completion list is still handling input
+// if (filteredItems.Count == 0) {
+// context.Rectangle (0, yPos, width, height - yPos);
+// context.SetSourceColor (backgroundColor);
+// context.Stroke ();
+// noMatchLayout.SetText (DataProvider.ItemCount == 0 ? NoSuggestionsMsg : NoMatchesMsg);
+// int lWidth, lHeight;
+// noMatchLayout.GetPixelSize (out lWidth, out lHeight);
+// context.SetSourceColor (textColor);
+// context.MoveTo ((width - lWidth) / 2, yPos + (height - lHeight - yPos) / 2 - lHeight / 2);
+// Pango.CairoHelper.ShowLayout (context, noMatchLayout);
+// return false;
+// }
+//
+// Iterate (true, ref yPos, delegate (CategorizedCompletionItems category, int ypos) {
+// if (ypos >= height)
+// return;
+// if (ypos < -rowHeight)
+// return;
+//
+// // window.DrawRectangle (this.Style.BackgroundGC (StateType.Insensitive), true, 0, yPos, width, rowHeight);
+// int x = 2;
+// if (category.CompletionCategory != null && !string.IsNullOrEmpty (category.CompletionCategory.Icon)) {
+// var icon = ImageService.GetIcon (category.CompletionCategory.Icon, IconSize.Menu);
+// context.DrawImage (this, icon, 0, ypos);
+// x = (int)icon.Width + 4;
+// }
+// context.Rectangle (0, ypos, Allocation.Width, rowHeight);
+// context.SetSourceColor (backgroundColor);
+// context.Fill ();
+//
+//
+// // layout.SetMarkup ("" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "");
+// // window.DrawLayout (textGCInsensitive, x - 1, ypos + 1 + (rowHeight - py) / 2, layout);
+// // layout.SetMarkup ("" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "");
+// categoryLayout.SetMarkup ((category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized"));
+// int px, py;
+// categoryLayout.GetPixelSize (out px, out py);
+// context.MoveTo (x, ypos + (rowHeight - py) / 2);
+// context.SetSourceColor (categoryColor);
+// Pango.CairoHelper.ShowLayout (context, categoryLayout);
+// }, delegate (CategorizedCompletionItems curCategory, int item, int itemidx, int ypos) {
+// if (ypos >= height)
+// return false;
+// if (ypos < -rowHeight)
+// return true;
+// const int categoryModeItemIndenting = 0;
+// if (InCategoryMode && curCategory != null && curCategory.CompletionCategory != null) {
+// xpos = iconTextSpacing + categoryModeItemIndenting;
+// } else {
+// xpos = iconTextSpacing;
+// }
+// bool drawIconAsSelected = SelectionEnabled && item == SelectedItemIndex;
+// string markup = DataProvider.HasMarkup (item) ? (DataProvider.GetMarkup (item) ?? "<null>") : GLib.Markup.EscapeText (DataProvider.GetText (item) ?? "");
+// string description = DataProvider.GetDescription (item, drawIconAsSelected);
+//
+// if (string.IsNullOrEmpty (description)) {
+// layout.SetMarkup (markup);
+// } else {
+// layout.SetMarkup (markup + " " + description);
+// }
+//
+// string text = DataProvider.GetText (item);
+//
+// if (!string.IsNullOrEmpty (text)) {
+// int [] matchIndices = DataProvider.GetHighlightedTextIndices(item);
+// if (matchIndices != null) {
+// Pango.AttrList attrList = layout.Attributes ?? new Pango.AttrList ();
+// for (int newSelection = 0; newSelection < matchIndices.Length; newSelection++) {
+// int idx = matchIndices [newSelection];
+// var bold = new AttrWeight (Weight.Bold);
+//
+// bold.StartIndex = (uint)idx;
+// bold.EndIndex = (uint)(idx + 1);
+// attrList.Insert (bold);
+//
+// if (item != SelectedItemIndex) {
+// var highlightColor = (item == SelectedItemIndex) ? Styles.CodeCompletion.SelectionHighlightColor : Styles.CodeCompletion.HighlightColor;
+// var fg = new AttrForeground ((ushort)(highlightColor.Red * ushort.MaxValue), (ushort)(highlightColor.Green * ushort.MaxValue), (ushort)(highlightColor.Blue * ushort.MaxValue));
+// fg.StartIndex = (uint)idx;
+// fg.EndIndex = (uint)(idx + 1);
+// attrList.Insert (fg);
+// }
+// }
+// layout.Attributes = attrList;
+// }
+// }
+//
+// Xwt.Drawing.Image icon = DataProvider.GetIcon (item);
+// int iconHeight, iconWidth;
+// if (icon != null) {
+// if (drawIconAsSelected)
+// icon = icon.WithStyles ("sel");
+// iconWidth = (int)icon.Width;
+// iconHeight = (int)icon.Height;
+// } else if (!Gtk.Icon.SizeLookup (IconSize.Menu, out iconWidth, out iconHeight)) {
+// iconHeight = iconWidth = 24;
+// }
+//
+// int wi, he, typos, iypos;
+// layout.GetPixelSize (out wi, out he);
+//
+//
+// typos = he < rowHeight ? ypos + (int)Math.Ceiling ((rowHeight - he) / 2.0) : ypos;
+// if (scalef <= 1.0)
+// typos -= 1; // 1px up on non HiDPI
+// iypos = iconHeight < rowHeight ? ypos + (rowHeight - iconHeight) / 2 : ypos;
+// if (item == SelectedItemIndex) {
+// var barStyle = SelectionEnabled ? Styles.CodeCompletion.SelectionBackgroundColor : Styles.CodeCompletion.SelectionBackgroundInactiveColor;
+// context.SetSourceColor (barStyle.ToCairoColor ());
+//
+// if (SelectionEnabled) {
+// context.Rectangle (0, ypos, Allocation.Width, rowHeight);
+// context.Fill ();
+// } else {
+// context.LineWidth++;
+// context.Rectangle (0.5, ypos + 0.5, Allocation.Width - 1, rowHeight - 1);
+// context.Stroke ();
+// context.LineWidth--;
+// }
+// }
+//
+// if (icon != null) {
+// context.DrawImage (this, icon, xpos, iypos);
+// xpos += iconTextSpacing;
+// }
+// context.SetSourceColor ((drawIconAsSelected ? Styles.CodeCompletion.SelectionTextColor : Styles.CodeCompletion.TextColor).ToCairoColor ());
+// var textXPos = xpos + iconWidth + 2;
+// context.MoveTo (textXPos, typos);
+// layout.Width = (int)((Allocation.Width - textXPos) * Pango.Scale.PangoScale);
+// layout.Ellipsize = EllipsizeMode.End;
+// Pango.CairoHelper.ShowLayout (context, layout);
+// int textW, textH;
+// layout.GetPixelSize (out textW, out textH);
+// layout.Width = -1;
+// layout.Ellipsize = EllipsizeMode.None;
+//
+// layout.SetMarkup ("");
+// if (layout.Attributes != null) {
+// layout.Attributes.Dispose ();
+// layout.Attributes = null;
+// }
+//
+// string rightText = DataProvider.GetRightSideDescription (item, drawIconAsSelected);
+// if (!string.IsNullOrEmpty (rightText)) {
+// layout.SetMarkup (rightText);
+//
+// int w, h;
+// layout.GetPixelSize (out w, out h);
+// const int leftpadding = 8;
+// const int rightpadding = 3;
+// w += rightpadding;
+// w = Math.Min (w, Allocation.Width - textXPos - textW - leftpadding);
+// wi += w;
+// typos = h < rowHeight ? ypos + (rowHeight - h) / 2 : ypos;
+// if (scalef <= 1.0)
+// typos -= 1; // 1px up on non HiDPI
+// context.MoveTo (Allocation.Width - w, typos);
+// layout.Width = (int)(w * Pango.Scale.PangoScale);
+// layout.Ellipsize = EllipsizeMode.End;
+//
+// Pango.CairoHelper.ShowLayout (context, layout);
+// layout.Width = -1;
+// layout.Ellipsize = EllipsizeMode.None;
+//
+// }
+//
+// if (Math.Min (maxListWidth, wi + xpos + iconWidth + 2) > listWidth) {
+// WidthRequest = listWidth = Math.Min (maxListWidth, wi + xpos + iconWidth + 2 + iconTextSpacing);
+// win.ResetSizes ();
+// } else {
+// //workaround for the vscrollbar display - the calculated width needs to be the width ofthe render region.
+// if (Allocation.Width < listWidth) {
+// if (listWidth - Allocation.Width < 30) {
+// WidthRequest = listWidth + listWidth - Allocation.Width;
+// win.ResetSizes ();
+// }
+// }
+// }
+//
+// return true;
+// });
+//
+// return false;
+// }
+// }
public int TextOffset {
get {
@@ -661,12 +661,17 @@ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
SetAdjustments (false);
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
+ {
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ min_width = listWidth;
+ }
+
+ protected override void OnGetPreferredHeight (out int min_height, out int natural_height)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = listWidth;
+ base.OnGetPreferredHeight (out min_height, out natural_height);
if (rowHeight > 0)
- requisition.Height += requisition.Height % rowHeight;
+ min_height += min_height % rowHeight;
}
void CalcVisibleRows ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
index 35bc051ecd1..dc2d6a808cb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
@@ -294,13 +294,13 @@ public TooltipInformationWindow ()
vb2.Spacing = 4;
vb2.PackStart (hb, true, true, 0);
- vb2.SizeRequested += (o, args) => {
- var w = Math.Max (headLabel.WidthRequest, headLabel.RealWidth);
- var req = new Gtk.Requisition ();
- req.Height = args.Requisition.Height;
- req.Width = (int)Math.Max (w + PaddingLeft + PaddingTop, args.Requisition.Width);
- args.Args[0] = req;
- };
+// vb2.SizeRequested += (o, args) => {
+// var w = Math.Max (headLabel.WidthRequest, headLabel.RealWidth);
+// var req = new Gtk.Requisition ();
+// req.Height = args.Requisition.Height;
+// req.Width = (int)Math.Max (w + PaddingLeft + PaddingTop, args.Requisition.Width);
+// args.Args[0] = req;
+// };
Content = BackendHost.ToolkitEngine.WrapWidget (vb2, Xwt.NativeWidgetSizing.DefaultPreferredSize);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index 191409be2b4..bd0c4337267 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -150,7 +150,7 @@ public void Store ()
CodeTemplateService.Templates = templates;
}
- static void RenderIcon (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ static void RenderIcon (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CodeTemplate template = (CodeTemplate)model.GetValue (iter, 0);
@@ -163,7 +163,7 @@ static void RenderIcon (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.Tr
}
- void RenderTemplateName (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+ void RenderTemplateName (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.ITreeModel model, Gtk.TreeIter iter)
{
CodeTemplate template = (CodeTemplate)model.GetValue (iter, 0);
var crt = (CellRendererText)cell;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
index e02b80ba359..b8225bda044 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/EditTemplateDialog.cs
@@ -99,7 +99,7 @@ public EditTemplateDialog (CodeTemplate template, bool isNew)
treeviewVariable.AppendColumn ("", new Gtk.CellRendererText (), "text", 0);
CellRendererText nameRenderer = new CellRendererText ();
- treeviewVariable.AppendColumn ("", nameRenderer, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
+ treeviewVariable.AppendColumn ("", nameRenderer, delegate (TreeViewColumn col, CellRenderer cell, ITreeModel model, TreeIter iter) {
nameRenderer.Markup = ((string)model.GetValue (iter, 2));
});
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
index c81c15ae148..79d66f04465 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs
@@ -111,7 +111,7 @@ internal class DefaultDeleteHandler: CommandHandler
protected override void Run ()
{
if (IdeApp.Workbench.RootWindow.HasToplevelFocus) {
- Gtk.Editable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.Editable;
+ Gtk.IEditable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.IEditable;
if (editable != null) {
int cm;
int cme;
@@ -142,8 +142,8 @@ protected override void Run ()
protected override void Update (CommandInfo info)
{
object focus = IdeApp.Workbench.RootWindow.Focus;
- if (focus is Gtk.Editable)
- info.Enabled = ((Gtk.Editable)focus).IsEditable;
+ if (focus is Gtk.IEditable)
+ info.Enabled = ((Gtk.IEditable)focus).IsEditable;
else if (focus is Gtk.TextView)
info.Enabled = ((Gtk.TextView)focus).Editable;
else
@@ -171,7 +171,7 @@ protected override void Run ()
#endif
if (IdeApp.Workbench.RootWindow.HasToplevelFocus) {
- Gtk.Editable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.Editable;
+ Gtk.IEditable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.IEditable;
if (editable != null) {
editable.CopyClipboard ();
return;
@@ -201,7 +201,7 @@ protected override void Run ()
protected override void Update (CommandInfo info)
{
object focus = IdeApp.Workbench.RootWindow.HasToplevelFocus ? IdeApp.Workbench.RootWindow.Focus : null;
- info.Enabled = (focus is Gtk.Editable || focus is Gtk.TextView);
+ info.Enabled = (focus is Gtk.IEditable || focus is Gtk.TextView);
#if MAC
var macfocus = AppKit.NSApplication.SharedApplication?.KeyWindow?.FirstResponder;
info.Enabled |= macfocus is AppKit.NSText || macfocus?.RespondsToSelector (copySelector) == true;
@@ -232,7 +232,7 @@ protected override void Run ()
#endif
if (IdeApp.Workbench.RootWindow.HasToplevelFocus) {
- Gtk.Editable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.Editable;
+ Gtk.IEditable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.IEditable;
if (editable != null) {
editable.CutClipboard ();
return;
@@ -262,8 +262,8 @@ protected override void Run ()
protected override void Update (CommandInfo info)
{
object focus = IdeApp.Workbench.RootWindow.HasToplevelFocus ? IdeApp.Workbench.RootWindow.Focus : null;
- if (focus is Gtk.Editable)
- info.Enabled = ((Gtk.Editable)focus).IsEditable;
+ if (focus is Gtk.IEditable)
+ info.Enabled = ((Gtk.IEditable)focus).IsEditable;
else if (focus is Gtk.TextView)
info.Enabled = ((Gtk.TextView)focus).Editable;
else
@@ -300,7 +300,7 @@ protected override void Run ()
}
#endif
if (IdeApp.Workbench.RootWindow.HasToplevelFocus) {
- Gtk.Editable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.Editable;
+ Gtk.IEditable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.IEditable;
if (editable != null) {
editable.PasteClipboard ();
return;
@@ -330,8 +330,8 @@ protected override void Run ()
protected override void Update (CommandInfo info)
{
object focus = IdeApp.Workbench.RootWindow.HasToplevelFocus ? IdeApp.Workbench.RootWindow.Focus : null;
- if (focus is Gtk.Editable)
- info.Enabled = ((Gtk.Editable)focus).IsEditable;
+ if (focus is Gtk.IEditable)
+ info.Enabled = ((Gtk.IEditable)focus).IsEditable;
else if (focus is Gtk.TextView)
info.Enabled = ((Gtk.TextView)focus).Editable;
else
@@ -387,7 +387,7 @@ protected override void Run ()
}
#endif
if (IdeApp.Workbench.RootWindow.HasToplevelFocus) {
- Gtk.Editable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.Editable;
+ Gtk.IEditable editable = IdeApp.Workbench.RootWindow.Focus as Gtk.IEditable;
if (editable != null) {
editable.SelectRegion (0, -1);
return;
@@ -416,7 +416,7 @@ protected override void Run ()
protected override void Update (CommandInfo info)
{
object focus = IdeApp.Workbench.RootWindow.HasToplevelFocus ? IdeApp.Workbench.RootWindow.Focus : null;
- info.Enabled = (focus is Gtk.Editable || focus is Gtk.TextView);
+ info.Enabled = (focus is Gtk.IEditable || focus is Gtk.TextView);
#if MAC
var macfocus = AppKit.NSApplication.SharedApplication?.KeyWindow?.FirstResponder;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs
index bb6434ab05a..98f480a40e3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ChunkStyle.cs
@@ -96,15 +96,15 @@ public override int GetHashCode ()
}
}
- internal Gdk.GC CreateBgGC (Gdk.Drawable drawable)
- {
- return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Foreground, RgbFgColor = (HslColor)Background };
- }
+// internal Gdk.GC CreateBgGC (Gdk.Drawable drawable)
+// {
+// return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Foreground, RgbFgColor = (HslColor)Background };
+// }
- internal Gdk.GC CreateFgGC (Gdk.Drawable drawable)
- {
- return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Background, RgbFgColor = (HslColor)Foreground };
- }
+// internal Gdk.GC CreateFgGC (Gdk.Drawable drawable)
+// {
+// return new Gdk.GC (drawable) { RgbBgColor = (HslColor)Background, RgbFgColor = (HslColor)Foreground };
+// }
public override string ToString ()
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs
index eb2142d770a..e6d09cbc114 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs
@@ -183,7 +183,7 @@ public virtual void ShowTooltipWindow (TextEditor editor, Window tipWindow, Tool
y = geometry.Top;
xwtWindow.Location = new Xwt.Point(x, y);
- var gtkWindow = Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeWindow (xwtWindow) as Gtk.Window;
+ var gtkWindow = Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk3).GetNativeWindow (xwtWindow) as Gtk.Window;
if (gtkWindow != null)
gtkWindow.ShowAll ();
else
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
index 7e984d5b068..3fef03b20de 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
@@ -177,7 +177,7 @@ void MoveUpButtonClicked (object sender, EventArgs e)
{
if (toolListBox.Selection.CountSelectedRows () == 1) {
TreeIter selectedItem;
- TreeModel ls;
+ ITreeModel ls;
((ListStore)toolListBox.Model).GetIter (out selectedItem, (TreePath)toolListBox.Selection.GetSelectedRows (out ls)[0]);
// we know we have a selected item so get it's index
// use that to get the path of the item before it, and swap the two
@@ -195,7 +195,7 @@ void MoveDownButtonClicked (object sender, EventArgs e)
{
if (toolListBox.Selection.CountSelectedRows () == 1) {
TreeIter selectedItem;
- TreeModel ls;
+ ITreeModel ls;
((ListStore)toolListBox.Model).GetIter (out selectedItem, (TreePath) toolListBox.Selection.GetSelectedRows(out ls)[0]);
// swap it with the next one
TreeIter toSwap = selectedItem;
@@ -321,7 +321,7 @@ TreeIter SelectedIter {
get {
if (toolListBox.Selection.CountSelectedRows () == 1) {
TreeIter selectedIter;
- TreeModel ls;
+ ITreeModel ls;
((ListStore) toolListBox.Model).GetIter (out selectedIter, (TreePath) toolListBox.Selection.GetSelectedRows (out ls)[0]);
return selectedIter;
}
@@ -332,7 +332,7 @@ ExternalTool SelectedTool {
get {
if (toolListBox.Selection.CountSelectedRows () == 1) {
TreeIter selectedIter;
- TreeModel ls;
+ ITreeModel ls;
((ListStore) toolListBox.Model).GetIter (out selectedIter, (TreePath) toolListBox.Selection.GetSelectedRows (out ls)[0]);
return toolListBox.Model.GetValue(selectedIter, 1) as ExternalTool;
}
@@ -378,7 +378,7 @@ void RemoveButtonClicked (object sender, EventArgs e)
int maxIndex = 0;
// first copy the selected item paths into a temp array
TreeIter[] selectedIters = new TreeIter[selectedItemCount];
- TreeModel lv;
+ ITreeModel lv;
TreePath[] pathList = toolListBox.Selection.GetSelectedRows (out lv);
for (int i = 0; i < selectedItemCount; i++) {
TreePath path = (TreePath) pathList[i];
@@ -414,7 +414,7 @@ int GetSelectedIndex (Gtk.TreeView tv)
{
if (toolListBox.Selection.CountSelectedRows () == 1) {
TreeIter selectedIter;
- TreeModel lv;
+ ITreeModel lv;
((ListStore) toolListBox.Model).GetIter(out selectedIter, (TreePath) toolListBox.Selection.GetSelectedRows (out lv)[0]);
// return index of first level node (since only 1 level list model)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
index 58f710ad14f..e286e57dc9b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
@@ -59,8 +59,8 @@ enum SearchScope {
}
CheckButton checkbuttonRecursively;
- ComboBoxEntry comboboxentryReplace;
- ComboBoxEntry comboboxentryPath;
+ ComboBoxText comboboxentryReplace;
+ ComboBoxText comboboxentryPath;
SearchEntry searchentryFileMask;
Button buttonBrowsePaths;
Button buttonReplace;
@@ -356,7 +356,7 @@ void ShowReplaceUI ()
return;
labelReplace = new Label { Text = GettextCatalog.GetString ("_Replace:"), Xalign = 0f, UseUnderline = true };
- comboboxentryReplace = new ComboBoxEntry ();
+ comboboxentryReplace = new ComboBoxText ();
LoadHistory ("MonoDevelop.FindReplaceDialogs.ReplaceHistory", comboboxentryReplace);
comboboxentryReplace.Show ();
labelReplace.Show ();
@@ -424,11 +424,11 @@ void ShowDirectoryPathUI ()
labelPath.Show ();
hboxPath = new HBox ();
- comboboxentryPath = new ComboBoxEntry ();
+ comboboxentryPath = new ComboBoxText ();
comboboxentryPath.Destroyed += ComboboxentryPathDestroyed;
LoadHistory ("MonoDevelop.FindReplaceDialogs.PathHistory", comboboxentryPath);
comboboxentryPath.Show ();
- hboxPath.PackStart (comboboxentryPath);
+ hboxPath.PackStart (comboboxentryPath, false, true, 0);
labelPath.MnemonicWidget = comboboxentryPath;
@@ -588,15 +588,15 @@ void UpdateSensitivity ()
buttonReplace.Sensitive = isSensitive;
}
- protected override void OnSizeRequested (ref Requisition requisition)
+ protected override void OnGetPreferredWidth (out int min_width, out int natural_width)
{
- base.OnSizeRequested (ref requisition);
- requisition.Width = Math.Max (480, requisition.Width);
+ base.OnGetPreferredWidth (out min_width, out natural_width);
+ min_width = Math.Max (480, min_width);
}
static void ComboboxentryPathDestroyed (object sender, EventArgs e)
{
- StoreHistory ("MonoDevelop.FindReplaceDialogs.PathHistory", (ComboBoxEntry)sender);
+ StoreHistory ("MonoDevelop.FindReplaceDialogs.PathHistory", (ComboBox)sender);
}
void ButtonBrowsePathsClicked (object sender, EventArgs e)
@@ -637,7 +637,7 @@ void InitFromProperties ()
// LoadHistory ("MonoDevelop.FindReplaceDialogs.FileMaskHistory", comboboxentryFileMask);
}
- static void LoadHistory (string propertyName, ComboBoxEntry entry)
+ static void LoadHistory (string propertyName, ComboBoxText entry)
{
var ec = new EntryCompletion ();
/* entry.Changed += delegate {
@@ -652,7 +652,7 @@ static void LoadHistory (string propertyName, ComboBoxEntry entry)
entry.Entry.Completion.Model = store;
entry.Model = store;
entry.Entry.ActivatesDefault = true;
- entry.TextColumn = 0;
+ entry.Active = 0;
var history = PropertyService.Get (propertyName);
if (!string.IsNullOrEmpty (history)) {
string[] items = history.Split (historySeparator);
@@ -684,7 +684,7 @@ void StorePoperties ()
//StoreHistory ("MonoDevelop.FindReplaceDialogs.FileMaskHistory", comboboxentryFileMask);
}
- static void StoreHistory (string propertyName, ComboBoxEntry comboBox)
+ static void StoreHistory (string propertyName, ComboBox comboBox)
{
var store = (ListStore)comboBox.Model;
var history = new List ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
index 8aea145849a..8f4a5041611 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
@@ -383,7 +383,7 @@ public void ShowStatus (string text)
labelStatus.Text = text;
}
- static void FileIconDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ static void FileIconDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -399,7 +399,7 @@ static string MarkupText (string text, bool didRead)
return string.Format ("{0}", GLib.Markup.EscapeText (text), didRead ? "normal" : "bold");
}
- void FileNameDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ void FileNameDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -420,19 +420,19 @@ void FileNameDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model
fileNameRenderer.Markup = MarkupText (System.IO.Path.GetFileName (searchResult.FileName) + ":" + lineNumber, didRead);
}
- int CompareLineNumbers (TreeModel model, TreeIter first, TreeIter second)
+ int CompareLineNumbers (ITreeModel model, TreeIter first, TreeIter second)
{
var loc1 = GetLocation ((SearchResult)model.GetValue (first, SearchResultColumn));
var loc2 = GetLocation ((SearchResult)model.GetValue (second, SearchResultColumn));
return loc1.Line.CompareTo (loc2.Line);
}
- static int DefaultSortFunc (TreeModel model, TreeIter first, TreeIter second)
+ static int DefaultSortFunc (ITreeModel model, TreeIter first, TreeIter second)
{
return 0;
}
- static int CompareFileNames (TreeModel model, TreeIter first, TreeIter second)
+ static int CompareFileNames (ITreeModel model, TreeIter first, TreeIter second)
{
var searchResult1 = (SearchResult)model.GetValue (first, SearchResultColumn);
var searchResult2 = (SearchResult)model.GetValue (second, SearchResultColumn);
@@ -446,7 +446,7 @@ static int CompareFileNames (TreeModel model, TreeIter first, TreeIter second)
}
}
- static int CompareProjectFileNames (TreeModel model, TreeIter first, TreeIter second)
+ static int CompareProjectFileNames (ITreeModel model, TreeIter first, TreeIter second)
{
var searchResult1 = (SearchResult)model.GetValue (first, SearchResultColumn);
var searchResult2 = (SearchResult)model.GetValue (second, SearchResultColumn);
@@ -457,7 +457,7 @@ static int CompareProjectFileNames (TreeModel model, TreeIter first, TreeIter se
return string.Compare (System.IO.Path.GetFileName (searchResult1.Projects [0].FileName), System.IO.Path.GetFileName (searchResult2.Projects [0].FileName), StringComparison.Ordinal);
}
- static int CompareFilePaths (TreeModel model, TreeIter first, TreeIter second)
+ static int CompareFilePaths (ITreeModel model, TreeIter first, TreeIter second)
{
var searchResult1 = (SearchResult)model.GetValue (first, SearchResultColumn);
var searchResult2 = (SearchResult)model.GetValue (second, SearchResultColumn);
@@ -467,7 +467,7 @@ static int CompareFilePaths (TreeModel model, TreeIter first, TreeIter second)
return System.IO.Path.GetDirectoryName (searchResult1.FileName).CompareTo (System.IO.Path.GetDirectoryName (searchResult2.FileName));
}
- void ResultPathDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ void ResultPathDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -491,7 +491,7 @@ void ResultPathDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel mod
pathRenderer.Markup = MarkupText (directory, didRead);
}
- static void ResultProjectIconDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ static void ResultProjectIconDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -506,7 +506,7 @@ static void ResultProjectIconDataFunc (TreeViewColumn column, CellRenderer cell,
}
}
- static void ResultProjectDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ static void ResultProjectDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -529,7 +529,7 @@ static int TranslateIndexToUTF8 (string text, int index)
return Encoding.UTF8.GetCharCount (bytes, 0, index);
}
List> markupCache = new List> ();
- void ResultTextDataFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+ void ResultTextDataFunc (TreeViewColumn column, CellRenderer cell, ITreeModel model, TreeIter iter)
{
if (TreeIter.Zero.Equals (iter))
return;
@@ -759,7 +759,7 @@ public void SelectAll ()
public void CopySelection ()
{
- TreeModel model;
+ ITreeModel model;
var sb = new StringBuilder ();
foreach (TreePath p in treeviewSearchResults.Selection.GetSelectedRows (out model)) {
TreeIter iter;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs
index 815c4360c59..6179a607029 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs
@@ -40,7 +40,9 @@ public static class FontService
static Properties fontProperties;
static string defaultMonospaceFontName = String.Empty;
+ static string defaultSansFontName = String.Empty;
static FontDescription defaultMonospaceFont = new FontDescription ();
+ static FontDescription defaultSansFont = new FontDescription ();
static void LoadDefaults ()
{
@@ -48,9 +50,15 @@ static void LoadDefaults ()
defaultMonospaceFont.Dispose ();
}
+ if (defaultSansFont != null) {
+ defaultSansFont.Dispose ();
+ }
+
#pragma warning disable 618
defaultMonospaceFontName = DesktopService.DefaultMonospaceFont;
defaultMonospaceFont = FontDescription.FromString (defaultMonospaceFontName);
+ defaultSansFontName = DesktopService.DefaultSansFont;
+ defaultSansFont = FontDescription.FromString (defaultSansFontName);
#pragma warning restore 618
}
@@ -85,10 +93,10 @@ internal static void Initialize ()
}
public static FontDescription MonospaceFont { get { return defaultMonospaceFont; } }
- public static FontDescription SansFont { get { return Gui.Styles.DefaultFont; } }
+ public static FontDescription SansFont { get { return defaultSansFont; } }
public static string MonospaceFontName { get { return defaultMonospaceFontName; } }
- public static string SansFontName { get { return Gui.Styles.DefaultFontName; } }
+ public static string SansFontName { get { return defaultSansFontName; } }
[Obsolete ("Use MonospaceFont")]
public static FontDescription DefaultMonospaceFontDescription {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExecutionModeComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExecutionModeComboBox.cs
index c8d022c9c96..5afcffef9f6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExecutionModeComboBox.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExecutionModeComboBox.cs
@@ -45,7 +45,7 @@ public ExecutionModeComboBox ()
{
this.Build ();
- comboMode.RowSeparatorFunc = delegate (TreeModel model, TreeIter iter) {
+ comboMode.RowSeparatorFunc = delegate (ITreeModel model, TreeIter iter) {
string item = (string) comboMode.Model.GetValue (iter, 0);
return item == "--";
};
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
index 3c50105a7b3..bf1dced8f88 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
@@ -29,2883 +29,2883 @@
//#define TREE_VERIFY_INTEGRITY
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Mono.Addins;
-using MonoDevelop.Components;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Commands;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mono.Addins;
+using MonoDevelop.Components;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Commands;
using MonoDevelop.Ide.Extensions;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects.Extensions;
-
-namespace MonoDevelop.Ide.Gui.Components
-{
- public partial class ExtensibleTreeView : Control, ICommandRouter
- {
- internal const int NodeInfoColumn = 0;
- internal const int DataItemColumn = 1;
- internal const int BuilderChainColumn = 2;
- internal const int FilledColumn = 3;
- internal const int ShowPopupColumn = 4;
-
- NodeBuilder[] builders;
- Dictionary builderChains = new Dictionary ();
- NodeHashtable nodeHash = new NodeHashtable ();
-
- ExtensibleTreeViewWidget widget;
- ExtensibleTreeViewTree tree;
- Gtk.TreeStore store;
- Gtk.TreeViewColumn complete_column;
- ZoomableCellRendererPixbuf pix_render;
- CustomCellRendererText text_render;
- TreeBuilderContext builderContext;
- Dictionary> callbacks = new Dictionary> ();
- bool editingText = false;
-
- TreePadOption[] options;
- TreeOptions globalOptions;
-
- TreeNodeNavigator workNode;
- TreeNodeNavigator compareNode1;
- TreeNodeNavigator compareNode2;
-
- internal bool sorting;
-
- object[] copyObjects;
- DragOperation currentTransferOperation;
-
- TransactedNodeStore transactionStore;
- int updateLockCount;
- string contextMenuPath;
- IDictionary contextMenuTypeNameAliases;
-
- public IDictionary ContextMenuTypeNameAliases {
- get { return contextMenuTypeNameAliases; }
- set { contextMenuTypeNameAliases = value; }
- }
-
- internal Gtk.TreeStore Store {
- get {
- return this.store;
- }
- }
-
- internal Gtk.TreeView Tree {
- get {
- return tree;
- }
- }
-
- public event EventHandler SelectionChanged;
-
- public bool AllowsMultipleSelection {
- get {
- return Tree.Selection.Mode == Gtk.SelectionMode.Multiple;
- }
- set {
- if (value)
- Tree.Selection.Mode = Gtk.SelectionMode.Multiple;
- else
- Tree.Selection.Mode = Gtk.SelectionMode.Single;
- }
- }
-
- public string Id { get; set; }
-
-
- class ExtensibleTreeViewWidget : CompactScrolledWindow, ICommandRouter
- {
- ExtensibleTreeView control;
-
- public ExtensibleTreeViewWidget (ExtensibleTreeView control)
- {
- this.control = control;
- ShadowType = Gtk.ShadowType.None;
- ShowBorderLine = false;
- }
-
- protected override void OnStyleSet (Gtk.Style previous_style)
- {
- base.OnStyleSet (previous_style);
- control.UpdateFont ();
- }
-
- protected override bool OnScrollEvent (Gdk.EventScroll evnt)
- {
- control.HideStatusMessage ();
- var modifier = !Platform.IsMac? Gdk.ModifierType.ControlMask
- //Mac window manager already uses control-scroll, so use command
- //Command might be either meta or mod1, depending on GTK version
- : (Gdk.ModifierType.MetaMask | Gdk.ModifierType.Mod1Mask);
-
- if ((evnt.State & modifier) !=0) {
- if (evnt.Direction == Gdk.ScrollDirection.Up)
- control.ZoomIn ();
- else if (evnt.Direction == Gdk.ScrollDirection.Down)
- control.ZoomOut ();
-
- return true;
- }
- return base.OnScrollEvent (evnt);
- }
-
- protected override void OnDestroyed ()
- {
- control.Destroy ();
- base.OnDestroyed ();
- }
-
- public object GetNextCommandTarget ()
- {
- return control;
- }
- }
-
- protected override object CreateNativeWidget ()
- {
- return widget;
- }
-
- public ExtensibleTreeView ()
- {
- widget = new ExtensibleTreeViewWidget (this);
- tree = new ExtensibleTreeViewTree (this);
- }
-
- public ExtensibleTreeView (NodeBuilder[] builders, TreePadOption[] options) : this ()
- {
- Initialize (builders, options);
- }
-
- void CustomFontPropertyChanged (object sender, EventArgs a)
- {
- UpdateFont ();
- }
-
- void UpdateFont ()
- {
- text_render.CustomFont = IdeApp.Preferences.CustomPadFont ?? tree.Style.FontDescription;
- tree.ColumnsAutosize ();
- }
-
- public void Initialize (NodeBuilder [] builders, TreePadOption [] options, string contextMenuPath = null)
- {
- OnInitialize (builders, options, contextMenuPath);
- }
-
- protected virtual void OnInitialize (NodeBuilder[] builders, TreePadOption[] options, string contextMenuPath)
- {
- this.contextMenuPath = contextMenuPath;
- builderContext = new TreeBuilderContext (this);
-
- SetBuilders (builders, options);
-
- store = new Gtk.TreeStore (typeof(NodeInfo), typeof(object), typeof(object), typeof(bool), typeof(bool));
- tree.Model = store;
- tree.Selection.Mode = Gtk.SelectionMode.Multiple;
-
- store.DefaultSortFunc = new Gtk.TreeIterCompareFunc (CompareNodes);
- store.SetSortColumnId (/* GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID */ -1, Gtk.SortType.Ascending);
-
- tree.HeadersVisible = false;
- tree.EnableSearch = false;
- complete_column = new Gtk.TreeViewColumn ();
- complete_column.Title = "column";
-
- pix_render = new ZoomableCellRendererPixbuf ();
- pix_render.Xpad = 0;
- complete_column.PackStart (pix_render, false);
-
- text_render = new CustomCellRendererText (this);
- text_render.Ypad = 0;
- IdeApp.Preferences.CustomPadFont.Changed += CustomFontPropertyChanged;
- text_render.EditingStarted += HandleEditingStarted;
- text_render.Edited += HandleOnEdit;
- text_render.EditingCanceled += HandleOnEditCancelled;
- complete_column.PackStart (text_render, true);
-
- complete_column.SetCellDataFunc (pix_render, SetIconCellData);
- complete_column.SetCellDataFunc (text_render, SetTextCellData);
-
- tree.AppendColumn (complete_column);
-
- tree.TestExpandRow += OnTestExpandRow;
- tree.RowActivated += OnNodeActivated;
- tree.DoPopupMenu += ShowPopup;
-
- // Add an extra action handler to the tree to handle Press actions
- var actionHandler = tree.ActionHandler;
- actionHandler.PerformPress += OnPerformPress;
-
- workNode = new TreeNodeNavigator (this);
- compareNode1 = new TreeNodeNavigator (this);
- compareNode2 = new TreeNodeNavigator (this);
-
- tree.CursorChanged += OnSelectionChanged;
- tree.KeyPressEvent += OnKeyPress;
- tree.MotionNotifyEvent += HandleMotionNotifyEvent;
- tree.LeaveNotifyEvent += HandleLeaveNotifyEvent;
-
- if (GtkGestures.IsSupported) {
- tree.AddGestureMagnifyHandler ((sender, args) => {
- Zoom += Zoom * (args.Magnification / 4d);
- });
- }
-
- for (int n=3; n<16; n++) {
- Gtk.Rc.ParseString ("style \"MonoDevelop.ExtensibleTreeView_" + n + "\" {\n GtkTreeView::expander-size = " + n + "\n }\n");
- Gtk.Rc.ParseString ("widget \"*.MonoDevelop.ExtensibleTreeView_" + n + "\" style \"MonoDevelop.ExtensibleTreeView_" + n + "\"\n");
- }
-
- if (!string.IsNullOrEmpty (Id))
- Zoom = PropertyService.Get ("MonoDevelop.Ide.ExtensibleTreeView.Zoom." + Id, 1d);
- else
- Zoom = 1d;
-
- widget.Add (tree);
- widget.ShowAll ();
-
-#if TREE_VERIFY_INTEGRITY
- GLib.Timeout.Add (3000, Checker);
-#endif
- }
-#if TREE_VERIFY_INTEGRITY
- // Verifies the consistency of the tree view. Disabled by default
- HashSet
-
@@ -139,6 +148,12 @@
..\..\..\build\bin\Microsoft.VisualStudio.CodingConventions.dll
False
+
+ gio-sharp-3.0
+
+
+ gtk-sharp-3.0
+
@@ -158,9 +173,14 @@
{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}
Xwt
+
+
+ {3B25FD1F-CEBA-4450-8893-DC330FDB56A7}
+ Xwt.Gtk3
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}
@@ -172,9 +192,13 @@
Mono.Addins.Setup
False
-
+
+
+ {410A7DC9-E7DA-43E6-B592-93E2A344B660}
+ Mono.Addins.GuiGtk3
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.dll.config b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.dll.config
index 3fd15269140..0e9f8ff6cc9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.dll.config
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.dll.config
@@ -11,8 +11,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
index 69756e0c1be..493cb33634f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
@@ -113,6 +113,11 @@ public static string DefaultMonospaceFont {
get { return PlatformService.DefaultMonospaceFont; }
}
+ [Obsolete ("Use FontService")]
+ public static string DefaultSansFont {
+ get { return PlatformService.DefaultSansFont; }
+ }
+
public static string PlatformName {
get { return PlatformService.Name; }
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
index d93adc5ac5f..bd8fe09906d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
@@ -33,7 +33,7 @@
using MonoDevelop.Core;
using MonoDevelop.Core.Instrumentation;
using Mono.Addins;
-using Mono.Addins.Gui;
+using Mono.Addins.GuiGtk3;
using Mono.Addins.Setup;
using MonoDevelop.Components.Commands;
@@ -78,14 +78,14 @@ public static class IdeApp
static EventHandler initializedEvent;
public static event EventHandler Initialized {
add {
- Runtime.RunInMainThread (() => {
- if (isInitialized) value (null, EventArgs.Empty);
+ Runtime.RunInMainThread (() => {
+ if (isInitialized) value (null, EventArgs.Empty);
else initializedEvent += value;
});
}
- remove {
- Runtime.RunInMainThread (() => {
- initializedEvent -= value;
+ remove {
+ Runtime.RunInMainThread (() => {
+ initializedEvent -= value;
});
}
}
@@ -339,8 +339,8 @@ public static void Initialize (ProgressMonitor monitor)
};
AutoTestService.Start (commandService, Preferences.EnableAutomatedTesting);
AutoTestService.NotifyEvent ("MonoDevelop.Ide.IdeStart");
-
- Gtk.LinkButton.SetUriHook ((button, uri) => Xwt.Desktop.OpenUrl (uri));
+
+// Gtk.LinkButton.SetUriHook ((button, uri) => Xwt.Desktop.OpenUrl (uri));
}
static void KeyBindingFailed (object sender, KeyBindingFailedEventArgs e)
@@ -406,9 +406,9 @@ internal static async void OpenFiles (IEnumerable files, Op
}
} else if (file.FileName.HasExtension ("mpack")) {
var service = new SetupService (AddinManager.Registry);
- AddinManagerWindow.RunToInstallFile (Workbench.RootWindow,
- service,
- file.FileName.FullPath);
+// AddinManagerWindow.RunToInstallFile (Workbench.RootWindow,
+// service,
+// file.FileName.FullPath);
} else {
filteredFiles.Add (file);
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
index 0b66b61642d..6500baa7fe2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
@@ -114,7 +114,7 @@ int Run (MonoDevelopOptions options)
SetupExceptionManager ();
// explicit GLib type system initialization for GLib < 2.36 before any other type system access
- GLib.GType.Init ();
+ //GLib.GType.Init ();
IdeApp.Customizer = options.IdeCustomizer ?? new IdeCustomizer ();
try {
@@ -137,8 +137,8 @@ int Run (MonoDevelopOptions options)
// XWT initialization
FilePath p = typeof(IdeStartup).Assembly.Location;
- Runtime.LoadAssemblyFrom (p.ParentDirectory.Combine("Xwt.Gtk.dll"));
- Xwt.Application.InitializeAsGuest (Xwt.ToolkitType.Gtk);
+ Runtime.LoadAssemblyFrom (p.ParentDirectory.Combine("Xwt.Gtk3.dll"));
+ Xwt.Application.InitializeAsGuest (Xwt.ToolkitType.Gtk3);
Xwt.Toolkit.CurrentEngine.RegisterBackend ();
Xwt.Toolkit.CurrentEngine.RegisterBackend ();
IdeTheme.SetupXwtTheme ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs
index 7125638f14f..1b80bcd26b3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeVersionInfo.cs
@@ -51,24 +51,7 @@ static string GetMonoVersionNumber ()
public static string GetGtkVersion ()
{
- uint v1 = 2, v2 = 0, v3 = 0;
-
- while (v1 < 99 && Gtk.Global.CheckVersion (v1, v2, v3) == null)
- v1++;
- v1--;
-
- while (v2 < 99 && Gtk.Global.CheckVersion (v1, v2, v3) == null)
- v2++;
- v2--;
-
- v3 = 0;
- while (v3 < 99 && Gtk.Global.CheckVersion (v1, v2, v3) == null)
- v3++;
- v3--;
-
- if (v1 == 99 || v2 == 99 || v3 == 99)
- return "unknown";
- return v1 +"." + v2 + "."+ v3;
+ return Gtk.Global.MajorVersion + "." + Gtk.Global.MinorVersion + "." + Gtk.Global.MicroVersion;
}
static string GetGtkTheme ()
diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj
index d8af16ef6e3..1a6f4979b63 100644
--- a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj
+++ b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj
@@ -17,11 +17,22 @@
-
-
-
+
+ gdk-sharp-3.0
+
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
-
+
+ gtk-sharp-3.0
+
+
+ gio-sharp-3.0
+
@@ -82,4 +93,4 @@
-
\ No newline at end of file
+
diff --git a/main/src/tools/mdmonitor/TimeLineView.cs b/main/src/tools/mdmonitor/TimeLineView.cs
index d345819c7d9..1f6346a9a39 100644
--- a/main/src/tools/mdmonitor/TimeLineView.cs
+++ b/main/src/tools/mdmonitor/TimeLineView.cs
@@ -346,181 +346,181 @@ protected override bool OnButtonPressEvent (EventButton evnt)
}
- protected override bool OnExposeEvent (EventExpose evnt)
- {
- if (data == null)
- BuildData ();
-
- hostSpots.Clear ();
- int ytop = padding;
- int markerX = 3;
- int lx = markerX + MarkerWidth + 1;
- int tx = 250;
- int ty = ytop;
- int maxx = lx;
- int maxy = 0;
-
- DateTime initialTime = mainValue.TimeStamp;
-
- Cairo.Context ctx = CairoHelper.Create (GdkWindow);
-
- using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
- gc.RgbFgColor = Style.White;
- GdkWindow.DrawRectangle (gc, true, 0, 0, Allocation.Width, Allocation.Height);
-
- // Draw full time marker
-
- ctx.NewPath ();
- ctx.Rectangle (markerX, ytop + baseTime + 0.5, MarkerWidth / 2, ((mainValue.Duration.TotalMilliseconds * scale) / 1000));
- HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
- hsl.L = 0.8;
- ctx.SetSourceColor (hsl);
- ctx.Fill ();
-
- // Draw values
-
- foreach (CounterValueInfo val in data) {
- DrawValue (ctx, gc, initialTime, ytop, lx, tx, ref ty, ref maxx, ref maxy, 0, val);
- }
-
- if (ty > maxy)
- maxy = ty;
-
- int totalms = (int)mainValue.Duration.TotalMilliseconds;
- int marks = (totalms / 1000) + 1;
-
- ctx.LineWidth = 1;
- gc.RgbFgColor = Style.Foreground (Gtk.StateType.Normal);
-
- for (int n = 0; n <= marks; n++) {
- ctx.NewPath ();
- int y = ytop + (int)(n * scale) + baseTime;
- ctx.MoveTo (markerX, y + 0.5);
- ctx.LineTo (markerX + MarkerWidth, y + 0.5);
- ctx.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ());
- ctx.Stroke ();
-
- y += 2;
- layout.SetText (n + "s");
- GdkWindow.DrawLayout (gc, markerX + 1, y + 2, layout);
-
- int tw, th;
- layout.GetPixelSize (out tw, out th);
- y += th;
-
- if (y > maxy)
- maxy = y;
- }
- }
-
- ((IDisposable)ctx).Dispose ();
-
- maxy += padding;
- maxx += padding;
-
- if (lastHeight != maxy || lastWidth != maxx) {
- lastWidth = maxx;
- lastHeight = maxy;
- SetSizeRequest (maxx, maxy);
- }
-
- return true;
- }
+// protected override bool OnExposeEvent (EventExpose evnt)
+// {
+// if (data == null)
+// BuildData ();
+//
+// hostSpots.Clear ();
+// int ytop = padding;
+// int markerX = 3;
+// int lx = markerX + MarkerWidth + 1;
+// int tx = 250;
+// int ty = ytop;
+// int maxx = lx;
+// int maxy = 0;
+//
+// DateTime initialTime = mainValue.TimeStamp;
+//
+// Cairo.Context ctx = CairoHelper.Create (GdkWindow);
+//
+// using (Gdk.GC gc = new Gdk.GC (GdkWindow)) {
+// gc.RgbFgColor = Style.White;
+// GdkWindow.DrawRectangle (gc, true, 0, 0, Allocation.Width, Allocation.Height);
+//
+// // Draw full time marker
+//
+// ctx.NewPath ();
+// ctx.Rectangle (markerX, ytop + baseTime + 0.5, MarkerWidth / 2, ((mainValue.Duration.TotalMilliseconds * scale) / 1000));
+// HslColor hsl = Style.Foreground (Gtk.StateType.Normal);
+// hsl.L = 0.8;
+// ctx.SetSourceColor (hsl);
+// ctx.Fill ();
+//
+// // Draw values
+//
+// foreach (CounterValueInfo val in data) {
+// DrawValue (ctx, gc, initialTime, ytop, lx, tx, ref ty, ref maxx, ref maxy, 0, val);
+// }
+//
+// if (ty > maxy)
+// maxy = ty;
+//
+// int totalms = (int)mainValue.Duration.TotalMilliseconds;
+// int marks = (totalms / 1000) + 1;
+//
+// ctx.LineWidth = 1;
+// gc.RgbFgColor = Style.Foreground (Gtk.StateType.Normal);
+//
+// for (int n = 0; n <= marks; n++) {
+// ctx.NewPath ();
+// int y = ytop + (int)(n * scale) + baseTime;
+// ctx.MoveTo (markerX, y + 0.5);
+// ctx.LineTo (markerX + MarkerWidth, y + 0.5);
+// ctx.SetSourceColor (Style.Foreground (Gtk.StateType.Normal).ToCairoColor ());
+// ctx.Stroke ();
+//
+// y += 2;
+// layout.SetText (n + "s");
+// GdkWindow.DrawLayout (gc, markerX + 1, y + 2, layout);
+//
+// int tw, th;
+// layout.GetPixelSize (out tw, out th);
+// y += th;
+//
+// if (y > maxy)
+// maxy = y;
+// }
+// }
+//
+// ((IDisposable)ctx).Dispose ();
+//
+// maxy += padding;
+// maxx += padding;
+//
+// if (lastHeight != maxy || lastWidth != maxx) {
+// lastWidth = maxx;
+// lastHeight = maxy;
+// SetSizeRequest (maxx, maxy);
+// }
+//
+// return true;
+// }
- void DrawValue (Cairo.Context ctx, Gdk.GC gc, DateTime initialTime, int ytop, int lx, int tx, ref int ty, ref int maxx, ref int maxy, int indent, CounterValueInfo val)
- {
- Gdk.Color color;
- if (val.Counter != null)
- color = val.Counter.GetColor ();
- else
- color = Style.Black;
-
- // Draw text
- gc.RgbFgColor = color;
-
- double ms = (val.Time - initialTime).TotalMilliseconds;
-
- string txt = (ms / 1000).ToString ("0.00000") + ": " + (val.Duration.TotalMilliseconds / 1000).ToString ("0.00000") + " " + val.Trace;
- layout.SetText (txt);
- GdkWindow.DrawLayout (gc, tx + indent, ty, layout);
- int tw, th;
- layout.GetPixelSize (out tw, out th);
- if (tx + tw + indent > maxx)
- maxx = tx + tw + indent;
-
- HotSpot hp = AddHotSpot (tx + indent, ty, tw, th);
- int tempTy = ty;
- hp.Action = delegate {
- int ytm = ytop + (int) ((ms * scale) / 1000);
- SetBaseTime ((int) (tempTy + (th / 2) + 0.5) - ytm);
- };
- hp.OnMouseOver += delegate {
- overValue = val;
- QueueDraw ();
- };
- hp.Action += delegate {
- focusedValue = val;
- QueueDraw ();
- };
-
- // Draw time marker
- int ytime = ytop + (int) ((ms * scale) / 1000) + baseTime;
-
- if (val == focusedValue || val == overValue) {
- ctx.NewPath ();
- double dx = val == focusedValue ? 0 : 2;
- ctx.Rectangle (lx + 0.5 + dx - SelectedValuePadding, ytime + 0.5, LineEndWidth - dx*2 + SelectedValuePadding, ((val.Duration.TotalMilliseconds * scale) / 1000));
- HslColor hsl = color;
- hsl.L = val == focusedValue ? 0.9 : 0.8;
- ctx.SetSourceColor (hsl);
- ctx.Fill ();
- }
-
- ctx.NewPath ();
- ctx.LineWidth = 1;
- ctx.MoveTo (lx + 0.5, ytime + 0.5);
- ctx.LineTo (lx + LineEndWidth + 0.5, ytime + 0.5);
- ctx.LineTo (tx - 3 - LineEndWidth + 0.5, ty + (th / 2) + 0.5);
- ctx.LineTo (tx + indent - 3 + 0.5, ty + (th / 2) + 0.5);
- ctx.SetSourceColor (color.ToCairoColor ());
- ctx.Stroke ();
-
- // Expander
-
- bool incLine = true;
-
- if (val.CanExpand) {
- double ex = tx + indent - 3 - ExpanderSize - 2 + 0.5;
- double ey = ty + (th / 2) - (ExpanderSize/2) + 0.5;
- hp = AddHotSpot (ex, ey, ExpanderSize, ExpanderSize);
- DrawExpander (ctx, ex, ey, val.Expanded, false);
- hp.OnMouseOver = delegate {
- using (Cairo.Context c = CairoHelper.Create (GdkWindow)) {
- DrawExpander (c, ex, ey, val.Expanded, true);
- }
- };
- hp.OnMouseLeave = delegate {
- using (Cairo.Context c = CairoHelper.Create (GdkWindow)) {
- DrawExpander (c, ex, ey, val.Expanded, false);
- }
- };
- hp.Action = delegate {
- ToggleExpand (val);
- };
-
- if (val.Expanded && val.ExpandedTimerTraces.Count > 0) {
- ty += th + LineSpacing;
- foreach (CounterValueInfo cv in val.ExpandedTimerTraces)
- DrawValue (ctx, gc, initialTime, ytop, lx, tx, ref ty, ref maxx, ref maxy, indent + ChildIndent, cv);
- incLine = false;
- }
- }
- if (incLine)
- ty += th + LineSpacing;
-
- if (ytime > maxy)
- maxy = ytime;
- }
+// void DrawValue (Cairo.Context ctx, Gdk.GC gc, DateTime initialTime, int ytop, int lx, int tx, ref int ty, ref int maxx, ref int maxy, int indent, CounterValueInfo val)
+// {
+// Gdk.Color color;
+// if (val.Counter != null)
+// color = val.Counter.GetColor ();
+// else
+// color = Style.Black;
+//
+// // Draw text
+// gc.RgbFgColor = color;
+//
+// double ms = (val.Time - initialTime).TotalMilliseconds;
+//
+// string txt = (ms / 1000).ToString ("0.00000") + ": " + (val.Duration.TotalMilliseconds / 1000).ToString ("0.00000") + " " + val.Trace;
+// layout.SetText (txt);
+// GdkWindow.DrawLayout (gc, tx + indent, ty, layout);
+// int tw, th;
+// layout.GetPixelSize (out tw, out th);
+// if (tx + tw + indent > maxx)
+// maxx = tx + tw + indent;
+//
+// HotSpot hp = AddHotSpot (tx + indent, ty, tw, th);
+// int tempTy = ty;
+// hp.Action = delegate {
+// int ytm = ytop + (int) ((ms * scale) / 1000);
+// SetBaseTime ((int) (tempTy + (th / 2) + 0.5) - ytm);
+// };
+// hp.OnMouseOver += delegate {
+// overValue = val;
+// QueueDraw ();
+// };
+// hp.Action += delegate {
+// focusedValue = val;
+// QueueDraw ();
+// };
+//
+// // Draw time marker
+// int ytime = ytop + (int) ((ms * scale) / 1000) + baseTime;
+//
+// if (val == focusedValue || val == overValue) {
+// ctx.NewPath ();
+// double dx = val == focusedValue ? 0 : 2;
+// ctx.Rectangle (lx + 0.5 + dx - SelectedValuePadding, ytime + 0.5, LineEndWidth - dx*2 + SelectedValuePadding, ((val.Duration.TotalMilliseconds * scale) / 1000));
+// HslColor hsl = color;
+// hsl.L = val == focusedValue ? 0.9 : 0.8;
+// ctx.SetSourceColor (hsl);
+// ctx.Fill ();
+// }
+//
+// ctx.NewPath ();
+// ctx.LineWidth = 1;
+// ctx.MoveTo (lx + 0.5, ytime + 0.5);
+// ctx.LineTo (lx + LineEndWidth + 0.5, ytime + 0.5);
+// ctx.LineTo (tx - 3 - LineEndWidth + 0.5, ty + (th / 2) + 0.5);
+// ctx.LineTo (tx + indent - 3 + 0.5, ty + (th / 2) + 0.5);
+// ctx.SetSourceColor (color.ToCairoColor ());
+// ctx.Stroke ();
+//
+// // Expander
+//
+// bool incLine = true;
+//
+// if (val.CanExpand) {
+// double ex = tx + indent - 3 - ExpanderSize - 2 + 0.5;
+// double ey = ty + (th / 2) - (ExpanderSize/2) + 0.5;
+// hp = AddHotSpot (ex, ey, ExpanderSize, ExpanderSize);
+// DrawExpander (ctx, ex, ey, val.Expanded, false);
+// hp.OnMouseOver = delegate {
+// using (Cairo.Context c = CairoHelper.Create (GdkWindow)) {
+// DrawExpander (c, ex, ey, val.Expanded, true);
+// }
+// };
+// hp.OnMouseLeave = delegate {
+// using (Cairo.Context c = CairoHelper.Create (GdkWindow)) {
+// DrawExpander (c, ex, ey, val.Expanded, false);
+// }
+// };
+// hp.Action = delegate {
+// ToggleExpand (val);
+// };
+//
+// if (val.Expanded && val.ExpandedTimerTraces.Count > 0) {
+// ty += th + LineSpacing;
+// foreach (CounterValueInfo cv in val.ExpandedTimerTraces)
+// DrawValue (ctx, gc, initialTime, ytop, lx, tx, ref ty, ref maxx, ref maxy, indent + ChildIndent, cv);
+// incLine = false;
+// }
+// }
+// if (incLine)
+// ty += th + LineSpacing;
+//
+// if (ytime > maxy)
+// maxy = ytime;
+// }
void DrawExpander (Cairo.Context ctx, double ex, double ey, bool expanded, bool hilight)
{
diff --git a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.CounterSelectorDialog.cs b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.CounterSelectorDialog.cs
index f37cb343d14..7442d7b8db2 100644
--- a/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.CounterSelectorDialog.cs
+++ b/main/src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.CounterSelectorDialog.cs
@@ -17,7 +17,7 @@ protected virtual void Build ()
this.Title = global::Mono.Unix.Catalog.GetString ("Select Counter");
this.WindowPosition = ((global::Gtk.WindowPosition)(4));
// Internal child Mono.Instrumentation.Monitor.CounterSelectorDialog.VBox
- global::Gtk.VBox w1 = this.VBox;
+ global::Gtk.VBox w1 = (Gtk.VBox)this.ContentArea;
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
@@ -34,7 +34,7 @@ protected virtual void Build ()
global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1 [this.GtkScrolledWindow]));
w3.Position = 0;
// Internal child Mono.Instrumentation.Monitor.CounterSelectorDialog.ActionArea
- global::Gtk.HButtonBox w4 = this.ActionArea;
+ global::Gtk.HButtonBox w4 = (Gtk.HButtonBox)this.ActionArea;
w4.Name = "dialog1_ActionArea";
w4.Spacing = 10;
w4.BorderWidth = ((uint)(5));
diff --git a/main/src/tools/mdmonitor/gtk-gui/gui.stetic b/main/src/tools/mdmonitor/gtk-gui/gui.stetic
index 49446c7ee4b..50557221fcf 100644
--- a/main/src/tools/mdmonitor/gtk-gui/gui.stetic
+++ b/main/src/tools/mdmonitor/gtk-gui/gui.stetic
@@ -2,10 +2,9 @@
..
- 2.12
+ 3.0
-
diff --git a/main/src/tools/mdmonitor/mdmonitor.csproj b/main/src/tools/mdmonitor/mdmonitor.csproj
index c97e7c871d8..6dc347b4442 100644
--- a/main/src/tools/mdmonitor/mdmonitor.csproj
+++ b/main/src/tools/mdmonitor/mdmonitor.csproj
@@ -16,15 +16,29 @@
-
-
-
-
-
-
-
+
+ gtk-sharp-3.0
+
+
+ gdk-sharp-3.0
+
+
+ glib-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gtk-sharp-3.0
+
+
+ gio-sharp-3.0
+
diff --git a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj
index 4bd8a7f984f..66f15887c39 100644
--- a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj
+++ b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj
@@ -15,10 +15,10 @@
-
+
-
-
+
+
..\..\build\bin\Microsoft.CodeAnalysis.dll
False
diff --git a/main/tests/IdeUnitTests/IdeTestBase.cs b/main/tests/IdeUnitTests/IdeTestBase.cs
index 4e441b985db..799c10b880e 100644
--- a/main/tests/IdeUnitTests/IdeTestBase.cs
+++ b/main/tests/IdeUnitTests/IdeTestBase.cs
@@ -33,7 +33,7 @@ protected override void InternalSetup(string rootDir)
{
base.InternalSetup(rootDir);
- Xwt.Application.Initialize(Xwt.ToolkitType.Gtk);
+ Xwt.Application.Initialize(Xwt.ToolkitType.Gtk3);
Gtk.Application.Init();
DesktopService.Initialize();
}
diff --git a/main/tests/IdeUnitTests/IdeUnitTests.csproj b/main/tests/IdeUnitTests/IdeUnitTests.csproj
index 72d4f06ba62..b0fdf13ce67 100644
--- a/main/tests/IdeUnitTests/IdeUnitTests.csproj
+++ b/main/tests/IdeUnitTests/IdeUnitTests.csproj
@@ -11,7 +11,9 @@
-
+
+
+
..\..\packages\Microsoft.VisualStudio.Composition.15.6.36\lib\net45\Microsoft.VisualStudio.Composition.dll
@@ -64,4 +66,4 @@
-
\ No newline at end of file
+
diff --git a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
index 09cb8cd8810..5a78c41d062 100644
--- a/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
+++ b/main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding.Tests.csproj
@@ -54,11 +54,11 @@
..\..\build\bin\Microsoft.CodeAnalysis.Features.dll
-
-
-
-
-
+
+
+
+
+
..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll
diff --git a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Projects/ProjectLoadSaveTests.cs b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Projects/ProjectLoadSaveTests.cs
index bc098e0ba02..cbef7b59fd2 100644
--- a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Projects/ProjectLoadSaveTests.cs
+++ b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Projects/ProjectLoadSaveTests.cs
@@ -1122,7 +1122,7 @@ public async Task AddImportThenRemoveImportAndThenAddImportAgain ()
[Test]
public void LoadReferenceWithSpaces_bug43510 ()
{
- var pref = ProjectReference.CreateAssemblyReference (" gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f");
+ var pref = ProjectReference.CreateAssemblyReference (" gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f");
var p = (DotNetProject)Services.ProjectService.CreateProject ("C#");
p.References.Add (pref);
Assert.IsTrue (pref.IsValid);
diff --git a/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj b/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
index 4cb1a342c3f..bad7568477a 100644
--- a/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
+++ b/main/tests/MonoDevelop.Refactoring.Tests/MonoDevelop.Refactoring.Tests.csproj
@@ -66,11 +66,11 @@
False
-
-
-
-
-
+
+
+
+
+
diff --git a/main/tests/TestRunner/TestRunner.csproj b/main/tests/TestRunner/TestRunner.csproj
index 39715e7606a..7bab31b646f 100644
--- a/main/tests/TestRunner/TestRunner.csproj
+++ b/main/tests/TestRunner/TestRunner.csproj
@@ -11,7 +11,7 @@
-
+
..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
diff --git a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
index 2b9fc46d735..f8177ccbca0 100644
--- a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
+++ b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
@@ -18,7 +18,7 @@
-
+
..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll
False
@@ -31,9 +31,9 @@
..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll
False
-
-
-
+
+
+
..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
diff --git a/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj b/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj
index 2ddfce2f46e..ce9cc6071d5 100644
--- a/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj
+++ b/main/tests/test-projects/ContactBook/ContactBook/ContactBook.csproj
@@ -39,11 +39,10 @@
-
-
-
-
-
+
+
+
+
@@ -55,4 +54,4 @@
-
\ No newline at end of file
+
diff --git a/main/tests/test-projects/ContactBook/ContactBook/gtk-gui/gui.stetic b/main/tests/test-projects/ContactBook/ContactBook/gtk-gui/gui.stetic
index 35dd4a3892c..4f3159cd9cd 100755
--- a/main/tests/test-projects/ContactBook/ContactBook/gtk-gui/gui.stetic
+++ b/main/tests/test-projects/ContactBook/ContactBook/gtk-gui/gui.stetic
@@ -5,7 +5,7 @@
2.4
-
+
diff --git a/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj b/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj
index 9a74e81afc4..95eaf3f0c56 100644
--- a/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj
+++ b/main/tests/test-projects/ContactBook/CustomWidgets/CustomWidgets.csproj
@@ -44,8 +44,8 @@
-
-
+
+
diff --git a/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj b/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj
index e361974bec3..da7b12d071a 100644
--- a/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj
+++ b/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj
@@ -32,7 +32,7 @@
-
+
False
diff --git a/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj.saved b/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj.saved
index 25935f76745..5a52f6f9b22 100644
--- a/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj.saved
+++ b/main/tests/test-projects/local-copy-package/ConsoleProject/ConsoleProject.csproj.saved
@@ -34,7 +34,7 @@
True
-
+
True
diff --git a/main/tests/ui/MonoDevelop.UserInterfaceTesting/MonoDevelop.UserInterfaceTesting.csproj b/main/tests/ui/MonoDevelop.UserInterfaceTesting/MonoDevelop.UserInterfaceTesting.csproj
index bc4f2728c95..93b5f7c42c7 100644
--- a/main/tests/ui/MonoDevelop.UserInterfaceTesting/MonoDevelop.UserInterfaceTesting.csproj
+++ b/main/tests/ui/MonoDevelop.UserInterfaceTesting/MonoDevelop.UserInterfaceTesting.csproj
@@ -34,7 +34,7 @@
..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll
-
+