[transmageddon] Various small fixes and cleanups



commit 440951bef80a3faba72dbe399f2de0f4ac1aef04
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Thu Mar 20 13:56:52 2014 +0100

    Various small fixes and cleanups

 src/transmageddon.py |   10 +++++-----
 src/utils.py         |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/transmageddon.py b/src/transmageddon.py
index e5ff87b..1651505 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -38,7 +38,7 @@ import transcoder_engine
 from urllib.parse import urlparse
 import codecfinder
 import about
-import presets,        udevdisco
+import presets, udevdisco
 import utils
 import datetime
 import langchooser, dvdtrackchooser
@@ -553,7 +553,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.streamdata['multipass'] = 0
        else:
            self.streamdata['multipass'] = int(passes)
-           self.streamdata['passcounter'] = int(0)
+           self.streamdata['passcounter'] = int(1)
 
    # Create query on uridecoder to get values to populate progressbar 
    # Notes:
@@ -1011,8 +1011,8 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            if "multipass-cache-file" not in properties:
               self.multipass=0
            else:
-               self.passcounter=int(1)
-               self.StatusBar.push(context_id, (_("Pass %(count)d Progress") % {'count': self.passcounter}))
+               self.streamdata['passcounter']=int(1)
+               self.StatusBar.push(context_id, (_("Pass %(count)d Progress") % {'count': 
self.streamdata['passcounter']}))
        if self.haveaudio:
            if "samplerate" in self.audiodata[0]:
                # self.check_for_elements()
@@ -1209,7 +1209,7 @@ class TransmageddonUI(Gtk.ApplicationWindow):
            self.containerchoice.set_active(0)
            self.start_time = False
            self.streamdata['multipass'] = 0
-           self.passcounter = 0
+           self.streamdata['passcounter'] = 0
            self.rotationchoice.set_sensitive(True)
            if self.builder.get_object("containerchoice").get_active():
                self.populate_menu_choices()
diff --git a/src/utils.py b/src/utils.py
index ee8c6f3..a0f0b30 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -39,12 +39,12 @@ def get_search_paths():
         @rtype: list
         @return: A list of paths to search in the order they will be searched
     """
-    userconfig=GLib.get_user_config_dir()
+    userconfig=str(GLib.get_user_config_dir())+"/transmageddon"
+    print(userconfig)
     return [
         userconfig,
         os.getcwd(),
         os.path.join(os.getcwd(), ".."),
-        os.path.expanduser(os.path.join(userconfig, "transmageddon")),
         os.path.join(sys.prefix, "share", "transmageddon"),
         os.path.join(sys.prefix, "local", "share", "transmageddon"),
     ]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]