anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix colours of buttons in notification frame

Browse Source
This commit is contained in:
Guillaume MM 2017-05-15 02:01:58 +02:00
parent 752a0a1e48
commit 700225c26f
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt4/GuiWorkArea.cpp
View File

@ -2220,10 +2220,7 @@ GuiWorkAreaContainer::GuiWorkAreaContainer(GuiWorkArea * wa, QWidget * parent)
this, SLOT(updateDisplay())); this, SLOT(updateDisplay()));
connect(reloadPB, SIGNAL(clicked()), this, SLOT(reload())); connect(reloadPB, SIGNAL(clicked()), this, SLOT(reload()));
connect(ignorePB, SIGNAL(clicked()), this, SLOT(ignore())); connect(ignorePB, SIGNAL(clicked()), this, SLOT(ignore()));
QPalette const & pal = notificationFrame->palette(); setMessageColour({notificationFrame}, {reloadPB, ignorePB});
QPalette newpal(pal.color(QPalette::Active, QPalette::HighlightedText),
pal.color(QPalette::Active, QPalette::Highlight));
notificationFrame->setPalette(newpal);
updateDisplay(); updateDisplay();
} }

13
src/frontends/qt4/qt_helpers.cpp
View File

@ -35,6 +35,7 @@
#include "support/PathChanger.h" #include "support/PathChanger.h"
#include "support/Systemcall.h" #include "support/Systemcall.h"
#include <QApplication>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QLineEdit> #include <QLineEdit>
@ -239,6 +240,18 @@ void focusAndHighlight(QAbstractItemView * w)
} }
void setMessageColour(list<QWidget *> highlighted, list<QWidget *> plain)
{
QPalette pal = QApplication::palette();
QPalette newpal(pal.color(QPalette::Active, QPalette::HighlightedText),
pal.color(QPalette::Active, QPalette::Highlight));
for (QWidget * w : highlighted)
w->setPalette(newpal);
for (QWidget * w : plain)
w->setPalette(pal);
}
/// wrapper to hide the change of method name to setSectionResizeMode /// wrapper to hide the change of method name to setSectionResizeMode
void setSectionResizeMode(QHeaderView * view, void setSectionResizeMode(QHeaderView * view,
int logicalIndex, QHeaderView::ResizeMode mode) { int logicalIndex, QHeaderView::ResizeMode mode) {

5
src/frontends/qt4/qt_helpers.h
View File

@ -83,6 +83,11 @@ void setValid(QWidget * widget, bool valid);
// set focus and highlight the current item if there is no selection already // set focus and highlight the current item if there is no selection already
void focusAndHighlight(QAbstractItemView * w); void focusAndHighlight(QAbstractItemView * w);
// Sets all widget in highlighted in highlighted colour, and their children in
// plain in standard colours.
void setMessageColour(std::list<QWidget *> highlighted,
std::list<QWidget *> plain);
/// Qt5 changed setSectionMode to setSectionResizeMode /// Qt5 changed setSectionMode to setSectionResizeMode
/// These wrappers work for Qt4 and Qt5 /// These wrappers work for Qt4 and Qt5
void setSectionResizeMode(QHeaderView * view, void setSectionResizeMode(QHeaderView * view,