Merge pull request #507 from jongough/updates

Updates
jongough · May 14, 2022 · 5cc705d · 5cc705d
2 parents ddda78c + d460aed
commit 5cc705d
Show file tree

Hide file tree

Showing 31 changed files with 937 additions and 549 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,6 +27,9 @@ workflows:
             <<: *std-filters
         - build-armhf-debian-buster:
             <<: *std-filters
+## Ready to build gtk3 version of armhf debian buster
+        - build-armhf-debian-buster-gtk3:
+            <<: *std-filters
 ## Derecated in favour of ubuntu-armhf:20.04 build - 14/01/2022
 ##        - build-armhf-bullseye:
 ##            <<: *std-filters
@@ -51,12 +54,12 @@ workflows:
             <<: *std-filters
         - build-buster:
             <<: *std-filters
-        - build-flatpak-x86-1808:
-            <<: *std-filters
         - build-flatpak-x86-2008:
             <<: *std-filters
         - build-flatpak-x86-2008-beta:
             <<: *std-filters
+        - build-flatpak-x86-1808:
+            <<: *std-filters
         - build-flatpak-arm64:
             <<: *std-filters
         - build-macos:
@@ -87,32 +90,20 @@ commands:
                 - when:
                     condition: <<parameters.install-python>>
                     steps:
-                    - run: sudo apt install software-properties-common
-                    - run: sudo add-apt-repository ppa:deadsnakes/ppa -y
-                    - run: sudo apt update
-                    - run: sudo apt install -y python3.7
-                    - run: ls -la /usr/bin/python*
-                    - run: sudo rm /usr/bin/python3
-                    - run: sudo ln -s /usr/bin/python3.7 /usr/bin/python3
-                    - run: ls -la /usr/bin/python*
-                    - run: sudo apt install -y python3.7 python3-pip
+                    - run: sudo apt install -y python3-pip
+                    - run: python3.8 -m pip install cloudsmith-cli
                 - when:
                     condition: <<parameters.use-orb>>
                     steps:
                     - cloudsmith/ensure-api-key
                     - cloudsmith/install-cli
                 - run: ci/cloudsmith-upload.sh
-    # add - use-apt-proxy before the '- run: ci/circleci-build*.sh' if building locally and there is an apt proxy available. It will speed up the build considerably if on a slow connection.
-    use-apt-proxy:
-        parameters:
-            use-proxy:
-                type: boolean
-                default: true
-        steps:
-            - when:
-                condition: <<parameters.use-proxy>>
-                steps:
-                - run: echo "Acquire::http::Proxy \"http://192.168.1.1:3142\";" | sudo tee -a /etc/apt/apt.conf.d/00aptproxy
+
+    # if you want to use a local proxy add Acquire::http::Proxy \"http://192.168.1.1:3142\"; to a file called circleci-cache/apt-proxy. This will require
+    #    --volume {your local directory}/circleci-cache:/home/circleci/circleci-cache
+    # on the circleci local command line so that the docker image script can have access to the directory
+    # if you are on a slow or data limited internet link you can put a copy of master.zip here, or allow one to be downloaded by the script, as it is used by the android builds to
+    # provide the wxWidgets QT information.
 
 jobs:
     build-armhf-stretch:
@@ -179,6 +170,23 @@ jobs:
             command: ci/circleci-build-raspbian-armhf.sh
             no_output_timeout: 30m
         - deploy-code
