From 6ab17155b82923f4263f1c536133e657970239a4 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Fri, 10 May 2002 00:26:00 +0000 Subject: [PATCH] much better indenting.. (thnx vim ;) --- bs/ui/bsappbase.ui.h | 112 +++++++++++++++++------------------ bs/ui/infoview.ui.h | 124 +++++++++++++++++++-------------------- bs/ui/resourceview.ui.h | 42 ++++++------- bs/ui/roidseditview.ui.h | 66 ++++++++++----------- bs/ui/tickviewbase.ui.h | 70 +++++++++++----------- 5 files changed, 207 insertions(+), 207 deletions(-) diff --git a/bs/ui/bsappbase.ui.h b/bs/ui/bsappbase.ui.h index 0b3b30a..305a4ca 100644 --- a/bs/ui/bsappbase.ui.h +++ b/bs/ui/bsappbase.ui.h @@ -1,12 +1,12 @@ /**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename slots use Qt Designer which will -** update this file, preserving your code. Create an init() slot in place of -** a constructor, and a destroy() slot in place of a destructor. -*****************************************************************************/ + ** ui.h extension file, included from the uic-generated form implementation. + ** + ** If you wish to add, delete or rename slots use Qt Designer which will + ** update this file, preserving your code. Create an init() slot in place of + ** a constructor, and a destroy() slot in place of a destructor. + *****************************************************************************/ + - void BSAppBase::fileNew() { @@ -55,12 +55,12 @@ void BSAppBase::editCut() void BSAppBase::init() { - conf = new BSConf(); - doc = new BSDoc(); - view = new BSView(this,doc); - connect(this, SIGNAL(ticksChanged(int, int) ), view, SLOT(slotTickChanged(int, int))); - connect(this, SIGNAL(resultModeChanged(int) ), view, SLOT(slotResultModeChanged(int))); - setCentralWidget(view); + conf = new BSConf(); + doc = new BSDoc(); + view = new BSView(this,doc); + connect(this, SIGNAL(ticksChanged(int, int) ), view, SLOT(slotTickChanged(int, int))); + connect(this, SIGNAL(resultModeChanged(int) ), view, SLOT(slotResultModeChanged(int))); + setCentralWidget(view); } void BSAppBase::editPaste() @@ -90,78 +90,78 @@ void BSAppBase::helpAbout() void BSAppBase::battleNew() { - bool ok = FALSE; - QString text = QInputDialog::getText( - tr( "Harvalen's Battlesystem" ), - tr( "Please enter the name of the battle (for example coords)" ), - QLineEdit::Normal, QString::null, &ok, this ); - if ( ok && !text.isEmpty() ) - doc->newBattle(text); - else + bool ok = FALSE; + QString text = QInputDialog::getText( + tr( "Harvalen's Battlesystem" ), + tr( "Please enter the name of the battle (for example coords)" ), + QLineEdit::Normal, QString::null, &ok, this ); + if ( ok && !text.isEmpty() ) + doc->newBattle(text); + else { - // user entered nothing or pressed Cancel + // user entered nothing or pressed Cancel } } void BSAppBase::battleSimulate() { - QApplication::setOverrideCursor( Qt::WaitCursor ); - - doc->runBattleSimulation(); - QApplication::restoreOverrideCursor(); + QApplication::setOverrideCursor( Qt::WaitCursor ); + + doc->runBattleSimulation(); + QApplication::restoreOverrideCursor(); } void BSAppBase::oneTickCheck_toggled( bool b) { - if(b) - { - maxTickSpin->setMinValue(0); - minTickSpin->setDisabled(true); - minTickSpin->setMaxValue(99); - emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); - } - else - { - minTickSpin->setEnabled(true); - minTickSpin->setMaxValue( maxTickSpin->value()); - if (minTickSpin->value() < maxTickSpin->value()) - maxTickSpin->setMinValue( minTickSpin->value()); + if(b) + { + maxTickSpin->setMinValue(0); + minTickSpin->setDisabled(true); + minTickSpin->setMaxValue(99); + emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); + } else { - maxTickSpin->setMinValue( maxTickSpin->value()); - minTickSpin->setValue(maxTickSpin->value()); + minTickSpin->setEnabled(true); + minTickSpin->setMaxValue( maxTickSpin->value()); + if (minTickSpin->value() < maxTickSpin->value()) + maxTickSpin->setMinValue( minTickSpin->value()); + else + { + maxTickSpin->setMinValue( maxTickSpin->value()); + minTickSpin->setValue(maxTickSpin->value()); + } + emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); } - emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); - } } void BSAppBase::minTickSpin_valueChanged( int i ) { - if ( !oneTickCheck->isChecked()) - maxTickSpin->setMinValue(i); + if ( !oneTickCheck->isChecked()) + maxTickSpin->setMinValue(i); } void BSAppBase::maxTickSpin_valueChanged( int i ) { - if ( !oneTickCheck->isChecked()) - minTickSpin->setMaxValue(i); + if ( !oneTickCheck->isChecked()) + minTickSpin->setMaxValue(i); } void BSAppBase::slotTicksChanged( int i ) { - if ( oneTickCheck->isChecked()) - { - maxTickSpin->setValue(i); - //minTickSpin->setValue(i-1); - emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); - return; - } - emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); + if ( oneTickCheck->isChecked()) + { + maxTickSpin->setValue(i); + //minTickSpin->setValue(i-1); + emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); + return; + } + emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); } void BSAppBase::resultModeCombo_activated( int i ) { - emit resultModeChanged(i); + emit resultModeChanged(i); } diff --git a/bs/ui/infoview.ui.h b/bs/ui/infoview.ui.h index 1a7d70d..14ee7ed 100644 --- a/bs/ui/infoview.ui.h +++ b/bs/ui/infoview.ui.h @@ -10,42 +10,42 @@ void InfoView::destroy() void InfoView::setRaces( std::vector races) { - for (std::vector::iterator i = races.begin(); i != races.end(); ++i) - { - RaceCombo->insertItem((*i)); - } - if ( RaceCombo->count() != 0) - NewButton->setEnabled(true); + for (std::vector::iterator i = races.begin(); i != races.end(); ++i) + { + RaceCombo->insertItem((*i)); + } + if ( RaceCombo->count() != 0) + NewButton->setEnabled(true); } void InfoView::setEta( int eta ) { - EtaSpin->setValue(eta); + EtaSpin->setValue(eta); } void InfoView::setFleetName( QString name ) { - NameLine->setText(name); - m_Name = name; - if (m_Name == "Home Planet" && m_Group == "Friendly") - { - GroupCombo->setEnabled(false); - BattleCombo->setEnabled(false); + NameLine->setText(name); + m_Name = name; + if (m_Name == "Home Planet" && m_Group == "Friendly") + { + GroupCombo->setEnabled(false); + BattleCombo->setEnabled(false); + ApplyButton->setEnabled(true); + NewButton->setEnabled(false); + RemoveButton->setEnabled(false); + return; + } + GroupCombo->setEnabled(true); + BattleCombo->setEnabled(true); ApplyButton->setEnabled(true); - NewButton->setEnabled(false); - RemoveButton->setEnabled(false); - return; - } - GroupCombo->setEnabled(true); - BattleCombo->setEnabled(true); - ApplyButton->setEnabled(true); - NewButton->setEnabled(true); - RemoveButton->setEnabled(true); + NewButton->setEnabled(true); + RemoveButton->setEnabled(true); } void InfoView::setRace( QString name ) { - RaceCombo->setCurrentText(name); + RaceCombo->setCurrentText(name); } void InfoView::InfoView_destroyed( QObject * ) @@ -55,108 +55,108 @@ void InfoView::InfoView_destroyed( QObject * ) void InfoView::CancelButton_clicked() { - emit cancel(); + emit cancel(); } void InfoView::NewButton_clicked() { - emit add(); + emit add(); } void InfoView::RemoveButton_clicked() { - emit remove(); + emit remove(); } void InfoView::setGroup( QString s ) { - GroupCombo->setCurrentText(s); - m_Group = s; + GroupCombo->setCurrentText(s); + m_Group = s; } void InfoView::setBattles( std::vector battles ) { - BattleCombo->clear(); - - for (std::vector::iterator i = battles.begin(); i != battles.end(); ++i) - { - BattleCombo->insertItem(*i); - } + BattleCombo->clear(); + + for (std::vector::iterator i = battles.begin(); i != battles.end(); ++i) + { + BattleCombo->insertItem(*i); + } } void InfoView::setBattle( QString s ) { - BattleCombo->setCurrentText(s); - m_Battle = s; + BattleCombo->setCurrentText(s); + m_Battle = s; } void InfoView::enableNameChange( bool b ) { - NameLine->setReadOnly(!b); + NameLine->setReadOnly(!b); } void InfoView::enableRemove( bool b ) { - RemoveButton->setEnabled(b); + RemoveButton->setEnabled(b); } void InfoView::ApplyButton_clicked() { - emit apply(); + emit apply(); } QString InfoView::battle() { - return BattleCombo->currentText(); + return BattleCombo->currentText(); } int InfoView::eta() { - return EtaSpin->value(); + return EtaSpin->value(); } QString InfoView::fleetName() { - return NameLine->text(); + return NameLine->text(); } QString InfoView::group() { - return GroupCombo->currentText(); + return GroupCombo->currentText(); } QString InfoView::race() { - return RaceCombo->currentText(); + return RaceCombo->currentText(); } void InfoView::slotNameChanged( const QString & s ) { - if (s != "Home Planet" && m_Name == "Home Planet" && m_Group == "Friendly") - { - GroupCombo->setEnabled(true); - BattleCombo->setEnabled(true); - ApplyButton->setEnabled(false); - NewButton->setEnabled(true); - } - if (s == "Home Planet" && m_Name == "Home Planet" && m_Group == "Friendly") - { - GroupCombo->setEnabled(false); - GroupCombo->setCurrentText(m_Group); - BattleCombo->setEnabled(false); - BattleCombo->setCurrentText(m_Battle); - ApplyButton->setEnabled(true); - NewButton->setEnabled(false); - } + if (s != "Home Planet" && m_Name == "Home Planet" && m_Group == "Friendly") + { + GroupCombo->setEnabled(true); + BattleCombo->setEnabled(true); + ApplyButton->setEnabled(false); + NewButton->setEnabled(true); + } + if (s == "Home Planet" && m_Name == "Home Planet" && m_Group == "Friendly") + { + GroupCombo->setEnabled(false); + GroupCombo->setCurrentText(m_Group); + BattleCombo->setEnabled(false); + BattleCombo->setCurrentText(m_Battle); + ApplyButton->setEnabled(true); + NewButton->setEnabled(false); + } } int InfoView::stays() { - return StaySpin->value(); + return StaySpin->value(); } void InfoView::setStays( int ticks ) { - StaySpin->setValue(ticks); + StaySpin->setValue(ticks); } diff --git a/bs/ui/resourceview.ui.h b/bs/ui/resourceview.ui.h index 485c4e5..a193871 100644 --- a/bs/ui/resourceview.ui.h +++ b/bs/ui/resourceview.ui.h @@ -1,27 +1,27 @@ /**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename slots use Qt Designer which will -** update this file, preserving your code. Create an init() slot in place of -** a constructor, and a destroy() slot in place of a destructor. -*****************************************************************************/ + ** ui.h extension file, included from the uic-generated form implementation. + ** + ** If you wish to add, delete or rename slots use Qt Designer which will + ** update this file, preserving your code. Create an init() slot in place of + ** a constructor, and a destroy() slot in place of a destructor. + *****************************************************************************/ //test void ResourceView::setLines( QString type, float i ) { - if (type == tr("metal")) - MetalEdit->setText(QString("%1").arg(i)); - else if (type == tr("crystal")) - CrystalEdit->setText(QString("%1").arg(i)); - else if (type == tr("eonium")) - EoniumEdit->setText(QString("%1").arg(i)); - else if (type == tr("uninit")) - UninitEdit->setText(QString("%1").arg(i)); - else if (type == tr("score")) - ScoreEdit->setText(QString("%1").arg(i)); - else if (type == tr("lost")) - ScoreLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("cost")) - CostEdit->setText(QString("%1").arg(i)); -} \ No newline at end of file + if (type == tr("metal")) + MetalEdit->setText(QString("%1").arg(i)); + else if (type == tr("crystal")) + CrystalEdit->setText(QString("%1").arg(i)); + else if (type == tr("eonium")) + EoniumEdit->setText(QString("%1").arg(i)); + else if (type == tr("uninit")) + UninitEdit->setText(QString("%1").arg(i)); + else if (type == tr("score")) + ScoreEdit->setText(QString("%1").arg(i)); + else if (type == tr("lost")) + ScoreLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("cost")) + CostEdit->setText(QString("%1").arg(i)); +} diff --git a/bs/ui/roidseditview.ui.h b/bs/ui/roidseditview.ui.h index 55d22b5..0755205 100644 --- a/bs/ui/roidseditview.ui.h +++ b/bs/ui/roidseditview.ui.h @@ -1,10 +1,10 @@ /**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename slots use Qt Designer which will -** update this file, preserving your code. Create an init() slot in place of -** a constructor, and a destroy() slot in place of a destructor. -*****************************************************************************/ + ** ui.h extension file, included from the uic-generated form implementation. + ** + ** If you wish to add, delete or rename slots use Qt Designer which will + ** update this file, preserving your code. Create an init() slot in place of + ** a constructor, and a destroy() slot in place of a destructor. + *****************************************************************************/ void RoidsEditView::init() { @@ -13,25 +13,25 @@ void RoidsEditView::init() void RoidsEditView::setValue( const QString & type, unsigned value ) { - if (type == tr("metal")) - MetalEdit->setText(QString("%1").arg(value)); - else if (type == tr("crystal")) - CrystalEdit->setText(QString("%1").arg(value)); - else if (type == tr("eonium")) - EoniumEdit->setText(QString("%1").arg(value)); - else if (type == tr("uninit")) - UninitEdit->setText(QString("%1").arg(value)); - else if (type == tr("score")) - ScoreEdit->setText(QString("%1").arg(value)); - - + if (type == tr("metal")) + MetalEdit->setText(QString("%1").arg(value)); + else if (type == tr("crystal")) + CrystalEdit->setText(QString("%1").arg(value)); + else if (type == tr("eonium")) + EoniumEdit->setText(QString("%1").arg(value)); + else if (type == tr("uninit")) + UninitEdit->setText(QString("%1").arg(value)); + else if (type == tr("score")) + ScoreEdit->setText(QString("%1").arg(value)); + + } void RoidsEditView::slotValueChanged() { QString type = sender()->name(); - + if (type == "MetalEdit") type = tr("metal"); else if (type == "CrystalEdit") @@ -45,22 +45,22 @@ void RoidsEditView::slotValueChanged() test = type; const QLineEdit *le = dynamic_cast(sender()); if (le) - emit changed(type, le->text().toInt()); + emit changed(type, le->text().toInt()); } void RoidsEditView::slotSetLost( QString type, float i ) { - if (type == tr("metal")) - MetalLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("crystal")) - CrystalLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("eonium")) - EoniumLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("uninit")) - UninitLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("scorelost")) - ScoreLostEdit->setText(QString("%1").arg(i)); - else if (type == tr("capping")) - CappingEdit->setText(QString("%1\%").arg(i*100)); -} \ No newline at end of file + if (type == tr("metal")) + MetalLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("crystal")) + CrystalLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("eonium")) + EoniumLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("uninit")) + UninitLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("scorelost")) + ScoreLostEdit->setText(QString("%1").arg(i)); + else if (type == tr("capping")) + CappingEdit->setText(QString("%1\%").arg(i*100)); +} diff --git a/bs/ui/tickviewbase.ui.h b/bs/ui/tickviewbase.ui.h index 026be8c..d37d629 100644 --- a/bs/ui/tickviewbase.ui.h +++ b/bs/ui/tickviewbase.ui.h @@ -1,52 +1,52 @@ /**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** Add custom slot implementations here. Use a slot init() for -** initialization code called during construction, and a slot destroy() -** for cleanup code called during destruction. -** -** This file gets modified by Qt Designer whenever you add, rename or -** remove custom slots. Implementation code does not get lost. -*****************************************************************************/ + ** ui.h extension file, included from the uic-generated form implementation. + ** + ** Add custom slot implementations here. Use a slot init() for + ** initialization code called during construction, and a slot destroy() + ** for cleanup code called during destruction. + ** + ** This file gets modified by Qt Designer whenever you add, rename or + ** remove custom slots. Implementation code does not get lost. + *****************************************************************************/ void CTickViewBase::slotMaxTick(int i) { - if ( !oneTickCheck->isChecked()) - minTickSpin->setMaxValue(i); - + if ( !oneTickCheck->isChecked()) + minTickSpin->setMaxValue(i); + } void CTickViewBase::slotMinTick( int i ) { - if ( !oneTickCheck->isChecked()) - maxTickSpin->setMinValue(i); + if ( !oneTickCheck->isChecked()) + maxTickSpin->setMinValue(i); } void CTickViewBase::slotTickChanged(int i) { - if ( oneTickCheck->isChecked()) - { - maxTickSpin->setValue(i); - //minTickSpin->setValue(i-1); - emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); - return; - } - emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); + if ( oneTickCheck->isChecked()) + { + maxTickSpin->setValue(i); + //minTickSpin->setValue(i-1); + emit ticksChanged( maxTickSpin->value() - 1, maxTickSpin->value()); + return; + } + emit ticksChanged( minTickSpin->value(), maxTickSpin->value()); } void CTickViewBase::slotOneTick( bool b ) { - if(b) - { - maxTickSpin->setMinValue(0); - minTickSpin->setDisabled(true); - minTickSpin->setMaxValue(99); - } - else - { - minTickSpin->setEnabled(true); - maxTickSpin->setMinValue( minTickSpin->value()); - minTickSpin->setMaxValue( maxTickSpin->value()); - } -} \ No newline at end of file + if(b) + { + maxTickSpin->setMinValue(0); + minTickSpin->setDisabled(true); + minTickSpin->setMaxValue(99); + } + else + { + minTickSpin->setEnabled(true); + maxTickSpin->setMinValue( minTickSpin->value()); + minTickSpin->setMaxValue( maxTickSpin->value()); + } +} -- 2.39.2