WebSVN – spk – Diff – //PluginManager/src/Forms/EditWares.h

 		EditWares(CPackages *pPackages) : _pPackages(pPackages)
+		{
 			InitializeComponent();
 			loadWares();
+			updateConflicts();
+		}
 		void loadWares();
+		void updateConflicts();
 	protected:
 		void editPrice();
 		void editNoto(int iNoto);
 		void reset();
 	private: System::Windows::Forms::ToolStripMenuItem^  toolStripMenuItem13;
 	private: System::Windows::Forms::ToolStripMenuItem^  toolStripMenuItem14;
 	private: System::Windows::Forms::ToolStripMenuItem^  toolStripMenuItem15;
 	private: System::Windows::Forms::ToolStripMenuItem^  toolStripMenuItem16;
 	private: System::Windows::Forms::ToolStripMenuItem^  toolStripMenuItem17;
+	private: System::Windows::Forms::TabControl^  tabControl1;
+	private: System::Windows::Forms::TabPage^  tabPage1;
+	private: System::Windows::Forms::TabPage^  tabPage2;
+	private: System::Windows::Forms::ListView^  listView2;
+	private: System::Windows::Forms::ColumnHeader^  columnHeader9;
+	private: System::Windows::Forms::ColumnHeader^  columnHeader10;
+	private: System::Windows::Forms::ColumnHeader^  columnHeader11;
 	private: System::ComponentModel::IContainer^  components;
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
 			this->toolStripMenuItem17 = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->toolStripSeparator1 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->resetToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->imageList1 = (gcnew System::Windows::Forms::ImageList(this->components));
 			this->button1 = (gcnew System::Windows::Forms::Button());
+			this->tabControl1 = (gcnew System::Windows::Forms::TabControl());
+			this->tabPage1 = (gcnew System::Windows::Forms::TabPage());
+			this->tabPage2 = (gcnew System::Windows::Forms::TabPage());
+			this->listView2 = (gcnew System::Windows::Forms::ListView());
+			this->columnHeader9 = (gcnew System::Windows::Forms::ColumnHeader());
+			this->columnHeader10 = (gcnew System::Windows::Forms::ColumnHeader());
+			this->columnHeader11 = (gcnew System::Windows::Forms::ColumnHeader());
 			this->contextMenuStrip1->SuspendLayout();
+			this->tabControl1->SuspendLayout();
+			this->tabPage1->SuspendLayout();
+			this->tabPage2->SuspendLayout();
 			this->SuspendLayout();
 			//
 			// listView1
 			//
 			this->listView1->AllowColumnReorder = true;
 				this->columnHeader4, this->columnHeader5, this->columnHeader2, this->columnHeader6, this->columnHeader7, this->columnHeader8});
 			this->listView1->ContextMenuStrip = this->contextMenuStrip1;
 			this->listView1->FullRowSelect = true;
 			this->listView1->HideSelection = false;
 			this->listView1->LargeImageList = this->imageList1;
-			this->listView1->Location = System::Drawing::Point(12, 12);
+			this->listView1->Location = System::Drawing::Point(-4, 0);
 			this->listView1->MultiSelect = false;
 			this->listView1->Name = L"listView1";
-			this->listView1->Size = System::Drawing::Size(767, 394);
+			this->listView1->Size = System::Drawing::Size(903, 503);
 			this->listView1->SmallImageList = this->imageList1;
 			this->listView1->TabIndex = 0;
 			this->listView1->UseCompatibleStateImageBehavior = false;
 			this->listView1->View = System::Windows::Forms::View::Details;
 			//
 			//
 			this->contextMenuStrip1->ImageScalingSize = System::Drawing::Size(32, 32);
 			this->contextMenuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(4) {this->editPriceToolStripMenuItem,
 				this->editNotoToolStripMenuItem, this->toolStripSeparator1, this->resetToolStripMenuItem});
 			this->contextMenuStrip1->Name = L"contextMenuStrip1";
