diff --git a/QtPyLoT.py b/QtPyLoT.py index 61e560f5..63ef7c8e 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -554,8 +554,8 @@ class MainWindow(QMainWindow): self.pg = pg # init style - self.set_style('dark') - #self.set_style('bright') + #self.set_style('dark') + self.set_style('bright') #self.set_style('default') # add event combo box and ref/test buttons @@ -3172,7 +3172,8 @@ def create_window(): return app, app_created def main(args=None): - project_filename = None + #project_filename = None + args.project_filename = 'C:/Shared/AlpArray/alparray_data/project_alparray_test.plp' pylot_infile = None if args: if args.project_filename: diff --git a/pylot/styles/bright.qss b/pylot/styles/bright.qss index 96ae977a..708b9a26 100644 --- a/pylot/styles/bright.qss +++ b/pylot/styles/bright.qss @@ -1,16 +1,16 @@ QMainWindow{ -background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(255, 255, 255, 255)); color: rgba(0, 0, 0, 255); } QWidget{ -background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(235, 235, 235, 255), stop:1 rgba(230, 230, 230, 255)); color: rgba(0, 0, 0, 255); } QWidget:checked{ background-color: transparent; -border-color: rgba(220, 220, 220, 255); +border-color: rgba(230, 230, 230, 255); border-width: 2px; border-style:inset; } @@ -19,100 +19,115 @@ QComboBox{ background-color: rgba(255, 255, 255, 255); color: rgba(0, 0, 0, 255); min-height: 1.5em; + +selection-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 55, 140, 150), stop:1 rgba(0, 70, 180, 150)); } QComboBox *{ background-color: rgba(255, 255, 255, 255); color: rgba(0, 0, 0, 255); + +selection-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 55, 140, 150), stop:1 rgba(0, 70, 180, 150)); +selection-color: rgba(255, 255, 255, 255); } QMenuBar{ -background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:2, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:2, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(230, 230, 230, 255)); padding:1px; } QMenuBar::item{ -background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:2, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:2, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(230, 230, 230, 255)); color: rgba(0, 0, 0, 255); padding:3px; } QMenu{ -background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(230, 230, 230 255)); color: rgba(0, 0, 0, 255); padding:0; } *::item:selected{ color: rgba(0, 0, 0, 255); -background-color: rgba(0, 150, 190, 255); +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 55, 140, 150), stop:1 rgba(0, 70, 180, 150)); } QToolBar{ -background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(255, 255, 255, 255)); border-style:solid; -border-color:rgba(220, 220, 220, 255); +border-color:rgba(200, 200, 200, 150); border-width:1px; } QToolBar *{ -background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(255, 255, 255, 255)); } QMessageBox{ -background-color: rgba(240, 240, 240 255); +background-color: rgba(255, 255, 255, 255); color: rgba(0, 0, 0, 255); } QTableWidget{ -background-color: rgba(240, 240, 240 255); +background-color: rgba(255, 255, 255, 255); color:rgba(0, 0, 0, 255); border-color:rgba(0, 0, 0, 255); selection-background-color: rgba(200, 210, 230, 255); } +QTableCornerButton::section{ +border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(230, 230, 230, 255)); +} + QHeaderView::section{ -background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240 255), stop:1 rgba(220, 220, 220, 255)); +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(230, 230, 230, 255)); border:none; border-top-style:solid; border-width:1px; -border-top-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240 255), stop:1 rgba(220, 220, 220, 255)); +border-top-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(230, 230, 230, 255)); color:rgba(0, 0, 0, 255); padding:5px; } +QHeaderView::section:checked{ +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 55, 140, 150), stop:1 rgba(0, 70, 180, 150)); +border-top-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 55, 140, 150), stop:1 rgba(0, 70, 180, 150)); +} + QHeaderView{ -background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240 255), stop:1 rgba(220, 220, 220, 255)); +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(230, 230, 230, 255)); border:none; border-top-style:solid; border-width:1px; -border-top-color:rgba(220, 220, 220, 255); +border-top-color:rgba(230, 230, 230, 255); color:rgba(0, 0, 0, 255); } QListWidget{ -background-color:rgba(200, 200, 200, 255); +background-color:rgba(230, 230, 230, 255); color:rgba(0, 0, 0, 255); } QStatusBar{ -background-color:rgba(240, 240, 240 255); +background-color:rgba(255, 255, 255, 255); color:rgba(0, 0, 0, 255); } QPushButton{ -background-color:qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color:qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(255, 255, 255, 255)); color:rgba(0, 0, 0, 255); border-style: outset; border-width: 2px; -border-color: rgba(220, 220, 220, 255); +border-color: rgba(230, 230, 230, 255); min-width: 6em; padding: 5px; } QPushButton:pressed{ -background-color: rgba(220, 220, 220, 255); +background-color: rgba(230, 230, 230, 255); } *:disabled{ @@ -124,10 +139,10 @@ background-color:transparent; } QTabBar::tab{ -background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(220, 220, 220, 255), stop:1 rgba(240, 240, 240 255)); +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(230, 230, 230, 255), stop:1 rgba(255, 255, 255, 255)); color: rgba(0, 0, 0, 255); border-style:solid; -border-color:rgba(220, 220, 220 255); +border-color:rgba(230, 230, 230 255); border-bottom-color: transparent; border-width:1px; padding:5px; @@ -137,7 +152,7 @@ QTabBar::tab:selected{ background-color:rgba(255, 255, 255, 255); color: rgba(0, 0, 0, 255); border-style:solid; -border-color:rgba(220, 220, 220, 255); +border-color:rgba(200, 200, 200, 255); border-bottom-color: transparent; border-width:1px; padding:5px; @@ -150,16 +165,16 @@ background-color:transparent; QTabWidget::pane{ background-color:rgba(0, 0, 0, 255); border-style:solid; -border-color:rgba(255, 255, 255, 255); +border-color:rgba(200, 200, 200, 255); border-width:1px; } QTabWidget::tab{ -background-color:rgba(240, 240, 240 255); +background-color:rgba(255, 255, 255, 255); } QTabWidget > QWidget{ -background-color: rgba(240, 240, 240 255); +background-color: rgba(255, 255, 255, 255); color: rgba(0, 0, 0, 255); } @@ -197,20 +212,20 @@ border-radius:0; } QListWidget{ -background-color:rgba(240, 240, 240 255) +background-color:rgba(255, 255, 255, 255) } QProgressBar{ border-radius:0; text-align:center; color:rgba(0, 0, 0, 255); -background-color:rgba(60,60,80,255); +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(230, 230, 230, 255)); border: 2px solid; -border-color:rgba(0, 150, 190, 255); +border-color:rgba(0, 55, 140, 150); border-radius:5px; } QProgressBar::chunk{ -background-color:rgba(0, 150, 190, 255); +background-color:rgba(60, 60, 70, 150); width:10px; -} \ No newline at end of file +} diff --git a/pylot/styles/dark.qss b/pylot/styles/dark.qss index 91bfff15..f4a8e447 100644 --- a/pylot/styles/dark.qss +++ b/pylot/styles/dark.qss @@ -18,12 +18,17 @@ border-style:inset; QComboBox{ background-color: rgba(80, 80, 90, 255); color: rgba(255, 255, 255, 255); -min-height: 1.5em; +min-height: 1.8em; + +selection-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 144, 180, 255), stop:1 rgba(0, 150, 190, 255)); } QComboBox *{ background-color: rgba(80, 80, 90, 255); color: rgba(255, 255, 255, 255); + +selection-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 144, 180, 255), stop:1 rgba(0, 150, 190, 255)); +selection-color: rgba(255, 255, 255, 255); } QMenuBar{ @@ -45,7 +50,7 @@ padding:0; *::item:selected{ color: rgba(255, 255, 255, 255); -background-color: rgba(0, 150, 190, 255); +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 144, 180, 255), stop:1 rgba(0, 150, 190, 255)); } QToolBar{ @@ -71,6 +76,11 @@ border-color:rgba(255, 255, 255, 255); selection-background-color: rgba(200, 210, 230, 255); } +QTableCornerButton::section{ +border: none; +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(60, 60, 70, 255), stop:1 rgba(70, 70, 80, 255)); +} + QHeaderView::section{ background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(60, 60, 70, 255), stop:1 rgba(70, 70, 80, 255)); border:none; @@ -81,6 +91,11 @@ color:rgba(255, 255, 255, 255); padding:5px; } +QHeaderView::section:checked{ +background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 120, 150, 255), stop:1 rgba(0, 150, 190, 255)); +border-top-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 120, 150, 255), stop:1 rgba(0, 150, 190, 255)); +} + QHeaderView{ background-color:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(60, 60, 70, 255), stop:1 rgba(70, 70, 80, 255)); @@ -104,7 +119,6 @@ color:rgba(255, 255, 255, 255); QPushButton{ background-color:qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 rgba(70, 70, 80, 255), stop:1 rgba(60, 60, 70, 255)); color:rgba(255, 255, 255, 255); -border-color: (60, 60, 70, 255); border-style: outset; border-width: 2px; border-color: rgba(50, 50, 60, 255); @@ -214,4 +228,4 @@ border-radius:5px; QProgressBar::chunk{ background-color:rgba(0, 150, 190, 255); width:10px; -} \ No newline at end of file +}