[commit] r2091 - in trunk: GME GME/CSGUI GME/CSGUI/Properties GME/CSGUI/Resources GME/Gme Install
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Oct 26 15:25:58 CDT 2012
Author: ksmyth
Date: Fri Oct 26 15:25:58 2012
New Revision: 2091
Log:
Add Welcome screen
Added:
trunk/GME/CSGUI/
trunk/GME/CSGUI/CSGUI.csproj
trunk/GME/CSGUI/CSGUI.props
trunk/GME/CSGUI/New.png
trunk/GME/CSGUI/Open.png
trunk/GME/CSGUI/Properties/
trunk/GME/CSGUI/Properties/AssemblyInfo.cs
trunk/GME/CSGUI/Properties/Resources.Designer.cs
trunk/GME/CSGUI/Properties/Resources.resx
trunk/GME/CSGUI/Resources/
trunk/GME/CSGUI/Resources/GME.ico
trunk/GME/CSGUI/WelcomeScreen.Designer.cs
trunk/GME/CSGUI/WelcomeScreen.cs
trunk/GME/CSGUI/WelcomeScreen.resx
trunk/GME/CSGUI/WelcomeScreenExp.cs
trunk/GME/CSGUI/app.manifest
Modified:
trunk/GME/GME.sln
trunk/GME/Gme/GME.vcxproj
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Gme/GMEApp.h
trunk/Install/GME_bin.wxs
Added: trunk/GME/CSGUI/CSGUI.csproj
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/CSGUI.csproj Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>CSGUI</RootNamespace>
+ <AssemblyName>CSGUI</AssemblyName>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationManifest>app.manifest</ApplicationManifest>
+ </PropertyGroup>
+ <PropertyGroup>
+ <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="WelcomeScreen.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="WelcomeScreen.Designer.cs">
+ <DependentUpon>WelcomeScreen.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="WelcomeScreenExp.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="WelcomeScreen.resx">
+ <DependentUpon>WelcomeScreen.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="app.manifest" />
+ <None Include="Open.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="New.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\GME.ico" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\tlbexp" $(TargetPath)</PostBuildEvent>
+ </PropertyGroup>
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/GME/CSGUI/CSGUI.props
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/CSGUI.props Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\bin\Release;$(MSBuildThisFileDirectory)\bin\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
\ No newline at end of file
Added: trunk/GME/CSGUI/New.png
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and trunk/GME/CSGUI/New.png Fri Oct 26 15:25:58 2012 (r2091) differ
Added: trunk/GME/CSGUI/Open.png
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and trunk/GME/CSGUI/Open.png Fri Oct 26 15:25:58 2012 (r2091) differ
Added: trunk/GME/CSGUI/Properties/AssemblyInfo.cs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/Properties/AssemblyInfo.cs Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CSGUI")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ISIS/Vanderbilt University")]
+[assembly: AssemblyProduct("CSGUI")]
+[assembly: AssemblyCopyright("Copyright © ISIS/Vanderbilt University 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("4218a841-86ae-47ea-8b69-1116626dd42e")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: trunk/GME/CSGUI/Properties/Resources.Designer.cs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/Properties/Resources.Designer.cs Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,84 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.269
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CSGUI.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CSGUI.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ internal static System.Drawing.Icon GME {
+ get {
+ object obj = ResourceManager.GetObject("GME", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap New {
+ get {
+ object obj = ResourceManager.GetObject("New", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap Open {
+ get {
+ object obj = ResourceManager.GetObject("Open", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
Added: trunk/GME/CSGUI/Properties/Resources.resx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/Properties/Resources.resx Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="Open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Open.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="New" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\New.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="GME" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\GME.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+</root>
\ No newline at end of file
Added: trunk/GME/CSGUI/Resources/GME.ico
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and trunk/GME/CSGUI/Resources/GME.ico Fri Oct 26 15:25:58 2012 (r2091) differ
Added: trunk/GME/CSGUI/WelcomeScreen.Designer.cs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/WelcomeScreen.Designer.cs Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,96 @@
+namespace CSGUI
+{
+ partial class WelcomeScreen
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.btnNew = new System.Windows.Forms.Button();
+ this.btnOpen = new System.Windows.Forms.Button();
+ this.grpRecents = new System.Windows.Forms.GroupBox();
+ this.SuspendLayout();
+ //
+ // btnNew
+ //
+ this.btnNew.BackgroundImage = global::CSGUI.Properties.Resources.New;
+ this.btnNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.btnNew.Location = new System.Drawing.Point(12, 168);
+ this.btnNew.Name = "btnNew";
+ this.btnNew.Size = new System.Drawing.Size(152, 150);
+ this.btnNew.TabIndex = 1;
+ this.btnNew.Text = "New ";
+ this.btnNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnNew.UseVisualStyleBackColor = true;
+ //
+ // btnOpen
+ //
+ this.btnOpen.BackgroundImage = global::CSGUI.Properties.Resources.Open;
+ this.btnOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.btnOpen.Location = new System.Drawing.Point(14, 12);
+ this.btnOpen.Name = "btnOpen";
+ this.btnOpen.Size = new System.Drawing.Size(150, 150);
+ this.btnOpen.TabIndex = 0;
+ this.btnOpen.Text = "Open ";
+ this.btnOpen.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnOpen.UseVisualStyleBackColor = true;
+ //
+ // grpRecents
+ //
+ this.grpRecents.Location = new System.Drawing.Point(170, 12);
+ this.grpRecents.Name = "grpRecents";
+ this.grpRecents.Size = new System.Drawing.Size(690, 306);
+ this.grpRecents.TabIndex = 2;
+ this.grpRecents.TabStop = false;
+ this.grpRecents.Text = "Recent Projects";
+ //
+ // WelcomeScreen
+ //
+ this.AllowDrop = true;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(872, 328);
+ this.Controls.Add(this.grpRecents);
+ this.Controls.Add(this.btnNew);
+ this.Controls.Add(this.btnOpen);
+ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Icon = global::CSGUI.Properties.Resources.GME;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "WelcomeScreen";
+ this.Text = "GME";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button btnOpen;
+ private System.Windows.Forms.Button btnNew;
+ private System.Windows.Forms.GroupBox grpRecents;
+
+
+ }
+}
\ No newline at end of file
Added: trunk/GME/CSGUI/WelcomeScreen.cs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/WelcomeScreen.cs Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace CSGUI
+{
+
+ [ComVisible(false)]
+ public partial class WelcomeScreen : Form
+ {
+
+ public string SelectedProject;
+ public WelcomeScreen()
+ {
+ InitializeComponent();
+ this.FormBorderStyle = FormBorderStyle.FixedSingle;
+ }
+ protected override bool ProcessMnemonic(char charCode)
+ {
+ if (charCode >= '1' && charCode < '1' + recents.Count)
+ {
+ this.SelectedProject = recents[charCode - '1'];
+ Close();
+ return true;
+ }
+ return false;
+ }
+
+ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+ {
+ if (keyData == Keys.Escape)
+ this.Close();
+ return base.ProcessCmdKey(ref msg, keyData);
+ }
+
+ List<string> recents;
+ internal void ShowDialog(IWin32Window windowWrapper, List<string> recents)
+ {
+ this.recents = recents;
+ int y = 20;
+ foreach (string recent_ in recents)
+ {
+ string recent = recent_;
+ LinkLabel recentLink = new System.Windows.Forms.LinkLabel();
+ recentLink.Text = recent;
+ recentLink.Location = new Point(7, y);
+ recentLink.AutoSize = false;
+ recentLink.AutoEllipsis = true;
+ recentLink.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ recentLink.Size = new Size(grpRecents.Size.Width - 14, 20);
+ recentLink.LinkClicked += delegate(object sender, LinkLabelLinkClickedEventArgs args)
+ {
+ this.SelectedProject = recent;
+ this.Close();
+ };
+ grpRecents.Controls.Add(recentLink);
+ y += 23;
+ }
+
+ this.btnOpen.Click += new EventHandler(delegate(object o, EventArgs args)
+ {
+ OpenFileDialog openFileDialog1 = new OpenFileDialog();
+ //openFileDialog1.InitialDirectory =
+ openFileDialog1.Filter = "GME project files (*.mga,*.xme)|*.mga; *.xme|MGA files|*.mga|GME XML files|*.xme; *.xml|All files (*.*)|*.*";
+ openFileDialog1.RestoreDirectory = true;
+ openFileDialog1.CheckFileExists = true;
+
+ if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
+ {
+ this.SelectedProject = openFileDialog1.FileName;
+ this.Close();
+ }
+ });
+ this.btnNew.Click += new EventHandler(delegate(object o, EventArgs args)
+ {
+ this.SelectedProject = WelcomeScreenExp.sCREATE_SENTINEL;
+ this.Close();
+ });
+ this.StartPosition = FormStartPosition.CenterParent;
+ this.ShowInTaskbar = false;
+ this.DragDrop += new DragEventHandler(delegate(object o, DragEventArgs de)
+ {
+ if (de.Data.GetDataPresent(DataFormats.FileDrop))
+ {
+ SelectedProject = (de.Data.GetData(DataFormats.FileDrop) as string[])[0];
+ this.Close();
+ }
+ });
+ this.DragEnter += new DragEventHandler(delegate(object o, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.FileDrop))
+ {
+ string filename = (e.Data.GetData(DataFormats.FileDrop) as string[])[0];
+ if (filename.EndsWith(".mga") || filename.EndsWith(".xme"))
+ {
+ e.Effect = DragDropEffects.Copy;
+ return;
+ }
+ }
+ e.Effect = DragDropEffects.None;
+
+ });
+ ShowDialog(windowWrapper);
+ }
+ }
+}
Added: trunk/GME/CSGUI/WelcomeScreen.resx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/WelcomeScreen.resx Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: trunk/GME/CSGUI/WelcomeScreenExp.cs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/WelcomeScreenExp.cs Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace CSGUI
+{
+ internal class WindowWrapper : IWin32Window
+ {
+ public IntPtr Handle { get; private set; }
+ public WindowWrapper(IntPtr hwnd) { Handle = hwnd; }
+ }
+
+ [Guid("68FDA295-8D49-4445-BE29-1F171B4BE07D"),
+ ProgId("MGA.WelcomeScreen"),
+ ClassInterface(ClassInterfaceType.AutoDual)]
+ [ComVisible(true)]
+ public class WelcomeScreenExp
+ {
+ public static string sCREATE_SENTINEL = "<create>";
+ public string CREATE_SENTINEL { get { return sCREATE_SENTINEL; } }
+ public string ShowWelcomeWindow(Int64 parentHwnd)
+ {
+ WelcomeScreen ws = new WelcomeScreen();
+ ws.ShowDialog(new WindowWrapper((IntPtr)parentHwnd), recents);
+ return ws.SelectedProject;
+ }
+
+ List<string> recents = new List<string>();
+
+ public void SetRecentProjects(object recents)
+ {
+ foreach (string recent in (recents as Array))
+ {
+ if (!String.IsNullOrEmpty(recent))
+ this.recents.Add(recent);
+ }
+ }
+ }
+
+}
Added: trunk/GME/CSGUI/app.manifest
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/CSGUI/app.manifest Fri Oct 26 15:25:58 2012 (r2091)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <assemblyIdentity
+ type="win32"
+ name="CSGUI"
+ version="1.0.0.0"
+ processorArchitecture="msil" />
+ <clrClass
+ clsid="{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}"
+ progid="MGA.WelcomeScreen"
+ threadingModel="Both"
+ name="CSGUI.WelcomeScreenExp"
+ runtimeVersion="v4.0.30319">
+ </clrClass>
+ <file name="CSGUI.dll">
+ </file>
+
+<!--
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+ <!- - UAC Manifest Options
+ If you want to change the Windows User Account Control level replace the
+ requestedExecutionLevel node with one of the following.
+
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+ <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
+
+ Specifying requestedExecutionLevel node will disable file and registry virtualization.
+ If you want to utilize File and Registry Virtualization for backward
+ compatibility then delete the requestedExecutionLevel node.
+ - ->
+ <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!- - A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.- ->
+
+ <!- - If your application is designed to work with Windows 7, uncomment the following supportedOS node- ->
+ <!- -<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>- ->
+
+ </application>
+ </compatibility>
+-->
+ <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+ <!-- <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>-->
+
+</asmv1:assembly>
Modified: trunk/GME/GME.sln
==============================================================================
--- trunk/GME/GME.sln Thu Oct 18 13:54:35 2012 (r2090)
+++ trunk/GME/GME.sln Fri Oct 26 15:25:58 2012 (r2091)
@@ -34,6 +34,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgaDotNetServices", "MgaDotNetServices\MgaDotNetServices.csproj", "{955209A1-8107-43C2-B0A7-729B03908C64}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSGUI", "CSGUI\CSGUI.csproj", "{6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -309,6 +311,17 @@
{955209A1-8107-43C2-B0A7-729B03908C64}.Release|Win32.Build.0 = Release|Any CPU
{955209A1-8107-43C2-B0A7-729B03908C64}.Release|x64.ActiveCfg = Release|Any CPU
{955209A1-8107-43C2-B0A7-729B03908C64}.Release|x64.Build.0 = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Debug|x64.Build.0 = Debug|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release_PGO_Instrument|Win32.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release_PGO_Instrument|x64.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release_PGO_Optimize|Win32.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release_PGO_Optimize|x64.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release|Win32.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release|Win32.Build.0 = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release|x64.ActiveCfg = Release|Any CPU
+ {6FC5FB26-36BE-4F8B-AEE9-8FD9914D666C}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Thu Oct 18 13:54:35 2012 (r2090)
+++ trunk/GME/Gme/GME.vcxproj Fri Oct 26 15:25:58 2012 (r2091)
@@ -57,18 +57,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\CSGUI\CSGUI.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\CSGUI\CSGUI.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\CSGUI\CSGUI.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\CSGUI\CSGUI.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -93,7 +97,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<CustomBuildStep>
<Message>Copying required CrashRpt files</Message>
- <Command>xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashRpt.dll "$(OutDir)" && ^
+ <Command>xcopy /Y/D/F ..\CSGUI\bin\Release\CSGUI.dll "$(OutDir)" && ^
+xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashRpt.dll "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashSender.exe "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\crashrpt_lang.ini "$(OutDir)"
</Command>
@@ -138,7 +143,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<CustomBuildStep>
<Message>Copying required CrashRpt files</Message>
- <Command>xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashRpt.dll "$(OutDir)" && ^
+ <Command>xcopy /Y/D/F ..\CSGUI\bin\Release\CSGUI.dll "$(OutDir)" && ^
+xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashRpt.dll "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashSender.exe "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\crashrpt_lang.ini "$(OutDir)"
</Command>
@@ -182,7 +188,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
<Message>Copying required CrashRpt files</Message>
- <Command>xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashRptd.dll "$(OutDir)" && ^
+ <Command>xcopy /Y/D/F ..\CSGUI\bin\Debug\CSGUI.dll "$(OutDir)" && ^
+xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashRptd.dll "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\CrashSenderd.exe "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\crashrpt_lang.ini "$(OutDir)"
</Command>
@@ -223,7 +230,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<CustomBuildStep>
<Message>Copying required CrashRpt files</Message>
- <Command>xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashRptd.dll "$(OutDir)" && ^
+ <Command>xcopy /Y/D/F ..\CSGUI\bin\Debug\CSGUI.dll "$(OutDir)" && ^
+xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashRptd.dll "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\CrashSenderd.exe "$(OutDir)" && ^
xcopy /Y/D/F ..\Lib\CrashRpt\bin\x64\crashrpt_lang.ini "$(OutDir)"
</Command>
@@ -265,6 +273,9 @@
<Project>{bef31e1e-bb02-4687-a543-a6ad5d522869}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="..\CSGUI\CSGUI.csproj">
+ <Project>{6fc5fb26-36be-4f8b-aee9-8fd9914d666c}</Project>
+ </ProjectReference>
<ProjectReference Include="..\Interfaces\Interfaces.vcxproj">
<Project>{a9ba4850-c3d5-45dc-98b3-c29ec9fd54eb}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Thu Oct 18 13:54:35 2012 (r2090)
+++ trunk/GME/Gme/GMEApp.cpp Fri Oct 26 15:25:58 2012 (r2091)
@@ -34,6 +34,13 @@
#pragma comment(lib, "CrashRpt.lib")
#endif
+#import "C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\mscorlib.tlb"
+namespace CSGUI {
+using namespace mscorlib;
+}
+#import "CSGUI.tlb"
+
+#pragma comment(linker, "\"/manifestdependency:type='win32' processorArchitecture='msil' name='CSGUI' version='1.0.0.0' language='*'\"")
#ifndef _DEBUG
#pragma comment(linker, "\"/manifestdependency:type='win32' name='Core' version='1.0.0.0' language='*'\"")
#pragma comment(linker, "\"/manifestdependency:type='win32' name='Meta' version='1.0.0.0' language='*'\"")
@@ -53,6 +60,7 @@
#endif
// ATL ///////////////////////////////////////////////////////////////////////////
+#include <atlsafe.h>
#include "mga_i.c"
#include "meta_i.c"
#include "Splash.h"
@@ -294,7 +302,8 @@
ParseCommandLine(cmdInfo);
if( cmdInfo.m_nShellCommand == CCommandLineInfo::FileOpen || cmdInfo.m_nShellCommand == CCommandLineInfo::AppRegister)
- cmdInfo.m_bShowSplash = false;
+ ;
+ cmdInfo.m_bShowSplash = false;
CSplashWnd::EnableSplashScreen(cmdInfo.m_bShowSplash);
// CG: The following block was inserted by 'Status Bar' component.
@@ -521,16 +530,55 @@
OpenProject(conn);
cmdInfo.m_nShellCommand = CCommandLineInfo::FileNothing;
+ return TRUE;
}
else if(cmdInfo.bOpenLast && !m_RecentProjectList[0].IsEmpty())
{
OpenProject(m_RecentProjectList[0]);
cmdInfo.m_nShellCommand = CCommandLineInfo::FileNothing;
+ return TRUE;
}
// Dispatch commands specified on the command line
//if (!ProcessShellCommand(cmdInfo))
// return FALSE;
+ return FALSE;
+}
+
+BOOL CGMEApp::ShowWelcomeWindow()
+{
+ CSGUI::_WelcomeScreenExpPtr ws;
+ ws.CreateInstance(L"MGA.WelcomeScreen");
+ if (ws)
+ try {
+ ATL::CComSafeArray<BSTR> recents;
+ for (int i = 0; i < m_RecentProjectList.GetSize(); i++)
+ {
+ recents.Add(CComBSTR(m_RecentProjectList[i]));
+ }
+ VARIANT vrecents;
+ vrecents.parray = (SAFEARRAY*)recents;
+ vrecents.vt = VT_ARRAY | VT_BSTR;
+ ws->SetRecentProjects(_variant_t(vrecents));
+ _bstr_t SelectedProject = ws->ShowWelcomeWindow((unsigned long)m_pMainWnd->GetSafeHwnd());
+
+ if (SelectedProject != _bstr_t()) {
+ if (SelectedProject == ws->CREATE_SENTINEL) {
+ OnFileNew();
+ } else {
+ CString conn = static_cast<const wchar_t*>(SelectedProject);
+ if(conn.Find(_T("=")) < 0) {
+ if (conn.Right(4).CompareNoCase(_T(".xme")) == 0)
+ conn.Insert(0, _T("XML="));
+ else
+ conn.Insert(0,_T("MGA="));
+ }
+ OpenProject(conn);
+ }
+ }
+ } catch (_com_error& e) {
+ //AfxMessageBox(e.ErrorMessage());
+ }
return TRUE;
}
@@ -578,7 +626,7 @@
}
}
- OpenCommandLineProject();
+ OpenCommandLineProject() || ShowWelcomeWindow();
int retVal = 0;
if (bNoProtect) {
Modified: trunk/GME/Gme/GMEApp.h
==============================================================================
--- trunk/GME/Gme/GMEApp.h Thu Oct 18 13:54:35 2012 (r2090)
+++ trunk/GME/Gme/GMEApp.h Fri Oct 26 15:25:58 2012 (r2091)
@@ -81,6 +81,7 @@
}
BOOL OpenCommandLineProject();
+ BOOL ShowWelcomeWindow();
private:
virtual int Run();
Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs Thu Oct 18 13:54:35 2012 (r2090)
+++ trunk/Install/GME_bin.wxs Fri Oct 26 15:25:58 2012 (r2091)
@@ -264,6 +264,12 @@
</Component>
</DirectoryRef>
+ <DirectoryRef Id="INSTALLDIR">
+ <Component>
+ <File Source="..\GME\CSGUI\bin\Release\CSGUI.dll" />
+ </Component>
+ </DirectoryRef>
+
<DirectoryRef Id="INSTALLDIR_BIN">
<Component Id="Meta.dll">
<File Id="Meta.dll" Name="Meta.dll" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Meta.dll">
More information about the gme-commit
mailing list