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 +2255 -1512
138 changed files with 2255 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b767ece5c5 - Show all commits

70
zeiterfassung/translations/zeiterfassung_de.ts
View File

@@ -20,113 +20,113 @@
<context>
<name>main</name>
<message>
<location filename="../main.cpp" line="337"/>
<location filename="../main.cpp" line="320"/>
<source>Loading settings...</source>
<translation>Lade Einstellungen...</translation>
</message>
<message>
<location filename="../main.cpp" line="58"/>
<location filename="../main.cpp" line="60"/>
<source>Loading translations...</source>
<translation>Lade Übersetzungen...</translation>
</message>
<message>
<location filename="../main.cpp" line="70"/>
<location filename="../main.cpp" line="71"/>
<location filename="../main.cpp" line="72"/>
<location filename="../main.cpp" line="73"/>
<source>Invalid language selection!</source>
<translation>Ungültige Sprachauswahl!</translation>
</message>
<message>
<location filename="../main.cpp" line="72"/>
<location filename="../main.cpp" line="74"/>
<source>You did not select a valid language!</source>
<translation>Sie haben keine gültige Sprachauswahl getroffen!</translation>
</message>
<message>
<location filename="../main.cpp" line="90"/>
<location filename="../main.cpp" line="92"/>
<source>Loading theme...</source>
<translation>Lade Aussehen...</translation>
</message>
<message>
<location filename="../main.cpp" line="101"/>
<location filename="../main.cpp" line="102"/>
<location filename="../main.cpp" line="109"/>
<location filename="../main.cpp" line="110"/>
<location filename="../main.cpp" line="103"/>
<location filename="../main.cpp" line="104"/>
<location filename="../main.cpp" line="111"/>
<location filename="../main.cpp" line="112"/>
<source>Could not load theme!</source>
<translation>Konnte Aussehen nicht laden!</translation>
</message>
<message>
<location filename="../main.cpp" line="103"/>
<location filename="../main.cpp" line="105"/>
<source>Theme file does not exist!</source>
<translation>Aussehen-Datei existiert nicht!</translation>
</message>
<message>
<location filename="../main.cpp" line="167"/>
<location filename="../main.cpp" line="169"/>
<source>Loading login page...</source>
<translation>Lade Login-Seite...</translation>
</message>
<message>
<location filename="../main.cpp" line="176"/>
<location filename="../main.cpp" line="177"/>
<location filename="../main.cpp" line="178"/>
<location filename="../main.cpp" line="179"/>
<source>Could not access Zeiterfassung!</source>
<translation>Konnte Zeiterfassung nicht erreichen!</translation>
</message>
<message>
<location filename="../main.cpp" line="180"/>
<location filename="../main.cpp" line="182"/>
<source>Base url</source>
<translation>Basis URL</translation>
</message>
<message>
<location filename="../main.cpp" line="181"/>
<location filename="../main.cpp" line="183"/>
<source>Please enter the base url to the Zeiterfassung:</source>
<translation>Bitte geben Sie die Basis URL zur Zeiterfassung ein:</translation>
</message>
<message>
<location filename="../main.cpp" line="198"/>
<location filename="../main.cpp" line="200"/>
<source>Authenticating...</source>
<translation>Authentifiziere...</translation>
</message>
<message>
<location filename="../main.cpp" line="219"/>
<location filename="../main.cpp" line="220"/>
<location filename="../main.cpp" line="221"/>
<location filename="../main.cpp" line="222"/>
<source>Could not authenticate with Zeiterfassung!</source>
<translation>Konnte nicht mit Zeiterfassung authentifizieren!</translation>
</message>
<message>
<location filename="../main.cpp" line="241"/>
<location filename="../main.cpp" line="243"/>
<source>Getting user information...</source>
<translation>Hole Benutzer Information...</translation>
</message>
<message>
<location filename="../main.cpp" line="250"/>
<location filename="../main.cpp" line="251"/>
<location filename="../main.cpp" line="252"/>
<location filename="../main.cpp" line="253"/>
<source>Could not get user information!</source>
<translation>Konnte Benutzer Information nicht holen!</translation>
</message>
<message>
<location filename="../main.cpp" line="292"/>
<location filename="../main.cpp" line="293"/>
<location filename="../main.cpp" line="286"/>
<location filename="../main.cpp" line="287"/>
<source>Could not load plugin %0!</source>
<translation>Konnte Plugin %0 nicht laden!</translation>
</message>
<message>
<location filename="../main.cpp" line="303"/>
<location filename="../main.cpp" line="304"/>
<location filename="../main.cpp" line="360"/>
<location filename="../main.cpp" line="361"/>
<source>Plugin not valid %0!</source>
<translation>Plugin %0 nicht gültig!</translation>
</message>
<message>
<location filename="../main.cpp" line="123"/>
<location filename="../main.cpp" line="125"/>
<source>Loading strip layouts...</source>
<translation>Lade Streifenlayouts...</translation>
</message>
<message>
<location filename="../main.cpp" line="127"/>
<location filename="../main.cpp" line="128"/>
<location filename="../main.cpp" line="136"/>
<location filename="../main.cpp" line="137"/>
<location filename="../main.cpp" line="146"/>
<location filename="../main.cpp" line="147"/>
<location filename="../main.cpp" line="156"/>
<location filename="../main.cpp" line="157"/>
<location filename="../main.cpp" line="129"/>
<location filename="../main.cpp" line="130"/>
<location filename="../main.cpp" line="138"/>
<location filename="../main.cpp" line="139"/>
<location filename="../main.cpp" line="148"/>
<location filename="../main.cpp" line="149"/>
<location filename="../main.cpp" line="158"/>
<location filename="../main.cpp" line="159"/>
<source>Could not load strips!</source>
<translation>Konnte Streifenlayouts nicht laden!</translation>
</message>

