[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src: Added icon for columns and a bit more spacing in spreadsheet's horiz.
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2014-02-16 13:17:37
Message-ID: E1WF1bF-0003bh-4P () scm ! kde ! org
[Download RAW message or body]

Git commit 065dc43ede2e40fb9aebbca90a93cb03a9bbb122 by Alexander Semke.
Committed on 16/02/2014 at 13:16.
Pushed by asemke into branch 'master'.

Added icon for columns and a bit more spacing in spreadsheet's horiz.
header.

M  +15   -14   src/backend/core/column/Column.cpp
M  +2    -11   src/backend/spreadsheet/Spreadsheet.cpp
M  +1    -4    src/backend/spreadsheet/SpreadsheetModel.cpp
M  +3    -4    src/commonfrontend/spreadsheet/SpreadsheetDoubleHeaderView.cpp

http://commits.kde.org/labplot/065dc43ede2e40fb9aebbca90a93cb03a9bbb122

diff --git a/src/backend/core/column/Column.cpp b/src/backend/core/column/Column.cpp
index bda531d..6d45b41 100644
--- a/src/backend/core/column/Column.cpp
+++ b/src/backend/core/column/Column.cpp
@@ -34,7 +34,7 @@
 #include "backend/lib/XmlStreamReader.h"
 #include "backend/core/datatypes/String2DateTimeFilter.h"
 #include "backend/core/datatypes/DateTime2StringFilter.h"
-#include <QIcon>
+#include <KIcon>
 #include <QMetaEnum>
 #include <KLocale>
 
@@ -424,19 +424,20 @@ double Column::valueAt(int row) const
 /**
  * \brief Return an icon to be used for decorating the views and spreadsheet column \
                headers
  */
-QIcon Column::icon() const
-{
-	switch(columnMode()) {
-		case AbstractColumn::Numeric:
-			return QIcon(QPixmap(":/numerictype.png"));
-		case AbstractColumn::Text:
-			return QIcon(QPixmap(":/texttype.png"));
-		case AbstractColumn::DateTime:
-		case AbstractColumn::Month:
-		case AbstractColumn::Day:
-			return QIcon(QPixmap(":/datetype.png"));
-	}
-	return QIcon();
+QIcon Column::icon() const {
+	//TODO: provide type-specific icons
+// 	switch(columnMode()) {
+// 		case AbstractColumn::Numeric:
+// 			return KIcon("x-shape-text");
+// 		case AbstractColumn::Text:
+// 			return QIcon(QPixmap(":/texttype.png"));
+// 		case AbstractColumn::DateTime:
+// 		case AbstractColumn::Month:
+// 		case AbstractColumn::Day:
+// 			return QIcon(QPixmap(""));
+// 	}
+
+	return KIcon("x-shape-text");
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
                
diff --git a/src/backend/spreadsheet/Spreadsheet.cpp \
b/src/backend/spreadsheet/Spreadsheet.cpp index e23aeeb..f24fdd3 100644
--- a/src/backend/spreadsheet/Spreadsheet.cpp
+++ b/src/backend/spreadsheet/Spreadsheet.cpp
@@ -614,17 +614,8 @@ void Spreadsheet::sortColumns(Column *leading, QList<Column*> \
cols, bool ascendi  /*!
   Returns an icon to be used for decorating my views.
   */
-QIcon Spreadsheet::icon() const
-{
-	QIcon ico;
-#ifdef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
-	ico.addPixmap(QPixmap(":/16x16/table.png"));
-	ico.addPixmap(QPixmap(":/24x24/table.png"));
-	ico.addPixmap(QPixmap(":/32x32/table.png"));
-#else
-	ico = KIcon("x-office-spreadsheet");
-#endif
-	return ico;
+QIcon Spreadsheet::icon() const {
+	return KIcon("table"); //or KIcon("x-office-spreadsheet")
 }
 
 /*!
diff --git a/src/backend/spreadsheet/SpreadsheetModel.cpp \
b/src/backend/spreadsheet/SpreadsheetModel.cpp index 46fdcff..4c3ffde 100644
--- a/src/backend/spreadsheet/SpreadsheetModel.cpp
+++ b/src/backend/spreadsheet/SpreadsheetModel.cpp
@@ -133,10 +133,8 @@ QVariant SpreadsheetModel::headerData(int section, \
Qt::Orientation orientation,  case Qt::ToolTipRole:
 				case Qt::EditRole:
 					return m_horizontal_header_data.at(section);
-#ifdef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
 				case Qt::DecorationRole:
 					return m_spreadsheet->child<Column>(section)->icon();
-#endif
 				case SpreadsheetModel::CommentRole:
 					return m_spreadsheet->child<Column>(section)->comment();
 				case Qt::SizeHintRole:
@@ -399,7 +397,6 @@ void SpreadsheetModel::updateHorizontalHeader()
 		Column * col = m_spreadsheet->child<Column>(i);
 
 		QString middle_section;
-#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
 		switch(col->columnMode()) {
 			case AbstractColumn::Numeric:
 				middle_section = " {numeric} ";
@@ -413,7 +410,7 @@ void SpreadsheetModel::updateHorizontalHeader()
 				middle_section = " {datetime} ";
 				break;
 		}
-#endif
+
 		QString designation_section;
 		switch(col->plotDesignation()) {
 			case AbstractColumn::X:
diff --git a/src/commonfrontend/spreadsheet/SpreadsheetDoubleHeaderView.cpp \
b/src/commonfrontend/spreadsheet/SpreadsheetDoubleHeaderView.cpp index \
                b7b3649..44c3205 100644
--- a/src/commonfrontend/spreadsheet/SpreadsheetDoubleHeaderView.cpp
+++ b/src/commonfrontend/spreadsheet/SpreadsheetDoubleHeaderView.cpp
@@ -94,11 +94,10 @@ SpreadsheetDoubleHeaderView::~SpreadsheetDoubleHeaderView(){
 }
 
 QSize SpreadsheetDoubleHeaderView::sizeHint() const{
-	QSize master_size, slave_size;
-	master_size = QHeaderView::sizeHint();
-	slave_size = m_slave->sizeHint();
+	QSize master_size = QHeaderView::sizeHint();
+	master_size.setHeight(master_size.height() + 5);
 	if(m_showComments)
-		master_size.setHeight(master_size.height() + slave_size.height());
+		master_size.setHeight(master_size.height() + m_slave->sizeHint().height());
 	return master_size;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]