Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/optiondialog.h @ 51:c59d5a3a8ff3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
0.9.80
author joachim99
date Tue, 09 Dec 2003 20:29:43 +0000
parents 86d21651c8db
children 8af4bb9d9a5a
comparison
equal deleted inserted replaced
50:8c9752066f09 51:c59d5a3a8ff3
16 * along with this program; if not, write to the Free Software 16 * along with this program; if not, write to the Free Software
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 * 18 *
19 */ 19 */
20 20
21 /***************************************************************************
22 * $Log$
23 * Revision 1.1 2003/10/06 18:38:48 joachim99
24 * KDiff3 version 0.9.70
25 * *
26 ***************************************************************************/
27
28 #ifndef OPTION_DIALOG_H 21 #ifndef OPTION_DIALOG_H
29 #define OPTION_DIALOG_H 22 #define OPTION_DIALOG_H
30 23
31 class QCheckBox; 24 class QCheckBox;
32 class QLabel; 25 class QLabel;
39 #include <qstringlist.h> 32 #include <qstringlist.h>
40 #include <list> 33 #include <list>
41 34
42 class OptionItem; 35 class OptionItem;
43 class KKeyDialog; 36 class KKeyDialog;
37
44 38
45 class OptionDialog : public KDialogBase 39 class OptionDialog : public KDialogBase
46 { 40 {
47 Q_OBJECT 41 Q_OBJECT
48 42
67 61
68 bool m_bReplaceTabs; 62 bool m_bReplaceTabs;
69 bool m_bAutoIndentation; 63 bool m_bAutoIndentation;
70 int m_tabSize; 64 int m_tabSize;
71 bool m_bAutoCopySelection; 65 bool m_bAutoCopySelection;
66 bool m_bStringEncoding;
72 67
73 bool m_bIgnoreTrivialMatches;
74 int m_maxSearchLength;
75 bool m_bPreserveCarriageReturn; 68 bool m_bPreserveCarriageReturn;
76 bool m_bUseExternalDiff;
77 bool m_bTryHard; 69 bool m_bTryHard;
70 bool m_bShowWhiteSpaceCharacters;
78 bool m_bShowWhiteSpace; 71 bool m_bShowWhiteSpace;
79 bool m_bShowLineNumbers; 72 bool m_bShowLineNumbers;
80 bool m_bHorizDiffWindowSplitting; 73 bool m_bHorizDiffWindowSplitting;
81 74
82 bool m_bIgnoreWhiteSpace; 75 int m_whiteSpace2FileMergeDefault;
76 int m_whiteSpace3FileMergeDefault;
83 bool m_bUpCase; 77 bool m_bUpCase;
84 bool m_bIgnoreNumbers; 78 bool m_bIgnoreNumbers;
79 bool m_bIgnoreComments;
85 QString m_PreProcessorCmd; 80 QString m_PreProcessorCmd;
86 QString m_LineMatchingPreProcessorCmd; 81 QString m_LineMatchingPreProcessorCmd;
87 82
88 bool m_bAutoAdvance; 83 bool m_bAutoAdvance;
89 int m_autoAdvanceDelay; 84 int m_autoAdvanceDelay;
100 bool m_bDmFollowFileLinks; 95 bool m_bDmFollowFileLinks;
101 bool m_bDmFollowDirLinks; 96 bool m_bDmFollowDirLinks;
102 bool m_bDmFindHidden; 97 bool m_bDmFindHidden;
103 bool m_bDmCreateBakFiles; 98 bool m_bDmCreateBakFiles;
104 bool m_bDmTrustDate; 99 bool m_bDmTrustDate;
100 bool m_bDmTrustSize;
105 bool m_bDmCopyNewer; 101 bool m_bDmCopyNewer;
106 bool m_bDmShowOnlyDeltas; 102 bool m_bDmShowOnlyDeltas;
107 bool m_bDmUseCvsIgnore; 103 bool m_bDmUseCvsIgnore;
108 QString m_DmFilePattern; 104 QString m_DmFilePattern;
109 QString m_DmFileAntiPattern; 105 QString m_DmFileAntiPattern;
122 virtual void slotApply( void ); 118 virtual void slotApply( void );
123 virtual void slotHelp( void ); 119 virtual void slotHelp( void );
124 120
125 private: 121 private:
126 void resetToDefaults(); 122 void resetToDefaults();
127 123
128 std::list<OptionItem*> m_optionItemList; 124 std::list<OptionItem*> m_optionItemList;
129 125
130 // FontConfigDlg 126 // FontConfigDlg
131 KFontChooser *m_fontChooser; 127 KFontChooser *m_fontChooser;
132 128
133 private: 129 private:
134 void setupFontPage(); 130 void setupFontPage();
135 void setupColorPage(); 131 void setupColorPage();
136 void setupEditPage(); 132 void setupEditPage();
137 void setupDiffPage(); 133 void setupDiffPage();
138 void setupDirectoryMergePage(); 134 void setupDirectoryMergePage();
139 void setupKeysPage(); 135 void setupKeysPage();
136 void setupOtherOptions();
140 }; 137 };
141 138
142 139
143 140
144 #endif 141 #endif