Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/overhaul'
Browse files Browse the repository at this point in the history
  • Loading branch information
carlthome committed Aug 31, 2014
2 parents a3eb1dd + 440f9d5 commit d4daf1e
Show file tree
Hide file tree
Showing 34 changed files with 2,468 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
215 changes: 215 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# 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
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# 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
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
26 changes: 26 additions & 0 deletions EyePaint.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EyePaint", "EyePaint\EyePaint.csproj", "{0A8492D9-B72D-4D5E-AF92-01119AF21737}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Debug|Any CPU.ActiveCfg = Debug|x86
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Debug|x86.ActiveCfg = Debug|x86
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Debug|x86.Build.0 = Debug|x86
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Release|Any CPU.ActiveCfg = Release|x86
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Release|x86.ActiveCfg = Release|x86
{0A8492D9-B72D-4D5E-AF92-01119AF21737}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
57 changes: 57 additions & 0 deletions EyePaint/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="EyePaint.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
</startup>
<userSettings>
<EyePaint.Properties.Settings>
<setting name="AdminEmail" serializeAs="String">
<value>[email protected]</value>
</setting>
<setting name="SmtpServer" serializeAs="String">
<value>default.default.default</value>
</setting>
<setting name="FlickrKey" serializeAs="String">
<value>a81591b96318cd9799982c11663df750</value>
</setting>
<setting name="FlickrSecret" serializeAs="String">
<value>05e84b538d7d4cf5</value>
</setting>
<setting name="Spacing" serializeAs="String">
<value>10</value>
</setting>
<setting name="Stability" serializeAs="String">
<value>10</value>
</setting>
<setting name="Blink" serializeAs="String">
<value>30</value>
</setting>
<setting name="Inertia" serializeAs="String">
<value>100</value>
</setting>
<setting name="ConnectionAttempts" serializeAs="String">
<value>10</value>
</setting>
<setting name="FlickrVerificationCode" serializeAs="String">
<value />
</setting>
<setting name="FlickrPhotoset" serializeAs="String">
<value>Måla med ögonen</value>
</setting>
<setting name="FlickrTitle" serializeAs="String">
<value>Målning med ögonen</value>
</setting>
<setting name="FlickrDescription" serializeAs="String">
<value>En målning gjord med ögonen.</value>
</setting>
<setting name="FlickrTags" serializeAs="String">
<value />
</setting>
</EyePaint.Properties.Settings>
</userSettings>
</configuration>
Loading

0 comments on commit d4daf1e

Please sign in to comment.