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

event-editor: Use AdwEntryRow

Browse Source
This commit is contained in:
Christopher Davis
2022-07-07 12:53:22 -04:00
parent 1be5fe53b5
commit 905128cc69
3 changed files with 9 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+1 -1
View File
@@ -163,7 +163,7 @@ libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.45.1')
libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.45.1') libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.45.1')
libecal_dep = dependency('libecal-2.0', version: '>= 3.45.1') libecal_dep = dependency('libecal-2.0', version: '>= 3.45.1')
libsoup_dep = dependency('libsoup-3.0') libsoup_dep = dependency('libsoup-3.0')
libadwaita_dep = dependency('libadwaita-1', version: '>= 1.0.0') libadwaita_dep = dependency('libadwaita-1', version: '>= 1.2.alpha')
glib_dep = dependency('glib-2.0', version: '>= 2.67.5') glib_dep = dependency('glib-2.0', version: '>= 2.67.5')
gtk_dep = dependency('gtk4', version: '>= 4.6.0') gtk_dep = dependency('gtk4', version: '>= 4.6.0')
gio_dep = dependency('gio-2.0', version: '>= 2.58.0') gio_dep = dependency('gio-2.0', version: '>= 2.58.0')
src/gui/event-editor/gcal-summary-section.c
-24
View File
@@ -51,27 +51,6 @@ enum
N_PROPS N_PROPS
}; };
/*
* Auxiliary methods
*/
static void
make_entry_expandable (GtkEditable *entry)
{
GtkWidget *child;
for (child = gtk_widget_get_first_child (GTK_WIDGET (entry));
child;
child = gtk_widget_get_next_sibling (child))
{
if (!GTK_IS_TEXT (child))
continue;
gtk_text_set_propagate_text_width (GTK_TEXT (child), TRUE);
}
}
/* /*
* GcalEventEditorSection interface * GcalEventEditorSection interface
*/ */
@@ -204,7 +183,4 @@ static void
gcal_summary_section_init (GcalSummarySection *self) gcal_summary_section_init (GcalSummarySection *self)
{ {
gtk_widget_init_template (GTK_WIDGET (self)); gtk_widget_init_template (GTK_WIDGET (self));
make_entry_expandable (self->location_entry);
make_entry_expandable (self->summary_entry);
} }
src/gui/event-editor/gcal-summary-section.ui
+8 -22
View File
@@ -12,37 +12,23 @@
<!-- Summary --> <!-- Summary -->
<child> <child>
<object class="AdwActionRow"> <object class="AdwEntryRow" id="summary_entry">
<property name="title" translatable="yes">Title</property> <property name="title" translatable="yes">Title</property>
<property name="activatable-widget">summary_entry</property>
<child>
<object class="GtkEntry" id="summary_entry">
<property name="hexpand">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="width-chars">20</property>
<property name="max-width-chars">30</property>
</object>
</child>
</object> </object>
</child> </child>
<!-- Location --> <!-- Location -->
<child> <child>
<object class="AdwActionRow"> <object class="AdwEntryRow" id="location_entry">
<property name="title" translatable="yes">Location</property> <property name="title" translatable="yes">Location</property>
<property name="activatable-widget">location_entry</property>
<child> <child type="suffix">
<object class="GtkEntry" id="location_entry"> <object class="GtkButton">
<property name="hexpand">True</property>
<property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="width-chars">20</property> <property name="icon-name">find-location-symbolic</property>
<property name="max-width-chars">30</property> <style>
<property name="secondary_icon_name">find-location-symbolic</property> <class name="flat"/>
</style>
</object> </object>
</child> </child>