mirror of
https://github.com/tomasriveral/NoteWrapper.git
synced 2026-08-12 10:20:46 +02:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
689c3074c0 | ||
|
|
e54933e5fa | ||
|
|
3f9471531d | ||
|
|
ab1928551a | ||
|
|
e75c8e5815 | ||
|
|
693e85d974 | ||
|
|
b9f71f580a | ||
|
|
c6aac80951 | ||
|
|
b395fe1072 | ||
|
|
27cc3de27d | ||
|
|
18538f3250 | ||
|
|
6c7cc413da | ||
|
|
e670ef935f | ||
|
|
29d86955f4 | ||
|
|
0f9ec32bfc | ||
|
|
5ad8f2f99e | ||
|
|
c6e590e57c | ||
|
|
d47bdb82eb | ||
|
|
50748eeac0 | ||
|
|
19a8f7e07f | ||
|
|
1c17c62835 |
Generated
+3
-3
@@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779560665,
|
"lastModified": 1786106723,
|
||||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
"narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
"rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
in {
|
in {
|
||||||
packages.default = pkgs.stdenv.mkDerivation (finalAttrs: {
|
packages.default = pkgs.stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "notewrapper";
|
pname = "notewrapper";
|
||||||
version = "v2.2.1";
|
version = "v2.3.0";
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
|
|||||||
+6
-4
@@ -598,7 +598,8 @@ backup_config_end:
|
|||||||
|
|
||||||
*backupMessage = 0; // we reset it to show the message only once
|
*backupMessage = 0; // we reset it to show the message only once
|
||||||
|
|
||||||
vaultSelected = ncursesSelect(vaultsArray, "Select vault to open (Use arrows or WASD, Enter to select):", vaultsCount, extraOptions, " ", "Or select an option below", "", shouldDebug);
|
vaultSelected = ncursesSelect(vaultsArray, "Select vault to open (Use arrows or WASD, Enter to select or use 1-9 to quick select or use 1-9 to quick select):", vaultsCount, extraOptions, " ",
|
||||||
|
"Or select an option below", "", shouldDebug);
|
||||||
|
|
||||||
// now that we won't use vaultsArray in this iteration of the loop, we should free it and
|
// now that we won't use vaultsArray in this iteration of the loop, we should free it and
|
||||||
// all its elements. (As this is memory in the heap and not the stack and thus is our
|
// all its elements. (As this is memory in the heap and not the stack and thus is our
|
||||||
@@ -666,8 +667,9 @@ backup_config_end:
|
|||||||
goto note_creation;
|
goto note_creation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
noteSelected =
|
char vaultMessage[PATH_MAX];
|
||||||
ncursesSelect(filesArray, "Select note or journal to open (Use arrows or WASD, Enter to select):", filesCount, extraNotesOptions, " ", "Or select an option below", "", shouldDebug);
|
snprintf(vaultMessage, PATH_MAX, "%s: Select note or journal to open (Use arrows or WASD, Enter to select or use 1-9 to quick select):", vaultSelected);
|
||||||
|
noteSelected = ncursesSelect(filesArray, vaultMessage, filesCount, extraNotesOptions, " ", "Or select an option below", "", shouldDebug);
|
||||||
// now that we won't use filesArray in this iteration of the loop, we should free it
|
// now that we won't use filesArray in this iteration of the loop, we should free it
|
||||||
// and all its elements. (As this is memory in the heap and not the stack and thus
|
// and all its elements. (As this is memory in the heap and not the stack and thus
|
||||||
// is our responsability to manage)
|
// is our responsability to manage)
|
||||||
@@ -741,7 +743,7 @@ backup_config_end:
|
|||||||
const char *yesNo[] = {"No, go back to note selection.", "Yes."};
|
const char *yesNo[] = {"No, go back to note selection.", "Yes."};
|
||||||
char *answer = ncursesSelect((char **)yesNo,
|
char *answer = ncursesSelect((char **)yesNo,
|
||||||
"Are you sure you want to delete the entire vault? This can "
|
"Are you sure you want to delete the entire vault? This can "
|
||||||
"not be undone (Use arrows or WASD, Enter to select):",
|
"not be undone (Use arrows or WASD, Enter to select or use 1-9 to quick select):",
|
||||||
1, 1, " ", "", "", shouldDebug);
|
1, 1, " ", "", "", shouldDebug);
|
||||||
debug("You answered: %s for deleting the vault %s", answer, vaultSelected);
|
debug("You answered: %s for deleting the vault %s", answer, vaultSelected);
|
||||||
if (strcmp(answer, "Yes.") == 0) {
|
if (strcmp(answer, "Yes.") == 0) {
|
||||||
|
|||||||
+5
-4
@@ -260,10 +260,11 @@ char *updateJournal(char *path, char *journal, char *timeFormat, int *journalWas
|
|||||||
// element
|
// element
|
||||||
|
|
||||||
// we must now select to create new entry or to enter in old one
|
// we must now select to create new entry or to enter in old one
|
||||||
char *selectedOption = ncursesSelect(entryArray, "Create new entry or acces old entry (Use arrows or WASD, Enter to select):", extraOptions, entryCount - extraOptions, " ", " ", "",
|
char *selectedOption =
|
||||||
shouldDebug); // the "Create new entry for the journal %s" will be the only options. All
|
ncursesSelect(entryArray, "Create new entry or acces old entry (Use arrows or WASD, Enter to select or use 1-9 to quick select):", extraOptions, entryCount - extraOptions, " ", " ", "",
|
||||||
// other will be extraOptions. This is made so that "Create [...] %s" will
|
shouldDebug); // the "Create new entry for the journal %s" will be the only options. All
|
||||||
// always be on top
|
// other will be extraOptions. This is made so that "Create [...] %s" will
|
||||||
|
// always be on top
|
||||||
debug("Selected option from journal entry selection: %s", selectedOption);
|
debug("Selected option from journal entry selection: %s", selectedOption);
|
||||||
if (strcmp(selectedOption, createEntryMessage) == 0) { // create new entry
|
if (strcmp(selectedOption, createEntryMessage) == 0) { // create new entry
|
||||||
char temp[PATH_MAX];
|
char temp[PATH_MAX];
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ void createNewVault(char **directoriesArray, int directoryCount, char **vaultsAr
|
|||||||
int emptyWarning = 0; // set to 1 later if inpted empty name
|
int emptyWarning = 0; // set to 1 later if inpted empty name
|
||||||
input_screen:
|
input_screen:
|
||||||
// choose in which directory the vault will be created
|
// choose in which directory the vault will be created
|
||||||
char *dirToVault = ncursesSelect(directoriesArray, "Select a directory, in which the vault will remain (Use arrows or WASD, Enter to select)", directoryCount, 0, "", "", " ", shouldDebug);
|
char *dirToVault =
|
||||||
|
ncursesSelect(directoriesArray, "Select a directory, in which the vault will remain (Use arrows or WASD, Enter to select or use 1-9 to quick select)", directoryCount, 0, "", "", " ", shouldDebug);
|
||||||
char *vaultName = malloc(PATH_MAX);
|
char *vaultName = malloc(PATH_MAX);
|
||||||
if (!bypass) { // if won't bypass (if -v or --vault weren't set)
|
if (!bypass) { // if won't bypass (if -v or --vault weren't set)
|
||||||
echo();
|
echo();
|
||||||
@@ -309,6 +310,69 @@ char *ncursesSelect(char **options, char *optionsText, int optionsNumber, int ex
|
|||||||
highlight = 0;
|
highlight = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case '1':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 1.");
|
||||||
|
highlight = 0;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '2':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 2.");
|
||||||
|
highlight = 1;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '3':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 3.");
|
||||||
|
highlight = 2;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '4':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 4.");
|
||||||
|
highlight = 3;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '5':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 5.");
|
||||||
|
highlight = 4;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '6':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 6.");
|
||||||
|
highlight = 5;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '7':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 7.");
|
||||||
|
highlight = 6;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '8':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 8.");
|
||||||
|
highlight = 7;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '9':
|
||||||
|
if (optionsNumber + extraOptionsNumber >= 1) {
|
||||||
|
debug("Quickselected option 9.");
|
||||||
|
highlight = 8;
|
||||||
|
goto end_loop;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 10: //\n
|
case 10: //\n
|
||||||
goto end_loop;
|
goto end_loop;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user