Skip to content

Commit

Permalink
1.4.2 - Some UI stuff, new font.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lains committed Sep 8, 2018
1 parent 4acaca7 commit ab12db3
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 12 deletions.
9 changes: 9 additions & 0 deletions data/com.github.lainsce.notejot.appdata.xml
View file
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.2" date="2018-09-14">
<description>
<p>Release: New Note Tech</p>
<ul>
<li>New font, as requested by users.</li>
<li>Some small UI fixes.</li>
</ul>
</description>
</release>
<release version="1.4.1" date="2018-09-07">
<description>
<p>Release: New Note Tech</p>
Expand Down
Binary file added data/font/Lavi.ttf
View file
Binary file not shown.
Binary file removed data/font/Markery.ttf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions data/meson.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ install_data(
)

install_data(
join_paths('font', 'Markery.ttf'),
join_paths('font', 'Lavi.ttf'),
install_dir: join_paths(get_option('datadir'), 'fonts', 'truetype', 'quilt')
)
)
Binary file modified data/shot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
com.github.lainsce.notejot (1.4.2) xenial; urgency=low

* New stuff, does anyone read this?

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

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

* New UI and stuff.
Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Name our project
project('com.github.lainsce.notejot', ['vala', 'c'],
version: '1.4.1'
version: '1.4.2'
)

# Import main lib files
Expand Down
42 changes: 33 additions & 9 deletions src/MainWindow.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ namespace Notejot {
}

this.get_style_context().add_class("rounded");
this.get_style_context().add_class("default-decoration");
this.get_style_context().add_class("notejot-window");
this.uid = uid_counter++;

update_theme();
Expand Down Expand Up @@ -138,13 +140,10 @@ namespace Notejot {
string style = null;
string selected_color = this.color;
style = (N_("""
@define-color textColorPrimary #1a1a1a;
@define-color textColorPrimary #323232;
.mainwindow-%d {
background-color: %s;
font-weight: 300;
font-family: 'Markery', fantasy;
font-size: 1.33em;
}
.notejot-view:selected {
Expand All @@ -163,10 +162,10 @@ namespace Notejot {
.window-%d .notejot-title image,
.window-%d .notejot-label {
color: %s;
font-family: 'Lavi', fantasy;
}
.window-%d .notejot-bar,
.window-%d .notejot-bar image {
.window-%d .notejot-bar {
color: %s;
background-color: %s;
border-top-color: %s;
Expand All @@ -175,24 +174,37 @@ namespace Notejot {
padding: 3px;
}
.window-%d .notejot-bar image {
color: %s;
padding: 3px;
background-image: none;
}
.window-%d .notejot-view,
.window-%d .notejot-view text,
.window-%d .notejot-title {
background-color: %s;
background-image: none;
border-bottom-color: %s;
font-family: 'Lavi', fantasy;
font-weight: 300;
font-size: 1.33em;
color: #000;
box-shadow: none;
}
.color-button {
border-radius: 50%;
background-image: none;
border: 2px solid alpha(@BLACK_300, 0.3);
box-shadow:
inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
0 1px 0 0 alpha (@bg_highlight_color, 0.3);
}
.color-button:hover,
.color-button:focus {
.color_button:focus {
border: 2px solid @BLACK_300;
}
Expand Down Expand Up @@ -231,7 +243,7 @@ namespace Notejot {
.color-cocoa {
background-color: #a3907c;
}
""")).printf(uid, selected_color, uid, uid, selected_color_text, uid, uid, selected_color_text, selected_color, selected_color, uid, uid, selected_color, selected_color);
""")).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);

try {
css_provider.load_from_data(style, -1);
Expand Down Expand Up @@ -263,6 +275,7 @@ namespace Notejot {

private void create_app_menu () {
var color_button_white = new Gtk.Button ();
color_button_white.has_focus = false;
color_button_white.halign = Gtk.Align.CENTER;
color_button_white.height_request = 24;
color_button_white.width_request = 24;
Expand All @@ -273,6 +286,7 @@ namespace Notejot {
color_button_white_context.add_class ("color-white");

var color_button_red = new Gtk.Button ();
color_button_red.has_focus = false;
color_button_red.halign = Gtk.Align.CENTER;
color_button_red.height_request = 24;
color_button_red.width_request = 24;
Expand All @@ -283,6 +297,7 @@ namespace Notejot {
color_button_red_context.add_class ("color-red");

var color_button_orange = new Gtk.Button ();
color_button_orange.has_focus = false;
color_button_orange.halign = Gtk.Align.CENTER;
color_button_orange.height_request = 24;
color_button_orange.width_request = 24;
Expand All @@ -293,6 +308,7 @@ namespace Notejot {
color_button_orange_context.add_class ("color-orange");

var color_button_yellow = new Gtk.Button ();
color_button_yellow.has_focus = false;
color_button_yellow.halign = Gtk.Align.CENTER;
color_button_yellow.height_request = 24;
color_button_yellow.width_request = 24;
Expand All @@ -303,6 +319,7 @@ namespace Notejot {
color_button_yellow_context.add_class ("color-yellow");

var color_button_green = new Gtk.Button ();
color_button_green.has_focus = false;
color_button_green.halign = Gtk.Align.CENTER;
color_button_green.height_request = 24;
color_button_green.width_request = 24;
Expand All @@ -313,6 +330,7 @@ namespace Notejot {
color_button_green_context.add_class ("color-green");

var color_button_blue = new Gtk.Button ();
color_button_blue.has_focus = false;
color_button_blue.halign = Gtk.Align.CENTER;
color_button_blue.height_request = 24;
color_button_blue.width_request = 24;
Expand All @@ -323,6 +341,7 @@ namespace Notejot {
color_button_blue_context.add_class ("color-blue");

var color_button_indigo = new Gtk.Button ();
color_button_indigo.has_focus = false;
color_button_indigo.halign = Gtk.Align.CENTER;
color_button_indigo.height_request = 24;
color_button_indigo.width_request = 24;
Expand All @@ -333,6 +352,7 @@ namespace Notejot {
color_button_indigo_context.add_class ("color-indigo");

var color_button_cocoa = new Gtk.Button ();
color_button_cocoa.has_focus = false;
color_button_cocoa.halign = Gtk.Align.CENTER;
color_button_cocoa.height_request = 24;
color_button_cocoa.width_request = 24;
Expand All @@ -343,6 +363,7 @@ namespace Notejot {
color_button_cocoa_context.add_class ("color-cocoa");

var color_button_slate = new Gtk.Button ();
color_button_slate.has_focus = false;
color_button_slate.halign = Gtk.Align.CENTER;
color_button_slate.height_request = 24;
color_button_slate.width_request = 24;
Expand All @@ -363,12 +384,15 @@ namespace Notejot {
color_button_box.pack_start (color_button_cocoa, false, true, 0);
color_button_box.pack_start (color_button_slate, false, true, 0);

var color_button_label = new Granite.HeaderLabel (_("Note Color"));

var setting_grid = new Gtk.Grid ();
setting_grid.margin = 12;
setting_grid.column_spacing = 6;
setting_grid.row_spacing = 6;
setting_grid.orientation = Gtk.Orientation.VERTICAL;
setting_grid.attach (color_button_box, 0, 0, 1, 1);
setting_grid.attach (color_button_label, 0, 0, 1, 1);
setting_grid.attach (color_button_box, 0, 1, 1, 1);
setting_grid.show_all ();

var popover = new Gtk.Popover (null);
Expand Down

0 comments on commit ab12db3

Please sign in to comment.