small fixes for #24

deseven · Apr 14, 2019 · c8609b1 · c8609b1
1 parent e7e8bd9
commit c8609b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/helpers.pb b/helpers.pb
@@ -163,6 +163,7 @@ Procedure MessageRequesterEx(Title.s, Info.s,type.s="'note'",defaultbutton=1,but
 EndProcedure
 
 Macro viewingMode()
+  editExistent = #False
   FreeGadget(#gadShortcutSelectorCap) : FreeGadget(#gadShortcutSelector)
   FreeGadget(#gadCommandCap) : FreeGadget(#gadCommand)
   FreeGadget(#gadWorkdirCap) : FreeGadget(#gadWorkdir)
@@ -250,6 +251,9 @@ Macro editingMode()
   HideGadget(#gadApply,#False)
   HideGadget(#gadCancel,#False)
   CloseGadgetList()
+  CocoaMessage(0,GadgetID(#gadAction),"setNextKeyView:",GadgetID(#gadCommand))
+  CocoaMessage(0,GadgetID(#gadCommand),"setNextKeyView:",GadgetID(#gadWorkdir))
+  CocoaMessage(0,GadgetID(#gadWorkdir),"setNextKeyView:",GadgetID(#gadAction))
 EndMacro
 
 Macro editingExistentMode()
@@ -298,8 +302,8 @@ Macro deactivateSelector(hotkey = "")
   EndIf
 EndMacro
 ; IDE Options = PureBasic 5.70 LTS (MacOS X - x64)
-; CursorPosition = 168
-; FirstLine = 164
+; CursorPosition = 255
+; FirstLine = 226
 ; Folding = ---
 ; EnableXP
 ; EnableUnicode
diff --git a/iCanHazShortcut.pbp b/iCanHazShortcut.pbp
@@ -7,24 +7,24 @@
   <section name="data">
     <explorer view="../../" pattern="0"/>
     <log show="1"/>
-    <lastopen date="2019-04-03 22:30" user="deseven" host="de7mac.local"/>
+    <lastopen date="2019-04-12 17:02" user="deseven" host="de7mac.local"/>
   </section>
   <section name="files">
     <file name="const.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="6995d5d4ad1fa33682df1c370949fea7"/>
+      <fingerprint md5="da5a898f79c4fe5b496a8d47baf68bd7"/>
     </file>
     <file name="helpers.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="fc823787f776a6ca0b1c17355dd1fa3a"/>
+      <fingerprint md5="a0b2ab7491e226f9f32ba8d97d51f18c"/>
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="064c139de5f9009d7a509a5838a1f569"/>
+      <fingerprint md5="fde5e0f23f2863472461033081c4e11e"/>
     </file>
     <file name="proc.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="afc9fd271f120d9264150195ae380902"/>
+      <fingerprint md5="b106ed9ec2b58a1b50d60db6350aea0c"/>
     </file>
   </section>
   <section name="targets">

diff --git a/main.pb b/main.pb
@@ -49,6 +49,7 @@ CocoaMessage(0,CocoaMessage(0,WindowID(#wnd),"standardWindowButton:",#NSWindowBu
 CocoaMessage(0,CocoaMessage(0,WindowID(#wnd),"standardWindowButton:",#NSWindowButtonMaximize),"setHidden:",#YES)
 PanelGadget(#gadTabs,5,0,590,300)
 CocoaMessage(0,GadgetID(#gadTabs),"setFocusRingType:",1)
+CocoaMessage(0, WindowID(#wnd), "setAutorecalculatesKeyViewLoop:", #NO)
 
 AddGadgetItem(#gadTabs,0,"Shortcuts")
 ListIconGadget(#gadShortcuts,5,0,560,220,"Shortcut",80,#PB_ListIcon_CheckBoxes)
@@ -107,9 +108,9 @@ AddGadgetItem(#gadTabs,2,"About")
 ImageGadget(#gadLogo,68,35,64,64,ImageID(#resLogo))
 TextGadget(#gadNameVer,0,113,200,60,#myName + ~"\n" + #myVer,#PB_Text_Center)
 TextGadget(#gadCopyright,45,172,70,20,"created by")
-HyperLinkGadget(#gadWebDeveloper,105,176,100,20,"deseven",#linkColorHighlighted)
+HyperLinkGadget(#gadWebDeveloper,107,173,100,20,"deseven",#linkColorHighlighted)
 TextGadget(#gadCopyrightIcon,45,186,70,20,"icons by")
-HyperLinkGadget(#gadWebDesigner,92,190,100,20,"denboroda",#linkColorHighlighted)
+HyperLinkGadget(#gadWebDesigner,94,187,100,20,"denboroda",#linkColorHighlighted)
 SetGadgetColor(#gadWebDeveloper,#PB_Gadget_FrontColor,#linkColor)
 SetGadgetColor(#gadWebDesigner,#PB_Gadget_FrontColor,#linkColor)
 SetGadgetFont(#gadNameVer,FontID(#resBigFont))
@@ -249,7 +250,6 @@ Repeat
                 SetGadgetItemState(#gadShortcuts,GetGadgetState(#gadShortcuts),gadgetState + #PB_ListIcon_Selected)
               EndIf
               RemoveGadgetItem(#gadShortcuts,GetGadgetState(#gadShortcuts)+1)
-              editExistent = #False
             Else
               AddGadgetItem(#gadShortcuts,-1,GetGadgetText(#gadShortcutSelector) + ~"\n" + 
                                              GetGadgetText(#gadAction) + ~"\n" +
@@ -439,7 +439,7 @@ ForEver
 
 die()
 ; IDE Options = PureBasic 5.70 LTS (MacOS X - x64)
-; CursorPosition = 142
-; FirstLine = 126
+; CursorPosition = 51
+; FirstLine = 35
 ; EnableXP
 ; EnableUnicode
diff --git a/proc.pb b/proc.pb
@@ -150,7 +150,7 @@ EndProcedure
 Procedure initResources()
   Protected imageSize.NSSize
   Protected path.s = GetPathPart(ProgramFilename()) + "../Resources/"
-  LoadFont(#resNormalFont,"Calibri",14)
+  LoadFont(#resNormalFont,"Lucida Grande",12)
   LoadFont(#resBigFont,"Courier",18,#PB_Font_Bold)
   If LoadImageEx(#resLogo,path+"main.icns") And
      LoadImageEx(#resAdd,path+"plus-circle.png") And
@@ -636,8 +636,8 @@ ProcedureC keyHandler(sender,sel,event)
   ProcedureReturn result
 EndProcedure
 ; IDE Options = PureBasic 5.70 LTS (MacOS X - x64)
-; CursorPosition = 83
-; FirstLine = 71
+; CursorPosition = 152
+; FirstLine = 149
 ; Folding = ----
 ; EnableXP
 ; EnableUnicode