=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2010-02-01 06:58:38 +0000
+++ openshot/windows/MainGTK.py	2010-02-01 14:29:57 +0000
@@ -64,7 +64,7 @@
 		
 		# initializes history stack
 		self.history_stack = []
-		self.max_history_size = 20
+
 		
 		# determine the directory OpenShot is running in.  This is used 
 		# to correctly load images, themes, etc...
@@ -168,6 +168,9 @@
 		self.settings = preferences.Settings(self.project)
 		self.settings.load_settings_from_xml()
 		
+		# limit for the history stack size
+		self.max_history_size = int(self.settings.general["max_history_size"])		
+		
 		#set some application state settings
 		x = int(self.settings.app_state["window_width"])
 		y = int(self.settings.app_state["window_height"])

=== modified file 'openshot/windows/glade/Preferences.glade'
--- openshot/windows/glade/Preferences.glade	2010-01-11 17:35:40 +0000
+++ openshot/windows/glade/Preferences.glade	2010-02-01 14:29:57 +0000
@@ -1,16 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Mon Feb  1 15:18:00 2010 -->
 <glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="frmPreferences">
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">center</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-
         <child>
           <widget class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
@@ -21,9 +20,6 @@
                 <property name="border_width">12</property>
                 <signal name="selection_changed" handler="on_icvCategories_selection_changed"/>
               </widget>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkNotebook" id="nbPrefPages">
@@ -35,7 +31,7 @@
                   <widget class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
@@ -43,86 +39,74 @@
                         <child>
                           <widget class="GtkTable" id="table1">
                             <property name="visible">True</property>
-                            <property name="n_rows">4</property>
+                            <property name="n_rows">5</property>
                             <property name="n_columns">3</property>
                             <child>
-                              <widget class="GtkLabel" id="label6">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">12</property>
-                                <property name="label" translatable="yes">Imported Image Length:</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="txtImageLength">
+                              <widget class="GtkEntry" id="txtHistoryStackSize">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip" translatable="yes">Timeline length, in seconds, for all imported images. </property>
-                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="tooltip" translatable="yes">max number of history steps</property>
                                 <property name="xalign">1</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_padding">12</property>
-                                <property name="y_padding">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkComboBox" id="cmbThemes">
-                                <property name="visible">True</property>
-                                <property name="items" translatable="no"></property>
-                                <signal name="changed" handler="on_cmbThemes_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                                <property name="x_padding">12</property>
-                                <property name="y_padding">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label7">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">12</property>
-                                <property name="label" translatable="yes">Default Theme:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkComboBox" id="cmbProfiles">
-                                <property name="visible">True</property>
-                                <property name="items" translatable="no"></property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                                <property name="x_padding">12</property>
-                                <property name="y_padding">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label5">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">12</property>
-                                <property name="label" translatable="yes">Default Profile:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="x_padding">12</property>
+                                <property name="y_padding">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label8">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Max History Steps:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label17">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Project File Type:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="cmbFileType">
+                                <property name="visible">True</property>
+                                <property name="items"></property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                                <property name="x_padding">12</property>
+                                <property name="y_padding">6</property>
                               </packing>
                             </child>
                             <child>
@@ -140,41 +124,84 @@
                                 <property name="y_padding">12</property>
                               </packing>
                             </child>
