Skip to content

Commit

Permalink
Merge pull request #181 from kmwallio/ui-experiment
Browse files Browse the repository at this point in the history
UI Improvements & libsoup3 migration
  • Loading branch information
kmwallio authored Jun 3, 2023
2 parents befa10b + d639507 commit e654b30
Show file tree
Hide file tree
Showing 55 changed files with 8,532 additions and 6,851 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ jobs:
- name: Add vala next
run: sudo add-apt-repository ppa:vala-team/daily

- name: Add libhandy-1 for focal
run: sudo add-apt-repository ppa:apandada1/libhandy-1

- name: Update Ubuntu
run: sudo apt-get update

- name: Install build essentials
run: sudo apt-get install build-essential meson ninja-build valac cmake libgtkspell3-3-dev libwebkit2gtk-4.0-dev libmarkdown2-dev libxml2-dev libarchive-dev libgtk-3-dev libgee-0.8-dev libgtksourceview-4-dev libsecret-1-dev libhandy-1-dev liblink-grammar-dev libjson-glib-dev
run: sudo apt-get install build-essential meson ninja-build valac cmake libgtkspell3-3-dev libwebkit2gtk-4.1-dev libmarkdown2-dev libxml2-dev libarchive-dev libgtk-3-dev libgee-0.8-dev libgtksourceview-4-dev libsecret-1-dev libhandy-1-dev liblink-grammar-dev libjson-glib-dev

- name: Init submodules
run: git submodule init
Expand Down
6 changes: 4 additions & 2 deletions .thiefsheets
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
"src",
"meson",
"po",
"tests"
"tests",
"builddir"
],
"folder-order" : [
"docs",
"po",
"tests"
"tests",
"builddir"
],
"notes" : "",
"icon" : ""
Expand Down
28 changes: 4 additions & 24 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,21 @@
"configurations": [
{
"name": "ThiefMD Launch",
"type": "cppdbg",
"type": "lldb",
"request": "launch",
"program": "${workspaceFolder}/build/com.github.kmwallio.thiefmd",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"console": "externalTerminal",
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
"console": "externalTerminal"
},
{
"name": "Tests Launch",
"type": "cppdbg",
"type": "lldb",
"request": "launch",
"program": "${workspaceFolder}/build/tests/tests",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
"console": "externalTerminal",
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
"console": "externalTerminal"
}
]
}
4 changes: 4 additions & 0 deletions DEB-Packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ Packages will be in parent directory.
## Push Tag

`git push origin v0.0.0-label`

## Running Under Debugger

