Skip to content

Commit ca028ac

Browse files
Philip-ScottPhilip-Scott
authored
Merge branch 'master' into Controller-configuration
2 parents 59be105 + 73b0d86 commit ca028ac

6 files changed

Lines changed: 264 additions & 11 deletions

File tree

‎data/com.github.philip-scott.spice-up.appdata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot.png</image>
2222
</screenshot>
2323
</screenshots>
24-
<developer_name>Felipe Escoto.</developer_name>
24+
<developer_name>Felipe Escoto</developer_name>
2525
<url type="homepage">https://github.com/Philip-Scott</url>
2626
<url type="bugtracker">https://github.com/Philip-Scott/Spice-up/issues</url>
2727
<url type="help">https://github.com/Philip-Scott/Spice-up/issues</url>

‎po/spice-up.pot‎

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,245 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the PACKAGE package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
#: ../src/Application.vala:30
7+
#, fuzzy
8+
msgid ""
9+
msgstr ""
10+
"Project-Id-Version: PACKAGE VERSION\n"
11+
"Report-Msgid-Bugs-To: \n"
12+
"POT-Creation-Date: 2017-05-05 09:34-0500\n"
13+
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14+
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15+
"Language-Team: LANGUAGE <LL@li.org>\n"
16+
"Language: \n"
17+
"MIME-Version: 1.0\n"
18+
"Content-Type: text/plain; charset=CHARSET\n"
19+
"Content-Transfer-Encoding: 8bit\n"
20+
21+
#: ../src/Services/FileManager.vala:32
22+
msgid "Cancel"
23+
msgstr ""
24+
25+
#: ../src/Services/FileManager.vala:62
26+
msgid "Open Image"
27+
msgstr ""
28+
29+
#: ../src/Services/FileManager.vala:62
30+
#: ../src/Services/FileManager.vala:75
31+
msgid "Open"
32+
msgstr ""
33+
34+
#: ../src/Services/FileManager.vala:75
35+
msgid "Open file"
36+
msgstr ""
37+
38+
#: ../src/Services/FileManager.vala:93
39+
msgid "Save file"
40+
msgstr ""
41+
42+
#: ../src/Services/FileManager.vala:93
43+
#: ../src/Services/FileManager.vala:157
44+
msgid "Save"
45+
msgstr ""
46+
47+
#: ../src/Services/FileManager.vala:157
48+
#: ../src/Widgets/Headerbar.vala:78
49+
msgid "Export to PDF"
50+
msgstr ""
51+
52+
#: ../src/Widgets/Welcome.vala:26
53+
msgid "Make a Simple Presentation"
54+
msgstr ""
55+
56+
#: ../src/Widgets/Welcome.vala:27
57+
msgid "New Presentation"
58+
msgstr ""
59+
60+
#: ../src/Widgets/Welcome.vala:27
61+
msgid "Create a new presentation"
62+
msgstr ""
63+
64+
#: ../src/Widgets/Welcome.vala:28
65+
msgid "Open File"
66+
msgstr ""
67+
68+
#: ../src/Widgets/Welcome.vala:28
69+
msgid "Open a saved presentation"
70+
msgstr ""
71+
72+
#: ../src/Widgets/Welcome.vala:32
73+
msgid "Open Last File"
74+
msgstr ""
75+
76+
#: ../src/Widgets/Headerbar.vala:69
77+
msgid "Undo"
78+
msgstr ""
79+
80+
#: ../src/Widgets/Headerbar.vala:70
81+
msgid "Redo"
82+
msgstr ""
83+
84+
#: ../src/Widgets/Headerbar.vala:71
85+
msgid "Text Box"
86+
msgstr ""
87+
88+
#: ../src/Widgets/Headerbar.vala:72
89+
msgid "Image"
90+
msgstr ""
91+
92+
#: ../src/Widgets/Headerbar.vala:73
93+
msgid "Shape"
94+
msgstr ""
95+
96+
#: ../src/Widgets/Headerbar.vala:79
97+
msgid "Start Presentation"
98+
msgstr ""
99+
100+
#: ../src/Widgets/ColorButton.vala:82
101+
msgid "Custom Color"
102+
msgstr ""
103+
104+
#: ../src/Widgets/ColorButton.vala:95
105+
msgid "Color 1:"
106+
msgstr ""
107+
108+
#: ../src/Widgets/ColorButton.vala:96
109+
msgid "Color 2:"
110+
msgstr ""
111+
112+
#: ../src/Widgets/ColorButton.vala:123
113+
msgid "Vertical"
114+
msgstr ""
115+
116+
#: ../src/Widgets/ColorButton.vala:124
117+
msgid "Horizontal"
118+
msgstr ""
119+
120+
#: ../src/Widgets/CanvasItems/TextItem.vala:38
121+
#: ../src/Widgets/CanvasItems/TextItem.vala:78
122+
#: ../src/Widgets/CanvasItems/TextItem.vala:90
123+
#: ../src/Widgets/CanvasItems/TextItem.vala:102
124+
msgid "Click to add text..."
125+
msgstr ""
126+
127+
#: ../src/Widgets/Toolbars/CanvasBar.vala:33
128+
msgid "Background color"
129+
msgstr ""
130+
131+
#: ../src/Widgets/Toolbars/CanvasBar.vala:42
132+
msgid "Background pattern"
133+
msgstr ""
134+
135+
#: ../src/Widgets/Toolbars/CanvasBar.vala:45
136+
msgid "3px tile"
137+
msgstr ""
138+
139+
#: ../src/Widgets/Toolbars/CanvasBar.vala:46
140+
msgid "Fabric dark"
141+
msgstr ""
142+
143+
#: ../src/Widgets/Toolbars/CanvasBar.vala:47
144+
msgid "Fabric light"
145+
msgstr ""
146+
147+
#: ../src/Widgets/Toolbars/CanvasBar.vala:48
148+
msgid "Beige paper"
149+
msgstr ""
150+
151+
#: ../src/Widgets/Toolbars/CanvasBar.vala:49
152+
msgid "Black linen"
153+
msgstr ""
154+
155+
#: ../src/Widgets/Toolbars/CanvasBar.vala:50
156+
msgid "Bright squares"
157+
msgstr ""
158+
159+
#: ../src/Widgets/Toolbars/CanvasBar.vala:51
160+
msgid "Flowers"
161+
msgstr ""
162+
163+
#: ../src/Widgets/Toolbars/CanvasBar.vala:52
164+
msgid "Hexellence"
165+
msgstr ""
166+
167+
#: ../src/Widgets/Toolbars/CanvasBar.vala:53
168+
msgid "Gplay"
169+
msgstr ""
170+
171+
#: ../src/Widgets/Toolbars/CanvasBar.vala:54
172+
msgid "Geometry"
173+
msgstr ""
174+
175+
#: ../src/Widgets/Toolbars/CanvasBar.vala:55
176+
msgid "Dark geometric"
177+
msgstr ""
178+
179+
#: ../src/Widgets/Toolbars/CanvasBar.vala:56
180+
msgid "Light wool"
181+
msgstr ""
182+
183+
#: ../src/Widgets/Toolbars/CanvasBar.vala:57
184+
msgid "Silver scales"
185+
msgstr ""
186+
187+
#: ../src/Widgets/Toolbars/CanvasBar.vala:58
188+
msgid "Subtle grid"
189+
msgstr ""
190+
191+
#: ../src/Widgets/Toolbars/CanvasBar.vala:59
192+
msgid "Subtle squares"
193+
msgstr ""
194+
195+
#: ../src/Widgets/Toolbars/CanvasBar.vala:60
196+
msgid "XV"
197+
msgstr ""
198+
199+
#: ../src/Widgets/Toolbars/CanvasBar.vala:61
200+
msgid " None"
201+
msgstr ""
202+
203+
#: ../src/Widgets/Toolbars/TextBar.vala:41
204+
msgid "Font color"
205+
msgstr ""
206+
207+
#: ../src/Widgets/Toolbars/TextBar.vala:44
208+
msgid "Font Style"
209+
msgstr ""
210+
211+
#: ../src/Widgets/Toolbars/TextBar.vala:51
212+
msgid "Font"
213+
msgstr ""
214+
215+
#: ../src/Widgets/Toolbars/TextBar.vala:62
216+
msgid "Font size"
217+
msgstr ""
218+
219+
#: ../src/Widgets/Toolbars/CommonBar.vala:34
220+
msgid "Delete"
221+
msgstr ""
222+
223+
#: ../src/Widgets/Toolbars/CommonBar.vala:55
224+
msgid "Move up"
225+
msgstr ""
226+
227+
#: ../src/Widgets/Toolbars/CommonBar.vala:59
228+
msgid "Move down"
229+
msgstr ""
230+
231+
#: ../src/Widgets/Toolbars/ShapeBar.vala:27
232+
msgid "Shape color"
233+
msgstr ""
234+
235+
#: ../src/Application.vala:29
236+
msgid "Spice-Up"
237+
msgstr ""
238+
239+
#: ../src/Application.vala:31
240+
msgid "About Spice-Up"
241+
msgstr ""
242+
243+
#: ../src/Application.vala:51
244+
msgid "translator-credits"
245+
msgstr ""

