Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

week-view, week-grid: various fixed

Browse Source 
This commit is a rebase, compile-warning remover and a
misbehaviour fixer too.
This commit is contained in:
Georges Basile Stavracas Neto
2016-12-01 23:48:53 -02:00
parent a94a15ebba
commit 154a01f4c1
7 changed files with 201 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/ui/week-header.ui
+26 -10
View File
@@ -63,19 +63,29 @@
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkButton" id="expand_button">
<object class="GtkBox" id="expand_button_box">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">GTK_ALIGN_END</property>
<signal name="clicked" handler="on_expand_action_activated" object="GcalWeekHeader" swapped="yes"/>
<style>
<class name="flat" />
<class name="circular" />
</style>
<property name="can_focus">False</property>
<property name="hexpand">False</property>
<child>
<object class="GtkImage" id="expand_button_image">
<object class="GtkButton" id="expand_button">
<property name="visible">True</property>
<property name="icon_name">go-down-symbolic</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="halign">center</property>
<property name="valign">end</property>
<property name="margin-bottom">6</property>
<signal name="clicked" handler="on_expand_action_activated" object="GcalWeekHeader" swapped="yes"/>
<style>
<class name="flat" />
<class name="circular" />
</style>
<child>
<object class="GtkImage" id="expand_button_image">
<property name="visible">True</property>
<property name="icon_name">go-down-symbolic</property>
</object>
</child>
</object>
</child>
</object>
@@ -186,4 +196,10 @@
</object>
</child>
</template>
<object class="GtkSizeGroup" id="sizegroup">
<property name="mode">horizontal</property>
<widgets>
<widget name="expand_button_box"/>
</widgets>
</object>
</interface>
data/ui/week-view.ui
+5 -3
View File
@@ -10,12 +10,13 @@
<object class="GcalWeekHeader" id="header">
<property name="visible">True</property>
<property name="active-date" bind-source="GcalWeekView" bind-property="active-date" bind-flags="default" />
<property name="sidebar-width-offset" bind-source="GcalWeekView" bind-property="sidebar-width-offset" bind-flags="default" />
</object>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
@@ -28,12 +29,13 @@
<property name="visible">True</property>
<property name="height-request">2568</property>
<signal name="draw" handler="gcal_week_view_draw_hours" object="GcalWeekView" swapped="yes" />
<signal name="size-allocate" handler="gcal_week_view_hours_bar_size_allocate" object="GcalWeekView" swapped="yes" />
</object>
</child>
<child>
<object class="GcalWeekGrid" id="week_grid">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
</child>
</object>
@@ -43,4 +45,4 @@
</object>
</child>
</template>
</interface>
</interface>