Merge lp://staging/~mandel/ubuntuone-windows-installer/add_preferences_dialog into lp://staging/ubuntuone-windows-installer/beta
Proposed by
Manuel de la Peña
| Status: | Merged |
|---|---|
| Approved by: | Manuel de la Peña |
| Approved revision: | 127 |
| Merged at revision: | 110 |
| Proposed branch: | lp://staging/~mandel/ubuntuone-windows-installer/add_preferences_dialog |
| Merge into: | lp://staging/ubuntuone-windows-installer/beta |
| Prerequisite: | lp://staging/~mandel/ubuntuone-windows-installer/add_timer_execution |
| Diff against target: |
2017 lines (+1462/-99) 30 files modified
lib/PhoenixControlLib/license.txt (+19/-0) src/Canonical.UbuntuOne.Client.Views/AccountView.xaml (+74/-0) src/Canonical.UbuntuOne.Client.Views/AccountView.xaml.cs (+64/-0) src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj (+31/-0) src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml (+40/-0) src/Canonical.UbuntuOne.Client.Views/DevicesView.xaml.cs (+39/-0) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml (+9/-8) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+23/-17) src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml (+60/-5) src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs (+98/-29) src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx (+96/-10) src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs (+224/-17) src/Canonical.UbuntuOne.Client.Views/ServicesView.xaml (+59/-0) src/Canonical.UbuntuOne.Client.Views/ServicesView.xaml.cs (+83/-0) src/Canonical.UbuntuOne.Client.Views/WindowsSettingsView.xaml (+41/-0) src/Canonical.UbuntuOne.Client.Views/WindowsSettingsView.xaml.cs (+66/-0) src/Canonical.UbuntuOne.Client.Views/objects.xml (+6/-0) src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj (+3/-0) src/Canonical.UbuntuOne.Client/Preferences/IPreferencesDialogPresenter.cs (+5/-0) src/Canonical.UbuntuOne.Client/Preferences/IPreferencesManager.cs (+42/-0) src/Canonical.UbuntuOne.Client/Preferences/IPreferencesView.cs (+83/-0) src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs (+182/-0) src/Canonical.UbuntuOne.Client/objects.xml (+5/-0) src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs (+6/-7) src/UbuntuOneClient/App.config (+14/-1) src/UbuntuOneClient/PreferencesManager.cs (+45/-0) src/UbuntuOneClient/Properties/Settings.Designer.cs (+24/-0) src/UbuntuOneClient/Properties/Settings.settings (+10/-5) src/UbuntuOneClient/UbuntuOneClient.csproj (+1/-0) src/UbuntuOneClient/objects.xml (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~mandel/ubuntuone-windows-installer/add_preferences_dialog |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Adds a preferences dialog that allows to store the execution setting of the app.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
