Photos

Merge lp:~tintou/pantheon-photos/leftover-removal into lp:~pantheon-photos/pantheon-photos/trunk

  1. leftover-removal
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Approved by: Danielle Foré
Approved revision: 3143
Merged at revision: 3146
Proposed branch: lp:~tintou/pantheon-photos/leftover-removal
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 210 lines (+0/-196)
2 files modified
data/ui/set_background_dialog.ui (+0/-133)
src/Dialogs.vala (+0/-63)
To merge this branch: bzr merge lp:~tintou/pantheon-photos/leftover-removal
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+315875@code.launchpad.net

Commit message

Remove unused desktop background slideshow dialog

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'data/ui/set_background_dialog.ui'
--- data/ui/set_background_dialog.ui 2016-01-28 20:55:24 +0000
+++ data/ui/set_background_dialog.ui 1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<interface>
3 <!-- interface-requires gtk+ 3.0 -->
4 <object class="GtkAdjustment" id="adjustment1">
5 <property name="upper">100</property>
6 <property name="step_increment">10</property>
7 <property name="page_increment">10</property>
8 <property name="page_size">10</property>
9 </object>
10 <object class="GtkDialog" id="dialog1">
11 <property name="width_request">400</property>
12 <property name="can_focus">False</property>
13 <property name="border_width">5</property>
14 <property name="title" translatable="yes">Set as Desktop Slideshow</property>
15 <property name="type_hint">normal</property>
16 <property name="skip_taskbar_hint">True</property>
17 <child internal-child="vbox">
18 <object class="GtkBox" id="dialog-vbox2">
19 <property name="visible">True</property>
20 <property name="can_focus">False</property>
21 <property name="orientation">vertical</property>
22 <property name="spacing">6</property>
23 <child internal-child="action_area">
24 <object class="GtkButtonBox" id="dialog-action_area2">
25 <property name="visible">True</property>
26 <property name="can_focus">False</property>
27 <property name="layout_style">end</property>
28 <child>
29 <object class="GtkButton" id="cancel_button">
30 <property name="label">gtk-cancel</property>
31 <property name="use_action_appearance">False</property>
32 <property name="visible">True</property>
33 <property name="can_focus">True</property>
34 <property name="can_default">True</property>
35 <property name="receives_default">True</property>
36 <property name="use_action_appearance">False</property>
37 <property name="use_stock">True</property>
38 </object>
39 <packing>
40 <property name="expand">False</property>
41 <property name="fill">False</property>
42 <property name="position">0</property>
43 </packing>
44 </child>
45 <child>
46 <object class="GtkButton" id="ok_button">
47 <property name="label">gtk-ok</property>
48 <property name="use_action_appearance">False</property>
49 <property name="visible">True</property>
50 <property name="can_focus">True</property>
51 <property name="can_default">True</property>
52 <property name="has_default">True</property>
53 <property name="receives_default">True</property>
54 <property name="has_tooltip">True</property>
55 <property name="tooltip_text" translatable="yes">Generate desktop background slideshow</property>
56 <property name="use_action_appearance">False</property>
57 <property name="use_stock">True</property>
58 </object>
59 <packing>
60 <property name="expand">False</property>
61 <property name="fill">False</property>
62 <property name="position">1</property>
63 </packing>
64 </child>
65 </object>
66 <packing>
67 <property name="expand">False</property>
68 <property name="fill">True</property>
69 <property name="pack_type">end</property>
70 <property name="position">0</property>
71 </packing>
72 </child>
73 <child>
74 <object class="GtkBox" id="hbox1">
75 <property name="visible">True</property>
76 <property name="can_focus">False</property>
77 <property name="spacing">5</property>
78 <child>
79 <object class="GtkLabel" id="label1">
80 <property name="visible">True</property>
81 <property name="can_focus">False</property>
82 <property name="label" translatable="yes">Show each photo for</property>
83 </object>
84 <packing>
85 <property name="expand">False</property>
86 <property name="fill">True</property>
87 <property name="position">0</property>
88 </packing>
89 </child>
90 <child>
91 <object class="GtkLabel" id="delay_value_label">
92 <property name="visible">True</property>
93 <property name="can_focus">False</property>
94 <property name="label" translatable="yes">period of time</property>
95 <attributes>
96 <attribute name="weight" value="bold"/>
97 </attributes>
98 </object>
99 <packing>
100 <property name="expand">False</property>
101 <property name="fill">True</property>
102 <property name="position">1</property>
103 </packing>
104 </child>
105 </object>
106 <packing>
107 <property name="expand">False</property>
108 <property name="fill">True</property>
109 <property name="position">1</property>
110 </packing>
111 </child>
112 <child>
113 <object class="GtkScale" id="delay_scale">
114 <property name="visible">True</property>
115 <property name="can_focus">True</property>
116 <property name="tooltip_text" translatable="yes">How long each photo is shown on the desktop background</property>
117 <property name="adjustment">adjustment1</property>
118 <property name="draw_value">False</property>
119 </object>
120 <packing>
121 <property name="expand">False</property>
122 <property name="fill">True</property>
123 <property name="position">2</property>
124 </packing>
125 </child>
126 </object>
127 </child>
128 <action-widgets>
129 <action-widget response="-6">cancel_button</action-widget>
130 <action-widget response="-5">ok_button</action-widget>
131 </action-widgets>
132 </object>
133</interface>
1340
=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala 2017-01-12 18:13:48 +0000
+++ src/Dialogs.vala 2017-01-30 09:51:45 +0000
@@ -1083,69 +1083,6 @@
1083 }1083 }
1084}1084}
10851085
1086public class SetBackgroundSlideshowDialog {
1087 private Gtk.Dialog dialog;
1088 private Gtk.Label delay_value_label;
1089 private Gtk.Scale delay_scale;
1090 private int delay_value = 0;
1091
1092 public SetBackgroundSlideshowDialog () {
1093 Gtk.Builder builder = AppWindow.create_builder ("set_background_dialog.ui", this);
1094
1095 dialog = builder.get_object ("dialog1") as Gtk.Dialog;
1096 dialog.set_type_hint (Gdk.WindowTypeHint.DIALOG);
1097 dialog.set_parent_window (AppWindow.get_instance ().get_parent_window ());
1098 dialog.set_transient_for (AppWindow.get_instance ());
1099 dialog.set_default_response (Gtk.ResponseType.OK);
1100
1101 delay_value_label = builder.get_object ("delay_value_label") as Gtk.Label;
1102
1103 delay_scale = builder.get_object ("delay_scale") as Gtk.Scale;
1104 delay_scale.value_changed.connect (on_delay_scale_value_changed);
1105 delay_scale.adjustment.value = 50;
1106 }
1107
1108 private void on_delay_scale_value_changed () {
1109 double value = delay_scale.adjustment.value;
1110
1111 // f(x)=x^5 allows to have fine-grained values (seconds) to the left
1112 // and very coarse-grained values (hours) to the right of the slider.
1113 // We limit maximum value to 1 day and minimum to 5 seconds.
1114 delay_value = (int) (Math.pow (value, 5) / Math.pow (90, 5) * 60 * 60 * 24 + 5);
1115
1116 // convert to text and remove fractions from values > 1 minute
1117 string text;
1118 if (delay_value < 60) {
1119 text = ngettext ("%d second", "%d seconds", delay_value).printf (delay_value);
1120 } else if (delay_value < 60 * 60) {
1121 int minutes = delay_value / 60;
1122 text = ngettext ("%d minute", "%d minutes", minutes).printf (minutes);
1123 delay_value = minutes * 60;
1124 } else if (delay_value < 60 * 60 * 24) {
1125 int hours = delay_value / (60 * 60);
1126 text = ngettext ("%d hour", "%d hours", hours).printf (hours);
1127 delay_value = hours * (60 * 60);
1128 } else {
1129 text = _ ("1 day");
1130 delay_value = 60 * 60 * 24;
1131 }
1132
1133 delay_value_label.label = text;
1134 }
1135
1136 public bool execute (out int delay_value) {
1137 dialog.show_all ();
1138
1139 bool result = dialog.run () == Gtk.ResponseType.OK;
1140
1141 dialog.destroy ();
1142
1143 delay_value = this.delay_value;
1144
1145 return result;
1146 }
1147}
1148
1149public class TextEntryDialog : Gtk.Dialog {1086public class TextEntryDialog : Gtk.Dialog {
1150 public delegate bool OnModifyValidateType (string text);1087 public delegate bool OnModifyValidateType (string text);
11511088

Subscribers

People subscribed via source and target branches

to all changes: