Skip to content

Commit d52c5b9

Browse files
committed
organize the code, fix some broken translations
1 parent 2b2438a commit d52c5b9

File tree

7 files changed

+16
-24
lines changed

7 files changed

+16
-24
lines changed

po/de.po

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ msgid "New sticky note"
8484
msgstr "Neue Haftnotiz"
8585

8686
#: src/MainWindow.vala:165
87-
#, fuzzy
8887
msgid "Delete sticky note "
8988
msgstr "Haftnotiz Löschen"
9089

@@ -230,7 +229,6 @@ msgstr ""
230229

231230
#: data/io.github.ellie_commons.jorts.desktop.in:4
232231
#: data/io.github.ellie_commons.jorts.metainfo.xml.in:40
233-
#, fuzzy
234232
msgid "Sticky notes"
235233
msgstr "Neue Haftnotiz"
236234

po/es.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ msgid "New sticky note"
8484
msgstr "Nueva nota adhesiva"
8585

8686
#: src/MainWindow.vala:165
87-
#, fuzzy
8887
msgid "Delete sticky note "
8988
msgstr "Eliminar nota adhesiva"
9089

po/fr.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ msgid "New sticky note"
8585
msgstr "Nouveau post-it"
8686

8787
#: src/MainWindow.vala:165
88-
#, fuzzy
8988
msgid "Delete sticky note "
9089
msgstr "Supprimer le post-it"
9190

po/pt.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ msgid "New sticky note"
8484
msgstr "Nova nota adesiva"
8585

8686
#: src/MainWindow.vala:165
87-
#, fuzzy
8887
msgid "Delete sticky note "
8988
msgstr "Excluir nota adesiva"
9089

po/pt_br.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ msgid "New sticky note"
8484
msgstr "Nova nota adesiva"
8585

8686
#: src/MainWindow.vala:165
87-
#, fuzzy
8887
msgid "Delete sticky note "
8988
msgstr "Excluir nota adesiva"
9089

src/Application.vala

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,23 @@ namespace jorts {
3838
Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
3939
Intl.textdomain (GETTEXT_PACKAGE);
4040

41-
/* // Follow whether dark or light
41+
// FIXME: Dark breaks a few things: border, font of editablelabel, buttons in popover
4242
var granite_settings = Granite.Settings.get_default ();
4343
var gtk_settings = Gtk.Settings.get_default ();
44-
*/
45-
/* gtk_settings.gtk_application_prefer_dark_theme = (
46-
granite_settings.prefers_color_scheme == DARK
47-
);
44+
gtk_settings.gtk_application_prefer_dark_theme = (
45+
granite_settings.prefers_color_scheme == DARK
46+
);
4847

4948
granite_settings.notify["prefers-color-scheme"].connect (() => {
5049
gtk_settings.gtk_application_prefer_dark_theme = (
5150
granite_settings.prefers_color_scheme == DARK
5251
);
53-
}); */
54-
55-
// Somehow without this the CSS isnt applied
56-
// Shouldnt it be automatic :(
57-
var app_provider = new Gtk.CssProvider ();
58-
app_provider.load_from_resource ("/io/github/ellie_commons/jorts/Application.css");
59-
Gtk.StyleContext.add_provider_for_display (
60-
Gdk.Display.get_default (),
61-
app_provider,
62-
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1
63-
);
52+
});
6453

65-
// build all the stylesheets
66-
jorts.Themer.init_all_themes();
6754

6855

56+
// build all the stylesheets
57+
jorts.Themer.init_all_themes();
6958
}
7059

7160
static construct {

src/Services/Themer.vala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,15 @@ namespace jorts.Themer {
155155

156156
public static void init_all_themes() {
157157

158+
// Also the standard sheet
159+
var app_provider = new Gtk.CssProvider ();
160+
app_provider.load_from_resource ("/io/github/ellie_commons/jorts/Application.css");
161+
Gtk.StyleContext.add_provider_for_display (
162+
Gdk.Display.get_default (),
163+
app_provider,
164+
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1
165+
);
166+
158167
debug("Init all themes");
159168
foreach (unowned var theme in jorts.Utils.themearray) {
160169
// Palette color

0 commit comments

Comments
 (0)