-			this->contextMenuStrip1->Size = System::Drawing::Size(174, 146);
+			this->contextMenuStrip1->Size = System::Drawing::Size(174, 124);
 			this->contextMenuStrip1->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &EditWares::contextMenuStrip1_Opening);
 			//
 			// editPriceToolStripMenuItem
 			//
 			this->editPriceToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"editPriceToolStripMenuItem.Image")));
 			//
 			// toolStripMenuItem2
 			//
 			this->toolStripMenuItem2->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem2.Image")));
 			this->toolStripMenuItem2->Name = L"toolStripMenuItem2";
-			this->toolStripMenuItem2->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem2->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem2->Text = L"+10 (1,000,000)";
 			this->toolStripMenuItem2->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem2_Click);
 			//
 			// toolStripMenuItem3
 			//
 			this->toolStripMenuItem3->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem3.Image")));
 			this->toolStripMenuItem3->Name = L"toolStripMenuItem3";
-			this->toolStripMenuItem3->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem3->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem3->Text = L"+9 (100,000)";
 			this->toolStripMenuItem3->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem3_Click);
 			//
 			// toolStripMenuItem4
 			//
 			this->toolStripMenuItem4->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem4.Image")));
 			this->toolStripMenuItem4->Name = L"toolStripMenuItem4";
-			this->toolStripMenuItem4->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem4->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem4->Text = L"+8 (33,333)";
 			this->toolStripMenuItem4->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem4_Click);
 			//
 			// toolStripMenuItem5
 			//
 			this->toolStripMenuItem5->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem5.Image")));
 			this->toolStripMenuItem5->Name = L"toolStripMenuItem5";
-			this->toolStripMenuItem5->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem5->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem5->Text = L"+7 (10,000)";
 			this->toolStripMenuItem5->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem5_Click);
 			//
 			// toolStripMenuItem6
 			//
 			this->toolStripMenuItem6->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem6.Image")));
 			this->toolStripMenuItem6->Name = L"toolStripMenuItem6";
-			this->toolStripMenuItem6->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem6->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem6->Text = L"+6 (3,333)";
 			this->toolStripMenuItem6->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem6_Click);
 			//
 			// toolStripMenuItem7
 			//
 			this->toolStripMenuItem7->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem7.Image")));
 			this->toolStripMenuItem7->Name = L"toolStripMenuItem7";
-			this->toolStripMenuItem7->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem7->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem7->Text = L"+5 (1,000)";
 			this->toolStripMenuItem7->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem7_Click);
 			//
 			// toolStripMenuItem8
 			//
 			this->toolStripMenuItem8->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem8.Image")));
 			this->toolStripMenuItem8->Name = L"toolStripMenuItem8";
-			this->toolStripMenuItem8->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem8->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem8->Text = L"+4 (333)";
 			this->toolStripMenuItem8->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem8_Click);
 			//
 			// toolStripMenuItem9
 			//
 			this->toolStripMenuItem9->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem9.Image")));
 			this->toolStripMenuItem9->Name = L"toolStripMenuItem9";
-			this->toolStripMenuItem9->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem9->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem9->Text = L"+3 (100)";
 			this->toolStripMenuItem9->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem9_Click);
 			//
 			// toolStripMenuItem10
 			//
 			this->toolStripMenuItem10->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem10.Image")));
 			this->toolStripMenuItem10->Name = L"toolStripMenuItem10";
-			this->toolStripMenuItem10->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem10->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem10->Text = L"+2 (33)";
 			this->toolStripMenuItem10->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem10_Click);
 			//
 			// toolStripMenuItem11
 			//
 			this->toolStripMenuItem11->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem11.Image")));
 			this->toolStripMenuItem11->Name = L"toolStripMenuItem11";
-			this->toolStripMenuItem11->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem11->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem11->Text = L"+ 1 (10)";
 			this->toolStripMenuItem11->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem11_Click);
 			//
 			// toolStripMenuItem12
 			//
 			this->toolStripMenuItem12->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem12.Image")));
 			this->toolStripMenuItem12->Name = L"toolStripMenuItem12";
