From 75cd192440c6ffcf6a9b6f8dc5ac32a3af70f0b8 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 10 Apr 2012 22:34:58 +0200 Subject: [PATCH] Rename mmg-qt to mkvtoolnix-gui --- .gitignore | 6 ++--- Rakefile | 26 +++++++++---------- ac/qt4.m4 | 8 +++--- build-config.in | 2 +- src/{mmg-qt => mkvtoolnix-gui}/Rakefile | 2 +- src/{mmg-qt => mkvtoolnix-gui}/forms/Rakefile | 0 .../forms/main_window.ui | 0 .../main_window.cpp | 12 ++++----- src/{mmg-qt => mkvtoolnix-gui}/main_window.h | 2 +- .../mkvtoolnix_gui.cpp} | 4 +-- .../mkvtoolnix_gui.h} | 0 src/{mmg-qt => mkvtoolnix-gui}/mux_config.cpp | 2 +- src/{mmg-qt => mkvtoolnix-gui}/mux_config.h | 6 ++--- .../qt_resources.qrc} | 0 .../source_file.cpp | 2 +- src/{mmg-qt => mkvtoolnix-gui}/source_file.h | 2 +- src/{mmg-qt => mkvtoolnix-gui}/track.cpp | 6 ++--- src/{mmg-qt => mkvtoolnix-gui}/track.h | 0 src/{mmg-qt => mkvtoolnix-gui}/util/Rakefile | 0 .../util/file_identifier.cpp | 6 ++--- .../util/file_identifier.h | 2 +- .../util/file_type_filter.cpp | 2 +- .../util/file_type_filter.h | 0 .../util/process.cpp | 2 +- src/{mmg-qt => mkvtoolnix-gui}/util/process.h | 0 .../util/settings.cpp | 2 +- .../util/settings.h | 0 src/{mmg-qt => mkvtoolnix-gui}/util/util.cpp | 2 +- src/{mmg-qt => mkvtoolnix-gui}/util/util.h | 0 29 files changed, 49 insertions(+), 47 deletions(-) rename src/{mmg-qt => mkvtoolnix-gui}/Rakefile (76%) rename src/{mmg-qt => mkvtoolnix-gui}/forms/Rakefile (100%) rename src/{mmg-qt => mkvtoolnix-gui}/forms/main_window.ui (100%) rename src/{mmg-qt => mkvtoolnix-gui}/main_window.cpp (81%) rename src/{mmg-qt => mkvtoolnix-gui}/main_window.h (93%) rename src/{mmg-qt/mmg_qt.cpp => mkvtoolnix-gui/mkvtoolnix_gui.cpp} (78%) rename src/{mmg-qt/mmg_qt.h => mkvtoolnix-gui/mkvtoolnix_gui.h} (100%) rename src/{mmg-qt => mkvtoolnix-gui}/mux_config.cpp (94%) rename src/{mmg-qt => mkvtoolnix-gui}/mux_config.h (91%) rename src/{mmg-qt/resources.qrc => mkvtoolnix-gui/qt_resources.qrc} (100%) rename src/{mmg-qt => mkvtoolnix-gui}/source_file.cpp (98%) rename src/{mmg-qt => mkvtoolnix-gui}/source_file.h (95%) rename src/{mmg-qt => mkvtoolnix-gui}/track.cpp (95%) rename src/{mmg-qt => mkvtoolnix-gui}/track.h (100%) rename src/{mmg-qt => mkvtoolnix-gui}/util/Rakefile (100%) rename src/{mmg-qt => mkvtoolnix-gui}/util/file_identifier.cpp (97%) rename src/{mmg-qt => mkvtoolnix-gui}/util/file_identifier.h (96%) rename src/{mmg-qt => mkvtoolnix-gui}/util/file_type_filter.cpp (96%) rename src/{mmg-qt => mkvtoolnix-gui}/util/file_type_filter.h (100%) rename src/{mmg-qt => mkvtoolnix-gui}/util/process.cpp (97%) rename src/{mmg-qt => mkvtoolnix-gui}/util/process.h (100%) rename src/{mmg-qt => mkvtoolnix-gui}/util/settings.cpp (88%) rename src/{mmg-qt => mkvtoolnix-gui}/util/settings.h (100%) rename src/{mmg-qt => mkvtoolnix-gui}/util/util.cpp (89%) rename src/{mmg-qt => mkvtoolnix-gui}/util/util.h (100%) diff --git a/.gitignore b/.gitignore index 55976b169..0d0959529 100644 --- a/.gitignore +++ b/.gitignore @@ -47,9 +47,9 @@ /src/mkvpropedit /src/mmg/mmg /src/mmg/mmg-gui -/src/mmg-qt/forms/*.h -/src/mmg-qt/mmg-qt -/src/mmg-qt/resources.cpp +/src/mkvtoolnix-gui/forms/*.h +/src/mkvtoolnix-gui/mkvtoolnix-gui +/src/mkvtoolnix-gui/qt_resources.cpp /src/tools/ac3parser /src/tools/base64tool /src/tools/diracparser diff --git a/Rakefile b/Rakefile index b622ff173..3f59bf7f7 100644 --- a/Rakefile +++ b/Rakefile @@ -78,7 +78,7 @@ def setup_globals } $build_tools ||= c?(:TOOLS) - $build_mmg_qt ||= c?(:USE_QT) && c?(:BUILD_MMGQT) + $build_mkvtoolnix_gui ||= c?(:USE_QT) && c?(:BUILD_MKVTOOLNIX_GUI) cflags_common = "-Wall -Wno-comment #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\"" ldflags_extra = c?(:MINGW) ? '' : "-Wl,--enable-auto-import" @@ -105,8 +105,8 @@ def define_default_task targets = $applications.clone # Build the stuff in the 'src/tools' directory only if requested - targets << "apps:tools" if $build_tools - targets << "apps:mmg-qt" if $build_mmg_qt + targets << "apps:tools" if $build_tools + targets << "apps:mkvtoolnix-gui" if $build_mkvtoolnix_gui # The tags file -- but only if it exists already if File.exists?("TAGS") @@ -479,7 +479,7 @@ task :clean do patterns = %w{ src/**/*.o lib/**/*.o src/**/*.a lib/**/*.a src/**/*.gch src/**/*.exe src/**/*.dll src/**/*.dll.a - src/info/ui/*.h src/mmg-qt/forms/*.h src/**/*.moc src/**/*.moco src/mmg-qt/resources.cpp + src/info/ui/*.h src/mkvtoolnix-gui/forms/*.h src/**/*.moc src/**/*.moco src/mkvtoolnix-gui/qt_resources.cpp po/*.mo doc/guide/**/*.hhk } patterns += $applications + $tools.collect { |name| "src/tools/#{name}" } @@ -647,21 +647,21 @@ if c?(:USE_WXWIDGETS) end # -# mmg-qt +# mkvtoolnix-gui # -if $build_mmg_qt - ui_files = FileList["src/mmg-qt/forms/**/*.ui"].to_a +if $build_mkvtoolnix_gui + ui_files = FileList["src/mkvtoolnix-gui/forms/**/*.ui"].to_a ui_files.each do |ui| file ui.ext('cpp').gsub(/forms\//, '') => ui.ext('h') end - Application.new("src/mmg-qt/mmg-qt"). - description("Build the mmg-qt executable"). - aliases("mmg-qt"). - sources(FileList["src/mmg-qt/**/*.cpp"], ui_files, 'src/mmg-qt/resources.cpp'). - sources((FileList["src/mmg-qt/**/*.h"].to_a - ui_files.collect { |ui| ui.ext 'h' }).collect { |h| h.ext 'moc' }). - sources("src/mmg-qt/resources.o", :if => c?(:MINGW)). + Application.new("src/mkvtoolnix-gui/mkvtoolnix-gui"). + description("Build the mkvtoolnix-gui executable"). + aliases("mkvtoolnix-gui"). + sources(FileList["src/mkvtoolnix-gui/**/*.cpp"], ui_files, 'src/mkvtoolnix-gui/qt_resources.cpp'). + sources((FileList["src/mkvtoolnix-gui/**/*.h"].to_a - ui_files.collect { |ui| ui.ext 'h' }).collect { |h| h.ext 'moc' }). + sources("src/mkvtoolnix-gui/resources.o", :if => c?(:MINGW)). libraries(common_libs, :qt). png_icon("share/icons/64x64/mkvmergeGUI.png"). create diff --git a/ac/qt4.m4 b/ac/qt4.m4 index 9c348bb91..790ae6c3c 100644 --- a/ac/qt4.m4 +++ b/ac/qt4.m4 @@ -188,12 +188,14 @@ return 0; fi fi - AC_ARG_WITH(mmg-qt,[AS_HELP_STRING([--with-mmg-qt],[build mmg-qt (not working yet, only for development)])], - [BUILD_MMGQT=yes],[BUILD_MMGQT=no]) + AC_ARG_WITH(mkvtoolnix-gui,[AS_HELP_STRING([--with-mkvtoolnix-gui],[build mkvtoolnix-gui (not working yet, only for development)])], + [BUILD_MKVTOOLNIX_GUI=yes],[BUILD_MKVTOOLNIX_GUI=no]) fi if test x"$have_qt" != "xyes" ; then opt_features_no="$opt_features_no\n * GUIs (Qt version)" +elif test x"$BUILD_MKVTOOLNIX_GUI" = "xyes" ; then + opt_features_yes="$opt_features_yes\n * mkvtoolnix-gui" fi AC_SUBST(MOC) @@ -201,4 +203,4 @@ AC_SUBST(UIC) AC_SUBST(QT_CFLAGS) AC_SUBST(QT_LIBS) AC_SUBST(USE_QT) -AC_SUBST(BUILD_MMGQT) +AC_SUBST(BUILD_MKVTOOLNIX_GUI) diff --git a/build-config.in b/build-config.in index 719a9ace5..030e9e5c7 100644 --- a/build-config.in +++ b/build-config.in @@ -124,7 +124,7 @@ ZLIB_LIBS = @ZLIB_LIBS@ # Which additional stuff to compile USE_WXWIDGETS = @USE_WXWIDGETS@ USE_QT = @USE_QT@ -BUILD_MMGQT = @BUILD_MMGQT@ +BUILD_MKVTOOLNIX_GUI = @BUILD_MKVTOOLNIX_GUI@ TRANSLATIONS = @TRANSLATIONS@ MANPAGES_TRANSLATIONS = @MANPAGES_TRANSLATIONS@ diff --git a/src/mmg-qt/Rakefile b/src/mkvtoolnix-gui/Rakefile similarity index 76% rename from src/mmg-qt/Rakefile rename to src/mkvtoolnix-gui/Rakefile index 8afd9c57c..7a9ee62b1 100644 --- a/src/mmg-qt/Rakefile +++ b/src/mkvtoolnix-gui/Rakefile @@ -1,6 +1,6 @@ #!/usr/bin/env rake # -*- mode: ruby; -*- -$build_mmg_qt = true +$build_mkvtoolnix_gui = true import File.dirname(__FILE__) + "/../../Rakefile" diff --git a/src/mmg-qt/forms/Rakefile b/src/mkvtoolnix-gui/forms/Rakefile similarity index 100% rename from src/mmg-qt/forms/Rakefile rename to src/mkvtoolnix-gui/forms/Rakefile diff --git a/src/mmg-qt/forms/main_window.ui b/src/mkvtoolnix-gui/forms/main_window.ui similarity index 100% rename from src/mmg-qt/forms/main_window.ui rename to src/mkvtoolnix-gui/forms/main_window.ui diff --git a/src/mmg-qt/main_window.cpp b/src/mkvtoolnix-gui/main_window.cpp similarity index 81% rename from src/mmg-qt/main_window.cpp rename to src/mkvtoolnix-gui/main_window.cpp index 176f231f8..1dc242a70 100644 --- a/src/mmg-qt/main_window.cpp +++ b/src/mkvtoolnix-gui/main_window.cpp @@ -1,12 +1,12 @@ #include "common/common_pch.h" #include "common/qt.h" -#include "mmg-qt/main_window.h" -#include "mmg-qt/forms/main_window.h" -#include "mmg-qt/util/file_identifier.h" -#include "mmg-qt/util/file_type_filter.h" -#include "mmg-qt/util/settings.h" -#include "mmg-qt/util/util.h" +#include "mkvtoolnix-gui/main_window.h" +#include "mkvtoolnix-gui/forms/main_window.h" +#include "mkvtoolnix-gui/util/file_identifier.h" +#include "mkvtoolnix-gui/util/file_type_filter.h" +#include "mkvtoolnix-gui/util/settings.h" +#include "mkvtoolnix-gui/util/util.h" #include #include diff --git a/src/mmg-qt/main_window.h b/src/mkvtoolnix-gui/main_window.h similarity index 93% rename from src/mmg-qt/main_window.h rename to src/mkvtoolnix-gui/main_window.h index 2d222da06..60b3e7c3a 100644 --- a/src/mmg-qt/main_window.h +++ b/src/mkvtoolnix-gui/main_window.h @@ -3,7 +3,7 @@ #include "common/common_pch.h" -#include "mmg-qt/mux_config.h" +#include "mkvtoolnix-gui/mux_config.h" #include #include diff --git a/src/mmg-qt/mmg_qt.cpp b/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp similarity index 78% rename from src/mmg-qt/mmg_qt.cpp rename to src/mkvtoolnix-gui/mkvtoolnix_gui.cpp index a300fb696..f769a99bb 100644 --- a/src/mmg-qt/mmg_qt.cpp +++ b/src/mkvtoolnix-gui/mkvtoolnix_gui.cpp @@ -2,8 +2,8 @@ #include -#include "mmg-qt/mmg_qt.h" -#include "mmg-qt/main_window.h" +#include "mkvtoolnix-gui/mmg_qt.h" +#include "mkvtoolnix-gui/main_window.h" int main(int argc, diff --git a/src/mmg-qt/mmg_qt.h b/src/mkvtoolnix-gui/mkvtoolnix_gui.h similarity index 100% rename from src/mmg-qt/mmg_qt.h rename to src/mkvtoolnix-gui/mkvtoolnix_gui.h diff --git a/src/mmg-qt/mux_config.cpp b/src/mkvtoolnix-gui/mux_config.cpp similarity index 94% rename from src/mmg-qt/mux_config.cpp rename to src/mkvtoolnix-gui/mux_config.cpp index 308cac2d4..7bfb100c6 100644 --- a/src/mmg-qt/mux_config.cpp +++ b/src/mkvtoolnix-gui/mux_config.cpp @@ -1,6 +1,6 @@ #include "common/common_pch.h" -#include "mmg-qt/mux_config.h" +#include "mkvtoolnix-gui/mux_config.h" MuxConfig::MuxConfig() : m_splitMode{DoNotSplit} diff --git a/src/mmg-qt/mux_config.h b/src/mkvtoolnix-gui/mux_config.h similarity index 91% rename from src/mmg-qt/mux_config.h rename to src/mkvtoolnix-gui/mux_config.h index 387633d70..c3adcef26 100644 --- a/src/mmg-qt/mux_config.h +++ b/src/mkvtoolnix-gui/mux_config.h @@ -3,9 +3,9 @@ #include "common/common_pch.h" -// #include "mmg-qt/attachment.h" -#include "mmg-qt/source_file.h" -#include "mmg-qt/track.h" +// #include "mkvtoolnix-gui/attachment.h" +#include "mkvtoolnix-gui/source_file.h" +#include "mkvtoolnix-gui/track.h" #include #include diff --git a/src/mmg-qt/resources.qrc b/src/mkvtoolnix-gui/qt_resources.qrc similarity index 100% rename from src/mmg-qt/resources.qrc rename to src/mkvtoolnix-gui/qt_resources.qrc diff --git a/src/mmg-qt/source_file.cpp b/src/mkvtoolnix-gui/source_file.cpp similarity index 98% rename from src/mmg-qt/source_file.cpp rename to src/mkvtoolnix-gui/source_file.cpp index 67b88abda..6337f3f9f 100644 --- a/src/mmg-qt/source_file.cpp +++ b/src/mkvtoolnix-gui/source_file.cpp @@ -1,7 +1,7 @@ #include "common/common_pch.h" #include "common/qt.h" -#include "mmg-qt/source_file.h" +#include "mkvtoolnix-gui/source_file.h" SourceFile::SourceFile(QString const &fileName) : m_fileName(fileName) diff --git a/src/mmg-qt/source_file.h b/src/mkvtoolnix-gui/source_file.h similarity index 95% rename from src/mmg-qt/source_file.h rename to src/mkvtoolnix-gui/source_file.h index ed64d99fa..b56859343 100644 --- a/src/mmg-qt/source_file.h +++ b/src/mkvtoolnix-gui/source_file.h @@ -11,7 +11,7 @@ #include "common/file_types.h" #include "common/qt.h" -#include "mmg-qt/track.h" +#include "mkvtoolnix-gui/track.h" class SourceFile; typedef std::shared_ptr SourceFilePtr; diff --git a/src/mmg-qt/track.cpp b/src/mkvtoolnix-gui/track.cpp similarity index 95% rename from src/mmg-qt/track.cpp rename to src/mkvtoolnix-gui/track.cpp index 66da3f536..04bf2f930 100644 --- a/src/mmg-qt/track.cpp +++ b/src/mkvtoolnix-gui/track.cpp @@ -1,9 +1,9 @@ #include "common/common_pch.h" #include "common/iso639.h" -#include "mmg-qt/source_file.h" -#include "mmg-qt/track.h" -#include "mmg-qt/util/settings.h" +#include "mkvtoolnix-gui/source_file.h" +#include "mkvtoolnix-gui/track.h" +#include "mkvtoolnix-gui/util/settings.h" Track::Track(Track::Type type) : m_file(nullptr) diff --git a/src/mmg-qt/track.h b/src/mkvtoolnix-gui/track.h similarity index 100% rename from src/mmg-qt/track.h rename to src/mkvtoolnix-gui/track.h diff --git a/src/mmg-qt/util/Rakefile b/src/mkvtoolnix-gui/util/Rakefile similarity index 100% rename from src/mmg-qt/util/Rakefile rename to src/mkvtoolnix-gui/util/Rakefile diff --git a/src/mmg-qt/util/file_identifier.cpp b/src/mkvtoolnix-gui/util/file_identifier.cpp similarity index 97% rename from src/mmg-qt/util/file_identifier.cpp rename to src/mkvtoolnix-gui/util/file_identifier.cpp index 80d0db8a8..3d1fa8946 100644 --- a/src/mmg-qt/util/file_identifier.cpp +++ b/src/mkvtoolnix-gui/util/file_identifier.cpp @@ -2,9 +2,9 @@ #include "common/qt.h" #include "common/strings/editing.h" -#include "mmg-qt/util/file_identifier.h" -#include "mmg-qt/util/process.h" -#include "mmg-qt/util/settings.h" +#include "mkvtoolnix-gui/util/file_identifier.h" +#include "mkvtoolnix-gui/util/process.h" +#include "mkvtoolnix-gui/util/settings.h" #include #include diff --git a/src/mmg-qt/util/file_identifier.h b/src/mkvtoolnix-gui/util/file_identifier.h similarity index 96% rename from src/mmg-qt/util/file_identifier.h rename to src/mkvtoolnix-gui/util/file_identifier.h index 519002610..69d7e32a2 100644 --- a/src/mmg-qt/util/file_identifier.h +++ b/src/mkvtoolnix-gui/util/file_identifier.h @@ -6,7 +6,7 @@ #include #include -#include "mmg-qt/source_file.h" +#include "mkvtoolnix-gui/source_file.h" class FileIdentifier: public QObject { Q_OBJECT; diff --git a/src/mmg-qt/util/file_type_filter.cpp b/src/mkvtoolnix-gui/util/file_type_filter.cpp similarity index 96% rename from src/mmg-qt/util/file_type_filter.cpp rename to src/mkvtoolnix-gui/util/file_type_filter.cpp index 2a5bf82f5..b058716a7 100644 --- a/src/mmg-qt/util/file_type_filter.cpp +++ b/src/mkvtoolnix-gui/util/file_type_filter.cpp @@ -2,7 +2,7 @@ #include "common/file_types.h" #include "common/qt.h" -#include "mmg-qt/util/file_type_filter.h" +#include "mkvtoolnix-gui/util/file_type_filter.h" #include diff --git a/src/mmg-qt/util/file_type_filter.h b/src/mkvtoolnix-gui/util/file_type_filter.h similarity index 100% rename from src/mmg-qt/util/file_type_filter.h rename to src/mkvtoolnix-gui/util/file_type_filter.h diff --git a/src/mmg-qt/util/process.cpp b/src/mkvtoolnix-gui/util/process.cpp similarity index 97% rename from src/mmg-qt/util/process.cpp rename to src/mkvtoolnix-gui/util/process.cpp index 4c8f288de..db7bb06c0 100644 --- a/src/mmg-qt/util/process.cpp +++ b/src/mkvtoolnix-gui/util/process.cpp @@ -4,7 +4,7 @@ #include #include "common/qt.h" -#include "mmg-qt/util/process.h" +#include "mkvtoolnix-gui/util/process.h" Process::Process(QString const &command, QStringList const &args) diff --git a/src/mmg-qt/util/process.h b/src/mkvtoolnix-gui/util/process.h similarity index 100% rename from src/mmg-qt/util/process.h rename to src/mkvtoolnix-gui/util/process.h diff --git a/src/mmg-qt/util/settings.cpp b/src/mkvtoolnix-gui/util/settings.cpp similarity index 88% rename from src/mmg-qt/util/settings.cpp rename to src/mkvtoolnix-gui/util/settings.cpp index a6fcdd155..987a541a9 100644 --- a/src/mmg-qt/util/settings.cpp +++ b/src/mkvtoolnix-gui/util/settings.cpp @@ -1,6 +1,6 @@ #include "common/common_pch.h" -#include "mmg-qt/util/settings.h" +#include "mkvtoolnix-gui/util/settings.h" Settings Settings::s_settings; diff --git a/src/mmg-qt/util/settings.h b/src/mkvtoolnix-gui/util/settings.h similarity index 100% rename from src/mmg-qt/util/settings.h rename to src/mkvtoolnix-gui/util/settings.h diff --git a/src/mmg-qt/util/util.cpp b/src/mkvtoolnix-gui/util/util.cpp similarity index 89% rename from src/mmg-qt/util/util.cpp rename to src/mkvtoolnix-gui/util/util.cpp index 42c2fd781..6aa8c7f51 100644 --- a/src/mmg-qt/util/util.cpp +++ b/src/mkvtoolnix-gui/util/util.cpp @@ -5,7 +5,7 @@ #include #include "common/qt.h" -#include "mmg-qt/util/util.h" +#include "mkvtoolnix-gui/util/util.h" QIcon Util::loadIcon(QString const &name, diff --git a/src/mmg-qt/util/util.h b/src/mkvtoolnix-gui/util/util.h similarity index 100% rename from src/mmg-qt/util/util.h rename to src/mkvtoolnix-gui/util/util.h