diff --git a/Rakefile b/Rakefile index 1bcb5f786..dfa053b35 100755 --- a/Rakefile +++ b/Rakefile @@ -242,7 +242,7 @@ end if c?(:MINGW) $programs.each do |program| path = program.gsub(/^mkv/, '') - icon = program == 'mkvinfo' ? 'share/icons/windows/mkvinfo.ico' : 'share/icons/windows/mkvmergeGUI.ico' + icon = program == 'mkvinfo' ? 'share/icons/windows/mkvinfo.ico' : 'share/icons/windows/mkvtoolnix-gui.ico' file "src/#{path}/resources.o" => [ "src/#{path}/manifest-#{c(:MINGW_PROCESSOR_ARCH)}.xml", "src/#{path}/resources.rc", icon ] end end @@ -582,7 +582,7 @@ namespace :install do install_data :desktopdir, FileList[ "#{$top_srcdir}/share/desktop/*.desktop" ] install_data :mimepackagesdir, FileList[ "#{$top_srcdir}/share/mime/*.xml" ] - wanted_apps = %w{mkvmerge mkvmergeGUI mkvinfo mkvextract mkvpropedit}.collect { |e| "#{e}.png" }.to_hash_by + wanted_apps = %w{mkvmerge mkvtoolnix-gui mkvinfo mkvextract mkvpropedit}.collect { |e| "#{e}.png" }.to_hash_by wanted_dirs = %w{16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256}.to_hash_by dirs_to_install = FileList[ "#{$top_srcdir}/share/icons/*" ].select { |dir| wanted_dirs[ dir.gsub(/.*icons\//, '').gsub(/\/.*/, '') ] }.sort.uniq @@ -823,7 +823,7 @@ if c?(:USE_WXWIDGETS) aliases(:mmg). sources("src/mmg", "src/mmg/header_editor", "src/mmg/options", "src/mmg/tabs", :type => :dir). sources("src/mmg/resources.o", :if => c?(:MINGW)). - png_icon("share/icons/64x64/mkvmergeGUI.png", "src/mmg/mmg_dialog.cpp", "src/mmg/header_editor/frame.cpp"). + png_icon("share/icons/64x64/mkvtoolnix-gui.png", "src/mmg/mmg_dialog.cpp", "src/mmg/header_editor/frame.cpp"). png_icon("share/icons/16x16/sort_ascending.png", "src/mmg/tabs/select_scanned_file_dlg.cpp"). png_icon("share/icons/16x16/sort_descending.png", "src/mmg/tabs/select_scanned_file_dlg.cpp"). libraries($common_libs, :wxwidgets). @@ -864,7 +864,7 @@ if $build_mkvtoolnix_gui sources("src/mkvtoolnix-gui/resources.o", :if => c?(:MINGW)). libraries($common_libs, :qt). libraries("-mwindows", :if => c?(:MINGW)). - png_icon("share/icons/64x64/mkvmergeGUI.png"). + png_icon("share/icons/64x64/mkvtoolnix-gui.png"). libraries($custom_libs). create end diff --git a/debian-upstream/mkvtoolnix-gui.install b/debian-upstream/mkvtoolnix-gui.install index a401a5f85..005b04b54 100644 --- a/debian-upstream/mkvtoolnix-gui.install +++ b/debian-upstream/mkvtoolnix-gui.install @@ -3,4 +3,4 @@ src/mkvinfo-gui usr/bin usr/share/applications/mkvmergeGUI.desktop usr/share/applications/mkvinfo.desktop usr/share/doc/mkvtoolnix-gui -usr/share/icons/hicolor/*/apps/mkvmergeGUI.png +usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png diff --git a/installer/mkvtoolnix.nsi b/installer/mkvtoolnix.nsi index a9ca67832..e0da6b2e1 100644 --- a/installer/mkvtoolnix.nsi +++ b/installer/mkvtoolnix.nsi @@ -18,7 +18,7 @@ SetCompressorDictSize 64 # MUI Settings !define MUI_ABORTWARNING -!define MUI_ICON "mkvmergeGUI.ico" +!define MUI_ICON "mkvtoolnix-gui.ico" # Language Selection Dialog Settings !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" diff --git a/share/desktop/mkvmergeGUI.desktop b/share/desktop/mkvmergeGUI.desktop index 639eb9fd3..ffc95156f 100644 --- a/share/desktop/mkvmergeGUI.desktop +++ b/share/desktop/mkvmergeGUI.desktop @@ -7,7 +7,7 @@ GenericName[es]=Creador de ficheros MKV GenericName[fr]=Créateur de fichiers MKV GenericName[zh_CN]=MKV 文件创建器 GenericName[zh_TW]=MKV 檔製作軟體 -Icon=mkvmergeGUI +Icon=mkvtoolnix-gui Exec=mmg %F Terminal=false MimeType=application/x-mmg-settings;video/x-matroska;audio/x-matroska; diff --git a/share/icons/128x128/mkvmergeGUI.png b/share/icons/128x128/mkvtoolnix-gui.png similarity index 100% rename from share/icons/128x128/mkvmergeGUI.png rename to share/icons/128x128/mkvtoolnix-gui.png diff --git a/share/icons/16x16/mkvmergeGUI.png b/share/icons/16x16/mkvtoolnix-gui.png similarity index 100% rename from share/icons/16x16/mkvmergeGUI.png rename to share/icons/16x16/mkvtoolnix-gui.png diff --git a/share/icons/24x24/mkvmergeGUI.png b/share/icons/24x24/mkvtoolnix-gui.png similarity index 100% rename from share/icons/24x24/mkvmergeGUI.png rename to share/icons/24x24/mkvtoolnix-gui.png diff --git a/share/icons/256x256/mkvmergeGUI.png b/share/icons/256x256/mkvtoolnix-gui.png similarity index 100% rename from share/icons/256x256/mkvmergeGUI.png rename to share/icons/256x256/mkvtoolnix-gui.png diff --git a/share/icons/32x32/mkvmergeGUI.png b/share/icons/32x32/mkvtoolnix-gui.png similarity index 100% rename from share/icons/32x32/mkvmergeGUI.png rename to share/icons/32x32/mkvtoolnix-gui.png diff --git a/share/icons/48x48/mkvmergeGUI.png b/share/icons/48x48/mkvtoolnix-gui.png similarity index 100% rename from share/icons/48x48/mkvmergeGUI.png rename to share/icons/48x48/mkvtoolnix-gui.png diff --git a/share/icons/64x64/mkvmergeGUI.png b/share/icons/64x64/mkvtoolnix-gui.png similarity index 100% rename from share/icons/64x64/mkvmergeGUI.png rename to share/icons/64x64/mkvtoolnix-gui.png diff --git a/share/icons/96x96/mkvmergeGUI.png b/share/icons/96x96/mkvtoolnix-gui.png similarity index 100% rename from share/icons/96x96/mkvmergeGUI.png rename to share/icons/96x96/mkvtoolnix-gui.png diff --git a/share/icons/windows/mkvmergeGUI.ico b/share/icons/windows/mkvtoolnix-gui.ico similarity index 100% rename from share/icons/windows/mkvmergeGUI.ico rename to share/icons/windows/mkvtoolnix-gui.ico diff --git a/src/mkvtoolnix-gui/main_window/main_window.cpp b/src/mkvtoolnix-gui/main_window/main_window.cpp index 4f7d6cd2c..068dc8206 100644 --- a/src/mkvtoolnix-gui/main_window/main_window.cpp +++ b/src/mkvtoolnix-gui/main_window/main_window.cpp @@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent) setupToolSelector(); // Setup window properties. - setWindowIcon(Util::loadIcon(Q("mkvmergeGUI.png"), QList{} << 32 << 48 << 64 << 128 << 256)); + setWindowIcon(Util::loadIcon(Q("mkvtoolnix-gui.png"), QList{} << 32 << 48 << 64 << 128 << 256)); retranslateUi(); diff --git a/src/mkvtoolnix-gui/qt_resources.qrc b/src/mkvtoolnix-gui/qt_resources.qrc index 4c6a43409..286ab7cd9 100644 --- a/src/mkvtoolnix-gui/qt_resources.qrc +++ b/src/mkvtoolnix-gui/qt_resources.qrc @@ -4,12 +4,10 @@ ../../share/icons/32x32/mkvextract.png ../../share/icons/32x32/mkvinfo.png - ../../share/icons/32x32/mkvmergeGUI.png ../../share/icons/32x32/mkvmerge.png ../../share/icons/32x32/mkvpropedit.png ../../share/icons/64x64/mkvextract.png ../../share/icons/64x64/mkvinfo.png - ../../share/icons/64x64/mkvmergeGUI.png ../../share/icons/64x64/mkvmerge.png ../../share/icons/64x64/mkvpropedit.png ../../share/icons/16x16/arrow-left-double.png @@ -35,7 +33,6 @@ ../../share/icons/32x32/document-new.png ../../share/icons/32x32/application-exit.png ../../share/icons/128x128/mkvextract.png - ../../share/icons/128x128/mkvmergeGUI.png ../../share/icons/128x128/mkvinfo.png ../../share/icons/128x128/mkvpropedit.png ../../share/icons/128x128/mkvmerge.png @@ -45,12 +42,10 @@ ../../share/icons/16x16/list-remove.png ../../share/icons/16x16/list-add.png ../../share/icons/256x256/mkvextract.png - ../../share/icons/256x256/mkvmergeGUI.png ../../share/icons/256x256/mkvinfo.png ../../share/icons/256x256/mkvpropedit.png ../../share/icons/256x256/mkvmerge.png ../../share/icons/48x48/mkvextract.png - ../../share/icons/48x48/mkvmergeGUI.png ../../share/icons/48x48/mkvinfo.png ../../share/icons/48x48/mkvpropedit.png ../../share/icons/48x48/mkvmerge.png @@ -83,7 +78,6 @@ ../../share/icons/48x48/document-preview-archive.png ../../share/icons/48x48/story-editor.png ../../share/icons/16x16/mkvmerge.png - ../../share/icons/16x16/mkvmergeGUI.png ../../share/icons/16x16/mkvextract.png ../../share/icons/16x16/mkvinfo.png ../../share/icons/16x16/mkvpropedit.png @@ -93,12 +87,10 @@ ../../share/icons/32x32/system-run.png ../../share/icons/64x64/system-run.png ../../share/icons/24x24/mkvmerge.png - ../../share/icons/24x24/mkvmergeGUI.png ../../share/icons/24x24/mkvextract.png ../../share/icons/24x24/mkvinfo.png ../../share/icons/24x24/mkvpropedit.png ../../share/icons/96x96/mkvmerge.png - ../../share/icons/96x96/mkvmergeGUI.png ../../share/icons/96x96/mkvextract.png ../../share/icons/96x96/mkvinfo.png ../../share/icons/96x96/mkvpropedit.png @@ -128,5 +120,13 @@ ../../share/icons/16x16/view-choose.png ../../share/icons/32x32/view-choose.png ../../share/icons/48x48/view-choose.png + ../../share/icons/96x96/mkvtoolnix-gui.png + ../../share/icons/16x16/mkvtoolnix-gui.png + ../../share/icons/128x128/mkvtoolnix-gui.png + ../../share/icons/256x256/mkvtoolnix-gui.png + ../../share/icons/32x32/mkvtoolnix-gui.png + ../../share/icons/64x64/mkvtoolnix-gui.png + ../../share/icons/48x48/mkvtoolnix-gui.png + ../../share/icons/24x24/mkvtoolnix-gui.png \ No newline at end of file diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index deb3fd14f..cd25cbbd3 100644 --- a/src/mkvtoolnix-gui/resources.rc +++ b/src/mkvtoolnix-gui/resources.rc @@ -1,4 +1,4 @@ -mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" +mkvtoolnix_gui ICON "../../share/icons/windows/mkvtoolnix-gui.ico" #if defined(MINGW_PROCESSOR_ARCH_AMD64) 1 RT_MANIFEST "manifest-amd64.xml" diff --git a/src/mmg/header_editor/frame.cpp b/src/mmg/header_editor/frame.cpp index 53446f186..9a2306ee8 100644 --- a/src/mmg/header_editor/frame.cpp +++ b/src/mmg/header_editor/frame.cpp @@ -45,7 +45,7 @@ #include "mmg/mmg.h" #if !defined(SYS_WINDOWS) -# include "share/icons/64x64/mkvmergeGUI.h" +# include "share/icons/64x64/mkvtoolnix-gui.h" #endif class header_editor_drop_target_c: public wxFileDropTarget { @@ -128,7 +128,7 @@ header_editor_frame_c::header_editor_frame_c(wxWindow *parent) m_status_bar_timer.SetOwner(this, ID_T_HE_STATUS_BAR); - SetIcon(wx_get_png_or_icon(mkvmergeGUI)); + SetIcon(wx_get_png_or_icon(mkvtoolnix_gui)); SetDropTarget(new header_editor_drop_target_c(this)); set_status_bar(Z("Header editor ready.")); diff --git a/src/mmg/mmg_dialog.cpp b/src/mmg/mmg_dialog.cpp index c6d4c643b..c6d1351c2 100644 --- a/src/mmg/mmg_dialog.cpp +++ b/src/mmg/mmg_dialog.cpp @@ -58,7 +58,7 @@ #endif // defined(HAVE_CURL_EASY_H) #if !defined(SYS_WINDOWS) -# include "share/icons/64x64/mkvmergeGUI.h" +# include "share/icons/64x64/mkvtoolnix-gui.h" #endif mmg_dialog *mdlg; @@ -181,7 +181,7 @@ mmg_dialog::mmg_dialog() load_job_queue(); - SetIcon(wx_get_png_or_icon(mkvmergeGUI)); + SetIcon(wx_get_png_or_icon(mkvtoolnix_gui)); help = nullptr; diff --git a/src/mmg/resources.rc b/src/mmg/resources.rc index 47acf8b10..4321e22f9 100644 --- a/src/mmg/resources.rc +++ b/src/mmg/resources.rc @@ -1,4 +1,4 @@ -mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" +mkvtoolnix_gui ICON "../../share/icons/windows/mkvtoolnix-gui.ico" #define wxUSE_NO_MANIFEST 1 #include "wx/msw/wx.rc"