Changeset 173

Timestamp:

06/13/07 06:22:23 (5 years ago)

Author:

marc

Message:

Dont hide server log on stopping server. Fixed minor UI quirk when starting/stopping server. Removed redundant gtk.Hbox. Removed my email from all files. Added references to the HACKING guide on the docs.

Location:

trunk

Files:

• BUGS (modified) (1 diff)
• DOCUMENTATION (modified) (1 diff)
• README (modified) (3 diffs)
• config.py (modified) (1 diff)
• console.py (modified) (1 diff)
• error.py (modified) (1 diff)
• itaka.py (modified) (1 diff)
• screenshot.py (modified) (1 diff)
• server.py (modified) (1 diff)
• uigtk.py (modified) (11 diffs)

trunk/BUGS

@@ -3 +3 @@
 
 Known bugs:
- Preferences expanding animation does not work right (#2)
+ Preferences expanding animation does not work correctly (#2)

trunk/DOCUMENTATION

@@ -1 +1 @@
 See Section 5 of the README ("DOCUMENTATION") for documentation information.
+See HACKING file if you intend to change Itaka's source code.

trunk/README

@@ -11 +11 @@
 4. DEBIAN PACKAGE
 5. DOCUMENTATION
-6. RELEASE NOTES
-7. PROGRAM CREDITS
+6. HACKING
+7. RELEASE NOTES
+8. PROGRAM CREDITS
 
 1. ABOUT ITAKA:
@@ -63 +64 @@
 epydoc --html -o doc -n Itaka -u "http://itaka.jardinpresente.com.ar" *.py
 
-6. RELEASE NOTES:
+6. HACKING
 
-This is the first feature-complete release of Itaka. 
+If you intend to change Itaka source coude, please read the HACKING file.
+
+Any questions should be emailed to me directly.
+
+7. RELEASE NOTES:
+
+This is the second release of Itaka. 
+
+See ChangeLog for more detailed information.
 
 Donations for this software would be greatly appreciated. This software is 
@@ -79 +88 @@
 See COPYING file for further license information
 
-7. PROGRAM CREDITS:
+8. PROGRAM CREDITS:
 
 Special thanks to James Henstridge for the excellent Python-GTK bindings and 

trunk/config.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc_at_gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/console.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc_at_gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/error.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc@gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/itaka.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc@gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/screenshot.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc_at_gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/server.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc_at_gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #

trunk/uigtk.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# Copyright 2003-2007 Marc E. <santusmarc_at_gmail.com>.
+# Copyright 2003-2007 Marc E.
 # http://itaka.jardinpresente.com.ar
 #
@@ -163 +163 @@
             # Stop the server
             if self.gui.server.listening():
-                self.gui.stop_server(None, True, False)
+                self.gui.stop_server(None, True)
 
         self._write_gui_log(self.simplemessage, self.detailedmessage, self._get_failure_icon(failuretype), True, True)
@@ -277 +277 @@
         self.console = consoleinstance
         self.itakaglobals = configuration[0]
+
         # The configuration instance has the user's preferences already loaded.
         self.configinstance = configuration[1]
         self.configuration = self.itakaglobals.values
 
+        # Instances of our Gui Logging class and Screenshot Server
+        self.server = iserver.ScreenshotServer(self)
         self.log = GuiLog(self, self.console, self.configuration)
         self.logpaused = False
-        
-        self.server = iserver.ScreenshotServer(self)
 
         # Start defining widgets
@@ -294 +295 @@
         self.window.set_icon(self.icon_pixbuf)
         self.window.set_border_width(6)
-        self.window.set_default_size(400, 1)
+        self.window.set_default_size(370, 1)
         self.window.set_position(gtk.WIN_POS_CENTER)
         self.window_position = self.window.get_position()
@@ -346 +347 @@
         self.itakaLogo.show()
 
-        self.box.pack_start(self.itakaLogo, True, True, 4)
-
-        self.ibox = gtk.HBox(False, 0)
+        self.box.pack_start(self.itakaLogo, False, False, 35)
+
         self.buttonStartstop = gtk.ToggleButton("Start", gtk.STOCK_PREFERENCES)
         self.startstopimage = gtk.Image()
@@ -355 +355 @@
         self.buttonStartstop.set_image(self.startstopimage)
         self.buttonStartstop.connect("toggled", self.button_start_server)
-        self.ibox.pack_start(self.buttonStartstop, True, True, 8)
 
         self.preferencesButton = gtk.Button("Preferences", gtk.STOCK_PREFERENCES)
@@ -367 +366 @@
         self.blinktimeout = None
 
-        self.ibox.pack_start(self.preferencesButton, True, True, 4)
-
-        self.box.pack_start(self.ibox, True, True, 0)
+        self.box.pack_start(self.buttonStartstop, True, True, 5)
+        self.box.pack_start(self.preferencesButton, True, True, 8)
+
         self.vbox.pack_start(self.box, False, False, 0)
 
@@ -1061 +1060 @@
         self.menuitemstop.set_sensitive(True)
 
-        self.expander.set_sensitive(True)
-
-    def stop_server(self, widget=None, foreign=False, contractlog=True):
+        if not self.expander.get_property("sensitive"):
+            self.expander.set_sensitive(True)
+
+    def stop_server(self, widget=None, foreign=False):
         """
         Stops the Twisted server.
@@ -1072 +1072 @@
         @type foreign: bool
         @param foreign: Whether the caller of this method is not self.buttonStartstop.
-
-        @type contractlog: bool
-        @param contractlog: Whether the log widget is contracted.
         """
 
@@ -1098 +1095 @@
             self.labelTime.set_text('')
             self.labelServed.set_text('')
-            if contractlog:
-                self.expander.set_expanded(False)                               
-                self.expander.set_sensitive(False)
             self.itakaLogo.set_from_file(os.path.join(self.itakaglobals.image_dir, "itaka.png"))
             self.menuitemstart.set_sensitive(True)
@@ -1112 +1106 @@
         if self.server.listening():
             self.log.message('Restarting the server to listen on port %d' % (self.configuration['server']['port']), ['stock', 'STOCK_REFRESH'])
-            self.stop_server(None, True, False)
+            self.stop_server(None, True)
             self.start_server(None, True)