diff --git a/.gitignore b/.gitignore index fcb205fb..3c4efe20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,261 @@ -# Shamelessly stolen from http://gist.github.com/114476 -# .gitignore for .NET projects -# Thanks to Derick Bailey -# http://www.lostechies.com/blogs/derickbailey/archive/2009/05/18/a-net-c-developer-s-gitignore-file.aspx -# Additional Thanks to -# - Alexey Abramov - -# Standard VS.NET and ReSharper Foo -obj -bin -Bin -*.csproj.user -*ReSharper* -*resharper* +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files *.suo -*.cache -Thumbs.db -*.dotCover +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* -# NuGet Packages Directory -packages - -# Other useful stuff -*.bak -*.cache +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj *.log -*.swp -*.user -_compareTemp -_notes -aspnet_client -httpd.parse.errors - -# Office Temp Files +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +#*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ ~$* - -# If you have a deploy folder -# deploy -# deploy/* - -# Exclude ALL DLLs? ( -# *.dll \ No newline at end of file +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc \ No newline at end of file diff --git a/CHANGELOG.markdown b/CHANGELOG.md similarity index 100% rename from CHANGELOG.markdown rename to CHANGELOG.md diff --git a/README.markdown b/README.md similarity index 98% rename from README.markdown rename to README.md index 36c4ff11..56a0d8e8 100644 --- a/README.markdown +++ b/README.md @@ -1,6 +1,10 @@ # Gemini -[![Build status](https://ci.appveyor.com/api/projects/status/jwagos6igfdgx819/branch/master?svg=true)](https://ci.appveyor.com/project/tgjones/gemini/branch/master) [![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/pr)](http://www.issuestats.com/github/tgjones/gemini) [![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/issue)](http://www.issuestats.com/github/tgjones/gemini) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/tgjones/gemini) +[![Build status](https://ci.appveyor.com/api/projects/status/jwagos6igfdgx819/branch/master?svg=true)](https://ci.appveyor.com/project/tgjones/gemini/branch/master) +[![NuGet](https://img.shields.io/nuget/v/GeminiWpf.svg)](https://www.nuget.org/packages/GeminiWpf/) +[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/pr?style=flat)](http://www.issuestats.com/github/tgjones/gemini) +[![Issue Stats](http://www.issuestats.com/github/tgjones/gemini/badge/issue?style=flat)](http://www.issuestats.com/github/tgjones/gemini) +[![Join the chat at https://gitter.im/tgjones/gemini](https://badges.gitter.im/tgjones/gemini.svg)](https://gitter.im/tgjones/gemini?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## What is this? diff --git a/appveyor.yml b/appveyor.yml index 89cfef8f..333bdbf4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ init: - ps: >- $parsedReleaseBuildVersion = $env:APPVEYOR_REPO_TAG_NAME -Match "(\d+.\d+.\d+(.\d+)?)" - If($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) { + if ($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) { $env:BuildVersion = $matches[0] $env:IsGithubRelease = $TRUE } @@ -15,13 +15,21 @@ init: $env:IsGithubRelease = "" } - Write-Host "Build Version: " $env:BuildVersion - Write-Host "Tag name: " $env:appveyor_repo_tag - Write-Host "Commit: " $env:APPVEYOR_REPO_COMMIT_MESSAGE - Write-Host "Commit extended:" $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED + write-host -NoNewline "Build Version: "; + write-host $env:BuildVersion -foregroundcolor "Yellow"; - Write-Host "appveyor_build_version Variable: " $env:appveyor_build_version - + write-host -NoNewline "Tag name: "; + write-host $env:appveyor_repo_tag -foregroundcolor "Yellow"; + + write-host -NoNewline "Commit: "; + write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE -foregroundcolor "Yellow"; + + write-host -NoNewline "Commit extended: "; + write-host $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -foregroundcolor "Yellow"; + + write-host -NoNewline "appveyor_build_version Variable: "; + write-host $env:appveyor_build_version -foregroundcolor "Yellow"; + assembly_info: patch: true file: '**\AssemblyInfo.*' @@ -29,6 +37,12 @@ assembly_info: assembly_file_version: $(BuildVersion) assembly_informational_version: $(BuildVersion) +install: +- ps: .\scripts\install-xna.ps1 + +cache: +- XNAGS40_setup.exe + before_build: - cmd: cd src - cmd: nuget restore diff --git a/lib/Xceed.Wpf.AvalonDock.Themes.VS2013.dll b/lib/Xceed.Wpf.AvalonDock.Themes.VS2013.dll deleted file mode 100644 index 525e6a77..00000000 Binary files a/lib/Xceed.Wpf.AvalonDock.Themes.VS2013.dll and /dev/null differ diff --git a/scripts/install-xna.ps1 b/scripts/install-xna.ps1 new file mode 100644 index 00000000..8ca6479f --- /dev/null +++ b/scripts/install-xna.ps1 @@ -0,0 +1,158 @@ +# https://bitbucket.org/rbwhitaker/xna-beyond-vs-2010/downloads/ + +function RemoveIfExists($path) { + if((Test-Path $path) -eq $True) { + Remove-Item $path -recurse; + } +} + +function RunInstaller($path) { + Start-Process -FilePath msiexec.exe -ArgumentList /i, $path, /quiet -Wait; +} + +function RunInstaller2([String]$path, [String]$extraOption) { + Start-Process -FilePath msiexec.exe -ArgumentList /a, $path, /quiet, $extraOption -Wait; +} + +function InstallXna($appName, $pathToExe, $installLocation, $extensionCacheLocation, $version) { + $vsInstalled = test-path "$pathToExe"; + if ($vsInstalled -eq $True) { + write-host " $appName is installed on this machine. XNA will be added there."; + write-host " Copying files."; + copy-item $xnaLocation $installLocation -recurse -force; + + write-host " Updating configuration for this version."; + $content = Get-Content ($installLocation + "\XNA Game Studio 4.0\extension.vsixmanifest"); + $content = $content -replace "Version=`"10.0`">", "Version=`"$version`">`r`n WDExpress"; + $content | Out-File ($installLocation + "\XNA Game Studio 4.0\extension.vsixmanifest") -encoding ASCII; + + write-host " Clearing the extensions cache."; + RemoveIfExists($extensionCacheLocation); + + write-host " Rebuilding the extension cache. This may take a few minutes."; + Start-Process -FilePath $pathToExe -ArgumentList /setup -Wait + write-host " Finished rebuilding cache."; + write-host " XNA Game Studio 4.0 is now installed for $appName!"; + } +} + +# Don't do anything if Visual Studio is already running. +if ((Get-Process "WDExpress" -ErrorAction SilentlyContinue) -or (Get-Process "devenv" -ErrorAction SilentlyContinue)) { + write-host "Cannot install XNA while a version of Visual Studio is running. Exiting script..."; + return; +} + +if (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole(` + [Security.Principal.WindowsBuiltInRole] "Administrator")) +{ + write-warning "You do not have Administrator rights to run this script!`nPlease re-run this script as an Administrator!" + break; +} + +$currentLocation = (Get-Location).ToString(); + +write-host "`r`n"; +write-host "Step 1/4: Downloading XNA Installer" -foregroundcolor "Blue"; + +$downloadLocation = ($currentLocation + "\XNAGS40_setup.exe"); +if ((Test-Path ".\XNAGS40_setup.exe") -eq $False) { + write-host " Downloading XNA 4.0 Refresh Installer to $downloadLocation. This may take several minutes."; + $wc = New-Object System.Net.WebClient + $wc.DownloadFile("http://download.microsoft.com/download/E/C/6/EC68782D-872A-4D58-A8D3-87881995CDD4/XNAGS40_setup.exe", $downloadLocation) + write-host " Download Complete."; +} else { + write-host " XNA 4.0 Refresh Installer already downloaded. Skipping download step."; +} +write-host "`r`n"; +write-host "Step 2/4: Running Installers" -foregroundcolor "Blue"; +write-host " Extracting components from XNA 4.0 Refresh Installer."; +start-process -FilePath .\XNAGS40_setup.exe -ArgumentList /extract:XNA, /quiet -Wait; + +write-host " Running Redists.msi"; +RunInstaller("`"$currentLocation\XNA\redists.msi`""); + +$XnaInProgramFiles = "C:\Program Files (x86)\Microsoft XNA"; + +write-host " Running XLiveRedist.msi"; +RunInstaller("`"$XnaInProgramFiles\XNA Game Studio\v4.0\Setup\XLiveRedist.msi`"") + +write-host " Running xnafx40_redist.msi"; +RunInstaller("`"$XnaInProgramFiles\XNA Game Studio\v4.0\Redist\XNA FX Redist\xnafx40_redist.msi`"") + +write-host " Running xnaliveproxy.msi"; +RunInstaller("`"$XnaInProgramFiles\XNA Game Studio\v4.0\Setup\xnaliveproxy.msi`"") + +write-host " Running xnags_platform_tools.msi"; +RunInstaller("`"$XnaInProgramFiles\XNA Game Studio\v4.0\Setup\xnags_platform_tools.msi`"") + +write-host " Running xnags_shared.msi"; +RunInstaller("`"$XnaInProgramFiles\XNA Game Studio\v4.0\Setup\xnags_shared.msi`"") + +write-host " Extracting extension files from xnags_visualstudio.msi"; +RunInstaller2 "`"$XnaInProgramFiles\XNA Game Studio\v4.0\Setup\xnags_visualstudio.msi`"" "TARGETDIR=C:\XNA-temp\ExtractedExtensions\" + +write-host " Running arpentry.msi"; +RunInstaller("`"$currentLocation\XNA\arpentry.msi`"") + +$xnaLocation = ("C:\XNA-temp\ExtractedExtensions\Microsoft Visual Studio 10.0\Common7\IDE\Extensions\Microsoft\XNA Game Studio 4.0"); + +write-host "`r`n"; +write-host "Step 3/4: Adding Extensions to Installed Versions of Visual Studio" -foregroundcolor "Blue"; + +# The following process is done for: +# * VS 2012 Professional (or another paid-for version) +# * VS Express 2012 for Windows Desktop +# * VS 2013 Professional (or another paid-for version) +# * VS Express 2013 for Windows Desktop +# * VS 2015 (All versions. 2015 will have Community Edition, which is better than Express.) +# 1. Check to see if the program is installed. If it isn't, we won't try to install there. +# 2. If we're going to install there, tell the user. +# 3. Copy the XNA extension to the new location. +# 4. Update the extension's version to the version that we're installing to. +# 5. For express, we need to also add the version name (WDExpress) to the list of supported editions. +# 6. Delete the extensions cache. +# 7. Rebuild the extensions cache. + +# $appName = "Visual Studio 2012 Pro"; +# $pathToExe = "${Env:VS110COMNTOOLS}..\IDE\devenv.exe"; +# $installLocation = "${Env:VS110COMNTOOLS}..\IDE\Extensions\Microsoft"; +# $extensionCacheLocation = "$home\AppData\Local\Microsoft\VisualStudio\11.0\Extensions"; +# $version = "11.0"; +# InstallXna $appName $pathToExe $installLocation $extensionCacheLocation $version; + +# $appName = "Visual Studio Express 2012 for Windows Desktop"; +# $pathToExe = "${Env:VS110COMNTOOLS}..\IDE\WDExpress.exe"; +# $installLocation = "${Env:VS110COMNTOOLS}..\IDE\WDExpressExtensions\Extensions" +# $extensionCacheLocation = "$home\AppData\Local\Microsoft\WDExpress\11.0\Extensions"; +# $version = "11.0"; +# InstallXna $appName $pathToExe $installLocation $extensionCacheLocation $version; + +# $appName = "Visual Studio 2013 Pro"; +# $pathToExe = "${Env:VS120COMNTOOLS}..\IDE\devenv.exe"; +# $installLocation = "${Env:VS120COMNTOOLS}..\IDE\Extensions\Microsoft"; +# $extensionCacheLocation = "$home\AppData\Local\Microsoft\VisualStudio\12.0\Extensions"; +# $version = "12.0"; +# InstallXna $appName $pathToExe $installLocation $extensionCacheLocation $version; + +# $appName = "Visual Studio Express 2013 for Windows Desktop"; +# $pathToExe = "${Env:VS120COMNTOOLS}..\IDE\WDExpress.exe"; +# $installLocation = "${Env:VS120COMNTOOLS}..\IDE\WDExpressExtensions\Extensions" +# $extensionCacheLocation = "$home\AppData\Local\Microsoft\WDExpress\12.0\Extensions"; +# $version = "12.0"; +# InstallXna $appName $pathToExe $installLocation $extensionCacheLocation $version; + +$appName = "Visual Studio 2015"; +$pathToExe = "${Env:VS140COMNTOOLS}..\IDE\devenv.exe"; +$installLocation = "${Env:VS140COMNTOOLS}..\IDE\Extensions\Microsoft"; +$extensionCacheLocation = "$home\AppData\Local\Microsoft\VisualStudio\14.0\Extensions"; +$version = "14.0"; +InstallXna $appName $pathToExe $installLocation $extensionCacheLocation $version; + +write-host "`r`n"; +write-host "Step 4/4: Cleanup" -foregroundcolor "Blue"; +write-host " Deleting extracted temporary files."; +RemoveIfExists("$currentLocation\XNA"); +RemoveIfExists("C:\XNA-temp\"); +RemoveIfExists("C:\xnags_visualstudio.msi"); + +write-host "`r`nInstallation Complete." -foregroundcolor "Yellow"; diff --git a/src/Gemini.Demo.MonoGame/Gemini.Demo.MonoGame.csproj b/src/Gemini.Demo.MonoGame/Gemini.Demo.MonoGame.csproj index c78c9b1d..c4229539 100644 --- a/src/Gemini.Demo.MonoGame/Gemini.Demo.MonoGame.csproj +++ b/src/Gemini.Demo.MonoGame/Gemini.Demo.MonoGame.csproj @@ -89,8 +89,9 @@ ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\..\lib\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll diff --git a/src/Gemini.Demo.MonoGame/packages.config b/src/Gemini.Demo.MonoGame/packages.config index b7c12768..3f977d13 100644 --- a/src/Gemini.Demo.MonoGame/packages.config +++ b/src/Gemini.Demo.MonoGame/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/src/Gemini.Demo.SharpDX/Gemini.Demo.SharpDX.csproj b/src/Gemini.Demo.SharpDX/Gemini.Demo.SharpDX.csproj index b8eb8081..0edbc055 100644 --- a/src/Gemini.Demo.SharpDX/Gemini.Demo.SharpDX.csproj +++ b/src/Gemini.Demo.SharpDX/Gemini.Demo.SharpDX.csproj @@ -103,8 +103,9 @@ ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\..\lib\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll diff --git a/src/Gemini.Demo.SharpDX/packages.config b/src/Gemini.Demo.SharpDX/packages.config index 33f88dac..81bd4cab 100644 --- a/src/Gemini.Demo.SharpDX/packages.config +++ b/src/Gemini.Demo.SharpDX/packages.config @@ -10,4 +10,5 @@ + \ No newline at end of file diff --git a/src/Gemini.Demo.Xna/Gemini.Demo.Xna.csproj b/src/Gemini.Demo.Xna/Gemini.Demo.Xna.csproj index 348f60dd..45f2cb47 100644 --- a/src/Gemini.Demo.Xna/Gemini.Demo.Xna.csproj +++ b/src/Gemini.Demo.Xna/Gemini.Demo.Xna.csproj @@ -87,8 +87,9 @@ ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\..\lib\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll diff --git a/src/Gemini.Demo.Xna/packages.config b/src/Gemini.Demo.Xna/packages.config index c94d17bc..562b6fa1 100644 --- a/src/Gemini.Demo.Xna/packages.config +++ b/src/Gemini.Demo.Xna/packages.config @@ -5,4 +5,5 @@ + \ No newline at end of file diff --git a/src/Gemini.Demo/Gemini.Demo.csproj b/src/Gemini.Demo/Gemini.Demo.csproj index 41cbd2ef..a69fa219 100644 --- a/src/Gemini.Demo/Gemini.Demo.csproj +++ b/src/Gemini.Demo/Gemini.Demo.csproj @@ -122,8 +122,9 @@ ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\..\lib\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll @@ -227,10 +228,12 @@ ResXFileCodeGenerator Resources.de.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs + diff --git a/src/Gemini.Demo/Modules/TextEditor/EditorProvider.cs b/src/Gemini.Demo/Modules/TextEditor/EditorProvider.cs index 0f715e83..ebc08b54 100644 --- a/src/Gemini.Demo/Modules/TextEditor/EditorProvider.cs +++ b/src/Gemini.Demo/Modules/TextEditor/EditorProvider.cs @@ -5,6 +5,7 @@ using Gemini.Demo.Modules.TextEditor.ViewModels; using Gemini.Framework; using Gemini.Framework.Services; +using Gemini.Demo.Properties; namespace Gemini.Demo.Modules.TextEditor { @@ -19,7 +20,7 @@ public class EditorProvider : IEditorProvider public IEnumerable FileTypes { - get { yield return new EditorFileType("Text File", ".txt"); } + get { yield return new EditorFileType(Resources.EditorProviderTextFile, ".txt"); } } public bool Handles(string path) diff --git a/src/Gemini.Demo/Properties/Resources.Designer.cs b/src/Gemini.Demo/Properties/Resources.Designer.cs index acb5ca72..d7ae16f4 100644 --- a/src/Gemini.Demo/Properties/Resources.Designer.cs +++ b/src/Gemini.Demo/Properties/Resources.Designer.cs @@ -60,6 +60,15 @@ internal Resources() { } } + /// + /// Looks up a localized string similar to Text File. + /// + internal static string EditorProviderTextFile { + get { + return ResourceManager.GetString("EditorProviderTextFile", resourceCulture); + } + } + /// /// Looks up a localized string similar to General. /// diff --git a/src/Gemini.Demo/Properties/Resources.de.resx b/src/Gemini.Demo/Properties/Resources.de.resx index 412a367d..6fe23ed4 100644 --- a/src/Gemini.Demo/Properties/Resources.de.resx +++ b/src/Gemini.Demo/Properties/Resources.de.resx @@ -123,4 +123,7 @@ Umgebung + + Textdatei + \ No newline at end of file diff --git a/src/Gemini.Demo/Properties/Resources.ko.resx b/src/Gemini.Demo/Properties/Resources.ko.resx new file mode 100644 index 00000000..10a50710 --- /dev/null +++ b/src/Gemini.Demo/Properties/Resources.ko.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 일반 + + + 환경 + + + 텍스트 파일 + + \ No newline at end of file diff --git a/src/Gemini.Demo/Properties/Resources.resx b/src/Gemini.Demo/Properties/Resources.resx index e455a5b3..83b5fe09 100644 --- a/src/Gemini.Demo/Properties/Resources.resx +++ b/src/Gemini.Demo/Properties/Resources.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Text File + General diff --git a/src/Gemini.Demo/Properties/Resources.ru.resx b/src/Gemini.Demo/Properties/Resources.ru.resx new file mode 100644 index 00000000..4bbd2c4d --- /dev/null +++ b/src/Gemini.Demo/Properties/Resources.ru.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Общие + + + Окружение + + + Текстовый файл + + \ No newline at end of file diff --git a/src/Gemini.Demo/packages.config b/src/Gemini.Demo/packages.config index 0c82cfdd..3759b0ee 100644 --- a/src/Gemini.Demo/packages.config +++ b/src/Gemini.Demo/packages.config @@ -13,4 +13,5 @@ + \ No newline at end of file diff --git a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj index bc57261c..7371d7cf 100644 --- a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj +++ b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj @@ -89,10 +89,12 @@ + ResXFileCodeGenerator Resources.Designer.cs + diff --git a/src/Gemini.Modules.CodeEditor/Properties/Resources.ko.resx b/src/Gemini.Modules.CodeEditor/Properties/Resources.ko.resx new file mode 100644 index 00000000..1d4455e0 --- /dev/null +++ b/src/Gemini.Modules.CodeEditor/Properties/Resources.ko.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 파일 + + \ No newline at end of file diff --git a/src/Gemini.Modules.CodeEditor/Properties/Resources.ru.resx b/src/Gemini.Modules.CodeEditor/Properties/Resources.ru.resx new file mode 100644 index 00000000..0ad30ed0 --- /dev/null +++ b/src/Gemini.Modules.CodeEditor/Properties/Resources.ru.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Файл + + \ No newline at end of file diff --git a/src/Gemini.Modules.CodeEditor/Properties/Resources.zh-Hans.resx b/src/Gemini.Modules.CodeEditor/Properties/Resources.zh-Hans.resx index 922f2331..76b513f7 100644 --- a/src/Gemini.Modules.CodeEditor/Properties/Resources.zh-Hans.resx +++ b/src/Gemini.Modules.CodeEditor/Properties/Resources.zh-Hans.resx @@ -118,6 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 文件 + 文件 \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj index bd0a875d..cb0d243c 100644 --- a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj +++ b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj @@ -45,6 +45,9 @@ ..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll True + + ..\packages\Gu.Wpf.Localization.6.1.0.0\lib\net45\Gu.Wpf.Localization.dll + @@ -93,10 +96,14 @@ ErrorListView.xaml + + ResXFileCodeGenerator Resources.Designer.cs + + Designer diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs b/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs index 063a5355..a6e7a6c0 100644 --- a/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Gemini.Modules.ErrorList.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // 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. + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,43 @@ internal Resources() { } /// - /// Looks up a localized string similar to {0} Errors. + /// Ищет локализованную строку, похожую на Column. + /// + internal static string ErrorListHeaderColumn { + get { + return ResourceManager.GetString("ErrorListHeaderColumn", resourceCulture); + } + } + + /// + /// Ищет локализованную строку, похожую на Description. + /// + internal static string ErrorListHeaderDescription { + get { + return ResourceManager.GetString("ErrorListHeaderDescription", resourceCulture); + } + } + + /// + /// Ищет локализованную строку, похожую на File. + /// + internal static string ErrorListHeaderFile { + get { + return ResourceManager.GetString("ErrorListHeaderFile", resourceCulture); + } + } + + /// + /// Ищет локализованную строку, похожую на Line. + /// + internal static string ErrorListHeaderLine { + get { + return ResourceManager.GetString("ErrorListHeaderLine", resourceCulture); + } + } + + /// + /// Ищет локализованную строку, похожую на {0} Errors. /// internal static string ErrorTextPlural { get { @@ -70,7 +106,7 @@ internal static string ErrorTextPlural { } /// - /// Looks up a localized string similar to {0} Error. + /// Ищет локализованную строку, похожую на {0} Error. /// internal static string ErrorTextSingular { get { @@ -79,7 +115,7 @@ internal static string ErrorTextSingular { } /// - /// Looks up a localized string similar to {0} Messages. + /// Ищет локализованную строку, похожую на {0} Messages. /// internal static string MessageTextPlural { get { @@ -88,7 +124,7 @@ internal static string MessageTextPlural { } /// - /// Looks up a localized string similar to {0} Message. + /// Ищет локализованную строку, похожую на {0} Message. /// internal static string MessageTextSingular { get { @@ -97,7 +133,7 @@ internal static string MessageTextSingular { } /// - /// Looks up a localized string similar to Error L_ist. + /// Ищет локализованную строку, похожую на Error L_ist. /// internal static string ViewErrorListCommandText { get { @@ -106,7 +142,7 @@ internal static string ViewErrorListCommandText { } /// - /// Looks up a localized string similar to Error List. + /// Ищет локализованную строку, похожую на Error List. /// internal static string ViewErrorListCommandToolTip { get { @@ -115,7 +151,7 @@ internal static string ViewErrorListCommandToolTip { } /// - /// Looks up a localized string similar to {0} Warnings. + /// Ищет локализованную строку, похожую на {0} Warnings. /// internal static string WarningTextPlural { get { @@ -124,7 +160,7 @@ internal static string WarningTextPlural { } /// - /// Looks up a localized string similar to {0} Warning. + /// Ищет локализованную строку, похожую на {0} Warning. /// internal static string WarningTextSingular { get { diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.de.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.de.resx new file mode 100644 index 00000000..d58980a3 --- /dev/null +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.de.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.ko.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.ko.resx new file mode 100644 index 00000000..9eee667d --- /dev/null +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.ko.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 오류 목록(_i) + + + 오류 목록 + + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.resx index 8d9eac1a..ef0fec9e 100644 --- a/src/Gemini.Modules.ErrorList/Properties/Resources.resx +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.resx @@ -141,4 +141,16 @@ {0} Warning + + Line + + + Column + + + File + + + Description + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.ru.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.ru.resx new file mode 100644 index 00000000..b65c15a3 --- /dev/null +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.ru.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + {0} Ошибок + + + {0} Ошибка + + + {0} Сообщений + + + {0} Сообщение + + + Список о_шибок + + + Список ошибок + + + {0} Предупреждений + + + {0} Предупреждение + + + Строка + + + Столбец + + + Файл + + + Описание + + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.zh-Hans.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.zh-Hans.resx new file mode 100644 index 00000000..d58980a3 --- /dev/null +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.zh-Hans.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Views/ErrorListView.xaml b/src/Gemini.Modules.ErrorList/Views/ErrorListView.xaml index db9fd119..170297e7 100644 --- a/src/Gemini.Modules.ErrorList/Views/ErrorListView.xaml +++ b/src/Gemini.Modules.ErrorList/Views/ErrorListView.xaml @@ -4,6 +4,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:dd="clr-namespace:Gemini.Modules.ErrorList.Design" xmlns:converters="clr-namespace:Gemini.Modules.ErrorList.Converters" + xmlns:p="clr-namespace:Gemini.Modules.ErrorList.Properties" + xmlns:l="http://gu.se/Localization" x:Class="Gemini.Modules.ErrorList.Views.ErrorListView" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="800" @@ -29,10 +31,10 @@ - - - - + + + + diff --git a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj index 0f3e48b7..9343b96f 100644 --- a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj +++ b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj @@ -236,10 +236,12 @@ PublicResXFileCodeGenerator Resources.de.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs + diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.ko.resx b/src/Gemini.Modules.Inspector/Properties/Resources.ko.resx new file mode 100644 index 00000000..d56d3c49 --- /dev/null +++ b/src/Gemini.Modules.Inspector/Properties/Resources.ko.resx @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 검사기 + + + 재설정 + + + 검사기 + + + 검사기 + + + 모두 재설정 + + + ⟲ + + + 표준 색상 + + + 표준 + + + 최근에 사용한 색상 + + + 사용가능한 색상 + + + 고급 + + \ No newline at end of file diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.resx b/src/Gemini.Modules.Inspector/Properties/Resources.resx index eccab99b..d3bb2853 100644 --- a/src/Gemini.Modules.Inspector/Properties/Resources.resx +++ b/src/Gemini.Modules.Inspector/Properties/Resources.resx @@ -140,7 +140,7 @@ ⟲ - + @Invariant Standard Colors diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.ru.resx b/src/Gemini.Modules.Inspector/Properties/Resources.ru.resx new file mode 100644 index 00000000..134955f9 --- /dev/null +++ b/src/Gemini.Modules.Inspector/Properties/Resources.ru.resx @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Изменение {0} от {1} до {2} + + + Разное + + + Инспектор + + + Сбросить + + + _Инспектор + + + Инспектор + + + Сбросить все ⟲ + + + ⟲ + + + Стандартные цвета + + + Стандарт + + + Недавно использованные цвета + + + Доступные цвета + + + Продвинутый + + + Сброс {0} от {1} до {2} + + \ No newline at end of file diff --git a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj index 43654911..863c9795 100644 --- a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj +++ b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj @@ -103,10 +103,12 @@ ResXFileCodeGenerator Resources.de.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs + diff --git a/src/Gemini.Modules.Output/Properties/Resources.ko.resx b/src/Gemini.Modules.Output/Properties/Resources.ko.resx new file mode 100644 index 00000000..ad435199 --- /dev/null +++ b/src/Gemini.Modules.Output/Properties/Resources.ko.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 출력 + + + 출력(_O) + + + 출력 + + \ No newline at end of file diff --git a/src/Gemini.Modules.Output/Properties/Resources.ru.resx b/src/Gemini.Modules.Output/Properties/Resources.ru.resx new file mode 100644 index 00000000..373b8eb0 --- /dev/null +++ b/src/Gemini.Modules.Output/Properties/Resources.ru.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Вывод + + + _Вывод + + + Вывод + + \ No newline at end of file diff --git a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj index 2ec6cbad..eade9943 100644 --- a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj +++ b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj @@ -120,11 +120,13 @@ + ResXFileCodeGenerator Resources.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 속성 창 + + + 속성 창 + + \ No newline at end of file diff --git a/src/Gemini.Modules.PropertyGrid/Properties/Resources.ru.resx b/src/Gemini.Modules.PropertyGrid/Properties/Resources.ru.resx new file mode 100644 index 00000000..458fa5d6 --- /dev/null +++ b/src/Gemini.Modules.PropertyGrid/Properties/Resources.ru.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Окно с_войств + + + Окно свойств + + + Свойства + + \ No newline at end of file diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj index 57c178c5..690e1812 100644 --- a/src/Gemini/Gemini.csproj +++ b/src/Gemini/Gemini.csproj @@ -84,8 +84,9 @@ ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\..\lib\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll @@ -186,6 +187,7 @@ SettingsView.xaml + @@ -198,6 +200,7 @@ + @@ -442,11 +445,13 @@ Resources.de.Designer.cs Designer + ResXFileCodeGenerator Resources.Designer.cs Designer + @@ -455,6 +460,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 편집 + + + 다시 실행(_R) + + + 다시 실행 + + + 실행 취소(_U) + + + 실행 취소 + + + 닫기(_C) + + + 닫기 + + + 끝내기(_X) + + + 끝내기 + + + 파일(_F) + + + 새로 만들기(_N) + + + 문서 {0} + + + 열기(_O) + + + 열기 + + + 최근에 사용한 파일 + + + 최근에 사용한 파일 + + + 다른 이름으로 저장(_A) + + + 다른 이름으로 저장 + + + 저장(_S) + + + 저장 + + + 도움말(_H) + + + 기록 + + + 초기 상태 + + + 메뉴 자동 감추기 + + + 색 테마: + + + [기본 제목] + + + 옵션 + + + 일반 + + + 환경 + + + 표준 + + + 카데고리 + + + 도구 상자 + + + 도구(_T) + + + 옵션(_O) + + + 옵션 + + + 기록(_H) + + + 기록 + + + 보기(_V) + + + 도구 상자(_X) + + + 도구 상자 + + + 창(_W) + + + 언어: + + + 다시 시작해야 적용됩니다 + + + 시스템 + + + 블루 + + + 광원 + + + 어둡게 + + + 모두 저장 + + + 모두 저장 + + + 새로 만들기 + + + 변경 내용을 "{1}" {0}에 저장하시겠습니까? + + + 모든 파일 + + + 지원되는 모든 파일 + + + 전체화면 + + + 전체화면 + + \ No newline at end of file diff --git a/src/Gemini/Properties/Resources.resx b/src/Gemini/Properties/Resources.resx index 08f0b4a8..684906c0 100644 --- a/src/Gemini/Properties/Resources.resx +++ b/src/Gemini/Properties/Resources.resx @@ -258,4 +258,37 @@ Save changes to the {0} "{1}" before closing? + + Recent Files + + + Recent Files + + + Save All + + + Save All + + + Failed to set value: {0} + + + All Supported Files + + + All Files + + + New + + + Save changes to the {0} "{1}" before closing? + + + Full Screen + + + Full Screen + \ No newline at end of file diff --git a/src/Gemini/Properties/Resources.ru.resx b/src/Gemini/Properties/Resources.ru.resx new file mode 100644 index 00000000..6f84e292 --- /dev/null +++ b/src/Gemini/Properties/Resources.ru.resx @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + _Правка + + + _Вернуть + + + Вернуть + + + _Отменить + + + Отменить + + + _Закрыть + + + Закрыть + + + Вы_ход + + + Выход + + + _Файл + + + _Новый + + + Без названия {0} + + + _Открыть + + + Открыть + + + Сохранить _как... + + + Сохранить как + + + _Сохранить + + + Сохранить + + + С_правка + + + История + + + Исходное состояние + + + Автоматически скрывать главное меню + + + Цветовая тема: + + + [Заголовок по умолчанию] + + + Настройки + + + Общие + + + Окружение + + + Стандарт + + + Категория + + + Панель инструментов + + + Се_рвис + + + _Настройки + + + Настройки + + + _История + + + История + + + _Вид + + + Панель инструментов + + + Панель инструментов + + + _Окно + + + Язык (Language): + + + Требуется перезагрузка + + + Системный + + + Синяя + + + Светлая + + + Тёмная + + + Во весь экран + + + Во весь экран + + + Последние файлы + + + Последние файлы + + + Сохранить все + + + Сохранить все + + + Не удалось задать значение: {0} + + + Все поддерживаемые файлы + + + Все файлы + + + Сохранить изменения в {0} "{1}" перед закрытием? + + + Новый + + \ No newline at end of file diff --git a/src/Gemini/Properties/Resources.zh-Hans.resx b/src/Gemini/Properties/Resources.zh-Hans.resx index 656f1b7b..0f874dc7 100644 --- a/src/Gemini/Properties/Resources.zh-Hans.resx +++ b/src/Gemini/Properties/Resources.zh-Hans.resx @@ -252,4 +252,25 @@ 暗色 + + 最近打开的文件 + + + 最近打开的文件 + + + 保存全部 + + + 保存全部 + + + 设置的数值失败：{0} + + + 全屏 + + + 全屏 + \ No newline at end of file diff --git a/src/Gemini/Resources/Icons/FullScreen.png b/src/Gemini/Resources/Icons/FullScreen.png new file mode 100644 index 00000000..861e57b6 Binary files /dev/null and b/src/Gemini/Resources/Icons/FullScreen.png differ diff --git a/src/Gemini/packages.config b/src/Gemini/packages.config index 79c484b8..91ca78ce 100644 --- a/src/Gemini/packages.config +++ b/src/Gemini/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file