[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/oscar/icq
From:       Nickolai Shaforostoff <shafff () ukr ! net>
Date:       2008-09-08 22:56:24
Message-ID: 1220914584.895037.6458.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 858892 by shaforo:

beautify codepage preselection code, and add i18n context makers



 M  +9 -9      icqprotocol.cpp  
 M  +14 -0     icqprotocol.h  
 M  +5 -5      ui/icqeditaccountui.ui  
 M  +16 -15    ui/icqeditaccountwidget.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/icqprotocol.cpp #858891:858892
@@ -564,15 +564,15 @@
 	addEncoding( availableMibs, 110, i18n("ISO-8859-14") );
 	addEncoding( availableMibs, 111, i18n("ISO-8859-15 Western") );
 
-	addEncoding( availableMibs, 2250, i18n("Windows-1250 Central European") );
-	addEncoding( availableMibs, 2251, i18n("Windows-1251 Cyrillic") );
-	addEncoding( availableMibs, 2252, i18n("Windows-1252 Western") );
-	addEncoding( availableMibs, 2253, i18n("Windows-1253 Greek") );
-	addEncoding( availableMibs, 2254, i18n("Windows-1254 Turkish") );
-	addEncoding( availableMibs, 2255, i18n("Windows-1255 Hebrew") );
-	addEncoding( availableMibs, 2256, i18n("Windows-1256 Arabic") );
-	addEncoding( availableMibs, 2257, i18n("Windows-1257 Baltic") );
-	addEncoding( availableMibs, 2258, i18n("Windows-1258 Viet Nam") );
+	addEncoding( availableMibs, CP1250, i18n("Windows-1250 Central European") );
+	addEncoding( availableMibs, CP1251, i18n("Windows-1251 Cyrillic") );
+	addEncoding( availableMibs, CP1252, i18n("Windows-1252 Western") );
+	addEncoding( availableMibs, CP1253, i18n("Windows-1253 Greek") );
+	addEncoding( availableMibs, CP1254, i18n("Windows-1254 Turkish") );
+	addEncoding( availableMibs, CP1255, i18n("Windows-1255 Hebrew") );
+	addEncoding( availableMibs, CP1256, i18n("Windows-1256 Arabic") );
+	addEncoding( availableMibs, CP1257, i18n("Windows-1257 Baltic") );
+	addEncoding( availableMibs, CP1258, i18n("Windows-1258 Viet Nam") );
 
 	addEncoding( availableMibs, 2009, i18n("IBM 850") );
 	addEncoding( availableMibs, 2085, i18n("IBM 866") );
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/icqprotocol.h #858891:858892
@@ -103,5 +103,19 @@
 	QMap<int, QString> mAffiliations;
 	ICQProtocolHandler protohandler;
 };
+
+
+#define CP1250 2250
+#define CP1251 2251
+#define CP1252 2252
+#define CP1253 2253
+#define CP1254 2254
+#define CP1255 2255
+#define CP1256 2256
+#define CP1257 2257
+#define CP1258 2258
+
+
+
 #endif
 // vim: set noet ts=4 sts=4 sw=4:
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui #858891:858892
@@ -35,7 +35,7 @@
      </property>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
-       <string>&amp;Basic Setup</string>
+       <string comment="@title:tab">&amp;Basic Setup</string>
       </attribute>
       <layout class="QVBoxLayout" >
        <property name="spacing" >
@@ -268,7 +268,7 @@
      </widget>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
-       <string>Accou&amp;nt Preferences</string>
+       <string comment="@title:tab">Accou&amp;nt Preferences</string>
       </attribute>
       <layout class="QVBoxLayout" >
        <property name="spacing" >
@@ -730,7 +730,7 @@
      </widget>
      <widget class="QWidget" name="tabVisible" >
       <attribute name="title" >
-       <string>Visible</string>
+       <string comment="@title:tab">Visible</string>
       </attribute>
       <layout class="QGridLayout" >
        <property name="leftMargin" >
@@ -796,7 +796,7 @@
      </widget>
      <widget class="QWidget" name="tabInvisible" >
       <attribute name="title" >
-       <string>Invisible</string>
+       <string comment="@title:tab">Invisible</string>
       </attribute>
       <layout class="QGridLayout" >
        <property name="leftMargin" >
@@ -862,7 +862,7 @@
      </widget>
      <widget class="QWidget" name="tabIgnore" >
       <attribute name="title" >
-       <string>Ignore</string>
+       <string comment="@title:tab">Ignore</string>
       </attribute>
       <layout class="QGridLayout" >
        <property name="leftMargin" >
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp #858891:858892
@@ -137,27 +137,16 @@
 	}
 	else
 	{
-		int encodingId=4; //see icqprotocol.cpp for mappings
+		int encodingId=4; //see ../icqprotocol.* for mappings
 		switch (QLocale::system().language())
 		{
 			case QLocale::Russian:
 			case QLocale::Ukrainian:
 			case QLocale::Byelorussian:
 			case QLocale::Bulgarian:
-				encodingId=2251;
+				encodingId=CP1251;
 				break;
-			case QLocale::Hebrew:
-				encodingId=2255;
-				break;
-			case QLocale::Turkish:
-				encodingId=2254;
-				break;
-			case QLocale::Greek:
-				encodingId=2253;
-				break;
-			case QLocale::Arabic:
-				encodingId=2256;
-				break;
+			case QLocale::English:
 			case QLocale::German:
 			case QLocale::Italian:
 			case QLocale::Spanish:
@@ -168,8 +157,20 @@
 			case QLocale::Swedish:
 			case QLocale::Norwegian:
 			case QLocale::Icelandic:
-				encodingId=2252;
+				encodingId=CP1252;
 				break;
+			case QLocale::Greek:
+				encodingId=CP1253;
+				break;
+			case QLocale::Turkish:
+				encodingId=CP1254;
+				break;
+			case QLocale::Hebrew:
+				encodingId=CP1255;
+				break;
+			case QLocale::Arabic:
+				encodingId=CP1256;
+				break;
 			default:
 				encodingId=4;
 		}
[prev in list] [next in list] [prev in thread] [next in thread]