Differential D3550 Diff 8711 plugins/grepview/grepdialog.cpp

Changeset View

Standalone View

View Options

plugins/grepview/grepdialog.cpp

Context not available.
38#include <util/path.h> 38​#include <util/path.h>
39 39​
40#include "grepviewplugin.h" 40​#include "grepviewplugin.h"
41#include "grepjob.h" ​
42#include "grepoutputview.h" 41​#include "grepoutputview.h"
43#include "grepfindthread.h" 42​#include "grepfindthread.h"
44#include "greputil.h" 43​#include "greputil.h"
Context not available.
66 << QStringLiteral("\\b%s\\b\\s*=[^=]") 65​ << QStringLiteral("\\b%s\\b\\s*=[^=]")
67 << QStringLiteral("\\->\\s*\\b%s\\b\\s*\\(") 66​ << QStringLiteral("\\->\\s*\\b%s\\b\\s*\\(")
68 << QStringLiteral("([a-z0-9_$]+)\\s*::\\s*\\b%s\\b\\s*\\(") 67​ << QStringLiteral("([a-z0-9_$]+)\\s*::\\s*\\b%s\\b\\s*\\(")
69 << QStringLiteral("\\b%s\\b\\s*\\->\\s*([a-z0-9_$]+)\\s*\\("); 68​ << QStringLiteral("\\b%s\\b\\s*\\->\\s*([a-z0-9_$]+)\\s*\\(");
70} 69​}
71 70​
72inline QStringList repl_template() { return QStringList() 71​inline QStringList repl_template() { return QStringList()
Context not available.
257{ 256​{
258 QUrl currentUrl = QUrl::fromLocalFile(dir); 257​ QUrl currentUrl = QUrl::fromLocalFile(dir);
259 if( !currentUrl.isValid() ) { 258​ if( !currentUrl.isValid() ) {
260 setEnableProjectBox(false); 259​ m_settings.projectFilesOnly = false;
261 return; 260​ return;
262 } 261​ }
263 262​
Context not available.
270 projectAvailable = false; 269​ projectAvailable = false;
271 } 270​ }
272 271​
273 setEnableProjectBox(projectAvailable); 272​ m_settings.projectFilesOnly = projectAvailable;
274} 273​}
275 274​
276GrepDialog::~GrepDialog() 275​GrepDialog::~GrepDialog()
Context not available.
297 replacementTemplateEdit->setCurrentItem( repl_template().at(index), true ); 296​ replacementTemplateEdit->setCurrentItem( repl_template().at(index), true );
298} 297​}
299 298​
300void GrepDialog::setEnableProjectBox(bool enable) 299​void GrepDialog::setSettings(const GrepJobSettings& settings)
301{ 300​{
302 limitToProjectCheck->setEnabled(enable); 301​ patternCombo->setEditText(settings.pattern);
303 limitToProjectLabel->setEnabled(enable); 302​ patternComboEditTextChanged(settings.pattern);
303​ m_settings.pattern = settings.pattern;
304​
305​ limitToProjectCheck->setEnabled(settings.projectFilesOnly);
306​ limitToProjectLabel->setEnabled(settings.projectFilesOnly);
307​ m_settings.projectFilesOnly = settings.projectFilesOnly;
308​
309​ // Note: everything else is set by a user
304} 310​}
305 311​
306void GrepDialog::setPattern(const QString &pattern) 312​GrepJobSettings GrepDialog::settings() const
307{ 313​{
308 patternCombo->setEditText(pattern); 314​ return m_settings;
309 patternComboEditTextChanged(pattern); ​
310} 315​}
311 316​
312void GrepDialog::setSearchLocations(const QString &dir) 317​void GrepDialog::setSearchLocations(const QString &dir)
Context not available.
331 directoryChanged(dir); 336​ directoryChanged(dir);
332} 337​}
333 338​
334QString GrepDialog::patternString() const ​
335{ ​
336 return patternCombo->currentText(); ​
337} ​
338 ​
339QString GrepDialog::templateString() const ​
340{ ​
341 return templateEdit->currentText().isEmpty() ? QStringLiteral("%s") : templateEdit->currentText(); ​
342} ​
343 ​
344QString GrepDialog::replacementTemplateString() const ​
345{ ​
346 return replacementTemplateEdit->currentText(); ​
347} ​
348 ​
349QString GrepDialog::filesString() const ​
350{ ​
351 return filesCombo->currentText(); ​
352} ​
353 ​
354QString GrepDialog::excludeString() const ​
355{ ​
356 return excludeCombo->currentText(); ​
357} ​
358 ​
359bool GrepDialog::useProjectFilesFlag() const ​
360{ ​
361 if (!limitToProjectCheck->isEnabled()) return false; ​
362 return limitToProjectCheck->isChecked(); ​
363} ​
364 ​
365bool GrepDialog::regexpFlag() const ​
366{ ​
367 return regexCheck->isChecked(); ​
368} ​
369 ​
370int GrepDialog::depthValue() const ​
371{ ​
372 return depthSpin->value(); ​
373} ​
374 ​
375bool GrepDialog::caseSensitiveFlag() const ​
376{ ​
377 return caseSensitiveCheck->isChecked(); ​
378} ​
379 ​
380void GrepDialog::patternComboEditTextChanged( const QString& text) 339​void GrepDialog::patternComboEditTextChanged( const QString& text)
381{ 340​{
382 buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty()); 341​ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
Context not available.
421{ 380​{
422 // search for unsaved documents 381​ // search for unsaved documents
423 QList<IDocument*> unsavedFiles; 382​ QList<IDocument*> unsavedFiles;
424 QStringList include = GrepFindFilesThread::parseInclude(filesString()); 383​ QStringList include = GrepFindFilesThread::parseInclude(m_settings.files);
425 QStringList exclude = GrepFindFilesThread::parseExclude(excludeString()); 384​ QStringList exclude = GrepFindFilesThread::parseExclude(m_settings.exclude);
426 385​
427 foreach(IDocument* doc, ICore::self()->documentController()->openDocuments()) 386​ foreach(IDocument* doc, ICore::self()->documentController()->openDocuments())
428 { 387​ {
Context not available.
461 420​
462 GrepOutputView *toolView = (GrepOutputView*)ICore::self()->uiController()-> 421​ GrepOutputView *toolView = (GrepOutputView*)ICore::self()->uiController()->
463 findToolView(i18n("Find/Replace in Files"), m_plugin->toolViewFactory(), IUiController::CreateAndRaise); 422​ findToolView(i18n("Find/Replace in Files"), m_plugin->toolViewFactory(), IUiController::CreateAndRaise);
464 GrepOutputModel* outputModel = toolView->renewModel(patternString(), description); 423​ GrepOutputModel* outputModel = toolView->renewModel(m_settings.pattern, description);
465 424​
466 connect(job, &GrepJob::showErrorMessage, 425​ connect(job, &GrepJob::showErrorMessage,
467 toolView, &GrepOutputView::showErrorMessage); 426​ toolView, &GrepOutputView::showErrorMessage);
Context not available.
475 connect(toolView, &GrepOutputView::outputViewIsClosed, job, [=]() {job->kill();}); 434​ connect(toolView, &GrepOutputView::outputViewIsClosed, job, [=]() {job->kill();});
476 435​
477 job->setOutputModel(outputModel); 436​ job->setOutputModel(outputModel);
478 job->setPatternString(patternString()); ​
479 job->setReplacementTemplateString(replacementTemplateString()); ​
480 job->setTemplateString(templateString()); ​
481 job->setFilesString(filesString()); ​
482 job->setExcludeString(excludeString()); ​
483 job->setDirectoryChoice(choice); 437​ job->setDirectoryChoice(choice);
484 438​
485 job->setProjectFilesFlag( useProjectFilesFlag() ); 439​ updateSettings();
486 job->setRegexpFlag( regexpFlag() ); 440​ job->setSettings(m_settings);
487 job->setDepth( depthValue() ); ​
488 job->setCaseSensitive( caseSensitiveFlag() ); ​
489 441​
490 ICore::self()->runController()->registerJob(job); 442​ ICore::self()->runController()->registerJob(job);
ematirovUnsubmitted
Done

Unneeded indentation change.

ematirov: Unneeded indentation change.
491 443​
Context not available.
494 close(); 446​ close();
495} 447​}
496 448​
449​void GrepDialog::updateSettings()
450​{
451​ if (!limitToProjectCheck->isEnabled())
452​ m_settings.projectFilesOnly = false;
kfunkUnsubmitted
Done

filesOnly = enabled && checked?

kfunk: `filesOnly = enabled && checked`?
453​ else
454​ m_settings.projectFilesOnly = limitToProjectCheck->isChecked();
455​
456​ m_settings.caseSensitive = caseSensitiveCheck->isChecked();
457​ m_settings.regexp = regexCheck->isChecked();
458​
459​ m_settings.depth = depthSpin->value();
460​
461​ m_settings.pattern = patternCombo->currentText();
462​ m_settings.searchTemplate = templateEdit->currentText().isEmpty() ? QStringLiteral("%s") : templateEdit->currentText();
463​ m_settings.replacementTemplate = replacementTemplateEdit->currentText();
464​ m_settings.files = filesCombo->currentText();
465​ m_settings.exclude = excludeCombo->currentText();
466​}
467​
497 468​
Context not available.