Browse Source

Un-xibless-ify HSErrorReportWindow

master
Virgil Dupras 4 years ago
parent
commit
bda6b937db
4 changed files with 45 additions and 12 deletions
  1. +1
    -4
      build.py
  2. +1
    -1
      cocoalib
  3. +42
    -6
      dupeGuru.xcodeproj/project.pbxproj
  4. +1
    -1
      hscommon

+ 1
- 4
build.py View File

@@ -19,7 +19,7 @@ from hscommon import sphinxgen
from hscommon.build import (
add_to_pythonpath, print_and_do, copy_packages, filereplace,
get_module_version, move_all, copy_all, OSXAppStructure,
build_cocoalib_xibless, fix_qt_resource_file, build_cocoa_ext, copy_embeddable_python_dylib,
fix_qt_resource_file, build_cocoa_ext, copy_embeddable_python_dylib,
collect_stdlib_dependencies
)
from hscommon import loc
@@ -105,7 +105,6 @@ def build_xibless(dest='cocoa/autogen'):
def build_cocoa(dev):
build_localizations()
build_cocoalib_xibless()
build_xibless()
build_cocoa_proxy_module()
build_cocoa_bridging_interfaces()
@@ -170,7 +169,6 @@ def build_localizations():

def build_updatepot():
print("Updating Cocoa strings file.")
build_cocoalib_xibless('cocoalib/autogen')
loc.generate_cocoa_strings_from_code('cocoalib', 'cocoalib/en.lproj')
build_xibless()
loc.generate_cocoa_strings_from_code('cocoa', 'cocoa/en.lproj')
@@ -298,7 +296,6 @@ def main():
os.chdir('..')
cocoa_app().copy_executable('cocoa/build/dupeGuru')
elif options.xibless:
build_cocoalib_xibless()
build_xibless()
else:
build_normal(options.dev)


+ 1
- 1
cocoalib

@@ -1 +1 @@
Subproject commit 1436715c3e4666e8e5e3f1886ad2933bd0ec1e34
Subproject commit 8ce3727c704f824f167a36c72c58b4b16d1ab6a3

+ 42
- 6
dupeGuru.xcodeproj/project.pbxproj View File

