Commit 4a45c8f3 authored by Federico Ceratto's avatar Federico Ceratto

Update upstream source from tag 'upstream/1.0-alpha2'

Update to upstream version '1.0-alpha2'
with Debian dir 21778437822725ff3f8aaf27d3154d4b3e2ed46d
parents 9510372d 74f35cfd
---
language: node_js
node_js:
- lts/*
sudo: required
services:
- docker
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++-5-dev
install:
- npm i -g @elementaryos/houston
script:
- houston ci
......@@ -9,18 +9,26 @@ Simple [Mastodon](https://github.com/tootsuite/mastodon) client for Linux
<a href='https://flathub.org/apps/details/com.github.bleakgrey.tootle'><img height='51' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
### Building
If the options above are not available to you, you can build the app from source:
### Building From Source
1. Make sure you have these dependencies:
- [x] meson
- [x] valac
- [x] libgtk-3-dev
- [x] libsoup2.4-dev
- [x] libjson-glib-dev
- [ ] libhandy-1.0-dev (>= 1.0.0)
*Note: Unchecked items will be installed automatically if not present in the system.*
Package Name | Required Version
--- |:---:
meson | 0.50
valac | 0.48
libglib-2.0-dev | 2.30.0
libjson-glib-dev | 1.4.4
libgee-0.8-dev | 0.8.5
libsoup2.4-dev | 2.64
libgtk-3-dev | 3.22.0
The following packages are also required, but will be installed automatically if not present in your system:
Package Name | Required Version
--- |:---:
libhandy-1.0-dev | 1.0.0
2. Run `install.sh` in the project directory. The app will launch automatically on success.
......
.avatar {
border-radius: 4px;
}
.header .chip {
padding: 4px 12px;
border-radius: 4px;
......@@ -9,13 +5,13 @@
}
.attachment {
border-radius: 6px;
border-radius: 5px;
background: rgba (150, 150, 150, 0.2);
padding:0px;
margin:0px;
}
.attachment .pic {
border-radius: 6px;
border-radius: 5px;
}
.attachment .chip {
padding: 6px;
......@@ -29,13 +25,32 @@
border-bottom: none;
}
.padded.app-view {
.padded.ttl-view {
margin: 32px 0 32px 0;
}
.app-view:not(.padded) .content row {
.ttl-view:not(.padded) .content row {
border-radius: 0px;
}
.app-action-bar .circular {
.ttl-action-bar .circular {
box-shadow: none;
}
.ttl-flat-button {
padding: 0px;
margin: 0px;
}
.ttl-post {
padding: 0px;
}
.ttl-thread-line {
background: @theme_fg_color;
opacity: .1;
margin-top: -8px;
margin-bottom: -8px;
}
.ttl-large-body {
font-size: 110%;
}
......@@ -55,6 +55,11 @@
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot1.png</image>
......@@ -62,14 +67,21 @@
<screenshot>
<image>https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot2.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot3.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot4.png</image>
</screenshot>
</screenshots>
<releases>
<release version="1.0.0-alpha1" date="2020-09-10">
<release version="1.0.0-alpha2" date="2020-10-30">
<description>
<ul>
<li>New app icon (Kudos to Tobias Bernard!)</li>
<li>New interface design</li>
<li>Added Lists and Conversations</li>
<li>Fixed bugs</li>
</ul>
</description>
......
......@@ -11,3 +11,5 @@ Keywords=toot;mastodon;social;network;post;
X-GNOME-Gettext-Domain=com.github.bleakgrey.tootle
X-GNOME-UsesNotifications=true
MimeType=x-scheme-handler/tootle;
# Translators: Do NOT translate or transliterate this text (these are enum types)!
X-Purism-FormFactor=Workstation;Mobile;
......@@ -2,23 +2,24 @@
<gresources>
<gresource prefix="/com/github/bleakgrey/tootle/">
<file alias="app.css">app.css</file>
<file preprocess="xml-stripblanks">ui/views/new_account.ui</file>
<file preprocess="xml-stripblanks">ui/views/base.ui</file>
<file preprocess="xml-stripblanks">ui/views/profile_header.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/status.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/accounts_button.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/accounts_button_item.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/profile_field_row.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/timeline_menu.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/list_item.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/list_editor_item.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/attachment_slot.ui</file>
<file preprocess="xml-stripblanks">ui/widgets/compose_attachment.ui</file>
<file preprocess="xml-stripblanks">ui/dialogs/new_account.ui</file>
<file preprocess="xml-stripblanks">ui/dialogs/compose.ui</file>
<file preprocess="xml-stripblanks">ui/dialogs/main.ui</file>
<file preprocess="xml-stripblanks">ui/dialogs/preferences.ui</file>
<file preprocess="xml-stripblanks">ui/dialogs/list_editor.ui</file>
<file preprocess="xml-stripblanks">ui/menus.ui</file>
<file>ui/views/new_account.ui</file>
<file>ui/views/base.ui</file>
<file>ui/views/profile_header.ui</file>
<file>ui/widgets/status.ui</file>
<file>ui/widgets/accounts_button.ui</file>
<file>ui/widgets/accounts_button_item.ui</file>
<file>ui/widgets/profile_field_row.ui</file>
<file>ui/widgets/timeline_menu.ui</file>
<file>ui/widgets/list_item.ui</file>
<file>ui/widgets/list_editor_item.ui</file>
<file>ui/widgets/attachment_slot.ui</file>
<file>ui/widgets/compose_attachment.ui</file>
<file>ui/widgets/adaptive_button.ui</file>
<file>ui/dialogs/new_account.ui</file>
<file>ui/dialogs/compose.ui</file>
<file>ui/dialogs/main.ui</file>
<file>ui/dialogs/preferences.ui</file>
<file>ui/dialogs/list_editor.ui</file>
<file>ui/menus.ui</file>
</gresource>
</gresources>
data/screenshot1.png

190 KB | W: | H:

data/screenshot1.png

187 KB | W: | H:

data/screenshot1.png
data/screenshot1.png
data/screenshot1.png
data/screenshot1.png
  • 2-up
  • Swipe
  • Onion skin
data/screenshot2.png

125 KB | W: | H:

data/screenshot2.png

142 KB | W: | H:

data/screenshot2.png
data/screenshot2.png
data/screenshot2.png
data/screenshot2.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -3,86 +3,88 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libhandy" version="1.0"/>
<template class="TootleDialogsCompose" parent="GtkWindow">
<template class="TootleDialogsCompose" parent="HdyWindow">
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="default_width">500</property>
<property name="default_height">250</property>
<property name="default_height">300</property>
<property name="type_hint">dialog</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="close">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_close" swapped="no"/>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child type="title">
<object class="HdyViewSwitcherTitle" id="mode_switcher">
<object class="HdyHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">mode</property>
</object>
</child>
<child>
<object class="GtkButton" id="commit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_commit" swapped="no"/>
<child>
<object class="GtkStack" id="commit_stack">
<child type="title">
<object class="HdyViewSwitcherTitle" id="mode_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">mode</property>
</object>
</child>
<child>
<object class="GtkButton" id="commit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_commit" swapped="no"/>
<child>
<object class="GtkLabel" id="commit_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Publish</property>
</object>
<packing>
<property name="name">ready</property>
</packing>
</child>
<child>
<object class="GtkSpinner">
<object class="GtkStack" id="commit_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="active">True</property>
<child>
<object class="GtkLabel" id="commit_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Publish</property>
</object>
<packing>
<property name="name">ready</property>
</packing>
</child>
<child>
<object class="GtkSpinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="active">True</property>
</object>
<packing>
<property name="name">working</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">working</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="close">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_close" swapped="no"/>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkStack" id="mode">
<property name="visible">True</property>
......@@ -397,7 +399,7 @@
</packing>
</child>
<style>
<class name="app-view"/>
<class name="ttl-view"/>
</style>
</object>
</child>
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<template class="TootleDialogsListEditor" parent="GtkWindow">
<template class="TootleDialogsListEditor" parent="HdyWindow">
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="default_width">300</property>
......@@ -17,6 +17,101 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child type="title">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Name</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">20</property>
<signal name="changed" handler="validate" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="cancel_btn">
<property name="label" translatable="yes">Cancel</property>
<property name="width_request">80</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="save_btn">
<property name="width_request">80</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_save_clicked" swapped="no"/>
<child>
<object class="GtkStack" id="save_btn_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Save</property>
</object>
<packing>
<property name="name">done</property>
</packing>
</child>
<child>
<object class="GtkSpinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="active">True</property>
</object>
<packing>
<property name="name">working</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkInfoBar" id="infobar">
<property name="visible">True</property>
......@@ -83,11 +178,6 @@
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSearchEntry" id="search_entry">
......@@ -110,11 +200,6 @@
<property name="placeholder_text" translatable="yes">Search among people you follow</property>
<signal name="search-changed" handler="on_search_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
......@@ -168,10 +253,12 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;span size="x-large"&gt;Nobody here&lt;/span&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Nobody here</property>
<property name="justify">center</property>
<property name="wrap">True</property>
<style>
<class name="title-2"/>
</style>
</object>
<packing>
<property name="expand">False</property>
......@@ -189,106 +276,6 @@
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child type="title">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Name</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">20</property>
<signal name="changed" handler="validate" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="cancel_btn">
<property name="label" translatable="yes">Cancel</property>
<property name="width_request">80</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="save_btn">
<property name="width_request">80</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_save_clicked" swapped="no"/>
<child>
<object class="GtkStack" id="save_btn_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Save</property>
</object>