24161188444

Committed 08 Apr 2026 10:06PM UTC coverage: 20.992% (-0.05%) from 21.04%

Build # 24161188444

Build Type

push

github

Committed by

web-flow

Commit Message

fix: let window manager handle dialog positioning (#947)

* fix: let window manager handle dialog positioning

- Config dialog: Only restore position/size if previously saved (not first launch)
- Close event: Only save position/size when not maximized

* fix: use getDialogGeometry() as reliable discriminator for saved state

Replaces savedPos.isNull() check with getDialogGeometry() non-empty check
to properly handle cases where position QPoint(0,0) was legitimately saved.

* fix: avoid saving maximized dialog position/size in all dialogs

Apply same guard pattern as ConfigDialog to KeygenDialog and UsersDialog:
only save pos()/size() when not maximized.

* fix: guard dialog position/size restore with geometry check in all dialogs

Apply same pattern as ConfigDialog to KeygenDialog and UsersDialog:
only restore pos()/size() if saved geometry exists.

Coverage Stats

0 of 21 new or added lines in 3 files covered. (0.0%)

4 existing lines in 3 files now uncovered.

1109 of 5283 relevant lines covered (20.99%)

7.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/keygendialog.cpp

// SPDX-FileCopyrightText: 2015 Anne Jan Brouwer
// SPDX-License-Identifier: GPL-3.0-or-later
#include "keygendialog.h"
#include "configdialog.h"
#include "pass.h"
#include "qprogressindicator.h"
#include "qtpasssettings.h"
#include "ui_keygendialog.h"
#include "util.h"
#include <QMessageBox>
#include <QRegularExpression>

#ifdef QT_DEBUG
#include "debughelper.h"
#endif

/**
 * @brief KeygenDialog::KeygenDialog basic constructor.
 * @param parent
 */
KeygenDialog::KeygenDialog(ConfigDialog *parent)
    : QDialog(parent), ui(new Ui::KeygenDialog) {
  ui->setupUi(this);
  dialog = parent;

  // Restore dialog state
  QByteArray savedGeometry = QtPassSettings::getDialogGeometry("keygenDialog");
  bool hasSavedGeometry = !savedGeometry.isEmpty();
  if (hasSavedGeometry) {
    restoreGeometry(savedGeometry);
  }
  if (QtPassSettings::isDialogMaximized("keygenDialog")) {
    showMaximized();
  } else if (hasSavedGeometry) {
    move(QtPassSettings::getDialogPos("keygenDialog"));
    resize(QtPassSettings::getDialogSize("keygenDialog"));
  } else {
    // Let window manager handle positioning for first launch
  }

  ui->plainTextEdit->setPlainText(Pass::getDefaultKeyTemplate());
}

/**
 * @brief KeygenDialog::~KeygenDialog even more basic destructor.
 */
KeygenDialog::~KeygenDialog() { delete ui; }

/**
 * @brief KeygenDialog::on_passphrase1_textChanged see if we want to have
 * protection.
 * @param arg1
 */
void KeygenDialog::on_passphrase1_textChanged(const QString &arg1) {
  bool state = ui->passphrase1->text() == ui->passphrase2->text();
  if (state) {
    replace("Passphrase", arg1);
    no_protection(arg1.isEmpty());
  }

  ui->buttonBox->setEnabled(state);
}

/**
 * @brief KeygenDialog::on_passphrase2_textChanged wrapper for
 * KeygenDialog::on_passphrase1_textChanged
 * @param arg1
 */
void KeygenDialog::on_passphrase2_textChanged(const QString &arg1) {
  on_passphrase1_textChanged(arg1);
}

/**
 * @brief KeygenDialog::on_checkBox_stateChanged expert mode enabled / disabled.
 * @param arg1
 */
void KeygenDialog::on_checkBox_stateChanged(int arg1) {
  ui->plainTextEdit->setReadOnly(!arg1);
  ui->plainTextEdit->setEnabled(arg1);
}

/**
 * @brief KeygenDialog::on_email_textChanged update the email in keypair
 * generation template.
 * @param arg1
 */
void KeygenDialog::on_email_textChanged(const QString &arg1) {
  replace("Name-Email", arg1);
}

/**
 * @brief KeygenDialog::on_name_textChanged update the name in keypair
 * generation template.
 * @param arg1
 */
void KeygenDialog::on_name_textChanged(const QString &arg1) {
  replace("Name-Real", arg1);
}

/**
 * @brief KeygenDialog::replace do some regex magic. fore replacing Passphrase
 * and protection in keypair generation template.
 * @param key
 * @param value
 */
void KeygenDialog::replace(const QString &key, const QString &value) {
  QStringList clear;
  QString expert = ui->plainTextEdit->toPlainText();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
  const QStringList lines =
      expert.split(Util::newLinesRegex(), Qt::SkipEmptyParts);
#else
  const QStringList lines =
      expert.split(Util::newLinesRegex(), QString::SkipEmptyParts);
#endif
  for (QString line : lines) {
    line.replace(QRegularExpression(key + ":.*"), key + ": " + value);
    if (key == "Passphrase") {
      line.replace("%no-protection", "Passphrase: " + value);
    }
    clear.append(line);
  }
  ui->plainTextEdit->setPlainText(clear.join("\n"));
}

/**
 * @brief KeygenDialog::no_protection remove protection in keypair generation
 * template.
 * @param enable
 */
void KeygenDialog::no_protection(bool enable) {
  QStringList clear;
  QString expert = ui->plainTextEdit->toPlainText();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
  const QStringList lines =
      expert.split(Util::newLinesRegex(), Qt::SkipEmptyParts);
#else
  const QStringList lines =
      expert.split(Util::newLinesRegex(), QString::SkipEmptyParts);
#endif
  for (QString line : lines) {
    bool remove = false;
    if (!enable) {
      if (line.indexOf("%no-protection") == 0) {
        remove = true;
      }
    } else {
      if (line.indexOf("Passphrase") == 0) {
        line = "%no-protection";
      }
    }
    if (!remove) {
      clear.append(line);
    }
  }
  ui->plainTextEdit->setPlainText(clear.join("\n"));
}

/**
 * @brief KeygenDialog::done we are going to create a key pair and show the
 * QProgressIndicator and some text since the generation will take some time.
 * @param r
 */
void KeygenDialog::done(int r) {
  if (QDialog::Accepted == r) { //  ok was pressed
                                // check name
    if (ui->name->text().length() < 5) {
      QMessageBox::critical(this, tr("Invalid name"),
                            tr("Name must be at least 5 characters long."));
      return;
    }

    // check email
    static const QRegularExpression mailre(
        QRegularExpression::anchoredPattern(
            R"(\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b)"),
        QRegularExpression::CaseInsensitiveOption);
    if (!mailre.match(ui->email->text()).hasMatch()) {
      QMessageBox::critical(
          this, tr("Invalid email"),
          tr("The email address you typed is not a valid email address."));
      return;
    }

    ui->widget->setEnabled(false);
    ui->buttonBox->setEnabled(false);
    ui->checkBox->setEnabled(false);
    ui->plainTextEdit->setEnabled(false);

    auto *pi = new QProgressIndicator();
    pi->startAnimation();
    pi->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

    ui->frame->hide();
    ui->label->setText(
        tr("This operation can take some minutes.<br />"
           "We need to generate a lot of random bytes. It is a good idea to "
           "perform some other action (type on the keyboard, move the mouse, "
           "utilize the disks) during the prime generation; this gives the "
           "random number generator a better chance to gain enough entropy."));

    this->layout()->addWidget(pi);

    this->show();
    dialog->genKey(ui->plainTextEdit->toPlainText(), this);
  } else { //  cancel, close or exc was pressed
    QDialog::done(r);
    return;
  }
}

/**
 * @brief KeygenDialog::closeEvent we are done here.
 * @param event
 */
void KeygenDialog::closeEvent(QCloseEvent *event) {
  QtPassSettings::setDialogGeometry("keygenDialog", saveGeometry());
  if (!isMaximized()) {
    QtPassSettings::setDialogPos("keygenDialog", pos());
    QtPassSettings::setDialogSize("keygenDialog", size());
  }
  QtPassSettings::setDialogMaximized("keygenDialog", isMaximized());
  event->accept();
}

1	// SPDX-FileCopyrightText: 2015 Anne Jan Brouwer
2	// SPDX-License-Identifier: GPL-3.0-or-later
3	#include "keygendialog.h"
4	#include "configdialog.h"
5	#include "pass.h"
6	#include "qprogressindicator.h"
7	#include "qtpasssettings.h"
8	#include "ui_keygendialog.h"
9	#include "util.h"
10	#include <QMessageBox>
11	#include <QRegularExpression>
12
13	#ifdef QT_DEBUG
14	#include "debughelper.h"
15	#endif
16
17	/**
18	* @brief KeygenDialog::KeygenDialog basic constructor.
19	* @param parent
20	*/
21	KeygenDialog::KeygenDialog(ConfigDialog *parent)	×
22	: QDialog(parent), ui(new Ui::KeygenDialog) {	×
23	ui->setupUi(this);	×
24	dialog = parent;	×
25
26	// Restore dialog state
NEW 27	QByteArray savedGeometry = QtPassSettings::getDialogGeometry("keygenDialog");	×
28	bool hasSavedGeometry = !savedGeometry.isEmpty();
NEW 29	if (hasSavedGeometry) {	×
NEW 30	restoreGeometry(savedGeometry);	×
31	}
32	if (QtPassSettings::isDialogMaximized("keygenDialog")) {	×
33	showMaximized();	×
NEW 34	} else if (hasSavedGeometry) {	×
35	move(QtPassSettings::getDialogPos("keygenDialog"));	×
36	resize(QtPassSettings::getDialogSize("keygenDialog"));	×
37	} else {
38	// Let window manager handle positioning for first launch
39	}
40
41	ui->plainTextEdit->setPlainText(Pass::getDefaultKeyTemplate());	×
42	}	×
43
44	/**
45	* @brief KeygenDialog::~KeygenDialog even more basic destructor.
46	*/
47	KeygenDialog::~KeygenDialog() { delete ui; }	×
48
49	/**
50	* @brief KeygenDialog::on_passphrase1_textChanged see if we want to have
51	* protection.
52	* @param arg1
53	*/
54	void KeygenDialog::on_passphrase1_textChanged(const QString &arg1) {	×
55	bool state = ui->passphrase1->text() == ui->passphrase2->text();	×
56	if (state) {	×
57	replace("Passphrase", arg1);	×
58	no_protection(arg1.isEmpty());	×
59	}
60
61	ui->buttonBox->setEnabled(state);	×
62	}	×
63
64	/**
65	* @brief KeygenDialog::on_passphrase2_textChanged wrapper for
66	* KeygenDialog::on_passphrase1_textChanged
67	* @param arg1
68	*/
69	void KeygenDialog::on_passphrase2_textChanged(const QString &arg1) {	×
70	on_passphrase1_textChanged(arg1);	×
71	}	×
72
73	/**
74	* @brief KeygenDialog::on_checkBox_stateChanged expert mode enabled / disabled.
75	* @param arg1
76	*/
77	void KeygenDialog::on_checkBox_stateChanged(int arg1) {	×
78	ui->plainTextEdit->setReadOnly(!arg1);	×
79	ui->plainTextEdit->setEnabled(arg1);	×
80	}	×
81
82	/**
83	* @brief KeygenDialog::on_email_textChanged update the email in keypair
84	* generation template.
85	* @param arg1
86	*/
87	void KeygenDialog::on_email_textChanged(const QString &arg1) {	×
88	replace("Name-Email", arg1);	×
89	}	×
90
91	/**
92	* @brief KeygenDialog::on_name_textChanged update the name in keypair
93	* generation template.
94	* @param arg1
95	*/
96	void KeygenDialog::on_name_textChanged(const QString &arg1) {	×
97	replace("Name-Real", arg1);	×
98	}	×
99
100	/**
101	* @brief KeygenDialog::replace do some regex magic. fore replacing Passphrase
102	* and protection in keypair generation template.
103	* @param key
104	* @param value
105	*/
106	void KeygenDialog::replace(const QString &key, const QString &value) {	×
107	QStringList clear;	×
108	QString expert = ui->plainTextEdit->toPlainText();	×
109	#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
110	const QStringList lines =
111	expert.split(Util::newLinesRegex(), Qt::SkipEmptyParts);	×
112	#else
113	const QStringList lines =
114	expert.split(Util::newLinesRegex(), QString::SkipEmptyParts);
115	#endif
116	for (QString line : lines) {	×
117	line.replace(QRegularExpression(key + ":.*"), key + ": " + value);	×
118	if (key == "Passphrase") {	×
119	line.replace("%no-protection", "Passphrase: " + value);	×
120	}
121	clear.append(line);
122	}
123	ui->plainTextEdit->setPlainText(clear.join("\n"));	×
124	}	×
125
126	/**
127	* @brief KeygenDialog::no_protection remove protection in keypair generation
128	* template.
129	* @param enable
130	*/
131	void KeygenDialog::no_protection(bool enable) {	×
132	QStringList clear;	×
133	QString expert = ui->plainTextEdit->toPlainText();	×
134	#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
135	const QStringList lines =
136	expert.split(Util::newLinesRegex(), Qt::SkipEmptyParts);	×
137	#else
138	const QStringList lines =
139	expert.split(Util::newLinesRegex(), QString::SkipEmptyParts);
140	#endif
141	for (QString line : lines) {	×
142	bool remove = false;
143	if (!enable) {	×
144	if (line.indexOf("%no-protection") == 0) {	×
145	remove = true;
146	}
147	} else {
148	if (line.indexOf("Passphrase") == 0) {	×
149	line = "%no-protection";	×
150	}
151	}
152	if (!remove) {
153	clear.append(line);
154	}
155	}
156	ui->plainTextEdit->setPlainText(clear.join("\n"));	×
157	}	×
158
159	/**
160	* @brief KeygenDialog::done we are going to create a key pair and show the
161	* QProgressIndicator and some text since the generation will take some time.
162	* @param r
163	*/
164	void KeygenDialog::done(int r) {	×
165	if (QDialog::Accepted == r) { // ok was pressed	×
166	// check name
167	if (ui->name->text().length() < 5) {	×
168	QMessageBox::critical(this, tr("Invalid name"),	×
169	tr("Name must be at least 5 characters long."));	×
170	return;	×
171	}
172
173	// check email
174	static const QRegularExpression mailre(
175	QRegularExpression::anchoredPattern(	×
176	R"(\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b)"),
177	QRegularExpression::CaseInsensitiveOption);	×
178	if (!mailre.match(ui->email->text()).hasMatch()) {	×
179	QMessageBox::critical(	×
180	this, tr("Invalid email"),	×
181	tr("The email address you typed is not a valid email address."));	×
182	return;	×
183	}
184
185	ui->widget->setEnabled(false);	×
186	ui->buttonBox->setEnabled(false);	×
187	ui->checkBox->setEnabled(false);	×
188	ui->plainTextEdit->setEnabled(false);	×
189
190	auto *pi = new QProgressIndicator();	×
191	pi->startAnimation();	×
192	pi->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);	×
193
194	ui->frame->hide();	×
195	ui->label->setText(	×
196	tr("This operation can take some minutes.<br />"	×
197	"We need to generate a lot of random bytes. It is a good idea to "
198	"perform some other action (type on the keyboard, move the mouse, "
199	"utilize the disks) during the prime generation; this gives the "
200	"random number generator a better chance to gain enough entropy."));
201
202	this->layout()->addWidget(pi);	×
203
204	this->show();	×
205	dialog->genKey(ui->plainTextEdit->toPlainText(), this);	×
206	} else { // cancel, close or exc was pressed
207	QDialog::done(r);	×
208	return;	×
209	}
210	}
211
212	/**
213	* @brief KeygenDialog::closeEvent we are done here.
214	* @param event
215	*/
216	void KeygenDialog::closeEvent(QCloseEvent *event) {	×
217	QtPassSettings::setDialogGeometry("keygenDialog", saveGeometry());	×
NEW 218	if (!isMaximized()) {	×
NEW 219	QtPassSettings::setDialogPos("keygenDialog", pos());	×
NEW 220	QtPassSettings::setDialogSize("keygenDialog", size());	×
221	}
UNCOV 222	QtPassSettings::setDialogMaximized("keygenDialog", isMaximized());	×
223	event->accept();
224	}	×

IJHack / QtPass / 24161188444

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous