feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Move filter widget to GitEditor

Browse Source 
and make it a QToolBar.

Change-Id: I6a16b1a828bfabaace8e14ef39344f7f2bac7e8a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-02-19 21:20:41 +02:00
committed by Orgad Shaneh
parent d21f72d0dd
commit 2110be00ab
3 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/giteditor.h
View File

@@ -34,6 +34,8 @@ namespace Utils { class FancyLineEdit; }
namespace Git {
namespace Internal {
class GitLogFilterWidget;
class GitEditorWidget : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
@@ -42,10 +44,11 @@ public:
GitEditorWidget();
void setPlainText(const QString &text) override;
void setGrepLineEdit(Utils::FancyLineEdit *lineEdit);
QWidget *addFilterWidget();
void setPickaxeLineEdit(Utils::FancyLineEdit *lineEdit);
QString grepValue() const;
QString pickaxeValue() const;
void refresh();
private:
void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
@@ -64,13 +67,10 @@ private:
bool supportChangeLinks() const override;
QString fileNameForLine(int line) const override;
QString sourceWorkingDirectory() const;
void refreshOnLineEdit(Utils::FancyLineEdit *lineEdit);
void lineEditChanged();
mutable QRegExp m_changeNumberPattern;
QString m_currentChange;
Utils::FancyLineEdit *m_grepLineEdit = nullptr;
Utils::FancyLineEdit *m_pickaxeLineEdit = nullptr;
GitLogFilterWidget *m_logFilterWidget = nullptr;
};
} // namespace Git