Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam-server-port_validation-nco
into lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
Requested reviews:
Avadhesh (openerp) (avp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-server-port_validation-nco/+merge/75305
Hello sir,
Improve Usability.
Add validation for the No Server and No Port.
On port number text box only numbers and backspace are allowed.
Put image on close button.
Thank You,
(nco)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-server-port_validation-nco/+merge/75305
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs 2011-09-07 06:07:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs 2011-09-14 06:24:36 +0000
@@ -29,8 +29,6 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frm_openerp_connection));
- this.lblopenconn = new System.Windows.Forms.Label();
- this.lbline = new System.Windows.Forms.Label();
this.btn_close = new System.Windows.Forms.Button();
this.btn_change_server_url = new System.Windows.Forms.Button();
this.pnopenconn = new System.Windows.Forms.Panel();
@@ -43,33 +41,15 @@
this.pnopenconn.SuspendLayout();
this.SuspendLayout();
//
- // lblopenconn
- //
- this.lblopenconn.AutoSize = true;
- this.lblopenconn.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblopenconn.Location = new System.Drawing.Point(19, 9);
- this.lblopenconn.Name = "lblopenconn";
- this.lblopenconn.Size = new System.Drawing.Size(130, 13);
- this.lblopenconn.TabIndex = 31;
- this.lblopenconn.Text = "OpenERP Connection";
- //
- // lbline
- //
- this.lbline.AutoSize = true;
- this.lbline.Location = new System.Drawing.Point(0, 22);
- this.lbline.Name = "lbline";
- this.lbline.Size = new System.Drawing.Size(328, 13);
- this.lbline.TabIndex = 32;
- this.lbline.Text = "---------------------------------------------------------------------------------" +
- "--------------------------";
- //
// btn_close
//
+ this.btn_close.Image = ((System.Drawing.Image)(resources.GetObject("btn_close.Image")));
+ this.btn_close.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btn_close.Location = new System.Drawing.Point(151, 140);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(75, 23);
- this.btn_close.TabIndex = 39;
- this.btn_close.Text = "Close";
+ this.btn_close.TabIndex = 5;
+ this.btn_close.Text = "&Close";
this.btn_close.UseVisualStyleBackColor = true;
this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
//
@@ -80,8 +60,8 @@
this.btn_change_server_url.Location = new System.Drawing.Point(232, 140);
this.btn_change_server_url.Name = "btn_change_server_url";
this.btn_change_server_url.Size = new System.Drawing.Size(65, 23);
- this.btn_change_server_url.TabIndex = 38;
- this.btn_change_server_url.Text = "OK";
+ this.btn_change_server_url.TabIndex = 4;
+ this.btn_change_server_url.Text = "&OK";
this.btn_change_server_url.UseVisualStyleBackColor = true;
this.btn_change_server_url.Click += new System.EventHandler(this.btn_change_server_url_Click);
//
@@ -94,9 +74,9 @@
this.pnopenconn.Controls.Add(this.lbn_port);
this.pnopenconn.Controls.Add(this.txt_server_connect);
this.pnopenconn.Controls.Add(this.lbn_server_connect);
- this.pnopenconn.Location = new System.Drawing.Point(3, 38);
+ this.pnopenconn.Location = new System.Drawing.Point(3, 23);
this.pnopenconn.Name = "pnopenconn";
- this.pnopenconn.Size = new System.Drawing.Size(295, 96);
+ this.pnopenconn.Size = new System.Drawing.Size(295, 101);
this.pnopenconn.TabIndex = 40;
//
// txt_port
@@ -105,8 +85,9 @@
this.txt_port.Location = new System.Drawing.Point(129, 39);
this.txt_port.Name = "txt_port";
this.txt_port.Size = new System.Drawing.Size(154, 20);
- this.txt_port.TabIndex = 44;
+ this.txt_port.TabIndex = 2;
this.txt_port.Text = "8069";
+ this.txt_port.TextChanged += new System.EventHandler(this.txt_port_TextChanged);
//
// lbn_protocol
//
@@ -126,7 +107,8 @@
this.combo_proto_connect.Location = new System.Drawing.Point(129, 65);
this.combo_proto_connect.Name = "combo_proto_connect";
this.combo_proto_connect.Size = new System.Drawing.Size(154, 21);
- this.combo_proto_connect.TabIndex = 42;
+ this.combo_proto_connect.TabIndex = 3;
+ this.combo_proto_connect.Text = "XML-RPC";
//
// lbn_port
//
@@ -143,7 +125,7 @@
this.txt_server_connect.Location = new System.Drawing.Point(129, 9);
this.txt_server_connect.Name = "txt_server_connect";
this.txt_server_connect.Size = new System.Drawing.Size(154, 20);
- this.txt_server_connect.TabIndex = 40;
+ this.txt_server_connect.TabIndex = 1;
this.txt_server_connect.Text = "localhost";
//
// lbn_server_connect
@@ -163,22 +145,16 @@
this.Controls.Add(this.pnopenconn);
this.Controls.Add(this.btn_close);
this.Controls.Add(this.btn_change_server_url);
- this.Controls.Add(this.lbline);
- this.Controls.Add(this.lblopenconn);
this.Name = "frm_openerp_connection";
this.Text = "OpenERP Connection";
- this.Load += new System.EventHandler(this.frm_openerp_connection_Load);
this.pnopenconn.ResumeLayout(false);
this.pnopenconn.PerformLayout();
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- private System.Windows.Forms.Label lblopenconn;
- private System.Windows.Forms.Label lbline;
private System.Windows.Forms.Button btn_close;
private System.Windows.Forms.Button btn_change_server_url;
private System.Windows.Forms.Panel pnopenconn;
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.cs 2011-09-08 12:28:12 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.cs 2011-09-14 06:24:36 +0000
@@ -25,33 +25,57 @@
this.txt_port.Text = cm.Getport().ToString();
}
+ public Boolean checkValidate()
+ {
+ if (txt_server_connect.Text.Equals(""))
+ {
+ System.Windows.Forms.MessageBox.Show("Please Enter the Server Name.");
+ return false;
+ }
+ if (txt_port.Text.Equals(""))
+ {
+ System.Windows.Forms.MessageBox.Show("Please Enter the Port Number.");
+ return false;
+ }
+ if (combo_proto_connect.Text == String.Empty)
+ {
+ System.Windows.Forms.MessageBox.Show("Please select protocol connection.");
+ return false;
+ }
+ return true;
+ }
private void btn_change_server_url_Click(object sender, EventArgs e)
- {
- if (combo_proto_connect.Text == String.Empty)
- {
- System.Windows.Forms.MessageBox.Show("Please select protocol connection.");
- }
-
- else
- {
- this.configman.Setserver(this.txt_server_connect.Text.Trim());
- this.configman.Setport(Int32.Parse(this.txt_port.Text.Trim()));
- frm_openerp_configuration config = new frm_openerp_configuration(this.configman);
- config.Show();
- this.Close();
- }
- }
+ {
+ if (checkValidate() == true)
+ {
+ this.configman.Setserver(this.txt_server_connect.Text.Trim());
+ this.configman.Setport(Int32.Parse(this.txt_port.Text.Trim()));
+ frm_openerp_configuration config = new frm_openerp_configuration(this.configman);
+ config.Show();
+ this.Close();
+ }
+ }
private void btn_close_Click(object sender, EventArgs e)
{
this.Close();
}
- private void frm_openerp_connection_Load(object sender, EventArgs e)
- {
-
- }
-
+ private void txt_port_TextChanged(object sender, EventArgs e)
+ {
+ txt_port.KeyPress += new KeyPressEventHandler(txt_port_keypress);
+ }
+ private void txt_port_keypress(object sender, KeyPressEventArgs e)
+ {
+ if ((e.KeyChar < '0' || e.KeyChar > '9') && (e.KeyChar != '\b'))
+ {
+ e.Handled = true;
+ }
+ else
+ {
+ e.Handled = false;
+ }
+ }
}
}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.resx'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.resx 2011-09-07 06:07:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_connection.resx 2011-09-14 06:24:36 +0000
@@ -118,6 +118,23 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btn_close.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAdHx8k
+ KDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5Ojf/2wBDAQoKCg0MDRoPDxo3JR8lNzc3Nzc3Nzc3Nzc3
+ Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzf/wAARCAAOAA4DASIAAhEBAxEB/8QA
+ HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh
+ MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW
+ V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
+ x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF
+ BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
+ YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+ hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq
+ 8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCTw3oA8SLJiSI35jWYmdM+bn7zFuTnJH1zWf4gV/D13KmkXcsE
+ scnkvPb5hZv7y5BzjcP0FLHrtz4da70qOWSOWKTyZpIMDc0ZI+VuDjP0qWCG98f6lJb20kSXaxiZ3nGx
+ WVcL/CDz8w7eteSraJbn2XvqTlJ+5b/Ly/r8v//Z
+</value>
+ </data>
<data name="btn_change_server_url.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhDgAOAPYAAGTaQkOoJWLaPyZ6DfT88amqqY3pcjSaFnfGYPv7+y2LElvPOYblajKLGGndRnfi
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
