Skip to content

Commit

Permalink
Fixes display issues of too wide notifications, bumps GTK version in …
Browse files Browse the repository at this point in the history 
…glade files

Resolves phuhl#103
Resovles phuhl#40


Former-commit-id: 74cb7a1
  • Loading branch information
@phuhl
phuhl committed Dec 18, 2020
1 parent f674112 commit 540eee0
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 93 deletions.
58 changes: 28 additions & 30 deletions notification.glade
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path style.css -->
<object class="GtkWindow" id="main_window">
<property name="width_request">300</property>
<property name="can_focus">False</property>
<property name="width-request">300</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="type">popup</property>
<property name="role">notification</property>
<property name="resizable">False</property>
<property name="type_hint">notification</property>
<property name="type-hint">notification</property>
<child>
<object class="GtkOverlay">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="vexpand">True</property>
<child>
<object class="GtkLabel" id="label_background">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="vexpand">True</property>
</object>
<packing>
Expand All @@ -30,14 +30,14 @@
<child type="overlay">
<object class="GtkBox" id="box_container">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage" id="img_img">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="vexpand">True</property>
<property name="pixel_size">185</property>
<property name="pixel-size">185</property>
<property name="icon_size">0</property>
<style>
<class name="deadd-noti-center"/>
Expand All @@ -54,22 +54,22 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">15</property>
<property name="margin_right">10</property>
<property name="can-focus">False</property>
<property name="margin-start">15</property>
<property name="margin-end">10</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="baseline_position">bottom</property>
<property name="baseline-position">bottom</property>
<child>
<object class="GtkLabel" id="label_titel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_top">10</property>
<property name="margin-top">10</property>
<property name="label" translatable="yes">Titel</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="wrap-mode">word-char</property>
<style>
<class name="notification"/>
<class name="title"/>
Expand All @@ -85,11 +85,12 @@
<child>
<object class="GtkLabel" id="label_body">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="use_markup">True</property>
<property name="use-markup">True</property>
<property name="wrap">True</property>
<property name="wrap-mode">char</property>
<style>
<class name="notification"/>
<class name="body"/>
Expand All @@ -105,7 +106,7 @@
<child>
<object class="GtkBox" id="box_actions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<child>
<placeholder/>
Expand All @@ -126,17 +127,17 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<child>
<object class="GtkImage" id="img_icon">
<property name="width_request">10</property>
<property name="height_request">10</property>
<property name="width-request">10</property>
<property name="height-request">10</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="margin_right">10</property>
<property name="margin-right">10</property>
<property name="icon_size">0</property>
<style>
<class name="deadd-noti-center"/>
Expand All @@ -153,7 +154,7 @@
<child>
<object class="GtkLabel" id="label_appname">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Appname</property>
<style>
Expand All @@ -180,7 +181,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
Expand All @@ -193,9 +194,6 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
<style>
<class name="blurredBG"/>
<class name="notification"/>
Expand Down
69 changes: 37 additions & 32 deletions notification_center.glade
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path style.css -->
<object class="GtkWindow" id="main_window">
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="type">popup</property>
<property name="role">notification-center</property>
<property name="resizable">False</property>
Expand All @@ -13,11 +14,12 @@
<child>
<object class="GtkOverlay">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<child>
<object class="GtkDrawingArea" id="main_bg">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="index">-1</property>
Expand All @@ -26,23 +28,24 @@
<child type="overlay">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="can-focus">False</property>
<property name="margin-start">10</property>
<property name="margin-end">5</property>
<property name="margin-bottom">5</property>
<property name="hexpand">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">20</property>
<property name="can-focus">False</property>
<property name="margin-bottom">20</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label_time">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin_top">5</property>
<property name="margin-top">5</property>
<property name="label" translatable="yes">01:31</property>
<style>
<class name="deadd-noti-center"/>
Expand All @@ -59,7 +62,7 @@
<child>
<object class="GtkLabel" id="label_date">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Sonntag, 09.04.2017</property>
<style>
Expand All @@ -83,13 +86,15 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="button_deleteAll">
<property name="label" translatable="yes">Alle Löschen</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
<property name="relief">none</property>
<style>
Expand All @@ -105,21 +110,24 @@
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="min_content_height">312</property>
<property name="propagate_natural_width">True</property>
<property name="propagate_natural_height">True</property>
<property name="can-focus">True</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="hscrollbar-policy">never</property>
<property name="min-content-height">312</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="shadow_type">none</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkBox" id="box_notis">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">20</property>
<child>
Expand All @@ -138,15 +146,15 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
Expand All @@ -155,17 +163,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
<style>
<class name="blurredBG"/>
</style>
Expand Down
Loading

0 comments on commit 540eee0

Please sign in to comment.