[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2845: Added 'common' country names to pull down menus. In English (in vidalia/branches/exit-country/src/vidalia: config res)
Author: cviecco
Date: 2008-07-08 10:29:05 -0400 (Tue, 08 Jul 2008)
New Revision: 2845
Added:
vidalia/branches/exit-country/src/vidalia/res/country_names.txt
Modified:
vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h
vidalia/branches/exit-country/src/vidalia/res/vidalia_common.qrc
Log:
Added 'common' country names to pull down menus. In English and official language(s) when I was able to find out the information.
Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp 2008-07-07 15:03:45 UTC (rev 2844)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp 2008-07-08 14:29:05 UTC (rev 2845)
@@ -19,7 +19,6 @@
#include <networksettings.h>
-
/** Default Constructor */
NetworkoutPage::NetworkoutPage(QWidget *parent)
: ConfigPage(parent, tr("Networkout"))
@@ -98,6 +97,7 @@
QString current=ui.cmboExitNodesbyCountry->currentText();
QStringList countrylist=current.split("(");
current=countrylist.at(0);
+ current=getExitCountry();
_settings->setExitNodeCountry(current);
}
@@ -147,7 +147,7 @@
//ui.chkCloseAllActiveCircuits->setEnabled(false);
HideUnhide();
-
+ load_longnames();
}
void
@@ -167,16 +167,8 @@
QString uniqueRouterName;
quint32 torVersion = Vidalia::torControl()->getTorVersion();
-/*
- if (torVersion < 0x020100) {
- //ui.grpBridgeSettings->setEnabled(false);
- //ui.lblNoBridgeSupport->setVisible(true);
- ui.cmboExitNodesbyCountry->setEnabled(false);
- ui.chkCloseAllActiveCircuits->setEnabled(true);
- ui.pButtonApplyCountry->setEnabled(false);
- return;
- }
-*/
+ //initialize the window.. just in case it has not been initialized yet.
+ load();
/*Fill up the internal structure*/
//by_country_exit_nodes.clear();
@@ -252,15 +244,25 @@
/*finally add the country information to the combo box!*/
QString countryCount(country);
countryCount.append("(").append(count).append(")");
- ui.cmboExitNodesbyCountry->addItem(country_flag,countryCount,
- countryCount);
+
+ QString longCountryCount;
+ if(country_long.contains(country)){
+ longCountryCount=country_long[country];
+ // longCountryCount.append(" (").append(country);
+ // longCountryCount.append(")(").append(count).append(")");
+ }
+ longCountryCount.append(" (").append(country);
+ longCountryCount.append(")(").append(count).append(")");
+ //countryCount.append("(").append(count).append(")");
+ ui.cmboExitNodesbyCountry->addItem(country_flag,longCountryCount,
+ country);
if(country.toAscii()==saved_country){
saved_index=itemcount;
}
+ /*Also add it on the exclude node list*/
+ ui.listWidgetExcludedCountries->addItem(longCountryCount);
- ui.listWidgetExcludedCountries->addItem(countryCount);
-
countryListItem=ui.listWidgetExcludedCountries->item(itemcount);
countryListItem->setIcon(country_flag);
itemcount++;
@@ -280,6 +282,7 @@
//memcpy(saved,_settings->getExitNodeCountry().toAscii(),2);
fprintf(stderr,"saved_index=%d saved_country=%s\n",saved_index,saved_country);
if(0!=saved_index){
+ //fprintf(stderr,"applying save!\n");
//apply a save!
QString err;
//save(err);
@@ -298,7 +301,11 @@
//fprintf(stderr,"qlen=%d",current.length());
QStringList countrylist=current.split("(");
+ current=countrylist.at(1);
+ countrylist=current.split(")");
current=countrylist.at(0);
+ current=getExitCountry();
+
//fprintf(stderr,"nqlen=%d",current.length());
//ui.lineEditExitNodes->setText(by_country_exit_nodes.value(current).join(","));
//ui.textEditExitNodes->setText(by_country_exit_nodes.value(current).join(","));
@@ -404,6 +411,7 @@
if((ui.chkNodePolicy->isChecked())){
settings.setUseExitNodePolicy(ui.chkExitNodePolicy->isChecked());
settings.setUseExcludeNodePolicy(ui.chkExcludeNodePolicy->isChecked());
+ fprintf(stderr,"node pol applyset, checked!\n");
/*Only save if we have enabled saving exit policies!*/
if(ui.chkExitNodePolicy->isChecked()){
@@ -412,10 +420,10 @@
/*iterate over listwidget?*/
QStringList exitList;
QString current=ui.cmboExitNodesbyCountry->currentText();
- //fprintf(stderr,"qlen=%d",current.length());
+ fprintf(stderr,"qlen=%d",current.length());
QStringList countrylist=current.split("(");
current=countrylist.at(0);
-
+ current=getExitCountry();
foreach (RouterStatus router, by_country_exit_nodes2.value(current)){
//ui.listWidgetExitNodes->addItem(router.name());
@@ -426,7 +434,8 @@
id=router.name();
}
exitList<<id;
- }
+ }
+ fprintf(stderr,"exit_size=%d\n",exitList.size());
settings.setExitNodeList(exitList);
}
if (ui.chkExcludeNodePolicy->isChecked()){
@@ -466,6 +475,8 @@
foreach(QListWidgetItem *selected,selectedCountries){
QString current=selected->text();
QStringList countrylist=current.split("(");
+ current=countrylist.at(1);
+ countrylist=current.split(")");
current=countrylist.at(0);
excludeCountries<<current;
}
@@ -473,3 +484,38 @@
}
+QString
+NetworkoutPage::getExitCountry(){
+ QString current=ui.cmboExitNodesbyCountry->currentText();
+
+ QStringList countrylist=current.split("(");
+
+ current=countrylist.at(1);
+ countrylist=current.split(")");
+ current=countrylist.at(0);
+ return current;
+}
+
+void
+NetworkoutPage::load_longnames(){
+
+ country_long.clear();
+
+ QFile file(":/geoip/country_names.txt");
+ QString line;
+ QStringList list;
+ QTextStream in(&file);
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ fprintf (stderr,"cannot open geoip data file!\n");
+ return;
+ }
+ while (!in.atEnd()) {
+ line = in.readLine();
+ list=line.split(",");
+ switch (list.size()){
+ case 2:
+ country_long.insert(list.at(0),list.at(1));
+ }
+ }
+}
+
Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h 2008-07-07 15:03:45 UTC (rev 2844)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h 2008-07-08 14:29:05 UTC (rev 2845)
@@ -72,6 +72,12 @@
/*Get the countries from the excludelist*/
QStringList getExcludeCountries();
+ /**/
+ QString getExitCountry();
+
+ /**/
+ void load_longnames();
+
/** A VidaliaSettings object used for saving/loading settings */
VidaliaSettings* _settings;
@@ -81,6 +87,7 @@
/*struct to hold the country-exit-node-mappings */
//QMap<QString,QStringList> by_country_exit_nodes;
QMap<QString,QList<RouterStatus> > by_country_exit_nodes2;
+ QMap<QString,QString> country_long;
TorControl* _torControl;
FileGeoIpResolver* _geoIpResolver;
Added: vidalia/branches/exit-country/src/vidalia/res/country_names.txt
===================================================================
--- vidalia/branches/exit-country/src/vidalia/res/country_names.txt (rev 0)
+++ vidalia/branches/exit-country/src/vidalia/res/country_names.txt 2008-07-08 14:29:05 UTC (rev 2845)
@@ -0,0 +1,198 @@
+af,Afghanistan | افغانستان
+al,Albania | Shqipëria
+dz,Algeria | الجزائر
+ad,Andorra
+ao,Angola
+ag,Antigua & Barbuda
+ar,Argentina
+am,Armenia | Հայաստան
+au,Australia
+at,Austria | Österreich
+az,Azerbaijan | Azərbaycan / Азәрбајҹан
+bs,Bahamas
+bh,Bahrain | البحرين
+bd,Bangladesh | বাংলাদেশ
+bb,Barbados
+by,Belarus | Беларусь / Biełaruś
+be,Belgium | België | Belgique | Belgien
+bz,Belize
+bj,Benin | Bénin
+bt,Bhutan | འབྲུག་ཡུལ་
+bo,Bolivia | Wuliwya | Volívia | Bulibiya
+ba,Bosnia & Herzegovina | Bosna i Hercegovina
+bw,Botswana
+br,Brazil | Brasil
+bn,Brunei Darussalam / بروني دارالسلام
+bg,Bulgaria | България
+bf,Burkina Faso
+bi,Burundi | Uburundi
+kh,Cambodia | កម្ពុជា
+cm,Cameroon | Cameroun
+ca,Canada
+cv,Cape Verde | Cabo Verde
+cf,Central African Republic | Centrafrique | Bêafrîka
+td,Chad | Tchad | تشاد
+cl,Chile
+cn,China | 中國 / 中国
+co,Colombia
+km,Comoros | Komori | Comores | جزر القمر
+cd,Congo, Dem. Rep. | Congo, Rép. dém.
+cg,Congo, Republic | Congo, République
+cr,Costa Rica
+ci,Cote d’Ivoire | Côte d’Ivoire
+hr,Croatia | Hrvatska
+cu,Cuba
+cy,Cyprus | Κύπρος | Kıbrıs
+cz,Czech Republic | Česká republika
+dk,Denmark | Danmark
+dj,Djibouti | جيبوتي
+dm,Dominica
+do,Dominican Republic | República Dominicana
+ec,Ecuador
+eg,Egypt | مصر
+sv,El Salvador
+gq,Equatorial Guinea | Guinea Ecuatorial | Guinée équatoriale | Guiné Equatorial
+er,Eritrea | ኤርትራ | إرتريا
+ee,Estonia | Eesti
+et,Ethiopia | ኢትዮጵያ
+fj,Fiji | Viti | फ़िजी / فیجی
+fi,Finland | Suomi
+fr,France
+ga,Gabon
+gm,Gambia
+ge,Georgia | საქართველო
+de,Germany | Deutschland
+gh,Ghana
+gr,Greece | Ελλάδα
+gd,Grenada
+gt,Guatemala
+gu,Guam
+gn,Guinea | Guinée
+gw,Guinea-Bissau | Guiné-Bissau
+gy,Guyana
+hk,Hong Kong
+ht,Haiti | Haïti | Ayiti
+hn,Honduras
+hu,Hungary | Magyarorság
+is,Iceland | Ísland
+in,India | भारत
+id,Indonesia / ايندونيسيا
+ir,Iran | ایران
+iq,Iraq | العراق
+ie,Ireland | Éire
+il,Israel | إسرائيل | ישראל
+it,Italy | Italia
+jm,Jamaica
+jp,Japan | 日本
+jo,Jordan | الأردن
+kz,Kazakhstan | Қазақстан / Qazaqstan
+ke,Kenya
+ki,Kiribati
+kp,Korea, North | 조선 / 朝鮮
+kr,Korea, South | 한국 / 韓國
+kw,Kuwait | الكويت
+kg,Kyrgyzstan | Кыргызстан
+la,Laos | ປະເທດລາວ
+lv,Latvia | Latvija
+lb,Lebanon | لبنان
+ls,Lesotho
+lr,Liberia
+ly,Libya | ليبيا
+li,Liechtenstein
+lt,Lithuania | Lietuva
+lu,Luxembourg | Luxemburg | Lëtzebuerg
+mk,Macedonia | Македонија
+mg,Madagascar | Madagasikara
+mw,Malawi | Malaŵi
+my,Malaysia / مليسيا
+mv,Maldives | ދިވެހިރާއްޖެ
+ml,Mali
+mt,Malta
+mh,Marshall Islands | Aelōn̄ in M̧ajeļ
+mr,Mauritania | موريتانيا | Mauritanie
+mu,Mauritius | Maurice
+mx,Mexico | México
+fm,Micronesia
+md,Moldova / Молдова
+mc,Monaco
+mn,Mongolia | Монгол улс
+me,Montenegro | Црна Гора
+ma,Morocco | المغرب
+mz,Mozambique | Moçambique
+mm,Myanmar | မ္ရန္မာ
+na,Namibia
+nr,Nauru | Naoero
+np,Nepal | नेपाल
+nl,Netherlands | Nederland
+nz,New Zealand | Aotearoa
+ni,Nicaragua
+ne,Niger
+ng,Nigeria
+no,Norway | Norge / Noreg
+om,Oman | عمان
+pk,Pakistan | پاکستان
+pw,Palau | Belau
+ps,Palestine | فلسطين
+pa,Panama | Panamá
+pg,Papua New Guinea | Papua Niugini
+py,Paraguay | Paraguái
+pe,Peru | Perú
+ph,Philippines | Pilipinas
+pl,Poland | Polska
+pt,Portugal
+qa,Qatar | قطر
+ro,Romania | România
+ru,Russia | Россия
+rw,Rwanda
+kn,Saint Kitts & Nevis
+lc,Saint Lucia
+vc,Saint Vincent & the Grenadines
+ws,Samoa | Sāmoa
+sm,San Marino
+st,Sao Tome & Principe | São Tomé Príncipe
+sa,Saudi Arabia | العربية السعودية
+sn,Senegal | Sénégal
+rs,Serbia | Србија
+sc,Seychelles | Sesel
+sl,Sierra Leone
+sg,Singapore | 新加坡 | Singapura | சிங்கப்பூர்
+sk,Slovakia | Slovensko
+si,Slovenia | Slovenija
+sb,Solomon Islands
+so,Somalia | Soomaaliya
+za,South Africa | Suid-Afrika
+es,Spain | España
+lk,Sri Lanka | ශ්රී ලංකාව | இலங்கை
+sd,Sudan | السودان
+sr,Suriname
+sz,Swaziland | eSwatini / kaNgwane
+se,Sweden | Sverige
+ch,Switzerland | Schweiz | Suisse | Svizzera | Svizra
+sy,Syria | سورية
+tw,Taiwan | 臺灣 / 台湾
+tj,Tajikistan | Тоҷикистон / تاجیکستان
+tz,Tanzania
+th,Thailand | ประเทศไทย
+tl,Timor-Leste (East Timor) | Timór-Leste
+tg,Togo
+to,Tonga
+tt,Trinidad & Tobago
+tn,Tunisia | تونس
+tr,Turkey | Türkiye
+tm,Turkmenistan | Türkmenistan / Түркменистан
+tv,Tuvalu
+ug,Uganda
+ua,Ukraine | Україна
+ae,United Arab Emirates | الإمارات العربية المتحدة
+gb,United Kingdom
+us,United States
+uy,Uruguay
+uz,Uzbekistan | Oʻzbekiston / Ўзбекистон
+vu,Vanuatu
+va,Vatican | Vaticanum
+ve,Venezuela
+vn,Vietnam | Việt Nam
+eh,Western Sahara | الصحراء الغربية
+ye,Yemen | اليمن
+zm,Zambia
+zw,Zimbabwe
Modified: vidalia/branches/exit-country/src/vidalia/res/vidalia_common.qrc
===================================================================
--- vidalia/branches/exit-country/src/vidalia/res/vidalia_common.qrc 2008-07-07 15:03:45 UTC (rev 2844)
+++ vidalia/branches/exit-country/src/vidalia/res/vidalia_common.qrc 2008-07-08 14:29:05 UTC (rev 2845)
@@ -284,5 +284,6 @@
<qresource prefix="/geoip">
<file>cacert_root.crt</file>
<file>geoip.data</file>
+ <file>country_names.txt</file>
</qresource>
</RCC>