diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index eb11b1e7412..7281f8a559b 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -556,11 +556,16 @@ GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) { qtwShortcuts->setColumnCount(canSuppress ? 4 : 3); qtwShortcuts->setItemDelegate(new ShortcutDelegate(qtwShortcuts)); + qtwShortcuts->headerItem()->setData(0, Qt::AccessibleTextRole, tr("Shortcut action")); + qtwShortcuts->headerItem()->setData(1, Qt::AccessibleTextRole, tr("Shortcut data")); + qtwShortcuts->headerItem()->setData(2, Qt::AccessibleTextRole, tr("Shortcut input combinations")); + qtwShortcuts->header()->setSectionResizeMode(0, QHeaderView::Fixed); qtwShortcuts->header()->resizeSection(0, 150); qtwShortcuts->header()->setSectionResizeMode(2, QHeaderView::Stretch); - if (canSuppress) + if (canSuppress) { qtwShortcuts->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents); + } qcbEnableGlobalShortcuts->setVisible(canDisable); @@ -705,6 +710,10 @@ void GlobalShortcutConfig::on_qtwShortcuts_itemChanged(QTreeWidgetItem *item, in if (gs && sc.qvData.userType() != gs->qvDefault.userType()) { item->setData(1, Qt::DisplayRole, gs->qvDefault); } + + item->setData(0, Qt::AccessibleTextRole, item->text(0)); + item->setData(1, Qt::AccessibleTextRole, item->text(1)); + item->setData(3, Qt::AccessibleDescriptionRole, item->checkState(3) == Qt::Checked ? tr("checked") : tr("unchecked")); } QString GlobalShortcutConfig::title() const { diff --git a/src/mumble/GlobalShortcut.ui b/src/mumble/GlobalShortcut.ui index f8d072cf4a9..98e97e463f9 100644 --- a/src/mumble/GlobalShortcut.ui +++ b/src/mumble/GlobalShortcut.ui @@ -124,13 +124,16 @@ - + List of configured shortcuts Configured shortcuts + + Use up and down keys to navigate through your added shortcuts. Use left and right keys to navigate between actions and options for a single shortcut. + QAbstractItemView::AllEditTriggers @@ -271,6 +274,13 @@ Without this option enabled, using Mumble's global shortcuts in privileged appli + + + MultiColumnTreeWidget + QTreeWidget +
widgets/MultiColumnTreeWidget.h
+
+