Changeset 1253

Timestamp:

1/19/2010 6:43:16 AM (2 months ago)

Author:

vessper

Message:

19/01/2010

---

- Prism: Added "Corp Hangar" mode for splitting corp assets into hangars (still needs more work)

Location:

trunk/EveHQ.Prism/Forms

Files:

• frmPrism.Designer.vb (modified) (49 diffs)
• frmPrism.resx (modified) (1 diff)
• frmPrism.vb (modified) (6 diffs)

trunk/EveHQ.Prism/Forms/frmPrism.Designer.vb

@@ -248 +248 @@
         Me.colJobsStatus = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.tabRecycle = New System.Windows.Forms.TabPage
+        Me.btnExport = New EveHQ.Core.SplitButton
+        Me.ctxRecycleExport = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.mnuExportToCSV = New System.Windows.Forms.ToolStripMenuItem
+        Me.mnuExportToTSV = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripSeparator
+        Me.mnuExportTotalsToCSV = New System.Windows.Forms.ToolStripMenuItem
+        Me.mnuExportTotalsToTSV = New System.Windows.Forms.ToolStripMenuItem
         Me.chkFeesOnItems = New System.Windows.Forms.CheckBox
         Me.lblPriceTotals = New System.Windows.Forms.Label
@@ -407 +414 @@
         Me.ColumnHeader12 = New System.Windows.Forms.ColumnHeader
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.btnExport = New EveHQ.Core.SplitButton
-        Me.ctxRecycleExport = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.mnuExportToCSV = New System.Windows.Forms.ToolStripMenuItem
-        Me.mnuExportToTSV = New System.Windows.Forms.ToolStripMenuItem
-        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripSeparator
-        Me.mnuExportTotalsToCSV = New System.Windows.Forms.ToolStripMenuItem
-        Me.mnuExportTotalsToTSV = New System.Windows.Forms.ToolStripMenuItem
+        Me.chkCorpHangarMode = New System.Windows.Forms.CheckBox
         Me.ctxAssets.SuspendLayout()
         Me.ctxFilter.SuspendLayout()
@@ -439 +440 @@
         Me.tabJobs.SuspendLayout()
         Me.tabRecycle.SuspendLayout()
+        Me.ctxRecycleExport.SuspendLayout()
         CType(Me.nudTax, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.nudBrokerFee, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -458 +460 @@
         Me.StatusStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
-        Me.ctxRecycleExport.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -465 +466 @@
         Me.ctxAssets.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuItemName, Me.ToolStripMenuItem1, Me.mnuAddCustomName, Me.mnuRemoveCustomName, Me.ToolStripMenuItem3, Me.mnuViewInIB, Me.mnuViewInHQF, Me.mnuModifyPrice, Me.mnuToolSep, Me.mnuItemRecycling})
         Me.ctxAssets.Name = "ctxAssets"
-        Me.ctxAssets.Size = New System.Drawing.Size(198, 176)
+        Me.ctxAssets.Size = New System.Drawing.Size(194, 176)
         '
         'mnuItemName
@@ -471 +472 @@
         Me.mnuItemName.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
         Me.mnuItemName.Name = "mnuItemName"
-        Me.mnuItemName.Size = New System.Drawing.Size(197, 22)
+        Me.mnuItemName.Size = New System.Drawing.Size(193, 22)
         Me.mnuItemName.Text = "Item Name"
         '
@@ -477 +478 @@
         '
         Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(190, 6)
         '
         'mnuAddCustomName
         '
         Me.mnuAddCustomName.Name = "mnuAddCustomName"
-        Me.mnuAddCustomName.Size = New System.Drawing.Size(197, 22)
+        Me.mnuAddCustomName.Size = New System.Drawing.Size(193, 22)
         Me.mnuAddCustomName.Text = "Add Custom Name"
         '
@@ -488 +489 @@
         '
         Me.mnuRemoveCustomName.Name = "mnuRemoveCustomName"
-        Me.mnuRemoveCustomName.Size = New System.Drawing.Size(197, 22)
+        Me.mnuRemoveCustomName.Size = New System.Drawing.Size(193, 22)
         Me.mnuRemoveCustomName.Text = "Remove Custom Name"
         '
