From a4003b6072da4c8ec134de11b288152efd54ab44 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 24 Mar 2013 11:10:07 -0400 Subject: [PATCH] Removed fairware dialogs under Linux. --- build.py | 6 +----- configure.py | 3 --- qt/run_template.py | 3 ++- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build.py b/build.py index 724f85c9..f4c89348 100644 --- a/build.py +++ b/build.py @@ -144,11 +144,7 @@ def build_qt(edition, dev, conf): print_and_do("pyrcc4 -py3 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py'))) fix_qt_resource_file(op.join('qt', 'base', 'dg_rc.py')) print("Creating the run.py file") - if conf.get('ubuntu_store'): - ubuntu_store_setup = "dgapp.model.registered = True; dgapp.model.registration_email = \"Ubuntu Store\"" - else: - ubuntu_store_setup = "" - filereplace(op.join('qt', 'run_template.py'), 'run.py', edition=edition, ubuntu_store_setup=ubuntu_store_setup) + filereplace(op.join('qt', 'run_template.py'), 'run.py', edition=edition) def build_help(edition): print("Generating Help") diff --git a/configure.py b/configure.py index 7dab8e2f..90b71363 100644 --- a/configure.py +++ b/configure.py @@ -23,7 +23,6 @@ def main(options): 'edition': options.edition, 'ui': options.ui, 'dev': options.dev, - 'ubuntu_store': options.ubuntu_store, } json.dump(conf, open('conf.json', 'w')) @@ -36,7 +35,5 @@ if __name__ == '__main__': help="Type of UI to build. 'qt' or 'cocoa'. Default is determined by your system.") parser.add_option('--dev', action='store_true', dest='dev', default=False, help="If this flag is set, will configure for dev builds.") - parser.add_option('--ubuntu-store', action='store_true', dest='ubuntu_store', default=False, - help="Set registration for the Ubuntu Store.") (options, args) = parser.parse_args() main(options) diff --git a/qt/run_template.py b/qt/run_template.py index a83fdf11..e3bebbb6 100644 --- a/qt/run_template.py +++ b/qt/run_template.py @@ -37,6 +37,7 @@ if __name__ == "__main__": from qt.{edition}.app import DupeGuru app.setWindowIcon(QIcon(QPixmap(":/{0}".format(DupeGuru.LOGO_NAME)))) dgapp = DupeGuru() - {ubuntu_store_setup} + if not ISWINDOWS: + dgapp.model.registered = True install_excepthook() sys.exit(app.exec_())