Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename mkvmergeGUI.* icons to mkvtoolnix-gui.*

Browse Source
This commit is contained in:
Moritz Bunkus 2015-05-09 09:41:04 +02:00
parent 48d9d4abc2
commit b13c83b1bc
19 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Rakefile
View File

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

2
debian-upstream/mkvtoolnix-gui.install
View File

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

2
installer/mkvtoolnix.nsi
View File

@ -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"

2
share/desktop/mkvmergeGUI.desktop
View File

@ -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;

0
share/icons/128x128/mkvmergeGUI.png → share/icons/128x128/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
share/icons/16x16/mkvmergeGUI.png → share/icons/16x16/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
share/icons/24x24/mkvmergeGUI.png → share/icons/24x24/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

0
share/icons/256x256/mkvmergeGUI.png → share/icons/256x256/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
share/icons/32x32/mkvmergeGUI.png → share/icons/32x32/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
share/icons/48x48/mkvmergeGUI.png → share/icons/48x48/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
share/icons/64x64/mkvmergeGUI.png → share/icons/64x64/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
share/icons/96x96/mkvmergeGUI.png → share/icons/96x96/mkvtoolnix-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
share/icons/windows/mkvmergeGUI.ico → share/icons/windows/mkvtoolnix-gui.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 KiB

After

Width:  |  Height:  |  Size: 179 KiB

2
src/mkvtoolnix-gui/main_window/main_window.cpp
View File

@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent)
setupToolSelector();
// Setup window properties.
setWindowIcon(Util::loadIcon(Q("mkvmergeGUI.png"), QList<int>{} << 32 << 48 << 64 << 128 << 256));
setWindowIcon(Util::loadIcon(Q("mkvtoolnix-gui.png"), QList<int>{} << 32 << 48 << 64 << 128 << 256));
retranslateUi();

16
src/mkvtoolnix-gui/qt_resources.qrc
View File