@@ -494 +495 @@
         '
         Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
-        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(194, 6)
+        Me.ToolStripMenuItem3.Size = New System.Drawing.Size(190, 6)
         '
         'mnuViewInIB
         '
         Me.mnuViewInIB.Name = "mnuViewInIB"
-        Me.mnuViewInIB.Size = New System.Drawing.Size(197, 22)
+        Me.mnuViewInIB.Size = New System.Drawing.Size(193, 22)
         Me.mnuViewInIB.Text = "View In Item Browser"
         '
@@ -505 +506 @@
         '
         Me.mnuViewInHQF.Name = "mnuViewInHQF"
-        Me.mnuViewInHQF.Size = New System.Drawing.Size(197, 22)
+        Me.mnuViewInHQF.Size = New System.Drawing.Size(193, 22)
         Me.mnuViewInHQF.Text = "Copy Setup for HQF"
         '
@@ -511 +512 @@
         '
         Me.mnuModifyPrice.Name = "mnuModifyPrice"
-        Me.mnuModifyPrice.Size = New System.Drawing.Size(197, 22)
+        Me.mnuModifyPrice.Size = New System.Drawing.Size(193, 22)
         Me.mnuModifyPrice.Text = "Modify Custom Price"
         '
@@ -517 +518 @@
         '
         Me.mnuToolSep.Name = "mnuToolSep"
-        Me.mnuToolSep.Size = New System.Drawing.Size(194, 6)
+        Me.mnuToolSep.Size = New System.Drawing.Size(190, 6)
         '
         'mnuItemRecycling
@@ -523 +524 @@
         Me.mnuItemRecycling.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuRecycleItem, Me.mnuRecycleContained, Me.mnuRecycleAll})
         Me.mnuItemRecycling.Name = "mnuItemRecycling"
-        Me.mnuItemRecycling.Size = New System.Drawing.Size(197, 22)
+        Me.mnuItemRecycling.Size = New System.Drawing.Size(193, 22)
         Me.mnuItemRecycling.Text = "Recycling Profitability"
         '
@@ -529 +530 @@
         '
         Me.mnuRecycleItem.Name = "mnuRecycleItem"
-        Me.mnuRecycleItem.Size = New System.Drawing.Size(169, 22)
+        Me.mnuRecycleItem.Size = New System.Drawing.Size(173, 22)
         Me.mnuRecycleItem.Text = "Current Item"
         '
@@ -536 +537 @@
         Me.mnuRecycleContained.Enabled = False
         Me.mnuRecycleContained.Name = "mnuRecycleContained"
-        Me.mnuRecycleContained.Size = New System.Drawing.Size(169, 22)
+        Me.mnuRecycleContained.Size = New System.Drawing.Size(173, 22)
         Me.mnuRecycleContained.Text = "Contained Items"
         '
@@ -543 +544 @@
         Me.mnuRecycleAll.Enabled = False
         Me.mnuRecycleAll.Name = "mnuRecycleAll"
-        Me.mnuRecycleAll.Size = New System.Drawing.Size(169, 22)
+        Me.mnuRecycleAll.Size = New System.Drawing.Size(173, 22)
         Me.mnuRecycleAll.Text = "Container + Items"
         '
@@ -570 +571 @@
         Me.ctxFilter.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddToFilterToolStripMenuItem})
         Me.ctxFilter.Name = "ctxFilter"
-        Me.ctxFilter.Size = New System.Drawing.Size(143, 26)
+        Me.ctxFilter.Size = New System.Drawing.Size(147, 26)
         '
         'AddToFilterToolStripMenuItem
         '
         Me.AddToFilterToolStripMenuItem.Name = "AddToFilterToolStripMenuItem"
-        Me.AddToFilterToolStripMenuItem.Size = New System.Drawing.Size(142, 22)
+        Me.AddToFilterToolStripMenuItem.Size = New System.Drawing.Size(146, 22)
         Me.AddToFilterToolStripMenuItem.Text = "Add To Filter"
         '
@@ -603 +604 @@
         Me.ctxFilterList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RemoveFilterToolStripMenuItem})
         Me.ctxFilterList.Name = "ctxFilterList"
