Show submodel image at first step - ShowSubModelGui header #52

trevorsandy · Dec 3, 2018 · 4084605 · 4084605
1 parent 512d662
commit 4084605
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -143,9 +143,9 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [univention-icon]:     https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/univention.png
 [windows-icon]:        https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/windows.png
 
-[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1038_20181203.exe
-[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1038_20181203-macos.dmg
-[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1038_20181203-x86_64.AppImage
+[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1039_20181203.exe
+[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1039_20181203-macos.dmg
+[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.3.4/LPub3D-2.3.4.1.1039_20181203-x86_64.AppImage
 
 [arch-url]:            https://download.opensuse.org/repositories/home:/trevorsandy/Arch_Extra/
 [centos-url]:          https://download.opensuse.org/repositories/home:/trevorsandy/CentOS_7/

diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Trevor SANDY <trevor[dot]sandy[at]gmail[dot]com>
 # Last Update October 02, 2018
 pkgname=lpub3d
-pkgver=2.3.4.1038
+pkgver=2.3.4.1039
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.3.4.1038) debian; urgency=medium
+lpub3d (2.3.4.1039) debian; urgency=medium
 
-  * LPub3D version 2.3.4.1.1038_20181203 for Linux
+  * LPub3D version 2.3.4.1.1039_20181203 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 03 Dec 2018 05:56:01 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 03 Dec 2018 05:58:04 +0100
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.3.4.1038
+Version: 2.3.4.1039
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -115,7 +115,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.3.4.1038
+Version: 2.3.4.1039
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -711,5 +711,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1038
+* Mon Dec 03 2018 - trevor.dot.sandy.at.gmail.dot.com 2.3.4.1039
 - LPub3D Linux package (rpm) release
diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 3 4 1 1038 86405c9
+2 3 4 1 1039 512d662
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.3.4.1.1038 (03 12 2018 05:56:01)
+LPub3D 2.3.4.1.1039 (03 12 2018 05:58:05)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -9,7 +9,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1038 (03 12 2018 05:56:01)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.3.4.1.1039 (03 12 2018 05:58:05)</h4>
         <hr>
           <p>
              LPub3D version 2.3.3<br>

diff --git a/mainApp/metagui.h b/mainApp/metagui.h
@@ -930,6 +930,48 @@ public slots:
   void cameraDistFactorChange(int factor);
 };
 
+/***********************************************************************
+ *
+ * Show Submodel
+ *
+ **********************************************************************/
+
+class QCheckBox;
+class ShowSubModelGui : public MetaGui
+{
+  Q_OBJECT
+public:
+
+  ShowSubModelGui(
+          SubModelMeta *_meta,
+          QGroupBox    *parent = nullptr);
+  ~ShowSubModelGui() {}
+
+  virtual void apply(QString &topLevelFile);
+
+private:
+  SubModelMeta *meta;
+
+  QCheckBox    *showSubmodelsBox;
+  QCheckBox    *showTopModelBox;
+
+  QCheckBox    *showSubmodelsDefaultBox;
+  QCheckBox    *showSubmodelsMetaBox;
+
+  QCheckBox    *showTopModelDefaultBox;
+  QCheckBox    *showTopModelMetaBox;
+
+  bool          showSubmodelsModified;
+  bool          showTopModelModified;
+
+  bool          showSubmodelsDefaulSettings;
+  bool          showTopModelDefaulSettings;
+
+public slots:
+  void showSubmodelsChange(bool checked);
+  void showTopModelChange(bool checked);
+};
+
 /***********************************************************************
  *
  * PliSort

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml
@@ -68,7 +68,7 @@
         <binary>lpub3d23</binary>
     </provides>
     <releases>
-        <release version="2.3.4.1038" date="2018-12-03">
+        <release version="2.3.4.1039" date="2018-12-03">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>