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.

Sign up for GitHub

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

inital support for user-selectable cursors #59

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

inital support for user-selectable cursors #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d650b65
inital support for user-selectable cursors
sp1ritCS Nov 15, 2020
48120af
Improved the Preferences UI
sp1ritCS Nov 15, 2020
87b8541
changed tool key too tool_cursors
sp1ritCS Nov 15, 2020
8f79de6
Merge branch 'ui' of github.com:sp1ritCS/notekit into ui
sp1ritCS Nov 15, 2020
6d02d62
minor preferences improvement
sp1ritCS Nov 15, 2020
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
6 changes: 6 additions & 0 deletions data/default_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"active_document" : "",
"use_headerbar" : true,
"use_highlight_proxy" : false,
"tool_cursors": {
"pen": "default",
"text": "text",
"eraser": "cell",
"select": "cross"
},
"colors" :
[
{
Expand Down
137 changes: 107 additions & 30 deletions data/preferences.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="reset_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-delete</property>
</object>
<object class="GtkDialog" id="preferences">
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
Expand Down Expand Up @@ -120,17 +122,74 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="filler2">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="cursor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Pen Cursor</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="pen_cursor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">16</property>
<property name="active">0</property>
<items>
<item id="cursor_default" translatable="yes">Default</item>
<item id="cursor_cross" translatable="yes">Cross</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_bottom">10</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;span foreground="grey"&gt;The cursor that the pen tool should have&lt;/span&gt;&lt;/small&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</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>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="use_headerbar">
<property name="label" translatable="yes">Use headerbar</property>
Expand All @@ -139,6 +198,17 @@
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="filler2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
Expand All @@ -149,7 +219,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
<child>
Expand All @@ -165,17 +235,20 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="filler3">
<object class="GtkCheckButton" id="use_highlight_proxy">
<property name="label" translatable="yes">Enable syntax highlighting</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -184,12 +257,9 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="use_highlight_proxy">
<property name="label" translatable="yes">Enable syntax highlighting</property>
<object class="GtkLabel" id="filler3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -201,7 +271,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
<property name="position">5</property>
</packing>
</child>
<child>
Expand All @@ -217,21 +287,6 @@ This increases startup time and may result in markdown rendering failing if &lt;
<property name="wrap">True</property>
<property name="max_width_chars">70</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="vexpand">True</property>
<property name="label" translatable="yes">Preference changes only take effect after restarting NoteKit.</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
Expand All @@ -251,6 +306,28 @@ This increases startup time and may result in markdown rendering failing if &lt;
<action-widget response="-5">button1</action-widget>
<action-widget response="-6">button2</action-widget>
</action-widgets>
<child type="titlebar">
<object class="GtkHeaderBar" id="settings_bar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Preferences</property>
<property name="subtitle" translatable="yes">Changes only take effect after restarting NoteKit.</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="reset">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">reset_image</property>
<property name="always_show_image">True</property>
</object>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-5">button1</action-widget>
<action-widget response="-6">button2</action-widget>
</action-widgets>
</object>
<object class="GtkSizeGroup">
<widgets>
Expand Down
16 changes: 12 additions & 4 deletions mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ CMainWindow::CMainWindow() : nav_model(), sview()
nav.get_style_context()->add_provider(sview_css,GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

/* load cursor types for document */
pen_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),"default");
text_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),"text");
eraser_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),"cell");
selection_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),"cross");
pen_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),GetToolCursor("pen", "default"));
text_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),GetToolCursor("text", "text"));
eraser_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),GetToolCursor("eraser", "cell"));
selection_cursor = Gdk::Cursor::create(Gdk::Display::get_default(),GetToolCursor("select", "cross"));

/* install document view */
sbuffer = sview.get_source_buffer();
Expand Down Expand Up @@ -581,3 +581,11 @@ bool CMainWindow::on_motion_notify(GdkEventMotion *e)

return false;
}

std::string CMainWindow::GetToolCursor(std::string tool, std::string fallback) {
if(!config["tool_cursors"][tool].isString() || config["tool_cursors"][tool].asString()=="") {
config["tool_cursors"][tool]=fallback;
return fallback;
}
return config["tool_cursors"][tool].asString();
}
2 changes: 2 additions & 0 deletions mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ class CMainWindow : public Gtk::Window
Gtk::SeparatorMenuItem sep;
Gtk::CheckMenuItem hide_sidebar;
} am;

std::string GetToolCursor(std::string tool, std::string fallback);
};

#endif // MAINWINDOW_H