diff --git a/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx b/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx
deleted file mode 100644
index 97faae3..0000000
Binary files a/Remontor/.vs/Remontor/FileContentIndex/3a145c8a-af63-4d54-b335-fabb896da18f.vsidx and /dev/null differ
diff --git a/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx b/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx
deleted file mode 100644
index 8b96928..0000000
Binary files a/Remontor/.vs/Remontor/FileContentIndex/a2d1a40b-2304-4881-af9d-8e51cda2b388.vsidx and /dev/null differ
diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo
index db3660d..de6a512 100644
Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ
diff --git a/Remontor/Connector/Connect.cs b/Remontor/Connector/Connect.cs
index 7c4718b..6c4a81a 100644
--- a/Remontor/Connector/Connect.cs
+++ b/Remontor/Connector/Connect.cs
@@ -48,6 +48,7 @@ namespace Remontor.Connector
{
Comp = comp;
+
}
public Connect(IComp comp, string login)
@@ -121,11 +122,11 @@ namespace Remontor.Connector
}
public string toString()
{
- if (Login == "")
+ if (Comp.GetName() == null)
{
return Comp.GetNetNameStr();
}
- return Login + "(" + Comp.GetNetNameStr() + ")";
+ return Comp.GetName() + "(" + Comp.GetNetNameStr() + ")";
}
public void Delete()
diff --git a/Remontor/FlowContainerWords.Designer.cs b/Remontor/FlowContainerWords.Designer.cs
index 70da679..17e70fb 100644
--- a/Remontor/FlowContainerWords.Designer.cs
+++ b/Remontor/FlowContainerWords.Designer.cs
@@ -79,6 +79,7 @@
this.WordsTree.TabIndex = 4;
this.WordsTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.TreeView_NodeMouseClick);
this.WordsTree.MouseClick += new System.Windows.Forms.MouseEventHandler(this.WordsTree_MouseClick);
+ this.WordsTree.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WordsTree_MouseDoubleClick);
this.WordsTree.MouseDown += new System.Windows.Forms.MouseEventHandler(this.WordsTree_MouseClick);
//
// imageList1
diff --git a/Remontor/FlowContainerWords.cs b/Remontor/FlowContainerWords.cs
index a6acd5c..8608720 100644
--- a/Remontor/FlowContainerWords.cs
+++ b/Remontor/FlowContainerWords.cs
@@ -1,4 +1,5 @@
-using Remontor.History;
+using Remontor.Connector;
+using Remontor.History;
using Remontor.Setting;
using Remontor.Words;
using System;
@@ -18,6 +19,8 @@ namespace Remontor
{
private bool Showed = true;
private Size NormalSize;
+ private TreeNode SelectedNode;
+ private bool tapNode;
public FlowContainerWords()
{
InitializeComponent();
@@ -25,7 +28,7 @@ namespace Remontor
- WordsList.MainCategory = SGlobalSetting.LoadWords();
+ //WordsList.MainCategory = SGlobalSetting.LoadWords();
WordsTree.Nodes.AddRange(WordsList.ListNodes());
SGlobalSetting.settingExpand.ExpendAll(WordsTree.Nodes);
@@ -77,6 +80,7 @@ namespace Remontor
if (BoundsNode.Contains(e.Location) && e.Node.Tag is WordsComp)
{
tree.SelectedNode = e.Node;
+ //System.Console.WriteLine("click") ;
// cm_words.Show(tree.PointToScreen(e.Location));
}
else
@@ -84,10 +88,39 @@ namespace Remontor
tree.SelectedNode = null;
}
+ }
+ if (e.Button == MouseButtons.Left)
+ {
+ if (BoundsNode.Contains(e.Location) && e.Node.Tag is WordsComp)
+ {
+ tapNode = true;
+ if (e.Node.IsSelected)
+ {
+ //SConnector.NewConnect(((WordsComp)e.Node.Tag).GetComp());
+ //tree.SelectedNode = null;
+
+ }
+ else
+ {
+ // System.Console.WriteLine("click1");
+ SelectedNode = e.Node;
+ // tree.SelectedNode = e.Node;
+
+
+ }
+
+
+ // cm_words.Show(tree.PointToScreen(e.Location));
+ }
+ else
+ {
+ tree.SelectedNode = null;
+ }
+
}
//tree.BeginUpdate();
-
- // for (int i = 0; i < tree.Nodes.Count; i++)
+
+ // for (int i = 0; i < tree.Nodes.Count; i++)
// {
// treeView1_treeViewChangeRootCheckBox(tree.Nodes[i]);
// }
@@ -97,9 +130,25 @@ namespace Remontor
private void WordsTree_MouseClick(object sender, MouseEventArgs e)
{
- System.Windows.Forms.TreeView tree = (System.Windows.Forms.TreeView)sender;
- tree.SelectedNode = null;
+ if (tapNode)
+ {
+ tapNode = false;
+ }
+ else
+ {
+ System.Windows.Forms.TreeView tree = (System.Windows.Forms.TreeView)sender;
+ tree.SelectedNode = null;
+ }
+
+
}
+ private void WordsTree_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ //System.Console.WriteLine("double");
+ if(SelectedNode != null) SConnector.NewConnect(((WordsComp)SelectedNode.Tag).GetComp());
+
+ SelectedNode = null;
+ }
}
}
diff --git a/Remontor/FlowContainerWords.resx b/Remontor/FlowContainerWords.resx
index 1397ad9..59cecab 100644
--- a/Remontor/FlowContainerWords.resx
+++ b/Remontor/FlowContainerWords.resx
@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
- UQAAAk1TRnQBSQFMAgEBCQEAAbABBwGwAQcBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
+ UQAAAk1TRnQBSQFMAgEBCQEAAbgBBwG4AQcBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
AwABSAMAAQEBAAEQBgABNhIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/kAAB/wF/
Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
diff --git a/Remontor/FlowConteinerSetting.Designer.cs b/Remontor/FlowConteinerSetting.Designer.cs
index 44f37f4..3d7f800 100644
--- a/Remontor/FlowConteinerSetting.Designer.cs
+++ b/Remontor/FlowConteinerSetting.Designer.cs
@@ -29,11 +29,11 @@
private void InitializeComponent()
{
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
- this.BtSave = new System.Windows.Forms.Button();
- this.BtAbout = new System.Windows.Forms.Button();
this.settingWordsControl1 = new Remontor.Setting.SettingWordsControl();
this.settingSCCMControl1 = new Remontor.Setting.SettingSCCMControl();
this.settingAppControl1 = new Remontor.Setting.settingAppControl();
+ this.BtSave = new System.Windows.Forms.Button();
+ this.BtAbout = new System.Windows.Forms.Button();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
@@ -48,30 +48,9 @@
this.flowLayoutPanel1.Controls.Add(this.BtSave);
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
- this.flowLayoutPanel1.Size = new System.Drawing.Size(330, 592);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(330, 616);
this.flowLayoutPanel1.TabIndex = 0;
//
- // BtSave
- //
- this.BtSave.Location = new System.Drawing.Point(3, 432);
- this.BtSave.Name = "BtSave";
- this.BtSave.Size = new System.Drawing.Size(323, 28);
- this.BtSave.TabIndex = 3;
- this.BtSave.Text = "Сохранить";
- this.BtSave.UseVisualStyleBackColor = true;
- this.BtSave.Click += new System.EventHandler(this.BtSave_Click);
- //
- // BtAbout
- //
- this.BtAbout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.BtAbout.Location = new System.Drawing.Point(3, 598);
- this.BtAbout.Name = "BtAbout";
- this.BtAbout.Size = new System.Drawing.Size(324, 28);
- this.BtAbout.TabIndex = 4;
- this.BtAbout.Text = "О программе";
- this.BtAbout.UseVisualStyleBackColor = true;
- //
// settingWordsControl1
//
this.settingWordsControl1.Location = new System.Drawing.Point(3, 3);
@@ -90,9 +69,30 @@
//
this.settingAppControl1.Location = new System.Drawing.Point(3, 296);
this.settingAppControl1.Name = "settingAppControl1";
- this.settingAppControl1.Size = new System.Drawing.Size(325, 130);
+ this.settingAppControl1.Size = new System.Drawing.Size(325, 194);
this.settingAppControl1.TabIndex = 2;
//
+ // BtSave
+ //
+ this.BtSave.Location = new System.Drawing.Point(3, 496);
+ this.BtSave.Name = "BtSave";
+ this.BtSave.Size = new System.Drawing.Size(323, 28);
+ this.BtSave.TabIndex = 3;
+ this.BtSave.Text = "Сохранить";
+ this.BtSave.UseVisualStyleBackColor = true;
+ this.BtSave.Click += new System.EventHandler(this.BtSave_Click);
+ //
+ // BtAbout
+ //
+ this.BtAbout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.BtAbout.Location = new System.Drawing.Point(3, 622);
+ this.BtAbout.Name = "BtAbout";
+ this.BtAbout.Size = new System.Drawing.Size(324, 28);
+ this.BtAbout.TabIndex = 4;
+ this.BtAbout.Text = "О программе";
+ this.BtAbout.UseVisualStyleBackColor = true;
+ //
// FlowConteinerSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -100,7 +100,7 @@
this.Controls.Add(this.flowLayoutPanel1);
this.Controls.Add(this.BtAbout);
this.Name = "FlowConteinerSetting";
- this.Size = new System.Drawing.Size(330, 629);
+ this.Size = new System.Drawing.Size(330, 653);
this.flowLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false);
diff --git a/Remontor/Form1.Designer.cs b/Remontor/Form1.Designer.cs
index 3845a0c..1e312bf 100644
--- a/Remontor/Form1.Designer.cs
+++ b/Remontor/Form1.Designer.cs
@@ -30,10 +30,10 @@
{
this.panel3 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
- this.flowConteinerSetting1 = new Remontor.FlowConteinerSetting();
- this.flowContainerWords1 = new Remontor.FlowContainerWords();
- this.flowContainer1 = new Remontor.FlowContainer();
this.barSessionControl1 = new Remontor.BarSessionControl();
+ this.flowContainer1 = new Remontor.FlowContainer();
+ this.flowContainerWords1 = new Remontor.FlowContainerWords();
+ this.flowConteinerSetting1 = new Remontor.FlowConteinerSetting();
this.panel3.SuspendLayout();
this.SuspendLayout();
//
@@ -58,16 +58,28 @@
this.label1.TabIndex = 0;
this.label1.Text = "Нету активныйх соединений";
//
- // flowConteinerSetting1
+ // barSessionControl1
//
- this.flowConteinerSetting1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ this.barSessionControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.flowConteinerSetting1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.flowConteinerSetting1.Location = new System.Drawing.Point(764, 40);
- this.flowConteinerSetting1.Name = "flowConteinerSetting1";
- this.flowConteinerSetting1.Size = new System.Drawing.Size(330, 678);
- this.flowConteinerSetting1.TabIndex = 1;
- this.flowConteinerSetting1.Visible = false;
+ this.barSessionControl1.Location = new System.Drawing.Point(0, 0);
+ this.barSessionControl1.Name = "barSessionControl1";
+ this.barSessionControl1.Size = new System.Drawing.Size(1094, 40);
+ this.barSessionControl1.TabIndex = 1;
+ this.barSessionControl1.Load += new System.EventHandler(this.barSessionControl1_Load);
+ //
+ // flowContainer1
+ //
+ this.flowContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.flowContainer1.BackColor = System.Drawing.Color.Transparent;
+ this.flowContainer1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.flowContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.flowContainer1.Location = new System.Drawing.Point(764, 40);
+ this.flowContainer1.Name = "flowContainer1";
+ this.flowContainer1.Size = new System.Drawing.Size(333, 678);
+ this.flowContainer1.TabIndex = 1;
+ this.flowContainer1.Visible = false;
//
// flowContainerWords1
//
@@ -83,28 +95,16 @@
this.flowContainerWords1.TabIndex = 1;
this.flowContainerWords1.Visible = false;
//
- // flowContainer1
+ // flowConteinerSetting1
//
- this.flowContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ this.flowConteinerSetting1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
- this.flowContainer1.BackColor = System.Drawing.Color.Transparent;
- this.flowContainer1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.flowContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.flowContainer1.Location = new System.Drawing.Point(764, 40);
- this.flowContainer1.Name = "flowContainer1";
- this.flowContainer1.Size = new System.Drawing.Size(333, 678);
- this.flowContainer1.TabIndex = 1;
- this.flowContainer1.Visible = false;
- //
- // barSessionControl1
- //
- this.barSessionControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.barSessionControl1.Location = new System.Drawing.Point(0, 0);
- this.barSessionControl1.Name = "barSessionControl1";
- this.barSessionControl1.Size = new System.Drawing.Size(1094, 40);
- this.barSessionControl1.TabIndex = 1;
- this.barSessionControl1.Load += new System.EventHandler(this.barSessionControl1_Load);
+ this.flowConteinerSetting1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.flowConteinerSetting1.Location = new System.Drawing.Point(764, 40);
+ this.flowConteinerSetting1.Name = "flowConteinerSetting1";
+ this.flowConteinerSetting1.Size = new System.Drawing.Size(330, 678);
+ this.flowConteinerSetting1.TabIndex = 1;
+ this.flowConteinerSetting1.Visible = false;
//
// Form1
//
diff --git a/Remontor/Form1.cs b/Remontor/Form1.cs
index a898603..3d3de25 100644
--- a/Remontor/Form1.cs
+++ b/Remontor/Form1.cs
@@ -27,7 +27,7 @@ namespace Remontor
public Form1()
{
SGlobalSetting.LoadSetting();
- //WordsList.MainCategory = SGlobalSetting.LoadWords();
+ WordsList.MainCategory = SGlobalSetting.LoadWords();
InitializeComponent();
barSessionControl1.hideTabHistory += flowContainer1.HideBar;
barSessionControl1.hideTabWords += flowContainerWords1.HideBar;
diff --git a/Remontor/Form1.resx b/Remontor/Form1.resx
index 1af7de1..8ab31dd 100644
--- a/Remontor/Form1.resx
+++ b/Remontor/Form1.resx
@@ -117,4 +117,25 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
\ No newline at end of file
diff --git a/Remontor/History/HistoryControl.Designer.cs b/Remontor/History/HistoryControl.Designer.cs
index e5f9576..ceb0bc1 100644
--- a/Remontor/History/HistoryControl.Designer.cs
+++ b/Remontor/History/HistoryControl.Designer.cs
@@ -73,10 +73,12 @@
//
// Photo
//
+ this.Photo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.Photo.Image = global::Remontor.Properties.Resources.Person;
this.Photo.Location = new System.Drawing.Point(3, 1);
this.Photo.Name = "Photo";
this.Photo.Size = new System.Drawing.Size(48, 48);
+ this.Photo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.Photo.TabIndex = 4;
this.Photo.TabStop = false;
this.Photo.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
diff --git a/Remontor/History/HistoryControl.cs b/Remontor/History/HistoryControl.cs
index e8c87e1..2581439 100644
--- a/Remontor/History/HistoryControl.cs
+++ b/Remontor/History/HistoryControl.cs
@@ -1,4 +1,6 @@
using Remontor.Connector;
+using Remontor.Picter;
+using Remontor.Seacher;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -29,6 +31,8 @@ namespace Remontor.History
PCLB.Text = hitem.NameNode();
FIOLB.Text = hitem.GetComp().GetDescription();
BackCustum = this.BackColor;
+ SPicManager.PictureSet(Photo, hitem.GetComp());
+
}
private void HistoryControl_MouseEnter(object sender, EventArgs e)
diff --git a/Remontor/Picter/PicBase.cs b/Remontor/Picter/PicBase.cs
index 6fac713..6cce99a 100644
--- a/Remontor/Picter/PicBase.cs
+++ b/Remontor/Picter/PicBase.cs
@@ -41,6 +41,11 @@ namespace Remontor.Picter
}
}
+ public string LoginGet
+ {
+ get { return Login; }
+ }
+
public bool Loaded()
{
return loaded;
diff --git a/Remontor/Picter/PicBaseWords.cs b/Remontor/Picter/PicBaseWords.cs
new file mode 100644
index 0000000..70ecc0f
--- /dev/null
+++ b/Remontor/Picter/PicBaseWords.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Remontor.Picter
+{
+ internal static class PicBaseWords
+ {
+ public static Image[] CollectImgMax= new Image[9] { global::Remontor.Properties.Resources._0words,
+ global::Remontor.Properties.Resources._1words,
+ global::Remontor.Properties.Resources._2words,
+ global::Remontor.Properties.Resources._3words,
+ global::Remontor.Properties.Resources._4words,
+ global::Remontor.Properties.Resources._5words,
+ global::Remontor.Properties.Resources._6words,
+ global::Remontor.Properties.Resources._7words,
+ global::Remontor.Properties.Resources._8words,
+ };
+ public static Image GetImageMax(int index)
+ {
+ return CollectImgMax[index];
+ }
+ }
+}
diff --git a/Remontor/Picter/PicLoaderTask.cs b/Remontor/Picter/PicLoaderTask.cs
index 2b36819..485f969 100644
--- a/Remontor/Picter/PicLoaderTask.cs
+++ b/Remontor/Picter/PicLoaderTask.cs
@@ -1,4 +1,5 @@
-using System;
+using Remontor.Setting;
+using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
@@ -23,15 +24,31 @@ namespace Remontor.Picter
this.Name = name;
Client = new WebClient();
Client.DownloadDataCompleted += Client_DownloadDataCompleted;
- Uri url = new Uri("http://localhost/Photo/titov.png");
- Client.DownloadDataAsync(url);
+ Client.Credentials = new NetworkCredential();
+ Client.UseDefaultCredentials = true;
+ string urlSetting = SGlobalSetting.settingApp.urlPhoto;
+ urlSetting = urlSetting.Replace("{#Login}", name);
+ try
+ {
+ Uri url = new Uri(urlSetting);
+ Client.DownloadDataAsync(url);
+ }
+ catch
+ {
+ MessageBox.Show("Неверная строка запроса фотографии");
+ }
}
private void Client_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e)
{
+ if (e.Error == null)
+ {
+ Img = new Bitmap(new MemoryStream(e.Result));
+ ImagePanel.Image = Img;
+ SPicManager.WriteResult(new PicBase(Img,Name));
+ }
+
- Img = new Bitmap(new MemoryStream(e.Result));
- ImagePanel.Image = Img;
// throw new NotImplementedException();
}
}
diff --git a/Remontor/Picter/SPicManager.cs b/Remontor/Picter/SPicManager.cs
index 148c5cb..00a06a2 100644
--- a/Remontor/Picter/SPicManager.cs
+++ b/Remontor/Picter/SPicManager.cs
@@ -1,4 +1,5 @@
-using Remontor.Words;
+using Remontor.Pinger;
+using Remontor.Words;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,12 +17,12 @@ namespace Remontor.Picter
IComp Comp = WordsList.FindCompName(comp.GetNetName());
if(Comp != null)
{
- // image = comp.GetImage();
+ image.Image = PicBaseWords.GetImageMax(comp.GetImage());
return;
}
else
{
- comp.SetName("titov");
+
if (comp.GetName() != null)
{
@@ -37,5 +38,18 @@ namespace Remontor.Picter
}
}
}
+
+ static public void WriteResult(PicBase picBase)
+ {
+ try
+ {
+ PicList.Add(picBase.LoginGet, picBase);
+ }
+ catch
+ {
+
+ }
+
+ }
}
}
diff --git a/Remontor/Properties/Resources.Designer.cs b/Remontor/Properties/Resources.Designer.cs
index 3c6a637..7a8bae6 100644
--- a/Remontor/Properties/Resources.Designer.cs
+++ b/Remontor/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ namespace Remontor.Properties {
}
}
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _0words {
+ get {
+ object obj = ResourceManager.GetObject("0words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
///
@@ -70,6 +80,16 @@ namespace Remontor.Properties {
}
}
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _1words {
+ get {
+ object obj = ResourceManager.GetObject("1words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
///
@@ -80,6 +100,76 @@ namespace Remontor.Properties {
}
}
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _2words {
+ get {
+ object obj = ResourceManager.GetObject("2words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _3words {
+ get {
+ object obj = ResourceManager.GetObject("3words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _4words {
+ get {
+ object obj = ResourceManager.GetObject("4words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _5words {
+ get {
+ object obj = ResourceManager.GetObject("5words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _6words {
+ get {
+ object obj = ResourceManager.GetObject("6words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _7words {
+ get {
+ object obj = ResourceManager.GetObject("7words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap _8words {
+ get {
+ object obj = ResourceManager.GetObject("8words", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
///
diff --git a/Remontor/Properties/Resources.resx b/Remontor/Properties/Resources.resx
index a2d326f..ce4ca48 100644
--- a/Remontor/Properties/Resources.resx
+++ b/Remontor/Properties/Resources.resx
@@ -127,9 +127,15 @@
..\Resources\add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ping_test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\2_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\apple-touch-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -160,29 +166,26 @@
..\Resources\down_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\1_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -211,7 +214,31 @@
..\Resources\reconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ping_test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\0words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\1words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\2words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\3words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\4words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\5words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\6words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\7words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\8words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj
index 895ffe0..3a2df83 100644
--- a/Remontor/Remontor.csproj
+++ b/Remontor/Remontor.csproj
@@ -108,6 +108,7 @@
+
@@ -361,5 +362,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Remontor/Resources/0words.png b/Remontor/Resources/0words.png
new file mode 100644
index 0000000..1897e00
Binary files /dev/null and b/Remontor/Resources/0words.png differ
diff --git a/Remontor/Resources/1words.png b/Remontor/Resources/1words.png
new file mode 100644
index 0000000..5115c47
Binary files /dev/null and b/Remontor/Resources/1words.png differ
diff --git a/Remontor/Resources/2words.png b/Remontor/Resources/2words.png
new file mode 100644
index 0000000..5bff0fa
Binary files /dev/null and b/Remontor/Resources/2words.png differ
diff --git a/Remontor/Resources/3words.png b/Remontor/Resources/3words.png
new file mode 100644
index 0000000..44cc67e
Binary files /dev/null and b/Remontor/Resources/3words.png differ
diff --git a/Remontor/Resources/4words.png b/Remontor/Resources/4words.png
new file mode 100644
index 0000000..9e5b948
Binary files /dev/null and b/Remontor/Resources/4words.png differ
diff --git a/Remontor/Resources/5words.png b/Remontor/Resources/5words.png
new file mode 100644
index 0000000..715e672
Binary files /dev/null and b/Remontor/Resources/5words.png differ
diff --git a/Remontor/Resources/6words.png b/Remontor/Resources/6words.png
new file mode 100644
index 0000000..ffa9ee7
Binary files /dev/null and b/Remontor/Resources/6words.png differ
diff --git a/Remontor/Resources/7words.png b/Remontor/Resources/7words.png
new file mode 100644
index 0000000..b9e1174
Binary files /dev/null and b/Remontor/Resources/7words.png differ
diff --git a/Remontor/Resources/8words.png b/Remontor/Resources/8words.png
new file mode 100644
index 0000000..edc8fc3
Binary files /dev/null and b/Remontor/Resources/8words.png differ
diff --git a/Remontor/Seacher/HistoryResult.cs b/Remontor/Seacher/HistoryResult.cs
index ec9bc25..a962759 100644
--- a/Remontor/Seacher/HistoryResult.cs
+++ b/Remontor/Seacher/HistoryResult.cs
@@ -37,19 +37,6 @@ namespace Remontor.Seacher
return LastConnect;
}
public string toString()
- {
- return Comp.GetNetNameStr();
- }
- ///
- /// //////////////////
- ///
- ///
- public IComp Result()
- {
- return Comp;
- }
-
- public string ResultString()
{
string buf;
if (Comp.GetName() == null)
@@ -64,5 +51,18 @@ namespace Remontor.Seacher
}
return buf;
}
+ ///
+ /// //////////////////
+ ///
+ ///
+ public IComp Result()
+ {
+ return Comp;
+ }
+
+ public string ResultString()
+ {
+ return StrQuestion;
+ }
}
}
diff --git a/Remontor/Seacher/SeahcLocal.cs b/Remontor/Seacher/SeahcLocal.cs
index b08e130..264b514 100644
--- a/Remontor/Seacher/SeahcLocal.cs
+++ b/Remontor/Seacher/SeahcLocal.cs
@@ -1,5 +1,7 @@
using Remontor.History;
+using Remontor.Seacher;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -44,26 +46,41 @@ namespace Remontor.Seacher
// if (itemOk.ToUpper() == item.NameNode().ToUpper()) ++y;
// }
// if(y == 0)
- // {
- // result.Add(item.NameNode());
- // comps.Add(item.GetComp());
- // ++i;
- // enable = true;
- // if (i>6) return result;
- // }
-
- // }
-
- // }
- // if (i == 0)
- // {
- // enable = false;
- // result.Add("Ничего не найдено");
- // }
- // return result;
- //}
+ // result.Add(item.NameNode());
+// comps.Add(item.GetComp());
+// int razdelitel = item.NameNode().IndexOf('(');
+// if (razdelitel != -1)
+// {
+// int beginString = item.NameNode().ToUpper().IndexOf(seach.ToUpper());
+// if (razdelitel 6) return result;
- public List ResultSeach(string seach)
+// }
+
+// }
+// if (i == 0)
+// {
+// enable = false;
+// result.Add("Ничего не найдено");
+// }
+// return result;
+//}
+
+public List ResultSeach(string seach)
{
int i = 0;
comps.Clear();
@@ -79,10 +96,27 @@ namespace Remontor.Seacher
}
if (y == 0)
{
-
- HistoryResult itemResult = new HistoryResult(item.GetComp(), item.GetStart());
+ string bufferQuest;
+ int razdelitel = item.NameNode().IndexOf('(');
+ if (razdelitel != -1)
+ {
+ int beginString = item.NameNode().ToUpper().IndexOf(seach.ToUpper());
+ if (razdelitel < beginString)
+ {
+ bufferQuest = item.NameNode().Substring(razdelitel + 1, item.NameNode().Length - razdelitel - 2);
+ }
+ else
+ {
+ bufferQuest = item.NameNode().Substring(0, razdelitel);
+ }
+ }
+ else
+ {
+ bufferQuest = item.NameNode();
+ }
+ HistoryResult itemResult = new HistoryResult(item.GetComp(), item.GetStart().ToString(), bufferQuest);
result.Add(itemResult);
-
+
++i;
enable = true;
if (i > 20) return result;
diff --git a/Remontor/SessionItemControl.Designer.cs b/Remontor/SessionItemControl.Designer.cs
index 0c9d3c0..875c8c9 100644
--- a/Remontor/SessionItemControl.Designer.cs
+++ b/Remontor/SessionItemControl.Designer.cs
@@ -72,7 +72,7 @@
// LbNetName
//
this.LbNetName.AutoSize = true;
- this.LbNetName.Location = new System.Drawing.Point(110, 20);
+ this.LbNetName.Location = new System.Drawing.Point(101, 20);
this.LbNetName.Name = "LbNetName";
this.LbNetName.Size = new System.Drawing.Size(10, 13);
this.LbNetName.TabIndex = 4;
@@ -85,6 +85,7 @@
this.PbPerson.Location = new System.Drawing.Point(3, 3);
this.PbPerson.Name = "PbPerson";
this.PbPerson.Size = new System.Drawing.Size(48, 48);
+ this.PbPerson.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.PbPerson.TabIndex = 0;
this.PbPerson.TabStop = false;
this.PbPerson.Click += new System.EventHandler(this.SessionItemControl_Click);
@@ -110,7 +111,7 @@
// LbLogin
//
this.LbLogin.AutoSize = true;
- this.LbLogin.Location = new System.Drawing.Point(248, 20);
+ this.LbLogin.Location = new System.Drawing.Point(239, 20);
this.LbLogin.Name = "LbLogin";
this.LbLogin.Size = new System.Drawing.Size(10, 13);
this.LbLogin.TabIndex = 7;
diff --git a/Remontor/Setting/SettingApp.cs b/Remontor/Setting/SettingApp.cs
index 22e4824..3cc0023 100644
--- a/Remontor/Setting/SettingApp.cs
+++ b/Remontor/Setting/SettingApp.cs
@@ -11,10 +11,15 @@ namespace Remontor.Setting
{
public string pathApp;
public int sizeHistoryItem;
+ public string urlPhoto;
+ public int sizePhotoItem;
public SettingApp()
{
this.pathApp = "CmRcViewer.exe";
this.sizeHistoryItem = 200;
+ this.urlPhoto = "http://localhost/Photo/{#Login}.png";
+ this.sizePhotoItem = 100;
}
+
}
}
diff --git a/Remontor/Setting/SettingAppControl.Designer.cs b/Remontor/Setting/SettingAppControl.Designer.cs
index 8589f11..7f70681 100644
--- a/Remontor/Setting/SettingAppControl.Designer.cs
+++ b/Remontor/Setting/SettingAppControl.Designer.cs
@@ -29,18 +29,27 @@
private void InitializeComponent()
{
this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.nb_ItemHistorySize = new System.Windows.Forms.NumericUpDown();
this.bt_path_open = new System.Windows.Forms.Button();
this.path = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
- this.nb_ItemHistorySize = new System.Windows.Forms.NumericUpDown();
- this.label1 = new System.Windows.Forms.Label();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.TbUrl = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.NbItemSizePhoto = new System.Windows.Forms.NumericUpDown();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nb_ItemHistorySize)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbItemSizePhoto)).BeginInit();
this.SuspendLayout();
//
// groupBox3
//
+ this.groupBox3.Controls.Add(this.label3);
+ this.groupBox3.Controls.Add(this.NbItemSizePhoto);
+ this.groupBox3.Controls.Add(this.TbUrl);
+ this.groupBox3.Controls.Add(this.label2);
this.groupBox3.Controls.Add(this.label1);
this.groupBox3.Controls.Add(this.nb_ItemHistorySize);
this.groupBox3.Controls.Add(this.bt_path_open);
@@ -48,15 +57,35 @@
this.groupBox3.Controls.Add(this.label12);
this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(319, 124);
+ this.groupBox3.Size = new System.Drawing.Size(319, 187);
this.groupBox3.TabIndex = 4;
this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Параметры подключений";
+ this.groupBox3.Text = "Параметры приложения";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(7, 67);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(130, 13);
+ this.label1.TabIndex = 9;
+ this.label1.Text = "Кол-во записей истории";
+ //
+ // nb_ItemHistorySize
+ //
+ this.nb_ItemHistorySize.Location = new System.Drawing.Point(143, 65);
+ this.nb_ItemHistorySize.Maximum = new decimal(new int[] {
+ 1000,
+ 0,
+ 0,
+ 0});
+ this.nb_ItemHistorySize.Name = "nb_ItemHistorySize";
+ this.nb_ItemHistorySize.Size = new System.Drawing.Size(165, 20);
+ this.nb_ItemHistorySize.TabIndex = 8;
//
// bt_path_open
//
- this.bt_path_open.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.bt_path_open.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.bt_path_open.Location = new System.Drawing.Point(281, 36);
this.bt_path_open.Name = "bt_path_open";
this.bt_path_open.Size = new System.Drawing.Size(27, 23);
@@ -83,30 +112,48 @@
this.label12.TabIndex = 5;
this.label12.Text = "Приложение для подключения";
//
- // nb_ItemHistorySize
+ // openFileDialog1
//
- this.nb_ItemHistorySize.Location = new System.Drawing.Point(143, 65);
- this.nb_ItemHistorySize.Maximum = new decimal(new int[] {
+ this.openFileDialog1.FileName = "openFileDialog1";
+ //
+ // TbUrl
+ //
+ this.TbUrl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.TbUrl.Location = new System.Drawing.Point(10, 103);
+ this.TbUrl.Name = "TbUrl";
+ this.TbUrl.Size = new System.Drawing.Size(298, 20);
+ this.TbUrl.TabIndex = 11;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(7, 87);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(137, 13);
+ this.label2.TabIndex = 10;
+ this.label2.Text = "Адрес запроса миниатюр";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(7, 129);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(144, 13);
+ this.label3.TabIndex = 13;
+ this.label3.Text = "Кол-во миниатюр в памяти";
+ //
+ // NbItemSizePhoto
+ //
+ this.NbItemSizePhoto.Location = new System.Drawing.Point(157, 127);
+ this.NbItemSizePhoto.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
- this.nb_ItemHistorySize.Name = "nb_ItemHistorySize";
- this.nb_ItemHistorySize.Size = new System.Drawing.Size(165, 20);
- this.nb_ItemHistorySize.TabIndex = 8;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(7, 67);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(130, 13);
- this.label1.TabIndex = 9;
- this.label1.Text = "Кол-во записей истории";
- //
- // openFileDialog1
- //
- this.openFileDialog1.FileName = "openFileDialog1";
+ this.NbItemSizePhoto.Name = "NbItemSizePhoto";
+ this.NbItemSizePhoto.Size = new System.Drawing.Size(151, 20);
+ this.NbItemSizePhoto.TabIndex = 12;
//
// settingAppControl
//
@@ -114,10 +161,11 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox3);
this.Name = "settingAppControl";
- this.Size = new System.Drawing.Size(325, 130);
+ this.Size = new System.Drawing.Size(325, 193);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nb_ItemHistorySize)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbItemSizePhoto)).EndInit();
this.ResumeLayout(false);
}
@@ -131,5 +179,9 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown nb_ItemHistorySize;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.TextBox TbUrl;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.NumericUpDown NbItemSizePhoto;
}
}
diff --git a/Remontor/Setting/SettingAppControl.cs b/Remontor/Setting/SettingAppControl.cs
index e070645..9a8d9d4 100644
--- a/Remontor/Setting/SettingAppControl.cs
+++ b/Remontor/Setting/SettingAppControl.cs
@@ -26,7 +26,8 @@ namespace Remontor.Setting
{
path.Text = SGlobalSetting.settingApp.pathApp;
nb_ItemHistorySize.Value = SGlobalSetting.settingApp.sizeHistoryItem;
-
+ TbUrl.Text = SGlobalSetting.settingApp.urlPhoto;
+ NbItemSizePhoto.Value= SGlobalSetting.settingApp.sizePhotoItem;
}
}
@@ -35,13 +36,18 @@ namespace Remontor.Setting
{
SGlobalSetting.settingApp.pathApp = path.Text;
SGlobalSetting.settingApp.sizeHistoryItem = (int)nb_ItemHistorySize.Value;
+ SGlobalSetting.settingApp.urlPhoto = TbUrl.Text;
+ SGlobalSetting.settingApp.sizePhotoItem = (int)NbItemSizePhoto.Value;
}
public bool edited()
{
return (SGlobalSetting.settingApp.pathApp != path.Text ||
- SGlobalSetting.settingApp.sizeHistoryItem != (int)nb_ItemHistorySize.Value);
+ SGlobalSetting.settingApp.sizeHistoryItem != (int)nb_ItemHistorySize.Value ||
+ SGlobalSetting.settingApp.urlPhoto != TbUrl.Text ||
+ SGlobalSetting.settingApp.sizePhotoItem != (int)NbItemSizePhoto.Value
+ );
}
diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe
index 7a0a6e4..8cc8888 100644
Binary files a/Remontor/bin/Debug/Remontor.exe and b/Remontor/bin/Debug/Remontor.exe differ
diff --git a/Remontor/bin/Debug/Remontor.pdb b/Remontor/bin/Debug/Remontor.pdb
index e16bd4f..a4397af 100644
Binary files a/Remontor/bin/Debug/Remontor.pdb and b/Remontor/bin/Debug/Remontor.pdb differ
diff --git a/Remontor/bin/Debug/base.wb b/Remontor/bin/Debug/base.wb
index 5e3c01e..16b8de1 100644
Binary files a/Remontor/bin/Debug/base.wb and b/Remontor/bin/Debug/base.wb differ
diff --git a/Remontor/bin/Debug/res.dat b/Remontor/bin/Debug/res.dat
index 0aaccaf..fb2a37a 100644
Binary files a/Remontor/bin/Debug/res.dat and b/Remontor/bin/Debug/res.dat differ
diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 7a623c9..1c2a664 100644
Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 2d3f4ec..7133443 100644
Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Remontor/obj/Debug/Remontor.FlowContainerWords.resources b/Remontor/obj/Debug/Remontor.FlowContainerWords.resources
index 96d2c11..55d28b9 100644
Binary files a/Remontor/obj/Debug/Remontor.FlowContainerWords.resources and b/Remontor/obj/Debug/Remontor.FlowContainerWords.resources differ
diff --git a/Remontor/obj/Debug/Remontor.Properties.Resources.resources b/Remontor/obj/Debug/Remontor.Properties.Resources.resources
index e8907c9..5aa48fd 100644
Binary files a/Remontor/obj/Debug/Remontor.Properties.Resources.resources and b/Remontor/obj/Debug/Remontor.Properties.Resources.resources differ
diff --git a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
index badcfbe..5f7e087 100644
--- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
+++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9a443a3f00d6902d59ef00044ff4ad2031b21723
+a251207a1f709599554699a07461e3f985fbdd91
diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache
index 0624dab..9d64c1d 100644
Binary files a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache and b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache differ
diff --git a/Remontor/obj/Debug/Remontor.exe b/Remontor/obj/Debug/Remontor.exe
index 7a0a6e4..8cc8888 100644
Binary files a/Remontor/obj/Debug/Remontor.exe and b/Remontor/obj/Debug/Remontor.exe differ
diff --git a/Remontor/obj/Debug/Remontor.pdb b/Remontor/obj/Debug/Remontor.pdb
index e16bd4f..a4397af 100644
Binary files a/Remontor/obj/Debug/Remontor.pdb and b/Remontor/obj/Debug/Remontor.pdb differ
diff --git a/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index 287f66e..beb0ef9 100644
Binary files a/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