diff --git a/desktop/onionshare/connection_tab.py b/desktop/onionshare/connection_tab.py index d7b49563..6c35f21b 100644 --- a/desktop/onionshare/connection_tab.py +++ b/desktop/onionshare/connection_tab.py @@ -551,6 +551,11 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): self.description_label.setWordWrap(True) # Detection preference + self.use_bridge = True + self.no_bridge = QtWidgets.QRadioButton( + strings._("gui_autoconnect_no_bridge") + ) + self.no_bridge.toggled.connect(self._toggle_no_bridge) self.detect_automatic_radio = QtWidgets.QRadioButton( strings._("gui_autoconnect_bridge_detect_automatic") ) @@ -560,6 +565,7 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): ) self.detect_manual_radio.toggled.connect(self._detect_manual_toggled) detect_layout = QtWidgets.QVBoxLayout() + detect_layout.addWidget(self.no_bridge) detect_layout.addWidget(self.detect_automatic_radio) detect_layout.addWidget(self.detect_manual_radio) @@ -577,8 +583,12 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): self.country_combobox.setStyleSheet( common.gui.css["autoconnect_countries_combobox"] ) + self.country_combobox.setIconSize(QtCore.QSize(26, 20)) for country_code in countries: - self.country_combobox.addItem(countries[country_code], country_code) + icon = QtGui.QIcon( + GuiCommon.get_resource_path(os.path.join("images", "countries", f"{country_code.lower()}.png")) + ) + self.country_combobox.addItem(icon, countries[country_code], country_code) # Task label self.task_label = QtWidgets.QLabel() @@ -588,18 +598,12 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): # Buttons self.connect_button = QtWidgets.QPushButton( - strings._("gui_autoconnect_bridge_start") + strings._("gui_autoconnect_start") ) self.connect_button.clicked.connect(self._connect_clicked) self.connect_button.setFixedWidth(150) self.connect_button.setStyleSheet(common.gui.css["autoconnect_start_button"]) - self.try_again_button = QtWidgets.QPushButton( - strings._("gui_autoconnect_try_again_without_a_bridge") - ) - self.try_again_button.clicked.connect(self._try_again_clicked) - self.try_again_button.setStyleSheet(common.gui.css["autoconnect_start_button"]) - self.configure_button = QtWidgets.QPushButton( strings._("gui_autoconnect_configure") ) @@ -628,7 +632,6 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): cta_layout = QtWidgets.QHBoxLayout() cta_layout.addWidget(self.connect_button) - cta_layout.addWidget(self.try_again_button) cta_layout.addWidget(self.configure_button) cta_layout.addStretch() cta_widget = QtWidgets.QWidget() @@ -651,21 +654,24 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): def hide_buttons(self): self.connect_button.hide() - self.try_again_button.hide() self.configure_button.hide() self.description_label.hide() self.error_label.hide() + self.no_bridge.hide() self.detect_automatic_radio.hide() self.detect_manual_radio.hide() def show_buttons(self): self.connect_button.show() - self.try_again_button.show() self.description_label.show() self.configure_button.show() + self.no_bridge.show() self.detect_automatic_radio.show() self.detect_manual_radio.show() + def _toggle_no_bridge(self): + self.use_bridge = not self.use_bridge + def _detect_automatic_toggled(self): self.country_combobox.setEnabled(False) self.country_combobox.hide() @@ -680,16 +686,11 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget): self.connection_status_label.setText( strings._("gui_autoconnect_trying_to_connect_to_tor") ) - self.connect_clicked.emit() - - def _try_again_clicked(self): - self.connection_status_label.setText( - strings._("gui_autoconnect_trying_to_connect_to_tor") - ) - self.country_combobox.setEnabled(False) - self.country_combobox.hide() - self.hide_buttons() - self.try_again_clicked.emit() + print(self.use_bridge) + if not self.use_bridge: + self.try_again_clicked.emit() + else: + self.connect_clicked.emit() def _open_tor_settings(self): self.open_tor_settings.emit() diff --git a/desktop/onionshare/resources/images/countries/ad.png b/desktop/onionshare/resources/images/countries/ad.png new file mode 100644 index 00000000..6b66c246 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ad.png differ diff --git a/desktop/onionshare/resources/images/countries/ae.png b/desktop/onionshare/resources/images/countries/ae.png new file mode 100644 index 00000000..1f7eef68 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ae.png differ diff --git a/desktop/onionshare/resources/images/countries/af.png b/desktop/onionshare/resources/images/countries/af.png new file mode 100644 index 00000000..df53be59 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/af.png differ diff --git a/desktop/onionshare/resources/images/countries/ag.png b/desktop/onionshare/resources/images/countries/ag.png new file mode 100644 index 00000000..21069a3f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ag.png differ diff --git a/desktop/onionshare/resources/images/countries/ai.png b/desktop/onionshare/resources/images/countries/ai.png new file mode 100644 index 00000000..654c9646 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ai.png differ diff --git a/desktop/onionshare/resources/images/countries/al.png b/desktop/onionshare/resources/images/countries/al.png new file mode 100644 index 00000000..07b47d59 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/al.png differ diff --git a/desktop/onionshare/resources/images/countries/am.png b/desktop/onionshare/resources/images/countries/am.png new file mode 100644 index 00000000..13b025fc Binary files /dev/null and b/desktop/onionshare/resources/images/countries/am.png differ diff --git a/desktop/onionshare/resources/images/countries/ao.png b/desktop/onionshare/resources/images/countries/ao.png new file mode 100644 index 00000000..9a9d4e06 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ao.png differ diff --git a/desktop/onionshare/resources/images/countries/aq.png b/desktop/onionshare/resources/images/countries/aq.png new file mode 100644 index 00000000..1e934968 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/aq.png differ diff --git a/desktop/onionshare/resources/images/countries/ar.png b/desktop/onionshare/resources/images/countries/ar.png new file mode 100644 index 00000000..2727c57f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ar.png differ diff --git a/desktop/onionshare/resources/images/countries/as.png b/desktop/onionshare/resources/images/countries/as.png new file mode 100644 index 00000000..df989550 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/as.png differ diff --git a/desktop/onionshare/resources/images/countries/at.png b/desktop/onionshare/resources/images/countries/at.png new file mode 100644 index 00000000..a9bd897a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/at.png differ diff --git a/desktop/onionshare/resources/images/countries/au.png b/desktop/onionshare/resources/images/countries/au.png new file mode 100644 index 00000000..335e5d38 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/au.png differ diff --git a/desktop/onionshare/resources/images/countries/aw.png b/desktop/onionshare/resources/images/countries/aw.png new file mode 100644 index 00000000..844b2627 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/aw.png differ diff --git a/desktop/onionshare/resources/images/countries/ax.png b/desktop/onionshare/resources/images/countries/ax.png new file mode 100644 index 00000000..cefdb644 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ax.png differ diff --git a/desktop/onionshare/resources/images/countries/az.png b/desktop/onionshare/resources/images/countries/az.png new file mode 100644 index 00000000..c4122296 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/az.png differ diff --git a/desktop/onionshare/resources/images/countries/ba.png b/desktop/onionshare/resources/images/countries/ba.png new file mode 100644 index 00000000..9b2f0562 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ba.png differ diff --git a/desktop/onionshare/resources/images/countries/bb.png b/desktop/onionshare/resources/images/countries/bb.png new file mode 100644 index 00000000..6972bc64 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bb.png differ diff --git a/desktop/onionshare/resources/images/countries/bd.png b/desktop/onionshare/resources/images/countries/bd.png new file mode 100644 index 00000000..5c9941fe Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bd.png differ diff --git a/desktop/onionshare/resources/images/countries/be.png b/desktop/onionshare/resources/images/countries/be.png new file mode 100644 index 00000000..12f523ae Binary files /dev/null and b/desktop/onionshare/resources/images/countries/be.png differ diff --git a/desktop/onionshare/resources/images/countries/bf.png b/desktop/onionshare/resources/images/countries/bf.png new file mode 100644 index 00000000..49b3b453 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bf.png differ diff --git a/desktop/onionshare/resources/images/countries/bg.png b/desktop/onionshare/resources/images/countries/bg.png new file mode 100644 index 00000000..4a9f1ddf Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bg.png differ diff --git a/desktop/onionshare/resources/images/countries/bh.png b/desktop/onionshare/resources/images/countries/bh.png new file mode 100644 index 00000000..d1e3626e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bh.png differ diff --git a/desktop/onionshare/resources/images/countries/bi.png b/desktop/onionshare/resources/images/countries/bi.png new file mode 100644 index 00000000..15595710 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bi.png differ diff --git a/desktop/onionshare/resources/images/countries/bj.png b/desktop/onionshare/resources/images/countries/bj.png new file mode 100644 index 00000000..211ddbab Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bj.png differ diff --git a/desktop/onionshare/resources/images/countries/bl.png b/desktop/onionshare/resources/images/countries/bl.png new file mode 100644 index 00000000..661ee83d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bl.png differ diff --git a/desktop/onionshare/resources/images/countries/bm.png b/desktop/onionshare/resources/images/countries/bm.png new file mode 100644 index 00000000..d3f0dfae Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bm.png differ diff --git a/desktop/onionshare/resources/images/countries/bn.png b/desktop/onionshare/resources/images/countries/bn.png new file mode 100644 index 00000000..1162f7b8 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bn.png differ diff --git a/desktop/onionshare/resources/images/countries/bo.png b/desktop/onionshare/resources/images/countries/bo.png new file mode 100644 index 00000000..4f07c406 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bo.png differ diff --git a/desktop/onionshare/resources/images/countries/bq.png b/desktop/onionshare/resources/images/countries/bq.png new file mode 100644 index 00000000..a79963ef Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bq.png differ diff --git a/desktop/onionshare/resources/images/countries/br.png b/desktop/onionshare/resources/images/countries/br.png new file mode 100644 index 00000000..6c68bf21 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/br.png differ diff --git a/desktop/onionshare/resources/images/countries/bs.png b/desktop/onionshare/resources/images/countries/bs.png new file mode 100644 index 00000000..50c30f9f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bs.png differ diff --git a/desktop/onionshare/resources/images/countries/bt.png b/desktop/onionshare/resources/images/countries/bt.png new file mode 100644 index 00000000..de4ecb37 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bt.png differ diff --git a/desktop/onionshare/resources/images/countries/bv.png b/desktop/onionshare/resources/images/countries/bv.png new file mode 100644 index 00000000..78ec587c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bv.png differ diff --git a/desktop/onionshare/resources/images/countries/bw.png b/desktop/onionshare/resources/images/countries/bw.png new file mode 100644 index 00000000..c2fb24be Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bw.png differ diff --git a/desktop/onionshare/resources/images/countries/by.png b/desktop/onionshare/resources/images/countries/by.png new file mode 100644 index 00000000..d4633868 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/by.png differ diff --git a/desktop/onionshare/resources/images/countries/bz.png b/desktop/onionshare/resources/images/countries/bz.png new file mode 100644 index 00000000..3f3d3b14 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/bz.png differ diff --git a/desktop/onionshare/resources/images/countries/ca.png b/desktop/onionshare/resources/images/countries/ca.png new file mode 100644 index 00000000..a363e7e2 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ca.png differ diff --git a/desktop/onionshare/resources/images/countries/cc.png b/desktop/onionshare/resources/images/countries/cc.png new file mode 100644 index 00000000..fdb31b25 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cc.png differ diff --git a/desktop/onionshare/resources/images/countries/cd.png b/desktop/onionshare/resources/images/countries/cd.png new file mode 100644 index 00000000..592174c5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cd.png differ diff --git a/desktop/onionshare/resources/images/countries/cf.png b/desktop/onionshare/resources/images/countries/cf.png new file mode 100644 index 00000000..b89d1422 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cf.png differ diff --git a/desktop/onionshare/resources/images/countries/cg.png b/desktop/onionshare/resources/images/countries/cg.png new file mode 100644 index 00000000..6d5109c3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cg.png differ diff --git a/desktop/onionshare/resources/images/countries/ch.png b/desktop/onionshare/resources/images/countries/ch.png new file mode 100644 index 00000000..175cb77d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ch.png differ diff --git a/desktop/onionshare/resources/images/countries/ci.png b/desktop/onionshare/resources/images/countries/ci.png new file mode 100644 index 00000000..0e9ad3c5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ci.png differ diff --git a/desktop/onionshare/resources/images/countries/ck.png b/desktop/onionshare/resources/images/countries/ck.png new file mode 100644 index 00000000..1e84826e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ck.png differ diff --git a/desktop/onionshare/resources/images/countries/cl.png b/desktop/onionshare/resources/images/countries/cl.png new file mode 100644 index 00000000..c4de8efe Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cl.png differ diff --git a/desktop/onionshare/resources/images/countries/cm.png b/desktop/onionshare/resources/images/countries/cm.png new file mode 100644 index 00000000..57487367 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cm.png differ diff --git a/desktop/onionshare/resources/images/countries/cn.png b/desktop/onionshare/resources/images/countries/cn.png new file mode 100644 index 00000000..00426be7 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cn.png differ diff --git a/desktop/onionshare/resources/images/countries/co.png b/desktop/onionshare/resources/images/countries/co.png new file mode 100644 index 00000000..a09f10b5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/co.png differ diff --git a/desktop/onionshare/resources/images/countries/cr.png b/desktop/onionshare/resources/images/countries/cr.png new file mode 100644 index 00000000..2e125bb1 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cr.png differ diff --git a/desktop/onionshare/resources/images/countries/cu.png b/desktop/onionshare/resources/images/countries/cu.png new file mode 100644 index 00000000..78937434 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cu.png differ diff --git a/desktop/onionshare/resources/images/countries/cv.png b/desktop/onionshare/resources/images/countries/cv.png new file mode 100644 index 00000000..8917b8ec Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cv.png differ diff --git a/desktop/onionshare/resources/images/countries/cw.png b/desktop/onionshare/resources/images/countries/cw.png new file mode 100644 index 00000000..498e05aa Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cw.png differ diff --git a/desktop/onionshare/resources/images/countries/cx.png b/desktop/onionshare/resources/images/countries/cx.png new file mode 100644 index 00000000..57884c26 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cx.png differ diff --git a/desktop/onionshare/resources/images/countries/cy.png b/desktop/onionshare/resources/images/countries/cy.png new file mode 100644 index 00000000..0d30ef60 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cy.png differ diff --git a/desktop/onionshare/resources/images/countries/cz.png b/desktop/onionshare/resources/images/countries/cz.png new file mode 100644 index 00000000..41683c0e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/cz.png differ diff --git a/desktop/onionshare/resources/images/countries/de.png b/desktop/onionshare/resources/images/countries/de.png new file mode 100644 index 00000000..e8e7a719 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/de.png differ diff --git a/desktop/onionshare/resources/images/countries/dj.png b/desktop/onionshare/resources/images/countries/dj.png new file mode 100644 index 00000000..08480b55 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/dj.png differ diff --git a/desktop/onionshare/resources/images/countries/dk.png b/desktop/onionshare/resources/images/countries/dk.png new file mode 100644 index 00000000..03b0625e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/dk.png differ diff --git a/desktop/onionshare/resources/images/countries/dm.png b/desktop/onionshare/resources/images/countries/dm.png new file mode 100644 index 00000000..761f3081 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/dm.png differ diff --git a/desktop/onionshare/resources/images/countries/do.png b/desktop/onionshare/resources/images/countries/do.png new file mode 100644 index 00000000..2342129b Binary files /dev/null and b/desktop/onionshare/resources/images/countries/do.png differ diff --git a/desktop/onionshare/resources/images/countries/dz.png b/desktop/onionshare/resources/images/countries/dz.png new file mode 100644 index 00000000..0f37c9ed Binary files /dev/null and b/desktop/onionshare/resources/images/countries/dz.png differ diff --git a/desktop/onionshare/resources/images/countries/ec.png b/desktop/onionshare/resources/images/countries/ec.png new file mode 100644 index 00000000..1323820c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ec.png differ diff --git a/desktop/onionshare/resources/images/countries/ee.png b/desktop/onionshare/resources/images/countries/ee.png new file mode 100644 index 00000000..b37067a5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ee.png differ diff --git a/desktop/onionshare/resources/images/countries/eg.png b/desktop/onionshare/resources/images/countries/eg.png new file mode 100644 index 00000000..fb32cf67 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/eg.png differ diff --git a/desktop/onionshare/resources/images/countries/eh.png b/desktop/onionshare/resources/images/countries/eh.png new file mode 100644 index 00000000..a3887188 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/eh.png differ diff --git a/desktop/onionshare/resources/images/countries/er.png b/desktop/onionshare/resources/images/countries/er.png new file mode 100644 index 00000000..d2f501a3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/er.png differ diff --git a/desktop/onionshare/resources/images/countries/es.png b/desktop/onionshare/resources/images/countries/es.png new file mode 100644 index 00000000..7f2f5444 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/es.png differ diff --git a/desktop/onionshare/resources/images/countries/et.png b/desktop/onionshare/resources/images/countries/et.png new file mode 100644 index 00000000..4e7bd2da Binary files /dev/null and b/desktop/onionshare/resources/images/countries/et.png differ diff --git a/desktop/onionshare/resources/images/countries/fi.png b/desktop/onionshare/resources/images/countries/fi.png new file mode 100644 index 00000000..7019665e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/fi.png differ diff --git a/desktop/onionshare/resources/images/countries/fj.png b/desktop/onionshare/resources/images/countries/fj.png new file mode 100644 index 00000000..45e3ce65 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/fj.png differ diff --git a/desktop/onionshare/resources/images/countries/fk.png b/desktop/onionshare/resources/images/countries/fk.png new file mode 100644 index 00000000..e4c45ba5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/fk.png differ diff --git a/desktop/onionshare/resources/images/countries/fo.png b/desktop/onionshare/resources/images/countries/fo.png new file mode 100644 index 00000000..1ae597b6 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/fo.png differ diff --git a/desktop/onionshare/resources/images/countries/fr.png b/desktop/onionshare/resources/images/countries/fr.png new file mode 100644 index 00000000..33cbe0cd Binary files /dev/null and b/desktop/onionshare/resources/images/countries/fr.png differ diff --git a/desktop/onionshare/resources/images/countries/ga.png b/desktop/onionshare/resources/images/countries/ga.png new file mode 100644 index 00000000..ec65fb99 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ga.png differ diff --git a/desktop/onionshare/resources/images/countries/gb.png b/desktop/onionshare/resources/images/countries/gb.png new file mode 100644 index 00000000..8082d24a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gb.png differ diff --git a/desktop/onionshare/resources/images/countries/gd.png b/desktop/onionshare/resources/images/countries/gd.png new file mode 100644 index 00000000..6bc36e67 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gd.png differ diff --git a/desktop/onionshare/resources/images/countries/ge.png b/desktop/onionshare/resources/images/countries/ge.png new file mode 100644 index 00000000..409f0438 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ge.png differ diff --git a/desktop/onionshare/resources/images/countries/gf.png b/desktop/onionshare/resources/images/countries/gf.png new file mode 100644 index 00000000..706db03f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gf.png differ diff --git a/desktop/onionshare/resources/images/countries/gg.png b/desktop/onionshare/resources/images/countries/gg.png new file mode 100644 index 00000000..99561cf3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gg.png differ diff --git a/desktop/onionshare/resources/images/countries/gh.png b/desktop/onionshare/resources/images/countries/gh.png new file mode 100644 index 00000000..4f7822ad Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gh.png differ diff --git a/desktop/onionshare/resources/images/countries/gi.png b/desktop/onionshare/resources/images/countries/gi.png new file mode 100644 index 00000000..29371137 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gi.png differ diff --git a/desktop/onionshare/resources/images/countries/gl.png b/desktop/onionshare/resources/images/countries/gl.png new file mode 100644 index 00000000..eacb6523 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gl.png differ diff --git a/desktop/onionshare/resources/images/countries/gm.png b/desktop/onionshare/resources/images/countries/gm.png new file mode 100644 index 00000000..7b5263a5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gm.png differ diff --git a/desktop/onionshare/resources/images/countries/gn.png b/desktop/onionshare/resources/images/countries/gn.png new file mode 100644 index 00000000..89bd2f5c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gn.png differ diff --git a/desktop/onionshare/resources/images/countries/gp.png b/desktop/onionshare/resources/images/countries/gp.png new file mode 100644 index 00000000..ad81c718 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gp.png differ diff --git a/desktop/onionshare/resources/images/countries/gq.png b/desktop/onionshare/resources/images/countries/gq.png new file mode 100644 index 00000000..9902f401 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gq.png differ diff --git a/desktop/onionshare/resources/images/countries/gr.png b/desktop/onionshare/resources/images/countries/gr.png new file mode 100644 index 00000000..31055920 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gr.png differ diff --git a/desktop/onionshare/resources/images/countries/gs.png b/desktop/onionshare/resources/images/countries/gs.png new file mode 100644 index 00000000..a8a9ccae Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gs.png differ diff --git a/desktop/onionshare/resources/images/countries/gt.png b/desktop/onionshare/resources/images/countries/gt.png new file mode 100644 index 00000000..9e5dc551 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gt.png differ diff --git a/desktop/onionshare/resources/images/countries/gu.png b/desktop/onionshare/resources/images/countries/gu.png new file mode 100644 index 00000000..93a2b60a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gu.png differ diff --git a/desktop/onionshare/resources/images/countries/gw.png b/desktop/onionshare/resources/images/countries/gw.png new file mode 100644 index 00000000..23f62f19 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gw.png differ diff --git a/desktop/onionshare/resources/images/countries/gy.png b/desktop/onionshare/resources/images/countries/gy.png new file mode 100644 index 00000000..c961af5e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/gy.png differ diff --git a/desktop/onionshare/resources/images/countries/hk.png b/desktop/onionshare/resources/images/countries/hk.png new file mode 100644 index 00000000..518de6ce Binary files /dev/null and b/desktop/onionshare/resources/images/countries/hk.png differ diff --git a/desktop/onionshare/resources/images/countries/hm.png b/desktop/onionshare/resources/images/countries/hm.png new file mode 100644 index 00000000..a2e92dd5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/hm.png differ diff --git a/desktop/onionshare/resources/images/countries/hn.png b/desktop/onionshare/resources/images/countries/hn.png new file mode 100644 index 00000000..cbebb2cd Binary files /dev/null and b/desktop/onionshare/resources/images/countries/hn.png differ diff --git a/desktop/onionshare/resources/images/countries/hr.png b/desktop/onionshare/resources/images/countries/hr.png new file mode 100644 index 00000000..5e0df4f0 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/hr.png differ diff --git a/desktop/onionshare/resources/images/countries/ht.png b/desktop/onionshare/resources/images/countries/ht.png new file mode 100644 index 00000000..1b5ca342 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ht.png differ diff --git a/desktop/onionshare/resources/images/countries/hu.png b/desktop/onionshare/resources/images/countries/hu.png new file mode 100644 index 00000000..83b1d3bc Binary files /dev/null and b/desktop/onionshare/resources/images/countries/hu.png differ diff --git a/desktop/onionshare/resources/images/countries/id.png b/desktop/onionshare/resources/images/countries/id.png new file mode 100644 index 00000000..f02cfeb5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/id.png differ diff --git a/desktop/onionshare/resources/images/countries/ie.png b/desktop/onionshare/resources/images/countries/ie.png new file mode 100644 index 00000000..6a1b4530 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ie.png differ diff --git a/desktop/onionshare/resources/images/countries/il.png b/desktop/onionshare/resources/images/countries/il.png new file mode 100644 index 00000000..830a1937 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/il.png differ diff --git a/desktop/onionshare/resources/images/countries/im.png b/desktop/onionshare/resources/images/countries/im.png new file mode 100644 index 00000000..8cba0294 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/im.png differ diff --git a/desktop/onionshare/resources/images/countries/in.png b/desktop/onionshare/resources/images/countries/in.png new file mode 100644 index 00000000..f6c9760e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/in.png differ diff --git a/desktop/onionshare/resources/images/countries/io.png b/desktop/onionshare/resources/images/countries/io.png new file mode 100644 index 00000000..ab8ab8c7 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/io.png differ diff --git a/desktop/onionshare/resources/images/countries/iq.png b/desktop/onionshare/resources/images/countries/iq.png new file mode 100644 index 00000000..937ce474 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/iq.png differ diff --git a/desktop/onionshare/resources/images/countries/ir.png b/desktop/onionshare/resources/images/countries/ir.png new file mode 100644 index 00000000..ae6be3e5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ir.png differ diff --git a/desktop/onionshare/resources/images/countries/is.png b/desktop/onionshare/resources/images/countries/is.png new file mode 100644 index 00000000..386e8516 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/is.png differ diff --git a/desktop/onionshare/resources/images/countries/it.png b/desktop/onionshare/resources/images/countries/it.png new file mode 100644 index 00000000..f6badffa Binary files /dev/null and b/desktop/onionshare/resources/images/countries/it.png differ diff --git a/desktop/onionshare/resources/images/countries/jm.png b/desktop/onionshare/resources/images/countries/jm.png new file mode 100644 index 00000000..3f030b08 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/jm.png differ diff --git a/desktop/onionshare/resources/images/countries/jo.png b/desktop/onionshare/resources/images/countries/jo.png new file mode 100644 index 00000000..47d00d33 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/jo.png differ diff --git a/desktop/onionshare/resources/images/countries/jp.png b/desktop/onionshare/resources/images/countries/jp.png new file mode 100644 index 00000000..6f19f56d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/jp.png differ diff --git a/desktop/onionshare/resources/images/countries/ke.png b/desktop/onionshare/resources/images/countries/ke.png new file mode 100644 index 00000000..326796d1 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ke.png differ diff --git a/desktop/onionshare/resources/images/countries/kg.png b/desktop/onionshare/resources/images/countries/kg.png new file mode 100644 index 00000000..6dd829cb Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kg.png differ diff --git a/desktop/onionshare/resources/images/countries/kh.png b/desktop/onionshare/resources/images/countries/kh.png new file mode 100644 index 00000000..71f0fa3b Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kh.png differ diff --git a/desktop/onionshare/resources/images/countries/ki.png b/desktop/onionshare/resources/images/countries/ki.png new file mode 100644 index 00000000..f3c93fd7 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ki.png differ diff --git a/desktop/onionshare/resources/images/countries/km.png b/desktop/onionshare/resources/images/countries/km.png new file mode 100644 index 00000000..9eb6c0e0 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/km.png differ diff --git a/desktop/onionshare/resources/images/countries/kn.png b/desktop/onionshare/resources/images/countries/kn.png new file mode 100644 index 00000000..e9bb5975 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kn.png differ diff --git a/desktop/onionshare/resources/images/countries/kp.png b/desktop/onionshare/resources/images/countries/kp.png new file mode 100644 index 00000000..9cf342c7 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kp.png differ diff --git a/desktop/onionshare/resources/images/countries/kr.png b/desktop/onionshare/resources/images/countries/kr.png new file mode 100644 index 00000000..e484c31d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kr.png differ diff --git a/desktop/onionshare/resources/images/countries/kw.png b/desktop/onionshare/resources/images/countries/kw.png new file mode 100644 index 00000000..628e72cd Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kw.png differ diff --git a/desktop/onionshare/resources/images/countries/ky.png b/desktop/onionshare/resources/images/countries/ky.png new file mode 100644 index 00000000..3079b0e8 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ky.png differ diff --git a/desktop/onionshare/resources/images/countries/kz.png b/desktop/onionshare/resources/images/countries/kz.png new file mode 100644 index 00000000..57bb5604 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/kz.png differ diff --git a/desktop/onionshare/resources/images/countries/la.png b/desktop/onionshare/resources/images/countries/la.png new file mode 100644 index 00000000..39158aee Binary files /dev/null and b/desktop/onionshare/resources/images/countries/la.png differ diff --git a/desktop/onionshare/resources/images/countries/lb.png b/desktop/onionshare/resources/images/countries/lb.png new file mode 100644 index 00000000..cd42222d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lb.png differ diff --git a/desktop/onionshare/resources/images/countries/lc.png b/desktop/onionshare/resources/images/countries/lc.png new file mode 100644 index 00000000..67141d92 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lc.png differ diff --git a/desktop/onionshare/resources/images/countries/li.png b/desktop/onionshare/resources/images/countries/li.png new file mode 100644 index 00000000..aa6b500d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/li.png differ diff --git a/desktop/onionshare/resources/images/countries/lk.png b/desktop/onionshare/resources/images/countries/lk.png new file mode 100644 index 00000000..508f69b8 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lk.png differ diff --git a/desktop/onionshare/resources/images/countries/lr.png b/desktop/onionshare/resources/images/countries/lr.png new file mode 100644 index 00000000..133f5114 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lr.png differ diff --git a/desktop/onionshare/resources/images/countries/ls.png b/desktop/onionshare/resources/images/countries/ls.png new file mode 100644 index 00000000..8769bb3f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ls.png differ diff --git a/desktop/onionshare/resources/images/countries/lt.png b/desktop/onionshare/resources/images/countries/lt.png new file mode 100644 index 00000000..6c070fee Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lt.png differ diff --git a/desktop/onionshare/resources/images/countries/lu.png b/desktop/onionshare/resources/images/countries/lu.png new file mode 100644 index 00000000..923c8f77 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lu.png differ diff --git a/desktop/onionshare/resources/images/countries/lv.png b/desktop/onionshare/resources/images/countries/lv.png new file mode 100644 index 00000000..8098efb7 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/lv.png differ diff --git a/desktop/onionshare/resources/images/countries/ly.png b/desktop/onionshare/resources/images/countries/ly.png new file mode 100644 index 00000000..b1ee1f74 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ly.png differ diff --git a/desktop/onionshare/resources/images/countries/ma.png b/desktop/onionshare/resources/images/countries/ma.png new file mode 100644 index 00000000..aea0c086 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ma.png differ diff --git a/desktop/onionshare/resources/images/countries/mc.png b/desktop/onionshare/resources/images/countries/mc.png new file mode 100644 index 00000000..bb9019a1 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mc.png differ diff --git a/desktop/onionshare/resources/images/countries/md.png b/desktop/onionshare/resources/images/countries/md.png new file mode 100644 index 00000000..6eb589e8 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/md.png differ diff --git a/desktop/onionshare/resources/images/countries/me.png b/desktop/onionshare/resources/images/countries/me.png new file mode 100644 index 00000000..32f8e3ed Binary files /dev/null and b/desktop/onionshare/resources/images/countries/me.png differ diff --git a/desktop/onionshare/resources/images/countries/mf.png b/desktop/onionshare/resources/images/countries/mf.png new file mode 100644 index 00000000..601f1422 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mf.png differ diff --git a/desktop/onionshare/resources/images/countries/mg.png b/desktop/onionshare/resources/images/countries/mg.png new file mode 100644 index 00000000..5090480a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mg.png differ diff --git a/desktop/onionshare/resources/images/countries/mk.png b/desktop/onionshare/resources/images/countries/mk.png new file mode 100644 index 00000000..1a2b6f25 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mk.png differ diff --git a/desktop/onionshare/resources/images/countries/ml.png b/desktop/onionshare/resources/images/countries/ml.png new file mode 100644 index 00000000..148bf6d5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ml.png differ diff --git a/desktop/onionshare/resources/images/countries/mm.png b/desktop/onionshare/resources/images/countries/mm.png new file mode 100644 index 00000000..94a2f4a2 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mm.png differ diff --git a/desktop/onionshare/resources/images/countries/mn.png b/desktop/onionshare/resources/images/countries/mn.png new file mode 100644 index 00000000..062b6d4a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mn.png differ diff --git a/desktop/onionshare/resources/images/countries/mo.png b/desktop/onionshare/resources/images/countries/mo.png new file mode 100644 index 00000000..c68a13d1 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mo.png differ diff --git a/desktop/onionshare/resources/images/countries/mq.png b/desktop/onionshare/resources/images/countries/mq.png new file mode 100644 index 00000000..49324523 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mq.png differ diff --git a/desktop/onionshare/resources/images/countries/mr.png b/desktop/onionshare/resources/images/countries/mr.png new file mode 100644 index 00000000..0fa0a2e4 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mr.png differ diff --git a/desktop/onionshare/resources/images/countries/ms.png b/desktop/onionshare/resources/images/countries/ms.png new file mode 100644 index 00000000..a9bfad94 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ms.png differ diff --git a/desktop/onionshare/resources/images/countries/mt.png b/desktop/onionshare/resources/images/countries/mt.png new file mode 100644 index 00000000..0ff75b1c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mt.png differ diff --git a/desktop/onionshare/resources/images/countries/mu.png b/desktop/onionshare/resources/images/countries/mu.png new file mode 100644 index 00000000..bfa67b33 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mu.png differ diff --git a/desktop/onionshare/resources/images/countries/mv.png b/desktop/onionshare/resources/images/countries/mv.png new file mode 100644 index 00000000..26c0716d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mv.png differ diff --git a/desktop/onionshare/resources/images/countries/mw.png b/desktop/onionshare/resources/images/countries/mw.png new file mode 100644 index 00000000..915d5130 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mw.png differ diff --git a/desktop/onionshare/resources/images/countries/mx.png b/desktop/onionshare/resources/images/countries/mx.png new file mode 100644 index 00000000..5fbe593a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mx.png differ diff --git a/desktop/onionshare/resources/images/countries/my.png b/desktop/onionshare/resources/images/countries/my.png new file mode 100644 index 00000000..c2a721c9 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/my.png differ diff --git a/desktop/onionshare/resources/images/countries/mz.png b/desktop/onionshare/resources/images/countries/mz.png new file mode 100644 index 00000000..2fcc0aca Binary files /dev/null and b/desktop/onionshare/resources/images/countries/mz.png differ diff --git a/desktop/onionshare/resources/images/countries/na.png b/desktop/onionshare/resources/images/countries/na.png new file mode 100644 index 00000000..c18b44d9 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/na.png differ diff --git a/desktop/onionshare/resources/images/countries/nc.png b/desktop/onionshare/resources/images/countries/nc.png new file mode 100644 index 00000000..158b7a96 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nc.png differ diff --git a/desktop/onionshare/resources/images/countries/ne.png b/desktop/onionshare/resources/images/countries/ne.png new file mode 100644 index 00000000..daa5c574 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ne.png differ diff --git a/desktop/onionshare/resources/images/countries/nf.png b/desktop/onionshare/resources/images/countries/nf.png new file mode 100644 index 00000000..0fceb9d2 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nf.png differ diff --git a/desktop/onionshare/resources/images/countries/ng.png b/desktop/onionshare/resources/images/countries/ng.png new file mode 100644 index 00000000..8721baca Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ng.png differ diff --git a/desktop/onionshare/resources/images/countries/ni.png b/desktop/onionshare/resources/images/countries/ni.png new file mode 100644 index 00000000..9e37af76 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ni.png differ diff --git a/desktop/onionshare/resources/images/countries/nl.png b/desktop/onionshare/resources/images/countries/nl.png new file mode 100644 index 00000000..ad171909 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nl.png differ diff --git a/desktop/onionshare/resources/images/countries/no.png b/desktop/onionshare/resources/images/countries/no.png new file mode 100644 index 00000000..16dd6960 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/no.png differ diff --git a/desktop/onionshare/resources/images/countries/np.png b/desktop/onionshare/resources/images/countries/np.png new file mode 100644 index 00000000..e5abc242 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/np.png differ diff --git a/desktop/onionshare/resources/images/countries/nr.png b/desktop/onionshare/resources/images/countries/nr.png new file mode 100644 index 00000000..3f22e20f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nr.png differ diff --git a/desktop/onionshare/resources/images/countries/nu.png b/desktop/onionshare/resources/images/countries/nu.png new file mode 100644 index 00000000..32e66f3d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nu.png differ diff --git a/desktop/onionshare/resources/images/countries/nz.png b/desktop/onionshare/resources/images/countries/nz.png new file mode 100644 index 00000000..b163d1e5 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/nz.png differ diff --git a/desktop/onionshare/resources/images/countries/om.png b/desktop/onionshare/resources/images/countries/om.png new file mode 100644 index 00000000..821abb22 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/om.png differ diff --git a/desktop/onionshare/resources/images/countries/pa.png b/desktop/onionshare/resources/images/countries/pa.png new file mode 100644 index 00000000..a51545aa Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pa.png differ diff --git a/desktop/onionshare/resources/images/countries/pe.png b/desktop/onionshare/resources/images/countries/pe.png new file mode 100644 index 00000000..87d2dd6e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pe.png differ diff --git a/desktop/onionshare/resources/images/countries/pf.png b/desktop/onionshare/resources/images/countries/pf.png new file mode 100644 index 00000000..3e911ea9 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pf.png differ diff --git a/desktop/onionshare/resources/images/countries/pg.png b/desktop/onionshare/resources/images/countries/pg.png new file mode 100644 index 00000000..295e2654 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pg.png differ diff --git a/desktop/onionshare/resources/images/countries/ph.png b/desktop/onionshare/resources/images/countries/ph.png new file mode 100644 index 00000000..9cd632d6 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ph.png differ diff --git a/desktop/onionshare/resources/images/countries/pk.png b/desktop/onionshare/resources/images/countries/pk.png new file mode 100644 index 00000000..bdeb2cc2 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pk.png differ diff --git a/desktop/onionshare/resources/images/countries/pl.png b/desktop/onionshare/resources/images/countries/pl.png new file mode 100644 index 00000000..2d755331 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pl.png differ diff --git a/desktop/onionshare/resources/images/countries/pm.png b/desktop/onionshare/resources/images/countries/pm.png new file mode 100644 index 00000000..715d2e70 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pm.png differ diff --git a/desktop/onionshare/resources/images/countries/pn.png b/desktop/onionshare/resources/images/countries/pn.png new file mode 100644 index 00000000..0546323c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pn.png differ diff --git a/desktop/onionshare/resources/images/countries/pr.png b/desktop/onionshare/resources/images/countries/pr.png new file mode 100644 index 00000000..baf86b37 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pr.png differ diff --git a/desktop/onionshare/resources/images/countries/pt.png b/desktop/onionshare/resources/images/countries/pt.png new file mode 100644 index 00000000..0cf75239 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pt.png differ diff --git a/desktop/onionshare/resources/images/countries/pw.png b/desktop/onionshare/resources/images/countries/pw.png new file mode 100644 index 00000000..e0bd6744 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/pw.png differ diff --git a/desktop/onionshare/resources/images/countries/py.png b/desktop/onionshare/resources/images/countries/py.png new file mode 100644 index 00000000..e4f0af36 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/py.png differ diff --git a/desktop/onionshare/resources/images/countries/qa.png b/desktop/onionshare/resources/images/countries/qa.png new file mode 100644 index 00000000..b721b574 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/qa.png differ diff --git a/desktop/onionshare/resources/images/countries/re.png b/desktop/onionshare/resources/images/countries/re.png new file mode 100644 index 00000000..44aa7a56 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/re.png differ diff --git a/desktop/onionshare/resources/images/countries/ro.png b/desktop/onionshare/resources/images/countries/ro.png new file mode 100644 index 00000000..cdad5d84 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ro.png differ diff --git a/desktop/onionshare/resources/images/countries/rs.png b/desktop/onionshare/resources/images/countries/rs.png new file mode 100644 index 00000000..6b8879c3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/rs.png differ diff --git a/desktop/onionshare/resources/images/countries/ru.png b/desktop/onionshare/resources/images/countries/ru.png new file mode 100644 index 00000000..ca23fc2b Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ru.png differ diff --git a/desktop/onionshare/resources/images/countries/rw.png b/desktop/onionshare/resources/images/countries/rw.png new file mode 100644 index 00000000..86be09e3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/rw.png differ diff --git a/desktop/onionshare/resources/images/countries/sa.png b/desktop/onionshare/resources/images/countries/sa.png new file mode 100644 index 00000000..8a90fcf0 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sa.png differ diff --git a/desktop/onionshare/resources/images/countries/sb.png b/desktop/onionshare/resources/images/countries/sb.png new file mode 100644 index 00000000..fcef5ab4 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sb.png differ diff --git a/desktop/onionshare/resources/images/countries/sc.png b/desktop/onionshare/resources/images/countries/sc.png new file mode 100644 index 00000000..30e82e90 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sc.png differ diff --git a/desktop/onionshare/resources/images/countries/sd.png b/desktop/onionshare/resources/images/countries/sd.png new file mode 100644 index 00000000..97dc8d6f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sd.png differ diff --git a/desktop/onionshare/resources/images/countries/se.png b/desktop/onionshare/resources/images/countries/se.png new file mode 100644 index 00000000..83148ecf Binary files /dev/null and b/desktop/onionshare/resources/images/countries/se.png differ diff --git a/desktop/onionshare/resources/images/countries/sg.png b/desktop/onionshare/resources/images/countries/sg.png new file mode 100644 index 00000000..6dd351ac Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sg.png differ diff --git a/desktop/onionshare/resources/images/countries/sh.png b/desktop/onionshare/resources/images/countries/sh.png new file mode 100644 index 00000000..93cd7a07 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sh.png differ diff --git a/desktop/onionshare/resources/images/countries/si.png b/desktop/onionshare/resources/images/countries/si.png new file mode 100644 index 00000000..53be7227 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/si.png differ diff --git a/desktop/onionshare/resources/images/countries/sj.png b/desktop/onionshare/resources/images/countries/sj.png new file mode 100644 index 00000000..ed0ec917 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sj.png differ diff --git a/desktop/onionshare/resources/images/countries/sk.png b/desktop/onionshare/resources/images/countries/sk.png new file mode 100644 index 00000000..c112f435 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sk.png differ diff --git a/desktop/onionshare/resources/images/countries/sl.png b/desktop/onionshare/resources/images/countries/sl.png new file mode 100644 index 00000000..14718766 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sl.png differ diff --git a/desktop/onionshare/resources/images/countries/sm.png b/desktop/onionshare/resources/images/countries/sm.png new file mode 100644 index 00000000..1a9a020f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sm.png differ diff --git a/desktop/onionshare/resources/images/countries/sn.png b/desktop/onionshare/resources/images/countries/sn.png new file mode 100644 index 00000000..8e0588ee Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sn.png differ diff --git a/desktop/onionshare/resources/images/countries/so.png b/desktop/onionshare/resources/images/countries/so.png new file mode 100644 index 00000000..16c5ab71 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/so.png differ diff --git a/desktop/onionshare/resources/images/countries/sr.png b/desktop/onionshare/resources/images/countries/sr.png new file mode 100644 index 00000000..1186ec53 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sr.png differ diff --git a/desktop/onionshare/resources/images/countries/ss.png b/desktop/onionshare/resources/images/countries/ss.png new file mode 100644 index 00000000..bee0cf22 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ss.png differ diff --git a/desktop/onionshare/resources/images/countries/st.png b/desktop/onionshare/resources/images/countries/st.png new file mode 100644 index 00000000..d31180ee Binary files /dev/null and b/desktop/onionshare/resources/images/countries/st.png differ diff --git a/desktop/onionshare/resources/images/countries/sv.png b/desktop/onionshare/resources/images/countries/sv.png new file mode 100644 index 00000000..bcb7e73d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sv.png differ diff --git a/desktop/onionshare/resources/images/countries/sx.png b/desktop/onionshare/resources/images/countries/sx.png new file mode 100644 index 00000000..1d323794 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sx.png differ diff --git a/desktop/onionshare/resources/images/countries/sy.png b/desktop/onionshare/resources/images/countries/sy.png new file mode 100644 index 00000000..bafc18a0 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sy.png differ diff --git a/desktop/onionshare/resources/images/countries/sz.png b/desktop/onionshare/resources/images/countries/sz.png new file mode 100644 index 00000000..dfd9db50 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/sz.png differ diff --git a/desktop/onionshare/resources/images/countries/tc.png b/desktop/onionshare/resources/images/countries/tc.png new file mode 100644 index 00000000..3d088142 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tc.png differ diff --git a/desktop/onionshare/resources/images/countries/td.png b/desktop/onionshare/resources/images/countries/td.png new file mode 100644 index 00000000..238b6669 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/td.png differ diff --git a/desktop/onionshare/resources/images/countries/tf.png b/desktop/onionshare/resources/images/countries/tf.png new file mode 100644 index 00000000..d8eb2aec Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tf.png differ diff --git a/desktop/onionshare/resources/images/countries/tg.png b/desktop/onionshare/resources/images/countries/tg.png new file mode 100644 index 00000000..ce234c3c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tg.png differ diff --git a/desktop/onionshare/resources/images/countries/th.png b/desktop/onionshare/resources/images/countries/th.png new file mode 100644 index 00000000..358dd526 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/th.png differ diff --git a/desktop/onionshare/resources/images/countries/tj.png b/desktop/onionshare/resources/images/countries/tj.png new file mode 100644 index 00000000..619bc473 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tj.png differ diff --git a/desktop/onionshare/resources/images/countries/tk.png b/desktop/onionshare/resources/images/countries/tk.png new file mode 100644 index 00000000..1c5cd10a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tk.png differ diff --git a/desktop/onionshare/resources/images/countries/tl.png b/desktop/onionshare/resources/images/countries/tl.png new file mode 100644 index 00000000..e6678ad1 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tl.png differ diff --git a/desktop/onionshare/resources/images/countries/tm.png b/desktop/onionshare/resources/images/countries/tm.png new file mode 100644 index 00000000..4cb21f15 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tm.png differ diff --git a/desktop/onionshare/resources/images/countries/tn.png b/desktop/onionshare/resources/images/countries/tn.png new file mode 100644 index 00000000..69b33d30 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tn.png differ diff --git a/desktop/onionshare/resources/images/countries/to.png b/desktop/onionshare/resources/images/countries/to.png new file mode 100644 index 00000000..1146b5cd Binary files /dev/null and b/desktop/onionshare/resources/images/countries/to.png differ diff --git a/desktop/onionshare/resources/images/countries/tr.png b/desktop/onionshare/resources/images/countries/tr.png new file mode 100644 index 00000000..8534508e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tr.png differ diff --git a/desktop/onionshare/resources/images/countries/tt.png b/desktop/onionshare/resources/images/countries/tt.png new file mode 100644 index 00000000..4b926f98 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tt.png differ diff --git a/desktop/onionshare/resources/images/countries/tw.png b/desktop/onionshare/resources/images/countries/tw.png new file mode 100644 index 00000000..96d0f291 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tw.png differ diff --git a/desktop/onionshare/resources/images/countries/tz.png b/desktop/onionshare/resources/images/countries/tz.png new file mode 100644 index 00000000..ab40819c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/tz.png differ diff --git a/desktop/onionshare/resources/images/countries/ua.png b/desktop/onionshare/resources/images/countries/ua.png new file mode 100644 index 00000000..d31294e0 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ua.png differ diff --git a/desktop/onionshare/resources/images/countries/ug.png b/desktop/onionshare/resources/images/countries/ug.png new file mode 100644 index 00000000..70c747f2 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ug.png differ diff --git a/desktop/onionshare/resources/images/countries/us.png b/desktop/onionshare/resources/images/countries/us.png new file mode 100644 index 00000000..00e97bad Binary files /dev/null and b/desktop/onionshare/resources/images/countries/us.png differ diff --git a/desktop/onionshare/resources/images/countries/uy.png b/desktop/onionshare/resources/images/countries/uy.png new file mode 100644 index 00000000..89c8be7c Binary files /dev/null and b/desktop/onionshare/resources/images/countries/uy.png differ diff --git a/desktop/onionshare/resources/images/countries/uz.png b/desktop/onionshare/resources/images/countries/uz.png new file mode 100644 index 00000000..a0ea7e6a Binary files /dev/null and b/desktop/onionshare/resources/images/countries/uz.png differ diff --git a/desktop/onionshare/resources/images/countries/va.png b/desktop/onionshare/resources/images/countries/va.png new file mode 100644 index 00000000..6077cc6f Binary files /dev/null and b/desktop/onionshare/resources/images/countries/va.png differ diff --git a/desktop/onionshare/resources/images/countries/vc.png b/desktop/onionshare/resources/images/countries/vc.png new file mode 100644 index 00000000..6380657e Binary files /dev/null and b/desktop/onionshare/resources/images/countries/vc.png differ diff --git a/desktop/onionshare/resources/images/countries/ve.png b/desktop/onionshare/resources/images/countries/ve.png new file mode 100644 index 00000000..21e3b441 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ve.png differ diff --git a/desktop/onionshare/resources/images/countries/vg.png b/desktop/onionshare/resources/images/countries/vg.png new file mode 100644 index 00000000..3744a29d Binary files /dev/null and b/desktop/onionshare/resources/images/countries/vg.png differ diff --git a/desktop/onionshare/resources/images/countries/vi.png b/desktop/onionshare/resources/images/countries/vi.png new file mode 100644 index 00000000..6eb69d00 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/vi.png differ diff --git a/desktop/onionshare/resources/images/countries/vn.png b/desktop/onionshare/resources/images/countries/vn.png new file mode 100644 index 00000000..d5708c76 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/vn.png differ diff --git a/desktop/onionshare/resources/images/countries/vu.png b/desktop/onionshare/resources/images/countries/vu.png new file mode 100644 index 00000000..db84aa06 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/vu.png differ diff --git a/desktop/onionshare/resources/images/countries/wf.png b/desktop/onionshare/resources/images/countries/wf.png new file mode 100644 index 00000000..db7e31ea Binary files /dev/null and b/desktop/onionshare/resources/images/countries/wf.png differ diff --git a/desktop/onionshare/resources/images/countries/ws.png b/desktop/onionshare/resources/images/countries/ws.png new file mode 100644 index 00000000..649a0397 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ws.png differ diff --git a/desktop/onionshare/resources/images/countries/ye.png b/desktop/onionshare/resources/images/countries/ye.png new file mode 100644 index 00000000..04602b36 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/ye.png differ diff --git a/desktop/onionshare/resources/images/countries/yt.png b/desktop/onionshare/resources/images/countries/yt.png new file mode 100644 index 00000000..c3ed9e4b Binary files /dev/null and b/desktop/onionshare/resources/images/countries/yt.png differ diff --git a/desktop/onionshare/resources/images/countries/za.png b/desktop/onionshare/resources/images/countries/za.png new file mode 100644 index 00000000..4800c414 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/za.png differ diff --git a/desktop/onionshare/resources/images/countries/zm.png b/desktop/onionshare/resources/images/countries/zm.png new file mode 100644 index 00000000..39608a7b Binary files /dev/null and b/desktop/onionshare/resources/images/countries/zm.png differ diff --git a/desktop/onionshare/resources/images/countries/zw.png b/desktop/onionshare/resources/images/countries/zw.png new file mode 100644 index 00000000..c00b48d3 Binary files /dev/null and b/desktop/onionshare/resources/images/countries/zw.png differ diff --git a/desktop/onionshare/resources/locale/en.json b/desktop/onionshare/resources/locale/en.json index e90547f7..54e2fa09 100644 --- a/desktop/onionshare/resources/locale/en.json +++ b/desktop/onionshare/resources/locale/en.json @@ -47,11 +47,11 @@ "gui_autoconnect_failed_to_connect_to_tor": "Failed to Connect to Tor", "gui_autoconnect_trying_to_connect_to_tor": "Trying to Connect to Tor...", "gui_autoconnect_bridge_description": "Are you connected to the internet?

