Merge branch 'release/v0.7.1'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+0.7.1 (2016-07-12)
+
+* Fixed preview issue with non-existent nodes under info root.
+* Updated validation and children groups.
+
 0.7.0 (2016-07-10)
 
 * Fixed rare bug with the validator.

designer/gui.py

@@ -640,7 +640,7 @@ def update_available_button():
             update_button = QPushButton("New Version Available!")
             update_button.setFlat(True)
             update_button.clicked.connect(lambda: web_open("https://github.com/GandaG/fomod-designer/releases/latest"))
-            self.statusBar().addWidget(update_button)
+            self.statusBar().addPermanentWidget(update_button)
 
         def check_remote():
             try:
@@ -655,19 +655,21 @@ def check_remote():
                 self.update_check_connection_error.emit()
 
         self.update_check_up_to_date.connect(lambda: self.setStatusBar(QStatusBar()))
-        self.update_check_up_to_date.connect(lambda: self.statusBar().addWidget(QLabel("Everything is up-to-date.")))
+        self.update_check_up_to_date.connect(
+            lambda: self.statusBar().addPermanentWidget(QLabel("Everything is up-to-date."))
+        )
         self.update_check_update_available.connect(lambda: self.setStatusBar(QStatusBar()))
         self.update_check_update_available.connect(update_available_button)
         self.update_check_timeout.connect(lambda: self.setStatusBar(QStatusBar()))
-        self.update_check_timeout.connect(lambda: self.statusBar().addWidget(QLabel("Connection timed out.")))
+        self.update_check_timeout.connect(lambda: self.statusBar().addPermanentWidget(QLabel("Connection timed out.")))
         self.update_check_connection_error.connect(lambda: self.setStatusBar(QStatusBar()))
         self.update_check_connection_error.connect(
-            lambda: self.statusBar().addWidget(QLabel(
+            lambda: self.statusBar().addPermanentWidget(QLabel(
                 "Could not connect to remote server, check your internet connection."
             ))
         )
 
-        self.statusBar().addWidget(QLabel("Checking for updates..."))
+        self.statusBar().addPermanentWidget(QLabel("Checking for updates..."))
 
         Thread(target=check_remote).start()
 

designer/nodes.py

@@ -994,10 +994,6 @@ def _init(self):
         required = (
             NodeConfigPluginDescription,
         )
-        at_least_one_child = (
-            NodeConfigFiles,
-            NodeConfigConditionFlags
-        )
         properties = OrderedDict([
             ("name", PropertyText("Name"))
         ])
@@ -1007,7 +1003,6 @@ def _init(self):
             0,
             allowed_children=allowed_children,
             properties=properties,
-            at_least_one_children_group=at_least_one_child,
             required_children=required
         )
         super()._init()

designer/previews.py

@@ -181,10 +181,14 @@ def run(self):
 
             self.kwargs["gui_worker"].clear_tab_signal.emit()
             self.kwargs["gui_worker"].clear_ui_signal.emit()
-            info_name = self.kwargs["info_root"]().find("Name").text
-            info_author = self.kwargs["info_root"]().find("Author").text
-            info_version = self.kwargs["info_root"]().find("Version").text
-            info_website = self.kwargs["info_root"]().find("Website").text
+            info_name = self.kwargs["info_root"]().find("Name").text \
+                if self.kwargs["info_root"]().find("Name") is not None else ""
+            info_author = self.kwargs["info_root"]().find("Author").text \
+                if self.kwargs["info_root"]().find("Author") is not None else ""
+            info_version = self.kwargs["info_root"]().find("Version").text \
+                if self.kwargs["info_root"]().find("Version") is not None else ""
+            info_website = self.kwargs["info_root"]().find("Website").text \
+                if self.kwargs["info_root"]().find("Website") is not None else ""
             self.kwargs["gui_worker"].set_labels_signal.emit(info_name, info_author, info_version, info_website)
 
             step_data = self.InstallStepData(element.get("name"))

dev/reqs.txt

@@ -1,5 +1,5 @@
 bumpversion==0.5.3
-fomod-validator==1.5.2
+fomod-validator==1.5.3
 invoke==0.12.2
 jsonpickle==0.9.3
 lxml==3.5.0

resources/mod_schema.xsd

@@ -425,7 +425,7 @@
 					<xs:documentation>The optional image associated with a plugin.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:choice>
+			<xs:choice minOccurs="0">
 				<xs:sequence>
 					<xs:element name="files" type="fileList">
 						<xs:annotation>

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.0
+current_version = 0.7.1
 current_build = 0
 
 [bdist_wheel]