gvcsfx 0.3

data/fx/show_text.fxml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+Author: Chris Liaw <chrisliaw@antrapol.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="353.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label fx:id="lblHeader" text="Diff Result">
+         <font>
+            <Font name="System Bold" size="13.0" />
+         </font>
+      </Label>
+      <TextArea fx:id="txtContent" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="280.0" minWidth="-Infinity" wrapText="true" VBox.vgrow="ALWAYS">
+         <VBox.margin>
+            <Insets bottom="5.0" top="5.0" />
+         </VBox.margin>
+      </TextArea>
+      <HBox alignment="CENTER_RIGHT" maxHeight="38.0" maxWidth="1.7976931348623157E308" minHeight="38.0" prefHeight="38.0" VBox.vgrow="ALWAYS">
+         <children>
+            <Button fx:id="butClose" maxWidth="80.0" minWidth="80.0" mnemonicParsing="false" onAction="#win_close" prefWidth="80.0" text="Close" />
+         </children>
+      </HBox>
+   </children>
+   <padding>
+      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+   </padding>
+</VBox>

data/fx/stash_select.fxml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+Author: Chris Liaw <chrisliaw@antrapol.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="178.0" prefWidth="507.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label fx:id="lblTitle" text="Restore Stash To New Branch" wrapText="true">
+         <font>
+            <Font name="System Bold" size="14.0" />
+         </font>
+      </Label>
+      <Label fx:id="lblContent" text="Please select one of the stash record in the combox below to restore:" wrapText="true" />
+      <HBox alignment="CENTER" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="48.0" VBox.vgrow="NEVER">
+         <children>
+            <ComboBox fx:id="cmbOptions" />
+         </children>
+      </HBox>
+      <TextField fx:id="txtNewBranch" alignment="CENTER" promptText="New branch name" />
+      <HBox alignment="CENTER_RIGHT" prefHeight="48.0" prefWidth="470.0" VBox.vgrow="NEVER">
+         <children>
+            <Button fx:id="butOk" defaultButton="true" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#butOk_onAction" prefWidth="80.0" text="OK">
+               <HBox.margin>
+                  <Insets right="5.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="butCancel" cancelButton="true" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#win_close" prefWidth="80.0" text="Cancel" />
+         </children>
+      </HBox>
+   </children>
+   <padding>
+      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+   </padding>
+</VBox>

data/gvcs_fx.rb

@@ -0,0 +1,85 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+require 'jrubyfx'
+
+require_relative "lib/version"
+
+fxml_root File.join(File.dirname(__FILE__),"fx")
+
+require_relative 'handlers/main_win_controller'
+require_relative 'handlers/tray'
+require_relative 'handlers/float_win_controller'
+
+module GvcsFx
+  class MainWin < JRubyFX::Application
+    include GvcsFx::Tray
+
+    attr_reader :stage
+    def start(stage)
+      
+      @stage = stage
+      #@stage.always_on_top = true
+      #@stage.init_style = javafx.stage.StageStyle::UNDECORATED
+      #javafx.application.Platform.implicit_exit = false
+
+      # temporary disable for direct testing
+      #with(stage, title: "G-VCS Float") do
+      #  fxml FloatWinController
+      #  show
+      #end
+
+      MainWinController.load_into(@stage)
+      @stage.show
+
+      # this is correct can show tray 
+      # but hide/show javafx stage doesn't work
+      #javax.swing.SwingUtilities.invokeLater do
+      #  start_tray(self)
+      #end
+
+    end # start
+
+    def show_stage
+      javafx.application.Platform.run_later do
+        puts "insite run_later #{@stage}"
+        if not @stage.nil?
+          @stage.show
+          @stage.toFront
+        end
+      end
+    end
+
+    def hide_stage
+      javafx.application.Platform.run_later do
+        @stage.hide
+      end
+    end
+
+  end
+end
+
+if $0 == __FILE__
+  #puts "Launching"
+  GvcsFx::MainWin.launch
+
+  ## put swing code in its own event loop or the right click menu and the icon itself won't show 
+  #event_thread = nil
+  #javax.swing.SwingUtilities.invokeAndWait { event_thread = java.lang.Thread.currentThread }
+  #event_thread.join
+end
+

