From 95fa1df6b71b873a91b7455a9bb230fe8513d8f4 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Tue, 14 Jun 2022 14:00:04 +0800 Subject: [PATCH] update languages & icons --- DSView/DSView.qrc | 2 + DSView/config.h | 2 +- DSView/icons/dark/update.svg | 109 ++++++++++++++++++++++++ DSView/icons/light/update.svg | 109 ++++++++++++++++++++++++ DSView/languages/my_25.qm | Bin 31345 -> 32753 bytes DSView/pv/devicemanager.cpp | 2 +- DSView/pv/dialogs/applicationpardlg.cpp | 4 +- DSView/pv/dialogs/applicationpardlg.h | 4 +- DSView/pv/dialogs/decoderoptionsdlg.cpp | 2 +- DSView/pv/dialogs/dsmessagebox.cpp | 6 +- DSView/pv/dialogs/dsmessagebox.h | 2 +- DSView/pv/dialogs/storeprogress.cpp | 2 +- DSView/pv/dock/keywordlineedit.cpp | 8 +- DSView/pv/dock/protocoldock.cpp | 16 ++-- DSView/pv/mainwindow.cpp | 10 +-- DSView/pv/toolbars/filebar.cpp | 6 +- DSView/pv/toolbars/logobar.cpp | 4 +- DSView/pv/toolbars/trigbar.cpp | 2 +- DSView/pv/ui/msgbox.cpp | 9 +- DSView/pv/ui/msgbox.h | 6 +- DSView/pv/view/devmode.cpp | 2 +- 21 files changed, 261 insertions(+), 46 deletions(-) create mode 100644 DSView/icons/dark/update.svg create mode 100644 DSView/icons/light/update.svg diff --git a/DSView/DSView.qrc b/DSView/DSView.qrc index 1fa1c2a1..a1408110 100755 --- a/DSView/DSView.qrc +++ b/DSView/DSView.qrc @@ -138,5 +138,7 @@ icons/dsl_logo.svg icons/dark/minimize.svg icons/logo.svg + icons/light/update.svg + icons/dark/update.svg diff --git a/DSView/config.h b/DSView/config.h index ec4e51a5..6b44cebb 100755 --- a/DSView/config.h +++ b/DSView/config.h @@ -30,6 +30,6 @@ #define DS_VERSION_MAJOR 1 #define DS_VERSION_MINOR 2 #define DS_VERSION_MICRO 0 -#define DS_VERSION_STRING "1.2.0-RC8" +#define DS_VERSION_STRING "1.2.0-RC10" #endif diff --git a/DSView/icons/dark/update.svg b/DSView/icons/dark/update.svg new file mode 100644 index 00000000..c02bb441 --- /dev/null +++ b/DSView/icons/dark/update.svg @@ -0,0 +1,109 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DSView/icons/light/update.svg b/DSView/icons/light/update.svg new file mode 100644 index 00000000..6ae61c73 --- /dev/null +++ b/DSView/icons/light/update.svg @@ -0,0 +1,109 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DSView/languages/my_25.qm b/DSView/languages/my_25.qm index 35bbd2f6090ffa109da24685c4e447d42b2fc366..304660c35c909c35d55c58e5fa82d9b97057839a 100755 GIT binary patch delta 5507 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 JF^+-C{{#8N9T5Nk delta 4182 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 M{(@`&vtjIi0rS+G8~^|S diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp index f148ee11..5e0c48c0 100755 --- a/DSView/pv/devicemanager.cpp +++ b/DSView/pv/devicemanager.cpp @@ -142,7 +142,7 @@ void DeviceManager::init_drivers() for (sr_dev_driver **driver = drivers; *driver; driver++) { if (sr_driver_init(_sr_ctx, *driver) != SR_OK) { throw runtime_error( - string("Failed to initialize driver ") + + string("Failed to initialize driver ") + string((*driver)->name)); } } diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp index 282127ec..536c04d0 100644 --- a/DSView/pv/dialogs/applicationpardlg.cpp +++ b/DSView/pv/dialogs/applicationpardlg.cpp @@ -43,7 +43,7 @@ ApplicationParamDlg::~ApplicationParamDlg() bool ApplicationParamDlg::ShowDlg(QWidget *parent) { DSDialog dlg(parent, true, true); - dlg.setTitle("Display options"); + dlg.setTitle(tr("Display options")); dlg.setMinimumSize(300, 200); QFormLayout &lay = *(new QFormLayout()); lay.setContentsMargins(0,20,0,30); @@ -53,7 +53,7 @@ bool ApplicationParamDlg::ShowDlg(QWidget *parent) QCheckBox *ck_quickScroll = new QCheckBox(); ck_quickScroll->setChecked(app._appOptions.quickScroll); - lay.addRow("Quick scroll", ck_quickScroll); + lay.addRow(tr("Quick scroll"), ck_quickScroll); dlg.layout()->addLayout(&lay); dlg.exec(); diff --git a/DSView/pv/dialogs/applicationpardlg.h b/DSView/pv/dialogs/applicationpardlg.h index 86c01b01..27abb2a0 100644 --- a/DSView/pv/dialogs/applicationpardlg.h +++ b/DSView/pv/dialogs/applicationpardlg.h @@ -29,9 +29,9 @@ namespace pv namespace dialogs { - class ApplicationParamDlg + class ApplicationParamDlg : public QObject { - // Q_OBJECT + Q_OBJECT public: ApplicationParamDlg(); diff --git a/DSView/pv/dialogs/decoderoptionsdlg.cpp b/DSView/pv/dialogs/decoderoptionsdlg.cpp index f11a4520..a6097496 100644 --- a/DSView/pv/dialogs/decoderoptionsdlg.cpp +++ b/DSView/pv/dialogs/decoderoptionsdlg.cpp @@ -433,7 +433,7 @@ void DecoderOptionsDlg::commit_decoder_probes(data::decode::Decoder *dec) void DecoderOptionsDlg::on_accept() { if (_cursor1 > 0 && _cursor1 == _cursor2){ - MsgBox::Show("error", "Invalid cursor index for sample range!"); + MsgBox::Show(tr("error"), tr("Invalid cursor index for sample range!")); return; } diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp index a2c273e6..482e0ec3 100755 --- a/DSView/pv/dialogs/dsmessagebox.cpp +++ b/DSView/pv/dialogs/dsmessagebox.cpp @@ -33,7 +33,7 @@ namespace pv { namespace dialogs { -DSMessageBox::DSMessageBox(QWidget *parent,const char *title) : +DSMessageBox::DSMessageBox(QWidget *parent,const QString title) : QDialog(parent) { (void)parent; @@ -67,8 +67,8 @@ DSMessageBox::DSMessageBox(QWidget *parent,const char *title) : _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); - if (title){ - _titlebar->setTitle(QString(title)); + if (!title.isEmpty()){ + _titlebar->setTitle(title); } else{ _titlebar->setTitle(tr("Message")); diff --git a/DSView/pv/dialogs/dsmessagebox.h b/DSView/pv/dialogs/dsmessagebox.h index 7b2a1038..6f33bfea 100755 --- a/DSView/pv/dialogs/dsmessagebox.h +++ b/DSView/pv/dialogs/dsmessagebox.h @@ -40,7 +40,7 @@ class DSMessageBox : public QDialog Q_OBJECT public: - DSMessageBox(QWidget *parent, const char *title=0); + DSMessageBox(QWidget *parent, const QString title=0); ~DSMessageBox(); diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp index e0542a62..a35eea8a 100755 --- a/DSView/pv/dialogs/storeprogress.cpp +++ b/DSView/pv/dialogs/storeprogress.cpp @@ -125,7 +125,7 @@ void StoreProgress::reject() void StoreProgress::accept() { if (_store_session.GetFileName() == ""){ - MsgBox::Show(NULL, "you need to select a file name."); + MsgBox::Show(NULL, tr("You need to select a file name.")); return; } diff --git a/DSView/pv/dock/keywordlineedit.cpp b/DSView/pv/dock/keywordlineedit.cpp index 4687896a..58a92ce7 100644 --- a/DSView/pv/dock/keywordlineedit.cpp +++ b/DSView/pv/dock/keywordlineedit.cpp @@ -22,9 +22,6 @@ #include "keywordlineedit.h" #include "../config/appconfig.h" -#define PROTOCOL_FIND_TITLE "Protocol search..." -#define PROTOCOL_FIND_TITLE_cn "协议查找..." - KeywordLineEdit::KeywordLineEdit(QWidget *parent, IKeywordActive *active) :QLineEdit(parent) { @@ -47,10 +44,7 @@ KeywordLineEdit::KeywordLineEdit(QWidget *parent, IKeywordActive *active) return; } - if (AppConfig::Instance().IsLangCn()) - this->setText(PROTOCOL_FIND_TITLE_cn); - else - this->setText(PROTOCOL_FIND_TITLE); + this->setText(tr("Protocol search...")); } void KeywordLineEdit::SetInputText(QString text) diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp index 57d01dc9..9e0e8188 100755 --- a/DSView/pv/dock/protocoldock.cpp +++ b/DSView/pv/dock/protocoldock.cpp @@ -113,9 +113,9 @@ ProtocolDock::ProtocolDock(QWidget *parent, view::View &view, SigSession *sessio sort(_decoderInfoList.begin(), _decoderInfoList.end(), ProtocolDock::protocol_sort_callback); if (repeatNammes != ""){ - QString err = "Any protocol have repeated id or name: "; + QString err = tr("Any protocol have repeated id or name: "); err += repeatNammes; - MsgBox::Show("error", err.toUtf8().data()); + MsgBox::Show(tr("error"), err.toUtf8().data()); } _arrow = new QToolButton(_up_widget); @@ -324,11 +324,11 @@ int ProtocolDock::get_protocol_index_by_id(QString id) void ProtocolDock::on_add_protocol() { if (_decoderInfoList.size() == 0){ - MsgBox::Show(NULL, "Protocol list is empty!"); + MsgBox::Show(NULL, tr("Protocol list is empty!")); return; } if (_selected_protocol_id == ""){ - MsgBox::Show(NULL, "Please select a protocol!"); + MsgBox::Show(NULL, tr("Please select a protocol!")); return; } @@ -372,7 +372,7 @@ void ProtocolDock::on_add_protocol() } if (pro_id == ""){ - MsgBox::Show("error", "find the base protocol error!"); + MsgBox::Show(tr("error"), tr("find the base protocol error!")); for(auto sub: sub_decoders){ delete sub; @@ -446,11 +446,11 @@ bool ProtocolDock::add_protocol_by_id(QString id, bool silent, std::listget_device()->dev_inst(); if ((!file_dev && strcmp(sdi->driver->name, sessionObj["Device"].toString().toUtf8()) != 0) || sdi->mode != sessionObj["DeviceMode"].toDouble()) { - MsgBox::Show(NULL, "Session File is not compatible with current device or mode!", this); + MsgBox::Show(NULL, tr("Session File is not compatible with current device or mode!"), this); return false; } @@ -1295,7 +1295,7 @@ void MainWindow::restore_dock() } catch(...) { - MsgBox::Show(NULL, "restore window status error!"); + MsgBox::Show(NULL, tr("restore window status error!")); } } diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp index 81996711..eef34b9d 100755 --- a/DSView/pv/toolbars/filebar.cpp +++ b/DSView/pv/toolbars/filebar.cpp @@ -121,8 +121,8 @@ void FileBar::reStyle() _action_load->setIcon(QIcon(iconPath+"/open.svg")); _action_store->setIcon(QIcon(iconPath+"/save.svg")); - _action_default->setIcon(QIcon(iconPath+"/settings.svg")); - _menu_session->setIcon(QIcon(iconPath+"/settings.svg")); + _action_default->setIcon(QIcon(iconPath+"/gear.svg")); + _menu_session->setIcon(QIcon(iconPath+"/gear.svg")); _action_open->setIcon(QIcon(iconPath+"/open.svg")); _action_save->setIcon(QIcon(iconPath+"/save.svg")); _action_export->setIcon(QIcon(iconPath+"/export.svg")); @@ -194,7 +194,7 @@ void FileBar::on_actionDefault_triggered() { QDir dir(GetResourceDir()); if (!dir.exists()) { - MsgBox::Show(NULL, "Cannot find default session file for this device!", this); + MsgBox::Show(NULL, tr("Cannot find default session file for this device!"), this); return; } diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp index c61e26cc..3617c17d 100755 --- a/DSView/pv/toolbars/logobar.cpp +++ b/DSView/pv/toolbars/logobar.cpp @@ -72,7 +72,7 @@ LogoBar::LogoBar(SigSession *session, QWidget *parent) : _logo_button.addAction(_manual); _issue = new QAction(this); - _issue->setObjectName(QString::fromUtf8("actionManual")); + _issue->setObjectName(QString::fromUtf8("actionIssue")); _logo_button.addAction(_issue); _update = new QAction(this); @@ -140,7 +140,7 @@ void LogoBar::reStyle() _about->setIcon(QIcon(iconPath+"/about.svg")); _manual->setIcon(QIcon(iconPath+"/manual.svg")); _issue->setIcon(QIcon(iconPath+"/bug.svg")); - _update->setIcon(QIcon(iconPath+"/bug.svg")); + _update->setIcon(QIcon(iconPath+"/update.svg")); if (_connected) _logo_button.setIcon(QIcon(iconPath+"/logo_color.svg")); diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp index 982c3456..8bf7495e 100755 --- a/DSView/pv/toolbars/trigbar.cpp +++ b/DSView/pv/toolbars/trigbar.cpp @@ -177,7 +177,7 @@ void TrigBar::reStyle() _dark_style->setIcon(QIcon(iconPath+"/dark.svg")); _light_style->setIcon(QIcon(iconPath+"/light.svg")); - _action_dispalyOptions->setIcon(QIcon(iconPath+"/params.svg")); + _action_dispalyOptions->setIcon(QIcon(iconPath+"/gear.svg")); AppConfig &app = AppConfig::Instance(); diff --git a/DSView/pv/ui/msgbox.cpp b/DSView/pv/ui/msgbox.cpp index 73c6494b..b579455c 100644 --- a/DSView/pv/ui/msgbox.cpp +++ b/DSView/pv/ui/msgbox.cpp @@ -23,7 +23,6 @@ #include "../dialogs/dsmessagebox.h" #include #include -#include #include "../dsvdef.h" #include "../appcontrol.h" @@ -32,9 +31,9 @@ //QMessageBox::information(NULL, "Title", "Content"); //QMessageBox::information(NULL, "Title", "Content",QMessageBox::Yes|QMessageBox::No|QMessageBox::Abort); -void MsgBox::Show(const char *title, const char *text, QWidget *parent) +void MsgBox::Show(const QString title, const QString text, QWidget *parent) { - assert(text); + assert(!text.isEmpty()); QString str; str.append("\n"); @@ -52,9 +51,9 @@ void MsgBox::Show(const char *title, const char *text, QWidget *parent) msg.exec(); } -bool MsgBox::Confirm(const char *text, QWidget *parent) +bool MsgBox::Confirm(const QString text, QWidget *parent) { - assert(text); + assert(!text.isEmpty()); QString str; str.append("\n"); diff --git a/DSView/pv/ui/msgbox.h b/DSView/pv/ui/msgbox.h index 8fc38ca1..23a0ae7c 100644 --- a/DSView/pv/ui/msgbox.h +++ b/DSView/pv/ui/msgbox.h @@ -21,12 +21,14 @@ #pragma once +#include + class QWidget; class MsgBox { public: - static void Show(const char *title, const char *text, QWidget *parent=0); + static void Show(const QString title, const QString text, QWidget *parent=0); - static bool Confirm(const char *text, QWidget *parent=0); + static bool Confirm(const QString text, QWidget *parent=0); }; \ No newline at end of file diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp index 1c3b5a8d..6acfe774 100755 --- a/DSView/pv/view/devmode.cpp +++ b/DSView/pv/view/devmode.cpp @@ -208,7 +208,7 @@ void DevMode::on_close() DevInst *dev_inst = _session->get_device(); assert(dev_inst); - if (_bFile && MsgBox::Confirm("are you sure to close the device?")){ + if (_bFile && MsgBox::Confirm(tr("are you sure to close the device?"))){ _session->close_file(dev_inst); dev_changed(true); }