Skip to content

Commit

Permalink
Merge remote-tracking branch 'urban82/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tibirna committed Jun 29, 2023
2 parents 6e95bf4 + 0e4dc81 commit 1075280
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 13 deletions.
2 changes: 0 additions & 2 deletions src/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ namespace QGit {
extern const QColor DARK_GREEN;

// initialized at startup according to system wide settings
extern QColor ODD_LINE_COL;
extern QColor EVEN_LINE_COL;
extern QFont STD_FONT;
extern QFont TYPE_WRITER_FONT;
extern QString GIT_DIR;
Expand Down
5 changes: 0 additions & 5 deletions src/listview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ int ListView::row(SCRef sha) const {

void ListView::setupGeometry() {

QPalette pl = palette();
pl.setColor(QPalette::Base, ODD_LINE_COL);
pl.setColor(QPalette::AlternateBase, EVEN_LINE_COL);
setPalette(pl); // does not seem to inherit application paletteAnnotate

QHeaderView* hv = header();
hv->setStretchLastSection(true);
hv->setSectionResizeMode(LOG_COL, QHeaderView::Interactive);
Expand Down
4 changes: 0 additions & 4 deletions src/mainimpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ MainImpl::MainImpl(SCRef cd, QWidget* p) : QMainWindow(p) {
connect(lineEditSHA, SIGNAL(returnPressed()), this, SLOT(lineEditSHA_returnPressed()));
connect(lineEditFilter, SIGNAL(returnPressed()), this, SLOT(lineEditFilter_returnPressed()));

// create light and dark colors for alternate background
ODD_LINE_COL = palette().color(QPalette::Base);
EVEN_LINE_COL = ODD_LINE_COL.darker(103);

// our interface to git world
git = new Git(this);
setupShortcuts();
Expand Down
2 changes: 0 additions & 2 deletions src/namespace_def.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ const QColor QGit::PURPLE = QColor(221, 221, 255);
const QColor QGit::DARK_GREEN = QColor(0, 205, 0);

// initialized at startup according to system wide settings
QColor QGit::ODD_LINE_COL;
QColor QGit::EVEN_LINE_COL;
QString QGit::GIT_DIR;

/*
Expand Down

0 comments on commit 1075280

Please sign in to comment.