specify only output extension on the Document tab

Remove checks for given files extensions. The program will try the
conversions with any input files. Default document formats updated.

ffmulticonverter/config.py

@@ -69,20 +69,11 @@
 
 #-----document data
 
-document_formats = {
-        'doc' : ['odt', 'pdf'],
-        'html' : ['odt'],
-        'odp' : ['pdf', 'ppt'],
-        'ods' : ['pdf'],
-        'odt' : ['doc', 'html', 'pdf', 'rtf', 'sxw', 'txt','xml'],
-        'ppt' : ['odp'],
-        'rtf' : ['odt'],
-        'sdw' : ['odt'],
-        'sxw' : ['odt'],
-        'txt' : ['odt'],
-        'xls' : ['ods'],
-        'xml' : ['doc', 'odt', 'pdf']
-        }
+document_formats = [
+        'bib', 'csv', 'dif', 'doc', 'docx', 'html', 'ltx', 'odp', 'ods', 'odt',
+        'pdf', 'ppt', 'pptx', 'rtf', 'sdc', 'sdw', 'txt', 'xls', 'xlsx', 'xml'
+        ]
+
 
 #-----misc
 translators = [

ffmulticonverter/documenttab.py

@@ -32,17 +32,11 @@ def __init__(self, parent):
         self.name = 'Documents'
         self.formats = config.document_formats
 
-        flist = []
-        for i in self.formats:
-            for y in self.formats[i]:
-                flist.append(i + ' to ' + y)
-        flist.sort()
-
-        convertQL = QLabel(self.tr('Convert:'))
-        self.convertQCB = QComboBox()
-        self.convertQCB.addItems(flist)
+        convertQL = QLabel(self.tr('Convert to:'))
+        self.extQCB = QComboBox()
+        self.extQCB.addItems(sorted(self.formats))
         final_layout = utils.add_to_layout(
-                'h', convertQL, self.convertQCB, None)
+                'h', convertQL, self.extQCB, None)
         self.setLayout(final_layout)
 
     def ok_to_continue(self):
@@ -51,27 +45,11 @@ def ok_to_continue(self):
 
         Checks if:
         - unoconv is missing.
-        - Given file extension is same with the declared extension.
 
         Return True if all tests pass, else False.
         """
-        decl_ext = self.convertQCB.currentText().split(' ')[0]
-
-        try:
-            if not self.parent.unoconv:
-                raise ValidationError(
-                        self.tr(
-                        'Unocov is not installed.\nYou will not be able '
-                        'to convert document files until you install it.')
-                        )
-            for i in self.parent.fnames:
-                file_ext = os.path.splitext(i)[-1][1:]
-                if file_ext != decl_ext:
-                    raise ValidationError(
-                            self.trUtf8('{0} is not {1}!'.format(i, decl_ext)))
-            return True
-
-        except ValidationError as e:
-            QMessageBox.warning(self, 'FF Multi Converter - ' + \
-                    self.tr('Error!'), str(e))
+        if not self.parent.unoconv:
+            QMessageBox.warning(self, 'FF Multi Converter - ' + self.tr('Error!'),
+                    self.tr('Unocov is not installed!'))
             return False
+        return True

ffmulticonverter/ffmulticonverter.py

@@ -398,18 +398,6 @@ def ok_to_continue(self):
                     self, 'FF Multi Converter - ' + self.tr('Error!'), str(e))
             return False
 
-    def get_output_extension(self):
-        """Extract the desired output file extension from GUI and return it."""
-        tab = self.get_current_tab()
-        if tab.name == 'AudioVideo':
-            ext_to = self.audiovideo_tab.extQCB.currentText()
-        elif tab.name == 'Images':
-            ext_to = tab.extQCB.currentText()
-        else:
-            ext_to = tab.convertQCB.currentText().split()[-1]
-
-        return '.' + ext_to
-
     def start_conversion(self):
         """
         Extract the appropriate information from GUI and call the
@@ -419,11 +407,12 @@ def start_conversion(self):
             return
 
         tab = self.get_current_tab()
+        ext_to = '.' + tab.extQCB.currentText()
+
         if tab.name == 'Documents' and not self.office_listener_started:
             utils.start_office_listener()
             self.office_listener_started = True
 
-        ext_to = self.get_output_extension()
         _list = utils.create_paths_list(
                 self.fnames, ext_to, self.prefix, self.suffix,
                 self.toQLE.text(), self.origQCB.isChecked(),