Final Edition

alexeysklemin · Jan 21, 2022 · c2ef822 · c2ef822
1 parent bb5fa4a
commit c2ef822
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/Project3/Interop/Interop.OleDbSrc.1.0.dll b/Project3/Interop/Interop.OleDbSrc.1.0.dll
diff --git a/Project3/Interop/Interop.TxDerived.1.0.dll b/Project3/Interop/Interop.TxDerived.1.0.dll
diff --git a/Project3/Interop/Interop.TxLookup.1.0.dll b/Project3/Interop/Interop.TxLookup.1.0.dll
diff --git 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<System::ComponentModel::ISupportInitialize^>(this->dataGridView1))->EndInit();
 			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->dataGridView2))->EndInit();
 			this->ResumeLayout(false);
@@ -135,19 +135,15 @@ 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();
 		SqlCommand^ SqlCom = gcnew SqlCommand();
 		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
@@ -120,6 +120,12 @@
   <metadata name="FriendName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="FriendName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Phones.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Phones.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/Project3/Project3.vcxproj b/Project3/Project3.vcxproj
@@ -120,11 +120,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="loadDb.cpp" />
     <ClCompile Include="MyForm.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="loadDb.h" />
     <ClInclude Include="MyForm.h">
       <FileType>CppForm</FileType>
     </ClInclude>
@@ -171,6 +169,33 @@
       <Isolated>false</Isolated>
       <EmbedInteropTypes>true</EmbedInteropTypes>
     </COMReference>
+    <COMReference Include="TxDerived.1.0">
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>342434f2-7398-425d-be08-fdc2011ef0fc</Guid>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="OleDbSrc.1.0">
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>82edf860-1f3e-426f-9dfe-959dfdb8a9e7</Guid>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="TxLookup.1.0">
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>09399b0a-c29a-4ffe-af70-828e78a16d60</Guid>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Project3/Project3.vcxproj.filters b/Project3/Project3.vcxproj.filters
@@ -18,16 +18,10 @@
     <ClCompile Include="MyForm.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="loadDb.cpp">
-      <Filter>Исходные файлы</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MyForm.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="loadDb.h">
-      <Filter>Файлы заголовков</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>