Skip to content

Commit

Permalink
Resolved #178, Customizer will now annoy you with a confirmation dial…
Browse files Browse the repository at this point in the history 
…og before cleaning is allowed.
  • Loading branch information
@kamilion
kamilion committed Aug 15, 2017
1 parent 87c6a5d commit fd60f77
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 27 deletions.
16 changes: 11 additions & 5 deletions src/gui.py.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ def msg_warning(msg):
def msg_critical(msg):
QMessageBox.critical(MainWindow, app.tr('Critical'), u'{0}'.format(msg))

def msg_question(msg):
return QMessageBox.question(MainWindow, app.tr('Question'), u'{0}'.format(msg))

# limit instances to one
lock = '/run/lock/customizer'
running = False
Expand All @@ -87,6 +90,7 @@ if int(sys.version_info[0]) >= 3:
class ThreadMailbox(QObject):
# Note that because we use a string to specify the type of
# the QString argument then this code will run under Python v2 and v3.
question_messagebox = pyqtSignal(['QString'])
critical_messagebox = pyqtSignal(['QString'])
warning_messagebox = pyqtSignal(['QString'])
info_messagebox = pyqtSignal(['QString'])
Expand Down Expand Up @@ -189,6 +193,7 @@ def setup_gui():
ui.rebuildButton.setEnabled(False)
ui.cleanButton.setEnabled(False)
ui.extraCustomizationBox.setEnabled(False)
main_thread_mailbox.question_messagebox.connect(msg_question)
main_thread_mailbox.critical_messagebox.connect(msg_critical)
main_thread_mailbox.warning_messagebox.connect(msg_warning)
main_thread_mailbox.info_messagebox.connect(msg_info)
Expand Down Expand Up @@ -300,11 +305,12 @@ def run_rebuild():
msg_critical(detail)

def run_clean():
message.sub_debug('Starting Cleaning...')
try:
worker(clean.main)
except Exception as detail:
msg_critical(detail)
if msg_question(app.tr('Confirm cleaning?')) == QMessageBox.Yes:
message.sub_debug('Starting Cleaning...')
try:
worker(clean.main)
except Exception as detail:
msg_critical(detail)

