feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
Conversation 0 Commits 84 Files Changed 223 +2279 -1538
140 changed files with 2279 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 43515e3245 - Show all commits

4
plugins/updaterplugin/updaterdialog.cpp
View File

@@ -31,8 +31,8 @@ UpdaterDialog::UpdaterDialog(MainWindow &mainWindow) :
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &UpdaterDialog::rejectedSlot);
auto url = m_mainWindow.settings().value(QStringLiteral("UpdaterPlugin/url"),
QUrl(QStringLiteral("https://api.github.com/repos/0xFEEDC0DE64/QtZeiterfassung/releases"))).toUrl();
m_reply = m_mainWindow.erfassung().manager()->get(QNetworkRequest(url));
QStringLiteral("https://api.github.com/repos/0xFEEDC0DE64/QtZeiterfassung/releases")).toString();
m_reply = m_mainWindow.erfassung().manager()->get(QNetworkRequest(QUrl(url)));
connect(m_reply, &QNetworkReply::finished, this, &UpdaterDialog::finished);
}

4
plugins/weatherplugin/weatherwidget.cpp
View File

@@ -69,14 +69,14 @@ void WeatherWidget::finished()
if(!obj.contains(QStringLiteral("weather")))
{
qWarning() << "no weather" << obj;
setText("No weater found");
setText(tr("No weather found"));
goto after;
}
if(!obj.contains(QStringLiteral("main")))
{
qWarning() << "no main" << obj;
setText("No main found");
setText(tr("No main found"));
goto after;
}

2
zeiterfassungguilib/stripswidget.cpp
View File

@@ -438,7 +438,7 @@ bool StripsWidget::createStrips()
auto label = new QLabel(tr("Strip rendering aborted due error.\n"
"Your bookings and time assignments for this day are in an illegal state!") % "\n" %
errorMessage, this);
label->setStyleSheet("color: red;");
label->setStyleSheet(QStringLiteral("color: red;"));
m_stripsLayout->addWidget(label);
}