[Fix] Fix and improvement for UI

alphaonex86 · Jul 3, 2019 · f4f607b · f4f607b
1 parent 59e1a7b
commit f4f607b
Show file tree

Hide file tree

Showing 18 changed files with 89 additions and 7 deletions.
diff --git a/CopyEngineManager.cpp b/CopyEngineManager.cpp
@@ -221,6 +221,7 @@ CopyEngineManager::returnCopyEngine CopyEngineManager::getCopyEngine(const Ultra
             pluginList[index].intances.push_back(pluginList.at(index).factory->getInstance());
             temp.engine=pluginList.at(index).intances.back();
             temp.canDoOnlyCopy=pluginList.at(index).canDoOnlyCopy;
+            temp.havePause=pluginList.at(index).factory->havePause();
             temp.type=pluginList.at(index).type;
             temp.transferListOperation=pluginList.at(index).transferListOperation;
             return temp;

diff --git a/CopyEngineManager.h b/CopyEngineManager.h
@@ -34,6 +34,7 @@ class CopyEngineManager : public QObject
     {
         PluginInterface_CopyEngine * engine;	///< The copy engine instance
         bool canDoOnlyCopy;			///< true if can do only the copy (not move)
+        bool havePause;
         Ultracopier::CopyType type;				///< Kind of copy what it can do
         Ultracopier::TransferListOperation transferListOperation;
     };

diff --git a/Core.cpp b/Core.cpp
@@ -365,6 +365,7 @@ int Core::connectCopyEngine(const Ultracopier::CopyMode &mode,bool ignoreMode,co
             newItem.action=Ultracopier::Idle;
             newItem.lastProgression=0;//store the real byte transfered, used in time remaining calculation
             newItem.isPaused=false;
+            newItem.havePause=returnInformations.havePause;
             newItem.isRunning=false;
             newItem.haveError=false;
             newItem.lastConditionalSync.start();
@@ -741,6 +742,7 @@ void Core::connectInterfaceAndSync(const unsigned int &index)
     currentCopyInstance.interface->setTransferListOperation(currentCopyInstance.transferListOperation);
     currentCopyInstance.interface->actionInProgess(currentCopyInstance.action);
     currentCopyInstance.interface->isInPause(currentCopyInstance.isPaused);
+    currentCopyInstance.interface->havePause(currentCopyInstance.havePause);
     if(currentCopyInstance.haveError)
         currentCopyInstance.interface->errorDetected();
     QWidget *tempWidget=currentCopyInstance.interface->getOptionsEngineWidget();

diff --git a/Core.h b/Core.h
@@ -68,6 +68,7 @@ class Core : public QObject
             std::string collisionAction;
             std::string errorAction;
             bool isPaused;
+            bool havePause;
             bool isRunning;
             Ultracopier::CopyType type;
             Ultracopier::TransferListOperation transferListOperation;

diff --git a/interface/PluginInterface_CopyEngine.h b/interface/PluginInterface_CopyEngine.h
@@ -193,6 +193,8 @@ class PluginInterface_CopyEngineFactory : public QObject
         virtual std::vector<std::string> supportedProtocolsForTheDestination() const = 0;
         /// \brief to get the options of the copy engine
         virtual QWidget * options() = 0;
+        /// \brief to get if have pause
+        virtual bool havePause() = 0;
     public slots:
         /// \brief to reset the options
         virtual void resetOptions() = 0;
@@ -204,7 +206,7 @@ class PluginInterface_CopyEngineFactory : public QObject
 };
 
 #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-Q_DECLARE_INTERFACE(PluginInterface_CopyEngineFactory,"first-world.info.ultracopier.PluginInterface.CopyEngineFactory/1.2.4.0");
+Q_DECLARE_INTERFACE(PluginInterface_CopyEngineFactory,"first-world.info.ultracopier.PluginInterface.CopyEngineFactory/2.0.0.0");
 #endif
 
 #endif // PLUGININTERFACE_COPYENGINE_H
diff --git a/interface/PluginInterface_Listener.h b/interface/PluginInterface_Listener.h
@@ -52,7 +52,7 @@ class PluginInterface_Listener : public QObject
 };
 
 #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-Q_DECLARE_INTERFACE(PluginInterface_Listener,"first-world.info.ultracopier.PluginInterface.Listener/1.2.4.0");
