diff kdiff3/src/optiondialog.h @ 58:8af4bb9d9a5a

Version 0.9.83

--- a/kdiff3/src/optiondialog.h	Sat Jan 31 14:25:47 2004 +0000
+++ b/kdiff3/src/optiondialog.h	Sun Mar 07 09:59:09 2004 +0000
@@ -35,6 +35,11 @@
 class OptionItem;
 class KKeyDialog;
 
+enum eLineEndStyle
+{
+   eLineEndUnix=0,
+   eLineEndDos
+};
 
 class OptionDialog : public KDialogBase
 {
@@ -64,6 +69,7 @@
     int  m_tabSize;
     bool m_bAutoCopySelection;
     bool m_bStringEncoding;
+    int  m_lineEndStyle;
 
     bool m_bPreserveCarriageReturn;
     bool m_bTryHard;
@@ -105,6 +111,9 @@
     QString m_DmFileAntiPattern;
     QString m_DmDirAntiPattern;
 
+    QString m_language;
+    QString m_fileCodec;
+    
     void saveOptions(KConfig* config);
     void readOptions(KConfig* config);
 
@@ -133,11 +142,13 @@
     void setupDiffPage();
     void setupDirectoryMergePage();
     void setupKeysPage();
+    void setupRegionalPage();
     void setupOtherOptions();
 };
 
 
 
+
 #endif