From atlantik-devel Wed Jun 26 07:59:22 2002 From: kde () office ! kde ! org Date: Wed, 26 Jun 2002 07:59:22 +0000 To: atlantik-devel Subject: [atlantik-devel] CVS: kdeaddons/atlantikdesigner/designer boardinfo.cpp,1.4,1.5 designer.cpp,1.43,1. X-MARC-Message: https://marc.info/?l=atlantik-devel&m=102507850219881 Update of /home/kde/kdeaddons/atlantikdesigner/designer In directory office:/tmp/cvs-serv6278/designer Modified Files: boardinfo.cpp designer.cpp editor.cpp group.cpp Log Message: CVS_SILENT Style guide fixes. Index: boardinfo.cpp =================================================================== RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/boardinfo.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- boardinfo.cpp 2002/06/12 01:31:34 1.4 +++ boardinfo.cpp 2002/06/26 07:59:20 1.5 @@ -49,7 +49,7 @@ versionLayout->addWidget(new QLabel(info->version, about)); QHBoxLayout *urlLayout = new QHBoxLayout(aboutLayout, spacingHint()); - urlLayout->addWidget(new QLabel(i18n("URL"), about)); + urlLayout->addWidget(new QLabel(i18n("URL:"), about)); if (editable) urlLayout->addWidget(url = new KLineEdit(info->url, about)); else @@ -57,7 +57,7 @@ aboutLayout->addStretch(3); - aboutLayout->addWidget(new QLabel(i18n("Description"), about)); + aboutLayout->addWidget(new QLabel(i18n("Description:"), about)); aboutLayout->addStretch(); aboutLayout->addWidget(description = new KLineEdit(about)); description->setText(info->description); @@ -69,7 +69,7 @@ if (editable) { QHBoxLayout *bgLayout = new QHBoxLayout(aboutLayout, spacingHint()); - bgLayout->addWidget(new QLabel(i18n("Background Color"), about)); + bgLayout->addWidget(new QLabel(i18n("Background color:"), about)); bgColor = new KColorButton(info->bgColor, about); bgLayout->addWidget(bgColor); } Index: designer.cpp =================================================================== RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- designer.cpp 2002/06/13 02:48:48 1.43 +++ designer.cpp 2002/06/26 07:59:20 1.44 @@ -526,7 +526,7 @@ { QStringList estates; for (int i = 1; i <= max; i++) - estates.append(i18n("Jump to estate %1").arg(QString::number(i))); + estates.append(i18n("Jump to Estate %1").arg(QString::number(i))); estateAct->setItems(estates); } Index: editor.cpp =================================================================== RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- editor.cpp 2002/06/12 01:31:34 1.28 +++ editor.cpp 2002/06/26 07:59:20 1.29 @@ -165,7 +165,7 @@ QHBoxLayout *typeLayout = new QHBoxLayout(KDialog::spacingHint()); layout->addLayout(typeLayout, 4, 0); - QLabel *typeLabel = new QLabel(i18n("Type"), this); + QLabel *typeLabel = new QLabel(i18n("Type:"), this); typeLayout->addWidget(typeLabel); typeCombo = new KComboBox(false, this, "Type Combo"); typeLayout->addWidget(typeCombo); @@ -180,7 +180,7 @@ QStringList estateTypes(i18n("Street")); estateTypes.append(i18n("Cards")); estateTypes.append(i18n("Free Parking")); - estateTypes.append(i18n("Go to jail")); + estateTypes.append(i18n("Go to Jail")); estateTypes.append(i18n("Tax")); estateTypes.append(i18n("Jail")); typeCombo->insertStringList(estateTypes); @@ -337,11 +337,11 @@ : EstateDlg(parent, name) { QGridLayout *taxBox = new QGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); - taxBox->addWidget(new QLabel(i18n("Fixed tax"), this), 0, 0); + taxBox->addWidget(new QLabel(i18n("Fixed tax:"), this), 0, 0); taxBox->addWidget(tax = new QSpinBox(0, 3000, 1, this), 0, 1); tax->setSpecialValueText(i18n("None")); tax->setSuffix("$"); - taxBox->addWidget(new QLabel(i18n("Percentage tax"), this), 1, 0); + taxBox->addWidget(new QLabel(i18n("Percentage tax:"), this), 1, 0); taxBox->addWidget(taxPercentage = new QSpinBox(0, 100, 1, this), 1, 1); taxPercentage->setSpecialValueText(i18n("None")); taxPercentage->setSuffix("%"); @@ -465,18 +465,18 @@ hlayout = new QHBoxLayout(this); typeCombo = new KComboBox(this); QStringList _types(i18n("Pay")); - _types.append(i18n("Pay each player")); + _types.append(i18n("Pay Each Player")); _types.append(i18n("Collect")); - _types.append(i18n("Collect from each player")); - _types.append(i18n("Advance to")); + _types.append(i18n("Collect From Each Player")); + _types.append(i18n("Advance To")); _types.append(i18n("Advance")); - _types.append(i18n("Go back")); - _types.append(i18n("Go to jail")); - _types.append(i18n("Get out of jail free card")); - _types.append(i18n("Advance to nearest utility")); - _types.append(i18n("Advance to nearest railroad")); - _types.append(i18n("Pay for each house")); - _types.append(i18n("Pay for each hotel")); + _types.append(i18n("Go Back")); + _types.append(i18n("Go to Jail")); + _types.append(i18n("Get out of Jail Free Card")); + _types.append(i18n("Advance to Nearest Utility")); + _types.append(i18n("Advance to Nearest Railroad")); + _types.append(i18n("Pay for Eeach House")); + _types.append(i18n("Pay for Each Hotel")); typeCombo->insertStringList(_types); hlayout->addWidget(typeCombo); connect(typeCombo, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); @@ -748,18 +748,18 @@ QVBoxLayout *bigbox = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QVGroupBox *RentPage = new QVGroupBox(i18n("&Rent By Number of Houses"), this); + QVGroupBox *RentPage = new QVGroupBox(i18n("&Rent by Number of Houses"), this); RentPage->setInsideSpacing(KDialog::spacingHint()); RentPage->setInsideMargin(KDialog::marginHint()); bigbox->addWidget(RentPage); QWidget *topRent = new QWidget(RentPage); QGridLayout *rentBox = new QGridLayout(topRent, 3, 3, KDialog::spacingHint()); - rentBox->addWidget(new QLabel(i18n("None"), topRent), 0, 0); - rentBox->addWidget(new QLabel(i18n("One"), topRent), 0, 1); - rentBox->addWidget(new QLabel(i18n("Two"), topRent), 0, 2); - rentBox->addWidget(new QLabel(i18n("Three"), topRent), 2, 0); - rentBox->addWidget(new QLabel(i18n("Four"), topRent), 2, 1); - rentBox->addWidget(new QLabel(i18n("Hotel"), topRent), 2, 2); + rentBox->addWidget(new QLabel(i18n("None:"), topRent), 0, 0); + rentBox->addWidget(new QLabel(i18n("One:"), topRent), 0, 1); + rentBox->addWidget(new QLabel(i18n("Two:"), topRent), 0, 2); + rentBox->addWidget(new QLabel(i18n("Three:"), topRent), 2, 0); + rentBox->addWidget(new QLabel(i18n("Four:"), topRent), 2, 1); + rentBox->addWidget(new QLabel(i18n("Hotel:"), topRent), 2, 2); rentBox->addWidget(houses0 = new QSpinBox(0, 3000, 1, topRent), 1, 0); rentBox->addWidget(houses1 = new QSpinBox(0, 3000, 1, topRent), 1, 1); @@ -781,12 +781,12 @@ houses5->setSpecialValueText(i18n("None")); QGridLayout *pricesBox = new QGridLayout(bigbox, 2, 2, KDialog::spacingHint()); - pricesBox->addWidget(new QLabel(i18n("Price"), this), 0, 0); + pricesBox->addWidget(new QLabel(i18n("Price:"), this), 0, 0); pricesBox->addWidget(price = new QSpinBox(0, 3000, 25, this), 0, 1); price->setSpecialValueText(i18n("None")); price->setSuffix(i18n("$")); - QLabel *groupLabel = new QLabel(i18n("Group"), this); + QLabel *groupLabel = new QLabel(i18n("Group:"), this); pricesBox->addWidget(groupLabel, 1, 0); groupCombo = new KComboBox(this, "Group Combo"); groupUpdate(); Index: group.cpp =================================================================== RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/group.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- group.cpp 2002/06/12 01:31:34 1.5 +++ group.cpp 2002/06/26 07:59:20 1.6 @@ -41,12 +41,12 @@ colorGroupBox = new QVGroupBox(i18n("&Colors"), page); vlayout->addWidget(colorGroupBox); - (void) new QLabel(i18n("Foreground"), colorGroupBox); + (void) new QLabel(i18n("Foreground:"), colorGroupBox); fgButton = new KColorButton(colorGroupBox, "Foreground Button"); connect(fgButton, SIGNAL(changed(const QColor &)), this, SLOT(fgChanged(const QColor &))); connect(fgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed())); - (void) new QLabel(i18n("Background"), colorGroupBox); + (void) new QLabel(i18n("Background:"), colorGroupBox); bgButton = new KColorButton(colorGroupBox, "Background Button"); connect(bgButton, SIGNAL(changed(const QColor &)), this, SLOT(bgChanged(const QColor &))); connect(bgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed())); @@ -56,13 +56,13 @@ pricesWidget = new QWidget(pricesGroupBox); QGridLayout *pricesLayout = new QGridLayout(pricesWidget, 2, 2, 0, spacingHint()); - pricesLayout->addWidget(new QLabel(i18n("House price"), pricesWidget), 0, 0); + pricesLayout->addWidget(new QLabel(i18n("House price:"), pricesWidget), 0, 0); pricesLayout->addWidget(housePrice = new QSpinBox(0, 3000, 25, pricesWidget), 0, 1); housePrice->setSpecialValueText(i18n("None")); housePrice->setSuffix(i18n("$")); connect(housePrice, SIGNAL(valueChanged(int)), this, SLOT(housePriceChanged(int))); - pricesLayout->addWidget(new QLabel(i18n("Global price"), pricesWidget), 1, 0); + pricesLayout->addWidget(new QLabel(i18n("Global price:"), pricesWidget), 1, 0); pricesLayout->addWidget(globalPrice = new QSpinBox(0, 3000, 25, pricesWidget), 1, 1); globalPrice->setSpecialValueText(i18n("None")); globalPrice->setSuffix(i18n("$")); @@ -73,7 +73,7 @@ mathWidget = new QWidget(dynamicGroupBox); QGridLayout *mathLayout = new QGridLayout(mathWidget, 2, 2, 0, spacingHint()); - mathLayout->addWidget(new QLabel(i18n("Rent variable"), mathWidget), 0, 0); + mathLayout->addWidget(new QLabel(i18n("Rent variable:"), mathWidget), 0, 0); mathLayout->addWidget(new QLabel(i18n("Expression:"), mathWidget), 1, 0); rentVarCombo = new QComboBox(mathWidget); @@ -102,7 +102,7 @@ void GroupEditor::add() { bool ok; - QString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group below."), QString::null, &ok, this); + QString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group below:"), QString::null, &ok, this); if (ok) { for (ConfigEstateGroupList::Iterator it = mylist.begin(); it != mylist.end(); ++it) _______________________________________________ atlantik-devel mailing list atlantik-devel@mail.kde.org http://mail.kde.org/mailman/listinfo/atlantik-devel