@@ -11,6 +11,7 @@
CE05598E1E76217C008EB4F8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE05598C1E76217C008EB4F8 /* Localizable.strings */; };
CE0559921E7626E7008EB4F8 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CE0559911E7626E7008EB4F8 /* locale */; };
CE65D0CC1E7781640092126E /* progress.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE65D0CA1E7781640092126E /* progress.xib */; };
CE65D0ED1E7783C40092126E /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE65D0EB1E7783C40092126E /* ErrorReportWindow.xib */; };
CE6F7D8D1E74E71C004C0518 /* Python in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6F7D8C1E74E71C004C0518 /* Python */; settings = {ATTRIBUTES = (Required, ); }; };
CE6F7DE61E74E9E4004C0518 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6F7DCF1E74E9E4004C0518 /* Dialogs.m */; };
CE6F7DE71E74E9E4004C0518 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6F7DD11E74E9E4004C0518 /* HSAboutBox.m */; };
@@ -55,7 +56,6 @@
CE97213E1E74E41D00A598C9 /* DetailsPanel_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9720FA1E74E41C00A598C9 /* DetailsPanel_UI.m */; };
CE97213F1E74E41D00A598C9 /* DetailsPanelPicture_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9720FC1E74E41C00A598C9 /* DetailsPanelPicture_UI.m */; };
CE9721401E74E41D00A598C9 /* DirectoryPanel_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9720FE1E74E41C00A598C9 /* DirectoryPanel_UI.m */; };
CE9721421E74E41D00A598C9 /* HSErrorReportWindow_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9721021E74E41C00A598C9 /* HSErrorReportWindow_UI.m */; };
CE9721431E74E41D00A598C9 /* IgnoreListDialog_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9721041E74E41C00A598C9 /* IgnoreListDialog_UI.m */; };
CE9721441E74E41D00A598C9 /* MainMenu_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9721061E74E41C00A598C9 /* MainMenu_UI.m */; };
CE9721451E74E41D00A598C9 /* ObjP.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9721081E74E41C00A598C9 /* ObjP.m */; };
@@ -154,6 +154,22 @@
CE65D0E61E7781890092126E /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = cocoalib/uk.lproj/progress.strings; sourceTree = "<group>"; };
CE65D0E81E77818B0092126E /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "cocoalib/zh-Hans.lproj/progress.strings"; sourceTree = "<group>"; };
CE65D0EA1E77818C0092126E /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = cocoalib/vi.lproj/progress.strings; sourceTree = "<group>"; };
CE65D0EC1E7783C40092126E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = cocoalib/Base.lproj/ErrorReportWindow.xib; sourceTree = "<group>"; };
CE65D0EF1E7784930092126E /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = cocoalib/fr.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0F11E7784950092126E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = cocoalib/de.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0F31E7784960092126E /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cocoalib/cs.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0F51E7784970092126E /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = cocoalib/es.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0F71E7784990092126E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = cocoalib/el.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0F91E77849A0092126E /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = cocoalib/it.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0FB1E77849B0092126E /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = cocoalib/nl.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0FD1E77849C0092126E /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = cocoalib/pl.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D0FF1E77849E0092126E /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = cocoalib/ko.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D1011E77849F0092126E /* hy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hy; path = cocoalib/hy.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D1031E7784A10092126E /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "cocoalib/pt-BR.lproj/ErrorReportWindow.strings"; sourceTree = "<group>"; };
CE65D1051E7784A20092126E /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = cocoalib/ru.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D1071E7784A40092126E /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = cocoalib/uk.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE65D1091E7784A50092126E /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "cocoalib/zh-Hans.lproj/ErrorReportWindow.strings"; sourceTree = "<group>"; };
CE65D10B1E7784A70092126E /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = cocoalib/vi.lproj/ErrorReportWindow.strings; sourceTree = "<group>"; };
CE6F7D891E74E5C2004C0518 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = build/Info.plist; sourceTree = "<group>"; };
CE6F7D8C1E74E71C004C0518 /* Python */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = Python; path = build/Python; sourceTree = "<group>"; };
CE6F7DCE1E74E9E4004C0518 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = "<group>"; };
@@ -272,8 +288,6 @@
CE9720FC1E74E41C00A598C9 /* DetailsPanelPicture_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanelPicture_UI.m; path = cocoa/autogen/DetailsPanelPicture_UI.m; sourceTree = "<group>"; };
CE9720FD1E74E41C00A598C9 /* DirectoryPanel_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryPanel_UI.h; path = cocoa/autogen/DirectoryPanel_UI.h; sourceTree = "<group>"; };
CE9720FE1E74E41C00A598C9 /* DirectoryPanel_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryPanel_UI.m; path = cocoa/autogen/DirectoryPanel_UI.m; sourceTree = "<group>"; };
CE9721011E74E41C00A598C9 /* HSErrorReportWindow_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow_UI.h; path = cocoa/autogen/HSErrorReportWindow_UI.h; sourceTree = "<group>"; };
CE9721021E74E41C00A598C9 /* HSErrorReportWindow_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSErrorReportWindow_UI.m; path = cocoa/autogen/HSErrorReportWindow_UI.m; sourceTree = "<group>"; };
CE9721031E74E41C00A598C9 /* IgnoreListDialog_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IgnoreListDialog_UI.h; path = cocoa/autogen/IgnoreListDialog_UI.h; sourceTree = "<group>"; };
CE9721041E74E41C00A598C9 /* IgnoreListDialog_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IgnoreListDialog_UI.m; path = cocoa/autogen/IgnoreListDialog_UI.m; sourceTree = "<group>"; };
CE9721051E74E41C00A598C9 /* MainMenu_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainMenu_UI.h; path = cocoa/autogen/MainMenu_UI.h; sourceTree = "<group>"; };
@@ -439,6 +453,7 @@
CE7CA6011E76336000874874 /* cocoalib */ = {
isa = PBXGroup;
children = (
CE65D0EB1E7783C40092126E /* ErrorReportWindow.xib */,
CE65D0CA1E7781640092126E /* progress.xib */,
CE7CA6021E76337700874874 /* about.xib */,
CE7CA6041E76337700874874 /* cocoalib.strings */,
@@ -493,8 +508,6 @@
CE9720FC1E74E41C00A598C9 /* DetailsPanelPicture_UI.m */,
CE9720FD1E74E41C00A598C9 /* DirectoryPanel_UI.h */,
CE9720FE1E74E41C00A598C9 /* DirectoryPanel_UI.m */,
CE9721011E74E41C00A598C9 /* HSErrorReportWindow_UI.h */,
CE9721021E74E41C00A598C9 /* HSErrorReportWindow_UI.m */,
CE9721031E74E41C00A598C9 /* IgnoreListDialog_UI.h */,
CE9721041E74E41C00A598C9 /* IgnoreListDialog_UI.m */,
CE9721051E74E41C00A598C9 /* MainMenu_UI.h */,
@@ -666,6 +679,7 @@
CE0559921E7626E7008EB4F8 /* locale in Resources */,
CED88C1F1E763F2700C9B98C /* py in Resources */,
CE05598E1E76217C008EB4F8 /* Localizable.strings in Resources */,
CE65D0ED1E7783C40092126E /* ErrorReportWindow.xib in Resources */,
CEFC8A251E74F23000965F37 /* dg_cocoa.py in Resources */,
CE7CA6061E76337700874874 /* about.xib in Resources */,
CE7CA6071E76337700874874 /* cocoalib.strings in Resources */,
@@ -734,7 +748,6 @@
CE97214E1E74E41D00A598C9 /* PyDeletionOptions.m in Sources */,
CE97214D1E74E41D00A598C9 /* PyColumns.m in Sources */,
CE9720F01E74E40300A598C9 /* PrioritizeDialog.m in Sources */,
CE9721421E74E41D00A598C9 /* HSErrorReportWindow_UI.m in Sources */,
CE9721451E74E41D00A598C9 /* ObjP.m in Sources */,
CE9720F21E74E40300A598C9 /* ProblemDialog.m in Sources */,
CE6F7DED1E74E9E4004C0518 /* NSImageAdditions.m in Sources */,
@@ -828,6 +841,29 @@
name = progress.xib;
sourceTree = "<group>";
};
CE65D0EB1E7783C40092126E /* ErrorReportWindow.xib */ = {
isa = PBXVariantGroup;
children = (
CE65D0EC1E7783C40092126E /* Base */,
CE65D0EF1E7784930092126E /* fr */,
CE65D0F11E7784950092126E /* de */,
CE65D0F31E7784960092126E /* cs */,
CE65D0F51E7784970092126E /* es */,
CE65D0F71E7784990092126E /* el */,
CE65D0F91E77849A0092126E /* it */,
CE65D0FB1E77849B0092126E /* nl */,
CE65D0FD1E77849C0092126E /* pl */,
CE65D0FF1E77849E0092126E /* ko */,
CE65D1011E77849F0092126E /* hy */,
CE65D1031E7784A10092126E /* pt-BR */,
CE65D1051E7784A20092126E /* ru */,
CE65D1071E7784A40092126E /* uk */,
CE65D1091E7784A50092126E /* zh-Hans */,
CE65D10B1E7784A70092126E /* vi */,
);
name = ErrorReportWindow.xib;
sourceTree = "<group>";
};
CE7CA6021E76337700874874 /* about.xib */ = {
isa = PBXVariantGroup;
children = (


+ 1
- 1
hscommon

@@ -1 +1 @@
Subproject commit 04adb620fae86eb9ca5cd6aad2afc61e4186f386
Subproject commit 73e3a0716d397c85701fd15510ef755d3a2f3be8

Loading…
Cancel
Save