[chronojump] volumeOn (contacts and encoder) moved to preferences multimedia tab
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] volumeOn (contacts and encoder) moved to preferences multimedia tab
- Date: Sat, 20 Aug 2016 13:05:17 +0000 (UTC)
commit 666664212c348eed089e6ffbbae40c31af48f73f
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Aug 20 14:59:06 2016 +0200
volumeOn (contacts and encoder) moved to preferences multimedia tab
glade/chronojump.glade | 207 +++++++++++++++++++--------------------
src/gui/chronojump.cs | 63 +------------
src/gui/preferences.cs | 18 +++-
src/gui/repetitiveConditions.cs | 3 +-
4 files changed, 120 insertions(+), 171 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 3053a10..e8691ae 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6282,8 +6282,8 @@ after time</property>
<property name="label"
translatable="yes">Phases</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -6351,25 +6351,12 @@ after time</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
<widget class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox76">
- <property name="width_request">70</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
<widget class="GtkCheckButton"
id="checkbutton_video">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6419,8 +6406,8 @@ after time</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -6430,8 +6417,8 @@ after time</property>
<property name="can_focus">False</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -6439,52 +6426,10 @@ after time</property>
<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>
- <widget class="GtkCheckButton"
id="checkbutton_volume">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
sound (on / off)</property>
- <property name="relief">none</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked"
handler="on_checkbutton_volume_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment68">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox144">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image_volume">
- <property name="width_request">16</property>
- <property name="height_request">16</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="yalign">0.49000000953674316</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
- </child>
- </widget>
- </child>
- </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -6492,13 +6437,6 @@ after time</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
</child>
<child>
<widget class="GtkLabel" id="label20">
@@ -13646,31 +13584,6 @@ Concentric</property>
<property name="position">3</property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_volume_encoder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
sound (on / off)</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_checkbutton_volume_encoder_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_volume_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">4</property>
- </packing>
- </child>
</widget>
<packing>
<property name="y_options"/>
@@ -18038,6 +17951,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22850,6 +22766,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24143,6 +24062,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25928,6 +25850,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26770,6 +26695,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -40056,6 +39984,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43191,6 +43137,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -44323,9 +44281,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -45618,6 +45573,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48244,13 +48202,19 @@ Other</property>
<widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">8</property>
- <property name="spacing">12</property>
+ <property name="border_width">16</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkCheckButton" id="checkbutton_volume">
+ <property name="label" translatable="yes">Play sounds while capturing</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Select the camera</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Play sound (on / off)</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -48259,11 +48223,35 @@ Other</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_combo_camera">
+ <widget class="GtkVBox" id="vbox26">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Select the camera</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_camera">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -48282,7 +48270,7 @@ Other</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Camera</property>
+ <property name="label" translatable="yes">Multimedia</property>
</widget>
<packing>
<property name="position">5</property>
@@ -50464,6 +50452,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -51421,6 +51412,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -52393,6 +52387,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index b553c08..96f70f5 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -263,11 +263,6 @@ public partial class ChronoJumpWindow
//[Widget] Gtk.Label label_video;
[Widget] Gtk.Image image_video_yes;
[Widget] Gtk.Image image_video_no;
-
- [Widget] Gtk.CheckButton checkbutton_volume;
- [Widget] Gtk.Image image_volume;
- [Widget] Gtk.Image image_volume_encoder;
- [Widget] Gtk.CheckButton checkbutton_volume_encoder;
//multiChronopic
@@ -906,21 +901,6 @@ public partial class ChronoJumpWindow
checkbutton_allow_finish_rj_after_time.Active = preferences.allowFinishRjAfterTime;
-
- UtilGtk.ColorsCheckOnlyPrelight(checkbutton_volume);
- UtilGtk.ColorsCheckOnlyPrelight(checkbutton_volume_encoder);
-
- //don't raise the signal
- checkbutton_volume.Clicked -= new EventHandler(on_checkbutton_volume_clicked);
- checkbutton_volume.Active = preferences.volumeOn;
- checkbutton_volume.Clicked += new EventHandler(on_checkbutton_volume_clicked);
- //don't raise the signal
- checkbutton_volume_encoder.Clicked -= new EventHandler(on_checkbutton_volume_encoder_clicked);
- checkbutton_volume_encoder.Active = preferences.volumeOn;
- checkbutton_volume_encoder.Clicked += new EventHandler(on_checkbutton_volume_encoder_clicked);
-
- changeVolumeButtons(preferences.volumeOn);
-
//---- video ----
UtilGtk.ColorsCheckOnlyPrelight(checkbutton_video);
@@ -3474,7 +3454,7 @@ public partial class ChronoJumpWindow
/*
- * videoOn and volumeOn
+ * videoOn
*/
@@ -3620,48 +3600,7 @@ public partial class ChronoJumpWindow
videoCapturePrepare(true); //if error, show message
}
- private void changeVolumeButtons(bool myVolume) {
- Pixbuf pixbuf;
- if(myVolume)
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "audio-volume-high.png");
- else
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "audio-volume-muted.png");
-
- image_volume.Pixbuf = pixbuf;
- image_volume_encoder.Pixbuf = pixbuf;
- }
-
- private void on_checkbutton_volume_clicked(object o, EventArgs args) {
- if(checkbutton_volume.Active) {
- preferences.volumeOn = true;
- SqlitePreferences.Update("volumeOn", "True", false);
- } else {
- preferences.volumeOn = false;
- SqlitePreferences.Update("volumeOn", "False", false);
- }
- //change encoder checkbox but don't raise the signal
- checkbutton_volume_encoder.Clicked -= new EventHandler(on_checkbutton_volume_encoder_clicked);
- checkbutton_volume_encoder.Active = preferences.volumeOn;
- checkbutton_volume_encoder.Clicked += new EventHandler(on_checkbutton_volume_encoder_clicked);
-
- changeVolumeButtons(preferences.volumeOn);
- }
- private void on_checkbutton_volume_encoder_clicked(object o, EventArgs args) {
- if(checkbutton_volume_encoder.Active) {
- preferences.volumeOn = true;
- SqlitePreferences.Update("volumeOn", "True", false);
- } else {
- preferences.volumeOn = false;
- SqlitePreferences.Update("volumeOn", "False", false);
- }
- //change encoder checkbox but don't raise the signal
- checkbutton_volume.Clicked -= new EventHandler(on_checkbutton_volume_clicked);
- checkbutton_volume.Active = preferences.volumeOn;
- checkbutton_volume.Clicked += new EventHandler(on_checkbutton_volume_clicked);
-
- changeVolumeButtons(preferences.volumeOn);
- }
/*
* cancel and finish
*/
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 9fa965b..ddbd1fe 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -114,7 +114,8 @@ public class PreferencesWindow {
[Widget] Gtk.RadioButton radio_encoder_1RM_weighted2;
[Widget] Gtk.RadioButton radio_encoder_1RM_weighted3;
- //camera tab
+ //multimedia tab
+ [Widget] Gtk.CheckButton checkbutton_volume;
[Widget] Gtk.Box hbox_combo_camera;
[Widget] Gtk.ComboBox combo_camera;
@@ -186,8 +187,15 @@ public class PreferencesWindow {
PreferencesWindowBox.createComboLanguage();
+ //multimedia tab
+ if(preferences.volumeOn)
+ PreferencesWindowBox.checkbutton_volume.Active = true;
+ else
+ PreferencesWindowBox.checkbutton_volume.Active = false;
+
PreferencesWindowBox.createComboCamera(UtilVideo.GetVideoDevices(),
preferences.videoDeviceNum);
-
+
+
string [] decs = {"1", "2", "3"};
PreferencesWindowBox.combo_decimals.Active = UtilGtk.ComboMakeActive(
decs, preferences.digitsNumber.ToString());
@@ -1117,6 +1125,12 @@ public class PreferencesWindow {
//---- end of encoder other
+ //multimedia ----
+ if( preferences.volumeOn != PreferencesWindowBox.checkbutton_volume.Active ) {
+ SqlitePreferences.Update("volumeOn",
PreferencesWindowBox.checkbutton_volume.Active.ToString(), true);
+ preferences.volumeOn = PreferencesWindowBox.checkbutton_volume.Active;
+ }
+
if( preferences.videoDeviceNum != UtilGtk.ComboGetActivePos(combo_camera) ) {
SqlitePreferences.Update("videoDevice",
UtilGtk.ComboGetActivePos(combo_camera).ToString(), true);
preferences.videoDeviceNum = UtilGtk.ComboGetActivePos(combo_camera);
diff --git a/src/gui/repetitiveConditions.cs b/src/gui/repetitiveConditions.cs
index e5ad153..c25b334 100644
--- a/src/gui/repetitiveConditions.cs
+++ b/src/gui/repetitiveConditions.cs
@@ -293,8 +293,7 @@ public class RepetitiveConditionsWindow
Util.PlaySound(Constants.SoundTypes.BAD, true);
} else
new DialogMessage(Constants.MessageTypes.INFO,
- Catalog.GetString("You need to activate sounds in main window") +
- " (" + Catalog.GetString("top right") + ")");
+ Catalog.GetString("You need to activate sounds in preferences /
multimedia."));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
