Skip to content

Commit 35a13d6

Browse files
authored
Merge branch 'main' into wpkelso/styles/switch-size
2 parents 7fb7677 + e53019c commit 35a13d6

File tree

17 files changed

+1173
-36
lines changed

17 files changed

+1173
-36
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
- name: Install Dependencies
2424
run: |
2525
apt update
26-
apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac
26+
apt install -y meson gobject-introspection libgee-0.8-dev libgirepository1.0-dev libgtk-4-dev libshumate-dev sassc valac valadoc gtk-doc-tools
2727
- name: Build
2828
env:
2929
DESTDIR: out
3030
PKG_CONFIG_PATH: ${{ github.workspace }}/build/meson-uninstalled
3131
run: |
32-
meson build
32+
meson setup build -Ddocumentation=true
3333
ninja -C build
3434
ninja -C build install
3535

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ You'll need the following dependencies:
2222
To build the Demo you'll additionally need:
2323
* libshumate-dev
2424

25-
Run `meson build` to configure the build environment:
25+
Run `meson setup` to configure the build environment:
2626

27-
meson build --prefix=/usr
27+
meson setup build --prefix=/usr
2828

2929
This command creates a `build` directory. For all following commands, change to
3030
the build directory before running them.

data/granite.metainfo.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="7.7.0" date="2025-02-10" urgency="medium">
30+
<release version="7.7.0" date="2025-09-30" urgency="medium">
3131
<description>
3232
<p>New Icons:</p>
3333
<ul>