-			this->toolStripMenuItem12->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem12->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem12->Text = L"0 (-10)";
 			this->toolStripMenuItem12->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem12_Click);
 			//
 			// toolStripMenuItem13
 			//
 			this->toolStripMenuItem13->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem13.Image")));
 			this->toolStripMenuItem13->Name = L"toolStripMenuItem13";
-			this->toolStripMenuItem13->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem13->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem13->Text = L"-1 (-100)";
 			this->toolStripMenuItem13->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem13_Click);
 			//
 			// toolStripMenuItem14
 			//
 			this->toolStripMenuItem14->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem14.Image")));
 			this->toolStripMenuItem14->Name = L"toolStripMenuItem14";
-			this->toolStripMenuItem14->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem14->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem14->Text = L"-2 (-1,000)";
 			this->toolStripMenuItem14->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem14_Click);
 			//
 			// toolStripMenuItem15
 			//
 			this->toolStripMenuItem15->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem15.Image")));
 			this->toolStripMenuItem15->Name = L"toolStripMenuItem15";
-			this->toolStripMenuItem15->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem15->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem15->Text = L"-3 (-10,000)";
 			this->toolStripMenuItem15->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem15_Click);
 			//
 			// toolStripMenuItem16
 			//
 			this->toolStripMenuItem16->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem16.Image")));
 			this->toolStripMenuItem16->Name = L"toolStripMenuItem16";
-			this->toolStripMenuItem16->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem16->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem16->Text = L"-4 (-100,000)";
 			this->toolStripMenuItem16->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem16_Click);
 			//
 			// toolStripMenuItem17
 			//
 			this->toolStripMenuItem17->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"toolStripMenuItem17.Image")));
 			this->toolStripMenuItem17->Name = L"toolStripMenuItem17";
-			this->toolStripMenuItem17->Size = System::Drawing::Size(169, 38);
+			this->toolStripMenuItem17->Size = System::Drawing::Size(153, 22);
 			this->toolStripMenuItem17->Text = L"-5 (-1,000,000)";
 			this->toolStripMenuItem17->Click += gcnew System::EventHandler(this, &EditWares::toolStripMenuItem17_Click);
 			//
 			// toolStripSeparator1
 			//
 			// imageList1
 			//
 			this->imageList1->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^  >(resources->GetObject(L"imageList1.ImageStream")));
 			this->imageList1->TransparentColor = System::Drawing::Color::Transparent;
 			this->imageList1->Images->SetKeyName(0, L"label1.Image.png");
+			this->imageList1->Images->SetKeyName(1, L"emblem_cvs_conflict.png");
+			this->imageList1->Images->SetKeyName(2, L"yes.png");
+			this->imageList1->Images->SetKeyName(3, L"no.png");
 			//
 			// button1
 			//
 			this->button1->Anchor = static_cast<System::Windows::Forms::AnchorStyles>((System::Windows::Forms::AnchorStyles::Bottom | System::Windows::Forms::AnchorStyles::Right));
 			this->button1->DialogResult = System::Windows::Forms::DialogResult::OK;
-			this->button1->Location = System::Drawing::Point(689, 413);
+			this->button1->Location = System::Drawing::Point(825, 563);
 			this->button1->Name = L"button1";
 			this->button1->Size = System::Drawing::Size(90, 33);
 			this->button1->TabIndex = 1;
 			this->button1->Text = L"Close";
 			this->button1->UseVisualStyleBackColor = true;
 			this->button1->Click += gcnew System::EventHandler(this, &EditWares::button1_Click);
