Skip to content

Commit

Permalink
Merge pull request #7270 from nextcloud/bugfix/useQmlFusionOnWindows
Browse files Browse the repository at this point in the history 
Bugfix/use qml fusion on windows
  • Loading branch information
@mgallien
mgallien authored Oct 7, 2024
2 parents cf1a6d7 + 9585c97 commit 3974040
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 129 deletions.
1 change: 1 addition & 0 deletions src/gui/folderwizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ FolderWizard::FolderWizard(AccountPtr account, QWidget *parent)
, _folderWizardSourcePage(new FolderWizardLocalPath(account))
, _folderWizardSelectiveSyncPage(new FolderWizardSelectiveSync(account))
{
setWizardStyle(QWizard::ModernStyle);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setPage(Page_Source, _folderWizardSourcePage);
_folderWizardSourcePage->installEventFilter(this);
Expand Down
64 changes: 0 additions & 64 deletions src/gui/folderwizardsourcepage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,70 +52,6 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="warnLabel">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>192</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>192</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>192</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>192</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
Expand Down
64 changes: 0 additions & 64 deletions src/gui/folderwizardtargetpage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,70 +19,6 @@
</item>
<item row="2" column="0">
<widget class="QFrame" name="warnFrame">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>153</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>153</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>153</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>153</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ int main(int argc, char **argv)
#if defined Q_OS_MAC
style = QStringLiteral("macOS");
#elif defined Q_OS_WIN
style = QStringLiteral("Windows");
style = QStringLiteral("Fusion");
#endif

QQuickStyle::setStyle(style);
Expand Down

0 comments on commit 3974040

Please sign in to comment.