mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Rename Imminent to Immediate Recovery 

For greater consistency with other strings
This commit is contained in:
isaak654 2022-06-14 20:08:32 +02:00
parent d8e5371465
commit a00f150ca3
No known key found for this signature in database
GPG Key ID: 59D402040437EC44
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -19,9 +19,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added ### Added
- added missing file recovery log from sbiectrl to sandman [#425](https://github.com/sandboxie-plus/Sandboxie/issues/425) - added missing file recovery log from sbiectrl to sandman [#425](https://github.com/sandboxie-plus/Sandboxie/issues/425)
- Imminent recovery window will now auto close when all files are recovered [#1498](https://github.com/sandboxie-plus/Sandboxie/issues/1498) - Immediate recovery window will now auto close when all files are recovered [#1498](https://github.com/sandboxie-plus/Sandboxie/issues/1498)
- the imminent recovery window of sandman is now by default alway on top like in sbiectrl this can be disabled with "Options/RecoveryOnTop=n" [#1465](https://github.com/sandboxie-plus/Sandboxie/issues/1465) - the Immediate recovery window of sandman is now by default alway on top like in sbiectrl this can be disabled with "Options/RecoveryOnTop=n" [#1465](https://github.com/sandboxie-plus/Sandboxie/issues/1465)
- added option to toggle Imminent recovery from the presets sub menu [#1653](https://github.com/sandboxie-plus/Sandboxie/issues/1653) - added option to toggle Immediate recovery from the presets sub menu [#1653](https://github.com/sandboxie-plus/Sandboxie/issues/1653)
- added option to disable file recovery and or message pop up globally - added option to disable file recovery and or message pop up globally
- added per box refresh opzion [#1945](https://github.com/sandboxie-plus/Sandboxie/issues/1945) - added per box refresh opzion [#1945](https://github.com/sandboxie-plus/Sandboxie/issues/1945)

2
SandboxiePlus/SandMan/Views/SbieView.cpp
View File

@ -136,7 +136,7 @@ CSbieView::CSbieView(QWidget* parent) : CPanelView(parent)
m_pMenuPresetsShares->setCheckable(true); m_pMenuPresetsShares->setCheckable(true);
m_pMenuPresets->addSeparator(); m_pMenuPresets->addSeparator();
m_pMenuPresetsRecovery = m_pMenuPresets->addAction(tr("Imminent Recovery"), this, SLOT(OnSandBoxAction())); m_pMenuPresetsRecovery = m_pMenuPresets->addAction(tr("Immediate Recovery"), this, SLOT(OnSandBoxAction()));
m_pMenuPresetsRecovery->setCheckable(true); m_pMenuPresetsRecovery->setCheckable(true);
m_pMenuDuplicate = m_pMenu->addAction(CSandMan::GetIcon("Duplicate"), tr("Duplicate Sandbox"), this, SLOT(OnSandBoxAction())); m_pMenuDuplicate = m_pMenu->addAction(CSandMan::GetIcon("Duplicate"), tr("Duplicate Sandbox"), this, SLOT(OnSandBoxAction()));

8
SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp
View File

@ -13,10 +13,10 @@
#endif #endif
CRecoveryWindow::CRecoveryWindow(const CSandBoxPtr& pBox, bool bImminent, QWidget *parent) CRecoveryWindow::CRecoveryWindow(const CSandBoxPtr& pBox, bool bImmediate, QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
m_bImminent = bImminent; m_bImmediate = bImmediate;
Qt::WindowFlags flags = windowFlags(); Qt::WindowFlags flags = windowFlags();
flags |= Qt::CustomizeWindowHint; flags |= Qt::CustomizeWindowHint;
@ -30,7 +30,7 @@ CRecoveryWindow::CRecoveryWindow(const CSandBoxPtr& pBox, bool bImminent, QWidge
//setWindowState(Qt::WindowActive); //setWindowState(Qt::WindowActive);
SetForegroundWindow((HWND)QWidget::winId()); SetForegroundWindow((HWND)QWidget::winId());
bool bAlwaysOnTop = theConf->GetBool("Options/AlwaysOnTop", false) || (bImminent && theConf->GetBool("Options/RecoveryOnTop", true)); bool bAlwaysOnTop = theConf->GetBool("Options/AlwaysOnTop", false) || (bImmediate && theConf->GetBool("Options/RecoveryOnTop", true));
this->setWindowFlag(Qt::WindowStaysOnTopHint, bAlwaysOnTop); this->setWindowFlag(Qt::WindowStaysOnTopHint, bAlwaysOnTop);
if (!bAlwaysOnTop) { if (!bAlwaysOnTop) {
@ -304,7 +304,7 @@ int CRecoveryWindow::FindFiles()
Count += FindFiles(Folder); Count += FindFiles(Folder);
} }
if (m_bImminent && m_FileMap.isEmpty()) if (m_bImmediate && m_FileMap.isEmpty())
this->close(); this->close();
m_pFileModel->Sync(m_FileMap); m_pFileModel->Sync(m_FileMap);

4
SandboxiePlus/SandMan/Windows/RecoveryWindow.h
View File

@ -36,7 +36,7 @@ class CRecoveryWindow : public QDialog
Q_OBJECT Q_OBJECT
public: public:
CRecoveryWindow(const CSandBoxPtr& pBox, bool bImminent = false, QWidget *parent = Q_NULLPTR); CRecoveryWindow(const CSandBoxPtr& pBox, bool bImmediate = false, QWidget *parent = Q_NULLPTR);
~CRecoveryWindow(); ~CRecoveryWindow();
bool IsDeleteShapshots() { return m_DeleteShapshots; } bool IsDeleteShapshots() { return m_DeleteShapshots; }
@ -85,7 +85,7 @@ protected:
bool m_bTargetsChanged; bool m_bTargetsChanged;
bool m_bReloadPending; bool m_bReloadPending;
bool m_DeleteShapshots; bool m_DeleteShapshots;
bool m_bImminent; bool m_bImmediate;
private: private:
Ui::RecoveryWindow ui; Ui::RecoveryWindow ui;