Skip to content

Commit

Permalink
1.4.3 - Some UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Lains committed Nov 8, 2018
1 parent 5419cac commit ae2784c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 15 deletions.
9 changes: 9 additions & 0 deletions data/com.github.lainsce.notejot.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
<releases>
<release version="1.4.3" date="2018-11-09">
<description>
<p>Release: Font Foraging</p>
<ul>
<li>Revert font decision.</li>
<li>Some small UI fixes.</li>
</ul>
</description>
</release>
<release version="1.4.2" date="2018-09-14">
<description>
<p>Release: New Note Tech</p>
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
com.github.lainsce.notejot (1.4.3) xenial; urgency=low

* New stuff. Please read the enclosed appdata book.

-- Lains <[email protected]> Fri, 09 Nov 2018 13:04:00 -0300

com.github.lainsce.notejot (1.4.2) xenial; urgency=low

* New stuff, does anyone read this?
Expand Down
3 changes: 3 additions & 0 deletions meson/post_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
if not os.environ.get('DESTDIR'):
print('Compiling gsettings schemas…')
subprocess.call(['glib-compile-schemas', schemadir], shell=False)

print('Rebuilding desktop icons cache...')
subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False)
1 change: 1 addition & 0 deletions src/EditableLabel.vala
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class Notejot.EditableLabel : Gtk.EventBox {
style = """
.notejot-label {
font-weight: 700;
font-size: 0.88em;
}
.notejot-label:backdrop {
color: mix (@textColorPrimary, @colorPrimary, 0.3);
Expand Down
28 changes: 13 additions & 15 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
namespace Notejot {
public class MainWindow : Gtk.Window {
private Gtk.Button delete_item;
private Gtk.SourceView view = new Gtk.SourceView ();
private Gtk.TextView view = new Gtk.TextView ();
private Gtk.HeaderBar header;
private Gtk.ActionBar actionbar;
private int uid;
private static int uid_counter = 0;
public string color = "#fff394";
public string selected_color_text = "#333333";
public string selected_color_text = "#ad5f00";
public string content = "";
public string title_name = "Notejot";
public Notejot.EditableLabel label;
Expand Down Expand Up @@ -146,13 +146,9 @@ namespace Notejot {
background-color: %s;
}
.notejot-view:selected {
color: @textColorPrimary;
}
.notejot-view:selected {
color: #FFFFFF;
background-color: #64baff;
.notejot-view text selection {
color: shade(%s, 1.88);
background-color: %s;
}
entry.flat {
Expand All @@ -162,6 +158,7 @@ namespace Notejot {
.window-%d .notejot-title image,
.window-%d .notejot-label {
color: %s;
box-shadow: none;
}
.window-%d .notejot-bar {
Expand All @@ -176,6 +173,7 @@ namespace Notejot {
.window-%d .notejot-bar image {
color: %s;
padding: 3px;
box-shadow: none;
background-image: none;
}
Expand All @@ -185,16 +183,16 @@ namespace Notejot {
background-color: %s;
background-image: none;
border-bottom-color: %s;
font-weight: 300;
font-size: 1.33em;
color: #000;
font-weight: 500;
font-size: 1.2em;
color: shade(%s, 0.5);
box-shadow: none;
}
.color-button {
border-radius: 50%;
background-image: none;
border: 2px solid alpha(@BLACK_300, 0.3);
border: 1px solid alpha(@BLACK_300, 0.25);
box-shadow:
inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
Expand All @@ -203,7 +201,7 @@ namespace Notejot {
.color-button:hover,
.color_button:focus {
border: 2px solid @BLACK_300;
border: 1px solid @BLACK_300;
}
.color-slate {
Expand Down Expand Up @@ -241,7 +239,7 @@ namespace Notejot {
.color-cocoa {
background-color: #a3907c;
}
""")).printf(uid, selected_color, uid, uid, selected_color_text, uid, selected_color_text, selected_color, selected_color, uid, selected_color_text, uid, uid, uid, selected_color, selected_color);
""")).printf(uid, selected_color, selected_color, selected_color_text, uid, uid, selected_color_text, uid, selected_color_text, selected_color, selected_color, uid, selected_color_text, uid, uid, uid, selected_color, selected_color, selected_color_text);

try {
css_provider.load_from_data(style, -1);
Expand Down

3 comments on commit ae2784c

@decathorpe
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't add release dates from the future. appstream-glib fails validation of the appdata file because of it, and it prevents me from building this package for fedora until that date comes around - because appdata validation is mandatory.

@lainsce
Copy link
Owner

@lainsce lainsce commented on ae2784c Nov 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I time my releases to when they actually are in AppCenter following reviews.

@decathorpe
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a bit ... unusual, but okay 🤷

Please sign in to comment.