diff options
-rw-r--r-- | data/stylesheeteditor.ui | 927 | ||||
-rw-r--r-- | src/stylesheet_editor.c | 25 |
2 files changed, 492 insertions, 460 deletions
diff --git a/data/stylesheeteditor.ui b/data/stylesheeteditor.ui index eac46b9..14c66e0 100644 --- a/data/stylesheeteditor.ui +++ b/data/stylesheeteditor.ui @@ -66,6 +66,8 @@ <columns> <!-- column-name element --> <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> </columns> </object> <template class="StylesheetEditor" parent="GtkDialog"> @@ -131,387 +133,531 @@ <property name="can_focus">False</property> <property name="margin_top">8</property> <property name="margin_bottom">8</property> - <property name="orientation">vertical</property> <property name="spacing">8</property> <child> - <object class="GtkComboBox" id="selector"> + <object class="GtkTreeView" id="selector"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="model">element_tree</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="padding">2</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkFrame"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">out</property> + <property name="orientation">vertical</property> <child> - <object class="GtkAlignment"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <property name="label_xalign">0</property> + <property name="shadow_type">out</property> <child> - <object class="GtkGrid"> + <object class="GtkAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">8</property> - <property name="column_spacing">8</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Width:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Height:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Corner x:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Corner y:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="w"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment19</property> - <signal name="value-changed" handler="dims_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="x"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment20</property> - <signal name="value-changed" handler="dims_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="h"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment21</property> - <signal name="value-changed" handler="dims_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="y"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment22</property> - <signal name="value-changed" handler="dims_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="h_units"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item id="percent" translatable="yes">% slide</item> - <item id="units" translatable="yes">units</item> - </items> - <signal name="changed" handler="dims_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">0</property> - </packing> - </child> + <property name="margin_top">8</property> + <property name="margin_bottom">8</property> <child> - <object class="GtkComboBoxText" id="w_units"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="active">0</property> - <items> - <item id="percent" translatable="yes">% slide</item> - <item id="units" translatable="yes">units</item> - </items> - <signal name="changed" handler="dims_sig" swapped="no"/> + <property name="row_spacing">8</property> + <property name="column_spacing">8</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Width:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Height:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Corner x:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Corner y:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="w"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment19</property> + <signal name="value-changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="x"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment20</property> + <signal name="value-changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="h"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment21</property> + <signal name="value-changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="y"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment22</property> + <signal name="value-changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="h_units"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item id="percent" translatable="yes">% slide</item> + <item id="units" translatable="yes">units</item> + </items> + <signal name="changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="w_units"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <items> + <item id="percent" translatable="yes">% slide</item> + <item id="units" translatable="yes">units</item> + </items> + <signal name="changed" handler="dims_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Geometry</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">8</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Text:</property> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Geometry</property> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="padding">4</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkFontButton" id="font"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="font">Sans 12</property> - <property name="preview_text">Preview text</property> - <signal name="font-set" handler="font_sig" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkColorButton" id="fgcol"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_alpha">True</property> - <property name="title" translatable="yes">Foreground colour</property> - <signal name="color-set" handler="fgcol_sig" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">8</property> - <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background:</property> + <property name="spacing">8</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Text:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFontButton" id="font"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="font">Sans 12</property> + <property name="preview_text">Preview text</property> + <signal name="font-set" handler="font_sig" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="fgcol"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_alpha">True</property> + <property name="title" translatable="yes">Foreground colour</property> + <signal name="color-set" handler="fgcol_sig" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="bggrad"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item id="flat" translatable="yes">Flat colour</item> - <item id="horiz" translatable="yes">Horizontal gradient</item> - <item id="vert" translatable="yes">Vertical gradient</item> - </items> - <signal name="changed" handler="bg_sig" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="padding">4</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkColorButton" id="bgcol"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_alpha">True</property> - <property name="title" translatable="yes">Background first colour</property> - <signal name="color-set" handler="bg_sig" swapped="no"/> + <property name="can_focus">False</property> + <property name="spacing">8</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="bggrad"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item id="flat" translatable="yes">Flat colour</item> + <item id="horiz" translatable="yes">Horizontal gradient</item> + <item id="vert" translatable="yes">Vertical gradient</item> + </items> + <signal name="changed" handler="bg_sig" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="bgcol"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_alpha">True</property> + <property name="title" translatable="yes">Background first colour</property> + <signal name="color-set" handler="bg_sig" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="bgcol2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_alpha">True</property> + <property name="title" translatable="yes">Background second colour</property> + <signal name="color-set" handler="bg_sig" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="padding">4</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkColorButton" id="bgcol2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_alpha">True</property> - <property name="title" translatable="yes">Background second colour</property> - <signal name="color-set" handler="bg_sig" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">8</property> - <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Alignment:</property> + <property name="spacing">8</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Alignment:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="alignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">0</property> + <property name="active_id">left</property> + <items> + <item id="left" translatable="yes">Left</item> + <item id="center" translatable="yes">Center</item> + <item id="right" translatable="yes">Right</item> + </items> + <signal name="changed" handler="alignment_sig" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="alignment"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="active">0</property> - <property name="active_id">left</property> - <items> - <item id="left" translatable="yes">Left</item> - <item id="center" translatable="yes">Center</item> - <item id="right" translatable="yes">Right</item> - </items> - <signal name="changed" handler="alignment_sig" swapped="no"/> + <property name="label_xalign">0</property> + <property name="shadow_type">out</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">8</property> + <property name="margin_bottom">8</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">8</property> + <property name="column_spacing">8</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Left:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Right:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Top:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Bottom:</property> + <property name="justify">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="padding_l"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment23</property> + <signal name="value-changed" handler="padding_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="padding_t"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment24</property> + <signal name="value-changed" handler="padding_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="padding_r"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment25</property> + <signal name="value-changed" handler="padding_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="padding_b"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment26</property> + <signal name="value-changed" handler="padding_sig" swapped="no"/> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Padding</property> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="padding">4</property> + <property name="position">4</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">2</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">out</property> <child> - <object class="GtkAlignment"> + <object class="GtkExpander"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> + <property name="can_focus">True</property> <child> <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">8</property> + <property name="margin_bottom">8</property> <property name="row_spacing">8</property> <property name="column_spacing">8</property> <property name="column_homogeneous">True</property> @@ -568,12 +714,12 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="padding_l"> + <object class="GtkSpinButton" id="paraspace_l"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment23</property> - <signal name="value-changed" handler="padding_sig" swapped="no"/> + <property name="adjustment">adjustment27</property> + <signal name="value-changed" handler="paraspace_sig" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -581,12 +727,12 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="padding_t"> + <object class="GtkSpinButton" id="paraspace_t"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment24</property> - <signal name="value-changed" handler="padding_sig" swapped="no"/> + <property name="adjustment">adjustment28</property> + <signal name="value-changed" handler="paraspace_sig" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -594,12 +740,12 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="padding_r"> + <object class="GtkSpinButton" id="paraspace_r"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment25</property> - <signal name="value-changed" handler="padding_sig" swapped="no"/> + <property name="adjustment">adjustment29</property> + <signal name="value-changed" handler="paraspace_sig" swapped="no"/> </object> <packing> <property name="left_attach">3</property> @@ -607,12 +753,12 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="padding_b"> + <object class="GtkSpinButton" id="paraspace_b"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment26</property> - <signal name="value-changed" handler="padding_sig" swapped="no"/> + <property name="adjustment">adjustment30</property> + <signal name="value-changed" handler="paraspace_sig" swapped="no"/> </object> <packing> <property name="left_attach">3</property> @@ -621,154 +767,31 @@ </child> </object> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Padding</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkExpander"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">8</property> - <property name="margin_bottom">8</property> - <property name="row_spacing">8</property> - <property name="column_spacing">8</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Left:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Right:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Top:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> + <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bottom:</property> - <property name="justify">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="paraspace_l"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment27</property> - <signal name="value-changed" handler="paraspace_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="paraspace_t"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment28</property> - <signal name="value-changed" handler="paraspace_sig" swapped="no"/> + <property name="label" translatable="yes">Paragraph spacing</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="paraspace_r"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment29</property> - <signal name="value-changed" handler="paraspace_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="paraspace_b"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">adjustment30</property> - <signal name="value-changed" handler="paraspace_sig" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Paragraph spacing</property> - </object> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> diff --git a/src/stylesheet_editor.c b/src/stylesheet_editor.c index 5cdd012..6d8a2b6 100644 --- a/src/stylesheet_editor.c +++ b/src/stylesheet_editor.c @@ -202,18 +202,18 @@ static void set_values_from_presentation(StylesheetEditor *se) { GtkTreeIter iter; GtkTreeIter iter2; - GValue val = G_VALUE_INIT; - GValue val2 = G_VALUE_INIT; gtk_tree_store_append(GTK_TREE_STORE(se->element_tree), &iter, NULL); - g_value_init(&val, G_TYPE_STRING); - g_value_set_static_string(&val, "Slide"); - gtk_tree_store_set_value(GTK_TREE_STORE(se->element_tree), &iter, 0, &val); + gtk_tree_store_set(GTK_TREE_STORE(se->element_tree), &iter, + 0, "Narrative", -1); + + gtk_tree_store_append(GTK_TREE_STORE(se->element_tree), &iter, NULL); + gtk_tree_store_set(GTK_TREE_STORE(se->element_tree), &iter, + 0, "Slide", -1); gtk_tree_store_append(GTK_TREE_STORE(se->element_tree), &iter2, &iter); - g_value_init(&val2, G_TYPE_STRING); - g_value_set_static_string(&val2, "Slide title"); - gtk_tree_store_set_value(GTK_TREE_STORE(se->element_tree), &iter2, 0, &val2); + gtk_tree_store_set(GTK_TREE_STORE(se->element_tree), &iter2, + 0, "Slide title", -1); set_geom_from_ss(se->priv->stylesheet, se->priv->el, se->w, se->h, se->x, se->y, se->w_units, se->h_units); @@ -476,6 +476,7 @@ void stylesheet_editor_class_init(StylesheetEditorClass *klass) SE_BIND_CHILD(y, dims_sig); SE_BIND_CHILD(w_units, dims_sig); SE_BIND_CHILD(h_units, dims_sig); + gtk_widget_class_bind_template_child(widget_class, StylesheetEditor, element_tree); gtk_widget_class_bind_template_callback(widget_class, revert_sig); @@ -496,6 +497,14 @@ StylesheetEditor *stylesheet_editor_new(Stylesheet *ss) se->priv->el = 0;//gtk_combo_box_get_active_id(GTK_COMBO_BOX(se->furniture_selector)); set_values_from_presentation(se); + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Element", renderer, + "text", 0, + NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(se->selector), column); + return se; } |