From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Tue, 7 Sep 2010 10:14:11 +0000 (+0200)
Subject: Fixed translations
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=edc4669b669b0699633997879b590acc7d1fc043;p=mdictionary

Fixed translations
---

diff --git a/data/translations/en_US.qm b/data/translations/en_US.qm
new file mode 100644
index 0000000..9dad8df
Binary files /dev/null and b/data/translations/en_US.qm differ
diff --git a/data/translations/pl_PL.qm b/data/translations/pl_PL.qm
new file mode 100644
index 0000000..3b3a37b
Binary files /dev/null and b/data/translations/pl_PL.qm differ
diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index a26c999..f2fab3c 100644
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -62,9 +62,6 @@ void MainWindow::initializeUI() {
     #endif
 
 
-    setWindowIcon(QIcon(":/icons/64x64/mdictionary.png"));
-    setWindowTitle("mDictionary");
-
     /*translationWidget is another stacked window, so we don't add it to
       layout, only create it with this widget as parent
       it must be created as first object in main window, otherwise sometimes
@@ -72,6 +69,12 @@ void MainWindow::initializeUI() {
       it segfaults*/
     translationWidget = new TranslationWidget(this);
 
+
+
+
+    setWindowIcon(QIcon(":/icons/64x64/mdictionary.png"));
+    setWindowTitle("mDictionary");
+
     mainLayout = new QVBoxLayout();
     QWidget* w = new QWidget();
     w->setLayout(mainLayout);
diff --git a/src/mdictionary/gui/main.cpp b/src/mdictionary/gui/main.cpp
index 2982155..69be667 100644
--- a/src/mdictionary/gui/main.cpp
+++ b/src/mdictionary/gui/main.cpp
@@ -57,20 +57,19 @@ QStringList parseParameters(int argc, char *argv[]) {
 void retranslate() {
     QString locale = QLocale::system().name();
 
-    QTranslator translator;
-    QTranslator qtTranslator;
+    QTranslator *translator = new QTranslator;
+    QTranslator *qtTranslator = new QTranslator;
 
-    qtTranslator.load("qt_" + locale,
+    qtTranslator->load("qt_" + locale,
     QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-    QCoreApplication::installTranslator(&qtTranslator);
+    QCoreApplication::installTranslator(qtTranslator);
 
-    qDebug()<<locale;
-    if(!translator.load(":/translations/" + locale)) {
-        translator.load(":/translations/en_US");
+    if(!translator->load(":/translations/" + locale)) {
+        translator->load(":/translations/en_US");
 
     }
 
-    QCoreApplication::installTranslator(&translator);
+    QCoreApplication::installTranslator(translator);
 }
 
 int main(int argc, char *argv[]) {
diff --git a/src/plugins/google/GoogleDialog.cpp b/src/plugins/google/GoogleDialog.cpp
index 9bfe817..a8dd8ab 100644
--- a/src/plugins/google/GoogleDialog.cpp
+++ b/src/plugins/google/GoogleDialog.cpp
@@ -74,8 +74,7 @@ void GoogleDialog::initializeUI() {
 
 
     langLayout = new QVBoxLayout;
-    langFromLayout = new QHBoxLayout;
-    langToLayout = new QHBoxLayout;
+    langsFormLayout = new QFormLayout;
     changeLangLayout = new QHBoxLayout;
 
 
@@ -122,14 +121,11 @@ void GoogleDialog::initializeUI() {
     langToComboBox->setCurrentIndex(actualLangTo);
     langFromComboBox->setCurrentIndex(actualLangFrom);
 
-    langFromLayout->addWidget(langFromLabel);
-    langFromLayout->addWidget(langFromComboBox);
+    langLayout->addLayout(langsFormLayout);
 
-    langToLayout->addWidget(langToLabel);
-    langToLayout->addWidget(langToComboBox);
+    langsFormLayout->addRow(langFromLabel, langFromComboBox);
 
-    langLayout->addLayout(langFromLayout);
-    langLayout->addLayout(langToLayout);
+    langsFormLayout->addRow(langToLabel, langToComboBox);
 
     changeLangLayout->addLayout(langLayout);
     changeLangLayout->addWidget(changeLangButton);
diff --git a/src/plugins/google/GoogleDialog.h b/src/plugins/google/GoogleDialog.h
index e448589..289b349 100644
--- a/src/plugins/google/GoogleDialog.h
+++ b/src/plugins/google/GoogleDialog.h
@@ -104,8 +104,7 @@ private:
     QComboBox *langToComboBox;
     QVBoxLayout* verticalLayout;
     QVBoxLayout* langLayout;
-    QHBoxLayout* langFromLayout;
-    QHBoxLayout* langToLayout;
+    QFormLayout* langsFormLayout;
     QHBoxLayout* changeLangLayout;
     QString _langFrom;
     QString _langTo;
diff --git a/src/plugins/google/translations/en_US.qm b/src/plugins/google/translations/en_US.qm
new file mode 100644
index 0000000..9dad8df
Binary files /dev/null and b/src/plugins/google/translations/en_US.qm differ
diff --git a/src/plugins/xdxf/translations/en_US.qm b/src/plugins/xdxf/translations/en_US.qm
new file mode 100644
index 0000000..900f716
Binary files /dev/null and b/src/plugins/xdxf/translations/en_US.qm differ