From 5d8a3e6a5f2677f430dcb5c16630f327dae40d5c Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Wed, 17 Oct 2018 23:08:35 +0200 Subject: [PATCH] renommage du projet --- CMakeLists.txt | 30 +++++++++++++++--------------- README.md | 14 +++++++------- docs/manual/Makefile | 6 +++--- po/fr/{gmajctl.po => FreeMajor.po} | 14 +++----------- scripts/i18n.sh | 4 ++-- sources/device/midi.cc | 4 ++-- sources/main.cc | 4 ++-- sources/ui/main_component.cxx | 2 +- sources/ui/main_component.fld | 2 +- sources/ui/main_window.cc | 2 +- 10 files changed, 37 insertions(+), 45 deletions(-) rename po/fr/{gmajctl.po => FreeMajor.po} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4e5194..6e9f5d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.3) -project(gmajctl VERSION "0.1" LANGUAGES CXX) +project(FreeMajor VERSION "0.1" LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") @@ -26,7 +26,7 @@ set(FLTK_SKIP_IMAGES ON) set(FLTK_SKIP_FLUID ON) find_package(FLTK REQUIRED) -add_executable(gmajctl WIN32 +add_executable(FreeMajor WIN32 "sources/main.cc" "sources/app_i18n.cc" "sources/utility/misc.cc" @@ -46,37 +46,37 @@ add_executable(gmajctl WIN32 "sources/ui/eq_display.cc" "sources/ui/association.cc" "sources/ui/midi_out_queue.cc") -target_compile_definitions(gmajctl +target_compile_definitions(FreeMajor PRIVATE "LOCALE_DIRECTORY=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\"") -target_include_directories(gmajctl +target_include_directories(FreeMajor PRIVATE "sources" "${FLTK_INCLUDE_DIR}") -target_link_libraries(gmajctl PRIVATE "${FLTK_LIBRARIES}") +target_link_libraries(FreeMajor PRIVATE "${FLTK_LIBRARIES}") include(RtMidi) -target_link_libraries(gmajctl PRIVATE RtMidi) +target_link_libraries(FreeMajor PRIVATE RtMidi) find_package(Threads REQUIRED) -target_link_libraries(gmajctl PRIVATE "${CMAKE_THREAD_LIBS_INIT}") +target_link_libraries(FreeMajor PRIVATE "${CMAKE_THREAD_LIBS_INIT}") if(ENABLE_GETTEXT) - target_compile_definitions(gmajctl PRIVATE "ENABLE_NLS=1") - target_include_directories(gmajctl PRIVATE ${Intl_INCLUDE_DIRS}) - target_link_libraries(gmajctl PRIVATE ${Intl_LIBRARIES}) - target_include_directories(gmajctl PRIVATE "thirdparty/gettext/include") + target_compile_definitions(FreeMajor PRIVATE "ENABLE_NLS=1") + target_include_directories(FreeMajor PRIVATE ${Intl_INCLUDE_DIRS}) + target_link_libraries(FreeMajor PRIVATE ${Intl_LIBRARIES}) + target_include_directories(FreeMajor PRIVATE "thirdparty/gettext/include") endif() -# target_sources(gmajctl PRIVATE "thirdparty/Fl_Knob/Fl_Knob/Fl_Knob.cxx") -# target_include_directories(gmajctl PRIVATE "thirdparty/Fl_Knob/Fl_Knob") +# target_sources(FreeMajor PRIVATE "thirdparty/Fl_Knob/Fl_Knob/Fl_Knob.cxx") +# target_include_directories(FreeMajor PRIVATE "thirdparty/Fl_Knob/Fl_Knob") ## Installation -install(TARGETS gmajctl DESTINATION "${CMAKE_INSTALL_BINDIR}") +install(TARGETS FreeMajor DESTINATION "${CMAKE_INSTALL_BINDIR}") ## Translations if(ENABLE_GETTEXT) set(TRANSLATIONS "fr") foreach(translation ${TRANSLATIONS}) gettext_process_po_files("${translation}" ALL INSTALL_DESTINATION "${CMAKE_INSTALL_LOCALEDIR}" PO_FILES - "po/${translation}/gmajctl.po") + "po/${translation}/FreeMajor.po") endforeach() endif() diff --git a/README.md b/README.md index a34b536..d73a912 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [![Build Status](https://semaphoreci.com/api/v1/jpcima/freemajor/branches/master/badge.svg)](https://semaphoreci.com/jpcima/freemajor) -[Automatic development build for Windows](http://jpcima.sdf1.org/software/development/GMajCtl/gmajctl-dev-win32.zip) +[Automatic development build for Windows](http://jpcima.sdf1.org/software/development/FreeMajor/FreeMajor-dev-win32.zip) ### Dependencies -gmajctl is mostly tested on [LibraZiK-2](http://librazik.tuxfamily.org/), a Debian Stretch based OS. +FreeMajor is mostly tested on [LibraZiK-2](http://librazik.tuxfamily.org/), a Debian Stretch based OS. The build dependencies on this OS are: ``` cmake @@ -19,18 +19,18 @@ Note that you might need to install `git` as well to fetch the sources. ``` git clone --recursive https://github.com/linuxmao-org/FreeMajor.git -mkdir gmajctl/build -cd gmajctl/build +mkdir FreeMajor/build +cd FreeMajor/build cmake .. cmake --build . cd .. -./build/gmajctl +./build/FreeMajor ``` ### Build after some modifications ``` -cd gmajctl +cd FreeMajor git pull cmake --build build -./build/gmajctl +./build/FreeMajor ``` diff --git a/docs/manual/Makefile b/docs/manual/Makefile index f29fe6a..d630be1 100644 --- a/docs/manual/Makefile +++ b/docs/manual/Makefile @@ -10,6 +10,6 @@ clean: $(foreach lang,$(LANGS),$(MAKE) -C $(lang) clean) install: - install -d $(DESTDIR)$(DOCDIR)/gmajctl/manual/ - cp -rf resources $(DESTDIR)$(DOCDIR)/gmajctl/manual/ - $(foreach lang,$(LANGS),install -D $(lang)/manual.html $(DESTDIR)$(DOCDIR)/gmajctl/manual/$(lang)/manual.html) + install -d $(DESTDIR)$(DOCDIR)/FreeMajor/manual/ + cp -rf resources $(DESTDIR)$(DOCDIR)/FreeMajor/manual/ + $(foreach lang,$(LANGS),install -D $(lang)/manual.html $(DESTDIR)$(DOCDIR)/FreeMajor/manual/$(lang)/manual.html) diff --git a/po/fr/gmajctl.po b/po/fr/FreeMajor.po similarity index 99% rename from po/fr/gmajctl.po rename to po/fr/FreeMajor.po index adab0fa..f0a138e 100644 --- a/po/fr/gmajctl.po +++ b/po/fr/FreeMajor.po @@ -1,13 +1,13 @@ -# French translations for gmajctl package. +# French translations for FreeMajor package. # Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gmajctl package. +# This file is distributed under the same license as the FreeMajor package. # Jean Pierre Cimalando , 2018. # Julien Taverna , 2018. # Olivier Humbert , 2018. # msgid "" msgstr "" -"Project-Id-Version: gmajctl 0.1\n" +"Project-Id-Version: FreeMajor 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-17 11:21+0200\n" "PO-Revision-Date: 2018-10-17 10:49+0200\n" @@ -759,10 +759,6 @@ msgstr "Fréq. max" msgid "Frequency" msgstr "Fréquence" -#: sources/ui/main_window.cc:15 sources/ui/main_component.cxx:111 -msgid "G-Major Editor" -msgstr "Éditeur G-Major" - #: sources/model/parameter.cc:390 sources/model/parameter.cc:408 msgid "Gain" msgstr "Gain" @@ -1607,10 +1603,6 @@ msgstr "" "Contrôleur logiciel libre et open source par\n" "Jean Pierre Cimalando & Julien Taverna" -#: sources/device/midi.cc:25 sources/device/midi.cc:44 -msgid "TC G-Major Editor" -msgstr "Editeur TC G-Major" - #. Fl_Input* txt_patch_name #: sources/ui/main_component.cxx:1481 msgid "Tap Tempo" diff --git a/scripts/i18n.sh b/scripts/i18n.sh index 1df17c5..8c5a221 100755 --- a/scripts/i18n.sh +++ b/scripts/i18n.sh @@ -12,12 +12,12 @@ po_update() { for locale in "fr"; do mkdir -p po/"$locale" - xgettext -k_ -k_P:1c,2 -L C++ --from-code=UTF-8 -c -s -o po/"$locale"/gmajctl.pot \ + xgettext -k_ -k_P:1c,2 -L C++ --from-code=UTF-8 -c -s -o po/"$locale"/FreeMajor.pot \ sources/*.{h,cc} \ sources/device/*.{h,cc} \ sources/model/*.{h,cc} \ sources/ui/*.{h,cc,cxx} \ sources/utility/*.{h,cc} - po_update po/"$locale"/gmajctl.po + po_update po/"$locale"/FreeMajor.po rm -f po/"$locale"/*.pot done diff --git a/sources/device/midi.cc b/sources/device/midi.cc index c2b0468..e7bb8df 100644 --- a/sources/device/midi.cc +++ b/sources/device/midi.cc @@ -22,7 +22,7 @@ Midi_Out &Midi_Out::instance() Midi_Out::Midi_Out() { RtMidiOut *client = new RtMidiOut( - RtMidi::UNSPECIFIED, _("TC G-Major Editor")); + RtMidi::UNSPECIFIED, _("FreeMajor")); client_.reset(client); client->setErrorCallback(&on_midi_error, this); } @@ -41,7 +41,7 @@ void Midi_Out::switch_api(RtMidi::Api api) if (api == client_->getCurrentApi()) return; - RtMidiOut *client = new RtMidiOut(api, _("TC G-Major Editor")); + RtMidiOut *client = new RtMidiOut(api, _("FreeMajor")); client_.reset(client); client->setErrorCallback(&on_midi_error, this); has_open_port_ = false; diff --git a/sources/main.cc b/sources/main.cc index f9a2283..fda6d0c 100644 --- a/sources/main.cc +++ b/sources/main.cc @@ -11,8 +11,8 @@ int main() { #if ENABLE_NLS setlocale(LC_ALL, ""); - bindtextdomain("gmajctl", LOCALE_DIRECTORY "/"); - textdomain("gmajctl"); + bindtextdomain("FreeMajor", LOCALE_DIRECTORY "/"); + textdomain("FreeMajor"); #endif Main_Window win; diff --git a/sources/ui/main_component.cxx b/sources/ui/main_component.cxx index 809e457..aabc319 100644 --- a/sources/ui/main_component.cxx +++ b/sources/ui/main_component.cxx @@ -108,7 +108,7 @@ void Main_Component::cb_btn_modifiers(Fl_Button* o, void* v) { } Main_Component::Main_Component(int X, int Y, int W, int H, const char *L) : Fl_Group(X, Y, W, H, L) { -{ Fl_Box* o = new Fl_Box(595, 1, 315, 39, _("G-Major Editor")); +{ Fl_Box* o = new Fl_Box(595, 1, 315, 39, _("FreeMajor")); o->box(FL_UP_BOX); o->labeltype(FL_SHADOW_LABEL); o->labelsize(28); diff --git a/sources/ui/main_component.fld b/sources/ui/main_component.fld index 0a4ce53..bcd8ab4 100644 --- a/sources/ui/main_component.fld +++ b/sources/ui/main_component.fld @@ -152,7 +152,7 @@ widget_class Main_Component {open decl {void on_changed_midi_interface();} {private local } Fl_Box {} { - label {G-Major Editor} + label FreeMajor selected xywh {595 1 315 39} box UP_BOX labeltype SHADOW_LABEL labelsize 28 } Fl_Button btn_import { diff --git a/sources/ui/main_window.cc b/sources/ui/main_window.cc index 3bf1ee8..d6a572f 100644 --- a/sources/ui/main_window.cc +++ b/sources/ui/main_window.cc @@ -12,7 +12,7 @@ Main_Window::Main_Window() { Main_Component *component = new Main_Component(0, 0, w(), h()); component_.reset(component); - this->copy_label(_("G-Major Editor")); + this->label(_("FreeMajor")); } Main_Window::~Main_Window()