anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use GtkLengthEntry in GTK vspace, document dialogs

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10811 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Spray 2006-02-05 22:05:24 +00:00
parent 6c69baf809
commit a94ebc1c53
7 changed files with 333 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/gtk/ChangeLog
View File

@ -3,6 +3,8 @@
* GPreferences.[Ch], glade/preferences.glade: Start work on
preferences dialog ("Screen fonts" tab done).
* GtkLengthEntry.C: fix packing, oversized units box
* GVSpace.[Ch], GDocument.[Ch], glade/document.glade, glade/vspace.glade:
Use GtkLengthEntry
2006-01-28 John Spray <spray@lyx.org>

182
src/frontends/gtk/GDocument.C
View File

@ -139,6 +139,7 @@ void GDocument::doBuild()
vspaceradio_->signal_toggled().connect(
sigc::mem_fun(*this, &GDocument::updateParagraphSeparationSensitivity));
xml_->get_widget("VerticalSpaceSize", box);
box->pack_start(vspacesizecombo_, true, true, 0);
box->show_all();
@ -156,14 +157,8 @@ void GDocument::doBuild()
sigc::mem_fun(*this,
&GDocument::updateParagraphSeparationSensitivity));
xml_->get_widget("VerticalSpaceLength", vspacelengthspin_);
vspacelengthadj_ = vspacelengthspin_->get_adjustment();
xml_->get_widget("VerticalSpaceUnit", box);
box->pack_start(vspaceunitcombo_, true, true, 0);
box->show_all();
populateUnitCombo(vspaceunitcombo_, false);
xml_->get_widget_derived("VerticalSpaceLength", vspacelengthentry_);
vspacelengthentry_->set_relative(false);
updateParagraphSeparationSensitivity();
// *** End "Document" Page ***
@ -186,16 +181,10 @@ void GDocument::doBuild()
pagesizecombo_.signal_changed().connect(
sigc::mem_fun(*this, &GDocument::pageSizeChanged));
xml_->get_widget("PageWidth", pagewidthspin_);
xml_->get_widget("PageHeight", pageheightspin_);
xml_->get_widget("PageWidthUnits", box);
box->pack_start(pagewidthunitscombo_, true, true, 0);
box->show_all();
populateUnitCombo(pagewidthunitscombo_, false);
xml_->get_widget("PageHeightUnits", box);
box->pack_start(pageheightunitscombo_, true, true, 0);
box->show_all();
populateUnitCombo(pageheightunitscombo_, false);
xml_->get_widget_derived("PageWidth", pagewidthlengthentry_);
xml_->get_widget_derived("PageHeight", pageheightlengthentry_);
pagewidthlengthentry_->set_relative(false);
pageheightlengthentry_->set_relative(false);
xml_->get_widget("Portrait", portraitradio_);
xml_->get_widget("Landscape", landscaperadio_);
@ -212,39 +201,13 @@ void GDocument::doBuild()
defaultmargins_->signal_toggled().connect(
sigc::mem_fun(*this, &GDocument::marginsChanged));
xml_->get_widget("MarginTop", mtopspin_);
xml_->get_widget("MarginBottom", mbottomspin_);
xml_->get_widget("MarginInner", minnerspin_);
xml_->get_widget("MarginOuter", mouterspin_);
xml_->get_widget("MarginHeadSep", mheadsepspin_);
xml_->get_widget("MarginHeadHeight", mheadheightspin_);
xml_->get_widget("MarginFootSkip", mfootskipspin_);
xml_->get_widget("MarginTopUnits", box);
box->pack_start(mtopunitcombo_, true, true, 0);
populateUnitCombo(mtopunitcombo_, false);
xml_->get_widget("MarginBottomUnits", box);
box->pack_start(mbottomunitcombo_, true, true, 0);
populateUnitCombo(mbottomunitcombo_, false);
xml_->get_widget("MarginInnerUnits", box);
box->pack_start(minnerunitcombo_, true, true, 0);
populateUnitCombo(minnerunitcombo_, false);
xml_->get_widget("MarginOuterUnits", box);
box->pack_start(mouterunitcombo_, true, true, 0);
populateUnitCombo(mouterunitcombo_, false);
xml_->get_widget("MarginHeadSepUnits", box);
box->pack_start(mheadsepunitcombo_, true, true, 0);
populateUnitCombo(mheadsepunitcombo_, false);
xml_->get_widget("MarginHeadHeightUnits", box);
box->pack_start(mheadheightunitcombo_, true, true, 0);
populateUnitCombo(mheadheightunitcombo_, false);
xml_->get_widget("MarginFootSkipUnits", box);
box->pack_start(mfootskipunitcombo_, true, true, 0);
populateUnitCombo(mfootskipunitcombo_, false);
Gtk::Table * table;
xml_->get_widget("MarginsTable", table);
table->show_all();
xml_->get_widget_derived("MarginsTop", mtoplengthentry_);
xml_->get_widget_derived("MarginsBottom", mbottomlengthentry_);
xml_->get_widget_derived("MarginsInner", minnerlengthentry_);
xml_->get_widget_derived("MarginsOuter", mouterlengthentry_);
xml_->get_widget_derived("MarginsHeadSep", mheadseplengthentry_);
xml_->get_widget_derived("MarginsHeadHeight", mheadheightlengthentry_);
xml_->get_widget_derived("MarginsFootSkip", mfootskiplengthentry_);
// *** End "Margins" Page ***
// *** Start "Language" Page ***
@ -408,7 +371,7 @@ void GDocument::update()
}
LyXLength vspacelen = params.getDefSkip().length().len();
setWidgetsFromLength(*vspacelengthadj_, vspaceunitcombo_, vspacelen);
vspacelengthentry_->set_length (vspacelen);
// *** End "Document" Page ***
@ -416,12 +379,8 @@ void GDocument::update()
int const psize = params.papersize;
pagesizecombo_.set_active(psize);
setWidgetsFromLength(
*(pagewidthspin_->get_adjustment()),
pagewidthunitscombo_, LyXLength(params.paperwidth));
setWidgetsFromLength(
*(pageheightspin_->get_adjustment()),
pageheightunitscombo_, LyXLength(params.paperheight));
pagewidthlengthentry_->set_length(LyXLength(params.paperwidth));
pageheightlengthentry_->set_length(LyXLength(params.paperheight));
if (params.orientation == ORIENTATION_PORTRAIT)
portraitradio_->set_active();
@ -440,36 +399,15 @@ void GDocument::update()
defaultmargins_->set_active(!params.use_geometry);
setWidgetsFromLength(
*(mtopspin_->get_adjustment()),
mtopunitcombo_,
LyXLength(params.topmargin));
setWidgetsFromLength(
*(mbottomspin_->get_adjustment()),
mbottomunitcombo_,
LyXLength(params.bottommargin));
setWidgetsFromLength(
*(minnerspin_->get_adjustment()),
minnerunitcombo_,
LyXLength(params.leftmargin));
setWidgetsFromLength(
*(mouterspin_->get_adjustment()),
mouterunitcombo_,
LyXLength(params.rightmargin));
setWidgetsFromLength(
*(mheadsepspin_->get_adjustment()),
mheadsepunitcombo_,
LyXLength(params.headsep));
setWidgetsFromLength(
*(mheadheightspin_->get_adjustment()),
mheadheightunitcombo_,
LyXLength(params.headheight));
setWidgetsFromLength(
*(mfootskipspin_->get_adjustment()),
mfootskipunitcombo_,
LyXLength(params.footskip));
marginsChanged();
mtoplengthentry_->set_length(params.topmargin);
mbottomlengthentry_->set_length(params.bottommargin);
minnerlengthentry_->set_length(params.leftmargin);
mouterlengthentry_->set_length(params.rightmargin);
mheadseplengthentry_->set_length(params.headsep);
mheadheightlengthentry_->set_length(params.headheight);
mfootskiplengthentry_->set_length(params.footskip);
marginsChanged();
// *** End "Margins" Page ***
// *** Start "Language" Page ***
@ -636,10 +574,7 @@ void GDocument::apply()
vspacesizemap_[vspacesizecombo_.get_active_row_number()];
params.setDefSkip(VSpace(selection));
if (selection == VSpace::LENGTH) {
string const length =
getLengthFromWidgets(*vspacelengthadj_,
vspaceunitcombo_);
LyXLength length = vspacelengthentry_->get_length();
params.setDefSkip(VSpace(LyXGlueLength(length)));
}
@ -649,10 +584,8 @@ void GDocument::apply()
params.papersize = PAPER_SIZE(
pagesizecombo_.get_active_row_number());
params.paperwidth = getLengthFromWidgets(
*(pagewidthspin_->get_adjustment()), pagewidthunitscombo_);
params.paperheight = getLengthFromWidgets(
*(pageheightspin_->get_adjustment()), pageheightunitscombo_);
params.paperwidth = pagewidthlengthentry_->get_length_string();
params.paperheight = pageheightlengthentry_->get_length_string();
if (portraitradio_->get_active())
params.orientation = ORIENTATION_PORTRAIT;
@ -670,33 +603,18 @@ void GDocument::apply()
params.sides = LyXTextClass::OneSide;
params.pagestyle = pagestylecombo_.get_active_text();
// *** End "Page" Page ***
// *** Begin "Margins" Page ***
params.use_geometry = !defaultmargins_->get_active();
params.topmargin = getLengthFromWidgets(
*(mtopspin_->get_adjustment()),
mtopunitcombo_);
params.bottommargin = getLengthFromWidgets(
*(mbottomspin_->get_adjustment()),
mbottomunitcombo_);
params.leftmargin = getLengthFromWidgets(
*(minnerspin_->get_adjustment()),
minnerunitcombo_);
params.rightmargin = getLengthFromWidgets(
*(mouterspin_->get_adjustment()),
mouterunitcombo_);
params.headsep = getLengthFromWidgets(
*(mheadsepspin_->get_adjustment()),
mheadsepunitcombo_);
params.headheight = getLengthFromWidgets(
*(mheadheightspin_->get_adjustment()),
mheadheightunitcombo_);
params.footskip = getLengthFromWidgets(
*(mfootskipspin_->get_adjustment()),
mfootskipunitcombo_);
params.topmargin = mtoplengthentry_->get_length_string();
params.bottommargin = mbottomlengthentry_->get_length_string();
params.leftmargin = minnerlengthentry_->get_length_string();
params.rightmargin = mouterlengthentry_->get_length_string();
params.headsep = mheadseplengthentry_->get_length_string();
params.headheight = mheadheightlengthentry_->get_length_string();
params.footskip = mfootskiplengthentry_->get_length_string();
// *** End "Margins" Page ***
// *** Start "Language" Page ***
@ -839,8 +757,7 @@ void GDocument::updateParagraphSeparationSensitivity()
bool const lengthsensitive = vspacesensitive &&
(vspacesizecombo_.get_active_row_number() == 3);
vspacelengthspin_->set_sensitive(lengthsensitive);
vspaceunitcombo_.set_sensitive(lengthsensitive);
vspacelengthentry_->set_sensitive(lengthsensitive);
}
@ -885,10 +802,8 @@ void GDocument::classChanged()
void GDocument::pageSizeChanged()
{
bool const customsize = pagesizecombo_.get_active_row_number() == 1;
pagewidthspin_->set_sensitive(customsize);
pageheightspin_->set_sensitive(customsize);
pagewidthunitscombo_.set_sensitive(customsize);
pageheightunitscombo_.set_sensitive(customsize);
pagewidthlengthentry_->set_sensitive(customsize);
pageheightlengthentry_->set_sensitive(customsize);
if (customsize)
portraitradio_->set_active();
@ -899,20 +814,13 @@ void GDocument::marginsChanged()
{
bool const custom = !defaultmargins_->get_active();
mtopspin_->set_sensitive(custom);
mbottomspin_->set_sensitive(custom);
minnerspin_->set_sensitive(custom);
mouterspin_->set_sensitive(custom);
mheadsepspin_->set_sensitive(custom);
mheadheightspin_->set_sensitive(custom);
mfootskipspin_->set_sensitive(custom);
mtopunitcombo_.set_sensitive(custom);
mbottomunitcombo_.set_sensitive(custom);
minnerunitcombo_.set_sensitive(custom);
mouterunitcombo_.set_sensitive(custom);
mheadsepunitcombo_.set_sensitive(custom);
mheadheightunitcombo_.set_sensitive(custom);
mfootskipunitcombo_.set_sensitive(custom);
mtoplengthentry_->set_sensitive(custom);
mbottomlengthentry_->set_sensitive(custom);
minnerlengthentry_->set_sensitive(custom);
mouterlengthentry_->set_sensitive(custom);
mheadseplengthentry_->set_sensitive(custom);
mheadheightlengthentry_->set_sensitive(custom);
mfootskiplengthentry_->set_sensitive(custom);
}

33
src/frontends/gtk/GDocument.h
View File

@ -17,6 +17,8 @@
#include "BranchList.h"
#include "GtkLengthEntry.h"
#include <gtkmm.h>
#include <map>
@ -54,18 +56,14 @@ private:
Gtk::RadioButton * vspaceradio_;
Gtk::ComboBoxText vspacesizecombo_;
std::map<int, VSpace::vspace_kind> vspacesizemap_;
Gtk::ComboBoxText vspaceunitcombo_;
Gtk::SpinButton * vspacelengthspin_;
Gtk::Adjustment * vspacelengthadj_;
GtkLengthEntry *vspacelengthentry_;
void updateParagraphSeparationSensitivity();
void classChanged();
// *** End "Document" Page ***
// *** Begin "Page" Page ***
Gtk::SpinButton * pagewidthspin_;
Gtk::SpinButton * pageheightspin_;
Gtk::ComboBoxText pagewidthunitscombo_;
Gtk::ComboBoxText pageheightunitscombo_;
GtkLengthEntry * pagewidthlengthentry_;
GtkLengthEntry * pageheightlengthentry_;
Gtk::ComboBoxText pagesizecombo_;
Gtk::RadioButton * portraitradio_;
Gtk::RadioButton * landscaperadio_;
@ -77,20 +75,13 @@ private:
// *** Begin "Margins" Page ***
Gtk::CheckButton * defaultmargins_;
Gtk::SpinButton * mtopspin_;
Gtk::SpinButton * mbottomspin_;
Gtk::SpinButton * minnerspin_;
Gtk::SpinButton * mouterspin_;
Gtk::SpinButton * mheadsepspin_;
Gtk::SpinButton * mheadheightspin_;
Gtk::SpinButton * mfootskipspin_;
Gtk::ComboBoxText mtopunitcombo_;
Gtk::ComboBoxText mbottomunitcombo_;
Gtk::ComboBoxText minnerunitcombo_;
Gtk::ComboBoxText mouterunitcombo_;
Gtk::ComboBoxText mheadsepunitcombo_;
Gtk::ComboBoxText mheadheightunitcombo_;
Gtk::ComboBoxText mfootskipunitcombo_;
GtkLengthEntry * mtoplengthentry_;
GtkLengthEntry * mbottomlengthentry_;
GtkLengthEntry * minnerlengthentry_;
GtkLengthEntry * mouterlengthentry_;
GtkLengthEntry * mheadseplengthentry_;
GtkLengthEntry * mheadheightlengthentry_;
GtkLengthEntry * mfootskiplengthentry_;
void marginsChanged();
// *** End "Margins" Page ***

19
src/frontends/gtk/GVSpace.C
View File

@ -47,16 +47,11 @@ void GVSpace::doBuild()
setOK(button);
xml_->get_widget("Spacing", spacingcombo_);
xml_->get_widget("Value", valuespin_);
Gtk::VBox * box;
xml_->get_widget("ValueUnits", box);
box->pack_start(valueunitscombo_, true, true, 0);
box->show_all();
xml_->get_widget_derived("Size", sizelengthentry_);
sizelengthentry_->set_relative(false);
xml_->get_widget("Protect", protectcheck_);
populateUnitCombo(valueunitscombo_, false);
spacingcombo_->signal_changed().connect(
sigc::mem_fun(*this, &GVSpace::onSpacingComboChanged));
}
@ -94,10 +89,9 @@ void GVSpace::update()
bool const custom_vspace = space.kind() == VSpace::LENGTH;
if (custom_vspace) {
setWidgetsFromLength(*valuespin_->get_adjustment(), valueunitscombo_, space.length().len());
sizelengthentry_->set_length(space.length().len());
} else {
setWidgetsFromLength(*valuespin_->get_adjustment(), valueunitscombo_, LyXLength());
sizelengthentry_->set_length("");
}
}
@ -122,7 +116,7 @@ void GVSpace::apply()
space = VSpace(VSpace::VFILL);
break;
case 5:
space = VSpace(LyXGlueLength(getLengthFromWidgets(*valuespin_->get_adjustment(), valueunitscombo_)));
space = VSpace(LyXGlueLength(sizelengthentry_->get_length()));
break;
}
@ -135,8 +129,7 @@ void GVSpace::apply()
void GVSpace::onSpacingComboChanged()
{
bool const custom = spacingcombo_->get_active_row_number() == 5;
valueunitscombo_.set_sensitive(custom);
valuespin_->set_sensitive(custom);
sizelengthentry_->set_sensitive(custom);
}
} // namespace frontend

