Rename mmg-qt to mkvtoolnix-gui

.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

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

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)

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@

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"

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 <QFileDialog>
 #include <QIcon>

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 <QDir>
 #include <QMainWindow>

src/mkvtoolnix-gui/mkvtoolnix_gui.cpp

@@ -2,8 +2,8 @@
 
 #include <QApplication>
 
-#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,

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}

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 <QObject>
 #include <QList>

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)

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<SourceFile> SourceFilePtr;

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)

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 <QMessageBox>
 #include <QStringList>

src/mkvtoolnix-gui/util/file_identifier.h

@@ -6,7 +6,7 @@
 #include <QStringList>
 #include <QWidget>
 
-#include "mmg-qt/source_file.h"
+#include "mkvtoolnix-gui/source_file.h"
 
 class FileIdentifier: public QObject {
   Q_OBJECT;

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 <QStringList>
 

src/mkvtoolnix-gui/util/process.cpp

@@ -4,7 +4,7 @@
 #include <QTemporaryFile>
 
 #include "common/qt.h"
-#include "mmg-qt/util/process.h"
+#include "mkvtoolnix-gui/util/process.h"
 
 Process::Process(QString const &command,
                  QStringList const &args)

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;
 

src/mkvtoolnix-gui/util/util.cpp

@@ -5,7 +5,7 @@
 #include <QString>
 
 #include "common/qt.h"
-#include "mmg-qt/util/util.h"
+#include "mkvtoolnix-gui/util/util.h"
 
 QIcon
 Util::loadIcon(QString const &name,