Skip to content

Commit 5831188

Browse files
author
larspalo
committed
Implemented global default paths for organ and cmb directory. Fixed crash caused by invalid image. Updated copyright year. Prepared for a new release.
1 parent 59a1faa commit 5831188

File tree

158 files changed

+597
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+597
-183
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GOODF cmake build file
2-
# Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
2+
# Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.10)
1919
# Set the project name and info
2020
project(
2121
GOODF
22-
VERSION 0.9.0
22+
VERSION 0.9.1
2323
DESCRIPTION "GOODF - Software for creating and editing GrandOrgue ODFs"
2424
LANGUAGES CXX C
2525
)
@@ -170,6 +170,7 @@ set(APP_SRC
170170
src/GUIPanelRepresentation.cpp
171171
src/CmbParser.cpp
172172
src/CmbDialog.cpp
173+
src/DefaultPathsDialog.cpp
173174
)
174175

175176
# add the executable

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[![Release](https://img.shields.io/github/v/release/larspalo/GOODF)](https://github.com/larspalo/GOODF/releases)
2+
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
3+
14
# GOODF
25

36
GOODF is a tool for creating and editing organ definition files for GrandOrgue. Opening large and complex .organ files can take a little while for the software to process, so please be patient if you try it.
@@ -19,7 +22,6 @@ Rendering of the GUI panels is now possible, but it likely needs more work befor
1922
- Testing the ability to both write and read .organ files will need to continue so that they both works really well without any bugs.
2023
- The graphical rendering of panels most likely still needs more work so that it should display the panels exactly like GrandOrgue will when scaled at 100%.
2124
- Implementing a possibility to select multiple GUI elements on the rendered panel and move them in unison.
22-
- Storing user settings in a configuration file to make some choices persistent is prepared but needs further improvement.
2325

2426
## Building from sources
2527
Normal development tools for c++ is needed as well as cmake, imagemagic and wxWidgets.

src/Attack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Attack.cpp is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

src/Attack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Attack.h is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

src/AttackDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* AttackDialog.cpp is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

src/AttackDialog.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* AttackDialog.h is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ class AttackDialog : public wxDialog {
6565
// Creates the controls and sizers
6666
void CreateControls();
6767

68-
// Accessor
68+
// Accessors
6969
unsigned GetSelectedAttackIndex();
7070
bool GetCopyReplaceLoops();
7171

@@ -115,7 +115,6 @@ class AttackDialog : public wxDialog {
115115
void OnRemoveLoopBtn(wxCommandEvent& event);
116116
void OnLoopStartSpin(wxSpinEvent& event);
117117
void OnLoopEndSpin(wxSpinEvent& event);
118-
// void OnCopyProperties(wxCommandEvent& event);
119118
void OnCopyReplaceLoopCheck(wxCommandEvent& event);
120119

121120
std::list<Attack>::iterator GetAttackIterator(unsigned index);

src/Button.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Button.cpp is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

src/Button.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Button.h is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

src/CmbDialog.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* CmbDialog.cpp is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
2020

2121
#include "CmbDialog.h"
2222
#include "GOODFDef.h"
23+
#include "GOODF.h"
2324
#include <wx/stdpaths.h>
2425
#include <wx/statline.h>
2526

@@ -301,10 +302,13 @@ bool CmbDialog::GetImportTrackerDelay() {
301302
}
302303

303304
void CmbDialog::OnBrowseForCmbBtn(wxCommandEvent& WXUNUSED(event)) {
305+
wxString defaultPath = ::wxGetApp().m_frame->GetDefaultCmbDirectory();
306+
if (defaultPath == wxEmptyString)
307+
defaultPath = wxStandardPaths::Get().GetDocumentsDir();
304308
wxFileDialog fileDialog(
305309
this,
306310
wxT("Select .cmb file to import"),
307-
wxStandardPaths::Get().GetDocumentsDir(),
311+
defaultPath,
308312
"",
309313
"GrandOrgue CMB files (*.cmb)|*.cmb;*.CMB",
310314
wxFD_OPEN|wxFD_FILE_MUST_EXIST

src/CmbDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* CmbDialog.h is part of GOODF.
3-
* Copyright (C) 2023 Lars Palo and contributors (see AUTHORS)
3+
* Copyright (C) 2024 Lars Palo and contributors (see AUTHORS)
44
*
55
* GOODF is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)