Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
45f12b7
feat: add assistant tray prompt
Rello Jan 30, 2026
e03c542
fix: align connection settings background
Rello Jan 20, 2026
c496970
chore: fix compilation for missing string literals
mgallien Feb 3, 2026
1ccc7c8
fix: use taskprocessing OCS API to submit prompt to AI
mgallien Feb 3, 2026
ad9f196
fix: send assistant chat history
Rello Feb 4, 2026
d2ed549
fix: avoid overriding assistant loader implicit height
Rello Feb 4, 2026
cbb91d6
fix: include assistant system prompt
Rello Feb 4, 2026
ad78fbe
fix: always send assistant history
Rello Feb 4, 2026
eb2036b
fix: send assistant history as json list
Rello Feb 4, 2026
7d72efb
chore: properly handle completed tasks (success or error)
mgallien Feb 4, 2026
3fad9d1
make the role in normal coloring
Rello Feb 4, 2026
397debb
Assistant conversation bubble
Rello Feb 5, 2026
c453bd7
Assistant UI to icon
Rello Feb 5, 2026
01e0995
Add signal for featured app button click
Rello Feb 5, 2026
b72941e
Remove NcAssistant feature check from user model
Rello Feb 5, 2026
f6b4be1
Refactor history handling in ocsassistantconnector
Rello Feb 5, 2026
923c582
Re-add AI input field
Rello Feb 5, 2026
c29eaa1
Refactor clearAssistantResponse for better clarity
Rello Feb 5, 2026
ea8b295
Restore MainWindow.qml file with original content
Rello Feb 5, 2026
7a70e2d
Restore original MainWindow.qml content
Rello Feb 6, 2026
e2ef411
Featured icon will become AI-only icon
Rello Feb 6, 2026
6475c51
featured icon will become AI only icon
Rello Feb 6, 2026
96c3623
scrollbar adjustment
Rello Feb 6, 2026
b05545d
no auto scrolling required
Rello Feb 6, 2026
25183af
hide other warnings when AI is active
Rello Feb 6, 2026
6d603a7
Refactor MainWindow.qml for improved structure
Rello Feb 6, 2026
eb547ad
make AI Text select-able by mouse
Rello Feb 8, 2026
baf8573
align scrollbar
Rello Feb 8, 2026
541aff4
Layout fix
Rello Feb 8, 2026
ed6995c
fix: Fixing selectable message bubbles.
Aiiaiiio Feb 9, 2026
1ae041d
feature: more conventional chat window
Aiiaiiio Feb 9, 2026
3d8cd6e
Add files via upload
Rello Feb 10, 2026
cbd4ac8
add send button
Rello Feb 10, 2026
50aafe8
better reset dialog
Rello Feb 11, 2026
1ac46fc
fix: Fixing the new conversation confirmation dialog geometry and style
Aiiaiiio Feb 11, 2026
71d3268
fix: Removing dim effect from modal Dialog
Aiiaiiio Feb 12, 2026
ff015bd
fix: fixing dialog background color + re-add dimming
Aiiaiiio Feb 12, 2026
1652335
fix: Removing header background color from dialog
Aiiaiiio Feb 13, 2026
3079311
fix: Fixing reset dialog aligment issues
Aiiaiiio Feb 16, 2026
d82ebe2
Update MainWindow.qml
Rello Feb 16, 2026
a7268b8
Update usermodel.cpp
Rello Feb 17, 2026
2b1793b
fix(tray): do not show sync error button when assistant is active
nilsding Feb 17, 2026
39ebd52
fix(tray): display assistant chat even if unified search is in progress
nilsding Feb 17, 2026
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
9 changes: 9 additions & 0 deletions src/gui/networksettings.cpp
Copy link
Member

Choose a reason for hiding this comment

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

this change seems unrelated to this PR

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <QNetworkProxy>
#include <QString>
#include <QList>
#include <QPalette>
#include <type_traits>

namespace OCC {
Expand All @@ -28,6 +29,14 @@ NetworkSettings::NetworkSettings(const AccountPtr &account, QWidget *parent)
, _account(account)
{
_ui->setupUi(this);
setAutoFillBackground(true);
setBackgroundRole(QPalette::AlternateBase);
_ui->proxyGroupBox->setAutoFillBackground(true);
_ui->proxyGroupBox->setBackgroundRole(QPalette::AlternateBase);
_ui->downloadBox->setAutoFillBackground(true);
_ui->downloadBox->setBackgroundRole(QPalette::AlternateBase);
_ui->uploadBox->setAutoFillBackground(true);
_ui->uploadBox->setBackgroundRole(QPalette::AlternateBase);

_ui->manualSettings->setVisible(_ui->manualProxyRadioButton->isChecked());

Expand Down
336 changes: 329 additions & 7 deletions src/gui/tray/MainWindow.qml

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/gui/tray/TrayWindowHeader.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import com.nextcloud.desktopclient
Rectangle {
id: root

signal featuredAppButtonClicked

readonly property alias currentAccountHeaderButton: currentAccountHeaderButton
readonly property alias openLocalFolderButton: openLocalFolderButton
readonly property alias appsMenu: appsMenu
Expand Down Expand Up @@ -71,12 +73,12 @@ Rectangle {
id: trayWindowFeaturedAppButton

Layout.alignment: Qt.AlignRight
Layout.preferredWidth: Style.trayWindowHeaderHeight
Layout.preferredWidth: Style.trayWindowHeaderHeight
Layout.fillHeight: true

visible: UserModel.currentUser.isFeaturedAppEnabled
visible: UserModel.currentUser.isAssistantEnabled
icon.source: UserModel.currentUser.featuredAppIcon + "/" + palette.windowText
onClicked: UserModel.openCurrentAccountFeaturedApp()
onClicked: root.featuredAppButtonClicked()

Accessible.role: Accessible.Button
Accessible.name: UserModel.currentUser.featuredAppAccessibleName
Expand Down
Loading
Loading