Conflicts:
	main/CourseTab/coursestablemanager.cpp
This commit is contained in:
liranbg 2014-10-08 00:18:37 +03:00
commit 281e56be3c
8 changed files with 70 additions and 15 deletions

View file

@ -229,7 +229,8 @@ void coursesTableManager::showGraph()
{
if (gp != NULL)
{
this->graph->showGraph(gp);
qDebug() << "Graph Dialog Opened. gp != NULL";
this->graph->showGraph(gp);
}
}

View file

@ -49,6 +49,9 @@ MainScreen::MainScreen(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainSc
ui->statusBar->repaint();
qDebug() << Q_FUNC_INFO << "Ready.";
//set the progress bar to be invisible (It will show only if value !=0 or !=100)
ui->progressBar->setVisible(false);
}
MainScreen::~MainScreen()
{
@ -238,6 +241,7 @@ void MainScreen::on_clearTableButton_clicked()
void MainScreen::on_graphButton_clicked()
{
qDebug() << "Show Graph button clicked";
courseTableMgr->showGraph();
}
@ -388,3 +392,15 @@ void MainScreen::on_labelMadeBy_linkActivated(const QString &link)
}
/**
* @brief Every time the value changes this method will be called
* @param value = the value of the progress Bar
*/
void MainScreen::on_progressBar_valueChanged(int value)
{
if(value == 0 || value == 100)
ui->progressBar->setVisible(false);
else
ui->progressBar->setVisible(true);
}

View file

@ -69,6 +69,8 @@ private slots:
void on_graphButton_clicked();
void on_progressBar_valueChanged(int value);
private:
void checkLocale();

View file

@ -690,7 +690,7 @@ background: qlineargradient(x1: 0, y1: 0.5, x2: 1, y2: 0.5, stop: 0 green, stop:
<x>0</x>
<y>0</y>
<width>1133</width>
<height>21</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuA_about">

View file

@ -1,5 +1,5 @@
#include "calendarDialog.h"
#include "ui_calendardialog.h"
#include "ui_calendarDialog.h"
CalendarDialog::CalendarDialog(QWidget *parent) :

View file

@ -148,3 +148,9 @@ void gradegraph::setVisualization()
ui->graphwidget->legend->setVisible(true); //show graph name on top right
}
void gradegraph::on_pushButton_clicked()
{
qDebug() << "Closed Graph Dialog";
this->done(0);
}

View file

@ -18,6 +18,9 @@ public:
void showGraph(GradePage *gpPTR);
~gradegraph();
private slots:
void on_pushButton_clicked();
private:
GradePage *gp;

View file

@ -7,13 +7,13 @@
<x>0</x>
<y>0</y>
<width>624</width>
<height>527</height>
<height>531</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
@ -34,16 +34,43 @@
</widget>
</item>
<item>
<widget class="QCustomPlot" name="graphwidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout"/>
<zorder></zorder>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCustomPlot" name="graphwidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout"/>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>88</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>