Differential D20850 Diff 57066 libdialogpages/diffpage.cpp

Changeset View

Standalone View

View Options

libdialogpages/diffpage.cpp

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s)
62{ 62​{
63 m_settings = nullptr; 63​ m_settings = nullptr;
64} 64​}
65 65​
66void DiffPage::setSettings(DiffSettings* setts) 66​void DiffPage::setSettings(DiffSettings* setts)
67{ 67​{
68 m_settings = setts; 68​ m_settings = setts;
69 69​
70 m_diffURLRequester->setUrl(QUrl::fromLocalFile(m_settings->m_diffProgram)); 70​ m_diffURLRequester->setText(m_settings->m_diffProgram);
71 71​
72 m_newFilesCheckBox->setChecked(m_settings->m_newFiles); 72​ m_newFilesCheckBox->setChecked(m_settings->m_newFiles);
73 m_smallerCheckBox->setChecked(m_settings->m_createSmallerDiff); 73​ m_smallerCheckBox->setChecked(m_settings->m_createSmallerDiff);
74 m_largerCheckBox->setChecked(m_settings->m_largeFiles); 74​ m_largerCheckBox->setChecked(m_settings->m_largeFiles);
75 m_tabsCheckBox->setChecked(m_settings->m_convertTabsToSpaces); 75​ m_tabsCheckBox->setChecked(m_settings->m_convertTabsToSpaces);
76 m_caseCheckBox->setChecked(m_settings->m_ignoreChangesInCase); 76​ m_caseCheckBox->setChecked(m_settings->m_ignoreChangesInCase);
77 m_linesCheckBox->setChecked(m_settings->m_ignoreEmptyLines); 77​ m_linesCheckBox->setChecked(m_settings->m_ignoreEmptyLines);
78 m_whitespaceCheckBox->setChecked(m_settings->m_ignoreWhiteSpace); 78​ m_whitespaceCheckBox->setChecked(m_settings->m_ignoreWhiteSpace);
Show All 25 Lines
104 104​
105void DiffPage::restore() 105​void DiffPage::restore()
106{ 106​{
107 // this shouldn't do a thing... 107​ // this shouldn't do a thing...
108} 108​}
109 109​
110void DiffPage::apply() 110​void DiffPage::apply()
111{ 111​{
112 m_settings->m_diffProgram = m_diffURLRequester->url().toLocalFile(); 112​ m_settings->m_diffProgram = m_diffURLRequester->text();
113 113​
114 m_settings->m_newFiles = m_newFilesCheckBox->isChecked(); 114​ m_settings->m_newFiles = m_newFilesCheckBox->isChecked();
115 m_settings->m_largeFiles = m_largerCheckBox->isChecked(); 115​ m_settings->m_largeFiles = m_largerCheckBox->isChecked();
116 m_settings->m_createSmallerDiff = m_smallerCheckBox->isChecked(); 116​ m_settings->m_createSmallerDiff = m_smallerCheckBox->isChecked();
117 m_settings->m_convertTabsToSpaces = m_tabsCheckBox->isChecked(); 117​ m_settings->m_convertTabsToSpaces = m_tabsCheckBox->isChecked();
118 m_settings->m_ignoreChangesInCase = m_caseCheckBox->isChecked(); 118​ m_settings->m_ignoreChangesInCase = m_caseCheckBox->isChecked();
119 m_settings->m_ignoreEmptyLines = m_linesCheckBox->isChecked(); 119​ m_settings->m_ignoreEmptyLines = m_linesCheckBox->isChecked();
120 m_settings->m_ignoreWhiteSpace = m_whitespaceCheckBox->isChecked(); 120​ m_settings->m_ignoreWhiteSpace = m_whitespaceCheckBox->isChecked();
Show All 15 Lines
136 m_settings->m_excludeFilesFileURL = m_excludeFileURLComboBox->currentText(); 136​ m_settings->m_excludeFilesFileURL = m_excludeFileURLComboBox->currentText();
137 m_settings->m_excludeFilesFileHistoryList = m_excludeFileURLComboBox->urls(); 137​ m_settings->m_excludeFilesFileHistoryList = m_excludeFileURLComboBox->urls();
138 138​
139 m_settings->saveSettings(KSharedConfig::openConfig().data()); 139​ m_settings->saveSettings(KSharedConfig::openConfig().data());
140} 140​}
141 141​
142void DiffPage::setDefaults() 142​void DiffPage::setDefaults()
143{ 143​{
144 m_diffURLRequester->setUrl(QUrl::fromLocalFile(QStringLiteral("diff"))); 144​ m_diffURLRequester->setText(QString());
145 m_newFilesCheckBox->setChecked(true); 145​ m_newFilesCheckBox->setChecked(true);
146 m_smallerCheckBox->setChecked(true); 146​ m_smallerCheckBox->setChecked(true);
147 m_largerCheckBox->setChecked(true); 147​ m_largerCheckBox->setChecked(true);
148 m_tabsCheckBox->setChecked(false); 148​ m_tabsCheckBox->setChecked(false);
149 m_caseCheckBox->setChecked(false); 149​ m_caseCheckBox->setChecked(false);
150 m_linesCheckBox->setChecked(false); 150​ m_linesCheckBox->setChecked(false);
151 m_whitespaceCheckBox->setChecked(false); 151​ m_whitespaceCheckBox->setChecked(false);
152 m_allWhitespaceCheckBox->setChecked(false); 152​ m_allWhitespaceCheckBox->setChecked(false);
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)196{
198 QVBoxLayout* layout = new QVBoxLayout(page); 198​ QVBoxLayout* layout = new QVBoxLayout(page);
199 199​
200 // add diff program selector 200​ // add diff program selector
201 m_diffProgramGroup = new QGroupBox(page); 201​ m_diffProgramGroup = new QGroupBox(page);
202 layout->addWidget(m_diffProgramGroup); 202​ layout->addWidget(m_diffProgramGroup);
203 QVBoxLayout* bgLayout = new QVBoxLayout(m_diffProgramGroup); 203​ QVBoxLayout* bgLayout = new QVBoxLayout(m_diffProgramGroup);
204 m_diffProgramGroup->setTitle(i18n("Diff Program")); 204​ m_diffProgramGroup->setTitle(i18n("Diff Program"));
205 205​
206​ // using the "text" property over the "url" property, to also allow plain executable names instead of full path
206 m_diffURLRequester = new KUrlRequester(m_diffProgramGroup); 207​ m_diffURLRequester = new KUrlRequester(m_diffProgramGroup);
207 m_diffURLRequester->setObjectName(QStringLiteral("diffURLRequester")); 208​ m_diffURLRequester->setObjectName(QStringLiteral("diffURLRequester"));
208 m_diffURLRequester->setWhatsThis(i18n("You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version.")); 209​ m_diffURLRequester->setWhatsThis(i18n("You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version."));
210​ m_diffURLRequester->setPlaceholderText(QStringLiteral("diff"));
209 bgLayout->addWidget(m_diffURLRequester); 211​ bgLayout->addWidget(m_diffURLRequester);
210 212​
211 layout->addStretch(1); 213​ layout->addStretch(1);
212 214​
213 m_tabWidget->addTab(page, i18n("Diff")); 215​ m_tabWidget->addTab(page, i18n("Diff"));
214} 216​}
215 217​
216void DiffPage::addFormatTab() 218​void DiffPage::addFormatTab()
▲ Show 20 Lines • Show All 169 Lines • Show Last 20 Lines