sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add .csv to exportation, fix progressbar

Browse source
This commit is contained in:
liranbg 2014-10-13 01:59:57 +03:00
parent cde830dac7
commit a33939c93b
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/CourseTab/coursestablemanager.cpp
View file

@ -196,7 +196,9 @@ void coursesTableManager::addRow(const gradeCourse *courseToAdd)
hours->setFlags(hours->flags() & ~Qt::ItemIsEditable); hours->setFlags(hours->flags() & ~Qt::ItemIsEditable);
grade = new QTableWidgetItem(); grade = new QTableWidgetItem();
// grade->setData(Qt::EditRole,c->getGrade()); //BUG good for sorting, the problem is when you edit -> the cell indicator disappear //grade->setData(Qt::EditRole,c->getGrade());
//BUG QT bug
//good for sorting, the problem is when you edit -> the cell indicator disappear
grade->setText(QString::number(c->getGrade())); grade->setText(QString::number(c->getGrade()));
addition = new QTableWidgetItem(); addition = new QTableWidgetItem();

4
main/jceWidgets/jcestatusbar.cpp
View file

@ -57,7 +57,7 @@ void jceStatusBar::setIconConnectionStatus(jceProgressStatus update)
showMessage(tr("Disconnected")); showMessage(tr("Disconnected"));
break; break;
case jceProgressStatus::Ready: case jceProgressStatus::Ready:
setProgressValue(100); setProgressValue(0);
iconPix.load(":/icons/redStatusIcon.png"); iconPix.load(":/icons/redStatusIcon.png");
showMessage(tr("Ready")); showMessage(tr("Ready"));
break; break;
@ -67,11 +67,13 @@ void jceStatusBar::setIconConnectionStatus(jceProgressStatus update)
showMessage(tr("Connecting...")); showMessage(tr("Connecting..."));
break; break;
case jceProgressStatus::Sending: case jceProgressStatus::Sending:
if (progressBar->value() < 10)
setProgressValue(10); setProgressValue(10);
iconPix.load(":/icons/blueStatusIcon.png"); iconPix.load(":/icons/blueStatusIcon.png");
showMessage(tr("Sending...")); showMessage(tr("Sending..."));
break; break;
case jceProgressStatus::Recieving: case jceProgressStatus::Recieving:
if (progressBar->value() < 15)
setProgressValue(15); setProgressValue(15);
iconPix.load(":/icons/blueStatusIcon.png"); iconPix.load(":/icons/blueStatusIcon.png");
showMessage(tr("Recieving...")); showMessage(tr("Recieving..."));

2
main/mainscreen.cpp
View file

@ -1,6 +1,5 @@
#include "mainscreen.h" #include "mainscreen.h"
#include "ui_mainscreen.h" #include "ui_mainscreen.h"
//TODO: busy flag to avoid overload request
MainScreen::MainScreen(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainScreen) MainScreen::MainScreen(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainScreen)
{ {
@ -251,6 +250,7 @@ void MainScreen::on_getCalendarBtn_clicked()
QString page; QString page;
if (loginHandel->isLoggedInFlag()) if (loginHandel->isLoggedInFlag())
{ {
statusBar->setIconConnectionStatus(jceStatusBar::Ready);
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_PAGE_PASSED) if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_PAGE_PASSED)
{ {
statusBar->setIconConnectionStatus(jceStatusBar::Inserting); statusBar->setIconConnectionStatus(jceStatusBar::Inserting);

6
src/jceData/CSV/csv_exporter.cpp
View file

@ -110,11 +110,11 @@ bool CSV_Exporter::exportCalendar(calendarSchedule *calSched, CalendarDialog *ca
*/ */
QString CSV_Exporter::getFileFath() QString CSV_Exporter::getFileFath()
{ {
QString fileName = QFileDialog::getSaveFileName(); QString fileName = QFileDialog::getSaveFileName(NULL,
QObject::tr("JceManager Save Schedule Dialog"), "",
QObject::tr("CSV Files (*.csv);;All Files (*)"));
if (fileName == "") if (fileName == "")
return NULL; return NULL;
if (!fileName.contains(".csv", Qt::CaseInsensitive))
fileName.append(".csv");
return fileName; return fileName;
} }