From eaae99b90788ade9ad27e5b49511b64c8990bd4a Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 12:38:22 +0200 Subject: [PATCH 1/6] RefsView Model: renamed toolbar "BranchesTB" -> "RefsViewTB" --- Modules/RefsViews/Branches/BranchesView.cpp | 2 +- Modules/RefsViews/Branches/BranchesViewActions.hid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/RefsViews/Branches/BranchesView.cpp b/Modules/RefsViews/Branches/BranchesView.cpp index cc65be45..27a3e876 100644 --- a/Modules/RefsViews/Branches/BranchesView.cpp +++ b/Modules/RefsViews/Branches/BranchesView.cpp @@ -51,7 +51,7 @@ BranchesView::BranchesView() setupActions( this ); setViewName( tr( "References" ) ); - setToolBar( tbBranchesTB ); + setToolBar( tbRefsViewTB ); setWidget( mTree ); setFlags( ConsumesContexts | DataPerContext ); diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index 4f287f63..d843c144 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -34,7 +34,7 @@ Ui BranchesViewActions { ConnectTo onRenameRef(); }; - ToolBar BranchesTB { + ToolBar RefsViewTB { // placeholder for the real toolbar }; From e630df8477b96649f4597e05d3854819504bbfc9 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 13:01:50 +0200 Subject: [PATCH 2/6] RefsView Module: rename context menu matching RefItem::Branch Prepare restructuring of context menus, matching the assigned item type. --- Modules/RefsViews/Branches/BranchesView.cpp | 14 ++++++++++---- Modules/RefsViews/Branches/BranchesViewActions.hid | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Modules/RefsViews/Branches/BranchesView.cpp b/Modules/RefsViews/Branches/BranchesView.cpp index 27a3e876..8ed8cb96 100644 --- a/Modules/RefsViews/Branches/BranchesView.cpp +++ b/Modules/RefsViews/Branches/BranchesView.cpp @@ -88,13 +88,19 @@ void BranchesView::showContextMenu(const QModelIndex& index, const QPoint& globa } Heaven::Menu* menu = 0; - if (item->type() == RefItem::Branch) { - menu = menuCtxMenuRefsView; - //menu->setActivationContext( item ); + switch (item->type()) { + case RefItem::Branch: + menu = menuMnuBranch; + break; + + default: + break; } - if ( menu ) + if ( menu ) { + //menu->setActivationContext( item ); menu->showPopup( globalPos ); + } } void BranchesView::onCheckoutRef() diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index d843c144..dbe1ccd9 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -38,10 +38,11 @@ Ui BranchesViewActions { // placeholder for the real toolbar }; - Menu CtxMenuRefsView { + Menu MnuBranch { Action CheckoutRef; Action RenameRef; Separator; + Action RemoveRef; }; From 6b297af082d0b58903d165ee3b34dbf37beeb090 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 14:24:38 +0200 Subject: [PATCH 3/6] RefsView Module: reorganized context menus according to their item type --- .../Branches/BranchesViewActions.hid | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index dbe1ccd9..e3c7a423 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -46,4 +46,24 @@ Ui BranchesViewActions { Action RemoveRef; }; + Menu MnuRemote { + Action RenameRef; + Separator; + Action RemoveRef; + }; + + Menu MnuRemoteBranch { + Action CheckoutRef; + Separator; + + Action RemoveRef; + }; + + Menu MnuTag { + Action CheckoutRef; + Separator; + + Action RemoveRef; + }; + }; From 70799c3529109cfcf5fb3ecef7d5d0606ed43a0c Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 14:25:50 +0200 Subject: [PATCH 4/6] RefsView Module: added merge places for fetch & push actions --- Modules/RefsViews/Branches/BranchesViewActions.hid | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index e3c7a423..a4fe32d1 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -43,12 +43,19 @@ Ui BranchesViewActions { Action RenameRef; Separator; + MergePlace FetchMP; + MergePlace PushMP; + Separator; + Action RemoveRef; }; Menu MnuRemote { Action RenameRef; Separator; + MergePlace FetchThisMP; + Separator; + Action RemoveRef; }; @@ -56,6 +63,9 @@ Ui BranchesViewActions { Action CheckoutRef; Separator; + MergePlace FetchThisMP; + Separator; + Action RemoveRef; }; From a95e8779d96a9877687f39a3cd87b4f25f449ee6 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 14:51:33 +0200 Subject: [PATCH 5/6] RefsView Module: added context menus for "Remote" and "Tag" items --- Modules/RefsViews/Branches/BranchesView.cpp | 10 +++++++++- Modules/RefsViews/Branches/BranchesViewActions.hid | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Modules/RefsViews/Branches/BranchesView.cpp b/Modules/RefsViews/Branches/BranchesView.cpp index 8ed8cb96..a5ba4108 100644 --- a/Modules/RefsViews/Branches/BranchesView.cpp +++ b/Modules/RefsViews/Branches/BranchesView.cpp @@ -87,12 +87,20 @@ void BranchesView::showContextMenu(const QModelIndex& index, const QPoint& globa return; } - Heaven::Menu* menu = 0; + Heaven::Menu* menu = nullptr; switch (item->type()) { case RefItem::Branch: menu = menuMnuBranch; break; + case RefItem::Remote: + menu = menuMnuRemote; + break; + + case RefItem::Tag: + menu = menuMnuTag; + break; + default: break; } diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index a4fe32d1..57c1d168 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -53,6 +53,7 @@ Ui BranchesViewActions { Menu MnuRemote { Action RenameRef; Separator; + MergePlace FetchThisMP; Separator; From 237bd816abaaedcec0effc5a7c091cd0f5e7fb32 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Wed, 1 Apr 2015 12:50:53 +0200 Subject: [PATCH 6/6] RefsView Model: added toolbar action frames to show/hide the different item-groups (Branches, Remotes, Tags) --- .../Branches/BranchesViewActions.hid | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid index 57c1d168..8d313ad3 100644 --- a/Modules/RefsViews/Branches/BranchesViewActions.hid +++ b/Modules/RefsViews/Branches/BranchesViewActions.hid @@ -35,7 +35,24 @@ Ui BranchesViewActions { }; ToolBar RefsViewTB { - // placeholder for the real toolbar + Action ShowLocalBranches { + Text "Branches"; + ConnectTo onShowBranches(); + Checkable true; + Checked true; + }; + Action ShowRemotes { + Text "Remotes"; + ConnectTo onShowRemotes(); + Checkable true; + Checked true; + }; + Action ShowTags { + Text "Tags"; + ConnectTo onShowTags(); + Checkable true; + Checked true; + }; }; Menu MnuBranch {