Translated Kommen & Gehen into english in code

This commit is contained in:
0xFEEDC0DE64
2017-12-05 21:07:12 +01:00
parent 7ddab6885f
commit 65685dfd90
13 changed files with 38 additions and 47 deletions

View File

@@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>About me</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
<item> <item>

View File

@@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Authentication</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

View File

@@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Buchung</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<item> <item>

View File

@@ -10,8 +10,8 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->lineEditBuchungKommenBackgroundColor->setText(settings.buchungKommenBackgroundColor()); ui->lineEditBuchungStartBackgroundColor->setText(settings.buchungStartBackgroundColor());
ui->lineEditBuchungGehenBackgroundColor->setText(settings.buchungGehenBackgroundColor()); ui->lineEditBuchungEndBackgroundColor->setText(settings.buchungEndBackgroundColor());
ui->lineEditBuchungOtherBackgroundColor->setText(settings.buchungOtherBackgroundColor()); ui->lineEditBuchungOtherBackgroundColor->setText(settings.buchungOtherBackgroundColor());
ui->lineEditTimeAssignmentBackgroundColor->setText(settings.timeAssignmentBackgroundColor()); ui->lineEditTimeAssignmentBackgroundColor->setText(settings.timeAssignmentBackgroundColor());
@@ -25,10 +25,10 @@ SettingsDialog::~SettingsDialog()
void SettingsDialog::submit() void SettingsDialog::submit()
{ {
if(ui->lineEditBuchungKommenBackgroundColor->text() != m_settings.buchungKommenBackgroundColor()) if(ui->lineEditBuchungStartBackgroundColor->text() != m_settings.buchungStartBackgroundColor())
m_settings.setBuchungKommenBackgroundColor(ui->lineEditBuchungKommenBackgroundColor->text()); m_settings.setBuchungStartBackgroundColor(ui->lineEditBuchungStartBackgroundColor->text());
if(ui->lineEditBuchungGehenBackgroundColor->text() != m_settings.buchungGehenBackgroundColor()) if(ui->lineEditBuchungEndBackgroundColor->text() != m_settings.buchungEndBackgroundColor())
m_settings.setBuchungGehenBackgroundColor(ui->lineEditBuchungGehenBackgroundColor->text()); m_settings.setBuchungEndBackgroundColor(ui->lineEditBuchungEndBackgroundColor->text());
if(ui->lineEditBuchungOtherBackgroundColor->text() != m_settings.buchungOtherBackgroundColor()) if(ui->lineEditBuchungOtherBackgroundColor->text() != m_settings.buchungOtherBackgroundColor())
m_settings.setBuchungOtherBackgroundColor(ui->lineEditBuchungOtherBackgroundColor->text()); m_settings.setBuchungOtherBackgroundColor(ui->lineEditBuchungOtherBackgroundColor->text());
if(ui->lineEditTimeAssignmentBackgroundColor->text() != m_settings.timeAssignmentBackgroundColor()) if(ui->lineEditTimeAssignmentBackgroundColor->text() != m_settings.timeAssignmentBackgroundColor())

View File

@@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<item> <item>
@@ -30,22 +30,22 @@
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelbuchungKommenBackgroundColor"> <widget class="QLabel" name="labelbuchungStartBackgroundColor">
<property name="text"> <property name="text">
<string>buchungKommenBackgroundColor</string> <string>buchungStartBackgroundColor</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>lineEditBuchungKommenBackgroundColor</cstring> <cstring>lineEditBuchungStartBackgroundColor</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="labelbuchungGehenBackgroundColor"> <widget class="QLabel" name="labelbuchungEndBackgroundColor">
<property name="text"> <property name="text">
<string>buchungGehenBackgroundColor</string> <string>buchungEndBackgroundColor</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>lineEditBuchungGehenBackgroundColor</cstring> <cstring>lineEditBuchungEndBackgroundColor</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@@ -70,10 +70,10 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="lineEditBuchungKommenBackgroundColor"/> <widget class="QLineEdit" name="lineEditBuchungStartBackgroundColor"/>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="lineEditBuchungGehenBackgroundColor"/> <widget class="QLineEdit" name="lineEditBuchungEndBackgroundColor"/>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="lineEditBuchungOtherBackgroundColor"/> <widget class="QLineEdit" name="lineEditBuchungOtherBackgroundColor"/>

View File

@@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Time assignment</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
<item> <item>

View File

@@ -862,7 +862,7 @@ void MainWindow::validateEntries()
auto startBuchung = *buchungenIter++; auto startBuchung = *buchungenIter++;
if(startBuchung.type != QStringLiteral("K")) if(startBuchung.type != QStringLiteral("K"))
{ {
errorMessage = tr("Expected Buchung for Kommen, instead got type %0\nBuchung ID: %1") errorMessage = tr("Expected start Buchung, instead got type %0\nBuchung ID: %1")
.arg(startBuchung.type) .arg(startBuchung.type)
.arg(startBuchung.id); .arg(startBuchung.id);
goto after; goto after;
@@ -940,7 +940,7 @@ void MainWindow::validateEntries()
{ {
if(timeAssignmentsIter == m_timeAssignmentsModel->constEnd()) if(timeAssignmentsIter == m_timeAssignmentsModel->constEnd())
{ {
errorMessage = tr("The last time assignment is finished without Gehen-Buchung\nTime assignment ID: %0") errorMessage = tr("The last time assignment is finished without end Buchung\nTime assignment ID: %0")
.arg(timeAssignment.id); .arg(timeAssignment.id);
goto after; goto after;
} }
@@ -989,7 +989,7 @@ void MainWindow::validateEntries()
auto endBuchung = *buchungenIter++; auto endBuchung = *buchungenIter++;
if(endBuchung.type != QStringLiteral("G")) if(endBuchung.type != QStringLiteral("G"))
{ {
errorMessage = tr("Expected Buchung for Gehen, instead got type %0\nBuchung ID: %1") errorMessage = tr("Expected end Buchung, instead got type %0\nBuchung ID: %1")
.arg(endBuchung.type) .arg(endBuchung.type)
.arg(endBuchung.id); .arg(endBuchung.id);
goto after; goto after;

View File

@@ -10,9 +10,6 @@
<height>581</height> <height>581</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/zeiterfassung/images/icon.png</normaloff>:/zeiterfassung/images/icon.png</iconset> <normaloff>:/zeiterfassung/images/icon.png</normaloff>:/zeiterfassung/images/icon.png</iconset>

View File

@@ -18,13 +18,13 @@ BuchungStrip::BuchungStrip(int id, const QTime &time, const QString &type, const
ui->labelTime->setText(time.toString(QStringLiteral("HH:mm"))); ui->labelTime->setText(time.toString(QStringLiteral("HH:mm")));
if(type == QStringLiteral("K")) if(type == QStringLiteral("K"))
{ {
setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungKommenBackgroundColor())); setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungStartBackgroundColor()));
ui->labelType->setText(tr("KOMMEN")); ui->labelType->setText(tr("START"));
} }
else if(type == QStringLiteral("G")) else if(type == QStringLiteral("G"))
{ {
setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungGehenBackgroundColor())); setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungEndBackgroundColor()));
ui->labelType->setText(tr("GEHEN")); ui->labelType->setText(tr("END"));
} }
else else
{ {

View File

@@ -10,9 +10,6 @@
<height>52</height> <height>52</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::WinPanel</enum> <enum>QFrame::WinPanel</enum>
</property> </property>

View File

@@ -10,9 +10,6 @@
<height>80</height> <height>80</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::WinPanel</enum> <enum>QFrame::WinPanel</enum>
</property> </property>

View File

@@ -132,24 +132,24 @@ void ZeiterfassungSettings::prependText(const QString &text)
prepentItem("texte", text); prepentItem("texte", text);
} }
QString ZeiterfassungSettings::buchungKommenBackgroundColor() const QString ZeiterfassungSettings::buchungStartBackgroundColor() const
{ {
return value("buchungKommenBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #7FFF7F, stop:1 #6FBF6F)")).toString(); return value("buchungStartBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #7FFF7F, stop:1 #6FBF6F)")).toString();
} }
void ZeiterfassungSettings::setBuchungKommenBackgroundColor(const QString &buchungKommenBackgroundColor) void ZeiterfassungSettings::setBuchungStartBackgroundColor(const QString &buchungStartBackgroundColor)
{ {
setValue("buchungKommenBackgroundColor", buchungKommenBackgroundColor); setValue("buchungStartBackgroundColor", buchungStartBackgroundColor);
} }
QString ZeiterfassungSettings::buchungGehenBackgroundColor() const QString ZeiterfassungSettings::buchungEndBackgroundColor() const
{ {
return value("buchungGehenBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #FF7F7F, stop:1 #BF6F6F)")).toString(); return value("buchungEndBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #FF7F7F, stop:1 #BF6F6F)")).toString();
} }
void ZeiterfassungSettings::setBuchungGehenBackgroundColor(const QString &buchungGehenBackgroundColor) void ZeiterfassungSettings::setBuchungEndBackgroundColor(const QString &buchungEndBackgroundColor)
{ {
setValue("buchungGehenBackgroundColor", buchungGehenBackgroundColor); setValue("buchungEndBackgroundColor", buchungEndBackgroundColor);
} }
QString ZeiterfassungSettings::buchungOtherBackgroundColor() const QString ZeiterfassungSettings::buchungOtherBackgroundColor() const

View File

@@ -46,11 +46,11 @@ public:
void setTexte(const QStringList &texte); void setTexte(const QStringList &texte);
void prependText(const QString &text); void prependText(const QString &text);
QString buchungKommenBackgroundColor() const; QString buchungStartBackgroundColor() const;
void setBuchungKommenBackgroundColor(const QString &buchungKommenBackgroundColor); void setBuchungStartBackgroundColor(const QString &buchungStartBackgroundColor);
QString buchungGehenBackgroundColor() const; QString buchungEndBackgroundColor() const;
void setBuchungGehenBackgroundColor(const QString &buchungGehenBackgroundColor); void setBuchungEndBackgroundColor(const QString &buchungEndBackgroundColor);
QString buchungOtherBackgroundColor() const; QString buchungOtherBackgroundColor() const;
void setBuchungOtherBackgroundColor(const QString &buchungOtherBackgroundColor); void setBuchungOtherBackgroundColor(const QString &buchungOtherBackgroundColor);