Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-02 05:12:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

encode one way for CLI, encode another for GUI (#141)

Browse source
This commit is contained in:
Micah Lee 2014-09-16 02:09:37 +00:00
parent fec0c9ad65
commit 89581b0a03
6 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
onionshare/strings.py
View file

@ -35,7 +35,10 @@ def load_strings(default="en"):
if key in translated[lang]: if key in translated[lang]:
strings[key] = translated[lang][key] strings[key] = translated[lang][key]
def translated(k): def translated(k, gui=False):
return strings[k].encode("utf-8").decode('utf-8', 'replace') if gui:
return strings[k].encode("utf-8").decode('utf-8', 'replace')
else:
return strings[k].encode("utf-8")
_ = translated _ = translated

2
onionshare_gui/downloads.py
View file

@ -30,7 +30,7 @@ class Downloads(QtGui.QVBoxLayout):
self.progress_bars = {} self.progress_bars = {}
# downloads label # downloads label
self.downloads_label = QtGui.QLabel(strings._('gui_downloads')) self.downloads_label = QtGui.QLabel(strings._('gui_downloads', True))
self.downloads_label.hide() self.downloads_label.hide()
# add the widgets # add the widgets

12
onionshare_gui/file_selection.py
View file

@ -34,7 +34,7 @@ class FileList(QtGui.QListWidget):
self.setSortingEnabled(True) self.setSortingEnabled(True)
# drag and drop label # drag and drop label
self.drop_label = QtGui.QLabel(QtCore.QString(strings._('gui_drag_and_drop')), parent=self) self.drop_label = QtGui.QLabel(QtCore.QString(strings._('gui_drag_and_drop', True)), parent=self)
self.drop_label.setAlignment(QtCore.Qt.AlignCenter) self.drop_label.setAlignment(QtCore.Qt.AlignCenter)
self.drop_label.setStyleSheet('background: url({0}) no-repeat center center; color: #999999;'.format(common.get_image_path('drop_files.png'))) self.drop_label.setStyleSheet('background: url({0}) no-repeat center center; color: #999999;'.format(common.get_image_path('drop_files.png')))
self.drop_label.hide() self.drop_label.hide()
@ -124,11 +124,11 @@ class FileSelection(QtGui.QVBoxLayout):
self.file_list.files_dropped.connect(self.update) self.file_list.files_dropped.connect(self.update)
# buttons # buttons
self.add_files_button = QtGui.QPushButton(strings._('gui_add_files')) self.add_files_button = QtGui.QPushButton(strings._('gui_add_files', True))
self.add_files_button.clicked.connect(self.add_files) self.add_files_button.clicked.connect(self.add_files)
self.add_dir_button = QtGui.QPushButton(strings._('gui_add_folder')) self.add_dir_button = QtGui.QPushButton(strings._('gui_add_folder', True))
self.add_dir_button.clicked.connect(self.add_dir) self.add_dir_button.clicked.connect(self.add_dir)
self.delete_button = QtGui.QPushButton(strings._('gui_delete')) self.delete_button = QtGui.QPushButton(strings._('gui_delete', True))
self.delete_button.clicked.connect(self.delete_file) self.delete_button.clicked.connect(self.delete_file)
button_layout = QtGui.QHBoxLayout() button_layout = QtGui.QHBoxLayout()
button_layout.addWidget(self.add_files_button) button_layout.addWidget(self.add_files_button)
@ -162,14 +162,14 @@ class FileSelection(QtGui.QVBoxLayout):
self.file_list.update() self.file_list.update()
def add_files(self): def add_files(self):
filenames = QtGui.QFileDialog.getOpenFileNames(caption=strings._('gui_choose_files'), options=QtGui.QFileDialog.ReadOnly) filenames = QtGui.QFileDialog.getOpenFileNames(caption=strings._('gui_choose_files', True), options=QtGui.QFileDialog.ReadOnly)
if filenames: if filenames:
for filename in filenames: for filename in filenames:
self.file_list.add_file(str(filename)) self.file_list.add_file(str(filename))
self.update() self.update()
def add_dir(self): def add_dir(self):
filename = QtGui.QFileDialog.getExistingDirectory(caption=strings._('gui_choose_folder'), options=QtGui.QFileDialog.ReadOnly) filename = QtGui.QFileDialog.getExistingDirectory(caption=strings._('gui_choose_folder', True), options=QtGui.QFileDialog.ReadOnly)
if filename: if filename:
self.file_list.add_file(str(filename)) self.file_list.add_file(str(filename))
self.update() self.update()

10
onionshare_gui/onionshare_gui.py
View file

@ -100,7 +100,7 @@ class OnionShareGui(QtGui.QWidget):
def start_server(self): def start_server(self):
# start the hidden service # start the hidden service
self.status_bar.showMessage(strings._('gui_starting_server').format(self.app.port)) self.status_bar.showMessage(strings._('gui_starting_server', True).format(self.app.port))
try: try:
self.app.choose_port() self.app.choose_port()
print strings._("connecting_ctrlport").format(self.app.port) print strings._("connecting_ctrlport").format(self.app.port)
@ -161,7 +161,7 @@ class OnionShareGui(QtGui.QWidget):
for event in events: for event in events:
if event["type"] == web.REQUEST_LOAD: if event["type"] == web.REQUEST_LOAD:
self.status_bar.showMessage(strings._('download_page_loaded')) self.status_bar.showMessage(strings._('download_page_loaded', True))
elif event["type"] == web.REQUEST_DOWNLOAD: elif event["type"] == web.REQUEST_DOWNLOAD:
self.downloads.add_download(event["data"]["id"], web.zip_filesize) self.downloads.add_download(event["data"]["id"], web.zip_filesize)
@ -176,10 +176,10 @@ class OnionShareGui(QtGui.QWidget):
self.server_status.stop_server() self.server_status.stop_server()
elif event["path"] != '/favicon.ico': elif event["path"] != '/favicon.ico':
self.status_bar.showMessage('{0}: {1}'.format(strings._('other_page_loaded'), event["path"])) self.status_bar.showMessage('{0}: {1}'.format(strings._('other_page_loaded', True), event["path"]))
def copy_url(self): def copy_url(self):
self.status_bar.showMessage(strings._('gui_copied_url'), 2000) self.status_bar.showMessage(strings._('gui_copied_url', True), 2000)
def clear_message(self): def clear_message(self):
self.status_bar.clearMessage() self.status_bar.clearMessage()
@ -221,7 +221,7 @@ def main():
valid = True valid = True
for filename in filenames: for filename in filenames:
if not os.path.exists(filename): if not os.path.exists(filename):
alert(strings._("not_a_file").format(filename)) alert(strings._("not_a_file", True).format(filename))
valid = False valid = False
if not valid: if not valid:
sys.exit() sys.exit()

2
onionshare_gui/options.py
View file

@ -35,7 +35,7 @@ class Options(QtGui.QHBoxLayout):
self.close_automatically.setCheckState(QtCore.Qt.Unchecked) self.close_automatically.setCheckState(QtCore.Qt.Unchecked)
else: else:
self.close_automatically.setCheckState(QtCore.Qt.Checked) self.close_automatically.setCheckState(QtCore.Qt.Checked)
self.close_automatically.setText(strings._("close_on_finish")) self.close_automatically.setText(strings._("close_on_finish", True))
self.connect(self.close_automatically, QtCore.SIGNAL('stateChanged(int)'), self.stay_open_changed) self.connect(self.close_automatically, QtCore.SIGNAL('stateChanged(int)'), self.stay_open_changed)
# add the widgets # add the widgets

6
onionshare_gui/server_status.py
View file

@ -48,9 +48,9 @@ class ServerStatus(QtGui.QVBoxLayout):
self.status_image_started = QtGui.QImage(common.get_image_path('server_started.png')) self.status_image_started = QtGui.QImage(common.get_image_path('server_started.png'))
self.status_image_label = QtGui.QLabel() self.status_image_label = QtGui.QLabel()
self.status_image_label.setFixedWidth(30) self.status_image_label.setFixedWidth(30)
self.start_server_button = QtGui.QPushButton(strings._('gui_start_server')) self.start_server_button = QtGui.QPushButton(strings._('gui_start_server', True))
self.start_server_button.clicked.connect(self.start_server) self.start_server_button.clicked.connect(self.start_server)
self.stop_server_button = QtGui.QPushButton(strings._('gui_stop_server')) self.stop_server_button = QtGui.QPushButton(strings._('gui_stop_server', True))
self.stop_server_button.clicked.connect(self.stop_server) self.stop_server_button.clicked.connect(self.stop_server)
server_layout = QtGui.QHBoxLayout() server_layout = QtGui.QHBoxLayout()
server_layout.addWidget(self.status_image_label) server_layout.addWidget(self.status_image_label)
@ -64,7 +64,7 @@ class ServerStatus(QtGui.QVBoxLayout):
self.url_label.setFont(url_font) self.url_label.setFont(url_font)
self.url_label.setWordWrap(True) self.url_label.setWordWrap(True)
self.url_label.setAlignment(QtCore.Qt.AlignCenter) self.url_label.setAlignment(QtCore.Qt.AlignCenter)
self.copy_url_button = QtGui.QPushButton(strings._('gui_copy_url')) self.copy_url_button = QtGui.QPushButton(strings._('gui_copy_url', True))
self.copy_url_button.clicked.connect(self.copy_url) self.copy_url_button.clicked.connect(self.copy_url)
url_layout = QtGui.QHBoxLayout() url_layout = QtGui.QHBoxLayout()
url_layout.addWidget(self.url_label) url_layout.addWidget(self.url_label)