Skip to content

Commit

Permalink
Some updates, include for Supercopier icon fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alphaonex86 committed Jan 20, 2016
1 parent 1b758d8 commit 7ed529f
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 14 deletions.
14 changes: 14 additions & 0 deletions EventDispatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <QCoreApplication>
#include <QMessageBox>
#include <QWidget>
#include <QStorageInfo>

#include "EventDispatcher.h"
#include "ExtraSocket.h"
Expand Down Expand Up @@ -102,6 +103,19 @@ EventDispatcher::EventDispatcher()
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("Version as all in one, direct"));
#endif
#endif

{
const QList<QStorageInfo> mountedVolumesList=QStorageInfo::mountedVolumes();
int index=0;
while(index<mountedVolumesList.size())
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("mountSysPoint: %1").arg(mountedVolumesList.at(index).rootPath()));
index++;
}
if(mountedVolumesList.isEmpty())
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("mountSysPoint is empty"));
}

//To lunch some initialization after QApplication::exec() to quit eventually
lunchInitFunction.setInterval(0);
lunchInitFunction.setSingleShot(true);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/moveDown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/moveUp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/player_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/player_play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/putOnBottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/putOnTop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins-alternative/Themes/Supercopier/resources/search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 1 addition & 14 deletions plugins/CopyEngine/Ultracopier/DriveManagement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,14 @@

DriveManagement::DriveManagement()
{
// timer.start(60*1000);
// connect(&timer,&QTimer::timeout,this,&DriveManagement::tryUpdate,Qt::QueuedConnection);
tryUpdate();
#ifdef Q_OS_WIN32
reg1=QRegularExpression(QStringLiteral("^(\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+"));
reg2=QRegularExpression(QStringLiteral("^((\\\\\\\\|//)[^\\\\\\\\/]+(\\\\|/)[^\\\\\\\\/]+).*$"));
reg3=QRegularExpression(QStringLiteral("^[a-zA-Z]:[\\\\/]"));
reg4=QRegularExpression(QStringLiteral("^([a-zA-Z]:[\\\\/]).*$"));
#endif
#ifdef ULTRACOPIER_PLUGIN_DEBUG
int index=0;
while(index<mountSysPoint.size())
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("mountSysPoint: %1").arg(mountSysPoint.at(index)));
index++;
}
if(mountSysPoint.isEmpty())
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("mountSysPoint is empty"));
#endif
/// \warn ULTRACOPIER_DEBUGCONSOLE() don't work here because the sinal slot is not connected!
}

//get drive of an file or folder
Expand Down Expand Up @@ -102,6 +91,4 @@ void DriveManagement::tryUpdate()
driveType << mountedVolumesList.at(index).fileSystemType();
index++;
}
if(mountedVolumesList.isEmpty())
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("QStorageInfo::mountedVolumes() list is empty"));
}
1 change: 1 addition & 0 deletions plugins/CopyEngine/Ultracopier/ListThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class ListThread : public QThread
public:
explicit ListThread(FacilityInterface * facilityInterface);
~ListThread();

//duplication copy detection
/** \brief compare the current sources of the copy, with the passed arguments
* \param sources the sources list to compares with the current sources list
Expand Down

0 comments on commit 7ed529f

Please sign in to comment.