[kde-doc-english] [calligra] kexi: GUI: General: Replaced term "row" with "record" in visible places
Jaroslaw Staniek
staniek at kde.org
Mon Jul 25 23:59:39 CEST 2011
Git commit d231a97d3548f322e2711fb49dd3ac9d46dd52f1 by Jaroslaw Staniek.
Committed on 25/07/2011 at 23:58.
Pushed by staniek into branch 'master'.
GUI: General: Replaced term "row" with "record" in visible places
BUG:278418
M +14 -14 kexi/widget/kexidataawareview.cpp
M +1 -1 kexi/migration/mdb/src/keximdb/mdbmigrate.cpp
M +1 -1 kexi/widget/tableview/kexidataawarepropertyset.h
M +4 -4 kexi/plugins/tables/kexilookupcolumnpage.cpp
M +3 -3 kexi/widget/tableview/kexitableviewdata.cpp
M +1 -1 kexi/migration/mysql/mysqlmigrate.cpp
M +3 -3 kexi/widget/tableview/kexitableedit.cpp
M +1 -1 kexi/widget/utils/kexisharedactionclient.h
M +2 -2 kexi/webforms/view/default/Delete.cpp
M +16 -16 kexi/widget/utils/kexirecordmarker.cpp
M +2 -2 kexi/core/KexiWindow.cpp
M +1 -1 kexi/widget/tableview/kexicomboboxbase.h
M +1 -1 kexi/examples/Simple_Database.kexi.sql
M +1 -1 kexi/plugins/tables/kexitabledesignerview_p.cpp
M +1 -1 kexi/plugins/reports/kexidbreportdata.cpp
M +2 -2 kexi/widget/tableview/kexitableview_p.h
M +1 -1 kexi/widget/tableview/kexitableview_p.cpp
M +28 -28 kexi/main/KexiMainWindow.cpp
M +1 -1 kexi/migration/AlterSchemaTableModel.cpp
M +3 -3 kexi/main/KexiMainWindow_p.h
M +1 -1 kexi/plugins/forms/kexiformscrollview.cpp
M +1 -1 kexi/widget/utils/kexirecordnavigator.h
M +37 -37 kexi/widget/tableview/kexitableview.h
M +1 -1 kexi/plugins/forms/kexiformscrollview.h
M +15 -15 kexi/widget/utils/kexirecordnavigator.cpp
M +1 -1 kexi/widget/tableview/kexitableedit.h
M +26 -26 kexi/widget/tableview/kexicomboboxbase.cpp
M +2 -2 kexi/widget/utils/kexirecordmarker.h
M +2 -2 kexi/plugins/queries/kexiquerydesignerguieditor.cpp
M +85 -85 kexi/widget/tableview/kexitableview.cpp
M +6 -6 kexi/widget/tableview/kexicomboboxpopup.cpp
M +4 -4 kexi/widget/tableview/kexidataawareobjectiface.h
M +2 -2 kexi/widget/tableview/kexidataawarepropertyset.cpp
M +18 -18 kexi/kexidb/connection.cpp
M +1 -1 kexi/kexidb/queryschema.cpp
M +1 -1 kexi/plugins/tables/kexilookupcolumnpage.h
M +1 -1 kexi/plugins/forms/widgets/kexidbform.cpp
M +- -- kexi/examples/Simple_Database.kexi
M +1 -1 kexi/core/kexi.cpp
M +5 -0 kexi/doc/dev/CHANGELOG-Kexi-js
M +14 -14 kexi/widget/tableview/kexidataawareobjectiface.cpp
M +5 -5 kexi/plugins/tables/kexitabledesignerview.cpp
http://commits.kde.org/calligra/d231a97d3548f322e2711fb49dd3ac9d46dd52f1
diff --git a/kexi/core/KexiWindow.cpp b/kexi/core/KexiWindow.cpp
index 251fea3..c20ee42 100644
--- a/kexi/core/KexiWindow.cpp
+++ b/kexi/core/KexiWindow.cpp
@@ -228,12 +228,12 @@ void KexiWindow::createSubwidgets()
d->topBarLyr->add(d->saveDesignButton);
d->topBarLyr->addWidget( d->saveDesignButtonSeparator = new KexiToolBarSeparator(this));
- a = sharedAction("data_save_row");
+ a = sharedAction("data_save_record");
btn = new KexiSmallToolButton(a, this);
btn->setToolButtonStyle( Qt::ToolButtonIconOnly );
d->topBarLyr->add(btn);
- a = sharedAction("data_cancel_row_changes");
+ a = sharedAction("data_cancel_record_changes");
btn = new KexiSmallToolButton(a, this);
btn->setToolButtonStyle( Qt::ToolButtonIconOnly );
d->topBarLyr->add(btn);
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index c6e8452..140288c 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -146,7 +146,7 @@ QString Kexi::iconNameForViewMode(ViewMode mode)
QString Kexi::msgYouCanImproveData()
{
- return i18n("You can correct data in this row or use \"Cancel row changes\" function.");
+ return i18n("You can correct data in this row or use \"Cancel record changes\" function.");
}
//--------------------------------------------------------------------------------
diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index a7beaec..582c98f 100644
--- a/kexi/doc/dev/CHANGELOG-Kexi-js
+++ b/kexi/doc/dev/CHANGELOG-Kexi-js
@@ -89,6 +89,11 @@ Tabbed toolbar TODOS:
**can be used e.g. when there's no project opened in Kexi to hide Create, Data, External Data tabs
*should we remove the accelerators from the tabs?
+2011-07-25
+General
+*Replaced term "row" with "record" in visible places
+BUG:278418
+
~~~~~~~~~~~~~~~~ 2.4 Alpha 2 (2.3.72) ~~~~~~~~~~~~~~~~
2011-06-08
diff --git a/kexi/examples/Simple_Database.kexi b/kexi/examples/Simple_Database.kexi
index c34cc7d..da940e2 100644
Binary files a/kexi/examples/Simple_Database.kexi and b/kexi/examples/Simple_Database.kexi differ
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index 0caf93f..a1d9de7 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -351,7 +351,7 @@ INSERT INTO "kexi__objectdata" VALUES(65,'<!DOCTYPE UI>
<enum>NoFocus</enum>
</property>
<property name="onClickAction">
-<string>currentForm:data_save_row</string>
+<string>currentForm:data_save_record</string>
</property>
<property name="text">
<string>Save Changes</string>
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index 7fc6562..990d69b 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -1357,7 +1357,7 @@ QString Connection::selectStatement(KexiDB::QuerySchema& querySchema,
s_additional_fields += expression;
//subqueries_for_lookup_data.append(lookupQuery);
} else {
- KexiDBWarn << "Connection::selectStatement(): unsupported row source type "
+ KexiDBWarn << "Connection::selectStatement(): unsupported record source type "
<< rowSource.typeName();
return QString();
}
@@ -3230,14 +3230,14 @@ bool Connection::updateRow(QuerySchema &query, RecordData& data, RowEditBuffer&
if (!mt) {
KexiDBWarn << " -- NO MASTER TABLE!";
setError(ERR_UPDATE_NO_MASTER_TABLE,
- i18n("Could not update row because there is no master table defined."));
+ i18n("Could not update record because there is no master table defined."));
return false;
}
IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0;
if (!useROWID && !pkey) {
KexiDBWarn << " -- NO MASTER TABLE's PKEY!";
setError(ERR_UPDATE_NO_MASTER_TABLES_PKEY,
- i18n("Could not update row because master table has no primary key defined."));
+ i18n("Could not update record because master table has no primary key defined."));
//! @todo perhaps we can try to update without using PKEY?
return false;
}
@@ -3266,7 +3266,7 @@ bool Connection::updateRow(QuerySchema &query, RecordData& data, RowEditBuffer&
if (pkey->fieldCount() != query.pkeyFieldsCount()) { //sanity check
KexiDBWarn << " -- NO ENTIRE MASTER TABLE's PKEY SPECIFIED!";
setError(ERR_UPDATE_NO_ENTIRE_MASTER_TABLES_PKEY,
- i18n("Could not update row because it does not contain entire master table's primary key."));
+ i18n("Could not update record because it does not contain entire master table's primary key."));
return false;
}
if (!pkey->fields()->isEmpty()) {
@@ -3304,7 +3304,7 @@ bool Connection::updateRow(QuerySchema &query, RecordData& data, RowEditBuffer&
return false;
if (!res) {
- setError(ERR_UPDATE_SERVER_ERROR, i18n("Row updating on the server failed."));
+ setError(ERR_UPDATE_SERVER_ERROR, i18n("Record updating on the server failed."));
return false;
}
//success: now also assign new values in memory:
@@ -3327,7 +3327,7 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
if (!mt) {
KexiDBWarn << " -- NO MASTER TABLE!";
setError(ERR_INSERT_NO_MASTER_TABLE,
- i18n("Could not insert row because there is no master table defined."));
+ i18n("Could not insert record because there is no master table defined."));
return false;
}
IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0;
@@ -3360,11 +3360,11 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
FieldList affectedFields;
if (b.isEmpty()) {
- // empty row inserting requested:
+ // empty record inserting requested:
if (!getROWID && !pkey) {
- KexiDBWarn << "MASTER TABLE's PKEY REQUIRED FOR INSERTING EMPTY ROWS: INSERT CANCELLED";
+ KexiDBWarn << "MASTER TABLE's PKEY REQUIRED FOR INSERTING EMPTY RECORDS: INSERT CANCELLED";
setError(ERR_INSERT_NO_MASTER_TABLES_PKEY,
- i18n("Could not insert row because master table has no primary key defined."));
+ i18n("Could not insert record because master table has no primary key defined."));
return false;
}
if (pkey) {
@@ -3373,7 +3373,7 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
if (pkey->fieldCount() != query.pkeyFieldsCount()) { //sanity check
KexiDBWarn << "NO ENTIRE MASTER TABLE's PKEY SPECIFIED!";
setError(ERR_INSERT_NO_ENTIRE_MASTER_TABLES_PKEY,
- i18n("Could not insert row because it does not contain entire master table's primary key."));
+ i18n("Could not insert record because it does not contain entire master table's primary key."));
return false;
}
}
@@ -3392,7 +3392,7 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
sqlvals += m_driver->valueToSQL(anyField, QVariant()/*NULL*/);
affectedFields.addField(anyField);
} else {
- // non-empty row inserting requested:
+ // non-empty record inserting requested:
for (KexiDB::RowEditBuffer::DBMap::ConstIterator it = b.constBegin();it != b.constEnd();++it) {
if (it.key()->field->table() != mt)
continue; // skip values for fields outside of the master table (e.g. a "visible value" of the lookup field)
@@ -3420,7 +3420,7 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
return false;
if (!res) {
- setError(ERR_INSERT_SERVER_ERROR, i18n("Row inserting on the server failed."));
+ setError(ERR_INSERT_SERVER_ERROR, i18n("Record inserting on the server failed."));
return false;
}
//success: now also assign a new value in memory:
@@ -3438,7 +3438,7 @@ bool Connection::insertRow(QuerySchema &query, RecordData& data, RowEditBuffer&
id_columnInfo->field->name(), id_columnInfo->field->table()->name(), &ROWID);
if (last_id == (quint64) - 1 || last_id <= 0) {
//! @todo show error
-//! @todo remove just inserted row. How? Using ROLLBACK?
+//! @todo remove just inserted record. How? Using ROLLBACK?
return false;
}
RecordData aif_data;
@@ -3484,7 +3484,7 @@ bool Connection::deleteRow(QuerySchema &query, RecordData& data, bool useROWID)
if (!mt) {
KexiDBWarn << " -- NO MASTER TABLE!";
setError(ERR_DELETE_NO_MASTER_TABLE,
- i18n("Could not delete row because there is no master table defined."));
+ i18n("Could not delete record because there is no master table defined."));
return false;
}
IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0;
@@ -3493,7 +3493,7 @@ bool Connection::deleteRow(QuerySchema &query, RecordData& data, bool useROWID)
if (!useROWID && !pkey) {
KexiDBWarn << " -- WARNING: NO MASTER TABLE's PKEY";
setError(ERR_DELETE_NO_MASTER_TABLES_PKEY,
- i18n("Could not delete row because there is no primary key for master table defined."));
+ i18n("Could not delete record because there is no primary key for master table defined."));
return false;
}
@@ -3508,7 +3508,7 @@ bool Connection::deleteRow(QuerySchema &query, RecordData& data, bool useROWID)
if (pkey->fieldCount() != query.pkeyFieldsCount()) { //sanity check
KexiDBWarn << " -- NO ENTIRE MASTER TABLE's PKEY SPECIFIED!";
setError(ERR_DELETE_NO_ENTIRE_MASTER_TABLES_PKEY,
- i18n("Could not delete row because it does not contain entire master table's primary key."));
+ i18n("Could not delete record because it does not contain entire master table's primary key."));
return false;
}
uint i = 0;
@@ -3534,7 +3534,7 @@ bool Connection::deleteRow(QuerySchema &query, RecordData& data, bool useROWID)
KexiDBDbg << " -- SQL == " << m_sql;
if (!executeSQL(m_sql)) {
- setError(ERR_DELETE_SERVER_ERROR, i18n("Row deletion on the server failed."));
+ setError(ERR_DELETE_SERVER_ERROR, i18n("Record deletion on the server failed."));
return false;
}
return true;
@@ -3557,7 +3557,7 @@ bool Connection::deleteAllRows(QuerySchema &query)
KexiDBDbg << " -- SQL == " << m_sql;
if (!executeSQL(m_sql)) {
- setError(ERR_DELETE_SERVER_ERROR, i18n("Row deletion on the server failed."));
+ setError(ERR_DELETE_SERVER_ERROR, i18n("Record deletion on the server failed."));
return false;
}
return true;
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index 7a2fe51..764fcce 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -1558,7 +1558,7 @@ void QuerySchema::computeFieldsExpanded()
ci->setIndexForVisibleLookupValue(d->fieldsExpanded->size() + index);
}
} else {
- KexiDBWarn << "QuerySchema::computeFieldsExpanded(): unsupported row source type "
+ KexiDBWarn << "QuerySchema::computeFieldsExpanded(): unsupported record source type "
<< rowSource.typeName();
}
}
diff --git a/kexi/main/KexiMainWindow.cpp b/kexi/main/KexiMainWindow.cpp
index 9e8dd5f..4482a91 100644
--- a/kexi/main/KexiMainWindow.cpp
+++ b/kexi/main/KexiMainWindow.cpp
@@ -901,10 +901,10 @@ void KexiMainWindow::setupActions()
d->action_edit_delete->setToolTip(i18n("Delete selected object"));
d->action_edit_delete->setWhatsThis(i18n("Deletes currently selected object."));
- d->action_edit_delete_row = createSharedAction(i18n("Delete Row"), "delete_table_row",
- KShortcut(Qt::CTRL + Qt::Key_Delete), "edit_delete_row");
- d->action_edit_delete_row->setToolTip(i18n("Delete currently selected row"));
- d->action_edit_delete_row->setWhatsThis(i18n("Deletes currently selected row."));
+ d->action_edit_delete_record = createSharedAction(i18n("Delete Record"), "delete_table_row",
+ KShortcut(Qt::CTRL + Qt::Key_Delete), "edit_delete_record");
+ d->action_edit_delete_record->setToolTip(i18n("Delete currently selected record"));
+ d->action_edit_delete_record->setWhatsThis(i18n("Deletes currently selected record."));
d->action_edit_clear_table = createSharedAction(i18n("Clear Table Contents"),
"clear_table_contents", KShortcut(), "edit_clear_table");
@@ -1010,19 +1010,19 @@ void KexiMainWindow::setupActions()
d->action_view_propeditor = 0;
//DATA MENU
- d->action_data_save_row = createSharedAction(i18n("&Save Row"), "dialog-ok",
- KShortcut(Qt::SHIFT | Qt::Key_Return), "data_save_row");
- d->action_data_save_row->setToolTip(i18n("Save changes made to the current row"));
- d->action_data_save_row->setWhatsThis(i18n("Saves changes made to the current row."));
-//temp. disable because of problems with volatile actions setActionVolatile( d->action_data_save_row, true );
-
- d->action_data_cancel_row_changes = createSharedAction(i18n("&Cancel Row Changes"),
- "dialog-cancel", KShortcut(), "data_cancel_row_changes");
- d->action_data_cancel_row_changes->setToolTip(
- i18n("Cancel changes made to the current row"));
- d->action_data_cancel_row_changes->setWhatsThis(
- i18n("Cancels changes made to the current row."));
-//temp. disable because of problems with volatile actions setActionVolatile( d->action_data_cancel_row_changes, true );
+ d->action_data_save_record = createSharedAction(i18n("&Save Record"), "dialog-ok",
+ KShortcut(Qt::SHIFT | Qt::Key_Return), "data_save_record");
+ d->action_data_save_record->setToolTip(i18n("Save changes made to the current record"));
+ d->action_data_save_record->setWhatsThis(i18n("Saves changes made to the current record."));
+//temp. disable because of problems with volatile actions setActionVolatile( d->action_data_save_record, true );
+
+ d->action_data_cancel_record_changes = createSharedAction(i18n("&Cancel Record Changes"),
+ "dialog-cancel", KShortcut(), "data_cancel_record_changes");
+ d->action_data_cancel_record_changes->setToolTip(
+ i18n("Cancel changes made to the current record"));
+ d->action_data_cancel_record_changes->setWhatsThis(
+ i18n("Cancels changes made to the current record."));
+//temp. disable because of problems with volatile actions setActionVolatile( d->action_data_cancel_record_changes, true );
d->action_data_execute = createSharedAction(
i18n("&Execute"), "media-playback-start", KShortcut(), "data_execute");
@@ -1209,13 +1209,13 @@ void KexiMainWindow::setupActions()
acat->addWindowAction("data_filter",
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
- acat->addWindowAction("data_save_row",
+ acat->addWindowAction("data_save_record",
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
- acat->addWindowAction("data_cancel_row_changes",
+ acat->addWindowAction("data_cancel_record_changes",
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
- acat->addWindowAction("delete_table_row",
+ acat->addWindowAction("delete_table_record",
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
//! @todo support this in KexiPart::FormObjectType as well
@@ -1244,7 +1244,7 @@ void KexiMainWindow::setupActions()
acat->addAction("edit_delete", Kexi::GlobalActionCategory | Kexi::PartItemActionCategory | Kexi::WindowActionCategory,
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
- acat->addAction("edit_delete_row", Kexi::GlobalActionCategory | Kexi::WindowActionCategory,
+ acat->addAction("edit_delete_record", Kexi::GlobalActionCategory | Kexi::WindowActionCategory,
KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType);
acat->addAction("edit_edititem", Kexi::PartItemActionCategory | Kexi::WindowActionCategory,
@@ -4984,7 +4984,7 @@ tristate KexiMainWindow::exportItemAsDataTable(KexiPart::Item* item)
if (!item)
return false;
//! @todo: check if changes to this are saved, if not: ask for saving
-//! @todo: accept row changes...
+//! @todo: accept record changes...
QMap<QString, QString> args;
args.insert("destinationType", "file");
@@ -5031,7 +5031,7 @@ bool KexiMainWindow::printPreviewForItem(KexiPart::Item* item, const QString& ti
tristate KexiMainWindow::printPreviewForItem(KexiPart::Item* item)
{
return printPreviewForItem(item, QString(),
-//! @todo store cached row data?
+//! @todo store cached record data?
true/*reload*/);
}
@@ -5039,7 +5039,7 @@ tristate KexiMainWindow::showPageSetupForItem(KexiPart::Item* item)
{
Q_UNUSED(item)
//! @todo: check if changes to this object's design are saved, if not: ask for saving
-//! @todo: accept row changes...
+//! @todo: accept record changes...
#ifdef __GNUC__
#warning TODO printActionForItem(item, PageSetupForItem);
#else
@@ -5058,7 +5058,7 @@ bool KexiMainWindow::printItem(KexiPart::Item* item, const KexiSimplePrintingSet
const QString& titleText)
{
//! @todo: check if changes to this object's design are saved, if not: ask for saving
-//! @todo: accept row changes...
+//! @todo: accept record changes...
KexiSimplePrintingCommand cmd(this, item->identifier());
//modal
return cmd.print(settings, titleText);
@@ -5068,7 +5068,7 @@ bool KexiMainWindow::printPreviewForItem(KexiPart::Item* item,
const KexiSimplePrintingSettings& settings, const QString& titleText, bool reload)
{
//! @todo: check if changes to this object's design are saved, if not: ask for saving
-//! @todo: accept row changes...
+//! @todo: accept record changes...
KexiSimplePrintingCommand* cmd = d->openedCustomObjectsForItem<KexiSimplePrintingCommand>(
item, "KexiSimplePrintingCommand");
if (!cmd) {
@@ -5110,10 +5110,10 @@ tristate KexiMainWindow::printActionForItem(KexiPart::Item* item, PrintActionTyp
#endif
if (window) {
- // accept row changes
+ // accept record changes
QWidget *prevFocusWidget = focusWidget();
window->setFocus();
- d->action_data_save_row->activate(QAction::Trigger);
+ d->action_data_save_record->activate(QAction::Trigger);
if (prevFocusWidget)
prevFocusWidget->setFocus();
diff --git a/kexi/main/KexiMainWindow_p.h b/kexi/main/KexiMainWindow_p.h
index 16eddeb..49c2aeb 100644
--- a/kexi/main/KexiMainWindow_p.h
+++ b/kexi/main/KexiMainWindow_p.h
@@ -1002,7 +1002,7 @@ public:
action_open_recent_connections_title_id;
//! edit menu
- KAction *action_edit_delete, *action_edit_delete_row,
+ KAction *action_edit_delete, *action_edit_delete_record,
*action_edit_cut, *action_edit_copy, *action_edit_paste,
*action_edit_find, *action_edit_findnext, *action_edit_findprev,
*action_edit_replace, *action_edit_replace_all,
@@ -1024,8 +1024,8 @@ public:
KToggleAction *action_show_helper;
#endif
//! data menu
- KAction *action_data_save_row;
- KAction *action_data_cancel_row_changes;
+ KAction *action_data_save_record;
+ KAction *action_data_cancel_record_changes;
KAction *action_data_execute;
//! format menu
diff --git a/kexi/migration/AlterSchemaTableModel.cpp b/kexi/migration/AlterSchemaTableModel.cpp
index 2d827b4..975de2c 100644
--- a/kexi/migration/AlterSchemaTableModel.cpp
+++ b/kexi/migration/AlterSchemaTableModel.cpp
@@ -69,7 +69,7 @@ QVariant AlterSchemaTableModel::headerData(int section, Qt::Orientation orientat
}
return QString("Column %1").arg(section);
}
- return QString("Row %1").arg(section);
+ return QString("Record %1").arg(section);
}
int AlterSchemaTableModel::columnCount ( const QModelIndex& parent ) const
diff --git a/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp b/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp
index 6d97d33..2a4856d 100644
--- a/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp
+++ b/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp
@@ -281,7 +281,7 @@ bool MDBMigrate::drv_copyTable(const QString& srcTable,
//! Copy each row into vals
mdb_rewind_table(tableDef);
- kDebug() << "Fetching " << tableDef->num_rows << " rows";
+ kDebug() << "Fetching " << tableDef->num_rows << " records";
#ifdef KEXI_MIGRATION_MAX_ROWS_TO_IMPORT
qulonglong rows = 0;
diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp
index 157b3f9..832cc2d 100644
--- a/kexi/migration/mysql/mysqlmigrate.cpp
+++ b/kexi/migration/mysql/mysqlmigrate.cpp
@@ -588,7 +588,7 @@ QVariant MySQLMigrate::drv_value(uint i)
if (m_dataRow) {
val = m_dataRow[i];
}else {
- kDebug() << "No row";
+ kDebug() << "No record";
}
return val;
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index d1cb003..139a699 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -239,7 +239,7 @@ void KexiFormScrollView::createEditor(int row, int col, const QString& addText,
if (m_verticalHeader)
m_verticalHeader->setEditRow(m_curRow);
if (isInsertingEnabled() && m_currentItem == m_insertItem) {
- //we should know that we are in state "new row editing"
+ //we should know that we are in state "new record editing"
m_newRowEditing = true;
//'insert' row editing: show another row after that:
m_data->append(m_insertItem);
diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h
index f164326..6a45a78 100644
--- a/kexi/plugins/forms/kexiformscrollview.h
+++ b/kexi/plugins/forms/kexiformscrollview.h
@@ -137,7 +137,7 @@ public slots:
KexiDataAwareObjectInterface::vScrollBarValueChanged(v);
}
- /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "row number" tooltip. */
+ /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "record number" tooltip. */
//! @todo unused for now, will be used for continuous forms
/* virtual void vScrollBarSliderReleased() {
KexiDataAwareObjectInterface::vScrollBarSliderReleased();
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index a29add8..a28cf50 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -480,7 +480,7 @@ bool KexiDBForm::eventFilter(QObject * watched, QEvent * e)
|| key == Qt::Key_End || key == Qt::Key_Down || key == Qt::Key_Up))
/* ^^ home/end/down/up are already handled by widgets */
&& d->dataAwareObject->handleKeyPress(
- ke, curRow, curCol, false/*!fullRowSelection*/, &moveToFirstField, &moveToLastField)) {
+ ke, curRow, curCol, false/*!fullRecordSelection*/, &moveToFirstField, &moveToLastField)) {
if (ke->isAccepted())
return true;
QWidget* widgetToFocus;
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 4dd8a3e..d3a79c8 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -963,7 +963,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
record = d->data->at(columnPosition);
rowPropertySet = d->sets->at(columnPosition);
kDebug() << "KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal():\n\t"
- "Setting \"" << orderByColumn->debugString() << "\" sorting for row #"
+ "Setting \"" << orderByColumn->debugString() << "\" sorting for record #"
<< columnPosition;
}
}
@@ -1585,7 +1585,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiDB::RecordData *recor
result->msg = i18n("Could not set criteria for \"%1\"",
table == "*" ? table : field);
else
- result->msg = i18n("Could not set criteria for empty row");
+ result->msg = i18n("Could not set criteria for empty record");
//moved to result->allowToDiscardChanges handler //d->dataTable->dataAwareObject()->cancelEditor(); //prevents further editing of this cell
} else if (str.isEmpty() || (e = parseExpressionString(str, token, true/*allowRelationalOperator*/))) {
if (e) {
diff --git a/kexi/plugins/reports/kexidbreportdata.cpp b/kexi/plugins/reports/kexidbreportdata.cpp
index 7aefd3b..f0fd7e2 100644
--- a/kexi/plugins/reports/kexidbreportdata.cpp
+++ b/kexi/plugins/reports/kexidbreportdata.cpp
@@ -84,7 +84,7 @@ bool KexiDBReportData::open()
if ( m_cursor )
{
- kDebug() << "Moving to first row..";
+ kDebug() << "Moving to first record..";
return m_cursor->moveFirst();
}
else
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 8a80d1c..d6a683b 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -132,7 +132,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(QWidget *parent)
//todo d->noDataSourceAvailableSingleText = i18n("No data source could be assigned for this widget.");
//todo d->noDataSourceAvailableMultiText = i18n("No data source could be assigned for multiple widgets.");
- //-Row Source
+ //-Record Source
/* QWidget *contents = new QWidget(this);
layout()->addWidget(contents);
QVBoxLayout *contentsVlyr = new QVBoxLayout(contents);
@@ -141,7 +141,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(QWidget *parent)
QHBoxLayout *hlyr = new QHBoxLayout();
mainLayout()->addLayout(hlyr);
- d->rowSourceLabel = new QLabel(i18n("Row source:"));
+ d->rowSourceLabel = new QLabel(i18n("Record source:"));
d->rowSourceLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
// d->rowSourceLabel->setMargin(2);
d->rowSourceLabel->setMinimumHeight(IconSize(KIconLoader::Small) + 4);
@@ -152,7 +152,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(QWidget *parent)
d->gotoRowSourceButton = new KexiSmallToolButton(KIcon("go-jump"), QString());
d->gotoRowSourceButton->setObjectName("gotoRowSourceButton");
d->gotoRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
- d->gotoRowSourceButton->setToolTip(i18n("Go to selected row source"));
+ d->gotoRowSourceButton->setToolTip(i18n("Go to selected record source"));
hlyr->addWidget(d->gotoRowSourceButton);
connect(d->gotoRowSourceButton, SIGNAL(clicked()), this, SLOT(slotGotoSelectedRowSource()));
@@ -160,7 +160,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(QWidget *parent)
KIcon("edit-clear-locationbar-rtl"), QString(), contents);
d->clearRowSourceButton->setObjectName("clearRowSourceButton");
d->clearRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
- d->clearRowSourceButton->setToolTip(i18n("Clear row source"));
+ d->clearRowSourceButton->setToolTip(i18n("Clear record source"));
hlyr->addWidget(d->clearRowSourceButton);
connect(d->clearRowSourceButton, SIGNAL(clicked()), this, SLOT(clearRowSourceSelection()));
*/
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.h b/kexi/plugins/tables/kexilookupcolumnpage.h
index a720d4d..870f81c 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.h
+++ b/kexi/plugins/tables/kexilookupcolumnpage.h
@@ -52,7 +52,7 @@ public slots:
void assignPropertySet(KoProperty::Set* propertySet);
signals:
- //! Signal emitted when helper button 'Go to selected row sourcesource' is clicked.
+ //! Signal emitted when helper button 'Go to selected record sourcesource' is clicked.
void jumpToObjectRequested(const QString& mime, const QString& name);
// /*! Signal emitted when current bound column has been changed. */
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index b032f7a..0bf036e 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -453,12 +453,12 @@ KexiTableDesignerView::createPropertySet(int row, const KexiDB::Field& field, bo
KexiDB::LookupFieldSchema *lookupFieldSchema
= field.table() ? field.table()->lookupFieldSchema(field) : 0;
set->addProperty(prop = new KoProperty::Property("rowSource",
- lookupFieldSchema ? lookupFieldSchema->rowSource().name() : QString(), i18n("Row Source")));
+ lookupFieldSchema ? lookupFieldSchema->rowSource().name() : QString(), i18n("Record Source")));
prop->setVisible(false);
set->addProperty(prop = new KoProperty::Property("rowSourceType",
lookupFieldSchema ? lookupFieldSchema->rowSource().typeName() : QString(),
- i18n("Row Source\nType")));
+ i18n("Record Source\nType")));
prop->setVisible(false);
set->addProperty(prop
@@ -908,7 +908,7 @@ void KexiTableDesignerView::slotRowUpdated(KexiDB::RecordData *record)
//moved
//add a special property indicating that this is brand new buffer,
//not just changed
-// KoProperty::Property* prop = new KoProperty::Property("newrow", QVariant());
+// KoProperty::Property* prop = new KoProperty::Property("newrecord", QVariant());
// prop->setVisible(false);
// newbuff->addProperty( prop );
@@ -921,7 +921,7 @@ void KexiTableDesignerView::slotRowUpdated(KexiDB::RecordData *record)
false /* !execute */);
}
} else {
- kWarning() << "row # not found !";
+ kWarning() << "record # not found !";
}
}
}
@@ -1276,7 +1276,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
const QString name((*b)["name"].value().toString());
if (name.isEmpty()) {
if (beSilent) {
- kWarning() << QString("no field caption entered at row %1...").arg(i + 1);
+ kWarning() << QString("no field caption entered at record %1...").arg(i + 1);
} else {
d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
d->view->startEditCurrentCell();
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index dd1b56a..c36887a 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -114,7 +114,7 @@ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(
history = new CommandHistory(historyActionCollection, true);
internalPropertyNames
- << "subType" << "uid" << "newrow" << "rowSource" << "rowSourceType"
+ << "subType" << "uid" << "newrecord" << "rowSource" << "rowSourceType"
<< "boundColumn" << "visibleColumn";
}
diff --git a/kexi/webforms/view/default/Delete.cpp b/kexi/webforms/view/default/Delete.cpp
index d867c6e..b02eaa3 100644
--- a/kexi/webforms/view/default/Delete.cpp
+++ b/kexi/webforms/view/default/Delete.cpp
@@ -43,11 +43,11 @@ void Delete::view(const QHash<QString, QString>& d, pion::net::HTTPResponseWrite
if (KexiWebForms::Model::Database::deleteRow(requestedTable, pkeyName, pkeyValue)) {
m_dict->ShowSection("SUCCESS");
- setValue("MESSAGE", "Row deleted successfully");
+ setValue("MESSAGE", "Record deleted successfully");
} else {
m_dict->ShowSection("ERROR");
/// @todo retrieve proper error message
- setValue("MESSAGE", "Error while trying to delete row!");
+ setValue("MESSAGE", "Error while trying to delete record!");
}
renderTemplate(m_dict, writer);
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index c7f3888..8bb9ce0 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -83,8 +83,8 @@ void KexiDataAwareView::initActions()
QList<QAction*> viewActions;
KActionCollection *ac = KexiMainWindowIface::global()->actionCollection();
viewActions
- << ac->action("data_save_row")
- << ac->action("data_cancel_row_changes");
+ << ac->action("data_save_record")
+ << ac->action("data_cancel_record_changes");
KAction *a = new KAction(this);
a->setSeparator(true);
@@ -102,8 +102,8 @@ void KexiDataAwareView::initActions()
<< ac->action("edit_find");
setViewActions(viewActions);
- plugSharedAction("edit_delete_row", this, SLOT(deleteCurrentRow()));
- m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut
+ plugSharedAction("edit_delete_record", this, SLOT(deleteCurrentRow()));
+ m_actionClient->plugSharedAction(sharedAction("edit_delete_record")); //for proper shortcut
plugSharedAction("edit_delete", this, SLOT(deleteAndStartEditCurrentCell()));
m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut
@@ -111,11 +111,11 @@ void KexiDataAwareView::initActions()
plugSharedAction("edit_edititem", this, SLOT(startEditOrToggleValue()));
m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut
- plugSharedAction("data_save_row", this, SLOT(acceptRowEdit()));
- m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut
+ plugSharedAction("data_save_record", this, SLOT(acceptRowEdit()));
+ m_actionClient->plugSharedAction(sharedAction("data_save_record")); //for proper shortcut
- plugSharedAction("data_cancel_row_changes", this, SLOT(cancelRowEdit()));
- m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut
+ plugSharedAction("data_cancel_record_changes", this, SLOT(cancelRowEdit()));
+ m_actionClient->plugSharedAction(sharedAction("data_cancel_record_changes")); //for proper shortcut
// if (m_dataAwareObject->isSortingEnabled()) {
//moved up plugSharedAction("data_sort_az", this, SLOT(sortAscending()));
@@ -183,11 +183,11 @@ void KexiDataAwareView::slotUpdateRowActions(int row)
setAvailable("edit_copy", !insertRowFocusedWithoutEditing);
setAvailable("edit_paste", !ro);
setAvailable("edit_delete", !ro && !insertRowFocusedWithoutEditing);
- setAvailable("edit_delete_row", !ro && !(deleting && row == rows));
+ setAvailable("edit_delete_record", !ro && !(deleting && row == rows));
setAvailable("edit_insert_empty_row", !ro && emptyInserting);
setAvailable("edit_clear_table", !ro && deleting && rows > 0);
- setAvailable("data_save_row", editing);
- setAvailable("data_cancel_row_changes", editing);
+ setAvailable("data_save_record", editing);
+ setAvailable("data_cancel_record_changes", editing);
setAvailable("data_sort_az", sorting);
setAvailable("data_sort_za", sorting);
}
@@ -254,10 +254,10 @@ void KexiDataAwareView::reloadActions()
if (separatorNeeded)
m_dataAwareObject->contextMenu()->addSeparator();
plugSharedAction("edit_delete", m_dataAwareObject->contextMenu());
- plugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
+ plugSharedAction("edit_delete_record", m_dataAwareObject->contextMenu());
} else {
- unplugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
- unplugSharedAction("edit_delete_row", m_dataAwareObject->contextMenu());
+ unplugSharedAction("edit_delete_record", m_dataAwareObject->contextMenu());
+ unplugSharedAction("edit_delete_record", m_dataAwareObject->contextMenu());
}
//if (!m_view->isSortingEnabled()) {
// unplugSharedAction("data_sort_az");
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 88411cc..316d9a6 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -113,7 +113,7 @@ void KexiComboBoxBase::setValueInternal(const QVariant& add_, bool removeOld)
}
if (popup()) {
const int rowToHighlight = rowToHighlightForLookupTable();
- popup()->tableView()->setHighlightedRow(rowToHighlight);
+ popup()->tableView()->setHighlightedRecord(rowToHighlight);
const int visibleColumn = lookupFieldSchema->visibleColumn(popup()->tableView()->data()->columnsCount());
if (m_setVisibleValueOnSetValueInternal && -1 != visibleColumn) {
@@ -141,14 +141,14 @@ void KexiComboBoxBase::setValueInternal(const QVariant& add_, bool removeOld)
if (popup()) {
if (origValue().isNull()) {
popup()->tableView()->clearSelection();
- popup()->tableView()->setHighlightedRow(0);
+ popup()->tableView()->setHighlightedRecord(0);
} else {
if (relData) {
if (rowToHighlight != -1)
- popup()->tableView()->setHighlightedRow(rowToHighlight);
+ popup()->tableView()->setHighlightedRecord(rowToHighlight);
} else if (!lookupFieldSchema) {
//popup()->tableView()->selectRow(origValue().toInt());
- popup()->tableView()->setHighlightedRow(origValue().toInt());
+ popup()->tableView()->setHighlightedRecord(origValue().toInt());
}
}
}
@@ -223,7 +223,7 @@ QString KexiComboBoxBase::valueForString(const QString& str, int* row,
if (column() && column()->isRelatedDataEditable())
return str; //new value entered and that's allowed
- kWarning() << "no related row found, ID will be painted!";
+ kWarning() << "no related record found, ID will be painted!";
if (allowNulls)
return QString();
return str; //for sanity but it's weird to show id to the user
@@ -369,7 +369,7 @@ void KexiComboBoxBase::createPopup(bool show)
popup()->tableView()->clearSelection();
else {
popup()->tableView()->selectRow(0);
- popup()->tableView()->setHighlightedRow(0);
+ popup()->tableView()->setHighlightedRecord(0);
}
}
if (show && internalEditor() && !internalEditor()->isVisible())
@@ -404,11 +404,11 @@ void KexiComboBoxBase::createPopup(bool show)
m_selectAllInInternalEditor_enabled = show;
m_setValueInInternalEditor_enabled = show;
if (rowToHighlight == -1) {
- rowToHighlight = qMax(popup()->tableView()->highlightedRow(), 0);
+ rowToHighlight = qMax(popup()->tableView()->highlightedRecord(), 0);
setValueInInternalEditor(QVariant());
}
popup()->tableView()->selectRow(rowToHighlight);
- popup()->tableView()->setHighlightedRow(rowToHighlight);
+ popup()->tableView()->setHighlightedRecord(rowToHighlight);
if (rowToHighlight < popup()->tableView()->rowsPerPage())
popup()->tableView()->ensureCellVisible(0, -1);
@@ -451,7 +451,7 @@ void KexiComboBoxBase::acceptPopupSelection()
return;
KexiDB::RecordData *record = popup()->tableView()->highlightedItem();
if (record) {
- popup()->tableView()->selectRow(popup()->tableView()->highlightedRow());
+ popup()->tableView()->selectRow(popup()->tableView()->highlightedRecord());
slotRowAccepted(record, -1);
}
popup()->hide();
@@ -524,7 +524,7 @@ void KexiComboBoxBase::setValueOrTextInInternalEditor(const QVariant& value)
bool KexiComboBoxBase::handleKeyPressForPopup(QKeyEvent *ke)
{
const int k = ke->key();
- int highlightedOrSelectedRow = popup() ? popup()->tableView()->highlightedRow() : -1;
+ int highlightedOrSelectedRow = popup() ? popup()->tableView()->highlightedRecord() : -1;
if (popup() && highlightedOrSelectedRow < 0)
highlightedOrSelectedRow = popup()->tableView()->currentRow();
@@ -539,46 +539,46 @@ bool KexiComboBoxBase::handleKeyPressForPopup(QKeyEvent *ke)
switch (k) {
case Qt::Key_Up:
- popup()->tableView()->setHighlightedRow(
+ popup()->tableView()->setHighlightedRecord(
qMax(highlightedOrSelectedRow - 1, 0));
- updateTextForHighlightedRow();
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_Down:
- popup()->tableView()->setHighlightedRow(
+ popup()->tableView()->setHighlightedRecord(
qMin(highlightedOrSelectedRow + 1, popup()->tableView()->rows() - 1));
- updateTextForHighlightedRow();
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_PageUp:
- popup()->tableView()->setHighlightedRow(
+ popup()->tableView()->setHighlightedRecord(
qMax(highlightedOrSelectedRow - popup()->tableView()->rowsPerPage(), 0));
- updateTextForHighlightedRow();
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_PageDown:
- popup()->tableView()->setHighlightedRow(
+ popup()->tableView()->setHighlightedRecord(
qMin(highlightedOrSelectedRow + popup()->tableView()->rowsPerPage(),
popup()->tableView()->rows() - 1));
- updateTextForHighlightedRow();
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_Home:
- popup()->tableView()->setHighlightedRow(0);
- updateTextForHighlightedRow();
+ popup()->tableView()->setHighlightedRecord(0);
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_End:
- popup()->tableView()->setHighlightedRow(popup()->tableView()->rows() - 1);
- updateTextForHighlightedRow();
+ popup()->tableView()->setHighlightedRecord(popup()->tableView()->rows() - 1);
+ updateTextForHighlightedRecord();
return true;
case Qt::Key_Enter:
case Qt::Key_Return: //accept
//select row that is highlighted
- if (popup()->tableView()->highlightedRow() >= 0)
- popup()->tableView()->selectRow(popup()->tableView()->highlightedRow());
+ if (popup()->tableView()->highlightedRecord() >= 0)
+ popup()->tableView()->selectRow(popup()->tableView()->highlightedRecord());
//do not return true: allow to process event
default: ;
}
return false;
}
-void KexiComboBoxBase::updateTextForHighlightedRow()
+void KexiComboBoxBase::updateTextForHighlightedRecord()
{
KexiDB::RecordData* record = popup() ? popup()->tableView()->highlightedItem() : 0;
if (record)
@@ -591,7 +591,7 @@ void KexiComboBoxBase::undoChanges()
if (lookupFieldSchema) {
// kDebug() << "m_visibleValue BEFORE=" << m_visibleValue;
if (popup())
- popup()->tableView()->selectRow(popup()->tableView()->highlightedRow());
+ popup()->tableView()->selectRow(popup()->tableView()->highlightedRecord());
m_visibleValue = visibleValueForLookupField();
// kDebug() << "m_visibleValue AFTER=" << m_visibleValue;
setValueOrTextInInternalEditor(m_visibleValue);
diff --git a/kexi/widget/tableview/kexicomboboxbase.h b/kexi/widget/tableview/kexicomboboxbase.h
index ca0f756..54fd177 100644
--- a/kexi/widget/tableview/kexicomboboxbase.h
+++ b/kexi/widget/tableview/kexicomboboxbase.h
@@ -136,7 +136,7 @@ protected:
virtual QVariant visibleValueForLookupField();
- void updateTextForHighlightedRow();
+ void updateTextForHighlightedRecord();
bool handleKeyPressForPopup(QKeyEvent *ke);
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 8fb7303..7f8dd8c 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -53,13 +53,13 @@ public:
a.navigatorEnabled = false;
//! @todo add option for backgroundAltering??
a.backgroundAltering = false;
- a.fullRowSelection = true;
- a.rowHighlightingEnabled = true;
- a.rowMouseOverHighlightingEnabled = true;
+ a.fullRecordSelection = true;
+ a.recordHighlightingEnabled = true;
+ a.recordMouseOverHighlightingEnabled = true;
a.persistentSelections = false;
- a.rowMouseOverHighlightingColor = palette().highlight().color();
- a.rowMouseOverHighlightingTextColor = palette().highlightedText().color();
- a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor;
+ a.recordMouseOverHighlightingColor = palette().highlight().color();
+ a.recordMouseOverHighlightingTextColor = palette().highlightedText().color();
+ a.recordHighlightingTextColor = a.recordMouseOverHighlightingTextColor;
a.gridEnabled = false;
setAppearance(a);
setInsertingEnabled(false);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index baac96f..20cae90 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -714,7 +714,7 @@ bool KexiDataAwareObjectInterface::acceptRowEdit()
if (!acceptEditor()) {
return false;
}
- kDebug() << "EDIT ROW ACCEPTING...";
+ kDebug() << "EDIT RECORD ACCEPTING...";
bool success = true;
// bool allow = true;
@@ -776,7 +776,7 @@ bool KexiDataAwareObjectInterface::acceptRowEdit()
updateAfterAcceptRowEdit();
- kDebug() << "EDIT ROW ACCEPTED:";
+ kDebug() << "EDIT RECORD ACCEPTED:";
// /*debug*/itemAt(m_curRow);
if (inserting) {
@@ -790,10 +790,10 @@ bool KexiDataAwareObjectInterface::acceptRowEdit()
/*emit*/ rowEditTerminated(m_curRow);
} else {
// if (!allow) {
-// kDebug() << "INSERT/EDIT ROW - DISALLOWED by signal!";
+// kDebug() << "INSERT/EDIT RECORD - DISALLOWED by signal!";
// }
// else {
-// kDebug() << "EDIT ROW - ERROR!";
+// kDebug() << "EDIT RECORD - ERROR!";
// }
int faultyColumn = -1;
if (m_data->result().column >= 0 && m_data->result().column < columns())
@@ -856,7 +856,7 @@ bool KexiDataAwareObjectInterface::cancelRowEdit()
updateAfterCancelRowEdit();
//! \todo (js): cancel changes for this row!
- kDebug() << "EDIT ROW CANCELLED.";
+ kDebug() << "EDIT RECORD CANCELLED.";
/*emit*/ rowEditTerminated(m_curRow);
return true;
@@ -1187,8 +1187,8 @@ void KexiDataAwareObjectInterface::deleteCurrentRow()
case AskDelete:
if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(
dynamic_cast<QWidget*>(this),
- i18n("Do you want to delete selected row?"), QString(),
- KGuiItem(i18n("&Delete Row"), "edit-delete"), KStandardGuiItem::cancel(),
+ i18n("Do you want to delete selected record?"), QString(),
+ KGuiItem(i18n("&Delete Record"), "edit-delete"), KStandardGuiItem::cancel(),
"dontAskBeforeDeleteRow"/*config entry*/,
KMessageBox::Notify | KMessageBox::Dangerous))
{
@@ -1635,7 +1635,7 @@ void KexiDataAwareObjectInterface::addNewRecordRequested()
}
bool KexiDataAwareObjectInterface::handleKeyPress(QKeyEvent *e, int &curRow, int &curCol,
- bool fullRowSelection, bool *moveToFirstField, bool *moveToLastField)
+ bool fullRecordSelection, bool *moveToFirstField, bool *moveToLastField)
{
if (moveToFirstField)
*moveToFirstField = false;
@@ -1663,7 +1663,7 @@ bool KexiDataAwareObjectInterface::handleKeyPress(QKeyEvent *e, int &curRow, int
selectNextPage();
e->accept();
} else if (k == Qt::Key_Home) {
- if (fullRowSelection) {
+ if (fullRecordSelection) {
//we're in row-selection mode: home key always moves to 1st row
curRow = 0;//to 1st row
} else {//cell selection mode: different actions depending on ctrl and shift keys mods
@@ -1680,7 +1680,7 @@ bool KexiDataAwareObjectInterface::handleKeyPress(QKeyEvent *e, int &curRow, int
//do not accept yet
e->ignore();
} else if (k == Qt::Key_End) {
- if (fullRowSelection) {
+ if (fullRecordSelection) {
//we're in row-selection mode: home key always moves to last row
curRow = m_data->count() - 1 + (isInsertingEnabled() ? 1 : 0);//to last row
} else {//cell selection mode: different actions depending on ctrl and shift keys mods
@@ -1726,7 +1726,7 @@ void KexiDataAwareObjectInterface::vScrollBarValueChanged(int v)
QWidget* thisWidget = dynamic_cast<QWidget*>(this);
// const QRect r( verticalScrollBar()->sliderRect() );
const int row = lastVisibleRow() + 1;
- const QString toolTipText( i18n("Row: %1", row) );
+ const QString toolTipText( i18n("Record: %1", row) );
QToolTip::showText(
QPoint(
thisWidget->mapToGlobal(verticalScrollBar()->pos()).x()
@@ -1760,7 +1760,7 @@ void KexiDataAwareObjectInterface::vScrollBarValueChanged(int v)
m_scrollBarTip->hide();
return;
}
- m_scrollBarTip->setText(i18n("Row: ") + QString::number(row));
+ m_scrollBarTip->setText(i18n("Record: ") + QString::number(row));
m_scrollBarTip->adjustSize();
QWidget* thisWidget = dynamic_cast<QWidget*>(this);
m_scrollBarTip->move(
@@ -1993,10 +1993,10 @@ tristate KexiDataAwareObjectInterface::find(const QVariant& valueToFind,
const bool startFromLastRowAndCol =
( !m_positionOfRecentlyFoundValue.exists && !next
&& options.searchDirection == KexiSearchAndReplaceViewInterface::Options::SearchAllRows)
- || (m_curRow >= rows() && !forward); //we're at "insert" row, and searching backwards: move to the last cell
+ || (m_curRow >= rows() && !forward); //we're at "insert" record, and searching backwards: move to the last cell
if (!startFrom1stRowAndCol && !startFromLastRowAndCol && m_curRow >= rows()) {
- //we're at "insert" row, and searching forward: no chances to find something
+ //we're at "insert" record, and searching forward: no chances to find something
return false;
}
KexiTableViewData::Iterator it((startFrom1stRowAndCol || startFromLastRowAndCol)
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 09fee3f..4ec1cb2 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -398,7 +398,7 @@ public:
virtual void startEditCurrentCell(const QString& setText = QString());
/*! Deletes currently selected cell's contents, if allowed.
- In most cases delete is not accepted immediately but "row editing" mode is just started. */
+ In most cases delete is not accepted immediately but "record editing" mode is just started. */
virtual void deleteAndStartEditCurrentCell();
inline KexiDB::RecordData *itemAt(int pos) const;
@@ -581,7 +581,7 @@ public:
can be other than the very first field in the form.
Used by KexiTableView::keyPressEvent() and KexiTableView::keyPressEvent(). */
- virtual bool handleKeyPress(QKeyEvent *e, int &curRow, int &curCol, bool fullRowSelection,
+ virtual bool handleKeyPress(QKeyEvent *e, int &curRow, int &curCol, bool fullRecordSelection,
bool *moveToFirstField = 0, bool *moveToLastField = 0);
protected:
@@ -749,7 +749,7 @@ protected:
Call this method from the subclass. */
virtual void vScrollBarValueChanged(int v);
- /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "row number" tooltip. */
+ /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "record number" tooltip. */
//replaced by QToolTip virtual void vScrollBarSliderReleased();
/* Handles timeout() signal of the m_scrollBarTipTimer. If the tooltip is visible,
@@ -959,7 +959,7 @@ inline KexiDB::RecordData *KexiDataAwareObjectInterface::itemAt(int pos) const
if (!record)
kDebug() << "pos:" << pos << "- NO ITEM!!";
else {
- /* kDebug() << "row:" << row;
+ /* kDebug() << "record:" << row;
int i=1;
for (KexiTableItem::Iterator it = item->begin();it!=item->end();++it,i++)
kDebug() << i<<": " << (*it).toString();*/
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 78f8fea..e3a534d 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -112,7 +112,7 @@ void KexiDataAwarePropertySet::slotReloadRequested()
void KexiDataAwarePropertySet::set(uint row, KoProperty::Set* set, bool newOne)
{
if (!set || row >= (uint)m_sets.size()) {
- kWarning() << "invalid args: rew=" << row << "propertyset=" << set;
+ kWarning() << "invalid args: record=" << row << "propertyset=" << set;
return;
}
if (set->parent() && set->parent() != this) {
@@ -127,7 +127,7 @@ void KexiDataAwarePropertySet::set(uint row, KoProperty::Set* set, bool newOne)
if (newOne) {
//add a special property indicating that this is brand new set,
//not just changed
- KoProperty::Property* prop = new KoProperty::Property("newrow");
+ KoProperty::Property* prop = new KoProperty::Property("newrecord");
prop->setVisible(false);
set->addProperty(prop);
m_view->setDirty();
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index 364e04b..89d77d0 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -106,7 +106,7 @@ public slots:
/*! Inserts \a set property set at \a row position.
If there was a buffer at this position before, it will be destroyed.
If \a newOne is true, the property set will be marked as newly created,
- simply by adding "newrow" property.
+ simply by adding "newrecord" property.
The property set \a set will be owned by this object, so you should not
delete this property set by hand but call removeCurrentPropertySet()
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index a601d78..b42392c 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -184,9 +184,9 @@ void KexiTableEdit::setupContents(QPainter *p, bool focused, const QVariant& val
void KexiTableEdit::paintSelectionBackground(QPainter *p, bool /*focused*/,
const QString& txt, int align, int x, int y_offset, int w, int h, const QColor& fillColor,
- const QFontMetrics &fm, bool readOnly, bool fullRowSelection)
+ const QFontMetrics &fm, bool readOnly, bool fullRecordSelection)
{
- if (!readOnly && !fullRowSelection && !txt.isEmpty()) {
+ if (!readOnly && !fullRecordSelection && !txt.isEmpty()) {
QRect bound = fm.boundingRect(x, y_offset, w - (x + x), h, align, txt);
bound.setY(0);
bound.setWidth(qMin(bound.width() + 2, w - (x + x) + 1));
@@ -198,7 +198,7 @@ void KexiTableEdit::paintSelectionBackground(QPainter *p, bool /*focused*/,
//TODO align center
bound.setHeight(h - 1);
p->fillRect(bound, fillColor);
- } else if (fullRowSelection) {
+ } else if (fullRecordSelection) {
p->fillRect(0, 0, w, h, fillColor);
}
}
diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h
index 10ea2d9..e026dc8 100644
--- a/kexi/widget/tableview/kexitableedit.h
+++ b/kexi/widget/tableview/kexitableedit.h
@@ -135,7 +135,7 @@ public:
setupContents(). */
virtual void paintSelectionBackground(QPainter *p, bool focused, const QString& txt,
int align, int x, int y_offset, int w, int h, const QColor& fillColor,
- const QFontMetrics &fm, bool readOnly, bool fullRowSelection);
+ const QFontMetrics &fm, bool readOnly, bool fullRecordSelection);
/*! Sometimes, editor can contain non-standard margin, for example combobox editor contains
dropdown button at the right side. \return left margin's size;
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 7985339..693a871 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -85,18 +85,18 @@ KexiTableView::Appearance::Appearance(QWidget *widget)
textColor = QPalette::Text;
borderColor = QColor(200, 200, 200);
emptyAreaColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color()/*QPalette::Base*/;
- rowHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, baseColor, 33, 66);
- rowMouseOverHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, baseColor, 10, 90);
- rowMouseOverAlternateHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, alternateBackgroundColor, 10, 90);
- rowHighlightingTextColor = textColor;
- rowMouseOverHighlightingTextColor = textColor;
+ recordHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, baseColor, 33, 66);
+ recordMouseOverHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, baseColor, 10, 90);
+ recordMouseOverAlternateHighlightingColor = KexiUtils::blendedColors(QPalette::Highlight, alternateBackgroundColor, 10, 90);
+ recordHighlightingTextColor = textColor;
+ recordMouseOverHighlightingTextColor = textColor;
}
backgroundAltering = true;
- rowMouseOverHighlightingEnabled = true;
- rowHighlightingEnabled = true;
+ recordMouseOverHighlightingEnabled = true;
+ recordHighlightingEnabled = true;
persistentSelections = true;
navigatorEnabled = true;
- fullRowSelection = false;
+ fullRecordSelection = false;
gridEnabled = true;
}
@@ -117,9 +117,9 @@ public:
//const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0;
//const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0;
if (KexiUtils::hasParent(m_tv->verticalHeader(), m_tv->childAt(pos))) {
- return i18n("Contains a pointer to the currently selected row");
+ return i18n("Contains a pointer to the currently selected record");
} else if (KexiUtils::hasParent(m_tv->m_navPanel, m_tv->childAt(pos))) {
- return i18n("Row navigator");
+ return i18n("Record navigator");
// return QWhatsThis::textFor(m_tv->m_navPanel, QPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin ));
}
const int col = m_tv->columnAt(pos.x() - leftMargin);
@@ -246,7 +246,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, QWidget* parent, const cha
#endif
//! \todo replace lineedit with table_field icon
-//2.0 setContextMenuTitle(KIcon("lineedit"), i18n("Row")); // the default
+//2.0 setContextMenuTitle(KIcon("lineedit"), i18n("Record")); // the default
// cannot display anything here - most actions in the context menu
// are related to a single cell (Cut, Copy..) and others to entire row (Delete Row):
setContextMenuEnabled(false);
@@ -282,7 +282,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, QWidget* parent, const cha
// m_verticalHeader->setFixedWidth(d->rowHeight);
m_verticalHeader->setCurrentRow(-1);
connect(m_verticalHeader, SIGNAL(rowPressed(uint)), this, SLOT(moveToRecordRequested(uint)));
- connect(m_verticalHeader, SIGNAL(rowHighlighted(int)), this, SLOT(setHighlightedRow(int)));
+ connect(m_verticalHeader, SIGNAL(recordHighlighted(int)), this, SLOT(setHighlightedRecord(int)));
/* not needed after #2010-01-05 fix connect(this, SIGNAL(contentsMoving(int,int)), this, SLOT(slotContentsMoving(int,int)));*/
setMargins(
@@ -305,7 +305,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, QWidget* parent, const cha
#endif
// setBackgroundAltering(true);
-// setFullRowSelectionEnabled(false);
+// setFullRecordSelectionEnabled(false);
setAcceptDrops(true);
viewport()->setAcceptDrops(true);
@@ -431,7 +431,7 @@ void KexiTableView::updateFonts(bool repaint)
#else
d->rowHeight = fontMetrics().lineSpacing() + 1;
#endif
- if (d->appearance.fullRowSelection) {
+ if (d->appearance.fullRecordSelection) {
d->rowHeight -= 1;
}
if (d->rowHeight < 17)
@@ -606,13 +606,13 @@ inline void KexiTableView::paintRow(KexiDB::RecordData *record,
// int transly = rowp-cy;
int transly = rowp;
- if (d->appearance.rowHighlightingEnabled && r == m_curRow && !d->appearance.fullRowSelection) {
- pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.rowHighlightingColor);
- } else if (d->appearance.rowMouseOverHighlightingEnabled && r == d->highlightedRow) {
+ if (d->appearance.recordHighlightingEnabled && r == m_curRow && !d->appearance.fullRecordSelection) {
+ pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.recordHighlightingColor);
+ } else if (d->appearance.recordMouseOverHighlightingEnabled && r == d->highlightedRecord) {
if (d->appearance.backgroundAltering && (r % 2 != 0))
- pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.rowMouseOverAlternateHighlightingColor);
+ pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.recordMouseOverAlternateHighlightingColor);
else
- pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.rowMouseOverHighlightingColor);
+ pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.recordMouseOverHighlightingColor);
} else {
if (d->appearance.backgroundAltering && (r % 2 != 0))
pb->fillRect(0, transly, maxwc, d->rowHeight, d->appearance.alternateBackgroundColor);
@@ -860,7 +860,7 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
if ((record == m_insertItem /*|| m_newRowEditing*/) && cellValue.isNull()) {
if (!tvcol->field()->isAutoIncrement() && !tvcol->field()->defaultValue().isNull()) {
- //display default value in the "insert row", if available
+ //display default value in the "insert record", if available
//(but not if there is autoincrement flag set)
cellValue = tvcol->field()->defaultValue();
defaultValueDisplayed = true;
@@ -869,8 +869,8 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
const bool columnReadOnly = tvcol->isReadOnly();
const bool dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
- = d->appearance.rowHighlightingEnabled && !d->appearance.persistentSelections
- && m_curRow /*d->highlightedRow*/ >= 0 && row != m_curRow; //d->highlightedRow;
+ = d->appearance.recordHighlightingEnabled && !d->appearance.persistentSelections
+ && m_curRow /*d->highlightedRecord*/ >= 0 && row != m_curRow; //d->highlightedRecord;
// setup default pen
QPen defaultPen;
@@ -880,30 +880,30 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
defaultPen = d->defaultValueDisplayParameters.selectedTextColor;
else
defaultPen = d->defaultValueDisplayParameters.textColor;
- } else if (d->appearance.fullRowSelection
- && (row == d->highlightedRow || (row == m_curRow && d->highlightedRow == -1))
+ } else if (d->appearance.fullRecordSelection
+ && (row == d->highlightedRecord || (row == m_curRow && d->highlightedRecord == -1))
&& usesSelectedTextColor)
{
- defaultPen = d->appearance.rowHighlightingTextColor; //special case: highlighted row
+ defaultPen = d->appearance.recordHighlightingTextColor; //special case: highlighted record
}
- else if (d->appearance.fullRowSelection && row == m_curRow && usesSelectedTextColor) {
- defaultPen = d->appearance.textColor; //special case for full row selection
+ else if (d->appearance.fullRecordSelection && row == m_curRow && usesSelectedTextColor) {
+ defaultPen = d->appearance.textColor; //special case for full record selection
}
else if ( m_currentItem == record && col == m_curCol && !columnReadOnly
&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
&& usesSelectedTextColor)
{
defaultPen = colorGroup().highlightedText(); //selected text
- } else if ( d->appearance.rowHighlightingEnabled && row == m_curRow
+ } else if ( d->appearance.recordHighlightingEnabled && row == m_curRow
&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
&& usesSelectedTextColor)
{
- defaultPen = d->appearance.rowHighlightingTextColor;
- } else if ( d->appearance.rowMouseOverHighlightingEnabled && row == d->highlightedRow
+ defaultPen = d->appearance.recordHighlightingTextColor;
+ } else if ( d->appearance.recordMouseOverHighlightingEnabled && row == d->highlightedRecord
&& !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
&& usesSelectedTextColor)
{
- defaultPen = d->appearance.rowMouseOverHighlightingTextColor;
+ defaultPen = d->appearance.recordMouseOverHighlightingTextColor;
} else {
defaultPen = d->appearance.textColor;
}
@@ -924,17 +924,17 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
if (!d->appearance.gridEnabled)
y_offset++; //correction because we're not drawing cell borders
- if (d->appearance.fullRowSelection && d->appearance.fullRowSelection) {
+ if (d->appearance.fullRecordSelection && d->appearance.fullRecordSelection) {
// p->fillRect(x, y_offset, x+w-1, y_offset+h-1, red);
}
- if (m_currentItem == record && (col == m_curCol || d->appearance.fullRowSelection)) {
- if (edit && ( (d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection)
- || (row == m_curRow && d->highlightedRow == -1 && d->appearance.fullRowSelection))
+ if (m_currentItem == record && (col == m_curCol || d->appearance.fullRecordSelection)) {
+ if (edit && ( (d->appearance.recordHighlightingEnabled && !d->appearance.fullRecordSelection)
+ || (row == m_curRow && d->highlightedRecord == -1 && d->appearance.fullRecordSelection))
)
{
edit->paintSelectionBackground(p, isEnabled(), txt, align, x, y_offset, w, h,
isEnabled() ? colorGroup().highlight() : QColor(200, 200, 200),//d->grayColor,
- p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection);
+ p->fontMetrics(), columnReadOnly, d->appearance.fullRecordSelection);
}
}
@@ -944,7 +944,7 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
// If we are in the focus cell, draw indication
if ( m_currentItem == record && col == m_curCol //js: && !d->recordIndicator)
- && !d->appearance.fullRowSelection)
+ && !d->appearance.fullRecordSelection)
{
// kDebug() << ">>> CURRENT CELL ("<<m_curCol<<"," << m_curRow<<") focus="<<has_focus;
if (isEnabled()) {
@@ -963,7 +963,7 @@ void KexiTableView::paintCell(QPainter* p, KexiDB::RecordData *record, int col,
if ( (!m_newRowEditing && record == m_insertItem)
|| (m_newRowEditing && record == m_currentItem && cellValue.isNull()))
{
- //we're in "insert row"
+ //we're in "insert record"
if (tvcol->field()->isAutoIncrement()) { // "autonumber" column
KexiDisplayUtils::paintAutonumberSign(d->autonumberSignDisplayParameters, p,
x, y_offset, w - x - x - ((align & Qt::AlignLeft) ? 2 : 0),
@@ -1170,7 +1170,7 @@ bool KexiTableView::handleContentsMousePressOrRelease(QMouseEvent* e, bool relea
return false;
}
newrow++;
- kDebug() << "Clicked just on 'insert' row.";
+ kDebug() << "Clicked just on 'insert' record.";
} else {
// get new focus cell
newrow = rowAt(e->pos().y());
@@ -1226,15 +1226,15 @@ void KexiTableView::contentsMouseMoveEvent(QMouseEvent *e)
}
// kDebug() << " row="<<row<< " col="<<col;
//update row highlight if needed
- if (d->appearance.rowMouseOverHighlightingEnabled) {
- if (row != d->highlightedRow) {
- const int oldRow = d->highlightedRow;
- d->highlightedRow = row;
+ if (d->appearance.recordMouseOverHighlightingEnabled) {
+ if (row != d->highlightedRecord) {
+ const int oldRow = d->highlightedRecord;
+ d->highlightedRecord = row;
updateRow(oldRow);
- updateRow(d->highlightedRow);
- //currently selected (not necessary highlighted) row needs to be repainted
+ updateRow(d->highlightedRecord);
+ //currently selected (not necessary highlighted) record needs to be repainted
updateRow(m_curRow);
- m_verticalHeader->setHighlightedRow(d->highlightedRow);
+ m_verticalHeader->setHighlightedRecord(d->highlightedRecord);
}
}
@@ -1309,9 +1309,9 @@ bool KexiTableView::shortCutPressed(QKeyEvent *e, const QString &action_name)
//check default shortcut (when user app has no action shortcuts defined
// but we want these shortcuts to still work)
- if (action_name == "data_save_row")
+ if (action_name == "data_save_record")
return (k == Qt::Key_Return || k == Qt::Key_Enter) && e->modifiers() == Qt::ShiftModifier;
- if (action_name == "edit_delete_row")
+ if (action_name == "edit_delete_record")
return k == Qt::Key_Delete && e->modifiers() == Qt::ControlModifier;
if (action_name == "edit_delete")
return k == Qt::Key_Delete && e->modifiers() == Qt::NoModifier;
@@ -1375,7 +1375,7 @@ void KexiTableView::keyPressEvent(QKeyEvent* e)
return;
}
} else if (m_rowEditing) {// if a row is in edit mode, do some special stuff
- if (shortCutPressed(e, "data_save_row")) {
+ if (shortCutPressed(e, "data_save_record")) {
kDebug() << "shortCutPressed!!!";
acceptRowEdit();
return;
@@ -1394,7 +1394,7 @@ void KexiTableView::keyPressEvent(QKeyEvent* e)
//check shared shortcuts
if (!ro) {
- if (shortCutPressed(e, "edit_delete_row")) {
+ if (shortCutPressed(e, "edit_delete_record")) {
deleteCurrentRow();
e->accept();
return;
@@ -1422,7 +1422,7 @@ void KexiTableView::keyPressEvent(QKeyEvent* e)
if (k == Qt::Key_Shift || k == Qt::Key_Alt || k == Qt::Key_Control || k == Qt::Key_Meta) {
e->ignore();
} else if (KexiDataAwareObjectInterface::handleKeyPress(
- e, curRow, curCol, d->appearance.fullRowSelection))
+ e, curRow, curCol, d->appearance.fullRecordSelection))
{
if (e->isAccepted())
return;
@@ -1615,7 +1615,7 @@ void KexiTableView::createEditor(int row, int col, const QString& addText, bool
//indicate on the vheader that we are editing:
m_verticalHeader->setEditRow(m_curRow);
if (isInsertingEnabled() && m_currentItem == m_insertItem) {
- //we should know that we are in state "new row editing"
+ //we should know that we are in state "new record editing"
m_newRowEditing = true;
//'insert' row editing: show another row after that:
m_data->append(m_insertItem);
@@ -2040,7 +2040,7 @@ void KexiTableView::ensureCellVisible(int row, int col/*=-1*/)
}
//quite clever: ensure the cell is visible:
- QRect r(columnPos(col == -1 ? m_curCol : col), rowPos(row) + (d->appearance.fullRowSelection ? 1 : 0),
+ QRect r(columnPos(col == -1 ? m_curCol : col), rowPos(row) + (d->appearance.fullRecordSelection ? 1 : 0),
columnWidth(col == -1 ? m_curCol : col), rowHeight());
/* if (m_navPanel && horizontalScrollBar()->isHidden() && row == rows()-1) {
@@ -2521,20 +2521,20 @@ bool KexiTableView::eventFilter(QObject *o, QEvent *e)
updateWidgetContentsSize();
}
} else if (e->type() == QEvent::Leave) {
- if (o == viewport() && d->appearance.rowMouseOverHighlightingEnabled
+ if (o == viewport() && d->appearance.recordMouseOverHighlightingEnabled
&& d->appearance.persistentSelections) {
- if (d->highlightedRow != -1) {
- int oldRow = d->highlightedRow;
- d->highlightedRow = -1;
+ if (d->highlightedRecord = -1) {
+ int oldRow = d->highlightedRecord;
+ d->highlightedRecord = -1;
updateRow(oldRow);
const bool dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted
- = d->appearance.rowHighlightingEnabled && !d->appearance.persistentSelections;
+ = d->appearance.recordHighlightingEnabled && !d->appearance.persistentSelections;
if (oldRow != m_curRow && m_curRow >= 0) {
if (!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted) {
//no highlight for now: show selection again
updateRow(m_curRow);
}
- m_verticalHeader->setHighlightedRow(-1);
+ m_verticalHeader->setHighlightedRecord(-1);
}
}
}
@@ -2544,7 +2544,7 @@ bool KexiTableView::eventFilter(QObject *o, QEvent *e)
//hp==true if currently focused widget is a child of this table view
const bool hp = KexiUtils::hasParent( static_cast<QWidget*>(o), focusWidget());
if (!hp && KexiUtils::hasParent( this, static_cast<QWidget*>(o))) {
- //accept row editing if focus is moved to foreign widget
+ //accept record editing if focus is moved to foreign widget
//(not a child, like eg. editor) from one of our table view's children
//or from table view itself
if (!acceptRowEdit()) {
@@ -2587,8 +2587,8 @@ const KexiTableView::Appearance& KexiTableView::appearance() const
void KexiTableView::setAppearance(const Appearance& a)
{
-// if (d->appearance.fullRowSelection != a.fullRowSelection) {
- if (a.fullRowSelection) {
+// if (d->appearance.fullRecordSelection != a.fullRecordSelection) {
+ if (a.fullRecordSelection) {
d->rowHeight -= 1;
} else {
d->rowHeight += 1;
@@ -2601,54 +2601,54 @@ void KexiTableView::setAppearance(const Appearance& a)
m_horizontalHeader->sizeHint().height(), 0, 0);
}
// }
- if (a.rowHighlightingEnabled)
+ if (a.recordHighlightingEnabled)
m_updateEntireRowWhenMovingToOtherRow = true;
m_navPanel->setVisible(a.navigatorEnabled);
- d->highlightedRow = -1;
+ d->highlightedRecord = -1;
//! @todo is setMouseTracking useful for other purposes?
- viewport()->setMouseTracking(a.rowMouseOverHighlightingEnabled);
+ viewport()->setMouseTracking(a.recordMouseOverHighlightingEnabled);
d->appearance = a;
setFont(font()); //this also updates contents
}
-int KexiTableView::highlightedRow() const
+int KexiTableView::highlightedRecord() const
{
- return d->highlightedRow;
+ return d->highlightedRecord;
}
-void KexiTableView::setHighlightedRow(int row)
+void KexiTableView::setHighlightedRecord(int record)
{
- if (row != -1) {
- row = qMin(rows() - 1 + (isInsertingEnabled() ? 1 : 0), row);
- row = qMax(0, row);
- ensureCellVisible(row, -1);
+ if (record != -1) {
+ record = qMin(rows() - 1 + (isInsertingEnabled() ? 1 : 0), record);
+ record = qMax(0, record);
+ ensureCellVisible(record, -1);
}
- const int previouslyHighlightedRow = d->highlightedRow;
- if (previouslyHighlightedRow == row) {
- if (previouslyHighlightedRow != -1)
- updateRow(previouslyHighlightedRow);
+ const int previouslyHighlightedRecord = d->highlightedRecord;
+ if (previouslyHighlightedRecord == record) {
+ if (previouslyHighlightedRecord != -1)
+ updateRow(previouslyHighlightedRecord);
return;
}
- d->highlightedRow = row;
- if (d->highlightedRow != -1)
- updateRow(d->highlightedRow);
+ d->highlightedRecord = record;
+ if (d->highlightedRecord != -1)
+ updateRow(d->highlightedRecord);
- if (previouslyHighlightedRow != -1)
- updateRow(previouslyHighlightedRow);
+ if (previouslyHighlightedRecord != -1)
+ updateRow(previouslyHighlightedRecord);
- if (m_curRow >= 0 && (previouslyHighlightedRow == -1 || previouslyHighlightedRow == m_curRow)
- && d->highlightedRow != m_curRow && !d->appearance.persistentSelections) {
- //currently selected row needs to be repainted
+ if (m_curRow >= 0 && (previouslyHighlightedRecord == -1 || previouslyHighlightedRecord == m_curRow)
+ && d->highlightedRecord != m_curRow && !d->appearance.persistentSelections) {
+ //currently selected record needs to be repainted
updateRow(m_curRow);
}
}
KexiDB::RecordData *KexiTableView::highlightedItem() const
{
- return d->highlightedRow == -1 ? 0 : m_data->at(d->highlightedRow);
+ return d->highlightedRecord == -1 ? 0 : m_data->at(d->highlightedRecord);
}
int KexiTableView::lastVisibleRow() const
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 0e46029..00ddb39 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -102,12 +102,12 @@ public:
/*! true if background altering should be enabled, true by default */
bool backgroundAltering;
- /*! true if full-row-selection mode is set,
- what means that all cells of the current row are always selected, instead of single cell.
+ /*! true if full-record-selection mode is set,
+ what means that all cells of the current record are always selected, instead of single cell.
This mode is usable for read-only table views, when we're interested only in navigating
- by rows. False by default, even for read-only table views.
+ by records. False by default, even for read-only table views.
*/
- bool fullRowSelection;
+ bool fullRecordSelection;
/*! true if fullgrid is enabled. True by default.
It is set to false for comboboxpopup table, to mimic original
@@ -118,37 +118,37 @@ public:
True by default. */
bool navigatorEnabled;
- /*! true if "row highlight" behaviour is enabled. False by default. */
- bool rowHighlightingEnabled;
+ /*! true if "record highlight" behaviour is enabled. False by default. */
+ bool recordHighlightingEnabled;
- /*! true if "row highlight over " behaviour is enabled. False by default. */
- bool rowMouseOverHighlightingEnabled;
+ /*! true if "record highlight over " behaviour is enabled. False by default. */
+ bool recordMouseOverHighlightingEnabled;
- /*! true if selection of a row should be kept when a user moved mouse
- pointer over other rows. Makes only sense when rowMouseOverHighlightingEnabled is true.
+ /*! true if selection of a record should be kept when a user moved mouse
+ pointer over other records. Makes only sense when recordMouseOverHighlightingEnabled is true.
True by default. It is set to false for comboboxpopup table, to mimic original
combobox look and feel. */
bool persistentSelections;
- /*! color for row highlight, default is intermediate (33%/60%) between
+ /*! color for record highlight, default is intermediate (33%/60%) between
active highlight and base color. */
- QColor rowHighlightingColor;
+ QColor recordHighlightingColor;
- /*! color for text under row highlight, default is the same as textColor.
- Used when rowHighlightingEnabled is true; */
- QColor rowHighlightingTextColor;
+ /*! color for text under record highlight, default is the same as textColor.
+ Used when recordHighlightingEnabled is true; */
+ QColor recordHighlightingTextColor;
- /*! color for row highlight for mouseover, default is intermediate (20%/80%) between
- active highlight and base color. Used when rowMouseOverHighlightingEnabled is true. */
- QColor rowMouseOverHighlightingColor;
+ /*! color for record highlight for mouseover, default is intermediate (20%/80%) between
+ active highlight and base color. Used when recordMouseOverHighlightingEnabled is true. */
+ QColor recordMouseOverHighlightingColor;
- /*! color for text under row highlight for mouseover, default is the same as textColor.
- Used when rowMouseOverHighlightingEnabled is true; */
- QColor rowMouseOverHighlightingTextColor;
+ /*! color for text under record highlight for mouseover, default is the same as textColor.
+ Used when recordMouseOverHighlightingEnabled is true; */
+ QColor recordMouseOverHighlightingTextColor;
- /*! Like rowMouseOverHighlightingColor but for areas painted with alternate color.
+ /*! Like recordMouseOverHighlightingColor but for areas painted with alternate color.
This is computed using active highlight color and alternateBackgroundColor. */
- QColor rowMouseOverAlternateHighlightingColor;
+ QColor recordMouseOverAlternateHighlightingColor;
};
KexiTableView(KexiTableViewData* data = 0, QWidget* parent = 0, const char* name = 0);
@@ -181,7 +181,7 @@ public:
/*! Enables or disables vertical scrollbar's. */
//moved void setScrollbarToolTipsEnabled(bool set);
- /*! \return maximum number of rows that can be displayed per one "page"
+ /*! \return maximum number of records that can be displayed per one "page"
for current table view's size. */
virtual int rowsPerPage() const;
@@ -255,10 +255,10 @@ public:
//! Initializes standard editor cell editor factories. This is called internally, once.
static void initCellEditorFactories();
- /*! \return highlighted row number or -1 if no row is highlighted.
- Makes sense if row highlighting is enabled.
- @see Appearance::rowHighlightingEnabled setHighlightedRow() */
- int highlightedRow() const;
+ /*! \return highlighted record number or -1 if no record is highlighted.
+ Makes sense if record highlighting is enabled.
+ @see Appearance::recordHighlightingEnabled setHighlightedRecord() */
+ int highlightedRecord() const;
KexiDB::RecordData *highlightedItem() const;
@@ -298,14 +298,14 @@ public slots:
\sa setColumnStretchEnabled() QHeader::adjustHeaderSize() */
void adjustHorizontalHeaderSize();
- /*! Sets highlighted row number or -1 if no row has to be highlighted.
- Makes sense if row highlighting is enabled.
- @see Appearance::rowHighlightingEnabled */
- void setHighlightedRow(int row);
+ /*! Sets highlighted record number or -1 if no record has to be highlighted.
+ Makes sense if record highlighting is enabled.
+ @see Appearance::recordHighlightingEnabled */
+ void setHighlightedRecord(int record);
- /*! Sets no row that will be highlighted. Equivalent to setHighlightedRow(-1). */
- inline void clearHighlightedRow() {
- setHighlightedRow(-1);
+ /*! Sets no record that will be highlighted. Equivalent to setHighlightedRecord(-1). */
+ inline void clearHighlightedRecord() {
+ setHighlightedRecord(-1);
}
/*! Ensures that cell at \a row and \a col is visible.
@@ -345,7 +345,7 @@ public slots:
}
/*! Deletes currently selected cell's contents, if allowed.
- In most cases delete is not accepted immediately but "row editing" mode is just started. */
+ In most cases delete is not accepted immediately but "record editing" mode is just started. */
virtual void deleteAndStartEditCurrentCell() {
KexiDataAwareObjectInterface::deleteAndStartEditCurrentCell();
}
@@ -486,7 +486,7 @@ protected slots:
}
#if 0 // 2.0
- /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "row number" tooltip. */
+ /*! Handles sliderReleased() signal of the verticalScrollBar(). Used to hide the "record number" tooltip. */
/*replaced by QToolTip virtual void vScrollBarSliderReleased() {
KexiDataAwareObjectInterface::vScrollBarSliderReleased();
}*/
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index 9c31ab3..1f8c43d 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -49,7 +49,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
//moved scrollBarTip = 0;
ensureCellVisibleOnShow = QPoint(-1, -1);
internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height() / 2;
- highlightedRow = -1;
+ highlightedRecord = -1;
moveCursorOnMouseRelease = false;
horizontalHeaderVisible = true;
recentCellWithToolTip = QPoint(-1, -1);
diff --git a/kexi/widget/tableview/kexitableview_p.h b/kexi/widget/tableview/kexitableview_p.h
index 2cbe676..e78c282 100644
--- a/kexi/widget/tableview/kexitableview_p.h
+++ b/kexi/widget/tableview/kexitableview_p.h
@@ -141,8 +141,8 @@ public:
At this time, it's used by KexiComboBoxPopup to decrease margin for popup's table. */
int internal_bottomMargin;
- /*! Helper for "highlighted row" effect. */
- int highlightedRow;
+ /*! Helper for "highlighted record" effect. */
+ int highlightedRecord;
/*! Id of context menu key (cached). */
int contextMenuKey;
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 9dc89d7..4383c91 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -617,7 +617,7 @@ bool KexiTableViewData::saveRow(KexiDB::RecordData& record, bool insert, bool re
if (insert) {
if (!d->cursor->insertRow(record, *d->pRowEditBuffer,
d->containsROWIDInfo/*also retrieve ROWID*/)) {
- d->result.msg = i18n("Row inserting failed.") + "\n\n"
+ d->result.msg = i18n("Record inserting failed.") + "\n\n"
+ Kexi::msgYouCanImproveData();
KexiDB::getHTMLErrorMesage(d->cursor, &d->result);
@@ -635,7 +635,7 @@ bool KexiTableViewData::saveRow(KexiDB::RecordData& record, bool insert, bool re
// ROWID = record[columns.count()].toULongLong();
if (!d->cursor->updateRow(static_cast<KexiDB::RecordData&>(record), *d->pRowEditBuffer,
d->containsROWIDInfo/*use ROWID*/)) {
- d->result.msg = i18n("Row changing failed.") + "\n\n" + Kexi::msgYouCanImproveData();
+ d->result.msg = i18n("Record changing failed.") + "\n\n" + Kexi::msgYouCanImproveData();
//! @todo set d->result.column if possible
KexiDB::getHTMLErrorMesage(d->cursor, d->result.desc);
return false;
@@ -703,7 +703,7 @@ bool KexiTableViewData::deleteRow(KexiDB::RecordData& record, bool repaint)
if (d->cursor) {//db-aware
d->result.success = false;
if (!d->cursor->deleteRow(static_cast<KexiDB::RecordData&>(record), d->containsROWIDInfo/*use ROWID*/)) {
- d->result.msg = i18n("Row deleting failed.");
+ d->result.msg = i18n("Record deleting failed.");
/*js: TODO: use KexiDB::errorMessage() for description (desc) as in KexiTableViewData::saveRow() */
KexiDB::getHTMLErrorMesage(d->cursor, &d->result);
d->result.success = false;
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index ad225fe..5f4639c 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -72,7 +72,7 @@ public:
: rowHeight(1)
, offset(0)
, currentRow(-1)
- , highlightedRow(-1)
+ , highlightedRecord(-1)
, editRow(-1)
, rows(0)
, showInsertRow(true) {
@@ -80,7 +80,7 @@ public:
int rowHeight;
int offset;
int currentRow;
- int highlightedRow;
+ int highlightedRecord;
int editRow;
int rows;
QBrush selectionBackgroundBrush;
@@ -184,7 +184,7 @@ void KexiRecordMarker::paintEvent(QPaintEvent *)
alteredColor = KexiUtils::blendedColors(
palette().color(QPalette::Window), d->selectionBackgroundBrush.color(), 2, 1);
}
- else if (d->highlightedRow == i) {
+ else if (d->highlightedRecord == i) {
alteredColor = KexiUtils::blendedColors(
palette().color(QPalette::Window), d->selectionBackgroundBrush.color(), 4, 1);
optionHeader.state |= QStyle::State_MouseOver;
@@ -245,17 +245,17 @@ void KexiRecordMarker::setCurrentRow(int row)
update(0, (d->rowHeight*d->currentRow) - d->offset - 1, width() + 2, d->rowHeight + 2);
}
-void KexiRecordMarker::setHighlightedRow(int row)
+void KexiRecordMarker::setHighlightedRecord(int record)
{
- if (row == d->highlightedRow)
+ if (record == d->highlightedRecord)
return;
- int oldRow = d->highlightedRow;
- d->highlightedRow = row;
+ int oldRecord = d->highlightedRecord;
+ d->highlightedRecord = record;
- if (oldRow != -1)
- update(0, (d->rowHeight*(oldRow)) - d->offset - 1, width() + 2, d->rowHeight + 2);
+ if (oldRecord != -1)
+ update(0, (d->rowHeight*oldRecord) - d->offset - 1, width() + 2, d->rowHeight + 2);
if (d->currentRow != -1)
- update(0, (d->rowHeight*d->highlightedRow) - d->offset - 1, width() + 2, d->rowHeight + 2);
+ update(0, (d->rowHeight*d->highlightedRecord) - d->offset - 1, width() + 2, d->rowHeight + 2);
}
void KexiRecordMarker::setOffset(int offset)
@@ -301,12 +301,12 @@ void KexiRecordMarker::mouseMoveEvent(QMouseEvent *e)
// kDebug() << "y / d->rowHeight:" << (y / d->rowHeight);
const uint row = y / d->rowHeight;
if ((int)row < rows()) {
- setHighlightedRow(row);
- emit rowHighlighted(row);
+ setHighlightedRecord(row);
+ emit recordHighlighted(row);
}
else {
- setHighlightedRow(-1);
- emit rowHighlighted(-1);
+ setHighlightedRecord(-1);
+ emit recordHighlighted(-1);
}
QWidget::mouseMoveEvent(e);
}
@@ -323,8 +323,8 @@ void KexiRecordMarker::mousePressEvent(QMouseEvent *e)
void KexiRecordMarker::leaveEvent(QEvent *e)
{
- setHighlightedRow(-1);
- emit rowHighlighted(-1);
+ setHighlightedRecord(-1);
+ emit recordHighlighted(-1);
QWidget::leaveEvent(e);
}
diff --git a/kexi/widget/utils/kexirecordmarker.h b/kexi/widget/utils/kexirecordmarker.h
index ca17e35..6f37899 100644
--- a/kexi/widget/utils/kexirecordmarker.h
+++ b/kexi/widget/utils/kexirecordmarker.h
@@ -47,7 +47,7 @@ public slots:
void setOffset(int offset);
void setCellHeight(int cellHeight);
void setCurrentRow(int row);
- void setHighlightedRow(int row);
+ void setHighlightedRecord(int row);
/*! Sets 'edit row' flag for \a row. Use row==-1 if you want to switch the flag off. */
void setEditRow(int row);
@@ -69,7 +69,7 @@ signals:
void rowPressed(uint row);
//! Used to allow row highlighting by moving mouse over the section
- void rowHighlighted(int row);
+ void recordHighlighted(int row);
protected:
virtual void paintEvent(QPaintEvent *e);
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index d98896d..a3dbf63 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -101,7 +101,7 @@ KexiRecordNavigator::KexiRecordNavigator(QWidget *parent, Q3ScrollView* parentVi
d->textLabel = new QLabel(this);
d->lyr->addWidget(d->textLabel);
- setLabelText(i18n("Row:"));
+ setLabelText(i18n("Record:"));
setFont( KexiUtils::smallFont() );
QFontMetrics fm(font());
@@ -129,9 +129,9 @@ KexiRecordNavigator::KexiRecordNavigator(QWidget *parent, Q3ScrollView* parentVi
d->navRecordNumberValidator = new QIntValidator(1, INT_MAX, this);
d->navRecordNumber->setValidator(d->navRecordNumberValidator);
d->navRecordNumber->installEventFilter(this);
- d->navRecordNumber->setToolTip(i18n("Current row number"));
+ d->navRecordNumber->setToolTip(i18n("Current record number"));
- QLabel *lbl_of = new QLabel(i18nc("\"of\" in row number information: N of M", "of"), this);
+ QLabel *lbl_of = new QLabel(i18nc("\"of\" in record number information: N of M", "of"), this);
lbl_of->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
lbl_of->setFixedWidth(fm.width(lbl_of->text()) + d->nav1DigitWidth);
lbl_of->setAlignment(Qt::AlignCenter);
@@ -152,7 +152,7 @@ KexiRecordNavigator::KexiRecordNavigator(QWidget *parent, Q3ScrollView* parentVi
d->navRecordCount->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
d->navRecordCount->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
d->navRecordCount->setFocusPolicy(Qt::NoFocus);
- d->navRecordCount->setToolTip(i18n("Number of rows"));
+ d->navRecordCount->setToolTip(i18n("Number of records"));
d->navBtnNext = createAction(KexiRecordNavigator::Actions::moveToNextRecord());
d->navBtnNext->setAutoRepeat(true);
@@ -302,7 +302,7 @@ void KexiRecordNavigator::setRecordCount(uint count)
resize(width() + (n.length() - d->navRecordCount->text().length())*d->nav1DigitWidth, height());
}
}
- //update row number widget's width
+ //update record number widget's width
const int w = d->nav1DigitWidth * qMax(qMax(n.length(), 2) + 1, d->navRecordNumber->text().length() + 1) + 2;
if (d->navRecordNumber->width() != w) //resize
d->navRecordNumber->setFixedWidth(w);
@@ -512,16 +512,16 @@ class KexiRecordNavigatorActionsInternal
{
public:
KexiRecordNavigatorActionsInternal()
- : moveToFirstRecord(i18n("First row"), "go-first-view", i18n("Go to first row"))
- , moveToPreviousRecord(i18n("Previous row"), "go-previous-view", i18n("Go to previous row"))
- , moveToNextRecord(i18n("Next row"), "go-next-view", i18n("Go to next row"))
- , moveToLastRecord(i18n("Last row"), "go-last-view", i18n("Go to last row"))
- , moveToNewRecord(i18n("New row"), "list-add", i18n("Go to new row")) {
- moveToFirstRecord.setWhatsThis(i18n("Moves cursor to first row."));
- moveToPreviousRecord.setWhatsThis(i18n("Moves cursor to previous row."));
- moveToNextRecord.setWhatsThis(i18n("Moves cursor to next row."));
- moveToLastRecord.setWhatsThis(i18n("Moves cursor to last row."));
- moveToNewRecord.setWhatsThis(i18n("Moves cursor to new row and allows inserting."));
+ : moveToFirstRecord(i18n("First record"), "go-first-view", i18n("Go to first record"))
+ , moveToPreviousRecord(i18n("Previous record"), "go-previous-view", i18n("Go to previous record"))
+ , moveToNextRecord(i18n("Next record"), "go-next-view", i18n("Go to next record"))
+ , moveToLastRecord(i18n("Last record"), "go-last-view", i18n("Go to last record"))
+ , moveToNewRecord(i18n("New record"), "list-add", i18n("Go to new record")) {
+ moveToFirstRecord.setWhatsThis(i18n("Moves cursor to first record."));
+ moveToPreviousRecord.setWhatsThis(i18n("Moves cursor to previous record."));
+ moveToNextRecord.setWhatsThis(i18n("Moves cursor to next record."));
+ moveToLastRecord.setWhatsThis(i18n("Moves cursor to last record."));
+ moveToNewRecord.setWhatsThis(i18n("Moves cursor to new record and allows inserting."));
}
KGuiItem moveToFirstRecord;
KGuiItem moveToPreviousRecord;
diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h
index 7b19e2a..60e2e4a 100644
--- a/kexi/widget/utils/kexirecordnavigator.h
+++ b/kexi/widget/utils/kexirecordnavigator.h
@@ -160,7 +160,7 @@ public slots:
void updateGeometry(int leftMargin);
/*! Sets label text at the left of the for record navigator's button.
- By default this label contains translated "Row:" text. */
+ By default this label contains translated "Record:" text. */
void setLabelText(const QString& text);
void setButtonToolTipText(KexiRecordNavigator::Button, const QString&);
diff --git a/kexi/widget/utils/kexisharedactionclient.h b/kexi/widget/utils/kexisharedactionclient.h
index 9d0bca4..dda32e7 100644
--- a/kexi/widget/utils/kexisharedactionclient.h
+++ b/kexi/widget/utils/kexisharedactionclient.h
@@ -37,7 +37,7 @@ public:
/*! Plugs action \a a for a widget. The action will be later looked up (by name)
on key press event, to get proper shortcut. If found, we know that the action is already
performed at main window's level, so we should give up. Otherwise - default shortcut
- will be used (example: Shift+Enter key for "data_save_row" action). \sa KexiTableView::shortCutPressed()
+ will be used (example: Shift+Enter key for "data_save_record" action). \sa KexiTableView::shortCutPressed()
*/
void plugSharedAction(QAction* a);
More information about the kde-doc-english
mailing list