krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Removed master table widget

Browse source
This commit is contained in:
graffy76 2013-08-16 18:23:02 -05:00
parent 84e5c2610a
commit 49c4e1bf9e
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apps/launcher/datafilespage.cpp
View file

@ -47,7 +47,7 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
QCheckBox checkBox; QCheckBox checkBox;
unsigned int height = checkBox.sizeHint().height() + 4; unsigned int height = checkBox.sizeHint().height() + 4;
/*
mastersTable->setModel(mMastersProxyModel); mastersTable->setModel(mMastersProxyModel);
mastersTable->setObjectName("MastersTable"); mastersTable->setObjectName("MastersTable");
mastersTable->setContextMenuPolicy(Qt::CustomContextMenu); mastersTable->setContextMenuPolicy(Qt::CustomContextMenu);
@ -63,7 +63,7 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
mastersTable->verticalHeader()->setDefaultSectionSize(height); mastersTable->verticalHeader()->setDefaultSectionSize(height);
mastersTable->verticalHeader()->setResizeMode(QHeaderView::Fixed); mastersTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
mastersTable->verticalHeader()->hide(); mastersTable->verticalHeader()->hide();
*/
pluginsTable->setModel(mFilterProxyModel); pluginsTable->setModel(mFilterProxyModel);
pluginsTable->setObjectName("PluginsTable"); pluginsTable->setObjectName("PluginsTable");
pluginsTable->setContextMenuPolicy(Qt::CustomContextMenu); pluginsTable->setContextMenuPolicy(Qt::CustomContextMenu);
@ -94,10 +94,10 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
connect(mNewProfileDialog->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(updateOkButton(QString))); connect(mNewProfileDialog->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(updateOkButton(QString)));
connect(pluginsTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex))); connect(pluginsTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mastersTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex))); //connect(mastersTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(pluginsTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint))); connect(pluginsTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
connect(mastersTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint))); //connect(mastersTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
connect(mDataFilesModel, SIGNAL(layoutChanged()), this, SLOT(updateViews())); connect(mDataFilesModel, SIGNAL(layoutChanged()), this, SLOT(updateViews()));
@ -255,6 +255,7 @@ void DataFilesPage::updateSplitter()
void DataFilesPage::updateViews() void DataFilesPage::updateViews()
{ {
// Ensure the columns are hidden because sort() re-enables them // Ensure the columns are hidden because sort() re-enables them
/*
mastersTable->setColumnHidden(1, true); mastersTable->setColumnHidden(1, true);
mastersTable->setColumnHidden(2, true); mastersTable->setColumnHidden(2, true);
mastersTable->setColumnHidden(3, true); mastersTable->setColumnHidden(3, true);
@ -263,7 +264,7 @@ void DataFilesPage::updateViews()
mastersTable->setColumnHidden(6, true); mastersTable->setColumnHidden(6, true);
mastersTable->setColumnHidden(7, true); mastersTable->setColumnHidden(7, true);
mastersTable->setColumnHidden(8, true); mastersTable->setColumnHidden(8, true);
*/
pluginsTable->setColumnHidden(1, true); pluginsTable->setColumnHidden(1, true);
pluginsTable->setColumnHidden(2, true); pluginsTable->setColumnHidden(2, true);
pluginsTable->setColumnHidden(3, true); pluginsTable->setColumnHidden(3, true);
@ -335,8 +336,8 @@ void DataFilesPage::on_checkAction_triggered()
if (pluginsTable->hasFocus()) if (pluginsTable->hasFocus())
setPluginsCheckstates(Qt::Checked); setPluginsCheckstates(Qt::Checked);
if (mastersTable->hasFocus()) //if (mastersTable->hasFocus())
setMastersCheckstates(Qt::Checked); // setMastersCheckstates(Qt::Checked);
} }
@ -345,17 +346,17 @@ void DataFilesPage::on_uncheckAction_triggered()
if (pluginsTable->hasFocus()) if (pluginsTable->hasFocus())
setPluginsCheckstates(Qt::Unchecked); setPluginsCheckstates(Qt::Unchecked);
if (mastersTable->hasFocus()) //if (mastersTable->hasFocus())
setMastersCheckstates(Qt::Unchecked); // setMastersCheckstates(Qt::Unchecked);
} }
void DataFilesPage::setMastersCheckstates(Qt::CheckState state) void DataFilesPage::setMastersCheckstates(Qt::CheckState state)
{ {/*
if (!mastersTable->selectionModel()->hasSelection()) { //if (!mastersTable->selectionModel()->hasSelection()) {
return; // return;
} //}
QModelIndexList indexes = mastersTable->selectionModel()->selectedIndexes(); //QModelIndexList indexes = mastersTable->selectionModel()->selectedIndexes();
foreach (const QModelIndex &index, indexes) foreach (const QModelIndex &index, indexes)
{ {
@ -368,7 +369,7 @@ void DataFilesPage::setMastersCheckstates(Qt::CheckState state)
return; return;
mDataFilesModel->setCheckState(sourceIndex, state); mDataFilesModel->setCheckState(sourceIndex, state);
} }*/
} }
void DataFilesPage::setPluginsCheckstates(Qt::CheckState state) void DataFilesPage::setPluginsCheckstates(Qt::CheckState state)
@ -519,7 +520,7 @@ void DataFilesPage::showContextMenu(const QPoint &point)
// Show menu // Show menu
mContextMenu->exec(globalPos); mContextMenu->exec(globalPos);
} }
/*
if (object->objectName() == QLatin1String("MastersTable")) { if (object->objectName() == QLatin1String("MastersTable")) {
if (!mastersTable->selectionModel()->hasSelection()) if (!mastersTable->selectionModel()->hasSelection())
return; return;
@ -548,4 +549,5 @@ void DataFilesPage::showContextMenu(const QPoint &point)
mContextMenu->exec(globalPos); mContextMenu->exec(globalPos);
} }
*/
} }

