Skip to content

Commit

Permalink
Icons and 3 new toolbar actions
Browse files Browse the repository at this point in the history
  • Loading branch information
typpos committed Jun 4, 2023
1 parent 69e3feb commit 798bdfc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions SandboxiePlus/SandMan/Resources/SandMan.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@
<file>Actions/Interface.png</file>
<file>Actions/Notification.png</file>
<file>Actions/Stack.png</file>
<file>Actions/PauseForce.png</file>
<file>Actions/DisableMessagePopup.png</file>
<file>Actions/DisableRecovery.png</file>
</qresource>
<qresource prefix="/Boxes">
<file alias="Empty3">Boxes/sandbox-b-empty.png</file>
Expand Down
15 changes: 7 additions & 8 deletions SandboxiePlus/SandMan/SandMan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,13 @@ void CSandMan::CreateMenus(bool bAdvanced)
m_pRunBoxed = m_pMenuFile->addAction(CSandMan::GetIcon("Run"), tr("Run Sandboxed"), this, SLOT(OnSandBoxAction()));
m_pEmptyAll = m_pMenuFile->addAction(CSandMan::GetIcon("EmptyAll"), tr("Terminate All Processes"), this, SLOT(OnEmptyAll()));
m_pMenuFile->addSeparator();
m_pDisableForce = m_pMenuFile->addAction(tr("Pause Forcing Programs"), this, SLOT(OnDisableForce()));
m_pDisableForce = m_pMenuFile->addAction(GetIcon("PauseForce"), tr("Pause Forcing Programs"), this, SLOT(OnDisableForce()));
m_pDisableForce->setCheckable(true);
if(bAdvanced) {
m_pDisableRecovery = m_pMenuFile->addAction(tr("Disable File Recovery"), this, SLOT(OnDisablePopUp()));
m_pDisableRecovery = m_pMenuFile->addAction(GetIcon("DisableRecovery"), tr("Disable File Recovery"), this, SLOT(OnDisablePopUp()));
m_pDisableRecovery->setCheckable(true);
m_pDisableRecovery->setChecked(theConf->GetBool("UIConfig/DisabledRecovery", false));
m_pDisableMessages = m_pMenuFile->addAction(tr("Disable Message Popup"), this, SLOT(OnDisablePopUp()));
m_pDisableMessages = m_pMenuFile->addAction(GetIcon("DisableMessagePopup"), tr("Disable Message Popup"), this, SLOT(OnDisablePopUp()));
m_pDisableMessages->setCheckable(true);
m_pDisableMessages->setChecked(theConf->GetBool("UIConfig/DisableMessages", false));
}
Expand Down Expand Up @@ -790,11 +790,10 @@ QList<ToolBarAction> CSandMan::GetAvailableToolBarActions()
ToolBarAction{ "KeepTerminated", m_pKeepTerminated },
ToolBarAction{ "BrowseFiles", m_pMenuBrowse },
ToolBarAction{ "EnableMonitor", m_pEnableMonitoring },
//TODO These need icons
//ToolBarAction{ "", nullptr },
//ToolBarAction{ "DisableForce", m_pDisableForce},
//ToolBarAction{ "DisableRecovery", m_pDisableRecovery },
//ToolBarAction{ "DisableMessages", m_pDisableMessages },
ToolBarAction{ "", nullptr },
ToolBarAction{ "DisableForce", m_pDisableForce},
ToolBarAction{ "DisableRecovery", m_pDisableRecovery },
ToolBarAction{ "DisableMessages", m_pDisableMessages },
ToolBarAction{ "", nullptr },
ToolBarAction{ "Connect", m_pConnect },
ToolBarAction{ "Disconnect", m_pDisconnect },
Expand Down

0 comments on commit 798bdfc

Please sign in to comment.