Changeset 97:faa45a728871

Timestamp:

12/14/10 22:04:28 (5 years ago)

Author:

is_rusinov

Branch:

default

Parents:

94:da7e8ebce313 (diff), 96:daa8203cf796 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automated merge with òÀËssh://kodomo.fbb.msu.ru/cca

Files:

• interface.py (modified) (2 diffs)
• interface.py (modified) (4 diffs)

interface.py

@@ -5 +5 @@
 import tkFileDialog
 import tkMessageBox
+import webbrowser
 from Tkinter import *
 
@@ -90 +91 @@
                 self.draw()
         
-        def show_help_window(self, event=None):
-                pass
-        
-        def hide_help_window(self, event=None):
-                pass
+        def show_help_window(self):
+                url = 'Help\Help.html'
+                webbrowser.open_new_tab(url)
         
         def zoom_in(self, event=None, zoom_rate=1):

interface.py

@@ -578 +578 @@
 manip_frame1 = Frame(automata_window, padx=10, pady=5)
 up = Button(manip_frame1, text="Up", command=handlers.upwards, width=10)
-to_top = Button(manip_frame1, text="To Top", command=handlers.to_top, width=10)
+to_top = Button(manip_frame1, text="To Top",
+                                        command=handlers.to_top, width=10)
 up.pack(side="left", fill="x")
 to_top.pack(side="right", fill="x")
@@ -584 +585 @@
 
 manip_frame2 = Frame(automata_window, padx=10, pady=5)
-down = Button(manip_frame2, text="Down", command=handlers.downwards, width=10)
+down = Button(manip_frame2, text="Down",
+                                        command=handlers.downwards, width=10)
 to_bottom = Button(manip_frame2, text="To Bottom",
                                         command=handlers.to_bottom, width=10)
@@ -666 +668 @@
 size_window.resizable(False, False)
 size_window.protocol("WM_DELETE_WINDOW", handlers.hide_size_window)
-Label(size_window, text="Current size of window:").pack(side="top", fill="x")
+Label(size_window, text="Current window size:").pack(side="top", fill="x")
 size_label = Label(size_window)
 size_label.pack(side="top", fill="x")
@@ -766 +768 @@
                                                                                                         accelerator="Ctrl+C")
 menu_action.bind_all("<Control-c>", handlers.clean_field)
-menu_action.add_command(label="Fill randomly", command=handlers.fill_randomly,
+menu_action.add_command(label="Fill randomly",
+                                                                                                        command=handlers.fill_randomly,
                                                                                                         accelerator="Ctrl+R")
 menu_action.bind_all("<Control-r>", handlers.fill_randomly)
 menu_action.add_separator()
-menu_action.add_command(label="Change size",command=handlers.show_size_window,
+menu_action.add_command(label="Change size",
+                                                                                                        command=handlers.show_size_window,
                                                                                                         accelerator="Ctrl+D")
 menu_action.bind_all("<Control-d>", handlers.show_size_window)