rpms/scim-chewing/devel scim-chewing-0.3.1-11.bz200694.patch, NONE, 1.1 scim-chewing.spec, 1.33, 1.34

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/scim-chewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30034

Modified Files:
	scim-chewing.spec 
Added Files:
	scim-chewing-0.3.1-11.bz200694.patch 
Log Message:
* Tue Jan 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-11.fc9
- Resolves: rhbz#200694 (Moving "Han-Yin" <-> Zhu-Yin" option to AUX UI.)



scim-chewing-0.3.1-11.bz200694.patch:

--- NEW FILE scim-chewing-0.3.1-11.bz200694.patch ---
--- scim-chewing-0.3.1/src/scim_chewing_imengine.h.4-bz200694	2006-05-31 01:06:34.000000000 +1000
+++ scim-chewing-0.3.1/src/scim_chewing_imengine.h	2006-09-26 10:02:59.000000000 +1000
@@ -99,6 +99,7 @@
 	void refresh_all_properties ();
 	void refresh_chieng_property ();
 	void refresh_letter_property ();
+	void refresh_kbtype_property ();
 
 	Connection m_reload_signal_connection;
 	WideString m_converted_string;
--- scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.4-bz200694	2006-09-26 10:02:59.000000000 +1000
+++ scim-chewing-0.3.1/src/scim_chewing_imengine.cpp	2006-09-26 11:34:56.000000000 +1000
@@ -39,6 +39,8 @@
 	"/IMEngine/Chinese/Chewing/ChiEngMode"
 #define SCIM_PROP_LETTER \
 	"/IMEngine/Chinese/Chewing/FullHalfLetter"
+#define SCIM_PROP_KBTYPE \
+	"/IMEngine/Chinese/Chewing/KeyboardType"
 
 #define SCIM_CHEWING_SELECTION_KEYS_NUM_DEF 9
 static int _selection_keys_num;
@@ -56,6 +58,7 @@
 
 static Property _chieng_property (SCIM_PROP_CHIENG, "");
 static Property _letter_property (SCIM_PROP_LETTER, "");
+static Property _kbtype_property (SCIM_PROP_KBTYPE, "");
 //static Property _punct_property  (SCIM_PROP_PUNCT, _("Full/Half Punct"));
 
 extern "C" {
@@ -77,6 +80,7 @@
 		_chieng_property.set_tip (_("The status of the current input method. Click to change it."));
 		_chieng_property.set_label (_("Eng"));
 		_letter_property.set_label (_("Half"));
+		_kbtype_property.set_label (_("Default"));
 		_scim_config = config;
 		return 1;
 	}
@@ -517,6 +521,12 @@
 		commit( ctx->output );
 	} else if ( property == SCIM_PROP_LETTER ) {
 		chewing_set_ShapeMode( ctx, !chewing_get_ShapeMode( ctx ) );
+	} else if ( property == SCIM_PROP_KBTYPE ) {
+		/* loop through the keyboard type array */
+		if ( chewing_get_KBType( ctx ) == LAST_KBTYPE )
+ 	                chewing_set_KBType( ctx, FIRST_KBTYPE );
+		else
+			chewing_set_KBType( ctx, chewing_get_KBType( ctx ) + 1 );
 	}
 	refresh_all_properties ();
 }
@@ -648,6 +658,7 @@
 	PropertyList proplist;
 	proplist.push_back (_chieng_property);
 	proplist.push_back (_letter_property);
+	proplist.push_back (_kbtype_property);
 
 	register_properties (proplist);
 	refresh_all_properties ();
@@ -657,6 +668,7 @@
 {
 	refresh_chieng_property ();
 	refresh_letter_property ();
+	refresh_kbtype_property ();
 }
 
 void ChewingIMEngineInstance::refresh_chieng_property ()
@@ -679,6 +691,45 @@
 	update_property (_letter_property);
 }
 
+void ChewingIMEngineInstance::refresh_kbtype_property ()
+{
+	/* look forward to be evoluted into drop-down list */
+	switch ( chewing_get_KBType( ctx ) )
+	{
+		case DEFAULT_KBTYPE:
+			_kbtype_property.set_label (_("Default"));
+			break;
+		case HSU_KBTYPE:
+			_kbtype_property.set_label (_("Hsu's"));
+			break;
+		case IBM_KBTYPE:
+			_kbtype_property.set_label (_("IBM"));
+			break;
+		case GINYIEH_KBTYPE:
+			_kbtype_property.set_label (_("Gin-Yieh"));
+			break;
+		case ETEN_KBTYPE:
+			_kbtype_property.set_label (_("ETen"));
+			break;
+		case ETEN26_KBTYPE:
+			_kbtype_property.set_label (_("ETen 26-key"));
+			break;
+		case DVORAK_KBTYPE:
+			_kbtype_property.set_label (_("Dvorak"));
+			break;
+		case DVORAKHSU_KBTYPE:
+			_kbtype_property.set_label (_("Dvorak Hsu's"));
+			break;
+		case HANYU_KBTYPE:
+			_kbtype_property.set_label (_("Han-Yu"));
+			break;
+		default:
+			_kbtype_property.set_label (_("Default"));
+		}
+
+	update_property (_kbtype_property);
+}
+
 ChewingLookupTable::ChewingLookupTable()
 	: LookupTable( _selection_keys_num )
 {


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scim-chewing.spec	19 Dec 2007 06:35:34 -0000	1.33
+++ scim-chewing.spec	8 Jan 2008 06:53:43 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           scim-chewing
 Version:        0.3.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPL
@@ -17,6 +17,7 @@
 Patch3:         scim-chewing-0.3.1-8.bz206120.patch
 Patch4:         scim-chewing-0.3.1-9.bz216581.patch
 Patch5:         scim-chewing-0.3.1-10.bz237924.patch
+Patch6:         scim-chewing-0.3.1-11.bz200694.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -30,6 +31,7 @@
 %patch3 -p1 -b .4-bz206120
 %patch4 -p1 -b .5-bz216581
 %patch5 -p1 -b .6-bz237924
+%patch6 -p1 -b .7-bz200694
 
 %build
 %configure --disable-static
@@ -59,6 +61,9 @@
 
 
 %changelog
+* Tue Jan 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-11.fc9
+- Resolves: rhbz#200694 (Moving "Han-Yin" <-> Zhu-Yin" option to AUX UI.)
+
 * Wed Dec 20 2007 Caius Chance <cchance at redhat.com> 0.3.1-10.fc9
 - Resolves: rhbz#237924 (Last candidate on lookup table is not a valid 
                          candidate.)