Skip to content

Commit 412bbcd

Browse files
TheOneRingTheOneRing
committed
Initial redesign
1 parent cdec208 commit 412bbcd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+69
-118
lines changed

‎OPENCLOUD.cmake‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
set( APPLICATION_NAME "OpenCloud" )
2+
set( APPLICATION_SHORTNAME "OpenCloud" )
3+
set( APPLICATION_EXECUTABLE "opencloud" )
4+
set( APPLICATION_DOMAIN "opencloud.eu" )
5+
set( APPLICATION_VENDOR "OpenCloud" )
6+
#set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE STRING "URL for updater" )
7+
set( APPLICATION_ICON_NAME "opencloud" )
8+
#set( APPLICATION_VIRTUALFILE_SUFFIX "owncloud" CACHE STRING "Virtual file suffix (not including the .)")
9+
10+
set( THEME_CLASS "OpenCloudTheme" )
11+
set( APPLICATION_REV_DOMAIN "eu.opencloud.desktopclient" )
12+
13+
set( THEME_INCLUDE "opencloudtheme.h" )
14+
15+
option( WITH_CRASHREPORTER "Build crashreporter" OFF )
16+
#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE STRING "URL for crash reporter" )
17+

‎OWNCLOUD.cmake‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎THEME.cmake‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif()
1919
if (EXISTS "${OEM_THEME_DIR}/OEM.cmake")
2020
include("${OEM_THEME_DIR}/OEM.cmake")
2121
else()
22-
include ("${CMAKE_CURRENT_LIST_DIR}/OWNCLOUD.cmake")
22+
include ("${CMAKE_CURRENT_LIST_DIR}/OPENCLOUD.cmake")
2323
endif()
2424

