github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-15 01:23:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed wrong reference to the GreenshotPlugin and changed a property name so it's forced to a default.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2228 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-10-30 18:10:41 +00:00
parent 65ad25ac57
commit 2127ce678b
9 changed files with 22 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Forms/SettingsForm.Designer.cs generated
View file

@ -1042,7 +1042,7 @@ namespace Greenshot {
this.checkbox_checkunstableupdates.LanguageKey = "expertsettings_checkunstableupdates"; this.checkbox_checkunstableupdates.LanguageKey = "expertsettings_checkunstableupdates";
this.checkbox_checkunstableupdates.Location = new System.Drawing.Point(10, 187); this.checkbox_checkunstableupdates.Location = new System.Drawing.Point(10, 187);
this.checkbox_checkunstableupdates.Name = "checkbox_checkunstableupdates"; this.checkbox_checkunstableupdates.Name = "checkbox_checkunstableupdates";
this.checkbox_checkunstableupdates.PropertyName = "CheckUnstable"; this.checkbox_checkunstableupdates.PropertyName = "CheckForUnstable";
this.checkbox_checkunstableupdates.Size = new System.Drawing.Size(394, 24); this.checkbox_checkunstableupdates.Size = new System.Drawing.Size(394, 24);
this.checkbox_checkunstableupdates.TabIndex = 29; this.checkbox_checkunstableupdates.TabIndex = 29;
this.checkbox_checkunstableupdates.UseVisualStyleBackColor = true; this.checkbox_checkunstableupdates.UseVisualStyleBackColor = true;

4
Greenshot/Helpers/UpdateHelper.cs
View file

@ -142,7 +142,7 @@ namespace Greenshot.Experimental {
// the current version is a release or release candidate AND check unstable is turned off. // the current version is a release or release candidate AND check unstable is turned off.
if (rssFile.isUnstable) { if (rssFile.isUnstable) {
// Skip if we shouldn't check unstables // Skip if we shouldn't check unstables
if ((conf.isRelease || conf.isReleaseCandidate) && !conf.CheckUnstable) { if ((conf.isRelease || conf.isReleaseCandidate) && !conf.CheckForUnstable) {
continue; continue;
} }
} }
@ -150,7 +150,7 @@ namespace Greenshot.Experimental {
// if the file is a release candidate, we will skip it when: // if the file is a release candidate, we will skip it when:
// the current version is a release AND check unstable is turned off. // the current version is a release AND check unstable is turned off.
if (rssFile.isReleaseCandidate) { if (rssFile.isReleaseCandidate) {
if (conf.isRelease && !conf.CheckUnstable) { if (conf.isRelease && !conf.CheckForUnstable) {
continue; continue;
} }
} }

2
Greenshot/releases/additional_files/readme.txt
View file

@ -4,7 +4,7 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a
CHANGE LOG: CHANGE LOG:
We changed the version to 1.0 after 5 years it should no longer have a "beta" feeling! We changed the version to 1.0 after 5 years it should no longer have a "beta" feeling!
1.0.6 build 2227 Release 1.0.6 build 2228 Release
Some features we added since 0.8: Some features we added since 0.8:
* General: Greenshot will now run in 64 bit mode, if the OS supports it. * General: Greenshot will now run in 64 bit mode, if the OS supports it.

2
GreenshotBoxPlugin/GreenshotBoxPlugin.csproj
View file

@ -59,7 +59,7 @@
<Content Include="Languages\language_Boxplugin-en-US.xml" /> <Content Include="Languages\language_Boxplugin-en-US.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Greenshot\GreenshotPlugin\GreenshotPlugin.csproj"> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project> <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name> <Name>GreenshotPlugin</Name>
</ProjectReference> </ProjectReference>

71
GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
View file

@ -13,13 +13,13 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\Greenshot\Lib\log4net.dll</HintPath> <HintPath>..\Greenshot\Lib\log4net.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
@ -31,6 +31,9 @@
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="UIAutomationClient"> <Reference Include="UIAutomationClient">
<RequiredTargetFramework>3.0</RequiredTargetFramework> <RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference> </Reference>
@ -79,72 +82,15 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon> <DependentUpon>Reference.map</DependentUpon>
</Compile> </Compile>
<None Include="Web References\confluence\RemoteAttachment1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteBlogEntry1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteBlogEntrySummary1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteClusterInformation1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteComment1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteContentPermissionSet1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteLabel1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteNodeStatus1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemotePage1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemotePageHistory1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemotePageSummary1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemotePermission1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteSearchResult1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteServerInfo1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteSpace1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteSpaceGroup1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteSpaceSummary1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteUser1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\confluence\RemoteUserInformation1.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<Resource Include="Images\Confluence.ico" /> <Resource Include="Images\Confluence.ico" />
<None Include="Languages\language_confluenceplugin-de-DE.xml"> <None Include="Languages\language_confluenceplugin-de-DE.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None> </None>
<None Include="Languages\language_confluenceplugin-en-US.xml"> <None Include="Languages\language_confluenceplugin-en-US.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None> </None>
<None Include="Languages\language_confluenceplugin-nl-NL.xml"> <None Include="Languages\language_confluenceplugin-nl-NL.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None> </None>
<None Include="Properties\AssemblyInfo.cs.template" /> <None Include="Properties\AssemblyInfo.cs.template" />
<None Include="Web References\confluence\confluenceservice-v1.wsdl" /> <None Include="Web References\confluence\confluenceservice-v1.wsdl" />
@ -188,6 +134,7 @@
<ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj"> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project> <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name> <Name>GreenshotPlugin</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

2
GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj
View file

@ -52,7 +52,7 @@
<None Include="Languages\language_dropboxplugin-en-US.xml" /> <None Include="Languages\language_dropboxplugin-en-US.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Greenshot\GreenshotPlugin\GreenshotPlugin.csproj"> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project> <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name> <Name>GreenshotPlugin</Name>
</ProjectReference> </ProjectReference>

3
GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj
View file

@ -14,6 +14,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>Always</RunPostBuildEvent> <RunPostBuildEvent>Always</RunPostBuildEvent>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
@ -55,7 +56,7 @@
<None Include="flickr.png" /> <None Include="flickr.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Greenshot\GreenshotPlugin\GreenshotPlugin.csproj"> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project> <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name> <Name>GreenshotPlugin</Name>
</ProjectReference> </ProjectReference>

4
GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj
View file

@ -15,7 +15,7 @@
<RunPostBuildEvent>Always</RunPostBuildEvent> <RunPostBuildEvent>Always</RunPostBuildEvent>
<FileUpgradeFlags /> <FileUpgradeFlags />
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Users\Melle\AppData\Roaming\ICSharpCode/SharpDevelop4\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
@ -55,7 +55,7 @@
<Content Include="Picasa.png" /> <Content Include="Picasa.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Greenshot\GreenshotPlugin\GreenshotPlugin.csproj"> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project> <Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
<Name>GreenshotPlugin</Name> <Name>GreenshotPlugin</Name>
</ProjectReference> </ProjectReference>

6
GreenshotPlugin/Core/CoreConfiguration.cs
View file

@ -176,8 +176,8 @@ namespace GreenshotPlugin.Core {
[IniProperty("MinimizeWorkingSetSize", Description="Optimize memory footprint, but with a performance penalty!", DefaultValue="False")] [IniProperty("MinimizeWorkingSetSize", Description="Optimize memory footprint, but with a performance penalty!", DefaultValue="False")]
public bool MinimizeWorkingSetSize; public bool MinimizeWorkingSetSize;
[IniProperty("CheckUnstable", Description = "Also check for unstable version updates", DefaultValue = "False")] [IniProperty("CheckForUnstable", Description = "Also check for unstable version updates", DefaultValue = "False")]
public bool CheckUnstable; public bool CheckForUnstable;
[IniProperty("ActiveTitleFixes", Description="The fixes that are active.")] [IniProperty("ActiveTitleFixes", Description="The fixes that are active.")]
public List<string> ActiveTitleFixes; public List<string> ActiveTitleFixes;
@ -294,7 +294,7 @@ namespace GreenshotPlugin.Core {
/// </summary> /// </summary>
public override void AfterLoad() { public override void AfterLoad() {
// Comment with releases // Comment with releases
// CheckUnstable = true; // CheckForUnstable = true;
if (OutputDestinations == null) { if (OutputDestinations == null) {
OutputDestinations = new List<string>(); OutputDestinations = new List<string>();