Skip to content

Commit

Permalink
Improve usability for the phone form factor
Browse files Browse the repository at this point in the history
- Fix window sizes
- Add or remove some scrollbars
- Shortcuts window still has issue
issue: #44
iman-salmani committed Jun 30, 2023
1 parent 8c19b34 commit 7a759f4
Showing 22 changed files with 189 additions and 177 deletions.
2 changes: 1 addition & 1 deletion src/ui/backup_window.ui
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="BackupWindow" parent="AdwWindow">
<property name="width-request">480</property>
<property name="width-request">360</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<property name="content"><!-- Content -->
1 change: 0 additions & 1 deletion src/ui/calendar/calendar.ui
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
<requires lib="Adw" version="1.0" />
<template class="Calendar" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">480</property>
<child><!-- Calendar Header -->
<object class="GtkBox">
<style>
1 change: 0 additions & 1 deletion src/ui/calendar/calendar_page.ui
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
<requires lib="Adw" version="1.0" />
<template class="CalendarPage" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">480</property>
<child><!-- Scrolled Window - Its for horizontal layout-->
<object class="GtkScrolledWindow" id="scrolled_window">
<property name="vexpand">true</property>
1 change: 0 additions & 1 deletion src/ui/calendar/tasks_list.ui
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
<requires lib="Adw" version="1.0" />
<template class="TasksList" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">480</property>
<property name="margin-bottom">24</property>
<child>
<object class="GtkBox"><!-- header -->
4 changes: 2 additions & 2 deletions src/ui/preferences_window.ui
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="PreferencesWindow" parent="AdwPreferencesWindow">
<property name="width-request">320</property>
<property name="height-request">320</property>
<property name="width-request">360</property>
<property name="height-request">294</property>
<child>
<object class="AdwPreferencesPage">
<child>
2 changes: 1 addition & 1 deletion src/ui/project/project_create_window.ui
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="ProjectCreateWindow" parent="GtkWindow">
<property name="width-request">480</property>
<property name="width-request">360</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<child type="titlebar"><!-- Header -->
226 changes: 111 additions & 115 deletions src/ui/project/project_edit_window.ui
Original file line number Diff line number Diff line change
@@ -3,137 +3,133 @@
<interface>
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="ProjectEditWindow" parent="AdwWindow">
<property name="width-request">480</property>
<template class="ProjectEditWindow" parent="GtkWindow">
<property name="width-request">360</property>
<property name="height-request">294</property>
<property name="default-height">480</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<property name="content"><!-- Content -->
<object class="GtkBox">
<property name="orientation">vertical</property>
<child><!-- Header -->
<object class="AdwHeaderBar">
<property name="title-widget">
<object class="GtkLabel">
<property name="label" translatable="yes">Edit Project</property>
<style>
<class name="heading" />
</style>
</object>
</property>
<property name="titlebar"><!-- Header -->
<object class="AdwHeaderBar">
<property name="title-widget">
<object class="GtkLabel">
<property name="label" translatable="yes">Edit Project</property>
<style>
<class name="flat" />
<class name="heading" />
</style>
</object>
</child>
<!-- End Header -->
<child><!-- Icon -->
<object class="GtkLabel" id="icon_label">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<style>
<class name="project-icon" />
<class name="large" />
</style>
</object>
</child>
<!-- End Icon -->
<child><!-- Profile -->
<object class="AdwPreferencesGroup">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<child><!-- Name -->
<object class="AdwEntryRow" id="name_entry_row">
<property name="title" translatable="yes">Name</property>
<property name="show-apply-button">true</property>
<signal name="apply" handler="handle_name_entry_row_apply" swapped="true" />
</property>
<style>
<class name="flat" />
</style>
</object>
</property><!-- End Header -->
<child><!-- Content -->
<object class="GtkScrolledWindow">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child><!-- Icon -->
<object class="GtkLabel" id="icon_label">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<style>
<class name="project-icon" />
<class name="large" />
</style>
</object>
</child>
<!-- End Name -->
<child><!-- Icon Row -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Icon</property>
<property name="activatable-widget">icon_menu_button</property>
<child type="suffix">
<object class="GtkMenuButton" id="icon_menu_button">
<property name="has-frame">false</property>
<property name="valign">center</property>
<property name="popover">
<object class="GtkEmojiChooser">
<signal name="emoji-picked" handler="handle_project_emoji_picked"
swapped="true" />
</child><!-- End Icon -->
<child><!-- Profile -->
<object class="AdwPreferencesGroup">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<child><!-- Name -->
<object class="AdwEntryRow" id="name_entry_row">
<property name="title" translatable="yes">Name</property>
<property name="show-apply-button">true</property>
<signal name="apply" handler="handle_name_entry_row_apply" swapped="true" />
</object>
</child><!-- End Name -->
<child><!-- Icon Row -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Icon</property>
<property name="activatable-widget">icon_menu_button</property>
<child type="suffix">
<object class="GtkMenuButton" id="icon_menu_button">
<property name="has-frame">false</property>
<property name="valign">center</property>
<property name="popover">
<object class="GtkEmojiChooser">
<signal name="emoji-picked" handler="handle_project_emoji_picked"
swapped="true" />
</object>
</property>
</object>
</property>
</child>
</object>
</child>
</object>
</child>
<!-- End Icon Row -->
<child><!-- Description -->
<object class="AdwExpanderRow" id="description_expander_row">
<property name="title" translatable="yes">Description</property>
<property name="subtitle-lines">1</property>
<child>
<object class="GtkTextView">
<property name="height-request">128</property>
<property name="top-margin">3</property>
<property name="bottom-margin">3</property>
<property name="left-margin">3</property>
<property name="right-margin">3</property>
<property name="wrap-mode">word</property>
<property name="buffer">
<object class="GtkTextBuffer" id="description_buffer">
</child><!-- End Icon Row -->
<child><!-- Description -->
<object class="AdwExpanderRow" id="description_expander_row">
<property name="title" translatable="yes">Description</property>
<property name="subtitle-lines">1</property>
<child>
<object class="GtkTextView">
<property name="height-request">80</property>
<property name="top-margin">3</property>
<property name="bottom-margin">3</property>
<property name="left-margin">3</property>
<property name="right-margin">3</property>
<property name="wrap-mode">word</property>
<property name="buffer">
<object class="GtkTextBuffer" id="description_buffer">
</object>
</property>
</object>
</property>
</child>
</object>
</child>
</child><!-- End Description -->
</object>
</child>
<!-- End Description -->
</object>
</child>
<!-- End Profile -->
<child><!-- Delete & Archive -->
<object class="AdwPreferencesGroup">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<child><!-- Archive -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Archive</property>
<property name="activatable-widget">archive_switch</property>
<child type="suffix">
<object class="GtkSwitch" id="archive_switch">
<property name="valign">center</property>
</child><!-- End Profile -->
<child><!-- Delete & Archive -->
<object class="AdwPreferencesGroup">
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<child><!-- Archive -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Archive</property>
<property name="activatable-widget">archive_switch</property>
<child type="suffix">
<object class="GtkSwitch" id="archive_switch">
<property name="valign">center</property>
</object>
</child>
</object>
</child>
</object>
</child>
<!-- End Archive-->
<child><!-- Delete -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Delete</property>
<property name="activatable-widget">delete_button</property>
<child type="suffix">
<object class="GtkButton" id="delete_button">
<property name="valign">center</property>
<property name="icon-name">user-trash-symbolic</property>
<signal name="clicked" handler="handle_delete_button_clicked" swapped="true" />
<style>
<class name="flat" />
</style>
</child><!-- End Archive-->
<child><!-- Delete -->
<object class="AdwActionRow">
<property name="title" translatable="yes">Delete</property>
<property name="activatable-widget">delete_button</property>
<child type="suffix">
<object class="GtkButton" id="delete_button">
<property name="valign">center</property>
<property name="icon-name">user-trash-symbolic</property>
<signal name="clicked" handler="handle_delete_button_clicked" swapped="true" />
<style>
<class name="flat" />
</style>
</object>
</child>
</object>
</child>
</child><!-- Delete -->
</object>
</child>
<!-- Delete -->
</child><!-- End Delete & Archive -->
</object>
</child>
<!-- End Delete & Archive -->
</object>
</property>
<!-- End Content -->
</child><!-- End Content -->
</template>
</interface>
1 change: 0 additions & 1 deletion src/ui/project/project_lists.ui
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
<property name="vexpand">true</property>
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
<property name="width-request">480</property>
<child>
<object class="GtkBox" id="sections_box">
<property name="orientation">vertical</property>
2 changes: 1 addition & 1 deletion src/ui/project/section_box.ui
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<requires lib="Adw" version="1.0" />
<template class="SectionBox" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="width-request">480</property>
<property name="width-request">256</property>
<child><!-- Header -->
<object class="GtkBox" id="header">
<property name="margin-start">12</property>
5 changes: 3 additions & 2 deletions src/ui/record/record_window.ui
Original file line number Diff line number Diff line change
@@ -4,8 +4,9 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="RecordWindow" parent="GtkWindow">
<property name="width-request">480</property>
<property name="height-request">480</property>
<property name="width-request">360</property>
<property name="height-request">294</property>
<property name="default-height">480</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<property name="titlebar">
4 changes: 2 additions & 2 deletions src/ui/reminder/reminder_window.ui
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="ReminderWindow" parent="GtkWindow">
<property name="width-request">480</property>
<property name="height-request">480</property>
<property name="width-request">360</property>
<property name="height-request">294</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<property name="titlebar">
12 changes: 8 additions & 4 deletions src/ui/search/search_window.ui
Original file line number Diff line number Diff line change
@@ -4,8 +4,10 @@
<requires lib="gtk" version="4.0" />
<requires lib="Adw" version="1.0" />
<template class="SearchWindow" parent="GtkWindow">
<property name="width-request">480</property>
<property name="height-request">480</property>
<property name="width-request">360</property>
<property name="height-request">294</property>
<property name="default-width">480</property>
<property name="default-height">480</property>
<property name="modal">true</property>
<property name="destroy-with-parent">true</property>
<property name="titlebar">
@@ -21,8 +23,7 @@
<child type="start">
<object class="GtkToggleButton" id="show_done_tasks_toggle_button">
<property name="icon-name">object-select-symbolic</property>
<signal name="toggled" handler="handle_show_done_tasks_toggle_button_toggled"
swapped="true" />
<signal name="toggled" handler="handle_show_done_tasks_toggle_button_toggled" swapped="true" />
</object>
</child>
</object>
@@ -53,6 +54,9 @@
<property name="icon-name">system-search-symbolic</property>
<property name="title" translatable="yes">no results found</property>
<property name="visible">false</property>
<style>
<class name="compact" />
</style>
</object>
</child>
</object>
6 changes: 2 additions & 4 deletions src/ui/shortcuts_window.ui
Original file line number Diff line number Diff line change
@@ -39,8 +39,7 @@
</object>
</child>
</object>
</child>
<!-- End Application -->
</child><!-- End Application -->
<child><!-- Tasks -->
<object class="GtkShortcutsGroup">
<property name="title" translatable="yes" context="shortcut window">Tasks</property>
@@ -52,8 +51,7 @@
</object>
</child>
</object>
</child>
<!-- End Tasks -->
</child><!-- End Tasks -->
</object>
</child>
</object>
Loading

0 comments on commit 7a759f4

Please sign in to comment.