Compare commits
17 Commits
f7dbb284ca
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| f7b816bd48 | |||
| fc18c30eaa | |||
| d71b435d31 | |||
| a948550932 | |||
| 7cc314e34c | |||
| f4c8e58d55 | |||
| e78cad78f0 | |||
| ac6de83e76 | |||
| 03bdf767b5 | |||
| 339f4f5f40 | |||
| 1464995bc8 | |||
| 86512b2d5a | |||
| d66e2a88a6 | |||
| 7af2af85d6 | |||
| 9d98f76bed | |||
| 1c4fb5137e | |||
| 6efa8ecf5c |
BIN
GitCompanion.ico
Normal file
BIN
GitCompanion.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
BIN
GitCompanion.png
Normal file
BIN
GitCompanion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
@@ -761,7 +761,7 @@ Procedure.i GetRemoteStatusInfo()
|
||||
; Vérifier que Git est dispo et repo initialisé
|
||||
If Not main\info\isGit Or Not main\info\isInit
|
||||
main\remoteStatus\status = "Repo non initialisé"
|
||||
ProcedureReturn 0
|
||||
ProcedureReturn #False
|
||||
EndIf
|
||||
|
||||
; Récupérer la branche courante
|
||||
@@ -2465,7 +2465,7 @@ Procedure InitGadget()
|
||||
; Le bouton "Enregistrer" actif si au moins un champ non vide
|
||||
DisableGadget(#GdtBtnSaveCfg, Bool(userName$ = "" And userEmail$ = ""))
|
||||
|
||||
|
||||
|
||||
EndProcedure
|
||||
|
||||
Macro RightGadget(GDT)
|
||||
@@ -2499,7 +2499,7 @@ Procedure OpenGUI()
|
||||
End
|
||||
EndIf
|
||||
; --- Dimensions générales ---
|
||||
#WinW = 950
|
||||
#WinW = 1280
|
||||
#WinH = 720 ; plus haut pour la zone d’aide
|
||||
#PanelW = 920
|
||||
#InPad = 10 ; marge interne au Panel
|
||||
@@ -2551,11 +2551,12 @@ Procedure OpenGUI()
|
||||
TextGadget(#GdtLblAction, #InPad, DownGadget(#GdtLblRemoteStatus)+#InMargin, 50, 20, "Action :")
|
||||
TextGadget(#GdtTxtAction, RightGadget(#GdtLblAction), GadgetY(#GdtLblAction), 300, 20, "-", #PB_Text_Border)
|
||||
CloseGadgetList()
|
||||
|
||||
; ---- Cadre "Fichiers & modifications" ----
|
||||
Define yFiles = DownGadget(#GdtFrmRemote)+ #InPad
|
||||
Define hFiles = PanelH - yFiles - #InPad
|
||||
FrameGadget(#GdtFrmFiles, #InPad, yFiles, #PanelW - 2*#InPad, hFiles, T("GdtFrmFiles","Fichiers & modifications"),#PB_Frame_Container)
|
||||
ListIconGadget(#GdtListStatus, #InPad, #InFrmY, GadgetWidth(#GdtFrmFiles)-2*#InPad, 120, T("GdtListStatus-Path","Path"), 300, #PB_ListIcon_CheckBoxes | #PB_ListIcon_MultiSelect | #PB_ListIcon_FullRowSelect |#PB_ListIcon_AlwaysShowSelection)
|
||||
ListIconGadget(#GdtListStatus, #InPad, #InFrmY, GadgetWidth(#GdtFrmFiles)-2*#InPad, hFiles-#BtnH*2-#InMargin*4-#InFrmY, T("GdtListStatus-Path","Path"), 300, #PB_ListIcon_CheckBoxes | #PB_ListIcon_MultiSelect | #PB_ListIcon_FullRowSelect |#PB_ListIcon_AlwaysShowSelection)
|
||||
AddGadgetColumn(#GdtListStatus, 1, T("GdtListStatus-Status","Status"), 50)
|
||||
AddGadgetColumn(#GdtListStatus, 2, T("GdtListStatus-Desc","Description"), 300)
|
||||
|
||||
@@ -2567,7 +2568,7 @@ Procedure OpenGUI()
|
||||
ButtonGadget(#GdtBtnIgnore, #InPad + 370, yLocalActions, 110, #BtnH, T("GdtBtnIgnore","Ignorer"))
|
||||
|
||||
; Message de commit
|
||||
Define yMsg = yLocalActions + #BtnH + 10
|
||||
Define yMsg = DownGadget(#GdtBtnRestore)+#InMargin
|
||||
TextGadget(#GdtLblMessage, #InPad + 10, yMsg + 4, 80, 22, T("GdtLblMessage","Message :"))
|
||||
StringGadget(#GdtFieldMessage, #InPad + 95, yMsg, #PanelW - 2*#InPad - 95 - 110, #BtnH, "")
|
||||
ButtonGadget(#GdtBtnCommit, #PanelW - #InPad - 100, yMsg - 2, 100, #BtnH, T("GdtBtnCommit","Commit"))
|
||||
@@ -2617,7 +2618,7 @@ Procedure OpenGUI()
|
||||
; ============================================================
|
||||
AddGadgetItem(#gdtPnl, -1, T("#gdtPnl-Config","Config"))
|
||||
|
||||
FrameGadget(#GdtFrmConfig, #InPad, #InPad, #PanelW - 2*#InPad, 170, T("GdtFrmConfig","Configuration Git"))
|
||||
FrameGadget(#GdtFrmConfig, #InPad, #InPad, #PanelW - 2*#InPad, 170, T("GdtFrmConfig","Configuration Git"),#PB_Frame_Container)
|
||||
TextGadget(#GdtLblUserName, #InPad + 10, #InPad + 35, 90, 22, "user.name")
|
||||
StringGadget(#GdtFieldUserName, #InPad + 110, #InPad + 33, #PanelW - 2*#InPad - 120, #BtnH, "")
|
||||
TextGadget(#GdtLblUserEmail, #InPad + 10, #InPad + 70, 90, 22, "user.email")
|
||||
@@ -2635,26 +2636,22 @@ Procedure OpenGUI()
|
||||
CloseGadgetList()
|
||||
|
||||
; ============================================================
|
||||
; Aide à droite du Panel (sans splitter)
|
||||
; HELP
|
||||
; ============================================================
|
||||
; On garde #PanelW / #PanelH tels quels
|
||||
|
||||
Define helpGap = 10 ; espace entre panel et aide
|
||||
Define helpX = #InPad + #PanelW + helpGap ; à droite du panel
|
||||
Define helpX = #InPad*2 + #PanelW ; à droite du panel
|
||||
Define helpY = #InPad
|
||||
Define helpW = WindowWidth(#WinMain)-GadgetWidth(#gdtPnl)- #InPad*4 ; reste de largeur jusqu'à la marge droite
|
||||
Define helpH = PanelH ; même hauteur que le panel
|
||||
|
||||
; (Optionnel) borne minimale si besoin
|
||||
If helpW < 100 : helpW = 100 : EndIf
|
||||
Define helpH = GadgetHeight(#gdtPnl) ; même hauteur que le panel
|
||||
|
||||
|
||||
; Soit en direct :
|
||||
WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
||||
|
||||
; — ou, si tu veux un cadre :
|
||||
; FrameGadget(#GdtFrmHelp, helpX, helpY, helpW, helpH, T("GdtFrmHelp","Aide"))
|
||||
; WebViewGadget(#GdtHelp, helpX + 10, helpY + 25, helpW - 20, helpH - 35)
|
||||
|
||||
FrameGadget(#GdtFrmHelp, helpX, helpY, helpW, helpH, T("GdtFrmHelp","Aide"),#PB_Frame_Container)
|
||||
WebViewGadget(#GdtHelp, helpX + #InMargin, helpY + #InFrmY, helpW - #InMargin*2, helpH - #InMargin-#InFrmY)
|
||||
CloseGadgetList()
|
||||
|
||||
SetGadgetText(#GgtFieldRepo,main\GitCall\workdir)
|
||||
CreateThread(@RefreshFileList(),0)
|
||||
@@ -2781,8 +2778,8 @@ OpenGUI()
|
||||
|
||||
|
||||
; IDE Options = PureBasic 6.21 (Windows - x64)
|
||||
; CursorPosition = 2645
|
||||
; FirstLine = 2641
|
||||
; CursorPosition = 537
|
||||
; FirstLine = 537
|
||||
; Folding = -----------
|
||||
; Optimizer
|
||||
; EnableThread
|
||||
Reference in New Issue
Block a user