OTX: Code merge cleanups

Author: manongjohn

README.md

@@ -2,6 +2,51 @@
 
 ![](./toonz/sources/toonz/Resources/splash_OTX.svg)
 
-OpenToonz (eXperimental), also known as OTX, is a portable version of OpenToonz that contain features proposed via PRs but not yet integrated into the official version.
+OpenToonz (eXperimental), also known as OTX, is a portable version of OpenToonz that contain changes, fixes and new features that will either be in the next official release or somewhere down the road.
 
-This repository IS NOT source code repository of OpenToonz. Please see https://github.com/opentoonz/opentoonz for the source code.
+This repository IS NOT source code repository of OpenToonz and should not be used for continued development. Please see https://github.com/opentoonz/opentoonz for the source code.
+
+### Program Requirements
+
+- Windows 7 (64bit) or later
+- macOS 10.13 (High Sierra) or later
+- Ubuntu 14.04 (or equivalent) or later
+
+For additional requirements, please refer to the OpenToonz site at <https://opentoonz.github.io/e/index.html>.
+
+### Installation and Usage
+
+OTX builds are created as portables so no installation is required.  You can keep existing installed OpenToonz versions on your system.
+
+- Windows:
+
+   - Download the file: OpenToonz-OTX-win.zip
+   - Right-click the OpenToonz-OTX-win.zip file and select "Extract All..." to extract the contents.
+      - This will extract a folder called "OpenToonzPortable".
+   - Move the OpenToonzPortable folder to a desired location (i.e. C:\Program Files, Desktop, a USB key)
+   - Double-click the 'OpenToonzPortable\OpenToonz.exe' to run
+
+- macOS:
+
+   - Download the file: OpenToonz-OTX-osx.dmg
+   - Double-click the OpenToonz-OTX-osx.dmg file to open it
+   - Drag the "OpenToonz" application to wherever you want to run it from (i.e Applications, Desktop, a USB key)
+        - If you already have the official OpenToonz application installed, you should rename the OTX version (OpenToonz_OTX) if you want to keep it in the same directory as the official version.
+   - Double-click the "OpenToonz" application to run.
+        - The 1st time you do this, macOS will likely block the application from running. You will need to update your Security settings to allow it to run.
+
+   - NOTE(s): 
+      - Do NOT run the OTX application from inside the .dmg file. It will not work.
+      - If you run this for the first time on a system that already has OpenToonz officially installed, it will detect the preferences and prompt you 2x to import them, once for preferences and another for room layouts.
+
+        However, due to a Qt bug, not OT, the popups appear behind the splash screen and will make it seem like it's taking forever to load.
+
+        If it seems like it is taking forever to initialize OTX, click away from the splash screen to reveal the popups. Click and drag it away from splash screen area before interacting with it.
+
+- Linux:
+
+   - Download the file: OpenToonz-OTX-linux.tar.gz
+   - Right-click the OpenToonz-OTX-linux.tar.gz file and "Extract Here" to extract the contents.
+        - This will create a folder as "OpenToonz-OTX-linux/OpenToonzPortable".
+   - Move the entire OpenToonzPortable folder to a desired location (i.e. application folder, Desktop, a USB key)
+   - Double-click the 'OpenToonzPortable/OpenToonz.AppImage' to run

toonz/sources/common/tapptools/tenv.cpp

