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

1.10.5

This commit is contained in:
DavidXanatos 2023-08-11 22:26:02 +02:00
parent 7a71512170
commit 3fbf1b2dd1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SandboxiePlus/SandMan/SbiePlusAPI.cpp
View File

@ -537,6 +537,8 @@ void CSandBoxPlus::ScanStartMenu()
//pLink->Arguments = ;
pLink->Icon = ReadIni(L"InternetShortcut", L"IconFile");
pLink->IconIndex = ReadIni(L"InternetShortcut", L"IconIndex").toInt();
if (pLink->Icon.isEmpty())
pLink->IconIndex = -1;
//pLink->WorkDir = ;
}

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

@ -1869,10 +1869,10 @@ void CSbieView::UpdateStartMenu(CSandBoxPlus* pBoxEx)
QAction* pAction = pMenu->addAction(Link.Name, this, SLOT(OnSandBoxAction()));
QIcon Icon;
if (!Link.Icon.isEmpty())
Icon = LoadWindowsIcon(Link.Icon, Link.IconIndex);
else if (Link.Target.contains("://"))
if(Link.IconIndex == -1)
Icon = theGUI->GetIcon("Internet");
else if (!Link.Icon.isEmpty())
Icon = LoadWindowsIcon(Link.Icon, Link.IconIndex);
if (Icon.isNull()) Icon = m_IconProvider.icon(QFileInfo(Link.Target));
pAction->setIcon(Icon);
QString Command;
@ -1916,26 +1916,25 @@ void CSbieView::UpdateRunMenu(const CSandBoxPtr& pBox)
QString CmdFile = pBoxEx->GetCommandFile(Entry["Command"].toString());
QString IconFile;
int IconIndex = 0;
if (FileIndex.first.isEmpty()) {
if (!CmdFile.contains("://"))
IconFile = CmdFile;
}
else if (FileIndex.second.isEmpty()) {
int IconIndex ;
if (FileIndex.second.isEmpty()) {
IconFile = CmdFile;
IconIndex = FileIndex.first.toInt();
}
else {
IconFile = FileIndex.first.replace("%BoxRoot%", pBoxEx->GetFileRoot(), Qt::CaseInsensitive);
if (FileIndex.first.isEmpty())
IconFile = CmdFile;
else
IconFile = FileIndex.first.replace("%BoxRoot%", pBoxEx->GetFileRoot(), Qt::CaseInsensitive);
IconIndex = FileIndex.second.toInt();
}
QAction* pAction = pMenu->addAction(FolderName.second, this, SLOT(OnSandBoxAction()));
QIcon Icon;
if (!IconFile.isEmpty())
Icon = LoadWindowsIcon(IconFile, IconIndex);
else if (CmdFile.contains("://"))
if(IconIndex == -1)
Icon = theGUI->GetIcon("Internet");
else if (!IconFile.isEmpty())
Icon = LoadWindowsIcon(IconFile, IconIndex);
if (Icon.isNull()) Icon = m_IconProvider.icon(QFileInfo(CmdFile));
pAction->setIcon(Icon);
pAction->setData(Entry["Command"].toString());