forked from qt-creator/qt-creator
Git: Replace branch dialog with branches side panel
This allows all kind of typical Git workflow (rebasing, merging, cherry-picking) without having the branches dialog on top of all windows. Task-number: QTCREATORBUG-19618 Change-Id: Iab078d79a589ff60fa8385c98ec2a23b352c084c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
committed by
André Hartmann
parent
b173c3d83f
commit
e543ef5eb1
97
src/plugins/git/branchview.h
Normal file
97
src/plugins/git/branchview.h
Normal file
@@ -0,0 +1,97 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2018 Andre Hartmann <aha_1980@gmx.de>
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of Qt Creator.
|
||||
**
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "branchutils.h"
|
||||
|
||||
#include <coreplugin/inavigationwidgetfactory.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <QWidget>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QPoint;
|
||||
class QToolButton;
|
||||
class QTreeView;
|
||||
QT_END_NAMESPACE;
|
||||
|
||||
namespace Utils {
|
||||
class ElidingLabel;
|
||||
class NavigationTreeView;
|
||||
}
|
||||
|
||||
namespace Git {
|
||||
namespace Internal {
|
||||
|
||||
class BranchModel;
|
||||
|
||||
class BranchView : public QWidget, public BranchUtils
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit BranchView();
|
||||
|
||||
void refreshIfSame(const QString &repository);
|
||||
void refresh(const QString &repository, bool force);
|
||||
|
||||
QToolButton *addButton() const;
|
||||
QToolButton *refreshButton() const;
|
||||
|
||||
QAction *m_includeOldEntriesAction = nullptr;
|
||||
QAction *m_includeTagsAction = nullptr;
|
||||
|
||||
private:
|
||||
void refreshCurrentRepository();
|
||||
void resizeColumns();
|
||||
void slotCustomContextMenu(const QPoint &point);
|
||||
void expandAndResize();
|
||||
void setIncludeOldEntries(bool filter);
|
||||
void setIncludeTags(bool includeTags);
|
||||
|
||||
QToolButton *m_addButton = nullptr;
|
||||
QToolButton *m_refreshButton = nullptr;
|
||||
Utils::ElidingLabel *m_repositoryLabel = nullptr;
|
||||
Utils::NavigationTreeView *m_branchView = nullptr;
|
||||
};
|
||||
|
||||
class BranchViewFactory : public Core::INavigationWidgetFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
BranchViewFactory();
|
||||
|
||||
BranchView *view() const;
|
||||
|
||||
private:
|
||||
Core::NavigationView createWidget() override;
|
||||
|
||||
QPointer<BranchView> m_view;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Git
|
||||
Reference in New Issue
Block a user