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

icon fix

Browse source
This commit is contained in:
liranbg 2014-09-18 01:59:42 +03:00
parent b092ca5ec2
commit 090dc28137
6 changed files with 139 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/mainscreen.cpp
View file

@ -8,7 +8,6 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
//this->setFixedSize(this->size()); //main not resizeable //this->setFixedSize(this->size()); //main not resizeable
//Login Tab //Login Tab
QPixmap iconPix;
iconPix.load(":/icons/iconX.png"); iconPix.load(":/icons/iconX.png");
ui->pswdLineEdit->setEchoMode((QLineEdit::Password)); ui->pswdLineEdit->setEchoMode((QLineEdit::Password));
ui->labelUsrInputStatus->setVisible(false); ui->labelUsrInputStatus->setVisible(false);
@ -25,7 +24,7 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
ui->statusBar->addPermanentWidget(statusLabel,1); ui->statusBar->addPermanentWidget(statusLabel,1);
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED); setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
//Course, Setting, Calendar Tab //Course, Calendar Tab
calendarSchedule * calendarSchedulePtr = new calendarSchedule(); calendarSchedule * calendarSchedulePtr = new calendarSchedule();
ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr); ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr);
ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue)); ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue));
@ -45,11 +44,9 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
ui->keepLogin->setChecked(true); ui->keepLogin->setChecked(true);
} }
//Local Check and ui setting. //language
checkLocale(); checkLocale();
} }
MainScreen::~MainScreen() MainScreen::~MainScreen()
@ -60,13 +57,12 @@ MainScreen::~MainScreen()
delete courseTableMgr; delete courseTableMgr;
delete userLoginSetting; delete userLoginSetting;
delete loginHandel; delete loginHandel;
delete ui;
delete data; delete data;
delete ui;
} }
//EVENTS ON STATUS BAR //EVENTS ON STATUS BAR
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
{ {
QPixmap iconPix;
switch (statusDescription) switch (statusDescription)
{ {
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS: case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:

5
main/mainscreen.h
View file

@ -81,14 +81,15 @@ private:
QLabel *ButtomStatusLabel; QLabel *ButtomStatusLabel;
QLabel *statusLabel; QLabel *statusLabel;
QPixmap iconPix;
user *userLoginSetting; user *userLoginSetting;
SaveData *data; SaveData *data;
CalendarManager * calendar; CalendarManager * calendar;
coursesTableManager *courseTableMgr; coursesTableManager *courseTableMgr;
loginHandler *loginHandel;
bool calendarLoaded; loginHandler *loginHandel;
}; };

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

@ -152,7 +152,7 @@ QString CSV_Exporter::makeLine(QString name, QDate *date, int startH, int startM
description.append("\n"); description.append("\n");
description.append(" ב"); description.append(" ב");
description.append(room); description.append(room);
description.append("\n Created with JCE Manager. \" "); description.append("\n Created with JCE Manager.\"");
//Create the Fucking Line //Create the Fucking Line
//Header: Subject,Start Date,Start Time,End Date,End Time,Description,Location //Header: Subject,Start Date,Start Time,End Date,End Time,Description,Location