+Q_DECLARE_INTERFACE(PluginInterface_Listener,"first-world.info.ultracopier.PluginInterface.Listener/2.0.0.0");
 #endif
 
 #endif // PLUGININTERFACE_LISTENER_H
diff --git a/interface/PluginInterface_PluginLoader.h b/interface/PluginInterface_PluginLoader.h
@@ -35,7 +35,7 @@ class PluginInterface_PluginLoader : public QObject
 };
 
 #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-Q_DECLARE_INTERFACE(PluginInterface_PluginLoader,"first-world.info.ultracopier.PluginInterface.PluginLoader/1.2.4.0");
+Q_DECLARE_INTERFACE(PluginInterface_PluginLoader,"first-world.info.ultracopier.PluginInterface.PluginLoader/2.0.0.0");
 #endif
 
 #endif // PLUGININTERFACE_PLUGINLOADER_H
diff --git a/interface/PluginInterface_SessionLoader.h b/interface/PluginInterface_SessionLoader.h
@@ -35,7 +35,7 @@ class PluginInterface_SessionLoader : public QObject
 };
 
 #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-Q_DECLARE_INTERFACE(PluginInterface_SessionLoader,"first-world.info.ultracopier.PluginInterface.SessionLoader/1.2.4.0");
+Q_DECLARE_INTERFACE(PluginInterface_SessionLoader,"first-world.info.ultracopier.PluginInterface.SessionLoader/2.0.0.0");
 #endif
 
 #endif // PLUGININTERFACE_SESSIONLOADER_H
diff --git a/interface/PluginInterface_Themes.h b/interface/PluginInterface_Themes.h
@@ -65,6 +65,8 @@ class PluginInterface_Themes : public QWidget
         virtual void haveExternalOrder() = 0;
         /// \brief set if is in pause
         virtual void isInPause(const bool &isInPause) = 0;
+        /// \brief set if is in pause
+        virtual void havePause(const bool &havePause) = 0;
     // signal to implement
     signals:
         //set the transfer list
@@ -113,7 +115,7 @@ class PluginInterface_ThemesFactory : public QObject
 };
 
 #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
-Q_DECLARE_INTERFACE(PluginInterface_ThemesFactory,"first-world.info.ultracopier.PluginInterface.ThemesFactory/1.2.4.0");
+Q_DECLARE_INTERFACE(PluginInterface_ThemesFactory,"first-world.info.ultracopier.PluginInterface.ThemesFactory/2.0.0.0");
 #endif
 
 #endif // PLUGININTERFACE_THEMES_H
diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.cpp
@@ -231,6 +231,12 @@ bool CopyEngineFactory::canDoOnlyCopy() const
     return false;
 }
 
+/// \brief to get if have pause
+bool CopyEngineFactory::havePause()
+{
+    return false;
+}
+
 void CopyEngineFactory::resetOptions()
 {
     auto options=optionsEngine;

diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.h b/plugins/CopyEngine/Ultracopier-Spec/CopyEngineFactory.h
@@ -66,6 +66,8 @@ class CopyEngineFactory : public PluginInterface_CopyEngineFactory
     std::vector<std::string> supportedProtocolsForTheDestination() const;
     /// \brief to get the options of the copy engine
     QWidget * options();
+    /// \brief to get if have pause
+    bool havePause();
 
 private:
     Ui::copyEngineOptions *ui;

diff --git a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp
@@ -275,7 +275,10 @@ void ScanFileOrFolder::run()
         else
         {
             ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source: "+source+" is file or symblink");
-            emit fileTransfer(source,destination+text_slash+TransferThread::resolvedName(source),mode);
+            if(stringEndsWith(destination,'/') || stringEndsWith(destination,'\\'))
+                emit fileTransfer(source,destination+TransferThread::resolvedName(source),mode);
+            else
+                emit fileTransfer(source,destination+text_slash+TransferThread::resolvedName(source),mode);
         }
         sourceIndex++;
     }

diff --git a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp
@@ -330,6 +330,12 @@ QWidget * CopyEngineFactory::options()
     return tempWidget;
 }
 
