[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kbabel_svn/catalogmanager/libcvs
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2005-09-01 13:06:02
Message-ID: 1125579962.561686.10689.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455813 by goutte:

Add the last used encoding to the combo box, only after the encoding has been
read from the settings


 M  +2 -4      cvsdialog.cpp  


--- branches/work/kbabel_svn/catalogmanager/libcvs/cvsdialog.cpp #455812:455813
@@ -115,10 +115,7 @@
     layout->addWidget( label );
     layout->addWidget( m_encodingComboBox );
     QStringList encodingList;
-#if 0
-    // ### FIXME: m_encoding is not initialzed correctly yet!
-    encodingList << i18n( "Descriptive encoding name", "Last choice (%1)" ).arg( \
                m_encoding );
-#endif
+    // The last encoding will be added at the top of the list, when the seetings \
                will be read.
     encodingList << i18n( "Descriptive encoding name", "Recommended (%1)" ).arg( \
                "UTF-8" );
     encodingList << i18n( "Descriptive encoding name", "Locale (%1)" ).arg( \
QTextCodec::codecForLocale()->mimeName() );  encodingList += \
KGlobal::charsets()->descriptiveEncodingNames(); @@ -383,6 +380,7 @@
 
     // ### FIXME: that is called too late!
     m_encoding = config->readEntry( "CVSEncoding", "UTF-8" );
+    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice \
(%1)" ).arg( m_encoding ), 0);  }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]