data/handlers/add_workspace_controller.rb

@@ -0,0 +1,88 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+module GvcsFx
+  class AddWorkspaceController
+    include JRubyFX::Controller
+    include Antrapol::ToolRack::ExceptionUtils
+    fxml "add_workspace.fxml"
+
+    ADDPROJ_KEY = "<Add New Project>"
+
+    attr_reader :result
+    def initialize
+      init
+    end
+
+    def init
+      @cmbProject.items.add_all(["",ADDPROJ_KEY])
+      hide_new_proj_entry
+    end
+
+    def add_option(opt)
+      @cmbProject.items.add(opt)
+    end
+
+    def butOpen_onAction(evt)
+      
+    end # butOpen_onAction
+
+    def cmbProj_onAction(evt)
+      val = @cmbProject.selection_model.selected_item
+      if not_empty?(val)
+        if val == ADDPROJ_KEY
+          show_new_proj_entry
+        else
+          hide_new_proj_entry
+        end
+      else
+        hide_new_proj_entry
+      end 
+    end # cmbProj_onAction
+
+    def butCreate_onAction(evt)
+      @result = [@cmbProject.selection_model.selected_item, @txtNewProjName.text]
+      @butOpen.scene.window.close
+    end
+
+    def butCancel_onAction(evt)
+      @butOpen.scene.window.close
+    end
+
+    def path=(val)
+      @lblWorkspacePath.text = val
+    end
+
+    def txtNewProjName_keyreleased(evt)
+      if (not evt.nil?) and evt.code == javafx.scene.input.KeyCode::ENTER
+        butCreate_onAction(nil)
+      end
+    end
+
+    private
+    def hide_new_proj_entry
+      @lblNewProjName.visible = false
+      @txtNewProjName.visible = false
+    end
+
+    def show_new_proj_entry
+      @lblNewProjName.visible = true
+      @txtNewProjName.visible = true
+    end
+
+  end
+end

data/handlers/event_handler.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GvcsFx
+  module EventHandler
+
+    def install_handler
+      handle_workspace_add
+      handle_workspace_selection_changed
+    end
+
+    def handle_workspace_add
+
+      register(Listener::Event[:workspace_added], Proc.new do |opts|
+
+        # change display from landing to details
+        # NO workspace selected yet so hold
+        #show_details
+        refresh_workspace_list
+
+      end)
+
+    end
+
+    def handle_workspace_selection_changed
+      register(Listener::Event[:workspace_selection_changed], Proc.new do |opts|
+        
+        refresh_details
+
+        #case @shownTab
+        #when :state
+        #  refresh_tab_state 
+        #when :logs
+        #  refresh_tab_logs
+        #when :ignoreRules
+        #  refresh_tab_ignore_rules
+        #end
+
+      end)
+    end
+
+  end
+end

data/handlers/float_win_controller.rb

@@ -0,0 +1,68 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+java_import javafx.scene.control.ContextMenu
+
+require_relative "main_win_controller"
+
+module GvcsFx
+  class FloatWinController
+    include JRubyFX::Controller
+    fxml "float.fxml"
+
+    def initialize
+    end
+
+
+    def show_context_menu(evt)
+      init_ctxmenu.show(@imgFloat, evt.screen_x, evt.screen_y) 
+    end
+
+
+    private
+    def init_ctxmenu
+
+      if @ctx.nil?
+
+        @ctx = ContextMenu.new
+        mnuItems = []
+        @mnuMain = javafx.scene.control.MenuItem.new("G-VCS")
+        @mnuMain.on_action do |evt|
+         stage = javafx.stage.Stage.new
+          stage.title = "G-VCS"
+          #stage.initModality(javafx.stage.Modality::WINDOW_MODAL)
+          #stage.initOwner(@imgFloat.scene.window)
+          ctrl = MainWinController.load_into(stage)
+          stage.show
+        end
+        mnuItems << @mnuMain
+
+        @mnuExit = javafx.scene.control.MenuItem.new("Exit")
+        @mnuExit.on_action do |evt|
+          @imgFloat.scene.window.close 
+        end
+        mnuItems << @mnuExit
+
+        @ctx.items.add_all(mnuItems)
+
+      end
+
+      @ctx
+    end
+
+  end
+end

