Merge lp:~jsjgruber/lernid/lernid.fix751019.fix749848.fix764069.fix764082 into lp:lernid

[John S. Gruber]

Contains fixes for lernid. All but the fix for LP: #764082 have already been merged into natty.

The fix for LP: #749848 unfortunately reverses the effect of enli's patch to load slides asynchronously rather than synchronously. I left it using webkit, however, so that it could be easily reinstated should the flash plugin support it, or should we convert it to a separate process, for example.

=== modified file 'bin/lernid'
--- bin/lernid	2010-03-07 20:47:42 +0000
+++ bin/lernid	2011-04-27 23:59:22 +0000
@@ -26,8 +26,6 @@
 import locale
 import pynotify
 
-gtk.gdk.threads_init()
-
 try:
     import appindicator
     HAVE_APPINDICATOR = True
@@ -97,9 +95,12 @@
 
         self._main_window = self.builder.get_object("lernid_window")
         # Restore size and maximize state
-        main_window_size = Preferences.get('main_window_size')
-        if main_window_size:
-            self._main_window.resize(main_window_size['width'], main_window_size['height'])
+        self.main_window_size = Preferences.get('main_window_size')
+        if self.main_window_size:
+            self._main_window.resize(self.main_window_size['width'], self.main_window_size['height'])
+        else:
+            size=self._main_window.get_size()
+            self.main_window_size = {'width': size[0], 'height' : size[1]}
         if Preferences.get('main_window_maximize'):
             self._main_window.maximize()
         def save_maximize_state(win, event):
@@ -142,8 +143,14 @@
         def unhighlight_session_tab(w, p, page_num):
             if page_num == self.TAB_SESSION:
                 self._session_label.set_label(_('_Session'))
+
+        def configure_event_mainwindow(self, event):
+            self.main_window_size['width'] = event.width
+            self.main_window_size['height'] = event.height
+
         self._browser.connect('page-changed', highlight_session_tab)
         self._slide.connect('slide-changed', highlight_session_tab)
+        self._main_window.connect('configure-event', configure_event_mainwindow)
 
         # Add widgets to the interface
         self.pack_widgets(Preferences.get('vertical'))
@@ -160,8 +167,18 @@
         self._subpane = self.builder.get_object(prefix+'subpaned')
         pos = Preferences.get(prefix+'panes')
         if pos:
-            # FIXME: Main pane is increased with 300 ±200 px every launch
-            #self._mainpane.set_position(pos['main'])
+            if prefix == 'h':
+                if pos['main'] > self.main_window_size['height']-160:
+                    pos['main'] = self.main_window_size['height']-160
+                if pos['sub'] > self.main_window_size['width']-160:
+                    pos['sub'] = self.main_window_size['width']-160
+            else:
+                if pos['main'] > self.main_window_size['width']-160:
+                    pos['main'] = self.main_window_size['width']-160
+                if pos['sub'] > self.main_window_size['height']-160:
+                    pos['sub'] = self.main_window_size['height']-160
+
+            self._mainpane.set_position(pos['main'])
             self._subpane.set_position(pos['sub'])
 
         menu_tweet = builder.get_object('menu_tweet')
@@ -362,13 +379,12 @@
 
         prefs = {}
         if not Preferences.get('main_window_maximize'):
-            width, height = self._main_window.get_size()
+            width = self.main_window_size['width']; height = self.main_window_size['height']
             prefs['main_window_size'] = {'width': width, 'height': height}
         prefix = 'v' if Preferences.get('vertical') else 'h'
         if (not Preferences.get(prefix+'panes') or
-            not (-15 < Preferences.get(prefix+'panes')['main'] - self._mainpane.get_position() < 15)):
-            # FIXME: HACK. For some reason the main pane position increases by 9-12
-            # pixels on every startup
+            (Preferences.get(prefix+'panes')['main'] != self._mainpane.get_position() ) or
+            (Preferences.get(prefix+'panes')['sub'] != self._subpane.get_position() ) ):
             prefs[prefix+'panes'] = {
                 'main': self._mainpane.get_position(),
                 'sub': self._subpane.get_position()

=== modified file 'data/ui/LernidWindow.ui'
--- data/ui/LernidWindow.ui	2010-03-04 13:13:13 +0000
+++ data/ui/LernidWindow.ui	2011-04-27 23:59:22 +0000
@@ -8,7 +8,7 @@
     <property name="width_request">800</property>
     <property name="height_request">550</property>
     <property name="title" translatable="yes">Lernid</property>
-    <property name="window_position">center</property>
+    <!--property name="window_position">center</property-->
     <property name="icon_name">lernid</property>
     <signal name="destroy" handler="quit"/>
     <child>

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-16 14:08:50 +0000
+++ debian/changelog	2011-04-27 23:59:22 +0000
@@ -1,3 +1,16 @@
+lernid (0.8.0.4) natty; urgency=low
+
+  * Sanity check pane settings. Retrieve update main window size from 
+    configure-event callbacks rather than trying to retrieve size from
+    a possibly destroyed window (by window manager). Allow window manager
+    complete discretion in window placement. (LP: #764082)
+  * Revise size parameters passed to poppler page render call. (LP: #764069)
+  * Revert the slide loading function to run synchronously
+    rather than using python threads. (LP: #749848)
+  * Handle case where web page has no title. (LP: #751019)
+
+ -- John S Gruber <[e-mail]>  Wed, 27 Apr 2011 17:37:00 -0400
+
 lernid (0.7.1) maverick; urgency=low
 
   [ Michael Budde ]

=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2010-03-06 14:16:47 +0000
+++ lernid/widgets/Browser.py	2011-04-27 23:59:22 +0000
@@ -154,6 +154,7 @@
             storeiter = self._url_store.iter_next(storeiter)
         if not match:
             title = browser.get_property('title')
+            if title is None: title = ''
             urllen = 150 - len(title)
             shorturl = url
             if len(url) > urllen:

=== modified file 'lernid/widgets/Slide.py'
--- lernid/widgets/Slide.py	2010-03-06 04:07:29 +0000
+++ lernid/widgets/Slide.py	2011-04-27 23:59:22 +0000
@@ -24,7 +24,6 @@
 import re
 import logging
 import urllib
-from threading import Thread
 
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import save_cache_path
@@ -104,7 +103,7 @@
             page = pdf.get_page(int(pagenumber) - 1)
             w, h = page.get_size()
             pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, int(w), int(h))
-            page.render_to_pixbuf(0,0,8,11,1,0, pixbuf)
+            page.render_to_pixbuf(0,0,int(w),int(h),1,0, pixbuf)
         except:
             Statusbar.push_message(_('An error was encountered while trying to load slide number {0}'.format(pagenumber)), duration=120)
             logging.debug("Something went wrong when loading slide %s" % pagenumber)
@@ -159,8 +158,7 @@
     def _session_changed(self, schedule, session):
         Statusbar.pop_message('slidesession')
         if session.slides:
-            thread = Thread(target=self._download_slides, args=(session,))
-            thread.start()
+            self._download_slides(session)
         else:
             self._image.clear()
             self.hide()