Skip to content

Commit

Permalink
*
Browse files Browse the repository at this point in the history
  • Loading branch information
@lainsce
lainsce committed Jun 25, 2024
1 parent 6c48fc6 commit c305c6e
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 164 deletions.
1 change: 0 additions & 1 deletion data/ui/edit_notebooks.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<property name="orientation">vertical</property>
<child>
<object class="HeAppBar">
<property name="show-buttons">1</property>
<property name="show-back">0</property>
<property name="scroller">sw</property>
<property name="viewtitle-widget">
Expand Down
70 changes: 70 additions & 0 deletions data/ui/main_menu.ui
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<template class="NotejotWidgetsMainMenu" parent="GtkBox">
<property name="orientation">1</property>
<style>
<class name="notejot-theme"/>
</style>
<child>
<object class="GtkBox">
<property name="orientation">1</property>
<property name="spacing">6</property>
<property name="margin-start">6</property>
<property name="margin-end">10</property>
<child>
<object class="GtkLabel">
<property name="label" translatable="true">Font Size</property>
<property name="halign">1</property>
<style>
<class name="caption"/>
<class name="dim-label"/>
</style>
</object>
</child>
<child>
<object class="HeSegmentedButton">
<child>
<object class="GtkToggleButton" id="s">
<property name="label">Small</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'small'"</property>
</object>
</child>
<child>
<object class="GtkToggleButton">
<property name="label">Medium</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'medium'"</property>
<property name="group">s</property>
</object>
</child>
<child>
<object class="GtkToggleButton">
<property name="label">Large</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'large'"</property>
<property name="group">s</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="HeDivider"></object>
</child>
<child>
<object class="HeTextButton" id="about_button">
<property name="hexpand">true</property>
<property name="action-name">win.action_about</property>
<property name="child">
<object class="HeButtonContent">
<property name="icon">dialog-information-symbolic</property>
<property name="label" translatable="true">About Notejot</property>
</object>
</property>
</object>
</child>
</template>
</interface>
64 changes: 2 additions & 62 deletions data/ui/main_window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@
<interface>
<menu id="menu">
<item>
<attribute name="label" translatable="yes">Text size</attribute>
<attribute name="display-hint">inline-buttons</attribute>
<attribute name="custom">zoom-grid</attribute>
<attribute name="custom">zoom</attribute>
</item>
<section>
<item>
<attribute name="label" translatable="yes">About Notejot</attribute>
<attribute name="action">win.action_about</attribute>
</item>
</section>
</menu>
<template class="NotejotMainWindow" parent="HeApplicationWindow">
<property name="visible">1</property>
Expand Down Expand Up @@ -50,59 +42,7 @@
<child type="titlebar-button">
<object class="GtkMenuButton" id="menu_button">
<property name="icon-name">open-menu-symbolic</property>
<property name="popover">
<object class="GtkPopoverMenu">
<property name="menu-model">menu</property>
<child type="zoom-grid">
<object class="GtkBox">
<property name="hexpand">1</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-start">10</property>
<property name="margin-end">6</property>
<child>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="true">Font Size</property>
<property name="sensitive">0</property>
</object>
</child>
</object>
</child>
<child>
<object class="HeSegmentedButton">
<child>
<object class="GtkToggleButton" id="s">
<property name="label">Small</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'small'"</property>
</object>
</child>
<child>
<object class="GtkToggleButton">
<property name="label">Medium</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'medium'"</property>
<property name="group">s</property>
</object>
</child>
<child>
<object class="GtkToggleButton">
<property name="label">Large</property>
<property name="action-name">app.font-size</property>
<property name="action-target">"'large'"</property>
<property name="group">s</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</property>
<property name="menu-model">menu</property>
</object>
</child>
<child>
Expand Down
1 change: 0 additions & 1 deletion data/ui/move_to_dialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<property name="orientation">vertical</property>
<child>
<object class="HeAppBar">
<property name="show-buttons">1</property>
<property name="show-back">0</property>
<property name="scroller">sw</property>
<property name="viewtitle-widget">
Expand Down
80 changes: 27 additions & 53 deletions data/ui/note_theme.ui
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<template class="NotejotWidgetsNoteTheme" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="orientation">1</property>
<style>
<class name="notejot-theme" />
<class name="notejot-theme"/>
</style>
<child>
<object class="GtkLabel">
<property name="margin-start">8</property>
<property name="margin-bottom">6</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Note Color</property>
<property name="margin-start">6</property>
<property name="margin-end">10</property>
<property name="halign">1</property>
<property name="label" translatable="true">Note Color</property>
<style>
<class name="caption"/>
<class name="dim-label"/>
</style>
</object>
</child>
<child>
<object class="GtkGrid">
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="hexpand">1</property>
<property name="column-spacing">6</property>
<property name="row-spacing">6</property>
<property name="margin-start">6</property>
<property name="margin-end">10</property>
<property name="hexpand">true</property>
<child>
<object class="GtkCheckButton" id="color_button_red">
<property name="tooltip-text" translatable="yes">Red</property>
<property name="tooltip-text" translatable="true">Red</property>
<style>
<class name="circular"/>
<class name="color-red"/>
Expand All @@ -36,37 +38,23 @@
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_orange">
<property name="tooltip-text" translatable="yes">Orange</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
<class name="color-orange"/>
</style>
<layout>
<property name="column">1</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_yellow">
<property name="tooltip-text" translatable="yes">Yellow</property>
<property name="tooltip-text" translatable="true">Yellow</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
<class name="color-yellow"/>
</style>
<layout>
<property name="column">2</property>
<property name="column">1</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_blue">
<property name="tooltip-text" translatable="yes">Blue</property>
<property name="tooltip-text" translatable="true">Blue</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
Expand All @@ -80,7 +68,7 @@
</child>
<child>
<object class="GtkCheckButton" id="color_button_purple">
<property name="tooltip-text" translatable="yes">Purple</property>
<property name="tooltip-text" translatable="true">Purple</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
Expand All @@ -92,44 +80,30 @@
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_brown">
<property name="tooltip-text" translatable="yes">Brown</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
<class name="color-brown"/>
</style>
<layout>
<property name="column">2</property>
<property name="row">1</property>
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_green">
<property name="tooltip-text" translatable="yes">Green</property>
<property name="tooltip-text" translatable="true">Green</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
<class name="color-green"/>
</style>
<layout>
<property name="column">3</property>
<property name="column">2</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="color_button_reset">
<property name="tooltip-text" translatable="yes">No Color</property>
<property name="tooltip-text" translatable="true">No Color</property>
<property name="group">color_button_red</property>
<style>
<class name="circular"/>
<class name="color-reset"/>
</style>
<layout>
<property name="column">3</property>
<property name="column">2</property>
<property name="row">1</property>
</layout>
</object>
Expand All @@ -144,25 +118,25 @@
</child>
<child>
<object class="HeTextButton" id="note_pin_button">
<property name="hexpand">1</property>
<property name="hexpand">true</property>
<property name="child">
<object class="HeButtonContent">
<property name="icon">view-pin-symbolic</property>
<property name="label" translatable="yes">Pin/Unpin Note</property>
<property name="label" translatable="true">Pin/Unpin Note</property>
</object>
</property>
</object>
</child>
<child>
<object class="HeTextButton" id="export_button">
<property name="hexpand">1</property>
<property name="hexpand">true</property>
<property name="child">
<object class="HeButtonContent">
<property name="icon">document-export-symbolic</property>
<property name="label" translatable="yes">Export Note…</property>
<property name="label" translatable="true">Export Note…</property>
</object>
</property>
</object>
</child>
</template>
</interface>
</interface>
3 changes: 3 additions & 0 deletions data/ui/notebookmainrowcontent.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<property name="orientation">horizontal</property>
<property name="valign">center</property>
<property name="spacing">12</property>
<style>
<class name="mini-content-block"/>
</style>
<child>
<object class="GtkImage">
<property name="halign">start</property>
Expand Down
5 changes: 2 additions & 3 deletions data/ui/notecontentview.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<property name="orientation">vertical</property>
<child>
<object class="HeAppBar" id="ftitlebar">
<property name="show-left-title-buttons">0</property>
<property name="show-back">0</property>
<property name="width-request">360</property>
</object>
Expand Down Expand Up @@ -52,9 +53,7 @@
<object class="GtkOverlay">
<child>
<object class="HeContentBlockImage" id="image">
<property name="height-request">182</property>
<property name="width-request">450</property>
<property name="rounded">0</property>
<property name="requested-height">160</property>
</object>
</child>
<child type="overlay">
Expand Down
Loading

0 comments on commit c305c6e

Please sign in to comment.