rpms/system-config-language/devel s-c-l-bug-493858-507796.patch, NONE, 1.1 system-config-language.spec, 1.52, 1.53

Pravin Satpute pravins at fedoraproject.org
Mon Jul 13 10:39:08 UTC 2009 

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8638

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l-bug-493858-507796.patch 
Log Message:
* Mon Jul 13 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-8
- fix bug 493858, 507796


s-c-l-bug-493858-507796.patch:

--- NEW FILE s-c-l-bug-493858-507796.patch ---
Only in system-config-language-1.3.2_mod/src: gui_detailsDialog.pyc
Only in system-config-language-1.3.2_mod/src: gui_errors.pyc
Only in system-config-language-1.3.2_mod/src: gui_install.pyc
Only in system-config-language-1.3.2_mod/src: gui_progress.pyc
Only in system-config-language-1.3.2_mod/src: lang_dict.pyc
Only in system-config-language-1.3.2_mod/src: language_backend.pyc
diff -rup system-config-language-1.3.2/src/language_gui.py system-config-language-1.3.2_mod/src/language_gui.py
--- system-config-language-1.3.2/src/language_gui.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/language_gui.py	2009-07-13 14:50:24.000000000 +0530
@@ -174,6 +174,50 @@ class childWindow:
         self.apply()
         gtk.main_quit()
 
+    def restoreClicked(self, *args):
+        #Get the lang from the list of languages
+        rc = self.langView.get_selection().get_selected()
+        if rc:
+            model, iter = rc
+            defaultLang =  self.langStore.get_value(iter, 0)
+            sysfontacm = self.langStore.get_value(iter, 1)
+            sysfont = self.langStore.get_value(iter, 2)
+            fullName = self.langStore.get_value(iter, 3)
+
+	if defaultLang=="en_US.UTF-8":
+        	dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+        	(_("Already system in default language,\nNothing to do.")))
+		dlg.run()
+        	dlg.destroy()
+        	return 1
+
+
+        str = _("Do you really want to change system language to default [en_US]?")                
+        d = gtk.MessageDialog(self.mainWindow, gtk.DIALOG_MODAL,
+        		gtk.MESSAGE_QUESTION,
+        		message_format = str)
+                                  
+        b = d.add_button(_("No"), gtk.RESPONSE_CANCEL)
+        b = d.add_button(_("Yes"), gtk.RESPONSE_OK)    
+        d.set_default_response(gtk.RESPONSE_OK)
+        rc = d.run()
+        d.destroy() 
+            
+        if rc == gtk.RESPONSE_OK:                               
+        	is_RepoError = True 
+        	defaultLang= "en_US"
+		self.setDefault(defaultLang)
+        else:
+        	return -1
+
+
+    def helpClicked(self, args):
+            dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+                                    (_("system-config-language is a graphical user interface that allows the user to change the default language of the system.")))
+            dlg.run()
+            dlg.destroy()
+            return 1
+
     def apply(self, *args):
         if self.doDebug:
             return 0
@@ -313,17 +357,33 @@ class childWindow:
         self.mainWindow.connect("destroy", self.destroy)
         self.mainWindow.set_title(_("Language Selection"))
         self.mainWindow.set_icon(iconPixbuf)        
-        self.mainWindow.set_size_request(-1, 350)
-        self.mainWindow.set_border_width(10)        
+        self.mainWindow.set_size_request(-1, 600)
+        self.mainWindow.set_border_width(12)        
 
         self.bb = gtk.HButtonBox()
         self.bb.set_layout(gtk.BUTTONBOX_END)
-        self.bb.set_spacing(10)
+        self.bb.set_spacing(12)
+
+        self.sdButton = gtk.Button("System _Defaults", None, True)
+        self.sdButton.connect("clicked", self.restoreClicked)
+        self.bb.pack_start(self.sdButton)
+
+        self.cancelButton = gtk.Button(stock='gtk-cancel')
+        self.cancelButton.connect("clicked", self.destroy)
+        self.bb.pack_start(self.cancelButton)
+
         self.okButton = gtk.Button(stock='gtk-ok')
         self.okButton.connect("clicked", self.okClicked)
         self.bb.pack_start(self.okButton)
 
-        self.toplevel.set_spacing(5)
+
+        self.helpButton = gtk.Button(stock='gtk-help')
+        self.helpButton.connect("clicked", self.helpClicked)
+        self.bb.pack_start(self.helpButton)
+	self.bb.set_child_secondary(self.helpButton, True)
+
+        self.toplevel.set_spacing(12)
+
         self.iconBox.pack_start(self.icon, False)
         self.iconBox.pack_start(self.msgLabel)
         self.toplevel.pack_start(self.iconBox, False)
Only in system-config-language-1.3.2_mod/src: language_gui.pyc
Only in system-config-language-1.3.2_mod/src: language_tui.pyc
Only in system-config-language-1.3.2_mod/src: tui_install.pyc


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- system-config-language.spec	7 Jul 2009 09:14:24 -0000	1.52
+++ system-config-language.spec	13 Jul 2009 10:38:37 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -21,6 +21,7 @@ Obsoletes: locale_config  <= %{version}
 Patch1: ca-po-462914.patch
 Patch2: dialogue-center-493824.patch
 Patch3: s-c-l-bug-598975.patch
+Patch4: s-c-l-bug-493858-507796.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -31,6 +32,7 @@ allows the user to change the default la
 %patch1 -p1 -b .1-ca-po
 %patch2 -p1 -b .2-dialogue-center
 %patch3 -p1 -b .3-rhpl
+%patch4 -p1 -b .4-s-c-cleanup
 
 %build
 make %{?_smp_mflags}
@@ -88,6 +90,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Mon Jul 13 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-8
+- fix bug 493858, 507796
+
 * Tue Jul 07 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-7
 - fix bug 598975
 - patch from Jeremy Katz katzj at redhat.com

More information about the fedora-extras-commits mailing list