From b1b2b9b66bdcc696326a558c0b8cd601979feec8 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Fri, 1 Mar 2013 12:07:34 -0800 Subject: [PATCH] Use standard Qt buttons in LogView. Recreate LogView when changing language (#3647) --- gui/cppcheck_de.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_es.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_fi.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_fr.ts | 12 ++---- gui/cppcheck_it.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_ja.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_ko.ts | 12 ++---- gui/cppcheck_nl.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_ru.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_sr.ts | 81 ++++++++++++++++++-------------------- gui/cppcheck_sv.ts | 77 +++++++++++++++++++----------------- gui/cppcheck_zh_CN.ts | 81 ++++++++++++++++++-------------------- gui/logview.cpp | 8 ++-- gui/logview.ui | 41 +++---------------- gui/mainwindow.cpp | 2 + gui/translationhandler.cpp | 1 + 16 files changed, 403 insertions(+), 479 deletions(-) diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts index 3a470d305..85ecf4b93 100644 --- a/gui/cppcheck_de.ts +++ b/gui/cppcheck_de.ts @@ -137,37 +137,27 @@ Parameter: -l(line) (file) Untersuchungs-Log - - &Save - &Speichern - - - + Clear Löschen - - Close - Schließen - - - + Save Log Speichere Log - + Text files (*.txt *.log);;All files (*.*) Textdateien (*.txt *.log);;Alle Dateien(*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" Datei kann nicht zum Schreiben geöffnet werden: "%1" @@ -184,8 +174,8 @@ Parameter: -l(line) (file) - - + + Cppcheck Cppcheck @@ -687,34 +677,34 @@ Möchten Sie die Prüfung abbrechen und Cppcheck beenden? Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) Projektdateien (*.cppcheck);;Alle Dateien(*.*) - + Select Project File Projektdatei auswählen - - + + Project: Projekt: - + Select Project Filename Projektnamen auswählen - + No project file loaded Keine Projektdatei geladen - + The project file %1 @@ -731,67 +721,67 @@ Do you want to remove the file from the recently used projects -list? Möchten Sie die Datei von der Liste der zuletzt benutzten Projekte entfernen? - + Finnish Finnisch - + English Englisch - + Chinese (Simplified) Chinesisch (vereinfacht) - + Dutch Niederländisch - + French Französisch - + Italian Italienisch - + Korean Koreanisch - + Spanish Spanisch - + Swedish Schwedisch - + German Deutsch - + Russian Russisch - + Japanese Japanisch - + Serbian Serbisch @@ -993,21 +983,26 @@ Optionen: Close Schließen + + + Save + Speichern + QObject - + Unknown language specified! Unbekannte Sprache angegeben! - + Language file %1 not found! Sprachdatei %1 nicht gefunden! - + Failed to load translation for language %1 from file %2 Die Übersetzungen der Sprache %1 konnten nicht aus der Datei %2 geladen werden @@ -1621,7 +1616,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde TranslationHandler - + Failed to change the user interface language: %1 @@ -1634,7 +1629,7 @@ The user interface language has been reset to English. Open the Preferences-dial Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dialog um eine verfügbare Sprache auszuwählen. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts index 352107416..eb12b35fd 100644 --- a/gui/cppcheck_es.ts +++ b/gui/cppcheck_es.ts @@ -126,37 +126,27 @@ Parameters: -l(line) (file) Comprobando log - - &Save - - - - + Clear Limpiar - - Close - Cerrar - - - + Save Log - + Text files (*.txt *.log);;All files (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" @@ -173,8 +163,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -668,34 +658,34 @@ Opening a new XML file will clear current results.Do you want to proceed?Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*) - + Select Project File Selecciona proyecto - - + + Project: Proyecto: - + Select Project Filename Selecciona el nombre del proyecto - + No project file loaded No hay ningún proyecto cargado - + The project file %1 @@ -706,67 +696,67 @@ Do you want to remove the file from the recently used projects -list? - + English English - + Dutch Holandés - + Chinese (Simplified) - + Finnish Finés - + French - + Italian - + Korean - + Spanish - + Swedish Sueco - + German Alemán - + Russian Ruso - + Japanese Japonés - + Serbian Servio @@ -958,21 +948,26 @@ Options: Close Cerrar + + + Save + + QObject - + Unknown language specified! - + Language file %1 not found! ¡Fichero de idioma %1 no encontrado! - + Failed to load translation for language %1 from file %2 Fallo al cargar la traducción para el idioma %1 desde el fichero %2 @@ -1583,7 +1578,7 @@ Para cambiar el tipo de comportamiento, abrir el menú vista. TranslationHandler - + Failed to change the user interface language: %1 @@ -1592,7 +1587,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts index ceeca7fa7..d77606d29 100644 --- a/gui/cppcheck_fi.ts +++ b/gui/cppcheck_fi.ts @@ -129,37 +129,27 @@ Parameters: -l(line) (file) - - &Save - - - - + Clear - - Close - - - - + Save Log - + Text files (*.txt *.log);;All files (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" @@ -176,8 +166,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -670,34 +660,34 @@ Do you want to stop the checking and exit Cppcheck?. Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 @@ -708,68 +698,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Suomi - + English Englanti - + Chinese (Simplified) - + Dutch - + French - + Italian - + Korean - + Spanish - + Swedish Ruotsi - + German Saksa - + Russian Venäjä - + Japanese Japanease - + Serbian @@ -961,22 +951,27 @@ Options: Close + + + Save + + QObject - + Unknown language specified! - + Language file %1 not found! Language file %1.qm not found! Käännöstiedostoa %1 ei löytynyt! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Käänöksen lataaminen kielelle %1 tiedostosta %2 epäonnistui @@ -1587,7 +1582,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik TranslationHandler - + Failed to change the user interface language: %1 @@ -1596,7 +1591,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts index 444ab27a7..9eff16683 100644 --- a/gui/cppcheck_fr.ts +++ b/gui/cppcheck_fr.ts @@ -104,18 +104,10 @@ Parameters: -l(line) (file) Checking Log - - &Save - - Clear - - Close - - Save Log @@ -756,6 +748,10 @@ Options: Close + + Save + + QObject diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts index 7e25f5d93..f9c59f856 100644 --- a/gui/cppcheck_it.ts +++ b/gui/cppcheck_it.ts @@ -138,37 +138,27 @@ Parametri: -l(line) (file) Log sulla scansione - - &Save - &Salva - - - + Clear Cancella - - Close - Chiudi - - - + Save Log Salva il rapporto - + Text files (*.txt *.log);;All files (*.*) File di testo (*.txt *.log);;Tutti i files(*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" Non è stato possibile aprire il file per la scrittura: "%1" @@ -185,8 +175,8 @@ Parametri: -l(line) (file) - - + + Cppcheck Cppcheck @@ -700,34 +690,34 @@ The user interface language has been reset to English. Open the Preferences-dial L'interfaccia utente è stata risettata in Inglese. Apri la finestra di dialogo Preferenze per selezionare una qualunque lingua a disposizione. - - + + Project files (*.cppcheck);;All files(*.*) Files di progetto (*.cppcheck);;Tutti i files(*.*) - + Select Project File Seleziona il file di progetto - - + + Project: Progetto: - + Select Project Filename Seleziona il nome del file di progetto - + No project file loaded Nessun file di progetto caricato - + The project file %1 @@ -744,67 +734,67 @@ Do you want to remove the file from the recently used projects -list? Vuoi rimuovere il file dalla lista dei progetti recentemente usati? - + Finnish Finnish - + English English - + Chinese (Simplified) - + Dutch Dutch - + French French - + Italian Italian - + Korean Korean - + Spanish Spanish - + Swedish Swedish - + German German - + Russian Russian - + Japanese Japanese - + Serbian Serbian @@ -996,21 +986,26 @@ Options: Close Chiudi + + + Save + + QObject - + Unknown language specified! Lingua specificata sconosciuta! - + Language file %1 not found! Il file di lingua %1 non trovato! - + Failed to load translation for language %1 from file %2 Fallito il tentativo di aprire la traduzione per la lingua %1 dal file %2 @@ -1624,7 +1619,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza. TranslationHandler - + Failed to change the user interface language: %1 @@ -1637,7 +1632,7 @@ The user interface language has been reset to English. Open the Preferences-dial L'interfaccia utente è stata risettata in Inglese. Apri la finestra di dialogo Preferenze per selezionare una qualunque lingua a disposizione. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts index 3185e0396..abf47d568 100644 --- a/gui/cppcheck_ja.ts +++ b/gui/cppcheck_ja.ts @@ -126,37 +126,27 @@ Parameters: -l(line) (file) Cppcheck ログ - - &Save - 保存(&S) - - - + Clear 消去 - - Close - 閉じる - - - + Save Log ログ保存 - + Text files (*.txt *.log);;All files (*.*) テキストファイル (*.txt *.log);;すべてのファイル(*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" @@ -173,8 +163,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -669,34 +659,34 @@ Do you want to stop the checking and exit Cppcheck?. Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) プロジェクトファイル (*.cppcheck);;すべてのファイル(*.*) - + Select Project File プロジェクトファイルを選択 - - + + Project: プロジェクト: - + Select Project Filename プロジェクトファイル名を選択 - + No project file loaded プロジェクトファイルが読み込まれていません - + The project file %1 @@ -707,68 +697,68 @@ Do you want to remove the file from the recently used projects -list? - + English 英語 - + Dutch オランダ語 - + Chinese (Simplified) - + Finnish フィンランド語 - + French フランス語 - + Italian - + Korean - + Spanish スペイン語 - + Swedish スウェーデン語 - + German ドイツ語 - + Russian ロシア語 - + Japanese Japanease 日本語 - + Serbian セルビア語 @@ -960,21 +950,26 @@ Options: Close 閉じる + + + Save + + QObject - + Unknown language specified! 指定された未知の言語 - + Language file %1 not found! 言語ファイル %1 が見つかりません! - + Failed to load translation for language %1 from file %2 @@ -1585,7 +1580,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1594,7 +1589,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts index 9a3219a0f..b9f8b90da 100644 --- a/gui/cppcheck_ko.ts +++ b/gui/cppcheck_ko.ts @@ -122,18 +122,10 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제: Checking Log 로그 확인 - - &Save - 저장(&S) - Clear 지우기 - - Close - 닫기 - Save Log 로그 저장 @@ -800,6 +792,10 @@ Options: Close 닫기 + + Save + + QObject diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts index 1d2ad8bf8..c8610559a 100644 --- a/gui/cppcheck_nl.ts +++ b/gui/cppcheck_nl.ts @@ -129,37 +129,27 @@ Parameters: -l(line) (file) - - &Save - - - - + Clear - - Close - - - - + Save Log - + Text files (*.txt *.log);;All files (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" @@ -176,8 +166,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -670,34 +660,34 @@ Do you want to stop the checking and exit Cppcheck?. Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 @@ -708,68 +698,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Fins - + English Engels - + Chinese (Simplified) - + Dutch Nederlands - + French - + Italian - + Korean - + Spanish - + Swedish Zweeds - + German Duits - + Russian Russisch - + Japanese Japanease - + Serbian @@ -961,22 +951,27 @@ Options: Close + + + Save + + QObject - + Unknown language specified! - + Language file %1 not found! Language file %1.qm not found! Kon het taalbestand niet vinden: %1! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Kon de vertaling voor taal %1 in bestand %2 niet laden @@ -1587,7 +1582,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden. TranslationHandler - + Failed to change the user interface language: %1 @@ -1596,7 +1591,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts index 27bf3c2a5..62f9378bc 100644 --- a/gui/cppcheck_ru.ts +++ b/gui/cppcheck_ru.ts @@ -139,37 +139,27 @@ Parameters: -l(line) (file) Лог проверки - - &Save - &Сохранить - - - + Clear Очистить - - Close - Закрыть - - - + Save Log Сохранить - + Text files (*.txt *.log);;All files (*.*) Текстовые файлы (*.txt *.log);;Все файлы (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" Не удалось записать в файл: "%1" @@ -186,8 +176,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -700,34 +690,34 @@ The user interface language has been reset to English. Open the Preferences-dial The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages. - - + + Project files (*.cppcheck);;All files(*.*) Файлы проекта (*.cppcheck);;Все файлы(*.*) - + Select Project File Выберите файл проекта - - + + Project: Проект: - + Select Project Filename Выберите имя файла для проекта - + No project file loaded Файл с проектом на загружен - + The project file %1 @@ -743,68 +733,68 @@ Do you want to remove the file from the recently used projects -list? Хотите удалить его из списка проектов? - + Finnish Финский - + English Английский - + Chinese (Simplified) Китайский (упрощенный) - + Dutch Голландский - + French Французский - + Italian Итальянский - + Korean Корейский - + Spanish Испанский - + Swedish Шведский - + German Немецкий - + Russian Русский - + Japanese Japanease Японский - + Serbian Сербский @@ -996,22 +986,27 @@ Options: Close Закрыть + + + Save + + QObject - + Unknown language specified! Неизвестный язык! - + Language file %1 not found! Language file %1.qm not found! Языковой файл %1 не найден! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Ошибка загрузки переводов для языка %1 из файла %2 @@ -1619,7 +1614,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1632,7 +1627,7 @@ The user interface language has been reset to English. Open the Preferences-dial The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts index eedc40427..dc2aad991 100644 --- a/gui/cppcheck_sr.ts +++ b/gui/cppcheck_sr.ts @@ -127,37 +127,27 @@ Parameters: -l(line) (file) - - &Save - - - - + Clear - - Close - - - - + Save Log - + Text files (*.txt *.log);;All files (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" @@ -174,8 +164,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -667,34 +657,34 @@ Do you want to stop the checking and exit Cppcheck?. Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 @@ -705,67 +695,67 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Finski - + English Engleski - + Chinese (Simplified) - + Dutch Holandski - + French Francuski - + Italian - + Korean - + Spanish Španski - + Swedish Švedski - + German Nemački - + Russian Ruski - + Japanese Japanski - + Serbian Srpski @@ -957,21 +947,26 @@ Options: Close + + + Save + + QObject - + Unknown language specified! - + Language file %1 not found! Could not find the file: %1! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2 @@ -1579,7 +1574,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1588,7 +1583,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts index ecf19dccd..013784119 100644 --- a/gui/cppcheck_sv.ts +++ b/gui/cppcheck_sv.ts @@ -143,37 +143,35 @@ Parametrar: -l(line) (file) Analys logg - &Save - &Spara + &Spara - + Clear Töm - Close - Stäng + Stäng - + Save Log Spara logg - + Text files (*.txt *.log);;All files (*.*) Text filer (*.txt *.log);;Alla filer (*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" Kunde ej öppna fil för skrivning: "%1" @@ -190,8 +188,8 @@ Parametrar: -l(line) (file) - - + + Cppcheck Cppcheck @@ -701,34 +699,34 @@ The user interface language has been reset to English. Open the Preferences-dial Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken. - - + + Project files (*.cppcheck);;All files(*.*) Projektfiler (*.cppcheck);;Alla filer(*.*) - + Select Project File Välj projektfil - - + + Project: Projekt: - + Select Project Filename Välj Projektfil - + No project file loaded Inget projekt laddat - + The project file %1 @@ -739,68 +737,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Finska - + English Engelska - + Chinese (Simplified) - + Dutch Nederländska - + French Franska - + Italian - + Korean - + Spanish - + Swedish Svenska - + German Tyska - + Russian Ryska - + Japanese Japanease Japanska - + Serbian Serbiska @@ -992,22 +990,27 @@ Options: Close Stäng + + + Save + + QObject - + Unknown language specified! Okänt språk valt! - + Language file %1 not found! Language file %1.qm not found! Språk filen %1 hittades ej! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Misslyckades med att ladda översättningen för %1 från filen %2 @@ -1620,7 +1623,7 @@ För att ställa in vilka fel som skall visas använd visa menyn. TranslationHandler - + Failed to change the user interface language: %1 @@ -1633,7 +1636,7 @@ The user interface language has been reset to English. Open the Preferences-dial Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts index 9473eeed5..741273b9f 100644 --- a/gui/cppcheck_zh_CN.ts +++ b/gui/cppcheck_zh_CN.ts @@ -136,37 +136,27 @@ Parameters: -l(line) (file) 正在检查记录 - - &Save - 保存(&S) - - - + Clear 清空 - - Close - 关闭 - - - + Save Log 保存记录 - + Text files (*.txt *.log);;All files (*.*) 文本文件(*.txt *.log);;所有文件(*.*) - + Cppcheck Cppcheck - + Could not open file for writing: "%1" 无法打开并写入文件: “%1” @@ -183,8 +173,8 @@ Parameters: -l(line) (file) - - + + Cppcheck Cppcheck @@ -699,34 +689,34 @@ The user interface language has been reset to English. Open the Preferences-dial 用户界面语言已被重置为英语。打开“首选项”对话框，选择任何可用的语言。 - - + + Project files (*.cppcheck);;All files(*.*) 项目文件(*.cppcheck);;所有文件(*.*) - + Select Project File 选择项目文件 - - + + Project: 项目: - + Select Project Filename 选择项目文件名 - + No project file loaded 项目文件未加载 - + The project file %1 @@ -743,68 +733,68 @@ Do you want to remove the file from the recently used projects -list? 你要从最近使用的项目列表中删除此文件吗？ - + English 英語 - + Dutch 荷兰语 - + Chinese (Simplified) - + Finnish 芬兰语 - + French 法语 - + Italian 意大利语 - + Korean 韩文 - + Spanish 西班牙语 - + Swedish 瑞典语 - + German 德语 - + Russian 俄语 - + Japanese Japanease 日语 - + Serbian 塞尔维亚语 @@ -996,21 +986,26 @@ Options: Close 关闭 + + + Save + + QObject - + Unknown language specified! 指定了未知语言！ - + Language file %1 not found! 语言文件 %1 不存在！ - + Failed to load translation for language %1 from file %2 无法从文件 %2 中为语言 %1 加载翻译文件 @@ -1626,7 +1621,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1639,7 +1634,7 @@ The user interface language has been reset to English. Open the Preferences-dial 用户界面语言已被重置为英语。打开“首选项”对话框，选择任何可用的语言。 - + Cppcheck Cppcheck diff --git a/gui/logview.cpp b/gui/logview.cpp index fd1e6f960..febaf80fb 100644 --- a/gui/logview.cpp +++ b/gui/logview.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "common.h" #include "logview.h" @@ -30,9 +31,10 @@ LogView::LogView(QWidget *parent) mUI.setupUi(this); setWindowFlags(Qt::Tool); - connect(mUI.mCloseButton, SIGNAL(clicked()), this, SLOT(CloseButtonClicked())); - connect(mUI.mClearButton, SIGNAL(clicked()), this, SLOT(ClearButtonClicked())); - connect(mUI.mSaveButton, SIGNAL(clicked()), this, SLOT(SaveButtonClicked())); + mUI.mButtonBox->button(QDialogButtonBox::Reset)->setText(tr("Clear")); + connect(mUI.mButtonBox->button(QDialogButtonBox::Close), SIGNAL(clicked()), this, SLOT(CloseButtonClicked())); + connect(mUI.mButtonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked()), this, SLOT(ClearButtonClicked())); + connect(mUI.mButtonBox->button(QDialogButtonBox::Save), SIGNAL(clicked()), this, SLOT(SaveButtonClicked())); QSettings settings; resize(settings.value(SETTINGS_LOG_VIEW_WIDTH, 400).toInt(), diff --git a/gui/logview.ui b/gui/logview.ui index f49cc06e2..e96fce2ee 100644 --- a/gui/logview.ui +++ b/gui/logview.ui @@ -28,42 +28,11 @@ - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Save - - - - - - - Clear - - - - - - - Close - - - - + + + QDialogButtonBox::Close|QDialogButtonBox::Reset|QDialogButtonBox::Save + + diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index cfea2420a..9b81dcff3 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -892,6 +892,8 @@ void MainWindow::SetLanguage(const QString &code) //Translate everything that is visible here mUI.retranslateUi(this); mUI.mResults->Translate(); + delete mLogView; + mLogView = 0; } } diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp index a18ac76d3..020403268 100644 --- a/gui/translationhandler.cpp +++ b/gui/translationhandler.cpp @@ -29,6 +29,7 @@ static void unused() QT_TRANSLATE_NOOP("QDialogButtonBox", "OK"); QT_TRANSLATE_NOOP("QDialogButtonBox", "Cancel"); QT_TRANSLATE_NOOP("QDialogButtonBox", "Close"); + QT_TRANSLATE_NOOP("QDialogButtonBox", "Save"); } TranslationHandler::TranslationHandler(QObject *parent) :