openshot-bug-722285.patch

   1 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/classes/sequences.py openshot-1.4.3-patched//openshot/classes/sequences.py
   2 --- openshot-1.4.3//openshot/classes/sequences.py       2012-09-30 22:33:29.000000000 +0200
   3 +++ openshot-1.4.3-patched//openshot/classes/sequences.py       2013-05-21 21:56:14.000000000 +0200
   4 @@ -302,10 +302,7 @@
   5
   6                 # resize the canvas height and width
   7                 new_size_of_middle = Size_Of_Middle + 200
   8 -               if new_size_of_middle > 32000:
   9 -                       # do not let the size of the canvas exceed 32,000... or cairo will throw an error
  10 -                       new_size_of_middle = 32000
  11 -
  12 +
  13                 canvas_timeline.set_bounds (0, 0, new_size_of_middle, timeline_heigth)
  14                 self.project.form.hscrollbar2.set_range(0, new_size_of_middle)
  15                 self.project.form.vscrollbar2.set_range(0, timeline_heigth)
  16 @@ -381,9 +378,7 @@
  17                 # loop through each tick mark
  18                 number_of_ticks = int(self.length / self.scale)
  19                 ruler_pixels = ((float(self.length) / float(self.scale)) * self.tick_pixels)
  20 -               if ruler_pixels > 32000:
  21 -                       ruler_pixels = 32000
  22 -
  23 +
  24                 tick = 0
  25                 end_of_timeline = False
  26
  27 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/catalog.xml openshot-1.4.3-patched//openshot/widgets/catalog.xml
  28 --- openshot-1.4.3//openshot/widgets/catalog.xml        1970-01-01 01:00:00.000000000 +0100
  29 +++ openshot-1.4.3-patched//openshot/widgets/catalog.xml        2012-05-27 22:55:15.000000000 +0200
  30 @@ -0,0 +1,11 @@
  31 +<?xml version="1.0" encoding="UTF-8"?>
  32 +<glade-catalog name="openshotwidgets" library="gladepython" domain="glade-3" depends="gtk+" language="python">
  33 +       <init-function>glade_python_init</init-function>
  34 +       <glade-widget-classes>
  35 +               <glade-widget-class title="Extended Scrollbar" name="Extended_Scrollbar" generic-name="Extended_Scrollbar"></glade-widget-class>
  36 +       </glade-widget-classes>
  37 +       <glade-widget-group name="OpenShot-widgets" title="OpenShot Widgets">
  38 +               <glade-widget-class-ref name="Extended_Scrollbar"/>
  39 +       </glade-widget-group>
  40 +</glade-catalog>
  41 +
  42 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/__init__.py openshot-1.4.3-patched//openshot/widgets/__init__.py
  43 --- openshot-1.4.3//openshot/widgets/__init__.py        1970-01-01 01:00:00.000000000 +0100
  44 +++ openshot-1.4.3-patched//openshot/widgets/__init__.py        2013-05-21 22:38:02.000000000 +0200
  45 @@ -0,0 +1 @@
  46 +#Comment so diff will include the file in the patch
  47 \ Kein Zeilenumbruch am Dateiende.
  48 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/openshotwidgets.py openshot-1.4.3-patched//openshot/widgets/openshotwidgets.py
  49 --- openshot-1.4.3//openshot/widgets/openshotwidgets.py 1970-01-01 01:00:00.000000000 +0100
  50 +++ openshot-1.4.3-patched//openshot/widgets/openshotwidgets.py 2013-05-22 22:55:24.000000000 +0200
  51 @@ -0,0 +1,40 @@
  52 +import gtk
  53 +
  54 +class Extended_Scrollbar(gtk.HScrollbar):
  55 +    __gtype_name__ = 'Extended_Scrollbar'
  56 +
  57 +    def __init__(self):
  58 +        self.adjustedadjustment=gtk.Adjustment(0.0, 0.0, 101.0, 0.1, 1.0, 1.0)
  59 +        self.scalefactor=1.0
  60 +        self.offset=0
  61 +        super(Extended_Scrollbar,self).__init__(self.adjustedadjustment)
  62 +
  63 +    def get_value(self):
  64 +        return (super(Extended_Scrollbar,self).get_value()-self.offset)/self.scalefactor
  65 +
  66 +    def set_value(self,goto_pixel):
  67 +        super(Extended_Scrollbar,self).set_value(goto_pixel*self.scalefactor+self.offset)
  68 +
  69 +    def set_range(self,gminimum,gmaximum):
  70 +        maxrange=64000
  71 +        if gmaximum<gminimum:
  72 +            swap=gmaximum
  73 +            gmaximum=gminimum
  74 +            gminimum=swap
  75 +
  76 +        if gmaximum-gminimum>maxrange or gmaximum>32000 or gminimum<32000:
  77 +            self.scalefactor=float(maxrange)/float(gmaximum-gminimum)
  78 +            gmaximum=32000
  79 +            gminimum=-32000
  80 +            self.offset=-32000
  81 +        else:
  82 +            self.scalefactor=1.0
  83 +            self.offset=0
  84 +        super(Extended_Scrollbar,self).set_range(gminimum,gmaximum)
  85 +
  86 +
  87 +    def get_adjustment(self):
  88 +        return super(Extended_Scrollbar,self).get_adjustment()
  89 +
  90 +    def set_adjustment_page_size(self,pagesize):
  91 +        super(Extended_Scrollbar,self).get_adjustment().set_page_size(pagesize)
  92 \ Kein Zeilenumbruch am Dateiende.
  93 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/windows/MainGTK.py openshot-1.4.3-patched//openshot/windows/MainGTK.py
  94 --- openshot-1.4.3//openshot/windows/MainGTK.py 2012-09-30 22:33:29.000000000 +0200
  95 +++ openshot-1.4.3-patched//openshot/windows/MainGTK.py 2013-05-22 22:54:13.000000000 +0200
  96 @@ -28,6 +28,7 @@
  97  import webbrowser
  98  import subprocess
  99  import shutil
 100 +from widgets import openshotwidgets
 101
 102  import classes.effect as effect
 103  from classes import files, lock, messagebox, open_project, project, timeline, tree, video, inputbox, av_formats, clip
 104 @@ -2450,7 +2451,7 @@
 105
 106                 # get the middle of the window
 107                 screen_width = (self.width / 2) - 100
 108 -
 109 +
 110                 if playhead_pixels > (current_scroll_pixels + screen_width):
 111                         # scroll to last scroll position
 112                         self.hscrollbar2.set_value(playhead_pixels - screen_width)
 113 diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/windows/ui/Main.ui openshot-1.4.3-patched//openshot/windows/ui/Main.ui
 114 --- openshot-1.4.3//openshot/windows/ui/Main.ui 2012-09-30 22:33:29.000000000 +0200
 115 +++ openshot-1.4.3-patched//openshot/windows/ui/Main.ui 2013-05-22 22:49:28.000000000 +0200
 116 @@ -1694,11 +1694,11 @@
 117                            </packing>
 118                          </child>
 119                          <child>
 120 -                          <object class="GtkHScrollbar" id="hscrollbar2">
 121 +                          <object class="Extended_Scrollbar" id="hscrollbar2">
 122                              <property name="visible">True</property>
 123                              <property name="can_focus">False</property>
 124                              <property name="adjustment">adjustment1</property>
 125 -                            <signal name="value-changed" handler="on_hscrollbar2_value_changed" swapped="no"/>
 126 +                            <signal name="value-changed" handler="on_hscrollbar2_value_changed"/>
 127                            </object>
 128                            <packing>
 129                              <property name="expand">True</property>