70
zeiterfassung/translations/zeiterfassung_en.ts
View File

@@ -20,113 +20,113 @@
<context>
<name>main</name>
<message>
<location filename="../main.cpp" line="337"/>
<location filename="../main.cpp" line="320"/>
<source>Loading settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="58"/>
<location filename="../main.cpp" line="60"/>
<source>Loading translations...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="70"/>
<location filename="../main.cpp" line="71"/>
<location filename="../main.cpp" line="72"/>
<location filename="../main.cpp" line="73"/>
<source>Invalid language selection!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="72"/>
<location filename="../main.cpp" line="74"/>
<source>You did not select a valid language!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="90"/>
<location filename="../main.cpp" line="92"/>
<source>Loading theme...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="101"/>
<location filename="../main.cpp" line="102"/>
<location filename="../main.cpp" line="109"/>
<location filename="../main.cpp" line="110"/>
<location filename="../main.cpp" line="103"/>
<location filename="../main.cpp" line="104"/>
<location filename="../main.cpp" line="111"/>
<location filename="../main.cpp" line="112"/>
<source>Could not load theme!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="103"/>
<location filename="../main.cpp" line="105"/>
<source>Theme file does not exist!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="167"/>
<location filename="../main.cpp" line="169"/>
<source>Loading login page...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="176"/>
<location filename="../main.cpp" line="177"/>
<location filename="../main.cpp" line="178"/>
<location filename="../main.cpp" line="179"/>
<source>Could not access Zeiterfassung!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="180"/>
<location filename="../main.cpp" line="182"/>
<source>Base url</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="181"/>
<location filename="../main.cpp" line="183"/>
<source>Please enter the base url to the Zeiterfassung:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="198"/>
<location filename="../main.cpp" line="200"/>
<source>Authenticating...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="219"/>
<location filename="../main.cpp" line="220"/>
<location filename="../main.cpp" line="221"/>
<location filename="../main.cpp" line="222"/>
<source>Could not authenticate with Zeiterfassung!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="241"/>
<location filename="../main.cpp" line="243"/>
<source>Getting user information...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="250"/>
<location filename="../main.cpp" line="251"/>
<location filename="../main.cpp" line="252"/>
<location filename="../main.cpp" line="253"/>
<source>Could not get user information!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="292"/>
<location filename="../main.cpp" line="293"/>
<location filename="../main.cpp" line="286"/>
<location filename="../main.cpp" line="287"/>
<source>Could not load plugin %0!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="303"/>
<location filename="../main.cpp" line="304"/>
<location filename="../main.cpp" line="360"/>
<location filename="../main.cpp" line="361"/>
<source>Plugin not valid %0!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="123"/>
<location filename="../main.cpp" line="125"/>
<source>Loading strip layouts...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.cpp" line="127"/>
<location filename="../main.cpp" line="128"/>
<location filename="../main.cpp" line="136"/>
<location filename="../main.cpp" line="137"/>
<location filename="../main.cpp" line="146"/>
<location filename="../main.cpp" line="147"/>
<location filename="../main.cpp" line="156"/>
<location filename="../main.cpp" line="157"/>
<location filename="../main.cpp" line="129"/>
<location filename="../main.cpp" line="130"/>
<location filename="../main.cpp" line="138"/>
<location filename="../main.cpp" line="139"/>
<location filename="../main.cpp" line="148"/>
<location filename="../main.cpp" line="149"/>
<location filename="../main.cpp" line="158"/>
<location filename="../main.cpp" line="159"/>
<source>Could not load strips!</source>
<translation type="unfinished"></translation>
</message>

12
zeiterfassungguilib/mainwindow.cpp
View File

@@ -254,12 +254,6 @@ void MainWindow::pushButtonStartPressed()
}
else
m_currentStripWidget->refreshTimeAssignments();
ui->actionToday->setEnabled(false);
ui->actionRefresh->setEnabled(false);
ui->dateEditDate->setReadOnly(true);
ui->pushButtonPrev->setEnabled(false);
ui->pushButtonNext->setEnabled(false);
}
void MainWindow::pushButtonEndPressed()
@@ -302,12 +296,6 @@ void MainWindow::pushButtonEndPressed()
m_currentStripWidget->refresh();
//refreshReport();
ui->actionToday->setEnabled(false);
ui->actionRefresh->setEnabled(false);
ui->dateEditDate->setReadOnly(true);
ui->pushButtonPrev->setEnabled(false);
ui->pushButtonNext->setEnabled(false);
}
void MainWindow::dateChangedSlot(const QDate &date)