Skip to content

Commit

Permalink
Implemented showing the solution tree in the solution explorer.
Browse files Browse the repository at this point in the history 
The solution explorer now shows the solution / project tree.
Fixed exception catch on Linux platform to not rethrow if exiting.
  • Loading branch information
@hach-que
hach-que committed Jun 23, 2012
1 parent 3749bf7 commit 5b46b34
Show file tree
Hide file tree
Showing 5 changed files with 497 additions and 97 deletions.
17 changes: 9 additions & 8 deletions ide/src/Moai.IDE/Moai.IDE.csproj
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -10,10 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Moai.IDE</RootNamespace>
<AssemblyName>Moai.IDE</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
<ApplicationIcon>icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -24,6 +21,11 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="." />
</EnvironmentVariables>
</EnvironmentVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -34,10 +36,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json.Net35, Version=4.0.2.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\libraries\Newtonsoft.Json.Net35.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
Expand All @@ -51,6 +49,9 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json.Net35">
<HintPath>..\..\libraries\Newtonsoft.Json.Net35.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\VersionInfo.cs">
Expand Down
1 change: 1 addition & 0 deletions ide/src/Moai.Platform.Linux/LinuxIDE.cs
View file
Expand Up @@ -51,6 +51,7 @@ protected override void ShowEvent(QShowEvent arg1)

public void Exit()
{
LinuxPlatform.ShuttingDown = true;
this.c_Documents.Clear();
QApplication.Quit();
}
Expand Down
4 changes: 3 additions & 1 deletion ide/src/Moai.Platform.Linux/LinuxPlatform.cs
View file
Expand Up @@ -10,6 +10,7 @@ namespace Moai.Platform.Linux
public class LinuxPlatform : IPlatform
{
private static readonly ILog m_Log = LogManager.GetLogger(typeof(LinuxPlatform));
internal static bool ShuttingDown = false;

public LinuxPlatform()
{
Expand All @@ -32,7 +33,8 @@ public void RunIDE(IIDE ide)
catch (Exception e)
{
m_Log.Error("An exception occurred while running the Linux platform.", e);
throw new ApplicationException("The application is unable to continue due to an inconsistant Qt state.", e);
if (!LinuxPlatform.ShuttingDown)
throw new ApplicationException("The application is unable to continue due to an inconsistant Qt state.", e);
}
}

Expand Down
17 changes: 8 additions & 9 deletions ide/src/Moai.Platform.Linux/Moai.Platform.Linux.csproj
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -10,7 +10,6 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Moai.Platform.Linux</RootNamespace>
<AssemblyName>Moai.Platform.Linux</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -44,18 +43,18 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="qt-dotnet">
<HintPath>..\..\..\..\..\..\..\..\usr\lib\mono\gac\qt-dotnet\4.5.0.0__194a23ba31c08164\qt-dotnet.dll</HintPath>
</Reference>
<Reference Include="qscintilla">
<HintPath>..\..\..\..\..\..\..\..\usr\lib\mono\gac\qscintilla\2.2.0.0__194a23ba31c08164\qscintilla.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\libraries\log4net.dll</HintPath>
</Reference>
<Reference Include="qtwebkit">
<HintPath>..\..\..\..\..\..\..\..\usr\lib\mono\gac\qtwebkit\2.2.0.0__194a23ba31c08164\qtwebkit.dll</HintPath>
</Reference>
<Reference Include="qt-dotnet">
<HintPath>..\..\..\..\..\..\..\..\usr\lib\mono\gac\qt-dotnet\4.5.0.0__194a23ba31c08164\qt-dotnet.dll</HintPath>
</Reference>
<Reference Include="qscintilla">
<HintPath>..\..\..\..\..\..\..\..\usr\lib\mono\gac\qscintilla\2.2.0.0__194a23ba31c08164\qscintilla.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\VersionInfo.cs">
Expand Down Expand Up @@ -126,4 +125,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit 5b46b34

Please sign in to comment.