Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate edit fields #461

Merged
merged 73 commits into from
Oct 30, 2019
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
804f75f
scroll till the end of last fact
ederag Sep 14, 2019
431e422
glade update
ederag Sep 14, 2019
116f578
ignore *~ backup files
ederag Sep 14, 2019
0716eaf
remove deprecated use_action_appearance
ederag Sep 14, 2019
c486590
add separate fields to the window
ederag Sep 14, 2019
b5804f0
control activity/category sizes
ederag Sep 15, 2019
b59d33c
rename activity to cmdline
ederag Sep 14, 2019
af402c6
add calendar widgets
ederag Sep 16, 2019
27afce3
cmdline update activity field
ederag Sep 16, 2019
04296f6
update category field
ederag Sep 16, 2019
c3ac659
update only while typing
ederag Sep 17, 2019
88a06d6
back and forth updates with activity
ederag Sep 18, 2019
10224b0
add tags
ederag Sep 19, 2019
02a46e6
try to fix background color
ederag Sep 21, 2019
b55e9e3
remove background noop
ederag Sep 21, 2019
321469b
update cmdline from category entry
ederag Sep 21, 2019
2987ad6
remove unused self.day_start
ederag Sep 22, 2019
235ab86
update date entries
ederag Sep 22, 2019
62ddfe4
use TimeInput for start and end times
ederag Sep 22, 2019
51f05ab
cmdline update times
ederag Sep 22, 2019
8c6c473
fix start_time suggestions
ederag Sep 23, 2019
e30410b
accept None
ederag Sep 24, 2019
045e866
handle end_time=None
ederag Sep 24, 2019
b176cc3
control date from dayline
ederag Sep 26, 2019
94e4416
comments
ederag Sep 26, 2019
88234f3
forward failing attribute requests to widget
ederag Sep 26, 2019
6644b68
start new fact now in gui
ederag Sep 27, 2019
f52b429
update timeline from start_date
ederag Sep 27, 2019
f642808
update end_date from gui entry
ederag Sep 27, 2019
dbd337b
change TimeInput.time to @property
ederag Sep 27, 2019
0f2fd46
update start_time from gui entry
ederag Sep 27, 2019
f49b271
handle no start-time on cmdline
ederag Sep 27, 2019
949e841
fix time pre-selection
ederag Sep 28, 2019
b6a3c0d
use start_time.date() if available
ederag Sep 28, 2019
80a70ae
update end_time from gui entry
ederag Sep 28, 2019
be73305
update activity and category from gui entries
ederag Sep 28, 2019
147a9bc
rename ActivityEntry to CmdLineEntry
ederag Sep 30, 2019
2c1d57d
add category completion
ederag Sep 30, 2019
e5a1bbf
activity@category completion
ederag Oct 1, 2019
61b7adc
fix description update from cmdline
ederag Oct 2, 2019
e70fd54
remove @category lines
ederag Oct 4, 2019
116b384
use self.fact directly on save
ederag Oct 5, 2019
030bf04
cleanup: move on_save_button_clicked
ederag Oct 5, 2019
20496ec
prevent enter from saving invalid fact
ederag Oct 5, 2019
2fd3513
copy the entered fact before any modification
ederag Oct 5, 2019
ac40301
ensure no end date without time
ederag Oct 5, 2019
324756b
cleanup: remove unused previous_time
ederag Oct 5, 2019
c04a2c3
Do not quit on Esc if any popup is visible
ederag Oct 5, 2019
42fc93e
move keyrelease events to keypress handler
ederag Oct 5, 2019
f05c700
grab focus on icon click
ederag Oct 5, 2019
2c78db4
comments
ederag Oct 5, 2019
1b51b77
use first column for text/filter
ederag Oct 5, 2019
4a5fa54
cleanup: wrap long line
ederag Oct 5, 2019
558a4b2
comment
ederag Oct 5, 2019
888f209
cleanup: remove no-op
ederag Oct 5, 2019
342a8e5
Merge remote-tracking branch 'upstream/master' into separate_edit_fields
ederag Oct 5, 2019
a7e567b
use str in ListStore call
ederag Oct 6, 2019
7e8d0e7
match the parent Entry width
ederag Oct 6, 2019
7eec94c
set no start time interval to 15 min
ederag Oct 6, 2019
3d2109b
accept None in datetime_to_hamsterday
ederag Oct 6, 2019
00df6b7
handle date changes with empty start_time
ederag Oct 6, 2019
aea8352
add clear icon to TimeInput
ederag Oct 6, 2019
d57eb94
move on_description_changed signal connection
ederag Oct 6, 2019
2d18aea
replace gtk.gdk references with gdk
ederag Oct 6, 2019
55a3155
separate down and clear category icons
ederag Oct 20, 2019
577b5bc
add clear action to category completion
ederag Oct 20, 2019
fa5759e
separate icons for TimeInput
ederag Oct 20, 2019
c967463
filter activities on category
ederag Oct 21, 2019
6225d27
remove unused functions
ederag Oct 22, 2019
8ebbc7a
use colorless icon
ederag Oct 22, 2019
63417e8
remove go-down-symbolic icon
ederag Oct 23, 2019
cc55b7e
hide calendars
ederag Oct 29, 2019
43c76d0
set label_fill
ederag Oct 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
control activity/category sizes
ederag committed Sep 21, 2019
commit b5804f055ddaf0a6d954f40f4d1c4f6f5bd7753e
21 changes: 10 additions & 11 deletions data/edit_activity.ui
Original file line number Diff line number Diff line change
@@ -156,6 +156,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkBox" id="start box">
@@ -247,10 +248,9 @@
</packing>
</child>
<child>
<object class="GtkBox">
<object class="GtkPaned">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkBox" id="activity box">
<property name="visible">True</property>
@@ -279,22 +279,22 @@
<property name="can_focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child>
<child>
<object class="GtkBox" id="category box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">4</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
@@ -319,16 +319,15 @@
<property name="can_focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child>
</object>