mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Fix TableWidget ( equipment ones ) on dark scheme.
This patch uses the class created by the previous patch to get rid of the CSS and be really desktop native. it fixes a lot of stuff in non-blue-styles and throws a lot of code away. <3 Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									c5c44e3a82
								
							
						
					
					
						commit
						0b5f9512ef
					
				
					 6 changed files with 13 additions and 42 deletions
				
			
		|  | @ -1,28 +0,0 @@ | |||
|  QTableView { | ||||
|      show-decoration-selected: 1; | ||||
|  } | ||||
| 
 | ||||
|  QTableView::item { | ||||
|      border: 1px solid #d9d9d9; | ||||
|      border-top-color: transparent; | ||||
|      border-bottom-color: transparent; | ||||
|      padding: 2px; | ||||
|  } | ||||
| 
 | ||||
|  QTableView::item:hover { | ||||
|      background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); | ||||
|      border: 1px solid #bfcde4; | ||||
|  } | ||||
| 
 | ||||
|  QTableView::item:selected { | ||||
|      border: 1px solid #567dbc; | ||||
|  } | ||||
| 
 | ||||
|  QTableView::item:selected:active{ | ||||
|      background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); | ||||
|  } | ||||
| 
 | ||||
|  QTableView::item:selected:!active { | ||||
|      background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf); | ||||
|  } | ||||
| 
 | ||||
|  | @ -22,14 +22,6 @@ | |||
| #include <QMenu> | ||||
| #include <QFileDialog> | ||||
| 
 | ||||
| class DiveListDelegate : public QStyledItemDelegate{ | ||||
| public: | ||||
| 	DiveListDelegate(){} | ||||
| 	QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const { | ||||
| 		return QSize(50,22); | ||||
| 	} | ||||
| }; | ||||
| 
 | ||||
| DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelection(false), | ||||
| 	sortColumn(0), currentOrder(Qt::DescendingOrder), searchBox(new QLineEdit(this)) | ||||
| { | ||||
|  |  | |||
|  | @ -19,6 +19,11 @@ | |||
| #include <QStringListModel> | ||||
| #include <QApplication> | ||||
| 
 | ||||
| QSize DiveListDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const | ||||
| { | ||||
| 	return QSize(50,22); | ||||
| } | ||||
| 
 | ||||
| // Gets the index of the model in the currentRow and column.
 | ||||
| // currCombo is defined below.
 | ||||
| #define IDX( XX ) mymodel->index(currCombo.currRow, XX) | ||||
|  |  | |||
|  | @ -5,6 +5,12 @@ | |||
| class QComboBox; | ||||
| class QPainter; | ||||
| 
 | ||||
| class DiveListDelegate : public QStyledItemDelegate{ | ||||
| public: | ||||
| 	DiveListDelegate(){} | ||||
| 	QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const; | ||||
| }; | ||||
| 
 | ||||
| class StarWidgetsDelegate : public QStyledItemDelegate { | ||||
| 	Q_OBJECT | ||||
| public: | ||||
|  |  | |||
|  | @ -1,5 +1,6 @@ | |||
| #include "tableview.h" | ||||
| #include "models.h" | ||||
| #include "modeldelegates.h" | ||||
| 
 | ||||
| #include <QPushButton> | ||||
| #include <QLayout> | ||||
|  | @ -10,11 +11,7 @@ | |||
| TableView::TableView(QWidget *parent) : QWidget(parent) | ||||
| { | ||||
| 	ui.setupUi(this); | ||||
| 	QFile cssFile(":table-css"); | ||||
| 	cssFile.open(QIODevice::ReadOnly); | ||||
| 	QTextStream reader(&cssFile); | ||||
| 	QString css = reader.readAll(); | ||||
| 	ui.tableView->setStyleSheet(css); | ||||
| 	ui.tableView->setItemDelegate(new DiveListDelegate); | ||||
| 	/* There`s mostly a need for a Mac fix here too. */ | ||||
| 	if (qApp->style()->objectName() == "gtk+") | ||||
| 		ui.groupBox->layout()->setContentsMargins(0, 9, 0, 0); | ||||
|  |  | |||
|  | @ -15,7 +15,6 @@ | |||
| <!--	<file alias="average">icons/average.svg</file> --> | ||||
| 	<file alias="average">icons/average.png</file> | ||||
| 	<file alias="warning">icons/warning.png</file> | ||||
| 	<file alias="table-css">qt-ui/css/tableviews.css</file> | ||||
| <!--	<file alias="scale">icons/scale.svg</file> --> | ||||
| 	<file alias="scale">icons/scale.png</file> | ||||
| <!--	<file alias="ruler">icons/ruler.svg</file> --> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue