Changeset 1287

Timestamp:

2/2/2010 3:55:36 AM (6 weeks ago)

Author:

vessper

Message:

02/02/2010

---

- Prism: Fixed Hangar Mode issues
- Prism: Update version

Location:

trunk/EveHQ.Prism

Files:

• Forms/frmPrism.Designer.vb (modified) (2 diffs)
• Forms/frmPrism.vb (modified) (4 diffs)
• My Project/AssemblyInfo.vb (modified) (1 diff)

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

@@ -24 +24 @@
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
-        Dim ListViewGroup3 As System.Windows.Forms.ListViewGroup = New System.Windows.Forms.ListViewGroup("Corporation", System.Windows.Forms.HorizontalAlignment.Left)
-        Dim ListViewGroup4 As System.Windows.Forms.ListViewGroup = New System.Windows.Forms.ListViewGroup("Personal", System.Windows.Forms.HorizontalAlignment.Left)
+        Dim ListViewGroup7 As System.Windows.Forms.ListViewGroup = New System.Windows.Forms.ListViewGroup("Corporation", System.Windows.Forms.HorizontalAlignment.Left)
+        Dim ListViewGroup8 As System.Windows.Forms.ListViewGroup = New System.Windows.Forms.ListViewGroup("Personal", System.Windows.Forms.HorizontalAlignment.Left)
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmPrism))
         Me.ctxAssets = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -1099 +1099 @@
         Me.lvwCharFilter.CheckBoxes = True
         Me.lvwCharFilter.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.colOwnerName})
-        ListViewGroup3.Header = "Corporation"
-        ListViewGroup3.Name = "grpCorporation"
-        ListViewGroup4.Header = "Personal"
-        ListViewGroup4.Name = "grpPersonal"
-        Me.lvwCharFilter.Groups.AddRange(New System.Windows.Forms.ListViewGroup() {ListViewGroup3, ListViewGroup4})
+        ListViewGroup7.Header = "Corporation"
+        ListViewGroup7.Name = "grpCorporation"
+        ListViewGroup8.Header = "Personal"
+        ListViewGroup8.Name = "grpPersonal"
+        Me.lvwCharFilter.Groups.AddRange(New System.Windows.Forms.ListViewGroup() {ListViewGroup7, ListViewGroup8})
         Me.lvwCharFilter.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
         Me.lvwCharFilter.Location = New System.Drawing.Point(32, 31)

trunk/EveHQ.Prism/Forms/frmPrism.vb

@@ -950 +950 @@
                             Dim accountID As Integer = flagID + 885
                             If accountID = 889 Then accountID = 1000
-                            If IsCorp = True And groupName <> "Station Services" Then
+                            If IsCorp = True And itemName <> "Office" Then
                                 If divisions.ContainsKey(selPilot.CorpID & "_" & accountID.ToString) = True Then
                                     flagName = CStr(divisions.Item(selPilot.CorpID & "_" & accountID.ToString))
-                                    If assetCorpMode = True And locNode.Items.Count < 7 Then
+                                    If assetCorpMode = True And locNode.Items.Count < 7 And itemName <> "Office" Then
                                         ' Build the corp division nodes
                                         For div As Integer = 0 To 6
@@ -966 +966 @@
 
                             ' Add the asset to the treelistview
-                            If assetCorpMode = True And (flagID = 4 Or (flagID >= 116 And flagID <= 121)) Then
+                            If assetCorpMode = True And itemName <> "Office" And (flagID = 4 Or (flagID >= 116 And flagID <= 121)) Then
                                 If (accountID - 1000) >= 0 And (accountID - 1000) < locNode.Items.Count Then
                                     locNode.Items(accountID - 1000).Items.Add(newAsset)
@@ -1150 +1150 @@
                 Dim accountID As Integer = subFlagID + 885
                 If accountID = 889 Then accountID = 1000
-                If assetOwner = selPilot.Corp And groupName <> "Station Services" Then
+                If assetOwner = selPilot.Corp And itemName <> "Office" 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
+                        If assetCorpMode = True And parentAsset.Items.Count < 7 And itemName <> "Office" Then
                             ' Build the corp division nodes
                             For div As Integer = 0 To 6
@@ -1164 +1164 @@
                     End If
                 End If
-                If assetCorpMode = True And (subFlagID = 4 Or (subFlagID >= 116 And subFlagID <= 121)) Then
+                If assetCorpMode = True And itemName <> "Office" And (subFlagID = 4 Or (subFlagID >= 116 And subFlagID <= 121)) Then
                     parentAsset.Items(accountID - 1000).Items.Add(subAsset)
                     AssetIsInHanger = True

trunk/EveHQ.Prism/My Project/AssemblyInfo.vb

@@ -32 +32 @@
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.14.1.1286")> 
-<Assembly: AssemblyFileVersion("1.14.1.1286")> 
+<Assembly: AssemblyVersion("1.14.1.1287")> 
+<Assembly: AssemblyFileVersion("1.14.1.1287")>