demo/Views/HyperTextViewGrid.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class HyperTextViewGrid : DemoPage {
2727
var hypertext_scrolled_window = new Gtk.ScrolledWindow () {
2828
height_request = 300,
2929
width_request = 600,
30-
child = hypertext_textview
30+
child = hypertext_textview,
31+
has_frame = true
3132
};
32-
hypertext_scrolled_window.add_css_class (Granite.STYLE_CLASS_FRAME);
3333

3434
var box = new Granite.Box (VERTICAL, NONE) {
3535
halign = CENTER,

demo/Views/WelcomeView.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class WelcomeView : DemoPage {
4545
margin_start = 12
4646
};
4747
listbox.set_placeholder (search_placeholder);
48-
listbox.add_css_class (Granite.STYLE_CLASS_FRAME);
48+
listbox.add_css_class (Granite.CssClass.CARD);
4949

5050
var search_entry = new Gtk.SearchEntry () {
5151
margin_top = 12,

lib/StyleManager.vala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Granite.StyleManager : Object {
2121

2222
/**
2323
* Returns the {@link Granite.StyleManager} that handles the default display
24-
* as gotten by {@link Gdk.Display.get_default ()}.
24+
* as gotten by {@link Gdk.Display.get_default}.
2525
*/
2626
public static unowned StyleManager get_default () {
2727
return style_managers_by_displays[Gdk.Display.get_default ()];
@@ -44,8 +44,8 @@ public class Granite.StyleManager : Object {
4444

4545
/**
4646
* The {@link Granite.Settings.ColorScheme} requested by the application
47-
* Uses value from {@link Granite.Settings.prefers_color_scheme} when set to {@link Granite.Settings.ColorScheme.NO_PREFERENCE }.
48-
* Default value is {@link Granite.Settings.ColorScheme.NO_PREFERENCE }
47+
* Uses value from {@link Granite.Settings.prefers_color_scheme} when set to {@link Granite.Settings.ColorScheme.NO_PREFERENCE}.
48+
* Default value is {@link Granite.Settings.ColorScheme.NO_PREFERENCE}
4949
*/
5050
public Settings.ColorScheme color_scheme { get; set; default = NO_PREFERENCE; }
5151

lib/Widgets/Box.vala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111
[Version (since = "7.7.0")]
1212
public class Granite.Box : Gtk.Box {
13+
[Version (since = "7.7.0")]
1314
public enum Spacing {
1415
NONE,
1516
// Spacing between groups of related controls like {@link Gtk.CheckButton}

po/LINGUAS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ yo
188188
za
189189
zh
190190
zh_CN
191-
zh_HK
192191
zh_TW
193192
zu
194193
ace
@@ -204,3 +203,6 @@ ca@valencia
204203
en_ZA
205204
pap
206205
sco
206+
zh_HK
207+
zh_HANT
208+
zh_HANS

po/extra/LINGUAS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ yo
188188
za
189189
zh
190190
zh_CN
191-
zh_HK
192191
zh_TW
193192
zu
194193
ace
@@ -204,3 +203,6 @@ ca@valencia
204203
en_ZA
205204
pap
206205
sco
206+
zh_HK
207+
zh_HANT
208+
zh_HANS

po/extra/he.po

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-07-09 01:07+0000\n"
11-
"PO-Revision-Date: 2025-03-12 14:55+0000\n"
11+
"PO-Revision-Date: 2025-10-08 05:55+0000\n"
1212
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
1313
"Language-Team: Hebrew <https://l10n.elementaryos.org/projects/desktop/"
1414
"granite-extra/he/>\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20-
"X-Generator: Weblate 5.10.2\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121

2222
#: data/granite.metainfo.xml.in:11
2323
msgid "Granite 7"
@@ -40,28 +40,28 @@ msgid "elementary, Inc."
4040
msgstr "elementary בע״מ."
4141

4242
#: data/granite.metainfo.xml.in:32
43-
#, fuzzy
44-
#| msgid "New Constants:"
4543
msgid "New Icons:"
46-
msgstr "קבועים חדשים:"
44+
msgstr "סמלים חדשים:"
4745

4846
#: data/granite.metainfo.xml.in:34
4947
msgid ""
5048
"View icons for columns, grids, lists, and reader mode. Plus horizontal and "
5149
"vertical ellipsis icons"
5250
msgstr ""
51+
"הצגת סמלים לעמודות, רשתות, רשימות ומצב קריאה. לרבות סמלי השמטה אופקיים "
52+
"ואנכיים"
5353

5454
#: data/granite.metainfo.xml.in:35
5555
msgid "Start and End show/hide sidebar icons"
5656
msgstr ""
5757

5858
#: data/granite.metainfo.xml.in:36
5959
msgid "Emoji category icons used by GTK's emoji picker"
60-
msgstr ""
60+
msgstr "סמלי קטגוריות אמוג׳י שבשימוש בורר האמוג׳י של GTK"
6161

6262
#: data/granite.metainfo.xml.in:37
6363
msgid "Eye icons required by Gtk.PasswordEntry"
64-
msgstr ""
64+
msgstr "סמלי עיניים שנחוצים ל־Gtk.PasswordEntry"
6565

6666
#: data/granite.metainfo.xml.in:39 data/granite.metainfo.xml.in:75
6767
#: data/granite.metainfo.xml.in:92 data/granite.metainfo.xml.in:156
@@ -73,32 +73,37 @@ msgstr "יכולות חדשות:"
7373
msgid ""
7474
"Box is an orientable widget that includes standardized spacing and linked "
7575
"styles"
76-
msgstr ""
76+
msgstr "התיבה - Box היא וידג׳ט שניתן ליישר שכולל סגנונות ריווח וקישור תקניים"
7777

7878
#: data/granite.metainfo.xml.in:42
7979
msgid "ListItem is a standard list widget that includes styles and spacing"
80-
msgstr ""
80+
msgstr "ListItem הוא וידג׳ט רשימה רגיל שכולל סגנונות וריווח"
8181

8282
#: data/granite.metainfo.xml.in:43
8383
msgid "ToolBox is a vertical layout widget for top and bottom toolbars"
8484
msgstr ""
85+
"סרגל הכלים - ToolBox הוא וידג׳ט בפריסה אנכית לסרגלי כלים עליונים או תחתונים"
8586

8687
#: data/granite.metainfo.xml.in:44
8788
msgid ""
8889
"new style class constants for labels: CssClass.NUMERIC and CssClass.MONOSPACE"
89-
msgstr ""
90+
msgstr "קבועי מחלקות סגנון חדשים לתוויות: CssClass.NUMERIC ו־CssClass.MONOSPACE"
9091

9192
#: data/granite.metainfo.xml.in:45
9293
msgid ""
9394
"StyleManager handles automatically setting dark and light modes as well as "
9495
"system accent colors using Portals"
9596
msgstr ""
97+
"מנהל הסגנונות - StyleManager מטפל בהגדרת המצבים כהה ובהיר אוטומטית לרבות "
98+
"גווני המערכת המשניים באמצעות שערים (Portals)"
9699

97100
#: data/granite.metainfo.xml.in:46
98101
msgid ""
99102
"BackButton is a standardized navigation button that activates "
100103
"\"navigation.pop\" and includes a shortcut tooltip"
101104
msgstr ""
105+
"כפתור חזרה - BackButton הוא כפתור ניווט תקני שמפעיל „navigation.pop” וכולל "
106+
"חלונית עצה למקשי הקיצור שלו"
102107

103108
#: data/granite.metainfo.xml.in:48 data/granite.metainfo.xml.in:79
104109
#: data/granite.metainfo.xml.in:98 data/granite.metainfo.xml.in:120
@@ -109,16 +114,17 @@ msgstr "שיפורים:"
109114

110115
#: data/granite.metainfo.xml.in:50
111116
msgid "accel_to_string now uses the word \"Super\" instead of the \"\" symbol"
112-
msgstr ""
117+
msgstr "accel_to_string משתמשת מעתה בביטוי „חלונות/סופר” במקום בסמל „⌘”"
113118

114119
#: data/granite.metainfo.xml.in:51
115120
msgid ""
116121
"HeaderLabel has a new property for H1-H4 sizes and H2 styles are now bolder"
117122
msgstr ""
123+
"ל־HeaderLabel יש מאפיין חדש לגדלים H1-‏H4 וסגנונות H2 מודגשים יותר מעכשיו"
118124

119125
#: data/granite.metainfo.xml.in:52
120126
msgid "CssClass.CARD is now rounded by default"
121-
msgstr ""
127+
msgstr "CssClass.CARD מעוגל מעתה כברירת מחדל"
122128

123129
#: data/granite.metainfo.xml.in:53 data/granite.metainfo.xml.in:85
124130
#: data/granite.metainfo.xml.in:106 data/granite.metainfo.xml.in:123
@@ -144,18 +150,16 @@ msgid ""
144150
msgstr ""
145151

146152
#: data/granite.metainfo.xml.in:60
147-
#, fuzzy
148-
#| msgid "Improvements:"
149153
msgid "Demo Improvements:"
150-
msgstr "שיפורים:"
154+
msgstr "שיפורים בהדגמה:"
151155

152156
#: data/granite.metainfo.xml.in:62
153157
msgid "More demo pages with more widgets"
154158
msgstr ""
155159

156160
#: data/granite.metainfo.xml.in:63
157161
msgid "Color scheme switcher in the sidebar"
158-
msgstr ""
162+
msgstr "בורר ערכות צבע בסרגל הצד"
159163

160164
#: data/granite.metainfo.xml.in:77
161165
msgid "Granite.Bin"

0 commit comments

Comments
 (0)