andrew
/
todo-d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: andrew:main
Branches Tags
andrew:main
andrew:v1.0.0
andrew:v1.0.0-SNAPSHOT
..
compare: andrew:v1.0.0-SNAPSHOT
Branches Tags
andrew:main
andrew:v1.0.0
andrew:v1.0.0-SNAPSHOT

No commits in common. "main" and "v1.0.0-SNAPSHOT" have entirely different histories.
main ... v1.0.0-SNA

5 changed files with 44 additions and 142 deletions
Show Stats Expand all files Collapse all files

3
dub.json
View File

@ -4,8 +4,7 @@
],
"copyright": "Copyright © 2022, Andrew Lalis",
"dependencies": {
"gtk-d": "~>3.10.0",
"dsh": "~>1.6.1"
"gtk-d": "~>3.10.0"
},
"stringImportPaths": [
"resources"

1
dub.selections.json
View File

@ -1,7 +1,6 @@
{
"fileVersion": 1,
"versions": {
"dsh": "1.6.1",
"gtk-d": "3.10.0"
}
}

5
resources/todo-ui.glade
View File

@ -107,7 +107,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="onAboutMenuActivated" swapped="no"/>
</object>
</child>
</object>
@ -134,7 +133,7 @@
<object class="GtkListBox" id="taskList">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="activate_on_single_click">False</property>
<property name="selection_mode">none</property>
</object>
</child>
</object>
@ -154,7 +153,6 @@
<object class="GtkEntry" id="addTaskEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<signal name="activate" handler="onAddTask" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@ -171,6 +169,7 @@
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="onAddTask" swapped="no"/>
<accelerator key="Return" signal="clicked"/>
</object>
<packing>
<property name="expand">False</property>

130
source/app.d
View File

@ -1,10 +1,5 @@
import model;
import std.stdio;
import std.functional : toDelegate;
import dsh : getHomeDir;
import std.path;
import std.file;
import gtk.MainWindow;
import gtk.Main;
@ -19,10 +14,6 @@ import gtk.Label;
import gtk.CheckButton;
import gtk.ToggleButton;
import gtk.Button;
import gtk.Widget;
import gdk.Keymap;
import gdk.Keysyms : GdkKeysyms;
import gio.Resource;
import glib.Bytes;
@ -39,6 +30,26 @@ class ToDoItemWidget : Box {
label.setHalign(GtkAlign.START);
label.setValign(GtkAlign.CENTER);
this.packStart(button, false, false, 0);
Button removeButton = new Button(StockID.REMOVE);
removeButton.addOnClicked(delegate(Button b) {
todoModel.removeItem(item.priority);
});
this.packEnd(removeButton, false, false, 0);
if (todoModel.canIncrement(item)) {
Button upButton = new Button(StockID.GO_UP, delegate(Button b) {
todoModel.incrementPriority(item);
});
this.packEnd(upButton, false, false, 0);
}
if (todoModel.canDecrement(item)) {
Button downButton = new Button(StockID.GO_DOWN, delegate(Button b) {
todoModel.decrementPriority(item);
});
this.packEnd(downButton, false, false, 0);
}
this.packEnd(label, true, true, 0);
}
}
@ -66,110 +77,31 @@ void main(string[] args) {
builder.addCallbackSymbol("onSaveAsMenuActivated", &onSaveAsMenuActivated);
builder.addCallbackSymbol("onOpenMenuActivated", &onOpenMenuActivated);
builder.addCallbackSymbol("onQuitMenuActivated", &onWindowDestroy);
builder.addCallbackSymbol("onAboutMenuActivated", &onAboutMenuActivated);
builder.connectSignals(null);
taskList = cast(ListBox) builder.getObject("taskList");
Widget listWidget = cast(Widget) taskList;
listWidget.addOnKeyPress(toDelegate(&taskListKeyPressed));
taskEntry = cast(Entry) builder.getObject("addTaskEntry");
todoModel = new ToDoModel();
string lastOpenPath = buildPath(getHomeDir(), ".config/todo-d/last-open.txt");
if (exists(lastOpenPath)) {
import std.string : strip;
string lastOpenFile = readText(lastOpenPath).strip;
todoModel.openFromJson(lastOpenFile);
}
import std.functional : toDelegate;
todoModel.addListener(ModelUpdateListener.of(toDelegate(&itemsUpdated)));
window = cast(ApplicationWindow) builder.getObject("window");
auto listener = new UIModelUpdateListener(window);
todoModel.addListener(listener);
// Trigger UI updates once before rendering the window.
todoModel.notifyListeners();
listener.fileUpdated(todoModel.getOpenFilename());
window.showAll();
Main.run();
}
class UIModelUpdateListener : ModelUpdateListener {
private ApplicationWindow window;
this(ApplicationWindow window) {
this.window = window;
}
void itemsUpdated(ToDoItem[] items) {
taskList.removeAll();
foreach (item; items) {
auto widget = new ToDoItemWidget(item, todoModel);
auto row = new ListBoxRow();
row.setSelectable(true);
row.setActivatable(false);
row.add(widget);
taskList.add(row);
}
taskList.showAll();
}
void fileUpdated(string filename) {
if (filename is null) {
window.setTitle("todo-d");
} else {
window.setTitle("todo-d - " ~ filename);
}
window.showAll();
}
}
bool taskListKeyPressed(GdkEventKey* event, Widget w) {
int idx = taskList.getSelectedRow().getIndex();
int selectedPrio = idx + 1;
ToDoItem selectedItem = todoModel.getItemAt(selectedPrio);
if (selectedItem is null) return true;
bool ctrlDown = (event.state & ModifierType.CONTROL_MASK) > 0;
if (ctrlDown && event.keyval == GdkKeysyms.GDK_Up && todoModel.canIncrement(selectedItem)) {
todoModel.incrementPriority(selectedItem);
auto row = taskList.getRowAtIndex(idx - 1);
taskList.selectRow(row);
Widget rowWidget = cast(Widget) row;
rowWidget.grabFocus();
}
if (ctrlDown && event.keyval == GdkKeysyms.GDK_Down && todoModel.canDecrement(selectedItem)) {
todoModel.decrementPriority(selectedItem);
auto row = taskList.getRowAtIndex(idx + 1);
taskList.selectRow(row);
Widget rowWidget = cast(Widget) row;
rowWidget.grabFocus();
}
if (!ctrlDown && event.keyval == GdkKeysyms.GDK_Up && idx > 0) {
auto row = taskList.getRowAtIndex(idx - 1);
taskList.selectRow(row);
Widget rowWidget = cast(Widget) row;
rowWidget.grabFocus();
}
if (!ctrlDown && event.keyval == GdkKeysyms.GDK_Down && idx + 1 < todoModel.itemCount) {
auto row = taskList.getRowAtIndex(idx + 1);
taskList.selectRow(row);
Widget rowWidget = cast(Widget) row;
rowWidget.grabFocus();
}
if (event.keyval == GdkKeysyms.GDK_Delete) {
todoModel.removeItem(selectedPrio);
}
if (event.keyval == GdkKeysyms.GDK_Return) {
selectedItem.checked = !selectedItem.checked;
todoModel.notifyListeners();
auto row = taskList.getRowAtIndex(idx);
taskList.selectRow(row);
Widget rowWidget = cast(Widget) row;
rowWidget.grabFocus();
}
return true;
}
extern (C) void addTask() {
todoModel.addItem(taskEntry.getText());
taskEntry.setText("");
@ -179,12 +111,6 @@ extern (C) void onWindowDestroy() {
Main.quit();
if (todoModel.getOpenFilename() !is null) {
todoModel.saveToJson(todoModel.getOpenFilename());
string configPath = buildPath(getHomeDir(), ".config/todo-d/");
if (!exists(configPath)) {
mkdirRecurse(configPath);
}
string lastOpenFile = buildPath(configPath, "last-open.txt");
std.file.write(lastOpenFile, todoModel.getOpenFilename());
}
}
@ -230,15 +156,3 @@ extern (C) void onOpenMenuActivated() {
}
dialog.close();
}
extern (C) void onAboutMenuActivated() {
import gtk.AboutDialog;
AboutDialog dialog = new AboutDialog();
dialog.setProgramName("Todo-D");
dialog.setLicenseType(GtkLicense.MIT_X11);
dialog.setAuthors(["Andrew Lalis"]);
dialog.setComments("A simple To-Do app written in D using GTK.");
dialog.setWebsite("https://github.com/andrewlalis/todo-d");
dialog.run();
dialog.destroy();
}

