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
d65218e0
Commit
d65218e0
authored
Oct 07, 2019
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "be able to double click on ubx files (WIP)"
This reverts commit
adb884c8
.
parent
4ea7af38
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
37 deletions
+2
-37
package.sh
release_scripts/linux/package.sh
+0
-2
openboard-ubx.xml
resources/linux/openboard-ubx.xml
+0
-8
UBApplication.cpp
src/core/UBApplication.cpp
+1
-6
UBApplicationController.cpp
src/core/UBApplicationController.cpp
+1
-20
UBApplicationController.h
src/core/UBApplicationController.h
+0
-1
No files found.
release_scripts/linux/package.sh
View file @
d65218e0
...
@@ -181,7 +181,6 @@ chown -R root:root $PACKAGE_DIRECTORY
...
@@ -181,7 +181,6 @@ chown -R root:root $PACKAGE_DIRECTORY
cp
-R
resources/customizations
$PACKAGE_DIRECTORY
/
cp
-R
resources/customizations
$PACKAGE_DIRECTORY
/
cp
resources/linux/openboard-ubz.xml
$PACKAGE_DIRECTORY
/etc/
cp
resources/linux/openboard-ubz.xml
$PACKAGE_DIRECTORY
/etc/
cp
resources/linux/openboard-ubx.xml
$PACKAGE_DIRECTORY
/etc/
if
$BUNDLE_QT
;
then
if
$BUNDLE_QT
;
then
cp
-R
resources/linux/run.sh
$PACKAGE_DIRECTORY
/
cp
-R
resources/linux/run.sh
$PACKAGE_DIRECTORY
/
...
@@ -285,7 +284,6 @@ cat > "$BASE_WORKING_DIR/DEBIAN/postinst" << EOF
...
@@ -285,7 +284,6 @@ cat > "$BASE_WORKING_DIR/DEBIAN/postinst" << EOF
xdg-desktop-menu install --novendor /usr/share/applications/
${
APPLICATION_CODE
}
.desktop
xdg-desktop-menu install --novendor /usr/share/applications/
${
APPLICATION_CODE
}
.desktop
xdg-mime install --mode system /
$APPLICATION_PATH
/
$APPLICATION_CODE
/etc/openboard-ubz.xml
xdg-mime install --mode system /
$APPLICATION_PATH
/
$APPLICATION_CODE
/etc/openboard-ubz.xml
xdg-mime install --mode system /
$APPLICATION_PATH
/
$APPLICATION_CODE
/etc/openboard-ubx.xml
xdg-mime default /usr/share/applications/
${
APPLICATION_CODE
}
.desktop application/ubz
xdg-mime default /usr/share/applications/
${
APPLICATION_CODE
}
.desktop application/ubz
ln -s
$SYMLINK_TARGET
/usr/bin/
$APPLICATION_CODE
ln -s
$SYMLINK_TARGET
/usr/bin/
$APPLICATION_CODE
...
...
resources/linux/openboard-ubx.xml
deleted
100644 → 0
View file @
4ea7af38
<?xml version="1.0"?>
<mime-info
xmlns=
'http://www.freedesktop.org/standards/shared-mime-info'
>
<mime-type
type=
"application/ubx"
>
<comment>
OpenBoard documents set
</comment>
<comment
xml:lang=
"fr"
>
Ensemble de documents OpenBoard
</comment>
<glob
pattern=
"*.ubx"
/>
</mime-type>
</mime-info>
src/core/UBApplication.cpp
View file @
d65218e0
...
@@ -349,12 +349,7 @@ int UBApplication::exec(const QString& pFileToImport)
...
@@ -349,12 +349,7 @@ int UBApplication::exec(const QString& pFileToImport)
boardController
->
setupLayout
();
boardController
->
setupLayout
();
if
(
pFileToImport
.
length
()
>
0
)
if
(
pFileToImport
.
length
()
>
0
)
{
if
(
pFileToImport
.
endsWith
(
".ubx"
))
UBApplication
::
applicationController
->
importUbx
(
pFileToImport
);
else
UBApplication
::
applicationController
->
importFile
(
pFileToImport
);
UBApplication
::
applicationController
->
importFile
(
pFileToImport
);
}
if
(
UBSettings
::
settings
()
->
appStartMode
->
get
().
toInt
())
if
(
UBSettings
::
settings
()
->
appStartMode
->
get
().
toInt
())
applicationController
->
showDesktop
();
applicationController
->
showDesktop
();
...
...
src/core/UBApplicationController.cpp
View file @
d65218e0
...
@@ -675,6 +675,7 @@ void UBApplicationController::showMessage(const QString& message, bool showSpinn
...
@@ -675,6 +675,7 @@ void UBApplicationController::showMessage(const QString& message, bool showSpinn
}
}
}
}
void
UBApplicationController
::
importFile
(
const
QString
&
pFilePath
)
void
UBApplicationController
::
importFile
(
const
QString
&
pFilePath
)
{
{
const
QFile
fileToOpen
(
pFilePath
);
const
QFile
fileToOpen
(
pFilePath
);
...
@@ -708,26 +709,6 @@ void UBApplicationController::importFile(const QString& pFilePath)
...
@@ -708,26 +709,6 @@ void UBApplicationController::importFile(const QString& pFilePath)
}
}
}
}
void
UBApplicationController
::
importUbx
(
const
QString
&
pFilePath
)
{
bool
success
=
false
;
QFileInfoList
list
=
UBDocumentManager
::
documentManager
()
->
importUbx
(
pFilePath
,
UBSettings
::
userDocumentDirectory
());
success
=
(
list
.
length
()
!=
0
);
if
(
success
)
{
if
(
mMainMode
==
Board
||
mMainMode
==
Internet
)
{
if
(
UBApplication
::
boardController
)
{
showBoard
();
}
}
}
}
void
UBApplicationController
::
useMultiScreen
(
bool
use
)
void
UBApplicationController
::
useMultiScreen
(
bool
use
)
{
{
if
(
use
&&
!
mMirror
)
if
(
use
&&
!
mMirror
)
...
...
src/core/UBApplicationController.h
View file @
d65218e0
...
@@ -93,7 +93,6 @@ class UBApplicationController : public QObject
...
@@ -93,7 +93,6 @@ class UBApplicationController : public QObject
void
showMessage
(
const
QString
&
message
,
bool
showSpinningWheel
);
void
showMessage
(
const
QString
&
message
,
bool
showSpinningWheel
);
void
importFile
(
const
QString
&
pFilePath
);
void
importFile
(
const
QString
&
pFilePath
);
void
importUbx
(
const
QString
&
pFilePath
);
UBDisplayManager
*
displayManager
()
UBDisplayManager
*
displayManager
()
{
{
...
...
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