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

List:       kde-commits
Subject:    KDE/kdeedu/parley/src/statistics
From:       Daniel Laidig <d.laidig () gmx ! de>
Date:       2010-05-28 20:53:15
Message-ID: 20100528205315.AB24EAC8C2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1131733 by laidig:

only show the grades that are relevant for the current language selection

forward-port of r1131732

 M  +2 -7      lessonstatistics.cpp  
 M  +0 -1      lessonstatistics.h  
 M  +10 -0     statisticsmainwindow.cpp  
 M  +1 -0      statisticsmainwindow.h  


--- trunk/KDE/kdeedu/parley/src/statistics/lessonstatistics.cpp #1131732:1131733
@@ -105,17 +105,12 @@
     GradeDelegate* delegate = new GradeDelegate(this);
     for (int i = 2; i < model->columnCount(QModelIndex()); i++) {
         setItemDelegateForColumn(i, delegate);
-        //setColumnWidth(i, 200);
+        setColumnWidth(i, 150);
     }
-    header()->resizeSections(QHeaderView::ResizeToContents);
+//    header()->resizeSections(QHeaderView::ResizeToContents);
     header()->setResizeMode(QHeaderView::Interactive);
 }
 
-void LessonStatisticsView::showGrades(int, int)
-{
-    // TODO: only show the corresponding grades
-}
-
 void LessonStatisticsView::removeGrades()
 {
     QModelIndex selectedIndex = selectionModel()->currentIndex();
--- trunk/KDE/kdeedu/parley/src/statistics/lessonstatistics.h #1131732:1131733
@@ -29,7 +29,6 @@
 public:
     LessonStatisticsView(QWidget *parent);
     void setModel(Editor::ContainerModel *model);
-    void showGrades(int languageFrom, int languageTo);
 
 private Q_SLOTS:
     void removeGrades();
--- trunk/KDE/kdeedu/parley/src/statistics/statisticsmainwindow.cpp #1131732:1131733
@@ -81,6 +81,7 @@
     m_statisticsModel->setDocument(doc);
     m_ui->lessonStatistics->setModel(m_statisticsModel);
     m_ui->lessonStatistics->expandToDepth(0);
+    m_ui->lessonStatistics->resizeColumnToContents(0);
 }
 
 void StatisticsMainWindow::initActions()
@@ -192,6 +193,7 @@
     emit languagesChanged(questionLanguage, solutionLangauge);
     //m_ui->lessonStatistics->showGrades(current->data(Qt::UserRole).toInt(), \
                current->data(Qt::UserRole+1).toInt());
     kDebug() << "set languages: " << current->data(Qt::UserRole).toInt() << \
current->data(Qt::UserRole+1).toInt(); +    updateVisibleColumns();
 }
 
 void StatisticsMainWindow::practiceModeSelected(int mode)
@@ -202,6 +204,14 @@
     showConjugationOptions(mode == Prefs::EnumPracticeMode::ConjugationPractice);
 }
 
+void StatisticsMainWindow::updateVisibleColumns()
+{
+    int solutionLanguage = Prefs::solutionLanguage();
+    for (int i = 2; i < m_ui->lessonStatistics->header()->count(); i++) {
+        m_ui->lessonStatistics->setColumnHidden(i, (i-2) != solutionLanguage);
+    }
+}
+
 void StatisticsMainWindow::showConjugationOptions(bool visible)
 {
     if (!m_conjugationOptions && !visible) {
--- trunk/KDE/kdeedu/parley/src/statistics/statisticsmainwindow.h #1131732:1131733
@@ -43,6 +43,7 @@
     void configurePractice();
     void languagesChanged();
     void practiceModeSelected(int mode);
+    void updateVisibleColumns();
 
 private:
     void initActions();


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