benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving merge conflicts

Browse Source
This commit is contained in:
Jeremy Borgman
2021-01-08 09:58:52 -06:00
parent c84b6df7d3 b1ba67ac4d
commit 73fe772b70
90 changed files with 7190 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/config/shortcutswidget.cpp
View File

@@ -48,7 +48,7 @@ ShortcutsWidget::ShortcutsWidget(QWidget* parent)
#endif
m_layout = new QVBoxLayout(this);
m_layout->setAlignment(Qt::AlignHCenter);
m_layout->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
m_shortcuts = m_config.shortcuts();
initInfoTable();
@@ -90,10 +90,13 @@ void ShortcutsWidget::initInfoTable()
const auto default_key_sequence = current_shortcut.at(2);
m_table->setItem(i, 0, new QTableWidgetItem(description));
const auto key_sequence = identifier.isEmpty()
? default_key_sequence
: m_config.shortcut(identifier);
QTableWidgetItem* item = new QTableWidgetItem(key_sequence);
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
QTableWidgetItem* item =
new QTableWidgetItem(nativeOSHotKeyText(m_shortcuts.at(i).at(2)));
#else
QTableWidgetItem* item = new QTableWidgetItem(m_shortcuts.at(i).at(2));
#endif
item->setTextAlignment(Qt::AlignCenter);
m_table->setItem(i, 1, item);
@@ -117,10 +120,8 @@ void ShortcutsWidget::initInfoTable()
// adjust size
m_table->resizeColumnsToContents();
m_table->resizeRowsToContents();
m_table->setMinimumWidth(400);
m_table->setMaximumWidth(600);
m_table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
m_table->horizontalHeader()->setMinimumSectionSize(200);
m_table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_table->horizontalHeader()->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
}
@@ -145,8 +146,14 @@ void ShortcutsWidget::slotShortcutCellClicked(int row, int col)
}
if (m_config.setShortcut(shortcutName, shortcutValue.toString())) {
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
QTableWidgetItem* item = new QTableWidgetItem(
nativeOSHotKeyText(shortcutValue.toString()));
#else
QTableWidgetItem* item =
new QTableWidgetItem(shortcutValue.toString());
#endif
item->setTextAlignment(Qt::AlignCenter);
item->setFlags(item->flags() ^ Qt::ItemIsEditable);
m_table->setItem(row, col, item);
@@ -155,3 +162,16 @@ void ShortcutsWidget::slotShortcutCellClicked(int row, int col)
delete setShortcutDialog;
}
}
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
const QString& ShortcutsWidget::nativeOSHotKeyText(const QString& text)
{
m_res = text;
m_res.replace("Ctrl+", "⌘");
m_res.replace("Alt+", "⌥");
m_res.replace("Meta+", "⌃");
m_res.replace("Shift+", "⇧");
return m_res;
}
#endif