diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo
index 2ea3e3a..3ca3e99 100644
Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ
diff --git a/Remontor/Words/AboutForm.Designer.cs b/Remontor/AboutForm.Designer.cs
similarity index 54%
rename from Remontor/Words/AboutForm.Designer.cs
rename to Remontor/AboutForm.Designer.cs
index 202e884..7cfa9ee 100644
--- a/Remontor/Words/AboutForm.Designer.cs
+++ b/Remontor/AboutForm.Designer.cs
@@ -28,19 +28,45 @@
///
private void InitializeComponent()
{
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 27);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(328, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Remonter программа для удобной организации работы c CSSM\r\n";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(13, 79);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(137, 13);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "Сочетания грячих клавиш";
+ //
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
this.Name = "AboutForm";
this.Text = "О программе";
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
}
}
\ No newline at end of file
diff --git a/Remontor/Words/AboutForm.cs b/Remontor/AboutForm.cs
similarity index 100%
rename from Remontor/Words/AboutForm.cs
rename to Remontor/AboutForm.cs
diff --git a/Remontor/Words/AboutForm.resx b/Remontor/AboutForm.resx
similarity index 100%
rename from Remontor/Words/AboutForm.resx
rename to Remontor/AboutForm.resx
diff --git a/Remontor/BarSessionControl.cs b/Remontor/BarSessionControl.cs
index 47b45a2..4b1ac8a 100644
--- a/Remontor/BarSessionControl.cs
+++ b/Remontor/BarSessionControl.cs
@@ -83,6 +83,7 @@ namespace Remontor
hideTabWords(barShow);
hideTabHistory(barShow);
+ if(SConnector.ActionConnect != null)SConnector.ActionConnect.Resize();
}
diff --git a/Remontor/Connector/Connect.cs b/Remontor/Connector/Connect.cs
index 38c774f..c12322a 100644
--- a/Remontor/Connector/Connect.cs
+++ b/Remontor/Connector/Connect.cs
@@ -96,15 +96,17 @@ namespace Remontor.Connector
ModeMonitor = new OneMon();
Proc = Process.Start(SGlobalSetting.settingApp.pathApp, ConnectStr);
//Proc = Process.Start(SGlobalSetting.settingApp.pathApp);
- Proc.WaitForInputIdle();
+
Proc.EnableRaisingEvents = true;
Proc.Exited += Proc_Exited;
+ PauseStart(Proc, 5000);
SetParent(Proc.MainWindowHandle, View.Handle);
SetWindowLong(Proc.MainWindowHandle, GWL_STYLE, WS_VISIBLE);
ModeMonitor.Resize(Proc, View);
- //Thread.Sleep(500);
- hwnd = GetWindowHandleByTitle("Устанавливается контакт с агентом удаленного управления на клиенте " + ConnectStr);
- // hwnd = GetWindowHandleByTitle("Contacting Remote Control Agent on client " + ConnectStr);
+
+ // hwnd = GetWindowHandleByTitle("Устанавливается контакт с агентом удаленного управления на клиенте " + ConnectStr);
+ Thread.Sleep(50);
+ hwnd = GetWindowHandleByTitle("Contacting Remote Control Agent on client " + ConnectStr);
Point CenterView = new Point(View.Bounds.Width/2, View.Bounds.Height/2);
Point CenterDraw = View.PointToScreen(CenterView);
MoveWindow(hwnd, CenterDraw.X- 325, CenterDraw.Y - 125 ,650,250,true);
@@ -120,6 +122,16 @@ namespace Remontor.Connector
}
+ private void PauseStart(Process proc, int timeOutMs)
+ {
+ int i = 0;
+ while ((proc.MainWindowHandle.ToInt64() == 0) && (i < timeOutMs))
+ {
+ Thread.Sleep(1);
+ i++;
+ }
+ }
+
private void Proc_Exited(object sender, EventArgs e)
{
diff --git a/Remontor/Connector/DobleMonFull.cs b/Remontor/Connector/DobleMonFull.cs
index ca89e7f..327889b 100644
--- a/Remontor/Connector/DobleMonFull.cs
+++ b/Remontor/Connector/DobleMonFull.cs
@@ -1,4 +1,5 @@
-using System;
+using Remontor.Setting;
+using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
@@ -32,9 +33,9 @@ namespace Remontor.Connector
Chanded = true;
SConnector.FormMain.WindowState = FormWindowState.Normal;
Chanded = false;
- SConnector.FormMain.Width = 3840;
- SConnector.FormMain.Height = 1040;
- SConnector.FormMain.Location = new System.Drawing.Point(0, 0);
+ SConnector.FormMain.Width = SGlobalSetting.settingApp.WidthDoble;
+ SConnector.FormMain.Height = SGlobalSetting.settingApp.HeightDoble;
+ SConnector.FormMain.Location = new System.Drawing.Point(SGlobalSetting.settingApp.xPosDoble, SGlobalSetting.settingApp.yPosDoble);
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9, true);
}
diff --git a/Remontor/Finder/Finder.Designer.cs b/Remontor/Finder/Finder.Designer.cs
index faea911..04d6e5e 100644
--- a/Remontor/Finder/Finder.Designer.cs
+++ b/Remontor/Finder/Finder.Designer.cs
@@ -30,10 +30,8 @@
{
this.CompNameLB = new System.Windows.Forms.TextBox();
this.SeaherPanel = new System.Windows.Forms.FlowLayoutPanel();
- this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.ConnectBtn = new System.Windows.Forms.Button();
- this.SeaherPanel.SuspendLayout();
this.SuspendLayout();
//
// CompNameLB
@@ -55,21 +53,11 @@
this.SeaherPanel.AutoScroll = true;
this.SeaherPanel.BackColor = System.Drawing.SystemColors.Window;
this.SeaherPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.SeaherPanel.Controls.Add(this.label2);
this.SeaherPanel.Location = new System.Drawing.Point(0, 39);
this.SeaherPanel.Name = "SeaherPanel";
this.SeaherPanel.Size = new System.Drawing.Size(384, 411);
this.SeaherPanel.TabIndex = 1;
//
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(3, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(88, 13);
- this.label2.TabIndex = 0;
- this.label2.Text = "Введите запрос";
- //
// label1
//
this.label1.AutoSize = true;
@@ -103,8 +91,6 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Новое подключение";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Finder_FormClosed);
- this.SeaherPanel.ResumeLayout(false);
- this.SeaherPanel.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -116,6 +102,5 @@
private System.Windows.Forms.FlowLayoutPanel SeaherPanel;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button ConnectBtn;
- private System.Windows.Forms.Label label2;
}
}
\ No newline at end of file
diff --git a/Remontor/Finder/Finder.cs b/Remontor/Finder/Finder.cs
index e85d59c..9cac1cf 100644
--- a/Remontor/Finder/Finder.cs
+++ b/Remontor/Finder/Finder.cs
@@ -22,6 +22,8 @@ namespace Remontor.Finder
{
InitializeComponent();
SConnector.FormMain.MenuStripCommand.actForm = this;
+ SessionItemControl itemControl = new SessionItemControl(new NoResult("Введите запрос"), UpdateActiv,0);
+ SeaherPanel.Controls.Add(itemControl);
}
private void ConnectBtn_Click(object sender, EventArgs e)
@@ -29,11 +31,20 @@ namespace Remontor.Finder
if(SelectedItem != null)
{
+
SConnector.NewConnect(SelectedItem.seacherResult.Result());
}
else
{
- SConnector.NewConnect(new CompId(CompNameLB.Text));
+ if (CompNameLB.Text.Length > 0)
+ {
+ SConnector.NewConnect(new CompId(CompNameLB.Text));
+ }
+ else
+ {
+ MessageBox.Show("Введите имя компьютера для подключения");
+ }
+
}
this.Close();
}
@@ -92,11 +103,12 @@ namespace Remontor.Finder
{
if (SeaherPanel.Controls[0] is SessionItemControl)
{
- if (!(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult is NoResult))
+
+ switch (e.KeyValue)
{
- switch (e.KeyValue)
- {
- case 40:
+ case 40:
+ if (!(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult is NoResult))
+ {
if (PreSelected < SeaherPanel.Controls.Count - 1)
{
SelectedItem = null;
@@ -106,8 +118,13 @@ namespace Remontor.Finder
((SessionItemControl)SeaherPanel.Controls[PreSelected]).SelectPreActiv((SessionItemControl)SeaherPanel.Controls[PreSelected]);
}
e.SuppressKeyPress = true;
- break;
- case 38:
+
+ }
+ break;
+
+ case 38:
+ if (!(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult is NoResult))
+ {
if (PreSelected > 0)
{
SelectedItem = null;
@@ -119,8 +136,11 @@ namespace Remontor.Finder
e.SuppressKeyPress = true;
//ListComp.Refresh();
- break;
- case 13:
+ }
+ break;
+ case 13:
+ if (!(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult is NoResult))
+ {
if (PreSelected > -1)
{
if ((SessionItemControl)SeaherPanel.Controls[PreSelected] == SelectedItem)
@@ -131,7 +151,7 @@ namespace Remontor.Finder
this.Close();
break;
}
- if (PreSelected >= 0)
+ else if (PreSelected >= 0)
{
if (SelectedItem != null) SelectedItem.SelectActiv(null);
SelectedItem = (SessionItemControl)SeaherPanel.Controls[PreSelected];
@@ -143,18 +163,34 @@ namespace Remontor.Finder
StopRefreshSeacher = false;
e.SuppressKeyPress = true;
+ break;
}
-
}
- break;
- }
- }
- }
+
+ }
+ if (PreSelected == -1)
+ {
+ if (CompNameLB.Text.Length > 0)
+ {
+ SConnector.NewConnect(new CompId(CompNameLB.Text));
+ this.Close();
+ }
+ else
+ {
+ MessageBox.Show("Введите имя компьютера для подключения");
+ }
+ }
+ break;
+
+
+ }
}
- private void Finder_FormClosed(object sender, FormClosedEventArgs e)
+ }
+
+ private void Finder_FormClosed(object sender, FormClosedEventArgs e)
{
SConnector.FormMain.MenuStripCommand.actForm = null;
}
diff --git a/Remontor/FlowContainerWords.cs b/Remontor/FlowContainerWords.cs
index 648d55b..d5ae943 100644
--- a/Remontor/FlowContainerWords.cs
+++ b/Remontor/FlowContainerWords.cs
@@ -25,7 +25,7 @@ namespace Remontor
{
InitializeComponent();
NormalSize = this.Size;
- this.Visible = true;
+
//WordsList.MainCategory = SGlobalSetting.LoadWords();
@@ -52,16 +52,16 @@ namespace Remontor
{
if(barShow == BarShow.ShowWords)
{
- this.Height = NormalSize.Height;
-
+ //this.Height = NormalSize.Height;
+ this.Visible = true;
}
else
{
- this.Height = 0;
- //this.Visible = false;
+ // this.Height = 0;
+ this.Visible = false;
}
- return (this.Height != 0);
+ return this.Visible;
}
diff --git a/Remontor/FlowConteinerSetting.Designer.cs b/Remontor/FlowConteinerSetting.Designer.cs
index 3d7f800..a0ae96c 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();
//
@@ -51,6 +51,28 @@
this.flowLayoutPanel1.Size = new System.Drawing.Size(330, 616);
this.flowLayoutPanel1.TabIndex = 0;
//
+ // BtSave
+ //
+ this.BtSave.Location = new System.Drawing.Point(3, 517);
+ 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;
+ this.BtAbout.Click += new System.EventHandler(this.BtAbout_Click);
+ //
// settingWordsControl1
//
this.settingWordsControl1.Location = new System.Drawing.Point(3, 3);
@@ -69,30 +91,9 @@
//
this.settingAppControl1.Location = new System.Drawing.Point(3, 296);
this.settingAppControl1.Name = "settingAppControl1";
- this.settingAppControl1.Size = new System.Drawing.Size(325, 194);
+ this.settingAppControl1.Size = new System.Drawing.Size(325, 215);
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);
diff --git a/Remontor/FlowConteinerSetting.cs b/Remontor/FlowConteinerSetting.cs
index 3197cc0..92c0686 100644
--- a/Remontor/FlowConteinerSetting.cs
+++ b/Remontor/FlowConteinerSetting.cs
@@ -83,5 +83,11 @@ namespace Remontor
UpdateTree();
}
+
+ private void BtAbout_Click(object sender, EventArgs e)
+ {
+ AboutForm aboutForm = new AboutForm();
+ aboutForm.Show();
+ }
}
}
diff --git a/Remontor/Form1.Designer.cs b/Remontor/Form1.Designer.cs
index 27962ac..8ffa86a 100644
--- a/Remontor/Form1.Designer.cs
+++ b/Remontor/Form1.Designer.cs
@@ -93,6 +93,7 @@
this.flowContainerWords1.Name = "flowContainerWords1";
this.flowContainerWords1.Size = new System.Drawing.Size(330, 678);
this.flowContainerWords1.TabIndex = 1;
+ this.flowContainerWords1.Visible = false;
//
// flowConteinerSetting1
//
diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj
index 3a8bb94..686c395 100644
--- a/Remontor/Remontor.csproj
+++ b/Remontor/Remontor.csproj
@@ -163,10 +163,10 @@
-
+
Form
-
+
AboutForm.cs
@@ -253,7 +253,7 @@
SettingWordsControl.cs
-
+
AboutForm.cs
diff --git a/Remontor/Setting/SettingApp.cs b/Remontor/Setting/SettingApp.cs
index 3cc0023..ec1b99b 100644
--- a/Remontor/Setting/SettingApp.cs
+++ b/Remontor/Setting/SettingApp.cs
@@ -13,12 +13,20 @@ namespace Remontor.Setting
public int sizeHistoryItem;
public string urlPhoto;
public int sizePhotoItem;
+ public int xPosDoble;
+ public int yPosDoble;
+ public int WidthDoble;
+ public int HeightDoble;
public SettingApp()
{
this.pathApp = "CmRcViewer.exe";
this.sizeHistoryItem = 200;
this.urlPhoto = "http://localhost/Photo/{#Login}.png";
this.sizePhotoItem = 100;
+ this.xPosDoble = 0;
+ this.yPosDoble = 0;
+ this.WidthDoble = 3840;
+ this.HeightDoble = 1040;
}
}
diff --git a/Remontor/Setting/SettingAppControl.Designer.cs b/Remontor/Setting/SettingAppControl.Designer.cs
index 7f70681..3839439 100644
--- a/Remontor/Setting/SettingAppControl.Designer.cs
+++ b/Remontor/Setting/SettingAppControl.Designer.cs
@@ -39,13 +39,35 @@
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.NbItemSizePhoto = new System.Windows.Forms.NumericUpDown();
+ this.label4 = new System.Windows.Forms.Label();
+ this.NbX = new System.Windows.Forms.NumericUpDown();
+ this.NbY = new System.Windows.Forms.NumericUpDown();
+ this.NbWidth = new System.Windows.Forms.NumericUpDown();
+ this.NbHeight = new System.Windows.Forms.NumericUpDown();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nb_ItemHistorySize)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NbItemSizePhoto)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbX)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbY)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbWidth)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbHeight)).BeginInit();
this.SuspendLayout();
//
// groupBox3
//
+ this.groupBox3.Controls.Add(this.label8);
+ this.groupBox3.Controls.Add(this.label7);
+ this.groupBox3.Controls.Add(this.label6);
+ this.groupBox3.Controls.Add(this.label5);
+ this.groupBox3.Controls.Add(this.NbHeight);
+ this.groupBox3.Controls.Add(this.NbWidth);
+ this.groupBox3.Controls.Add(this.NbY);
+ this.groupBox3.Controls.Add(this.NbX);
+ this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Controls.Add(this.NbItemSizePhoto);
this.groupBox3.Controls.Add(this.TbUrl);
@@ -57,7 +79,7 @@
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, 187);
+ this.groupBox3.Size = new System.Drawing.Size(319, 210);
this.groupBox3.TabIndex = 4;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Параметры приложения";
@@ -114,7 +136,7 @@
//
// openFileDialog1
//
- this.openFileDialog1.FileName = "openFileDialog1";
+ this.openFileDialog1.FileName = "CmRcViewer.exe";
//
// TbUrl
//
@@ -155,17 +177,115 @@
this.NbItemSizePhoto.Size = new System.Drawing.Size(151, 20);
this.NbItemSizePhoto.TabIndex = 12;
//
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(7, 158);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(198, 13);
+ this.label4.TabIndex = 14;
+ this.label4.Text = "Позиция окна при двойном мониторе";
+ //
+ // NbX
+ //
+ this.NbX.Location = new System.Drawing.Point(20, 178);
+ this.NbX.Maximum = new decimal(new int[] {
+ 9000,
+ 0,
+ 0,
+ 0});
+ this.NbX.Name = "NbX";
+ this.NbX.Size = new System.Drawing.Size(48, 20);
+ this.NbX.TabIndex = 15;
+ //
+ // NbY
+ //
+ this.NbY.Location = new System.Drawing.Point(84, 178);
+ this.NbY.Maximum = new decimal(new int[] {
+ 9000,
+ 0,
+ 0,
+ 0});
+ this.NbY.Name = "NbY";
+ this.NbY.Size = new System.Drawing.Size(48, 20);
+ this.NbY.TabIndex = 16;
+ //
+ // NbWidth
+ //
+ this.NbWidth.Location = new System.Drawing.Point(170, 178);
+ this.NbWidth.Maximum = new decimal(new int[] {
+ 9000,
+ 0,
+ 0,
+ 0});
+ this.NbWidth.Name = "NbWidth";
+ this.NbWidth.Size = new System.Drawing.Size(48, 20);
+ this.NbWidth.TabIndex = 17;
+ this.NbWidth.ValueChanged += new System.EventHandler(this.numericUpDown3_ValueChanged);
+ //
+ // NbHeight
+ //
+ this.NbHeight.Location = new System.Drawing.Point(262, 178);
+ this.NbHeight.Maximum = new decimal(new int[] {
+ 9000,
+ 0,
+ 0,
+ 0});
+ this.NbHeight.Name = "NbHeight";
+ this.NbHeight.Size = new System.Drawing.Size(48, 20);
+ this.NbHeight.TabIndex = 18;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(5, 180);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(14, 13);
+ this.label5.TabIndex = 19;
+ this.label5.Text = "X";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(69, 180);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(14, 13);
+ this.label6.TabIndex = 20;
+ this.label6.Text = "Y";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(135, 180);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(35, 13);
+ this.label7.TabIndex = 21;
+ this.label7.Text = "Width";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(223, 180);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(38, 13);
+ this.label8.TabIndex = 22;
+ this.label8.Text = "Height";
+ //
// settingAppControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox3);
this.Name = "settingAppControl";
- this.Size = new System.Drawing.Size(325, 193);
+ this.Size = new System.Drawing.Size(325, 219);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nb_ItemHistorySize)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NbItemSizePhoto)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbX)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbY)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbWidth)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.NbHeight)).EndInit();
this.ResumeLayout(false);
}
@@ -183,5 +303,14 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.NumericUpDown NbItemSizePhoto;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.NumericUpDown NbHeight;
+ private System.Windows.Forms.NumericUpDown NbWidth;
+ private System.Windows.Forms.NumericUpDown NbY;
+ private System.Windows.Forms.NumericUpDown NbX;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label8;
}
}
diff --git a/Remontor/Setting/SettingAppControl.cs b/Remontor/Setting/SettingAppControl.cs
index 9a8d9d4..3d07a17 100644
--- a/Remontor/Setting/SettingAppControl.cs
+++ b/Remontor/Setting/SettingAppControl.cs
@@ -28,6 +28,10 @@ namespace Remontor.Setting
nb_ItemHistorySize.Value = SGlobalSetting.settingApp.sizeHistoryItem;
TbUrl.Text = SGlobalSetting.settingApp.urlPhoto;
NbItemSizePhoto.Value= SGlobalSetting.settingApp.sizePhotoItem;
+ NbX.Value = SGlobalSetting.settingApp.xPosDoble;
+ NbY.Value = SGlobalSetting.settingApp.yPosDoble;
+ NbWidth.Value = SGlobalSetting.settingApp.WidthDoble;
+ NbHeight.Value = SGlobalSetting.settingApp.HeightDoble;
}
}
@@ -38,7 +42,10 @@ namespace Remontor.Setting
SGlobalSetting.settingApp.sizeHistoryItem = (int)nb_ItemHistorySize.Value;
SGlobalSetting.settingApp.urlPhoto = TbUrl.Text;
SGlobalSetting.settingApp.sizePhotoItem = (int)NbItemSizePhoto.Value;
-
+ SGlobalSetting.settingApp.xPosDoble = (int)NbX.Value;
+ SGlobalSetting.settingApp.yPosDoble = (int)NbY.Value;
+ SGlobalSetting.settingApp.WidthDoble = (int)NbWidth.Value;
+ SGlobalSetting.settingApp.HeightDoble = (int)NbHeight.Value;
}
public bool edited()
@@ -46,7 +53,11 @@ namespace Remontor.Setting
return (SGlobalSetting.settingApp.pathApp != path.Text ||
SGlobalSetting.settingApp.sizeHistoryItem != (int)nb_ItemHistorySize.Value ||
SGlobalSetting.settingApp.urlPhoto != TbUrl.Text ||
- SGlobalSetting.settingApp.sizePhotoItem != (int)NbItemSizePhoto.Value
+ SGlobalSetting.settingApp.sizePhotoItem != (int)NbItemSizePhoto.Value ||
+ SGlobalSetting.settingApp.xPosDoble != (int)NbX.Value ||
+ SGlobalSetting.settingApp.yPosDoble != (int)NbY.Value ||
+ SGlobalSetting.settingApp.WidthDoble != (int)NbWidth.Value ||
+ SGlobalSetting.settingApp.HeightDoble != (int)NbHeight.Value
);
}
@@ -61,5 +72,10 @@ namespace Remontor.Setting
}
SConnector.FormMain.ShowOn = false;
}
+
+ private void numericUpDown3_ValueChanged(object sender, EventArgs e)
+ {
+
+ }
}
}
diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe
index 75ce7e8..5b6b3f4 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 c537213..e027727 100644
Binary files a/Remontor/bin/Debug/Remontor.pdb and b/Remontor/bin/Debug/Remontor.pdb differ
diff --git a/Remontor/bin/Debug/res.dat b/Remontor/bin/Debug/res.dat
index c3af0fb..b407f1b 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 7f8c9de..798cbfc 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 674cc3d..de8a43a 100644
Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
index 1cc0505..3efefa3 100644
--- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
+++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0e56687aa700e9f91fd77cd5fb555dd338a94233
+5f8dae99d0f6b64ebd78e3e0215781eb971e64a2
diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache
index 6972694..b28703b 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 75ce7e8..5b6b3f4 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 c537213..e027727 100644
Binary files a/Remontor/obj/Debug/Remontor.pdb and b/Remontor/obj/Debug/Remontor.pdb differ