-        Me.ctxFilterList.Size = New System.Drawing.Size(147, 26)
+        Me.ctxFilterList.Size = New System.Drawing.Size(152, 26)
         '
         'RemoveFilterToolStripMenuItem
         '
         Me.RemoveFilterToolStripMenuItem.Name = "RemoveFilterToolStripMenuItem"
-        Me.RemoveFilterToolStripMenuItem.Size = New System.Drawing.Size(146, 22)
+        Me.RemoveFilterToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.RemoveFilterToolStripMenuItem.Text = "Remove Filter"
         '
@@ -645 +646 @@
         Me.ctxTabPrism.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClosePrismTab})
         Me.ctxTabPrism.Name = "ctxTabbedMDI"
-        Me.ctxTabPrism.Size = New System.Drawing.Size(124, 26)
+        Me.ctxTabPrism.Size = New System.Drawing.Size(128, 26)
         '
         'mnuClosePrismTab
         '
         Me.mnuClosePrismTab.Name = "mnuClosePrismTab"
-        Me.mnuClosePrismTab.Size = New System.Drawing.Size(123, 22)
+        Me.mnuClosePrismTab.Size = New System.Drawing.Size(127, 22)
         Me.mnuClosePrismTab.Text = "Not Valid"
         '
@@ -749 +750 @@
         Me.ctxAPIStatus.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClearXMLCache})
         Me.ctxAPIStatus.Name = "ctxAPIStatus"
-        Me.ctxAPIStatus.Size = New System.Drawing.Size(198, 26)
+        Me.ctxAPIStatus.Size = New System.Drawing.Size(194, 26)
         '
         'mnuClearXMLCache
         '
         Me.mnuClearXMLCache.Name = "mnuClearXMLCache"
-        Me.mnuClearXMLCache.Size = New System.Drawing.Size(197, 22)
+        Me.mnuClearXMLCache.Size = New System.Drawing.Size(193, 22)
         Me.mnuClearXMLCache.Text = "Clear Prism XML Cache"
         '
         'tabAssets
         '
+        Me.tabAssets.Controls.Add(Me.chkCorpHangarMode)
         Me.tabAssets.Controls.Add(Me.chkExcludeOrders)
         Me.tabAssets.Controls.Add(Me.btnFilters)
@@ -784 +786 @@
         '
         Me.chkExcludeOrders.AutoSize = True
-        Me.chkExcludeOrders.Location = New System.Drawing.Point(724, 59)
+        Me.chkExcludeOrders.Location = New System.Drawing.Point(455, 60)
         Me.chkExcludeOrders.Name = "chkExcludeOrders"
         Me.chkExcludeOrders.Size = New System.Drawing.Size(99, 17)
@@ -811 +813 @@
         'txtMinSystemValue
         '
-        Me.txtMinSystemValue.Location = New System.Drawing.Point(572, 57)
+        Me.txtMinSystemValue.Location = New System.Drawing.Point(679, 57)
         Me.txtMinSystemValue.Name = "txtMinSystemValue"
         Me.txtMinSystemValue.Size = New System.Drawing.Size(135, 21)
@@ -821 +823 @@
         '
         Me.chkMinSystemValue.AutoSize = True
-        Me.chkMinSystemValue.Location = New System.Drawing.Point(453, 60)
+        Me.chkMinSystemValue.Location = New System.Drawing.Point(560, 60)
         Me.chkMinSystemValue.Name = "chkMinSystemValue"
         Me.chkMinSystemValue.Size = New System.Drawing.Size(113, 17)
@@ -878 +880 @@
         'txtSearch
         '
-        Me.txtSearch.Location = New System.Drawing.Point(113, 34)
+        Me.txtSearch.Location = New System.Drawing.Point(56, 34)
         Me.txtSearch.Name = "txtSearch"
-        Me.txtSearch.Size = New System.Drawing.Size(215, 21)
+        Me.txtSearch.Size = New System.Drawing.Size(231, 21)
         Me.txtSearch.TabIndex = 19
         '
@@ -2671 +2673 @@
         Me.tabRecycle.UseVisualStyleBackColor = True
         '