+    build-armhf-debian-buster-gtk3:
+        machine:
+            image: ubuntu-2004:202104-01
+        environment:
+        - OCPN_TARGET=buster-armhf
+        - DOCKER_IMAGE=jongough/debian-armhf:buster
+        - BUILD_FLAGS=-j3
+        - BUILD_ENV=debian
+        - BUILD_GTK3: true
+        - DEPLOY_USE_ORB: true
+        steps:
+        - checkout
+        - run: chmod a+x ./ci/*.sh
+        - run:
+            command: ci/circleci-build-raspbian-armhf.sh
+            no_output_timeout: 30m
+        - deploy-code
     build-armhf-bullseye:
         machine:
             image: ubuntu-2004:202104-01
@@ -432,7 +440,7 @@ jobs:
         resource_class: arm.medium
         environment:
         - OCPN_TARGET:  flatpak-arm64
-        - FLATPAK_BRANCH: beta
+        - FLATPAK_BRANCH: stable
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 20.08
         - DEPLOY_USE_ORB: true
@@ -486,7 +494,6 @@ jobs:
         resource_class: large
         environment:
         - OCPN_TARGET:  android-armhf
-        - DEPLOY_USE_ORB: true
         steps:
         - checkout
         - run: chmod a+x ci/*.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,9 +30,9 @@ set(PACKAGE "ocpn_draw")
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "8")
-set(VERSION_PATCH "15")
-set(VERSION_TWEAK "6")
-set(VERSION_DATE "20/04/2021") # DD/MM/YYYY format
+set(VERSION_PATCH "16")
+set(VERSION_TWEAK "0")
+set(VERSION_DATE "14/05/2021") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")

diff --git a/Forms/ODPointPropertiesDialog.cpp b/Forms/ODPointPropertiesDialog.cpp
@@ -25,7 +25,6 @@ bool ODPointPropertiesDialog::Create( wxWindow* parent, wxWindowID id, const wxS
 		return false;
 	}
 
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
 	m_SizerDialogBox = new wxBoxSizer( wxVERTICAL );
 
@@ -318,7 +317,7 @@ bool ODPointPropertiesDialog::Create( wxWindow* parent, wxWindowID id, const wxS
 	m_scrolledWindowBasicProperties->SetSizer( m_SizerBasicProperties );
 	m_scrolledWindowBasicProperties->Layout();
 	m_SizerBasicProperties->Fit( m_scrolledWindowBasicProperties );
-	m_notebookProperties->AddPage( m_scrolledWindowBasicProperties, _("Basic"), true );
+	m_notebookProperties->AddPage( m_scrolledWindowBasicProperties, _("Basic"), false );
 	m_panelDisplayText = new wxPanel( m_notebookProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_SizerDisplayText = new wxBoxSizer( wxVERTICAL );
 
@@ -418,9 +417,20 @@ bool ODPointPropertiesDialog::Create( wxWindow* parent, wxWindowID id, const wxS
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
 
 	m_checkBoxVisible = new wxCheckBox( m_panelExtended, wxID_ANY, _("Show on chart"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxVisible->SetValue(true);
 	bSizer3->Add( m_checkBoxVisible, 0, wxALL, 5 );
 
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_checkBoxShowAtScale = new wxCheckBox( m_panelExtended, wxID_ANY, _("Show at scale> 1:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_checkBoxShowAtScale, 0, wxALL, 5 );
+
+	m_textCtrlShowAtScale = new wxTextCtrl( m_panelExtended, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_textCtrlShowAtScale, 1, wxALL, 5 );
+
+
+	bSizer3->Add( bSizer25, 0, wxEXPAND, 5 );
+
 	wxBoxSizer* bSizer4;
 	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
 
@@ -438,7 +448,7 @@ bool ODPointPropertiesDialog::Create( wxWindow* parent, wxWindowID id, const wxS
 	m_panelExtended->SetSizer( bSizer3 );
 	m_panelExtended->Layout();
 	bSizer3->Fit( m_panelExtended );
-	m_notebookProperties->AddPage( m_panelExtended, _("Extended"), false );
+	m_notebookProperties->AddPage( m_panelExtended, _("Extended"), true );
 
 	bSizer26->Add( m_notebookProperties, 1, wxEXPAND | wxALL, 5 );
 

diff --git a/Forms/ODPointPropertiesDialog.h b/Forms/ODPointPropertiesDialog.h
@@ -135,6 +135,8 @@ class ODPointPropertiesDialog : public wxDialog
 		wxRadioBox* m_radioBoxShowDisplayText;
 		wxPanel* m_panelExtended;
 		wxCheckBox* m_checkBoxVisible;
+		wxCheckBox* m_checkBoxShowAtScale;
+		wxTextCtrl* m_textCtrlShowAtScale;
 		wxStaticText* m_staticText1;
 		wxTextCtrl* m_textCtrlGuid;
 		wxBoxSizer* m_SizerButtons;