changes to main window

nextmcloud · Aug 12, 2024 · fb2a165 · fb2a165
1 parent 1c5d9dc
commit fb2a165
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -190,3 +190,6 @@ convert.exe
 *-w10startmenu.png
 *state-*.png
 theme.qrc
+
+# Ignore specific folders
+shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
@@ -58,6 +58,18 @@ int main(int argc, char **argv)
 #ifdef Q_OS_WIN
     SetDllDirectory(L"");
 #endif
+
+    bool resourceLoaded = false;
+    const QString currentPath = QDir::currentPath();
+    if(Utility::isMac())
+    {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc"));
+    }
+    else if(Utility::isWindows() || !resourceLoaded)
+    {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc"));
+    }
+
     Q_INIT_RESOURCE(resources);
     Q_INIT_RESOURCE(theme);
 

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -351,6 +351,22 @@ ApplicationWindow {
                             }
                         }
 
+                        contentItem: ScrollView {
+                            id: accMenuScrollView
+                            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+
+                            data: WheelHandler {
+                                target: accMenuScrollView.contentItem
+                            }
+                            ListView {
+                                implicitHeight: contentHeight
+                                model: accountMenu.contentModel
+                                interactive: true
+                                clip: true
+                                currentIndex: accountMenu.currentIndex
+                            }
+                        }
+
                         onClosed: {
                             // HACK: reload account Instantiator immediately by restting it - could be done better I guess
                             // see also onVisibleChanged above