+        'btnExport
+        '
+        Me.btnExport.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnExport.AutoSize = True
+        Me.btnExport.ContextMenuStrip = Me.ctxRecycleExport
+        Me.btnExport.Location = New System.Drawing.Point(1030, 520)
+        Me.btnExport.Name = "btnExport"
+        Me.btnExport.Size = New System.Drawing.Size(100, 23)
+        Me.btnExport.SplitMenu = Me.ctxRecycleExport
+        Me.btnExport.TabIndex = 62
+        Me.btnExport.Text = "Export"
+        Me.btnExport.UseVisualStyleBackColor = True
+        '
+        'ctxRecycleExport
+        '
+        Me.ctxRecycleExport.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuExportToCSV, Me.mnuExportToTSV, Me.ToolStripMenuItem5, Me.mnuExportTotalsToCSV, Me.mnuExportTotalsToTSV})
+        Me.ctxRecycleExport.Name = "ctxResourceExport"
+        Me.ctxRecycleExport.Size = New System.Drawing.Size(282, 98)
+        '
+        'mnuExportToCSV
+        '
+        Me.mnuExportToCSV.Name = "mnuExportToCSV"
+        Me.mnuExportToCSV.Size = New System.Drawing.Size(281, 22)
+        Me.mnuExportToCSV.Text = "Copy Recycling Data to Clipboard (CSV)"
+        '
+        'mnuExportToTSV
+        '
+        Me.mnuExportToTSV.Name = "mnuExportToTSV"
+        Me.mnuExportToTSV.Size = New System.Drawing.Size(281, 22)
+        Me.mnuExportToTSV.Text = "Copy Recycling Data to Clipboard (TSV)"
+        '
+        'ToolStripMenuItem5
+        '
+        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
+        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(278, 6)
+        '
+        'mnuExportTotalsToCSV
+        '
+        Me.mnuExportTotalsToCSV.Name = "mnuExportTotalsToCSV"
+        Me.mnuExportTotalsToCSV.Size = New System.Drawing.Size(281, 22)
+        Me.mnuExportTotalsToCSV.Text = "Copy Recycling Totals to Clipboard (CSV)"
+        '
+        'mnuExportTotalsToTSV
+        '
+        Me.mnuExportTotalsToTSV.Name = "mnuExportTotalsToTSV"
+        Me.mnuExportTotalsToTSV.Size = New System.Drawing.Size(281, 22)
+        Me.mnuExportTotalsToTSV.Text = "Copy Recycling Totals to Clipboard (TSV)"
+        '
         'chkFeesOnItems
         '
@@ -3148 +3198 @@
         Me.ctxRecycleItems.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAddRecycleItem})
         Me.ctxRecycleItems.Name = "ctxRecycleItem"
-        Me.ctxRecycleItems.Size = New System.Drawing.Size(124, 26)
+        Me.ctxRecycleItems.Size = New System.Drawing.Size(130, 26)
         '
         'mnuAddRecycleItem
         '
         Me.mnuAddRecycleItem.Name = "mnuAddRecycleItem"
-        Me.mnuAddRecycleItem.Size = New System.Drawing.Size(123, 22)
+        Me.mnuAddRecycleItem.Size = New System.Drawing.Size(129, 22)
         Me.mnuAddRecycleItem.Text = "Add Item"
         '
@@ -3160 +3210 @@
         Me.ctxRecycleItem.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAlterRecycleQuantity, Me.ToolStripMenuItem2, Me.mnuRemoveRecycleItem})
         Me.ctxRecycleItem.Name = "ctxRecycleItem"
-        Me.ctxRecycleItem.Size = New System.Drawing.Size(149, 54)
+        Me.ctxRecycleItem.Size = New System.Drawing.Size(154, 54)
         '
         'mnuAlterRecycleQuantity
         '
         Me.mnuAlterRecycleQuantity.Name = "mnuAlterRecycleQuantity"
-        Me.mnuAlterRecycleQuantity.Size = New System.Drawing.Size(148, 22)
+        Me.mnuAlterRecycleQuantity.Size = New System.Drawing.Size(153, 22)
         Me.mnuAlterRecycleQuantity.Text = "Alter Quantity"
         '