def edit_sources():
message.sub_debug('Trying to edit sources...')
Expand Down
32 changes: 21 additions & 11 deletions tr/customizer_bg_BG.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,59 +238,69 @@
<translation>Критично</translation>
</message>
<message>
<location filename="gui.py" line="77"/>
<location filename="gui.py" line="80"/>
<source>An instance of Customizer is already running.</source>
<translation>Инстанция на Customizer вече е стартирана.</translation>
</message>
<message>
<location filename="gui.py" line="84"/>
<location filename="gui.py" line="87"/>
<source>You are attempting to run Customizer with Python 3.</source>
<translation>Опитвате се да стартирате Customizer с Python 3.</translation>
</message>
<message>
<location filename="gui.py" line="183"/>
<location filename="gui.py" line="187"/>
<source>The filesystem is not valid or corrupted. Clean is recommended.</source>
<translation>Файловата система не е валидна или е повредена. Изчистване е препоръчително.</translation>
</message>
<message>
<location filename="gui.py" line="210"/>
<location filename="gui.py" line="215"/>
<source>No supported terminal emulator detected.</source>
<translation>Не е намерен терминал, който се поддържа.</translation>
</message>
<message>
<location filename="gui.py" line="273"/>
<location filename="gui.py" line="278"/>
<source>Open</source>
<translation>Отвори</translation>
</message>
<message>
<location filename="gui.py" line="283"/>
<location filename="gui.py" line="288"/>
<source>ISO Files (*.iso);;All Files (*)</source>
<translation>ISO Файлове (*.iso);;Всички Файлове (*)</translation>
</message>
<message>
<location filename="gui.py" line="319"/>
<location filename="gui.py" line="325"/>
<source>No supported text editor detected.</source>
<translation>Не е намерен текстов редактор, който се поддържа.</translation>
</message>
<message>
<location filename="gui.py" line="332"/>
<location filename="gui.py" line="338"/>
<source>Deb Files (*.deb);;All Files (*)</source>
<translation>Deb Файлове (*.deb);;Всички Файлове (*)</translation>
</message>
<message>
<location filename="gui.py" line="349"/>
<location filename="gui.py" line="355"/>
<source>Shell Scripts (*.sh);;All Files (*)</source>
<translation>Скриптове на Обвивката (*.sh);;Всички Файлове (*)</translation>
</message>
<message>
<location filename="gui.py" line="445"/>
<location filename="gui.py" line="451"/>
<source>No supported file manager detected.</source>
<translation>Не е намерен файлов мениджър, който се поддържа.</translation>
</message>
<message>
<location filename="gui.py" line="383"/>
<location filename="gui.py" line="389"/>
<source>Live user can not be empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gui.py" line="67"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gui.py" line="308"/>
<source>Confirm cleaning?</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
32 changes: 21 additions & 11 deletions tr/customizer_ko_KR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,59 +238,69 @@
<translation>치명적</translation>
</message>
<message>
<location filename="gui.py" line="77"/>
<location filename="gui.py" line="80"/>
<source>An instance of Customizer is already running.</source>
<translation>커스터마이저의 한 예가 이미 실행중입니다.</translation>
</message>
<message>
<location filename="gui.py" line="84"/>
<location filename="gui.py" line="87"/>
<source>You are attempting to run Customizer with Python 3.</source>
<translation>당신은 파이썬 3으로 커스터마이저를 실행하려고합니다.</translation>
</message>
<message>
<location filename="gui.py" line="183"/>
<location filename="gui.py" line="187"/>
<source>The filesystem is not valid or corrupted. Clean is recommended.</source>
<translation>파일시스템이 잘못되거나 손상되었습니다. 청소를 하는 것이 좋습니다.</translation>
</message>
<message>
<location filename="gui.py" line="210"/>
<location filename="gui.py" line="215"/>
<source>No supported terminal emulator detected.</source>
<translation>지원되는 터미널 에뮬레이터가 감지 되지 않습니다.</translation>
</message>
<message>
<location filename="gui.py" line="273"/>
<location filename="gui.py" line="278"/>
<source>Open</source>
<translation>열기</translation>
</message>
<message>
<location filename="gui.py" line="283"/>
<location filename="gui.py" line="288"/>
<source>ISO Files (*.iso);;All Files (*)</source>
<translation>ISO 파일 (*.iso);;모든 파일 (*)</translation>
</message>
<message>
<location filename="gui.py" line="319"/>
<location filename="gui.py" line="325"/>
<source>No supported text editor detected.</source>
<translation>지원되는 텍스트 에디터가 감지 되지 않습니다.</translation>
</message>
<message>
<location filename="gui.py" line="332"/>
<location filename="gui.py" line="338"/>
<source>Deb Files (*.deb);;All Files (*)</source>
<translation>Deb 파일 (*.deb);;모든 파일 (*)</translation>
</message>
<message>
<location filename="gui.py" line="349"/>
<location filename="gui.py" line="355"/>
<source>Shell Scripts (*.sh);;All Files (*)</source>
<translation>쉘 스크립트 (*.sh);;모든 파일 (*)</translation>
</message>
<message>
<location filename="gui.py" line="445"/>
<location filename="gui.py" line="451"/>
<source>No supported file manager detected.</source>
<translation>지원되는 파일 탐색기가 감지 되지 않습니다.</translation>
</message>
<message>
<location filename="gui.py" line="383"/>
<location filename="gui.py" line="389"/>
<source>Live user can not be empty.</source>
<translation type="unfinished">라이브 유저는 비워 둘 수 없습니다 .</translation>
</message>
<message>
<location filename="gui.py" line="67"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="gui.py" line="308"/>
<source>Confirm cleaning?</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

0 comments on commit fd60f77

Please sign in to comment.