@@ -174,7 +174,6 @@ class EnvGlobals {  // singleton
       m_applicationFullName += " " + m_version.getAppNote();
 
     m_moduleName          = m_version.getAppName();
-//	m_moduleName = m_version.getAppName() + " (eXperimental)";
     m_rootVarName         = toUpper(m_version.getAppName()) + "ROOT";
 #ifdef _WIN32
     // from v1.3, registry root is moved to SOFTWARE\\OpenToonz\\OpenToonz

toonz/sources/common/tsound/tsound_nt.cpp

@@ -499,12 +499,12 @@ bool TSoundOutputDeviceImp::doOpenDevice(const TSoundTrackFormat &format) {
   wf.cbSize          = 0;
 
   TThread::MutexLocker sl(&m_mutex);
-  CloseHandle(CreateThread(NULL, 0, MyWaveOutCallbackThread, (LPVOID) this, 0,
+  CloseHandle(CreateThread(NULL, 0, MyWaveOutCallbackThread, (LPVOID)this, 0,
                            &m_notifyThreadId));
 
   MMRESULT ret;
   if ((ret = waveOutOpen(&m_wout, WAVE_MAPPER, &wf, (DWORD)m_notifyThreadId,
-                         (DWORD) this, CALLBACK_THREAD)) != MMSYSERR_NOERROR) {
+                         (DWORD)this, CALLBACK_THREAD)) != MMSYSERR_NOERROR) {
     while (!PostThreadMessage(m_notifyThreadId, WM_QUIT, 0, 0))
       ;
   }

toonz/sources/common/tsystem/tfilepath.cpp

@@ -321,9 +321,10 @@ void TFilePath::setPath(std::wstring path) {
       m_path.length() > 1 && m_path[m_path.length() - 1] == wslash)
     m_path.erase(m_path.length() - 1, 1);
 
-  if (isUncName && !(m_path.find_last_of(L'\\') > 1 ||
-                     m_path.find_last_of(L'/') >
-                         1))  // e' indicato solo il nome della macchina...
+  if (isUncName &&
+      !(m_path.find_last_of(L'\\') > 1 ||
+        m_path.find_last_of(L'/') >
+            1))  // e' indicato solo il nome della macchina...
     m_path.append(1, wslash);
 }
 
@@ -666,9 +667,8 @@ TFilePath TFilePath::getParentDir() const  // noSlash!
 {
   int i = getLastSlash(m_path);  // cerco l'ultimo slash
   if (i < 0) {
-    if (m_path.length() >= 2 &&
-        ('a' <= m_path[0] && m_path[0] <= 'z' ||
-         'A' <= m_path[0] && m_path[0] <= 'Z') &&
+    if (m_path.length() >= 2 && ('a' <= m_path[0] && m_path[0] <= 'z' ||
+                                 'A' <= m_path[0] && m_path[0] <= 'Z') &&
         m_path[1] == ':')
       return TFilePath(m_path.substr(0, 2));
     else

toonz/sources/image/3gp/tiio_3gp.h

@@ -15,9 +15,6 @@
 // Windows include
 #include <windows.h>
 
-#include "tlevel_io.h"
-#include "tthreadmessage.h"
-
 namespace QuickTime {
 #define list List
 #define map Map

toonz/sources/image/mov/tiio_mov.h

@@ -15,11 +15,6 @@
 // Windows include
 #include <windows.h>
 
-// Toonz includes
-#include "tlevel_io.h"
-#include "tthreadmessage.h"
-#include "tcommon.h"
-
 // QuickTime includes
 namespace QuickTime {
 #define list QuickTime_list

toonz/sources/include/tools/tool.h

@@ -280,8 +280,8 @@ class DVAPI TTool {
     MeshImage   = 0x8,   //!< Will work on mesh images
     Splines     = 0x10,  //!< Will work on motion paths
 
-    LevelColumns= 0x20,  //!< Will work on level columns
-    MeshColumns = 0x40,  //!< Will work on mesh columns
+    LevelColumns = 0x20,  //!< Will work on level columns
+    MeshColumns  = 0x40,  //!< Will work on mesh columns
 
     EmptyTarget = 0x80,  //!< Will work on empty cells/columns
 

toonz/sources/include/toonz/preferences.h

@@ -127,14 +127,14 @@ class DVAPI Preferences final : public QObject  // singleton
 public:
   static Preferences *instance();
 
+  void load();
+
   QMap<PreferencesItemId, PreferencesItem> m_items;
   void initializeOptions();
   void definePreferenceItems();
   void define(PreferencesItemId id, QString idString, QMetaType::Type type,
               QVariant defaultValue, QVariant min = 0, QVariant max = -1);
 
-  void load();
-
   void setCallBack(const PreferencesItemId id, OnEditedFunc func);
   void resolveCompatibility();
 

toonz/sources/include/toonz/preferencesitemids.h

@@ -178,7 +178,6 @@ enum PreferencesItemId {
   // Shortcut popup settings
   shortcutPreset,
   // Viewer context menu
-  guidedDrawingEnabled,
   guidedDrawingType,
   guidedAutoInbetween,
   guidedInterpolationType,

toonz/sources/include/tversion.h

@@ -61,7 +61,6 @@ std::string ToonzVersion::getAppVersionInfo(std::string msg) {
   appinfo += "." + getAppRevisionString();
   if (hasAppNote())
     appinfo += " " + std::string(applicationNote);
-//  appinfo += "  (eXperimental)";
   return appinfo;
 }