2525
message(STATUS "Branding: ${APPLICATION_NAME}")
@@ -41,14 +41,6 @@ string(REPLACE "&" "&" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
4141
string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
4242
string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
4343

44-
if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
45-
set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
46-
endif()
47-
48-
if (NOT DEFINED PACKAGE)
49-
set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
50-
endif()
51-
5244
if(NOT CRASHREPORTER_EXECUTABLE)
5345
set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
5446
endif()

‎cmake/modules/OCAddVfsPlugin.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function(add_vfs_plugin)
1212
apply_common_target_settings(vfs_${__PLUGIN_NAME})
1313

1414

15-
set_target_properties(vfs_${__PLUGIN_NAME} PROPERTIES OUTPUT_NAME "ownCloud_vfs_${__PLUGIN_NAME}")
15+
set_target_properties(vfs_${__PLUGIN_NAME} PROPERTIES OUTPUT_NAME "OpenCloud_vfs_${__PLUGIN_NAME}")
1616

1717
target_link_libraries(vfs_${__PLUGIN_NAME}
1818
libsync

‎src/csync/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ set_target_properties(
7272
csync
7373
PROPERTIES
7474
OUTPUT_NAME
75-
"ownCloudCsync"
75+
"OpenCloudCsync"
7676
VERSION
7777
${MIRALL_VERSION}
7878
SOVERSION

‎src/gui/generalsettings.ui‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<item>
153153
<spacer name="spacer_3">
154154
<property name="orientation">
155-
<enum>Qt::Horizontal</enum>
155+
<enum>Qt::Orientation::Horizontal</enum>
156156
</property>
157157
<property name="sizeHint" stdset="0">
158158
<size>
@@ -178,7 +178,7 @@
178178
<item>
179179
<widget class="NetworkSettings" name="widget" native="true">
180180
<property name="focusPolicy">
181-
<enum>Qt::StrongFocus</enum>
181+
<enum>Qt::FocusPolicy::StrongFocus</enum>
182182
</property>
183183
</widget>
184184
</item>
@@ -188,7 +188,7 @@
188188
<item>
189189
<spacer name="verticalSpacer">
190190
<property name="orientation">
191-
<enum>Qt::Vertical</enum>
191+
<enum>Qt::Orientation::Vertical</enum>
192192
</property>
193193
<property name="sizeHint" stdset="0">
194194
<size>
@@ -220,7 +220,7 @@
220220
<item>
221221
<spacer name="spacer">
222222
<property name="orientation">
223-
<enum>Qt::Horizontal</enum>
223+
<enum>Qt::Orientation::Horizontal</enum>
224224
</property>
225225
<property name="sizeHint" stdset="0">
226226
<size>
@@ -230,19 +230,6 @@
230230
</property>
231231
</spacer>
232232
</item>
233-
<item>
234-
<widget class="QLabel" name="copyrightLabel">
235-
<property name="cursor">
236-
<cursorShape>ArrowCursor</cursorShape>
237-
</property>
238-
<property name="text">
239-
<string notr="true">Copyright ownCloud GmbH</string>
240-
</property>
241-
<property name="textInteractionFlags">
242-
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
243-
</property>
244-
</widget>
245-
</item>
246233
<item>
247234
<widget class="QPushButton" name="about_pushButton">
248235
<property name="text">

‎src/libsync/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(libsync_SRCS
2121
abstractnetworkjob.cpp
2222
networkjobs.cpp
2323
owncloudpropagator.cpp
24-
owncloudtheme.cpp
24+
opencloudtheme.cpp
2525
platform.cpp
2626
progressdispatcher.cpp
2727
propagatorjobs.cpp
@@ -137,7 +137,7 @@ GENERATE_EXPORT_HEADER(libsync
137137
)
138138

139139
set_target_properties(libsync PROPERTIES
140-
OUTPUT_NAME "ownCloudLibSync"
140+
OUTPUT_NAME "OpenCloudLibSync"
141141
VERSION ${MIRALL_VERSION}
142142
SOVERSION ${MIRALL_SOVERSION}
143143
)

src/libsync/owncloudtheme.cpp renamed to src/libsync/opencloudtheme.cpp

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* for more details.
1313
*/
1414

15-
#include "owncloudtheme.h"
15+
#include "opencloudtheme.h"
1616

1717
#include <QCoreApplication>
1818
#include <QIcon>
@@ -21,39 +21,37 @@
2121

2222
namespace OCC {
2323

24-
ownCloudTheme::ownCloudTheme()
24+
OpenCloudTheme::OpenCloudTheme()
2525
: Theme()
2626
{
2727
}
2828

29-
QColor ownCloudTheme::wizardHeaderBackgroundColor() const
29+
QColor OpenCloudTheme::wizardHeaderBackgroundColor() const
3030
{
31-
return QColor(4, 30, 66);
31+
return QColor("#20434F");
3232
}
3333

34-
QColor ownCloudTheme::wizardHeaderTitleColor() const
34+
QColor OpenCloudTheme::wizardHeaderTitleColor() const
3535
{
3636
return Qt::white;
3737
}
3838

39-
QIcon ownCloudTheme::wizardHeaderLogo() const
39+
QIcon OpenCloudTheme::wizardHeaderLogo() const
4040
{
4141
return Resources::themeUniversalIcon(QStringLiteral("wizard_logo"));
4242
}
43-
44-
QIcon ownCloudTheme::aboutIcon() const
43+
QIcon OpenCloudTheme::aboutIcon() const
4544
{
46-
return Resources::themeUniversalIcon(QStringLiteral("oc-image-about"));
45+
return Resources::themeUniversalIcon(QStringLiteral("opencloud-icon"));
4746
}
4847

49-
QmlButtonColor ownCloudTheme::primaryButtonColor() const
48+
QmlButtonColor OpenCloudTheme::primaryButtonColor() const
5049
{
51-
const QColor button("#709cd2");
52-
return {button, Qt::white, button.darker()};
50+
return {"#E2BAFF", "#20434F", "#DADADA"};
5351
}
5452

55-
QmlButtonColor ownCloudTheme::secondaryButtonColor() const
53+
QmlButtonColor OpenCloudTheme::secondaryButtonColor() const
5654
{
57-
return {"#d4d3d0", Qt::black, QColor(Qt::black).lighter()};
55+
return {"#CA8DF5", "#19353F", "#B0B0B0"};
5856
}
5957
}

src/libsync/owncloudtheme.h renamed to src/libsync/opencloudtheme.h

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,17 @@
1111
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1212
* for more details.
1313
*/
14-
15-
#ifndef OWNCLOUD_THEME_H
16-
#define OWNCLOUD_THEME_H
14+
#pragma once
1715

1816
#include "theme.h"
1917

2018
namespace OCC {
2119

22-
/**
23-
* @brief The ownCloudTheme class
24-
* @ingroup libsync
25-
*/
26-
class ownCloudTheme : public Theme
20+
class OpenCloudTheme : public Theme
2721
{
2822
Q_OBJECT
2923
public:
30-
ownCloudTheme();
24+
OpenCloudTheme();
3125
QColor wizardHeaderBackgroundColor() const override;
3226
QColor wizardHeaderTitleColor() const override;
3327
QIcon wizardHeaderLogo() const override;
@@ -36,4 +30,3 @@ class ownCloudTheme : public Theme
3630
QmlButtonColor secondaryButtonColor() const override;
3731
};
3832
}
39-
#endif // OWNCLOUD_THEME_H

‎src/libsync/theme.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ QString Theme::defaultServerFolder() const
201201

202202
QString Theme::helpUrl() const
203203
{
204-
return QStringLiteral("https://doc.owncloud.com/desktop/latest/");
204+
return {};
205205
}
206206

207207
QString Theme::conflictHelpUrl() const
@@ -243,7 +243,11 @@ void Theme::setSystrayUseMonoIcons(bool mono)
243243

244244
QUrl Theme::updateCheckUrl() const
245245
{
246+
#ifdef APPLICATION_UPDATE_URL
246247
return QUrl(QStringLiteral(APPLICATION_UPDATE_URL));
248+
#else
249+
return {};
250+
#endif
247251
}
248252

249253
bool Theme::wizardSkipAdvancedPage() const

0 commit comments

Comments
 (0)