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

Merge upstream #53

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
c82f0e8
fixed mergeconflict
coderofsalvation May 12, 2022
6931633
rearrange misc config section a bit
Jul 12, 2022
47cb1c1
Merge branch 'master' into feat/raina_toggle_advanced_drag_n_drop
Jul 12, 2022
24f303c
introduced toggle for advanced drag and drop
Jul 12, 2022
67ba0e7
make sure setting is present
Jul 12, 2022
8f9a623
re-introduce old drag behavior
Jul 13, 2022
1c15bcc
style adjustments
Jul 13, 2022
bc25397
adjusted formatting + updated author
coderofsalvation Aug 26, 2022
caa8169
Merge pull request #274 from coderofsalvation/feat/helpdialog-ctrl-h
coderofsalvation Aug 26, 2022
04841c2
responsive filedialog
coderofsalvation Aug 27, 2022
96310c7
improved paste
coderofsalvation Sep 2, 2021
07e3d5f
chore/copy-paste-sample-respect-relative-notenumber
coderofsalvation Aug 31, 2022
a41e2c2
shortcuts to navigate instrument/samples/orderlist
coderofsalvation Aug 29, 2022
9944dd5
meowgli's tweak https://github.com/milkytracker/MilkyTracker/issues/304
Feb 6, 2023
48ab547
Fix uninitialized fields in PatternEditorControl
nyanpasu64 Sep 18, 2021
40602a7
Fix uninitialized fields in PPListBox
nyanpasu64 Sep 18, 2021
64edaab
Fix About screen reading uninitialized memory
nyanpasu64 Sep 18, 2021
ce123f0
Fix uninitialized read in piano control
nyanpasu64 Sep 18, 2021
f578adf
switch to C11 when RTMIDI
coderofsalvation Jun 30, 2023
a644cb5
replaced tanh with TAP-inspired compression-algo #nodistortion #relat…
Nov 16, 2022
a67efef
sample-editor easy fade-in/out + loop fold
Nov 16, 2022
a8e76b0
list ports to stdout + check for default port using MIDI_IN env-var
coderofsalvation Aug 31, 2022
7531312
fix: minimal non-opengl platforms can run MT again
coderofsalvation May 17, 2022
fb84c38
Added some shortcuts to make my performances easier
Claytone Aug 10, 2022
ada5f10
Removed commented line
Claytone Aug 10, 2022
3dd036c
Replaced VK_OEM keys with regular letters because cmake didn't like t…
Claytone Aug 10, 2022
639a3af
Switched to single-modifier shortcuts and more sensible layout
Claytone Aug 10, 2022
06ae8b4
Updated docs
Claytone Aug 10, 2022
c40e8ec
improvements + show selected channel by highlighting scope
coderofsalvation Sep 2, 2022
c0c783b
fix wrong cwd when loading file from command line
mothcompute Apr 13, 2023
eb7305c
build linux
coderofsalvation Jun 30, 2023
7ee2a41
Merge branch 'chore/linuxbuilds' into rc/1.04
coderofsalvation Jun 30, 2023
51ae20a
typofix
coderofsalvation Jun 30, 2023
b6be2b2
regression bugfix: shift+left/right should do selection
coderofsalvation Jun 30, 2023
70824e4
add rpi builder script
coderofsalvation Jul 2, 2023
3bfcc62
Merge remote-tracking branch 'milkytrackerx/chore/copy-paste-sample-r…
coderofsalvation Jul 3, 2023
5e45010
Merge remote-tracking branch 'milkytrackerx/feat/responsive-filedialo…
coderofsalvation Jul 3, 2023
c2b0ce5
Merge remote-tracking branch 'milkypailes/feat/raina_toggle_advanced_…
coderofsalvation Jul 3, 2023
592d076
resolved milkyshortcut-conflicts to get to the following coherent
coderofsalvation Jul 3, 2023
3eed11c
added call to action for new users
coderofsalvation Jul 3, 2023
4fd5462
resolved merge-conflict
coderofsalvation Jul 3, 2023
a974a20
updated help
coderofsalvation Jul 3, 2023
5f9e135
removed broken links
coderofsalvation Jul 3, 2023
90c767a
add advanced drag drop to docs
coderofsalvation Jul 3, 2023
4cc7f42
Merge remote-tracking branch 'milkytrackerx/bugfix/machinegun' into r…
coderofsalvation Jul 3, 2023
1fa39ca
version bump + update docs
coderofsalvation Jul 5, 2023
4da3169
Merge pull request #314 from milkytracker/rc/1.04
coderofsalvation Jul 5, 2023
ef2627b
update documentation
coderofsalvation Jul 5, 2023
c8fc468
typofix
coderofsalvation Jul 5, 2023
ee38e3e
typofix
coderofsalvation Jul 5, 2023
6266e0d
Merge remote-tracking branch 'milkytrackerx/feat/sampleeditor-improve…
coderofsalvation Jul 5, 2023
8461197
cleanup menu by moving to FX submenu
coderofsalvation Jul 5, 2023
cd09c58
Merge pull request #317 from milkytracker/feat/menu-cleanup
coderofsalvation Jul 5, 2023
d63efeb
tidy cleanup subMenuFX
coderofsalvation Jul 5, 2023
7e91714
possible bugfix: return nPorts
coderofsalvation Jul 6, 2023
3a3e9e1
Update MilkyTracker.html
olymp14n Sep 29, 2023
aaa522e
Merge pull request #327 from olymp14n/patch-1
lmnoop Oct 9, 2023
a4735fc
Update MilkyTracker.html
lmnoop Oct 9, 2023
50273e4
Make RTMidi optional again
Deltafire Nov 21, 2023
b2d771d
Merge remote-tracking branch 'upstream/master'
MBeijer Jan 8, 2024
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: 5 additions & 1 deletion docs/MilkyTracker.html
Original file line number Diff line number Diff line change
@@ -155,7 +155,8 @@
<body>
<h1>MilkyTracker Manual <span id="version" style="font-size: small; font-weight: normal;">v1.03</span></h1>
<p>
Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://milkytracker.titandemo.org/">MilkyTracker.titandemo.org</a> as well.
Hello and welcome to MilkyTracker, an all-in-one Tracker musicstudio.<br>
It's opensource, multi-platform and inspired (and compatible) with Fasttracker.
</p>
<h4>Disclaimer:</h4>
<p>
@@ -3176,6 +3177,9 @@ <h4>
<tr>
<td><em>Deltafire</em></td><td>maintainer since v0.90.85</td>
</tr>
<tr>
<td><em>coderofsalvation</em></td><td>maintainer since v1.03.00</td>
</tr>
<tr>
<td><em>kenet</em></td><td>graphics</td>
</tr>
8 changes: 8 additions & 0 deletions src/tools/generateHelp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh
set -x
printf "\n\n" > milkytracker.help
lynx -dump ./docs/MilkyTracker.html | grep -v "file:" | awk '{ print " "$0"\n" }' >> milkytracker.help
{
echo "// generated by src/tools/generateHelp.sh"
xxd -i milkytracker.help
} > src/tracker/DialogHelpText.h
1 change: 1 addition & 0 deletions src/tracker/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ add_executable(tracker
AnimatedFXControl.cpp
ColorExportImport.cpp
ColorPaletteContainer.cpp
DialogHelp.cpp
DialogChannelSelector.cpp
DialogEQ.cpp
DialogGroupSelection.cpp
79 changes: 79 additions & 0 deletions src/tracker/DialogHelp.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* tracker/DialogHelp.cpp
*
* Copyright 2022 coderofsalvation / Leon van Kammen
*
* This file is part of Milkytracker.
*
* Milkytracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Milkytracker is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Milkytracker. If not, see <http://www.gnu.org/licenses/>.
*
*/

/*
* DialogHelp.cpp
* MilkyTracker
*
* Created by coderofsalvation / Leon van Kammen on 13-07-2022
*
*/

#include "DialogHelp.h"
#include "DialogHelpText.h"
#include "MessageBoxContainer.h"
#include "ListBox.h"
#include "PPUI.h"

DialogHelp::DialogHelp(PPScreen *screen,
DialogResponder *responder,
pp_int32 id,
const PPString &caption,
bool okCancel /* = false*/) : PPDialogBase()
{
char line[HELP_MAX_LINE];
pp_int32 w = 800;
pp_int32 h = screen->getHeight() - 200;
if (okCancel)
initDialog(screen, responder, id, caption, w, h, 26, "Ok", "Cancel");
else
initDialog(screen, responder, id, caption, w, h, 26, "Okay");

pp_int32 x = getMessageBoxContainer()->getLocation().x;
pp_int32 y = getMessageBoxContainer()->getLocation().y;

pp_int32 width = getMessageBoxContainer()->getSize().width;
pp_int32 height = getMessageBoxContainer()->getSize().height;

PPButton *button = static_cast<PPButton *>(messageBoxContainerGeneric->getControlByID(PP_MESSAGEBOX_BUTTON_YES));
pp_int32 y2 = button->getLocation().y;
pp_int32 x2 = x + width / 2 - 30;

y2 = getMessageBoxContainer()->getControlByID(MESSAGEBOX_STATICTEXT_MAIN_CAPTION)->getLocation().y + 18;
x2 = x + width / 2 - 120;

listBox = new PPListBox(MESSAGEBOX_LISTBOX_USER1, screen, this, PPPoint(x + 12, y + (3 * 8)), PPSize(width - (3 * 8), height - (8 * 8)), true, false, true, true);
listBox->setShowIndex(true);
memset(line, 0, HELP_MAX_LINE);
for (pp_int32 i = 0; i < milkytracker_help_len; i++)
{
char c = milkytracker_help[i];
if (c == '\n')
{
listBox->addItem(line);
memset(line, 0, HELP_MAX_LINE);
}
else
sprintf(line, "%s%c", line, c);
}
messageBoxContainerGeneric->addControl(listBox);
}
54 changes: 54 additions & 0 deletions src/tracker/DialogHelp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* tracker/DialogHelp.h
*
* Copyright 2022 coderofsalvation / Leon van Kammen
*
* This file is part of Milkytracker.
*
* Milkytracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Milkytracker is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Milkytracker. If not, see <http://www.gnu.org/licenses/>.
*
*/

/*
* DialogHelp.h
* MilkyTracker
*
* Created by coderofsalvation / Leon van Kammen on 13-07-2022
*
*/

#ifndef __DIALOGHELP_H__
#define __DIALOGHELP_H__

#include "DialogBase.h"

#define HELP_MAX_LINE 255

class DialogHelp : public PPDialogBase
{
private:
class PPListBox* listBox;

public:
DialogHelp(PPScreen* screen,
DialogResponder* responder,
pp_int32 id,
const PPString& caption,
bool okCancel = false);

PPListBox* getListBox() { return listBox; }

};

#endif
Loading