-			    <child>
- 			      <widget class="GtkComboBox" id="cmbFileType">
- 			        <property name="visible">True</property>
- 			        <property name="items" translatable="no"></property>
- 			      </widget>
- 			      <packing>
- 			        <property name="left_attach">1</property>
- 			        <property name="right_attach">2</property>
- 			        <property name="top_attach">3</property>
- 			        <property name="bottom_attach">4</property>
- 			        <property name="x_padding">12</property>
- 			        <property name="y_padding">6</property>
- 			        <property name="x_options">GTK_FILL</property>
- 			        <property name="y_options"></property>
- 			      </packing>
- 			    </child> 
-			    <child>
- 			      <widget class="GtkLabel" id="label17">
- 			        <property name="visible">True</property>
- 			        <property name="label" translatable="yes">Project File Type:</property>
- 			        <property name="xalign">0</property>
- 			        <property name="xpad">12</property>
- 			      </widget>
- 			      <packing>
-      		                <property name="left_attach">0</property>
- 			        <property name="right_attach">1</property>
- 			        <property name="top_attach">3</property>
- 			        <property name="bottom_attach">4</property>
- 			      </packing>
- 			    </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
+                            <child>
+                              <widget class="GtkLabel" id="label5">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Default Profile:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="cmbProfiles">
+                                <property name="visible">True</property>
+                                <property name="items"></property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                                <property name="x_padding">12</property>
+                                <property name="y_padding">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label7">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Default Theme:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="cmbThemes">
+                                <property name="visible">True</property>
+                                <property name="items"></property>
+                                <signal name="changed" handler="on_cmbThemes_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                                <property name="x_padding">12</property>
+                                <property name="y_padding">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="txtImageLength">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" translatable="yes">Timeline length, in seconds, for all imported images. </property>
+                                <property name="xalign">1</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="x_padding">12</property>
+                                <property name="y_padding">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label6">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Imported Image Length:</property>
+                              </widget>
                             </child>
                           </widget>
                         </child>
@@ -195,11 +222,11 @@
                 <child>
                   <widget class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="no">page 1</property>
+                    <property name="label">page 1</property>
                   </widget>
                   <packing>
+                    <property name="type">tab</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
@@ -208,12 +235,12 @@
                 <child>
                   <widget class="GtkLabel" id="label2">
                     <property name="visible">True</property>
-                    <property name="label" translatable="no">page 2</property>
+                    <property name="label">page 2</property>
                   </widget>
                   <packing>
+                    <property name="type">tab</property>
                     <property name="position">1</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
@@ -222,12 +249,12 @@
                 <child>
                   <widget class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="label" translatable="no">page 3</property>
+                    <property name="label">page 3</property>
                   </widget>
                   <packing>
+                    <property name="type">tab</property>
                     <property name="position">2</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
               </widget>
@@ -237,9 +264,6 @@
               </packing>
             </child>
           </widget>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <widget class="GtkHSeparator" id="hseparator1">
@@ -254,29 +278,30 @@
           <widget class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="border_width">12</property>
-            <property name="layout_style">end</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
               <widget class="GtkButton" id="btnCancel">
-                <property name="label" translatable="no">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_btnCancel_clicked"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="btnApply">
-                <property name="label" translatable="no">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_btnApply_clicked"/>
               </widget>
               <packing>

=== modified file 'openshot/windows/preferences.py'
--- openshot/windows/preferences.py	2010-01-31 19:26:19 +0000
+++ openshot/windows/preferences.py	2010-02-01 14:29:57 +0000
@@ -83,6 +83,7 @@
 			
 		#populate form objects
 		self.txtImageLength.set_text(self.settings.general["imported_image_length"])
+		self.txtHistoryStackSize.set_text(self.settings.general["max_history_size"])
 		theme_name = self.settings.general["default_theme"]
 		file_type = self.settings.general["project_file_type"]
 		self.set_dropdown_values(theme_name, self.cmbThemes)
@@ -105,6 +106,7 @@
 		self.settings.general["default_theme"] = self.cmbThemes.get_active_text()
 		self.settings.general["default_profile"] = self.cmbProfiles.get_active_text()
 		self.settings.general["project_file_type"] = self.cmbFileType.get_active_text()
+		self.settings.general["max_history_size"] = self.txtHistoryStackSize.get_text()
 		
 		# save settings
 		self.settings.save_settings_to_xml()
@@ -180,7 +182,8 @@
 		"imported_image_length" : "7",
 		"default_theme" : "blue_glass",
 		"default_profile" : "DV NTSC",
-		"project_file_type" : "binary"
+		"project_file_type" : "binary",
+		"max_history_size" : "20"
 		}
 	
 	app_state = {