diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-empty.png
deleted file mode 100644
index 6cb88c59..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-full.png
deleted file mode 100644
index 0fea5cc3..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-b-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-empty.png
deleted file mode 100644
index 1da9f210..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-full.png
deleted file mode 100644
index 133d8278..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-c-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-frameDM.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-frameDM.png
new file mode 100644
index 00000000..59e6ba39
Binary files /dev/null and b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-frameDM.png differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-empty.png
deleted file mode 100644
index c38c22ae..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-full.png
deleted file mode 100644
index aea1a974..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-g-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-empty.png
deleted file mode 100644
index d7069d20..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-full.png
deleted file mode 100644
index d132924b..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-m-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-empty.png
deleted file mode 100644
index 127c3bb8..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-full.png
deleted file mode 100644
index 472626d6..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-o-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-empty.png
deleted file mode 100644
index d457977f..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-full.png
deleted file mode 100644
index a9538854..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-r-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-empty.png
deleted file mode 100644
index ff204cb3..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-full.png
deleted file mode 100644
index 1427aa53..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-w-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-empty.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-empty.png
deleted file mode 100644
index 79301033..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-empty.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-full.png b/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-full.png
deleted file mode 100644
index 884d6a54..00000000
Binary files a/SandboxiePlus/SandMan/Resources/Boxes/sandbox-y-full.png and /dev/null differ
diff --git a/SandboxiePlus/SandMan/Resources/SandMan.qrc b/SandboxiePlus/SandMan/Resources/SandMan.qrc
index f5ea76b4..c23f394b 100644
--- a/SandboxiePlus/SandMan/Resources/SandMan.qrc
+++ b/SandboxiePlus/SandMan/Resources/SandMan.qrc
@@ -178,32 +178,18 @@
Actions/Font.png
Actions/ResetFont.png
Actions/Dll.png
+ SideLogoDM.png
- Boxes/sandbox-b-empty.png
- Boxes/sandbox-b-full.png
- Boxes/sandbox-c-empty.png
- Boxes/sandbox-c-full.png
- Boxes/sandbox-g-empty.png
- Boxes/sandbox-g-full.png
- Boxes/sandbox-m-empty.png
- Boxes/sandbox-m-full.png
- Boxes/sandbox-r-empty.png
- Boxes/sandbox-r-full.png
- Boxes/sandbox-y-empty.png
- Boxes/sandbox-y-full.png
- Boxes/sandbox-o-empty.png
- Boxes/sandbox-o-full.png
Boxes/BusyOverlay.png
Boxes/sandbox-frame.png
Boxes/sandbox-items.png
Boxes/sandbox-sand.png
- Boxes/sandbox-w-empty.png
- Boxes/sandbox-w-full.png
Boxes/sandbox-group.png
Boxes/sandbox-group+.png
Boxes/sandbox-out.png
Boxes/DelOverlay.png
+ Boxes/sandbox-frameDM.png
Advanced.png
diff --git a/SandboxiePlus/SandMan/Resources/SideLogoDM.png b/SandboxiePlus/SandMan/Resources/SideLogoDM.png
new file mode 100644
index 00000000..46230f68
Binary files /dev/null and b/SandboxiePlus/SandMan/Resources/SideLogoDM.png differ
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
index aac43ca6..0f8bee60 100644
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@@ -239,11 +239,6 @@ CSandMan::CSandMan(QWidget *parent)
connect(m_pHotkeyManager, SIGNAL(activated(size_t)), SLOT(OnHotKey(size_t)));
SetupHotKeys();
- //for (int i = 0; i < eMaxColor; i++) {
- // m_BoxIcons[i].Empty = QIcon(QString(":/Boxes/Empty%1").arg(i));
- // m_BoxIcons[i].InUse = QIcon(QString(":/Boxes/Full%1").arg(i));
- //}
-
m_BoxColors[CSandBoxPlus::eHardenedPlus] = qRgb(238,35,4);
m_BoxColors[CSandBoxPlus::eHardened] = qRgb(247,125,2);
m_BoxColors[CSandBoxPlus::eDefaultPlus] = qRgb(1,133,248);
@@ -1345,28 +1340,11 @@ void CSandMan::commitData(QSessionManager& manager)
theConf->Sync();
}
-QIcon CSandMan::GetBoxIcon(int boxType, bool inUse)// , int iBusy)
+QIcon CSandMan::GetBoxIcon(int boxType, bool inUse)
{
- //EBoxColors color = eYellow;
int iViewMode = theConf->GetInt("Options/ViewMode", 1);
- if (iViewMode != 2) {
+ if (iViewMode != 2)
return GetColorIcon(m_BoxColors[boxType], inUse);
- /*switch (boxType) {
- case CSandBoxPlus::eHardenedPlus: color = eRed; break;
- case CSandBoxPlus::eHardened: color = eOrang; break;
- case CSandBoxPlus::eDefaultPlus: color = eBlue; break;
- case CSandBoxPlus::eDefault: color = eYellow; break;
- case CSandBoxPlus::eAppBoxPlus: color = eCyan; break;
- case CSandBoxPlus::eAppBox: color = eGreen; break;
- case CSandBoxPlus::eInsecure: color = eMagenta; break;
- case CSandBoxPlus::eOpen: color = eWhite; break;
- }*/
- }
- //if (inBusy)
- // return m_BoxIcons[color].Busy;
- /*if (inUse)
- return m_BoxIcons[color].InUse;
- return m_BoxIcons[color].Empty;*/
return GetColorIcon(m_BoxColors[CSandBoxPlus::eDefault], inUse);
}
@@ -1380,6 +1358,10 @@ QIcon CSandMan::GetColorIcon(QColor boxColor, bool inUse/*, bool bOut*/)
if(Frame.isNull())
Frame = QPixmap(":/Boxes/Frame");
+ static QPixmap FrameDM;
+ if(FrameDM.isNull())
+ FrameDM = QPixmap(":/Boxes/FrameDM");
+
static QPixmap Items;
if(Items.isNull())
Items = QPixmap(":/Boxes/Items");
@@ -1408,7 +1390,10 @@ QIcon CSandMan::GetColorIcon(QColor boxColor, bool inUse/*, bool bOut*/)
// painter.drawPixmap(0, 0, QPixmap::fromImage(MyOut));
//}
painter.drawPixmap(0, 0, QPixmap::fromImage(MySand));
- painter.drawPixmap(0, 0, Frame);
+ if (m_DarkTheme)
+ painter.drawPixmap(0, 0, FrameDM);
+ else
+ painter.drawPixmap(0, 0, Frame);
if (inUse)
{
//rgb = change_hsv_c(rgb, -60, 2, 1); // yellow -> red
diff --git a/SandboxiePlus/SandMan/SandMan.h b/SandboxiePlus/SandMan/SandMan.h
index d5ee230c..83b6196a 100644
--- a/SandboxiePlus/SandMan/SandMan.h
+++ b/SandboxiePlus/SandMan/SandMan.h
@@ -92,7 +92,7 @@ public:
void EditIni(const QString& IniPath, bool bPlus = false);
- QIcon GetBoxIcon(int boxType, bool inUse = false);// , bool inBusy = false);
+ QIcon GetBoxIcon(int boxType, bool inUse = false);
QRgb GetBoxColor(int boxType) { return m_BoxColors[boxType]; }
QIcon GetColorIcon(QColor boxColor, bool inUse = false/*, bool bOut = false*/);
QIcon MakeIconBusy(const QIcon& Icon, int Index = 0);
@@ -165,13 +165,6 @@ protected:
QMap m_BoxColors;
- //struct SBoxIcon {
- // QIcon Empty;
- // QIcon InUse;
- // //QIcon Busy;
- //};
- //QMap m_BoxIcons;
-
class UGlobalHotkeys* m_pHotkeyManager;
bool m_ImDiskReady;
diff --git a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
index 461a2f2d..92920f27 100644
--- a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
+++ b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp
@@ -168,7 +168,10 @@ CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent)
: QWizardPage(parent)
{
setTitle(tr("Create new Sandbox"));
- setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png"));
+ if (theGUI->m_DarkTheme)
+ setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png"));
+ else
+ setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png"));
m_bInstant = theConf->GetBool("Options/InstantBoxWizard", false);