projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
93664a4
)
Add DCPOMATIC_SUBHEADING_TOP_PAD.
author
Carl Hetherington
<cth@carlh.net>
Mon, 16 Jan 2023 22:57:16 +0000
(23:57 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 16 Jan 2023 22:57:16 +0000
(23:57 +0100)
src/tools/dcpomatic_kdm.cc
patch
|
blob
|
history
src/wx/dkdm_dialog.cc
patch
|
blob
|
history
src/wx/kdm_dialog.cc
patch
|
blob
|
history
src/wx/self_dkdm_dialog.cc
patch
|
blob
|
history
src/wx/wx_util.h
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 673c54f7839ea0b4122875ae0c980f6b7567fd63..aeb1cf2de9463e06e03a6cbd520378e0491cb72b 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-166,7
+166,7
@@
public:
h = new StaticText (overall_panel, _("DKDM"));
h->SetFont (subheading_font);
h = new StaticText (overall_panel, _("DKDM"));
h->SetFont (subheading_font);
- right->Add
(h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2
);
+ right->Add
(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD
);
_dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
#ifndef __WXGTK3__
_dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
#ifndef __WXGTK3__
@@
-218,7
+218,7
@@
public:
h = new StaticText (overall_panel, _("Output"));
h->SetFont (subheading_font);
h = new StaticText (overall_panel, _("Output"));
h->SetFont (subheading_font);
- right->Add
(h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2
);
+ right->Add
(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD
);
_output = new KDMOutputPanel (overall_panel);
right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
_output = new KDMOutputPanel (overall_panel);
right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
diff --git
a/src/wx/dkdm_dialog.cc
b/src/wx/dkdm_dialog.cc
index c7503048cea80331645afb15808949ca1a1316a0..75e4e1aa1ce0b372a470592a76c8b7ae626936a3 100644
(file)
--- a/
src/wx/dkdm_dialog.cc
+++ b/
src/wx/dkdm_dialog.cc
@@
-106,7
+106,7
@@
DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
/* Sub-heading: Output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
/* Sub-heading: Output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
- right->Add
(h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2
);
+ right->Add
(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD
);
_output = new DKDMOutputPanel (this);
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
_output = new DKDMOutputPanel (this);
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
diff --git
a/src/wx/kdm_dialog.cc
b/src/wx/kdm_dialog.cc
index 268573e6c35e5048699961279b59c87f806ee022..79f78b2327a24751f2b86be43e76a2e6285582ae 100644
(file)
--- a/
src/wx/kdm_dialog.cc
+++ b/
src/wx/kdm_dialog.cc
@@
-108,7
+108,7
@@
KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
/* Sub-heading: Output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
/* Sub-heading: Output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
- right->Add
(h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2
);
+ right->Add
(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD
);
_output = new KDMOutputPanel (this);
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
_output = new KDMOutputPanel (this);
right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
diff --git
a/src/wx/self_dkdm_dialog.cc
b/src/wx/self_dkdm_dialog.cc
index 89a35803f22e131a82ea787595ce874267e0394a..c8587e7ee83a8620d99e5539457b89c00fe25f92 100644
(file)
--- a/
src/wx/self_dkdm_dialog.cc
+++ b/
src/wx/self_dkdm_dialog.cc
@@
-75,7
+75,7
@@
SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, std::shared_ptr<const Film> fi
/* Sub-heading: output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
/* Sub-heading: output */
h = new StaticText (this, _("Output"));
h->SetFont (subheading_font);
- vertical->Add
(h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2
);
+ vertical->Add
(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD
);
_internal = new wxRadioButton (this, wxID_ANY, _("Save to KDM Creator tool's list"));
vertical->Add (_internal, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
_internal = new wxRadioButton (this, wxID_ANY, _("Save to KDM Creator tool's list"));
vertical->Add (_internal, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
diff --git
a/src/wx/wx_util.h
b/src/wx/wx_util.h
index be3be0d1ad5cce322117f064135f7f00cbb74703..1143c5b53a13916c44746e768841a6c4222c6f98 100644
(file)
--- a/
src/wx/wx_util.h
+++ b/
src/wx/wx_util.h
@@
-70,6
+70,8
@@
class PasswordEntry;
#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 0
#endif
#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 0
#endif
+#define DCPOMATIC_SUBHEADING_TOP_PAD 16
+
/** Amount by which you need to top-pad a choice to make it line up, in some cases */
#ifdef DCPOMATIC_OSX
#define DCPOMATIC_CHOICE_TOP_PAD 1
/** Amount by which you need to top-pad a choice to make it line up, in some cases */
#ifdef DCPOMATIC_OSX
#define DCPOMATIC_CHOICE_TOP_PAD 1