Skip to content

Commit b3eb78e

Browse files
author
ThePBone
committed
New black color scheme variant
1 parent 6ee0288 commit b3eb78e

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

dialog/settingsdlg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ SettingsDlg::SettingsDlg(MainWindow* mainwin,QWidget *parent) :
7373
ui->paletteSelect->addItem("Default","default");
7474
ui->paletteSelect->addItem("Black","black");
7575
ui->paletteSelect->addItem("Blue","blue");
76-
ui->paletteSelect->addItem("Dark","dark");
7776
ui->paletteSelect->addItem("Dark Blue","darkblue");
7877
ui->paletteSelect->addItem("Dark Green","darkgreen");
79-
ui->paletteSelect->addItem("Honeycomb","honeycomb");
8078
ui->paletteSelect->addItem("Gray","gray");
8179
ui->paletteSelect->addItem("Green","green");
80+
ui->paletteSelect->addItem("Honeycomb","honeycomb");
81+
ui->paletteSelect->addItem("Pitch Black","pitchblack");
8282
ui->paletteSelect->addItem("Stone","stone");
8383
ui->paletteSelect->addItem("White","white");
8484
ui->paletteSelect->addItem("Custom","custom");

main.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ int main(int argc, char *argv[])
7272
startInTray,
7373
parser.isSet(minst));
7474

75-
w.setVisible(!startInTray);
7675
w.setFixedSize(w.geometry().width(),w.geometry().height());
7776
w.setGeometry(
7877
QStyle::alignedRect(
@@ -83,8 +82,8 @@ int main(int argc, char *argv[])
8382
)
8483
);
8584
w.setWindowFlags(Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint);
86-
w.hide();
87-
if(!parser.isSet(tray)) w.show();
85+
w.show();
86+
w.setVisible(!startInTray);
8887

8988
QApplication::setQuitOnLastWindowClosed( true );
9089
return QApplication::exec();

misc/stylehelper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ class ColorStyle {
6464
namespace ColorStyleProvider {
6565
static QMap<CS_UNIT> TABLE(){
6666
InitializableQMap<CS_UNIT> map;
67-
map << QPair<CS_UNIT>("dark",ColorStyle(true,QColor(25,25,25),QColor(53,53,53),Qt::white,QColor(42, 130, 218)))
68-
<< QPair<CS_UNIT>("gray",ColorStyle(true,QColor(83,83,125),QColor(49,49,74),Qt::white,QColor(151, 151, 184),QColor(144,144,179)))
67+
map << QPair<CS_UNIT>("gray",ColorStyle(true,QColor(83,83,125),QColor(49,49,74),Qt::white,QColor(151, 151, 184),QColor(144,144,179)))
6968
<< QPair<CS_UNIT>("white",ColorStyle(false,Qt::white,Qt::white,Qt::black,QColor(56,161,227)))
7069
<< QPair<CS_UNIT>("blue",ColorStyle(true,QColor(0,0,38),QColor(0,0,50),Qt::white,QColor(85,0,255)))
7170
<< QPair<CS_UNIT>("darkblue",ColorStyle(true,QColor(14,19,29),QColor(19,25,38),Qt::white,QColor(70,79,89)))
7271
<< QPair<CS_UNIT>("honeycomb",ColorStyle(false,QColor(185,188,182),QColor(212,215,208),Qt::black,QColor(243,193,41),Qt::white))
73-
<< QPair<CS_UNIT>("black",ColorStyle(true,Qt::black,QColor(16,16,16),QColor(222,222,222),QColor(132,132,132)))
72+
<< QPair<CS_UNIT>("pitchblack",ColorStyle(true,Qt::black,QColor(16,16,16),QColor(222,222,222),QColor(132,132,132)))
73+
<< QPair<CS_UNIT>("black",ColorStyle(true,QColor(40,40,40),QColor(29,29,29),Qt::white,QColor(190,190,190),Qt::black,QColor(90,90,90)))
7474
<< QPair<CS_UNIT>("darkgreen",ColorStyle(true,QColor(30,30,30),QColor(27,34,36),QColor(197,209,217),QColor(153, 199, 190)))
7575
<< QPair<CS_UNIT>("green",ColorStyle(true,QColor(6,29,12),QColor(0,12,0),Qt::white,QColor(86,191,121)))
7676
<< QPair<CS_UNIT>("stone",ColorStyle(true,QColor(27,36,40),QColor(34,45,50),Qt::white,QColor(165,206,255)));

0 commit comments

Comments
 (0)