Changed preferred language algorithm to the new one - now feature has two names:

- default "name"
- "name:<my native lang>" OR "int_name" OR "name:en"

Also houses names are drawn if house has a number and a name

1 files changed, 0 insertions, 117 deletions

diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 7281d434ab..8a4b684999 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -1,6 +1,5 @@
 #include "preferences_dialog.hpp"
 
-#include "../platform/languages.hpp"
 #include "../platform/settings.hpp"
 
 #include <QtGui/QIcon>
@@ -24,27 +23,6 @@ namespace qt
     setWindowIcon(icon);
     setWindowTitle(tr("Preferences"));
 
-    m_pTable = new QTableWidget(0, 2, this);
-    m_pTable->setAlternatingRowColors(true);
-    m_pTable->setShowGrid(false);
-    m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_pTable->verticalHeader()->setVisible(false);
-    m_pTable->horizontalHeader()->setVisible(false);
-    m_pTable->horizontalHeader()->setStretchLastSection(true);
-
-    languages::CodesAndNamesT langList;
-    languages::GetCurrentSettings(langList);
-    for (size_t i = 0; i < langList.size(); ++i)
-    {
-      m_pTable->insertRow(i);
-      QTableWidgetItem * c1 = new QTableWidgetItem(langList[i].first.c_str());
-      c1->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-      m_pTable->setItem(i, 0, c1);
-      QTableWidgetItem * c2 = new QTableWidgetItem(QString::fromUtf8(langList[i].second.c_str()));
-      c2->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-      m_pTable->setItem(i, 1, c2);
-    }
-
     m_pUnits = new QButtonGroup(this);
     QGroupBox * radioBox = new QGroupBox("System of measurement");
     {
@@ -80,27 +58,6 @@ namespace qt
       connect(m_pUnits, SIGNAL(buttonClicked(int)), this, SLOT(OnUnitsChanged(int)));
     }
 
-    QHBoxLayout * tableLayout = new QHBoxLayout();
-    {
-      QPushButton * upButton = new QPushButton();
-      upButton->setIcon(QIcon(":/navig64/up.png"));
-      upButton->setToolTip(tr("Move up"));
-      upButton->setDefault(false);
-      connect(upButton, SIGNAL(clicked()), this, SLOT(OnUpClick()));
-
-      QPushButton * downButton = new QPushButton();
-      downButton->setIcon(QIcon(":/navig64/down.png"));
-      downButton->setToolTip(tr("Move down"));
-      downButton->setDefault(false);
-      connect(downButton, SIGNAL(clicked()), this, SLOT(OnDownClick()));
-
-      QVBoxLayout * vBox = new QVBoxLayout();
-      vBox->addWidget(upButton);
-      vBox->addWidget(downButton);
-
-      tableLayout->addLayout(vBox);
-      tableLayout->addWidget(m_pTable);
-    }
 
     QHBoxLayout * bottomLayout = new QHBoxLayout();
     {
@@ -116,12 +73,8 @@ namespace qt
 
     QVBoxLayout * finalLayout = new QVBoxLayout();
     finalLayout->addWidget(radioBox);
-    finalLayout->addLayout(tableLayout);
     finalLayout->addLayout(bottomLayout);
     setLayout(finalLayout);
-
-    if (m_pTable->rowCount() > 0)
-      m_pTable->selectRow(0);
   }
 
   void PreferencesDialog::OnCloseClick()
@@ -129,76 +82,6 @@ namespace qt
     done(0);
   }
 
-  static void SwapRows(QTableWidget & widget, int row1, int row2)
-  {
-    QTableWidgetItem * c0 = widget.takeItem(row1, 0);
-    QTableWidgetItem * c1 = widget.takeItem(row1, 1);
-    widget.setItem(row1, 0, widget.takeItem(row2, 0));
-    widget.setItem(row1, 1, widget.takeItem(row2, 1));
-    widget.setItem(row2, 0, c0);
-    widget.setItem(row2, 1, c1);
-  }
-
-  static void ShiftSelectionRange(QList<QTableWidgetSelectionRange> & range, int offset)
-  {
-    QList<QTableWidgetSelectionRange> newRange;
-    for (int i = 0; i < range.size(); ++i)
-      newRange.append(QTableWidgetSelectionRange(range[i].topRow() + offset,
-                                                 range[i].leftColumn(),
-                                                 range[i].bottomRow() + offset,
-                                                 range[i].rightColumn()));
-    range = newRange;
-  }
-
-  void PreferencesDialog::OnUpClick()
-  {
-    QList<QTableWidgetSelectionRange> selection = m_pTable->selectedRanges();
-    int const selSize = selection.size();
-    if (selSize && selection[0].topRow() > 0)
-    {
-      for (int i = 0; i < selSize; ++i)
-      {
-        m_pTable->setRangeSelected(selection[i], false);
-        for (int j = selection[i].topRow(); j < selection[i].topRow() + selection[i].rowCount(); ++j)
-          SwapRows(*m_pTable, j, j - 1);
-      }
-
-      ShiftSelectionRange(selection, -1);
-      for (int i = 0; i < selSize; ++i)
-        m_pTable->setRangeSelected(selection[i], true);
-      m_pTable->scrollToItem(m_pTable->item(selection[0].topRow(), 0));
-    }
-  }
-
-  void PreferencesDialog::OnDownClick()
-  {
-    QList<QTableWidgetSelectionRange> selection = m_pTable->selectedRanges();
-    int const selSize = selection.size();
-    if (selSize && selection[selSize - 1].bottomRow() < m_pTable->rowCount() - 1)
-    {
-      for (int i = selSize - 1; i >= 0; --i)
-      {
-        m_pTable->setRangeSelected(selection[i], false);
-        for (int j = selection[i].bottomRow(); j > selection[i].bottomRow() - selection[i].rowCount(); --j)
-          SwapRows(*m_pTable, j, j + 1);
-      }
-      ShiftSelectionRange(selection, +1);
-      for (int i = 0; i < selSize; ++i)
-        m_pTable->setRangeSelected(selection[i], true);
-      m_pTable->scrollToItem(m_pTable->item(selection[selSize - 1].bottomRow(), 0));
-    }
-  }
-
-  void PreferencesDialog::done(int code)
-  {
-    languages::CodesT langCodes;
-    for (int i = 0; i < m_pTable->rowCount(); ++i)
-      langCodes.push_back(m_pTable->item(i, 0)->text().toUtf8().constData());
-    languages::SaveSettings(langCodes);
-
-    base_t::done(code);
-  }
-
   void PreferencesDialog::OnUnitsChanged(int i)
   {
     using namespace Settings;