Skip to content

Commit 7b46928

Browse files
authored
Support Multiple Files (Philip-Scott#329)
* Add FileData.vala * Sidebar: Notebooks are now sections * Load and save last opened notebook and page in file * Allow opening arbitrary files * NotebookPicker: Initial work * Add pane icons * UI to hide and show the different side panels * Styled notebook pane and shortcuts * Notebooks are now Sections, and bug fixes
1 parent bb427cf commit 7b46928

27 files changed

Lines changed: 1091 additions & 288 deletions

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ vala_precompile(VALA_C
9797
src/Widgets/Editor.vala
9898
src/Widgets/HelpBox.vala
9999
src/Widgets/Headerbar.vala
100+
src/Widgets/NotebookPicker.vala
100101
src/Widgets/ViewEditStack.vala
101102
src/Widgets/ToolbarButton.vala
102103
src/Widgets/BookmarkButton.vala
@@ -119,6 +120,7 @@ vala_precompile(VALA_C
119120
src/Widgets/Dialogs/NotebookListDialog.vala
120121
121122
src/Services/Bookmark.vala
123+
src/Services/FileData.vala
122124
src/Services/FileManager.vala
123125
src/Services/Notebook.vala
124126
src/Services/Image.vala

data/assets.gresource.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
</gresource>
88
<gresource prefix="/com/github/philip-scott/notes-up/icons">
99
<file alias="notebook-symbolic.svg" compressed="false" preprocess="">icons/symbolic/notebook-symbolic.svg</file>
10+
<file alias="panes-all-symbolic.svg" compressed="false" preprocess="">icons/symbolic/panes-all-symbolic.svg</file>
11+
<file alias="panes-two-symbolic.svg" compressed="false" preprocess="">icons/symbolic/panes-two-symbolic.svg</file>
12+
<file alias="panes-one-symbolic.svg" compressed="false" preprocess="">icons/symbolic/panes-one-symbolic.svg</file>
13+
<file alias="panes-none-symbolic.svg" compressed="false" preprocess="">icons/symbolic/panes-none-symbolic.svg</file>
1014
</gresource>
1115
<gresource prefix="/com/github/philip-scott/notes-up/">
1216
<file alias="Application.css" compressed="true">assets/stylesheets/app/Application.css</file>

data/assets/stylesheets/app/Application.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@
5454
color: #000;
5555
}
5656

57+
.notebook-list :selected {
58+
background-color: transparent;
59+
color: @colorAccent;
60+
}
61+
62+
.notebook-list :selected image {
63+
background-color: transparent;
64+
color: alpha (@colorAccent, 0.9);
65+
}
66+
67+
5768
/* Solarized Light*/
5869

5970
.solarized-light .view {
@@ -75,10 +86,18 @@
7586
color: #3b3339;
7687
}
7788

89+
.solarized-light .notebook-list row:selected {
90+
background-color: transparent;
91+
}
92+
7893
.solarized-light list row:selected .h3 {
7994
color: #3b3339;
8095
}
8196

97+
.solarized-light .notebook-list row:selected .h3 {
98+
color: @colorAccent;
99+
}
100+
82101
.solarized-light .toolbar,
83102
.solarized-light .inline-toolbar {
84103
background-color: alpha (#fbefce, 0.5);
@@ -125,10 +144,18 @@
125144
color: #ddd;
126145
}
127146

147+
.solarized-dark .notebook-list row:selected {
148+
background-color: transparent;
149+
}
150+
128151
.solarized-dark list row:selected .h3 {
129152
color: #fff;
130153
}
131154

155+
.solarized-dark .notebook-list row:selected .h3 {
156+
color: @colorAccent;
157+
}
158+
132159
.solarized-dark .toolbar,
133160
.solarized-dark .inline-toolbar,
134161
.solarized-dark .inline-toolbar.toolbar {
Lines changed: 87 additions & 0 deletions
Loading
Lines changed: 73 additions & 0 deletions
Loading
Lines changed: 80 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)