From c753fbc2a3508ae4d4d43c9b87f16656c91b95bb Mon Sep 17 00:00:00 2001 From: gambas Date: Thu, 1 Jul 2021 13:28:48 +0200 Subject: [PATCH] Version Control: Add a button that shows all the modifications in the version control panel. [DEVELOPMENT ENVIRONMENT] * NEW: Version Control: Add a button that shows all the modifications in the version control panel. --- app/src/gambas3/.src/Debug/FDebugInfo.class | 8 ++++++++ app/src/gambas3/.src/Debug/FDebugInfo.form | 13 +++++++++---- app/src/gambas3/.src/Options/FOption.class | 7 ++++++- app/src/gambas3/.src/Options/FOption.form | 1 + 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class index 7152e0ae5..085a7dd7e 100644 --- a/app/src/gambas3/.src/Debug/FDebugInfo.class +++ b/app/src/gambas3/.src/Debug/FDebugInfo.class @@ -377,6 +377,8 @@ Public Sub ReadConfig() Project.SetSmallFont(hCtrl) Next + btnChanges.Picture = Picture["img/32/modified.png"].Stretch(Stock.GetSize("small")) + 'H = Max(Stock.GetSize("small"), cmbWatch.Font.H) * 1.4 'panWatch.H = H ' For Each hChild In panWatch.Children @@ -1785,3 +1787,9 @@ Public Sub cmbWatch_Change() UpdateWatchButtons End + +Public Sub btnChanges_Click() + + FFileInfoVC.Run(Project.Dir) + +End diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.form b/app/src/gambas3/.src/Debug/FDebugInfo.form index 51affdfaf..2f4a6b645 100644 --- a/app/src/gambas3/.src/Debug/FDebugInfo.form +++ b/app/src/gambas3/.src/Debug/FDebugInfo.form @@ -285,26 +285,31 @@ ToolTip = ("Clear console") Picture = Picture["icon:/small/clear"] } + { btnChanges ToolButton + MoveScaled(9,0,17,4) + AutoResize = True + Text = ("Modifications.") & "..." + } { btnVcCommit ToolButton - MoveScaled(9,0,12,4) + MoveScaled(28,0,12,4) AutoResize = True Text = ("Commit") & "..." Picture = Picture["icon:/small/upload"] } { btnVcUpdate ToolButton - MoveScaled(20,0,15,4) + MoveScaled(41,0,15,4) AutoResize = True Text = ("Synchronize") Picture = Picture["icon:/small/download"] } { btnVcRevert ToolButton - MoveScaled(34,0,20,4) + MoveScaled(57,0,9,4) AutoResize = True Text = ("Revert all changes") & "..." Picture = Picture["icon:/small/undo"] } { btnVcAddAll ToolButton - MoveScaled(54,0,27,4) + MoveScaled(68,0,13,4) AutoResize = True Text = ("Add everything to repository") Picture = Picture["icon:/small/add"] diff --git a/app/src/gambas3/.src/Options/FOption.class b/app/src/gambas3/.src/Options/FOption.class index afc9e66e3..0299853e6 100644 --- a/app/src/gambas3/.src/Options/FOption.class +++ b/app/src/gambas3/.src/Options/FOption.class @@ -1828,7 +1828,12 @@ Public Sub gvwLayout_Select() Endif sName = $aLayout[gvwLayout.Row * 2] - btnDeleteLayout.Enabled = Exist(GetLayoutPath(sName)) + If sName Then + btnDeleteLayout.Enabled = Exist(GetLayoutPath(sName)) + Else + btnDeleteLayout.Enabled = False + Endif + LoadLayout(sName) End diff --git a/app/src/gambas3/.src/Options/FOption.form b/app/src/gambas3/.src/Options/FOption.form index c2364ecdd..76689c498 100644 --- a/app/src/gambas3/.src/Options/FOption.form +++ b/app/src/gambas3/.src/Options/FOption.form @@ -958,6 +958,7 @@ } { btnDeleteLayout Button MoveScaled(0,5,19,4) + Enabled = False AutoResize = True Text = ("Delete") Picture = Picture["icon:/small/delete"]