@@ -3171 +3221 @@
         '
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(145, 6)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(150, 6)
         '
         'mnuRemoveRecycleItem
         '
         Me.mnuRemoveRecycleItem.Name = "mnuRemoveRecycleItem"
-        Me.mnuRemoveRecycleItem.Size = New System.Drawing.Size(148, 22)
+        Me.mnuRemoveRecycleItem.Size = New System.Drawing.Size(153, 22)
         Me.mnuRemoveRecycleItem.Text = "Remove Item"
         '
@@ -3652 +3702 @@
         Me.ctxBPManager.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuSendToBPCalc, Me.ToolStripMenuItem4, Me.mnuAmendBPDetails, Me.mnuRemoveCustomBP})
         Me.ctxBPManager.Name = "ctxBPManager"
-        Me.ctxBPManager.Size = New System.Drawing.Size(223, 76)
+        Me.ctxBPManager.Size = New System.Drawing.Size(219, 76)
         '
         'mnuSendToBPCalc
         '
         Me.mnuSendToBPCalc.Name = "mnuSendToBPCalc"
-        Me.mnuSendToBPCalc.Size = New System.Drawing.Size(222, 22)
+        Me.mnuSendToBPCalc.Size = New System.Drawing.Size(218, 22)
         Me.mnuSendToBPCalc.Text = "Send to Blueprint Calculator"
         '
@@ -3663 +3713 @@
         '
         Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
-        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(219, 6)
+        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(215, 6)
         '
         'mnuAmendBPDetails
         '
         Me.mnuAmendBPDetails.Name = "mnuAmendBPDetails"
-        Me.mnuAmendBPDetails.Size = New System.Drawing.Size(222, 22)
+        Me.mnuAmendBPDetails.Size = New System.Drawing.Size(218, 22)
         Me.mnuAmendBPDetails.Text = "Amend Blueprint Details"
         '
@@ -3674 +3724 @@
         '
         Me.mnuRemoveCustomBP.Name = "mnuRemoveCustomBP"
-        Me.mnuRemoveCustomBP.Size = New System.Drawing.Size(222, 22)
+        Me.mnuRemoveCustomBP.Size = New System.Drawing.Size(218, 22)
         Me.mnuRemoveCustomBP.Text = "Remove Custom Blueprint"
         '
@@ -3689 +3739 @@
         '
         Me.tssLabelTotalAssetsLabel.Name = "tssLabelTotalAssetsLabel"
-        Me.tssLabelTotalAssetsLabel.Size = New System.Drawing.Size(154, 17)
+        Me.tssLabelTotalAssetsLabel.Size = New System.Drawing.Size(143, 17)
         Me.tssLabelTotalAssetsLabel.Text = "Total Displayed Asset Value:"
         '
@@ -3704 +3754 @@
         '
         Me.tssLabelSelectedAssetsLabel.Name = "tssLabelSelectedAssetsLabel"
-        Me.tssLabelSelectedAssetsLabel.Size = New System.Drawing.Size(162, 17)
+        Me.tssLabelSelectedAssetsLabel.Size = New System.Drawing.Size(153, 17)
         Me.tssLabelSelectedAssetsLabel.Text = "     Total Selected Asset Value:"
         '
@@ -3907 +3957 @@
         '
         Me.mnuLocation.Name = "mnuLocation"
-        Me.mnuLocation.Size = New System.Drawing.Size(173, 22)
+        Me.mnuLocation.Size = New System.Drawing.Size(184, 22)
         Me.mnuLocation.Text = "Grouped by Location"
         '
@@ -3914 +3964 @@
         Me.mnuAssetLists.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAssetListName, Me.mnuAssetListQuantity, Me.mnuAssetListPrice, Me.mnuAssetListValue})
         Me.mnuAssetLists.Name = "mnuAssetLists"
-        Me.mnuAssetLists.Size = New System.Drawing.Size(173, 22)
+        Me.mnuAssetLists.Size = New System.Drawing.Size(184, 22)
         Me.mnuAssetLists.Text = "Asset Lists"
         '
