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
1=== removed file 'data/ui/set_background_dialog.ui'
2--- data/ui/set_background_dialog.ui 2016-01-28 20:55:24 +0000
3+++ data/ui/set_background_dialog.ui 1970-01-01 00:00:00 +0000
4@@ -1,133 +0,0 @@
5-<?xml version="1.0" encoding="UTF-8"?>
6-<interface>
7- <!-- interface-requires gtk+ 3.0 -->
8- <object class="GtkAdjustment" id="adjustment1">
9- <property name="upper">100</property>
10- <property name="step_increment">10</property>
11- <property name="page_increment">10</property>
12- <property name="page_size">10</property>
13- </object>
14- <object class="GtkDialog" id="dialog1">
15- <property name="width_request">400</property>
16- <property name="can_focus">False</property>
17- <property name="border_width">5</property>
18- <property name="title" translatable="yes">Set as Desktop Slideshow</property>
19- <property name="type_hint">normal</property>
20- <property name="skip_taskbar_hint">True</property>
21- <child internal-child="vbox">
22- <object class="GtkBox" id="dialog-vbox2">
23- <property name="visible">True</property>
24- <property name="can_focus">False</property>
25- <property name="orientation">vertical</property>
26- <property name="spacing">6</property>
27- <child internal-child="action_area">
28- <object class="GtkButtonBox" id="dialog-action_area2">
29- <property name="visible">True</property>
30- <property name="can_focus">False</property>
31- <property name="layout_style">end</property>
32- <child>
33- <object class="GtkButton" id="cancel_button">
34- <property name="label">gtk-cancel</property>
35- <property name="use_action_appearance">False</property>
36- <property name="visible">True</property>
37- <property name="can_focus">True</property>
38- <property name="can_default">True</property>
39- <property name="receives_default">True</property>
40- <property name="use_action_appearance">False</property>
41- <property name="use_stock">True</property>
42- </object>
43- <packing>
44- <property name="expand">False</property>
45- <property name="fill">False</property>
46- <property name="position">0</property>
47- </packing>
48- </child>
49- <child>
50- <object class="GtkButton" id="ok_button">
51- <property name="label">gtk-ok</property>
52- <property name="use_action_appearance">False</property>
53- <property name="visible">True</property>
54- <property name="can_focus">True</property>
55- <property name="can_default">True</property>
56- <property name="has_default">True</property>
57- <property name="receives_default">True</property>
58- <property name="has_tooltip">True</property>
59- <property name="tooltip_text" translatable="yes">Generate desktop background slideshow</property>
60- <property name="use_action_appearance">False</property>
61- <property name="use_stock">True</property>
62- </object>
63- <packing>
64- <property name="expand">False</property>
65- <property name="fill">False</property>
66- <property name="position">1</property>
67- </packing>
68- </child>
69- </object>
70- <packing>
71- <property name="expand">False</property>
72- <property name="fill">True</property>
73- <property name="pack_type">end</property>
74- <property name="position">0</property>
75- </packing>
76- </child>
77- <child>
78- <object class="GtkBox" id="hbox1">
79- <property name="visible">True</property>
80- <property name="can_focus">False</property>
81- <property name="spacing">5</property>
82- <child>
83- <object class="GtkLabel" id="label1">
84- <property name="visible">True</property>
85- <property name="can_focus">False</property>
86- <property name="label" translatable="yes">Show each photo for</property>
87- </object>
88- <packing>
89- <property name="expand">False</property>
90- <property name="fill">True</property>
91- <property name="position">0</property>
92- </packing>
93- </child>
94- <child>
95- <object class="GtkLabel" id="delay_value_label">
96- <property name="visible">True</property>
97- <property name="can_focus">False</property>
98- <property name="label" translatable="yes">period of time</property>
99- <attributes>
100- <attribute name="weight" value="bold"/>
101- </attributes>
102- </object>
103- <packing>
104- <property name="expand">False</property>
105- <property name="fill">True</property>
106- <property name="position">1</property>
107- </packing>
108- </child>
109- </object>
110- <packing>
111- <property name="expand">False</property>
112- <property name="fill">True</property>
113- <property name="position">1</property>
114- </packing>
115- </child>
116- <child>
117- <object class="GtkScale" id="delay_scale">
118- <property name="visible">True</property>
119- <property name="can_focus">True</property>
120- <property name="tooltip_text" translatable="yes">How long each photo is shown on the desktop background</property>
121- <property name="adjustment">adjustment1</property>
122- <property name="draw_value">False</property>
123- </object>
124- <packing>
125- <property name="expand">False</property>
126- <property name="fill">True</property>
127- <property name="position">2</property>
128- </packing>
129- </child>
130- </object>
131- </child>
132- <action-widgets>
133- <action-widget response="-6">cancel_button</action-widget>
134- <action-widget response="-5">ok_button</action-widget>
135- </action-widgets>
136- </object>
137-</interface>
138
139=== modified file 'src/Dialogs.vala'
140--- src/Dialogs.vala 2017-01-12 18:13:48 +0000
141+++ src/Dialogs.vala 2017-01-30 09:51:45 +0000
142@@ -1083,69 +1083,6 @@
143 }
144 }
145
146-public class SetBackgroundSlideshowDialog {
147- private Gtk.Dialog dialog;
148- private Gtk.Label delay_value_label;
149- private Gtk.Scale delay_scale;
150- private int delay_value = 0;
151-
152- public SetBackgroundSlideshowDialog () {
153- Gtk.Builder builder = AppWindow.create_builder ("set_background_dialog.ui", this);
154-
155- dialog = builder.get_object ("dialog1") as Gtk.Dialog;
156- dialog.set_type_hint (Gdk.WindowTypeHint.DIALOG);
157- dialog.set_parent_window (AppWindow.get_instance ().get_parent_window ());
158- dialog.set_transient_for (AppWindow.get_instance ());
159- dialog.set_default_response (Gtk.ResponseType.OK);
160-
161- delay_value_label = builder.get_object ("delay_value_label") as Gtk.Label;
162-
163- delay_scale = builder.get_object ("delay_scale") as Gtk.Scale;
164- delay_scale.value_changed.connect (on_delay_scale_value_changed);
165- delay_scale.adjustment.value = 50;
166- }
167-
168- private void on_delay_scale_value_changed () {
169- double value = delay_scale.adjustment.value;
170-
171- // f(x)=x^5 allows to have fine-grained values (seconds) to the left
172- // and very coarse-grained values (hours) to the right of the slider.
173- // We limit maximum value to 1 day and minimum to 5 seconds.
174- delay_value = (int) (Math.pow (value, 5) / Math.pow (90, 5) * 60 * 60 * 24 + 5);
175-
176- // convert to text and remove fractions from values > 1 minute
177- string text;
178- if (delay_value < 60) {
179- text = ngettext ("%d second", "%d seconds", delay_value).printf (delay_value);
180- } else if (delay_value < 60 * 60) {
181- int minutes = delay_value / 60;
182- text = ngettext ("%d minute", "%d minutes", minutes).printf (minutes);
183- delay_value = minutes * 60;
184- } else if (delay_value < 60 * 60 * 24) {
185- int hours = delay_value / (60 * 60);
186- text = ngettext ("%d hour", "%d hours", hours).printf (hours);
187- delay_value = hours * (60 * 60);
188- } else {
189- text = _ ("1 day");
190- delay_value = 60 * 60 * 24;
191- }
192-
193- delay_value_label.label = text;
194- }
195-
196- public bool execute (out int delay_value) {
197- dialog.show_all ();
198-
199- bool result = dialog.run () == Gtk.ResponseType.OK;
200-
201- dialog.destroy ();
202-
203- delay_value = this.delay_value;
204-
205- return result;
206- }
207-}
208-
209 public class TextEntryDialog : Gtk.Dialog {
210 public delegate bool OnModifyValidateType (string text);
211

Subscribers

People subscribed via source and target branches

to all changes: