Page MenuHomePhabricator (Chris)
Files F103279

No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/SettingGeneralForm.cpp b/src/SettingGeneralForm.cpp
index 9b0a0f3..837340d 100644
--- a/src/SettingGeneralForm.cpp
+++ b/src/SettingGeneralForm.cpp
@@ -1,124 +1,125 @@
#include "MySettings.h"
#include "SelectItemDialog.h"
#include "ApplicationGlobal.h"
#include "SettingGeneralForm.h"
#include "ui_SettingGeneralForm.h"
#include "common/misc.h"
#include <QFileDialog>
SettingGeneralForm::SettingGeneralForm(QWidget *parent) :
AbstractSettingForm(parent),
ui(new Ui::SettingGeneralForm)
{
ui->setupUi(this);
langs = languages();
themes.push_back(SelectItemDialog::Item("standard", tr("Standard")));
themes.push_back(SelectItemDialog::Item("dark", tr("Dark")));
updateLanguage();
updateTheme();
}
SettingGeneralForm::~SettingGeneralForm()
{
delete ui;
}
QList<SelectItemDialog::Item> SettingGeneralForm::languages()
{
QList<SelectItemDialog::Item> langs;
langs.push_back(SelectItemDialog::Item("en", tr("English")));
langs.push_back(SelectItemDialog::Item("ja", tr("Japanese")));
langs.push_back(SelectItemDialog::Item("ru", tr("Russian")));
langs.push_back(SelectItemDialog::Item("zh-CN", tr("Chinese (Simplified)")));
+ langs.push_back(SelectItemDialog::Item("zh-TW", tr("Chinese (Taiwan)")));
return langs;
}
void SettingGeneralForm::exchange(bool save)
{
if (save) {
settings()->remember_and_restore_window_position = ui->checkBox_save_window_pos->isChecked();
settings()->enable_high_dpi_scaling = ui->checkBox_enable_high_dpi_scaling->isChecked();
} else {
ui->checkBox_save_window_pos->setChecked(settings()->remember_and_restore_window_position);
ui->checkBox_enable_high_dpi_scaling->setChecked(settings()->enable_high_dpi_scaling);
}
}
void SettingGeneralForm::on_pushButton_browse_default_working_dir_clicked()
{
}
void SettingGeneralForm::updateLanguage()
{
QString id = global->language_id;
if (id.isEmpty()) {
id = "en";
}
for (SelectItemDialog::Item const &item : langs) {
if (item.id == id) {
ui->lineEdit_language->setText(item.text);
return;
}
}
}
void SettingGeneralForm::updateTheme()
{
QString id = global->theme_id;
if (id.isEmpty()) {
id = "standard";
}
for (SelectItemDialog::Item const &item : themes) {
if (item.id == id) {
ui->lineEdit_theme->setText(item.text);
return;
}
}
}
void SettingGeneralForm::execSelectLanguageDialog(QWidget *parent, QList<SelectItemDialog::Item> const &langs, std::function<void()> const &done)
{
SelectItemDialog dlg(parent);
dlg.setWindowTitle(tr("Select Language"));
for (SelectItemDialog::Item const &item : langs) {
dlg.addItem(item.id, item.text);
}
dlg.select(global->language_id.isEmpty() ? "en" : global->language_id);
if (dlg.exec() == QDialog::Accepted) {
SelectItemDialog::Item item = dlg.item();
global->language_id = item.id;
MySettings s;
s.beginGroup("UI");
s.setValue("Language", global->language_id);
s.endGroup();
done();
}
}
void SettingGeneralForm::on_pushButton_change_language_clicked()
{
execSelectLanguageDialog(this, langs, [&](){updateLanguage();});
}
void SettingGeneralForm::on_pushButton_change_theme_clicked()
{
SelectItemDialog dlg(this);
dlg.setWindowTitle(tr("Select Theme"));
for (SelectItemDialog::Item const &item : themes) {
dlg.addItem(item.id, item.text);
}
dlg.select(global->theme_id.isEmpty() ? "standard" : global->theme_id);
if (dlg.exec() == QDialog::Accepted) {
SelectItemDialog::Item item = dlg.item();
global->theme_id = item.id;
MySettings s;
s.beginGroup("UI");
s.setValue("Theme", global->theme_id);
s.endGroup();
updateTheme();
}
}
diff --git a/src/resources/resources.qrc b/src/resources/resources.qrc
index 4ab5993..bdeb856 100644
--- a/src/resources/resources.qrc
+++ b/src/resources/resources.qrc
@@ -1,53 +1,53 @@
<RCC>
<qresource prefix="/">
<file>image/stage.svg</file>
<file>image/unstage.svg</file>
<file>image/commit.svg</file>
<file>image/push.svg</file>
<file>image/selall.svg</file>
<file>image/graphcolor.png</file>
<file>image/pull.svg</file>
<file>image/clone.svg</file>
<file>image/fetch.svg</file>
<file>image/digits.png</file>
<file>image/guitar.png</file>
<file>image/Guitar.svg</file>
<file>image/folder.png</file>
<file>image/repository.png</file>
<file>image/maximize.png</file>
<file>image/transparent.png</file>
<file>image/file.png</file>
<file>image/clear.png</file>
<file>image/terminal.svg</file>
<file>image/explorer.svg</file>
<file>image/about.png</file>
<file>image/redsquare.svg</file>
<file>darktheme/button/button_normal.png</file>
<file>darktheme/button/button_press.png</file>
<file>darktheme/hsb/hsb_add_line.png</file>
<file>darktheme/hsb/hsb_page_bg.png</file>
<file>darktheme/hsb/hsb_slider.png</file>
<file>darktheme/hsb/hsb_sub_line.png</file>
<file>darktheme/progress/horz.png</file>
<file>darktheme/progress/vert.png</file>
<file>darktheme/vsb/vsb_add_line.png</file>
<file>darktheme/vsb/vsb_page_bg.png</file>
<file>darktheme/vsb/vsb_slider.png</file>
<file>darktheme/vsb/vsb_sub_line.png</file>
<file>darktheme/graphcolor.png</file>
<file>image/menu.png</file>
<file>image/signature-bad.png</file>
<file>image/signature-dubious.png</file>
<file>image/signature-good.png</file>
<file>translations/Guitar_ja.qm</file>
<file>translations/Guitar_ru.qm</file>
<file>image/add.svg</file>
<file>image/chg.svg</file>
<file>image/del.svg</file>
<file>image/ren.svg</file>
<file>image/cpy.svg</file>
<file>image/status.svg</file>
<file>translations/Guitar_zh-CN.qm</file>
- <file>translations/Guitar_zh-CN.ts</file>
+ <file>translations/Guitar_zh-TW.qm</file>
</qresource>
</RCC>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Feb 7, 7:28 AM (1 d, 1 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
55882
Default Alt Text
(5 KB)

Event Timeline