5
src/frontends/gtk/GVSpace.h
View File

@ -14,6 +14,8 @@
#include "GViewBase.h"
#include "GtkLengthEntry.h"
namespace lyx {
namespace frontend {
@ -32,8 +34,7 @@ private:
void onSpacingComboChanged();
Gtk::ComboBox * spacingcombo_;
Gtk::SpinButton * valuespin_;
Gtk::ComboBoxText valueunitscombo_;
GtkLengthEntry * sizelengthentry_;
Gtk::CheckButton * protectcheck_;
};

654
src/frontends/gtk/glade/document.glade
View File

@ -16,6 +16,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@ -539,31 +540,13 @@
</child>
<child>
<widget class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
<property name="top_padding">6</property>
<property name="bottom_padding">0</property>
<property name="left_padding">12</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkVBox" id="vbox9">
<widget class="GtkHBox" id="hbox99">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">12</property>
<child>
<widget class="GtkVBox" id="VerticalSpaceSize">
<widget class="GtkHBox" id="VerticalSpaceSize">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@ -580,26 +563,7 @@
</child>
<child>
<widget class="GtkSpinButton" id="VerticalSpaceLength">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="VerticalSpaceUnit">
<widget class="GtkHBox" id="VerticalSpaceLength">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@ -607,6 +571,10 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -622,15 +590,6 @@
</packing>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@ -1042,7 +1001,7 @@
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_columns">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@ -1133,88 +1092,6 @@
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="PageWidth">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 65536 1 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="PageHeight">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 65536 1 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="PageWidthUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="PageHeightUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="PageSize">
<property name="visible">True</property>
@ -1227,13 +1104,61 @@
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="PageHeight">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="PageWidth">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>
</child>
</widget>
@ -1515,7 +1440,7 @@
<property name="border_width">12</property>
<property name="visible">True</property>
<property name="n_rows">8</property>
<property name="n_columns">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@ -1533,7 +1458,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginTop</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1562,7 +1486,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginBottom</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1591,7 +1514,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginInner</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1620,7 +1542,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginOuter</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1649,7 +1570,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginHeadSep</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1678,7 +1598,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginHeadHeight</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1707,7 +1626,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">MarginFootSkip</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@ -1723,293 +1641,6 @@
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginTop">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginBottom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginInner">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginOuter">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginHeadSep">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginHeadHeight">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="MarginFootSkip">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">666 0 65536 0.01 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginTopUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginBottomUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginInnerUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginOuterUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginHeadSepUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginHeadHeightUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="MarginFootSkipUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="DefaultMargins">
<property name="visible">True</property>
@ -2031,6 +1662,173 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsTop">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsBottom">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsInner">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsOuter">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsHeadSep">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsHeadHeight">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="MarginsFootSkip">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>

47
src/frontends/gtk/glade/vspace.glade
View File

@ -16,6 +16,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@ -86,6 +87,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -100,7 +105,7 @@
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">_Value:</property>
<property name="label" translatable="yes">S_ize:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -110,6 +115,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -130,6 +139,8 @@ MedSkip
BigSkip
VFill
Custom</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -141,47 +152,15 @@ Custom</property>
</child>
<child>
<widget class="GtkHBox" id="hbox1">
<widget class="GtkHBox" id="Size">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkSpinButton" id="Value">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">False</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1 0 65536 1 10 10</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="ValueUnits">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="padding">4</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>