27
source/model.d
View File

@ -13,7 +13,14 @@ class ToDoItem {
interface ModelUpdateListener {
void itemsUpdated(ToDoItem[] items);
void fileUpdated(string filename);
static ModelUpdateListener of(void delegate(ToDoItem[]) dg) {
return new class ModelUpdateListener {
void itemsUpdated(ToDoItem[] items) {
dg(items);
}
};
}
}
class ToDoModel {
@ -29,15 +36,6 @@ class ToDoModel {
return openFilename;
}
ToDoItem getItemAt(int prio) {
if (prio < 1 || prio > items.length) return null;
return items[prio - 1];
}
ulong itemCount() {
return items.length;
}
void addItem(string text) {
addItem(new ToDoItem(text, 1_000_000, false));
}
@ -101,10 +99,7 @@ class ToDoModel {
);
items ~= item;
}
if (openFilename != filename) {
openFilename = filename;
foreach (l; listeners) l.fileUpdated(filename);
}
sort!((a, b) => a.priority < b.priority)(items);
normalizePrio();
notifyListeners();
@ -124,16 +119,12 @@ class ToDoModel {
}
j["items"] = JSONValue(itemObjs);
write(filename, toJSON(j, true));
if (openFilename != filename) {
openFilename = filename;
foreach (l; listeners) l.fileUpdated(filename);
}
}
void clear() {
items = [];
openFilename = null;
foreach (l; listeners) l.fileUpdated(openFilename);
notifyListeners();
}
@ -144,7 +135,7 @@ class ToDoModel {
}
}
public void notifyListeners() {
private void notifyListeners() {
foreach (l; listeners) l.itemsUpdated(this.items);
}
}