diff --git a/Project3/Interop/Interop.OleDbSrc.1.0.dll b/Project3/Interop/Interop.OleDbSrc.1.0.dll new file mode 100644 index 0000000..b650e72 Binary files /dev/null and b/Project3/Interop/Interop.OleDbSrc.1.0.dll differ diff --git a/Project3/Interop/Interop.TxDerived.1.0.dll b/Project3/Interop/Interop.TxDerived.1.0.dll new file mode 100644 index 0000000..6078cc6 Binary files /dev/null and b/Project3/Interop/Interop.TxDerived.1.0.dll differ diff --git a/Project3/Interop/Interop.TxLookup.1.0.dll b/Project3/Interop/Interop.TxLookup.1.0.dll new file mode 100644 index 0000000..799e2b5 Binary files /dev/null and b/Project3/Interop/Interop.TxLookup.1.0.dll differ diff --git a/Project3/MyForm.h b/Project3/MyForm.h index 77d9a89..90dd171 100644 --- a/Project3/MyForm.h +++ b/Project3/MyForm.h @@ -76,7 +76,7 @@ namespace Project3 { this->dataGridView1->Name = L"dataGridView1"; this->dataGridView1->RowHeadersWidth = 51; this->dataGridView1->RowTemplate->Height = 24; - this->dataGridView1->Size = System::Drawing::Size(294, 124); + this->dataGridView1->Size = System::Drawing::Size(677, 263); this->dataGridView1->TabIndex = 0; this->dataGridView1->CellContentClick += gcnew System::Windows::Forms::DataGridViewCellEventHandler(this, &MyForm::dataGridView1_CellContentClick); // @@ -102,11 +102,11 @@ namespace Project3 { this->dataGridView2->AllowUserToOrderColumns = true; this->dataGridView2->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->dataGridView2->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(1) { this->Phones }); - this->dataGridView2->Location = System::Drawing::Point(383, -2); + this->dataGridView2->Location = System::Drawing::Point(695, -2); this->dataGridView2->Name = L"dataGridView2"; this->dataGridView2->RowHeadersWidth = 51; this->dataGridView2->RowTemplate->Height = 24; - this->dataGridView2->Size = System::Drawing::Size(284, 124); + this->dataGridView2->Size = System::Drawing::Size(674, 263); this->dataGridView2->TabIndex = 2; // // Phones @@ -125,7 +125,7 @@ namespace Project3 { this->Controls->Add(this->Refreshbtn); this->Controls->Add(this->dataGridView1); this->Name = L"MyForm"; - this->Text = L"MyForm"; + this->Text = L"Phonebook"; (cli::safe_cast(this->dataGridView1))->EndInit(); (cli::safe_cast(this->dataGridView2))->EndInit(); this->ResumeLayout(false); @@ -135,7 +135,7 @@ namespace Project3 { private: System::Void dataGridView1_CellContentClick(System::Object^ sender, System::Windows::Forms::DataGridViewCellEventArgs^ e) { } private: System::Void Refreshbtn_Click(System::Object^ sender, System::EventArgs^ e) { - //loadDb(); + SqlConnection^ conn; SqlConnectionStringBuilder^ connStrifBuilder; SqlConnection^ SqlCon = gcnew SqlConnection(); @@ -143,11 +143,7 @@ namespace Project3 { DataTable^ SqlDt = gcnew DataTable(); SqlDataAdapter^ SqlDtA = gcnew SqlDataAdapter(); SqlDataReader^ SqlRd; - SqlCon->ConnectionString = "Data Source= 127.0.0.1;Initial Catalog=dbo.PhonesFriends;Integrated Security=true; Server = localhost"; - connStrifBuilder = gcnew SqlConnectionStringBuilder(); - connStrifBuilder->DataSource = "LAPTOP-8IOTANJP\\SQLEXPRESS"; - connStrifBuilder->InitialCatalog = "FriendsPhones"; - connStrifBuilder->IntegratedSecurity = true; + SqlCon->ConnectionString = "Data Source=127.0.0.1/SQLEXPRESS;Initial Catalog=PhonesFriends;Integrated Security=True"; SqlCon->Open(); SqlCom->Connection = SqlCon; SqlCom->CommandText = "SELECT FriendName FROM FriendNames"; diff --git a/Project3/MyForm.resx b/Project3/MyForm.resx index d9d22f5..c7e8dfc 100644 --- a/Project3/MyForm.resx +++ b/Project3/MyForm.resx @@ -120,6 +120,12 @@ True + + True + + + True + True diff --git a/Project3/Project3.vcxproj b/Project3/Project3.vcxproj index a225071..7ba5959 100644 --- a/Project3/Project3.vcxproj +++ b/Project3/Project3.vcxproj @@ -120,11 +120,9 @@ - - CppForm @@ -171,6 +169,33 @@ false true + + 0 + 1 + 342434f2-7398-425d-be08-fdc2011ef0fc + 0 + tlbimp + false + true + + + 0 + 1 + 82edf860-1f3e-426f-9dfe-959dfdb8a9e7 + 0 + tlbimp + false + true + + + 0 + 1 + 09399b0a-c29a-4ffe-af70-828e78a16d60 + 0 + tlbimp + false + true + diff --git a/Project3/Project3.vcxproj.filters b/Project3/Project3.vcxproj.filters index 8b2f254..2ec3e5c 100644 --- a/Project3/Project3.vcxproj.filters +++ b/Project3/Project3.vcxproj.filters @@ -18,16 +18,10 @@ Исходные файлы - - Исходные файлы - Файлы заголовков - - Файлы заголовков - \ No newline at end of file