Skip to content

Commit c74653b

Browse files
TCB13TCB13
committed
Update copy; macOS UI Fixes
1 parent c3b3f59 commit c74653b

File tree

6 files changed

+137
-113
lines changed

6 files changed

+137
-113
lines changed

‎LoFloccus/LoFloccus.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ FORMS += \
2626
lofloccus.ui
2727

2828
# Generic for all builds
29-
VERSION = 1.2.1
29+
VERSION = 1.2.2
3030
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
3131
INCLUDEPATH += $${PWD}/libs
3232

‎LoFloccus/LoFloccus.pro.user‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 4.11.1, 2021-12-08T22:53:44. -->
3+
<!-- Written by QtCreator 4.11.1, 2021-12-11T00:56:07. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -64,14 +64,14 @@
6464
<data>
6565
<variable>ProjectExplorer.Project.Target.0</variable>
6666
<valuemap type="QVariantMap">
67-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
68-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
69-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
67+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Static</value>
68+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Static</value>
69+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{6ade0079-14a6-434a-872a-bd67ebf6cbea}</value>
7070
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
7171
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
7272
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
7373
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
74-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Debug</value>
74+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Debug</value>
7575
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
7676
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
7777
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -119,7 +119,7 @@
119119
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
120120
</valuemap>
121121
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
122-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Release</value>
122+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Release</value>
123123
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
124124
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
125125
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -128,7 +128,7 @@
128128
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
129129
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
130130
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
131-
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
131+
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
132132
</valuemap>
133133
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
134134
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -167,7 +167,7 @@
167167
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
168168
</valuemap>
169169
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
170-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Profile</value>
170+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Profile</value>
171171
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
172172
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
173173
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -176,7 +176,7 @@
176176
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
177177
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
178178
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
179-
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
179+
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
180180
</valuemap>
181181
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
182182
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -307,14 +307,14 @@
307307
<data>
308308
<variable>ProjectExplorer.Project.Target.1</variable>
309309
<valuemap type="QVariantMap">
310-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Static</value>
311-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Static</value>
312-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{6ade0079-14a6-434a-872a-bd67ebf6cbea}</value>
313-
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
310+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
311+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.14.2 MinGW 64-bit</value>
312+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5142.win64_mingw73_kit</value>
313+
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
314314
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
315315
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
316316
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
317-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Debug</value>
317+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Debug</value>
318318
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
319319
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
320320
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -362,7 +362,7 @@
362362
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
363363
</valuemap>
364364
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
365-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Release</value>
365+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Release</value>
366366
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
367367
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
368368
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -371,7 +371,7 @@
371371
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
372372
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
373373
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
374-
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
374+
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
375375
</valuemap>
376376
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
377377
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -410,7 +410,7 @@
410410
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
411411
</valuemap>
412412
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
413-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Static-Profile</value>
413+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Tadeu Bento/Projetos/LoFloccus/build-LoFloccus-Desktop_Qt_5_14_2_MinGW_64_bit-Profile</value>
414414
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
415415
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
416416
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -419,7 +419,7 @@
419419
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
420420
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
421421
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
422-
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
422+
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
423423
</valuemap>
424424
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
425425
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -530,14 +530,14 @@
530530
</valuelist>
531531
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
532532
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
533-
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
534-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
535-
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
533+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Tadeu Bento/Projetos/LoFloccus/LoFloccus/LoFloccus.pro</value>
534+
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/Tadeu Bento/Projetos/LoFloccus/LoFloccus/LoFloccus.pro</value>
536535
<value type="QString" key="RunConfiguration.Arguments"></value>
537536
<value type="bool" key="RunConfiguration.Arguments.multi">false</value>
538537
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
539538
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
540539
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
540+
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
541541
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
542542
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
543543
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>

‎LoFloccus/libs/libLoFloccusDavDarwin.a‎

3.45 MB
Binary file not shown.

‎LoFloccus/libs/libLoFloccusDavWin64.a‎

0 Bytes
Binary file not shown.

‎LoFloccus/lofloccus.ui‎

