Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
136 changed files with 2185 additions and 1430 deletions
Showing only changes of commit f4cf491051 - Show all commits

View File

@@ -57,5 +57,6 @@ void DevToolsPlugin::attachTo(MainWindow &mainWindow)
{
auto dialog = new LogDialog(&mainWindow);
dialog->setModel(model.get());
mainWindow.menuTools()->addAction(tr("Show log"), dialog, &QDialog::open);
mainWindow.menuTools()->addAction(QIcon(QStringLiteral(":/zeiterfassung/plugins/devtoolsplugin/images/dev-tools.png")),
tr("Show log"), dialog, &QDialog::open);
}

View File

@@ -25,7 +25,7 @@ SOURCES += devtoolsplugin.cpp \
FORMS += \
logdialog.ui
RESOURCES +=
RESOURCES += devtoolsplugin_resources.qrc
TRANSLATIONS += translations/devtoolsplugin_en.ts \
translations/devtoolsplugin_de.ts

View File

@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/zeiterfassung/plugins/devtoolsplugin">
<file>images/dev-tools.png</file>
</qresource>
</RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>694</width>
<height>300</height>
</rect>
</property>

View File

@@ -35,7 +35,17 @@ QVariant LogModel::data(const QModelIndex &index, int role) const
case Qt::EditRole:
switch(index.column())
{
case 0: return entry.type;
case 0:
{
switch(entry.type)
{
case QtDebugMsg: return tr("Debug");
case QtWarningMsg: return tr("Warning");
case QtCriticalMsg: return tr("Critical");
case QtFatalMsg: return tr("Fatal");
case QtInfoMsg: return tr("Info");
}
}
case 1: return entry.dateTime.toString(QStringLiteral("dd.MM.yyyy HH:mm:ss.zzz"));
case 2: return entry.functionName;
case 3: return entry.message;

View File

@@ -1,4 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de_DE">
<context>
<name>DevToolsPlugin</name>
<message>
<source>Show log</source>
<translation>Log anzeigen</translation>
</message>
</context>
<context>
<name>LogDialog</name>
<message>
<source>Log</source>
<translation>Log</translation>
</message>
</context>
<context>
<name>LogModel</name>
<message>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
<source>Timestamp</source>
<translation>Zeitpunkt</translation>
</message>
<message>
<source>Function</source>
<translation>Funktion</translation>
</message>
<message>
<source>Message</source>
<translation>Nachricht</translation>
</message>
<message>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
<source>Critical</source>
<translation>Kritisch</translation>
</message>
<message>
<source>Fatal</source>
<translation>Fatal</translation>
</message>
<message>
<source>Info</source>
<translation>Info</translation>
</message>
</context>
</TS>

View File

@@ -1,4 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>DevToolsPlugin</name>
<message>
<source>Show log</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogDialog</name>
<message>
<source>Log</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogModel</name>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Timestamp</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Function</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Debug</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Critical</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fatal</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>