@@ -3920 +3970 @@
         '
         Me.mnuAssetListName.Name = "mnuAssetListName"
-        Me.mnuAssetListName.Size = New System.Drawing.Size(184, 22)
+        Me.mnuAssetListName.Size = New System.Drawing.Size(195, 22)
         Me.mnuAssetListName.Text = "Asset List (Name)"
         '
@@ -3927 +3977 @@
         Me.mnuAssetListQuantity.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAssetListQuantityA, Me.mnuAssetListQuantityD})
         Me.mnuAssetListQuantity.Name = "mnuAssetListQuantity"
-        Me.mnuAssetListQuantity.Size = New System.Drawing.Size(184, 22)
+        Me.mnuAssetListQuantity.Size = New System.Drawing.Size(195, 22)
         Me.mnuAssetListQuantity.Text = "Asset List (Quantity)"
         '
@@ -3933 +3983 @@
         '
         Me.mnuAssetListQuantityA.Name = "mnuAssetListQuantityA"
-        Me.mnuAssetListQuantityA.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListQuantityA.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListQuantityA.Text = "Ascending"
         '
@@ -3939 +3989 @@
         '
         Me.mnuAssetListQuantityD.Name = "mnuAssetListQuantityD"
-        Me.mnuAssetListQuantityD.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListQuantityD.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListQuantityD.Text = "Descending"
         '
@@ -3946 +3996 @@
         Me.mnuAssetListPrice.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAssetListPriceA, Me.mnuAssetListPriceD})
         Me.mnuAssetListPrice.Name = "mnuAssetListPrice"
-        Me.mnuAssetListPrice.Size = New System.Drawing.Size(184, 22)
+        Me.mnuAssetListPrice.Size = New System.Drawing.Size(195, 22)
         Me.mnuAssetListPrice.Text = "Asset List (Unit Price)"
         '
@@ -3952 +4002 @@
         '
         Me.mnuAssetListPriceA.Name = "mnuAssetListPriceA"
-        Me.mnuAssetListPriceA.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListPriceA.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListPriceA.Text = "Ascending"
         '
@@ -3958 +4008 @@
         '
         Me.mnuAssetListPriceD.Name = "mnuAssetListPriceD"
-        Me.mnuAssetListPriceD.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListPriceD.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListPriceD.Text = "Descending"
         '
@@ -3965 +4015 @@
         Me.mnuAssetListValue.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuAssetListValueA, Me.mnuAssetListValueD})
         Me.mnuAssetListValue.Name = "mnuAssetListValue"
-        Me.mnuAssetListValue.Size = New System.Drawing.Size(184, 22)
+        Me.mnuAssetListValue.Size = New System.Drawing.Size(195, 22)
         Me.mnuAssetListValue.Text = "Asset List (Total Value)"
         '
@@ -3971 +4021 @@
         '
         Me.mnuAssetListValueA.Name = "mnuAssetListValueA"
-        Me.mnuAssetListValueA.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListValueA.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListValueA.Text = "Ascending"
         '
@@ -3977 +4027 @@
         '
         Me.mnuAssetListValueD.Name = "mnuAssetListValueD"
-        Me.mnuAssetListValueD.Size = New System.Drawing.Size(129, 22)
+        Me.mnuAssetListValueD.Size = New System.Drawing.Size(140, 22)
         Me.mnuAssetListValueD.Text = "Descending"
         '
@@ -4048 +4098 @@
         Me.ColumnHeader12.Width = 119
         '
