Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
de0e3ab3
Commit
de0e3ab3
authored
May 05, 2011
by
shibakaneki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Resolved issue "Sankore-7"
- Modified the document path - Removed a warning
parent
1c62ce54
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
UBLibraryController.cpp
src/board/UBLibraryController.cpp
+1
-0
UBDesktopServices_mac.cpp
src/frameworks/UBDesktopServices_mac.cpp
+3
-5
UBLibActionBar.cpp
src/gui/UBLibActionBar.cpp
+4
-1
No files found.
src/board/UBLibraryController.cpp
View file @
de0e3ab3
...
@@ -374,6 +374,7 @@ QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPat
...
@@ -374,6 +374,7 @@ QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPat
QList
<
UBLibElement
*>
UBLibraryController
::
listElementsInVirtualForlder
(
UBLibElement
*
pElement
)
QList
<
UBLibElement
*>
UBLibraryController
::
listElementsInVirtualForlder
(
UBLibElement
*
pElement
)
{
{
Q_UNUSED
(
pElement
);
return
mFavoriteList
;
return
mFavoriteList
;
}
}
...
...
src/frameworks/UBDesktopServices_mac.cpp
View file @
de0e3ab3
...
@@ -70,8 +70,7 @@ QString UBDesktopServices::storageLocation(StandardLocation type)
...
@@ -70,8 +70,7 @@ QString UBDesktopServices::storageLocation(StandardLocation type)
short
domain
=
kOnAppropriateDisk
;
short
domain
=
kOnAppropriateDisk
;
if
(
QDesktopServices
::
DataLocation
==
type
if
(
QDesktopServices
::
DataLocation
==
type
||
QDesktopServices
::
CacheLocation
==
type
)
||
QDesktopServices
::
CacheLocation
==
type
)
domain
=
kUserDomain
;
domain
=
kUserDomain
;
// http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html
// http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html
...
@@ -82,9 +81,8 @@ QString UBDesktopServices::storageLocation(StandardLocation type)
...
@@ -82,9 +81,8 @@ QString UBDesktopServices::storageLocation(StandardLocation type)
QString
path
=
getFullPath
(
ref
);
QString
path
=
getFullPath
(
ref
);
if
(
QDesktopServices
::
DataLocation
==
type
if
(
QDesktopServices
::
DataLocation
==
type
||
QDesktopServices
::
CacheLocation
==
type
)
||
QDesktopServices
::
CacheLocation
==
type
)
path
+=
"/Sankore"
;
path
+=
"/"
+
QCoreApplication
::
applicationName
();
return
path
;
return
path
;
}
}
...
...
src/gui/UBLibActionBar.cpp
View file @
de0e3ab3
...
@@ -396,9 +396,12 @@ void UBLibActionBar::dropEvent(QDropEvent *event)
...
@@ -396,9 +396,12 @@ void UBLibActionBar::dropEvent(QDropEvent *event)
onActionRemoveFavorite
();
onActionRemoveFavorite
();
}
}
else
if
(
mpDeleteBtn
==
pTargetW
)
else
if
(
mpDeleteBtn
==
pTargetW
)
{
if
(
mpDeleteBtn
->
isEnabled
())
{
{
onActionTrash
();
onActionTrash
();
}
}
}
else
if
(
mpSocialBtn
==
pTargetW
)
else
if
(
mpSocialBtn
==
pTargetW
)
{
{
onActionSocial
();
onActionSocial
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment