Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

9 years ago · fe1671d91e
parent ffcf753acb c0db311a23
commit fe1671d91e
16 changed files with 441 additions and 5 deletions
--- a/application/appRc.qrc
+++ b/application/appRc.qrc
@ -4,5 +4,6 @@
        <file>icons/login_64.png</file>
        <file>style.css</file>
        <file>icons/settings.svg</file>
+        <file>translations/prodejna_cs_CZ.qm</file>
    </qresource>
 </RCC>
--- a/application/application.pro
+++ b/application/application.pro
@ -56,3 +56,7 @@ INCLUDEPATH += $$PWD/../qdecimal/decnumber

 RESOURCES += \
    appRc.qrc
+
+TRANSLATIONS = translations/prodejna_cz.ts
+
+DISTFILES +=
--- a/application/main.cpp
+++ b/application/main.cpp
@ -1,12 +1,22 @@
 #include "mainwindow.h"
 #include <QApplication>
 #include <QDesktopWidget>
-
-#include <QStringList>
+#include <QTranslator>
+#include <QLibraryInfo>

 int main(int argc, char *argv[])
 {
    QApplication a(argc, argv);
+
+    QTranslator qtTranslator;
+    qtTranslator.load("qt_" + QLocale::system().name(),
+            QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    a.installTranslator(&qtTranslator);
+
+    QTranslator myappTranslator;
+    myappTranslator.load(":/translations/prodejna_" + QLocale::system().name());
+    a.installTranslator(&myappTranslator);
+
    MainWindow w;
    w.move(QApplication::desktop()->screen()->rect().center() - w.rect().center());
    w.show();
--- a/application/translations/prodejna_cs_CZ.qm
+++ b/application/translations/prodejna_cs_CZ.qm
--- a/application/translations/prodejna_cz.ts
+++ b/application/translations/prodejna_cz.ts
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="cs_CZ">
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../logindialog.ui" line="14"/>
+        <location filename="../logindialog.ui" line="70"/>
+        <source>Login</source>
+        <translation>Login</translation>
+    </message>
+    <message>
+        <location filename="../logindialog.ui" line="80"/>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="14"/>
+        <source>MainWindow</source>
+        <translation>Nastaveni</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="64"/>
+        <source>File</source>
+        <translation>Soubor</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="86"/>
+        <source>Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="91"/>
+        <source>Open database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="100"/>
+        <source>Login...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="105"/>
+        <location filename="../mainwindow.ui" line="108"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
--- a/core/autotablemodel.h
+++ b/core/autotablemodel.h
@ -89,6 +89,7 @@ public:
            for (int i = 0; i < entity->metaObject()->propertyCount(); i++) {
                if (i == section) {
                    QString colName(entity->metaObject()->property(i + 1).name());
+                    delete entity;
                    return tr(colName.toStdString().c_str());
                }
            }
--- a/core/context.cpp
+++ b/core/context.cpp
@ -6,6 +6,7 @@
 #include <QSqlResult>
 #include <QSqlError>
 #include <QDebug>
+#include <QTranslator>

 #include <odb/sqlite/database.hxx>

@ -49,6 +50,8 @@ void Context::loadPlugins()
    m_plugins.append(new Users);
    m_plugins.append(new Roles);

+    qApp->installTranslator(corePlugin->translator());
+
    QDir pluginsDir(qApp->applicationDirPath() + "/../plugins");

    foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) {
@ -59,6 +62,9 @@ void Context::loadPlugins()
            IPlugin *plugin = qobject_cast<IPlugin*>(p);
            if (plugin != NULL) {
                plugin->init(pluginLoader.metaData());
+
+                QTranslator *translator = plugin->translator();
+                qApp->installTranslator(translator);
                m_plugins.append(plugin);
            }
        }
--- a/core/core.pro
+++ b/core/core.pro
@ -146,3 +146,5 @@ else:unix: LIBS += -L$$OUT_PWD/../qdecimal/lib/ -lqdecimal -ldecnumber

 INCLUDEPATH += $$PWD/../qdecimal/src
 INCLUDEPATH += $$PWD/../qdecimal/decnumber
+
+TRANSLATIONS = translations/core_cz.ts
--- a/core/coreplugin.cpp
+++ b/core/coreplugin.cpp
@ -25,3 +25,11 @@ void CorePlugin::initServiceUi()
    m_settingsUi = new GlobalSettingsForm();
 }

+QTranslator *CorePlugin::translator()
+{
+    QTranslator *trans = new QTranslator();
+    trans->load(":/translations/core_" + QLocale::system().name());
+
+    return trans;
+}
+
--- a/core/coreplugin.h
+++ b/core/coreplugin.h
@ -12,6 +12,10 @@ public:
    // IMetaDataPlugin interface
 protected:
    virtual void initServiceUi();
+
+    // IPlugin interface
+public:
+    QTranslator *translator() override;
 };

 #endif // COREPLUGIN_H
--- a/core/gridform.h
+++ b/core/gridform.h
@ -98,6 +98,12 @@ public slots:
            hide.append(var.toInt());
        }

+        QMap<QString, QVariant> widths = Context::instance().settings()->value("grids/" + pluginId() + "/widths").toMap();
+        foreach (QString key, widths.keys()) {
+            tableView()->setColumnWidth(key.toInt(), widths[key].toInt());
+        }
+
+        connect(tableView()->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(widthChanged(int,int,int)));
        hideColumns(hide);
    }

--- a/core/igridform.cpp
+++ b/core/igridform.cpp
@ -2,6 +2,8 @@
 #include "ui_gridform.h"

 #include <QList>
+#include <QDebug>
+#include <QMap>

 #include "context.h"
 #include "filterui.h"
@ -108,6 +110,15 @@ void IGridForm::columnsAccepted()
    Context::instance().settings()->setValue("grids/" + pluginId() + "/hide", QVariant::fromValue(varList));
 }

+void IGridForm::widthChanged(int logicalIndex, int oldSize, int newSize)
+{
+    Q_UNUSED(oldSize);
+
+    QMap<QString, QVariant> widths = Context::instance().settings()->value("grids/" + pluginId() + "/widths").toMap();
+    widths[QString::number(logicalIndex)] = newSize;
+    Context::instance().settings()->setValue("grids/" + pluginId() + "/widths", QVariant::fromValue(widths));
+}
+

 void IGridForm::on_btnFilter_toggled(bool checked)
 {
--- a/core/igridform.h
+++ b/core/igridform.h
@ -48,6 +48,7 @@ private slots:
    void on_tableView_customContextMenuRequested(const QPoint &pos);
    void on_actionSelectColumns_triggered();
    void columnsAccepted();
+    void widthChanged(int logicalIndex, int oldSize, int newSize);

    void on_btnFilter_toggled(bool checked);

--- a/core/iplugin.h
+++ b/core/iplugin.h
@ -7,6 +7,7 @@
 #include <QJsonObject>
 #include <QStringList>
 #include <QIcon>
+#include <QTranslator>

 #include "service.h"
 #include "igridform.h"
@ -71,9 +72,8 @@ public:
        return (Service<T>*)m_service;
    }

-    virtual QIcon pluginIcon() {
-        return QIcon();
-    }
+    virtual QTranslator* translator() { return NULL; }
+    virtual QIcon pluginIcon() { return QIcon(); }

 protected:
    QWidget *m_ui;
--- a/core/translations/core_cs_CZ.qm
+++ b/core/translations/core_cs_CZ.qm
--- a/core/translations/core_cs_CZ.ts
+++ b/core/translations/core_cs_CZ.ts
@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="cs_CZ">
+<context>
+    <name>ColumnDialog</name>
+    <message>
+        <location filename="../columndialog.ui" line="14"/>
+        <source>Select columns</source>
+        <translation>Volba sloupcu</translation>
+    </message>
+</context>
+<context>
+    <name>FilterDialog</name>
+    <message>
+        <location filename="../filterdialog.ui" line="14"/>
+        <source>Manage filters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterdialog.cpp" line="63"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterdialog.cpp" line="63"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilterUi</name>
+    <message>
+        <location filename="../filterui.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="71"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="74"/>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="97"/>
+        <source>Load filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="117"/>
+        <location filename="../filterui.ui" line="120"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="140"/>
+        <location filename="../filterui.ui" line="143"/>
+        <source>Manage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="209"/>
+        <source>Add condition &quot;AND&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="214"/>
+        <source>Add condition &quot;OR&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.ui" line="219"/>
+        <source>Remove condition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.cpp" line="88"/>
+        <source>OR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filterui.cpp" line="88"/>
+        <source>AND</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FormDialog</name>
+    <message>
+        <location filename="../formdialog.ui" line="17"/>
+        <source>Edit record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../formdialog.cpp" line="32"/>
+        <source>Validation error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GlobalSettingsForm</name>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="20"/>
+        <source>Company info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="26"/>
+        <source>IC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="36"/>
+        <source>VAT number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="46"/>
+        <source>VAT payer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="56"/>
+        <source>Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="62"/>
+        <source>Firm Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="72"/>
+        <source>Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="82"/>
+        <source>House Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="92"/>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="102"/>
+        <source>ZIP code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="115"/>
+        <location filename="../settings/globalsettingsform.ui" line="121"/>
+        <source>Logo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settings/globalsettingsform.ui" line="128"/>
+        <source>Select file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GridForm</name>
+    <message>
+        <location filename="../gridform.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="23"/>
+        <source>Add record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="29"/>
+        <source>N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="52"/>
+        <source>Edit record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="55"/>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="75"/>
+        <location filename="../gridform.h" line="188"/>
+        <source>Delete record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="78"/>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="98"/>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="101"/>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="124"/>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="127"/>
+        <source>P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.ui" line="190"/>
+        <source>Select columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.h" line="138"/>
+        <location filename="../gridform.h" line="141"/>
+        <source>Database error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gridform.h" line="188"/>
+        <source>Realy delete this record?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RolesForm</name>
+    <message>
+        <location filename="../roles/rolesform.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../roles/rolesform.ui" line="23"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../roles/rolesform.ui" line="33"/>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../roles/rolesform.ui" line="52"/>
+        <source>Permissions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SaveFilterDialog</name>
+    <message>
+        <location filename="../savefilterdialog.ui" line="14"/>
+        <location filename="../savefilterdialog.ui" line="23"/>
+        <source>Filter name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsForm</name>
+    <message>
+        <location filename="../settingsform.ui" line="17"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UserForm</name>
+    <message>
+        <location filename="../users/userform.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="20"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="30"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="44"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="57"/>
+        <source>Is Admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="67"/>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="77"/>
+        <source>Roles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../users/userform.ui" line="91"/>
+        <source>Retype Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>