+/// \brief to get if have pause
+bool CopyEngineFactory::havePause()
+{
+    return true;
+}
+
 void CopyEngineFactory::setDoRightTransfer(bool doRightTransfer)
 {
     ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"the value have changed");

diff --git a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.h
@@ -66,6 +66,8 @@ class CopyEngineFactory : public PluginInterface_CopyEngineFactory
     std::vector<std::string> supportedProtocolsForTheDestination() const;
     /// \brief to get the options of the copy engine
     QWidget * options();
+    /// \brief to get if have pause
+    bool havePause();
 
 private:
     Ui::copyEngineOptions *ui;

diff --git a/plugins/Themes/Oxygen/interface.cpp b/plugins/Themes/Oxygen/interface.cpp
@@ -685,6 +685,12 @@ void Themes::isInPause(const bool &isInPause)
     updatePause();
 }
 
+/// \brief set have pause
+void Themes::havePause(const bool &havePause)
+{
+    ui->pauseButton->setEnabled(havePause);
+}
+
 void Themes::updatePause()
 {
     if(storeIsInPause)

diff --git a/plugins/Themes/Oxygen/interface.h b/plugins/Themes/Oxygen/interface.h
@@ -95,6 +95,8 @@ class Themes : public PluginInterface_Themes
     void haveExternalOrder();
     /// \brief set if is in pause
     void isInPause(const bool &);
+    /// \brief set if have pause
+    void havePause(const bool &);
     /// \brief get the widget for the copy engine
     QWidget * getOptionsEngineWidget();
     /// \brief to set if the copy engine is found

diff --git a/plugins/Themes/Oxygen2/interface.cpp b/plugins/Themes/Oxygen2/interface.cpp
@@ -829,6 +829,15 @@ void Themes::isInPause(const bool &isInPause)
     updatePause();
 }
 
+/// \brief set have pause
+void Themes::havePause(const bool &havePause)
+{
+    if(darkUi)
+        pauseButton->setEnabled(havePause);
+    else
+        ui->pauseButton->setEnabled(havePause);
+}
+
 void Themes::updatePause()
 {
     if(storeIsInPause)
@@ -851,7 +860,42 @@ void Themes::updateCurrentFileInformation()
     TransferModel::currentTransfertItem transfertItem=transferModel.getCurrentTransfertItem();
     if(transfertItem.haveItem)
     {
-        QString newPath=QString::fromStdString(transfertItem.from);
+        std::string from=transfertItem.from;
+        std::string::size_type pos=from.rfind('/');
+        if(pos == std::string::npos)
+        {
+            #ifdef Q_OS_WIN32
+            std::string::size_type pos=from.rfind('\\');
+            if(pos != std::string::npos)
+                if(pos < from.size()-1)
+                    from=from.substr(0,pos);
+            #endif
+        }
+        else if(pos < from.size()-1)
+        {
+            #ifdef Q_OS_WIN32
+            std::string::size_type pos2=from.rfind('\\');
+            if(pos2 != std::string::npos)
+            {
+                std::string::size_type pos=from.rfind('\\');
+                if(pos != std::string::npos)
+                {
+                    if(pos2 < from.size()-1)
+                    {
+                        if(pos<pos2)
+                            from=from.substr(0,pos2);
+                        else
+                            from=from.substr(0,pos);
+                    }
+                }
+                else
+                    from=from.substr(0,pos);
+            }
+            else
+            #endif
+            from=from.substr(0,pos);
+        }
+        QString newPath=QString::fromStdString(from);
         if(newPath.size()>(64+3))
             newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32);
         ui->from->setText(newPath);

diff --git a/plugins/Themes/Oxygen2/interface.h b/plugins/Themes/Oxygen2/interface.h
@@ -100,6 +100,8 @@ class Themes : public PluginInterface_Themes
     void doneTime(const std::vector<std::pair<uint64_t,uint32_t> > &timeList);
     /// \brief set if is in pause
     void isInPause(const bool &);
+    /// \brief set if have pause
+    void havePause(const bool &);
     /// \brief get the widget for the copy engine
     QWidget * getOptionsEngineWidget();
     /// \brief to set if the copy engine is found