Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-10 12:27:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

gui: rebindwidget - Make magic colon replacement string a macro

Browse Source 
This should help prevent making typos when using it to replace an actual
colon in the macro data.
This commit is contained in:
Karl Fleischmann
2026-05-25 21:58:10 +03:00
committed by Tasos Sahanidis
parent a8d85ab55a
commit de6b946ab2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/rebindwidget.cpp
+4 -2
View File
@@ -11,6 +11,8 @@
static const int DPI_OFFSET = -KeyAction::DPI_CYCLE_UP + 1; static const int DPI_OFFSET = -KeyAction::DPI_CYCLE_UP + 1;
static const int DPI_CUST_IDX = KeyAction::DPI_CUSTOM + DPI_OFFSET; static const int DPI_CUST_IDX = KeyAction::DPI_CUSTOM + DPI_OFFSET;
static const QString MACRO_MAGIC_COLON_REPLACEMENT = QStringLiteral("&das_IST_31N_col0n;");
static inline void setLocalUiElementsEnabled(Ui::RebindWidget* const ui, const bool e){ static inline void setLocalUiElementsEnabled(Ui::RebindWidget* const ui, const bool e){
ui->editAsStringBtn->setEnabled(e); ui->editAsStringBtn->setEnabled(e);
ui->btnAddEvent->setEnabled(e); ui->btnAddEvent->setEnabled(e);
@@ -364,7 +366,7 @@ void RebindWidget::setSelection(const QStringList& newSelection, bool applyPrevi
if(dataCount == 3 || dataCount == 4){ if(dataCount == 3 || dataCount == 4){
// Colons in the name field are escaped // Colons in the name field are escaped
QString macroName = macroData[2].toString(); QString macroName = macroData[2].toString();
macroName.replace("&das_IST_31N_col0n;", ":"); macroName.replace(MACRO_MAGIC_COLON_REPLACEMENT, ":");
ui->macroName->setText(macroName); ui->macroName->setText(macroName);
// Pick the appropriate string to parse due to legacy formats // Pick the appropriate string to parse due to legacy formats
@@ -490,7 +492,7 @@ void RebindWidget::applyChanges(const QStringList& keys, bool doUnbind){
// daemon_string is the one sent to the daemon, and original_recorded_macro_string is the raw user data // daemon_string is the one sent to the daemon, and original_recorded_macro_string is the raw user data
// preview_string is now unused as it can be generated from the remaining data // preview_string is now unused as it can be generated from the remaining data
// Any colons in user_specified_macro_name are escaped // Any colons in user_specified_macro_name are escaped
QString escapedMacroName = ui->macroName->text().replace(":", "&das_IST_31N_col0n;"); QString escapedMacroName = ui->macroName->text().replace(":", MACRO_MAGIC_COLON_REPLACEMENT);
QString finalDaemonString = macroLines.toString(false); QString finalDaemonString = macroLines.toString(false);
QString originalString = macroLines.toString(true); QString originalString = macroLines.toString(true);
QString macro = QString("%1::%2:%3").arg(finalDaemonString, escapedMacroName, originalString); QString macro = QString("%1::%2:%3").arg(finalDaemonString, escapedMacroName, originalString);