data/handlers/fx_alert.rb

@@ -0,0 +1,120 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+java_import javafx.scene.control.Alert
+
+module GvcsFx
+  module FxAlert
+
+    def fx_alert_info(msg, title = "Information", owner = nil)
+      dlg = Alert.new(Alert::AlertType::INFORMATION)
+      #dlg.header_text = msg
+      dlg.title = title
+      lbl = javafx.scene.control.Label.new(msg)
+      lbl.wrap_text = true
+      dlg.dialog_pane.content = lbl
+      dlg.header_text = nil
+      #dlg.content_text = msg
+      dlg.init_modality(javafx.stage.Modality::WINDOW_MODAL)
+      dlg.init_owner(owner) if not owner.nil?
+      dlg.show_and_wait
+    end
+
+    def fx_alert_error(msg, title = "Error", owner = nil)
+      dlg = Alert.new(Alert::AlertType::ERROR)
+      #dlg.header_text = msg
+      dlg.title = title
+      lbl = javafx.scene.control.Label.new(msg)
+      lbl.wrap_text = true
+      dlg.dialog_pane.content = lbl
+      dlg.header_text = nil
+      dlg.init_modality(javafx.stage.Modality::WINDOW_MODAL)
+      dlg.init_owner(owner) if not owner.nil?
+      #dlg.init_style(javafx.stage.StageStyle::UTILITY)
+      dlg.show_and_wait
+    end
+
+    def fx_alert_warning(msg, title = "Warning", owner = nil)
+      dlg = Alert.new(Alert::AlertType::WARNING)
+      #dlg.header_text = msg
+      lbl = javafx.scene.control.Label.new(msg)
+      lbl.wrap_text = true
+      dlg.dialog_pane.content = lbl
+      #dlg.content_text = msg
+      dlg.title = title
+      dlg.header_text = nil
+      dlg.init_modality(javafx.stage.Modality::WINDOW_MODAL)
+      dlg.init_owner(owner) if not owner.nil?
+      dlg.show_and_wait
+    end
+
+    def fx_alert_confirmation(msg, header = nil, title = "Confirmation", owner = nil)
+
+      dlg = javafx.scene.control.Alert.new(javafx.scene.control.Alert::AlertType::CONFIRMATION)
+      dlg.init_modality(javafx.stage.Modality::WINDOW_MODAL)
+      dlg.init_owner(owner) if not owner.nil?
+      dlg.title = title
+      dlg.header_text = header
+      lbl = javafx.scene.control.Label.new(msg)
+      lbl.wrap_text = true
+      dlg.dialog_pane.content = lbl
+      # this will make long text not shown as no wrapping is provided
+      #dlg.content_text = msg
+
+      #if not (opts[:custom_buttons].nil? or opts[:custom_buttons].empty?)
+      #  cusBut = {  }
+      #  opts.each do |key,act|
+      #    par = [act[:name]]
+      #    par << javafx.scene.control.ButtonBar.ButtonData::CANCEL_CLOSE if act[:is_cancel]
+      #    cusBut[javafx.scene.control.ButtonType.new(*par)] = k
+
+      #    dlg.getButtonTypes.setAll(*cusBut.keys)
+      #  end
+      #end
+
+      res = dlg.show_and_wait
+
+      #if not (opts[:custom_buttons].nil? or opts[:custom_buttons].empty?)
+      #  sel = res.get
+      #  key = cusBut[sel]
+      #  key
+      #else
+        if res.get == javafx.scene.control.ButtonType::OK
+          :ok
+        else
+          :cancel
+        end
+      #end
+      
+    end # fx_alert_confirmation
+
+    def fx_alert_input(title, header, content)
+      dlg = javafx.scene.control.TextInputDialog.new
+      dlg.title = title
+      dlg.header_text = header
+      dlg.content_text = content
+      res = dlg.show_and_wait
+      if res.is_present
+        # there is some string in the text field
+        [true, res.get]
+      else
+        [false, ""]
+      end
+    end
+
+  end
+end