Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: remove default list of commonly used country codes

Browse Source 
Countries/regions are used rarely. Such an arbitrary list is not
really that useful. Let the user set up their own preferences.
This commit is contained in:
Moritz Bunkus 2020-09-06 21:51:56 +02:00
parent 1decaad545
commit 3760502646
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/iso3166.cpp
View File

@ -18,8 +18,6 @@
namespace mtx::iso3166 {
std::vector<std::string> const g_popular_country_codes{ "CN", "DE", "ES", "FI", "FR", "IT", "JP", "NL", "NO", "PT", "RU", "SE", "GB", "US" };
namespace {
std::vector<region_t> const s_cctlds_only{

1
src/common/iso3166.h
View File

@ -24,7 +24,6 @@ struct region_t {
};
extern std::vector<region_t> const g_regions;
extern std::vector<std::string> const g_popular_country_codes;
std::optional<region_t> look_up(std::string const &s);
std::optional<region_t> look_up(unsigned int number);

4
src/mkvtoolnix-gui/util/settings.cpp
View File

@ -436,10 +436,6 @@ Settings::setDefaults(std::optional<QVariant> enableMuxingTracksByTheseTypes) {
m_oftenUsedLanguages.sort();
}
if (m_oftenUsedCountries.isEmpty())
for (auto const &countryCode : mtx::iso3166::g_popular_country_codes)
m_oftenUsedCountries << Q(countryCode).toLower();
if (m_oftenUsedCharacterSets.isEmpty())
for (auto const &characterSet : g_popular_character_sets)
m_oftenUsedCharacterSets << Q(characterSet);