Lines changed: 111 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,6 @@
2727
<locale language="English" country="UnitedStates"/>
2828
</property>
2929
<widget class="QWidget" name="centralwidget">
30-
<widget class="QLabel" name="logo">
31-
<property name="geometry">
32-
<rect>
33-
<x>130</x>
34-
<y>20</y>
35-
<width>51</width>
36-
<height>41</height>
37-
</rect>
38-
</property>
39-
<property name="font">
40-
<font>
41-
<family>Arial</family>
42-
</font>
43-
</property>
44-
<property name="text">
45-
<string/>
46-
</property>
47-
<property name="pixmap">
48-
<pixmap resource="resources.qrc">:/assets/logo.png</pixmap>
49-
</property>
50-
<property name="alignment">
51-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
52-
</property>
53-
</widget>
5430
<widget class="QLabel" name="connect_label">
5531
<property name="geometry">
5632
<rect>
@@ -70,52 +46,6 @@
7046
<string>Connect your Floccus Browser Extension</string>
7147
</property>
7248
</widget>
73-
<widget class="QLabel" name="description_label">
74-
<property name="geometry">
75-
<rect>
76-
<x>0</x>
77-
<y>60</y>
78-
<width>461</width>
79-
<height>21</height>
80-
</rect>
81-
</property>
82-
<property name="font">
83-
<font>
84-
<pointsize>10</pointsize>
85-
<weight>75</weight>
86-
<bold>true</bold>
87-
</font>
88-
</property>
89-
<property name="text">
90-
<string>Sync Floccus to a Local Folder!</string>
91-
</property>
92-
<property name="alignment">
93-
<set>Qt::AlignCenter</set>
94-
</property>
95-
</widget>
96-
<widget class="QLabel" name="logo_label">
97-
<property name="geometry">
98-
<rect>
99-
<x>190</x>
100-
<y>20</y>
101-
<width>141</width>
102-
<height>41</height>
103-
</rect>
104-
</property>
105-
<property name="font">
106-
<font>
107-
<pointsize>16</pointsize>
108-
<weight>75</weight>
109-
<bold>true</bold>
110-
</font>
111-
</property>
112-
<property name="text">
113-
<string>LoFloccus</string>
114-
</property>
115-
<property name="alignment">
116-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
117-
</property>
118-
</widget>
11949
<widget class="Line" name="line">
12050
<property name="geometry">
12151
<rect>
@@ -188,14 +118,14 @@
188118
<item>
189119
<widget class="QLabel" name="label">
190120
<property name="text">
191-
<string>1. Open Floccus and choose &quot;XBEL in WebDav Account&quot;</string>
121+
<string>1. Open Floccus and click &quot;+ New Account&quot;</string>
192122
</property>
193123
</widget>
194124
</item>
195125
<item>
196126
<widget class="QLabel" name="label_2">
197127
<property name="text">
198-
<string>2. Click &quot;Add Account&quot; and fill in the following details:</string>
128+
<string>2. Choose &quot;XBEL file in WebDAV share&quot; and fill in the following details:</string>
199129
</property>
200130
</widget>
201131
</item>
@@ -413,6 +343,115 @@
413343
<enum>Qt::Horizontal</enum>
414344
</property>
415345
</widget>
346+
<widget class="QWidget" name="verticalLayoutWidget_3">
347+
<property name="geometry">
348+
<rect>
349+
<x>0</x>
350+
<y>10</y>
351+
<width>461</width>
352+
<height>71</height>
353+
</rect>
354+
</property>
355+
<layout class="QVBoxLayout" name="verticalLayout_3">
356+
<property name="spacing">
357+
<number>0</number>
358+
</property>
359+
<item>
360+
<layout class="QHBoxLayout" name="horizontalLayout_3">
361+
<property name="spacing">
362+
<number>10</number>
363+
</property>
364+
<item>
365+
<spacer name="horizontalSpacer">
366+
<property name="orientation">
367+
<enum>Qt::Horizontal</enum>
368+
</property>
369+
<property name="sizeHint" stdset="0">
370+
<size>
371+
<width>20</width>
372+
<height>20</height>
373+
</size>
374+
</property>
375+
</spacer>
376+
</item>
377+
<item>
378+
<widget class="QLabel" name="logo">
379+
<property name="minimumSize">
380+
<size>
381+
<width>48</width>
382+
<height>48</height>
383+
</size>
384+
</property>
385+
<property name="font">
386+
<font>
387+
<family>Arial</family>
388+
</font>
389+
</property>
390+
<property name="text">
391+
<string/>
392+
</property>
393+
<property name="pixmap">
394+
<pixmap resource="resources.qrc">:/assets/logo.png</pixmap>
395+
</property>
396+
<property name="alignment">
397+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
398+
</property>
399+
<property name="margin">
400+
<number>0</number>
401+
</property>
402+
</widget>
403+
</item>
404+
<item>
405+
<widget class="QLabel" name="logo_label">
406+
<property name="font">
407+
<font>
408+
<pointsize>17</pointsize>
409+
<weight>75</weight>
410+
<bold>true</bold>
411+
</font>
412+
</property>
413+
<property name="text">
414+
<string>LoFloccus</string>
415+
</property>
416+
<property name="alignment">
417+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
418+
</property>
419+
</widget>
420+
</item>
421+
<item>
422+
<spacer name="horizontalSpacer_2">
423+
<property name="orientation">
424+
<enum>Qt::Horizontal</enum>
425+
</property>
426+
<property name="sizeHint" stdset="0">
427+
<size>
428+
<width>40</width>
429+
<height>20</height>
430+
</size>
431+
</property>
432+
</spacer>
433+
</item>
434+
</layout>
435+
</item>
436+
<item>
437+
<widget class="QLabel" name="description_label">
438+
<property name="font">
439+
<font>
440+
<pointsize>10</pointsize>
441+
<weight>75</weight>
442+
<bold>true</bold>
443+
</font>
444+
</property>
445+
<property name="text">
446+
<string>Sync Floccus to a Local Folder!</string>
447+
</property>
448+
<property name="alignment">
449+
<set>Qt::AlignCenter</set>
450+
</property>
451+
</widget>
452+
</item>
453+
</layout>
454+
</widget>
416455
</widget>
417456
<widget class="QMenuBar" name="menubar">
418457
<property name="geometry">

0 commit comments

Comments
 (0)