Merge lp:~yuvipanda/dreampie/trunk into lp:dreampie

[Yuvi Panda]

[Yuvi Panda (yuvipanda)]

Fix for bug https://bugs.launchpad.net/dreampie/+bug/525347 #525347

[Noam Yorav-Raphael (noamraph)]

Thanks for the patch! It looks really good. I fixed it in revision 121.
(I haven't really merged this because from the flow of inputs during the past two days I forgot about your patch and re-implemented it. I'm sorry! Please file other patches that way - I merged two other patches that way and it was really nice.)

review: Approve

=== modified file 'dreampielib/gui/__init__.py'
--- dreampielib/gui/__init__.py	2010-02-19 11:26:51 +0000
+++ dreampielib/gui/__init__.py	2010-02-21 18:43:14 +0000
@@ -1,3 +1,4 @@
+
 # Copyright 2010 Noam Yorav-Raphael
 #
 # This file is part of DreamPie.
@@ -854,12 +855,19 @@
         self.quit()
 
     def quit(self):
-        msg = gtk.MessageDialog(self.window_main, gtk.DIALOG_MODAL,
-                                gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
-                                _("Are you sure you want to quit?"))
-        response = msg.run()
-        msg.destroy()
-        if response == gtk.RESPONSE_YES:
+        confirmed = False            
+        if self.config.get_bool('silent-exit'):
+            confirmed = True
+        else:
+            msg = gtk.MessageDialog(self.window_main, gtk.DIALOG_MODAL,
+                                    gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
+                                    _("Are you sure you want to quit?"))
+            response = msg.run()
+            msg.destroy()
+            if response == gtk.RESPONSE_YES:
+                confirmed = True
+                
+        if confirmed:
             self.is_terminating = True
             self.window_main.destroy()
             self.subp.kill()

=== modified file 'dreampielib/gui/config.py'
--- dreampielib/gui/config.py	2010-02-16 09:37:27 +0000
+++ dreampielib/gui/config.py	2010-02-21 18:43:14 +0000
@@ -34,6 +34,7 @@
 reshist-size = 30
 autofold = True
 autofold-numlines = 30
+silent-exit = False
 viewer = ''
 init-code = ''
 

=== modified file 'dreampielib/gui/config_dialog.py'
--- dreampielib/gui/config_dialog.py	2010-02-14 07:50:13 +0000
+++ dreampielib/gui/config_dialog.py	2010-02-21 18:43:14 +0000
@@ -59,6 +59,8 @@
         self.leave_code_chk.props.active = config.get_bool('leave-code')
         
         self.hide_defs_chk.props.active = config.get_bool('hide-defs')
+
+        self.silent_exit_chk.props.active = config.get_bool('silent-exit')
     
         self.themes = dict((name, tags.get_theme(config, name))
                            for name in tags.get_theme_names(config))
@@ -117,6 +119,8 @@
         config.set_bool('leave-code', self.leave_code_chk.props.active)
         
         config.set_bool('hide-defs', self.hide_defs_chk.props.active)
+
+        config.set_bool('silent-exit', self.silent_exit_chk.props.active)
         
         sb = self.sourcebuffer
         init_code = sb.get_text(sb.get_start_iter(),

=== modified file 'share/dreampie/dreampie.glade'
--- share/dreampie/dreampie.glade	2010-02-19 11:26:51 +0000
+++ share/dreampie/dreampie.glade	2010-02-21 18:43:14 +0000
@@ -1111,6 +1111,18 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+			    <child>
+			      <widget class="GtkCheckButton" id="silent_exit_chk">
+				<property name="label" translatable="yes">Exit without confirmation</property>
+				<property name="visible">True</property>
+				<property name="can_focus">True</property>
+				<property name="receives_default">False</property>
+				<property name="draw_indicator">True</property>
+			      </widget>
+			      <packing>
+				<property name="position">2</property>
+			      </packing>
+			    </child>
                           </widget>
                         </child>
                         <child>