diff options
| author | ZackaryWelch <welch.zackary@gmail.com> | 2018-05-02 13:47:32 -0400 |
|---|---|---|
| committer | ZackaryWelch <welch.zackary@gmail.com> | 2018-05-02 13:47:32 -0400 |
| commit | 18d1b06a5797d0393d283fc1adee6f8fa5e02800 (patch) | |
| tree | eba0037e95826073e45a3b2fcc8be60dbf8dc23f /src-qt5 | |
| parent | Added more annotation and widget support. Currently incomplete. Updated to Mu... (diff) | |
| parent | Change the icon used for the menu-list in lumina-fm (diff) | |
| download | lumina-18d1b06a5797d0393d283fc1adee6f8fa5e02800.tar.gz lumina-18d1b06a5797d0393d283fc1adee6f8fa5e02800.tar.bz2 lumina-18d1b06a5797d0393d283fc1adee6f8fa5e02800.zip | |
Merge branch 'master' of http://github.com/trueos/lumina
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/core/lumina-desktop/SystemWindow.cpp | 2 | ||||
| -rw-r--r-- | src-qt5/core/lumina-theme-engine/colors/trident-dark.conf | 4 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop/SystemWindow.cpp b/src-qt5/core/lumina-desktop/SystemWindow.cpp index dbcec2a2..af9188bc 100644 --- a/src-qt5/core/lumina-desktop/SystemWindow.cpp +++ b/src-qt5/core/lumina-desktop/SystemWindow.cpp @@ -20,7 +20,7 @@ SystemWindow::SystemWindow() : QDialog(), ui(new Ui::SystemWindow){ ui->tool_restart->setIcon( LXDG::findIcon("system-reboot","") ); ui->tool_shutdown->setIcon( LXDG::findIcon("system-shutdown","") ); ui->tool_suspend->setIcon( LXDG::findIcon("system-suspend","") ); - ui->push_cancel->setIcon( LXDG::findIcon("dialog-cancel","") ); + ui->push_cancel->setIcon( LXDG::findIcon("system-cancel","dialog-cancel") ); ui->push_lock->setIcon( LXDG::findIcon("system-lock-screen","") ); //Connect the signals/slots connect(ui->tool_logout, SIGNAL(clicked()), this, SLOT(sysLogout()) ); diff --git a/src-qt5/core/lumina-theme-engine/colors/trident-dark.conf b/src-qt5/core/lumina-theme-engine/colors/trident-dark.conf new file mode 100644 index 00000000..b3d3ab45 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/trident-dark.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffffff, #3d3d40, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #5d5d5d, #3a3636, #e7e4e0, #1a59c3, #f9f9f9, #0986d3, #a70b06, #7a7978, #ffffff, #3f3f36, #ffffff +disabled_colors=#808080, #3d3d40, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #ffffff, #808080, #5d5d5d, #3a3636, #e7e4e0, #1a59c3, #808080, #0986d3, #a70b06, #7a7978, #ffffff, #3f3f36, #ffffff +inactive_colors=#ffffff, #3d3d40, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #5d5d5d, #3a3636, #e7e4e0, #1a59c3, #f9f9f9, #0986d3, #a70b06, #7a7978, #ffffff, #3f3f36, #ffffff diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp index 9471e297..d1b0e8db 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp @@ -225,7 +225,7 @@ void DirWidget::UpdateIcons(){ ui->actionBack->setIcon( LXDG::findIcon("go-previous","") ); ui->actionUp->setIcon( LXDG::findIcon("go-up","") ); ui->actionHome->setIcon( LXDG::findIcon("go-home","") ); - ui->actionMenu->setIcon( LXDG::findIcon("view-more-vertical","format-list-unordered") ); + ui->actionMenu->setIcon( LXDG::findIcon("open-menu", "view-more-vertical") ); ui->actionSingleColumn->setIcon(LXDG::findIcon("view-right-close","view-close") ); ui->actionDualColumn->setIcon(LXDG::findIcon("view-right-new","view-split-left-right") ); |