Skip to content

fix(settings): use combo box for photo format #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Resurgamz wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
Open

fix(settings): use combo box for photo format #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/assets/resource/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,11 @@
{
"key": "picformat",
"name": "Photo:",
"type":"formatLabel",
"default": " JPG"
"type":"combobox",
"items": [
"JPG"
],
"default": 0
},
{
"key": "vidformat",
Expand Down
1 change: 0 additions & 1 deletion src/src/accessibility/ac-deepin-camera-define.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#define BUTTON_OPTION_PIC_LINE_EDIT QObject::tr("OptionPicLineEditBtn")
#define BUTTON_OPTION_VIDEO_LINE_EDIT QObject::tr("OptionVideoLineEditBtn")
#define OPTION_FORMAT_LABER QObject::tr("OptionFormatLabel")
#define OPTION_FRAME QObject::tr("OptionFrame")
#define PIC_OPTION QObject::tr("PicOption")
#define VIDEO_OPTION QObject::tr("VideoOption")
Expand Down
43 changes: 0 additions & 43 deletions src/src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,48 +131,6 @@ static QString ElideText(const QString &text, const QSize &size,
return textlinestr;
}

static QWidget *createFormatLabelOptionHandle(QObject *opt)
{
DTK_CORE_NAMESPACE::DSettingsOption *option = qobject_cast<DTK_CORE_NAMESPACE::DSettingsOption *>(opt);
DLabel *lab = new DLabel();
DWidget *main = new DWidget();
QHBoxLayout *layout = new QHBoxLayout;
QWidget *optionWidget = new QWidget;
QFormLayout *optionLayout = new QFormLayout(optionWidget);

main->setLayout(layout);
main->setContentsMargins(0, 0, 0, 0);
main->setMinimumWidth(240);
main->setMinimumHeight(20);
layout->addWidget(lab);
layout->setContentsMargins(0, 0, 0, 0);
layout->setAlignment(Qt::AlignVCenter);
lab->setObjectName(OPTION_FORMAT_LABER);
lab->setAccessibleName(OPTION_FORMAT_LABER);
lab->setMinimumHeight(20);

lab->setText(option->value().toString());
QFont ft("SourceHanSansSC");
ft.setPixelSize(15);
ft.setWeight(QFont::Medium);
lab->setFont(ft);
lab->setAlignment(Qt::AlignVCenter);
lab->show();
optionWidget->setObjectName(OPTION_FRAME);
optionWidget->setAccessibleName(OPTION_FRAME);
optionLayout->setContentsMargins(0, 0, 0, 0);

optionLayout->setSpacing(0);
DLabel *dLabel = new DLabel(QObject::tr(option->name().toStdString().c_str()));
dLabel->setMinimumHeight(20);
dLabel->setAlignment(Qt::AlignVCenter);
optionLayout->addRow(dLabel, main);
optionWidget->setContentsMargins(0, 0, 0, 0);
workaround_updateStyle(optionWidget, "light");

return optionWidget;
}

static QWidget *createPicSelectableLineEditOptionHandle(QObject *opt)
{
DTK_CORE_NAMESPACE::DSettingsOption *option = qobject_cast<DTK_CORE_NAMESPACE::DSettingsOption *>(opt);
Expand Down Expand Up @@ -1077,7 +1035,6 @@ void CMainWindow::settingDialog()
m_SetDialog->setFixedSize(820, 600);
m_SetDialog->widgetFactory()->registerWidget("selectableEditpic", createPicSelectableLineEditOptionHandle);
m_SetDialog->widgetFactory()->registerWidget("selectableEditvd", createVdSelectableLineEditOptionHandle);
m_SetDialog->widgetFactory()->registerWidget("formatLabel", createFormatLabelOptionHandle);
m_SetDialog->setObjectName(SETTING_DIALOG);
m_SetDialog->setAccessibleName(SETTING_DIALOG);

Expand Down
Loading