author | tille <tille> | 2002-10-25 21:13:51 (UTC) |
---|---|---|
committer | tille <tille> | 2002-10-25 21:13:51 (UTC) |
commit | 595407074ac5724eb33aeb151ce27e38fbca21d5 (patch) (unidiff) | |
tree | 5f29c9fe9e2c06cc887726e475e50da47e67803c | |
parent | 437330505960e2783e088049665e0a11b2dc7edb (diff) | |
download | opie-595407074ac5724eb33aeb151ce27e38fbca21d5.zip opie-595407074ac5724eb33aeb151ce27e38fbca21d5.tar.gz opie-595407074ac5724eb33aeb151ce27e38fbca21d5.tar.bz2 |
sorts the tanslated country now
-rw-r--r-- | core/pim/addressbook/TODO | 4 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 3 |
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 | |||
@@ -12,14 +12,12 @@ Important: | |||
12 | - Overview window cleanup needed.. | 12 | - Overview window cleanup needed.. |
13 | - Cursor keys should work in detail-view (ablabel) | 13 | - Cursor keys should work in detail-view (ablabel) |
14 | -> Ablabel should be removed and Abtable should be increased with | 14 | -> Ablabel should be removed and Abtable should be increased with |
15 | different views (as started by darwin zins).. | 15 | different views (as started by darwin zins).. |
16 | - Store last settings of combo-boxes | 16 | - Store last settings of combo-boxes |
17 | - Finishing of new View functions (List, Phonebook...) | 17 | - Finishing of new View functions (List, Phonebook...) |
18 | - The names of the countries are sorted by there english names, only.. | ||
19 | Even if they are translated.. :S | ||
20 | - Reload if contacts were changed externally | 18 | - Reload if contacts were changed externally |
21 | - "What's this" should be added | 19 | - "What's this" should be added |
22 | 20 | ||
23 | Less important: | 21 | Less important: |
24 | 22 | ||
25 | - The picker (alphabetical sort widget) should be | 23 | - The picker (alphabetical sort widget) should be |
@@ -41,6 +39,8 @@ Fixed: | |||
41 | - Mail-Icon is missing | 39 | - Mail-Icon is missing |
42 | - Use opie-mail insted of qt-mail if possible. | 40 | - Use opie-mail insted of qt-mail if possible. |
43 | - Font menu is invisible using german translation | 41 | - Font menu is invisible using german translation |
44 | - Personal contact editor: Disable categories | 42 | - Personal contact editor: Disable categories |
45 | - "Nonenglish" translation bug has to be fixed. | 43 | - "Nonenglish" translation bug has to be fixed. |
46 | - contacteditor: Birthday, annyversary, ... : Use Dateselector | 44 | - contacteditor: Birthday, annyversary, ... : Use Dateselector |
45 | - The names of the countries are sorted by there english names, only.. | ||
46 | 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 | |||
@@ -35,12 +35,13 @@ | |||
35 | #include <qscrollview.h> | 35 | #include <qscrollview.h> |
36 | #include <qtoolbutton.h> | 36 | #include <qtoolbutton.h> |
37 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
38 | #include <qmainwindow.h> | 38 | #include <qmainwindow.h> |
39 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
40 | #include <qpopupmenu.h> | 40 | #include <qpopupmenu.h> |
41 | #include <qlistbox.h> | ||
41 | 42 | ||
42 | static inline bool containsAlphaNum( const QString &str ); | 43 | static inline bool containsAlphaNum( const QString &str ); |
43 | static inline bool constainsWhiteSpace( const QString &str ); | 44 | static inline bool constainsWhiteSpace( const QString &str ); |
44 | 45 | ||
45 | // helper functions, convert our comma delimited list to proper | 46 | // helper functions, convert our comma delimited list to proper |
46 | // file format... | 47 | // file format... |
@@ -694,12 +695,14 @@ void ContactEditor::init() { | |||
694 | cmbCountry->insertItem( tr ( "Virgin Islands" ) ); | 695 | cmbCountry->insertItem( tr ( "Virgin Islands" ) ); |
695 | cmbCountry->insertItem( tr ( "Western Sahara" ) ); | 696 | cmbCountry->insertItem( tr ( "Western Sahara" ) ); |
696 | cmbCountry->insertItem( tr ( "Yemen" ) ); | 697 | cmbCountry->insertItem( tr ( "Yemen" ) ); |
697 | cmbCountry->insertItem( tr ( "Yugoslavia" ) ); | 698 | cmbCountry->insertItem( tr ( "Yugoslavia" ) ); |
698 | cmbCountry->insertItem( tr ( "Zambia" ) ); | 699 | cmbCountry->insertItem( tr ( "Zambia" ) ); |
699 | cmbCountry->insertItem( tr ( "Zimbabwe" ) ); | 700 | cmbCountry->insertItem( tr ( "Zimbabwe" ) ); |
701 | if (cmbCountry->listBox()!=0) | ||
702 | cmbCountry->listBox()->sort(); | ||
700 | 703 | ||
701 | cmbCountry->setMaximumWidth( 135 ); | 704 | cmbCountry->setMaximumWidth( 135 ); |
702 | 705 | ||
703 | gl->addMultiCellWidget( cmbCountry, 5, 5, 1, 2 ); | 706 | gl->addMultiCellWidget( cmbCountry, 5, 5, 1, 2 ); |
704 | 707 | ||
705 | cmbChooserField4 = new QComboBox( FALSE, container ); | 708 | cmbChooserField4 = new QComboBox( FALSE, container ); |