sorts the tanslated country now

2 files changed, 5 insertions, 2 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 100a6fd..654bbd2 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -1,46 +1,46 @@
 Stuff todo until OPIE 1.0 :
 
 Pending bugfixes from previous work:
 
 Urgent:
 
 
 Important:
 
 - Name order selected in "contacteditor" not used in list view.
 
 - Overview window cleanup needed..
 - Cursor keys should work in detail-view (ablabel)
   -> Ablabel should be removed and Abtable should be increased with
 	different views (as started by darwin zins)..
 - Store last settings of combo-boxes
 - Finishing of new View functions (List, Phonebook...)
-- The names of the countries are sorted by there english names, only..
-  Even if they are translated.. :S
 - Reload if contacts were changed externally
 - "What's this" should be added
 
 Less important:
 
 -  The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
 - Use advanced database functions in abtable to decrease
   memory footprint and to make everything more easy !
 	(abtable should store Iterator for selected Category)
 
 Should be Fixed (not absolute sure, need further validation):
 
 
 Fixed:
 - Syncing: abtable not reloaded after sync.
 - Find widget should be replaced by something like 
   qpdf has.
 - Adding a configuration dialog
 - Picker: Activated letter schould be more visible
 - Advanced handling of cursor keys (search..)
 - Mail-Icon is missing
 - Use opie-mail insted of qt-mail if possible.
 - Font menu is invisible using german translation
 - Personal contact editor: Disable categories
 - "Nonenglish" translation bug has to be fixed.
 - contacteditor: Birthday, annyversary, ... : Use Dateselector
+- The names of the countries are sorted by there english names, only..
+  Even if they are translated.. :S
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index a59a927..52ab0f2 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -17,48 +17,49 @@
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
 #include "addresspicker.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 #include <qpe/timeconversion.h>
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qpopupmenu.h> 
+#include <qlistbox.h> 
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
 		   const QString &strOtherEmail, QString &strBack );
 
 ContactEditor::ContactEditor(	const OContact &entry,
 				const QValueList<int> *newOrderedValues,
 				QStringList *slNewOrdered,
 				QWidget *parent,
 				const char *name,
 				WFlags fl )
 	: QDialog( parent, name, TRUE, fl ),
 	  orderedValues( newOrderedValues ),
 	  slOrdered( *slNewOrdered ),
 	  m_personalView ( false )
 {
@@ -676,48 +677,50 @@ void ContactEditor::init() {
 	cmbCountry->insertItem( tr ( "Taiwan" ) );
 	cmbCountry->insertItem( tr ( "Tajikistan" ) );
 	cmbCountry->insertItem( tr ( "Tanzania" ) );
 	cmbCountry->insertItem( tr ( "Thailand" ) );
 	cmbCountry->insertItem( tr ( "Togo" ) );
 	cmbCountry->insertItem( tr ( "Tokelau" ) );
 	cmbCountry->insertItem( tr ( "Tonga" ) );
 	cmbCountry->insertItem( tr ( "Tunisia" ) );
 	cmbCountry->insertItem( tr ( "Turkey" ) );
 	cmbCountry->insertItem( tr ( "Turkmenistan" ) );
 	cmbCountry->insertItem( tr ( "Tuvalu" ) );
 	cmbCountry->insertItem( tr ( "Uganda" ) );
 	cmbCountry->insertItem( tr ( "Ukraine" ) );
 	cmbCountry->insertItem( tr ( "Uruguay" ) );
 	cmbCountry->insertItem( tr ( "Uzbekistan" ) );
 	cmbCountry->insertItem( tr ( "Vanuatu" ) );
 	cmbCountry->insertItem( tr ( "Venezuela" ) );
 	cmbCountry->insertItem( tr ( "Viet Nam" ) );
 	cmbCountry->insertItem( tr ( "Virgin Islands" ) );
 	cmbCountry->insertItem( tr ( "Western Sahara" ) );
 	cmbCountry->insertItem( tr ( "Yemen" ) );
 	cmbCountry->insertItem( tr ( "Yugoslavia" ) );
 	cmbCountry->insertItem( tr ( "Zambia" ) );
 	cmbCountry->insertItem( tr ( "Zimbabwe" ) );
+	if (cmbCountry->listBox()!=0)
+ 	  cmbCountry->listBox()->sort();
 
 	cmbCountry->setMaximumWidth( 135 );
 
 	gl->addMultiCellWidget( cmbCountry, 5, 5, 1, 2 );
 
 	cmbChooserField4 = new QComboBox( FALSE, container );
 	cmbChooserField4->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField4, 6, 0 );
 	txtChooserField4 = new QLineEdit( container );
 	gl->addMultiCellWidget( txtChooserField4, 6, 6, 1, 2 );
 
 	QSpacerItem *space = new QSpacerItem(1,1,
                                              QSizePolicy::Maximum,
                                              QSizePolicy::MinimumExpanding );
 	gl->addItem( space, 7, 0 );
 
 	tabMain->insertTab( tabViewport, tr( "Address" ) );
 
 	tabViewport = new QWidget ( tabMain );
 
 	vb = new QVBoxLayout( tabViewport );
 
 	svDetails = new QScrollView( tabViewport );
 	vb->addWidget( svDetails, 0, 0 );