* Added a close button on the login dialog

 * Since 770 is suported now, removed my notes on it
 * Removed the threading context since we aren't doing that anymore
 * Added some reminders for myself in using the SDK

git-svn-id: file:///svnroot/gc-dialer/trunk@51 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/README b/README
index 20a761e..2c1ecde 100644 (file)
--- a/README
+++ b/README
@@ -8,3 +8,30 @@ Supported PLATFORMs include
        desktop
        os2007
        os2008
+
+SDK Enviroment
+===================
+
+Native
+
+Follow install instructions
+       Ubuntu: http://www.linuxuk.org/node/38
+Install Nokia stuff (for each target)
+       fakeroot apt-get install maemo-explicit
+
+Userful commands
+Login
+       /scratchbox/login
+Change targets
+       sb-conf select DIABLO_ARMEL
+       sb-conf select DIABLO_X86
+Fixing it
+       fakeroot apt-get -f install
+
+Starting scratchbox
+       Xephyr :2 -host-cursor -screen 800x480x16 -dpi 96 -ac -extension Composite
+       scratchbox
+       export DISPLAY=:2
+       af-sb-init.sh start
+Then running a command in the "Maemo" terminal will launch it in the Xephyr session
+       Tip: run with "run-standalone.sh" for niceness?

diff --git a/TODO b/TODO
index 94cd992..af1ad6e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,9 +1,3 @@
-770 Support
-       GTK Builder -> Glade
-       XML -> Glade File (Don't know how many of these matter, we might need to build a seperate glade file)
-               object -> widget
-               interface -> glade-interface
-               Differences in properties
 General Python/Maemo stuff
        http://pymaemo.garage.maemo.org/documentation.html
 DBus

diff --git a/gc_dialer/gc_dialer.glade b/gc_dialer/gc_dialer.glade
index cc22104..a2bcaf4 100644 (file)
--- a/gc_dialer/gc_dialer.glade
+++ b/gc_dialer/gc_dialer.glade
@@ -658,6 +658,16 @@ Copyright 2008</property>
                 <signal name="clicked" handler="on_loginbutton_clicked"/>
               </widget>
             </child>
+            <child>
+              <widget class="GtkButton" id="closebutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Close</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_loginclose_clicked"/>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index e578a4b..a4e98b0 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -15,7 +15,6 @@ import os
 import re
 import time
 import threading
-import contextlib
 import gobject
 import gtk
 import gtk.glade
@@ -55,14 +54,9 @@ except ImportError:
 from gcbackend import GCDialer
 
 import socket
-socket.setdefaulttimeout(5)
 
-@contextlib.contextmanager
-def gtk_critical_section():
-       #The API changed and I hope these are the right calls
-       gtk.gdk.threads_enter()
-       yield
-       gtk.gdk.threads_leave()
+
+socket.setdefaulttimeout(5)
 
 
 def makeugly(prettynumber):
@@ -195,6 +189,7 @@ class Dialpad(object):
                        "on_digit_clicked"  : self.on_digit_clicked,
                        "on_dial_clicked"    : self.on_dial_clicked,
                        "on_loginbutton_clicked" : self.on_loginbutton_clicked,
+                       "on_loginclose_clicked" : self.on_loginclose_clicked,
                        "on_clearcookies_clicked" : self.on_clearcookies_clicked,
                #       "on_callbackentry_changed" : self.on_callbackentry_changed,
                        "on_notebook_switch_page" : self.on_notebook_switch_page,
@@ -354,6 +349,9 @@ class Dialpad(object):
        def on_loginbutton_clicked(self, data=None):
                self.wTree.get_widget("login_dialog").response(gtk.RESPONSE_OK)
 
+       def on_loginclose_clicked(self, data=None):
+               sys.exit(0)
+
        def on_dial_clicked(self, widget):
                self.attemptLogin(3)