Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam-configmanager-sgo into
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-configmanager-sgo/+merge/74374
i have created file or get and set method and add it.
thank you
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-outlook.net-jam-configmanager-sgo/+merge/74374
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-outlook.net-jam.
=== added file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/ConfigManager.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/ConfigManager.cs 1970-01-01 00:00:00 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/ConfigManager.cs 2011-09-07 09:59:23 +0000
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenERPOutlookPlugin
+{
+ public class ConfigManager
+ {
+ private string[] combodb_val;
+ public string[] GetDB()
+ {
+ return combodb_val;
+ }
+
+ public void SetDB(string[] dbval)
+ {
+ combodb_val = dbval;
+ }
+
+ private string server;
+ public string Getserver()
+ {
+ return server;
+ }
+
+ public void Setserver(string Server)
+ {
+ server = Server;
+ }
+
+ private int port;
+ public int Getport()
+ {
+ return port;
+ }
+
+ public void Setport(int Port)
+ {
+ port = Port;
+ }
+
+ private string protocol;
+ public string Getprotocol()
+ {
+ return protocol;
+ }
+ public void Setprotocol(string Protocol)
+ {
+ protocol = Protocol;
+ }
+
+
+ private string weburl;
+ public string GetWeburl()
+ {
+ return weburl;
+ }
+
+ public void SetWeburl(string WebUrl)
+ {
+ weburl = WebUrl;
+ }
+
+ private string user_name;
+ public string GetUname()
+ {
+ return user_name;
+ }
+
+ public void SetUname(string uname)
+ {
+ user_name = uname;
+ }
+
+ private string pwd;
+ public string GetPwd()
+ {
+ return pwd;
+ }
+
+ public void SetPwd(string Password)
+ {
+ pwd = Password;
+ }
+
+ private string webserver;
+ public string GetWebserver()
+ {
+ return webserver;
+ }
+
+ public void SetWebserver(string WebServer)
+ {
+ webserver = WebServer;
+ }
+
+ private int webport;
+ public int GetWebport()
+ {
+ return webport;
+ }
+
+ public void SetWebport(int WebPort)
+ {
+ webport = WebPort;
+ }
+
+ private string webprotocol;
+ public string GetWebprotocol()
+ {
+ return webprotocol;
+ }
+
+ public void SetWebprotocol(string WebProtocol)
+ {
+ webprotocol = WebProtocol;
+ }
+
+
+ }
+}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj 2011-09-07 06:07:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj 2011-09-07 09:59:23 +0000
@@ -67,6 +67,7 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="Cache.cs" />
+ <Compile Include="ConfigManager.cs" />
<Compile Include="frm_contact.cs">
<SubType>Form</SubType>
</Compile>
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.dll 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.pdb 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/bin/Debug/OpenERPOutlookPlugin.tlb 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs 2011-09-07 06:07:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs 2011-09-07 09:59:23 +0000
@@ -201,6 +201,7 @@
this.combo_config_database.Name = "combo_config_database";
this.combo_config_database.Size = new System.Drawing.Size(269, 21);
this.combo_config_database.TabIndex = 61;
+ this.combo_config_database.SelectedIndexChanged += new System.EventHandler(this.combo_config_database_SelectedIndexChanged);
//
// btn_openerp_connect
//
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs 2011-09-07 08:42:56 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/frm_openerp_configuration.cs 2011-09-07 09:59:23 +0000
@@ -27,12 +27,13 @@
public string combodb_val;
public string url;
public string weburl;
- public ListViewItem item;
-
+ public ListViewItem item;
+ ConfigManager cm = new ConfigManager();
+
public frm_openerp_configuration()
{
InitializeComponent();
-
+
}
public frm_openerp_configuration(string strparam, string strparam2)
@@ -52,7 +53,7 @@
this.getname();
}
public ListView getname()
- {
+ {
string url = txt_server_config.Text;
XMLRPCConnect rpcclient_dblist = new XMLRPCConnect(url + "/xmlrpc/db");
Object[] res_dblist = rpcclient_dblist.list();
@@ -198,6 +199,7 @@
}
+<<<<<<< TREE
private void btn_webserver_parameter_change_Click(object sender, EventArgs e)
{
@@ -212,4 +214,26 @@
}
}
+=======
+ private void combo_config_database_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+
+ //private void btn_webserver_parameter_change_Click(object sender, EventArgs e)
+ //{
+ // this.Close();
+ // frm_openerp_connection_webserver connect_webserver = new frm_openerp_connection_webserver();
+ // connect_webserver.Show();
+ //}
+
+
+
+
+
+ }
+
+
+>>>>>>> MERGE-SOURCE
}
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt'
--- outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-09-07 06:07:59 +0000
+++ outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.FileListAbsolute.txt 2011-09-07 09:59:23 +0000
@@ -53,3 +53,21 @@
C:\Documents and Settings\atp\My Documents\Visual Studio 2008\Projects\OpenERPOutlookPlugin\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.pdb
C:\Documents and Settings\atp\My Documents\Visual Studio 2008\Projects\OpenERPOutlookPlugin\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.tlb
C:\Documents and Settings\atp\My Documents\Visual Studio 2008\Projects\OpenERPOutlookPlugin\OpenERPOutlookPlugin\bin\Debug\Interop.ADODB.dll
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\ResolveAssemblyReference.cache
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\Interop.ADODB.dll
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.csproj.ResolveComReference.cache
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_contact.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_create_new_partner.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_openerp_configuration.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_openerp_connection.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_openerp_connection_webserver.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_push_mail.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.frm_select_partner.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.Properties.Resources.resources
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.csproj.GenerateResource.Cache
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.dll
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.pdb
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\OpenERPOutlookPlugin.tlb
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\bin\Debug\Interop.ADODB.dll
+C:\Documents and Settings\sanjay\My Documents\Visual Studio 2008\Projects\openerp-outlook-plugin_v2.0\OpenERPOutlookPlugin\obj\Debug\OpenERPOutlookPlugin.pdb
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.GenerateResource.Cache 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.csproj.ResolveComReference.cache 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.dll 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/Debug/OpenERPOutlookPlugin.pdb 2011-09-07 09:59:23 +0000 differ
=== modified file 'outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache'
Binary files outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache 2011-09-07 06:07:59 +0000 and outlook/plugin/openerp-outlook-plugin_v2.0/OpenERPOutlookPlugin/obj/OpenERPOutlookPlugin.csproj.UnmanagedRegistration.cache 2011-09-07 09:59:23 +0000 differ
_______________________________________________
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
