Skip to content

Commit

Permalink
fixed importData(), executeLink(), MTRecord::exists(), fixed links in…
Browse files Browse the repository at this point in the history
… viewCircuit(), viewInspection(), viewTable(), updated the translations
  • Loading branch information
michal-tomlein committed Apr 26, 2009
1 parent 60e3ada commit 38da134
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 136 deletions.
4 changes: 2 additions & 2 deletions about_widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ AboutWidget::AboutWidget()
about_qt.append("</p><p></p><p style=\"font-family: sans-serif; font-size:8pt;\">");
about_qt.append(tr("Qt is a C++ toolkit for cross-platform application development."));
about_qt.append("</p><p></p><p style=\"font-family: sans-serif; font-size:8pt;\">");
about_qt.append(tr("Qt provides single-source portability across MS Windows, Mac OS X, Linux and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core."));
about_qt.append(tr("Qt provides single-source portability across MS Windows, Mac OS X, Linux and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE."));
about_qt.append("</p><p></p><p style=\"font-family: sans-serif; font-size:8pt;\">");
about_qt.append(tr("Qt is a Trolltech product. See <span style=\"font-style:italic;\">http://www.trolltech.com/qt/</span> for more information."));
about_qt.append(tr("Qt is a Nokia product. See <span style=\"font-style:italic;\">www.qtsoftware.com/qt</span> for more information."));
about_qt.append("</p>");
#ifdef Q_WS_MAC
about_qt.remove("font-family: sans-serif;");
Expand Down
4 changes: 2 additions & 2 deletions database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,7 @@ void MainWindow::importData()
last_item->setExpanded(true);
}
}
if (id->exec() != QDialog::Accepted) { // BEGIN IMPORT
if (id->exec() == QDialog::Accepted) { // BEGIN IMPORT
StringVariantMap set;
for (int c = 0; c < id->customers()->count(); ++c) {
if (id->customers()->item(c)->checkState() == Qt::Unchecked) { continue; }
Expand All @@ -1476,7 +1476,7 @@ if (id->exec() != QDialog::Accepted) { // BEGIN IMPORT
if (!record.exists()) {
id_justified = c_id.rightJustified(8, '0');
QListWidgetItem * item = new QListWidgetItem;
item->setText(set.value("name", QString()).toString().isEmpty() ? id_justified : tr("%1 (%2)").arg(id_justified).arg(set.value("name").toString()));
item->setText(set.value("company").toString().isEmpty() ? id_justified : tr("%1 (%2)").arg(id_justified).arg(set.value("company").toString()));
item->setData(Qt::UserRole, c_id);
lw_customers->addItem(item);
}
Expand Down
Loading

0 comments on commit 38da134

Please sign in to comment.