Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new json object #268

Draft
wants to merge 5 commits into
base: new-file-format
Choose a base branch
from
Draft

Use new json object #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f28ed7
Update fr.po (#261)
NathanBnm Feb 2, 2019
09a7341
Require Gtk3.22 - Dropped support for older Gtk versions
Philip-Scott Feb 24, 2019
62ec19f
Respect privacy settings using Granite (#260)
Philip-Scott Mar 3, 2019
527f5e9
Use FileFormat items to load data
Philip-Scott Mar 4, 2019
2ba560f
Merge branch 'master' of github.com:Philip-Scott/Spice-up into new-fi…
Philip-Scott Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
add_definitions(-w)

set (PKG_DEPS
granite>=5.2.0
granite>=5.2.3
gee-0.8
gtk+-3.0>=3.9.10
gtk+-3.0>=3.22.0
json-glib-1.0
gudev-1.0
libevdev
Expand Down
48 changes: 24 additions & 24 deletions po/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ msgstr "Ma Présentation"
#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/FileManager.vala:104
#, c-format
msgid "By: %s"
msgstr "De: %s"
msgstr "De : %s"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/FileManager.vala:210
#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:85
Expand All @@ -69,27 +69,27 @@ msgstr "Contrôleur trouvé"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:67
msgid "Set up…"
msgstr "Configuration"
msgstr "Configuration…"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:150
msgid "Controller Configuration"
msgstr "Configuration du Contrôleur"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:159
msgid "Next Slide:"
msgstr "Suivant:"
msgstr "Suivant :"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:160
msgid "Previous Slide:"
msgstr "Précedent:"
msgstr "Précedent :"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:161
msgid "Set Jump:"
msgstr "Créer un saut:"
msgstr "Créer un saut :"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:162
msgid "Jump to slide:"
msgstr "Allez à la diapositive:"
msgstr "Allez à la diapositive :"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Services/GamepadSlideController.vala:163
msgid "Toggle Presentation:"
Expand All @@ -114,7 +114,7 @@ msgstr "..."
#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/CanvasItems/TextItem.vala:90
#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/CanvasItems/TextItem.vala:111
msgid "Click to add text..."
msgstr "Cliquer pour ajouter du text..."
msgstr "Cliquer pour ajouter du texte..."

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/ColorPicker/ColorPicker.vala:94
msgid "Color Palette"
Expand Down Expand Up @@ -154,19 +154,19 @@ msgstr "Annuler"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:76
msgid "Redo"
msgstr "Refaire"
msgstr "Rétablir"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:77
msgid "Insert Text Box"
msgstr "Insérer du text"
msgstr "Insérer du texte"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:78
msgid "Insert Image"
msgstr "Insérer une image"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:79
msgid "Insert Shape"
msgstr "Inseré une forme"
msgstr "Inserer une forme"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Headerbar.vala:80
msgid "Return to Welcome Screen"
Expand All @@ -179,23 +179,23 @@ msgstr "Commencer la Présentation"
#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Library/LibraryItem.vala:39
#, c-format
msgid "Open: %s"
msgstr "Ouvrir: %s"
msgstr "Ouvrir : %s"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Library/LibraryItem.vala:64
msgid "Name: "
msgstr "Nom: "
msgstr "Nom : "

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Library/LibraryItem.vala:70
msgid "Aspect Ratio: "
msgstr "Ratio: "
msgstr "Ratio : "

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Library/LibraryItem.vala:85
msgid "Open file location…"
msgstr "Ouvrir le dossier…"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Library/LibraryItem.vala:123
msgid "Could not rename: File already exists…"
msgstr "Renommage impossible: Le fichier existe déjà…"
msgstr "Impossible de renommer : Le fichier existe déjà…"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/PresenterView.vala:228
#, c-format
Expand All @@ -208,7 +208,7 @@ msgstr "Fin"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/SlideList.vala:225
msgid "Presenter Notes:"
msgstr "Notes du présentateur:"
msgstr "Notes du présentateur :"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:35
msgid "Background color"
Expand All @@ -228,7 +228,7 @@ msgstr "Tissu sombre"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:50
msgid "Fabric light"
msgstr "Tissu claire"
msgstr "Tissu clair"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:51
msgid "Batthern"
Expand Down Expand Up @@ -268,15 +268,15 @@ msgstr "Géométrie"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:60
msgid "Dark geometric"
msgstr "Sombre Géométrie"
msgstr "Géométrie sombre"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:61
msgid "Light wool"
msgstr "Laine fine"
msgstr "Laine claire"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:62
msgid "Neutral squares"
msgstr "Petits carrés neutres"
msgstr "Carrés neutres"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/CanvasBar.vala:63
msgid "Silver scales"
Expand Down Expand Up @@ -332,7 +332,7 @@ msgstr "Cercle"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/ShapeBar.vala:37
msgid "Roundness"
msgstr "Arrondir"
msgstr "Arrondi"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/ShapeBar.vala:56
msgid "Shape color"
Expand Down Expand Up @@ -368,7 +368,7 @@ msgstr "Bas"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/TextBar.vala:70
msgid "Font color"
msgstr "Couleur du text"
msgstr "Couleur du texte"

#: /home/felipe/Code/com.github.philip-scott.spice-up/po/../src/Widgets/Toolbars/TextBar.vala:73
msgid "Font Style"
Expand Down Expand Up @@ -410,10 +410,10 @@ msgstr "Ouvrir une présentation enregistrée"
#~ msgstr "Créer une Présentation"

#~ msgid "Color 1:"
#~ msgstr "Couleur 1:"
#~ msgstr "Couleur 1 :"

#~ msgid "Color 2:"
#~ msgstr "Couleur 2:"
#~ msgstr "Couleur 2 :"

#~ msgid "Vertical"
#~ msgstr "Verticale"
Expand All @@ -422,4 +422,4 @@ msgstr "Ouvrir une présentation enregistrée"
#~ msgstr "Horizontale"

#~ msgid "translator-credits"
#~ msgstr "Damien Bouthier"
#~ msgstr "Damien Bouthier / Corrections : NathanBnm"
13 changes: 5 additions & 8 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@

include(ValaPrecompile)

pkg_check_modules (GTK_3_22 QUIET gtk+-3.0>=3.20)
if (GTK_3_22_FOUND)
set (GLOBAL_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS} --define=GTK_3_22)
message ("-- Compiling for Gtk 3.22")
else (GTK_3_22_FOUND)
message ("-- Compiling for Gtk 3.18")
endif (GTK_3_22_FOUND)

vala_precompile(VALA_C
Main.vala
Application.vala
Expand All @@ -27,6 +19,11 @@ vala_precompile(VALA_C

Services/FileFormat/SpiceUpFile.vala
Services/FileFormat/ZipArchiveHandler.vala
Services/FileFormat/JsonObject.vala

Services/FileFormat/Objects/CanvasItem.vala
Services/FileFormat/Objects/Presentation.vala
Services/FileFormat/Objects/Slide.vala

Widgets/Canvas.vala
Widgets/EntryCombo.vala
Expand Down
Loading