Skip to content

Notifications #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camilasan merged 22 commits into from
Mar 13, 2018
Merged

Notifications #197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a7dd3a7
Displays the actual notification subject in the system tray messages.
Feb 12, 2018
b24751b
Adds button to open notification in the browser - to update something…
Feb 14, 2018
bfc7aa1
Adds option to toggle display of Sync and Activity notifications.
Feb 14, 2018
ab7185a
Changes notification text in the checkboxes and adds tooltips with ex…
Feb 15, 2018
20cf4ed
Improves Notification Widget UI.
Feb 16, 2018
32e29fb
Doesn't open the file manager when there isn't a file associated with…
Feb 16, 2018
1a0edc1
Sync activities notifications are never shown unless there is an erro…
Feb 23, 2018
4c79059
Changes notification icon bell size.
Feb 25, 2018
e33d2bf
Removes (s) from time strings.
Feb 25, 2018
4a6a8ca
Removes _appName from Activity data.
Feb 25, 2018
71f4760
Do not display user account when there is only one user in popup mess…
Feb 25, 2018
d71438f
Adds host and scheme to activity link so it can be opened in the
Feb 25, 2018
44f299e
Removes debug messages.
Feb 25, 2018
0f9d8e1
Only uses 'More information' text in button for notification link.
Feb 25, 2018
09a92a5
Align text and changes spacing in notification widget.
Feb 25, 2018
112c5e1
Removes Server Activities option from General settings.
Feb 26, 2018
56709f3
Removes string 'Created' from notifications time.
Feb 26, 2018
6bf9f65
Only notify users of new notifications and only shows them all on sta…
Feb 27, 2018
d42401e
Changes notifications api endpoint to v2.
Mar 1, 2018
621596f
Saves notifications ETag response header to use to request only new n…
Mar 1, 2018
3c77898
Makes sure JsonApiJob::finished won't throw a JSON error when status …
Mar 3, 2018
2e4472a
Enables server notifications by default.
Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removes Server Activities option from General settings. 
Signed-off-by: Camila San <[email protected]>
  • Loading branch information
Camila San committed Feb 26, 2018
commit 112c5e10b6ce0b60beba31cdac582a14cc8d2a69
11 changes: 0 additions & 11 deletions src/gui/generalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)
this, &GeneralSettings::slotToggleOptionalServerNotifications);
_ui->serverNotificationsCheckBox->setToolTip(tr("Server notifications that require attention."));

connect(_ui->serverActivitiesCheckBox, &QAbstractButton::toggled,
this, &GeneralSettings::slotToggleOptionalServerActivities);
_ui->serverActivitiesCheckBox->setToolTip(tr("Activity feed from the server."));

connect(_ui->showInExplorerNavigationPaneCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotShowInExplorerNavigationPane);

_ui->autostartCheckBox->setChecked(Utility::hasLaunchOnStartup(Theme::instance()->appName()));
Expand Down Expand Up @@ -121,7 +117,6 @@ void GeneralSettings::loadMiscSettings()
ConfigFile cfgFile;
_ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
_ui->serverNotificationsCheckBox->setChecked(cfgFile.optionalServerNotifications());
_ui->serverActivitiesCheckBox->setChecked(cfgFile.optionalServerActivities());
_ui->showInExplorerNavigationPaneCheckBox->setChecked(cfgFile.showInExplorerNavigationPane());
_ui->crashreporterCheckBox->setChecked(cfgFile.crashReporter());
auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
Expand Down Expand Up @@ -178,12 +173,6 @@ void GeneralSettings::slotToggleOptionalServerNotifications(bool enable)
cfgFile.setOptionalServerNotifications(enable);
}

void GeneralSettings::slotToggleOptionalServerActivities(bool enable)
{
ConfigFile cfgFile;
cfgFile.setOptionalServerActivities(enable);
}

void GeneralSettings::slotShowInExplorerNavigationPane(bool checked)
{
ConfigFile cfgFile;
Expand Down
1 change: 0 additions & 1 deletion src/gui/generalsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ private slots:
void saveMiscSettings();
void slotToggleLaunchOnStartup(bool);
void slotToggleOptionalServerNotifications(bool);
void slotToggleOptionalServerActivities(bool);
void slotShowInExplorerNavigationPane(bool);
void slotUpdateInfo();
void slotIgnoreFilesEditor();
Expand Down
7 changes: 0 additions & 7 deletions src/gui/generalsettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="serverActivitiesCheckBox">
<property name="text">
<string>Show Server &amp;Activities</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
14 changes: 0 additions & 14 deletions src/libsync/configfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ static const char monoIconsC[] = "monoIcons";
static const char promptDeleteC[] = "promptDeleteAllFiles";
static const char crashReporterC[] = "crashReporter";
static const char optionalServerNotificationsC[] = "optionalServerNotifications";
static const char optionalServerActivitiesC[] = "optionalServerActivities";
static const char showInExplorerNavigationPaneC[] = "showInExplorerNavigationPane";
static const char skipUpdateCheckC[] = "skipUpdateCheck";
static const char updateCheckIntervalC[] = "updateCheckInterval";
Expand Down Expand Up @@ -128,12 +127,6 @@ bool ConfigFile::optionalServerNotifications() const
return settings.value(QLatin1String(optionalServerNotificationsC), false).toBool();
Copy link
Member

@juliusknorr juliusknorr Mar 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think notifications should be enabled by default. Any opinions @jancborchardt

Copy link
Member Author

@camilasan camilasan Mar 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

}

bool ConfigFile::optionalServerActivities() const
{
QSettings settings(configFile(), QSettings::IniFormat);
return settings.value(QLatin1String(optionalServerActivitiesC), false).toBool();
}

bool ConfigFile::showInExplorerNavigationPane() const
{
const bool defaultValue =
Expand Down Expand Up @@ -191,13 +184,6 @@ void ConfigFile::setOptionalServerNotifications(bool show)
settings.sync();
}

void ConfigFile::setOptionalServerActivities(bool show)
{
QSettings settings(configFile(), QSettings::IniFormat);
settings.setValue(QLatin1String(optionalServerActivitiesC), show);
settings.sync();
}

void ConfigFile::saveGeometry(QWidget *w)
{
#ifndef TOKEN_AUTH_ONLY
Expand Down
3 changes: 0 additions & 3 deletions src/libsync/configfile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
bool optionalServerNotifications() const;
void setOptionalServerNotifications(bool show);

bool optionalServerActivities() const;
void setOptionalServerActivities(bool show);

bool showInExplorerNavigationPane() const;
void setShowInExplorerNavigationPane(bool show);

Expand Down