Skip to content

Commit

Permalink
Update the help page
Browse files Browse the repository at this point in the history
  • Loading branch information
maoschanz committed Jul 9, 2019
1 parent 11c7dcf commit 7439a78
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 90 deletions.
5 changes: 2 additions & 3 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@

## General

- Important: elementary support
- VERY important: WHAT THE HELL WITH THE FUCKING FILE CORRUPTIONS ??????
- Very important: don't save the `/run/user/1000/doc/...` path in dconf ?????
- Not important: support more desktop environments (Pantheon ? Budgie ? Unity ? MATE ? Cinnamon ?) -> budgie works already ?
- Not important: more clear and useful error messages, including line numbers

## Translations

- Important: provide translations to the description in `data/com.github.maoschanz.DynamicWallpaperEditor.appdata.xml.in` but without cluttering the `.po` file with release notes bullshit
- Very important: update existing translations
- Important: provide translations to the description in `data/com.github.maoschanz.DynamicWallpaperEditor.appdata.xml.in`, but without cluttering the `.po` file with release notes bullshit
- Not important: Provide translations for the help user manual

20 changes: 10 additions & 10 deletions data/com.github.maoschanz.DynamicWallpaperEditor.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
</screenshots>

<releases>
<!-- <release version="1.14" date="2018-07-12"> -->
<!-- <description> -->
<!-- <ul> -->
<!-- <li>Better UI for the slideshow mode</li> -->
<!-- <li>More helpful labels for the daylight mode</li> -->
<!-- <li>Pantheon desktop support</li> -->
<!-- <li>Various bug fixes</li> -->
<!-- </ul> -->
<!-- </description> -->
<!-- </release> -->
<release version="2.0" date="2018-07-09">
<description>
<ul>
<li>Better UI for the slideshow mode</li>
<li>More helpful labels for the daylight mode</li>
<li>Other desktop environments support</li>
<li>Various bug fixes</li>
</ul>
</description>
</release>
<release version="1.13" date="2018-07-05">
<description>
<ul>
Expand Down
Binary file modified help/C/figures/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 15 additions & 12 deletions help/C/index.page
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title type="text">Dynamic Wallpaper Editor</title>
<credit type="author">
<name>Romain F. T.</name>
<years>2018</years>
<years>2018-2019</years>
</credit>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
Expand All @@ -17,22 +17,25 @@
</title>

<p>GNOME Shell natively allows the wallpaper to change automatically over
time, so your wallpaper can be for example:</p>
<list>
<item><p>a slideshow of your favorite pictures</p></item>
<item><p>an image adapting to the daylight</p></item>
</list>
time, so your wallpaper can be for example a slideshow of your favorite
pictures, or an image adapting to the daylight.</p>
<p>Dynamic wallpapers are saved as XML files, and this utility helps you
creating, editing, and applying them.</p>
<media type="image" mime="image/png" src="figures/screenshot.png" its:translate="no"/>

<section id="type">
<title>Select a type of wallpaper</title>
<p>The three available types are <gui style="menuitem">Slideshow</gui> (all
pictures have the same duration), <gui style="menuitem">Time of the day</gui>
(each picture has its own duration, and the total is 24 hours), and
<gui style="menuitem">Custom</gui> (each picture has its own duration). The
default value is <gui style="menuitem">Custom</gui>.</p>
<p>The three available types are:</p>
<list>
<item><p><gui style="button">Slideshow</gui> (all pictures have the same
duration)</p></item>
<item><p><gui style="button">Time of the day</gui> (each picture has its
own duration, and the total is 24 hours)</p></item>
<item><p><gui style="button">Custom</gui> (each picture has its own
duration).</p></item>
</list>
<p>When you open an empty window to create a new wallpaper, the default
value is <gui style="button">Custom</gui>.</p>
<p>When you open an existing XML file, the existing type is detected.</p>
</section>

Expand Down Expand Up @@ -67,7 +70,7 @@