+			//
+			// tabControl1
+			//
+			this->tabControl1->Anchor = static_cast<System::Windows::Forms::AnchorStyles>((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom)
+				| System::Windows::Forms::AnchorStyles::Left)
+				| System::Windows::Forms::AnchorStyles::Right));
+			this->tabControl1->Controls->Add(this->tabPage1);
+			this->tabControl1->Controls->Add(this->tabPage2);
+			this->tabControl1->ImageList = this->imageList1;
+			this->tabControl1->Location = System::Drawing::Point(12, 12);
+			this->tabControl1->Name = L"tabControl1";
+			this->tabControl1->SelectedIndex = 0;
+			this->tabControl1->Size = System::Drawing::Size(903, 542);
+			this->tabControl1->TabIndex = 2;
+			//
+			// tabPage1
+			//
+			this->tabPage1->Controls->Add(this->listView1);
+			this->tabPage1->ImageKey = L"label1.Image.png";
+			this->tabPage1->Location = System::Drawing::Point(4, 39);
+			this->tabPage1->Name = L"tabPage1";
+			this->tabPage1->Padding = System::Windows::Forms::Padding(3);
+			this->tabPage1->Size = System::Drawing::Size(895, 499);
+			this->tabPage1->TabIndex = 0;
+			this->tabPage1->Text = L"Wares";
+			this->tabPage1->UseVisualStyleBackColor = true;
+			//
+			// tabPage2
+			//
+			this->tabPage2->Controls->Add(this->listView2);
+			this->tabPage2->ImageIndex = 1;
+			this->tabPage2->Location = System::Drawing::Point(4, 39);
+			this->tabPage2->Name = L"tabPage2";
+			this->tabPage2->Padding = System::Windows::Forms::Padding(3);
+			this->tabPage2->Size = System::Drawing::Size(895, 499);
+			this->tabPage2->TabIndex = 1;
+			this->tabPage2->Text = L"Conflicts";
+			this->tabPage2->UseVisualStyleBackColor = true;
+			//
+			// listView2
+			//
+			this->listView2->Anchor = static_cast<System::Windows::Forms::AnchorStyles>((((System::Windows::Forms::AnchorStyles::Top | System::Windows::Forms::AnchorStyles::Bottom)
+				| System::Windows::Forms::AnchorStyles::Left)
+				| System::Windows::Forms::AnchorStyles::Right));
+			this->listView2->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {this->columnHeader9, this->columnHeader10,
+				this->columnHeader11});
+			this->listView2->FullRowSelect = true;
+			this->listView2->LargeImageList = this->imageList1;
+			this->listView2->Location = System::Drawing::Point(-4, 0);
+			this->listView2->Name = L"listView2";
+			this->listView2->Size = System::Drawing::Size(903, 503);
+			this->listView2->SmallImageList = this->imageList1;
+			this->listView2->TabIndex = 0;
+			this->listView2->UseCompatibleStateImageBehavior = false;
+			this->listView2->View = System::Windows::Forms::View::Details;
+			//
+			// columnHeader9
+			//
+			this->columnHeader9->Text = L"Package";
+			//
+			// columnHeader10
+			//
+			this->columnHeader10->Text = L"Name";
+			//
+			// columnHeader11
+			//
+			this->columnHeader11->Text = L"Description";
 			//
 			// EditWares
 			//
-			this->ClientSize = System::Drawing::Size(791, 458);
+			this->ClientSize = System::Drawing::Size(927, 608);
+			this->Controls->Add(this->tabControl1);
 			this->Controls->Add(this->button1);
-			this->Controls->Add(this->listView1);
 			this->Icon = (cli::safe_cast<System::Drawing::Icon^  >(resources->GetObject(L"$this.Icon")));
 			this->Name = L"EditWares";
 			this->Text = L"Used Wares";
 			this->contextMenuStrip1->ResumeLayout(false);
+			this->tabControl1->ResumeLayout(false);
+			this->tabPage1->ResumeLayout(false);
+			this->tabPage2->ResumeLayout(false);
 			this->ResumeLayout(false);
+		}
 #pragma endregion
 	private: System::Void button1_Click(System::Object^  sender, System::EventArgs^  e) {

Subversion Repositories spk

(root)//PluginManager/src/Forms/EditWares.h – Rev 88 → 89