Skip to content

Commit

Permalink
Merge remote branch “origin/master”
Browse files Browse the repository at this point in the history
  • Loading branch information
Nokse22 committed Jan 11, 2024
2 parents b4698af + cb629c0 commit 0ba5e20
Show file tree
Hide file tree
Showing 44 changed files with 4,615 additions and 1,607 deletions.
548 changes: 548 additions & 0 deletions ascii-draw-window.cmb

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
<gresources>
<gresource prefix="/io/github/nokse22/asciidraw">
<file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
<file preprocess="xml-stripblanks">ui/window.ui</file>
<file preprocess="xml-stripblanks">ui/new_palette.ui</file>
<file preprocess="xml-stripblanks">ui/canvas.ui</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/eraser-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/paintbrush-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/text-symbolic.svg</file>
Expand All @@ -13,5 +16,9 @@
<file preprocess="xml-stripblanks">icons/16x16/actions/increase-canvas-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/table-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/tree-list-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/format-text-italic-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/sidebar-show-right-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/line-style-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/edit-undo-symbolic.svg</file>
</gresource>
</gresources>
File renamed without changes.
File renamed without changes
4 changes: 4 additions & 0 deletions data/icons/16x16/actions/edit-undo-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions data/icons/16x16/actions/format-text-italic-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions data/icons/16x16/actions/line-style-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
8 changes: 8 additions & 0 deletions data/icons/16x16/actions/sidebar-show-right-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
3 changes: 0 additions & 3 deletions data/io.github.nokse22.asciidraw.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
</key>
<key name="window-height" type="i">
<default>800</default>
</key>
<key name="palettes" type="s">
<default>'█░▒▓'</default>
</key>
</schema>
</schemalist>
9 changes: 9 additions & 0 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ desktop_file = i18n.merge_file(
install_dir: join_paths(get_option('datadir'), 'applications')
)

pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())

gnome.compile_resources('ascii-draw',
'ascii-draw.gresource.xml',
gresource_bundle: true,
install: true,
install_dir: pkgdatadir,
)

desktop_utils = find_program('desktop-file-validate', required: false)
if desktop_utils.found()
test('Validate desktop file', desktop_utils, args: [desktop_file])
Expand Down
53 changes: 53 additions & 0 deletions data/ui/canvas.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<interface>
<!-- interface-name canvas.ui -->
<requires lib="gtk" version="4.0"/>
<requires lib="libadwaita" version="1.0"/>
<template class="Canvas" parent="AdwBin">
<child>
<object class="GtkScrolledWindow">
<child>
<object class="GtkOverlay">
<property name="child">
<object class="GtkGrid" id="draw_grid">
<property name="css-classes">ascii-textview
canvas-shadow</property>
<property name="halign">start</property>
<property name="valign">start</property>
</object>
</property>
<property name="halign">center</property>
<property name="margin-bottom">12</property>
<property name="margin-end">12</property>
<property name="margin-start">12</property>
<property name="margin-top">12</property>
<property name="valign">center</property>
<child type="overlay">
<object class="GtkGrid" id="preview_grid">
<property name="can-focus">False</property>
<property name="css-classes">ascii-preview</property>
<property name="halign">start</property>
<property name="valign">start</property>
</object>
</child>
<child type="overlay">
<object class="GtkDrawingArea" id="draw_drawing_area">
<property name="css-classes">ascii-textview
canvas-shadow</property>
</object>
</child>
<child type="overlay">
<object class="GtkDrawingArea" id="preview_drawing_area">
<property name="css-classes">ascii-preview</property>
</object>
</child>
<child type="overlay">
<object class="GtkDrawingArea" id="drawing_area"/>
</child>
</object>
</child>
</object>
</child>
</template>
</interface>
71 changes: 71 additions & 0 deletions data/ui/new_palette.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<interface>
<!-- interface-name ascii-draw-new-palette.ui -->
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.2"/>
<template class="NewPaletteWindow" parent="AdwWindow">
<property name="default-height">360</property>
<property name="default-width">360</property>
<property name="modal">True</property>
<property name="title" translatable="yes">New palette</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="AdwHeaderBar">
<property name="css-classes">flat</property>
</object>
</child>
<child>
<object class="GtkBox">
<child>
<object class="GtkBox">
<property name="hexpand">True</property>
<property name="margin-bottom">12</property>
<property name="margin-end">12</property>
<property name="margin-start">12</property>
<property name="margin-top">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="vexpand">True</property>
<child>
<object class="AdwEntryRow" id="palette_name_entry">
<property name="css-classes">card</property>
<property name="title" translatable="yes">Palette name</property>
</object>
</child>
<child>
<object class="GtkTextView">
<property name="bottom-margin">12</property>
<property name="buffer">
<object class="GtkTextBuffer" id="palette_chars_buffer"/>
</property>
<property name="css-classes">card</property>
<property name="left-margin">12</property>
<property name="right-margin">12</property>
<property name="top-margin">12</property>
<property name="vexpand">True</property>
<property name="wrap-mode">word-char</property>
</object>
</child>
<child>
<object class="GtkButton" id="add_button">
<property name="css-classes">suggested-action
pill</property>
<property name="halign">center</property>
<property name="label" translatable="yes">Save</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<signal name="clicked" handler="on_add_clicked"/>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</template>
</interface>

Loading

0 comments on commit 0ba5e20

Please sign in to comment.