9
apps/opencs/view/doc/filedialog.cpp
View file

@ -42,7 +42,7 @@ FileDialog::FileDialog(QWidget *parent) :
unsigned int height = checkBox.sizeHint().height() + 4; unsigned int height = checkBox.sizeHint().height() + 4;
masterView->setModel(mMastersProxyModel); masterView->setModel(mMastersProxyModel);
/*
mastersTable->setModel(mMastersProxyModel); mastersTable->setModel(mMastersProxyModel);
mastersTable->setObjectName("MastersTable"); mastersTable->setObjectName("MastersTable");
mastersTable->setContextMenuPolicy(Qt::CustomContextMenu); mastersTable->setContextMenuPolicy(Qt::CustomContextMenu);
@ -57,7 +57,7 @@ FileDialog::FileDialog(QWidget *parent) :
mastersTable->verticalHeader()->setDefaultSectionSize(height); mastersTable->verticalHeader()->setDefaultSectionSize(height);
mastersTable->verticalHeader()->setResizeMode(QHeaderView::Fixed); mastersTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
mastersTable->verticalHeader()->hide(); mastersTable->verticalHeader()->hide();
*/
pluginsTable->setModel(mFilterProxyModel); pluginsTable->setModel(mFilterProxyModel);
pluginsTable->setObjectName("PluginsTable"); pluginsTable->setObjectName("PluginsTable");
pluginsTable->setContextMenuPolicy(Qt::CustomContextMenu); pluginsTable->setContextMenuPolicy(Qt::CustomContextMenu);
@ -116,7 +116,7 @@ FileDialog::FileDialog(QWidget *parent) :
//connect(filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); //connect(filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(pluginsTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex))); connect(pluginsTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mastersTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex))); //connect(mastersTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mCreateButton, SIGNAL(clicked()), this, SLOT(createButtonClicked())); connect(mCreateButton, SIGNAL(clicked()), this, SLOT(createButtonClicked()));
@ -127,6 +127,7 @@ FileDialog::FileDialog(QWidget *parent) :
void FileDialog::updateViews() void FileDialog::updateViews()
{ {
// Ensure the columns are hidden because sort() re-enables them // Ensure the columns are hidden because sort() re-enables them
/*
mastersTable->setColumnHidden(1, true); mastersTable->setColumnHidden(1, true);
mastersTable->setColumnHidden(3, true); mastersTable->setColumnHidden(3, true);
mastersTable->setColumnHidden(4, true); mastersTable->setColumnHidden(4, true);
@ -135,7 +136,7 @@ void FileDialog::updateViews()
mastersTable->setColumnHidden(7, true); mastersTable->setColumnHidden(7, true);
mastersTable->setColumnHidden(8, true); mastersTable->setColumnHidden(8, true);
mastersTable->resizeColumnsToContents(); mastersTable->resizeColumnsToContents();
*/
pluginsTable->setColumnHidden(1, true); pluginsTable->setColumnHidden(1, true);
pluginsTable->setColumnHidden(3, true); pluginsTable->setColumnHidden(3, true);
pluginsTable->setColumnHidden(4, true); pluginsTable->setColumnHidden(4, true);

1
files/ui/datafilespage.ui
View file

@ -36,7 +36,6 @@
<property name="childrenCollapsible"> <property name="childrenCollapsible">
<bool>false</bool> <bool>false</bool>
</property> </property>
<widget class="QTableView" name="mastersTable"/>
<widget class="QTableView" name="pluginsTable"/> <widget class="QTableView" name="pluginsTable"/>
</widget> </widget>
</item> </item>