locale, statusbar
locale: english as default statusbar: progressbar dissappear at 100%
This commit is contained in:
parent
e48ae9d43c
commit
2209923153
4 changed files with 11 additions and 13 deletions
|
@ -111,7 +111,7 @@ void jceStatusBar::setIconConnectionStatus(jceProgressStatus update)
|
|||
*/
|
||||
void jceStatusBar::setProgressValue(int value)
|
||||
{
|
||||
if (value == 0)
|
||||
if (value == 0 || value == 100)
|
||||
{
|
||||
progressBar->setVisible(false);
|
||||
progressBar->setValue(0);
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
//TODO: Project todo list
|
||||
//update translation, update site spelling, release notes, update help
|
||||
//BUG: fix locale on windows
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
#ifdef QT_DEBUG // Incase QtCreator is in Debug mode all qDebug messages will go to terminal
|
||||
|
@ -24,17 +25,17 @@ int main(int argc, char *argv[])
|
|||
SaveData data;
|
||||
loco = data.getLocal();
|
||||
//Loading Local (From Settings file (SaveData.cpp)
|
||||
if(loco == "default")
|
||||
if(loco == "en")
|
||||
{
|
||||
QString locale = QLocale::system().name();
|
||||
translator.load("jce_"+locale , a.applicationDirPath());
|
||||
qDebug() << Q_FUNC_INFO << "Local : Default Local Loaded";
|
||||
translator.load("jce_" + loco , a.applicationDirPath());
|
||||
qDebug() << Q_FUNC_INFO << "Locale : English Local Loaded";
|
||||
}else if(loco == "he"){
|
||||
translator.load("jce_he" , a.applicationDirPath());
|
||||
translator.load("jce_" + loco , a.applicationDirPath());
|
||||
qDebug() << Q_FUNC_INFO << "Local : Hebrew Local Loaded";
|
||||
}else{
|
||||
translator.load("jce_en" , a.applicationDirPath());
|
||||
qDebug() << Q_FUNC_INFO << "Local : English Local Loaded";
|
||||
data.reset();
|
||||
qCritical() << Q_FUNC_INFO << "save data corrupted, rested file.";
|
||||
}
|
||||
a.installTranslator(&translator); //Setting local
|
||||
a.setApplicationVersion(APP_VERSION);
|
||||
|
|
|
@ -88,7 +88,7 @@ void SaveData::setCal(QString cal)
|
|||
*/
|
||||
void SaveData::setLocal(QString local)
|
||||
{
|
||||
DB.insert("local", local);
|
||||
DB.insert("locale", local);
|
||||
save();
|
||||
}
|
||||
|
||||
|
@ -116,7 +116,7 @@ QString SaveData::getPassword()
|
|||
*/
|
||||
QString SaveData::getLocal()
|
||||
{
|
||||
return DB.value("local");
|
||||
return DB.value("locale");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -160,7 +160,7 @@ void SaveData::createDB()
|
|||
{
|
||||
DB.insert("username", "");
|
||||
DB.insert("password", "");
|
||||
DB.insert("local", "default");
|
||||
DB.insert("locale", "en");
|
||||
DB.insert("calendar", "");
|
||||
}
|
||||
|
||||
|
|
|
@ -152,9 +152,6 @@ void jceLogin::reMakeConnection()
|
|||
*/
|
||||
int jceLogin::makeFirstVisit()
|
||||
{
|
||||
QString usr = jceA->getUsername();
|
||||
QString psw = jceA->getPassword();
|
||||
|
||||
if (JceConnector->sendData(jceLoginHtmlScripts::makeRequest(jceLoginHtmlScripts::getFirstValidationStep(*jceA))))
|
||||
{
|
||||
if (!JceConnector->recieveData(recieverPage))
|
||||
|
|
Loading…
Reference in a new issue