<section id="save-apply">
<title>Save and apply as wallpaper</title>
<p>Save your creation as an XML file (with the <gui style="menuitem">Save</gui>
<p>Save your creation as an XML file (with the <gui style="button">Save</gui>
button), and apply it as a wallpaper with the <gui style="button">Set as
wallpaper</gui> button. Adjustment options (zoom, centered, stretched, etc.)
are available from the menu next to it.</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(
'dynamic-wallpaper-editor',
version: '1.14.0',
version: '2.0.0',
meson_version: '>= 0.50.0',
)

Expand Down
84 changes: 22 additions & 62 deletions src/ui/menus.ui
Original file line number Diff line number Diff line change
Expand Up @@ -123,27 +123,28 @@
</submenu>
</section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">View</attribute>
<section>
<attribute name="label" translatable="yes">Wallpaper type</attribute>
<item>
<attribute name="action">win.wallpaper-type</attribute>
<attribute name="label" translatable="yes">Slideshow</attribute>
<attribute name="target">slideshow</attribute>
</item>
<item>
<attribute name="action">win.wallpaper-type</attribute>
<attribute name="label" translatable="yes">Daylight</attribute>
<attribute name="target">daylight</attribute>
</item>
<item>
<attribute name="action">win.wallpaper-type</attribute>
<attribute name="label" translatable="yes">Custom</attribute>
<attribute name="target">custom</attribute>
</item>
</section>
</submenu>
<!-- <submenu> -->
<!-- <attribute name="label" translatable="yes">View</attribute> -->
<!-- <section> -->
<!-- FIXME ne marche pas car on se repose sur l'activation des radiobuttons dans le code -->
<!-- <attribute name="label" translatable="yes">Wallpaper type</attribute> -->
<!-- <item> -->
<!-- <attribute name="action">win.wallpaper-type</attribute> -->
<!-- <attribute name="label" translatable="yes">Slideshow</attribute> -->
<!-- <attribute name="target">slideshow</attribute> -->
<!-- </item> -->
<!-- <item> -->
<!-- <attribute name="action">win.wallpaper-type</attribute> -->
<!-- <attribute name="label" translatable="yes">Daylight</attribute> -->
<!-- <attribute name="target">daylight</attribute> -->
<!-- </item> -->
<!-- <item> -->
<!-- <attribute name="action">win.wallpaper-type</attribute> -->
<!-- <attribute name="label" translatable="yes">Custom</attribute> -->
<!-- <attribute name="target">custom</attribute> -->
<!-- </item> -->
<!-- </section> -->
<!-- </submenu> -->
<submenu>
<attribute name="label" translatable="yes">Help</attribute>
<section>
Expand Down Expand Up @@ -191,45 +192,4 @@
</item>
</section>
</menu>

<menu id="eee">
<section>
<attribute name="label" translatable="yes">Background adjustment</attribute>
<!-- <item> -->
<!-- <attribute name="action">win.pic_options</attribute> -->
<!-- <attribute name="label" translatable="yes">None</attribute> -->
<!-- <attribute name="target">none</attribute> -->
<!-- </item> -->
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Mosaic</attribute>
<attribute name="target">wallpaper</attribute>
</item>
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Centered</attribute>
<attribute name="target">centered</attribute>
</item>
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Scaled</attribute>
<attribute name="target">scaled</attribute>
</item>
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Streched</attribute>
<attribute name="target">streched</attribute>
</item>
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Zoom</attribute>
<attribute name="target">zoom</attribute>
</item>
<item>
<attribute name="action">win.pic_options</attribute>
<attribute name="label" translatable="yes">Spanned</attribute>
<attribute name="target">spanned</attribute>
</item>
</section>
</menu>
</interface>
5 changes: 3 additions & 2 deletions src/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __init__(self, **kwargs):
self._is_saved = True
self.check_24 = False
self.desktop_env = os.getenv('XDG_CURRENT_DESKTOP', 'GNOME')
self.set_show_menubar(False) # TODO show it with Cinnamon ??
self.set_show_menubar(False) # TODO fix it, then show it with Cinnamon ??
# The issue with Cinnamon is with the start time popover

# Used in the "add pictures" file chooser dialog
Expand Down Expand Up @@ -222,7 +222,8 @@ def get_setting_keys(self):
wp_options = None
if 'Budgie' in self.desktop_env:
pass # Doesn't support XML wallpapers XXX ???
elif 'GNOME' in self.desktop_env or 'Pantheon' in self.desktop_env:
elif 'GNOME' in self.desktop_env or 'Pantheon' in self.desktop_env \
or 'Unity' in self.desktop_env:
gsettings = Gio.Settings.new('org.gnome.desktop.background')
wp_path = 'picture-uri'
wp_options = 'picture-options'
Expand Down

0 comments on commit 7439a78

Please sign in to comment.