otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

the massive preparations - settings and sysConf

Browse source
This commit is contained in:
tildearrow 2024-05-26 23:30:33 -05:00
parent 35a2bb7a53
commit e12bf82f49
16 changed files with 43460 additions and 21654 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12485
po/es.po
View file

File diff suppressed because it is too large Load diff

12476
po/furnace.pot
View file

File diff suppressed because it is too large Load diff

12484
po/pl.po
View file

File diff suppressed because it is too large Load diff

12476
po/pt_BR.po
View file

File diff suppressed because it is too large Load diff

12488
po/ru.po
View file

File diff suppressed because it is too large Load diff

2
scripts/update-po.sh
View file

@ -13,7 +13,7 @@ echo '"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
' >> po/furnace.pot
find src/ -type f -regex ".*\(cpp\|h\)$" | xargs xgettext --omit-header -k_ -k_N -L C++ -o - >> po/furnace.pot || exit 1
find src/ -type f -regex ".*\(cpp\|h\)$" | xargs xgettext --omit-header -k_ -k_N -L C++ --from-code=UTF-8 -j -o po/furnace.pot || exit 1
cd po
for i in ${EXPORT_LANGS[@]}; do

28
src/gui/chanOsc.cpp
View file

@ -29,23 +29,23 @@
#define FURNACE_FFT_CUTOFF 0.1
const char* chanOscRefs[]={
"None (0%)",
"None (50%)",
"None (100%)",
_N("None (0%)"),
_N("None (50%)"),
_N("None (100%)"),
"Frequency",
"Volume",
"Channel",
"Brightness",
_N("Frequency"),
_N("Volume"),
_N("Channel"),
_N("Brightness"),
"Note Trigger"
_N("Note Trigger")
};
const char* autoColsTypes[]={
"Off",
"Mode 1",
"Mode 2",
"Mode 3"
_N("Off"),
_N("Mode 1"),
_N("Mode 2"),
_N("Mode 3")
};
static void _drawOsc(const ImDrawList* drawList, const ImDrawCmd* cmd) {
@ -338,8 +338,8 @@ void FurnaceGUI::drawChanOsc() {
if (ImGui::ColorEdit4(_("Background"),(float*)&chanOscGrad.bgColor)) {
updateChanOscGradTex=true;
}
ImGui::Combo(_("X Axis##AxisX"),&chanOscColorX,chanOscRefs,GUI_OSCREF_MAX);
ImGui::Combo(_("Y Axis##AxisY"),&chanOscColorY,chanOscRefs,GUI_OSCREF_MAX);
ImGui::Combo(_("X Axis##AxisX"),&chanOscColorX,LocalizedComboGetter,chanOscRefs,GUI_OSCREF_MAX);
ImGui::Combo(_("Y Axis##AxisY"),&chanOscColorY,LocalizedComboGetter,chanOscRefs,GUI_OSCREF_MAX);
ImGui::EndTable();
}

20
src/gui/findReplace.cpp
View file

@ -601,7 +601,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::Text(_("Note"));
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##NCondition",&i.noteMode,queryModes,GUI_QUERY_MAX);
ImGui::Combo("##NCondition",&i.noteMode,LocalizedComboGetter,queryModes,GUI_QUERY_MAX);
ImGui::TableNextColumn();
if (FIRST_VISIBLE(i.noteMode)) {
if ((i.noteMode==GUI_QUERY_RANGE || i.noteMode==GUI_QUERY_RANGE_NOT) && i.note>=120) {
@ -669,7 +669,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::Text(_("Ins"));
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##ICondition",&i.insMode,queryModes,GUI_QUERY_MAX);
ImGui::Combo("##ICondition",&i.insMode,LocalizedComboGetter,queryModes,GUI_QUERY_MAX);
ImGui::TableNextColumn();
if (FIRST_VISIBLE(i.insMode)) {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -687,7 +687,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::Text(_("Volume"));
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##VCondition",&i.volMode,queryModes,GUI_QUERY_MAX);
ImGui::Combo("##VCondition",&i.volMode,LocalizedComboGetter,queryModes,GUI_QUERY_MAX);
ImGui::TableNextColumn();
if (FIRST_VISIBLE(i.volMode)) {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -707,7 +707,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::Text(_("Effect"));
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##ECondition",&i.effectMode[j],queryModes,GUI_QUERY_MAX);
ImGui::Combo("##ECondition",&i.effectMode[j],LocalizedComboGetter,queryModes,GUI_QUERY_MAX);
ImGui::TableNextColumn();
if (FIRST_VISIBLE(i.effectMode[j])) {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -725,7 +725,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::Text(_("Value"));
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##EVCondition",&i.effectValMode[j],queryModes,GUI_QUERY_MAX);
ImGui::Combo("##EVCondition",&i.effectValMode[j],LocalizedComboGetter,queryModes,GUI_QUERY_MAX);
ImGui::TableNextColumn();
if (FIRST_VISIBLE(i.effectValMode[j])) {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -865,7 +865,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!queryReplaceNoteDo);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##NRMode",&queryReplaceNoteMode,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::Combo("##NRMode",&queryReplaceNoteMode,LocalizedComboGetter,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (queryReplaceNoteMode==GUI_QUERY_REPLACE_SET) {
@ -915,7 +915,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!queryReplaceInsDo);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##IRMode",&queryReplaceInsMode,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::Combo("##IRMode",&queryReplaceInsMode,LocalizedComboGetter,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (queryReplaceInsMode==GUI_QUERY_REPLACE_SET) {
@ -944,7 +944,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!queryReplaceVolDo);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##VRMode",&queryReplaceVolMode,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::Combo("##VRMode",&queryReplaceVolMode,LocalizedComboGetter,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (queryReplaceVolMode==GUI_QUERY_REPLACE_SET) {
@ -975,7 +975,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!queryReplaceEffectDo[i]);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##ERMode",&queryReplaceEffectMode[i],queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::Combo("##ERMode",&queryReplaceEffectMode[i],LocalizedComboGetter,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (queryReplaceEffectMode[i]==GUI_QUERY_REPLACE_SET) {
@ -1004,7 +1004,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!queryReplaceEffectValDo[i]);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##ERModeV",&queryReplaceEffectValMode[i],queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::Combo("##ERModeV",&queryReplaceEffectValMode[i],LocalizedComboGetter,queryReplaceModes,GUI_QUERY_REPLACE_MAX);
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (queryReplaceEffectValMode[i]==GUI_QUERY_REPLACE_SET) {

6
src/gui/gui.cpp
View file

@ -515,6 +515,12 @@ bool FurnaceGUI::InvCheckbox(const char* label, bool* value) {
return false;
}
bool FurnaceGUI::LocalizedComboGetter(void* data, int idx, const char** out_text) {
const char* const* items=(const char* const*)data;
if (out_text) *out_text=_(items[idx]);
return true;
}
void FurnaceGUI::sameLineMaybe(float width) {
if (width<0.0f) width=ImGui::GetFrameHeight();

3
src/gui/gui.h
View file

@ -2674,6 +2674,9 @@ class FurnaceGUI {
void renderFMPreviewOPZ(const DivInstrumentFM& params, int pos=0);
void renderFMPreviewESFM(const DivInstrumentFM& params, const DivInstrumentESFM& esfmParams, int pos=0);
// combo with locale
static bool LocalizedComboGetter(void* data, int idx, const char** out_text);
// these ones offer ctrl-wheel fine value changes.
bool CWSliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format=NULL, ImGuiSliderFlags flags=0);
bool CWVSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format=NULL, ImGuiSliderFlags flags=0);

4
src/gui/insEdit.cpp
View file

@ -5643,7 +5643,7 @@ void FurnaceGUI::drawInsEdit() {
}
int cmd=ins->gb.hwSeq[i].cmd;
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::Combo("##HWSeqCmd",&cmd,gbHWSeqCmdTypes,DivInstrumentGB::DIV_GB_HWCMD_MAX)) {
if (ImGui::Combo("##HWSeqCmd",&cmd,LocalizedComboGetter,gbHWSeqCmdTypes,DivInstrumentGB::DIV_GB_HWCMD_MAX)) {
if (ins->gb.hwSeq[i].cmd!=cmd) {
ins->gb.hwSeq[i].cmd=cmd;
ins->gb.hwSeq[i].data=0;
@ -5976,7 +5976,7 @@ void FurnaceGUI::drawInsEdit() {
}
int cmd=ins->su.hwSeq[i].cmd;
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::Combo("##HWSeqCmd",&cmd,suHWSeqCmdTypes,DivInstrumentSoundUnit::DIV_SU_HWCMD_MAX)) {
if (ImGui::Combo("##HWSeqCmd",&cmd,LocalizedComboGetter,suHWSeqCmdTypes,DivInstrumentSoundUnit::DIV_SU_HWCMD_MAX)) {
if (ins->su.hwSeq[i].cmd!=cmd) {
ins->su.hwSeq[i].cmd=cmd;
ins->su.hwSeq[i].val=0;

2
src/gui/log.cpp
View file

@ -50,7 +50,7 @@ void FurnaceGUI::drawLog() {
ImGui::Text(_("Level"));
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::Combo("##LogLevel",&logLevel,logLevels,5);
ImGui::Combo("##LogLevel",&logLevel,LocalizedComboGetter,logLevels,5);
if (ImGui::BeginTable("LogView",3,ImGuiTableFlags_ScrollY|ImGuiTableFlags_BordersInnerV)) {
ImGui::PushFont(patFont);

2
src/gui/sampleEdit.cpp
View file

@ -953,7 +953,7 @@ void FurnaceGUI::drawSampleEdit() {
if (resampleTarget<0) resampleTarget=0;
if (resampleTarget>96000) resampleTarget=96000;
}
ImGui::Combo(_("Filter"),&resampleStrat,resampleStrats,6);
ImGui::Combo(_("Filter"),&resampleStrat,LocalizedComboGetter,resampleStrats,6);
if (ImGui::Button(_("Resample"))) {
sample->prepareUndo(true);
e->lockEngine([this,sample,targetRate]() {

1992
src/gui/settings.cpp
View file

File diff suppressed because it is too large Load diff

644
src/gui/sysConf.cpp
View file

File diff suppressed because it is too large Load diff

2
src/main.cpp
View file

@ -506,8 +506,6 @@ int main(int argc, char** argv) {
} else {
logV("text domain 2: %s",localeRet);
}
logV(_("this is a test!"));
#endif
initParams();