mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-01-22 14:41:39 +00:00
Merge branch 'regless' into develop
Conflicts: cocoa/inter/app.py core/app.py hscommon/reg.py locale/cs/LC_MESSAGES/ui.po locale/de/LC_MESSAGES/ui.po locale/fr/LC_MESSAGES/ui.po locale/hy/LC_MESSAGES/ui.po locale/it/LC_MESSAGES/ui.po locale/pt_BR/LC_MESSAGES/ui.po locale/ru/LC_MESSAGES/ui.po locale/ui.pot locale/uk/LC_MESSAGES/ui.po locale/vi/LC_MESSAGES/ui.po locale/zh_CN/LC_MESSAGES/ui.po qt/base/app.py
This commit is contained in:
@@ -379,23 +379,14 @@ class OSXFrameworkStructure:
|
||||
action(op.abspath(path), header_dest)
|
||||
|
||||
|
||||
def build_cocoalib_xibless(dest='cocoa/autogen', withfairware=True):
|
||||
def build_cocoalib_xibless(dest='cocoa/autogen'):
|
||||
import xibless
|
||||
ensure_folder(dest)
|
||||
FNPAIRS = [
|
||||
('progress.py', 'ProgressController_UI'),
|
||||
('error_report.py', 'HSErrorReportWindow_UI'),
|
||||
('about.py', 'HSAboutBox_UI'),
|
||||
]
|
||||
if withfairware:
|
||||
FNPAIRS += [
|
||||
('fairware_about.py', 'HSFairwareAboutBox_UI'),
|
||||
('demo_reminder.py', 'HSDemoReminder_UI'),
|
||||
('enter_code.py', 'HSEnterCode_UI'),
|
||||
]
|
||||
else:
|
||||
FNPAIRS += [
|
||||
('about.py', 'HSAboutBox_UI'),
|
||||
]
|
||||
for srcname, dstname in FNPAIRS:
|
||||
srcpath = op.join('cocoalib', 'ui', srcname)
|
||||
dstpath = op.join(dest, dstname)
|
||||
|
||||
Reference in New Issue
Block a user