-        'btnExport
-        '
-        Me.btnExport.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnExport.AutoSize = True
-        Me.btnExport.ContextMenuStrip = Me.ctxRecycleExport
-        Me.btnExport.Location = New System.Drawing.Point(1030, 520)
-        Me.btnExport.Name = "btnExport"
-        Me.btnExport.Size = New System.Drawing.Size(100, 23)
-        Me.btnExport.SplitMenu = Me.ctxRecycleExport
-        Me.btnExport.TabIndex = 62
-        Me.btnExport.Text = "Export"
-        Me.btnExport.UseVisualStyleBackColor = True
-        '
-        'ctxRecycleExport
-        '
-        Me.ctxRecycleExport.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuExportToCSV, Me.mnuExportToTSV, Me.ToolStripMenuItem5, Me.mnuExportTotalsToCSV, Me.mnuExportTotalsToTSV})
-        Me.ctxRecycleExport.Name = "ctxResourceExport"
-        Me.ctxRecycleExport.Size = New System.Drawing.Size(293, 120)
-        '
-        'mnuExportToCSV
-        '
-        Me.mnuExportToCSV.Name = "mnuExportToCSV"
-        Me.mnuExportToCSV.Size = New System.Drawing.Size(292, 22)
-        Me.mnuExportToCSV.Text = "Copy Recycling Data to Clipboard (CSV)"
-        '
-        'mnuExportToTSV
-        '
-        Me.mnuExportToTSV.Name = "mnuExportToTSV"
-        Me.mnuExportToTSV.Size = New System.Drawing.Size(292, 22)
-        Me.mnuExportToTSV.Text = "Copy Recycling Data to Clipboard (TSV)"
-        '
-        'ToolStripMenuItem5
-        '
-        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(289, 6)
-        '
-        'mnuExportTotalsToCSV
-        '
-        Me.mnuExportTotalsToCSV.Name = "mnuExportTotalsToCSV"
-        Me.mnuExportTotalsToCSV.Size = New System.Drawing.Size(292, 22)
-        Me.mnuExportTotalsToCSV.Text = "Copy Recycling Totals to Clipboard (CSV)"
-        '
-        'mnuExportTotalsToTSV
-        '
-        Me.mnuExportTotalsToTSV.Name = "mnuExportTotalsToTSV"
-        Me.mnuExportTotalsToTSV.Size = New System.Drawing.Size(292, 22)
-        Me.mnuExportTotalsToTSV.Text = "Copy Recycling Totals to Clipboard (TSV)"
+        'chkCorpHangarMode
+        '
+        Me.chkCorpHangarMode.AutoSize = True
+        Me.chkCorpHangarMode.Checked = True
+        Me.chkCorpHangarMode.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.chkCorpHangarMode.Location = New System.Drawing.Point(171, 10)
+        Me.chkCorpHangarMode.Name = "chkCorpHangarMode"
+        Me.chkCorpHangarMode.Size = New System.Drawing.Size(116, 17)
+        Me.chkCorpHangarMode.TabIndex = 30
+        Me.chkCorpHangarMode.Text = "Corp Hangar Mode"
+        Me.chkCorpHangarMode.UseVisualStyleBackColor = True
         '
         'frmPrism
@@ -4147 +4161 @@
         Me.tabRecycle.ResumeLayout(False)
         Me.tabRecycle.PerformLayout()
+        Me.ctxRecycleExport.ResumeLayout(False)
         CType(Me.nudTax, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.nudBrokerFee, System.ComponentModel.ISupportInitialize).EndInit()
@@ -4169 +4184 @@
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
-        Me.ctxRecycleExport.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -4561 +4575 @@
     Friend WithEvents mnuExportTotalsToCSV As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mnuExportTotalsToTSV As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents chkCorpHangarMode As System.Windows.Forms.CheckBox
 End Class

trunk/EveHQ.Prism/Forms/frmPrism.resx

@@ -130 +130 @@
     <value>546, 17</value>
   </metadata>
+  <metadata name="ctxAPIStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 54</value>
+  </metadata>
   <metadata name="ctxRecycleExport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 54</value>
-  </metadata>
-  <metadata name="ctxAPIStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
   </metadata>
   <metadata name="ctxRecycleItems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

trunk/EveHQ.Prism/Forms/frmPrism.vb

@@ -54 +54 @@
     Dim totalAssetBatch As Long = 0
     Dim HQFShip As New ArrayList
+    Dim assetCorpMode As Boolean = False
     Dim IndustryTimeFormat As String = "yyyy-MM-dd HH:mm:ss"
     Dim culture As System.Globalization.CultureInfo = New System.Globalization.CultureInfo("en-GB")
@@ -806 +807 @@
             Dim rep As String = ""
             Dim IsCorp As Boolean = False
