diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | 58bb0769bdf13a9747e900aa2f0955137738ce9d (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /storage/ndb/src | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-58bb0769bdf13a9747e900aa2f0955137738ce9d.tar.gz | |
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria
Now need to merge with latest xtradb before pushing
sql/ha_partition.cc:
Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
Changed to use opt_stack_trace instead of opt_pstack.
Removed references to pstack
sql/partition_element.h:
Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
Fixed wrong assert
Diffstat (limited to 'storage/ndb/src')
50 files changed, 225 insertions, 2698 deletions
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs index ea1798c8c67..b19875b97ef 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs index 9763fac5622..5ee35e5e90e 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs index c01e41f3e60..506cb6777f0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs index 5b4d1b56df7..a126c632ffd 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs index 39b8c160159..80a8daee2d0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs index f492aa64c60..a780190f86c 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + //author:Arun //date:Nov 13,2002 //Wizard using panel diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs index c1ee1b2fe9e..eac12d4868e 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs index 581b8383e7c..ab8d58ed11f 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs index b3a2361bcb0..41929c104d0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Text; using System.Collections.Specialized; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs index b8ff2844af9..6e070875b25 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Collections; using System.IO; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs index 2cef5d34f17..9025f122994 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Net; using System.Net.Sockets; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs index 9c0d82a0b27..25d0d9947d6 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Net; using System.Net.Sockets; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs index cecfcaeb0f3..4261efc8a29 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs index a7966947e1f..5258ad290fc 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls deleted file mode 100644 index 5b42dfeadb6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls +++ /dev/null @@ -1,20 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Computer" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_ip As String -Public m_name As String -Public m_status As String -Public m_processes As Collection - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls deleted file mode 100644 index dfb1195d910..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls +++ /dev/null @@ -1,18 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Database_" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_name As String -Public m_processes As Collection -Public m_status As String diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico Binary files differdeleted file mode 100644 index 34b85992394..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico Binary files differdeleted file mode 100644 index fe30ff5d1e6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico Binary files differdeleted file mode 100644 index af0a1294f9e..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico Binary files differdeleted file mode 100644 index e8caf6e9a73..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico Binary files differdeleted file mode 100644 index 2deff5472bc..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico Binary files differdeleted file mode 100644 index 9cab239de23..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico Binary files differdeleted file mode 100644 index f05c95f74fe..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico Binary files differdeleted file mode 100644 index 800606eda0c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico Binary files differdeleted file mode 100644 index a2404977771..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico Binary files differdeleted file mode 100644 index 9dadb12cfbe..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico Binary files differdeleted file mode 100644 index a13c80c81b4..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico Binary files differdeleted file mode 100644 index 5eb4c06815d..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC b/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC deleted file mode 100644 index 3100640f8bd..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC +++ /dev/null @@ -1,5 +0,0 @@ -[SCC] -SCC=This is a source code control file -[NdbCPC.vbp] -SCC_Project_Name=this project is not under source code control -SCC_Aux_Path=<This is an empty string for the mssccprj.scc file> diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas b/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas deleted file mode 100644 index ae8ed444a41..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas +++ /dev/null @@ -1,233 +0,0 @@ -Attribute VB_Name = "Module1" -Option Explicit -Public fMainForm As frmMain -Public g_computers As New Collection -Public g_databases As New Collection - -Sub Main() - If False Then - Dim fLogin As New frmLogin - fLogin.Show vbModal - If Not fLogin.OK Then - 'Login Failed so exit app - End - End If - Unload fLogin - - frmSplash.Show - frmSplash.Refresh - End If - - init - - Set fMainForm = New frmMain - Load fMainForm - Unload frmSplash - - fMainForm.Show -End Sub - -Private Sub init() - Dim c As Computer - Dim p As Process - - ' --- - ' One node configuration - ' - Set c = New Computer - With c - .m_ip = "130.100.232.31" - .m_name = "ndb-client31" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "mgm-1" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - Set p = New Process - With p - .m_id = "2" - .m_name = "ndb-2" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - Set p = New Process - With p - .m_id = "3" - .m_name = "api-3" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - ' --- - ' Two node configuration - ' - Set p = New Process - With p - .m_id = "4" - .m_name = "mgm-1" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.1.1" - .m_name = "cluster-1" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "ndb-2" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.2.1" - .m_name = "cluster-2" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "ndb-3" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.3.1" - .m_name = "cluster-3" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "api-4" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.4.1" - .m_name = "cluster-4" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "api-5" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "130.100.232.5" - .m_name = "ndbs05" - .m_status = "Not connected" - Set .m_processes = New Collection - End With - addComputer c - - Set c = New Computer - With c - .m_ip = "130.100.232.7" - .m_name = "ndb-srv7" - .m_status = "No contact" - Set .m_processes = New Collection - End With - addComputer c - -End Sub - -Public Sub addComputer(ByRef c As Computer) - g_computers.Add c, "_" & c.m_name -End Sub - -Private Sub addProcess(ByRef c As Computer, ByRef p As Process) - c.m_processes.Add p, "_" & p.m_id - - Dim cl As Database_ - If Not Exists(g_databases, "_" & p.m_database) Then - Set cl = New Database_ - With cl - .m_name = p.m_database - .m_status = "Unknown" - Set .m_processes = New Collection - End With - g_databases.Add cl, "_" & p.m_database - Else - Set cl = g_databases("_" & p.m_database) - End If - cl.m_processes.Add p, "_" & p.m_computer.m_name & "_" & p.m_id -End Sub - -Public Function Exists(ByRef c As Collection, ByVal k As String) As Boolean - Dim r As Boolean - Dim o As Object - - r = True - - On Error GoTo NotFound - Set o = c.Item(k) - GoTo Continue -NotFound: - If Err.Number <> 5 Then - Err.Raise Err.Number, Err.Source, Err.Description - End If - - r = False -Continue: - Exists = r -End Function - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp deleted file mode 100644 index dc8f3780a74..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp +++ /dev/null @@ -1,49 +0,0 @@ -Type=Exe -Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx -Module=Module1; Module1.bas -Form=frmMain.frm -Form=frmSplash.frm -Form=frmLogin.frm -Form=frmOptions.frm -Form=frmAbout.frm -Class=Computer; Computer.cls -Class=Process; Process.cls -Class=Database_; Database.cls -Form=frmNewComputer.frm -Form=frmNewDatabase3.frm -Form=frmNewDatabase1.frm -Form=frmNewDatabase2.frm -IconForm="frmAbout" -Startup="Sub Main" -HelpFile="" -Title="NdbCPC" -ExeName32="NdbCPC.exe" -Command32="" -Name="NdbCPC" -HelpContextID="0" -CompatibleMode="0" -MajorVer=1 -MinorVer=0 -RevisionVer=0 -AutoIncrementVer=0 -ServerSupportFiles=0 -VersionCompanyName="ctp" -CompilationType=0 -OptimizationType=0 -FavorPentiumPro(tm)=0 -CodeViewDebugInfo=0 -NoAliasing=0 -BoundsCheck=0 -OverflowCheck=0 -FlPointCheck=0 -FDIVCheck=0 -UnroundedFP=0 -StartMode=0 -Unattended=0 -Retained=0 -ThreadPerObject=0 -MaxNumberOfThreads=1 -DebugStartupOption=0 - -[MS Transaction Server] -AutoRefresh=1 diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw deleted file mode 100644 index 825abbc923a..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw +++ /dev/null @@ -1,13 +0,0 @@ -Module1 = 44, 44, 577, 492, -frmMain = 44, 44, 577, 492, , 66, 66, 599, 514, C -frmSplash = 132, 132, 670, 576, C, 88, 88, 621, 536, C -frmLogin = 0, 0, 538, 444, C, 110, 110, 643, 558, C -frmOptions = 176, 176, 714, 620, C, 132, 132, 665, 580, C -frmAbout = 132, 132, 759, 511, C, 154, 154, 687, 602, C -Computer = 110, 110, 648, 554, -Process = 132, 132, 670, 576, C -Database_ = 88, 88, 626, 532, C -frmNewComputer = 44, 44, 582, 488, , 22, 22, 390, 218, C -frmNewDatabase3 = 0, 0, 506, 444, , 0, 0, 506, 444, C -frmNewDatabase1 = 132, 132, 638, 550, , 154, 154, 660, 572, C -frmNewDatabase2 = 198, 198, 704, 616, , 176, 176, 682, 594, C diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls deleted file mode 100644 index fcb4c2cbb2c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls +++ /dev/null @@ -1,22 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Process" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_computer As Computer -Public m_id As String -Public m_name As String -Public m_database As String -Public m_status As String -Public m_owner As String - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico Binary files differdeleted file mode 100644 index fe82350d376..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico b/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico Binary files differdeleted file mode 100644 index d73302d1cd5..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm deleted file mode 100644 index b842d20de21..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm +++ /dev/null @@ -1,245 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmAbout - BorderStyle = 3 'Fixed Dialog - Caption = "About NdbCPC" - ClientHeight = 3630 - ClientLeft = 45 - ClientTop = 330 - ClientWidth = 5865 - ClipControls = 0 'False - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3630 - ScaleWidth = 5865 - ShowInTaskbar = 0 'False - StartUpPosition = 1 'CenterOwner - Tag = "About NdbCPC" - Begin VB.PictureBox picIcon - AutoSize = -1 'True - BackColor = &H00C0C0C0& - ClipControls = 0 'False - Height = 540 - Left = 240 - Picture = "frmAbout.frx":0000 - ScaleHeight = 480 - ScaleMode = 0 'User - ScaleWidth = 480 - TabIndex = 2 - TabStop = 0 'False - Top = 240 - Width = 540 - End - Begin VB.CommandButton cmdOK - Cancel = -1 'True - Caption = "OK" - Default = -1 'True - Height = 345 - Left = 4245 - TabIndex = 0 - Tag = "OK" - Top = 2625 - Width = 1467 - End - Begin VB.CommandButton cmdSysInfo - Caption = "&System Info..." - Height = 345 - Left = 4260 - TabIndex = 1 - Tag = "&System Info..." - Top = 3075 - Width = 1452 - End - Begin VB.Label lblDescription - Caption = "App Description" - ForeColor = &H00000000& - Height = 1170 - Left = 1050 - TabIndex = 6 - Tag = "App Description" - Top = 1125 - Width = 4092 - End - Begin VB.Label lblTitle - Caption = "Application Title" - ForeColor = &H00000000& - Height = 480 - Left = 1050 - TabIndex = 5 - Tag = "Application Title" - Top = 240 - Width = 4092 - End - Begin VB.Line Line1 - BorderColor = &H00808080& - BorderStyle = 6 'Inside Solid - Index = 1 - X1 = 225 - X2 = 5657 - Y1 = 2430 - Y2 = 2430 - End - Begin VB.Line Line1 - BorderColor = &H00FFFFFF& - BorderWidth = 2 - Index = 0 - X1 = 240 - X2 = 5657 - Y1 = 2445 - Y2 = 2445 - End - Begin VB.Label lblVersion - Caption = "Version" - Height = 225 - Left = 1050 - TabIndex = 4 - Tag = "Version" - Top = 780 - Width = 4092 - End - Begin VB.Label lblDisclaimer - Caption = "Warning: ..." - ForeColor = &H00000000& - Height = 825 - Left = 255 - TabIndex = 3 - Tag = "Warning: ..." - Top = 2625 - Width = 3870 - End -End -Attribute VB_Name = "frmAbout" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -' Reg Key Security Options... -Const KEY_ALL_ACCESS = &H2003F - - -' Reg Key ROOT Types... -Const HKEY_LOCAL_MACHINE = &H80000002 -Const ERROR_SUCCESS = 0 -Const REG_SZ = 1 ' Unicode nul terminated string -Const REG_DWORD = 4 ' 32-bit number - - -Const gREGKEYSYSINFOLOC = "SOFTWARE\Microsoft\Shared Tools Location" -Const gREGVALSYSINFOLOC = "MSINFO" -Const gREGKEYSYSINFO = "SOFTWARE\Microsoft\Shared Tools\MSINFO" -Const gREGVALSYSINFO = "PATH" - - -Private Declare Function RegOpenKeyEx Lib "advapi32" Alias "RegOpenKeyExA" (ByVal hKey As Long, ByVal lpSubKey As String, ByVal ulOptions As Long, ByVal samDesired As Long, ByRef phkResult As Long) As Long -Private Declare Function RegQueryValueEx Lib "advapi32" Alias "RegQueryValueExA" (ByVal hKey As Long, ByVal lpValueName As String, ByVal lpReserved As Long, ByRef lpType As Long, ByVal lpData As String, ByRef lpcbData As Long) As Long -Private Declare Function RegCloseKey Lib "advapi32" (ByVal hKey As Long) As Long - -Private Sub Form_Load() - lblVersion.Caption = "Version " & App.Major & "." & App.Minor & "." & App.Revision - lblTitle.Caption = App.Title -End Sub - - - -Private Sub cmdSysInfo_Click() - Call StartSysInfo -End Sub - - -Private Sub cmdOK_Click() - Unload Me -End Sub - - -Public Sub StartSysInfo() - On Error GoTo SysInfoErr - - - Dim rc As Long - Dim SysInfoPath As String - - - ' Try To Get System Info Program Path\Name From Registry... - If GetKeyValue(HKEY_LOCAL_MACHINE, gREGKEYSYSINFO, gREGVALSYSINFO, SysInfoPath) Then - ' Try To Get System Info Program Path Only From Registry... - ElseIf GetKeyValue(HKEY_LOCAL_MACHINE, gREGKEYSYSINFOLOC, gREGVALSYSINFOLOC, SysInfoPath) Then - ' Validate Existance Of Known 32 Bit File Version - If (Dir(SysInfoPath & "\MSINFO32.EXE") <> "") Then - SysInfoPath = SysInfoPath & "\MSINFO32.EXE" - - - ' Error - File Can Not Be Found... - Else - GoTo SysInfoErr - End If - ' Error - Registry Entry Can Not Be Found... - Else - GoTo SysInfoErr - End If - - - Call Shell(SysInfoPath, vbNormalFocus) - - - Exit Sub -SysInfoErr: - MsgBox "System Information Is Unavailable At This Time", vbOKOnly -End Sub - - -Public Function GetKeyValue(KeyRoot As Long, KeyName As String, SubKeyRef As String, ByRef KeyVal As String) As Boolean - Dim i As Long ' Loop Counter - Dim rc As Long ' Return Code - Dim hKey As Long ' Handle To An Open Registry Key - Dim hDepth As Long ' - Dim KeyValType As Long ' Data Type Of A Registry Key - Dim tmpVal As String ' Tempory Storage For A Registry Key Value - Dim KeyValSize As Long ' Size Of Registry Key Variable - '------------------------------------------------------------ - ' Open RegKey Under KeyRoot {HKEY_LOCAL_MACHINE...} - '------------------------------------------------------------ - rc = RegOpenKeyEx(KeyRoot, KeyName, 0, KEY_ALL_ACCESS, hKey) ' Open Registry Key - - - If (rc <> ERROR_SUCCESS) Then GoTo GetKeyError ' Handle Error... - - - tmpVal = String$(1024, 0) ' Allocate Variable Space - KeyValSize = 1024 ' Mark Variable Size - - - '------------------------------------------------------------ - ' Retrieve Registry Key Value... - '------------------------------------------------------------ - rc = RegQueryValueEx(hKey, SubKeyRef, 0, KeyValType, tmpVal, KeyValSize) ' Get/Create Key Value - - - If (rc <> ERROR_SUCCESS) Then GoTo GetKeyError ' Handle Errors - - - tmpVal = VBA.Left(tmpVal, InStr(tmpVal, VBA.Chr(0)) - 1) - '------------------------------------------------------------ - ' Determine Key Value Type For Conversion... - '------------------------------------------------------------ - Select Case KeyValType ' Search Data Types... - Case REG_SZ ' String Registry Key Data Type - KeyVal = tmpVal ' Copy String Value - Case REG_DWORD ' Double Word Registry Key Data Type - For i = Len(tmpVal) To 1 Step -1 ' Convert Each Bit - KeyVal = KeyVal + Hex(Asc(Mid(tmpVal, i, 1))) ' Build Value Char. By Char. - Next - KeyVal = Format$("&h" + KeyVal) ' Convert Double Word To String - End Select - - - GetKeyValue = True ' Return Success - rc = RegCloseKey(hKey) ' Close Registry Key - Exit Function ' Exit - - -GetKeyError: ' Cleanup After An Error Has Occured... - KeyVal = "" ' Set Return Val To Empty String - GetKeyValue = False ' Return Failure - rc = RegCloseKey(hKey) ' Close Registry Key -End Function - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm deleted file mode 100644 index d4d663c93c2..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm +++ /dev/null @@ -1,119 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmLogin - BorderStyle = 3 'Fixed Dialog - Caption = "Login" - ClientHeight = 1590 - ClientLeft = 45 - ClientTop = 330 - ClientWidth = 3750 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 1590 - ScaleWidth = 3750 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Tag = "Login" - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 360 - Left = 2100 - TabIndex = 5 - Tag = "Cancel" - Top = 1020 - Width = 1140 - End - Begin VB.CommandButton cmdOK - Caption = "OK" - Default = -1 'True - Height = 360 - Left = 495 - TabIndex = 4 - Tag = "OK" - Top = 1020 - Width = 1140 - End - Begin VB.TextBox txtPassword - Height = 285 - IMEMode = 3 'DISABLE - Left = 1305 - PasswordChar = "*" - TabIndex = 1 - Top = 525 - Width = 2325 - End - Begin VB.TextBox txtUserName - Height = 285 - Left = 1305 - TabIndex = 3 - Top = 135 - Width = 2325 - End - Begin VB.Label lblLabels - Caption = "&Password:" - Height = 248 - Index = 1 - Left = 105 - TabIndex = 0 - Tag = "&Password:" - Top = 540 - Width = 1080 - End - Begin VB.Label lblLabels - Caption = "&User Name:" - Height = 248 - Index = 0 - Left = 105 - TabIndex = 2 - Tag = "&User Name:" - Top = 150 - Width = 1080 - End -End -Attribute VB_Name = "frmLogin" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Private Declare Function GetUserName Lib "advapi32.dll" Alias "GetUserNameA" (ByVal lpbuffer As String, nSize As Long) As Long - - -Public OK As Boolean -Private Sub Form_Load() - Dim sBuffer As String - Dim lSize As Long - - - sBuffer = Space$(255) - lSize = Len(sBuffer) - Call GetUserName(sBuffer, lSize) - If lSize > 0 Then - txtUserName.Text = Left$(sBuffer, lSize) - Else - txtUserName.Text = vbNullString - End If -End Sub - - - -Private Sub cmdCancel_Click() - OK = False - Me.Hide -End Sub - - -Private Sub cmdOK_Click() - 'ToDo: create test for correct password - 'check for correct password - If txtPassword.Text = "" Then - OK = True - Me.Hide - Else - MsgBox "Invalid Password, try again!", , "Login" - txtPassword.SetFocus - txtPassword.SelStart = 0 - txtPassword.SelLength = Len(txtPassword.Text) - End If -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm deleted file mode 100644 index a4bf5b58941..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm +++ /dev/null @@ -1,1207 +0,0 @@ -VERSION 5.00 -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx" -Begin VB.Form frmMain - Caption = "NdbCPC" - ClientHeight = 5955 - ClientLeft = 2115 - ClientTop = 2250 - ClientWidth = 8880 - LinkTopic = "Form1" - ScaleHeight = 5955 - ScaleWidth = 8880 - Begin MSComctlLib.ImageList ImageList1 - Left = 6840 - Top = 3120 - _ExtentX = 1005 - _ExtentY = 1005 - BackColor = 16777215 - ImageWidth = 16 - ImageHeight = 16 - MaskColor = 12632256 - _Version = 393216 - BeginProperty Images {2C247F25-8591-11D1-B16A-00C0F0283628} - NumListImages = 11 - BeginProperty ListImage1 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":0000 - Key = "close" - EndProperty - BeginProperty ListImage2 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":27B4 - Key = "open" - EndProperty - BeginProperty ListImage3 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":4F68 - Key = "computer_unknown" - EndProperty - BeginProperty ListImage4 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5284 - Key = "computer_stopped" - EndProperty - BeginProperty ListImage5 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":55A0 - Key = "computer_started" - EndProperty - BeginProperty ListImage6 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":58BC - Key = "" - EndProperty - BeginProperty ListImage7 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5BD8 - Key = "" - EndProperty - BeginProperty ListImage8 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5EF4 - Key = "" - EndProperty - BeginProperty ListImage9 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":6210 - Key = "db" - EndProperty - BeginProperty ListImage10 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":652A - Key = "computer" - EndProperty - BeginProperty ListImage11 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":6844 - Key = "properties" - EndProperty - EndProperty - End - Begin VB.PictureBox picSplitter - BackColor = &H00808080& - BorderStyle = 0 'None - FillColor = &H00808080& - Height = 4800 - Left = 5400 - ScaleHeight = 2090.126 - ScaleMode = 0 'User - ScaleWidth = 780 - TabIndex = 6 - Top = 705 - Width = 72 - Visible = 0 'False - End - Begin MSComctlLib.TreeView tvTreeView - Height = 4800 - Left = 0 - TabIndex = 5 - Top = 705 - Width = 2016 - _ExtentX = 3545 - _ExtentY = 8467 - _Version = 393217 - HideSelection = 0 'False - Indentation = 0 - LineStyle = 1 - Sorted = -1 'True - Style = 7 - FullRowSelect = -1 'True - ImageList = "ImageList1" - Appearance = 1 - End - Begin VB.PictureBox picTitles - Align = 1 'Align Top - Appearance = 0 'Flat - BorderStyle = 0 'None - ForeColor = &H80000008& - Height = 300 - Left = 0 - ScaleHeight = 300 - ScaleWidth = 8880 - TabIndex = 2 - TabStop = 0 'False - Top = 420 - Width = 8880 - Begin VB.Label lblTitle - BorderStyle = 1 'Fixed Single - Caption = " ListView:" - Height = 270 - Index = 1 - Left = 2078 - TabIndex = 4 - Tag = " ListView:" - Top = 12 - Width = 3216 - End - Begin VB.Label lblTitle - BorderStyle = 1 'Fixed Single - Caption = " TreeView:" - Height = 270 - Index = 0 - Left = 0 - TabIndex = 3 - Tag = " TreeView:" - Top = 12 - Width = 2016 - End - End - Begin MSComctlLib.Toolbar tbToolBar - Align = 1 'Align Top - Height = 420 - Left = 0 - TabIndex = 1 - Top = 0 - Width = 8880 - _ExtentX = 15663 - _ExtentY = 741 - ButtonWidth = 609 - ButtonHeight = 582 - Appearance = 1 - ImageList = "ImageList1" - _Version = 393216 - BeginProperty Buttons {66833FE8-8583-11D1-B16A-00C0F0283628} - NumButtons = 5 - BeginProperty Button1 {66833FEA-8583-11D1-B16A-00C0F0283628} - Style = 3 - EndProperty - BeginProperty Button2 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "Add computer" - Object.ToolTipText = "Add computer" - ImageKey = "computer" - EndProperty - BeginProperty Button3 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "New database" - Object.ToolTipText = "New database" - ImageKey = "db" - EndProperty - BeginProperty Button4 {66833FEA-8583-11D1-B16A-00C0F0283628} - Style = 3 - EndProperty - BeginProperty Button5 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "Properties" - Object.ToolTipText = "Properties" - ImageKey = "properties" - EndProperty - EndProperty - End - Begin MSComctlLib.StatusBar sbStatusBar - Align = 2 'Align Bottom - Height = 270 - Left = 0 - TabIndex = 0 - Top = 5685 - Width = 8880 - _ExtentX = 15663 - _ExtentY = 476 - _Version = 393216 - BeginProperty Panels {8E3867A5-8586-11D1-B16A-00C0F0283628} - NumPanels = 3 - BeginProperty Panel1 {8E3867AB-8586-11D1-B16A-00C0F0283628} - AutoSize = 1 - Object.Width = 10028 - Text = "Status" - TextSave = "Status" - EndProperty - BeginProperty Panel2 {8E3867AB-8586-11D1-B16A-00C0F0283628} - Style = 6 - AutoSize = 2 - TextSave = "2002-10-15" - EndProperty - BeginProperty Panel3 {8E3867AB-8586-11D1-B16A-00C0F0283628} - Style = 5 - AutoSize = 2 - TextSave = "09:44" - EndProperty - EndProperty - End - Begin MSComctlLib.ListView lvProcesses - Height = 4815 - Left = 2040 - TabIndex = 8 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = 0 'False - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 6 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Key = "Id" - Text = "Id" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Key = "Computer" - Text = "Computer" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(3) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 2 - Key = "Database" - Text = "Database" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(4) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 3 - Key = "Name" - Text = "Name" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(5) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 4 - Key = "Status" - Text = "Status" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(6) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 5 - Key = "Owner" - Text = "Owner" - Object.Width = 2540 - EndProperty - End - Begin MSComctlLib.ListView lvComputers - Height = 4815 - Left = 2040 - TabIndex = 7 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = -1 'True - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - Icons = "ImageList1" - SmallIcons = "ImageList1" - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 2 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Text = "Computer" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Text = "Status" - Object.Width = 2540 - EndProperty - End - Begin MSComctlLib.ListView lvDatabases - Height = 4815 - Left = 2040 - TabIndex = 9 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - View = 3 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = -1 'True - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - Icons = "ImageList1" - SmallIcons = "ImageList1" - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 2 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Key = "Database" - Text = "Database" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Key = "Status" - Text = "Status" - Object.Width = 2540 - EndProperty - End - Begin VB.Image imgSplitter - Height = 4788 - Left = 1965 - MousePointer = 9 'Size W E - Top = 705 - Width = 150 - End - Begin VB.Menu mnuFile - Caption = "&File" - Begin VB.Menu mnuFileOpen - Caption = "&Open..." - End - Begin VB.Menu mnuFileFind - Caption = "&Find" - End - Begin VB.Menu mnuFileBar0 - Caption = "-" - End - Begin VB.Menu mnuFileSendTo - Caption = "Sen&d to" - End - Begin VB.Menu mnuFileBar1 - Caption = "-" - End - Begin VB.Menu mnuFileNew - Caption = "&New" - Shortcut = ^N - End - Begin VB.Menu mnuFileBar2 - Caption = "-" - End - Begin VB.Menu mnuFileDelete - Caption = "&Delete" - End - Begin VB.Menu mnuFileRename - Caption = "Rena&me" - End - Begin VB.Menu mnuFileProperties - Caption = "Propert&ies" - End - Begin VB.Menu mnuFileBar3 - Caption = "-" - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 1 - Visible = 0 'False - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 2 - Visible = 0 'False - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 3 - Visible = 0 'False - End - Begin VB.Menu mnuFileBar4 - Caption = "-" - Visible = 0 'False - End - Begin VB.Menu mnuFileBar5 - Caption = "-" - End - Begin VB.Menu mnuFileClose - Caption = "&Close" - End - End - Begin VB.Menu mnuEdit - Caption = "&Edit" - Begin VB.Menu mnuEditUndo - Caption = "&Undo" - End - Begin VB.Menu mnuEditBar0 - Caption = "-" - End - Begin VB.Menu mnuEditCut - Caption = "Cu&t" - Shortcut = ^X - End - Begin VB.Menu mnuEditCopy - Caption = "&Copy" - Shortcut = ^C - End - Begin VB.Menu mnuEditPaste - Caption = "&Paste" - Shortcut = ^V - End - Begin VB.Menu mnuEditPasteSpecial - Caption = "Paste &Special..." - End - Begin VB.Menu mnuEditBar1 - Caption = "-" - End - Begin VB.Menu mnuEditSelectAll - Caption = "Select &All" - Shortcut = ^A - End - Begin VB.Menu mnuEditInvertSelection - Caption = "&Invert Selection" - End - End - Begin VB.Menu mnuView - Caption = "&View" - Begin VB.Menu mnuViewToolbar - Caption = "&Toolbar" - Checked = -1 'True - End - Begin VB.Menu mnuViewStatusBar - Caption = "Status &Bar" - Checked = -1 'True - End - Begin VB.Menu mnuViewBar0 - Caption = "-" - End - Begin VB.Menu mnuListViewMode - Caption = "Lar&ge Icons" - Index = 0 - End - Begin VB.Menu mnuListViewMode - Caption = "S&mall Icons" - Index = 1 - End - Begin VB.Menu mnuListViewMode - Caption = "&List" - Index = 2 - End - Begin VB.Menu mnuListViewMode - Caption = "&Details" - Index = 3 - End - Begin VB.Menu mnuViewBar1 - Caption = "-" - End - Begin VB.Menu mnuViewArrangeIcons - Caption = "Arrange &Icons" - End - Begin VB.Menu mnuViewBar2 - Caption = "-" - End - Begin VB.Menu mnuViewRefresh - Caption = "&Refresh" - End - Begin VB.Menu mnuViewOptions - Caption = "&Options..." - End - Begin VB.Menu mnuViewWebBrowser - Caption = "&Web Browser" - End - End - Begin VB.Menu mnuHelp - Caption = "&Help" - Begin VB.Menu mnuHelpContents - Caption = "&Contents" - End - Begin VB.Menu mnuHelpSearchForHelpOn - Caption = "&Search For Help On..." - End - Begin VB.Menu mnuHelpBar0 - Caption = "-" - End - Begin VB.Menu mnuHelpAbout - Caption = "&About " - End - End - Begin VB.Menu mnuPopComputers - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopAddComputer - Caption = "Add computer" - End - Begin VB.Menu mnuPop__ - Caption = "-" - End - Begin VB.Menu mnuPopSortComputers - Caption = "Sorted" - End - End - Begin VB.Menu mnuPopDatabases - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopNewDatabase - Caption = "New database" - End - Begin VB.Menu mnuPopSortDatabases0 - Caption = "-" - End - Begin VB.Menu mnuPopSortDatabases - Caption = "Sorted" - End - End - Begin VB.Menu mnuPopComputer - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopComputerName - Caption = "ComputerName" - Enabled = 0 'False - End - Begin VB.Menu mnuPopComputer0 - Caption = "-" - End - Begin VB.Menu mnuPopConnectComputer - Caption = "Connect" - End - Begin VB.Menu mnuPopDisconnectComputer - Caption = "Disconnect" - End - Begin VB.Menu mnuPopRemoveComputer - Caption = "Remove" - End - Begin VB.Menu mnuComputer1 - Caption = "-" - End - Begin VB.Menu mnuPopComputerProperties - Caption = "Properties" - End - End -End -Attribute VB_Name = "frmMain" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit -Private Declare Function OSWinHelp% Lib "user32" Alias "WinHelpA" (ByVal hwnd&, ByVal HelpFile$, ByVal wCommand%, dwData As Any) - -Dim mbMoving As Boolean -Const sglSplitLimit = 500 -Dim m_currentNode As MSComctlLib.Node -Dim m_currentList As ListView - -Dim m_currentView As Integer -Dim m_computerWidth As Integer -Dim m_databaseWidth As Integer - -Dim m_currentComputer As Computer -Dim m_currentDatabase As Database_ - -Private Sub Form_Load() - tvTreeView.Nodes.Clear - lvComputers.ListItems.Clear - lvProcesses.ListItems.Clear - lvDatabases.ListItems.Clear - - Me.Left = GetSetting(App.Title, "Settings", "MainLeft", 1000) - Me.Top = GetSetting(App.Title, "Settings", "MainTop", 1000) - Me.Width = GetSetting(App.Title, "Settings", "MainWidth", 6500) - Me.Height = GetSetting(App.Title, "Settings", "MainHeight", 6500) - - tvTreeView.Nodes.Add , tvwChild, "Computers", "Computers", 1, 2 - Dim c As Computer - For Each c In g_computers - addComputer c - Next - - Set m_currentNode = tvTreeView.Nodes("Computers") - Set m_currentList = lvComputers - - tvTreeView.Nodes.Add , tvwChild, "Databases", "Databases", 1, 2 - Dim d As Database_ - For Each d In g_databases - AddDatabase d - Next - - lvComputers.Visible = True - lvProcesses.Visible = False - lvDatabases.Visible = False - lvComputers.View = lvwReport - lvProcesses.View = lvwReport - lvDatabases.View = lvwReport - m_computerWidth = lvProcesses.ColumnHeaders("Computer").Width - m_databaseWidth = lvProcesses.ColumnHeaders("Database").Width - lvProcesses.ColumnHeaders("Id").Width = 0 -End Sub - -Private Sub setComputer(ByVal f_ip As String) - Dim c As Computer - Set c = g_computers(f_ip) - If c Is Nothing Then - MsgBox "Unknown computer: " & f_ip - Exit Sub - End If - - Set m_currentComputer = c - - lblTitle(1).Caption = "Processes defined on computer: " & c.m_name - setProcesses c.m_processes - - If lvProcesses.ColumnHeaders("Computer").Width <> 0 Then - m_computerWidth = lvProcesses.ColumnHeaders("Computer").Width - lvProcesses.ColumnHeaders("Computer").Width = 0 - End If - - If lvProcesses.ColumnHeaders("Database").Width = 0 Then - lvProcesses.ColumnHeaders("Database").Width = m_databaseWidth - End If -End Sub - -Private Sub setDatabase(ByVal f_name As String) - Dim c As Database_ - Set c = g_databases(f_name) - If c Is Nothing Then - MsgBox "Unknown database: " & f_name - Exit Sub - End If - - Set m_currentDatabase = c - - lblTitle(1).Caption = "Processes defined for database: " & c.m_name - setProcesses c.m_processes - - If lvProcesses.ColumnHeaders("Database").Width <> 0 Then - m_databaseWidth = lvProcesses.ColumnHeaders("Database").Width - lvProcesses.ColumnHeaders("Database").Width = 0 - End If - - If lvProcesses.ColumnHeaders("Computer").Width = 0 Then - lvProcesses.ColumnHeaders("Computer").Width = m_computerWidth - End If - -End Sub - -Private Sub setProcesses(ByRef c As Collection) - lvProcesses.ListItems.Clear - Dim p As Process - For Each p In c - Dim li As ListItem - Set li = lvProcesses.ListItems.Add(, "_" & p.m_computer.m_name & "_" & p.m_id, p.m_id) - li.SubItems(1) = p.m_computer.m_name - li.SubItems(2) = p.m_database - li.SubItems(3) = p.m_name - li.SubItems(4) = p.m_status - li.SubItems(5) = p.m_owner - Next -End Sub - -Public Sub addComputer(ByRef c As Computer) - Dim icon As Integer - Select Case c.m_status - Case "No contact" - icon = 4 - Case "Connected" - icon = 5 - Case Else - icon = 3 - End Select - - Dim li As ListItem - Set li = lvComputers.ListItems.Add(, "_" & c.m_name, c.m_name, icon, icon) - li.SubItems(1) = c.m_status - - tvTreeView.Nodes.Add "Computers", tvwChild, "_" & c.m_name, c.m_name, icon, icon -End Sub - -Public Sub removeComputer(ByRef name As String) - lvComputers.ListItems.Remove "_" & name - tvTreeView.Nodes.Remove "_" & name - - ' - ' Check if should remove database - Dim c As Computer - Set c = g_computers("_" & name) - Dim db As Database_ - Dim dbs As New Collection - Dim p As Process - For Each p In c.m_processes - Set db = g_databases("_" & p.m_database) - db.m_processes.Remove "_" & p.m_computer.m_name & "_" & p.m_id - If Not Exists(dbs, p.m_database) Then dbs.Add db, p.m_database - Next - - For Each db In dbs - If db.m_processes.Count = 0 Then - g_databases.Remove "_" & db.m_name - tvTreeView.Nodes.Remove "_" & db.m_name - End If - Next - - g_computers.Remove "_" & name - - ' - ' Check if should remove database - - Dim n As MSComctlLib.Node - Set n = tvTreeView.SelectedItem - selectNode n -End Sub - -Private Sub AddDatabase(ByRef c As Database_) - Dim li As ListItem - Set li = lvDatabases.ListItems.Add(, "_" & c.m_name, c.m_name, 9, 9) - li.SubItems(1) = c.m_status - tvTreeView.Nodes.Add "Databases", tvwChild, "_" & c.m_name, c.m_name, 9, 9 -End Sub - -Private Sub Form_Unload(Cancel As Integer) - Dim i As Integer - - - 'close all sub forms - For i = Forms.Count - 1 To 1 Step -1 - Unload Forms(i) - Next - If Me.WindowState <> vbMinimized Then - SaveSetting App.Title, "Settings", "MainLeft", Me.Left - SaveSetting App.Title, "Settings", "MainTop", Me.Top - SaveSetting App.Title, "Settings", "MainWidth", Me.Width - SaveSetting App.Title, "Settings", "MainHeight", Me.Height - End If -End Sub - -Private Sub Form_Resize() - On Error Resume Next - If Me.Width < 3000 Then Me.Width = 3000 - SizeControls imgSplitter.Left -End Sub - -Private Sub imgSplitter_MouseDown(Button As Integer, Shift As Integer, X As Single, Y As Single) - With imgSplitter - picSplitter.Move .Left, .Top, .Width \ 2, .Height - 20 - End With - picSplitter.Visible = True - mbMoving = True -End Sub - -Private Sub imgSplitter_MouseMove(Button As Integer, Shift As Integer, X As Single, Y As Single) - Dim sglPos As Single - - - If mbMoving Then - sglPos = X + imgSplitter.Left - If sglPos < sglSplitLimit Then - picSplitter.Left = sglSplitLimit - ElseIf sglPos > Me.Width - sglSplitLimit Then - picSplitter.Left = Me.Width - sglSplitLimit - Else - picSplitter.Left = sglPos - End If - End If -End Sub - - -Private Sub imgSplitter_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - SizeControls picSplitter.Left - picSplitter.Visible = False - mbMoving = False -End Sub - - -Private Sub TreeView1_DragDrop(Source As Control, X As Single, Y As Single) - If Source = imgSplitter Then - SizeControls X - End If -End Sub - - -Sub SizeControls(X As Single) - On Error Resume Next - - 'set the width - If X < 1500 Then X = 1500 - If X > (Me.Width - 1500) Then X = Me.Width - 1500 - tvTreeView.Width = X - imgSplitter.Left = X - - Dim t_left, t_width As Integer - t_left = X + 40 - t_width = Me.Width - (tvTreeView.Width + 140) - - lblTitle(0).Width = tvTreeView.Width - lblTitle(1).Left = t_left + 20 - lblTitle(1).Width = t_width - 40 - - - 'set the top - If tbToolBar.Visible Then - tvTreeView.Top = tbToolBar.Height + picTitles.Height - Else - tvTreeView.Top = picTitles.Height - End If - - - 'set the height - If sbStatusBar.Visible Then - tvTreeView.Height = Me.ScaleHeight - (picTitles.Top + picTitles.Height + sbStatusBar.Height) - Else - tvTreeView.Height = Me.ScaleHeight - (picTitles.Top + picTitles.Height) - End If - - - imgSplitter.Top = tvTreeView.Top - imgSplitter.Height = tvTreeView.Height - - setListDimensions t_left, t_width, tvTreeView.Top, tvTreeView.Height -End Sub - -Private Sub setListView(ByVal f_View As Integer) - lvComputers.View = f_View - lvProcesses.View = f_View -End Sub - -Private Sub setListDimensions(ByVal f_Left As Integer, ByVal f_Width As Integer, ByVal f_Top As Integer, ByVal f_Height As Integer) - With lvComputers - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With - With lvProcesses - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With - With lvDatabases - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With -End Sub - -Private Sub tbToolBar_ButtonClick(ByVal Button As MSComctlLib.Button) - On Error Resume Next - Select Case Button.Key - Case "New database" - 'ToDo: Add 'Back' button code. - mnuPopNewDatabase_Click - Case "Add computer" - 'ToDo: Add 'Forward' button code. - frmNewComputer.Show vbModal, Me - Dim c As Computer - For Each c In frmNewComputer.m_hosts - addComputer c - g_computers.Add c, "_" & c.m_name - Next - Case "Properties" - mnuFileProperties_Click - End Select -End Sub - -Private Sub mnuHelpAbout_Click() - frmAbout.Show vbModal, Me -End Sub - -Private Sub mnuHelpSearchForHelpOn_Click() - Dim nRet As Integer - - - 'if there is no helpfile for this project display a message to the user - 'you can set the HelpFile for your application in the - 'Project Properties dialog - If Len(App.HelpFile) = 0 Then - MsgBox "Unable to display Help Contents. There is no Help associated with this project.", vbInformation, Me.Caption - Else - On Error Resume Next - nRet = OSWinHelp(Me.hwnd, App.HelpFile, 261, 0) - If Err Then - MsgBox Err.Description - End If - End If - -End Sub - -Private Sub mnuHelpContents_Click() - Dim nRet As Integer - - - 'if there is no helpfile for this project display a message to the user - 'you can set the HelpFile for your application in the - 'Project Properties dialog - If Len(App.HelpFile) = 0 Then - MsgBox "Unable to display Help Contents. There is no Help associated with this project.", vbInformation, Me.Caption - Else - On Error Resume Next - nRet = OSWinHelp(Me.hwnd, App.HelpFile, 3, 0) - If Err Then - MsgBox Err.Description - End If - End If - -End Sub - - -Private Sub mnuViewWebBrowser_Click() - 'ToDo: Add 'mnuViewWebBrowser_Click' code. - MsgBox "Add 'mnuViewWebBrowser_Click' code." -End Sub - -Private Sub mnuViewOptions_Click() - frmOptions.Show vbModal, Me -End Sub - -Private Sub mnuViewRefresh_Click() - 'ToDo: Add 'mnuViewRefresh_Click' code. - MsgBox "Add 'mnuViewRefresh_Click' code." -End Sub - - -Private Sub mnuViewStatusBar_Click() - mnuViewStatusBar.Checked = Not mnuViewStatusBar.Checked - sbStatusBar.Visible = mnuViewStatusBar.Checked - SizeControls imgSplitter.Left -End Sub - -Private Sub mnuViewToolbar_Click() - mnuViewToolbar.Checked = Not mnuViewToolbar.Checked - tbToolBar.Visible = mnuViewToolbar.Checked - SizeControls imgSplitter.Left -End Sub - -Private Sub mnuEditInvertSelection_Click() - 'ToDo: Add 'mnuEditInvertSelection_Click' code. - MsgBox "Add 'mnuEditInvertSelection_Click' code." -End Sub - -Private Sub mnuEditSelectAll_Click() - 'ToDo: Add 'mnuEditSelectAll_Click' code. - MsgBox "Add 'mnuEditSelectAll_Click' code." -End Sub - -Private Sub mnuEditPasteSpecial_Click() - 'ToDo: Add 'mnuEditPasteSpecial_Click' code. - MsgBox "Add 'mnuEditPasteSpecial_Click' code." -End Sub - -Private Sub mnuEditPaste_Click() - 'ToDo: Add 'mnuEditPaste_Click' code. - MsgBox "Add 'mnuEditPaste_Click' code." -End Sub - -Private Sub mnuEditCopy_Click() - 'ToDo: Add 'mnuEditCopy_Click' code. - MsgBox "Add 'mnuEditCopy_Click' code." -End Sub - -Private Sub mnuEditCut_Click() - 'ToDo: Add 'mnuEditCut_Click' code. - MsgBox "Add 'mnuEditCut_Click' code." -End Sub - -Private Sub mnuEditUndo_Click() - 'ToDo: Add 'mnuEditUndo_Click' code. - MsgBox "Add 'mnuEditUndo_Click' code." -End Sub - -Private Sub mnuFileClose_Click() - 'unload the form - Unload Me - -End Sub - -Private Sub mnuFileProperties_Click() - 'ToDo: Add 'mnuFileProperties_Click' code. - MsgBox "Add 'mnuFileProperties_Click' code." -End Sub - -Private Sub mnuFileRename_Click() - 'ToDo: Add 'mnuFileRename_Click' code. - MsgBox "Add 'mnuFileRename_Click' code." -End Sub - -Private Sub mnuFileDelete_Click() - 'ToDo: Add 'mnuFileDelete_Click' code. - MsgBox "Add 'mnuFileDelete_Click' code." -End Sub - -Private Sub mnuFileNew_Click() - 'ToDo: Add 'mnuFileNew_Click' code. - MsgBox "Add 'mnuFileNew_Click' code." -End Sub - -Private Sub mnuFileSendTo_Click() - 'ToDo: Add 'mnuFileSendTo_Click' code. - MsgBox "Add 'mnuFileSendTo_Click' code." -End Sub - -Private Sub mnuFileFind_Click() - 'ToDo: Add 'mnuFileFind_Click' code. - MsgBox "Add 'mnuFileFind_Click' code." -End Sub - -Private Sub mnuFileOpen_Click() - Dim sFile As String -End Sub - -Private Sub mnuPopComputerProperties_Click() - mnuFileProperties_Click -End Sub - -Private Sub mnuPopNewDatabase_Click() - frmNewDatabase1.Show vbModal, Me - frmNewDatabase2.Show vbModal, Me - frmNewDatabase3.Show vbModal, Me -End Sub - -Private Sub mnuPopAddComputer_Click() - frmNewComputer.Show vbModal, Me - Dim c As Computer - For Each c In frmNewComputer.m_hosts - addComputer c - g_computers.Add c, "_" & c.m_name - Next -End Sub - -Private Sub mnuPopSortComputers_Click() - If m_currentNode.Sorted = True Then - mnuPopSortComputers.Checked = False - m_currentNode.Sorted = False - Else - mnuPopSortComputers.Checked = True - m_currentNode.Sorted = True - End If -End Sub - -Private Sub mnuPopRemoveComputer_Click() - Dim res As VbMsgBoxResult - Dim str As String - str = "Remove computer " & m_currentComputer.m_name - res = MsgBox(str, vbOKCancel, str) - If res = vbOK Then - removeComputer (m_currentComputer.m_name) - End If -End Sub - -Private Sub mnuPopSortDatabases_Click() - If m_currentNode.Sorted = True Then - mnuPopSortDatabases.Checked = False - m_currentNode.Sorted = False - Else - mnuPopSortDatabases.Checked = True - m_currentNode.Sorted = True - End If -End Sub - -Private Sub tvTreeView_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub tvTreeView_Collapse(ByVal Node As MSComctlLib.Node) - 'MsgBox "tvTreeView_Collapse" -End Sub - -Private Sub tvTreeView_Expand(ByVal Node As MSComctlLib.Node) - 'MsgBox "tvTreeView_Expand" -End Sub - -Private Sub tvTreeView_NodeClick(ByVal Node As MSComctlLib.Node) - selectNode Node -End Sub - -Private Sub tvTreeView_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - 'MsgBox "tvTreeView_MouseUp Button: " & Button & " Shift: " & Shift - Dim Node As MSComctlLib.Node - Dim place As Integer - - Set Node = tvTreeView.HitTest(X, Y) - place = selectNode(Node) - If Button = vbRightButton Then - ShowPopup place - End If -End Sub - -Private Function selectNode(ByRef n As MSComctlLib.Node) As Integer - Dim list As ListView - Dim place As Integer - - If n Is Nothing Then - If Not m_currentNode Is Nothing Then - place = 1 - m_currentNode.Selected = False - Else - place = 2 - End If - Else - n.Selected = True - If n.Text = "Computers" Then - place = 3 - Set list = lvComputers - lblTitle(1).Caption = "Computers" - ElseIf n.Text = "Databases" Then - place = 4 - Set list = lvDatabases - lblTitle(1).Caption = "Databases" - ElseIf n.Parent.Text = "Computers" Then - place = 5 - Set list = lvProcesses - setComputer (n.Key) - ElseIf n.Parent.Text = "Databases" Then - place = 6 - Set list = lvProcesses - setDatabase (n.Key) - End If - - If m_currentList.hwnd <> list.hwnd Then - m_currentList.Visible = False - list.Visible = True - Set m_currentList = list - End If - End If - Set m_currentNode = n - selectNode = place -End Function - -Private Sub lvComputers_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - Dim li As ListItem - Set li = lvComputers.HitTest(X, Y) - If Button = vbRightButton And Not li Is Nothing Then - Dim c As Computer - Set m_currentComputer = g_computers(li.Key) - ShowPopup 5 - End If -End Sub - -Private Sub ShowPopup(ByVal place As Integer) - Select Case place - Case 3 - PopupMenu mnuPopComputers - Case 4 - PopupMenu mnuPopDatabases - Case 5 - mnuPopComputerName.Caption = m_currentComputer.m_name & ": " & m_currentComputer.m_status - Select Case m_currentComputer.m_status - Case "Connected" - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = True - Case "Connecting" - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = True - Case "Not connected" - mnuPopConnectComputer.Enabled = True - mnuPopDisconnectComputer.Enabled = False - Case "No contact" - mnuPopConnectComputer.Enabled = True - mnuPopDisconnectComputer.Enabled = False - Case Else - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = False - End Select - - PopupMenu mnuPopComputer, , , , mnuPopComputerName - End Select -End Sub - -Private Sub lvComputers_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub lvProcesses_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub lvDatabases_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub ColumnClick(ByRef list As ListView, i As Integer) - i = i - 1 - If list.SortKey = i Then - list.SortOrder = 1 - list.SortOrder - Else - list.SortKey = i - End If -End Sub - -Private Sub lvComputers_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvComputers, ColumnHeader.Index -End Sub - -Private Sub lvProcesses_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvProcesses, ColumnHeader.Index -End Sub - -Private Sub lvDatabases_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvDatabases, ColumnHeader.Index -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm deleted file mode 100644 index eae5802493c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm +++ /dev/null @@ -1,124 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewComputer - Caption = "Add computer" - ClientHeight = 1545 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 4605 - LinkTopic = "Form1" - ScaleHeight = 1545 - ScaleWidth = 4605 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton Command3 - Caption = "Apply" - Default = -1 'True - Height = 360 - Left = 3240 - TabIndex = 4 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.CommandButton Command2 - Caption = "Cancel" - Height = 360 - Left = 1920 - TabIndex = 3 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.CommandButton Command1 - Caption = "OK" - Height = 360 - Left = 600 - TabIndex = 2 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.TextBox Text1 - Height = 285 - Left = 1440 - TabIndex = 1 - Top = 240 - Width = 2925 - End - Begin VB.Label lblLabels - Caption = "Computer name:" - Height = 255 - Index = 1 - Left = 120 - TabIndex = 0 - Tag = "&User Name:" - Top = 240 - Width = 1440 - End -End -Attribute VB_Name = "frmNewComputer" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Public m_hosts As New Collection - -Private Sub Form_Load() - If m_hosts.Count > 0 Then - For i = m_hosts.Count To 1 Step -1 - m_hosts.Remove i - Next - End If -End Sub - -Private Sub Command1_Click() - If Text1.Text = "" Then - MsgBox "Invalid hostname" - Exit Sub - End If - - If Exists(g_computers, "_" & Text1.Text) Then - MsgBox Text1.Text & " already exists" - Exit Sub - End If - - Dim c As New Computer - With c - .m_ip = "" - .m_name = Text1.Text - .m_status = "Not connected" - Set .m_processes = New Collection - End With - - m_hosts.Add c - - Unload Me -End Sub - -Private Sub Command2_Click() - Unload Me -End Sub - -Private Sub Command3_Click() - If Text1.Text = "" Then - MsgBox "Invalid hostname" - Exit Sub - End If - - If Exists(g_computers, "_" & Text1.Text) Then - MsgBox Text1.Text & " already exists" - Exit Sub - End If - - Dim c As New Computer - With c - .m_ip = "" - .m_name = Text1.Text - .m_status = "Not connected" - Set .m_processes = New Collection - End With - - m_hosts.Add c - - Text1.Text = "" -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx Binary files differdeleted file mode 100644 index 593f4708db8..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx Binary files differdeleted file mode 100644 index b20c2b651ae..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm deleted file mode 100644 index 3fa1fd4c4e8..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm +++ /dev/null @@ -1,187 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase1 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Nodes" - ClientHeight = 3000 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3281.25 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.TextBox textApiNodes - Height = 285 - Left = 2760 - TabIndex = 12 - Text = "4" - Top = 1665 - Width = 375 - End - Begin VB.VScrollBar VScroll1 - Height = 255 - Left = 3240 - TabIndex = 11 - Top = 1680 - Width = 135 - End - Begin VB.OptionButton Option4 - Alignment = 1 'Right Justify - Caption = "1" - Height = 375 - Left = 2760 - TabIndex = 10 - Top = 1020 - Width = 375 - End - Begin VB.OptionButton Option3 - Alignment = 1 'Right Justify - Caption = "4" - Height = 375 - Left = 3960 - TabIndex = 9 - Top = 360 - Width = 375 - End - Begin VB.OptionButton Option2 - Alignment = 1 'Right Justify - Caption = "2" - Height = 375 - Left = 3360 - TabIndex = 8 - Top = 360 - Width = 375 - End - Begin VB.OptionButton Option1 - Alignment = 1 'Right Justify - Caption = "1" - Height = 375 - Left = 2760 - TabIndex = 7 - Top = 360 - Value = -1 'True - Width = 375 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Label Label3 - Caption = "No of api nodes" - Height = 255 - Left = 240 - TabIndex = 6 - Top = 1680 - Width = 2415 - End - Begin VB.Label Label2 - Caption = "No of management nodes" - Height = 255 - Left = 240 - TabIndex = 5 - Top = 1080 - Width = 2415 - End - Begin VB.Label Label1 - Caption = "No of database nodes" - Height = 255 - Left = 240 - TabIndex = 4 - Top = 420 - Width = 2415 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase1" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub - -Private Sub Option1_Click() - Option2.Value = False - Option3.Value = False -End Sub - -Private Sub Option2_Click() - Option1.Value = False - Option3.Value = False -End Sub - -Private Sub Option3_Click() - Option1.Value = False - Option2.Value = False -End Sub - -Private Sub Option4_Click() - Option4.Value = True -End Sub - -Private Sub textApiNodes_Validate(Cancel As Boolean) - 'If Not isnumber(textApiNodes.Text) Then Cancel = False -End Sub diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm deleted file mode 100644 index 49806a695ea..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm +++ /dev/null @@ -1,136 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase2 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Computers" - ClientHeight = 2895 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3166.406 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.ComboBox Combo1 - Height = 315 - Left = 2400 - TabIndex = 7 - Text = "Combo1" - Top = 360 - Width = 1455 - End - Begin VB.VScrollBar VScroll2 - Height = 255 - Left = 4560 - TabIndex = 6 - Top = 375 - Width = 135 - End - Begin VB.TextBox Text1 - Height = 285 - Left = 4080 - TabIndex = 5 - Text = "4" - Top = 360 - Width = 375 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Label Label5 - Caption = "Computer" - Height = 255 - Left = 2400 - TabIndex = 9 - Top = 0 - Width = 975 - End - Begin VB.Label Label4 - Caption = "Node id" - Height = 255 - Left = 4080 - TabIndex = 8 - Top = 120 - Width = 615 - End - Begin VB.Label Label1 - Caption = "Database node 1" - Height = 255 - Left = 240 - TabIndex = 4 - Top = 420 - Width = 2415 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase2" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log deleted file mode 100644 index 808b21866e5..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log +++ /dev/null @@ -1 +0,0 @@ -Line 2: The Form or MDIForm name frmNewDatabase1 is already in use; cannot load this form. diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm deleted file mode 100644 index ba050a58a09..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm +++ /dev/null @@ -1,88 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase3 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Database configuration" - ClientHeight = 3000 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3281.25 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase3" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm deleted file mode 100644 index e526a35b3ec..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm +++ /dev/null @@ -1,231 +0,0 @@ -VERSION 5.00 -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx" -Begin VB.Form frmOptions - BorderStyle = 3 'Fixed Dialog - Caption = "Options" - ClientHeight = 5040 - ClientLeft = 6600 - ClientTop = 4575 - ClientWidth = 6150 - KeyPreview = -1 'True - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 5040 - ScaleWidth = 6150 - ShowInTaskbar = 0 'False - Tag = "Options" - Begin VB.CommandButton cmdOK - Caption = "OK" - Height = 375 - Left = 2490 - TabIndex = 1 - Tag = "OK" - Top = 4455 - Width = 1095 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 375 - Left = 3720 - TabIndex = 3 - Tag = "Cancel" - Top = 4455 - Width = 1095 - End - Begin VB.CommandButton cmdApply - Caption = "&Apply" - Height = 375 - Left = 4920 - TabIndex = 5 - Tag = "&Apply" - Top = 4455 - Width = 1095 - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 3 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 7 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample4 - Caption = "Sample 4" - Height = 2022 - Left = 505 - TabIndex = 11 - Tag = "Sample 4" - Top = 502 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 2 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 9 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample3 - Caption = "Sample 3" - Height = 2022 - Left = 406 - TabIndex = 10 - Tag = "Sample 3" - Top = 403 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 1 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 6 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample2 - Caption = "Sample 2" - Height = 2022 - Left = 307 - TabIndex = 8 - Tag = "Sample 2" - Top = 305 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 0 - Left = 210 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 2 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample1 - Caption = "Sample 1" - Height = 2022 - Left = 208 - TabIndex = 4 - Tag = "Sample 1" - Top = 207 - Width = 2033 - End - End - Begin MSComctlLib.TabStrip tbsOptions - Height = 4245 - Left = 105 - TabIndex = 0 - Top = 120 - Width = 5895 - _ExtentX = 10398 - _ExtentY = 7488 - _Version = 393216 - BeginProperty Tabs {1EFB6598-857C-11D1-B16A-00C0F0283628} - NumTabs = 4 - BeginProperty Tab1 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 1" - ImageVarType = 2 - EndProperty - BeginProperty Tab2 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 2" - ImageVarType = 2 - EndProperty - BeginProperty Tab3 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 3" - ImageVarType = 2 - EndProperty - BeginProperty Tab4 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 4" - ImageVarType = 2 - EndProperty - EndProperty - End -End -Attribute VB_Name = "frmOptions" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Private Sub cmdApply_Click() - 'ToDo: Add 'cmdApply_Click' code. - MsgBox "Apply Code goes here to set options w/o closing dialog!" -End Sub - - -Private Sub cmdCancel_Click() - Unload Me -End Sub - - -Private Sub cmdOK_Click() - 'ToDo: Add 'cmdOK_Click' code. - MsgBox "Code goes here to set options and close dialog!" - Unload Me -End Sub - - -Private Sub Form_KeyDown(KeyCode As Integer, Shift As Integer) - Dim i As Integer - i = tbsOptions.SelectedItem.Index - 'handle ctrl+tab to move to the next tab - If (Shift And 3) = 2 And KeyCode = vbKeyTab Then - If i = tbsOptions.Tabs.Count Then - 'last tab so we need to wrap to tab 1 - Set tbsOptions.SelectedItem = tbsOptions.Tabs(1) - Else - 'increment the tab - Set tbsOptions.SelectedItem = tbsOptions.Tabs(i + 1) - End If - ElseIf (Shift And 3) = 3 And KeyCode = vbKeyTab Then - If i = 1 Then - 'last tab so we need to wrap to tab 1 - Set tbsOptions.SelectedItem = tbsOptions.Tabs(tbsOptions.Tabs.Count) - Else - 'increment the tab - Set tbsOptions.SelectedItem = tbsOptions.Tabs(i - 1) - End If - End If -End Sub - - - - -Private Sub tbsOptions_Click() - - - Dim i As Integer - 'show and enable the selected tab's controls - 'and hide and disable all others - For i = 0 To tbsOptions.Tabs.Count - 1 - If i = tbsOptions.SelectedItem.Index - 1 Then - picOptions(i).Left = 210 - picOptions(i).Enabled = True - Else - picOptions(i).Left = -20000 - picOptions(i).Enabled = False - End If - Next - - -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx Binary files differdeleted file mode 100644 index fee0c5c59de..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico b/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico Binary files differdeleted file mode 100644 index 6bbf8022fc6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico Binary files differdeleted file mode 100644 index 7bb32cc83d3..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico +++ /dev/null diff --git a/storage/ndb/src/libndb.ver.in b/storage/ndb/src/libndb.ver.in index 72bf93d196f..c7b97876d44 100644 --- a/storage/ndb/src/libndb.ver.in +++ b/storage/ndb/src/libndb.ver.in @@ -1,2 +1,17 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; }; |