SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@154 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-01-12 18:23:43 +00:00
parent a1a58713f1
commit 60164817bc
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qad_sql_table/sql_table_widget.cpp
View File

@@ -460,6 +460,11 @@ void SQLTableWidget::setTableName(const QString & t) {
QStringList wrl = wr.split(";"); QStringList wrl = wr.split(";");
addRelation(wrl[0], wrl[1], wrl[2], wrl[3]); addRelation(wrl[0], wrl[1], wrl[2], wrl[3]);
} }
QMapIterator<QString, bool> cnit(col_vis);
while (cnit.hasNext()) {
cnit.next();
setColumnVisible(cnit.key(), cnit.value());
}
} }
@@ -855,6 +860,14 @@ void SQLTableWidget::addFixedColumnTranslation(const QString & col_name, const Q
} }
void SQLTableWidget::setAdditionalActions(QList<QAction * > a) {
foreach (QAction * i, add_actions)
popup_menu.removeAction(i);
add_actions = a;
popup_menu.addActions(a);
}
void SQLTableWidget::setCustomQuery(const QString & q) { void SQLTableWidget::setCustomQuery(const QString & q) {
custom_query = q; custom_query = q;
updateTable(); updateTable();

8
qad_sql_table/sql_table_widget.h
View File

@@ -226,9 +226,9 @@ public:
bool isColumnHidden(int ind) {if (!columnExists(ind)) return true; return !column_props[ind].visible;} bool isColumnHidden(int ind) {if (!columnExists(ind)) return true; return !column_props[ind].visible;}
bool isColumnHidden(const QString & name) {if (!columnExists(name)) return true; return !column_props[columnByName(name)].visible;} bool isColumnHidden(const QString & name) {if (!columnExists(name)) return true; return !column_props[columnByName(name)].visible;}
void setColumnVisible(int ind, bool visible); void setColumnVisible(int ind, bool visible);
void setColumnVisible(const QString & name, bool visible) {setColumnVisible(columnByName(name), visible);} void setColumnVisible(const QString & name, bool visible) {col_vis[name] = visible; setColumnVisible(columnByName(name), visible);}
void setColumnHidden(int ind, bool hidden) {setColumnVisible(ind, !hidden);} void setColumnHidden(int ind, bool hidden) {setColumnVisible(ind, !hidden);}
void setColumnHidden(const QString & name, bool hidden) {setColumnVisible(columnByName(name), !hidden);} void setColumnHidden(const QString & name, bool hidden) {col_vis[name] = !hidden; setColumnVisible(columnByName(name), !hidden);}
bool lineNewVisible() const; bool lineNewVisible() const;
bool lineFilterVisible() const; bool lineFilterVisible() const;
@@ -238,6 +238,8 @@ public:
void fetchMore() {if (model) model->fetchMore();} void fetchMore() {if (model) model->fetchMore();}
void fetchAll() {if (model) while (model->canFetchMore()) model->fetchMore();} void fetchAll() {if (model) while (model->canFetchMore()) model->fetchMore();}
void setAdditionalActions(QList<QAction * > a);
QSqlRecord headerRecord() const {if (model) return model->record(); return QSqlRecord();} QSqlRecord headerRecord() const {if (model) return model->record(); return QSqlRecord();}
QSqlRecord currentRecord() const; QSqlRecord currentRecord() const;
@@ -288,7 +290,9 @@ private:
QMenu popup_menu, popup_col, popup_filter; QMenu popup_menu, popup_col, popup_filter;
QTime tm; QTime tm;
QActionGroup filters_group; QActionGroup filters_group;
QList<QAction*> add_actions;
QMap<QString, QPair<QString, QString> > translates, fixed_translates; QMap<QString, QPair<QString, QString> > translates, fixed_translates;
QMap<QString, bool> col_vis;
int timer; int timer;
bool filters_active, table_opened, read_only, first_update; bool filters_active, table_opened, read_only, first_update;
static QString _dir; static QString _dir;