@ -4,12 +4,10 @@
<qresource>
<file alias='icons/32x32/mkvextract.png'>../../share/icons/32x32/mkvextract.png</file>
<file alias='icons/32x32/mkvinfo.png'>../../share/icons/32x32/mkvinfo.png</file>
<file alias='icons/32x32/mkvmergeGUI.png'>../../share/icons/32x32/mkvmergeGUI.png</file>
<file alias='icons/32x32/mkvmerge.png'>../../share/icons/32x32/mkvmerge.png</file>
<file alias='icons/32x32/mkvpropedit.png'>../../share/icons/32x32/mkvpropedit.png</file>
<file alias='icons/64x64/mkvextract.png'>../../share/icons/64x64/mkvextract.png</file>
<file alias='icons/64x64/mkvinfo.png'>../../share/icons/64x64/mkvinfo.png</file>
<file alias='icons/64x64/mkvmergeGUI.png'>../../share/icons/64x64/mkvmergeGUI.png</file>
<file alias='icons/64x64/mkvmerge.png'>../../share/icons/64x64/mkvmerge.png</file>
<file alias='icons/64x64/mkvpropedit.png'>../../share/icons/64x64/mkvpropedit.png</file>
<file alias='icons/16x16/arrow-left-double.png'>../../share/icons/16x16/arrow-left-double.png</file>
@ -35,7 +33,6 @@
<file alias='icons/32x32/document-new.png'>../../share/icons/32x32/document-new.png</file>
<file alias='icons/32x32/application-exit.png'>../../share/icons/32x32/application-exit.png</file>
<file alias='icons/128x128/mkvextract.png'>../../share/icons/128x128/mkvextract.png</file>
<file alias='icons/128x128/mkvmergeGUI.png'>../../share/icons/128x128/mkvmergeGUI.png</file>
<file alias='icons/128x128/mkvinfo.png'>../../share/icons/128x128/mkvinfo.png</file>
<file alias='icons/128x128/mkvpropedit.png'>../../share/icons/128x128/mkvpropedit.png</file>
<file alias='icons/128x128/mkvmerge.png'>../../share/icons/128x128/mkvmerge.png</file>
@ -45,12 +42,10 @@
<file alias='icons/16x16/list-remove.png'>../../share/icons/16x16/list-remove.png</file>
<file alias='icons/16x16/list-add.png'>../../share/icons/16x16/list-add.png</file>
<file alias='icons/256x256/mkvextract.png'>../../share/icons/256x256/mkvextract.png</file>
<file alias='icons/256x256/mkvmergeGUI.png'>../../share/icons/256x256/mkvmergeGUI.png</file>
<file alias='icons/256x256/mkvinfo.png'>../../share/icons/256x256/mkvinfo.png</file>
<file alias='icons/256x256/mkvpropedit.png'>../../share/icons/256x256/mkvpropedit.png</file>
<file alias='icons/256x256/mkvmerge.png'>../../share/icons/256x256/mkvmerge.png</file>
<file alias='icons/48x48/mkvextract.png'>../../share/icons/48x48/mkvextract.png</file>
<file alias='icons/48x48/mkvmergeGUI.png'>../../share/icons/48x48/mkvmergeGUI.png</file>
<file alias='icons/48x48/mkvinfo.png'>../../share/icons/48x48/mkvinfo.png</file>
<file alias='icons/48x48/mkvpropedit.png'>../../share/icons/48x48/mkvpropedit.png</file>
<file alias='icons/48x48/mkvmerge.png'>../../share/icons/48x48/mkvmerge.png</file>
@ -83,7 +78,6 @@
<file alias='icons/48x48/document-preview-archive.png'>../../share/icons/48x48/document-preview-archive.png</file>
<file alias='icons/48x48/story-editor.png'>../../share/icons/48x48/story-editor.png</file>
<file alias='icons/16x16/mkvmerge.png'>../../share/icons/16x16/mkvmerge.png</file>
<file alias='icons/16x16/mkvmergeGUI.png'>../../share/icons/16x16/mkvmergeGUI.png</file>
<file alias='icons/16x16/mkvextract.png'>../../share/icons/16x16/mkvextract.png</file>
<file alias='icons/16x16/mkvinfo.png'>../../share/icons/16x16/mkvinfo.png</file>
<file alias='icons/16x16/mkvpropedit.png'>../../share/icons/16x16/mkvpropedit.png</file>
@ -93,12 +87,10 @@
<file alias='icons/32x32/system-run.png'>../../share/icons/32x32/system-run.png</file>
<file alias='icons/64x64/system-run.png'>../../share/icons/64x64/system-run.png</file>
<file alias='icons/24x24/mkvmerge.png'>../../share/icons/24x24/mkvmerge.png</file>
<file alias='icons/24x24/mkvmergeGUI.png'>../../share/icons/24x24/mkvmergeGUI.png</file>
<file alias='icons/24x24/mkvextract.png'>../../share/icons/24x24/mkvextract.png</file>
<file alias='icons/24x24/mkvinfo.png'>../../share/icons/24x24/mkvinfo.png</file>
<file alias='icons/24x24/mkvpropedit.png'>../../share/icons/24x24/mkvpropedit.png</file>
<file alias='icons/96x96/mkvmerge.png'>../../share/icons/96x96/mkvmerge.png</file>
<file alias='icons/96x96/mkvmergeGUI.png'>../../share/icons/96x96/mkvmergeGUI.png</file>
<file alias='icons/96x96/mkvextract.png'>../../share/icons/96x96/mkvextract.png</file>
<file alias='icons/96x96/mkvinfo.png'>../../share/icons/96x96/mkvinfo.png</file>
<file alias='icons/96x96/mkvpropedit.png'>../../share/icons/96x96/mkvpropedit.png</file>
@ -128,5 +120,13 @@
<file alias='icons/16x16/view-choose.png'>../../share/icons/16x16/view-choose.png</file>
<file alias='icons/32x32/view-choose.png'>../../share/icons/32x32/view-choose.png</file>
<file alias='icons/48x48/view-choose.png'>../../share/icons/48x48/view-choose.png</file>
<file alias='icons/96x96/mkvtoolnix-gui.png'>../../share/icons/96x96/mkvtoolnix-gui.png</file>
<file alias='icons/16x16/mkvtoolnix-gui.png'>../../share/icons/16x16/mkvtoolnix-gui.png</file>
<file alias='icons/128x128/mkvtoolnix-gui.png'>../../share/icons/128x128/mkvtoolnix-gui.png</file>
<file alias='icons/256x256/mkvtoolnix-gui.png'>../../share/icons/256x256/mkvtoolnix-gui.png</file>
<file alias='icons/32x32/mkvtoolnix-gui.png'>../../share/icons/32x32/mkvtoolnix-gui.png</file>
<file alias='icons/64x64/mkvtoolnix-gui.png'>../../share/icons/64x64/mkvtoolnix-gui.png</file>
<file alias='icons/48x48/mkvtoolnix-gui.png'>../../share/icons/48x48/mkvtoolnix-gui.png</file>
<file alias='icons/24x24/mkvtoolnix-gui.png'>../../share/icons/24x24/mkvtoolnix-gui.png</file>
</qresource>
</RCC>

2
src/mkvtoolnix-gui/resources.rc
View File

@ -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"

4
src/mmg/header_editor/frame.cpp
View File

@ -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."));

4
src/mmg/mmg_dialog.cpp
View File

@ -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;

2
src/mmg/resources.rc
View File

@ -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"