1.11.0
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 812 B |
Before Width: | Height: | Size: 960 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
|
@ -178,32 +178,18 @@
|
|||
<file>Actions/Font.png</file>
|
||||
<file>Actions/ResetFont.png</file>
|
||||
<file>Actions/Dll.png</file>
|
||||
<file>SideLogoDM.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/Boxes">
|
||||
<file alias="Empty3">Boxes/sandbox-b-empty.png</file>
|
||||
<file alias="Full3">Boxes/sandbox-b-full.png</file>
|
||||
<file alias="Empty4">Boxes/sandbox-c-empty.png</file>
|
||||
<file alias="Full4">Boxes/sandbox-c-full.png</file>
|
||||
<file alias="Empty2">Boxes/sandbox-g-empty.png</file>
|
||||
<file alias="Full2">Boxes/sandbox-g-full.png</file>
|
||||
<file alias="Empty5">Boxes/sandbox-m-empty.png</file>
|
||||
<file alias="Full5">Boxes/sandbox-m-full.png</file>
|
||||
<file alias="Empty1">Boxes/sandbox-r-empty.png</file>
|
||||
<file alias="Full1">Boxes/sandbox-r-full.png</file>
|
||||
<file alias="Empty0">Boxes/sandbox-y-empty.png</file>
|
||||
<file alias="Full0">Boxes/sandbox-y-full.png</file>
|
||||
<file alias="Empty6">Boxes/sandbox-o-empty.png</file>
|
||||
<file alias="Full6">Boxes/sandbox-o-full.png</file>
|
||||
<file alias="Busy">Boxes/BusyOverlay.png</file>
|
||||
<file alias="Frame">Boxes/sandbox-frame.png</file>
|
||||
<file alias="Items">Boxes/sandbox-items.png</file>
|
||||
<file alias="Sand">Boxes/sandbox-sand.png</file>
|
||||
<file alias="Empty7">Boxes/sandbox-w-empty.png</file>
|
||||
<file alias="Full7">Boxes/sandbox-w-full.png</file>
|
||||
<file alias="Group">Boxes/sandbox-group.png</file>
|
||||
<file alias="Group2">Boxes/sandbox-group+.png</file>
|
||||
<file alias="Out">Boxes/sandbox-out.png</file>
|
||||
<file alias="AutoDel">Boxes/DelOverlay.png</file>
|
||||
<file alias="FrameDM">Boxes/sandbox-frameDM.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/Assets">
|
||||
<file>Advanced.png</file>
|
||||
|
|
After Width: | Height: | Size: 19 KiB |
|
@ -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,6 +1390,9 @@ QIcon CSandMan::GetColorIcon(QColor boxColor, bool inUse/*, bool bOut*/)
|
|||
// painter.drawPixmap(0, 0, QPixmap::fromImage(MyOut));
|
||||
//}
|
||||
painter.drawPixmap(0, 0, QPixmap::fromImage(MySand));
|
||||
if (m_DarkTheme)
|
||||
painter.drawPixmap(0, 0, FrameDM);
|
||||
else
|
||||
painter.drawPixmap(0, 0, Frame);
|
||||
if (inUse)
|
||||
{
|
||||
|
|
|
@ -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<int, QRgb> m_BoxColors;
|
||||
|
||||
//struct SBoxIcon {
|
||||
// QIcon Empty;
|
||||
// QIcon InUse;
|
||||
// //QIcon Busy;
|
||||
//};
|
||||
//QMap<int, SBoxIcon> m_BoxIcons;
|
||||
|
||||
class UGlobalHotkeys* m_pHotkeyManager;
|
||||
|
||||
bool m_ImDiskReady;
|
||||
|
|
|
@ -168,6 +168,9 @@ CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent)
|
|||
: QWizardPage(parent)
|
||||
{
|
||||
setTitle(tr("Create new Sandbox"));
|
||||
if (theGUI->m_DarkTheme)
|
||||
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png"));
|
||||
else
|
||||
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png"));
|
||||
|
||||
m_bInstant = theConf->GetBool("Options/InstantBoxWizard", false);
|
||||
|
|