diff options
Diffstat (limited to 'Swift/QtUI/QtVCardWidget')
4 files changed, 8 insertions, 8 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp b/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp index ed36580..02ceb0a 100644 --- a/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp +++ b/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp @@ -23,86 +23,86 @@ QtTagComboBox::QtTagComboBox(QWidget* parent) : QComboBox(parent) { displayItem = new QStandardItem(); displayItem->setText(""); displayModel->insertRow(0, displayItem); editMenu = new QMenu(this); this->setModel(displayModel); editable = true; } QtTagComboBox::~QtTagComboBox() { } bool QtTagComboBox::isEditable() const { return editable; } void QtTagComboBox::setEditable(const bool editable) { this->editable = editable; } void QtTagComboBox::addTag(const QString &id, const QString &label) { QAction* tagAction = new QAction(editMenu); tagAction->setText(label); tagAction->setCheckable(true); tagAction->setData(QString(id)); editMenu->addAction(tagAction); } void QtTagComboBox::setTag(const QString &id, bool value) { QList<QAction*> tagActions = editMenu->actions(); - foreach(QAction* action, tagActions) { + for (auto action : tagActions) { if (action->data() == id) { action->setChecked(value); updateDisplayItem(); return; } } } bool QtTagComboBox::isTagSet(const QString &id) const { QList<QAction*> tagActions = editMenu->actions(); - foreach(QAction* action, tagActions) { + for (auto action : tagActions) { if (action->data() == id) { return action->isChecked(); } } return false; } void QtTagComboBox::showPopup() { } void QtTagComboBox::hidePopup() { } bool QtTagComboBox::event(QEvent* event) { if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::KeyRelease) { if (!editable) return true; QPoint p = mapToGlobal(QPoint(0,0)); p += QPoint(0, height()); editMenu->exec(p); updateDisplayItem(); return true; } return QComboBox::event(event); } void QtTagComboBox::updateDisplayItem() { QList<QAction*> tagActions = editMenu->actions(); QString text = ""; - foreach(QAction* action, tagActions) { + for (auto action : tagActions) { if (action->isChecked()) { if (text != "") { text += ", "; } text += action->text(); } } setItemText(0, text); } } diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp index 4043dbc..596006a 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp @@ -63,61 +63,61 @@ void QtVCardAddressField::setupContentWidgets() { pocodeLineEdit->setPlaceholderText(tr("Postal Code")); regionLineEdit->setPlaceholderText(tr("Region")); countryLineEdit->setPlaceholderText(tr("Country")); #endif deliveryTypeLabel = new QtElidingLabel(this); deliveryTypeLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); getGridLayout()->addWidget(deliveryTypeLabel, getGridLayout()->rowCount()-3, 4, Qt::AlignVCenter); domesticRadioButton = new QRadioButton(tr("Domestic Delivery"), this); getGridLayout()->addWidget(domesticRadioButton, getGridLayout()->rowCount()-2, 4, Qt::AlignVCenter); internationalRadioButton = new QRadioButton(tr("International Delivery"), this); getGridLayout()->addWidget(internationalRadioButton, getGridLayout()->rowCount()-1, 4, Qt::AlignVCenter); buttonGroup = new QButtonGroup(this); buttonGroup->addButton(domesticRadioButton); buttonGroup->addButton(internationalRadioButton); setTabOrder(internationalRadioButton, getTagComboBox()); getTagComboBox()->addTag("postal", tr("Postal")); getTagComboBox()->addTag("parcel", tr("Parcel")); QtVCardHomeWork::setTagComboBox(getTagComboBox()); textFields << streetLineEdit << poboxLineEdit << addressextLineEdit << cityLineEdit << pocodeLineEdit << regionLineEdit << countryLineEdit; childWidgets << deliveryTypeLabel << domesticRadioButton << internationalRadioButton; } void QtVCardAddressField::customCleanup() { - foreach(QWidget* widget, textFields) { + for (auto widget : textFields) { widget->hide(); textFieldGridLayout->removeWidget(widget); } getGridLayout()->removeItem(textFieldGridLayoutItem); } bool QtVCardAddressField::isEmpty() const { return streetLineEdit->text().isEmpty() && poboxLineEdit->text().isEmpty() && addressextLineEdit->text().isEmpty() && cityLineEdit->text().isEmpty() && pocodeLineEdit->text().isEmpty() && regionLineEdit->text().isEmpty() && countryLineEdit->text().isEmpty(); } void QtVCardAddressField::setAddress(const VCard::Address& address) { setPreferred(address.isPreferred); setHome(address.isHome); setWork(address.isWork); getTagComboBox()->setTag("postal", address.isPostal); getTagComboBox()->setTag("parcel", address.isParcel); domesticRadioButton->setChecked(address.deliveryType == VCard::DomesticDelivery); internationalRadioButton->setChecked(address.deliveryType == VCard::InternationalDelivery); streetLineEdit->setText(P2QSTRING(address.street)); poboxLineEdit->setText(P2QSTRING(address.poBox)); addressextLineEdit->setText(P2QSTRING(address.addressExtension)); cityLineEdit->setText(P2QSTRING(address.locality)); @@ -143,40 +143,40 @@ VCard::Address QtVCardAddressField::getAddress() const { address.country = Q2PSTRING(countryLineEdit->text()); return address; } void QtVCardAddressField::handleEditibleChanged(bool isEditable) { assert(streetLineEdit); assert(poboxLineEdit); assert(addressextLineEdit); assert(cityLineEdit); assert(pocodeLineEdit); assert(regionLineEdit); assert(countryLineEdit); assert(deliveryTypeLabel); assert(domesticRadioButton); assert(internationalRadioButton); streetLineEdit->setEditable(isEditable); poboxLineEdit->setEditable(isEditable); addressextLineEdit->setEditable(isEditable); cityLineEdit->setEditable(isEditable); pocodeLineEdit->setEditable(isEditable); regionLineEdit->setEditable(isEditable); countryLineEdit->setEditable(isEditable); deliveryTypeLabel->setText(buttonGroup->checkedButton() == nullptr ? "" : buttonGroup->checkedButton()->text()); deliveryTypeLabel->setVisible(!isEditable); domesticRadioButton->setVisible(isEditable); internationalRadioButton->setVisible(isEditable); - foreach (QWidget* widget, textFields) { + for (auto widget : textFields) { QtResizableLineEdit* lineEdit; if ((lineEdit = dynamic_cast<QtResizableLineEdit*>(widget))) { lineEdit->setVisible(isEditable ? true : !lineEdit->text().isEmpty()); lineEdit->setStyleSheet(isEditable ? "" : "QLineEdit { border: none; background: transparent; }"); } } } } diff --git a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp index ab69cba..9bb6a35 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp @@ -94,61 +94,61 @@ void QtVCardGeneralField::setStarVisible(const bool isVisible) { starVisible = isVisible; updatePreferredStarVisibility(); } bool QtVCardGeneralField::getStarVisible() const { return starVisible; } void QtVCardGeneralField::setPreferred(const bool preferred) { if (preferredCheckBox) preferredCheckBox->setChecked(preferred); updatePreferredStarVisibility(); } bool QtVCardGeneralField::getPreferred() const { return preferredCheckBox ? preferredCheckBox->isChecked() : false; } void QtVCardGeneralField::customCleanup() { } QtTagComboBox* QtVCardGeneralField::getTagComboBox() const { return tagComboBox; } QGridLayout* QtVCardGeneralField::getGridLayout() const { return layout; } void QtVCardGeneralField::handleCloseButtonClicked() { customCleanup(); - foreach(QWidget* widget, childWidgets) { + for (auto widget : childWidgets) { widget->hide(); layout->removeWidget(widget); } deleteField(this); } void QtVCardGeneralField::handlePreferredStarStateChanged(int state) { if (state == Qt::Checked) { QToolTip::showText(QCursor::pos(), tr("Marked as your preferred %1. Click again to undo.").arg(labelText)); } } void QtVCardGeneralField::updatePreferredStarVisibility() { if (preferredCheckBox) { bool showStar = false; if (editable) { if (starVisible) { showStar = true; } else { showStar = preferredCheckBox->isChecked(); } } else { showStar = preferredCheckBox->isChecked(); } preferredCheckBox->setVisible(showStar); preferredCheckBox->setEnabled(editable); } } diff --git a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp index 9e303b7..5162c73 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp @@ -51,101 +51,101 @@ void QtVCardOrganizationField::setupContentWidgets() { #if QT_VERSION >= 0x050000 unitsTreeWidget->header()->setSectionResizeMode(0, QHeaderView::Stretch); #else unitsTreeWidget->header()->setResizeMode(0, QHeaderView::Stretch); #endif unitsTreeWidget->setHeaderHidden(true); unitsTreeWidget->setRootIsDecorated(false); unitsTreeWidget->setEditTriggers(QAbstractItemView::DoubleClicked); unitsTreeWidget->setItemDelegateForColumn(1, itemDelegate); connect(unitsTreeWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), SLOT(handleItemChanged(QTreeWidgetItem*,int))); getGridLayout()->addWidget(unitsTreeWidget, getGridLayout()->rowCount()-1, 4, 2, 1); QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << ""); item->setFlags(item->flags() | Qt::ItemIsEditable); unitsTreeWidget->addTopLevelItem(item); getTagComboBox()->hide(); organizationLabel->hide(); childWidgets << organizationLabel << organizationLineEdit << unitsTreeWidget; } bool QtVCardOrganizationField::isEmpty() const { return organizationLineEdit->text().isEmpty() && unitsTreeWidget->model()->rowCount() != 0; } void QtVCardOrganizationField::setOrganization(const VCard::Organization& organization) { organizationLineEdit->setText(P2QSTRING(organization.name)); unitsTreeWidget->clear(); - foreach(std::string unit, organization.units) { + for (const auto& unit : organization.units) { QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(P2QSTRING(unit)) << ""); item->setFlags(item->flags() | Qt::ItemIsEditable); unitsTreeWidget->addTopLevelItem(item); } QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << ""); item->setFlags(item->flags() | Qt::ItemIsEditable); unitsTreeWidget->addTopLevelItem(item); } VCard::Organization QtVCardOrganizationField::getOrganization() const { VCard::Organization organization; organization.name = Q2PSTRING(organizationLineEdit->text()); for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) { QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i); if (!row->text(0).isEmpty()) { organization.units.push_back(Q2PSTRING(row->text(0))); } } return organization; } void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) { assert(organizationLineEdit); assert(unitsTreeWidget); organizationLineEdit->setVisible(isEditable); organizationLabel->setVisible(!isEditable); if (!isEditable) { QString label; for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) { QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i); if (!row->text(0).isEmpty()) { label += row->text(0) + ", "; } } label += organizationLineEdit->text(); organizationLabel->setText(label); } unitsTreeWidget->setVisible(isEditable); } void QtVCardOrganizationField::handleItemChanged(QTreeWidgetItem *, int) { guaranteeEmptyRow(); } void QtVCardOrganizationField::handleRowsRemoved(const QModelIndex&, int, int) { guaranteeEmptyRow(); } void QtVCardOrganizationField::guaranteeEmptyRow() { bool hasEmptyRow = false; QList<QTreeWidgetItem*> rows = unitsTreeWidget->findItems("", Qt::MatchFixedString); - foreach(QTreeWidgetItem* row, rows) { + for (auto row : rows) { if (row->text(0).isEmpty()) { hasEmptyRow = true; } } if (!hasEmptyRow) { QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << ""); item->setFlags(item->flags() | Qt::ItemIsEditable); unitsTreeWidget->addTopLevelItem(item); unitsTreeWidget->setCurrentItem(item); } } } |