[med-svn] [aghermann] 55/60: tweaks to SF dialogs, & whitespace
andrei zavada
hmmr-guest at alioth.debian.org
Mon Nov 4 23:50:01 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 2770f29761749187cd5128a5ac5e6411064a7a07
Author: Andrei Zavada <hmmr at lonnie>
Date: Sun Oct 27 09:52:32 2013 +0200
tweaks to SF dialogs, & whitespace
---
upstream/data/sf-filters.glade | 3 ++-
upstream/data/sf-patterns.glade | 9 ++++++++-
upstream/data/sf-phasediff.glade | 3 +++
upstream/data/sf-rk1968.glade | 5 +----
upstream/src/aghermann/ui/sf/mainmenu_cb.cc | 2 ++
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/upstream/data/sf-filters.glade b/upstream/data/sf-filters.glade
index f1199fb..2f52f1a 100644
--- a/upstream/data/sf-filters.glade
+++ b/upstream/data/sf-filters.glade
@@ -41,10 +41,11 @@
<object class="GtkDialog" id="wSFFilters">
<property name="can_focus">False</property>
<property name="border_width">10</property>
- <property name="title" translatable="yes">High- and Low-pass filters</property>
+ <property name="title" translatable="yes">Filters</property>
<property name="modal">True</property>
<property name="window_position">mouse</property>
<property name="destroy_with_parent">True</property>
+ <property name="icon">aghermann.png</property>
<property name="type_hint">dialog</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="response" handler="gtk_widget_hide_on_delete" swapped="no"/>
diff --git a/upstream/data/sf-patterns.glade b/upstream/data/sf-patterns.glade
index 718841f..2baed71 100644
--- a/upstream/data/sf-patterns.glade
+++ b/upstream/data/sf-patterns.glade
@@ -164,7 +164,8 @@
<property name="default_width">800</property>
<property name="default_height">570</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">normal</property>
+ <property name="icon">aghermann.png</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="gravity">north</property>
@@ -1246,6 +1247,12 @@ on individual parameters</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="top_attach">1</property>
diff --git a/upstream/data/sf-phasediff.glade b/upstream/data/sf-phasediff.glade
index 46b66e3..0b7cff7 100644
--- a/upstream/data/sf-phasediff.glade
+++ b/upstream/data/sf-phasediff.glade
@@ -17,6 +17,9 @@
<property name="border_width">10</property>
<property name="title" translatable="yes">Inter-channel lag</property>
<property name="window_position">center-on-parent</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="icon">aghermann.png</property>
+ <property name="type_hint">dialog</property>
<signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
<child>
<object class="GtkTable" id="table28">
diff --git a/upstream/data/sf-rk1968.glade b/upstream/data/sf-rk1968.glade
index 8ec580a..388c20a 100644
--- a/upstream/data/sf-rk1968.glade
+++ b/upstream/data/sf-rk1968.glade
@@ -16,9 +16,7 @@
<property name="border_width">10</property>
<property name="title" translatable="yes">Rechtschaffen & Kales</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">normal</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
+ <property name="type_hint">dialog</property>
<property name="gravity">north</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
@@ -283,7 +281,6 @@
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
<property name="transient_for">wSFRK</property>
<signal name="close" handler="gtk_widget_hide_on_delete" swapped="no"/>
<signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
diff --git a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
index 0a983aa..320bc93 100644
--- a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
+++ b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
@@ -127,6 +127,7 @@ iSFMontagePatterns_activate_cb(
const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
+
SF.patterns_d().setup_controls_for_find();
gtk_widget_show( (GtkWidget*)SF.patterns_d().wSFFD);
}
@@ -139,6 +140,7 @@ iSFMontagePhaseDiff_activate_cb(
const gpointer userdata)
{
auto& SF = *(SScoringFacility*)userdata;
+
gtk_widget_show( (GtkWidget*)SF.phasediff_d().wSFPD);
}
--
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