[Iscs-developers] ISCS/spm/src spmmainform.cpp,1.59,1.60 spmmainform.h,1.43,1.44
Status: Beta
Brought to you by:
jsulliva
Menu
▾
▴
[Iscs-developers] ISCS/spm/src spmmainform.cpp,1.59,1.60 spmmainform.h,1.43,1.44
|
From: <jsu...@us...> - 2003-11-25 06:28:40
|
Update of /cvsroot/iscs/ISCS/spm/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11066/spm/src
Modified Files:
spmmainform.cpp spmmainform.h
Log Message:
Began edit Access Group functions and documentation
Index: spmmainform.cpp
===================================================================
RCS file: /cvsroot/iscs/ISCS/spm/src/spmmainform.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** spmmainform.cpp 25 Nov 2003 01:35:23 -0000 1.59
--- spmmainform.cpp 25 Nov 2003 05:12:05 -0000 1.60
***************
*** 172,175 ****
--- 172,176 ----
connect( loginAction, SIGNAL( activated() ), this, SLOT( go2LoginTab() ) );
connect( LoginPushButton, SIGNAL( clicked() ), this, SLOT( loginSequence() ) );
+ connect( DbPasswordLineEdit, SIGNAL(returnPressed()), this, SLOT(loginSequence()) );
connect( fileExitAction, SIGNAL( activated() ), this, SLOT( exitSPM() ) );
connect( so->commitAction, SIGNAL( activated() ), this, SLOT( commitChanges() ) );
***************
*** 198,203 ****
connect( RemAccFromAGAction, SIGNAL(activated()), this, SLOT(prepRemAccFromAG()) );
connect( EditAccAction, SIGNAL(activated()), this, SLOT(editAcc()) );
! connect( IPAccTable, SIGNAL(doubleClicked(int, int, int, const QPoint &)), this, SLOT(editIPAcc()) );
! connect( X509AccTable, SIGNAL(doubleClicked(int, int, int, const QPoint &)), this, SLOT(editX509Acc()) );
// connect( AGListView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(editAG()) );
connect( AGListView, SIGNAL(returnPressed(QListViewItem *)), this, SLOT(editAG()) );
--- 199,204 ----
connect( RemAccFromAGAction, SIGNAL(activated()), this, SLOT(prepRemAccFromAG()) );
connect( EditAccAction, SIGNAL(activated()), this, SLOT(editAcc()) );
! connect( IPAccTable, SIGNAL(doubleClicked(int, int, int, const QPoint &)), this, SLOT(editIPAccSlot()) );
! connect( X509AccTable, SIGNAL(doubleClicked(int, int, int, const QPoint &)), this, SLOT(editX509AccSlot()) );
// connect( AGListView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(editAG()) );
connect( AGListView, SIGNAL(returnPressed(QListViewItem *)), this, SLOT(editAG()) );
***************
*** 747,755 ****
case Qt::Key_Enter :
if (obj == IPAccTable->viewport()) {
! editIPAcc();
return true;
}
if ( obj == X509AccTable->viewport() ) {
! editX509Acc();
return true;
}
--- 748,756 ----
case Qt::Key_Enter :
if (obj == IPAccTable->viewport()) {
! editIPAccSlot();
return true;
}
if ( obj == X509AccTable->viewport() ) {
! editX509AccSlot();
return true;
}
***************
*** 3853,3857 ****
*/
! bool SPMMainForm::changeAllAccChainJumps( const QString & NewRange, const QString & OldRange, const QString & NewAR, const QString & OldAR, const QString & NewPEP, const QString & OldPEP )
{
bool Deny;
--- 3854,3858 ----
*/
! bool SPMMainForm::changeAllAccChainJumps( const QString & NewRange, const QString & NewAR, const QString & OldAR, const QString & NewPEP, const QString & OldPEP )
{
bool Deny;
***************
*** 4435,4442 ****
}
else if( IPAccTable->hasFocus() ) {
! editIPAcc();
}
else if ( X509AccTable->hasFocus() ) {
! editX509Acc();
}
}
--- 4436,4443 ----
}
else if( IPAccTable->hasFocus() ) {
! editIPAccSlot();
}
else if ( X509AccTable->hasFocus() ) {
! editX509AccSlot();
}
}
***************
*** 4445,4453 ****
void SPMMainForm::editAG()
{
QMessageBox::information(this, "SPM - Placeholder", "We are in the editAG functions");
}
//======================================================
! void SPMMainForm::editIPAcc()
{
bool Changed;
--- 4446,4512 ----
void SPMMainForm::editAG()
{
+ int Row;
+ QString FQN, Acc;
+ QValueList<int> IPAccs, X509Accs;
+ QListViewItem * LVI;
+ QPtrList<QListViewItem> AGList;
+ QListViewItemIterator it(AGListView);
+
+ while( *it ){
+ LVI = *it;
+ if ( LVI->isSelected() ) {
+ if ( LVI->text(1).isEmpty() ) { // i.e., this is an Access Group
+ AGList.append(LVI);
+ }
+ else if ( LVI->text(1) == "IP" ) { // i.e., an IP Accessor
+ if ( IPAccTabRefresh ) {
+ fillIPAccTable();
+ IPAccTabRefresh = false;
+ }
+ Acc = LVI->text(0);
+ Row = findIPAccRow( Acc.left(Acc.find("-")), Acc.mid(Acc.find("-") + 1) );
+ QValueList<int>::iterator vit = IPAccs.begin();
+ while( vit != IPAccs.end() ){
+ if ( *vit <= Row ) { // the list should be in descending order
+ break;
+ }
+ ++vit;
+ }
+ if ( vit == IPAccs.end() || *vit < Row ) { // We do not want to insert it if it already exists
+ IPAccs.insert(vit, Row);
+ }
+ }
+ else if ( LVI->text(1) == "X.509" ) { // i.e., an IP Accessor
+ if ( X509AccTabRefresh ) { // it is possible that the table has not yet been filled
+ fillX509AccTable();
+ X509AccTabRefresh = false;
+ }
+ Acc = LVI->text(0);
+ Row = findX509AccRow( Acc.mid(4, Acc.find("\n") - 4), Acc.mid(Acc.find("\n") + 5) ); // 4 compensates for "DN: " and 5 for "\nCA: "
+ QValueList<int>::iterator vit = X509Accs.begin();
+ while( vit != X509Accs.end() ){
+ if ( *vit <= Row ) {
+ break;
+ }
+ ++vit;
+ }
+ if ( vit == X509Accs.end() || *vit < Row ) {
+ X509Accs.insert(vit, Row);
+ }
+ }
+ }
+ ++it;
+ }
+ if ( ! IPAccs.isEmpty() ){
+ editIPAcc(IPAccs);
+ }
+ if ( ! X509Accs.isEmpty() ){
+ editX509Acc(X509Accs);
+ }
QMessageBox::information(this, "SPM - Placeholder", "We are in the editAG functions");
}
//======================================================
! void SPMMainForm::editIPAcc(QValueList<int> & Rows)
{
bool Changed;
***************
*** 4456,4468 ****
QString OldRange, OldComment, OldAR, OldPEP, Update, Where, NewAR, NewRange, NewPEP, Low, High;
QListViewItem * LVI;
- QValueList<int> Rows;
QStringList SubRangeAdds, SubRangeDels, SuperRangeAdds, SuperRangeDels, NewRows;
QStringList::iterator it;
- for ( int i = 0; i < IPAccTable->numRows(); i++ ) {
- if ( IPAccTable->isRowSelected(i) ) {
- Rows.prepend(i);
- }
- }
if ( Rows.isEmpty() ) {
QMessageBox::warning(this, tr("SPM - No Items Selected"), tr("There are no Accessors selected for edit") );
--- 4515,4521 ----
***************
*** 4824,4828 ****
}
else { // we have changed PEPs so we need to add all the jumps to the new PEP (we deleted the old ones earlier)
! if ( ! changeAllAccChainJumps(NewRange, OldRange, NewAR, OldAR, NewPEP, OldPEP) ) {
QMessageBox::warning(this, tr("SPM - Failed IP Accessor Edit"), tr("Could not make firewall changes for %1\nAll edits will be backed out").arg(OldRange) );
multiErrResultsTrans(3);
--- 4877,4881 ----
}
else { // we have changed PEPs so we need to add all the jumps to the new PEP (we deleted the old ones earlier)
! if ( ! changeAllAccChainJumps(NewRange, NewAR, OldAR, NewPEP, OldPEP) ) {
QMessageBox::warning(this, tr("SPM - Failed IP Accessor Edit"), tr("Could not make firewall changes for %1\nAll edits will be backed out").arg(OldRange) );
multiErrResultsTrans(3);
***************
*** 4985,4989 ****
//======================================================
! void SPMMainForm::editX509Acc()
{
bool Changed;
--- 5038,5054 ----
//======================================================
! void SPMMainForm::editIPAccSlot()
! {
! QValueList<int> Rows;
! for ( int i = 0; i < IPAccTable->numRows(); i++ ) {
! if ( IPAccTable->isRowSelected(i) ) {
! Rows.prepend(i);
! }
! }
! editIPAcc(Rows);
! }
! //======================================================
!
! void SPMMainForm::editX509Acc( QValueList<int> Rows )
{
bool Changed;
***************
*** 4992,5002 ****
QStringList NewRows, Fields, CAListRetry;
QListViewItem * LVI;
- QValueList<int> Rows;
- for ( int i = 0; i < X509AccTable->numRows(); i++ ) {
- if ( X509AccTable->isRowSelected(i) ) {
- Rows.prepend(i);
- }
- }
if ( Rows.isEmpty() ) {
QMessageBox::warning(this, tr("SPM - No Items Selected"), tr("There are no Accessors selected for edit") );
--- 5057,5061 ----
***************
*** 5006,5009 ****
--- 5065,5072 ----
so->MultiSelect = ( Rows.count() > 1 );
if ( so->MultiSelect ) {
+ X509AccForm->OkPushButton->hide();
+ X509AccForm->CancelPushButton->hide();
+ X509AccForm->OkPushButton->show();
+ X509AccForm->CancelPushButton->show(); // We need this to workaround a problem in Qt where the newly shown buttons hide the already shown buttons
X509AccForm->CancelAllPushButton->show();
X509AccForm->CancelRestPushButton->show();
***************
*** 5352,5355 ****
--- 5415,5430 ----
//======================================================
+ void SPMMainForm::editX509AccSlot()
+ {
+ QValueList<int> Rows;
+ for ( int i = 0; i < X509AccTable->numRows(); i++ ) {
+ if ( X509AccTable->isRowSelected(i) ) {
+ Rows.prepend(i);
+ }
+ }
+ editX509Acc(Rows);
+ }
+ //======================================================
+
void SPMMainForm::ensureAGLVIExists( QString FullName )
{
***************
*** 5759,5762 ****
--- 5834,5840 ----
AGDialog->AGParentComboBox->listBox()->clear();
AGDialog->AGParentComboBox->insertStringList(so->AGList);
+ AGDialog->AGOkAllPushButton->hide();
+ AGDialog->AGCancelAllPushButton->hide();
+ AGDialog->AGCancelRestPushButton->hide();
switch( SelItems.count() ){ // set the AGDialog ComboBox to the correct entry
case 0 :
***************
*** 5779,5784 ****
bool NoRename = false, Continued = false, Broken, OkAll = (SelItems.count() < 2); // if we only have a single item, we do not need to confirm its addition
QString First = "";
- // Handle any Top-Level Access Groups including checking for duplicates
Choice = AGDialog->AGParentComboBox->currentItem();
if ( Choice == 0 || Choice == 2 ) { // i.e., "Top-Level" or "All Selected + Top-Level" - we use the item number so we can translate the strings as needed
// Check for duplicates
--- 5857,5871 ----
bool NoRename = false, Continued = false, Broken, OkAll = (SelItems.count() < 2); // if we only have a single item, we do not need to confirm its addition
QString First = "";
Choice = AGDialog->AGParentComboBox->currentItem();
+ if ( Choice == 1 || Choice == 2 ) {
+ AGDialog->AGOkPushButton->hide();
+ AGDialog->AGCancelPushButton->hide();
+ AGDialog->AGOkPushButton->show();
+ AGDialog->AGCancelPushButton->show(); // We need to do this to work around a problem with Qt where it write the newly shown buttons over the already showing buttons
+ AGDialog->AGOkAllPushButton->show();
+ AGDialog->AGCancelAllPushButton->show();
+ AGDialog->AGCancelRestPushButton->show();
+ }
+ // Handle any Top-Level Access Groups including checking for duplicates
if ( Choice == 0 || Choice == 2 ) { // i.e., "Top-Level" or "All Selected + Top-Level" - we use the item number so we can translate the strings as needed
// Check for duplicates
***************
*** 5815,5821 ****
// prepare the approval dialog box and show it
- AGDialog->AGOkAllPushButton->setEnabled(true);
- AGDialog->AGCancelAllPushButton->setEnabled(true);
- AGDialog->AGCancelRestPushButton->setEnabled(true);
AGDialog->AGNameLineEdit->setReadOnly(true);
AGDialog->AGCommentTextEdit->setReadOnly(true);
--- 5902,5905 ----
***************
*** 6435,6441 ****
return false;
}
- AGDialog->AGOkAllPushButton->setEnabled(false);
- AGDialog->AGCancelAllPushButton->setEnabled(false);
- AGDialog->AGCancelRestPushButton->setEnabled(false);
AGDialog->AGNameLineEdit->setReadOnly(false);
AGDialog->AGCommentTextEdit->setReadOnly(false);
--- 6519,6522 ----
Index: spmmainform.h
===================================================================
RCS file: /cvsroot/iscs/ISCS/spm/src/spmmainform.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** spmmainform.h 25 Nov 2003 01:35:24 -0000 1.43
--- spmmainform.h 25 Nov 2003 05:12:06 -0000 1.44
***************
*** 133,140 ****
virtual void cancelNewIPAcc();
virtual void cancelNewX509Acc();
! virtual bool changeAllAccChainJumps( const QString & NewRange, const QString & OldRange, const QString & NewAR, const QString & OldAR, const QString & NewPEP, const QString & OldPEP );
virtual void clearLVIChildren( QListViewItem * LVI );
virtual bool createDNList();
virtual void cullLVDescendants( QPtrList<QListViewItem> & PL );
virtual void ensureAGLVIExists( QString FullName );
virtual void ensureLocationLVIExists( QString FullName );
--- 133,142 ----
virtual void cancelNewIPAcc();
virtual void cancelNewX509Acc();
! virtual bool changeAllAccChainJumps( const QString & NewRange, const QString & NewAR, const QString & OldAR, const QString & NewPEP, const QString & OldPEP );
virtual void clearLVIChildren( QListViewItem * LVI );
virtual bool createDNList();
virtual void cullLVDescendants( QPtrList<QListViewItem> & PL );
+ virtual void editIPAcc(QValueList<int> & Rows);
+ virtual void editX509Acc( QValueList<int> Rows );
virtual void ensureAGLVIExists( QString FullName );
virtual void ensureLocationLVIExists( QString FullName );
***************
*** 208,213 ****
virtual void editAcc();
virtual void editAG();
! virtual void editIPAcc();
! virtual void editX509Acc();
virtual void expandAGSlot( QListViewItem * Parent );
virtual void expandAllAG();
--- 210,215 ----
virtual void editAcc();
virtual void editAG();
! virtual void editIPAccSlot();
! virtual void editX509AccSlot();
virtual void expandAGSlot( QListViewItem * Parent );
virtual void expandAllAG();
|