added the alias editor action

it pops a dialog to enter the new alias.

Author: modSpike

src/gui/accountsgui/accountsguicontroller.cpp

@@ -89,12 +89,9 @@ void AccountsGuiController::onAccountAdded(AccountState *state)
     _actionForAccount.insert(accountId, accountAction);
 
     accountAction->setIcon(account->avatar());
-    // eventually make this elided
-    // problem is, the action has no idea what the size of the button should be.
-    // it's really dumb to have "long" text on any toolbar component in the first place. We hope to fix this someday
-    // by allowing the user to set an account alias which will show as the account name but that needs a major release
-    // to support the config change
+
     accountAction->setText(account->accountAlias());
+    connect(account, &Account::accountAliasChanged, accountAction, [accountAction](const QString &newAlias) { accountAction->setText(newAlias); });
 
     accountAction->setToolTip(QString("%1\n%2").arg(account->davDisplayName(), account->url().toDisplayString()));
     accountAction->setData(QVariant::fromValue(accountView));

src/gui/accountsgui/accountviewcontroller.cpp

@@ -26,6 +26,7 @@
 #include "libsync/theme.h"
 
 #include <QDesktopServices>
+#include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
@@ -110,6 +111,11 @@ void AccountViewController::buildManageAccountMenu()
     connect(_remove, &QAction::triggered, this, &AccountViewController::onDeleteAccount);
     actions.push_back(_remove);
 
+    _rename = new QAction(tr("Change alias..."));
+    _rename->setObjectName("changeAliasAction");
+    connect(_rename, &QAction::triggered, this, &AccountViewController::onChangeAlias);
+    actions.push_back(_rename);
+
     _view->setAccountMenuActions(actions);
 }
 
@@ -123,6 +129,7 @@ void AccountViewController::refreshAccountActions()
         _reconnect->setEnabled(false);
         _showInBrowser->setEnabled(false);
         _remove->setEnabled(false);
+        _rename->setEnabled(false);
         return;
     }
 
@@ -187,6 +194,28 @@ void AccountViewController::onDeleteAccount()
     messageBox->open();
 }
 
+void AccountViewController::onChangeAlias()
+{
+    if (!_accountState || !_accountState->account())
+        return;
+
+
+    // naturally this thing is STUPIDLY TINY by default so using the convenience method is out:
+    // QString newAlias = QInputDialog::getText(_view, tr("Change alias"), tr("Account alias:"), QLineEdit::Normal, _accountState->account()->accountAlias());
+
+    QInputDialog dialog(_view);
+    dialog.setWindowTitle(tr("Change alias"));
+    dialog.setInputMode(QInputDialog::TextInput);
+    dialog.setLabelText(tr("Account alias:"));
+    dialog.setTextValue(_accountState->account()->accountAlias());
+    QSize minHint = dialog.minimumSizeHint(); // width is 192?
+    dialog.resize(minHint.width() * 2, minHint.height());
+
+    int res = dialog.exec();
+    if (res == QDialog::Accepted && !dialog.textValue().isEmpty())
+        _accountState->account()->setAccountAlias(dialog.textValue());
+}
+
 QIcon AccountViewController::lookupStatusIcon(StatusIcon status)
 {
     QIcon icon;
@@ -208,6 +237,7 @@ QIcon AccountViewController::lookupStatusIcon(StatusIcon status)
     }
     return icon;
 }
+
 void AccountViewController::onAccountStateChanged(AccountState::State state)
 {
     if (!_accountState || !_accountState->account() || !_view) {

src/gui/accountsgui/accountviewcontroller.h

@@ -49,6 +49,7 @@ class AccountViewController : public QObject
     void onDeleteAccount();
     void onOpenAccountInBrowser();
     void onToggleSignInState();
+    void onChangeAlias();
 
     void onFolderWizardAccepted();
 
@@ -62,6 +63,7 @@ class AccountViewController : public QObject
     QAction *_reconnect = nullptr;
     QAction *_showInBrowser = nullptr;
     QAction *_remove = nullptr;
+    QAction *_rename = nullptr;
 
     void buildManageAccountMenu();
     void refreshAccountActions();

src/gui/mainwindow/mainwindow.cpp

@@ -86,9 +86,8 @@ void MainWindow::buildWindow()
     // which makes the button "edge" clear. Anyway without this fix, the  ... button looked really weird
     // looked like it was pushed too far to the right with a larger gap on the left side vs the right
     // this change helped a lot.
-    // note setting the margin does nothing because it's not actually in play - the extra gap around the separator
-    // is due to the widget spacing in the toolbar itself. I think if we want to get rid of this we have to completely hide
-    // the separator, but leave it in place to allow placing other widgets before or after it.
+    // leaving this here as we are currently just hiding the separator, if we want to show it again this needs
+    // to be uncommented too.
     // _toolbar->setStyleSheet("QToolBar::Separator { width: 1px; height: 1px; }");
     _toolbar->setIconSize(iconsSize);
     _toolbar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
@@ -108,7 +107,7 @@ void MainWindow::buildWindow()
     _separatorAction = _toolbar->addSeparator();
     // I'm hiding the separator as it is too difficult to make the more button look normal as the toolbar widget spacing is used
     // on either side of the separator, and this makes the more button look weird/out of place/too far to the right in a subtle way.
-    // if we want to turn it back on, at minimum the style sheet above should be uncommented else it's *really* bad.
+    // if we want to turn it back on, at minimum the tooblar::separator style sheet above should be uncommented else it's *really* bad.
     _separatorAction->setVisible(false);
 
     QAction *moreAction = new QAction(tr("More"), this);

src/libsync/account.cpp

@@ -165,6 +165,8 @@ void Account::setAccountAlias(const QString &newAlias)
     if (_alias != newAlias) {
         _alias = newAlias;
         emit accountAliasChanged(_alias);
+        // eh, may as well save it to settings right away
+        emit wantsAccountSaved(this);
     }
 }