Skip to content

Commit

Permalink
Merge pull request #26 from jankcat/release/r2.5
Browse files Browse the repository at this point in the history
Release/r2.5
  • Loading branch information
jankcat committed Mar 24, 2015
2 parents eef6c51 + 9e0ac87 commit 9be80c5
Show file tree
Hide file tree
Showing 25 changed files with 932 additions and 118 deletions.
44 changes: 0 additions & 44 deletions Rapid Reporter/Forms/AboutDlg.xaml

This file was deleted.

40 changes: 0 additions & 40 deletions Rapid Reporter/Forms/AboutDlg.xaml.cs

This file was deleted.

112 changes: 112 additions & 0 deletions Rapid Reporter/Forms/AboutForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Rapid Reporter/Forms/AboutForm.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System;
using System.Windows.Forms;

namespace Rapid_Reporter.Forms
{
public partial class AboutForm : Form
{
public AboutForm()
{
InitializeComponent();
}

private void AboutForm_Load(object sender, EventArgs e)
{
appName.Text = Application.ProductName;
appVer.Text = Application.ProductVersion;
}

private void btnClose_Click(object sender, EventArgs e)
{
Close();
}
}
}
130 changes: 130 additions & 0 deletions Rapid Reporter/Forms/AboutForm.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="label1.Text" xml:space="preserve">
<value>This software is a fork of the application "Rapid Reporter", originally published by Shmuel Gershon at http://testing.gershon.info/reporter/, and was listed as Copyright 2010+. The original application listed in it's readme document that "The application is released in a Creative Commons license BY-NC-SA.", which can be found here: http://creativecommons.org/licenses/by-nc-sa/4.0/.

Many changes have been made, and the source code has almost completely been rewritten. Because of these changes, no warranty is given by the original author of "Rapid Reporter", and no warranty is given by the creators of this fork. The original author has not given any endorsement to this fork. The modifications and additions to this work are published under the CC BY-NC-SA license as well, found here: http://creativecommons.org/licenses/by-nc-sa/4.0/.

This fork is Copyright 2015+ Timothy Watkins.

Info, new versions and reporting bugs:
https://github.com/jankcat/rapidreporterplusplus</value>
</data>
</root>
13 changes: 11 additions & 2 deletions Rapid Reporter/Forms/SMWidget.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@
<MenuItem Name="ColorPicker" Header="Pick Color" Click="ColorPicker_OnClick">
<MenuItem.Icon>
<Image Source="paintbrush.png" Width="20" Height="20"/></MenuItem.Icon></MenuItem>
<MenuItem Name="AboutBox" Header="About..." Click="AboutBox_Click"><MenuItem.Icon><Image Source="RapidReporter.ico" Width="16" /></MenuItem.Icon></MenuItem>
<MenuItem Name="UpdateButton" Header="Check For Updates..." Click="UpdateButton_Click">
<MenuItem.Icon>
<Image Source="update.png" Width="20" Height="20" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Name="AboutBox" Header="About..." Click="AboutBox_Click">
<MenuItem.Icon>
<Image Source="help.png" Width="20" Height="20" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Window.ContextMenu>
<Grid Name="MainGrid" Background="#FF0068FF"> <!-- We want the application to shine in view, tester never has to look for it-->
Expand All @@ -28,7 +37,7 @@
<ColumnDefinition /> <!-- Note taking section -->
<ColumnDefinition Width="31" /> <!-- Close button -->
</Grid.ColumnDefinitions>
<Slider Grid.Column="0" Margin="5" Name="TransparencySlide" LargeChange="0.5" Maximum="1" Minimum="0.5" Orientation="Vertical" Value="1" TickPlacement="TopLeft" TickFrequency="0.2" ValueChanged="TransparencySlide_ValueChanged" ToolTip="Transparency" />
<Slider Grid.Column="0" Margin="5" Name="TransparencySlide" LargeChange="0.5" Maximum="1" Minimum="0.5" Orientation="Vertical" TickPlacement="TopLeft" TickFrequency="0.2" ValueChanged="TransparencySlide_ValueChanged" ToolTip="Transparency" />
<Button Grid.Column="1" Margin="0,5,0,0" Name="ScreenShot" Click="ScreenShot_Click" ToolTip="Snaps a screenshot. Shift+Click to edit and crop with Paint. Ctrl+Click to capture the full screen." VerticalAlignment="Top" IsEnabled="False" Height="22">
<Button.BitmapEffect><BevelBitmapEffect BevelWidth="0" /></Button.BitmapEffect>
<Image Name="ScreenShotIcon" Source="iconshot_dis.png" Height="16" Width="18"/>
Expand Down
Loading

0 comments on commit 9be80c5

Please sign in to comment.