diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-09 18:46:40 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-09 18:46:40 +0100 |
| commit | d783669223da5bfe8caa1b95c0ff6e1c5046e09e (patch) | |
| tree | 08e156330c147d73aff48d018d60df6bfa50e259 /src/GraphicObjects | |
| parent | 8678c71d24bd88ceca04dc71b0d1b93a2f51cecf (diff) | |
Squashed commit devel branch:
commit 7f91f7c2e83f7cfb2922ea83586f156f03f88a59
Author: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Fri Feb 9 18:13:59 2018 +0100
go back to OpenTK-2, waiting for an official release
commit 125f32758a584c4976d3536eab3702fd37a8a7a9
Author: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Fri Feb 9 17:26:00 2018 +0100
LoadInterface replaced by AddWidget overload, [ide] property view item templates in separate template file
commit 7c48cd2f0332d2ec82006edb755fcd37ab1f2b4a
Author: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Fri Feb 9 12:10:13 2018 +0100
Tooltips, CrowIDE improvements, Fetch subdata when test not eq TypeOf, debug listener in basicTest, RemoveWidget in iface
modifié : Crow.ControlsLib/Crow.ControlsLib.csproj
modifié : Crow.csproj
modifié : Crow.sln
modifié : CrowIDE/CrowIDE.csproj
modifié : CrowIDE/src/CrowIDE.cs
modifié : CrowIDE/src/ImlVisualEditor.cs
nouveau fichier : CrowIDE/src/Project.cs
nouveau fichier : CrowIDE/src/Solution.cs
nouveau fichier : CrowIDE/src/VerticalLine.cs
nouveau fichier : CrowIDE/ui/ProjectProperties.crow
nouveau fichier : CrowIDE/ui/ProjectTree.template
nouveau fichier : CrowIDE/ui/TreeExpandable.template
modifié : CrowIDE/ui/imlEditor.crow
modifié : Default.style
nouveau fichier : Icons/assembly.svg
nouveau fichier : Templates/Tooltip.template
modifié : Tests/BasicTests.cs
modifié : Tests/HelloWorld.cs
modifié : Tests/Interfaces/Divers/0.crow
modifié : Tests/Interfaces/Divers/testShape.crow
modifié : Tests/Interfaces/Divers/welcome.crow
modifié : Tests/Tests.csproj
modifié : src/CompilerServices/CompilerServices.cs
modifié : src/GraphicObjects/FileDialog.cs
modifié : src/GraphicObjects/GraphicObject.cs
modifié : src/GraphicObjects/MessageBox.cs
modifié : src/Instantiator.cs
modifié : src/Interface.cs
modifié : src/ItemTemplate.cs
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/FileDialog.cs | 3 | ||||
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 11 | ||||
| -rw-r--r-- | src/GraphicObjects/MessageBox.cs | 5 | ||||
| -rw-r--r-- | src/GraphicObjects/Popper.cs | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/src/GraphicObjects/FileDialog.cs b/src/GraphicObjects/FileDialog.cs index a5ba7b20..285ca253 100644 --- a/src/GraphicObjects/FileDialog.cs +++ b/src/GraphicObjects/FileDialog.cs @@ -52,6 +52,9 @@ namespace Crow public event EventHandler OkClicked; #endregion + public string SelectedFileFullPath { + get { return Path.Combine (SelectedDirectory, SelectedFile); } + } [XmlAttributeAttribute][DefaultValue("/home")] public virtual string CurrentDirectory { get { return curDir; } diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 3da8330d..e24e9b28 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -808,6 +808,17 @@ namespace Crow NotifyValueChanged ("Style", style); } } + string tooltip; + [XmlAttributeAttribute] + public virtual string Tooltip { + get { return tooltip; } + set { + if (tooltip == value) + return; + tooltip = value; + NotifyValueChanged("Tooltip", tooltip); + } + } #endregion #region Default and Style Values loading diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/MessageBox.cs index 277a7e11..7f945810 100644 --- a/src/GraphicObjects/MessageBox.cs +++ b/src/GraphicObjects/MessageBox.cs @@ -120,7 +120,6 @@ namespace Crow NotifyValueChanged ("MsgIcon", "#Crow.Images.Icons.exit.svg"); Caption = "Error"; OkMessage = "Ok"; - CancelMessage = "Cancel"; break; } } @@ -136,7 +135,7 @@ namespace Crow close (); } public static MessageBox Show (Type msgBoxType, string message, string okMsg = "", string cancelMsg = ""){ - lock (Interface.CurrentInterface.UpdateMutex) { + //lock (Interface.CurrentInterface.UpdateMutex) { MessageBox mb = new MessageBox (Interface.CurrentInterface); mb.CurrentInterface.AddWidget (mb); mb.MsgType = msgBoxType; @@ -146,7 +145,7 @@ namespace Crow if (!string.IsNullOrEmpty(cancelMsg)) mb.CancelMessage = cancelMsg; return mb; - } + //} } } } diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs index 5316a5a7..41210dc5 100644 --- a/src/GraphicObjects/Popper.cs +++ b/src/GraphicObjects/Popper.cs @@ -224,7 +224,7 @@ namespace Crow if (Content != null) { Content.Visible = true; if (Content.Parent == null) - CurrentInterface.AddWidget (Content, true); + CurrentInterface.AddWidget (Content); if (Content.LogicalParent != this) Content.LogicalParent = this; CurrentInterface.PutOnTop (Content, true); |