`G_DEBUG=fatal-criticals gdb --args ./com.github.kmwallio.thiefmd`
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ yay -S thiefmd
* Czech Translation by [Vojtěch Perník](https://github.com/pervoj)
* Finnish Translation by Jiri Grönroos
* German Translation by Fish and Helix
* Polish Translation by Łukasz Horodecki

## Planning

Expand Down Expand Up @@ -158,6 +159,17 @@ $ sudo ninja install

[Prebuilt packages](https://github.com/kmwallio/ThiefMD/releases) are available.

### Building and Running the Tests

By default the code is built without tests. To compile the test suite the project has to be told to do so by setting the meson variable `build_tests`.

After that they can be built and run by `ninja`:

```bash
$ meson configure -Dbuild_tests=true build
$ cd build && ninja && ninja tests
```

## Acknowledgments

* [Contributors who help make ThiefMD awesome](https://github.com/kmwallio/ThiefMD/graphs/contributors)
Expand Down
1 change: 1 addition & 0 deletions data/app.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
<file alias="medium.png" compressed="false" preprocess="">icons/connections/medium.png</file>
<file alias="forem.png" compressed="false" preprocess="">icons/connections/forem.png</file>
<file alias="hashnode.png" compressed="false" preprocess="">icons/connections/hashnode.png</file>
<file alias="library.png" compressed="false" preprocess="">icons/other/library.png</file>
</gresource>
</gresources>
13 changes: 13 additions & 0 deletions data/com.github.kmwallio.thiefmd.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@
</screenshot>
</screenshots>
<releases>
<release version="0.2.7" date="2023-06-03" urgency="low">
<description>
<p>Like your files to fly solo? Open files from your file manager. Even abandon our library concept if you want to.</p>
<p>We also have a new out of box experience and some <i>hopefully</i> UI improvements.</p>
<p><b>Breaking Change</b> We've updated the Wordpress API. You now have to use Application Passwords.</p>
<ul>
<li>Add support for single file opening</li>
<li>Fix some null references</li>
<li>New UI</li>
</ul>
</description>
<url>https://github.com/kmwallio/ThiefMD/releases/tag/v0.2.7</url>
</release>
<release version="0.2.6" date="2022-06-26" urgency="low">
<description>
<p>Publish to Hashnode, Medium, or Forem! Share your story in more places faster than ever.</p>
Expand Down
3 changes: 2 additions & 1 deletion data/com.github.kmwallio.thiefmd.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Name=ThiefMD
GenericName=Thief Markdown Editor
Comment=The Markdown Editor worth Stealing
Categories=Office
Exec=com.github.kmwallio.thiefmd
Exec=com.github.kmwallio.thiefmd %U
Icon=com.github.kmwallio.thiefmd
Terminal=false
Type=Application
Keywords=markdown;text;editor;
MimeType=text/x-markdown;text/markdown;text/fountain;text/spmd;
Binary file added data/icons/other/library.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion data/language-specs
21 changes: 19 additions & 2 deletions data/styles/app-stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ menu {
color: @textColorPrimary;
}

.thiefmd-toolbar:backdrop, .thief-toolbar:backdrop, .thiefmd-toolbar:backdrop button {
background-image: linear-gradient(lighter(@colorPrimary), @colorPrimary 50%);
color: mix(@textColorPrimary, @colorPrimary, 0.5);
}

actionbar,
.action-bar {
border-top-color: transparent;
Expand Down Expand Up @@ -80,19 +85,31 @@ actionbar,
.thief-search-results *:hover:active {
background: @colorPrimaryActive;
color: @textColorActive;
border-bottom: 0px solid @textColorPrimary;
border-top: 0px solid @textColorPrimary;
border-left: 5px solid @selectionColor;
border-right: 0px;
}

filechooser actionbar, filechooser, filechooser stack, placessidebar, window {
background: @windowColor;
color: @colorPrimary;
}

placessidebar, treeview {
placessidebar, treeview, .thief-library-header {
background: lighter(@windowColor);
color: @colorPrimary;
border: 0;
}

.thief-library-header button:active,
.thief-library-header button:hover,
.thief-library-header button:hover:active {
background: lighter(@windowColor);
color: @textColorGlobal;
}

treeview.view header button {
treeview.view header button, .thief-library-header button {
background: lighter(@windowColor);
color: @colorPrimary;
}
Expand Down
18 changes: 3 additions & 15 deletions flatpak/com.github.kmwallio.thiefmd.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id": "com.github.kmwallio.thiefmd",
"runtime": "org.gnome.Platform",
"runtime-version": "41",
"runtime-version": "44",
"sdk": "org.gnome.Sdk",
"command": "com.github.kmwallio.thiefmd",
"finish-args": [
Expand Down Expand Up @@ -40,6 +40,7 @@
"sha256": "c30019506320ca2474d834cced1e2217ea533e00eb2a3f4eb7879007940ec682"
}]
},
"shared-modules/intltool/intltool-0.51.json",
{
"name": "gtkspell",
"cleanup": [
Expand All @@ -49,20 +50,7 @@
"type": "archive",
"url": "https://sourceforge.net/projects/gtkspell/files/3.0.10/gtkspell3-3.0.10.tar.xz",
"sha256": "b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732"
}],
"modules": [{
"name": "enchant",
"cleanup": [
"*.a"
],
"sources": [{
"type": "archive",
"url": "https://github.com/AbiWord/enchant/releases/download/v2.2.11/enchant-2.2.11.tar.gz",
"sha256": "a29c5777c4e45fcac2595c15c49d6d2aa434fa5e7c993dff3f9f367b65fe472a"
}]
},
"shared-modules/intltool/intltool-0.51.json"
]
}]
},
{
"name": "discount",
Expand Down
18 changes: 10 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Name our project
project('com.github.kmwallio.thiefmd', ['vala', 'c'],
version: '0.2.6'
version: '0.2.7'
)

# Application ID
Expand Down Expand Up @@ -131,17 +131,19 @@ executable(
'src/Widgets/ThemePreview.vala',
'src/Widgets/Thinking.vala',
'src/Widgets/MarkdownCheatSheet.vala',
'src/Widgets/SoloEditor.vala',
'src/Widgets/Welcome.vala',
'src/ultheme/src/HexColors.vala',
'src/ultheme/src/Ultheme.vala',
'src/writegood/src/language.vala',
'src/writegood/src/writegood.vala',
'src/writegood/src/en_us.vala',
'src/writeas/src/Writeas.vala',
'src/ghost/src/Ghost.vala',
'src/wordpress/src/Wordpress.vala',
'src/medium/src/Medium.vala',
'src/forem/src/Forem.vala',
'src/hashnode/src/Hashnode.vala',
'src/writeas/src/Writeas3.vala',
'src/ghost/src/Ghost3.vala',
'src/wordpress/src/Wordpress3.vala',
'src/medium/src/Medium3.vala',
'src/forem/src/Forem3.vala',
'src/hashnode/src/Hashnode3.vala',
'src/bibtex/src/BibTex.vala',
asresources,
c_args: c_args,
Expand All @@ -150,7 +152,7 @@ executable(
dependency('gtksourceview-4'),
dependency('gtk+-3.0'),
dependency('gtkspell3-3.0'),
dependency('webkit2gtk-4.0'),
dependency('webkit2gtk-4.1'),
dependency('json-glib-1.0'),
dependency('gee-0.8'),
dependency('libarchive'),
Expand Down
8 changes: 5 additions & 3 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ src/ultheme/src/Ultheme.vala
src/writegood/src/language.vala
src/writegood/src/writegood.vala
src/writegood/src/en_us.vala
src/writeas/src/Writeas.vala
src/ghost/src/Ghost.vala
src/wordpress/src/Wordpress.vala
src/writeas/src/Writeas3.vala
src/ghost/src/Ghost3.vala
src/wordpress/src/Wordpress3.vala
src/hashnode/src/Hashnode3.vala
src/forem/src/Forem3.vala
src/bibtex/src/BibTex.vala
Loading

0 comments on commit e654b30

Please sign in to comment.