arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 14:41:39 +00:00
Code Releases Wiki Activity

Pushed some logic for fairware from gui layers to hscommon.

Browse Source
This commit is contained in:
Virgil Dupras
2011-09-24 16:21:20 -04:00
parent 9fac97c147
commit 9a7a20472d
5 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
qt/base/app.py
View File

@@ -82,9 +82,7 @@ class DupeGuru(QObject):
self.problemDialog = ProblemDialog(parent=self.resultWindow, app=self)
self.preferences_dialog = self._create_preferences_dialog(self.resultWindow)
self.about_box = AboutBox(self.resultWindow, self)
self.model.set_registration(self.prefs.registration_code, self.prefs.registration_email)
self.directories_dialog.show()
self.model.load()
@@ -113,13 +111,6 @@ class DupeGuru(QObject):
if ISLINUX:
self.actionCheckForUpdate.setVisible(False) # This only works on Windows
def _setup_as_registered(self):
self.prefs.registration_code = self.registration_code
self.prefs.registration_email = self.registration_email
self.actionRegister.setVisible(False)
self.about_box.registerButton.hide()
self.about_box.registeredEmailLabel.setText(self.prefs.registration_email)
def _update_options(self):
self.model.scanner.mix_file_kind = self.prefs.mix_file_kind
self.model.options['escape_filter_regexp'] = self.prefs.use_regexp
@@ -198,9 +189,7 @@ class DupeGuru(QObject):
#--- Events
def finishedLaunching(self):
if self.model.should_show_fairware_reminder:
reg = Registration(self.model)
reg.show_nag()
self.model.initial_registration_setup()
def application_will_terminate(self):
self.willSavePrefs.emit()
@@ -282,6 +271,15 @@ class DupeGuru(QObject):
def set_default(self, key, value):
self.prefs.set_value(key, value)
def setup_as_registered(self):
self.actionRegister.setVisible(False)
self.about_box.registerButton.hide()
self.about_box.registeredEmailLabel.setText(self.model.registration_email)
def show_fairware_nag(self):
reg = Registration(self.model)
reg.show_nag()
def show_extra_fairware_reminder(self):
dialog = ExtraFairwareReminder(self.directories_dialog, self)
dialog.exec()

6
qt/base/preferences.py
View File

@@ -49,8 +49,6 @@ class Preferences(PreferencesBase):
self.recentResults = get('RecentResults', self.recentResults)
self.recentFolders = get('RecentFolders', self.recentFolders)
self.registration_code = get('RegistrationCode', self.registration_code)
self.registration_email = get('RegistrationEmail', self.registration_email)
self._load_specific(settings)
def _reset_specific(self):
@@ -76,8 +74,6 @@ class Preferences(PreferencesBase):
self.recentResults = []
self.recentFolders = []
self.registration_code = ''
self.registration_email = ''
self._reset_specific()
def reset_columns(self):
@@ -110,7 +106,5 @@ class Preferences(PreferencesBase):
set_('RecentResults', self.recentResults)
set_('RecentFolders', self.recentFolders)
set_('RegistrationCode', self.registration_code)
set_('RegistrationEmail', self.registration_email)
self._save_specific(settings)