+            assetCorpMode = False
             ' See if this owner is a corp
             If PlugInData.CorpList.ContainsKey(owner) = True Then
                 IsCorp = True
+                assetCorpMode = chkCorpHangarMode.Checked
                 ' See if we have a representative
                 Dim CorpRep As SortedList = CType(PlugInData.CorpReps(0), Collections.SortedList)
@@ -1048 +1051 @@
         Dim subLoc As XmlNode
         Dim containerPrice As Double = 0
+        Dim AssetIsInHanger As Boolean = False
+        Dim hangarPrice As Double = 0
         Dim linePrice As Double = 0
         subLocList = loc.ChildNodes(0).ChildNodes
@@ -1097 +1102 @@
                 Dim subAsset As New ContainerListViewItem
                 subAsset.Tag = subLoc.Attributes.GetNamedItem("itemID").Value
-                parentAsset.Items.Add(subAsset)
+                Dim subFlagID As Integer = CInt(subLoc.Attributes.GetNamedItem("flag").Value)
+                Dim subFlagName As String = PlugInData.itemFlags(subFlagID).ToString
+                Dim accountID As Integer = subFlagID + 885
+                If accountID = 889 Then accountID = 1000
+                If assetOwner = selPilot.Corp And groupName <> "Station Services" Then
+                    If divisions.ContainsKey(selPilot.CorpID & "_" & accountID.ToString) = True Then
+                        subFlagName = CStr(divisions.Item(selPilot.CorpID & "_" & accountID.ToString))
+                        If assetCorpMode = True And parentAsset.Items.Count < 7 Then
+                            ' Build the corp division nodes
+                            For div As Integer = 0 To 6
+                                Dim hangar As New ContainerListViewItem
+                                hangar.Text = CStr(divisions.Item(selPilot.CorpID & "_" & (1000 + div).ToString))
+                                parentAsset.Items.Add(hangar)
+                                hangar.SubItems(AssetColumn.Value).Text = FormatNumber(0, 2)
+                            Next
+                        End If
+                    End If
+                End If
+                If assetCorpMode = True And (subFlagID = 4 Or (subFlagID >= 116 And subFlagID <= 121)) Then
+                    parentAsset.Items(accountID - 1000).Items.Add(subAsset)
+                    AssetIsInHanger = True
+                Else
+                    parentAsset.Items.Add(subAsset)
+                    AssetIsInHanger = False
+                End If
                 subAsset.SubItems(0).Tag = itemName
                 If PlugInData.AssetItemNames.ContainsKey(subAsset.Tag.ToString) = True Then
@@ -1107 +1136 @@
                 subAsset.SubItems(AssetColumn.Group).Text = groupName
                 subAsset.SubItems(AssetColumn.Category).Text = catName
-                Dim subFlagID As Integer = CInt(subLoc.Attributes.GetNamedItem("flag").Value)
-                Dim subFlagName As String = PlugInData.itemFlags(subFlagID).ToString
-                If assetOwner = selPilot.Corp And subAsset.SubItems(2).Text <> "Station Services" Then
-                    Dim accountID As Integer = subFlagID + 885
-                    If accountID = 889 Then accountID = 1000
-                    If divisions.ContainsKey(selPilot.CorpID & "_" & accountID.ToString) = True Then
-                        subFlagName = CStr(divisions.Item(selPilot.CorpID & "_" & accountID.ToString))
-                    End If
-                End If
                 subAsset.SubItems(AssetColumn.Location).Text = subFlagName
                 subAsset.SubItems(AssetColumn.Meta).Text = metaLevel
@@ -1154 +1174 @@
                 containerPrice += linePrice
                 subAsset.SubItems(AssetColumn.Value).Text = FormatNumber(linePrice, 2, TriState.UseDefault, TriState.UseDefault, TriState.UseDefault)
+
+                ' Update hangar price if applicable
+                If AssetIsInHanger = True Then
+                    hangarPrice = CDbl(subAsset.ParentItem.SubItems(AssetColumn.Value).Text)
+                    subAsset.ParentItem.SubItems(AssetColumn.Value).Text = FormatNumber(hangarPrice + linePrice, 2)
+                End If
 
                 ' Add the asset to the list of assets