diff options
author | Ken Moore <moorekou@gmail.com> | 2016-05-11 08:58:58 -0400 |
---|---|---|
committer | Ken Moore <moorekou@gmail.com> | 2016-05-11 08:58:58 -0400 |
commit | 3f1750e0fe81492223b6774e082282266eec91d4 (patch) | |
tree | 97797cc07757f088bfcdaf2faa64c206fdaeec7c /src-qt5 | |
parent | Fix a desktop crash which only seems to happen if you have an existing, but i... (diff) | |
parent | Fix the loading of icons where the theme uses pure numbers instead of the <nu... (diff) | |
download | lumina-3f1750e0fe81492223b6774e082282266eec91d4.tar.gz lumina-3f1750e0fe81492223b6774e082282266eec91d4.tar.bz2 lumina-3f1750e0fe81492223b6774e082282266eec91d4.zip |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'src-qt5')
-rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.cpp | 3 | ||||
-rw-r--r-- | src-qt5/core/libLumina/themes/Glass.qss.template | 538 | ||||
-rw-r--r-- | src-qt5/core/lumina-session/main.cpp | 5 | ||||
-rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 5 |
4 files changed, 545 insertions, 6 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index c3c89d37..bfca4f71 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -640,7 +640,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ } } - //If still no icon found, look for any image format inthe "pixmaps" directory + //If still no icon found, look for any image format in the "pixmaps" directory if(ico.isNull()){ if(QFile::exists(LOS::AppPrefix()+"share/pixmaps/"+iconName)){ ico.addFile(LOS::AppPrefix()+"share/pixmaps/"+iconName); @@ -682,6 +682,7 @@ QStringList LXDG::getChildIconDirs(QString parent){ //qDebug() << " - Parent:" << parent << "Dirs:" << dirs; for(int i=0; i<dirs.length(); i++){ if(dirs[i].contains("x")){ dirs[i].prepend( QString::number(10-dirs[i].section("x",0,0).length())+QString::number(10-dirs[i].at(0).digitValue())+"::::"); } + else if(dirs[i].at(0).isNumber()){dirs[i].prepend( QString::number(10-dirs[i].length())+QString::number(10-dirs[i].at(0).digitValue())+"::::"); } else{ dirs[i].prepend( "0::::"); } } dirs.sort(); diff --git a/src-qt5/core/libLumina/themes/Glass.qss.template b/src-qt5/core/libLumina/themes/Glass.qss.template new file mode 100644 index 00000000..13e54df3 --- /dev/null +++ b/src-qt5/core/libLumina/themes/Glass.qss.template @@ -0,0 +1,538 @@ +/* ALL THE TEMPLATE WIDGETS */ +INHERITS=None + +/* ALL THE WIDGETS WITH THE BASE COLOR */ +QMainWindow, QMenu, QDialog, QMessageBox{ + background: %%BASECOLOR%%; + color: %%TEXTCOLOR%%; +} + +/* ALL THE WIDGETS WITH AN ALTERNATE BASE COLOR */ +QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{ + background: %%ALTBASECOLOR%%; + color: %%TEXTCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + selection-color: %%TEXTHIGHLIGHTCOLOR%%; + +} + +/* PAGES OF CONTAINER WIDGETS */ +QStackedWidget .QWidget, QTabWidget .QWidget{ + background: %%ALTBASECOLOR%%; + color: %%TEXTCOLOR%%; + border: none; +} +QToolBox::tab{ + color: %%TEXTCOLOR%%; +} + +/* MENU WIDGETS */ +QMenuBar, QMenuBar::item,QToolBar{ + background: %%SECONDARYCOLOR%%; + border: none; + color: %%TEXTCOLOR%%; +} + +QStatusBar{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%); + border: none; + color: %%TEXTCOLOR%%; +} +QToolBar:top{ + border-bottom: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:bottom{ + border-top: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:left{ + border-right: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:right{ + border-left: 1px solid %%ACCENTCOLOR%%; +} + +QMenuBar::item{ + background: transparent; /*Use the menu bar color*/ + padding-left: 4px; + padding-right: 2px; +} + +QMenuBar::item:selected, QMenuBar::item:pressed, QMenu::item:selected{ +background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); +color: %%TEXTHIGHLIGHTCOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} +QMenuBar::item:disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +QMenu::item{ + border: 2px solid #808080; +} + +QMenu::item{ + background: transparent; + border: 1px solid transparent; + color: %%TEXTCOLOR%%; + padding: 4px 30px 4px 20px; + margin-left: 3px; + margin-right: 3px; +} + +/* TAB WIDGETS */ +/*QTabBar{ + Custom Font settings need to be here and NOT in the ::tab fields, + otherwise it will break auto-scaling of the tab sizes to fit the text +}*/ +QTabBar::tab { + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + padding: 2px; + color: %%TEXTCOLOR%%; +} +QTabBar::tab:top{ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +QTabBar::tab:bottom{ + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +/* left/right tab indicators appear to be reversed in Qt*/ +QTabBar::tab:right{ + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:left{ + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:selected{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTabBar::tab:hover { + background: %%HIGHLIGHTCOLOR%%; + border: 1px solid %%ACCENTDISABLECOLOR%%; + } + +QTabBar::tab:!selected:top { + margin-top: 4px; +} +QTabBar::tab:!selected:bottom{ + margin-bottom: 4px; +} +QTabBar::tab:!selected:right{ + margin-left: 4px; +} +QTabBar::tab:!selected:left{ + margin-right: 4px; +} + +/* FRAME WIDGETS */ +QToolTip{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%ALTBASECOLOR%%); + border-radius: 3px; + border: 1px solid %%ACCENTCOLOR%%; + padding: 1px; + color: %%TEXTCOLOR%%; +} + +QLabel{ + background: transparent; + border: none; + color: %%TEXTCOLOR%%; +} +QAbstractButton::disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +/* GROUP BOX */ +QGroupBox{ + background-color: transparent; + border-color: %%ACCENTCOLOR%%; + border-radius: 5px; + margin-top: 2ex; + font-weight: bold; +} +QGroupBox::title{ + subcontrol-origin: margin; + subcontrol-position: top center; + padding: 0 3px; + background: transparent; + /*border: none;*/ + color: %%TEXTCOLOR%%; +} + +/* COMBO BOX */ +QComboBox{ + /*border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + padding: 1px 18px 1px 3px;*/ + color: %%TEXTCOLOR%%; + background: %%ALTBASECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + } + + +/* VIEW WIDGETS */ +QTreeView, QListView{ + background: %%ALTBASECOLOR%%; + alternate-background-color: %%BASECOLOR%%; + /*selection-background-color: %%SECONDARYCOLOR%%;*/ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + /*show-decoration-selected: 1;*/ + color: %%TEXTCOLOR%%; + selection-color: %%TEXTCOLOR%%; +} + +QTreeView:focus, QListView:focus{ + border: 1px solid %%HIGHLIGHTDISABLECOLOR%%; +} + +/* +QTreeView::item and QListView::item unneccessary: +Already set though parentage and causes usage errors if set manually +*/ + +/*QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; + border-color: %%ACCENTCOLOR%%; + color: %%TEXTCOLOR%%; +}*/ + +QTreeView::item:hover, QListView::item:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected:hover, QListView::item:selected:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; +} +QTreeView::item:selected:focus, QListView::item:selected:focus{ + background: %%SECONDARYCOLOR%%; +} +QHeaderView{ + background: %%HIGHLIGHTDISABLECOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; + border: none; + border-top-left-radius: 3px; /*match the list/tree view widgets*/ + border-top-right-radius: 3px; /*match the list/tree view widgets*/ +} +QHeaderView::section{ + background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/ + color: %%TEXTHIGHLIGHTCOLOR%%; + border-color: %%ACCENTCOLOR%%; + padding: 1px; + padding-left: 4px; +} +QHeaderView::section:hover{ + background: %%PRIMARYCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + color: %%TEXTCOLOR%%; +} + +/* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/ +QScrollBar{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); + /*border: 1px solid %%ACCENTCOLOR%%;*/ +} +QScrollBar:horizontal{ + margin: 0px 20px 0px 20px; +} +QScrollBar:vertical{ + margin: 20px 0px 20px 0px; +} +QScrollBar::sub-page, QScrollBar::add-page{ + background: %%BASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; +} +QScrollBar::sub-page:vertical{ + border-bottom: none; +} +QScrollBar::add-page:vertical{ + border-top: none; +} +QScrollBar::sub-page:horizontal{ + border-right: none; +} +QScrollBar::add-page:horizontal{ + border-left: none; +} +QScrollBar::handle{ + background: QLinearGradient(x1: 0, y1: -0.3, x2: 0, y2: 1.3, stop: 0 %%BASECOLOR%%, stop: 0.5 %%SECONDARYCOLOR%%, stop: 1 %%BASECOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; +} +QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{ + background: %%HIGHLIGHTCOLOR%%; +} +QScrollBar::add-line{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; +subcontrol-position: bottom right; +subcontrol-origin: margin; +} +QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{ +height: 20px; +} +QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{ +width: 20px; +} +QScrollBar::sub-line{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; +subcontrol-position: top left; +subcontrol-origin: margin; +height: 20px; +} +/* SLIDERS */ +QSlider::groove:horizontal { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::groove:vertical { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::sub-page:horizontal { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::sub-page:vertical { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::add-page:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::add-page:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::handle:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 13px; +border-radius: 4px; +} +QSlider::handle:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 13px; +border-radius: 4px; +} +QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{ +border: 1px solid %%ACCENTDISABLECOLOR%%; +/*background: %%HIGHLIGHTCOLOR%%;*/ +} + +QSlider::sub-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::add-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::handle:horizontal:disabled { +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} + +/* BUTTONS */ +QPushButton{ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + padding: 2px; + padding-right: 4px; + color: %%TEXTCOLOR%%; + } + +QToolButton{ /* Assume a flat button for every toolbutton by default*/ + color: %%TEXTCOLOR%%; + border: 1px solid transparent; + border-radius: 3px; + background-color: transparent; + padding: 1px; +} + + QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{ + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + margin-top: 2px; + } + +QPushButton:flat, QToolButton:flat{ + background-color: transparent; + border: 1px solid transparent; /* no border for a flat button */ +} + +QPushButton:hover, QToolButton:hover{ + border: 1px solid %%ACCENTCOLOR%%; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton, QCheckBox{ + padding: 2px; + border: 1px solid transparent; + border-radius: 3px; + color: %%TEXTCOLOR%%; +} +QRadioButton::hover, QCheckBox:hover{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{ + border: 1px solid %%TEXTCOLOR%%; +} +QRadioButton::indicator{ + border-radius: 7px; +} +QRadioButton::indicator:checked{ + background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent); +} +QCheckBox::indicator:checked, QGroupBox::indicator:checked{ + padding: 1px; + background-origin: content; + background-clip: content; + background: %%TEXTCOLOR%%; +} +QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{ + padding: 1px; + background-origin: content; + background-clip: content; + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%); +} + +/* PROGRESSBAR */ +QProgressBar{ + background-color: %%ALTBASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 5px; + color: %%TEXTCOLOR%%; + text-align: center; + padding: 1px; +} + QProgressBar::chunk { + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); + /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/ + border-radius: 5px; + } +QProgressBar::chunk:vertical{ + margin-left: 2px; + margin-right: 2px; +} +QProgressBar::chunk:horizontal{ + margin-top: 2px; + margin-bottom: 2px; +} + +LDPlugin#applauncher QToolButton{ + background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 30), stop:1 rgba(229, 229, 229, 70)); + border-width: 3px; + border-style: solid; + border-radius: 5px; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + color: white; +} +LDPlugin#applauncher QToolButton:hover{ + background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 100), stop:1 rgba(229, 229, 229, 150)); + border-width: 3px; + border-style: solid; + border-radius: 5px; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + color: white; + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QWidget#LuminaPanelColor{ + background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 60), stop:1 rgba(229, 229, 229, 110)); + border-radius: 3px; +} +/*Special taskmanager window buttons: based on window state*/ +LTBWidget{ + border: 1px solid transparent; + border-radius: 3px; +} +LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/ +LTBWidget#WindowVisible{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%PRIMARYCOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowInvisible{ + background: transparent; +} +LTBWidget#WindowActive{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowAttention{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); +} +LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover, QToolButton:hover{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); + color: %%TEXTHIGHLIGHTCOLOR%%; + border-width: 1px; + border-style: solid; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); +} +/* CALENDER WIDGET */ + /* (This is a special hack since there is no official support for stylesheets for this widget) */ + QCalendarWidget QWidget#qt_calendar_navigationbar{ + background-color: %%ALTBASECOLOR%%; + } +QCalendarWidget QWidget{ + background-color: %%BASECOLOR%%; + alternate-background-color: rgba(229, 229, 229, 50); + color: %%TEXTCOLOR%%; +} +QCalendarWidget QAbstractButton{ + background-color: transparent; +} +QCalendarWidget QAbstractButton::menu-indicator{ + image: none; +} +QCalendarWidget QAbstractItemView{ + selection-background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 20), stop:1 rgba(229, 229, 229, 100)); + selection-color: %%TEXTHIGHLIGHTCOLOR%%; +} +QCalendarWidget QWidget#qt_calendar_calendarview{ + background-color: %%ALTBASECOLOR%%; + border: none; +} diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 0ed3067a..8f89e95c 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -9,9 +9,6 @@ #include <QProcess> #include <QString> - - - #include "session.h" #include <LuminaUtils.h> #include <LuminaOS.h> @@ -39,7 +36,7 @@ int main(int argc, char ** argv) setenv("XDG_CURRENT_DESKTOP","Lumina",1); unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... //Check for any missing user config files - + //Start X11 if needed //Configure X11 monitors if needed diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 0e8f80ae..380ee370 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -45,9 +45,12 @@ void LSession::procFinished(){ } void LSession::startProcess(QString ID, QString command){ - QString logfile = QDir::homePath()+"/.lumina/logs/"+ID+".log"; + QString dir = QDir::homePath()+"/.lumina/logs"; + if(!QFile::exists(dir)){ QDir tmp(dir); tmp.mkpath(dir); } + QString logfile = dir+"/"+ID+".log"; if(QFile::exists(logfile+".old")){ QFile::remove(logfile+".old"); } if(QFile::exists(logfile)){ QFile::rename(logfile,logfile+".old"); } + QProcess *proc = new QProcess(); proc->setProcessChannelMode(QProcess::MergedChannels); proc->setProcessEnvironment( QProcessEnvironment::systemEnvironment() ); |