ShortcutsDialog.cpp   ShortcutsDialog.cpp 
skipping to change at line 66 skipping to change at line 66
} }
return QSortFilterProxyModel::filterAcceptsRow(source_row, source_pa rent); return QSortFilterProxyModel::filterAcceptsRow(source_row, source_pa rent);
} }
ShortcutsDialog::ShortcutsDialog(QObject* parent) : ShortcutsDialog::ShortcutsDialog(QObject* parent) :
StelDialog(parent), StelDialog(parent),
ui(new Ui_shortcutsDialogForm), ui(new Ui_shortcutsDialogForm),
filterModel(new ShortcutsFilterModel(this)), filterModel(new ShortcutsFilterModel(this)),
mainModel(new QStandardItemModel(this)) mainModel(new QStandardItemModel(this))
{ {
dialogName = "Shortcuts";
actionMgr = StelApp::getInstance().getStelActionManager(); actionMgr = StelApp::getInstance().getStelActionManager();
} }
ShortcutsDialog::~ShortcutsDialog() ShortcutsDialog::~ShortcutsDialog()
{ {
collisionItems.clear(); collisionItems.clear();
delete ui; delete ui;
ui = NULL; ui = NULL;
} }
skipping to change at line 281 skipping to change at line 282
QStandardItem* item = mainModel->itemFromIndex(mainIndex); QStandardItem* item = mainModel->itemFromIndex(mainIndex);
if (itemIsEditable(item)) if (itemIsEditable(item))
{ {
ui->primaryShortcutEdit->setFocus(); ui->primaryShortcutEdit->setFocus();
} }
} }
void ShortcutsDialog::createDialogContent() void ShortcutsDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
resetModel(); resetModel();
filterModel->setSourceModel(mainModel); filterModel->setSourceModel(mainModel);
filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive); filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
filterModel->setSortCaseSensitivity(Qt::CaseInsensitive); filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
filterModel->setDynamicSortFilter(true); filterModel->setDynamicSortFilter(true);
filterModel->setSortLocaleAware(true); filterModel->setSortLocaleAware(true);
ui->shortcutsTreeView->setModel(filterModel); ui->shortcutsTreeView->setModel(filterModel);
ui->shortcutsTreeView->header()->setSectionsMovable(false); ui->shortcutsTreeView->header()->setSectionsMovable(false);
ui->shortcutsTreeView->sortByColumn(0, Qt::AscendingOrder); ui->shortcutsTreeView->sortByColumn(0, Qt::AscendingOrder);
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/