2.5.4 for mac

iazarny · Jun 29, 2024 · 6ac8cd6 · 6ac8cd6
1 parent dbab151
commit 6ac8cd6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/ge-mac-installer.sh b/ge-mac-installer.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 mkdir app
-mv target/gitember-2.5.2-spring-boot.jar app
+mv target/gitember-2.5.4-spring-boot.jar app
 
 jpackage \
    --input app/  --name Gitember2 --vendor "Igor Azarny" \
-   --main-jar gitember-2.5.2-spring-boot.jar  --app-version 2.5 \
+   --main-jar gitember-2.5.4-spring-boot.jar  --app-version 2.5 \
    --icon src/main/resources/icon/gitember.icns \
    --type "dmg" \
    --mac-sign \
@@ -14,8 +14,11 @@ jpackage \
 mv Gitember2-2.5.dmg Gitember2.5.dmg
 
 # .dmg signing is required for notarization.
-codesign --timestamp -s "3H6449CVS8" "Gitember2.5.dmg"
-codesign --timestamp -s "Developer ID Application: Igor Azarny (3H6449CVS8)" "Gitember2.5.dmg"
+#codesign --timestamp -s "Igor Azarny (3H6449CVS8)" "Gitember2.5.dmg"
+#codesign -dv --verbose=4 Gitember2.5.dmg
+#security find-identity -v -p codesigning
+codesign --timestamp --sign D5D8A01CF3AA50AB7099527B727E97918FBADB6D  "Gitember2.5.dmg"
+#codesign --timestamp -s "Developer ID Application: Igor Azarny (3H6449CVS8)" "Gitember2.5.dmg"
 
 ####### notarization #######
 xcrun notarytool submit "Gitember2.5.dmg" --wait --keychain-profile "Igor Azarny"

diff --git a/site/assets/img/favicon.png b/site/assets/img/favicon.png
diff --git a/site/index.html b/site/index.html
@@ -5,9 +5,9 @@
   <meta charset="utf-8">
   <meta content="width=device-width, initial-scale=1.0" name="viewport">
 
-  <title>Avilon Bootstrap Template</title>
-  <meta content="" name="description">
-  <meta content="" name="keywords">
+  <title>Gitember</title>
+  <meta content="Git gui client for mac and windows" name="description">
+  <meta content="git gui " name="keywords">
 
   <!-- Favicons -->
   <link href="assets/img/favicon.png" rel="icon">

diff --git a/src/main/java/com/az/gitember/controller/main/MainController.java b/src/main/java/com/az/gitember/controller/main/MainController.java
@@ -109,6 +109,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         Context.setMain(this);
         if (Context.isMac()) {
             mainMenuBar.setUseSystemMenuBar(true);
+            mainMenuBar.setStyle("");
             menuContainer.getChildren().remove(mainMenuBar);
             mainPaneTop.getChildren().add(mainMenuBar);
             mainPaneTop.getChildren().remove(menuContainer);

diff --git a/src/main/java/com/az/gitember/controller/workingcopy/Workingcopy.java b/src/main/java/com/az/gitember/controller/workingcopy/Workingcopy.java
@@ -43,7 +43,7 @@ public class Workingcopy implements Initializable {
     public Pane spacerPane;
     public TextField searchText;
     public CheckBox checkBoxShowLfs;
-    public CheckBox checkBoxShowLastChanges;
+    //public CheckBox checkBoxShowLastChanges;
     private FilteredList filteredList;
 
     private String headSha = "HEAD";
@@ -80,7 +80,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         itemLstChangesDate.setCellValueFactory(
                 c -> new SimpleStringProperty(c.getValue().getChangeDateSafe() ));
 
-        checkBoxShowLastChanges.selectedProperty().addListener((observable, oldValue, newValue) -> {
+        /*checkBoxShowLastChanges.selectedProperty().addListener((observable, oldValue, newValue) -> {
 
             if(newValue) {
                 new StatusUpdateEventHandler(true, workerStateEvent -> {
@@ -95,7 +95,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
             }
 
 
-        });
+        });*/
 
         checkBoxShowLfs.setVisible(Context.lfsRepo.getValue());
         checkBoxShowLfs.selectedProperty().addListener(
@@ -111,7 +111,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
 
 
         if (Context.lastChanges.get()) {
-            checkBoxShowLastChanges.setSelected(true);
+           // checkBoxShowLastChanges.setSelected(true);
             itemLstChangesName.setVisible(true);
             itemLstChangesAuthor.setVisible(true);
             itemLstChangesDate.setVisible(true);
@@ -120,7 +120,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
 
         checkBoxShowLfs.selectedProperty().setValue(Context.showLfsFiles.get());
 
-        Bindings.bindBidirectional(Context.lastChanges, checkBoxShowLastChanges.selectedProperty());
+        //Bindings.bindBidirectional(Context.lastChanges, checkBoxShowLastChanges.selectedProperty());
         Bindings.bindBidirectional(Context.showLfsFiles, checkBoxShowLfs.selectedProperty());
 
         selectTableColumn.setCellValueFactory( c -> new SimpleObjectProperty(c.getValue()));

diff --git a/src/main/resources/com/az/gitember/workingcopy.fxml b/src/main/resources/com/az/gitember/workingcopy.fxml
@@ -83,7 +83,6 @@
                 </Button>
                 <Pane id="MERGEITEM" fx:id="spacerPane"/>
                 <CheckBox id="MERGEITEM" fx:id="checkBoxShowLfs" text="Show large files" visible="false"/>
-                <CheckBox id="MERGEITEM" fx:id="checkBoxShowLastChanges" text="Last changes" />
 
                 <TextField id="MERGEITEM" fx:id="searchText" promptText="Search" />