summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cbdfb3b)
Enable 'Reset secret notes' menu action only if user
has not supplied correct password.
'Undo reset' menu action has been removed.
Signed-off-by: Janusz Sobczak <janusz.sobczak@gmail.com>
hasReadFile(false)
{
ui->setupUi(this);
hasReadFile(false)
{
ui->setupUi(this);
+
+ resetAction = ui->menuOptions->addAction(tr("Reset secret notes"));
+ connect(resetAction, SIGNAL(triggered()), this, SLOT(on_actionReset_secret_notes_triggered()));
+
- undoResetAction = ui->menuOptions->addAction(tr("Undo reset"));
- connect(undoResetAction, SIGNAL(triggered()),this, SLOT(undoReset()));
- enableUndoReset(false);
undoEditAction = ui->menuOptions->addAction(tr("Undo edit"));
connect(undoEditAction,SIGNAL(triggered()), this, SLOT(undoEdit()));
undoEditAction = ui->menuOptions->addAction(tr("Undo edit"));
connect(undoEditAction,SIGNAL(triggered()), this, SLOT(undoEdit()));
MainWindow::~MainWindow()
{
plaintext.fill(0);
MainWindow::~MainWindow()
{
plaintext.fill(0);
delete ui;
if (password)
memset(password,0,passLength);
delete ui;
if (password)
memset(password,0,passLength);
if (password)
memset(password, 0, passLength);
delete[] password;
if (password)
memset(password, 0, passLength);
delete[] password;
- password = NULL;
- if (plaintext.length() > 0) {
- undoText.fill(0);
- undoText = plaintext;
- }
- if (undoText.length() > 0)
- enableUndoReset(true);
ui->textEdit->clear();
enableTextEdit(true);
askNewPassword();
ui->textEdit->clear();
enableTextEdit(true);
askNewPassword();
if (!ena) {
ui->textEdit->setPlainText(tr("Secret Notes disabled"));
}
if (!ena) {
ui->textEdit->setPlainText(tr("Secret Notes disabled"));
}
+ enableResetAction(!ena);
-void MainWindow::enableUndoReset(bool ena)
-{
- undoResetAction->setVisible(ena);
-}
-
-void MainWindow::undoReset()
-{
- plaintext.fill(0);
- plaintext = undoText;
- undoText.fill(0);
- undoText = "";
- ui->textEdit->setPlainText(plaintext);
- enableUndoReset(false);
- enableTextEdit(true);
-}
void MainWindow::undoEdit()
{
void MainWindow::undoEdit()
{
{
undoEditAction->setVisible(b);
}
{
undoEditAction->setVisible(b);
}
+
+void MainWindow::enableResetAction(bool b)
+{
+ resetAction->setVisible(b);
+}
void setPassword(const QString& text);
void askNewPassword();
QString plaintext;
void setPassword(const QString& text);
void askNewPassword();
QString plaintext;
void enableTextEdit(bool);
void enableTextEdit(bool);
- void enableUndoReset(bool);
- QAction *undoResetAction;
+ void enableResetAction(bool);
+ QAction *resetAction;
QAction *undoEditAction;
QString filePath;
QAction *undoEditAction;
QString filePath;
void on_actionReset_secret_notes_triggered();
void on_actionChange_password_triggered();
void on_textEdit_undoAvailable(bool b);
void on_actionReset_secret_notes_triggered();
void on_actionChange_password_triggered();
void on_textEdit_undoAvailable(bool b);
void undoEdit();
void readFile();
};
void undoEdit();
void readFile();
};
<string>Options</string>
</property>
<addaction name="actionChange_password"/>
<string>Options</string>
</property>
<addaction name="actionChange_password"/>
- <addaction name="actionReset_secret_notes"/>
</widget>
<addaction name="menuOptions"/>
</widget>
</widget>
<addaction name="menuOptions"/>
</widget>