Skip to content

Commit b7232f4

Browse files
committed
Version final update
1 parent 5ad001e commit b7232f4

27 files changed

Lines changed: 2078 additions & 2045 deletions

File tree

Samples/IconExtractor/SampleApp/Form1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Drawing;
3-
using System.Drawing.Drawing2D;
43
using System.IO;
54
using System.Windows.Forms;
6-
using TsudaKageyu;
5+
6+
using WinCopies.GUI.Drawing;
77

88
namespace SampleApp
99
{

Samples/IconExtractor/SampleApp/IconListView.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System;
22
using System.Drawing;
33
using System.Drawing.Drawing2D;
4-
using System.IO;
54
using System.Windows.Forms;
6-
using TsudaKageyu;
75

86
namespace SampleApp
97
{

Samples/IconExtractor/SampleApp/Properties/Resources.Designer.cs

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Checker" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\resources\checker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
</root>

Samples/IconLib/MultiIcon/Form1.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Text;
7-
using System.Windows.Forms;
8-
using System.Runtime.InteropServices;
9-
using System.IO;
104
using System.Drawing.Imaging;
11-
using System.Drawing.IconLib;
12-
using System.Drawing.IconLib.ColorProcessing;
5+
using System.IO;
136
using System.Linq;
7+
using System.Windows.Forms;
8+
9+
using WinCopies.GUI.Drawing;
1410

1511
namespace MultiIconTester
1612
{

Samples/WinCopies.GUI.Samples/CopyProcessTest.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<RowDefinition />
1313
</Grid.RowDefinitions>
1414
<ToolBar>
15-
<Button Click="Button_Click">+</Button>
16-
<Button Click="Button_Click_1">Clear</Button>
15+
<!--<Button Click="Button_Click">+</Button>
16+
<Button Click="Button_Click_1">Clear</Button>-->
1717
</ToolBar>
1818
<ItemsControl Grid.Row="1" ItemsSource="{Binding Items}" />
1919
</Grid>
Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Collections.ObjectModel;
4-
using System.Text;
5-
using System.Windows;
6-
using System.Windows.Controls;
7-
using System.Windows.Data;
8-
using System.Windows.Documents;
9-
using System.Windows.Input;
10-
using System.Windows.Media;
11-
using System.Windows.Media.Imaging;
12-
using System.Windows.Shapes;
13-
using WinCopies.GUI.IO;
14-
using WinCopies.GUI.IO.Process;
1+
//using System;
2+
//using System.Collections.Generic;
3+
//using System.Collections.ObjectModel;
4+
//using System.Text;
5+
//using System.Windows;
6+
//using System.Windows.Controls;
7+
//using System.Windows.Data;
8+
//using System.Windows.Documents;
9+
//using System.Windows.Input;
10+
//using System.Windows.Media;
11+
//using System.Windows.Media.Imaging;
12+
//using System.Windows.Shapes;
13+
//using WinCopies.GUI.IO;
14+
//using WinCopies.GUI.IO.Process;
1515

16-
namespace WinCopies.GUI.Samples
17-
{
18-
/// <summary>
19-
/// Interaction logic for CopyTest.xaml
20-
/// </summary>
21-
public partial class CopyTest : Window
22-
{
23-
private static readonly DependencyPropertyKey ItemsPropertyKey = DependencyProperty.RegisterReadOnly(nameof(Items), typeof(ObservableCollection<Copy>), typeof(CopyTest), new PropertyMetadata(new ObservableCollection<Copy>()));
16+
//namespace WinCopies.GUI.Samples
17+
//{
18+
// /// <summary>
19+
// /// Interaction logic for CopyTest.xaml
20+
// /// </summary>
21+
// public partial class CopyTest : Window
22+
// {
23+
// private static readonly DependencyPropertyKey ItemsPropertyKey = DependencyProperty.RegisterReadOnly(nameof(Items), typeof(ObservableCollection<Copy>), typeof(CopyTest), new PropertyMetadata(new ObservableCollection<Copy>()));
2424

25-
public static readonly DependencyProperty ItemsProperty = ItemsPropertyKey.DependencyProperty;
25+
// public static readonly DependencyProperty ItemsProperty = ItemsPropertyKey.DependencyProperty;
2626

27-
public ObservableCollection<Copy> Items => (ObservableCollection<Copy>)GetValue(ItemsProperty);
27+
// public ObservableCollection<Copy> Items => (ObservableCollection<Copy>)GetValue(ItemsProperty);
2828

29-
public CopyTest()
30-
{
31-
InitializeComponent();
29+
// public CopyTest()
30+
// {
31+
// InitializeComponent();
3232

33-
DataContext = this;
34-
}
33+
// DataContext = this;
34+
// }
3535

36-
private void Button_Click(object sender, RoutedEventArgs e)
37-
{
38-
var addNew = new AddNewCopy();
36+
// private void Button_Click(object sender, RoutedEventArgs e)
37+
// {
38+
// var addNew = new AddNewCopy();
3939

40-
if (addNew.ShowDialog() == true)
41-
{
42-
var Copy = IO.Process.Copy.From(new CopyProcessPathCollection(addNew.SourcePath), addNew.DestPath
43-
#if DEBUG
44-
, null
45-
#endif
46-
) ;
40+
// if (addNew.ShowDialog() == true)
41+
// {
42+
// var Copy = IO.Process.Copy.From(new CopyProcessPathCollection(addNew.SourcePath), addNew.DestPath
43+
//#if DEBUG
44+
//, null
45+
//#endif
46+
// ) ;
4747

48-
Copy.WorkerReportsProgress = true;
49-
Copy.WorkerSupportsCancellation = true;
48+
// Copy.WorkerReportsProgress = true;
49+
// Copy.WorkerSupportsCancellation = true;
5050

51-
Items.Add(Copy);
51+
// Items.Add(Copy);
5252

53-
Copy.RunWorkerAsync();
54-
}
55-
}
53+
// Copy.RunWorkerAsync();
54+
// }
55+
// }
5656

57-
private void Button_Click_1(object sender, RoutedEventArgs e)
58-
{
59-
ObservableCollection<Copy> items = Items;
57+
// private void Button_Click_1(object sender, RoutedEventArgs e)
58+
// {
59+
// ObservableCollection<Copy> items = Items;
6060

61-
while (items.Count > 0)
62-
{
63-
items[0].CancelAsync();
61+
// while (items.Count > 0)
62+
// {
63+
// items[0].CancelAsync();
6464

65-
items.RemoveAt(0);
66-
}
67-
}
68-
}
69-
}
65+
// items.RemoveAt(0);
66+
// }
67+
// }
68+
// }
69+
//}

0 commit comments

Comments
 (0)