It's also possible that your internet is being censored. You might be able to bypass this using a bridge.", - "gui_autoconnect_bridge_detect_automatic": "Automatically determine my country from my IP address", - "gui_autoconnect_bridge_detect_manual": "Manually select my country", + "gui_autoconnect_bridge_detect_automatic": "Automatically determine my country from my IP address for bridge settings", + "gui_autoconnect_bridge_detect_manual": "Manually select my country for bridge settings", "gui_autoconnect_start": "Connect to Tor", "gui_autoconnect_configure": "Network Settings", - "gui_autoconnect_bridge_start": "Use a Bridge", + "gui_autoconnect_no_bridge": "Try again without bridge", "gui_autoconnect_try_again_without_a_bridge": "Try again without a Bridge", "gui_autoconnect_circumventing_censorship": "Trying to resolve connectivity issues", "gui_autoconnect_circumventing_censorship_starting_circumvention": "Starting censorship circumvention process", diff --git a/desktop/scripts/countries-get-flag.py b/desktop/scripts/countries-get-flag.py new file mode 100644 index 00000000..e500fd00 --- /dev/null +++ b/desktop/scripts/countries-get-flag.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python3 +import subprocess +import tempfile +import json +import os + + +def main(): + tmp_dir = tempfile.TemporaryDirectory() + flagsdir = os.path.join(tmp_dir.name, "flagsicon") + subprocess.run(["git", "clone", "https://github.com/lipis/flag-icons.git", flagsdir]) + + with open( + os.path.join("onionshare", "resources", "countries", "en.json") + ) as f: + countries = list(json.loads(f.read())) + + os.makedirs( + os.path.join( + "onionshare", + "resources", + "images", + "countries", + ), + exist_ok=True, + ) + + for country in countries: + country = country.lower() + if os.path.isfile(os.path.join(flagsdir, "flags", "4x3", f"{country}.svg")): + src_filename = os.path.join(flagsdir, "flags", "4x3", f"{country}.svg") + dest_filename = os.path.join( + "onionshare", + "resources", + "images", + "countries", + f"{country}.png", + ) + subprocess.run( + [ + "convert", + src_filename, + "-background", + "none", + "-density", + "100", + "-resize", + "64x", + dest_filename, + ] + ) + + +if __name__ == "__main__": + main()