Added seperate language enty for Title Language

- minor version bump - Takes the place of the language_code setting - subs now have their own languge entry called subs_language
Laharah · Sep 4, 2016 · 6b48a1b · 6b48a1b
1 parent e3f71fb
commit 6b48a1b
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 #FilebotTool: FileBot Integration for Deluge
 *requires [Filebot](http://www.filebot.net/)*
 
-**Version 1.0**
+**Version 1.1.0**
 
 #####[Download Latest Release](https://github.com/Laharah/deluge-FilebotTool/releases/latest)
 
@@ -21,6 +21,7 @@ your torrents seeding **without wasting storage space on duplicates!**
 - Batch processing
 - Dry run previews
 - Download missing subtitles
+- Multi-language support
 - Easily rollback mistakes
 - supports both server-client and classic mode
 - Custom auto-organize rulesets:

diff --git a/filebottool/core.py b/filebottool/core.py
@@ -693,7 +693,7 @@ def do_revert(self, torrent_id):
     @export
     def save_rename_dialog_settings(self, new_settings):
         log.debug("recieved settings from client: {0}".format(new_settings))
-        for setting in self.config["rename_dialog_last_settings"]:
+        for setting in DEFAULT_PREFS["rename_dialog_last_settings"]:
             try:
                 if new_settings[setting] is not None:
                     self.config["rename_dialog_last_settings"][setting] = (

diff --git a/filebottool/data/handler_editor.glade b/filebottool/data/handler_editor.glade
@@ -312,6 +312,42 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="language_code_label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip" translatable="yes">2 character language code
+(ex: 'en' for english)</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Title Language:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="language_code_entry1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">2 character language code
+(ex: 'en' for english)</property>
+                        <property name="max_length">2</property>
+                        <property name="invisible_char">●</property>
+                        <property name="width_chars">3</property>
+                        <property name="invisible_char_set">True</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">True</property>
+                        <property name="secondary_icon_sensitive">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                     <child>
                       <widget class="GtkLabel" id="episode_order_label">
                         <property name="visible">True</property>
@@ -323,7 +359,7 @@
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="padding">3</property>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -334,7 +370,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                   </widget>

diff --git a/filebottool/data/rename.glade b/filebottool/data/rename.glade
@@ -600,6 +600,41 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkLabel" id="language_code_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="tooltip" translatable="yes">2 character language code
+(ex: 'en' for english)</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Title Language:</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="language_code_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" translatable="yes">2 character language code
+(ex: 'en' for english)</property>
+                                <property name="max_length">2</property>
+                                <property name="invisible_char">●</property>
+                                <property name="width_chars">3</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                             <child>
                               <widget class="GtkLabel" id="episode_order_label">
                                 <property name="visible">True</property>
@@ -610,7 +645,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                             <child>
@@ -622,7 +657,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                           </widget>
@@ -719,7 +754,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="language_code_label">
+                                  <widget class="GtkLabel" id="subs_language_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -734,7 +769,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="language_code_entry">
+                                  <widget class="GtkEntry" id="subs_language_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip" translatable="yes">2 character language code

diff --git a/filebottool/gtkui/handler_ui.py b/filebottool/gtkui/handler_ui.py
@@ -113,12 +113,12 @@ def populate_with_settings(self, settings):
                 combo.set_active(value_index)
 
         entry_value_pairs = [
-            (self.format_string_entry, settings["format_string"]),
-            (self.encoding_entry, settings["encoding"]),
-            (self.subs_language_entry, settings["subs_language"]),
-            (self.language_code_entry, settings["language_code"]),
-            (self.query_entry, settings["query_override"]),
-            (self.output_entry, settings["output"])
+            (self.format_string_entry, settings.get("format_string", '')),
+            (self.encoding_entry, settings.get("encoding", '')),
+            (self.subs_language_entry, settings.get("subs_language", '')),
+            (self.language_code_entry, settings.get("language_code", '')),
+            (self.query_entry, settings.get("query_override", '')),
+            (self.output_entry, settings.get("output", '')),
         ]
 
         log.debug("Setting entry widgets")

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
 __plugin_name__ = "FileBotTool"
 __author__ = "laharah"
 __author_email__ = "laharah+fbt@gmail.com"
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 __url__ = "https://github.com/Laharah/deluge-FileBotTool"
 __license__ = "GPLv3"
 __description__ = "Integrates FileBot functionality to Deluge"