‎src/Main.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Authored by: Felipe Escoto <felescoto95@hotmail.com>
2020
*/
2121

22-
public const string APP_NAME = "Presentations";
22+
public const string APP_NAME = "Spice-Up";
2323
public const string TERMINAL_NAME = "spice-up";
2424

2525
public static int main (string[] args) {

‎src/Widgets/ColorButton.vala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public class Spice.ColorPicker : ColorButton {
120120
gradient_type.halign = Gtk.Align.END;
121121
gradient_type.valign = Gtk.Align.END;
122122

123-
gradient_type.add_entry ("to bottom", "Vertical");
124-
gradient_type.add_entry ("to right", "Horizontal");
123+
gradient_type.add_entry ("to bottom", _("Vertical"));
124+
gradient_type.add_entry ("to right", _("Horizontal"));
125125
//gradient_type.add_entry ("radial", "Radial"); TODO: Gtk doesn't support radial gradients just yet
126126
gradient_type.text = "to bottom";
127127

‎src/Widgets/Welcome.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Spice.Welcome : Granite.Widgets.Welcome {
2323
public signal void open_file (File file);
2424

2525
public Welcome () {
26-
base ("Spice up", "Make a Simple Presentation");
26+
base ("Spice up", _("Make a Simple Presentation"));
2727
append ("document-new", _("New Presentation"), _("Create a new presentation"));
2828
append ("folder-open", _("Open File"), _("Open a saved presentation"));
2929

‎src/Window.vala‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ public class Spice.Window : Gtk.ApplicationWindow {
200200
if (toast != null && notification_shown) {
201201
toast.reveal_child = !is_fullscreen;
202202
}
203+
204+
if (slide_manager.current_slide != null) {
205+
slide_manager.current_slide.canvas.unselect_all ();
206+
}
203207
}
204208

205209
return false;
@@ -221,29 +225,33 @@ public class Spice.Window : Gtk.ApplicationWindow {
221225
case 65364: // Down Arrow
222226
case 32: // Spaceeeeeeee
223227
case 65293: // Enter
224-
next_slide ();
225-
return true;
228+
return next_slide ();
226229
// Previous Slide
227230
case 65361: //Left Arrow
228231
case 65362: // Up Arrow
229232
case 65288: // Backspace
230-
previous_slide ();
231-
return true;
233+
return previous_slide ();
232234
}
233235

234236
return false;
235237
}
236238

237-
private void next_slide () {
239+
private bool next_slide () {
238240
if (is_fullscreen) {
239241
this.slide_manager.next_slide ();
242+
return true;
240243
}
244+
245+
return false;
241246
}
242247

243-
private void previous_slide () {
248+
private bool previous_slide () {
244249
if (is_fullscreen) {
245250
this.slide_manager.previous_slide ();
251+
return true;
246252
}
253+
254+
return false;
247255
}
248256

249257
public void add_toast_notification (Granite.Widgets.Toast toast) {

0 commit comments

Comments
 (0)