View difference between Paste ID: hM8R4fNj and Hsii1HWy

 Source: https://github.com/ispysoftware/iSpy/commit/28fcbda3b9ef345adac54fdf098e2c1e1dd5a5d3
 diff -Naur iSpy-master/MainForm.cs iSpy-master-mod/MainForm.cs
 --- iSpy-master/MainForm.cs	2015-11-02 02:03:08.000000000 -0800
 +++ iSpy-master-mod/MainForm.cs	2015-11-02 20:18:26.000000000 -0800
 @@ -256,6 +256,7 @@
          private ToolStripMenuItem _helpToolstripMenuItem;
          private Timer _houseKeepingTimer;
          private ToolStripMenuItem _iPCameraToolStripMenuItem;
 +        private ToolStripMenuItem _quickAddIpCameraToolStripMenuItem;
          private string _lastPath = Program.AppDataPath;
          private ToolStripMenuItem _listenToolStripMenuItem;
          private ToolStripMenuItem _localCameraToolStripMenuItem;
 @@ -3315,6 +3316,11 @@
              AddCamera(1);
          }
 
 +        private void QuickAddToolStripMenuItemClick(object sender, EventArgs e)
 +        {
 +            QuickAddCamera();
 +        }
 +
          private void MicrophoneToolStripMenuItemClick(object sender, EventArgs e)
          {
              AddMicrophone(0);
 @@ -4527,6 +4533,7 @@
              this._toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();
              this._localCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
              this._iPCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 +            this._quickAddIpCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
              this.iPCameraWithWizardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
              this.oNVIFCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
              this._floorPlanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 @@ -5492,6 +5499,7 @@
              this._toolStripDropDownButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
              this._localCameraToolStripMenuItem,
              this._iPCameraToolStripMenuItem,
 +            this._quickAddIpCameraToolStripMenuItem,
              this.iPCameraWithWizardToolStripMenuItem,
              this.oNVIFCameraToolStripMenuItem,
              this._floorPlanToolStripMenuItem,
 @@ -5527,6 +5535,16 @@
              this._iPCameraToolStripMenuItem.Text = "IP Camera";
              this._iPCameraToolStripMenuItem.Click += new System.EventHandler(this.IpCameraToolStripMenuItemClick);
              //
 +            // _quickAddIpCameraToolStripMenuItem
 +            //
 +            this._quickAddIpCameraToolStripMenuItem.Image = global::iSpyApplication.Properties.Resources.Computer;
 +            this._quickAddIpCameraToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0);
 +            this._quickAddIpCameraToolStripMenuItem.Name = "_quickAddIpCameraToolStripMenuItem";
 +            this._quickAddIpCameraToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
 +            this._quickAddIpCameraToolStripMenuItem.Size = new System.Drawing.Size(402, 24);
 +            this._quickAddIpCameraToolStripMenuItem.Text = "Foscam (and Knockoffs)";
 +            this._quickAddIpCameraToolStripMenuItem.Click += new System.EventHandler(this.QuickAddToolStripMenuItemClick);
 +            //
              // iPCameraWithWizardToolStripMenuItem
              //
              this.iPCameraWithWizardToolStripMenuItem.Image = global::iSpyApplication.Properties.Resources.Computer;
 diff -Naur iSpy-master/MainForm_Configuration.cs iSpy-master-mod/MainForm_Configuration.cs
 --- iSpy-master/MainForm_Configuration.cs	2015-11-02 02:03:08.000000000 -0800
 +++ iSpy-master-mod/MainForm_Configuration.cs	2015-11-02 21:21:46.000000000 -0800
 @@ -2251,6 +2251,117 @@
              LoadPreviews();
          }
 
 +        private void QuickAddCamera()
 +        {
 +            CameraWindow cw = NewCameraWindow(1);
 +
 +            string cameraIP = string.Empty;
 +            string cameraUser = string.Empty;
 +            string cameraPassword = string.Empty;
 +
 +            if (ShowInputDialog("IP", ref cameraIP) != DialogResult.OK) return;
 +            if (ShowInputDialog("Username", ref cameraUser) != DialogResult.OK) return;
 +            if (ShowInputDialog("Password", ref cameraPassword) != DialogResult.OK) return;
 +
 +            // needed for talk
 +            string rawCameraIP = cameraIP.Split(':')[0];
 +            int cameraPort = 80;
 +            if (cameraIP.Contains(":"))
 +            {
 +                int.TryParse(cameraIP.Split(':')[1], out cameraPort);
 +            }
 +
 +            // disable annoying stuff
 +            cw.Camobject.alerts.active = false;
 +            cw.Camobject.detector.recordonalert = false;
 +            cw.Camobject.detector.recordondetect = false;
 +            cw.Camobject.detector.type = "None";
 +
 +            // setup talk
 +            cw.Camobject.settings.audioport = cameraPort;
 +            cw.Camobject.settings.audiomodel = "Foscam";
 +            cw.Camobject.settings.audioip = rawCameraIP;
 +            cw.Camobject.settings.audiousername = cameraUser;
 +            cw.Camobject.settings.audiopassword = cameraPassword;
 +
 +            // setup misc cam settings
 +            cw.Camobject.settings.login = cameraUser;
 +            cw.Camobject.settings.password = cameraPassword;
 +
 +            // setup video source (VLC)
 +            cw.Camobject.settings.videosourcestring = string.Format("http://{1}:{2}@{0}/videostream.cgi?usr={1}&pwd={2}", cameraIP, cameraUser, cameraPassword);
 +            cw.Camobject.settings.sourceindex = 5;
 +
 +            TopMost = false;
 +            var ac = new AddCamera { CameraControl = cw, StartWizard = false, IsNew = true, MainClass = this };
 +            ac.ShowDialog(this);
 +            if (ac.DialogResult == DialogResult.OK)
 +            {
 +                UnlockLayout();
 +                SetNewStartPosition();
 +                if (cw.VolumeControl != null && !cw.VolumeControl.IsEnabled)
 +                    cw.VolumeControl.Enable();
 +                NeedsSync = true;
 +            }
 +            else
 +            {
 +                int cid = cw.Camobject.id;
 +                cw.Disable();
 +                _pnlCameras.Controls.Remove(cw);
 +                cw.Dispose();
 +                Cameras.RemoveAll(p => p.id == cid);
 +            }
 +            ac.Dispose();
 +            TopMost = Conf.AlwaysOnTop;
 +        }
 +
 +        // http://stackoverflow.com/a/17546909
 +        private DialogResult ShowInputDialog(string caption, ref string input)
 +        {
 +            System.Drawing.Size size = new System.Drawing.Size(200, 95);
 +            Form inputBox = new Form();
 +
 +            inputBox.StartPosition = FormStartPosition.CenterParent;
 +            inputBox.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 +            inputBox.ClientSize = size;
 +            inputBox.Text = caption;
 +
 +            System.Windows.Forms.Label label = new Label();
 +            label.Size = new System.Drawing.Size(size.Width - 10, 23);
 +            label.Location = new System.Drawing.Point(5, 5);
 +            label.Text = caption;
 +            inputBox.Controls.Add(label);
 +
 +            System.Windows.Forms.TextBox textBox = new TextBox();
 +            textBox.Size = new System.Drawing.Size(size.Width - 10, 23);
 +            textBox.Location = new System.Drawing.Point(5, 28);
 +            textBox.Text = input;
 +            inputBox.Controls.Add(textBox);
 +
 +            Button okButton = new Button();
 +            okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
 +            okButton.Name = "okButton";
 +            okButton.Size = new System.Drawing.Size(75, 23);
 +            okButton.Text = "&OK";
 +            okButton.Location = new System.Drawing.Point(size.Width - 80 - 80, 64);
 +            inputBox.Controls.Add(okButton);
 +
 +            Button cancelButton = new Button();
 +            cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
 +            cancelButton.Name = "cancelButton";
 +            cancelButton.Size = new System.Drawing.Size(75, 23);
 +            cancelButton.Text = "&Cancel";
 +            cancelButton.Location = new System.Drawing.Point(size.Width - 80, 64);
 +            inputBox.Controls.Add(cancelButton);
 +
 +            inputBox.AcceptButton = okButton;
 +            inputBox.CancelButton = cancelButton;
 +
 +            DialogResult result = inputBox.ShowDialog();
 +            input = textBox.Text;
 +            return result;
 +        }
 +
          private void AddCamera(int videoSourceIndex, bool startWizard = false)
          {
              CameraWindow cw = NewCameraWindow(videoSourceIndex);