CVS commit by dang: 


Less cryptic (but longer) encoding names.
Now why doesn't QSizePolicy::MinimumExpanding automagically expand the combobox horizontally so that the full encoding names can be seen without maximising the window?

CCMAIL: koffice-devel@kde.org,dang@kde.org


  M +2 -3      ExportDialog.cc   1.8
  M +2 -3      ImportDialog.cc   1.7


--- koffice/filters/kword/ascii/ExportDialog.cc  #1.7:1.8
@@ -42,5 +42,5 @@ AsciiExportDialog :: AsciiExportDialog(Q
     kapp->restoreOverrideCursor();
 
-    QStringList encodings(KGlobal::charsets()->availableEncodingNames());
+    QStringList encodings(KGlobal::charsets()->descriptiveEncodingNames());
     // Add a few non-standard encodings
     encodings << "Apple Roman"; // Apple 
@@ -49,5 +49,4 @@ AsciiExportDialog :: AsciiExportDialog(Q
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
-    //m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     resize(size()); // Is this right?

--- koffice/filters/kword/ascii/ImportDialog.cc  #1.6:1.7
@@ -39,5 +39,5 @@ AsciiImportDialog :: AsciiImportDialog(Q
     kapp->restoreOverrideCursor();
 
-    QStringList encodings(KGlobal::charsets()->availableEncodingNames());
+    QStringList encodings(KGlobal::charsets()->descriptiveEncodingNames());
     // Add a few non-standard encodings
     encodings << "Apple Roman"; // Apple 
@@ -46,5 +46,4 @@ AsciiImportDialog :: AsciiImportDialog(Q
 
     m_dialog->comboBoxEncoding->insertStringList(encodings);
-    //m_dialog->comboBoxEncoding->insertStringList(encodings);
 
     resize(size()); // Is this right?


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel