[med-svn] [aghermann] 26/34: SF: ui tweaks
andrei zavada
hmmr-guest at moszumanska.debian.org
Sat Nov 23 00:46:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch master
in repository aghermann.
commit cdc4841a0ab572430ad130ee36351c7c688dd5a2
Author: Andrei Zavada <hmmr at ra>
Date: Sat Nov 16 15:35:47 2013 +0200
SF: ui tweaks
---
upstream/data/sf.glade | 483 ++++++++++++++++--------------
upstream/src/aghermann/ui/sf/construct.cc | 5 +
upstream/src/aghermann/ui/sf/sf.cc | 4 +-
3 files changed, 264 insertions(+), 228 deletions(-)
diff --git a/upstream/data/sf.glade b/upstream/data/sf.glade
index 5ceadca..3aa7afe 100644
--- a/upstream/data/sf.glade
+++ b/upstream/data/sf.glade
@@ -833,7 +833,7 @@
<property name="can_focus">False</property>
<property name="border_width">2</property>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkBox" id="cSFMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -1016,6 +1016,7 @@
<property name="valign">center</property>
<property name="label" translatable="yes"><i>hint</i></property>
<property name="use_markup">True</property>
+ <property name="angle">90</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1032,10 +1033,22 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="cSFPagePosition">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
<property name="row_spacing">3</property>
<child>
<object class="GtkButton" id="bSFBack">
@@ -1063,6 +1076,8 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="xalign">1</property>
+ <property name="xpad">3</property>
+ <property name="ypad">2</property>
<property name="label" translatable="yes">_P </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eSFCurrentPage</property>
@@ -1088,6 +1103,7 @@
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFPageNo</property>
<property name="numeric">True</property>
</object>
@@ -1103,6 +1119,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="margin_right">2</property>
<property name="xalign">0</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">of</property>
@@ -1135,9 +1152,10 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox" id="cSFPagesize">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
@@ -1154,16 +1172,22 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eSFPageSize">
+ <object class="GtkToggleButton" id="bSFDrawCrosshair">
+ <property name="label" translatable="yes">†</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Crosshair (F1)</property>
+ <property name="tooltip_text" translatable="yes">Crosshair (F1)</property>
<property name="valign">center</property>
- <property name="add_tearoffs">True</property>
<property name="focus_on_click">False</property>
+ <accelerator key="F1" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -1179,9 +1203,24 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkComboBox" id="eSFPageSize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="add_tearoffs">True</property>
+ <property name="focus_on_click">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1195,7 +1234,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">3</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1208,11 +1247,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">2</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkBox" id="cSFMainControls">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -1223,11 +1262,63 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="cSFStatusBar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="lSFOverChannel">
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="scale" value="0.69999999999999996"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStatusbar" id="sbSF">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">end</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="cSFPageNavContainer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="n_columns">7</property>
<child>
<object class="GtkButton" id="bSFGotoPrevUnscored">
<property name="label" translatable="yes">◁</property>
@@ -1293,183 +1384,158 @@
<property name="bottom_attach">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">3</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">2</property>
<child>
- <object class="GtkLabel" id="lSFOverChannel">
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="scale" value="0.69999999999999996"/>
- </attributes>
+ <object class="GtkButton" id="bSFScoreNREM1">
+ <property name="label" translatable="yes">➊</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">NREM Stage 1 (<b>a</b>)</property>
+ <property name="tooltip_text" translatable="yes">NREM Stage 1 (a)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="a" signal="clicked"/>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkStatusbar" id="sbSF">
+ <object class="GtkButton" id="bSFScoreNREM2">
+ <property name="label" translatable="yes">➋</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">end</property>
- <property name="hexpand">True</property>
- <property name="spacing">2</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">NREM Stage 2 (<b>s</b>)</property>
+ <property name="tooltip_text" translatable="yes">NREM Stage 2 (s)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="s" signal="activate"/>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkButton" id="bSFScoreNREM3">
+ <property name="label" translatable="yes">➌</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">NREM Stage 3 (<b>d</b>)</property>
+ <property name="tooltip_text" translatable="yes">NREM Stage 3 (d)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="d" signal="activate"/>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bSFScoreNREM4">
+ <property name="label" translatable="yes">➍</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">NREM Stage 4 (<b>f</b>)</property>
+ <property name="tooltip_text" translatable="yes">NREM Stage 4 (f)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="f" signal="activate"/>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bSFScoreREM">
+ <property name="label" translatable="yes">ℝ</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">REM (<b>r</b>)</property>
+ <property name="tooltip_text" translatable="yes">REM (r)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="r" signal="activate"/>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bSFScoreWake">
+ <property name="label" translatable="yes">☺</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
+ <property name="tooltip_text" translatable="yes">Wake (w)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="w" signal="activate"/>
+ </object>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="bSFScoreClear">
+ <property name="label" translatable="yes">⌫</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
+ <property name="tooltip_text" translatable="yes">Clear (q)</property>
+ <property name="valign">center</property>
+ <property name="focus_on_click">False</property>
+ <accelerator key="q" signal="activate"/>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator2">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_padding">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreNREM1">
- <property name="label" translatable="yes">➊</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">NREM Stage 1 (<b>a</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="a" signal="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreNREM2">
- <property name="label" translatable="yes">➋</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">NREM Stage 2 (<b>s</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="s" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreNREM3">
- <property name="label" translatable="yes">➌</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">NREM Stage 3 (<b>d</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="d" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreNREM4">
- <property name="label" translatable="yes">➍</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">NREM Stage 4 (<b>f</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="f" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreREM">
- <property name="label" translatable="yes">ℝ</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">REM (<b>r</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="r" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreWake">
- <property name="label" translatable="yes">☺</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Wake (<b>w</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="w" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="bSFScoreClear">
- <property name="label" translatable="yes">⌫</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_markup" translatable="yes">Clear (<b>q</b>)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="q" signal="activate"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1484,12 +1550,6 @@
<property name="n_columns">5</property>
<property name="column_spacing">4</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label202">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1597,59 +1657,21 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">3</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">3</property>
- <property name="pack_type">end</property>
- <property name="position">11</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="bSFDrawCrosshair">
- <property name="label" translatable="yes">†</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Crosshair (<b>F1</b>)</property>
- <property name="tooltip_text" translatable="yes">Crosshair (F1)</property>
- <property name="valign">center</property>
- <property name="focus_on_click">False</property>
- <accelerator key="F1" signal="activate"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">12</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
@@ -1696,6 +1718,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICANofICs</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -1739,6 +1762,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAEigVecFirst</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -1769,6 +1793,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAEigVecLast</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -1821,6 +1846,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICASampleSizePercent</property>
<property name="digits">1</property>
<property name="numeric">True</property>
@@ -1866,6 +1892,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAMaxIterations</property>
<property name="numeric">True</property>
</object>
@@ -1908,6 +1935,7 @@
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAepsilon</property>
<property name="digits">5</property>
<property name="numeric">True</property>
@@ -1953,6 +1981,7 @@ the stabilized version of the algorithm</property>
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAmu</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -2155,6 +2184,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAa1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -2180,6 +2210,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<property name="invisible_char">•</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
+ <property name="input_purpose">number</property>
<property name="adjustment">jSFICAa2</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -2384,7 +2415,7 @@ skew: 𝑔(𝑢) = 𝑢2</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
diff --git a/upstream/src/aghermann/ui/sf/construct.cc b/upstream/src/aghermann/ui/sf/construct.cc
index df68160..c923a90 100644
--- a/upstream/src/aghermann/ui/sf/construct.cc
+++ b/upstream/src/aghermann/ui/sf/construct.cc
@@ -78,6 +78,11 @@ SScoringFacilityWidgets ()
G_CONNECT_2 (eSFCurrentPage, value, changed);
G_CONNECT_1 (eSFCurrentPos, clicked);
+ {
+ auto font_desc = pango_font_description_from_string( "Mono 8");
+ gtk_widget_override_font( (GtkWidget*)eSFCurrentPos, font_desc);
+ pango_font_description_free( font_desc);
+ }
G_CONNECT_1 (bSFForward, clicked);
G_CONNECT_1 (bSFBack, clicked);
diff --git a/upstream/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc
index a8b2db7..73595c7 100644
--- a/upstream/src/aghermann/ui/sf/sf.cc
+++ b/upstream/src/aghermann/ui/sf/sf.cc
@@ -686,14 +686,14 @@ draw_current_pos( const double x) const
"%s.%02d",
tmp, (int)((clickt - floor(clickt)) * 100));
} else
- snprintf_buf( "--:--:--");
+ snprintf_buf( "--:--:--.--");
} else {
time_t time_at_cur_pos = cur_vpage_start()
+ (time_t)(show_cur_pos_time_relative ? -epoch_clockhour : start_time());
struct tm *ltime = localtime( &time_at_cur_pos);
char tmp[10];
strftime( tmp, 9, "%H:%M:%S", ltime);
- snprintf_buf( "%s", tmp);
+ snprintf_buf( "%s.--", tmp);
}
gtk_button_set_label( eSFCurrentPos, global::buf);
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list